From 6425e4ae49d6b1e26aeb34f4dd3cb76807ee7e65 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 22 Apr 2021 16:15:53 +0200
Subject: [PATCH 0001/1101] refactor(CLI): Improve inner flow documentation

---
 scripts/serverless.js | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index c99975b64b2..44ffa54e85c 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -45,6 +45,8 @@ const processSpanPromise = (async () => {
     }
 
     const ServerlessError = require('../lib/serverless-error');
+
+    // Abort if command is not supported in this environment
     if (commandSchema && commandSchema.isHidden && commandSchema.noSupportNotice) {
       throw new ServerlessError(
         `Cannot run \`${command}\` command: ${commandSchema.noSupportNotice}`
@@ -95,6 +97,8 @@ const processSpanPromise = (async () => {
     };
 
     if (!commandSchema || commandSchema.serviceDependencyMode) {
+      // Command is potentially service specific, follow up with resolution of service config
+
       const resolveConfigurationPath = require('../lib/cli/resolve-configuration-path');
       const readConfiguration = require('../lib/configuration/read');
 
@@ -120,7 +124,7 @@ const processSpanPromise = (async () => {
         serviceDir = process.cwd();
         if (!commandSchema) {
           // If command was not recognized in first resolution phase
-          // Parse args again also against schemas commands which require service to be run
+          // parse args again also against schemas of commands which require service context
           resolveInput.clear();
           ({ command, commands, options, isHelpRequest, commandSchema } = resolveInput(
             require('../lib/cli/commands-schema/service')
@@ -130,7 +134,8 @@ const processSpanPromise = (async () => {
         // IIFE for maintanance convenience
         await (async () => {
           if (_.get(configuration.provider, 'variableSyntax')) {
-            // Request to rely on old variables resolver explictly, abort
+            // Request to rely on old variables resolver explictly
+            // abort (fallback to legacy internal resolution)
             if (isHelpRequest) return;
             if (configuration.variablesResolutionMode) {
               throw new ServerlessError(
@@ -181,8 +186,8 @@ const processSpanPromise = (async () => {
             }
           }
           if (!commandSchema && providerName === 'aws') {
-            // If command was not recognized in first resolution phase
-            // Parse args again also against schemas commands which require AWS service to be run
+            // If command was not recognized in previous resolution phases
+            // parse args again also against schemas commands which require AWS service context
             resolveInput.clear();
             ({ command, commands, options, isHelpRequest, commandSchema } = resolveInput(
               require('../lib/cli/commands-schema/aws-service')
@@ -274,7 +279,6 @@ const processSpanPromise = (async () => {
 
           if (!variablesMeta.size) return; // No properties configured with variables
 
-          // Resolve all unresolved configuration properties
           resolverConfiguration.fulfilledSources.add('env');
 
           if (isHelpRequest || commands[0] === 'plugin') {
@@ -352,6 +356,8 @@ const processSpanPromise = (async () => {
         ({ command, commands, options, isHelpRequest, commandSchema } = resolveInput(
           require('../lib/cli/commands-schema/aws-service')
         ));
+
+        // Validate result command and options
         require('../lib/cli/ensure-supported-command')();
       }
     }
@@ -372,6 +378,8 @@ const processSpanPromise = (async () => {
       serverless.invocationId = uuid.v4();
       await serverless.init();
       if (serverless.invokedInstance) {
+        // Local (in service) installation was found and initialized internally,
+        // From now on refer to it only
         serverless.invokedInstance.invocationId = serverless.invocationId;
         serverless = serverless.invokedInstance;
       }
@@ -381,11 +389,12 @@ const processSpanPromise = (async () => {
         if (!configuration) return;
         let hasFinalCommandSchema = false;
         if (configuration.plugins) {
+          // After plugins are loaded, re-resolve CLI command and options schema as plugin
+          // might have defined extra commands and options
+
           // TODO: Remove "serverless.pluginManager.externalPlugins" check with next major
           if (serverless.pluginManager.externalPlugins) {
             if (serverless.pluginManager.externalPlugins.size) {
-              // After plugins are loaded, re-resolve CLI command and options schema as plugin
-              // might have defined extra commands and options
               const commandsSchema = require('../lib/cli/commands-schema/resolve-final')(
                 serverless.pluginManager.externalPlugins,
                 { providerName: providerName || 'aws', configuration }
@@ -412,11 +421,15 @@ const processSpanPromise = (async () => {
           ));
         }
 
+        // Validate result command and options
         require('../lib/cli/ensure-supported-command')(configuration);
         if (isHelpRequest) return;
         if (!_.get(variablesMeta, 'size')) return;
 
+        // Resolve remaininig service configuration variables
         if (providerName === 'aws') {
+          // Ensure properties which are crucial to some variable source resolvers
+          // are actually resolved.
           if (
             !ensureResolvedProperty('provider\0credentials', {
               shouldSilentlyReturnIfLegacyMode: true,
@@ -445,6 +458,8 @@ const processSpanPromise = (async () => {
           // we have full "opt" source data if user didn't explicitly switch to new resolver
           resolverConfiguration.fulfilledSources.add('opt');
         }
+
+        // Register serverless instance and AWS provider specific variable sources
         resolverConfiguration.sources.sls = require('../lib/configuration/variables/sources/instance-dependent/get-sls')(
           serverless
         );
@@ -465,6 +480,7 @@ const processSpanPromise = (async () => {
           resolverConfiguration.fulfilledSources.add('cf').add('s3').add('ssm');
         }
 
+        // Register dashboard specific variable source resolvers
         if (configuration.org && serverless.pluginManager.dashboardPlugin) {
           for (const [sourceName, sourceConfig] of Object.entries(
             serverless.pluginManager.dashboardPlugin.configurationVariablesSources
@@ -477,6 +493,7 @@ const processSpanPromise = (async () => {
         const ensurePlainFunction = require('type/plain-function/ensure');
         const ensurePlainObject = require('type/plain-object/ensure');
 
+        // Register variable source resolvers provided by external plugins
         for (const externalPlugin of serverless.pluginManager.externalPlugins) {
           const pluginName = externalPlugin.constructor.name;
           if (externalPlugin.configurationVariablesSources != null) {
@@ -531,6 +548,7 @@ const processSpanPromise = (async () => {
           }
         }
 
+        // Having all source resolvers configured, resolve variables
         await resolveVariables(resolverConfiguration);
         if (!variablesMeta.size) {
           serverless.isConfigurationInputResolved = true;
@@ -541,6 +559,8 @@ const processSpanPromise = (async () => {
         ) {
           return;
         }
+
+        // Report unrecognized variable sources found in variables configured in service config
         const unresolvedSources = require('../lib/configuration/variables/resolve-unresolved-source-types')(
           variablesMeta
         );
@@ -607,8 +627,10 @@ const processSpanPromise = (async () => {
       })();
 
       if (isHelpRequest && serverless.pluginManager.externalPlugins) {
+        // Show help
         require('../lib/cli/render-help')(serverless.pluginManager.externalPlugins);
       } else {
+        // Run command
         await serverless.run();
       }
     } catch (error) {

From 53a7872f78f51938b409925e052d34f2dc85abbd Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 23 Apr 2021 09:53:00 +0200
Subject: [PATCH 0002/1101] fix(Variables): Fix unresolved sources resolver

---
 .../resolve-unresolved-source-types.js        | 28 ++++---
 .../resolve-unresolved-source-types.test.js   | 75 ++++++++++++++-----
 2 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/lib/configuration/variables/resolve-unresolved-source-types.js b/lib/configuration/variables/resolve-unresolved-source-types.js
index 2130c2546cc..bab1a8fec1b 100644
--- a/lib/configuration/variables/resolve-unresolved-source-types.js
+++ b/lib/configuration/variables/resolve-unresolved-source-types.js
@@ -1,21 +1,29 @@
 'use strict';
 
 const processVariables = (propertyPath, variablesMeta, resultMap) => {
-  if (!variablesMeta.variables) return;
+  let hasUnresolvedSources = false;
+  if (!variablesMeta.variables) return hasUnresolvedSources;
   for (const variableMeta of variablesMeta.variables) {
     if (!variableMeta.sources) continue;
-    for (const sourceData of variableMeta.sources) {
-      if (!sourceData.type) continue;
-      if (!resultMap.has(sourceData.type)) resultMap.set(sourceData.type, new Set());
-      resultMap.get(sourceData.type).add(propertyPath);
-      if (sourceData.params) {
-        for (const paramData of sourceData.params) {
-          processVariables(propertyPath, paramData, resultMap);
-        }
+    const sourceData = variableMeta.sources[0];
+    if (!sourceData.type) continue;
+    if (sourceData.params) {
+      for (const paramData of sourceData.params) {
+        if (processVariables(propertyPath, paramData, resultMap)) hasUnresolvedSources = true;
       }
-      if (sourceData.address) processVariables(propertyPath, sourceData.address, resultMap);
+      if (hasUnresolvedSources) continue;
     }
+    if (sourceData.address) {
+      if (processVariables(propertyPath, sourceData.address, resultMap)) {
+        hasUnresolvedSources = true;
+        continue;
+      }
+    }
+    hasUnresolvedSources = true;
+    if (!resultMap.has(sourceData.type)) resultMap.set(sourceData.type, new Set());
+    resultMap.get(sourceData.type).add(propertyPath);
   }
+  return hasUnresolvedSources;
 };
 
 module.exports = (propertiesVariablesMeta) => {
diff --git a/test/unit/lib/configuration/variables/resolve-unresolved-source-types.test.js b/test/unit/lib/configuration/variables/resolve-unresolved-source-types.test.js
index ab694ea8d64..83318f32055 100644
--- a/test/unit/lib/configuration/variables/resolve-unresolved-source-types.test.js
+++ b/test/unit/lib/configuration/variables/resolve-unresolved-source-types.test.js
@@ -3,44 +3,79 @@
 const { expect } = require('chai');
 
 const resolveMeta = require('../../../../../lib/configuration/variables/resolve-meta');
+const resolve = require('../../../../../lib/configuration/variables/resolve');
 const resolveUnresolvedSourceTypes = require('../../../../../lib/configuration/variables/resolve-unresolved-source-types');
 
 describe('test/unit/lib/configuration/variables/resolve-unresolved-source-types.test.js', () => {
   const configuration = {
-    foo: {
-      params: '${sourceParam(param1, param2)}',
-      varParam: '${sourceParam(${sourceDirect:})}',
+    resolved: 'foo${recognized:}',
+    unrecognized: 'foo${unrecognized:}',
+    unrecognizedInParens: 'foo${recognized(${unrecognized:}, ${unrecognized2:})}',
+    unrecognizedInAddress: 'foo${recognized:${unrecognized:}}',
+    unrecognizedInParensAndAddress:
+      'foo${recognized(${unrecognized:}, ${unrecognized2:}):${unrecognized3:}}',
+    unrecognizedFallback: 'foo${recognized:, unrecognized:}',
+    otherUnrecognizedFallback: 'foo${unrecognized:, unrecognized4:}',
+    deep: {
+      resolved: 'foo${recognized:}',
+      unrecognized: 'foo${unrecognized:}',
+      unrecognizedInParens: 'foo${recognized(${unrecognized:}, ${unrecognized2:})}',
+      unrecognizedInAddress: 'foo${recognized:${unrecognized:}}',
+      unrecognizedInParensAndAddress:
+        'foo${recognized(${unrecognized:}, ${unrecognized2:}):${unrecognized3:}}',
+      unrecognizedFallback: 'foo${recognized:, unrecognized:}',
+      otherUnrecognizedFallback: 'foo${unrecognized:, unrecognized4:}',
     },
-    static: true,
-    address: 'foo${sourceAddress:address-result}',
-    varAddress: 'foo${sourceAddress:${sourceDirect:}}',
+  };
 
-    nonStringStringPart: 'elo${sourceMissing:, null}',
-    notExistingProperty: "${sourceProperty(not, existing), 'notExistingFallback'}",
-    nestUnrecognized: {
-      unrecognized:
-        '${sourceDirect:}|${sourceUnrecognized:}|${sourceDirect(${sourceUnrecognized:})}' +
-        '${sourceDirect:${sourceUnrecognized:}}',
+  const sources = {
+    recognized: {
+      resolve: () => ({ value: 234 }),
     },
   };
   let resultMap;
 
   before(async () => {
-    resultMap = resolveUnresolvedSourceTypes(resolveMeta(configuration));
+    const variablesMeta = resolveMeta(configuration);
+    await resolve({
+      serviceDir: process.cwd(),
+      configuration,
+      variablesMeta,
+      sources,
+      options: {},
+      fulfilledSources: new Set('recognized'),
+    });
+
+    resultMap = resolveUnresolvedSourceTypes(variablesMeta);
   });
 
   it('should resolve all not resolved sources', () => {
     expect(resultMap).to.deep.equal(
       new Map([
-        ['sourceParam', new Set(['foo\0params', 'foo\0varParam'])],
         [
-          'sourceDirect',
-          new Set(['foo\0varParam', 'varAddress', 'nestUnrecognized\0unrecognized']),
+          'unrecognized',
+          new Set([
+            'unrecognized',
+            'unrecognizedInParens',
+            'unrecognizedInAddress',
+            'unrecognizedInParensAndAddress',
+            'otherUnrecognizedFallback',
+            'deep\0unrecognized',
+            'deep\0unrecognizedInParens',
+            'deep\0unrecognizedInAddress',
+            'deep\0unrecognizedInParensAndAddress',
+            'deep\0otherUnrecognizedFallback',
+          ]),
+        ],
+        [
+          'unrecognized2',
+          new Set([
+            'unrecognizedInParens',
+            'unrecognizedInParensAndAddress',
+            'deep\0unrecognizedInParens',
+            'deep\0unrecognizedInParensAndAddress',
+          ]),
         ],
-        ['sourceAddress', new Set(['address', 'varAddress'])],
-        ['sourceMissing', new Set(['nonStringStringPart'])],
-        ['sourceProperty', new Set(['notExistingProperty'])],
-        ['sourceUnrecognized', new Set(['nestUnrecognized\0unrecognized'])],
       ])
     );
   });

From 9e3399e2bc4a2f8fd5c97bd4f5fd02b564ce1cb0 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 23 Apr 2021 10:26:42 +0200
Subject: [PATCH 0003/1101] chore: Bump dependencies

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 609cb1b3b46..2a251dc8559 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.890.0",
+    "aws-sdk": "^2.891.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",

From 1626761b31655b459b05759fca17c279c61b41a2 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 23 Apr 2021 10:30:33 +0200
Subject: [PATCH 0004/1101] chore: Release v2.38.0

---
 CHANGELOG.md | 11 +++++++++++
 package.json |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f02d391e7e..8dee4facf5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 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.
 
+## [2.38.0](https://github.com/serverless/serverless/compare/v2.37.2...v2.38.0) (2021-04-23)
+
+### Features
+
+- **AWS CloudFormation:** Add default export names to outputs ([#9313](https://github.com/serverless/serverless/issues/9313)) ([7e139bb](https://github.com/serverless/serverless/commit/7e139bb0136e0d053f4f6f8cb2876480bb2a485e)) ([Joseph Cha](https://github.com/js-cha))
+
+### Bug Fixes
+
+- **AWS API Gateway:** Create one request validator and reuse ([#9319](https://github.com/serverless/serverless/issues/9319)) ([154351f](https://github.com/serverless/serverless/commit/154351f1a5925a745873895014ed31f03b2842b3)) ([Jacques](https://github.com/gambit66))
+- **Variables:** Fix unresolved sources notifications ([#9356](https://github.com/serverless/serverless/issues/9356)) ([53a7872](https://github.com/serverless/serverless/commit/53a7872f78f51938b409925e052d34f2dc85abbd)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ### [2.37.2](https://github.com/serverless/serverless/compare/v2.37.1...v2.37.2) (2021-04-22)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 2a251dc8559..a1aed905698 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.37.2",
+  "version": "2.38.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 28c5af47f4ae4cf0957390712f72353bf7af3c68 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 22 Apr 2021 14:48:03 +0200
Subject: [PATCH 0005/1101] refactor: Add `code` to `ServerlessError` in
 `./Serverless.js`

---
 lib/Serverless.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index 0864eededb9..defd63c6dfc 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -37,20 +37,24 @@ class Serverless {
         ensureString(configObject.serviceDir, {
           name: 'config.serviceDir',
           Error: ServerlessError,
+          errorCode: 'INVALID_NON_STRING_SERVICE_DIR',
         })
       );
       this.configurationFilename = ensureString(configObject.configurationFilename, {
         name: 'config.configurationFilename',
         Error: ServerlessError,
+        errorCode: 'INVALID_NON_STRING_CONFIGURATION_FILENAME',
       });
       if (path.isAbsolute(this.configurationFilename)) {
         throw new ServerlessError(
-          `"config.configurationFilename" cannot be absolute path. Received: ${configObject.configurationFilename}`
+          `"config.configurationFilename" cannot be absolute path. Received: ${configObject.configurationFilename}`,
+          'INVALID_ABSOLUTE_PATH_CONFIGURATION_FILENAME'
         );
       }
       this.configurationInput = ensurePlainObject(configObject.configuration, {
         name: 'config.configuration',
         Error: ServerlessError,
+        errorCode: 'INVALID_NON_OBJECT_CONFIGURATION',
       });
       this.isConfigurationInputResolved = Boolean(configObject.isConfigurationResolved);
     } else if (configObject.configurationPath != null) {
@@ -59,6 +63,7 @@ class Serverless {
         ensureString(configObject.configurationPath, {
           name: 'config.configurationPath',
           Error: ServerlessError,
+          errorCode: 'INVALID_NON_STRING_CONFIGURATION_PATH',
         })
       );
       this.serviceDir = process.cwd();
@@ -67,6 +72,7 @@ class Serverless {
         isOptional: true,
         name: 'config.configuration',
         Error: ServerlessError,
+        errorCode: 'INVALID_NON_OBJECT_CONFIGURATION',
       });
       if (this.configurationInput) {
         this.isConfigurationInputResolved = Boolean(configObject.isConfigurationResolved);

From 395bdc8b23b0fd5a94fee3584df89f30232e6d74 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 22 Apr 2021 15:24:10 +0200
Subject: [PATCH 0006/1101] refactor: Add `code` to `ServerlessError` in
 `lib/configuration`

---
 lib/configuration/read.js                       |  2 +-
 lib/configuration/resolve-provider-name.js      |  1 +
 lib/configuration/variables/sources/env.js      |  1 +
 lib/configuration/variables/sources/file.js     |  2 ++
 .../sources/instance-dependent/get-cf.js        |  1 +
 .../sources/instance-dependent/get-s3.js        |  1 +
 .../sources/instance-dependent/get-sls.js       |  1 +
 .../sources/instance-dependent/get-ssm.js       |  1 +
 lib/configuration/variables/sources/opt.js      |  1 +
 .../variables/sources/str-to-bool.js            |  1 +
 .../configuration/resolve-provider-name.test.js | 17 +++++++++++------
 11 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/lib/configuration/read.js b/lib/configuration/read.js
index aaaaa632226..89fe28dc6be 100644
--- a/lib/configuration/read.js
+++ b/lib/configuration/read.js
@@ -37,7 +37,7 @@ const resolveTsNode = async (serviceDir) => {
         return require.resolve(`${String(stdoutBuffer).trim()}/ts-node`);
       } catch (globalDepError) {
         if (globalDepError.code !== 'MODULE_NOT_FOUND') throw globalDepError;
-        throw new ServerlessError('"ts-node" not found');
+        throw new ServerlessError('"ts-node" not found', 'TS_NODE_NOT_FOUND');
       }
     }
   }
diff --git a/lib/configuration/resolve-provider-name.js b/lib/configuration/resolve-provider-name.js
index d0ec19dd4c2..0a5d1022c73 100644
--- a/lib/configuration/resolve-provider-name.js
+++ b/lib/configuration/resolve-provider-name.js
@@ -12,6 +12,7 @@ module.exports = (configuration) => {
       {
         Error: ServerlessError,
         errorMessage: 'Invalid service configuration: "provider.name" property is missing',
+        errorCode: 'INVALID_CONFIGURATION_PROVIDER_NAME_MISSING',
       }
     );
   } catch (error) {
diff --git a/lib/configuration/variables/sources/env.js b/lib/configuration/variables/sources/env.js
index 9e535c4103d..9f1f15549ea 100644
--- a/lib/configuration/variables/sources/env.js
+++ b/lib/configuration/variables/sources/env.js
@@ -14,6 +14,7 @@ module.exports = {
     address = ensureString(address, {
       Error: ServerlessError,
       errorMessage: 'Non-string address argument in variable "env" source: %v',
+      errorCode: 'INVALID_ENV_SOURCE_ADDRESS_ARGUMENT',
     });
 
     return { value: process.env[address] || null, isPending: !isSourceFulfilled };
diff --git a/lib/configuration/variables/sources/file.js b/lib/configuration/variables/sources/file.js
index 9e2b217fe71..4e6b697a9ce 100644
--- a/lib/configuration/variables/sources/file.js
+++ b/lib/configuration/variables/sources/file.js
@@ -33,6 +33,7 @@ module.exports = {
       ensureString(params[0], {
         Error: ServerlessError,
         errorMessage: 'Non-string path argument in variable "file" source: %v',
+        errorCode: 'INVALID_FILE_SOURCE_PATH_ARGUMENT',
       })
     );
     if (!filePath.startsWith(`${serviceDir}${path.sep}`)) {
@@ -45,6 +46,7 @@ module.exports = {
       address = ensureString(address, {
         Error: ServerlessError,
         errorMessage: 'Non-string address argument for variable "file" source: %v',
+        errorCode: 'INVALID_FILE_SOURCE_ADDRESS_ARGUMENT',
       });
     }
 
diff --git a/lib/configuration/variables/sources/instance-dependent/get-cf.js b/lib/configuration/variables/sources/instance-dependent/get-cf.js
index 2507012b845..382518b4a8b 100644
--- a/lib/configuration/variables/sources/instance-dependent/get-cf.js
+++ b/lib/configuration/variables/sources/instance-dependent/get-cf.js
@@ -17,6 +17,7 @@ module.exports = (serverlessInstance) => {
       address = ensureString(address, {
         Error: ServerlessError,
         errorMessage: 'Non-string address argument in variable "cf" source: %v',
+        errorCode: 'INVALID_CF_SOURCE_ADDRESS_ARGUMENT',
       });
       const separatorIndex = address.indexOf('.');
       if (separatorIndex === -1) {
diff --git a/lib/configuration/variables/sources/instance-dependent/get-s3.js b/lib/configuration/variables/sources/instance-dependent/get-s3.js
index 8da1a033800..e48facee732 100644
--- a/lib/configuration/variables/sources/instance-dependent/get-s3.js
+++ b/lib/configuration/variables/sources/instance-dependent/get-s3.js
@@ -16,6 +16,7 @@ module.exports = (serverlessInstance) => {
       address = ensureString(address, {
         Error: ServerlessError,
         errorMessage: 'Non-string address argument in variable "s3" source: %v',
+        errorCode: 'INVALID_S3_SOURCE_ADDRESS_ARGUMENT',
       });
       const separatorIndex = address.indexOf('/');
       if (separatorIndex === -1) {
diff --git a/lib/configuration/variables/sources/instance-dependent/get-sls.js b/lib/configuration/variables/sources/instance-dependent/get-sls.js
index 127ad6f4d5e..74fdceaea26 100644
--- a/lib/configuration/variables/sources/instance-dependent/get-sls.js
+++ b/lib/configuration/variables/sources/instance-dependent/get-sls.js
@@ -15,6 +15,7 @@ module.exports = (serverlessInstance) => {
       address = ensureString(address, {
         Error: ServerlessError,
         errorMessage: 'Non-string address argument in variable "sls" source: %v',
+        errorCode: 'INVALID_SLS_SOURCE_ADDRESS_ARGUMENT',
       });
 
       switch (address) {
diff --git a/lib/configuration/variables/sources/instance-dependent/get-ssm.js b/lib/configuration/variables/sources/instance-dependent/get-ssm.js
index 36f7b424e3b..bf2623542d6 100644
--- a/lib/configuration/variables/sources/instance-dependent/get-ssm.js
+++ b/lib/configuration/variables/sources/instance-dependent/get-ssm.js
@@ -19,6 +19,7 @@ module.exports = (serverlessInstance) => {
       address = ensureString(address, {
         Error: ServerlessError,
         errorMessage: 'Non-string address argument in variable "ssm" source: %v',
+        errorCode: 'INVALID_SSM_SOURCE_ADDRESS_ARGUMENT',
       });
       const region = !params || !params[0] || params[0] === 'raw' ? undefined : params[0];
       const shouldReturnRawValue = params && (params[0] === 'raw' || params[1] === 'raw');
diff --git a/lib/configuration/variables/sources/opt.js b/lib/configuration/variables/sources/opt.js
index c6dd838f4d6..e543444f8e9 100644
--- a/lib/configuration/variables/sources/opt.js
+++ b/lib/configuration/variables/sources/opt.js
@@ -9,6 +9,7 @@ module.exports = {
       isOptional: true,
       Error: ServerlessError,
       errorMessage: 'Non-string address argument in variable "opt" source: %v',
+      errorCode: 'INVALID_OPT_SOURCE_ADDRESS_ARGUMENT',
     });
     if (!isSourceFulfilled) {
       if (address == null) return { value: null, isPending: true };
diff --git a/lib/configuration/variables/sources/str-to-bool.js b/lib/configuration/variables/sources/str-to-bool.js
index b9ab92b6c81..9935ad785fb 100644
--- a/lib/configuration/variables/sources/str-to-bool.js
+++ b/lib/configuration/variables/sources/str-to-bool.js
@@ -15,6 +15,7 @@ module.exports = {
     const stringValue = ensureString(params[0], {
       Error: ServerlessError,
       errorMessage: 'Non-string "strToBool" input:. Received: %v',
+      errorCode: 'INVALID_STR_TO_BOOL_SOURCE_VALUE',
     }).trim();
 
     if (trueStrings.has(stringValue)) return { value: true };
diff --git a/test/unit/lib/configuration/resolve-provider-name.test.js b/test/unit/lib/configuration/resolve-provider-name.test.js
index ee24c19e8a2..10288b07310 100644
--- a/test/unit/lib/configuration/resolve-provider-name.test.js
+++ b/test/unit/lib/configuration/resolve-provider-name.test.js
@@ -3,8 +3,9 @@
 const { expect } = require('chai');
 
 const resolveProviderName = require('../../../../lib/configuration/resolve-provider-name');
+const ServerlessError = require('../../../../lib/serverless-error');
 
-describe('test/unit/lib/configuration/resolve-provider.name.test.js', () => {
+describe('test/unit/lib/configuration/resolve-provider-name.test.js', () => {
   it('should read name from "provider"', () => {
     expect(resolveProviderName({ provider: 'foo' })).to.equal('foo');
   });
@@ -12,14 +13,18 @@ describe('test/unit/lib/configuration/resolve-provider.name.test.js', () => {
     expect(resolveProviderName({ provider: { name: 'foo' } })).to.equal('foo');
   });
   it('should reject missing "provider.name"', () => {
-    expect(() => resolveProviderName({ provider: {} })).to.throw('Invalid service configuration');
+    expect(() => resolveProviderName({ provider: {} }))
+      .to.throw(ServerlessError)
+      .with.property('code', 'INVALID_CONFIGURATION_PROVIDER_NAME_MISSING');
   });
   it('should reject invalid "provider.name"', () => {
-    expect(() => resolveProviderName({ provider: { name: {} } })).to.throw(
-      'Invalid service configuration'
-    );
+    expect(() => resolveProviderName({ provider: { name: {} } }))
+      .to.throw(ServerlessError)
+      .with.property('code', 'INVALID_CONFIGURATION_PROVIDER_NAME_MISSING');
   });
   it('should reject missing "provider"', () => {
-    expect(() => resolveProviderName({})).to.throw('Invalid service configuration');
+    expect(() => resolveProviderName({}))
+      .to.throw(ServerlessError)
+      .with.property('code', 'INVALID_CONFIGURATION_PROVIDER_NAME_MISSING');
   });
 });

From 82040b427e4c292bf9287a668fa46856ba5204e2 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 22 Apr 2021 15:39:37 +0200
Subject: [PATCH 0007/1101] refactor: Add `code` to `ServerlessError` in
 `lib/classes`

---
 lib/classes/ConfigSchemaHandler/index.js |  2 +-
 lib/classes/PluginManager.js             | 32 ++++++++++++++++--------
 lib/classes/Service.js                   | 15 ++++++++---
 lib/classes/Variables.js                 | 23 +++++++++++------
 4 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/lib/classes/ConfigSchemaHandler/index.js b/lib/classes/ConfigSchemaHandler/index.js
index 7faa3da1ec6..abf7ba36931 100644
--- a/lib/classes/ConfigSchemaHandler/index.js
+++ b/lib/classes/ConfigSchemaHandler/index.js
@@ -122,7 +122,7 @@ class ConfigSchemaHandler {
             ? `${ERROR_PREFIX}: \n     ${messages.join('\n     ')}`
             : `${ERROR_PREFIX} ${messages[0]}`;
 
-        throw new ServerlessError(errorMessage);
+        throw new ServerlessError(errorMessage, 'SCHEMA_VALIDATION');
       } else {
         if (messages.length === 1) {
           this.serverless.cli.log(`${WARNING_PREFIX} ${messages[0]}`, 'Serverless', {
diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 2197891aac5..efdf0ee5dc9 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -188,12 +188,14 @@ class PluginManager {
               `Serverless plugin "${name}" not found.`,
               ' Make sure it\'s installed and listed in the "plugins" section',
               ' of your serverless config file.',
-            ].join('')
+            ].join(''),
+            'PLUGIN_NOT_FOUND'
           );
         }
         if (!Plugin) {
           throw new ServerlessError(
-            `Serverless plugin "${name}", didn't export Plugin constructor.`
+            `Serverless plugin "${name}", didn't export Plugin constructor.`,
+            'MISSING_PLUGIN_NAME'
           );
         }
         return Plugin;
@@ -231,7 +233,10 @@ class PluginManager {
   createCommandAlias(alias, command) {
     // Deny self overrides
     if (command.startsWith(alias)) {
-      throw new ServerlessError(`Command "${alias}" cannot be overriden by an alias`);
+      throw new ServerlessError(
+        `Command "${alias}" cannot be overriden by an alias`,
+        'INVALID_COMMAND_ALIAS'
+      );
     }
 
     const splitAlias = alias.split(':');
@@ -245,7 +250,8 @@ class PluginManager {
     // Check if the alias is already defined
     if (aliasTarget.command) {
       throw new ServerlessError(
-        `Alias "${alias}" is already defined for command ${aliasTarget.command}`
+        `Alias "${alias}" is already defined for command ${aliasTarget.command}`,
+        'COMMAND_ALIAS_ALREADY_DEFINED'
       );
     }
     // Check if the alias would overwrite an exiting command
@@ -257,7 +263,10 @@ class PluginManager {
         return __.commands[aliasPath];
       }, this)
     ) {
-      throw new ServerlessError(`Command "${alias}" cannot be overriden by an alias`);
+      throw new ServerlessError(
+        `Command "${alias}" cannot be overriden by an alias`,
+        'INVALID_COMMAND_ALIAS'
+      );
     }
     aliasTarget.command = command;
   }
@@ -270,7 +279,10 @@ class PluginManager {
     // Check if there is already an alias for the same path as the command
     const aliasCommand = this.getAliasCommandTarget(key.split(':'));
     if (aliasCommand) {
-      throw new ServerlessError(`Command "${key}" cannot override an existing alias`);
+      throw new ServerlessError(
+        `Command "${key}" cannot override an existing alias`,
+        'INVALID_COMMAND_OVERRIDE_EXISTING_ALIAS'
+      );
     }
     // Load the command
     const commands = _.mapValues(details.commands, (subDetails, subKey) =>
@@ -488,7 +500,7 @@ class PluginManager {
             }
           }
           errorMessage.push('" to see a more helpful error message for this command.');
-          throw new ServerlessError(errorMessage.join(''));
+          throw new ServerlessError(errorMessage.join(''), 'SUBCOMMAND_NOT_FOUND');
         }
 
         // top level command isn't valid. give a suggestion
@@ -502,7 +514,7 @@ class PluginManager {
           `Serverless command "${commandName}" not found. Did you mean "${suggestedCommand}"?`,
           ' Run "serverless help" for a list of all available commands.',
         ].join('');
-        throw new ServerlessError(errorMessage);
+        throw new ServerlessError(errorMessage, 'COMMAND_NOT_FOUND');
       },
       { commands: this.commands }
     );
@@ -622,7 +634,7 @@ class PluginManager {
           'This command can only be run in a Serverless service directory. ',
           "Make sure to reference a valid config file in the current working directory if you're using a custom config file",
         ].join('');
-        throw new ServerlessError(msg);
+        throw new ServerlessError(msg, 'INVALID_COMMAND_MISSING_SERVICE_DIRECTORY');
       }
     }
   }
@@ -652,7 +664,7 @@ class PluginManager {
           typeof value.customValidation.errorMessage === 'string' &&
           !value.customValidation.regularExpression.test(this.cliOptions[key])
         ) {
-          throw new ServerlessError(value.customValidation.errorMessage);
+          throw new ServerlessError(value.customValidation.errorMessage, 'INVALID_CLI_OPTION');
         }
       });
     }
diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index 51c23ee9793..bb7fddfc340 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -256,14 +256,20 @@ class Service {
     if (functionName in this.functions) {
       return this.functions[functionName];
     }
-    throw new ServerlessError(`Function "${functionName}" doesn't exist in this Service`);
+    throw new ServerlessError(
+      `Function "${functionName}" doesn't exist in this Service`,
+      'FUNCTION_MISSING_IN_SERVICE'
+    );
   }
 
   getLayer(layerName) {
     if (layerName in this.layers) {
       return this.layers[layerName];
     }
-    throw new ServerlessError(`Layer "${layerName}" doesn't exist in this Service`);
+    throw new ServerlessError(
+      `Layer "${layerName}" doesn't exist in this Service`,
+      'LAYER_MISSING_IN_SERVICE'
+    );
   }
 
   getEventInFunction(eventName, functionName) {
@@ -273,7 +279,10 @@ class Service {
     if (event) {
       return event;
     }
-    throw new ServerlessError(`Event "${eventName}" doesn't exist in function "${functionName}"`);
+    throw new ServerlessError(
+      `Event "${eventName}" doesn't exist in function "${functionName}"`,
+      'EVENT_MISSING_FOR_FUNCTION'
+    );
   }
 
   getAllEventsInFunction(functionName) {
diff --git a/lib/classes/Variables.js b/lib/classes/Variables.js
index 6e276ad8175..9e353dcb1d5 100644
--- a/lib/classes/Variables.js
+++ b/lib/classes/Variables.js
@@ -451,7 +451,7 @@ class Variables {
         ` a string for variable ${matchedString}.`,
         ' Please make sure the value of the property is a string.',
       ].join('');
-      throw new ServerlessError(errorMessage);
+      throw new ServerlessError(errorMessage, 'INVALID_NON_STRING_PROPERTY');
     }
     return property;
   }
@@ -565,7 +565,9 @@ class Variables {
           ' You can only reference env vars, options, & files.',
           ' You can check our docs for more info.',
         ].join('');
-        ret = BbPromise.reject(new ServerlessError(errorMessage));
+        ret = BbPromise.reject(
+          new ServerlessError(errorMessage, 'INVALID_VARIABLE_REFERENCE_SYNTAX')
+        );
       }
       ret = this.tracker.add(variableString, ret, propertyString);
     }
@@ -708,7 +710,9 @@ class Variables {
                 ` file "${referencedFileRelativePath}".`,
                 ' Check if your javascript is returning the correct data.',
               ].join('');
-              return BbPromise.reject(new ServerlessError(errorMessage));
+              return BbPromise.reject(
+                new ServerlessError(errorMessage, 'INVALID_FILE_VARIABLE_SYNTAX')
+              );
             }
             return BbPromise.resolve(deepValueToPopulateResolved);
           }
@@ -727,7 +731,9 @@ class Variables {
             ` file "${referencedFileRelativePath}" sub properties`,
             ' Please use ":" to reference sub properties.',
           ].join('');
-          return BbPromise.reject(new ServerlessError(errorMessage));
+          return BbPromise.reject(
+            new ServerlessError(errorMessage, 'INVALID_FILE_VARIABLE_SYNTAX')
+          );
         }
         deepProperties = deepProperties.slice(1).split('.');
         return this.getDeeperValue(deepProperties, valueToPopulate);
@@ -767,7 +773,7 @@ class Variables {
             ` Stack name: "${stackName}"`,
             ` Requested variable: "${outputLogicalId}".`,
           ].join('');
-          return BbPromise.reject(new ServerlessError(errorMessage));
+          return BbPromise.reject(new ServerlessError(errorMessage, 'INVALID_CF_VARIABLE'));
         }
         return BbPromise.resolve(output.OutputValue);
       });
@@ -791,7 +797,7 @@ class Variables {
       .then((response) => BbPromise.resolve(response.Body.toString()))
       .catch((err) => {
         const errorMessage = `Error getting value for ${variableString}. ${err.message}`;
-        return BbPromise.reject(new ServerlessError(errorMessage));
+        return BbPromise.reject(new ServerlessError(errorMessage, 'INVALID_S3_VARIABLE'));
       });
   }
 
@@ -836,7 +842,7 @@ class Variables {
         },
         (err) => {
           if (!err.providerError || err.providerError.statusCode !== 400) {
-            throw new ServerlessError(err.message);
+            throw new ServerlessError(err.message, 'INVALID_SSM_VARIABLE');
           }
         }
       );
@@ -855,7 +861,8 @@ class Variables {
           return true;
         }
         throw new ServerlessError(
-          'Unexpected strToBool input; expected either "true", "false", "0", or "1".'
+          'Unexpected strToBool input; expected either "true", "false", "0", or "1".',
+          'INVALID_STR_TO_BOOL_SOURCE_VALUE'
         );
       }
       // Cast non-string inputs

From 8748a783ae4e0ca25507c45e1a5619fc7c1520c8 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 22 Apr 2021 16:02:00 +0200
Subject: [PATCH 0008/1101] refactor: Add `code` to `ServerlessError` in
 `lib/aws`

---
 lib/aws/request.js                | 2 +-
 test/unit/lib/aws/request.test.js | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/aws/request.js b/lib/aws/request.js
index 211e7ed5d83..b45d1fb7f66 100644
--- a/lib/aws/request.js
+++ b/lib/aws/request.js
@@ -194,7 +194,7 @@ async function awsRequest(service, method, ...args) {
             : bottomError.message;
           message = errorMessage;
           // We do not want to trigger the retry mechanism for credential errors
-          throw Object.assign(new ServerlessError(errorMessage), {
+          throw Object.assign(new ServerlessError(errorMessage, 'AWS_CREDENTIALS_NOT_FOUND'), {
             providerError: Object.assign({}, err, { retryable: false }),
           });
         }
diff --git a/test/unit/lib/aws/request.test.js b/test/unit/lib/aws/request.test.js
index 737904163d2..641f94c03b4 100644
--- a/test/unit/lib/aws/request.test.js
+++ b/test/unit/lib/aws/request.test.js
@@ -53,9 +53,7 @@ describe('#request', () => {
             Key: 'test-key',
           }
         )
-      ).to.be.rejectedWith(
-        'AWS provider credentials not found. Learn how to set up AWS provider credentials in our docs here: <\u001b[32mhttp://slss.io/aws-creds-setup\u001b[39m>.'
-      );
+      ).to.be.eventually.rejected.and.have.property('code', 'AWS_CREDENTIALS_NOT_FOUND');
     });
 
     it('should support passing params without credentials', async () => {

From 822a7cf9f527514b53fd8cfc5c172ec5dc53f4ce Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 22 Apr 2021 16:19:35 +0200
Subject: [PATCH 0009/1101] refactor: Add `code` to `ServerlessError` in
 `lib/utils`

---
 lib/utils/downloadTemplateFromRepo.js         | 10 +++----
 lib/utils/renameService.js                    |  2 +-
 .../utils/downloadTemplateFromRepo.test.js    | 28 +++++++++++++------
 test/unit/lib/utils/renameService.test.js     |  4 ++-
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/lib/utils/downloadTemplateFromRepo.js b/lib/utils/downloadTemplateFromRepo.js
index e82fb55eb74..63816ad8d1c 100644
--- a/lib/utils/downloadTemplateFromRepo.js
+++ b/lib/utils/downloadTemplateFromRepo.js
@@ -40,7 +40,7 @@ function validateUrl({ url, hostname, service, owner, repo }) {
   // validate if given url is a valid url
   if (url.hostname !== hostname || !owner || !repo) {
     const errorMessage = `The URL must be a valid ${service} URL in the following format: https://${hostname}/serverless/serverless`;
-    throw new ServerlessError(errorMessage);
+    throw new ServerlessError(errorMessage, 'INVALID_TEMPLATE_URL');
   }
 }
 
@@ -211,14 +211,14 @@ function parsePlainGitURL(url) {
 function parseRepoURL(inputUrl) {
   return new BbPromise((resolve, reject) => {
     if (!inputUrl) {
-      return reject(new ServerlessError('URL is required'));
+      return reject(new ServerlessError('URL is required', 'MISSING_TEMPLATE_URL'));
     }
 
     const url = URL.parse(inputUrl.replace(/\/$/, ''));
 
     // check if url parameter is a valid url
     if (!url.host && !url.href.startsWith('git@')) {
-      return reject(new ServerlessError('The URL you passed is not valid'));
+      return reject(new ServerlessError('The URL you passed is not valid', 'INVALID_TEMPLATE_URL'));
     }
 
     if (isPlainGitURL(url.href)) {
@@ -233,7 +233,7 @@ function parseRepoURL(inputUrl) {
 
     const msg =
       'The URL you passed is not one of the valid providers: "GitHub", "GitHub Entreprise", "Bitbucket", "Bitbucket Server" or "GitLab".';
-    const err = new ServerlessError(msg);
+    const err = new ServerlessError(msg, 'INVALID_TEMPLATE_PROVIDER');
     // test if it's a private bitbucket server
     return retrieveBitbucketServerInfo(url)
       .then((isBitbucket) => {
@@ -277,7 +277,7 @@ function downloadTemplateFromRepo(inputUrl, templateName, downloadPath) {
 
     if (dirExistsSync(path.join(process.cwd(), dirName))) {
       const errorMessage = `A folder named "${dirName}" already exists.`;
-      throw new ServerlessError(errorMessage);
+      throw new ServerlessError(errorMessage, 'TARGET_FOLDER_ALREADY_EXISTS');
     }
 
     log(`Downloading and installing "${serviceName}"...`);
diff --git a/lib/utils/renameService.js b/lib/utils/renameService.js
index 0a97f3074b5..a48ed24dce4 100644
--- a/lib/utils/renameService.js
+++ b/lib/utils/renameService.js
@@ -57,7 +57,7 @@ function renameService(name, serviceDir) {
   }
 
   const errorMessage = ['serverless.yml or serverlss.ts not found in', ` ${serviceDir}`].join('');
-  throw new ServerlessError(errorMessage);
+  throw new ServerlessError(errorMessage, 'MISSING_SERVICE_FILE');
 }
 
 module.exports.renameService = renameService;
diff --git a/test/unit/lib/utils/downloadTemplateFromRepo.test.js b/test/unit/lib/utils/downloadTemplateFromRepo.test.js
index fd67ee46765..80bd4b88733 100644
--- a/test/unit/lib/utils/downloadTemplateFromRepo.test.js
+++ b/test/unit/lib/utils/downloadTemplateFromRepo.test.js
@@ -73,13 +73,15 @@ describe('downloadTemplateFromRepo', () => {
 
   describe('downloadTemplateFromRepo', () => {
     it('should reject an error if the passed URL option is not a valid URL', () => {
-      return expect(downloadTemplateFromRepo('invalidUrl')).to.be.rejectedWith(Error);
+      return expect(
+        downloadTemplateFromRepo('invalidUrl')
+      ).to.be.eventually.rejected.and.have.property('code', 'INVALID_TEMPLATE_URL');
     });
 
     it('should reject an error if the passed URL is not a valid GitHub URL', () => {
       return expect(
         downloadTemplateFromRepo('http://no-git-hub-url.com/foo/bar')
-      ).to.be.rejectedWith(Error);
+      ).to.be.eventually.rejected.and.have.property('code', 'INVALID_TEMPLATE_PROVIDER');
     });
 
     it('should reject an error if a directory with the same service name is already present', () => {
@@ -88,7 +90,7 @@ describe('downloadTemplateFromRepo', () => {
 
       return expect(
         downloadTemplateFromRepo('https://github.com/johndoe/existing-service')
-      ).to.be.rejectedWith(Error);
+      ).to.be.eventually.rejected.and.have.property('code', 'TARGET_FOLDER_ALREADY_EXISTS');
     });
 
     it('should download the service based on a regular .git URL', () => {
@@ -223,23 +225,31 @@ describe('downloadTemplateFromRepo', () => {
       const serviceDirName = path.join(serviceDir, 'rest-api-with-dynamodb');
       fse.mkdirsSync(serviceDirName);
 
-      return expect(downloadTemplateFromRepo(null, url)).to.be.rejectedWith(Error);
+      return expect(
+        downloadTemplateFromRepo(null, url)
+      ).to.be.eventually.rejected.and.have.property('code', 'MISSING_TEMPLATE_URL');
     });
   });
 
   describe('parseRepoURL', () => {
     it('should reject an error if no URL is provided', () => {
-      return expect(parseRepoURL()).to.be.rejectedWith(Error);
+      return expect(parseRepoURL()).to.be.eventually.rejected.and.have.property(
+        'code',
+        'MISSING_TEMPLATE_URL'
+      );
     });
 
     it('should reject an error if URL is not valid', () => {
-      return expect(parseRepoURL('non_valid_url')).to.be.rejectedWith(Error);
+      return expect(parseRepoURL('non_valid_url')).to.be.eventually.rejected.and.have.property(
+        'code',
+        'INVALID_TEMPLATE_URL'
+      );
     });
 
     it('should throw an error if URL is not of valid provider', () => {
-      return expect(parseRepoURL('https://kostasbariotis.com/repo/owner')).to.be.rejectedWith(
-        Error
-      );
+      return expect(
+        parseRepoURL('https://kostasbariotis.com/repo/owner')
+      ).to.be.eventually.rejected.and.have.property('code', 'INVALID_TEMPLATE_PROVIDER');
     });
 
     it('should parse a valid GitHub URL', () => {
diff --git a/test/unit/lib/utils/renameService.test.js b/test/unit/lib/utils/renameService.test.js
index 45cda8431da..b5c758539fe 100644
--- a/test/unit/lib/utils/renameService.test.js
+++ b/test/unit/lib/utils/renameService.test.js
@@ -201,6 +201,8 @@ describe('renameService', () => {
   });
 
   it('should fail to set new service name in serverless.yml', () => {
-    expect(() => renameService('new-service-name', serviceDir)).to.throw(Error);
+    expect(() => renameService('new-service-name', serviceDir))
+      .to.throw()
+      .and.have.property('code', 'MISSING_SERVICE_FILE');
   });
 });

From fbf0ed30e933755ae86c3d31050cdb0d3b952b82 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 23 Apr 2021 09:59:57 +0200
Subject: [PATCH 0010/1101] refactor: Add `code` to `ServerlessError` in
 `lib/plugins/aws`

---
 lib/plugins/aws/configCredentials.js            | 10 ++++++++--
 lib/plugins/aws/customResources/index.js        |  5 ++++-
 lib/plugins/aws/deploy/lib/checkForChanges.js   |  3 ++-
 .../aws/deploy/lib/existsDeploymentBucket.js    |  8 ++++++--
 lib/plugins/aws/deploy/lib/extendedValidate.js  |  6 ++++--
 lib/plugins/aws/deployFunction.js               | 12 ++++++++----
 lib/plugins/aws/info/getStackInfo.js            |  3 ++-
 lib/plugins/aws/invokeLocal/index.js            | 11 ++++++++---
 lib/plugins/aws/lib/monitorStack.js             |  4 ++--
 lib/plugins/aws/lib/validate.js                 |  5 ++++-
 lib/plugins/aws/logs.js                         |  2 +-
 .../package/compile/events/alb/lib/validate.js  | 12 ++++++++----
 .../events/apiGateway/lib/hack/updateStage.js   |  2 +-
 .../compile/events/apiGateway/lib/restApi.js    |  5 ++++-
 .../events/apiGateway/lib/usagePlanKeys.js      |  5 ++++-
 .../compile/events/apiGateway/lib/validate.js   | 17 +++++++++++------
 .../aws/package/compile/events/cloudFront.js    | 17 ++++++++++++-----
 .../package/compile/events/cloudWatchEvent.js   |  3 ++-
 .../aws/package/compile/events/cloudWatchLog.js |  2 +-
 .../package/compile/events/cognitoUserPool.js   |  2 +-
 .../package/compile/events/eventBridge/index.js |  3 ++-
 .../aws/package/compile/events/s3/index.js      |  4 ++--
 lib/plugins/aws/package/compile/events/sns.js   |  3 ++-
 .../compile/events/websockets/lib/stage.js      |  3 ++-
 .../compile/events/websockets/lib/validate.js   |  3 ++-
 lib/plugins/aws/package/compile/functions.js    | 11 ++++++++---
 .../aws/package/lib/generateCoreTemplate.js     |  2 +-
 lib/plugins/aws/utils/resolveCfImportValue.js   |  3 ++-
 lib/plugins/aws/utils/resolveCfRefValue.js      |  3 ++-
 .../unit/lib/plugins/aws/deployFunction.test.js |  2 +-
 30 files changed, 117 insertions(+), 54 deletions(-)

diff --git a/lib/plugins/aws/configCredentials.js b/lib/plugins/aws/configCredentials.js
index 8996e291473..45489c3dbf1 100644
--- a/lib/plugins/aws/configCredentials.js
+++ b/lib/plugins/aws/configCredentials.js
@@ -24,7 +24,10 @@ class AwsConfigCredentials {
     };
 
     if (!os.homedir()) {
-      throw new ServerlessError("Can't find home directory on your local file system.");
+      throw new ServerlessError(
+        "Can't find home directory on your local file system.",
+        'MISSING_HOME_DIRECTORY'
+      );
     }
 
     this.hooks = {
@@ -42,7 +45,10 @@ class AwsConfigCredentials {
 
     // validate
     if (!this.options.key || !this.options.secret) {
-      throw new ServerlessError('Please include --key and --secret options for AWS.');
+      throw new ServerlessError(
+        'Please include --key and --secret options for AWS.',
+        'MISSING_KEY_AND_SECRET_CLI_OPTIONS'
+      );
     }
 
     this.serverless.cli.log('Setting up AWS...');
diff --git a/lib/plugins/aws/customResources/index.js b/lib/plugins/aws/customResources/index.js
index b95f57811b3..ebdf1f1302c 100644
--- a/lib/plugins/aws/customResources/index.js
+++ b/lib/plugins/aws/customResources/index.js
@@ -50,7 +50,10 @@ async function addCustomResourceToService(awsProvider, resourceName, iamRoleStat
     Handler = 'apiGatewayCloudWatchRole/handler.handler';
     customResourceFunctionLogicalId = awsProvider.naming.getCustomResourceApiGatewayAccountCloudWatchRoleHandlerFunctionLogicalId();
   } else {
-    throw new ServerlessError(`No implementation found for Custom Resource "${resourceName}"`);
+    throw new ServerlessError(
+      `No implementation found for Custom Resource "${resourceName}"`,
+      'MISSING_CUSTOM_RESOURCE_IMPLEMENTATION'
+    );
   }
   absoluteFunctionName = `${funcPrefix}-${functionName}`;
   if (absoluteFunctionName.length > 64) {
diff --git a/lib/plugins/aws/deploy/lib/checkForChanges.js b/lib/plugins/aws/deploy/lib/checkForChanges.js
index 4fd4ad11cc8..3e651ca9556 100644
--- a/lib/plugins/aws/deploy/lib/checkForChanges.js
+++ b/lib/plugins/aws/deploy/lib/checkForChanges.js
@@ -59,7 +59,8 @@ module.exports = {
               `The serverless deployment bucket "${params.Bucket}" does not exist.`,
               `Create it manually if you want to reuse the CloudFormation stack "${stackName}",`,
               'or delete the stack if it is no longer required.',
-            ].join(' ')
+            ].join(' '),
+            'DEPLOYMENT_BUCKET_DOES_NOT_EXIST'
           )
         );
       })
diff --git a/lib/plugins/aws/deploy/lib/existsDeploymentBucket.js b/lib/plugins/aws/deploy/lib/existsDeploymentBucket.js
index af3cd33bbe6..dbc71104c81 100644
--- a/lib/plugins/aws/deploy/lib/existsDeploymentBucket.js
+++ b/lib/plugins/aws/deploy/lib/existsDeploymentBucket.js
@@ -17,13 +17,17 @@ module.exports = {
         if (result.LocationConstraint === 'EU') result.LocationConstraint = 'eu-west-1';
         if (result.LocationConstraint !== this.provider.getRegion()) {
           throw new ServerlessError(
-            'Deployment bucket is not in the same region as the lambda function'
+            'Deployment bucket is not in the same region as the lambda function',
+            'DEPLOYMENT_BUCKET_INVALID_REGION'
           );
         }
         return BbPromise.resolve();
       })
       .catch((err) => {
-        throw new ServerlessError(`Could not locate deployment bucket. Error: ${err.message}`);
+        throw new ServerlessError(
+          `Could not locate deployment bucket. Error: ${err.message}`,
+          'DEPLOYMENT_BUCKET_NOT_FOUND'
+        );
       });
   },
 };
diff --git a/lib/plugins/aws/deploy/lib/extendedValidate.js b/lib/plugins/aws/deploy/lib/extendedValidate.js
index d4b2ffc8661..928e0585127 100644
--- a/lib/plugins/aws/deploy/lib/extendedValidate.js
+++ b/lib/plugins/aws/deploy/lib/extendedValidate.js
@@ -16,7 +16,8 @@ module.exports = {
     );
     if (!this.serverless.utils.fileExistsSync(serviceStateFilePath)) {
       throw new ServerlessError(
-        `No ${serviceStateFileName} file found in the package path you provided.`
+        `No ${serviceStateFileName} file found in the package path you provided.`,
+        'MISSING_SERVICE_STATE_FILE'
       );
     }
     const state = this.serverless.utils.readFileSync(serviceStateFilePath);
@@ -86,7 +87,8 @@ module.exports = {
 
         if (!this.serverless.utils.fileExistsSync(artifactFilePath)) {
           throw new ServerlessError(
-            `No ${artifactFileName} file found in the package path you provided.`
+            `No ${artifactFileName} file found in the package path you provided.`,
+            'MISSING_ARTIFACT_FILE'
           );
         }
       });
diff --git a/lib/plugins/aws/deployFunction.js b/lib/plugins/aws/deployFunction.js
index 2a204d29f68..4757c332c43 100644
--- a/lib/plugins/aws/deployFunction.js
+++ b/lib/plugins/aws/deployFunction.js
@@ -78,7 +78,7 @@ class AwsDeployFunction {
             ' After that you can redeploy your services functions with the',
             ' "serverless deploy function" command.',
           ].join('');
-          throw new ServerlessError(errorMessage);
+          throw new ServerlessError(errorMessage, 'FUNCTION_NOT_YET_DEPLOYED');
         }
         throw error;
       }
@@ -120,7 +120,10 @@ class AwsDeployFunction {
       }
       const roleProperties = roleResource.Properties;
       if (!roleProperties.RoleName) {
-        throw new ServerlessError('Role resource missing RoleName property');
+        throw new ServerlessError(
+          'Role resource missing RoleName property',
+          'MISSING_ROLENAME_FOR_ROLE'
+        );
       }
       const compiledFullRoleName = `${roleProperties.Path || '/'}${roleProperties.RoleName}`;
 
@@ -146,7 +149,8 @@ class AwsDeployFunction {
         if (err.providerError && err.providerError.code === 'ResourceConflictException') {
           if (didOneMinutePass) {
             throw new ServerlessError(
-              'Retry timed out. Please try to deploy your function once again.'
+              'Retry timed out. Please try to deploy your function once again.',
+              'DEPLOY_FUNCTION_CONFIGURATION_UPDATE_TIMED_OUT'
             );
           }
           this.serverless.cli.log(
@@ -258,7 +262,7 @@ class AwsDeployFunction {
           // taken from the bash man pages
           if (!key.match(/^[A-Za-z_][a-zA-Z0-9_]*$/)) {
             const errorMessage = 'Invalid characters in environment variable';
-            throw new ServerlessError(errorMessage);
+            throw new ServerlessError(errorMessage, 'DEPLOY_FUNCTION_INVALID_ENV_VARIABLE');
           }
 
           if (params.Environment.Variables[key] != null) {
diff --git a/lib/plugins/aws/info/getStackInfo.js b/lib/plugins/aws/info/getStackInfo.js
index 73706e45700..bd208a55661 100644
--- a/lib/plugins/aws/info/getStackInfo.js
+++ b/lib/plugins/aws/info/getStackInfo.js
@@ -47,7 +47,8 @@ module.exports = {
             },
             (error) => {
               throw new ServerlessError(
-                `Could not resolve provider.httpApi.id parameter. ${error.message}`
+                `Could not resolve provider.httpApi.id parameter. ${error.message}`,
+                'UNABLE_TO_RESOLVE_HTTP_API_ID'
               );
             }
           )
diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invokeLocal/index.js
index 84aabe565c6..11f38f1e454 100644
--- a/lib/plugins/aws/invokeLocal/index.js
+++ b/lib/plugins/aws/invokeLocal/index.js
@@ -67,7 +67,10 @@ class AwsInvokeLocal {
     const exists = await fileExists(absolutePath);
 
     if (!exists) {
-      throw new ServerlessError(`The file you provided does not exist: ${absolutePath}`);
+      throw new ServerlessError(
+        `The file you provided does not exist: ${absolutePath}`,
+        'INVOKE_LOCAL_MISSING_FILE'
+      );
     }
     if (absolutePath.endsWith('.js')) {
       // to support js - export as an input data
@@ -86,7 +89,8 @@ class AwsInvokeLocal {
 
     if (this.options.functionObj.image) {
       throw new ServerlessError(
-        'Local invocation of lambdas pointing AWS ECR images is not supported'
+        'Local invocation of lambdas pointing AWS ECR images is not supported',
+        'INVOKE_LOCAL_IMAGE_BACKED_FUNCTIONS_NOT_SUPPORTED'
       );
     }
     if (this.options.contextPath) {
@@ -198,7 +202,8 @@ class AwsInvokeLocal {
           }
         } catch (error) {
           throw new ServerlessError(
-            `Could not resolve "${name}" environment variable: ${error.message}`
+            `Could not resolve "${name}" environment variable: ${error.message}`,
+            'INVOKE_LOCAL_INVALID_ENV_VARIABLE'
           );
         }
       })
diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js
index 7794d393063..d044471ae27 100644
--- a/lib/plugins/aws/lib/monitorStack.js
+++ b/lib/plugins/aws/lib/monitorStack.js
@@ -91,7 +91,7 @@ module.exports = {
                 let errorMessage = 'An error occurred: ';
                 errorMessage += `${stackLatestError.LogicalResourceId} - `;
                 errorMessage += `${stackLatestError.ResourceStatusReason}.`;
-                throw new ServerlessError(errorMessage);
+                throw new ServerlessError(errorMessage, 'STACK_MONITORING_FAILURE');
               }
             },
             (e) => {
@@ -102,7 +102,7 @@ module.exports = {
                 stackStatus = 'DELETE_COMPLETE';
                 return;
               }
-              throw new ServerlessError(e.message);
+              throw new ServerlessError(e.message, 'STACK_MONITORING_FAILURE');
             }
           )
       )
diff --git a/lib/plugins/aws/lib/validate.js b/lib/plugins/aws/lib/validate.js
index 53f0b8d1c39..68dca8f3d19 100644
--- a/lib/plugins/aws/lib/validate.js
+++ b/lib/plugins/aws/lib/validate.js
@@ -5,7 +5,10 @@ const ServerlessError = require('../../../serverless-error');
 module.exports = {
   validate() {
     if (!this.serverless.serviceDir) {
-      throw new ServerlessError('This command can only be run inside a service directory');
+      throw new ServerlessError(
+        'This command can only be run inside a service directory',
+        'MISSING_SERVICE_DIRECTORY'
+      );
     }
 
     this.options.stage = this.provider.getStage();
diff --git a/lib/plugins/aws/logs.js b/lib/plugins/aws/logs.js
index 6820d264be1..2dfbea9a5a9 100644
--- a/lib/plugins/aws/logs.js
+++ b/lib/plugins/aws/logs.js
@@ -47,7 +47,7 @@ class AwsLogs {
 
     const reply = await this.provider.request('CloudWatchLogs', 'describeLogStreams', params);
     if (!reply || reply.logStreams.length === 0) {
-      throw new ServerlessError('No existing streams for the function');
+      throw new ServerlessError('No existing streams for the function', 'NO_EXISTING_LOG_STREAMS');
     }
 
     return reply.logStreams.map((logStream) => logStream.logStreamName);
diff --git a/lib/plugins/aws/package/compile/events/alb/lib/validate.js b/lib/plugins/aws/package/compile/events/alb/lib/validate.js
index de4aec4de63..81d01b21067 100644
--- a/lib/plugins/aws/package/compile/events/alb/lib/validate.js
+++ b/lib/plugins/aws/package/compile/events/alb/lib/validate.js
@@ -115,7 +115,10 @@ module.exports = {
     }
     const matches = listenerArn.match(this.ALB_LISTENER_REGEXP);
     if (!matches) {
-      throw new ServerlessError(`Invalid ALB listenerArn in function "${functionName}".`);
+      throw new ServerlessError(
+        `Invalid ALB listenerArn in function "${functionName}".`,
+        'ALB_INVALID_LISTENER_ARN'
+      );
     }
     return { albId: matches[1], listenerId: matches[2] };
   },
@@ -138,7 +141,7 @@ module.exports = {
         '  Events in the same function cannot use the same priority even if they have a different listenerArn.\n',
         '  This is a Serverless limitation that will be fixed in the next major release.',
       ].join('');
-      throw new ServerlessError(errorMessage);
+      throw new ServerlessError(errorMessage, 'ALB_PRIORITY_ALREADY_IN_USE');
     }
 
     comparator = (e1, e2) => samePriority(e1, e2) && sameListener(e1, e2) && !sameFunction(e1, e2);
@@ -148,7 +151,7 @@ module.exports = {
         `ALB event in function "${duplicates[0].functionName}"`,
         ` cannot use priority "${duplicates[0].priority}" because it is already in use.`,
       ].join('');
-      throw new ServerlessError(errorMessage);
+      throw new ServerlessError(errorMessage, 'ALB_PRIORITY_ALREADY_IN_USE');
     }
   },
 
@@ -159,7 +162,8 @@ module.exports = {
     for (const auth of eventAuthorizers) {
       if (!authorizers[auth]) {
         throw new ServerlessError(
-          `No match for "${auth}" in function "${functionName}" found in registered ALB authorizers`
+          `No match for "${auth}" in function "${functionName}" found in registered ALB authorizers`,
+          'ALB_MISSING_AUTHORIZER'
         );
       }
     }
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js
index ba06d897124..21483c3450b 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js
@@ -81,7 +81,7 @@ module.exports = {
               "that there's a way to support your setup).",
             ].join('');
 
-            throw new ServerlessError(errorMessage);
+            throw new ServerlessError(errorMessage, 'API_GATEWAY_REST_API_ID_NOT_RESOLVED');
           }
           return resolveStage
             .call(this)
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js
index 0247669b747..e42dd6aa152 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js
@@ -28,7 +28,10 @@ module.exports = {
         vpcEndpointIds = this.serverless.service.provider.vpcEndpointIds;
 
         if (endpointType !== 'PRIVATE') {
-          throw new ServerlessError('VPC endpoint IDs are only available for private APIs');
+          throw new ServerlessError(
+            'VPC endpoint IDs are only available for private APIs',
+            'API_GATEWAY_INVALID_VPC_ENDPOINT_IDS_CONFIG'
+          );
         }
       }
     }
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.js
index d88c6ebd97a..d017514661d 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.js
@@ -42,7 +42,10 @@ module.exports = {
           !usagePlansIncludeName &&
           _.isObject(value)
         ) {
-          throw new ServerlessError(`API key "${name}" has no usage plan defined`);
+          throw new ServerlessError(
+            `API key "${name}" has no usage plan defined`,
+            'API_GATEWAY_KEY_WITHOUT_USAGE_PLAN'
+          );
         }
         if (_.isObject(apiKeyDefinition) && usagePlansIncludeName) {
           keyNumber = 0;
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
index 1e68f4c474a..6695ed7ac9e 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
@@ -83,7 +83,7 @@ module.exports = {
               const errorMessage = [
                 `You need to set the request uri when using the ${http.integration} integration.`,
               ];
-              throw new ServerlessError(errorMessage);
+              throw new ServerlessError(errorMessage, 'API_GATEWAY_MISSING_REQUEST_URI');
             }
 
             http.connectionType = this.getConnectionType(http);
@@ -92,7 +92,7 @@ module.exports = {
               const errorMessage = [
                 `You need to set connectionId when using ${http.connectionType} connectionType.`,
               ];
-              throw new ServerlessError(errorMessage);
+              throw new ServerlessError(errorMessage, 'API_GATEWAY_MISSING_CONNECTION_ID');
             }
           }
 
@@ -158,7 +158,8 @@ module.exports = {
                 `Invalid stage name ${stage}:`,
                 'it should contains only [-_a-zA-Z0-9] for AWS provider if http event are present',
                 'according to API Gateway limitation.',
-              ].join(' ')
+              ].join(' '),
+              'API_GATEWAY_INVALID_STAGE_NAME'
             );
           }
 
@@ -235,7 +236,8 @@ module.exports = {
           _.isObject(authorizer.arn)
         ) {
           throw new ServerlessError(
-            'Please provide an authorizer name for authorizers of type COGNITO_USER_POOLS'
+            'Please provide an authorizer name for authorizers of type COGNITO_USER_POOLS',
+            'API_GATEWAY_MISSING_AUTHORIZER_NAME'
           );
         } else {
           name = this.provider.naming.extractAuthorizerNameFromArn(arn);
@@ -243,7 +245,10 @@ module.exports = {
       } else if (authorizer.name) {
         authorizerFunctionName = name = authorizer.name;
       } else {
-        throw new ServerlessError('Please provide either an authorizer name or ARN');
+        throw new ServerlessError(
+          'Please provide either an authorizer name or ARN',
+          'API_GATEWAY_MISSING_AUTHORIZER_NAME_OR_ARN'
+        );
       }
 
       if (!type) {
@@ -289,7 +294,7 @@ module.exports = {
       const errorMessage = [
         'Cognito claims can only be filtered when using the lambda integration type',
       ];
-      throw new ServerlessError(errorMessage);
+      throw new ServerlessError(errorMessage, 'API_GATEWAY_INVALID_COGNITO_CLAIMS');
     }
 
     return {
diff --git a/lib/plugins/aws/package/compile/events/cloudFront.js b/lib/plugins/aws/package/compile/events/cloudFront.js
index ce5c44cab3d..bd51da252bc 100644
--- a/lib/plugins/aws/package/compile/events/cloudFront.js
+++ b/lib/plugins/aws/package/compile/events/cloudFront.js
@@ -416,7 +416,8 @@ class AwsCompileCloudFrontEvents {
             if (event.cloudFront.isDefaultOrigin) {
               if (defaultOrigin && defaultOrigin !== origin) {
                 throw new ServerlessError(
-                  'Found more than one cloudfront event with "isDefaultOrigin" defined'
+                  'Found more than one cloudfront event with "isDefaultOrigin" defined',
+                  'CLOUDFRONT_MULTIPLE_DEFAULT_ORIGIN_EVENTS'
                 );
               }
               defaultOrigin = origin;
@@ -534,13 +535,17 @@ class AwsCompileCloudFrontEvents {
     if (lambdaAtEdgeFunctions.length) {
       if (this.provider.getRegion() !== 'us-east-1') {
         throw new ServerlessError(
-          'CloudFront associated functions have to be deployed to the us-east-1 region.'
+          'CloudFront associated functions have to be deployed to the us-east-1 region.',
+          'CLOUDFRONT_INVALID_REGION'
         );
       }
 
       // Check if all behaviors got unique pathPatterns
       if (behaviors.length !== _.uniqBy(behaviors, 'PathPattern').length) {
-        throw new ServerlessError('Found more than one behavior with the same PathPattern');
+        throw new ServerlessError(
+          'Found more than one behavior with the same PathPattern',
+          'CLOUDFRONT_MULTIPLE_BEHAVIORS_FOR_SINGLE_PATH_PATTERN'
+        );
       }
 
       // Check if all event types in every behavior is unique
@@ -553,7 +558,8 @@ class AwsCompileCloudFrontEvents {
         })
       ) {
         throw new ServerlessError(
-          'The event type of a function association must be unique in the cache behavior'
+          'The event type of a function association must be unique in the cache behavior',
+          'CLOUDFRONT_EVENT_TYPE_NON_UNIQUE_CACHE_BEHAVIOR'
         );
       }
 
@@ -563,7 +569,8 @@ class AwsCompileCloudFrontEvents {
         if (!origin) {
           if (origins.length > 1) {
             throw new ServerlessError(
-              'Found more than one origin but none of the cloudfront event has "isDefaultOrigin" defined'
+              'Found more than one origin but none of the cloudfront event has "isDefaultOrigin" defined',
+              'CLOUDFRONT_MULTIPLE_DEFAULT_ORIGIN_EVENTS'
             );
           }
           origin = origins[0];
diff --git a/lib/plugins/aws/package/compile/events/cloudWatchEvent.js b/lib/plugins/aws/package/compile/events/cloudWatchEvent.js
index eb37ebf200d..129991cbbcd 100644
--- a/lib/plugins/aws/package/compile/events/cloudWatchEvent.js
+++ b/lib/plugins/aws/package/compile/events/cloudWatchEvent.js
@@ -70,7 +70,8 @@ class AwsCompileCloudWatchEventEvents {
                   'You can only set one of input, inputPath, or inputTransformer ',
                   'properties at the same time for cloudwatch events. ',
                   'Please check the AWS docs for more info',
-                ].join('')
+                ].join(''),
+                'CLOUDWATCH_MULTIPLE_INPUT_PROPERTIES'
               );
             }
 
diff --git a/lib/plugins/aws/package/compile/events/cloudWatchLog.js b/lib/plugins/aws/package/compile/events/cloudWatchLog.js
index 657fd84427a..d038f772278 100644
--- a/lib/plugins/aws/package/compile/events/cloudWatchLog.js
+++ b/lib/plugins/aws/package/compile/events/cloudWatchLog.js
@@ -59,7 +59,7 @@ class AwsCompileCloudWatchLogEvents {
                 `"${LogGroupName}" logGroup for cloudwatchLog event is duplicated.`,
                 ' This property can only be set once per CloudFormation stack.',
               ].join('');
-              throw new ServerlessError(errorMessage);
+              throw new ServerlessError(errorMessage, 'CLOUDWATCHLOG_DUPLICATED_LOG_GROUP_EVENT');
             }
             logGroupNames.push(LogGroupName);
             logGroupNamesThisFunction.push(LogGroupName);
diff --git a/lib/plugins/aws/package/compile/events/cognitoUserPool.js b/lib/plugins/aws/package/compile/events/cognitoUserPool.js
index 8dedf86390d..a983fa5b18d 100644
--- a/lib/plugins/aws/package/compile/events/cognitoUserPool.js
+++ b/lib/plugins/aws/package/compile/events/cognitoUserPool.js
@@ -151,7 +151,7 @@ class AwsCompileCognitoUserPoolEvents {
                 'Only one Cognito User Pool can be configured per function.',
                 ` In "${FunctionName}" you're attempting to configure "${currentPoolName}" and "${pool}" at the same time.`,
               ].join('');
-              throw new ServerlessError(errorMessage);
+              throw new ServerlessError(errorMessage, 'COGNITO_MULTIPLE_USER_POOLS_PER_FUNCTION');
             }
 
             const eventFunctionLogicalId = this.provider.naming.getLambdaLogicalId(functionName);
diff --git a/lib/plugins/aws/package/compile/events/eventBridge/index.js b/lib/plugins/aws/package/compile/events/eventBridge/index.js
index 7c0e90b384f..8cc5846e929 100644
--- a/lib/plugins/aws/package/compile/events/eventBridge/index.js
+++ b/lib/plugins/aws/package/compile/events/eventBridge/index.js
@@ -126,7 +126,8 @@ class AwsCompileEventBridgeEvents {
                 [
                   'You can only set one of input, inputPath, or inputTransformer ',
                   'properties for eventBridge events.',
-                ].join('')
+                ].join(''),
+                'EVENTBRIDGE_MULTIPLE_INPUT_PROPERTIES'
               );
             }
 
diff --git a/lib/plugins/aws/package/compile/events/s3/index.js b/lib/plugins/aws/package/compile/events/s3/index.js
index 67f875b563c..b153f32a681 100644
--- a/lib/plugins/aws/package/compile/events/s3/index.js
+++ b/lib/plugins/aws/package/compile/events/s3/index.js
@@ -102,7 +102,7 @@ class AwsCompileS3Events {
                 `${bucketName} - Bucket name must conform to pattern ${this.serverless.configSchemaHandler.schema.definitions.awsS3BucketName.pattern}.`,
                 `Please check provider.s3.${bucketRef} and/or s3 events of function "${functionName}".`,
               ].join(' ');
-              throw new ServerlessError(errorMessage);
+              throw new ServerlessError(errorMessage, 'S3_INVALID_BUCKET_PATTERN');
             }
 
             if (bucketsLambdaConfigurations[bucketName]) {
@@ -282,7 +282,7 @@ class AwsCompileS3Events {
                 'Only one S3 Bucket can be configured per function.',
                 ` In "${FunctionName}" you're attempting to configure "${currentBucketName}" and "${bucket}" at the same time.`,
               ].join('');
-              throw new ServerlessError(errorMessage);
+              throw new ServerlessError(errorMessage, 'S3_MULTIPLE_BUCKETS_PER_FUNCTION');
             }
 
             rules = (event.s3.rules || []).map((rule) => {
diff --git a/lib/plugins/aws/package/compile/events/sns.js b/lib/plugins/aws/package/compile/events/sns.js
index 198346e6962..6e38c9a3238 100644
--- a/lib/plugins/aws/package/compile/events/sns.js
+++ b/lib/plugins/aws/package/compile/events/sns.js
@@ -87,7 +87,8 @@ class AwsCompileSNSEvents {
                 // Only true when providing CFN intrinsic function (not string) to arn property without topicName property
                 if (!topicName) {
                   throw new ServerlessError(
-                    'Missing "sns.topicName" setting (it needs to be provided if "sns.arn" is not provided as plain ARN string)'
+                    'Missing "sns.topicName" setting (it needs to be provided if "sns.arn" is not provided as plain ARN string)',
+                    'SNS_MISSING_TOPIC_NAME'
                   );
                 }
               } else {
diff --git a/lib/plugins/aws/package/compile/events/websockets/lib/stage.js b/lib/plugins/aws/package/compile/events/websockets/lib/stage.js
index 74038bc125b..24db29fcd66 100644
--- a/lib/plugins/aws/package/compile/events/websockets/lib/stage.js
+++ b/lib/plugins/aws/package/compile/events/websockets/lib/stage.js
@@ -46,7 +46,8 @@ module.exports = {
           throw new ServerlessError(
             `provider.logs.websocket.level is set to an invalid value. Support values are ${Array.from(
               validLogLevels
-            ).join(', ')}, got ${level}.`
+            ).join(', ')}, got ${level}.`,
+            'WEBSOCKETS_INVALID_LOGS_LEVEL'
           );
         }
       }
diff --git a/lib/plugins/aws/package/compile/events/websockets/lib/validate.js b/lib/plugins/aws/package/compile/events/websockets/lib/validate.js
index b7f253cbdcb..c2b52ea1311 100644
--- a/lib/plugins/aws/package/compile/events/websockets/lib/validate.js
+++ b/lib/plugins/aws/package/compile/events/websockets/lib/validate.js
@@ -82,7 +82,8 @@ module.exports = {
                 if (_.isObject(event.websocket.authorizer.arn)) {
                   if (!event.websocket.authorizer.name) {
                     throw new ServerlessError(
-                      'Websocket Authorizer: Non-string "arn" needs to be accompanied with "name"'
+                      'Websocket Authorizer: Non-string "arn" needs to be accompanied with "name"',
+                      'WEBSOCKETS_MISSING_AUTHORIZER_NAME'
                     );
                   }
                   websocketObj.authorizer.name = event.websocket.authorizer.name;
diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index 8a5807e7029..e259a986e5a 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -148,12 +148,14 @@ class AwsCompileFunctions {
 
     if (!functionObject.handler && !functionObject.image) {
       throw new ServerlessError(
-        `Either "handler" or "image" property needs to be set on function "${functionName}"`
+        `Either "handler" or "image" property needs to be set on function "${functionName}"`,
+        'FUNCTION_NEITHER_HANDLER_NOR_IMAGE_DEFINED_ERROR'
       );
     }
     if (functionObject.handler && functionObject.image) {
       throw new ServerlessError(
-        `Either "handler" or "image" property (not both) needs to be set on function "${functionName}".`
+        `Either "handler" or "image" property (not both) needs to be set on function "${functionName}".`,
+        'FUNCTION_BOTH_HANDLER_AND_IMAGE_DEFINED_ERROR'
       );
     }
 
@@ -634,7 +636,10 @@ class AwsCompileFunctions {
       if (functionAddress.includes(':sqs:')) return 'sqs:SendMessage';
       if (functionAddress.includes(':sns:')) return 'sns:Publish';
       if (functionAddress.includes(':event-bus/')) return 'events:PutEvents';
-      throw new ServerlessError(`Unsupported destination target ${functionAddress}`);
+      throw new ServerlessError(
+        `Unsupported destination target ${functionAddress}`,
+        'UNSUPPORTED_DESTINATION_TARGET'
+      );
     })();
     iamPolicyStatements.push({
       Effect: 'Allow',
diff --git a/lib/plugins/aws/package/lib/generateCoreTemplate.js b/lib/plugins/aws/package/lib/generateCoreTemplate.js
index 9eba01caefa..4991327931e 100644
--- a/lib/plugins/aws/package/lib/generateCoreTemplate.js
+++ b/lib/plugins/aws/package/lib/generateCoreTemplate.js
@@ -75,7 +75,7 @@ module.exports = {
       const errorMessage = [
         'You cannot enable and disable S3 Transfer Acceleration at the same time',
       ].join('');
-      throw new ServerlessError(errorMessage);
+      throw new ServerlessError(errorMessage, 'S3_ACCELERATION_ENABLED_AND_DISABLED');
     }
 
     if (bucketName) {
diff --git a/lib/plugins/aws/utils/resolveCfImportValue.js b/lib/plugins/aws/utils/resolveCfImportValue.js
index 5e9b7be00cd..5e9795e8299 100644
--- a/lib/plugins/aws/utils/resolveCfImportValue.js
+++ b/lib/plugins/aws/utils/resolveCfImportValue.js
@@ -11,7 +11,8 @@ function resolveCfImportValue(provider, name, sdkParams = {}) {
     }
 
     throw new ServerlessError(
-      `Could not resolve Fn::ImportValue with name ${name}. Are you sure this value is exported ?`
+      `Could not resolve Fn::ImportValue with name ${name}. Are you sure this value is exported ?`,
+      'CF_IMPORT_RESOLUTION'
     );
   });
 }
diff --git a/lib/plugins/aws/utils/resolveCfRefValue.js b/lib/plugins/aws/utils/resolveCfRefValue.js
index 08ef8039e03..928e4f58e02 100644
--- a/lib/plugins/aws/utils/resolveCfRefValue.js
+++ b/lib/plugins/aws/utils/resolveCfRefValue.js
@@ -19,7 +19,8 @@ function resolveCfRefValue(provider, resourceLogicalId, sdkParams = {}) {
       }
 
       throw new ServerlessError(
-        `Could not resolve Ref with name ${resourceLogicalId}. Are you sure this value matches one resource logical ID ?`
+        `Could not resolve Ref with name ${resourceLogicalId}. Are you sure this value matches one resource logical ID ?`,
+        'CF_REF_RESOLUTION'
       );
     });
 }
diff --git a/test/unit/lib/plugins/aws/deployFunction.test.js b/test/unit/lib/plugins/aws/deployFunction.test.js
index 04a47af4d98..7960927121e 100644
--- a/test/unit/lib/plugins/aws/deployFunction.test.js
+++ b/test/unit/lib/plugins/aws/deployFunction.test.js
@@ -968,6 +968,6 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
           },
         },
       })
-    ).to.be.eventually.rejectedWith('Please run "serverless deploy" to deploy your service');
+    ).to.be.eventually.rejected.and.have.property('code', 'FUNCTION_NOT_YET_DEPLOYED');
   });
 });

From 81f0858cc93dfe7eda795380bc2cca5e54115989 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 23 Apr 2021 10:19:44 +0200
Subject: [PATCH 0011/1101] refactor: Add `code` to `ServerlessError` in
 `lib/plugins`

---
 lib/plugins/aws/lib/monitorStack.js       |  4 ++--
 lib/plugins/config.js                     | 14 ++++++++------
 lib/plugins/create/create.js              | 14 +++++++-------
 lib/plugins/deploy.js                     |  2 +-
 lib/plugins/package/lib/packageService.js |  2 +-
 lib/plugins/package/lib/zipService.js     |  7 +++++--
 lib/plugins/plugin/lib/utils.js           | 10 ++++++++--
 lib/plugins/print.js                      | 14 ++++++++++----
 lib/plugins/standalone.js                 |  6 ++++--
 9 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js
index d044471ae27..9905fdcb53e 100644
--- a/lib/plugins/aws/lib/monitorStack.js
+++ b/lib/plugins/aws/lib/monitorStack.js
@@ -91,7 +91,7 @@ module.exports = {
                 let errorMessage = 'An error occurred: ';
                 errorMessage += `${stackLatestError.LogicalResourceId} - `;
                 errorMessage += `${stackLatestError.ResourceStatusReason}.`;
-                throw new ServerlessError(errorMessage, 'STACK_MONITORING_FAILURE');
+                throw new ServerlessError(errorMessage, 'STACK_OPERATION_FAILURE');
               }
             },
             (e) => {
@@ -102,7 +102,7 @@ module.exports = {
                 stackStatus = 'DELETE_COMPLETE';
                 return;
               }
-              throw new ServerlessError(e.message, 'STACK_MONITORING_FAILURE');
+              throw new ServerlessError(e.message, 'STACK_OPERATION_FAILURE');
             }
           )
       )
diff --git a/lib/plugins/config.js b/lib/plugins/config.js
index 2a4d4529726..525c00d13d4 100644
--- a/lib/plugins/config.js
+++ b/lib/plugins/config.js
@@ -69,7 +69,7 @@ class Config {
         `Provider "${provider}" is not supported.`,
         ` Supported providers are: ${humanReadableProvidersList}.`,
       ].join('');
-      throw new ServerlessError(errorMessage);
+      throw new ServerlessError(errorMessage, 'INVALID_PROVIDER');
     }
   }
 
@@ -84,19 +84,20 @@ class Config {
         return;
       }
       if (this.serverless.isLocallyInstalled) {
-        throw new ServerlessError(noSupportErrorMessage);
+        throw new ServerlessError(noSupportErrorMessage, 'AUTO_UPDATE_NOT_SUPPORTED');
       }
       if (this.serverless.isStandaloneExecutable) {
         if (process.platform === 'win32') {
-          throw new ServerlessError(noSupportErrorMessage);
+          throw new ServerlessError(noSupportErrorMessage, 'AUTO_UPDATE_NOT_SUPPORTED');
         }
       } else {
         if (!(await isNpmGlobalPackage())) {
-          throw new ServerlessError(noSupportErrorMessage);
+          throw new ServerlessError(noSupportErrorMessage, 'AUTO_UPDATE_NOT_SUPPORTED');
         }
         if (!(await isNpmPackageWritable(this.serverless))) {
           throw new ServerlessError(
-            'Auto update cannot be set, due to missing write access to npm global installation'
+            'Auto update cannot be set, due to missing write access to npm global installation',
+            'AUTO_UPDATE_NOT_SET_MISSING_WRITE_ACCESS'
           );
         }
       }
@@ -123,7 +124,8 @@ class Config {
 
       if (!validShells.has(shell)) {
         throw new ServerlessError(
-          `Shell "${shell}" is not supported. Supported shells: ${Array.from(validShells)}.`
+          `Shell "${shell}" is not supported. Supported shells: ${Array.from(validShells)}.`,
+          'TABCOMPLETION_INVALID_SHELL_ARGUMENT'
         );
       }
       const location = (() => {
diff --git a/lib/plugins/create/create.js b/lib/plugins/create/create.js
index 8cc048d147a..099cad8dbfe 100644
--- a/lib/plugins/create/create.js
+++ b/lib/plugins/create/create.js
@@ -22,7 +22,7 @@ const handleServiceCreationError = (error) => {
     'Please check that you have the required permissions to write to the directory',
   ].join('');
 
-  throw new ServerlessError(errorMessage);
+  throw new ServerlessError(errorMessage, 'UNABLE_TO_CREATE_SERVICE');
 };
 
 class Create {
@@ -66,7 +66,7 @@ class Create {
           this.serverless.cli.log(message);
         })
         .catch((err) => {
-          throw new ServerlessError(err);
+          throw new ServerlessError(err, 'BOILERPLATE_GENERATION_ERROR');
         });
     } else if ('template-path' in this.options) {
       // Copying template from a local directory
@@ -75,7 +75,7 @@ class Create {
         : path.join(process.cwd(), this.options.name);
       if (dirExistsSync(serviceDir)) {
         const errorMessage = `A folder named "${serviceDir}" already exists.`;
-        throw new ServerlessError(errorMessage);
+        throw new ServerlessError(errorMessage, 'TARGET_FOLDER_ALREADY_EXISTS');
       }
       copyDirContentsSync(untildify(this.options['template-path']), serviceDir, {
         noLinks: true,
@@ -88,7 +88,7 @@ class Create {
         'You must either pass a template name (--template), ',
         'a URL (--template-url) or a local path (--template-path).',
       ].join('');
-      throw new ServerlessError(errorMessage);
+      throw new ServerlessError(errorMessage, 'MISSING_TEMPLATE_CLI_PARAM');
     }
     return BbPromise.resolve();
   }
@@ -101,7 +101,7 @@ class Create {
         `Template "${this.options.template}" is not supported.`,
         ` Supported templates are: ${humanReadableTemplatesList}.`,
       ].join('');
-      throw new ServerlessError(errorMessage);
+      throw new ServerlessError(errorMessage, 'NOT_SUPPORTED_TEMPLATE');
     }
 
     // store the custom options for the service if given
@@ -125,7 +125,7 @@ class Create {
           'Rename or move the directory and try again if you want serverless to create it"',
         ].join('');
 
-        throw new ServerlessError(errorMessage);
+        throw new ServerlessError(errorMessage, 'TARGET_FOLDER_ALREADY_EXISTS');
       }
 
       this.serverless.cli.log(`Generating boilerplate in "${newPath}"`);
@@ -144,7 +144,7 @@ class Create {
             `Move the file and try again if you want serverless to write a new "${filename}"`,
           ].join('');
 
-          throw new ServerlessError(errorMessage);
+          throw new ServerlessError(errorMessage, 'TEMPLATE_FILE_ALREADY_EXISTS');
         }
       });
     }
diff --git a/lib/plugins/deploy.js b/lib/plugins/deploy.js
index b676b7f7f1d..ae682625aa7 100644
--- a/lib/plugins/deploy.js
+++ b/lib/plugins/deploy.js
@@ -33,7 +33,7 @@ class Deploy {
         const provider = this.serverless.service.provider.name;
         if (!this.serverless.getProvider(provider)) {
           const errorMessage = `The specified provider "${provider}" does not exist.`;
-          throw new ServerlessError(errorMessage);
+          throw new ServerlessError(errorMessage, 'INVALID_PROVIDER');
         }
         if (this.options.function) {
           // If the user has given a function parameter, spawn a function deploy
diff --git a/lib/plugins/package/lib/packageService.js b/lib/plugins/package/lib/packageService.js
index 66ed9f1154f..363ed6849d8 100644
--- a/lib/plugins/package/lib/packageService.js
+++ b/lib/plugins/package/lib/packageService.js
@@ -260,7 +260,7 @@ module.exports = {
         .filter((r) => r[1] === true)
         .map((r) => r[0]);
       if (filePaths.length !== 0) return filePaths;
-      throw new ServerlessError('No file matches include / exclude patterns');
+      throw new ServerlessError('No file matches include / exclude patterns', 'NO_MATCHED_FILES');
     });
   },
 };
diff --git a/lib/plugins/package/lib/zipService.js b/lib/plugins/package/lib/zipService.js
index 8271ab45f68..265c1693065 100644
--- a/lib/plugins/package/lib/zipService.js
+++ b/lib/plugins/package/lib/zipService.js
@@ -58,7 +58,7 @@ module.exports = {
    */
   zipFiles(files, zipFileName, prefix) {
     if (files.length === 0) {
-      const error = new ServerlessError('No files to package');
+      const error = new ServerlessError('No files to package', 'NO_FILES_TO_PACKAGE');
       return BbPromise.reject(error);
     }
 
@@ -117,7 +117,10 @@ module.exports = {
         filePath,
       }),
       (error) => {
-        throw new ServerlessError(`Cannot read file ${filePath} due to: ${error.message}`);
+        throw new ServerlessError(
+          `Cannot read file ${filePath} due to: ${error.message}`,
+          'CANNOT_READ_FILE'
+        );
       }
     );
   },
diff --git a/lib/plugins/plugin/lib/utils.js b/lib/plugins/plugin/lib/utils.js
index 1b86613029c..da2ff6f772e 100644
--- a/lib/plugins/plugin/lib/utils.js
+++ b/lib/plugins/plugin/lib/utils.js
@@ -12,7 +12,10 @@ const ServerlessError = require('../../../serverless-error');
 module.exports = {
   validate() {
     if (!this.serverless.serviceDir) {
-      throw new ServerlessError('This command can only be run inside a service directory');
+      throw new ServerlessError(
+        'This command can only be run inside a service directory',
+        'MISSING_SERVICE_DIRECTORY'
+      );
     }
 
     return BbPromise.resolve();
@@ -22,7 +25,10 @@ module.exports = {
     if (this.serverless.configurationFilename) {
       return path.resolve(this.serverless.serviceDir, this.serverless.configurationFilename);
     }
-    throw new ServerlessError('Could not find any serverless service definition file.');
+    throw new ServerlessError(
+      'Could not find any serverless service definition file.',
+      'MISSING_SERVICE_CONFIGURATION_FILE'
+    );
   },
 
   getPlugins() {
diff --git a/lib/plugins/print.js b/lib/plugins/print.js
index 0761fed4167..bcce55016d1 100644
--- a/lib/plugins/print.js
+++ b/lib/plugins/print.js
@@ -100,7 +100,10 @@ class Print {
         conf = conf[step];
 
         if (!conf) {
-          throw new ServerlessError(`Path "${this.options.path}" not found`);
+          throw new ServerlessError(
+            `Path "${this.options.path}" not found`,
+            'INVALID_PATH_ARGUMENT'
+          );
         }
       }
     }
@@ -110,7 +113,7 @@ class Print {
       if (this.options.transform === 'keys') {
         conf = Object.keys(conf);
       } else {
-        throw new ServerlessError('Transform can only be "keys"');
+        throw new ServerlessError('Transform can only be "keys"', 'INVALID_TRANSFORM');
       }
     }
 
@@ -123,7 +126,10 @@ class Print {
         out = conf.join(os.EOL);
       } else {
         if (_.isObject(conf)) {
-          throw new ServerlessError('Cannot print an object as "text"');
+          throw new ServerlessError(
+            'Cannot print an object as "text"',
+            'PRINT_INVALID_OBJECT_AS_TEXT'
+          );
         }
 
         out = String(conf);
@@ -133,7 +139,7 @@ class Print {
     } else if (format === 'yaml') {
       out = yaml.dump(JSON.parse(jc.stringify(conf)), { noRefs: true });
     } else {
-      throw new ServerlessError('Format must be "yaml", "json" or "text"');
+      throw new ServerlessError('Format must be "yaml", "json" or "text"', 'PRINT_INVALID_FORMAT');
     }
 
     this.serverless.cli.consoleLog(out);
diff --git a/lib/plugins/standalone.js b/lib/plugins/standalone.js
index edd9bfbde0d..4acd1aeb9e3 100644
--- a/lib/plugins/standalone.js
+++ b/lib/plugins/standalone.js
@@ -57,7 +57,8 @@ module.exports = class Standalone {
           'Note: Service is safe to upgrade if no deprecations are logged during its deployment.',
           `      Check https://github.com/serverless/serverless/releases/tag/v${latestMajor}.0.0 ` +
             'for list of all breaking changes',
-        ].join('\n')
+        ].join('\n'),
+        'CANNOT_UPGRADE_MAJOR'
       );
     }
     this.serverless.cli.log('Downloading new version...');
@@ -66,7 +67,8 @@ module.exports = class Standalone {
     if (!standaloneResponse.ok) {
       throw new ServerlessError(
         'Sorry unable to `upgrade` at this point ' +
-          `(server rejected request with ${standaloneResponse.status})`
+          `(server rejected request with ${standaloneResponse.status})`,
+        'UPGRADE_ERROR'
       );
     }
     await fse.remove(BINARY_TMP_PATH);

From 8c37e0ac6df7a1a010e57ef14702185b2ef07dfa Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 23 Apr 2021 12:47:20 +0200
Subject: [PATCH 0012/1101] refactor: Adjust invalid `code` for
 `ServerlessError`

---
 lib/classes/ConfigSchemaHandler/index.js                        | 2 +-
 lib/classes/Variables.js                                        | 2 +-
 lib/configuration/variables/sources/env.js                      | 2 +-
 lib/configuration/variables/sources/file.js                     | 2 +-
 .../variables/sources/instance-dependent/get-cf.js              | 2 +-
 .../variables/sources/instance-dependent/get-s3.js              | 2 +-
 .../variables/sources/instance-dependent/get-sls.js             | 2 +-
 .../variables/sources/instance-dependent/get-ssm.js             | 2 +-
 lib/configuration/variables/sources/opt.js                      | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/classes/ConfigSchemaHandler/index.js b/lib/classes/ConfigSchemaHandler/index.js
index abf7ba36931..8456310ed51 100644
--- a/lib/classes/ConfigSchemaHandler/index.js
+++ b/lib/classes/ConfigSchemaHandler/index.js
@@ -122,7 +122,7 @@ class ConfigSchemaHandler {
             ? `${ERROR_PREFIX}: \n     ${messages.join('\n     ')}`
             : `${ERROR_PREFIX} ${messages[0]}`;
 
-        throw new ServerlessError(errorMessage, 'SCHEMA_VALIDATION');
+        throw new ServerlessError(errorMessage, 'INVALID_NON_SCHEMA_COMPLIANT_CONFIGURATION');
       } else {
         if (messages.length === 1) {
           this.serverless.cli.log(`${WARNING_PREFIX} ${messages[0]}`, 'Serverless', {
diff --git a/lib/classes/Variables.js b/lib/classes/Variables.js
index 9e353dcb1d5..8a5ec30c1f5 100644
--- a/lib/classes/Variables.js
+++ b/lib/classes/Variables.js
@@ -451,7 +451,7 @@ class Variables {
         ` a string for variable ${matchedString}.`,
         ' Please make sure the value of the property is a string.',
       ].join('');
-      throw new ServerlessError(errorMessage, 'INVALID_NON_STRING_PROPERTY');
+      throw new ServerlessError(errorMessage, 'INVALID_NON_STRING_VARIABLE_RESOLUTION_RESULT');
     }
     return property;
   }
diff --git a/lib/configuration/variables/sources/env.js b/lib/configuration/variables/sources/env.js
index 9f1f15549ea..8856947ae9a 100644
--- a/lib/configuration/variables/sources/env.js
+++ b/lib/configuration/variables/sources/env.js
@@ -14,7 +14,7 @@ module.exports = {
     address = ensureString(address, {
       Error: ServerlessError,
       errorMessage: 'Non-string address argument in variable "env" source: %v',
-      errorCode: 'INVALID_ENV_SOURCE_ADDRESS_ARGUMENT',
+      errorCode: 'INVALID_ENV_SOURCE_ADDRESS',
     });
 
     return { value: process.env[address] || null, isPending: !isSourceFulfilled };
diff --git a/lib/configuration/variables/sources/file.js b/lib/configuration/variables/sources/file.js
index 4e6b697a9ce..5075144dc45 100644
--- a/lib/configuration/variables/sources/file.js
+++ b/lib/configuration/variables/sources/file.js
@@ -46,7 +46,7 @@ module.exports = {
       address = ensureString(address, {
         Error: ServerlessError,
         errorMessage: 'Non-string address argument for variable "file" source: %v',
-        errorCode: 'INVALID_FILE_SOURCE_ADDRESS_ARGUMENT',
+        errorCode: 'INVALID_FILE_SOURCE_ADDRESS',
       });
     }
 
diff --git a/lib/configuration/variables/sources/instance-dependent/get-cf.js b/lib/configuration/variables/sources/instance-dependent/get-cf.js
index 382518b4a8b..84bf9374bd1 100644
--- a/lib/configuration/variables/sources/instance-dependent/get-cf.js
+++ b/lib/configuration/variables/sources/instance-dependent/get-cf.js
@@ -17,7 +17,7 @@ module.exports = (serverlessInstance) => {
       address = ensureString(address, {
         Error: ServerlessError,
         errorMessage: 'Non-string address argument in variable "cf" source: %v',
-        errorCode: 'INVALID_CF_SOURCE_ADDRESS_ARGUMENT',
+        errorCode: 'INVALID_CF_SOURCE_ADDRESS',
       });
       const separatorIndex = address.indexOf('.');
       if (separatorIndex === -1) {
diff --git a/lib/configuration/variables/sources/instance-dependent/get-s3.js b/lib/configuration/variables/sources/instance-dependent/get-s3.js
index e48facee732..4726c499110 100644
--- a/lib/configuration/variables/sources/instance-dependent/get-s3.js
+++ b/lib/configuration/variables/sources/instance-dependent/get-s3.js
@@ -16,7 +16,7 @@ module.exports = (serverlessInstance) => {
       address = ensureString(address, {
         Error: ServerlessError,
         errorMessage: 'Non-string address argument in variable "s3" source: %v',
-        errorCode: 'INVALID_S3_SOURCE_ADDRESS_ARGUMENT',
+        errorCode: 'INVALID_S3_SOURCE_ADDRESS',
       });
       const separatorIndex = address.indexOf('/');
       if (separatorIndex === -1) {
diff --git a/lib/configuration/variables/sources/instance-dependent/get-sls.js b/lib/configuration/variables/sources/instance-dependent/get-sls.js
index 74fdceaea26..4b7a6780363 100644
--- a/lib/configuration/variables/sources/instance-dependent/get-sls.js
+++ b/lib/configuration/variables/sources/instance-dependent/get-sls.js
@@ -15,7 +15,7 @@ module.exports = (serverlessInstance) => {
       address = ensureString(address, {
         Error: ServerlessError,
         errorMessage: 'Non-string address argument in variable "sls" source: %v',
-        errorCode: 'INVALID_SLS_SOURCE_ADDRESS_ARGUMENT',
+        errorCode: 'INVALID_SLS_SOURCE_ADDRESS',
       });
 
       switch (address) {
diff --git a/lib/configuration/variables/sources/instance-dependent/get-ssm.js b/lib/configuration/variables/sources/instance-dependent/get-ssm.js
index bf2623542d6..83ff2ea7ea2 100644
--- a/lib/configuration/variables/sources/instance-dependent/get-ssm.js
+++ b/lib/configuration/variables/sources/instance-dependent/get-ssm.js
@@ -19,7 +19,7 @@ module.exports = (serverlessInstance) => {
       address = ensureString(address, {
         Error: ServerlessError,
         errorMessage: 'Non-string address argument in variable "ssm" source: %v',
-        errorCode: 'INVALID_SSM_SOURCE_ADDRESS_ARGUMENT',
+        errorCode: 'INVALID_SSM_SOURCE_ADDRESS',
       });
       const region = !params || !params[0] || params[0] === 'raw' ? undefined : params[0];
       const shouldReturnRawValue = params && (params[0] === 'raw' || params[1] === 'raw');
diff --git a/lib/configuration/variables/sources/opt.js b/lib/configuration/variables/sources/opt.js
index e543444f8e9..6a7af5c4aac 100644
--- a/lib/configuration/variables/sources/opt.js
+++ b/lib/configuration/variables/sources/opt.js
@@ -9,7 +9,7 @@ module.exports = {
       isOptional: true,
       Error: ServerlessError,
       errorMessage: 'Non-string address argument in variable "opt" source: %v',
-      errorCode: 'INVALID_OPT_SOURCE_ADDRESS_ARGUMENT',
+      errorCode: 'INVALID_OPT_SOURCE_ADDRESS',
     });
     if (!isSourceFulfilled) {
       if (address == null) return { value: null, isPending: true };

From 31a51e21396dba8ca4ad4d22c023a8a63960a40c Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 23 Apr 2021 13:48:45 +0200
Subject: [PATCH 0013/1101] docs: Add example on how to enable native CF for
 eventBridge

---
 docs/providers/aws/events/event-bridge.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/providers/aws/events/event-bridge.md b/docs/providers/aws/events/event-bridge.md
index 2b8f29c6428..ff58f085740 100644
--- a/docs/providers/aws/events/event-bridge.md
+++ b/docs/providers/aws/events/event-bridge.md
@@ -71,7 +71,13 @@ functions:
 
 ### Re-using an existing event bus
 
-If you want to reuse an existing event bus, you can define it with literal `arn` or with a reference to an existing event bus name via CF intrinsic functions. Referencing via intrinsic functions in available only if you use native CloudFormation support with `provider.eventBridge.useCloudFormation: true` setting.
+If you want to reuse an existing event bus, you can define it with literal `arn` or with a reference to an existing event bus name via CF intrinsic functions. Referencing via intrinsic functions in available only if you use native CloudFormation support with `provider.eventBridge.useCloudFormation: true` setting:
+
+```yml
+provider:
+  eventBridge:
+    useCloudFormation: true
+```
 
 Using literal `arn`:
 

From 7a0fbf7143ab9901517f9a67fcd228155fa8e47b Mon Sep 17 00:00:00 2001
From: Corentin Doue <31917261+CorentinDoue@users.noreply.github.com>
Date: Tue, 27 Apr 2021 09:52:35 +0200
Subject: [PATCH 0014/1101] docs: Improvements for `google` provider docs
 (#9326)

---
 .../google/cli-reference/invoke-local.md      | 67 -----------------
 docs/providers/google/guide/credentials.md    | 74 ++++++++++++++++---
 2 files changed, 63 insertions(+), 78 deletions(-)
 delete mode 100644 docs/providers/google/cli-reference/invoke-local.md

diff --git a/docs/providers/google/cli-reference/invoke-local.md b/docs/providers/google/cli-reference/invoke-local.md
deleted file mode 100644
index 4dcc28c3d41..00000000000
--- a/docs/providers/google/cli-reference/invoke-local.md
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--
-title: Serverless Framework Commands - Google Cloud Functions - Invoke Local
-menuText: invoke local
-menuOrder: 7
-description: Emulate an invocation of your Google Cloud function locally using the Serverless Framework
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/google/cli-reference/invoke-local)
-
-<!-- DOCS-SITE-LINK:END -->
-
-# Google - Invoke Local
-
-Invokes deployed function locally. It allows to send event data to the function, read logs and display other important information of the function invocation.
-
-```bash
-serverless invoke local -f functionName
-```
-
-## Options
-
-- `--function` or `-f` The name of the function in your service that you want to invoke. **Required**.
-- `--data` or `-d` Data you want to pass into the function
-- `--path` or `-p` Path to JSON or YAML file holding input data. This path is relative to the root directory of the service.
-- `--raw` Pass data as a raw string even if it is JSON. If not set, JSON data are parsed and passed as an object.
-- `--contextPath` or `-x`, The path to a json file holding input context to be passed to the invoked function. This path is relative to the root directory of the service.
-- `--context` or `-c`, String data to be passed as a context to your function. Same like with `--data`, context included in `--contextPath` will overwrite the context you passed with `--context` flag.
-- `--env` or `-e` String representing an environment variable to set when invoking your function, in the form `<name>=<value>`. Can be repeated for more than one environment variable.
-
-> Keep in mind that if you pass both `--path` and `--data`, the data included in the `--path` file will overwrite the data you passed with the `--data` flag.
-
-## Examples
-
-### Local function invocation
-
-```bash
-serverless invoke local -f functionName
-```
-
-### Local function invocation with data
-
-```bash
-serverless invoke local -f functionName -d '{ "data": "hello world" }'
-```
-
-### Local function invocation with data passing
-
-```bash
-serverless invoke local -f functionName -p path/to/file.json
-
-# OR
-
-serverless invoke local -f functionName -p path/to/file.yaml
-```
-
-### Local function invocation, setting environment variables
-
-```bash
-serverless invoke local -f functionName -e VAR1=value1
-
-# Or more than one variable
-
-serverless invoke local -f functionName -e VAR1=value1 -e VAR2=value2
-```
diff --git a/docs/providers/google/guide/credentials.md b/docs/providers/google/guide/credentials.md
index 8ed710c5b03..e7c49344ae1 100644
--- a/docs/providers/google/guide/credentials.md
+++ b/docs/providers/google/guide/credentials.md
@@ -49,9 +49,39 @@ Go to the <a href="https://console.cloud.google.com/apis/dashboard" target="_bla
 - Cloud Storage
 - Cloud Logging API
 
-## Get credentials & assign roles
+## Set up a user & assign roles
 
-You need to create credentials with appropriate roles Serverless can use to create resources in your Project.
+You can either use a **Service Account** or directly your **Google Account**
+with appropriate roles that Serverless can use to create resources in your project.
+
+### Google Account
+
+(<a href="https://cloud.google.com/iam/docs/overview#google_account" target="_blank">Google Accounts</a> are real users who can be authenticated by the Google SSO)
+
+This method is the most convenient to allow developers to develop and deploy a Serverless application locally.
+
+If you are owner of the project you have nothing to do.
+Otherwise, make sure your user has at least the following roles:
+
+- `Deployment Manager Editor`
+- `Storage Admin`
+- `Logging Admin`
+- `Cloud Functions Developer`
+
+### Service Account
+
+(<a href="https://cloud.google.com/iam/docs/overview#service_account" target="_blank">Service accounts</a> are accounts for applications instead of individuals end users)
+
+This method is useful for to authenticate a CI/CD or to assume a specific role without changing the roles of a **Google Account**.
+
+Create a **Service Account** with at least the following roles:
+
+- `Deployment Manager Editor`
+- `Storage Admin`
+- `Logging Admin`
+- `Cloud Functions Developer`
+
+How to create a **Service Account**:
 
 1. Go to the <a href="https://console.cloud.google.com" target="_blank">Google Cloud Console</a>.
 2. Choose the project that you are working on from the top drop down
@@ -60,21 +90,43 @@ You need to create credentials with appropriate roles Serverless can use to crea
 5. Click `CREATE SERVICE ACCOUNT` button on the top
 6. Input Service account name and Service account ID will be generated automatically for you. Change it if you wish to.
 7. Click `Create` button
-8. Add `Deployment Manager Editor`, `Storage Admin`, `Logging Admin`, `Cloud Functions Developer` roles and click `Continue`
-9. Click `+CREATE KEY` button and select `JSON` key type and click `Create` button
-10. You will see a json (AKA `keyfile`) file downloaded
-11. Click `Done` button
-12. Save the `keyfile` somewhere secure. We recommend making a folder in your root folder and putting it there. Like this, `~/.gcloud/keyfile.json`. You can change the file name from `keyfile` to anything. Remember the path you saved it to.
+8. Add `Deployment Manager Editor`, `Storage Admin`, `Logging Admin`, `Cloud Functions Developer` roles
+9. Click `Done` button
 
-## Update the `provider` config in `serverless.yml`
+## Authenticate
 
-Open up your `serverless.yml` file and update the `provider` section with your Google Cloud Project id and
-the path to your `keyfile.json` file (this path needs to be absolute!). It should look something like this:
+The Serverless Google Cloud plugin supports several authentication methods.
+
+### Application Default Credentials
+
+The plugin will let Google find the **Application Default Credentials** and implicitly authenticate.
+
+To authenticate with a **Google Account** use <a href="https://cloud.google.com/sdk/gcloud/reference/auth/application-default/login" target="_blank">gcloud cli login</a>
+
+```shell
+gcloud auth application-default login
+```
+
+To authenticate with a **Service Account**:
+
+1. Go on the Service Account panel of `IAM & admin`
+2. Select a Service Account and click on `manage keys`
+3. Create a JSON credentials keyfile
+4. Download and store the keyfile
+5. expose the absolute path of the keyfile in the environment variable `GOOGLE_APPLICATION_CREDENTIALS`
+
+### Explicitly provide the path of a credentials keyfile
+
+1. Get a credentials keyfile as explained above.
+2. In the `provider` config in `serverless.yml`, add a `credentials` attribute with the absolute path of the credentials keyfile:
 
 ```yml
 provider:
   name: google
   runtime: nodejs
   project: my-serverless-project-1234
-  credentials: ~/.gcloud/keyfile.json
+
+  credentials: ~/.gcloud/keyfile.json # <- the path must be absolute
 ```
+
+If `provider.credentials` is provided in the `serverless.yml`, the **Application Default Credentials** will be ignored.

From c8adc0c796a6558c3fe1bc86e3647d3fe711a9ad Mon Sep 17 00:00:00 2001
From: Android3000 <Android3000@users.noreply.github.com>
Date: Tue, 27 Apr 2021 06:24:04 -0400
Subject: [PATCH 0015/1101] feat(AWS IAM): Support `provider.iam.role.path`
 (#9363)

---
 docs/providers/aws/guide/iam.md               | 17 +++++++
 docs/providers/aws/guide/serverless.yml.md    |  1 +
 lib/plugins/aws/lib/naming.js                 |  3 +-
 lib/plugins/aws/provider.js                   |  4 ++
 test/unit/lib/plugins/aws/lib/naming.test.js  |  6 +++
 .../aws/package/lib/mergeIamTemplates.test.js | 45 ++++++++++++-------
 6 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/docs/providers/aws/guide/iam.md b/docs/providers/aws/guide/iam.md
index 8de6af6b2d0..846e99c2615 100644
--- a/docs/providers/aws/guide/iam.md
+++ b/docs/providers/aws/guide/iam.md
@@ -24,6 +24,8 @@ All IAM-related properties of provider are grouped under `iam` property:
 provider:
   iam:
     role:
+      name: custom-role-name
+      path: /custom-role-path/
       statements:
         - Effect: 'Allow',
           Resource: '*',
@@ -120,6 +122,21 @@ provider:
       name: your-custom-name-${sls:stage}-role
 ```
 
+### Path for the Default IAM Role
+
+By default, it will use a path of: `/`
+
+This can be overridden by setting `provider.iam.role.path`:
+
+```yml
+service: new-service
+
+provider:
+  iam:
+    role:
+      path: /your-custom-path/
+```
+
 ## Custom IAM Roles
 
 **WARNING:** You need to take care of the overall role setup as soon as you define custom roles.
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index b7eb727ca72..359ab8b46ca 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -208,6 +208,7 @@ provider:
     # .. OR configure logical role
     role:
       name: your-custom-name-role # Optional custom name for default IAM role
+      path: /your-custom-path/ # Optional custom path for default IAM role
       managedPolicies: # Optional IAM Managed Policies, which allows to include the policies into IAM Role
         - arn:aws:iam:*****:policy/some-managed-policy
       permissionsBoundary: arn:aws:iam::XXXXXX:policy/policy # ARN of an Permissions Boundary for the role.
diff --git a/lib/plugins/aws/lib/naming.js b/lib/plugins/aws/lib/naming.js
index 7893a57e17f..c93353c6f5b 100644
--- a/lib/plugins/aws/lib/naming.js
+++ b/lib/plugins/aws/lib/naming.js
@@ -88,7 +88,8 @@ module.exports = {
 
   // Role
   getRolePath() {
-    return '/';
+    const customRolePath = _.get(this.provider, 'serverless.service.provider.iam.role.path');
+    return customRolePath || '/';
   },
   getRoleName() {
     const customRoleName = _.get(this.provider, 'serverless.service.provider.iam.role.name');
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index baad1017a67..7789c6c154e 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -886,6 +886,10 @@ class AwsProvider {
                           type: 'string',
                           pattern: '^[A-Za-z0-9/_+=,.@-]{1,64}$',
                         },
+                        path: {
+                          type: 'string',
+                          pattern: '(^\\/$)|(^\\/[\u0021-\u007f]+\\/$)',
+                        },
                         managedPolicies: {
                           type: 'array',
                           items: { $ref: '#/definitions/awsArn' },
diff --git a/test/unit/lib/plugins/aws/lib/naming.test.js b/test/unit/lib/plugins/aws/lib/naming.test.js
index 949f4f37a37..f0a348ca5d6 100644
--- a/test/unit/lib/plugins/aws/lib/naming.test.js
+++ b/test/unit/lib/plugins/aws/lib/naming.test.js
@@ -106,6 +106,12 @@ describe('#naming()', () => {
     it('should return `/`', () => {
       expect(sdk.naming.getRolePath()).to.equal('/');
     });
+
+    it('uses custom role path', () => {
+      const customRolePath = '/custom-role-path/';
+      _.set(sdk.naming.provider, 'serverless.service.provider.iam.role.path', customRolePath);
+      expect(sdk.naming.getRolePath()).to.eql(customRolePath);
+    });
   });
 
   describe('#getRoleName()', () => {
diff --git a/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js b/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
index 388e3e9b710..74b5edc6a61 100644
--- a/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
@@ -1,8 +1,12 @@
 'use strict';
 
-const expect = require('chai').expect;
+const chai = require('chai');
 const runServerless = require('../../../../../../utils/run-serverless');
 
+chai.use(require('chai-as-promised'));
+
+const expect = chai.expect;
+
 describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
   describe('No default role', () => {
     it('should not create role resource if there are no functions', async () => {
@@ -274,6 +278,8 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
             provider: {
               iam: {
                 role: {
+                  name: 'custom-default-role',
+                  path: '/custom-role-path/',
                   statements: [
                     {
                       Effect: 'Allow',
@@ -307,23 +313,32 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
       });
 
       it('should support `provider.iam.role.name`', async () => {
-        const customRoleName = 'custom-default-role';
-        const { cfTemplate, awsNaming } = await runServerless({
-          fixture: 'function',
-          command: 'package',
-          configExt: {
-            provider: {
-              iam: {
-                role: {
-                  name: customRoleName,
+        const iamRoleLambdaResource = cfResources[naming.getRoleLogicalId()];
+        expect(iamRoleLambdaResource.Properties.RoleName).to.be.eq('custom-default-role');
+      });
+
+      it('should support `provider.iam.role.path`', async () => {
+        const iamRoleLambdaResource = cfResources[naming.getRoleLogicalId()];
+        expect(iamRoleLambdaResource.Properties.Path).to.be.eq('/custom-role-path/');
+      });
+
+      it('should reject an invalid `provider.iam.role.path`', async () => {
+        const customRolePath = '/invalid';
+        await expect(
+          runServerless({
+            fixture: 'function',
+            command: 'package',
+            configExt: {
+              provider: {
+                iam: {
+                  role: {
+                    path: customRolePath,
+                  },
                 },
               },
             },
-          },
-        });
-
-        const iamRoleLambdaResource = cfTemplate.Resources[awsNaming.getRoleLogicalId()];
-        expect(iamRoleLambdaResource.Properties.RoleName).to.be.eq(customRoleName);
+          })
+        ).to.be.eventually.rejectedWith(/'provider.iam.role.path': should match pattern/);
       });
 
       it('should support `provider.iam.role.statements`', async () => {

From d66215097658be0bd39aef2740cec1d3ffff763d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 26 Apr 2021 15:24:32 +0200
Subject: [PATCH 0016/1101] test: Improve internal naming

---
 .../configuration/variables/resolve.test.js   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/unit/lib/configuration/variables/resolve.test.js b/test/unit/lib/configuration/variables/resolve.test.js
index ca492efc2cc..a7efa4cf33e 100644
--- a/test/unit/lib/configuration/variables/resolve.test.js
+++ b/test/unit/lib/configuration/variables/resolve.test.js
@@ -34,10 +34,10 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
       propertyDeepCircularC: '${sourceProperty(propertyDeepCircularA)}',
       propertyRoot: '${sourceProperty:}',
       withString: 'foo${sourceDirect:}',
-      resolvesVariablesObject: '${sourceVariables(object)}',
-      resolvesVariablesArray: '${sourceVariables(array)}',
-      resolvesVariablesString: '${sourceVariables(string)}',
-      resolvesVariablesStringInvalid: '${sourceVariables(stringInvalid)}',
+      resolvesResultVariablesObject: '${sourceResultVariables(object)}',
+      resolvesResultVariablesArray: '${sourceResultVariables(array)}',
+      resolvesResultVariablesString: '${sourceResultVariables(string)}',
+      resolvesResultVariablesStringInvalid: '${sourceResultVariables(stringInvalid)}',
       incomplete: '${sourceDirect:}elo${sourceIncomplete:}',
       missing: '${sourceDirect:}elo${sourceMissing:}other${sourceMissing:}',
       missingFallback: '${sourceDirect:}elo${sourceMissing:, "foo"}',
@@ -83,7 +83,7 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
           return { value: result == null ? null : result };
         },
       },
-      sourceVariables: {
+      sourceResultVariables: {
         resolve: ({ params: [type] }) => {
           switch (type) {
             case 'object':
@@ -229,9 +229,9 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
     });
 
     it('should resolve variables in returned results', () => {
-      expect(configuration.resolvesVariablesObject).to.deep.equal({ foo: 234 });
-      expect(configuration.resolvesVariablesArray).to.deep.equal([1, 234]);
-      expect(configuration.resolvesVariablesString).to.equal(234);
+      expect(configuration.resolvesResultVariablesObject).to.deep.equal({ foo: 234 });
+      expect(configuration.resolvesResultVariablesArray).to.deep.equal([1, 234]);
+      expect(configuration.resolvesResultVariablesString).to.equal(234);
     });
 
     // https://github.com/serverless/serverless/issues/9016
@@ -340,7 +340,7 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
     });
 
     it('should error on invalid variable notation in returned result', () => {
-      const valueMeta = variablesMeta.get('resolvesVariablesStringInvalid');
+      const valueMeta = variablesMeta.get('resolvesResultVariablesStringInvalid');
       expect(valueMeta).to.not.have.property('variables');
       expect(valueMeta.error.code).to.equal('UNTERMINATED_VARIABLE');
     });
@@ -375,7 +375,7 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
         'propertyDeepCircularB',
         'propertyDeepCircularC',
         'propertyRoot',
-        'resolvesVariablesStringInvalid',
+        'resolvesResultVariablesStringInvalid',
         'missing',
         'nonStringStringPart',
         'nestUnrecognized\0unrecognized',

From 102d0bafe63c9ad0c824fb0d6e50e74ef5b4b550 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 26 Apr 2021 15:40:45 +0200
Subject: [PATCH 0017/1101] refactor(Variables): Fix inline comment typo

---
 lib/configuration/variables/resolve.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/configuration/variables/resolve.js b/lib/configuration/variables/resolve.js
index 583c26a4a1b..48a5421421b 100644
--- a/lib/configuration/variables/resolve.js
+++ b/lib/configuration/variables/resolve.js
@@ -48,7 +48,7 @@ class VariablesResolver {
 
     // Resolve all variables simultaneously
     // Resolution batches are identified to ensure source resolution cache is not shared among them.
-    // (each new resolutioon batch has access to extended configuration structure
+    // (each new resolution batch has access to extended configuration structure
     // and cached source resolver may block access to already resolved structure)
     const resolutionBatchId = ++lastResolutionBatchId;
 

From 2ff58b16bf3fe766685d5b6c30fd9a2bb6e22f0f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 27 Apr 2021 12:36:14 +0200
Subject: [PATCH 0018/1101] feat(Variables): Expose variable resolver function
 to variable sources

---
 docs/providers/aws/guide/variables.md         | 14 ++++-----
 lib/configuration/variables/resolve.js        | 24 +++++++++++++++
 lib/configuration/variables/sources/file.js   | 13 ++++++--
 .../configuration/variables/resolve.test.js   | 30 +++++++++++++++++++
 .../variables/sources/file.test.js            | 11 +++++++
 .../sources/fixture/file-function-variable.js |  5 ++++
 .../file-property-function-variable.js        |  5 ++++
 7 files changed, 92 insertions(+), 10 deletions(-)
 create mode 100644 test/unit/lib/configuration/variables/sources/fixture/file-function-variable.js
 create mode 100644 test/unit/lib/configuration/variables/sources/fixture/file-property-function-variable.js

diff --git a/docs/providers/aws/guide/variables.md b/docs/providers/aws/guide/variables.md
index 60e6b2afd6a..3661b4b13b7 100644
--- a/docs/providers/aws/guide/variables.md
+++ b/docs/providers/aws/guide/variables.md
@@ -476,17 +476,17 @@ With a new variables resolver (_which will be the only used resolver in v3 of a
 
 - `options` - An object referencing resolved CLI params as passed to the command
 - `resolveConfigurationProperty([key1, key2, ...keyN])` - Async function which resolves specific service configuration property. It returns a fully resolved value of configuration property. If circular reference is detected resolution will be rejected.
+- `resolveVariable(variableString)` - Async function which resolves provided variable string. String should be passed without wrapping (`${` and `}`) braces. Example valid values:
+  - `file(./config.js):SOME_VALUE`
+  - `env:SOME_ENV_VAR, null` (end with `, null`, if missing value at the variable source should be resolved with `null`, and not with a thrown error)
 
-Example, of how to obtain a value of AWS region that will be used by Serverless Framework:
+Example on how to obtain some Serverless Framework configuration values:
 
 ```js
 // config.js (when relying on new variables resolver)
-module.exports = async ({ options, resolveConfigurationProperty }) => {
-  let region = options.region;
-  if (!region) {
-    region = await resolveConfigurationProperty(['provider', 'region']);
-    if (!region) region = 'us-east-1'; // Framework default
-  }
+module.exports = async ({ options, resolveVariable }) => {
+  const stage = await resolveVariable('sls:stage');
+  const region = await resolveVariable('opt:region, self:provider.region, "us-east-1"');
   ...
 }
 ```
diff --git a/lib/configuration/variables/resolve.js b/lib/configuration/variables/resolve.js
index 48a5421421b..c71aef5c244 100644
--- a/lib/configuration/variables/resolve.js
+++ b/lib/configuration/variables/resolve.js
@@ -483,6 +483,30 @@ Object.defineProperties(
               propertyPath,
               ensureArray(dependencyPropertyPathKeys, { ensureItem: ensureString })
             ),
+          resolveVariable: async (variableString) => {
+            variableString = `\${${ensureString(variableString, {
+              Error: ServerlessError,
+              name: 'variableString',
+              errorCode: 'INVALID_VARIABLE_INPUT_TYPE',
+            })}}`;
+            const variableData = parse(variableString);
+            if (!variableData) {
+              throw new ServerlessError(
+                `Invalid variable value: "${variableString}"`,
+                'INVALID_VARIABLE_INPUT'
+              );
+            }
+            const meta = {
+              value: variableString,
+              variables: variableData,
+            };
+            await this.resolveVariables(resolutionBatchId, propertyPath, meta);
+            if (meta.error) throw meta.error;
+            if (meta.variables) {
+              throw new ServerlessError('Cannot resolve variable', 'MISSING_VARIABLE_DEPENDENCY');
+            }
+            return meta.value;
+          },
         });
         ensurePlainObject(result, {
           errorMessage: `Unexpected "${sourceData.type}" source result: %v`,
diff --git a/lib/configuration/variables/sources/file.js b/lib/configuration/variables/sources/file.js
index 5075144dc45..4b6ad596bc8 100644
--- a/lib/configuration/variables/sources/file.js
+++ b/lib/configuration/variables/sources/file.js
@@ -21,7 +21,14 @@ const readFile = async (filePath, serviceDir) => {
 };
 
 module.exports = {
-  resolve: async ({ serviceDir, params, address, resolveConfigurationProperty, options }) => {
+  resolve: async ({
+    serviceDir,
+    params,
+    address,
+    resolveConfigurationProperty,
+    resolveVariable,
+    options,
+  }) => {
     if (!params || !params[0]) {
       throw new ServerlessError(
         'Missing path argument in variable "file" source',
@@ -116,7 +123,7 @@ module.exports = {
             }
             try {
               isResolvedByFunction = true;
-              return await result({ options, resolveConfigurationProperty });
+              return await result({ options, resolveConfigurationProperty, resolveVariable });
             } catch (error) {
               if (error.code === 'MISSING_VARIABLE_DEPENDENCY') throw error;
               throw new ServerlessError(
@@ -163,7 +170,7 @@ module.exports = {
         }
         isResolvedByFunction = true;
         try {
-          result = await result({ options, resolveConfigurationProperty });
+          result = await result({ options, resolveConfigurationProperty, resolveVariable });
         } catch (error) {
           if (error.code === 'MISSING_VARIABLE_DEPENDENCY') throw error;
           throw new ServerlessError(
diff --git a/test/unit/lib/configuration/variables/resolve.test.js b/test/unit/lib/configuration/variables/resolve.test.js
index a7efa4cf33e..078716316a6 100644
--- a/test/unit/lib/configuration/variables/resolve.test.js
+++ b/test/unit/lib/configuration/variables/resolve.test.js
@@ -38,6 +38,10 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
       resolvesResultVariablesArray: '${sourceResultVariables(array)}',
       resolvesResultVariablesString: '${sourceResultVariables(string)}',
       resolvesResultVariablesStringInvalid: '${sourceResultVariables(stringInvalid)}',
+      resolvesVariables: '${sourceResolveVariable("sourceParam(${sourceDirect:})")}',
+      resolvesVariablesFallback: '${sourceResolveVariable("sourceMissing:, null"), null}',
+      resolvesVariablesInvalid1: '${sourceResolveVariable("sourceDirect(")}',
+      resolvesVariablesInvalid2: '${sourceResolveVariable("sourceDirect")}',
       incomplete: '${sourceDirect:}elo${sourceIncomplete:}',
       missing: '${sourceDirect:}elo${sourceMissing:}other${sourceMissing:}',
       missingFallback: '${sourceDirect:}elo${sourceMissing:, "foo"}',
@@ -83,6 +87,11 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
           return { value: result == null ? null : result };
         },
       },
+      sourceResolveVariable: {
+        resolve: async ({ params, resolveVariable }) => {
+          return { value: await resolveVariable(params[0]) };
+        },
+      },
       sourceResultVariables: {
         resolve: ({ params: [type] }) => {
           switch (type) {
@@ -376,6 +385,8 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
         'propertyDeepCircularC',
         'propertyRoot',
         'resolvesResultVariablesStringInvalid',
+        'resolvesVariablesInvalid1',
+        'resolvesVariablesInvalid2',
         'missing',
         'nonStringStringPart',
         'nestUnrecognized\0unrecognized',
@@ -391,6 +402,25 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
         `infiniteResolutionRecursion${'\0nest'.repeat(10)}`,
       ]);
     });
+
+    describe('"resolveVariable" source util', () => {
+      it('should resolve variable', () => {
+        expect(configuration.resolvesVariables).to.equal('234');
+      });
+      it('should support multiple sources', () => {
+        expect(configuration.resolvesVariablesFallback).to.equal(null);
+      });
+
+      it('should error on invalid input', () => {
+        let valueMeta = variablesMeta.get('resolvesVariablesInvalid1');
+        expect(valueMeta).to.not.have.property('variables');
+        expect(valueMeta.error.code).to.equal('VARIABLE_RESOLUTION_ERROR');
+
+        valueMeta = variablesMeta.get('resolvesVariablesInvalid2');
+        expect(valueMeta).to.not.have.property('variables');
+        expect(valueMeta.error.code).to.equal('VARIABLE_RESOLUTION_ERROR');
+      });
+    });
   });
 
   describe('Partial resolution', () => {
diff --git a/test/unit/lib/configuration/variables/sources/file.test.js b/test/unit/lib/configuration/variables/sources/file.test.js
index d568a39be49..2ee882d53e4 100644
--- a/test/unit/lib/configuration/variables/sources/file.test.js
+++ b/test/unit/lib/configuration/variables/sources/file.test.js
@@ -23,6 +23,8 @@ describe('test/unit/lib/configuration/variables/sources/file.test.js', () => {
       jsPropertyFunction: '${file(file-property-function.js):property}',
       jsPropertyFunctionProperty: '${file(file-property-function.js):property.result}',
       addressSupport: '${file(file.json):result}',
+      jsFunctionResolveVariable: '${file(file-function-variable.js)}',
+      jsPropertyFunctionResolveVariable: '${file(file-property-function-variable.js):property}',
       nonExistingYaml: '${file(not-existing.yaml), null}',
       nonExistingJson: '${file(not-existing.json), null}',
       nonExistingJs: '${file(not-existing.js), null}',
@@ -89,6 +91,15 @@ describe('test/unit/lib/configuration/variables/sources/file.test.js', () => {
   it('should support "address" argument', () =>
     expect(configuration.addressSupport).to.equal('json'));
 
+  it('should support internal variable resolution', () => {
+    expect(configuration.jsFunctionResolveVariable).to.deep.equal({
+      varResult: { result: 'yaml' },
+    });
+    expect(configuration.jsPropertyFunctionResolveVariable).to.deep.equal({
+      varResult: { result: 'json' },
+    });
+  });
+
   it('should uncoditionally split "address" property keys by "."', () =>
     expect(configuration.ambiguousAddress).to.equal('object'));
 
diff --git a/test/unit/lib/configuration/variables/sources/fixture/file-function-variable.js b/test/unit/lib/configuration/variables/sources/fixture/file-function-variable.js
new file mode 100644
index 00000000000..3e4621d5310
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/fixture/file-function-variable.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = async ({ resolveVariable }) => ({
+  varResult: await resolveVariable('file(file.yaml)'),
+});
diff --git a/test/unit/lib/configuration/variables/sources/fixture/file-property-function-variable.js b/test/unit/lib/configuration/variables/sources/fixture/file-property-function-variable.js
new file mode 100644
index 00000000000..13988c06e22
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/fixture/file-property-function-variable.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports.property = async ({ resolveVariable }) => ({
+  varResult: await resolveVariable('file(file.json)'),
+});

From 78a4a96d74848799b13d273eb25956f4518f5099 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 27 Apr 2021 11:38:10 +0200
Subject: [PATCH 0019/1101] refactor(Telemetry): Add
 `isTelemetryReportedExternally` flag

---
 lib/Serverless.js     | 1 +
 scripts/serverless.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index defd63c6dfc..768c06f53e4 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -95,6 +95,7 @@ class Serverless {
       this.processedInput = { commands, options };
     }
     this.hasResolvedCommandsExternally = Boolean(configObject.hasResolvedCommandsExternally);
+    this.isTelemetryReportedExternally = Boolean(configObject.isTelemetryReportedExternally);
 
     // Due to design flaw properties of configObject (which is to be merged onto `this.config`)
     // also are subject to variables resolution.
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 44ffa54e85c..5f59ee29954 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -369,6 +369,7 @@ const processSpanPromise = (async () => {
       isConfigurationResolved:
         commands[0] === 'plugin' || Boolean(variablesMeta && !variablesMeta.size),
       hasResolvedCommandsExternally: true,
+      isTelemetryReportedExternally: true,
       commands,
       options,
     });

From fac47cfa23c6e0573b0baa9b379d7226654c4dbd Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 27 Apr 2021 11:41:52 +0200
Subject: [PATCH 0020/1101] refactor(Telemetry): Only process in
 `PluginManager` if flag missing

---
 lib/classes/PluginManager.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index efdf0ee5dc9..1efd5a8002c 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -598,12 +598,15 @@ class PluginManager {
       await hook();
     }
 
-    await storeTelemetryLocally(await generateTelemetryPayload(this.serverless));
     let deferredBackendNotificationRequest;
-    if (commandsArray.join(' ') === 'deploy') {
-      deferredBackendNotificationRequest = sendTelemetry({
-        serverlessExecutionSpan: this.serverless.onExitPromise,
-      });
+
+    if (!this.serverless.isTelemetryReportedExternally) {
+      await storeTelemetryLocally(await generateTelemetryPayload(this.serverless));
+      if (commandsArray.join(' ') === 'deploy') {
+        deferredBackendNotificationRequest = sendTelemetry({
+          serverlessExecutionSpan: this.serverless.onExitPromise,
+        });
+      }
     }
 
     try {

From 4cab803ccda05bb3834c0ec4df483837ff84802e Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 27 Apr 2021 11:54:52 +0200
Subject: [PATCH 0021/1101] refactor(Telemetry): Move telemetry handling to
 `scripts/serverless.js`

---
 scripts/serverless.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index 5f59ee29954..f0296615510 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -16,6 +16,13 @@ if (require('../lib/utils/tabCompletion/isSupported') && process.argv[2] === 'co
 const handleError = require('../lib/cli/handle-error');
 const humanizePropertyPathKeys = require('../lib/configuration/variables/humanize-property-path-keys');
 
+const {
+  storeLocally: storeTelemetryLocally,
+  send: sendTelemetry,
+} = require('../lib/utils/telemetry');
+const generateTelemetryPayload = require('../lib/utils/telemetry/generatePayload');
+const processBackendNotificationRequest = require('../lib/utils/processBackendNotificationRequest');
+
 let serverless;
 
 process.once('uncaughtException', (error) =>
@@ -634,6 +641,16 @@ const processSpanPromise = (async () => {
         // Run command
         await serverless.run();
       }
+      await storeTelemetryLocally(await generateTelemetryPayload(serverless));
+      let backendNotificationRequest;
+      if (commands.join(' ') === 'deploy') {
+        backendNotificationRequest = await sendTelemetry({
+          serverlessExecutionSpan: processSpanPromise,
+        });
+      }
+      if (backendNotificationRequest) {
+        await processBackendNotificationRequest(backendNotificationRequest);
+      }
     } catch (error) {
       // If Dashboard Plugin, capture error
       const dashboardPlugin =

From 98e6e1eaf7a58794f51843f75e08fd4a7ceb261a Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 27 Apr 2021 12:01:14 +0200
Subject: [PATCH 0022/1101] refactor(Telemetry): Ensure local serverless will
 not run telemetry

---
 scripts/serverless.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index f0296615510..c0a240ac666 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -384,6 +384,11 @@ const processSpanPromise = (async () => {
     try {
       serverless.onExitPromise = processSpanPromise;
       serverless.invocationId = uuid.v4();
+      // TODO: REMOVE WITH NEXT MAJOR
+      // The purpose of below logic is to ensure that locally resolved `serverless` instance
+      // that might be in lower version will not attempt to handle telemetry on its own
+      require('../lib/utils/telemetry/areDisabled'); // Ensure value is resolved
+      process.env.SLS_TRACKING_DISABLED = '1';
       await serverless.init();
       if (serverless.invokedInstance) {
         // Local (in service) installation was found and initialized internally,

From e1b9ba46bda28db101f61a53b46a66ab195ad810 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 27 Apr 2021 12:35:01 +0200
Subject: [PATCH 0023/1101] refactor(Telemetry): Do not generate payload if
 telemetry disabled

---
 lib/Serverless.js            |  1 +
 lib/classes/PluginManager.js |  5 ++++-
 scripts/serverless.js        | 23 +++++++++++++----------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index 768c06f53e4..679c9806944 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -108,6 +108,7 @@ class Serverless {
     delete configObject.commands;
     delete configObject.isConfigurationResolved;
     delete configObject.hasResolvedCommandsExternally;
+    delete configObject.isTelemetryReportedExternally;
     delete configObject.options;
 
     this.providers = {};
diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 1efd5a8002c..f7d3f885386 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -15,6 +15,7 @@ const renderCommandHelp = require('../cli/render-help/command');
 const { storeLocally: storeTelemetryLocally, send: sendTelemetry } = require('../utils/telemetry');
 const generateTelemetryPayload = require('../utils/telemetry/generatePayload');
 const processBackendNotificationRequest = require('../utils/processBackendNotificationRequest');
+const isTelemetryDisabled = require('../utils/telemetry/areDisabled');
 
 const requireServicePlugin = (serviceDir, pluginPath, localPluginsPath) => {
   if (localPluginsPath && !pluginPath.startsWith('./')) {
@@ -600,7 +601,9 @@ class PluginManager {
 
     let deferredBackendNotificationRequest;
 
-    if (!this.serverless.isTelemetryReportedExternally) {
+    // TODO: Remove this logic with `v3.0.0` along with removal of `isTelemetryReportedExternally`
+    // After we are ensured that local fallback from `v3` will always fall back to `v3` local installation
+    if (!this.serverless.isTelemetryReportedExternally && !isTelemetryDisabled) {
       await storeTelemetryLocally(await generateTelemetryPayload(this.serverless));
       if (commandsArray.join(' ') === 'deploy') {
         deferredBackendNotificationRequest = sendTelemetry({
diff --git a/scripts/serverless.js b/scripts/serverless.js
index c0a240ac666..1212c957bb7 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -22,6 +22,7 @@ const {
 } = require('../lib/utils/telemetry');
 const generateTelemetryPayload = require('../lib/utils/telemetry/generatePayload');
 const processBackendNotificationRequest = require('../lib/utils/processBackendNotificationRequest');
+const isTelemetryDisabled = require('../lib/utils/telemetry/areDisabled');
 
 let serverless;
 
@@ -387,7 +388,6 @@ const processSpanPromise = (async () => {
       // TODO: REMOVE WITH NEXT MAJOR
       // The purpose of below logic is to ensure that locally resolved `serverless` instance
       // that might be in lower version will not attempt to handle telemetry on its own
-      require('../lib/utils/telemetry/areDisabled'); // Ensure value is resolved
       process.env.SLS_TRACKING_DISABLED = '1';
       await serverless.init();
       if (serverless.invokedInstance) {
@@ -646,15 +646,18 @@ const processSpanPromise = (async () => {
         // Run command
         await serverless.run();
       }
-      await storeTelemetryLocally(await generateTelemetryPayload(serverless));
-      let backendNotificationRequest;
-      if (commands.join(' ') === 'deploy') {
-        backendNotificationRequest = await sendTelemetry({
-          serverlessExecutionSpan: processSpanPromise,
-        });
-      }
-      if (backendNotificationRequest) {
-        await processBackendNotificationRequest(backendNotificationRequest);
+
+      if (!isTelemetryDisabled) {
+        await storeTelemetryLocally(await generateTelemetryPayload(serverless));
+        let backendNotificationRequest;
+        if (commands.join(' ') === 'deploy') {
+          backendNotificationRequest = await sendTelemetry({
+            serverlessExecutionSpan: processSpanPromise,
+          });
+        }
+        if (backendNotificationRequest) {
+          await processBackendNotificationRequest(backendNotificationRequest);
+        }
       }
     } catch (error) {
       // If Dashboard Plugin, capture error

From 11e7311032824d357888ef615596c40ec1bbf66c Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 27 Apr 2021 15:36:23 +0200
Subject: [PATCH 0024/1101] refactor: Introduce `is-using-local-installation`
 util

---
 lib/cli/handle-error.js           |  5 ++---
 lib/utils/is-locally-installed.js | 11 +++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 lib/utils/is-locally-installed.js

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 66a0c88145d..89b11f14d98 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -10,8 +10,7 @@ const sfeVersion = require('@serverless/enterprise-plugin/package.json').version
 const { platformClientVersion } = require('@serverless/enterprise-plugin');
 const ServerlessError = require('../serverless-error');
 const tokenizeException = require('../utils/tokenize-exception');
-
-const serverlessPath = path.resolve(__dirname, '../Serverless.js');
+const resolveIsLocallyInstalled = require('../utils/is-locally-installed');
 
 const consoleLog = (message) => process.stdout.write(`${message}\n`);
 
@@ -103,7 +102,7 @@ module.exports = async (exception, options = {}) => {
   const installationModePostfix = await (async () => {
     if (isStandaloneExecutable) return ' (standalone)';
     if (isLocallyInstalled != null) return isLocallyInstalled ? ' (local)' : '';
-    return serverlessPath === (await resolveLocalServerlessPath()) ? ' (local)' : '';
+    return (await resolveIsLocallyInstalled()) ? ' (local)' : '';
   })();
   consoleLog(
     chalk.yellow(`     Framework Version:         ${slsVersion}${installationModePostfix}`)
diff --git a/lib/utils/is-locally-installed.js b/lib/utils/is-locally-installed.js
new file mode 100644
index 00000000000..697a4eb158a
--- /dev/null
+++ b/lib/utils/is-locally-installed.js
@@ -0,0 +1,11 @@
+'use strict';
+
+const path = require('path');
+const resolveLocalServerlessPath = require('../cli/resolve-local-serverless-path');
+
+const serverlessPath = path.resolve(__dirname, '../Serverless.js');
+
+module.exports = async () => {
+  const localServerlessPath = await resolveLocalServerlessPath();
+  return serverlessPath === localServerlessPath;
+};

From ba5f207d0ae83717567a9dad2e74af33eeec905f Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 27 Apr 2021 17:31:31 +0200
Subject: [PATCH 0025/1101] refactor(Telemetry): Make `serverless` optional in
 `generatePayload`

---
 lib/utils/telemetry/generatePayload.js        | 25 +++++++++++----
 .../utils/telemetry/generatePayload.test.js   | 32 +++++++++++++++++++
 2 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index 00d628bda84..c1b8524d2f4 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -8,6 +8,8 @@ const isStandalone = require('../isStandaloneExecutable');
 const { triggeredDeprecations } = require('../logDeprecation');
 const isNpmGlobal = require('../npmPackage/isGlobal');
 const noServiceCommands = require('../../cli/commands-schema/no-service');
+const resolveInput = require('../../cli/resolve-input');
+const resolveIsLocallyInstalled = require('../../utils/is-locally-installed');
 const ci = require('ci-info');
 
 const versions = {
@@ -26,11 +28,12 @@ const checkIsTabAutocompletionInstalled = async () => {
 };
 
 const shouldIncludeServiceSpecificConfig = (serverless) => {
-  if (!serverless.serviceDir) {
+  if (!serverless || !serverless.serviceDir) {
     return false;
   }
 
-  const noServiceCommand = noServiceCommands.get(serverless.processedInput.commands.join(' '));
+  const { command } = resolveInput();
+  const noServiceCommand = noServiceCommands.get(command);
   if (noServiceCommand && !noServiceCommand.serviceDependencyMode) {
     return false;
   }
@@ -72,7 +75,7 @@ const getServiceConfig = (serverless) => {
   };
 };
 
-module.exports = async (serverless) => {
+module.exports = async (serverless = null) => {
   let timezone;
   try {
     timezone = new Intl.DateTimeFormat().resolvedOptions().timeZone;
@@ -108,10 +111,20 @@ module.exports = async (serverless) => {
     return userConfig.get('userId');
   })();
 
+  const isLocallyInstalled = await (async () => {
+    if (serverless) {
+      return serverless.isLocallyInstalled;
+    }
+
+    return resolveIsLocallyInstalled();
+  })();
+
+  const { command } = resolveInput();
+
   const payload = {
     ciName,
     cliName: 'serverless',
-    command: serverless.processedInput.commands.join(' '),
+    command,
     dashboard: {
       userId,
     },
@@ -122,10 +135,10 @@ module.exports = async (serverless) => {
         if (process.platform === 'win32') return 'global:standalone:windows';
         return 'global:standalone:other';
       }
-      if (!serverless.isLocallyInstalled) {
+      if (!isLocallyInstalled) {
         return (await isNpmGlobal()) ? 'global:npm' : 'global:other';
       }
-      if (serverless._isInvokedByGlobalInstallation) return 'local:fallback';
+      if (serverless && serverless._isInvokedByGlobalInstallation) return 'local:fallback';
       return 'local:direct';
     })(),
     isAutoUpdateEnabled: Boolean(userConfig.get('autoUpdate.enabled')),
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index 74a24e7ef03..b032c5dad3e 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -253,6 +253,38 @@ describe('lib/utils/telemetry/generatePayload', () => {
     });
   });
 
+  it('Should correctly resolve payload with missing `serverless` instance', async () => {
+    // Run serverless in order to ensure command resolution
+    await runServerless({
+      fixture: 'aws',
+      command: 'print',
+    });
+
+    const payload = await generatePayload();
+
+    expect(payload).to.have.property('frameworkLocalUserId');
+    delete payload.frameworkLocalUserId;
+    expect(payload).to.have.property('firstLocalInstallationTimestamp');
+    delete payload.firstLocalInstallationTimestamp;
+    expect(payload).to.have.property('timestamp');
+    delete payload.timestamp;
+    expect(payload).to.have.property('dashboard');
+    delete payload.dashboard;
+    expect(payload).to.have.property('timezone');
+    delete payload.timezone;
+    expect(payload).to.have.property('ciName');
+    delete payload.ciName;
+    expect(payload).to.deep.equal({
+      cliName: 'serverless',
+      command: 'print',
+      isAutoUpdateEnabled: false,
+      isTabAutocompletionInstalled: false,
+      triggeredDeprecations: [],
+      installationType: 'global:other',
+      versions,
+    });
+  });
+
   it('Should resolve payload with predefined local config', async () => {
     const { serverless } = await runServerless({
       fixture: 'customProvider',

From 543423d869ba35c6866506bb49a8642700214b3a Mon Sep 17 00:00:00 2001
From: YErii <yeriime@outlook.com>
Date: Tue, 27 Apr 2021 23:47:59 +0800
Subject: [PATCH 0026/1101] feat(Templates): Update dependencies for
 `cloudflare` template (#9373)

---
 .../create/templates/cloudflare-workers-enterprise/package.json | 2 +-
 lib/plugins/create/templates/cloudflare-workers/package.json    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/create/templates/cloudflare-workers-enterprise/package.json b/lib/plugins/create/templates/cloudflare-workers-enterprise/package.json
index e8490dae4b8..c76d334292d 100644
--- a/lib/plugins/create/templates/cloudflare-workers-enterprise/package.json
+++ b/lib/plugins/create/templates/cloudflare-workers-enterprise/package.json
@@ -9,6 +9,6 @@
   "author": "cloudflare",
   "license": "MIT",
   "devDependencies": {
-    "serverless-cloudflare-workers": "1.0.5"
+    "serverless-cloudflare-workers": "1.2.0"
   }
 }
diff --git a/lib/plugins/create/templates/cloudflare-workers/package.json b/lib/plugins/create/templates/cloudflare-workers/package.json
index cff6760a3ca..da5289f9552 100644
--- a/lib/plugins/create/templates/cloudflare-workers/package.json
+++ b/lib/plugins/create/templates/cloudflare-workers/package.json
@@ -9,6 +9,6 @@
   "author": "cloudflare",
   "license": "MIT",
   "devDependencies": {
-    "serverless-cloudflare-workers": "1.0.5"
+    "serverless-cloudflare-workers": "1.2.0"
   }
 }

From ed3d75dafd9b8721ac27e1e84e3cd2d0cd281d96 Mon Sep 17 00:00:00 2001
From: AlinoeDoctari <75314813+AlinoeDoctari@users.noreply.github.com>
Date: Tue, 27 Apr 2021 17:56:18 +0200
Subject: [PATCH 0027/1101] test(AWS Deploy): Add integration tests for custom
 deployment bucket

---
 .../custom-deployment-bucket.test.js          | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 test/integration/custom-deployment-bucket.test.js

diff --git a/test/integration/custom-deployment-bucket.test.js b/test/integration/custom-deployment-bucket.test.js
new file mode 100644
index 00000000000..befc4dc658d
--- /dev/null
+++ b/test/integration/custom-deployment-bucket.test.js
@@ -0,0 +1,36 @@
+'use strict';
+
+const uuid = require('uuid');
+const { expect } = require('chai');
+const fixtures = require('../fixtures/programmatic');
+const awsRequest = require('@serverless/test/aws-request');
+const { deployService, removeService } = require('../utils/integration');
+const { createBucket, deleteBucket } = require('../utils/s3');
+
+describe('Base AWS provider test', function () {
+  this.timeout(1000 * 60 * 10);
+
+  const bucketName = `serverless-test-${uuid.v4()}`;
+  let serviceDir;
+
+  before(async () => {
+    await createBucket(bucketName);
+    ({ servicePath: serviceDir } = await fixtures.setup('function', {
+      configExt: { provider: { deploymentBucket: { name: bucketName } } },
+    }));
+    await deployService(serviceDir);
+  });
+
+  it('should deploy in the configured aws bucket', async () => {
+    // we cannot deploy an empty fixture like aws so we go for a small one
+    const res = await awsRequest('S3', 'listObjects', { Bucket: bucketName });
+    expect(
+      res.Contents.filter((obj) => /compiled-cloudformation-template.json$/.test(obj.Key)).length
+    ).to.equal(1);
+  });
+
+  after(async () => {
+    await removeService(serviceDir);
+    await deleteBucket(bucketName);
+  });
+});

From 07a5483bb6e989aa5d29b0bba03fd2160be28fb7 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 27 Apr 2021 21:09:06 +0200
Subject: [PATCH 0028/1101] refactor(CLI): Pass `serverless` instance to
 `handle-error`

---
 lib/cli/handle-error.js | 18 ++++++++++++++++--
 scripts/serverless.js   |  6 ++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 89b11f14d98..75241782bde 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -33,7 +33,20 @@ const writeMessage = (title, message) => {
 
 module.exports = async (exception, options = {}) => {
   if (!isObject(options)) options = {};
-  const { isUncaughtException, isLocallyInstalled, isInvokedByGlobalInstallation } = options;
+  // Due to the fact that the handler can be invoked via fallback, we need to support both `serverless`
+  // and `isLocallyInstalled` + `isInvokedByGlobalInstallation` properties
+  // TODO: Support for these properties should be removed with next major
+  const {
+    isUncaughtException,
+    isLocallyInstalled: passedIsLocallyInstalled,
+    isInvokedByGlobalInstallation: passedIsInvokedByGlobalInstallation,
+    serverless,
+  } = options;
+
+  const isLocallyInstalled = serverless ? serverless.isLocallyInstalled : passedIsLocallyInstalled;
+  const isInvokedByGlobalInstallation = serverless
+    ? serverless._isInvokedByGlobalInstallation
+    : passedIsInvokedByGlobalInstallation;
 
   if (isInvokedByGlobalInstallation) {
     const localServerlessPath = await resolveLocalServerlessPath();
@@ -43,6 +56,7 @@ module.exports = async (exception, options = {}) => {
       // TODO: Remove local version fallback with next major (when its moved to the top of the process)
       try {
         require(path.resolve(localServerlessPath, '../cli/handle-error'))(exception, {
+          serverless,
           isLocallyInstalled,
           isUncaughtException,
         });
@@ -52,7 +66,7 @@ module.exports = async (exception, options = {}) => {
 
         // Ugly mock of serverless below is used to ensure that Framework version will be logged with `(local)` suffix
         require(path.resolve(localServerlessPath, '../classes/Error')).logError(exception, {
-          serverless: { isLocallyInstalled },
+          serverless: serverless || { isLocallyInstalled },
           forceExit: isUncaughtException,
         });
         return;
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 1212c957bb7..5f45acc7758 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -29,8 +29,7 @@ let serverless;
 process.once('uncaughtException', (error) =>
   handleError(error, {
     isUncaughtException: true,
-    isLocallyInstalled: serverless && serverless.isLocallyInstalled,
-    isInvokedByGlobalInstallation: serverless && serverless.isInvokedByGlobalInstallation,
+    serverless,
   })
 );
 
@@ -685,8 +684,7 @@ const processSpanPromise = (async () => {
     }
   } catch (error) {
     handleError(error, {
-      isLocallyInstalled: serverless && serverless.isLocallyInstalled,
-      isInvokedByGlobalInstallation: serverless && serverless.isInvokedByGlobalInstallation,
+      serverless,
     });
   }
 })();

From a05e88d92e010ddfe019d5b5b873547b7d187d6d Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 28 Apr 2021 11:22:16 +0200
Subject: [PATCH 0029/1101] fix(AWS API Gateway): Ensure unique name for
 request validator

---
 .../events/apiGateway/lib/requestValidator.js     |  4 +++-
 .../apiGateway/lib/requestValidator.test.js       | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
index 690c539410a..ae20a516a27 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
@@ -177,7 +177,9 @@ module.exports = {
 
   createRequestValidator() {
     const validatorLogicalId = this.provider.naming.getValidatorLogicalId();
-    const validatorName = 'Validate request body and querystring parameters';
+    const validatorName = `${
+      this.serverless.service.service
+    }-${this.provider.getStage()} | Validate request body and querystring parameters`;
     this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
       validatorLogicalId
     ] = {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
index 0c0d6b2fbb2..d9e7f439ea5 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
@@ -9,14 +9,18 @@ chai.use(require('chai-as-promised'));
 describe('#compileRequestValidators()', () => {
   let cfResources;
   let naming;
+  let serviceName;
+  let stage;
 
   before(async () => {
-    const { cfTemplate, awsNaming } = await runServerless({
+    const { cfTemplate, awsNaming, serverless } = await runServerless({
       fixture: 'requestSchema',
       command: 'package',
     });
     cfResources = cfTemplate.Resources;
     naming = awsNaming;
+    serviceName = serverless.service.service;
+    stage = serverless.getProvider('aws').getStage();
   });
 
   describe(' reusable schemas ', () => {
@@ -331,6 +335,15 @@ describe('#compileRequestValidators()', () => {
       });
     });
 
+    it('should create validator with that includes `service` and `stage`', () => {
+      const validatorLogicalId = naming.getValidatorLogicalId();
+      const validatorResource = cfResources[validatorLogicalId];
+
+      expect(validatorResource.Properties.Name).to.equal(
+        `${serviceName}-${stage} | Validate request body and querystring parameters`
+      );
+    });
+
     it('should support multiple request:schema property for regression', () => {
       const modelJsonLogicalId = naming.getEndpointModelLogicalId(
         'TestDashdeprecatedDashmultiple',

From 72f952703b0a3ad92ca92c7180f940d7ab82cc4d Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 28 Apr 2021 12:20:44 +0200
Subject: [PATCH 0030/1101] test(Telemetry): Ensure telemetry is not emitted
 during tests

---
 test/mochaPatch.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/mochaPatch.js b/test/mochaPatch.js
index 8bd417359a4..4e86c2c5b16 100644
--- a/test/mochaPatch.js
+++ b/test/mochaPatch.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const path = require('path');
 const fs = require('fs');
 
 // Temporary patch to help tackle peekaboo error, by revelaing fuller stack trace for "fs" errors
@@ -43,19 +42,19 @@ patchPromised('open');
 patchCallback('readFile');
 patchCallback('open');
 
-const disableServerlessStatsRequests = require('@serverless/test/disable-serverless-stats-requests');
 const ensureArtifact = require('../lib/utils/ensureArtifact');
 const resolveLocalServerless = require('../lib/cli/resolve-local-serverless-path');
 const resolveInput = require('../lib/cli/resolve-input');
 
-disableServerlessStatsRequests(path.resolve(__dirname, '..'));
-
 const BbPromise = require('bluebird');
 
 BbPromise.config({
   longStackTraces: true,
 });
 
+// In order to ensure that telemetry is not mistakenly emitted during test runs
+process.env.SLS_TELEMETRY_DISABLED = '1';
+
 const { runnerEmitter } = require('@serverless/test/setup/patch');
 
 runnerEmitter.on('runner', (runner) => {

From d81730c219c70cd11d04a23ee217c4af3b320985 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 28 Apr 2021 15:18:36 +0200
Subject: [PATCH 0031/1101] feat(Telemetry): Do not report telemetry for help
 commands

---
 scripts/serverless.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index 5f45acc7758..fe7551934d4 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -646,7 +646,7 @@ const processSpanPromise = (async () => {
         await serverless.run();
       }
 
-      if (!isTelemetryDisabled) {
+      if (!isTelemetryDisabled && !isHelpRequest) {
         await storeTelemetryLocally(await generateTelemetryPayload(serverless));
         let backendNotificationRequest;
         if (commands.join(' ') === 'deploy') {

From fd97e877cec6397cccf0e2bb2d1bfb5d71bdd798 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 28 Apr 2021 15:27:17 +0200
Subject: [PATCH 0032/1101] refactor: Ensure that `options` are copied in
 Serverless constructor

---
 lib/Serverless.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index 679c9806944..ef0f66058ce 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -87,7 +87,10 @@ class Serverless {
       this._shouldReportMissingServiceDeprecation = true;
     }
     const commands = ensureArray(configObject.commands, { isOptional: true });
-    const options = ensurePlainObject(configObject.options, { isOptional: true });
+    let options = ensurePlainObject(configObject.options, { isOptional: true });
+    // This is a temporary workaround to ensure that original `options` are not mutated
+    // Should be removed after addressing: https://github.com/serverless/serverless/issues/2582
+    if (options) options = { ...options };
     if (!commands || !options) {
       this._shouldReportCommandsDeprecation = true;
       this.processedInput = resolveCliInput();

From f5b2b9be395c9c2d3de4c4f91f991276bc22dc33 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 28 Apr 2021 15:54:27 +0200
Subject: [PATCH 0033/1101] feat(Telemetry): Add `commandOptionNames` to
 payload

---
 lib/utils/telemetry/generatePayload.js        |  7 +++++-
 .../utils/telemetry/generatePayload.test.js   | 25 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index c1b8524d2f4..c800b63cb78 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -119,12 +119,17 @@ module.exports = async (serverless = null) => {
     return resolveIsLocallyInstalled();
   })();
 
-  const { command } = resolveInput();
+  const { command, options, commandSchema } = resolveInput();
+
+  // We only consider options that are present in command schema
+  const availableOptionNames = new Set(Object.keys(commandSchema.options));
+  const commandOptionNames = Object.keys(options).filter((x) => availableOptionNames.has(x));
 
   const payload = {
     ciName,
     cliName: 'serverless',
     command,
+    commandOptionNames,
     dashboard: {
       userId,
     },
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index b032c5dad3e..ef5405046df 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -66,6 +66,7 @@ describe('lib/utils/telemetry/generatePayload', () => {
     expect(payload).to.deep.equal({
       cliName: 'serverless',
       command: 'print',
+      commandOptionNames: [],
       config: {
         provider: {
           name: 'aws',
@@ -113,6 +114,7 @@ describe('lib/utils/telemetry/generatePayload', () => {
     expect(payload).to.deep.equal({
       cliName: 'serverless',
       command: 'print',
+      commandOptionNames: [],
       config: {
         provider: {
           name: 'customProvider',
@@ -158,6 +160,7 @@ describe('lib/utils/telemetry/generatePayload', () => {
     expect(payload).to.deep.equal({
       cliName: 'serverless',
       command: 'print',
+      commandOptionNames: [],
       config: {
         provider: {
           name: 'aws',
@@ -199,6 +202,7 @@ describe('lib/utils/telemetry/generatePayload', () => {
     expect(payload).to.deep.equal({
       cliName: 'serverless',
       command: 'config',
+      commandOptionNames: [],
       isAutoUpdateEnabled: false,
       isTabAutocompletionInstalled: false,
       triggeredDeprecations: [],
@@ -228,6 +232,7 @@ describe('lib/utils/telemetry/generatePayload', () => {
     delete payload.ciName;
     expect(payload).to.deep.equal({
       command: 'help',
+      commandOptionNames: [],
       cliName: 'serverless',
       config: {
         provider: {
@@ -277,6 +282,7 @@ describe('lib/utils/telemetry/generatePayload', () => {
     expect(payload).to.deep.equal({
       cliName: 'serverless',
       command: 'print',
+      commandOptionNames: [],
       isAutoUpdateEnabled: false,
       isTabAutocompletionInstalled: false,
       triggeredDeprecations: [],
@@ -312,6 +318,7 @@ describe('lib/utils/telemetry/generatePayload', () => {
     const { serverless } = await runServerless({
       fixture: 'customProvider',
       command: 'config',
+      commandOptionNames: [],
     });
 
     await fs.promises.writeFile(
@@ -349,6 +356,7 @@ describe('lib/utils/telemetry/generatePayload', () => {
     const { serverless } = await runServerless({
       fixture: 'customProvider',
       command: 'config',
+      commandOptionNames: [],
     });
 
     let payload;
@@ -358,4 +366,21 @@ describe('lib/utils/telemetry/generatePayload', () => {
     });
     expect(payload.ciName).to.equal('Seed');
   });
+
+  it('Should correctly resolve `commandOptionNames` property', async () => {
+    const { serverless } = await runServerless({
+      fixture: 'httpApi',
+      command: 'print',
+      options: {
+        region: 'eu-west-1',
+        format: 'json',
+        path: 'provider.name',
+      },
+    });
+    const payload = await generatePayload(serverless);
+
+    expect(new Set(payload.commandOptionNames)).to.deep.equal(
+      new Set(['region', 'format', 'path'])
+    );
+  });
 });

From 95e063d904443044b73d61e73d04447b298d22ed Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 29 Apr 2021 12:39:47 +0200
Subject: [PATCH 0034/1101] docs: Remove not supported `--noDeploy` from docs

---
 docs/providers/aws/cli-reference/deploy.md      | 1 -
 docs/providers/azure/cli-reference/deploy.md    | 1 -
 docs/providers/kubeless/cli-reference/deploy.md | 1 -
 3 files changed, 3 deletions(-)

diff --git a/docs/providers/aws/cli-reference/deploy.md b/docs/providers/aws/cli-reference/deploy.md
index 7a52946b012..23fda45ca63 100644
--- a/docs/providers/aws/cli-reference/deploy.md
+++ b/docs/providers/aws/cli-reference/deploy.md
@@ -23,7 +23,6 @@ serverless deploy
 ## Options
 
 - `--config` or `-c` Name of your configuration file, if other than `serverless.yml|.yaml|.js|.json`.
-- `--noDeploy` or `-n` Skips the deployment steps and leaves artifacts in the `.serverless` directory
 - `--stage` or `-s` The stage in your service that you want to deploy to.
 - `--region` or `-r` The region in that stage that you want to deploy to.
 - `--package` or `-p` path to a pre-packaged directory and skip packaging step.
diff --git a/docs/providers/azure/cli-reference/deploy.md b/docs/providers/azure/cli-reference/deploy.md
index 19e3657894b..b2099c42e4f 100644
--- a/docs/providers/azure/cli-reference/deploy.md
+++ b/docs/providers/azure/cli-reference/deploy.md
@@ -29,7 +29,6 @@ The `sls deploy apim` command will deploy API management as configured within `s
 - `--region` or `-r` - Specify region name
 - `--subscriptionId` or `-i` - Specify subscription ID
 - `--config` or `-c` Name of your configuration file, if other than `serverless.yml|.yaml|.js|.json`.
-- `--noDeploy` or `-n` Skips the deployment steps and leaves artifacts in the `.serverless` directory
 - `--verbose` or `-v` Shows all stack events during deployment, and display any Stack Output.
 
 ## Artifacts
diff --git a/docs/providers/kubeless/cli-reference/deploy.md b/docs/providers/kubeless/cli-reference/deploy.md
index ec43d318e07..38766ccad4c 100644
--- a/docs/providers/kubeless/cli-reference/deploy.md
+++ b/docs/providers/kubeless/cli-reference/deploy.md
@@ -27,7 +27,6 @@ This is the simplest deployment usage possible. With this command Serverless wil
 ## Options
 
 - `--config` or `-c` Name of your configuration file, if other than `serverless.yml|.yaml|.js|.json`.
-- `--noDeploy` or `-n` Skips the deployment steps and leaves artifacts in the `.serverless` directory.
 - `--verbose` or `-v` Shows all stack events during deployment, and display any Stack Output.
 - `--package` or `-p` The path of a previously packaged deployment to get deployed (skips packaging step).
 - `--function` or `-f` Invoke `deploy function` (see above). Convenience shortcut - cannot be used with `--package`.

From 85b9e5319df48904664f966e988cc725116ce865 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 29 Apr 2021 16:40:45 +0200
Subject: [PATCH 0035/1101] fix(Telemetry): Ensure that container commands do
 not trigger telemetry

---
 lib/cli/resolve-input.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/cli/resolve-input.js b/lib/cli/resolve-input.js
index c9f1f9ae8f8..1d41f45b1b3 100644
--- a/lib/cli/resolve-input.js
+++ b/lib/cli/resolve-input.js
@@ -73,6 +73,10 @@ module.exports = memoizee((commandsSchema = require('./commands-schema')) => {
     result.isContainerCommand = Array.from(commandsSchema.keys()).some((commandName) =>
       commandName.startsWith(`${command} `)
     );
+    if (result.isContainerCommand) {
+      result.isHelpRequest = true;
+      return result;
+    }
   }
 
   if (
@@ -82,18 +86,17 @@ module.exports = memoizee((commandsSchema = require('./commands-schema')) => {
     command === 'help'
   ) {
     result.isHelpRequest = true;
+    return result;
   }
 
-  if (!result.isHelpRequest) {
-    const argsString = args.join(' ');
-    if (command && argsString !== command && !argsString.startsWith(`${command} `)) {
-      // Some options were passed before command name (e.g. "sls -v deploy"), deprecate such usage
-      require('../utils/logDeprecation')(
-        'CLI_OPTIONS_BEFORE_COMMAND',
-        '"serverless" command options are expected to follow command and not be put before the command.\n' +
-          'Starting from next major Serverless will no longer support the latter form.'
-      );
-    }
+  const argsString = args.join(' ');
+  if (command && argsString !== command && !argsString.startsWith(`${command} `)) {
+    // Some options were passed before command name (e.g. "sls -v deploy"), deprecate such usage
+    require('../utils/logDeprecation')(
+      'CLI_OPTIONS_BEFORE_COMMAND',
+      '"serverless" command options are expected to follow command and not be put before the command.\n' +
+        'Starting from next major Serverless will no longer support the latter form.'
+    );
   }
 
   return result;

From 360925d2e0cddb6fbbbb72ca47495aa71a43d1fc Mon Sep 17 00:00:00 2001
From: Stephen <bishtawi@users.noreply.github.com>
Date: Fri, 30 Apr 2021 07:33:32 +0000
Subject: [PATCH 0036/1101] fix(AWS S3): Fix parsing of the artifact S3 url
 (#9380)

---
 docs/providers/aws/guide/packaging.md         |  8 +++--
 lib/plugins/aws/package/compile/functions.js  | 17 +++++-----
 lib/plugins/aws/utils/parse-s3-uri.js         | 26 ++++++++++++++
 .../plugins/aws/utils/parse-s3-uri.test.js    | 34 +++++++++++++++++++
 4 files changed, 73 insertions(+), 12 deletions(-)
 create mode 100644 lib/plugins/aws/utils/parse-s3-uri.js
 create mode 100644 test/unit/lib/plugins/aws/utils/parse-s3-uri.test.js

diff --git a/docs/providers/aws/guide/packaging.md b/docs/providers/aws/guide/packaging.md
index 4c7953504a9..5d4cbde1ec9 100644
--- a/docs/providers/aws/guide/packaging.md
+++ b/docs/providers/aws/guide/packaging.md
@@ -119,7 +119,9 @@ functions:
 
 #### Artifacts hosted on S3
 
-Artifacts can also be fetched from a remote S3 bucket. In this case you just need to provide the S3 object URL as the artifact value. This applies to both, service-wide and function-level artifact setups.
+Artifacts can also be fetched from a remote S3 bucket. In this case you just need to provide the S3 object URI (old style or new) as the artifact value. This applies to both, service-wide and function-level artifact setups.
+
+**Note:** At this time, only S3 URIs are supported. Serverless does not yet support fetching artifacts from non-S3 remote locations.
 
 ##### Service package
 
@@ -127,7 +129,7 @@ Artifacts can also be fetched from a remote S3 bucket. In this case you just nee
 service: my-service
 
 package:
-  artifact: https://s3.amazonaws.com/some-bucket/service-artifact.zip
+  artifact: s3://some-bucket/path/to/service-artifact.zip
 ```
 
 ##### Individual function packages
@@ -142,7 +144,7 @@ functions:
   hello:
     handler: com.serverless.Handler
   package:
-    artifact: https://s3.amazonaws.com/some-bucket/function-artifact.zip
+    artifact: s3://some-bucket/path/to/service-artifact.zip
 ```
 
 ### Packaging functions separately
diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index e259a986e5a..39c11a4ee87 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -9,6 +9,7 @@ const path = require('path');
 const ServerlessError = require('../../../../serverless-error');
 const deepSortObjectByKey = require('../../../../utils/deepSortObjectByKey');
 const getHashForFilePath = require('../lib/getHashForFilePath');
+const parseS3URI = require('../../utils/parse-s3-uri');
 
 class AwsCompileFunctions {
   constructor(serverless, options) {
@@ -102,18 +103,16 @@ class AwsCompileFunctions {
       _.get(functionObject, 'package.artifact') ||
       _.get(this, 'serverless.service.package.artifact');
 
-    const regex = new RegExp('s3\\.amazonaws\\.com/(.+)/(.+)');
-    const match = artifactFilePath.match(regex);
-
-    if (!match) return;
+    const s3Object = parseS3URI(artifactFilePath);
+    if (!s3Object) return;
+    if (process.env.SLS_DEBUG) {
+      this.serverless.cli.log(`Downloading ${s3Object.Key} from bucket ${s3Object.Bucket}`);
+    }
     await new Promise((resolve, reject) => {
       const tmpDir = this.serverless.utils.getTmpDirPath();
-      const filePath = path.join(tmpDir, match[2]);
+      const filePath = path.join(tmpDir, path.basename(s3Object.Key));
 
-      const readStream = S3.getObject({
-        Bucket: match[1],
-        Key: match[2],
-      }).createReadStream();
+      const readStream = S3.getObject(s3Object).createReadStream();
 
       const writeStream = fs.createWriteStream(filePath);
       readStream
diff --git a/lib/plugins/aws/utils/parse-s3-uri.js b/lib/plugins/aws/utils/parse-s3-uri.js
new file mode 100644
index 00000000000..ecb843c48c7
--- /dev/null
+++ b/lib/plugins/aws/utils/parse-s3-uri.js
@@ -0,0 +1,26 @@
+'use strict';
+
+const patterns = [
+  // S3 URI. Ex: s3://bucket/path/to/artifact.zip
+  new RegExp('^s3://([^/]+)/(.+)'),
+
+  // New style S3 URL. Ex: https://bucket.s3.amazonaws.com/path/to/artifact.zip
+  new RegExp('([^/]+)\\.s3\\.amazonaws\\.com/(.+)'),
+
+  // Old style S3 URL. Ex: https://s3.amazonaws.com/bucket/path/to/artifact.zip
+  new RegExp('s3\\.amazonaws\\.com/([^/]+)/(.+)'),
+];
+
+module.exports = (url) => {
+  for (const regex of patterns) {
+    const match = url.match(regex);
+    if (match) {
+      return {
+        Bucket: match[1],
+        Key: match[2],
+      };
+    }
+  }
+
+  return null;
+};
diff --git a/test/unit/lib/plugins/aws/utils/parse-s3-uri.test.js b/test/unit/lib/plugins/aws/utils/parse-s3-uri.test.js
new file mode 100644
index 00000000000..99aad0e3e10
--- /dev/null
+++ b/test/unit/lib/plugins/aws/utils/parse-s3-uri.test.js
@@ -0,0 +1,34 @@
+'use strict';
+const expect = require('chai').expect;
+const parseS3URI = require('../../../../../../lib/plugins/aws/utils/parse-s3-uri');
+
+describe('test/unit/lib/plugins/aws/utils/parse-s3-uri.test.js', () => {
+  it('should parse an S3 URI', () => {
+    const expected = {
+      Bucket: 'test-bucket',
+      Key: 'path/to/artifact.zip',
+    };
+    const actual = parseS3URI('s3://test-bucket/path/to/artifact.zip');
+    expect(actual).to.deep.equal(expected);
+  });
+  it('should parse an old style S3 URL', () => {
+    const expected = {
+      Bucket: 'test-bucket',
+      Key: 'path/to/artifact.zip',
+    };
+    const actual = parseS3URI('https://s3.amazonaws.com/test-bucket/path/to/artifact.zip');
+    expect(actual).to.deep.equal(expected);
+  });
+  it('should parse a new style S3 URL', () => {
+    const expected = {
+      Bucket: 'test-bucket',
+      Key: 'path/to/artifact.zip',
+    };
+    const actual = parseS3URI('https://test-bucket.s3.amazonaws.com/path/to/artifact.zip');
+    expect(actual).to.deep.equal(expected);
+  });
+  it('should reject non S3 URLs', () => {
+    const actual = parseS3URI('https://example.com/path/to/artifact.zip');
+    expect(actual).to.be.null;
+  });
+});

From f1a9a7b76032c312fd83c6dd5e1a332dfffa0b52 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 30 Apr 2021 10:40:47 +0200
Subject: [PATCH 0037/1101] refactor(Telemetry): Add `anonymizeStacktracePaths`
 util

---
 .../telemetry/anonymize-stacktrace-paths.js   |  23 +++
 package.json                                  |   1 +
 .../anonymize-stacktrace-paths.test.js        | 132 ++++++++++++++++++
 3 files changed, 156 insertions(+)
 create mode 100644 lib/utils/telemetry/anonymize-stacktrace-paths.js
 create mode 100644 test/unit/lib/utils/telemetry/anonymize-stacktrace-paths.test.js

diff --git a/lib/utils/telemetry/anonymize-stacktrace-paths.js b/lib/utils/telemetry/anonymize-stacktrace-paths.js
new file mode 100644
index 00000000000..737fbe0035f
--- /dev/null
+++ b/lib/utils/telemetry/anonymize-stacktrace-paths.js
@@ -0,0 +1,23 @@
+'use strict';
+
+const path = require('path');
+const commonPath = require('path2/common');
+
+const anonymizeStacktracePaths = (stacktracePaths) => {
+  let commonPathPrefix = commonPath(...stacktracePaths.filter((p) => path.isAbsolute(p)));
+
+  const lastServerlessIndex = commonPathPrefix.lastIndexOf(`${path.sep}serverless${path.sep}`);
+
+  if (lastServerlessIndex !== -1) {
+    commonPathPrefix = commonPathPrefix.slice(0, lastServerlessIndex);
+  } else {
+    const lastNodeModulesIndex = commonPathPrefix.lastIndexOf(`${path.sep}node_modules${path.sep}`);
+    if (lastNodeModulesIndex !== -1) {
+      commonPathPrefix = commonPathPrefix.slice(0, lastNodeModulesIndex);
+    }
+  }
+
+  return stacktracePaths.map((s) => s.replace(commonPathPrefix, ''));
+};
+
+module.exports = anonymizeStacktracePaths;
diff --git a/package.json b/package.json
index a1aed905698..c972ca04f82 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
     "ncjsm": "^4.1.0",
     "node-fetch": "^2.6.1",
     "object-hash": "^2.1.1",
+    "path2": "^0.1.0",
     "promise-queue": "^2.2.5",
     "replaceall": "^0.1.6",
     "semver": "^7.3.5",
diff --git a/test/unit/lib/utils/telemetry/anonymize-stacktrace-paths.test.js b/test/unit/lib/utils/telemetry/anonymize-stacktrace-paths.test.js
new file mode 100644
index 00000000000..440e31b09b4
--- /dev/null
+++ b/test/unit/lib/utils/telemetry/anonymize-stacktrace-paths.test.js
@@ -0,0 +1,132 @@
+'use strict';
+
+const expect = require('chai').expect;
+const anonymizeStacktracePaths = require('../../../../../lib/utils/telemetry/anonymize-stacktrace-paths');
+
+describe('test/unit/lib/utils/anonymize-stacktrace-paths.test.js', () => {
+  if (process.platform !== 'win32') {
+    it('Should remove common prefix up to last `serverless` occurence', () => {
+      const stacktracePaths = [
+        '/home/xxx/serverless/yyy/zzz-serverless/serverless/lib/plugins/aws/package/lib/getHashForFilePath.js:23:13',
+        '/home/xxx/serverless/yyy/zzz-serverless/serverless/lib/plugins/otherfile.js:100:10',
+        '/home/xxx/serverless/yyy/zzz-serverless/serverless/lib/plugins/another.js:100:10',
+      ];
+
+      const result = anonymizeStacktracePaths(stacktracePaths);
+      expect(result).to.deep.equal([
+        '/serverless/lib/plugins/aws/package/lib/getHashForFilePath.js:23:13',
+        '/serverless/lib/plugins/otherfile.js:100:10',
+        '/serverless/lib/plugins/another.js:100:10',
+      ]);
+    });
+
+    it('Should leave relative paths unaltered and do not consider them for common prefix', () => {
+      const stacktracePaths = [
+        '/home/xxx/serverless/yyy/zzz-serverless/serverless/lib/plugins/aws/package/lib/getHashForFilePath.js:23:13',
+        '/home/xxx/serverless/yyy/zzz-serverless/serverless/lib/plugins/otherfile.js:100:10',
+        'somefile.js:100:10',
+        'another.js:100:10',
+      ];
+
+      const result = anonymizeStacktracePaths(stacktracePaths);
+      expect(result).to.deep.equal([
+        '/serverless/lib/plugins/aws/package/lib/getHashForFilePath.js:23:13',
+        '/serverless/lib/plugins/otherfile.js:100:10',
+        'somefile.js:100:10',
+        'another.js:100:10',
+      ]);
+    });
+
+    it('Should remove common prefix if `/serverless/` or `/node_modules/` not found in path', () => {
+      const stacktracePaths = [
+        '/home/xxx/yyy/zzz-serverless/lib/plugins/aws/package/lib/getHashForFilePath.js:23:13',
+        '/home/xxx/yyy/zzz-serverless/lib/plugins/otherfile.js:100:10',
+        '/home/xxx/yyy/zzz-serverless/lib/plugins/another.js:100:10',
+      ];
+
+      const result = anonymizeStacktracePaths(stacktracePaths);
+      expect(result).to.deep.equal([
+        '/aws/package/lib/getHashForFilePath.js:23:13',
+        '/otherfile.js:100:10',
+        '/another.js:100:10',
+      ]);
+    });
+
+    it('Should remove common prefix up to last `node_modules` occurence if `serverless` not found', () => {
+      const stacktracePaths = [
+        '/home/xxx/yyy/zzz-serverless/node_modules/lib/plugins/aws/package/lib/getHashForFilePath.js:23:13',
+        '/home/xxx/yyy/zzz-serverless/node_modules/lib/plugins/otherfile.js:100:10',
+        '/home/xxx/yyy/zzz-serverless/node_modules/lib/plugins/another.js:100:10',
+      ];
+
+      const result = anonymizeStacktracePaths(stacktracePaths);
+      expect(result).to.deep.equal([
+        '/node_modules/lib/plugins/aws/package/lib/getHashForFilePath.js:23:13',
+        '/node_modules/lib/plugins/otherfile.js:100:10',
+        '/node_modules/lib/plugins/another.js:100:10',
+      ]);
+    });
+  }
+
+  if (process.platform === 'win32') {
+    it('Should remove common prefix up to last `serverless` occurence for windows-style paths', () => {
+      const stacktracePaths = [
+        'C:\\home\\xxx\\serverless\\yyy\\zzz-serverless\\serverless\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        'C:\\home\\xxx\\serverless\\yyy\\zzz-serverless\\serverless\\lib\\plugins\\otherfile.js:100:10',
+        'C:\\home\\xxx\\serverless\\yyy\\zzz-serverless\\serverless\\lib\\plugins\\another.js:100:10',
+      ];
+
+      const result = anonymizeStacktracePaths(stacktracePaths);
+      expect(result).to.deep.equal([
+        '\\serverless\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        '\\serverless\\lib\\plugins\\otherfile.js:100:10',
+        '\\serverless\\lib\\plugins\\another.js:100:10',
+      ]);
+    });
+
+    it('Should remove common prefix up to last `serverless` occurence for windows-style paths', () => {
+      const stacktracePaths = [
+        'C:\\home\\xxx\\serverless\\yyy\\zzz-serverless\\serverless\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        'C:\\home\\xxx\\serverless\\yyy\\zzz-serverless\\serverless\\lib\\plugins\\otherfile.js:100:10',
+        'another.js:100:10',
+      ];
+
+      const result = anonymizeStacktracePaths(stacktracePaths);
+      expect(result).to.deep.equal([
+        '\\serverless\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        '\\serverless\\lib\\plugins\\otherfile.js:100:10',
+        'another.js:100:10',
+      ]);
+    });
+
+    it('Should remove common prefix if `\\serverless\\` not found in path', () => {
+      const stacktracePaths = [
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\lib\\plugins\\otherfile.js:100:10',
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\lib\\plugins\\another.js:100:10',
+      ];
+
+      const result = anonymizeStacktracePaths(stacktracePaths);
+      expect(result).to.deep.equal([
+        '\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        '\\otherfile.js:100:10',
+        '\\another.js:100:10',
+      ]);
+    });
+
+    it('Should remove common prefix up to last `node_modules` occurence if `serverless` not found', () => {
+      const stacktracePaths = [
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\node_modules\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\node_modules\\lib\\plugins\\otherfile.js:100:10',
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\node_modules\\lib\\plugins\\another.js:100:10',
+      ];
+
+      const result = anonymizeStacktracePaths(stacktracePaths);
+      expect(result).to.deep.equal([
+        '\\node_modules\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        '\\node_modules\\lib\\plugins\\otherfile.js:100:10',
+        '\\node_modules\\lib\\plugins\\another.js:100:10',
+      ]);
+    });
+  }
+});

From 8860397798398412d7232d9e4e0001a83efb0424 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 30 Apr 2021 11:01:46 +0200
Subject: [PATCH 0038/1101] refactor(Telemetry): Add `resolveErrorLocation`
 util

---
 lib/utils/telemetry/resolve-error-location.js | 29 +++++++
 lib/utils/tokenize-exception.js               |  1 +
 .../telemetry/resolve-error-location.test.js  | 78 +++++++++++++++++++
 .../unit/lib/utils/tokenize-exception.test.js |  3 +-
 4 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 lib/utils/telemetry/resolve-error-location.js
 create mode 100644 test/unit/lib/utils/telemetry/resolve-error-location.test.js

diff --git a/lib/utils/telemetry/resolve-error-location.js b/lib/utils/telemetry/resolve-error-location.js
new file mode 100644
index 00000000000..94779db85b0
--- /dev/null
+++ b/lib/utils/telemetry/resolve-error-location.js
@@ -0,0 +1,29 @@
+'use strict';
+
+const anonymizeStacktracePaths = require('./anonymize-stacktrace-paths');
+
+const resolveErrorLocation = (exceptionTokens) => {
+  if (!exceptionTokens.stack) return '<not accessible due to non-error exception>';
+
+  const splittedStack = exceptionTokens.stack.split('\n');
+  if (splittedStack.length === 1 && exceptionTokens.code) return '<not available>';
+
+  const stacktraceLineRegex = /\s*at.*\((.*)\).?/;
+  const stacktracePaths = [];
+  for (const line of splittedStack) {
+    const match = line.match(stacktraceLineRegex) || [];
+    const matchedPath = match[1];
+    if (matchedPath) {
+      // Limited to maximum 5 lines in location
+      if (stacktracePaths.push(matchedPath) === 5) {
+        break;
+      }
+    } else if (stacktracePaths.length) break;
+  }
+
+  if (!stacktracePaths.length) return '<not reflected in stack>';
+
+  return anonymizeStacktracePaths(stacktracePaths).join('\n').replace(/\\/g, '/');
+};
+
+module.exports = resolveErrorLocation;
diff --git a/lib/utils/tokenize-exception.js b/lib/utils/tokenize-exception.js
index 38282d3b23a..45122aa0f40 100644
--- a/lib/utils/tokenize-exception.js
+++ b/lib/utils/tokenize-exception.js
@@ -13,6 +13,7 @@ module.exports = (exception) => {
       stack: exception.stack,
       message: exception.message,
       isUserError: userErrorNames.has(exception.name),
+      code: exception.code,
     };
   }
   return {
diff --git a/test/unit/lib/utils/telemetry/resolve-error-location.test.js b/test/unit/lib/utils/telemetry/resolve-error-location.test.js
new file mode 100644
index 00000000000..ceab86b564d
--- /dev/null
+++ b/test/unit/lib/utils/telemetry/resolve-error-location.test.js
@@ -0,0 +1,78 @@
+'use strict';
+
+const expect = require('chai').expect;
+
+const resolveErrorLocation = require('../../../../../lib/utils/telemetry/resolve-error-location');
+const tokenizeException = require('../../../../../lib/utils/tokenize-exception');
+
+describe('test/unit/lib/utils/resolve-error-location.test.js', () => {
+  it('should be null when stack missing', () => {
+    const err = new Error('test');
+    delete err.stack;
+    const result = resolveErrorLocation(tokenizeException(err));
+    expect(result).to.equal('<not accessible due to non-error exception>');
+  });
+
+  it('should be null for error with code and one-line stacktrace', () => {
+    const err = new Error('test');
+    err.code = 'ERR_CODE';
+    err.stack = 'Oneline stacktrace';
+    const result = resolveErrorLocation(tokenizeException(err));
+    expect(result).to.equal('<not available>');
+  });
+
+  it('should be null if no matching lines found', () => {
+    const err = new Error('test');
+    err.stack = 'no matching\nlines in\nstacktrace';
+    const result = resolveErrorLocation(tokenizeException(err));
+    expect(result).to.equal('<not reflected in stack>');
+  });
+
+  if (process.platform !== 'win32') {
+    it('should return at most 5 lines', () => {
+      const err = new Error('test');
+      err.stack =
+        'Error:\n' +
+        '    at Context.it (/home/xxx/serverless/test/unit/lib/utils/resolve-error-location.test.js:10:17)\n' +
+        '    at callFn (/home/xxx/serverless/node_modules/mocha/lib/runnable.js:366:21)\n' +
+        '    at Test.Runnable.run (/home/xxx/serverless/node_modules/mocha/lib/runnable.js:354:5)\n' +
+        '    at Runner.runTest (/home/xxx/serverless/node_modules/mocha/lib/runner.js:677:10)\n' +
+        '    at next (/home/xxx/serverless/node_modules/mocha/lib/runner.js:801:12)\n' +
+        '    at next (/home/xxx/serverless/node_modules/mocha/lib/runner.js:594:14)\n';
+      const result = resolveErrorLocation(tokenizeException(err));
+      expect(result).to.equal(
+        [
+          '/test/unit/lib/utils/resolve-error-location.test.js:10:17',
+          '/node_modules/mocha/lib/runnable.js:366:21',
+          '/node_modules/mocha/lib/runnable.js:354:5',
+          '/node_modules/mocha/lib/runner.js:677:10',
+          '/node_modules/mocha/lib/runner.js:801:12',
+        ].join('\n')
+      );
+    });
+  }
+
+  if (process.platform === 'win32') {
+    it('should return at most 5 lines and use `/` path separator', () => {
+      const err = new Error('test');
+      err.stack =
+        'Error:\n' +
+        '    at Context.it (C:\\home\\xxx\\serverless\\test\\unit\\lib\\utils\\resolve-error-location.test.js:10:17)\n' +
+        '    at callFn (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runnable.js:366:21)\n' +
+        '    at Test.Runnable.run (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runnable.js:354:5)\n' +
+        '    at Runner.runTest (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:677:10)\n' +
+        '    at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:801:12)\n' +
+        '    at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:594:14)\n';
+      const result = resolveErrorLocation(tokenizeException(err));
+      expect(result).to.equal(
+        [
+          '/test/unit/lib/utils/resolve-error-location.test.js:10:17',
+          '/node_modules/mocha/lib/runnable.js:366:21',
+          '/node_modules/mocha/lib/runnable.js:354:5',
+          '/node_modules/mocha/lib/runner.js:677:10',
+          '/node_modules/mocha/lib/runner.js:801:12',
+        ].join('\n')
+      );
+    });
+  }
+});
diff --git a/test/unit/lib/utils/tokenize-exception.test.js b/test/unit/lib/utils/tokenize-exception.test.js
index 81d43d84b75..0e763f5da91 100644
--- a/test/unit/lib/utils/tokenize-exception.test.js
+++ b/test/unit/lib/utils/tokenize-exception.test.js
@@ -7,12 +7,13 @@ const tokenizeError = require('../../../../lib/utils/tokenize-exception');
 
 describe('test/unit/lib/utils/tokenize-exception.test.js', () => {
   it('Should tokenize user error', () => {
-    const errorTokens = tokenizeError(new ServerlessError('Some error'));
+    const errorTokens = tokenizeError(new ServerlessError('Some error', 'ERR_CODE'));
     expect(errorTokens.title).to.equal('Serverless Error');
     expect(errorTokens.name).to.equal('ServerlessError');
     expect(errorTokens.stack).to.include('tokenize-exception.test.js:');
     expect(errorTokens.message).to.equal('Some error');
     expect(errorTokens.isUserError).to.equal(true);
+    expect(errorTokens.code).to.equal('ERR_CODE');
   });
 
   it('Should tokenize programmer error', () => {

From 5861d08768a06e2e88609d0785ce590d3f693683 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 30 Apr 2021 11:20:43 +0200
Subject: [PATCH 0039/1101] feat(Telemetry): Report failures via telemetry

---
 lib/cli/handle-error.js                       |  21 ++++
 lib/utils/telemetry/resolve-error-location.js |   4 +-
 scripts/serverless.js                         |   8 +-
 test/unit/lib/cli/handle-error.test.js        | 106 +++++++++++++++++-
 4 files changed, 134 insertions(+), 5 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 75241782bde..e7f47940fd9 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -11,6 +11,10 @@ const { platformClientVersion } = require('@serverless/enterprise-plugin');
 const ServerlessError = require('../serverless-error');
 const tokenizeException = require('../utils/tokenize-exception');
 const resolveIsLocallyInstalled = require('../utils/is-locally-installed');
+const isTelemetryDisabled = require('../utils/telemetry/areDisabled');
+const { storeLocally: storeTelemetryLocally, send: sendTelemetry } = require('../utils/telemetry');
+const generateTelemetryPayload = require('../utils/telemetry/generatePayload');
+const resolveErrorLocation = require('../utils/telemetry/resolve-error-location');
 
 const consoleLog = (message) => process.stdout.write(`${message}\n`);
 
@@ -41,6 +45,7 @@ module.exports = async (exception, options = {}) => {
     isLocallyInstalled: passedIsLocallyInstalled,
     isInvokedByGlobalInstallation: passedIsInvokedByGlobalInstallation,
     serverless,
+    hasTelemetryBeenReported,
   } = options;
 
   const isLocallyInstalled = serverless ? serverless.isLocallyInstalled : passedIsLocallyInstalled;
@@ -59,6 +64,7 @@ module.exports = async (exception, options = {}) => {
           serverless,
           isLocallyInstalled,
           isUncaughtException,
+          hasTelemetryBeenReported,
         });
         return;
       } catch (error) {
@@ -134,6 +140,21 @@ module.exports = async (exception, options = {}) => {
   consoleLog(chalk.yellow(`     Components Version:        ${componentsVersion}`));
   consoleLog(' ');
 
+  // If `hasTelemetryBeenReported` is not defined, we don't want to publish telemetry
+  if (!isTelemetryDisabled && hasTelemetryBeenReported === false) {
+    const telemetryPayload = await generateTelemetryPayload(serverless);
+    const failureReason = {
+      kind: isUserError ? 'user' : 'programmer',
+      code: exception.code,
+    };
+
+    if (!isUserError || !exception.code) {
+      failureReason.location = resolveErrorLocation(exceptionTokens);
+    }
+    await storeTelemetryLocally({ ...telemetryPayload, failureReason, outcome: 'failure' });
+    await sendTelemetry();
+  }
+
   process.exitCode = 1;
   if (isUncaughtException) process.exit();
 };
diff --git a/lib/utils/telemetry/resolve-error-location.js b/lib/utils/telemetry/resolve-error-location.js
index 94779db85b0..55c6f077bdf 100644
--- a/lib/utils/telemetry/resolve-error-location.js
+++ b/lib/utils/telemetry/resolve-error-location.js
@@ -15,9 +15,7 @@ const resolveErrorLocation = (exceptionTokens) => {
     const matchedPath = match[1];
     if (matchedPath) {
       // Limited to maximum 5 lines in location
-      if (stacktracePaths.push(matchedPath) === 5) {
-        break;
-      }
+      if (stacktracePaths.push(matchedPath) === 5) break;
     } else if (stacktracePaths.length) break;
   }
 
diff --git a/scripts/serverless.js b/scripts/serverless.js
index fe7551934d4..13830b280e9 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -26,10 +26,13 @@ const isTelemetryDisabled = require('../lib/utils/telemetry/areDisabled');
 
 let serverless;
 
+let hasTelemetryBeenReported = false;
+
 process.once('uncaughtException', (error) =>
   handleError(error, {
     isUncaughtException: true,
     serverless,
+    hasTelemetryBeenReported,
   })
 );
 
@@ -647,7 +650,9 @@ const processSpanPromise = (async () => {
       }
 
       if (!isTelemetryDisabled && !isHelpRequest) {
-        await storeTelemetryLocally(await generateTelemetryPayload(serverless));
+        hasTelemetryBeenReported = true;
+        const telemetryPayload = await generateTelemetryPayload(serverless);
+        await storeTelemetryLocally({ ...telemetryPayload, outcome: 'success' });
         let backendNotificationRequest;
         if (commands.join(' ') === 'deploy') {
           backendNotificationRequest = await sendTelemetry({
@@ -685,6 +690,7 @@ const processSpanPromise = (async () => {
   } catch (error) {
     handleError(error, {
       serverless,
+      hasTelemetryBeenReported,
     });
   }
 })();
diff --git a/test/unit/lib/cli/handle-error.test.js b/test/unit/lib/cli/handle-error.test.js
index e689cac1ec5..403c4af4f76 100644
--- a/test/unit/lib/cli/handle-error.test.js
+++ b/test/unit/lib/cli/handle-error.test.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { expect } = require('chai');
+const chai = require('chai');
 const sinon = require('sinon');
 
 const path = require('path');
@@ -8,6 +8,11 @@ const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const handleError = require('../../../../lib/cli/handle-error');
 const isStandaloneExecutable = require('../../../../lib/utils/isStandaloneExecutable');
 const ServerlessError = require('../../../../lib/serverless-error');
+const proxyquire = require('proxyquire');
+
+chai.use(require('sinon-chai'));
+
+const expect = chai.expect;
 
 describe('test/unit/lib/cli/handle-error.test.js', () => {
   it('should log environment information', async () => {
@@ -95,4 +100,103 @@ describe('test/unit/lib/cli/handle-error.test.js', () => {
     );
     expect(stdoutData).to.have.string('NON-ERROR');
   });
+
+  describe('with mocked telemetry', () => {
+    const generateTelemetryPayloadStub = sinon.stub().resolves({});
+    const storeTelemetryLocallyStub = sinon.stub();
+    const sendTelemetryStub = sinon.stub();
+
+    const handleErrorWithMocks = proxyquire('../../../../lib/cli/handle-error', {
+      '../utils/telemetry/areDisabled': false,
+      '../utils/telemetry/generatePayload': generateTelemetryPayloadStub,
+      '../utils/telemetry/index': {
+        send: sendTelemetryStub,
+        storeLocally: storeTelemetryLocallyStub,
+      },
+    });
+
+    beforeEach(() => {
+      sinon.resetHistory();
+    });
+
+    it('should record telemetry only if `hasTelemetryBeenReported` is `false`', async () => {
+      // Override to avoid printing to stdout in tests
+      await overrideStdoutWrite(
+        () => {},
+        () =>
+          handleErrorWithMocks(new ServerlessError('Test error', 'ERR_CODE'), {
+            hasTelemetryBeenReported: false,
+          })
+      );
+      expect(generateTelemetryPayloadStub).to.be.calledOnce;
+      expect(storeTelemetryLocallyStub).to.be.calledOnce;
+      expect(sendTelemetryStub).to.be.calledOnce;
+      expect(storeTelemetryLocallyStub.getCall(0).args[0]).to.deep.equal({
+        outcome: 'failure',
+        failureReason: {
+          code: 'ERR_CODE',
+          kind: 'user',
+        },
+      });
+    });
+
+    it('should add `location` to `failureReason` in telemetry if error code missing', async () => {
+      // Override to avoid printing to stdout in tests
+      await overrideStdoutWrite(
+        () => {},
+        () =>
+          handleErrorWithMocks(new ServerlessError('Test error'), {
+            hasTelemetryBeenReported: false,
+          })
+      );
+      expect(generateTelemetryPayloadStub).to.be.calledOnce;
+      expect(storeTelemetryLocallyStub).to.be.calledOnce;
+      expect(sendTelemetryStub).to.be.calledOnce;
+      expect(storeTelemetryLocallyStub.getCall(0).args[0].failureReason).to.have.property(
+        'location'
+      );
+    });
+
+    it('should add `location` to `failureReason` in telemetry for non-user errors', async () => {
+      // Override to avoid printing to stdout in tests
+      await overrideStdoutWrite(
+        () => {},
+        () =>
+          handleErrorWithMocks(new Error('Test error'), {
+            hasTelemetryBeenReported: false,
+          })
+      );
+      expect(generateTelemetryPayloadStub).to.be.calledOnce;
+      expect(storeTelemetryLocallyStub).to.be.calledOnce;
+      expect(sendTelemetryStub).to.be.calledOnce;
+      expect(storeTelemetryLocallyStub.getCall(0).args[0].failureReason).to.have.property(
+        'location'
+      );
+    });
+
+    it('should not record telemetry if `hasTelemetryBeenReported` is `true`', async () => {
+      // Override to avoid printing to stdout in tests
+      await overrideStdoutWrite(
+        () => {},
+        () =>
+          handleErrorWithMocks(new ServerlessError('Test error'), {
+            hasTelemetryBeenReported: true,
+          })
+      );
+      expect(generateTelemetryPayloadStub).not.to.be.called;
+      expect(storeTelemetryLocallyStub).not.to.be.called;
+      expect(sendTelemetryStub).not.to.be.called;
+    });
+
+    it('should not record telemetry if `hasTelemetryBeenReported` is not passed', async () => {
+      // Override to avoid printing to stdout in tests
+      await overrideStdoutWrite(
+        () => {},
+        () => handleErrorWithMocks(new ServerlessError('Test error'))
+      );
+      expect(generateTelemetryPayloadStub).not.to.be.called;
+      expect(storeTelemetryLocallyStub).not.to.be.called;
+      expect(sendTelemetryStub).not.to.be.called;
+    });
+  });
 });

From d647125ff5daa07972675fd28690d42746ab223b Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 29 Apr 2021 20:59:51 +0200
Subject: [PATCH 0040/1101] feat(Telemetry): Add `commandDurationMs` to payload

---
 bin/serverless.js                                 |  3 +++
 lib/utils/telemetry/generatePayload.js            | 12 ++++++++++++
 .../lib/utils/telemetry/generatePayload.test.js   | 15 +++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/bin/serverless.js b/bin/serverless.js
index c7404e6d86e..607937045db 100755
--- a/bin/serverless.js
+++ b/bin/serverless.js
@@ -2,6 +2,9 @@
 
 'use strict';
 
+// `EvalError` is used to not pollute global namespace but still have the value accessible globally
+EvalError.$serverlessCommandStartTime = process.hrtime();
+
 const nodeVersion = Number(process.version.split('.')[0].slice(1));
 
 if (nodeVersion < 10) {
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index c800b63cb78..baf65f7108d 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -76,6 +76,14 @@ const getServiceConfig = (serverless) => {
 };
 
 module.exports = async (serverless = null) => {
+  let commandDurationMs;
+
+  if (EvalError.$serverlessCommandStartTime) {
+    const diff = process.hrtime(EvalError.$serverlessCommandStartTime);
+    // First element is in seconds and second in nanoseconds
+    commandDurationMs = Math.floor(diff[0] * 1000 + diff[1] / 1000000);
+  }
+
   let timezone;
   try {
     timezone = new Intl.DateTimeFormat().resolvedOptions().timeZone;
@@ -154,6 +162,10 @@ module.exports = async (serverless = null) => {
     versions,
   };
 
+  if (commandDurationMs != null) {
+    payload.commandDurationMs = commandDurationMs;
+  }
+
   if (shouldIncludeServiceSpecificConfig(serverless)) {
     const npmDependencies = (() => {
       const pkgJson = (() => {
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index ef5405046df..fc2af4df733 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -16,6 +16,9 @@ const versions = {
 };
 
 describe('lib/utils/telemetry/generatePayload', () => {
+  // In order for tests below to return `commandDurationMs`
+  EvalError.$serverlessCommandStartTime = process.hrtime();
+
   it('Should resolve payload for AWS service', async () => {
     const { servicePath: serviceDir } = await fixtures.setup('httpApi', {
       configExt: {
@@ -63,6 +66,8 @@ describe('lib/utils/telemetry/generatePayload', () => {
     delete payload.timezone;
     expect(payload).to.have.property('ciName');
     delete payload.ciName;
+    expect(payload).to.have.property('commandDurationMs');
+    delete payload.commandDurationMs;
     expect(payload).to.deep.equal({
       cliName: 'serverless',
       command: 'print',
@@ -111,6 +116,8 @@ describe('lib/utils/telemetry/generatePayload', () => {
     delete payload.timezone;
     expect(payload).to.have.property('ciName');
     delete payload.ciName;
+    expect(payload).to.have.property('commandDurationMs');
+    delete payload.commandDurationMs;
     expect(payload).to.deep.equal({
       cliName: 'serverless',
       command: 'print',
@@ -157,6 +164,8 @@ describe('lib/utils/telemetry/generatePayload', () => {
     delete payload.timezone;
     expect(payload).to.have.property('ciName');
     delete payload.ciName;
+    expect(payload).to.have.property('commandDurationMs');
+    delete payload.commandDurationMs;
     expect(payload).to.deep.equal({
       cliName: 'serverless',
       command: 'print',
@@ -199,6 +208,8 @@ describe('lib/utils/telemetry/generatePayload', () => {
     delete payload.timezone;
     expect(payload).to.have.property('ciName');
     delete payload.ciName;
+    expect(payload).to.have.property('commandDurationMs');
+    delete payload.commandDurationMs;
     expect(payload).to.deep.equal({
       cliName: 'serverless',
       command: 'config',
@@ -230,6 +241,8 @@ describe('lib/utils/telemetry/generatePayload', () => {
     delete payload.timezone;
     expect(payload).to.have.property('ciName');
     delete payload.ciName;
+    expect(payload).to.have.property('commandDurationMs');
+    delete payload.commandDurationMs;
     expect(payload).to.deep.equal({
       command: 'help',
       commandOptionNames: [],
@@ -279,6 +292,8 @@ describe('lib/utils/telemetry/generatePayload', () => {
     delete payload.timezone;
     expect(payload).to.have.property('ciName');
     delete payload.ciName;
+    expect(payload).to.have.property('commandDurationMs');
+    delete payload.commandDurationMs;
     expect(payload).to.deep.equal({
       cliName: 'serverless',
       command: 'print',

From 132c830b0a86998efbae1b4984dc9cea85957d61 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 30 Apr 2021 13:23:00 +0200
Subject: [PATCH 0041/1101] fix(CLI): Ensure no general help is listed under
 interactive setup help

---
 lib/cli/render-help/index.js         | 5 ++++-
 test/unit/scripts/serverless.test.js | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/cli/render-help/index.js b/lib/cli/render-help/index.js
index 8ee11545428..c1da2506e86 100644
--- a/lib/cli/render-help/index.js
+++ b/lib/cli/render-help/index.js
@@ -8,7 +8,10 @@ const renderCommandHelp = require('./command');
 module.exports = (loadedPlugins) => {
   const { command, options } = resolveInput();
   if (!command) {
-    if (options['help-interactive']) renderInteractiveSetupHelp();
+    if (options['help-interactive']) {
+      renderInteractiveSetupHelp();
+      return;
+    }
     renderGeneralHelp(loadedPlugins);
   } else if (command === 'help') {
     renderGeneralHelp(loadedPlugins);
diff --git a/test/unit/scripts/serverless.test.js b/test/unit/scripts/serverless.test.js
index e0a695f202a..17df68a9edf 100644
--- a/test/unit/scripts/serverless.test.js
+++ b/test/unit/scripts/serverless.test.js
@@ -185,6 +185,14 @@ describe('test/unit/scripts/serverless.test.js', () => {
     expect(output).to.include('stage');
   });
 
+  it('should print interactive setup help to stdout', async () => {
+    const output = String(
+      (await spawn('node', [serverlessPath, '--help-interactive'])).stdoutBuffer
+    );
+    expect(output).to.include('Interactive CLI');
+    expect(output).to.not.include('General Commands');
+  });
+
   it('should show help when running container command', async () => {
     // Note: Arbitrarily picked "plugin" command for testing
     const output = stripAnsi(

From 46d5f6aef9190b4e2be6e044b1fe8a1914fd8505 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 30 Apr 2021 13:39:28 +0200
Subject: [PATCH 0042/1101] chore: Bump dependencies

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index c972ca04f82..700c1dc58ab 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.891.0",
+    "aws-sdk": "^2.896.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
@@ -58,7 +58,7 @@
     "lodash": "^4.17.21",
     "memoizee": "^0.4.15",
     "micromatch": "^4.0.4",
-    "ncjsm": "^4.1.0",
+    "ncjsm": "^4.2.0",
     "node-fetch": "^2.6.1",
     "object-hash": "^2.1.1",
     "path2": "^0.1.0",
@@ -80,7 +80,7 @@
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "cos-nodejs-sdk-v5": "^2.9.13",
-    "eslint": "^7.24.0",
+    "eslint": "^7.25.0",
     "eslint-plugin-import": "^2.22.1",
     "git-list-updated": "^1.2.1",
     "github-release-from-cc-changelog": "^2.2.0",

From 6d2ed840fb21d469d8e4a548a38ca9302d5a9d2c Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 30 Apr 2021 13:48:41 +0200
Subject: [PATCH 0043/1101] chore: Release 2.39.0

---
 CHANGELOG.md | 26 ++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dee4facf5d..ec189c4fbf8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,32 @@
 
 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.
 
+## [2.39.0](https://github.com/serverless/serverless/compare/v2.38.0...v2.39.0) (2021-04-30)
+
+### Features
+
+- **AWS IAM:** Support `provider.iam.role.path` ([#9363](https://github.com/serverless/serverless/issues/9363)) ([c8adc0c](https://github.com/serverless/serverless/commit/c8adc0c796a6558c3fe1bc86e3647d3fe711a9ad)) ([Android3000](https://github.com/Android3000))
+- **Variables:** Expose variable resolver function to variable sources ([#9368](https://github.com/serverless/serverless/pull/9368)) ([2ff58b1](https://github.com/serverless/serverless/commit/2ff58b16bf3fe766685d5b6c30fd9a2bb6e22f0f)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **AWS API Gateway:** Ensure unique name for request validator ([#9382](https://github.com/serverless/serverless/pull/9382)) ([a05e88d](https://github.com/serverless/serverless/commit/a05e88d92e010ddfe019d5b5b873547b7d187d6d)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS S3:** Fix parsing of the artifact S3 url ([#9380](https://github.com/serverless/serverless/issues/9380)) ([360925d](https://github.com/serverless/serverless/commit/360925d2e0cddb6fbbbb72ca47495aa71a43d1fc)) ([Stephen](https://github.com/bishtawi))
+- **CLI:** Ensure no general help is listed under interactive setup help ([#9406](https://github.com/serverless/serverless/pull/9406)) ([132c830](https://github.com/serverless/serverless/commit/132c830b0a86998efbae1b4984dc9cea85957d61)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **Telemetry:**
+  - Report failures via telemetry ([#9396](https://github.com/serverless/serverless/pull/9396)) ([5861d08](https://github.com/serverless/serverless/commit/5861d08768a06e2e88609d0785ce590d3f693683)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Ensure that container commands do not trigger telemetry ([#9397](https://github.com/serverless/serverless/pull/9397)) ([85b9e53](https://github.com/serverless/serverless/commit/85b9e5319df48904664f966e988cc725116ce865)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Add `commandDurationMs` to payload ([#9401](https://github.com/serverless/serverless/pull/9401)) ([d647125](https://github.com/serverless/serverless/commit/d647125ff5daa07972675fd28690d42746ab223b)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Add `commandOptionNames` to payload ([#9387](https://github.com/serverless/serverless/pull/9387)) ([f5b2b9b](https://github.com/serverless/serverless/commit/f5b2b9be395c9c2d3de4c4f91f991276bc22dc33)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Ensure `code` to `ServerlessError` instances ([#9357](https://github.com/serverless/serverless/pull/9357)) ([822a7cf](https://github.com/serverless/serverless/commit/822a7cf9f527514b53fd8cfc5c172ec5dc53f4ce)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Templates
+
+- Update dependencies for `cloudflare` template ([#9373](https://github.com/serverless/serverless/issues/9373)) ([543423d](https://github.com/serverless/serverless/commit/543423d869ba35c6866506bb49a8642700214b3a)) ([YErii](https://github.com/YEriin))
+
 ## [2.38.0](https://github.com/serverless/serverless/compare/v2.37.2...v2.38.0) (2021-04-23)
 
 ### Features
diff --git a/package.json b/package.json
index 700c1dc58ab..6ec8759f56e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.38.0",
+  "version": "2.39.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 80511a4b17e77e22cf8b20d1ce50eef7506d4f7f Mon Sep 17 00:00:00 2001
From: Filip Golonka <filip.golonka@schibsted.pl>
Date: Mon, 3 May 2021 09:50:46 +0200
Subject: [PATCH 0044/1101] fix(AWS HTTP API): Ensure to apply tags to stage
 (#9407)

---
 docs/providers/aws/events/http-api.md                     | 4 ++--
 lib/plugins/aws/package/compile/events/httpApi.js         | 8 ++++++++
 .../plugins/aws/package/compile/events/httpApi.test.js    | 4 ++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/docs/providers/aws/events/http-api.md b/docs/providers/aws/events/http-api.md
index 0333c0c58b0..f5e325d4f51 100644
--- a/docs/providers/aws/events/http-api.md
+++ b/docs/providers/aws/events/http-api.md
@@ -406,7 +406,7 @@ provider:
 
 ### Tags
 
-When using HTTP API, it is possible to tag the corresponding API Gateway. By setting `provider.httpApi.useProviderTags` to `true`, all tags defined on `provider.tags` will be applied to API Gateway.
+When using HTTP API, it is possible to tag the corresponding API Gateway resources. By setting `provider.httpApi.useProviderTags` to `true`, all tags defined on `provider.tags` will be applied to API Gateway and API Gateway Stage.
 
 ```yaml
 provider:
@@ -416,6 +416,6 @@ provider:
     useProviderTags: true
 ```
 
-In the above example, the tag project: myProject will be applied to API Gateway.
+In the above example, the tag project: myProject will be applied to API Gateway and API Gateway Stage.
 
 _Note: If the API Gateway has any existing tags applied outside of Serverless Framework, they will be removed during deployment._
diff --git a/lib/plugins/aws/package/compile/events/httpApi.js b/lib/plugins/aws/package/compile/events/httpApi.js
index bc704795172..3abb1835436 100644
--- a/lib/plugins/aws/package/compile/events/httpApi.js
+++ b/lib/plugins/aws/package/compile/events/httpApi.js
@@ -166,6 +166,14 @@ class HttpApiEvents {
       },
     };
 
+    if (
+      this.serverless.service.provider.tags &&
+      this.serverless.service.provider.httpApi &&
+      this.serverless.service.provider.httpApi.useProviderTags
+    ) {
+      properties.Tags = Object.assign({}, this.serverless.service.provider.tags);
+    }
+
     const resource = (this.cfTemplate.Resources[this.provider.naming.getHttpApiStageLogicalId()] = {
       Type: 'AWS::ApiGatewayV2::Stage',
       Properties: properties,
diff --git a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
index b5e075045ed..192f5d0246f 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
@@ -206,6 +206,10 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       const { Tags } = cfApi.Properties;
       expect(Tags).to.be.a('object');
       expect(Tags).to.deep.equal(expectedTags);
+
+      const { Tags: stageTags } = cfStage.Properties;
+      expect(stageTags).to.be.a('object');
+      expect(stageTags).to.deep.equal(expectedTags);
     });
 
     it('should set payload format version', () => {

From 3ccf6a3af3de093fabfa33a966b7a0a922712845 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 3 May 2021 11:35:17 +0200
Subject: [PATCH 0045/1101] fix(Telemetry): Properly resolve location when for
 only relative paths (#9418)

---
 .../telemetry/anonymize-stacktrace-paths.js   | 23 ++++++++++++-------
 .../anonymize-stacktrace-paths.test.js        |  7 ++++++
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/lib/utils/telemetry/anonymize-stacktrace-paths.js b/lib/utils/telemetry/anonymize-stacktrace-paths.js
index 737fbe0035f..15b653d11ad 100644
--- a/lib/utils/telemetry/anonymize-stacktrace-paths.js
+++ b/lib/utils/telemetry/anonymize-stacktrace-paths.js
@@ -4,16 +4,23 @@ const path = require('path');
 const commonPath = require('path2/common');
 
 const anonymizeStacktracePaths = (stacktracePaths) => {
-  let commonPathPrefix = commonPath(...stacktracePaths.filter((p) => path.isAbsolute(p)));
+  const absoluteStacktracePaths = stacktracePaths.filter((p) => path.isAbsolute(p));
+  let commonPathPrefix = '';
 
-  const lastServerlessIndex = commonPathPrefix.lastIndexOf(`${path.sep}serverless${path.sep}`);
+  if (absoluteStacktracePaths.length) {
+    commonPathPrefix = commonPath(...absoluteStacktracePaths);
 
-  if (lastServerlessIndex !== -1) {
-    commonPathPrefix = commonPathPrefix.slice(0, lastServerlessIndex);
-  } else {
-    const lastNodeModulesIndex = commonPathPrefix.lastIndexOf(`${path.sep}node_modules${path.sep}`);
-    if (lastNodeModulesIndex !== -1) {
-      commonPathPrefix = commonPathPrefix.slice(0, lastNodeModulesIndex);
+    const lastServerlessIndex = commonPathPrefix.lastIndexOf(`${path.sep}serverless${path.sep}`);
+
+    if (lastServerlessIndex !== -1) {
+      commonPathPrefix = commonPathPrefix.slice(0, lastServerlessIndex);
+    } else {
+      const lastNodeModulesIndex = commonPathPrefix.lastIndexOf(
+        `${path.sep}node_modules${path.sep}`
+      );
+      if (lastNodeModulesIndex !== -1) {
+        commonPathPrefix = commonPathPrefix.slice(0, lastNodeModulesIndex);
+      }
     }
   }
 
diff --git a/test/unit/lib/utils/telemetry/anonymize-stacktrace-paths.test.js b/test/unit/lib/utils/telemetry/anonymize-stacktrace-paths.test.js
index 440e31b09b4..0a2d915bbca 100644
--- a/test/unit/lib/utils/telemetry/anonymize-stacktrace-paths.test.js
+++ b/test/unit/lib/utils/telemetry/anonymize-stacktrace-paths.test.js
@@ -68,6 +68,13 @@ describe('test/unit/lib/utils/anonymize-stacktrace-paths.test.js', () => {
     });
   }
 
+  it('Should handle stacktrace with only relative paths', () => {
+    const stacktracePaths = ['somefile.js:100:10', 'another.js:100:10'];
+
+    const result = anonymizeStacktracePaths(stacktracePaths);
+    expect(result).to.deep.equal(['somefile.js:100:10', 'another.js:100:10']);
+  });
+
   if (process.platform === 'win32') {
     it('Should remove common prefix up to last `serverless` occurence for windows-style paths', () => {
       const stacktracePaths = [

From 3ab06282fdc9455f364fd73bd14761bae0c8d289 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 3 May 2021 11:56:32 +0200
Subject: [PATCH 0046/1101] fix(Telemetry): Handle error locations not enclosed
 in parens

---
 lib/utils/telemetry/resolve-error-location.js |  4 +-
 .../telemetry/resolve-error-location.test.js  | 40 +++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/lib/utils/telemetry/resolve-error-location.js b/lib/utils/telemetry/resolve-error-location.js
index 55c6f077bdf..e7e91dba33a 100644
--- a/lib/utils/telemetry/resolve-error-location.js
+++ b/lib/utils/telemetry/resolve-error-location.js
@@ -8,11 +8,11 @@ const resolveErrorLocation = (exceptionTokens) => {
   const splittedStack = exceptionTokens.stack.split('\n');
   if (splittedStack.length === 1 && exceptionTokens.code) return '<not available>';
 
-  const stacktraceLineRegex = /\s*at.*\((.*)\).?/;
+  const stacktraceLineRegex = /(?:\s*at.*\((.*)\).?|\s*at\s(.*))/;
   const stacktracePaths = [];
   for (const line of splittedStack) {
     const match = line.match(stacktraceLineRegex) || [];
-    const matchedPath = match[1];
+    const matchedPath = match[1] || match[2];
     if (matchedPath) {
       // Limited to maximum 5 lines in location
       if (stacktracePaths.push(matchedPath) === 5) break;
diff --git a/test/unit/lib/utils/telemetry/resolve-error-location.test.js b/test/unit/lib/utils/telemetry/resolve-error-location.test.js
index ceab86b564d..3675678e781 100644
--- a/test/unit/lib/utils/telemetry/resolve-error-location.test.js
+++ b/test/unit/lib/utils/telemetry/resolve-error-location.test.js
@@ -29,6 +29,26 @@ describe('test/unit/lib/utils/resolve-error-location.test.js', () => {
   });
 
   if (process.platform !== 'win32') {
+    it('should correctly handle paths not enclosed in parentheses', () => {
+      const err = new Error('test');
+      err.stack =
+        'Error: spawn E2BIG\n' +
+        '    at ChildProcess.spawn (node:internal/child_process:403:11)\n' +
+        '    at Object.spawn (node:child_process:573:9)\n' +
+        '    at /home/xxx/api/node_modules/bestzip/lib/bestzip.js:75:29\n' +
+        '    at /home/xxx/api/node_modules/async/dist/async.js:1802:20\n';
+
+      const result = resolveErrorLocation(tokenizeException(err));
+      expect(result).to.equal(
+        [
+          'node:internal/child_process:403:11',
+          'node:child_process:573:9',
+          '/bestzip/lib/bestzip.js:75:29',
+          '/async/dist/async.js:1802:20',
+        ].join('\n')
+      );
+    });
+
     it('should return at most 5 lines', () => {
       const err = new Error('test');
       err.stack =
@@ -53,6 +73,26 @@ describe('test/unit/lib/utils/resolve-error-location.test.js', () => {
   }
 
   if (process.platform === 'win32') {
+    it('should correctly handle paths not enclosed in parentheses', () => {
+      const err = new Error('test');
+      err.stack =
+        'Error: spawn E2BIG\n' +
+        '    at ChildProcess.spawn (node:internal/child_process:403:11)\n' +
+        '    at Object.spawn (node:child_process:573:9)\n' +
+        '    at C:\\home\\xxx\\api\\node_modules\\bestzip\\lib\\bestzip.js:75:29\n' +
+        '    at C:\\home\\xxx\\api\\node_modules\\async\\dist\\async.js:1802:20\n';
+
+      const result = resolveErrorLocation(tokenizeException(err));
+      expect(result).to.equal(
+        [
+          'node:internal/child_process:403:11',
+          'node:child_process:573:9',
+          '/bestzip/lib/bestzip.js:75:29',
+          '/async/dist/async.js:1802:20',
+        ].join('\n')
+      );
+    });
+
     it('should return at most 5 lines and use `/` path separator', () => {
       const err = new Error('test');
       err.stack =

From bdbf154c97abde6ad2ff807dbea3ad1110ee5fec Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 3 May 2021 11:58:47 +0200
Subject: [PATCH 0047/1101] fix(Telemetry): Split stack lines properly on all
 OS-es

---
 lib/utils/telemetry/resolve-error-location.js |  2 +-
 .../telemetry/resolve-error-location.test.js  | 22 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/utils/telemetry/resolve-error-location.js b/lib/utils/telemetry/resolve-error-location.js
index e7e91dba33a..3ddc7d18942 100644
--- a/lib/utils/telemetry/resolve-error-location.js
+++ b/lib/utils/telemetry/resolve-error-location.js
@@ -5,7 +5,7 @@ const anonymizeStacktracePaths = require('./anonymize-stacktrace-paths');
 const resolveErrorLocation = (exceptionTokens) => {
   if (!exceptionTokens.stack) return '<not accessible due to non-error exception>';
 
-  const splittedStack = exceptionTokens.stack.split('\n');
+  const splittedStack = exceptionTokens.stack.split(/[\r\n]+/);
   if (splittedStack.length === 1 && exceptionTokens.code) return '<not available>';
 
   const stacktraceLineRegex = /(?:\s*at.*\((.*)\).?|\s*at\s(.*))/;
diff --git a/test/unit/lib/utils/telemetry/resolve-error-location.test.js b/test/unit/lib/utils/telemetry/resolve-error-location.test.js
index 3675678e781..c7ad4d678d6 100644
--- a/test/unit/lib/utils/telemetry/resolve-error-location.test.js
+++ b/test/unit/lib/utils/telemetry/resolve-error-location.test.js
@@ -76,11 +76,11 @@ describe('test/unit/lib/utils/resolve-error-location.test.js', () => {
     it('should correctly handle paths not enclosed in parentheses', () => {
       const err = new Error('test');
       err.stack =
-        'Error: spawn E2BIG\n' +
-        '    at ChildProcess.spawn (node:internal/child_process:403:11)\n' +
-        '    at Object.spawn (node:child_process:573:9)\n' +
-        '    at C:\\home\\xxx\\api\\node_modules\\bestzip\\lib\\bestzip.js:75:29\n' +
-        '    at C:\\home\\xxx\\api\\node_modules\\async\\dist\\async.js:1802:20\n';
+        'Error: spawn E2BIG\r\n' +
+        '    at ChildProcess.spawn (node:internal/child_process:403:11)\r\n' +
+        '    at Object.spawn (node:child_process:573:9)\r\n' +
+        '    at C:\\home\\xxx\\api\\node_modules\\bestzip\\lib\\bestzip.js:75:29\r\n' +
+        '    at C:\\home\\xxx\\api\\node_modules\\async\\dist\\async.js:1802:20\r\n';
 
       const result = resolveErrorLocation(tokenizeException(err));
       expect(result).to.equal(
@@ -97,12 +97,12 @@ describe('test/unit/lib/utils/resolve-error-location.test.js', () => {
       const err = new Error('test');
       err.stack =
         'Error:\n' +
-        '    at Context.it (C:\\home\\xxx\\serverless\\test\\unit\\lib\\utils\\resolve-error-location.test.js:10:17)\n' +
-        '    at callFn (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runnable.js:366:21)\n' +
-        '    at Test.Runnable.run (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runnable.js:354:5)\n' +
-        '    at Runner.runTest (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:677:10)\n' +
-        '    at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:801:12)\n' +
-        '    at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:594:14)\n';
+        '    at Context.it (C:\\home\\xxx\\serverless\\test\\unit\\lib\\utils\\resolve-error-location.test.js:10:17)\r\n' +
+        '    at callFn (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runnable.js:366:21)\r\n' +
+        '    at Test.Runnable.run (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runnable.js:354:5)\r\n' +
+        '    at Runner.runTest (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:677:10)\r\n' +
+        '    at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:801:12)\r\n' +
+        '    at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:594:14)\r\n';
       const result = resolveErrorLocation(tokenizeException(err));
       expect(result).to.equal(
         [

From 3282d9ace4a2d112def81c1326c48ff47dc9f255 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 3 May 2021 12:13:50 +0200
Subject: [PATCH 0048/1101] chore: Bump dependencies

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 6ec8759f56e..15c4d22450d 100644
--- a/package.json
+++ b/package.json
@@ -23,13 +23,13 @@
   },
   "dependencies": {
     "@serverless/cli": "^1.5.2",
-    "@serverless/components": "^3.9.0",
+    "@serverless/components": "^3.9.1",
     "@serverless/enterprise-plugin": "^4.5.3",
     "@serverless/utils": "^4.1.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.896.0",
+    "aws-sdk": "^2.897.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
@@ -79,7 +79,7 @@
     "@serverless/test": "^8.1.0",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "cos-nodejs-sdk-v5": "^2.9.13",
+    "cos-nodejs-sdk-v5": "^2.9.14",
     "eslint": "^7.25.0",
     "eslint-plugin-import": "^2.22.1",
     "git-list-updated": "^1.2.1",

From 2403cc6e30f336003c5f561aa119e5732fe008b9 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 3 May 2021 12:22:15 +0200
Subject: [PATCH 0049/1101] chore: Release v2.39.1

---
 CHANGELOG.md | 13 +++++++++++++
 package.json |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec189c4fbf8..adc0b6c0a99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 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.
 
+### [2.39.1](https://github.com/serverless/serverless/compare/v2.39.0...v2.39.1) (2021-05-03)
+
+### Bug Fixes
+
+- **AWS HTTP API:** Ensure to apply tags to stage ([#9407](https://github.com/serverless/serverless/issues/9407)) ([80511a4](https://github.com/serverless/serverless/commit/80511a4b17e77e22cf8b20d1ce50eef7506d4f7f)) ([Filip Golonka](https://github.com/filipgolonka))
+
+### Maintenance Improvements
+
+- **Telemetry:**
+  - Handle error locations not enclosed in parens ([#9419](https://github.com/serverless/serverless/pull/9419)) ([3ab0628](https://github.com/serverless/serverless/commit/3ab06282fdc9455f364fd73bd14761bae0c8d289)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Properly resolve location when for only relative paths ([#9418](https://github.com/serverless/serverless/issues/9418)) ([3ccf6a3](https://github.com/serverless/serverless/commit/3ccf6a3af3de093fabfa33a966b7a0a922712845)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Split stack lines properly on all OS-es ([#9419](https://github.com/serverless/serverless/pull/9419)) ([bdbf154](https://github.com/serverless/serverless/commit/bdbf154c97abde6ad2ff807dbea3ad1110ee5fec)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
 ## [2.39.0](https://github.com/serverless/serverless/compare/v2.38.0...v2.39.0) (2021-04-30)
 
 ### Features
diff --git a/package.json b/package.json
index 15c4d22450d..fbf684bd7bf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.39.0",
+  "version": "2.39.1",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From e02a267e688fed77f3aa53a5424b048f5f1970db Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 3 May 2021 13:29:18 +0200
Subject: [PATCH 0050/1101] docs(Variables): Improve CLI options docs

---
 docs/providers/aws/guide/variables.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/providers/aws/guide/variables.md b/docs/providers/aws/guide/variables.md
index 3661b4b13b7..c0eb6e6abf9 100644
--- a/docs/providers/aws/guide/variables.md
+++ b/docs/providers/aws/guide/variables.md
@@ -162,7 +162,7 @@ In the above example you're dynamically adding a prefix to the function names by
 
 ## Referencing CLI Options
 
-To reference CLI options that you passed, use the `${opt:some_option}` syntax in your `serverless.yml` configuration file. It is valid to use the empty string in place of `some_option`. This looks like "`${opt:}`" and the result of declaring this in your `serverless.yml` is to embed the complete `options` object (i.e. all the command line options from your `serverless` command).
+To reference CLI options that you passed, use the `${opt:<option>}` syntax in your `serverless.yml` configuration file. It is valid to use the empty string in place of `<option>`. This looks like "`${opt:}`" and the result of declaring this in your `serverless.yml` is to embed the complete `options` object (i.e. all the command line options from your `serverless` command).
 
 ```yml
 service: new-service

From 42bbfecd51f0f403668090e38db6141bdeb70a1a Mon Sep 17 00:00:00 2001
From: Ikko Ashimine <eltociear@gmail.com>
Date: Tue, 4 May 2021 15:51:30 +0900
Subject: [PATCH 0051/1101] docs(AWS ALB): Fixed typo in docs (#9422)

accross -> across
---
 docs/providers/aws/events/alb.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/providers/aws/events/alb.md b/docs/providers/aws/events/alb.md
index 0573b3a2205..c6293250758 100644
--- a/docs/providers/aws/events/alb.md
+++ b/docs/providers/aws/events/alb.md
@@ -198,7 +198,7 @@ functions:
 
 ## Specifying explicitly the target group names
 
-If you want full control over the name used for the target group you can specify it using the `targetGroupName` property. Note that the name must be unique accross the entire region and is limited to 32 characters with only alphanumerics and hyphens allowed.
+If you want full control over the name used for the target group you can specify it using the `targetGroupName` property. Note that the name must be unique across the entire region and is limited to 32 characters with only alphanumerics and hyphens allowed.
 
 This setting is exclusive with the `provider.alb.targetGroupPrefix` setting.
 

From 2c7f024a57dd70c0e05d6ab7f40e530c96f2351a Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 4 May 2021 09:12:11 +0200
Subject: [PATCH 0052/1101] fix(AWS Deploy): Dont update `vpc` during `deploy
 function` if uses CF

---
 lib/plugins/aws/deployFunction.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/plugins/aws/deployFunction.js b/lib/plugins/aws/deployFunction.js
index 4757c332c43..6e480616b6b 100644
--- a/lib/plugins/aws/deployFunction.js
+++ b/lib/plugins/aws/deployFunction.js
@@ -284,17 +284,11 @@ class AwsDeployFunction {
       const vpc = functionObj.vpc || providerObj.vpc;
       params.VpcConfig = {};
 
-      if (
-        _.isObject(vpc.securityGroupIds['Fn::Split']) ||
-        (Array.isArray(vpc.securityGroupIds) && !vpc.securityGroupIds.some(_.isObject))
-      ) {
+      if (Array.isArray(vpc.securityGroupIds) && !vpc.securityGroupIds.some(_.isObject)) {
         params.VpcConfig.SecurityGroupIds = vpc.securityGroupIds;
       }
 
-      if (
-        _.isObject(vpc.subnetIds['Fn::Split']) ||
-        (Array.isArray(vpc.subnetIds) && !vpc.subnetIds.some(_.isObject))
-      ) {
+      if (Array.isArray(vpc.subnetIds) && !vpc.subnetIds.some(_.isObject)) {
         params.VpcConfig.SubnetIds = vpc.subnetIds;
       }
 

From 7338358126ac249374e341b7b19ce83582ecff1d Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 4 May 2021 14:23:56 +0200
Subject: [PATCH 0053/1101] fix: Fix schema for `Fn::Split` for `vpc` config

---
 lib/plugins/aws/provider.js                   |  5 ++--
 .../aws/package/compile/functions.test.js     | 26 +++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 7789c6c154e..8ef676fb2a0 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -376,8 +376,9 @@ class AwsProvider {
                 type: 'array',
                 minItems: 2,
                 maxItems: 2,
-                items: [{ type: 'string' }, { $ref: '#/definitions/awsCfFunction' }],
-                additionalItems: false,
+                items: {
+                  oneOf: [{ type: 'string' }, { $ref: '#/definitions/awsCfFunction' }],
+                },
               },
             },
             required: ['Fn::Split'],
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index 638b566035e..b787974cbf9 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -1737,6 +1737,32 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       });
     });
 
+    it('should support `vpc` defined with `Fn::Split`', async () => {
+      const { awsNaming, cfTemplate, fixtureData } = await runServerless({
+        fixture: 'function',
+        command: 'package',
+        configExt: {
+          provider: {
+            vpc: {
+              subnetIds: {
+                'Fn::Split': [',', 'subnet-01010101,subnet-21212121'],
+              },
+              securityGroupIds: {
+                'Fn::Split': [',', 'sg-0a0a0a0a,sg-0b0b0b0b'],
+              },
+            },
+          },
+        },
+      });
+
+      const providerConfig = fixtureData.serviceConfig.provider;
+
+      const { VpcConfig } = cfTemplate.Resources[awsNaming.getLambdaLogicalId('foo')].Properties;
+
+      expect(VpcConfig.SecurityGroupIds).to.deep.equal(providerConfig.vpc.securityGroupIds);
+      expect(VpcConfig.SubnetIds).to.deep.equal(providerConfig.vpc.subnetIds);
+    });
+
     describe('when custom IAM role is used', () => {
       let customRoleServiceConfig;
       let fooFunctionRole;

From 2c2c77f90518e73921b0f4dd02767b5ad4476db4 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 4 May 2021 14:41:31 +0200
Subject: [PATCH 0054/1101] fix(Telemetry): Do not report when `commandSchema`
 not resolved

---
 lib/cli/handle-error.js                |  6 ++++--
 test/unit/lib/cli/handle-error.test.js | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index e7f47940fd9..6da59ab7a21 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -15,6 +15,7 @@ const isTelemetryDisabled = require('../utils/telemetry/areDisabled');
 const { storeLocally: storeTelemetryLocally, send: sendTelemetry } = require('../utils/telemetry');
 const generateTelemetryPayload = require('../utils/telemetry/generatePayload');
 const resolveErrorLocation = require('../utils/telemetry/resolve-error-location');
+const resolveInput = require('./resolve-input');
 
 const consoleLog = (message) => process.stdout.write(`${message}\n`);
 
@@ -140,8 +141,9 @@ module.exports = async (exception, options = {}) => {
   consoleLog(chalk.yellow(`     Components Version:        ${componentsVersion}`));
   consoleLog(' ');
 
-  // If `hasTelemetryBeenReported` is not defined, we don't want to publish telemetry
-  if (!isTelemetryDisabled && hasTelemetryBeenReported === false) {
+  // If `hasTelemetryBeenReported` is not defined, we don't want to publish telemetry, similarily for when `commandSchema` is not available
+  const { commandSchema } = resolveInput();
+  if (commandSchema && !isTelemetryDisabled && hasTelemetryBeenReported === false) {
     const telemetryPayload = await generateTelemetryPayload(serverless);
     const failureReason = {
       kind: isUserError ? 'user' : 'programmer',
diff --git a/test/unit/lib/cli/handle-error.test.js b/test/unit/lib/cli/handle-error.test.js
index 403c4af4f76..160dde04980 100644
--- a/test/unit/lib/cli/handle-error.test.js
+++ b/test/unit/lib/cli/handle-error.test.js
@@ -105,8 +105,10 @@ describe('test/unit/lib/cli/handle-error.test.js', () => {
     const generateTelemetryPayloadStub = sinon.stub().resolves({});
     const storeTelemetryLocallyStub = sinon.stub();
     const sendTelemetryStub = sinon.stub();
+    const resolveInputStub = sinon.stub().returns({ commandSchema: {} });
 
     const handleErrorWithMocks = proxyquire('../../../../lib/cli/handle-error', {
+      './resolve-input': resolveInputStub,
       '../utils/telemetry/areDisabled': false,
       '../utils/telemetry/generatePayload': generateTelemetryPayloadStub,
       '../utils/telemetry/index': {
@@ -198,5 +200,22 @@ describe('test/unit/lib/cli/handle-error.test.js', () => {
       expect(storeTelemetryLocallyStub).not.to.be.called;
       expect(sendTelemetryStub).not.to.be.called;
     });
+
+    it('should not record telemetry if `commandSchema` was not resolved', async () => {
+      // Ensure that `commandSchema` is not included in result of `resolveInput`
+      resolveInputStub.returns({});
+
+      // Override to avoid printing to stdout in tests
+      await overrideStdoutWrite(
+        () => {},
+        () =>
+          handleErrorWithMocks(new ServerlessError('Test error'), {
+            hasTelemetryBeenReported: false,
+          })
+      );
+      expect(generateTelemetryPayloadStub).not.to.be.called;
+      expect(storeTelemetryLocallyStub).not.to.be.called;
+      expect(sendTelemetryStub).not.to.be.called;
+    });
   });
 });

From ae9442e53b04648ff5b9c436ef86765d2ad9d872 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 4 May 2021 21:32:52 +0200
Subject: [PATCH 0055/1101] fix(Telemetry): Do not share telemetry cache folder
 with old versions

Fixes the issue for global to local fallback case, where older global which send cache on every command was sending same telemetry as local
---
 lib/utils/telemetry/cache-path.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/telemetry/cache-path.js b/lib/utils/telemetry/cache-path.js
index 64016988afc..bff3e83d8f7 100644
--- a/lib/utils/telemetry/cache-path.js
+++ b/lib/utils/telemetry/cache-path.js
@@ -6,5 +6,5 @@ const os = require('os');
 module.exports = (() => {
   const resolvedHomeDir = os.homedir();
   if (!resolvedHomeDir) return null;
-  return path.resolve(resolvedHomeDir, '.serverless', 'analytics-cache');
+  return path.resolve(resolvedHomeDir, '.serverless', 'telemetry-cache');
 })();

From b7a113d48d634f89a91a31cd05b8d2e57f540c77 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 4 May 2021 21:51:26 +0200
Subject: [PATCH 0056/1101] fix(Telemetry): Ensure proper options for generate
 payload fallback

---
 lib/Serverless.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index ef0f66058ce..f4814bd0c6b 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -275,7 +275,7 @@ class Serverless {
       const commandsSchema = require('./cli/commands-schema/resolve-final')(
         this.pluginManager.externalPlugins,
         {
-          providerName: this.service.providerName,
+          providerName: this.service.provider.name,
         }
       );
       const resolveInput = require('./cli/resolve-input');

From da476ad7ac52b331ae47102e01a9270a18b40833 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 4 May 2021 21:52:59 +0200
Subject: [PATCH 0057/1101] fix(CLI): Ensure to support `disableDeprecations`
 setting

---
 lib/Serverless.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index f4814bd0c6b..6cabd3a3548 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -276,6 +276,7 @@ class Serverless {
         this.pluginManager.externalPlugins,
         {
           providerName: this.service.provider.name,
+          configuration: this.configurationInput,
         }
       );
       const resolveInput = require('./cli/resolve-input');

From 14d39caecfdd67cd3978bad66b3d72c41c63d9ec Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 4 May 2021 22:13:22 +0200
Subject: [PATCH 0058/1101] chore: Bump dependencies

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index fbf684bd7bf..8d40ecf09f0 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.897.0",
+    "aws-sdk": "^2.900.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
@@ -99,7 +99,7 @@
     "semver-regex": "^3.1.2",
     "sinon": "^10.0.0",
     "sinon-chai": "^3.6.0",
-    "standard-version": "^9.2.0",
+    "standard-version": "^9.3.0",
     "strip-ansi": "^6.0.0",
     "ws": "^7.4.5",
     "xml2js": "^0.4.23"

From 6ca24897197dbe4c9ba1b8f7933503be8f24a0f4 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 4 May 2021 22:22:38 +0200
Subject: [PATCH 0059/1101] chore: Release v2.39.2

---
 CHANGELOG.md | 13 +++++++++++++
 package.json |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index adc0b6c0a99..5a7796c7824 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 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.
 
+### [2.39.2](https://github.com/serverless/serverless/compare/v2.39.1...v2.39.2) (2021-05-04)
+
+### Bug Fixes
+
+- **CLI:**
+  - Fix internal command resolution in case of a fallback to local version from older global version ([#9429](https://github.com/serverless/serverless/pull/9429)) ([b7a113d](https://github.com/serverless/serverless/commit/b7a113d48d634f89a91a31cd05b8d2e57f540c77)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Ensure to support `disableDeprecations` setting when validating not supported options ([#9429](https://github.com/serverless/serverless/pull/9429)) ([da476ad](https://github.com/serverless/serverless/commit/da476ad7ac52b331ae47102e01a9270a18b40833)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Telemetry:**
+  - Do not attempt to report unrecognized commands ([#9427](https://github.com/serverless/serverless/pull/9427)) ([2c2c77f](https://github.com/serverless/serverless/commit/2c2c77f90518e73921b0f4dd02767b5ad4476db4)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Do not share telemetry cache folder with old versions ([#9429](https://github.com/serverless/serverless/pull/9429)) ([ae9442e](https://github.com/serverless/serverless/commit/ae9442e53b04648ff5b9c436ef86765d2ad9d872)) ([Mariusz Nowak](https://github.com/medikoo))
+- **AWS Deploy:** Fix changes detection when VPC with intrinsic CF functions is involved ([#9425](https://github.com/serverless/serverless/pull/9425)) ([2c7f024](https://github.com/serverless/serverless/commit/2c7f024a57dd70c0e05d6ab7f40e530c96f2351a)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Fix `provider.vpc` configuration schema ([#9425](https://github.com/serverless/serverless/pull/9)) ([7338358](https://github.com/serverless/serverless/commit/7338358126ac249374e341b7b19ce83582ecff1d)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
 ### [2.39.1](https://github.com/serverless/serverless/compare/v2.39.0...v2.39.1) (2021-05-03)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 8d40ecf09f0..486e200ee43 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.39.1",
+  "version": "2.39.2",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 078ec59058e1c37bd81388c7e81087b48fc2ba24 Mon Sep 17 00:00:00 2001
From: Nicholas Wehr <33910651+wwwehr@users.noreply.github.com>
Date: Thu, 6 May 2021 09:09:16 +0000
Subject: [PATCH 0060/1101] feat(AWS Lambda): Add `ecr.scanOnPush`
 configuration option (#9379)

---
 docs/providers/aws/guide/functions.md      |  3 ++
 docs/providers/aws/guide/serverless.yml.md |  1 +
 lib/plugins/aws/provider.js                | 21 +++++++---
 test/unit/lib/plugins/aws/provider.test.js | 48 ++++++++++++++++++++++
 4 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/docs/providers/aws/guide/functions.md b/docs/providers/aws/guide/functions.md
index abbbb61f80f..ea1bfceeb06 100644
--- a/docs/providers/aws/guide/functions.md
+++ b/docs/providers/aws/guide/functions.md
@@ -203,6 +203,8 @@ See the documentation about [IAM](./iam.md) for function level IAM roles.
 
 Alternatively lambda environment can be configured through docker images. Image published to AWS ECR registry can be referenced as lambda source (check [AWS Lambda – Container Image Support](https://aws.amazon.com/blogs/aws/new-for-aws-lambda-container-image-support/)). In addition, you can also define your own images that will be built locally and uploaded to AWS ECR registry.
 
+Serverless will create an ECR repository for your image, but it currently does not manage updates to it. An ECR repository is created only for new services or the first time that a function configured with an `image` is deployed. In service configuration, you can configure the ECR repository to scan for CVEs via the `provider.ecr.scanOnPush` property, which is `false` by default. (See [documentation](https://docs.aws.amazon.com/AmazonECR/latest/userguide/image-scanning.html))
+
 In service configuration, images can be configured via `provider.ecr.images`. To define an image that will be built locally, you need to specify `path` property, which should point to valid docker context directory. Optionally, you can also set `file` to specify Dockerfile that should be used when building an image. It is also possible to define images that already exist in AWS ECR repository. In order to do that, you need to define `uri` property, which should follow `<account>.dkr.ecr.<region>.amazonaws.com/<repository>@<digest>` or `<account>.dkr.ecr.<region>.amazonaws.com/<repository>:<tag>` format. Additionally, with `buildArgs` property, you can define arguments that will be passed to `docker build` command with `--build-arg` flag. They might be later referenced via `ARG` within your `Dockerfile`. The `cacheFrom` property can be used to specify which images to use as a source for layer caching in the `docker build` command with `--cache-from` flag. When `uri` is defined for an image, `buildArgs` and `cacheFrom` cannot be defined.
 
 Example configuration
@@ -212,6 +214,7 @@ service: service-name
 provider:
   name: aws
   ecr:
+    scanOnPush: true
     images:
       baseimage:
         path: ./path/to/context
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 359ab8b46ca..33ff1ce7187 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -62,6 +62,7 @@ provider:
   deploymentPrefix: serverless # The S3 prefix under which deployed artifacts should be stored. Default is serverless
   lambdaHashingVersion: 20201221 # optional, version of hashing algorithm that should be used by the framework
   ecr:
+    scanOnPush: true
     images: # Definitions of images that later can be referenced by key in `function.image`
       baseimage:
         uri: 000000000000.dkr.ecr.us-east-1.amazonaws.com/test-image@sha256:6bb600b4d6e1d7cf521097177d111111ea373edb91984a505333be8ac9455d38 # Image uri of existing Docker image in ECR
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 8ef676fb2a0..a943e079fc9 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -913,6 +913,7 @@ class AwsProvider {
             ecr: {
               type: 'object',
               properties: {
+                scanOnPush: { type: 'boolean' },
                 images: {
                   type: 'object',
                   patternProperties: {
@@ -1832,7 +1833,7 @@ Object.defineProperties(
       { promise: true }
     ),
     getOrCreateEcrRepository: d(
-      async function () {
+      async function (scanOnPush) {
         const registryId = await this.getAccountId();
         const repositoryName = this.naming.getEcrRepositoryName();
         let repositoryUri;
@@ -1848,6 +1849,7 @@ Object.defineProperties(
           }
           const result = await this.request('ECR', 'createRepository', {
             repositoryName,
+            imageScanningConfiguration: { scanOnPush },
           });
           repositoryUri = result.repository.repositoryUri;
         }
@@ -1859,7 +1861,7 @@ Object.defineProperties(
       { promise: true }
     ),
     resolveImageUriAndShaFromPath: d(
-      async function (imageName, imagePath, imageFilename, buildArgs, cacheFrom) {
+      async function (imageName, imagePath, imageFilename, buildArgs, cacheFrom, scanOnPush) {
         await this.ensureDockerIsAvailable();
 
         let isDockerfileAvailable = false;
@@ -1878,7 +1880,7 @@ Object.defineProperties(
           );
         }
 
-        const { repositoryUri, repositoryName } = await this.getOrCreateEcrRepository();
+        const { repositoryUri, repositoryName } = await this.getOrCreateEcrRepository(scanOnPush);
 
         const localTag = `${repositoryName}:${imageName}`;
         const remoteTag = `${repositoryUri}:${imageName}`;
@@ -2009,6 +2011,7 @@ Object.defineProperties(
         const defaultDockerfile = 'Dockerfile';
         const defaultBuildArgs = {};
         const defaultCacheFrom = [];
+        const defaultScanOnPush = false;
 
         if (imageUri) {
           return await this.resolveImageUriAndShaFromUri(imageUri);
@@ -2019,6 +2022,12 @@ Object.defineProperties(
           `ecr.images.${imageName}`
         );
 
+        const imageScanDefinedInProvider = _.get(
+          this.serverless.service.provider,
+          'ecr.scanOnPush',
+          defaultScanOnPush
+        );
+
         if (!imageDefinedInProvider) {
           throw new ServerlessError(
             `Referenced "${imageName}" not defined in "provider.ecr.images"`,
@@ -2057,7 +2066,8 @@ Object.defineProperties(
               imageDefinedInProvider.path,
               imageDefinedInProvider.file || defaultDockerfile,
               imageDefinedInProvider.buildArgs || defaultBuildArgs,
-              imageDefinedInProvider.cacheFrom || defaultCacheFrom
+              imageDefinedInProvider.cacheFrom || defaultCacheFrom,
+              imageScanDefinedInProvider
             );
           }
           return await this.resolveImageUriAndShaFromUri(imageDefinedInProvider.uri);
@@ -2070,7 +2080,8 @@ Object.defineProperties(
           imageDefinedInProvider,
           defaultDockerfile,
           imageDefinedInProvider.buildArgs || defaultBuildArgs,
-          imageDefinedInProvider.cacheFrom || defaultCacheFrom
+          imageDefinedInProvider.cacheFrom || defaultCacheFrom,
+          imageScanDefinedInProvider
         );
       },
       { promise: true }
diff --git a/test/unit/lib/plugins/aws/provider.test.js b/test/unit/lib/plugins/aws/provider.test.js
index e36ce853675..355f099f758 100644
--- a/test/unit/lib/plugins/aws/provider.test.js
+++ b/test/unit/lib/plugins/aws/provider.test.js
@@ -1124,6 +1124,7 @@ aws_secret_access_key = CUSTOMSECRET
       const proxyEndpoint = `https://${repositoryUri}`;
       const describeRepositoriesStub = sinon.stub();
       const createRepositoryStub = sinon.stub();
+      const createRepositoryStubScanOnPush = sinon.stub();
       const baseAwsRequestStubMap = {
         STS: {
           getCallerIdentity: {
@@ -1216,6 +1217,53 @@ aws_secret_access_key = CUSTOMSECRET
         expect(spawnExtStub).to.be.calledWith('docker', ['push', `${repositoryUri}:baseimage`]);
       });
 
+      it('should work correctly when repository does not exist beforehand and scanOnPush is set', async () => {
+        const awsRequestStubMap = {
+          ...baseAwsRequestStubMap,
+          ECR: {
+            ...baseAwsRequestStubMap.ECR,
+            describeRepositories: describeRepositoriesStub.throws({
+              providerError: { code: 'RepositoryNotFoundException' },
+            }),
+            createRepository: createRepositoryStubScanOnPush.resolves({
+              repository: { repositoryUri },
+            }),
+          },
+        };
+
+        const { awsNaming, cfTemplate } = await runServerless({
+          fixture: 'ecr',
+          command: 'package',
+          awsRequestStubMap,
+          modulesCacheStub,
+          configExt: {
+            provider: {
+              ecr: {
+                scanOnPush: true,
+                images: {
+                  baseimage: {
+                    path: './',
+                    file: 'Dockerfile.dev',
+                  },
+                },
+              },
+            },
+          },
+        });
+
+        const functionCfLogicalId = awsNaming.getLambdaLogicalId('foo');
+        const functionCfConfig = cfTemplate.Resources[functionCfLogicalId].Properties;
+        const versionCfConfig = findVersionCfConfig(cfTemplate.Resources, functionCfLogicalId);
+
+        expect(functionCfConfig.Code.ImageUri).to.deep.equal(`${repositoryUri}@sha256:${imageSha}`);
+        expect(versionCfConfig.CodeSha256).to.equal(imageSha);
+        expect(describeRepositoriesStub).to.be.calledOnce;
+        expect(createRepositoryStubScanOnPush).to.be.calledOnce;
+        expect(createRepositoryStubScanOnPush.args[0][0].imageScanningConfiguration).to.deep.equal({
+          scanOnPush: true,
+        });
+      });
+
       it('should work correctly when repository does not exist beforehand', async () => {
         const awsRequestStubMap = {
           ...baseAwsRequestStubMap,

From 962433864ff4f52bf178b7afc1b6e54e58e58702 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 6 May 2021 11:50:44 +0200
Subject: [PATCH 0061/1101] fix(CLI): Do not validate command when falling back
 to old version

Old versions may not provide information on external plugins, and in such case we do not have a full picture supported commands and options.
We should avoid any validation in such case
---
 scripts/serverless.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index 13830b280e9..48e8b89f8f0 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -402,7 +402,7 @@ const processSpanPromise = (async () => {
       // IIFE for maintanance convenience
       await (async () => {
         if (!configuration) return;
-        let hasFinalCommandSchema = false;
+        let hasFinalCommandSchema = null;
         if (configuration.plugins) {
           // After plugins are loaded, re-resolve CLI command and options schema as plugin
           // might have defined extra commands and options
@@ -423,9 +423,12 @@ const processSpanPromise = (async () => {
               hasFinalCommandSchema = true;
             }
           } else {
-            // Invocation fallen back to old Framework version. As we do not have easily
-            // accessible info on loaded plugins, skip further variables resolution
+            // Invocation fallen back to old Framework version, where we do not have easily
+            // accessible info on loaded plugins
+            // 1. Skip further variables resolution
             variablesMeta = null;
+            // 2. Avoid command validation
+            hasFinalCommandSchema = false;
           }
         }
         if (!providerName && !hasFinalCommandSchema) {
@@ -435,9 +438,10 @@ const processSpanPromise = (async () => {
             require('../lib/cli/commands-schema/aws-service')
           ));
         }
+        if (hasFinalCommandSchema == null) hasFinalCommandSchema = true;
 
         // Validate result command and options
-        require('../lib/cli/ensure-supported-command')(configuration);
+        if (hasFinalCommandSchema) require('../lib/cli/ensure-supported-command')(configuration);
         if (isHelpRequest) return;
         if (!_.get(variablesMeta, 'size')) return;
 

From 5c7e87f3e06b9ce6e91b8017b4d65062d6695817 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 6 May 2021 13:07:13 +0200
Subject: [PATCH 0062/1101] chore: Bump dependencies

---
 package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 486e200ee43..bf63420e558 100644
--- a/package.json
+++ b/package.json
@@ -23,13 +23,13 @@
   },
   "dependencies": {
     "@serverless/cli": "^1.5.2",
-    "@serverless/components": "^3.9.1",
+    "@serverless/components": "^3.9.2",
     "@serverless/enterprise-plugin": "^4.5.3",
     "@serverless/utils": "^4.1.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.900.0",
+    "aws-sdk": "^2.901.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
@@ -39,7 +39,7 @@
     "d": "^1.0.1",
     "dayjs": "^1.10.4",
     "decompress": "^4.2.1",
-    "dotenv": "^8.2.0",
+    "dotenv": "^8.6.0",
     "download": "^8.0.0",
     "essentials": "^1.1.1",
     "fastest-levenshtein": "^1.0.12",
@@ -74,7 +74,7 @@
     "yaml-ast-parser": "0.0.43"
   },
   "devDependencies": {
-    "@commitlint/cli": "^12.1.1",
+    "@commitlint/cli": "^12.1.2",
     "@serverless/eslint-config": "^3.0.0",
     "@serverless/test": "^8.1.0",
     "chai": "^4.3.4",

From fa993ea1f1af5d1495954b0407476b7c864273c2 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 6 May 2021 13:09:15 +0200
Subject: [PATCH 0063/1101] chore: Release 2.40.0

---
 CHANGELOG.md | 10 ++++++++++
 package.json |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a7796c7824..db7b0984909 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 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.
 
+## [2.40.0](https://github.com/serverless/serverless/compare/v2.39.2...v2.40.0) (2021-05-06)
+
+### Features
+
+- **AWS Lambda:** Add `ecr.scanOnPush` configuration option ([#9379](https://github.com/serverless/serverless/issues/9379)) ([078ec59](https://github.com/serverless/serverless/commit/078ec59058e1c37bd81388c7e81087b48fc2ba24)) ([Nicholas Wehr](https://github.com/wwwehr))
+
+### Bug Fixes
+
+- **CLI:** Do not validate command when falling back to old version ([#9437](https://github.com/serverless/serverless/pull/9437)) ([9624338](https://github.com/serverless/serverless/commit/962433864ff4f52bf178b7afc1b6e54e58e58702)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ### [2.39.2](https://github.com/serverless/serverless/compare/v2.39.1...v2.39.2) (2021-05-04)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index bf63420e558..5554ced072e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.39.2",
+  "version": "2.40.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From ec909452b5167e05d892d2c44bc46b4ff7d7470a Mon Sep 17 00:00:00 2001
From: lyndoh <20314316+lyndoh@users.noreply.github.com>
Date: Fri, 7 May 2021 02:01:46 +1000
Subject: [PATCH 0064/1101] feat(AWS API Gateway): Support disabling default
 endpoint (#9404)

---
 docs/providers/aws/events/apigateway.md       | 10 ++++++
 docs/providers/aws/events/http-api.md         | 10 ++++++
 docs/providers/aws/guide/serverless.yml.md    |  1 +
 .../compile/events/apiGateway/lib/restApi.js  |  4 +++
 lib/plugins/aws/provider.js                   |  1 +
 .../events/apiGateway/lib/restApi.test.js     | 34 +++++++++++++++++++
 6 files changed, 60 insertions(+)

diff --git a/docs/providers/aws/events/apigateway.md b/docs/providers/aws/events/apigateway.md
index 9df1dcc0599..9b5fb3d7a69 100644
--- a/docs/providers/aws/events/apigateway.md
+++ b/docs/providers/aws/events/apigateway.md
@@ -1835,3 +1835,13 @@ provider:
       level: INFO
       fullExecutionData: false
 ```
+
+## Disable Default Endpoint
+
+By default, clients can invoke your API with the default https://{api_id}.execute-api.{region}.amazonaws.com endpoint. To require that clients use a custom domain name to invoke your API, disable the default endpoint.
+
+```yml
+provider:
+  apiGateway:
+    disableDefaultEndpoint: true
+```
diff --git a/docs/providers/aws/events/http-api.md b/docs/providers/aws/events/http-api.md
index f5e325d4f51..580370276f0 100644
--- a/docs/providers/aws/events/http-api.md
+++ b/docs/providers/aws/events/http-api.md
@@ -419,3 +419,13 @@ provider:
 In the above example, the tag project: myProject will be applied to API Gateway and API Gateway Stage.
 
 _Note: If the API Gateway has any existing tags applied outside of Serverless Framework, they will be removed during deployment._
+
+### Disable Default Endpoint
+
+By default, clients can invoke your API with the default https://{api_id}.execute-api.{region}.amazonaws.com endpoint. To require that clients use a custom domain name to invoke your API, disable the default endpoint.
+
+```yml
+provider:
+  httpApi:
+    disableDefaultEndpoint: true
+```
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 33ff1ce7187..7358c3ac369 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -116,6 +116,7 @@ provider:
       - ${env:MY_API_KEY} # you can hide it in a serverless variable
     minimumCompressionSize: 1024 # Compress response when larger than specified size in bytes (must be between 0 and 10485760)
     description: Some Description # Optional description for the API Gateway stage deployment
+    disableDefaultEndpoint: true # Optional disable the default 'execute-api' endpoint
     binaryMediaTypes: # Optional binary media types the API might return
       - '*/*'
     metrics:  false # Optional detailed Cloud Watch Metrics
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js
index e42dd6aa152..483feb3e282 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js
@@ -44,12 +44,16 @@ module.exports = {
       EndpointConfiguration.VpcEndpointIds = vpcEndpointIds;
     }
 
+    const DisableExecuteApiEndpoint =
+      apiGateway.disableDefaultEndpoint == null ? undefined : apiGateway.disableDefaultEndpoint;
+
     _.merge(this.serverless.service.provider.compiledCloudFormationTemplate.Resources, {
       [this.apiGatewayRestApiLogicalId]: {
         Type: 'AWS::ApiGateway::RestApi',
         Properties: {
           Name: this.provider.naming.getApiGatewayName(),
           BinaryMediaTypes,
+          DisableExecuteApiEndpoint,
           EndpointConfiguration,
         },
       },
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index a943e079fc9..323a87417e0 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -614,6 +614,7 @@ class AwsProvider {
                   items: { type: 'string', pattern: '^\\S+\\/\\S+$' },
                 },
                 description: { type: 'string' },
+                disableDefaultEndpoint: { type: 'boolean' },
                 metrics: { type: 'boolean' },
                 minimumCompressionSize: { type: 'integer', minimum: 0, maximum: 10485760 },
                 resourcePolicy: { $ref: '#/definitions/awsResourcePolicyStatements' },
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
index 1d3c8233284..d24a858caec 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
@@ -4,6 +4,7 @@ const chai = require('chai');
 const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
 const Serverless = require('../../../../../../../../../../lib/Serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
+const runServerless = require('../../../../../../../../../utils/run-serverless');
 
 const expect = chai.expect;
 chai.use(require('chai-as-promised'));
@@ -45,6 +46,7 @@ describe('#compileRestApi()', () => {
       Type: 'AWS::ApiGateway::RestApi',
       Properties: {
         BinaryMediaTypes: undefined,
+        DisableExecuteApiEndpoint: undefined,
         Name: 'dev-new-service',
         EndpointConfiguration: {
           Types: ['EDGE'],
@@ -79,6 +81,7 @@ describe('#compileRestApi()', () => {
       Properties: {
         Name: 'dev-new-service',
         BinaryMediaTypes: undefined,
+        DisableExecuteApiEndpoint: undefined,
         EndpointConfiguration: {
           Types: ['EDGE'],
         },
@@ -112,6 +115,7 @@ describe('#compileRestApi()', () => {
       Properties: {
         Name: 'dev-new-service',
         BinaryMediaTypes: undefined,
+        DisableExecuteApiEndpoint: undefined,
         EndpointConfiguration: {
           Types: ['EDGE'],
         },
@@ -143,6 +147,7 @@ describe('#compileRestApi()', () => {
       Type: 'AWS::ApiGateway::RestApi',
       Properties: {
         BinaryMediaTypes: ['*/*'],
+        DisableExecuteApiEndpoint: undefined,
         EndpointConfiguration: {
           Types: ['EDGE'],
         },
@@ -158,3 +163,32 @@ describe('#compileRestApi()', () => {
     expect(() => awsCompileApigEvents.compileRestApi()).to.throw(Error);
   });
 });
+
+describe('lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js', () => {
+  it('should not disable the default execute-api endpoint by default', async () => {
+    const { cfTemplate } = await runServerless({
+      fixture: 'apiGateway',
+      command: 'package',
+    });
+    const resource = cfTemplate.Resources.ApiGatewayRestApi;
+
+    expect(resource.Properties.DisableExecuteApiEndpoint).to.equal(undefined);
+  });
+
+  it('should support `provider.apiGateway.disableDefaultEndpoint`', async () => {
+    const { cfTemplate } = await runServerless({
+      fixture: 'apiGateway',
+      command: 'package',
+      configExt: {
+        provider: {
+          apiGateway: {
+            disableDefaultEndpoint: true,
+          },
+        },
+      },
+    });
+    const resource = cfTemplate.Resources.ApiGatewayRestApi;
+
+    expect(resource.Properties.DisableExecuteApiEndpoint).to.equal(true);
+  });
+});

From 40e56fc0e9f71f06068d7d4c30178db8b2260357 Mon Sep 17 00:00:00 2001
From: Zach Whaley <zachbwhaley@gmail.com>
Date: Sun, 9 May 2021 14:21:19 -0500
Subject: [PATCH 0065/1101] fix(Packaging): Fix support of the artifact S3 uri
 with region (#9411)

---
 lib/plugins/aws/utils/parse-s3-uri.js         | 21 ++++++----
 .../plugins/aws/utils/parse-s3-uri.test.js    | 40 +++++++++++++++++++
 2 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/lib/plugins/aws/utils/parse-s3-uri.js b/lib/plugins/aws/utils/parse-s3-uri.js
index ecb843c48c7..02538a2a0e9 100644
--- a/lib/plugins/aws/utils/parse-s3-uri.js
+++ b/lib/plugins/aws/utils/parse-s3-uri.js
@@ -1,14 +1,21 @@
 'use strict';
 
+// https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-bucket-intro.html
 const patterns = [
   // S3 URI. Ex: s3://bucket/path/to/artifact.zip
-  new RegExp('^s3://([^/]+)/(.+)'),
+  new RegExp('^s3://(?<bucket>[^/]+)/(?<key>.+)'),
 
-  // New style S3 URL. Ex: https://bucket.s3.amazonaws.com/path/to/artifact.zip
-  new RegExp('([^/]+)\\.s3\\.amazonaws\\.com/(.+)'),
+  // New style S3 URL.
+  // Ex: https://bucket.s3.amazonaws.com/path/to/artifact.zip
+  // Ex: https://bucket.s3.region.amazonaws.com/path/to/artifact.zip
+  // Ex: https://bucket.s3-region.amazonaws.com/path/to/artifact.zip
+  new RegExp('(?<bucket>[^/]+)\\.s3([\\.-][\\w\\d-]+)?\\.amazonaws\\.com/(?<key>.+)'),
 
-  // Old style S3 URL. Ex: https://s3.amazonaws.com/bucket/path/to/artifact.zip
-  new RegExp('s3\\.amazonaws\\.com/([^/]+)/(.+)'),
+  // Old style S3 URL.
+  // Ex: https://s3.amazonaws.com/bucket/path/to/artifact.zip
+  // Ex: https://s3.region.amazonaws.com/bucket/path/to/artifact.zip
+  // Ex: https://s3-region.amazonaws.com/bucket/path/to/artifact.zip
+  new RegExp('s3([\\.-][\\w\\d-]+)?\\.amazonaws\\.com/(?<bucket>[^/]+)/(?<key>.+)'),
 ];
 
 module.exports = (url) => {
@@ -16,8 +23,8 @@ module.exports = (url) => {
     const match = url.match(regex);
     if (match) {
       return {
-        Bucket: match[1],
-        Key: match[2],
+        Bucket: match.groups.bucket,
+        Key: match.groups.key,
       };
     }
   }
diff --git a/test/unit/lib/plugins/aws/utils/parse-s3-uri.test.js b/test/unit/lib/plugins/aws/utils/parse-s3-uri.test.js
index 99aad0e3e10..fb86cbcfa4a 100644
--- a/test/unit/lib/plugins/aws/utils/parse-s3-uri.test.js
+++ b/test/unit/lib/plugins/aws/utils/parse-s3-uri.test.js
@@ -19,6 +19,26 @@ describe('test/unit/lib/plugins/aws/utils/parse-s3-uri.test.js', () => {
     const actual = parseS3URI('https://s3.amazonaws.com/test-bucket/path/to/artifact.zip');
     expect(actual).to.deep.equal(expected);
   });
+  it('should parse an old style S3 URL with region', () => {
+    const expected = {
+      Bucket: 'test-bucket',
+      Key: 'path/to/artifact.zip',
+    };
+    const actual = parseS3URI(
+      'https://s3.us-west-1.amazonaws.com/test-bucket/path/to/artifact.zip'
+    );
+    expect(actual).to.deep.equal(expected);
+  });
+  it('should parse another old style S3 URL with region', () => {
+    const expected = {
+      Bucket: 'test-bucket',
+      Key: 'path/to/artifact.zip',
+    };
+    const actual = parseS3URI(
+      'https://s3-us-west-1.amazonaws.com/test-bucket/path/to/artifact.zip'
+    );
+    expect(actual).to.deep.equal(expected);
+  });
   it('should parse a new style S3 URL', () => {
     const expected = {
       Bucket: 'test-bucket',
@@ -27,6 +47,26 @@ describe('test/unit/lib/plugins/aws/utils/parse-s3-uri.test.js', () => {
     const actual = parseS3URI('https://test-bucket.s3.amazonaws.com/path/to/artifact.zip');
     expect(actual).to.deep.equal(expected);
   });
+  it('should parse a new style S3 URL with region', () => {
+    const expected = {
+      Bucket: 'test-bucket',
+      Key: 'path/to/artifact.zip',
+    };
+    const actual = parseS3URI(
+      'https://test-bucket.s3.eu-west-1.amazonaws.com/path/to/artifact.zip'
+    );
+    expect(actual).to.deep.equal(expected);
+  });
+  it('should parse another new style S3 URL with region', () => {
+    const expected = {
+      Bucket: 'test-bucket',
+      Key: 'path/to/artifact.zip',
+    };
+    const actual = parseS3URI(
+      'https://test-bucket.s3-eu-west-1.amazonaws.com/path/to/artifact.zip'
+    );
+    expect(actual).to.deep.equal(expected);
+  });
   it('should reject non S3 URLs', () => {
     const actual = parseS3URI('https://example.com/path/to/artifact.zip');
     expect(actual).to.be.null;

From 9e558eefd66e9dafcb16b3636b934d753ade001e Mon Sep 17 00:00:00 2001
From: Jaakko Lappalainen <jkk.lapp@gmail.com>
Date: Mon, 10 May 2021 08:40:57 +0100
Subject: [PATCH 0066/1101] feat(AWS Lambda): Deprecate `nodejs12.x` as default
 runtime (#9416)

---
 docs/deprecations.md                                |  8 ++++++++
 lib/plugins/aws/package/compile/functions.js        | 12 ++++++++++++
 test/unit/lib/plugins/aws/invokeLocal/index.test.js |  1 +
 .../lib/utils/telemetry/generatePayload.test.js     | 13 ++++++++-----
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 50bbe436e9f..5195998348e 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -17,6 +17,14 @@ disabledDeprecations:
   - '*' # To disable all deprecation messages
 ```
 
+<a name="CHANGE_OF_DEFAULT_RUNTIME_TO_NODEJS14X"><div>&nbsp;</div></a>
+
+## Change of default runtime to `nodejs14.x`
+
+Deprecation code: `CHANGE_OF_DEFAULT_RUNTIME_TO_NODEJS14X`
+
+Starting with `v3.0.0`, the default runtime will change from `nodejs12.x` to `nodejs14.x`. In order to hide the deprecation message and ensure seamless upgrade, please set the runtime explicitly.
+
 <a name="AWS_API_GATEWAY_NON_APPLICABLE_SETTINGS"><div>&nbsp;</div></a>
 
 ## AWS API Gateway non-applicable settings configured
diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index 39c11a4ee87..f0af59a88bc 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -62,6 +62,18 @@ class AwsCompileFunctions {
               'Switch to it now by setting "provider.lambdaHashingVersion" to "20201221"'
           );
         }
+        if (
+          !this.serverless.service.provider.runtime &&
+          Object.keys(this.serverless.service.functions).length &&
+          Object.values(this.serverless.service.functions).some(
+            ({ handler, runtime }) => handler && !runtime
+          )
+        ) {
+          this.serverless._logDeprecation(
+            'CHANGE_OF_DEFAULT_RUNTIME_TO_NODEJS14X',
+            'Starting with `v3.0.0`, the default runtime will change from `nodejs12.x` to `nodejs14.x`. In order to hide the deprecation message and ensure seamless upgrade, please set the runtime explicitly.'
+          );
+        }
       },
       'package:compileFunctions': async () =>
         BbPromise.bind(this).then(this.downloadPackageArtifacts).then(this.compileFunctions),
diff --git a/test/unit/lib/plugins/aws/invokeLocal/index.test.js b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
index 68b6b560f0e..6fbbd25657f 100644
--- a/test/unit/lib/plugins/aws/invokeLocal/index.test.js
+++ b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
@@ -1465,6 +1465,7 @@ describe('test/unit/lib/plugins/aws/invokeLocal/index.test.js', () => {
           },
           configExt: {
             provider: {
+              runtime: 'nodejs14.x',
               environment: {
                 PROVIDER_LEVEL_VAR: 'PROVIDER_LEVEL_VAR_VALUE',
                 NULL_VAR: null,
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index fc2af4df733..b5e56064e46 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -22,6 +22,9 @@ describe('lib/utils/telemetry/generatePayload', () => {
   it('Should resolve payload for AWS service', async () => {
     const { servicePath: serviceDir } = await fixtures.setup('httpApi', {
       configExt: {
+        provider: {
+          runtime: 'nodejs14.x',
+        },
         functions: {
           withContainer: {
             image:
@@ -75,16 +78,16 @@ describe('lib/utils/telemetry/generatePayload', () => {
       config: {
         provider: {
           name: 'aws',
-          runtime: 'nodejs12.x',
+          runtime: 'nodejs14.x',
           stage: 'dev',
           region: 'us-east-1',
         },
         plugins: [],
         functions: [
-          { runtime: 'nodejs12.x', events: [{ type: 'httpApi' }, { type: 'httpApi' }] },
-          { runtime: 'nodejs12.x', events: [{ type: 'httpApi' }] },
-          { runtime: 'nodejs12.x', events: [] },
-          { runtime: 'nodejs12.x', events: [] },
+          { runtime: 'nodejs14.x', events: [{ type: 'httpApi' }, { type: 'httpApi' }] },
+          { runtime: 'nodejs14.x', events: [{ type: 'httpApi' }] },
+          { runtime: 'nodejs14.x', events: [] },
+          { runtime: 'nodejs14.x', events: [] },
           { runtime: '$containerimage', events: [] },
         ],
       },

From 8d56d0e520db8068e89fa8d4d2bf4e64b0acd97b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 10 May 2021 12:41:25 +0200
Subject: [PATCH 0067/1101] style: Prettier

---
 .../ConfigSchemaHandler/normalizeAjvErrors.js |   6 +-
 lib/classes/Variables.js                      |  13 +-
 lib/cli/ensure-supported-command.js           |  10 +-
 lib/cli/parse-args.js                         |   3 +-
 lib/plugins/aws/customResources/index.js      |  15 +-
 .../resources/s3/lib/bucket.js                |  14 +-
 lib/plugins/aws/deployFunction.js             |  16 +-
 lib/plugins/aws/invokeLocal/index.js          |  15 +-
 .../compile/events/alb/lib/permissions.js     |  10 +-
 .../compile/events/alb/lib/targetGroups.js    |   5 +-
 .../aws/package/compile/events/alexaSkill.js  |   9 +-
 .../package/compile/events/alexaSmartHome.js  |   9 +-
 .../compile/events/apiGateway/index.js        |   4 +-
 .../events/apiGateway/lib/permissions.js      |  10 +-
 .../events/apiGateway/lib/requestValidator.js |  35 +-
 .../aws/package/compile/events/cloudFront.js  |  20 +-
 .../package/compile/events/cloudWatchEvent.js |   9 +-
 .../package/compile/events/cloudWatchLog.js   |   5 +-
 .../package/compile/events/cognitoUserPool.js |  19 +-
 .../compile/events/eventBridge/index.js       |  19 +-
 .../aws/package/compile/events/httpApi.js     |  17 +-
 .../compile/events/iotFleetProvisioning.js    |  10 +-
 .../lib/ensureApiGatewayCloudWatchRole.js     |   6 +-
 .../aws/package/compile/events/s3/index.js    |   8 +-
 .../aws/package/compile/events/schedule.js    |   9 +-
 lib/plugins/aws/package/compile/events/sns.js |   7 +-
 lib/plugins/aws/package/compile/events/sqs.js |  10 +-
 .../aws/package/compile/events/stream.js      |  15 +-
 .../compile/events/websockets/lib/api.js      |   6 +-
 .../events/websockets/lib/deployment.js       |   5 +-
 .../events/websockets/lib/permissions.js      |  10 +-
 .../events/websockets/lib/routeResponses.js   |   5 +-
 lib/plugins/aws/package/compile/functions.js  |  15 +-
 lib/plugins/aws/package/compile/layers.js     |  24 +-
 .../aws/package/lib/generateCoreTemplate.js   |  34 +-
 .../aws/package/lib/mergeIamTemplates.js      |  31 +-
 package.json                                  |   2 +-
 scripts/serverless.js                         |  15 +-
 .../classes/ConfigSchemaHandler/index.test.js |  22 +-
 .../unit/lib/plugins/aws/deploy/index.test.js |  12 +-
 .../aws/deploy/lib/checkForChanges.test.js    |  15 +-
 .../package/compile/events/cloudFront.test.js | 665 +++++++++---------
 .../compile/events/cognitoUserPool.test.js    |  18 +-
 .../compile/events/eventBridge/index.test.js  |   5 +-
 .../package/compile/events/httpApi.test.js    |   5 +-
 .../package/compile/events/s3/index.test.js   |  27 +-
 .../aws/package/compile/events/sqs.test.js    |  24 +-
 .../aws/package/compile/events/stream.test.js |  27 +-
 .../compile/events/websockets/lib/api.test.js |  26 +-
 .../events/websockets/lib/authorizers.test.js |   6 +-
 .../events/websockets/lib/deployment.test.js  |   3 +-
 .../websockets/lib/integrations.test.js       |   3 +-
 .../events/websockets/lib/permissions.test.js |   3 +-
 .../websockets/lib/routeResponses.test.js     |   3 +-
 .../events/websockets/lib/routes.test.js      |   3 +-
 .../events/websockets/lib/stage.test.js       |   3 +-
 .../aws/package/compile/functions.test.js     |  72 +-
 .../lib/mergeCustomProviderResources.test.js  |   3 +-
 .../aws/package/lib/mergeIamTemplates.test.js |   6 +-
 test/unit/lib/plugins/aws/provider.test.js    |   6 +-
 test/unit/lib/plugins/aws/rollback.test.js    |   9 +-
 .../aws/utils/findAndGroupDeployments.test.js |   9 +-
 .../aws/utils/getS3ObjectsFromStacks.test.js  |   6 +-
 63 files changed, 736 insertions(+), 720 deletions(-)

diff --git a/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.js b/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.js
index b5ed5296071..5961495520a 100644
--- a/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.js
+++ b/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.js
@@ -35,9 +35,9 @@ const filterIrreleventEventConfigurationErrors = (resultErrorsSet) => {
     delete eventEventTypeErrorsByTypeIndex.root;
 
     // 3.3 Resolve eventual type configuration errors for intended event type
-    const eventConfiguredEventTypeErrors = Object.entries(
-      eventEventTypeErrorsByTypeIndex
-    ).find(([, errors]) => errors.every(({ keyword }) => keyword !== 'required'));
+    const eventConfiguredEventTypeErrors = Object.entries(eventEventTypeErrorsByTypeIndex).find(
+      ([, errors]) => errors.every(({ keyword }) => keyword !== 'required')
+    );
 
     if (!eventConfiguredEventTypeErrors) {
       // 3.4 If there are no event type configuration errors for intended event type
diff --git a/lib/classes/Variables.js b/lib/classes/Variables.js
index 8a5ec30c1f5..2431f73340d 100644
--- a/lib/classes/Variables.js
+++ b/lib/classes/Variables.js
@@ -476,11 +476,14 @@ class Variables {
       match = quotedWordSyntax.exec(input);
     }
     const commaReplacements = [];
-    const contained = (
-      commaMatch // curry the current commaMatch
-    ) => (
-      stringMatch // check whether stringMatch containing the commaMatch
-    ) => stringMatch.start < commaMatch.index && this.overwriteSyntax.lastIndex < stringMatch.end;
+    const contained =
+      (
+        commaMatch // curry the current commaMatch
+      ) =>
+      (
+        stringMatch // check whether stringMatch containing the commaMatch
+      ) =>
+        stringMatch.start < commaMatch.index && this.overwriteSyntax.lastIndex < stringMatch.end;
     match = this.overwriteSyntax.exec(input);
     while (match) {
       const matchContained = contained(match);
diff --git a/lib/cli/ensure-supported-command.js b/lib/cli/ensure-supported-command.js
index 933fb921a89..9ab32236a4c 100644
--- a/lib/cli/ensure-supported-command.js
+++ b/lib/cli/ensure-supported-command.js
@@ -25,14 +25,8 @@ const getCommandSuggestion = (command, commandsSchema) => {
 };
 
 module.exports = (configuration = null) => {
-  const {
-    command,
-    options,
-    commandSchema,
-    commandsSchema,
-    isContainerCommand,
-    isHelpRequest,
-  } = resolveInput();
+  const { command, options, commandSchema, commandsSchema, isContainerCommand, isHelpRequest } =
+    resolveInput();
 
   if (!commandSchema && !isContainerCommand) {
     throw new ServerlessError(
diff --git a/lib/cli/parse-args.js b/lib/cli/parse-args.js
index 9b228f8a21c..3b19fc5b36a 100644
--- a/lib/cli/parse-args.js
+++ b/lib/cli/parse-args.js
@@ -4,7 +4,8 @@
 
 const ServerlessError = require('../serverless-error');
 
-const paramRe = /^-(?:-(?<fullName>[a-zA-Z][A-Za-z0-9:_-]+)|(?<aliasNames>[a-z]+))(?:=(?<value>.*)|$)/;
+const paramRe =
+  /^-(?:-(?<fullName>[a-zA-Z][A-Za-z0-9:_-]+)|(?<aliasNames>[a-z]+))(?:=(?<value>.*)|$)/;
 const isParamName = RegExp.prototype.test.bind(paramRe);
 
 module.exports = (
diff --git a/lib/plugins/aws/customResources/index.js b/lib/plugins/aws/customResources/index.js
index ebdf1f1302c..fe8d78695bd 100644
--- a/lib/plugins/aws/customResources/index.js
+++ b/lib/plugins/aws/customResources/index.js
@@ -36,19 +36,24 @@ async function addCustomResourceToService(awsProvider, resourceName, iamRoleStat
   if (resourceName === 's3') {
     functionName = awsProvider.naming.getCustomResourceS3HandlerFunctionName();
     Handler = 's3/handler.handler';
-    customResourceFunctionLogicalId = awsProvider.naming.getCustomResourceS3HandlerFunctionLogicalId();
+    customResourceFunctionLogicalId =
+      awsProvider.naming.getCustomResourceS3HandlerFunctionLogicalId();
   } else if (resourceName === 'cognitoUserPool') {
     functionName = awsProvider.naming.getCustomResourceCognitoUserPoolHandlerFunctionName();
     Handler = 'cognitoUserPool/handler.handler';
-    customResourceFunctionLogicalId = awsProvider.naming.getCustomResourceCognitoUserPoolHandlerFunctionLogicalId();
+    customResourceFunctionLogicalId =
+      awsProvider.naming.getCustomResourceCognitoUserPoolHandlerFunctionLogicalId();
   } else if (resourceName === 'eventBridge') {
     functionName = awsProvider.naming.getCustomResourceEventBridgeHandlerFunctionName();
     Handler = 'eventBridge/handler.handler';
-    customResourceFunctionLogicalId = awsProvider.naming.getCustomResourceEventBridgeHandlerFunctionLogicalId();
+    customResourceFunctionLogicalId =
+      awsProvider.naming.getCustomResourceEventBridgeHandlerFunctionLogicalId();
   } else if (resourceName === 'apiGatewayCloudWatchRole') {
-    functionName = awsProvider.naming.getCustomResourceApiGatewayAccountCloudWatchRoleHandlerFunctionName();
+    functionName =
+      awsProvider.naming.getCustomResourceApiGatewayAccountCloudWatchRoleHandlerFunctionName();
     Handler = 'apiGatewayCloudWatchRole/handler.handler';
-    customResourceFunctionLogicalId = awsProvider.naming.getCustomResourceApiGatewayAccountCloudWatchRoleHandlerFunctionLogicalId();
+    customResourceFunctionLogicalId =
+      awsProvider.naming.getCustomResourceApiGatewayAccountCloudWatchRoleHandlerFunctionLogicalId();
   } else {
     throw new ServerlessError(
       `No implementation found for Custom Resource "${resourceName}"`,
diff --git a/lib/plugins/aws/customResources/resources/s3/lib/bucket.js b/lib/plugins/aws/customResources/resources/s3/lib/bucket.js
index 8920eb186a8..41f84cd5789 100644
--- a/lib/plugins/aws/customResources/resources/s3/lib/bucket.js
+++ b/lib/plugins/aws/customResources/resources/s3/lib/bucket.js
@@ -48,9 +48,10 @@ async function updateConfiguration(config) {
 
   return getConfiguration(config).then((NotificationConfiguration) => {
     // remove configurations for this specific function
-    NotificationConfiguration.LambdaFunctionConfigurations = NotificationConfiguration.LambdaFunctionConfigurations.filter(
-      (conf) => !conf.Id.startsWith(functionName)
-    );
+    NotificationConfiguration.LambdaFunctionConfigurations =
+      NotificationConfiguration.LambdaFunctionConfigurations.filter(
+        (conf) => !conf.Id.startsWith(functionName)
+      );
 
     // add the events to the existing NotificationConfiguration
     bucketConfigs.forEach((bucketConfig) => {
@@ -84,9 +85,10 @@ async function removeConfiguration(config) {
 
   return getConfiguration(config).then((NotificationConfiguration) => {
     // remove configurations for this specific function
-    NotificationConfiguration.LambdaFunctionConfigurations = NotificationConfiguration.LambdaFunctionConfigurations.filter(
-      (conf) => !conf.Id.startsWith(functionName)
-    );
+    NotificationConfiguration.LambdaFunctionConfigurations =
+      NotificationConfiguration.LambdaFunctionConfigurations.filter(
+        (conf) => !conf.Id.startsWith(functionName)
+      );
 
     const payload = {
       Bucket,
diff --git a/lib/plugins/aws/deployFunction.js b/lib/plugins/aws/deployFunction.js
index 6e480616b6b..45545b9b3a6 100644
--- a/lib/plugins/aws/deployFunction.js
+++ b/lib/plugins/aws/deployFunction.js
@@ -89,8 +89,8 @@ class AwsDeployFunction {
 
   checkIfFunctionChangesBetweenImageAndHandler() {
     const functionObject = this.serverless.service.getFunction(this.options.function);
-    const remoteFunctionPackageType = this.serverless.service.provider.remoteFunctionData
-      .Configuration.PackageType;
+    const remoteFunctionPackageType =
+      this.serverless.service.provider.remoteFunctionData.Configuration.PackageType;
 
     if (functionObject.handler && remoteFunctionPackageType === 'Image') {
       throw new ServerlessError(
@@ -171,8 +171,8 @@ class AwsDeployFunction {
     const functionObj = this.options.functionObj;
     const serviceObj = this.serverless.service.serviceObject;
     const providerObj = this.serverless.service.provider;
-    const remoteFunctionConfiguration = this.serverless.service.provider.remoteFunctionData
-      .Configuration;
+    const remoteFunctionConfiguration =
+      this.serverless.service.provider.remoteFunctionData.Configuration;
     const params = {
       FunctionName: functionObj.name,
     };
@@ -365,8 +365,8 @@ class AwsDeployFunction {
       const { functionImageUri, functionImageSha } = await this.provider.resolveImageUriAndSha(
         this.options.function
       );
-      const remoteImageSha = this.serverless.service.provider.remoteFunctionData.Configuration
-        .CodeSha256;
+      const remoteImageSha =
+        this.serverless.service.provider.remoteFunctionData.Configuration.CodeSha256;
       if (remoteImageSha === functionImageSha && !this.options.force) {
         this.serverless.cli.log('Image did not change. Skipping function deployment.');
         return;
@@ -383,8 +383,8 @@ class AwsDeployFunction {
 
       const data = fs.readFileSync(artifactFilePath);
 
-      const remoteHash = this.serverless.service.provider.remoteFunctionData.Configuration
-        .CodeSha256;
+      const remoteHash =
+        this.serverless.service.provider.remoteFunctionData.Configuration.CodeSha256;
       const localHash = crypto.createHash('sha256').update(data).digest('base64');
 
       if (remoteHash === localHash && !this.options.force) {
diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invokeLocal/index.js
index 11f38f1e454..43e2fb92160 100644
--- a/lib/plugins/aws/invokeLocal/index.js
+++ b/lib/plugins/aws/invokeLocal/index.js
@@ -502,16 +502,11 @@ class AwsInvokeLocal {
     const envVarsDockerArgs = _.flatMap(envVars, (value, key) => ['--env', `${key}=${value}`]);
 
     const dockerArgsFromOptions = this.getDockerArgsFromOptions();
-    const dockerArgs = [
-      'run',
-      '--rm',
-      '-v',
-      `${artifactPath}:/var/task:ro,delegated`,
-    ].concat(envVarsDockerArgs, dockerArgsFromOptions, [
-      imageName,
-      handler,
-      JSON.stringify(this.options.data),
-    ]);
+    const dockerArgs = ['run', '--rm', '-v', `${artifactPath}:/var/task:ro,delegated`].concat(
+      envVarsDockerArgs,
+      dockerArgsFromOptions,
+      [imageName, handler, JSON.stringify(this.options.data)]
+    );
 
     try {
       const { stdBuffer } = await spawnExt('docker', dockerArgs);
diff --git a/lib/plugins/aws/package/compile/events/alb/lib/permissions.js b/lib/plugins/aws/package/compile/events/alb/lib/permissions.js
index 3c705e7d17f..c823c306c76 100644
--- a/lib/plugins/aws/package/compile/events/alb/lib/permissions.js
+++ b/lib/plugins/aws/package/compile/events/alb/lib/permissions.js
@@ -8,12 +8,10 @@ module.exports = {
     this.validated.events.forEach((event) => {
       const { functionName, albId, multiValueHeaders } = event;
 
-      const albPermissionLogicalId = this.provider.naming.getLambdaAlbPermissionLogicalId(
-        functionName
-      );
-      const registerTargetPermissionLogicalId = this.provider.naming.getLambdaRegisterTargetPermissionLogicalId(
-        functionName
-      );
+      const albPermissionLogicalId =
+        this.provider.naming.getLambdaAlbPermissionLogicalId(functionName);
+      const registerTargetPermissionLogicalId =
+        this.provider.naming.getLambdaRegisterTargetPermissionLogicalId(functionName);
       const targetGroupLogicalId = this.provider.naming.getAlbTargetGroupLogicalId(
         functionName,
         albId,
diff --git a/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.js b/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.js
index 1b1e099e06b..9fc9fda1aed 100644
--- a/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.js
+++ b/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.js
@@ -28,9 +28,8 @@ module.exports = {
         albId,
         multiValueHeaders
       );
-      const registerTargetPermissionLogicalId = this.provider.naming.getLambdaRegisterTargetPermissionLogicalId(
-        functionName
-      );
+      const registerTargetPermissionLogicalId =
+        this.provider.naming.getLambdaRegisterTargetPermissionLogicalId(functionName);
 
       const healthCheckProperties = { HealthCheckEnabled: healthCheckDefaults.HealthCheckEnabled };
       if (healthCheck) {
diff --git a/lib/plugins/aws/package/compile/events/alexaSkill.js b/lib/plugins/aws/package/compile/events/alexaSkill.js
index 49f689bfc57..556ec9105b6 100644
--- a/lib/plugins/aws/package/compile/events/alexaSkill.js
+++ b/lib/plugins/aws/package/compile/events/alexaSkill.js
@@ -77,10 +77,11 @@ class AwsCompileAlexaSkillEvents {
             permissionTemplate.Properties.EventSourceToken = appId.replace(/\\n|\\r/g, '');
           }
 
-          const lambdaPermissionLogicalId = this.provider.naming.getLambdaAlexaSkillPermissionLogicalId(
-            functionName,
-            alexaSkillNumberInFunction
-          );
+          const lambdaPermissionLogicalId =
+            this.provider.naming.getLambdaAlexaSkillPermissionLogicalId(
+              functionName,
+              alexaSkillNumberInFunction
+            );
 
           const permissionCloudForamtionResource = {
             [lambdaPermissionLogicalId]: permissionTemplate,
diff --git a/lib/plugins/aws/package/compile/events/alexaSmartHome.js b/lib/plugins/aws/package/compile/events/alexaSmartHome.js
index 910bbf4e485..c1d02993bf4 100644
--- a/lib/plugins/aws/package/compile/events/alexaSmartHome.js
+++ b/lib/plugins/aws/package/compile/events/alexaSmartHome.js
@@ -63,10 +63,11 @@ class AwsCompileAlexaSmartHomeEvents {
               },
             };
 
-            const lambdaPermissionLogicalId = this.provider.naming.getLambdaAlexaSmartHomePermissionLogicalId(
-              functionName,
-              alexaSmartHomeNumberInFunction
-            );
+            const lambdaPermissionLogicalId =
+              this.provider.naming.getLambdaAlexaSmartHomePermissionLogicalId(
+                functionName,
+                alexaSmartHomeNumberInFunction
+              );
 
             const permissionCloudFormationResource = {
               [lambdaPermissionLogicalId]: permissionTemplate,
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/index.js b/lib/plugins/aws/package/compile/events/apiGateway/index.js
index 76606a2bf4c..96320d6f3f4 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/index.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/index.js
@@ -329,8 +329,8 @@ class AwsCompileApigEvents {
       // TODO should be removed once AWS fixes the removal via CloudFormation
       'before:remove:remove': async () => {
         const globalValidate = require('../../../../lib/validate').validate;
-        const disassociateUsagePlan = require('./lib/hack/disassociateUsagePlan')
-          .disassociateUsagePlan;
+        const disassociateUsagePlan =
+          require('./lib/hack/disassociateUsagePlan').disassociateUsagePlan;
 
         return BbPromise.bind(this).then(globalValidate).then(disassociateUsagePlan);
       },
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.js
index 5fa0ed05cbf..7e62e244be0 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.js
@@ -7,9 +7,8 @@ module.exports = {
     const cfResources = this.serverless.service.provider.compiledCloudFormationTemplate.Resources;
     this.permissionMapping.forEach(
       ({ lambdaLogicalId, lambdaAliasName, lambdaAliasLogicalId, event }) => {
-        const lambdaPermissionLogicalId = this.provider.naming.getLambdaApiGatewayPermissionLogicalId(
-          event.functionName
-        );
+        const lambdaPermissionLogicalId =
+          this.provider.naming.getLambdaApiGatewayPermissionLogicalId(event.functionName);
 
         const functionArnGetter = { 'Fn::GetAtt': [lambdaLogicalId, 'Arn'] };
         Object.assign(cfResources, {
@@ -44,9 +43,8 @@ module.exports = {
 
         if (event.http.authorizer && event.http.authorizer.arn) {
           const authorizer = event.http.authorizer;
-          const authorizerPermissionLogicalId = this.provider.naming.getLambdaApiGatewayPermissionLogicalId(
-            authorizer.name
-          );
+          const authorizerPermissionLogicalId =
+            this.provider.naming.getLambdaApiGatewayPermissionLogicalId(authorizer.name);
 
           if (
             (authorizer.type || '').toUpperCase() === 'COGNITO_USER_POOLS' ||
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
index ae20a516a27..0fd2b0c2441 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
@@ -17,9 +17,10 @@ module.exports = {
       let validatorName;
 
       if (event.http.request && event.http.request.schemas) {
-        const template = this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
-          methodLogicalId
-        ];
+        const template =
+          this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
+            methodLogicalId
+          ];
         for (const [contentType, schemaConfig] of _.entries(event.http.request.schemas)) {
           let modelLogicalId;
 
@@ -89,9 +90,10 @@ module.exports = {
         }
       } else if (event.http.request && event.http.request.schema) {
         // Old functionality
-        const template = this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
-          methodLogicalId
-        ];
+        const template =
+          this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
+            methodLogicalId
+          ];
         for (const [contentType, schema] of _.entries(event.http.request.schema)) {
           const modelLogicalId = this.provider.naming.getEndpointModelLogicalId(
             resourceName,
@@ -180,17 +182,16 @@ module.exports = {
     const validatorName = `${
       this.serverless.service.service
     }-${this.provider.getStage()} | Validate request body and querystring parameters`;
-    this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
-      validatorLogicalId
-    ] = {
-      Type: 'AWS::ApiGateway::RequestValidator',
-      Properties: {
-        RestApiId: this.provider.getApiGatewayRestApiId(),
-        ValidateRequestBody: true,
-        ValidateRequestParameters: true,
-        Name: validatorName,
-      },
-    };
+    this.serverless.service.provider.compiledCloudFormationTemplate.Resources[validatorLogicalId] =
+      {
+        Type: 'AWS::ApiGateway::RequestValidator',
+        Properties: {
+          RestApiId: this.provider.getApiGatewayRestApiId(),
+          ValidateRequestBody: true,
+          ValidateRequestParameters: true,
+          Name: validatorName,
+        },
+      };
     return {
       validatorLogicalId,
       validatorName,
diff --git a/lib/plugins/aws/package/compile/events/cloudFront.js b/lib/plugins/aws/package/compile/events/cloudFront.js
index bd51da252bc..c1bf444773c 100644
--- a/lib/plugins/aws/package/compile/events/cloudFront.js
+++ b/lib/plugins/aws/package/compile/events/cloudFront.js
@@ -317,9 +317,11 @@ class AwsCompileCloudFrontEvents {
   }
 
   compileCloudFrontEvents() {
-    this.cloudFrontDistributionLogicalId = this.provider.naming.getCloudFrontDistributionLogicalId();
+    this.cloudFrontDistributionLogicalId =
+      this.provider.naming.getCloudFrontDistributionLogicalId();
 
-    this.cloudFrontDistributionDomainNameLogicalId = this.provider.naming.getCloudFrontDistributionDomainNameLogicalId();
+    this.cloudFrontDistributionDomainNameLogicalId =
+      this.provider.naming.getCloudFrontDistributionDomainNameLogicalId();
 
     const lambdaAtEdgeFunctions = [];
 
@@ -582,9 +584,10 @@ class AwsCompileCloudFrontEvents {
 
       const lambdaInvokePermissions = lambdaAtEdgeFunctions.reduce(
         (permissions, lambdaAtEdgeFunction) => {
-          const invokePermissionName = this.provider.naming.getLambdaAtEdgeInvokePermissionLogicalId(
-            lambdaAtEdgeFunction.functionName
-          );
+          const invokePermissionName =
+            this.provider.naming.getLambdaAtEdgeInvokePermissionLogicalId(
+              lambdaAtEdgeFunction.functionName
+            );
           const invokePermission = {
             Type: 'AWS::Lambda::Permission',
             Properties: {
@@ -628,9 +631,10 @@ class AwsCompileCloudFrontEvents {
           )
         );
       } else {
-        const lambdaAssumeStatement = Resources.IamRoleLambdaExecution.Properties.AssumeRolePolicyDocument.Statement.find(
-          (statement) => statement.Principal.Service.includes('lambda.amazonaws.com')
-        );
+        const lambdaAssumeStatement =
+          Resources.IamRoleLambdaExecution.Properties.AssumeRolePolicyDocument.Statement.find(
+            (statement) => statement.Principal.Service.includes('lambda.amazonaws.com')
+          );
         if (lambdaAssumeStatement) {
           lambdaAssumeStatement.Principal.Service.push('edgelambda.amazonaws.com');
         }
diff --git a/lib/plugins/aws/package/compile/events/cloudWatchEvent.js b/lib/plugins/aws/package/compile/events/cloudWatchEvent.js
index 129991cbbcd..f55bc82e942 100644
--- a/lib/plugins/aws/package/compile/events/cloudWatchEvent.js
+++ b/lib/plugins/aws/package/compile/events/cloudWatchEvent.js
@@ -91,10 +91,11 @@ class AwsCompileCloudWatchEventEvents {
               functionName,
               cloudWatchEventNumberInFunction
             );
-            const lambdaPermissionLogicalId = this.provider.naming.getLambdaCloudWatchEventPermissionLogicalId(
-              functionName,
-              cloudWatchEventNumberInFunction
-            );
+            const lambdaPermissionLogicalId =
+              this.provider.naming.getLambdaCloudWatchEventPermissionLogicalId(
+                functionName,
+                cloudWatchEventNumberInFunction
+              );
             const cloudWatchId = this.provider.naming.getCloudWatchEventId(functionName);
 
             const cloudWatchEventRuleTemplate = `
diff --git a/lib/plugins/aws/package/compile/events/cloudWatchLog.js b/lib/plugins/aws/package/compile/events/cloudWatchLog.js
index d038f772278..f792178e988 100644
--- a/lib/plugins/aws/package/compile/events/cloudWatchLog.js
+++ b/lib/plugins/aws/package/compile/events/cloudWatchLog.js
@@ -69,9 +69,8 @@ class AwsCompileCloudWatchLogEvents {
               functionName,
               cloudWatchLogNumberInFunction
             );
-            const lambdaPermissionLogicalId = this.provider.naming.getLambdaCloudWatchLogPermissionLogicalId(
-              functionName
-            );
+            const lambdaPermissionLogicalId =
+              this.provider.naming.getLambdaCloudWatchLogPermissionLogicalId(functionName);
 
             // unescape quotes once when the first quote is detected escaped
             const idxFirstSlash = FilterPattern.indexOf('\\');
diff --git a/lib/plugins/aws/package/compile/events/cognitoUserPool.js b/lib/plugins/aws/package/compile/events/cognitoUserPool.js
index a983fa5b18d..34bafdace0a 100644
--- a/lib/plugins/aws/package/compile/events/cognitoUserPool.js
+++ b/lib/plugins/aws/package/compile/events/cognitoUserPool.js
@@ -97,11 +97,12 @@ class AwsCompileCognitoUserPoolEvents {
                   },
                 },
               };
-              const lambdaPermissionLogicalId = this.provider.naming.getLambdaCognitoUserPoolPermissionLogicalId(
-                cognitoUserPoolTriggerFunction.functionName,
-                cognitoUserPoolTriggerFunction.poolName,
-                cognitoUserPoolTriggerFunction.triggerSource
-              );
+              const lambdaPermissionLogicalId =
+                this.provider.naming.getLambdaCognitoUserPoolPermissionLogicalId(
+                  cognitoUserPoolTriggerFunction.functionName,
+                  cognitoUserPoolTriggerFunction.poolName,
+                  cognitoUserPoolTriggerFunction.triggerSource
+                );
               const permissionCFResource = {
                 [lambdaPermissionLogicalId]: permissionTemplate,
               };
@@ -155,10 +156,10 @@ class AwsCompileCognitoUserPoolEvents {
             }
 
             const eventFunctionLogicalId = this.provider.naming.getLambdaLogicalId(functionName);
-            const customResourceFunctionLogicalId = this.provider.naming.getCustomResourceCognitoUserPoolHandlerFunctionLogicalId();
-            const customPoolResourceLogicalId = this.provider.naming.getCustomResourceCognitoUserPoolResourceLogicalId(
-              functionName
-            );
+            const customResourceFunctionLogicalId =
+              this.provider.naming.getCustomResourceCognitoUserPoolHandlerFunctionLogicalId();
+            const customPoolResourceLogicalId =
+              this.provider.naming.getCustomResourceCognitoUserPoolResourceLogicalId(functionName);
 
             // store how often the custom Cognito User Pool resource is used
             if (poolResources[pool]) {
diff --git a/lib/plugins/aws/package/compile/events/eventBridge/index.js b/lib/plugins/aws/package/compile/events/eventBridge/index.js
index 8cc5846e929..482d749755d 100644
--- a/lib/plugins/aws/package/compile/events/eventBridge/index.js
+++ b/lib/plugins/aws/package/compile/events/eventBridge/index.js
@@ -219,11 +219,10 @@ class AwsCompileEventBridgeEvents {
     }
 
     const eventFunctionLogicalId = this.provider.naming.getLambdaLogicalId(functionName);
-    const customResourceFunctionLogicalId = this.provider.naming.getCustomResourceEventBridgeHandlerFunctionLogicalId();
-    const customEventBridgeResourceLogicalId = this.provider.naming.getCustomResourceEventBridgeResourceLogicalId(
-      functionName,
-      idx
-    );
+    const customResourceFunctionLogicalId =
+      this.provider.naming.getCustomResourceEventBridgeHandlerFunctionLogicalId();
+    const customEventBridgeResourceLogicalId =
+      this.provider.naming.getCustomResourceEventBridgeResourceLogicalId(functionName, idx);
 
     const customEventBridge = {
       Type: 'Custom::EventBridge',
@@ -246,9 +245,8 @@ class AwsCompileEventBridgeEvents {
       },
     };
 
-    compiledCloudFormationTemplate.Resources[
-      customEventBridgeResourceLogicalId
-    ] = customEventBridge;
+    compiledCloudFormationTemplate.Resources[customEventBridgeResourceLogicalId] =
+      customEventBridge;
 
     if (!hasEventBusesIamRoleStatement && eventBusName && eventBusName !== 'default') {
       iamRoleStatements.push({
@@ -349,9 +347,8 @@ class AwsCompileEventBridgeEvents {
     };
     // If this stack is creating the event bus the rule must depend on it to ensure stack can be removed
     if (shouldCreateEventBus) {
-      eventRuleResource.DependsOn = this.provider.naming.getEventBridgeEventBusLogicalId(
-        eventBusName
-      );
+      eventRuleResource.DependsOn =
+        this.provider.naming.getEventBridgeEventBusLogicalId(eventBusName);
     }
 
     const ruleNameLogicalIdStub = makeRuleName({
diff --git a/lib/plugins/aws/package/compile/events/httpApi.js b/lib/plugins/aws/package/compile/events/httpApi.js
index 3abb1835436..dc0fccaa16a 100644
--- a/lib/plugins/aws/package/compile/events/httpApi.js
+++ b/lib/plugins/aws/package/compile/events/httpApi.js
@@ -266,9 +266,8 @@ class HttpApiEvents {
   }
 
   compileAuthorizerLambdaPermission({ functionName, functionArn, name, functionObject }) {
-    const authorizerPermissionLogicalId = this.provider.naming.getLambdaAuthorizerHttpApiPermissionLogicalId(
-      name
-    );
+    const authorizerPermissionLogicalId =
+      this.provider.naming.getLambdaAuthorizerHttpApiPermissionLogicalId(name);
     const permissionResource = {
       Type: 'AWS::Lambda::Permission',
       Properties: {
@@ -295,9 +294,8 @@ class HttpApiEvents {
     };
 
     if (functionObject && functionObject.targetAlias) {
-      permissionResource.Properties.DependsOn = this.provider.naming.getLambdaLogicalId(
-        functionName
-      );
+      permissionResource.Properties.DependsOn =
+        this.provider.naming.getLambdaLogicalId(functionName);
     }
     this.cfTemplate.Resources[authorizerPermissionLogicalId] = permissionResource;
   }
@@ -536,10 +534,9 @@ Object.defineProperties(
             if (method === '*') {
               method = 'ANY';
               if (
-                Array.from(
-                  allowedMethods,
-                  (allowedMethod) => `${allowedMethod} ${path}`
-                ).some((duplicateRouteKey) => routes.has(duplicateRouteKey))
+                Array.from(allowedMethods, (allowedMethod) => `${allowedMethod} ${path}`).some(
+                  (duplicateRouteKey) => routes.has(duplicateRouteKey)
+                )
               ) {
                 throw new ServerlessError(
                   `Duplicate method for "${path}" path in function ${functionName} for httpApi event in serverless.yml`,
diff --git a/lib/plugins/aws/package/compile/events/iotFleetProvisioning.js b/lib/plugins/aws/package/compile/events/iotFleetProvisioning.js
index 9e2cd30e446..b7e3740761a 100644
--- a/lib/plugins/aws/package/compile/events/iotFleetProvisioning.js
+++ b/lib/plugins/aws/package/compile/events/iotFleetProvisioning.js
@@ -42,12 +42,10 @@ class AwsCompileIotFleetProvisioningEvents {
         const templateBody = event.iotFleetProvisioning.templateBody;
 
         const lambdaLogicalId = this.provider.naming.getLambdaLogicalId(functionName);
-        const iotFleetProvisioningLogicalId = this.provider.naming.getIotFleetProvisioningLogicalId(
-          functionName
-        );
-        const lambdaPermissionLogicalId = this.provider.naming.getLambdaIotFleetProvisioningPermissionLogicalId(
-          functionName
-        );
+        const iotFleetProvisioningLogicalId =
+          this.provider.naming.getIotFleetProvisioningLogicalId(functionName);
+        const lambdaPermissionLogicalId =
+          this.provider.naming.getLambdaIotFleetProvisioningPermissionLogicalId(functionName);
 
         const provisioningTemplateResource = {
           Type: 'AWS::IoT::ProvisioningTemplate',
diff --git a/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.js b/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.js
index d0eef6b47b5..f1f166414ea 100644
--- a/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.js
+++ b/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.js
@@ -18,8 +18,10 @@ module.exports = memoize(async (provider) =>
     }
 
     const cfTemplate = provider.serverless.service.provider.compiledCloudFormationTemplate;
-    const customResourceLogicalId = provider.naming.getCustomResourceApiGatewayAccountCloudWatchRoleResourceLogicalId();
-    const customResourceFunctionLogicalId = provider.naming.getCustomResourceApiGatewayAccountCloudWatchRoleHandlerFunctionLogicalId();
+    const customResourceLogicalId =
+      provider.naming.getCustomResourceApiGatewayAccountCloudWatchRoleResourceLogicalId();
+    const customResourceFunctionLogicalId =
+      provider.naming.getCustomResourceApiGatewayAccountCloudWatchRoleHandlerFunctionLogicalId();
 
     cfTemplate.Resources[customResourceLogicalId] = {
       Type: 'Custom::ApiGatewayAccountRole',
diff --git a/lib/plugins/aws/package/compile/events/s3/index.js b/lib/plugins/aws/package/compile/events/s3/index.js
index b153f32a681..39f4b88ed3f 100644
--- a/lib/plugins/aws/package/compile/events/s3/index.js
+++ b/lib/plugins/aws/package/compile/events/s3/index.js
@@ -294,10 +294,10 @@ class AwsCompileS3Events {
             });
 
             const eventFunctionLogicalId = this.provider.naming.getLambdaLogicalId(functionName);
-            const customResourceFunctionLogicalId = this.provider.naming.getCustomResourceS3HandlerFunctionLogicalId();
-            const customS3ResourceLogicalId = this.provider.naming.getCustomResourceS3ResourceLogicalId(
-              functionName
-            );
+            const customResourceFunctionLogicalId =
+              this.provider.naming.getCustomResourceS3HandlerFunctionLogicalId();
+            const customS3ResourceLogicalId =
+              this.provider.naming.getCustomResourceS3ResourceLogicalId(functionName);
 
             // store how often the custom S3 resource is used
             if (bucketResources[bucket]) {
diff --git a/lib/plugins/aws/package/compile/events/schedule.js b/lib/plugins/aws/package/compile/events/schedule.js
index d7eacf02a4d..8d28861bd28 100644
--- a/lib/plugins/aws/package/compile/events/schedule.js
+++ b/lib/plugins/aws/package/compile/events/schedule.js
@@ -121,10 +121,11 @@ class AwsCompileScheduledEvents {
               functionName,
               scheduleNumberInFunction
             );
-            const lambdaPermissionLogicalId = this.provider.naming.getLambdaSchedulePermissionLogicalId(
-              functionName,
-              scheduleNumberInFunction
-            );
+            const lambdaPermissionLogicalId =
+              this.provider.naming.getLambdaSchedulePermissionLogicalId(
+                functionName,
+                scheduleNumberInFunction
+              );
             const scheduleId = this.provider.naming.getScheduleId(functionName);
 
             const scheduleTemplate = `
diff --git a/lib/plugins/aws/package/compile/events/sns.js b/lib/plugins/aws/package/compile/events/sns.js
index 6e38c9a3238..fec3d847729 100644
--- a/lib/plugins/aws/package/compile/events/sns.js
+++ b/lib/plugins/aws/package/compile/events/sns.js
@@ -103,11 +103,8 @@ class AwsCompileSNSEvents {
             }
 
             if (event.sns.redrivePolicy) {
-              const {
-                deadLetterTargetArn,
-                deadLetterTargetRef,
-                deadLetterTargetImport,
-              } = event.sns.redrivePolicy;
+              const { deadLetterTargetArn, deadLetterTargetRef, deadLetterTargetImport } =
+                event.sns.redrivePolicy;
               let targetArn;
               let targetUrl;
 
diff --git a/lib/plugins/aws/package/compile/events/sqs.js b/lib/plugins/aws/package/compile/events/sqs.js
index 0c3cdcdc9c6..5389ad2bb0f 100644
--- a/lib/plugins/aws/package/compile/events/sqs.js
+++ b/lib/plugins/aws/package/compile/events/sqs.js
@@ -72,9 +72,8 @@ class AwsCompileSQSEvents {
             const queueLogicalId = this.provider.naming.getQueueLogicalId(functionName, queueName);
 
             const dependsOn = [];
-            const functionIamRoleResourceName = this.provider.resolveFunctionIamRoleResourceName(
-              functionObj
-            );
+            const functionIamRoleResourceName =
+              this.provider.resolveFunctionIamRoleResourceName(functionObj);
             if (functionIamRoleResourceName) {
               dependsOn.push(functionIamRoleResourceName);
             }
@@ -117,8 +116,9 @@ class AwsCompileSQSEvents {
           this.serverless.service.provider.compiledCloudFormationTemplate.Resources
             .IamRoleLambdaExecution
         ) {
-          const statement = this.serverless.service.provider.compiledCloudFormationTemplate
-            .Resources.IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement;
+          const statement =
+            this.serverless.service.provider.compiledCloudFormationTemplate.Resources
+              .IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement;
           if (sqsStatement.Resource.length) {
             statement.push(sqsStatement);
           }
diff --git a/lib/plugins/aws/package/compile/events/stream.js b/lib/plugins/aws/package/compile/events/stream.js
index 34d18fff8aa..622206a5945 100644
--- a/lib/plugins/aws/package/compile/events/stream.js
+++ b/lib/plugins/aws/package/compile/events/stream.js
@@ -188,9 +188,8 @@ class AwsCompileStreamEvents {
             );
 
             const dependsOn = [];
-            const functionIamRoleResourceName = this.provider.resolveFunctionIamRoleResourceName(
-              functionObj
-            );
+            const functionIamRoleResourceName =
+              this.provider.resolveFunctionIamRoleResourceName(functionObj);
             if (functionIamRoleResourceName) {
               dependsOn.push(functionIamRoleResourceName);
             }
@@ -285,9 +284,8 @@ class AwsCompileStreamEvents {
                     ConsumerName: consumerName,
                   },
                 };
-                const consumerLogicalId = this.provider.naming.getStreamConsumerLogicalId(
-                  consumerName
-                );
+                const consumerLogicalId =
+                  this.provider.naming.getStreamConsumerLogicalId(consumerName);
                 newStreamObject[consumerLogicalId] = consumerResource;
                 if (Array.isArray(streamResource.DependsOn)) {
                   streamResource.DependsOn.push(consumerLogicalId);
@@ -318,8 +316,9 @@ class AwsCompileStreamEvents {
           this.serverless.service.provider.compiledCloudFormationTemplate.Resources
             .IamRoleLambdaExecution
         ) {
-          const statement = this.serverless.service.provider.compiledCloudFormationTemplate
-            .Resources.IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement;
+          const statement =
+            this.serverless.service.provider.compiledCloudFormationTemplate.Resources
+              .IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement;
           if (dynamodbStreamStatement.Resource.length) {
             statement.push(dynamodbStreamStatement);
           }
diff --git a/lib/plugins/aws/package/compile/events/websockets/lib/api.js b/lib/plugins/aws/package/compile/events/websockets/lib/api.js
index 6660e043e89..b4c39638357 100644
--- a/lib/plugins/aws/package/compile/events/websockets/lib/api.js
+++ b/lib/plugins/aws/package/compile/events/websockets/lib/api.js
@@ -30,8 +30,10 @@ module.exports = {
       },
     });
 
-    const defaultRoleResource = this.serverless.service.provider.compiledCloudFormationTemplate
-      .Resources[this.provider.naming.getRoleLogicalId()];
+    const defaultRoleResource =
+      this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
+        this.provider.naming.getRoleLogicalId()
+      ];
 
     if (defaultRoleResource) {
       // insert policy that allows functions to postToConnection
diff --git a/lib/plugins/aws/package/compile/events/websockets/lib/deployment.js b/lib/plugins/aws/package/compile/events/websockets/lib/deployment.js
index 2f0c1724243..4b700fb7eeb 100644
--- a/lib/plugins/aws/package/compile/events/websockets/lib/deployment.js
+++ b/lib/plugins/aws/package/compile/events/websockets/lib/deployment.js
@@ -24,9 +24,8 @@ module.exports = {
       .createHash('sha256')
       .update(JSON.stringify(websocketsTemplatePart))
       .digest('base64');
-    this.websocketsDeploymentLogicalId = this.provider.naming.getWebsocketsDeploymentLogicalId(
-      cfTemplateHash
-    );
+    this.websocketsDeploymentLogicalId =
+      this.provider.naming.getWebsocketsDeploymentLogicalId(cfTemplateHash);
 
     const resources = this.serverless.service.provider.compiledCloudFormationTemplate.Resources;
     _.merge(resources, {
diff --git a/lib/plugins/aws/package/compile/events/websockets/lib/permissions.js b/lib/plugins/aws/package/compile/events/websockets/lib/permissions.js
index c0cdfb859f8..69aca9a708e 100644
--- a/lib/plugins/aws/package/compile/events/websockets/lib/permissions.js
+++ b/lib/plugins/aws/package/compile/events/websockets/lib/permissions.js
@@ -8,9 +8,8 @@ module.exports = {
       const websocketApiId = this.provider.getApiGatewayWebsocketApiId();
       const lambdaLogicalId = this.provider.naming.getLambdaLogicalId(event.functionName);
 
-      const websocketsPermissionLogicalId = this.provider.naming.getLambdaWebsocketsPermissionLogicalId(
-        event.functionName
-      );
+      const websocketsPermissionLogicalId =
+        this.provider.naming.getLambdaWebsocketsPermissionLogicalId(event.functionName);
 
       _.merge(this.serverless.service.provider.compiledCloudFormationTemplate.Resources, {
         [websocketsPermissionLogicalId]: {
@@ -27,9 +26,8 @@ module.exports = {
       });
 
       if (event.authorizer) {
-        const websocketsAuthorizerPermissionLogicalId = this.provider.naming.getLambdaWebsocketsPermissionLogicalId(
-          event.authorizer.name
-        );
+        const websocketsAuthorizerPermissionLogicalId =
+          this.provider.naming.getLambdaWebsocketsPermissionLogicalId(event.authorizer.name);
 
         const authorizerPermissionTemplate = {
           [websocketsAuthorizerPermissionLogicalId]: {
diff --git a/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.js b/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.js
index 2af12cb3968..d7fbfc61209 100644
--- a/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.js
+++ b/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.js
@@ -7,9 +7,8 @@ module.exports = {
         return;
       }
 
-      const websocketsRouteResponseLogicalId = this.provider.naming.getWebsocketsRouteResponseLogicalId(
-        event.route
-      );
+      const websocketsRouteResponseLogicalId =
+        this.provider.naming.getWebsocketsRouteResponseLogicalId(event.route);
 
       const websocketsRouteLogicalId = this.provider.naming.getWebsocketsRouteLogicalId(
         event.route
diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index f0af59a88bc..c4973abf133 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -533,9 +533,8 @@ class AwsCompileFunctions {
       Object.assign(cfTemplate.Resources, newVersionObject);
 
       // Add function versions to Outputs section
-      const functionVersionOutputLogicalId = this.provider.naming.getLambdaVersionOutputLogicalId(
-        functionName
-      );
+      const functionVersionOutputLogicalId =
+        this.provider.naming.getLambdaVersionOutputLogicalId(functionName);
       const newVersionOutput = this.cfOutputLatestVersionTemplate();
 
       newVersionOutput.Value = { Ref: versionLogicalId };
@@ -548,9 +547,8 @@ class AwsCompileFunctions {
         if (!shouldVersionFunction) delete versionResource.DeletionPolicy;
 
         const provisionedConcurrency = Number(functionObject.provisionedConcurrency);
-        const aliasLogicalId = this.provider.naming.getLambdaProvisionedConcurrencyAliasLogicalId(
-          functionName
-        );
+        const aliasLogicalId =
+          this.provider.naming.getLambdaProvisionedConcurrencyAliasLogicalId(functionName);
         const aliasName = this.provider.naming.getLambdaProvisionedConcurrencyAliasName();
 
         functionObject.targetAlias = { name: aliasName, logicalId: aliasLogicalId };
@@ -637,8 +635,9 @@ class AwsCompileFunctions {
 
   // Memoized in a constructor
   ensureTargetExecutionPermission(functionAddress) {
-    const iamPolicyStatements = this.serverless.service.provider.compiledCloudFormationTemplate
-      .Resources.IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement;
+    const iamPolicyStatements =
+      this.serverless.service.provider.compiledCloudFormationTemplate.Resources
+        .IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement;
 
     const action = (() => {
       if (!functionAddress.startsWith('arn:') || functionAddress.includes(':function:')) {
diff --git a/lib/plugins/aws/package/compile/layers.js b/lib/plugins/aws/package/compile/layers.js
index dff0f7af054..10a3d4d0416 100644
--- a/lib/plugins/aws/package/compile/layers.js
+++ b/lib/plugins/aws/package/compile/layers.js
@@ -99,15 +99,13 @@ class AwsCompileLayers {
 
       newLayerOutput.Value = { Ref: layerLogicalId };
 
-      const layerHashOutputLogicalId = this.provider.naming.getLambdaLayerHashOutputLogicalId(
-        layerName
-      );
+      const layerHashOutputLogicalId =
+        this.provider.naming.getLambdaLayerHashOutputLogicalId(layerName);
       const newLayerHashOutput = this.cfOutputLayerHashTemplate();
       newLayerHashOutput.Value = sha;
 
-      const layerS3KeyOutputLogicalId = this.provider.naming.getLambdaLayerS3KeyOutputLogicalId(
-        layerName
-      );
+      const layerS3KeyOutputLogicalId =
+        this.provider.naming.getLambdaLayerS3KeyOutputLogicalId(layerName);
       const newLayerS3KeyOutput = this.cfOutputLayerS3KeyTemplate();
       newLayerS3KeyOutput.Value = newLayer.Properties.Content.S3Key;
 
@@ -121,25 +119,23 @@ class AwsCompileLayers {
 
   async compareWithLastLayer(layerName) {
     const stackName = this.provider.naming.getStackName();
-    const layerHashOutputLogicalId = this.provider.naming.getLambdaLayerHashOutputLogicalId(
-      layerName
-    );
+    const layerHashOutputLogicalId =
+      this.provider.naming.getLambdaLayerHashOutputLogicalId(layerName);
 
     return this.provider.request('CloudFormation', 'describeStacks', { StackName: stackName }).then(
       (data) => {
         const lastHash = data.Stacks[0].Outputs.find(
           (output) => output.OutputKey === layerHashOutputLogicalId
         );
-        const compiledCloudFormationTemplate = this.serverless.service.provider
-          .compiledCloudFormationTemplate;
+        const compiledCloudFormationTemplate =
+          this.serverless.service.provider.compiledCloudFormationTemplate;
         const newSha = compiledCloudFormationTemplate.Outputs[layerHashOutputLogicalId].Value;
         if (lastHash == null || lastHash.OutputValue !== newSha) {
           return;
         }
 
-        const layerS3keyOutputLogicalId = this.provider.naming.getLambdaLayerS3KeyOutputLogicalId(
-          layerName
-        );
+        const layerS3keyOutputLogicalId =
+          this.provider.naming.getLambdaLayerS3KeyOutputLogicalId(layerName);
         const lastS3Key = data.Stacks[0].Outputs.find(
           (output) => output.OutputKey === layerS3keyOutputLogicalId
         );
diff --git a/lib/plugins/aws/package/lib/generateCoreTemplate.js b/lib/plugins/aws/package/lib/generateCoreTemplate.js
index 4991327931e..0b18c34b176 100644
--- a/lib/plugins/aws/package/lib/generateCoreTemplate.js
+++ b/lib/plugins/aws/package/lib/generateCoreTemplate.js
@@ -6,16 +6,17 @@ const ServerlessError = require('../../../../serverless-error');
 
 module.exports = {
   generateCoreTemplate() {
-    this.serverless.service.provider.compiledCloudFormationTemplate = this.serverless.utils.readFileSync(
-      path.join(
-        this.serverless.config.serverlessPath,
-        'plugins',
-        'aws',
-        'package',
-        'lib',
-        'core-cloudformation-template.json'
-      )
-    );
+    this.serverless.service.provider.compiledCloudFormationTemplate =
+      this.serverless.utils.readFileSync(
+        path.join(
+          this.serverless.config.serverlessPath,
+          'plugins',
+          'aws',
+          'package',
+          'lib',
+          'core-cloudformation-template.json'
+        )
+      );
 
     const bucketName = this.serverless.service.provider.deploymentBucket;
 
@@ -60,7 +61,8 @@ module.exports = {
       }
 
       if (deploymentBucketObject.skipPolicySetup) {
-        const deploymentBucketPolicyLogicalId = this.provider.naming.getDeploymentBucketPolicyLogicalId();
+        const deploymentBucketPolicyLogicalId =
+          this.provider.naming.getDeploymentBucketPolicyLogicalId();
         delete this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
           deploymentBucketPolicyLogicalId
         ];
@@ -86,7 +88,8 @@ module.exports = {
       }
       this.bucketName = bucketName;
       this.serverless.service.package.deploymentBucket = bucketName;
-      this.serverless.service.provider.compiledCloudFormationTemplate.Outputs.ServerlessDeploymentBucketName.Value = bucketName;
+      this.serverless.service.provider.compiledCloudFormationTemplate.Outputs.ServerlessDeploymentBucketName.Value =
+        bucketName;
 
       delete this.serverless.service.provider.compiledCloudFormationTemplate.Resources
         .ServerlessDeploymentBucket;
@@ -107,9 +110,10 @@ module.exports = {
         }
       );
       // keep track of acceleration status via CloudFormation Output
-      this.serverless.service.provider.compiledCloudFormationTemplate.Outputs.ServerlessDeploymentBucketAccelerated = {
-        Value: true,
-      };
+      this.serverless.service.provider.compiledCloudFormationTemplate.Outputs.ServerlessDeploymentBucketAccelerated =
+        {
+          Value: true,
+        };
     } else if (isS3TransferAccelerationDisabled && isS3TransferAccelerationSupported) {
       // explicitly disable acceleration via CloudFormation
       Object.assign(
diff --git a/lib/plugins/aws/package/lib/mergeIamTemplates.js b/lib/plugins/aws/package/lib/mergeIamTemplates.js
index 54aaa7666dd..e0bf88aeca5 100644
--- a/lib/plugins/aws/package/lib/mergeIamTemplates.js
+++ b/lib/plugins/aws/package/lib/mergeIamTemplates.js
@@ -86,10 +86,12 @@ module.exports = {
     } else if (iamRole.permissionBoundary) {
       iamRoleLambdaExecutionTemplate.Properties.PermissionsBoundary = iamRole.permissionBoundary;
     } else if (this.serverless.service.provider.rolePermissionsBoundary) {
-      iamRoleLambdaExecutionTemplate.Properties.PermissionsBoundary = this.serverless.service.provider.rolePermissionsBoundary;
+      iamRoleLambdaExecutionTemplate.Properties.PermissionsBoundary =
+        this.serverless.service.provider.rolePermissionsBoundary;
     }
 
-    iamRoleLambdaExecutionTemplate.Properties.Policies[0].PolicyName = this.provider.naming.getPolicyName();
+    iamRoleLambdaExecutionTemplate.Properties.Policies[0].PolicyName =
+      this.provider.naming.getPolicyName();
 
     _.merge(this.serverless.service.provider.compiledCloudFormationTemplate.Resources, {
       [this.provider.naming.getRoleLogicalId()]: iamRoleLambdaExecutionTemplate,
@@ -100,19 +102,18 @@ module.exports = {
     }-${this.provider.getStage()}`;
     const logGroupsPrefix = this.provider.naming.getLogGroupName(canonicalFunctionNamePrefix);
 
-    const policyDocumentStatements = this.serverless.service.provider.compiledCloudFormationTemplate
-      .Resources[this.provider.naming.getRoleLogicalId()].Properties.Policies[0].PolicyDocument
-      .Statement;
+    const policyDocumentStatements =
+      this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
+        this.provider.naming.getRoleLogicalId()
+      ].Properties.Policies[0].PolicyDocument.Statement;
 
     let hasOneOrMoreCanonicallyNamedFunctions = false;
     const disableLogsCanonicallyNamedFunctions = [];
 
     // Ensure policies for functions with custom name resolution
     this.serverless.service.getAllFunctions().forEach((functionName) => {
-      const {
-        name: resolvedFunctionName,
-        disableLogs: areLogsDisabled,
-      } = this.serverless.service.getFunction(functionName);
+      const { name: resolvedFunctionName, disableLogs: areLogsDisabled } =
+        this.serverless.service.getFunction(functionName);
       if (!resolvedFunctionName || resolvedFunctionName.startsWith(canonicalFunctionNamePrefix)) {
         if (areLogsDisabled) {
           disableLogsCanonicallyNamedFunctions.push(resolvedFunctionName);
@@ -123,9 +124,8 @@ module.exports = {
       }
 
       if (!areLogsDisabled) {
-        const customFunctionNamelogGroupsPrefix = this.provider.naming.getLogGroupName(
-          resolvedFunctionName
-        );
+        const customFunctionNamelogGroupsPrefix =
+          this.provider.naming.getLogGroupName(resolvedFunctionName);
 
         policyDocumentStatements[0].Resource.push({
           'Fn::Sub':
@@ -214,9 +214,10 @@ module.exports = {
 
   mergeManagedPolicies(managedPolicies) {
     if (!managedPolicies.length) return;
-    const resource = this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
-      this.provider.naming.getRoleLogicalId()
-    ].Properties;
+    const resource =
+      this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
+        this.provider.naming.getRoleLogicalId()
+      ].Properties;
     if (!Array.isArray(resource.ManagedPolicyArns)) {
       resource.ManagedPolicyArns = [];
     }
diff --git a/package.json b/package.json
index 5554ced072e..be0b92a5bf8 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "mock-require": "^3.0.3",
     "nyc": "^15.1.0",
     "pkg": "^4.5.1",
-    "prettier": "^2.2.1",
+    "prettier": "^2.3.0",
     "process-utils": "^4.0.0",
     "proxyquire": "^2.1.3",
     "semver-regex": "^3.1.2",
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 48e8b89f8f0..7ea97914577 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -415,9 +415,8 @@ const processSpanPromise = (async () => {
                 { providerName: providerName || 'aws', configuration }
               );
               resolveInput.clear();
-              ({ command, commands, options, isHelpRequest, commandSchema } = resolveInput(
-                commandsSchema
-              ));
+              ({ command, commands, options, isHelpRequest, commandSchema } =
+                resolveInput(commandsSchema));
               serverless.processedInput.commands = serverless.pluginManager.cliCommands = commands;
               serverless.processedInput.options = serverless.pluginManager.cliOptions = options;
               hasFinalCommandSchema = true;
@@ -479,9 +478,8 @@ const processSpanPromise = (async () => {
         }
 
         // Register serverless instance and AWS provider specific variable sources
-        resolverConfiguration.sources.sls = require('../lib/configuration/variables/sources/instance-dependent/get-sls')(
-          serverless
-        );
+        resolverConfiguration.sources.sls =
+          require('../lib/configuration/variables/sources/instance-dependent/get-sls')(serverless);
         resolverConfiguration.fulfilledSources.add('sls');
 
         if (providerName === 'aws') {
@@ -580,9 +578,8 @@ const processSpanPromise = (async () => {
         }
 
         // Report unrecognized variable sources found in variables configured in service config
-        const unresolvedSources = require('../lib/configuration/variables/resolve-unresolved-source-types')(
-          variablesMeta
-        );
+        const unresolvedSources =
+          require('../lib/configuration/variables/resolve-unresolved-source-types')(variablesMeta);
         if (!(configuration.variablesResolutionMode >= 20210326)) {
           unresolvedSources.delete('opt');
           const legacyCfVarPropertyPaths = new Set();
diff --git a/test/unit/lib/classes/ConfigSchemaHandler/index.test.js b/test/unit/lib/classes/ConfigSchemaHandler/index.test.js
index d1054c7bfbe..91cdb9ef971 100644
--- a/test/unit/lib/classes/ConfigSchemaHandler/index.test.js
+++ b/test/unit/lib/classes/ConfigSchemaHandler/index.test.js
@@ -131,11 +131,12 @@ describe('ConfigSchemaHandler', () => {
         command: 'info',
       });
 
-      const existingEventDefinition = serverless.serverless.configSchemaHandler.schema.properties.functions.patternProperties[
-        FUNCTION_NAME_PATTERN
-      ].properties.events.items.anyOf.find(
-        (definition) => definition.required[0] === 'existingEvent'
-      ).properties.existingEvent;
+      const existingEventDefinition =
+        serverless.serverless.configSchemaHandler.schema.properties.functions.patternProperties[
+          FUNCTION_NAME_PATTERN
+        ].properties.events.items.anyOf.find(
+          (definition) => definition.required[0] === 'existingEvent'
+        ).properties.existingEvent;
 
       expect(existingEventDefinition.properties).to.have.deep.property(
         'somePluginAdditionalEventProp',
@@ -152,11 +153,12 @@ describe('ConfigSchemaHandler', () => {
         command: 'info',
       });
 
-      const existingEventDefinition = serverless.serverless.configSchemaHandler.schema.properties.functions.patternProperties[
-        FUNCTION_NAME_PATTERN
-      ].properties.events.items.anyOf.find(
-        (definition) => definition.required[0] === 'existingComplexEvent'
-      ).properties.existingComplexEvent;
+      const existingEventDefinition =
+        serverless.serverless.configSchemaHandler.schema.properties.functions.patternProperties[
+          FUNCTION_NAME_PATTERN
+        ].properties.events.items.anyOf.find(
+          (definition) => definition.required[0] === 'existingComplexEvent'
+        ).properties.existingComplexEvent;
 
       expect(existingEventDefinition).to.deep.equal({
         anyOf: [
diff --git a/test/unit/lib/plugins/aws/deploy/index.test.js b/test/unit/lib/plugins/aws/deploy/index.test.js
index 301ce7ffa64..023b921e80c 100644
--- a/test/unit/lib/plugins/aws/deploy/index.test.js
+++ b/test/unit/lib/plugins/aws/deploy/index.test.js
@@ -400,16 +400,14 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
     const listObjectsV2Stub = sinon.stub().resolves({
       Contents: [
         {
-          Key:
-            'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/compiled-cloudformation-template.json',
+          Key: 'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/compiled-cloudformation-template.json',
           LastModified: new Date(),
           ETag: '"5102a4cf710cae6497dba9e61b85d0a4"',
           Size: 356,
           StorageClass: 'STANDARD',
         },
         {
-          Key:
-            'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/my-own.zip',
+          Key: 'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/my-own.zip',
           LastModified: new Date(),
           ETag: '"5102a4cf710cae6497dba9e61b85d0a4"',
           Size: 356,
@@ -421,8 +419,7 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
     s3HeadObjectStub
       .withArgs({
         Bucket: 's3-bucket-resource',
-        Key:
-          'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/compiled-cloudformation-template.json',
+        Key: 'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/compiled-cloudformation-template.json',
       })
       .returns({
         Metadata: { filesha256: 'qxp+iwSTMhcRUfHzka4AE4XAWawS8GnEyBh1WpGb7Vw=' },
@@ -430,8 +427,7 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
     s3HeadObjectStub
       .withArgs({
         Bucket: 's3-bucket-resource',
-        Key:
-          'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/my-own.zip',
+        Key: 'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/my-own.zip',
       })
       .returns({
         Metadata: { filesha256: 'T0qEYHOE4Xv2E8Ar03xGogAlElcdf/dQh/lh9ao7Glo=' },
diff --git a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
index 3fcd3ecf5cd..c4a8cc1d1ea 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
@@ -601,8 +601,7 @@ describe('checkForChanges #2', () => {
           listObjectsV2: {
             Contents: [
               {
-                Key:
-                  'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/artifact.zip',
+                Key: 'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/artifact.zip',
                 LastModified: new Date(),
                 ETag: '"5102a4cf710cae6497dba9e61b85d0a4"',
                 Size: 356,
@@ -1041,8 +1040,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
             headObjectStub
               .withArgs({
                 Bucket: 'deployment-bucket',
-                Key:
-                  'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/compiled-cloudformation-template.json',
+                Key: 'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/compiled-cloudformation-template.json',
               })
               .returns({
                 Metadata: { filesha256: 'pZOdrt6qijT7ITsLQjPP9QwgMAfKA2RuUUSTW+l8wWs=' },
@@ -1051,8 +1049,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
             headObjectStub
               .withArgs({
                 Bucket: 'deployment-bucket',
-                Key:
-                  'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/my-own.zip',
+                Key: 'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/my-own.zip',
               })
               .returns({
                 Metadata: { filesha256: 'T0qEYHOE4Xv2E8Ar03xGogAlElcdf/dQh/lh9ao7Glo=' },
@@ -1063,16 +1060,14 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
           listObjectsV2: {
             Contents: [
               {
-                Key:
-                  'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/compiled-cloudformation-template.json',
+                Key: 'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/compiled-cloudformation-template.json',
                 LastModified: new Date(),
                 ETag: '"5102a4cf710cae6497dba9e61b85d0a4"',
                 Size: 356,
                 StorageClass: 'STANDARD',
               },
               {
-                Key:
-                  'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/my-own.zip',
+                Key: 'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/my-own.zip',
                 LastModified: new Date(),
                 ETag: '"5102a4cf710cae6497dba9e61b85d0a4"',
                 Size: 356,
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
index e0b61a30c29..48d64889369 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
@@ -355,62 +355,63 @@ describe('AwsCompileCloudFrontEvents', () => {
           ],
         },
       };
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        FirstLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'FirstLambdaFunction' },
+          FirstLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'FirstLambdaFunction' },
+            },
           },
-        },
-        IamRoleLambdaExecution: {
-          Type: 'AWS::IAM::Role',
-          Properties: {
-            AssumeRolePolicyDocument: {
-              Version: '2012-10-17',
-              Statement: [
+          IamRoleLambdaExecution: {
+            Type: 'AWS::IAM::Role',
+            Properties: {
+              AssumeRolePolicyDocument: {
+                Version: '2012-10-17',
+                Statement: [
+                  {
+                    Effect: 'Allow',
+                    Principal: {
+                      Service: ['lambda.amazonaws.com'],
+                    },
+                    Action: ['sts:AssumeRole'],
+                  },
+                ],
+              },
+              Policies: [
                 {
-                  Effect: 'Allow',
-                  Principal: {
-                    Service: ['lambda.amazonaws.com'],
+                  PolicyName: {
+                    'Fn::Join': ['-', ['dev', 'first', 'lambda']],
+                  },
+                  PolicyDocument: {
+                    Version: '2012-10-17',
+                    Statement: [],
                   },
-                  Action: ['sts:AssumeRole'],
                 },
               ],
-            },
-            Policies: [
-              {
-                PolicyName: {
-                  'Fn::Join': ['-', ['dev', 'first', 'lambda']],
-                },
-                PolicyDocument: {
-                  Version: '2012-10-17',
-                  Statement: [],
-                },
-              },
-            ],
-            Path: '/',
-            RoleName: {
-              'Fn::Join': [
-                '-',
-                [
-                  'first',
-                  'dev',
-                  {
-                    Ref: 'AWS::Region',
-                  },
-                  'lambdaRole',
+              Path: '/',
+              RoleName: {
+                'Fn::Join': [
+                  '-',
+                  [
+                    'first',
+                    'dev',
+                    {
+                      Ref: 'AWS::Region',
+                    },
+                    'lambdaRole',
+                  ],
                 ],
-              ],
+              },
             },
           },
-        },
-      };
+        };
 
       expect(() => awsCompileCloudFrontEvents.compileCloudFrontEvents()).to.throw(
         /to the us-east-1 region/
@@ -431,62 +432,63 @@ describe('AwsCompileCloudFrontEvents', () => {
           ],
         },
       };
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        FirstLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'FirstLambdaFunction' },
+          FirstLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'FirstLambdaFunction' },
+            },
           },
-        },
-        IamRoleLambdaExecution: {
-          Type: 'AWS::IAM::Role',
-          Properties: {
-            AssumeRolePolicyDocument: {
-              Version: '2012-10-17',
-              Statement: [
+          IamRoleLambdaExecution: {
+            Type: 'AWS::IAM::Role',
+            Properties: {
+              AssumeRolePolicyDocument: {
+                Version: '2012-10-17',
+                Statement: [
+                  {
+                    Effect: 'Allow',
+                    Principal: {
+                      Service: ['lambda.amazonaws.com'],
+                    },
+                    Action: ['sts:AssumeRole'],
+                  },
+                ],
+              },
+              Policies: [
                 {
-                  Effect: 'Allow',
-                  Principal: {
-                    Service: ['lambda.amazonaws.com'],
+                  PolicyName: {
+                    'Fn::Join': ['-', ['dev', 'first', 'lambda']],
+                  },
+                  PolicyDocument: {
+                    Version: '2012-10-17',
+                    Statement: [],
                   },
-                  Action: ['sts:AssumeRole'],
                 },
               ],
-            },
-            Policies: [
-              {
-                PolicyName: {
-                  'Fn::Join': ['-', ['dev', 'first', 'lambda']],
-                },
-                PolicyDocument: {
-                  Version: '2012-10-17',
-                  Statement: [],
-                },
-              },
-            ],
-            Path: '/',
-            RoleName: {
-              'Fn::Join': [
-                '-',
-                [
-                  'first',
-                  'dev',
-                  {
-                    Ref: 'AWS::Region',
-                  },
-                  'lambdaRole',
+              Path: '/',
+              RoleName: {
+                'Fn::Join': [
+                  '-',
+                  [
+                    'first',
+                    'dev',
+                    {
+                      Ref: 'AWS::Region',
+                    },
+                    'lambdaRole',
+                  ],
                 ],
-              ],
+              },
             },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -607,20 +609,21 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -677,20 +680,21 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -744,14 +748,15 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -807,20 +812,21 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -863,14 +869,15 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -936,20 +943,21 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -1001,20 +1009,21 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-      };
+        };
 
       expect(() => {
         awsCompileCloudFrontEvents.compileCloudFrontEvents();
@@ -1048,32 +1057,33 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        FirstLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'FirstLambdaFunction' },
+          FirstLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'FirstLambdaFunction' },
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-        SecondLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'SecondLambdaFunction' },
+          SecondLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'SecondLambdaFunction' },
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -1134,20 +1144,21 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        FirstLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'FirstLambdaFunction' },
+          FirstLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'FirstLambdaFunction' },
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -1213,32 +1224,33 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        FirstLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'FirstLambdaFunction' },
+          FirstLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'FirstLambdaFunction' },
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-        SecondLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'SecondLambdaFunction' },
+          SecondLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'SecondLambdaFunction' },
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -1321,32 +1333,33 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        FirstLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'FirstLambdaFunction' },
+          FirstLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'FirstLambdaFunction' },
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-        SecondLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'SecondLambdaFunction' },
+          SecondLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'SecondLambdaFunction' },
+            },
           },
-        },
-      };
+        };
 
       expect(() => {
         awsCompileCloudFrontEvents.compileCloudFrontEvents();
@@ -1382,32 +1395,33 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        FirstLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'FirstLambdaFunction' },
+          FirstLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'FirstLambdaFunction' },
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-        SecondLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'SecondLambdaFunction' },
+          SecondLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'SecondLambdaFunction' },
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -1464,20 +1478,21 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        FirstLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'FirstLambdaFunction' },
+          FirstLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'FirstLambdaFunction' },
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -1532,32 +1547,33 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        FirstLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'FirstLambdaFunction' },
+          FirstLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'FirstLambdaFunction' },
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-        SecondLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'SecondLambdaFunction' },
+          SecondLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'SecondLambdaFunction' },
+            },
           },
-        },
-      };
+        };
 
       expect(() => {
         awsCompileCloudFrontEvents.compileCloudFrontEvents();
@@ -1592,32 +1608,33 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        FirstLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'FirstLambdaFunction' },
+          FirstLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'FirstLambdaFunction' },
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-        SecondLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'SecondLambdaFunction' },
+          SecondLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'SecondLambdaFunction' },
+            },
           },
-        },
-      };
+        };
 
       expect(() => {
         awsCompileCloudFrontEvents.compileCloudFrontEvents();
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js b/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
index fe379bdb4f5..a920b1dfca0 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
@@ -295,9 +295,9 @@ describe('AwsCompileCognitoUserPoolEvents', () => {
       return expect(
         awsCompileCognitoUserPoolEvents.existingCognitoUserPools()
       ).to.be.fulfilled.then(() => {
-        const {
-          Resources,
-        } = awsCompileCognitoUserPoolEvents.serverless.service.provider.compiledCloudFormationTemplate;
+        const { Resources } =
+          awsCompileCognitoUserPoolEvents.serverless.service.provider
+            .compiledCloudFormationTemplate;
 
         expect(addCustomResourceToServiceStub).to.have.been.calledOnce;
         expect(addCustomResourceToServiceStub.args[0][1]).to.equal('cognitoUserPool');
@@ -377,9 +377,9 @@ describe('AwsCompileCognitoUserPoolEvents', () => {
       return expect(
         awsCompileCognitoUserPoolEvents.existingCognitoUserPools()
       ).to.be.fulfilled.then(() => {
-        const {
-          Resources,
-        } = awsCompileCognitoUserPoolEvents.serverless.service.provider.compiledCloudFormationTemplate;
+        const { Resources } =
+          awsCompileCognitoUserPoolEvents.serverless.service.provider
+            .compiledCloudFormationTemplate;
 
         expect(addCustomResourceToServiceStub).to.have.been.calledOnce;
         expect(addCustomResourceToServiceStub.args[0][1]).to.equal('cognitoUserPool');
@@ -491,9 +491,9 @@ describe('AwsCompileCognitoUserPoolEvents', () => {
       return expect(
         awsCompileCognitoUserPoolEvents.existingCognitoUserPools()
       ).to.be.fulfilled.then(() => {
-        const {
-          Resources,
-        } = awsCompileCognitoUserPoolEvents.serverless.service.provider.compiledCloudFormationTemplate;
+        const { Resources } =
+          awsCompileCognitoUserPoolEvents.serverless.service.provider
+            .compiledCloudFormationTemplate;
 
         expect(addCustomResourceToServiceStub).to.have.been.calledOnce;
         expect(addCustomResourceToServiceStub.args[0][1]).to.equal('cognitoUserPool');
diff --git a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
index 692e6f1e8b7..9a49fd8e935 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
@@ -156,9 +156,8 @@ describe('EventBridgeEvents', () => {
     it('should create the correct policy Statement', () => {
       const roleId = naming.getCustomResourcesRoleLogicalId('default', '12345');
 
-      const [firstStatement, secondStatement, thirdStatment] = cfResources[
-        roleId
-      ].Properties.Policies[0].PolicyDocument.Statement;
+      const [firstStatement, secondStatement, thirdStatment] =
+        cfResources[roleId].Properties.Policies[0].PolicyDocument.Statement;
       expect(firstStatement.Effect).to.be.eq('Allow');
       expect(firstStatement.Resource['Fn::Join'][1]).to.deep.include('arn');
       expect(firstStatement.Resource['Fn::Join'][1]).to.deep.include('events');
diff --git a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
index 192f5d0246f..78cbd654b9f 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
@@ -462,9 +462,8 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
     });
 
     it('should create permission resource when authorizer references function from service', () => {
-      const authorizerPermissionLogicalId = naming.getLambdaAuthorizerHttpApiPermissionLogicalId(
-        'someAuthorizer'
-      );
+      const authorizerPermissionLogicalId =
+        naming.getLambdaAuthorizerHttpApiPermissionLogicalId('someAuthorizer');
       expect(cfResources[authorizerPermissionLogicalId]).to.deep.equal({
         Type: 'AWS::Lambda::Permission',
         Properties: {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
index a032d87385b..d1be3db4189 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
@@ -373,9 +373,8 @@ describe('AwsCompileS3Events', () => {
       };
 
       return expect(awsCompileS3Events.existingS3Buckets()).to.be.fulfilled.then(() => {
-        const {
-          Resources,
-        } = awsCompileS3Events.serverless.service.provider.compiledCloudFormationTemplate;
+        const { Resources } =
+          awsCompileS3Events.serverless.service.provider.compiledCloudFormationTemplate;
 
         expect(addCustomResourceToServiceStub).to.have.been.calledOnce;
         expect(addCustomResourceToServiceStub.args[0][1]).to.equal('s3');
@@ -458,9 +457,8 @@ describe('AwsCompileS3Events', () => {
       };
 
       return expect(awsCompileS3Events.existingS3Buckets()).to.be.fulfilled.then(() => {
-        const {
-          Resources,
-        } = awsCompileS3Events.serverless.service.provider.compiledCloudFormationTemplate;
+        const { Resources } =
+          awsCompileS3Events.serverless.service.provider.compiledCloudFormationTemplate;
 
         expect(addCustomResourceToServiceStub).to.have.been.calledOnce;
         expect(addCustomResourceToServiceStub.args[0][1]).to.equal('s3');
@@ -564,9 +562,8 @@ describe('AwsCompileS3Events', () => {
       };
 
       return expect(awsCompileS3Events.existingS3Buckets()).to.be.fulfilled.then(() => {
-        const {
-          Resources,
-        } = awsCompileS3Events.serverless.service.provider.compiledCloudFormationTemplate;
+        const { Resources } =
+          awsCompileS3Events.serverless.service.provider.compiledCloudFormationTemplate;
 
         expect(addCustomResourceToServiceStub).to.have.been.calledOnce;
         expect(addCustomResourceToServiceStub.args[0][1]).to.equal('s3');
@@ -745,9 +742,8 @@ describe('AwsCompileS3Events', () => {
       };
 
       return expect(awsCompileS3Events.existingS3Buckets()).to.be.fulfilled.then(() => {
-        const {
-          Resources,
-        } = awsCompileS3Events.serverless.service.provider.compiledCloudFormationTemplate;
+        const { Resources } =
+          awsCompileS3Events.serverless.service.provider.compiledCloudFormationTemplate;
 
         expect(Object.keys(Resources)).to.have.length(2);
         expect(Resources.FirstCustomS31).to.deep.equal({
@@ -872,9 +868,10 @@ describe('AwsCompileS3Events', () => {
         '*',
       ];
 
-      const lambdaPermissionsPolicies = cfTemplate.Resources.IamRoleCustomResourcesLambdaExecution.Properties.Policies[
-        '0'
-      ].PolicyDocument.Statement.filter((x) => x.Action[0].includes('AddPermission'));
+      const lambdaPermissionsPolicies =
+        cfTemplate.Resources.IamRoleCustomResourcesLambdaExecution.Properties.Policies[
+          '0'
+        ].PolicyDocument.Statement.filter((x) => x.Action[0].includes('AddPermission'));
 
       expect(lambdaPermissionsPolicies).to.have.length(1);
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js b/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
index 3124cc0302c..8f49098b3bb 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
@@ -50,7 +50,8 @@ describe('AwsCompileSQSEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       expect(() => {
         awsCompileSQSEvents.compileSQSEvents();
@@ -74,7 +75,8 @@ describe('AwsCompileSQSEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       expect(() => {
         awsCompileSQSEvents.compileSQSEvents();
@@ -107,7 +109,8 @@ describe('AwsCompileSQSEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       expect(() => {
         awsCompileSQSEvents.compileSQSEvents();
@@ -140,7 +143,8 @@ describe('AwsCompileSQSEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       expect(() => {
         awsCompileSQSEvents.compileSQSEvents();
@@ -171,7 +175,8 @@ describe('AwsCompileSQSEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       awsCompileSQSEvents.serverless.service.provider.role = 'arn:aws:iam::account:role/foo';
 
@@ -205,7 +210,8 @@ describe('AwsCompileSQSEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       expect(() => {
         awsCompileSQSEvents.compileSQSEvents();
@@ -233,7 +239,8 @@ describe('AwsCompileSQSEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       awsCompileSQSEvents.serverless.service.provider.role = {
         'Fn::GetAtt': [roleLogicalId, 'Arn'],
@@ -269,7 +276,8 @@ describe('AwsCompileSQSEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       awsCompileSQSEvents.serverless.service.provider.role = roleLogicalId;
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/stream.test.js b/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
index af2404dd754..910e424d64c 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
@@ -97,7 +97,8 @@ describe('AwsCompileStreamEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       expect(() => {
         awsCompileStreamEvents.compileStreamEvents();
@@ -122,7 +123,8 @@ describe('AwsCompileStreamEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       expect(() => {
         awsCompileStreamEvents.compileStreamEvents();
@@ -156,7 +158,8 @@ describe('AwsCompileStreamEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       expect(() => {
         awsCompileStreamEvents.compileStreamEvents();
@@ -186,7 +189,8 @@ describe('AwsCompileStreamEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       expect(() => {
         awsCompileStreamEvents.compileStreamEvents();
@@ -214,7 +218,8 @@ describe('AwsCompileStreamEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       awsCompileStreamEvents.serverless.service.provider.role = 'arn:aws:iam::account:role/foo';
 
@@ -249,7 +254,8 @@ describe('AwsCompileStreamEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       expect(() => {
         awsCompileStreamEvents.compileStreamEvents();
@@ -278,7 +284,8 @@ describe('AwsCompileStreamEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       expect(() => {
         awsCompileStreamEvents.compileStreamEvents();
@@ -307,7 +314,8 @@ describe('AwsCompileStreamEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       awsCompileStreamEvents.serverless.service.provider.role = {
         'Fn::GetAtt': [roleLogicalId, 'Arn'],
@@ -340,7 +348,8 @@ describe('AwsCompileStreamEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       awsCompileStreamEvents.serverless.service.provider.role = roleLogicalId;
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/api.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/api.test.js
index ea87b825839..c11588e8bd5 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/api.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/api.test.js
@@ -18,19 +18,20 @@ describe('#compileApi()', () => {
     awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless);
 
     roleLogicalId = awsCompileWebsocketsEvents.provider.naming.getRoleLogicalId();
-    awsCompileWebsocketsEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-      [roleLogicalId]: {
-        Properties: {
-          Policies: [
-            {
-              PolicyDocument: {
-                Statement: [],
+    awsCompileWebsocketsEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+      {
+        [roleLogicalId]: {
+          Properties: {
+            Policies: [
+              {
+                PolicyDocument: {
+                  Statement: [],
+                },
               },
-            },
-          ],
+            ],
+          },
         },
-      },
-    };
+      };
   });
 
   it('should create a websocket api resource', () => {
@@ -90,7 +91,8 @@ describe('#compileApi()', () => {
   });
 
   it('should NOT add the websockets policy if role resource does not exist', () => {
-    awsCompileWebsocketsEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {};
+    awsCompileWebsocketsEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+      {};
 
     awsCompileWebsocketsEvents.compileApi();
     const resources =
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/authorizers.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/authorizers.test.js
index 9cf51b2bfdf..1c5da2675b3 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/authorizers.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/authorizers.test.js
@@ -16,7 +16,8 @@ describe('#compileAuthorizers()', () => {
 
       awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless);
 
-      awsCompileWebsocketsEvents.websocketsApiLogicalId = awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
+      awsCompileWebsocketsEvents.websocketsApiLogicalId =
+        awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
 
       awsCompileWebsocketsEvents.validated = {
         events: [
@@ -111,7 +112,8 @@ describe('#compileAuthorizers()', () => {
 
       awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless);
 
-      awsCompileWebsocketsEvents.websocketsApiLogicalId = awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
+      awsCompileWebsocketsEvents.websocketsApiLogicalId =
+        awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
 
       awsCompileWebsocketsEvents.validated = {
         events: [
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/deployment.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/deployment.test.js
index b1cb4c04041..4b1c1f4e899 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/deployment.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/deployment.test.js
@@ -22,7 +22,8 @@ describe('#compileDeployment()', () => {
 
     awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless, options);
 
-    awsCompileWebsocketsEvents.websocketsApiLogicalId = awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
+    awsCompileWebsocketsEvents.websocketsApiLogicalId =
+      awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
   });
 
   it('should create a deployment resource and output', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/integrations.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/integrations.test.js
index de54f104be9..e624610121e 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/integrations.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/integrations.test.js
@@ -15,7 +15,8 @@ describe('#compileIntegrations()', () => {
 
     awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless);
 
-    awsCompileWebsocketsEvents.websocketsApiLogicalId = awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
+    awsCompileWebsocketsEvents.websocketsApiLogicalId =
+      awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
   });
 
   it('should create an integration resource for every event', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/permissions.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/permissions.test.js
index 93100ee5902..bdda6014341 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/permissions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/permissions.test.js
@@ -15,7 +15,8 @@ describe('#compilePermissions()', () => {
 
     awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless);
 
-    awsCompileWebsocketsEvents.websocketsApiLogicalId = awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
+    awsCompileWebsocketsEvents.websocketsApiLogicalId =
+      awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
   });
 
   it('should create a permission resource for every event', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.test.js
index 1c6cf48209d..535161a3226 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.test.js
@@ -15,7 +15,8 @@ describe('#compileRouteResponses()', () => {
 
     awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless);
 
-    awsCompileWebsocketsEvents.websocketsApiLogicalId = awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
+    awsCompileWebsocketsEvents.websocketsApiLogicalId =
+      awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
   });
 
   it('should create a RouteResponse resource for events with selection expression', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routes.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routes.test.js
index 23d99e82039..95c64247ed1 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routes.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routes.test.js
@@ -15,7 +15,8 @@ describe('#compileRoutes()', () => {
 
     awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless);
 
-    awsCompileWebsocketsEvents.websocketsApiLogicalId = awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
+    awsCompileWebsocketsEvents.websocketsApiLogicalId =
+      awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
   });
 
   it('should create a route resource for every event', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js
index 2b07e6df576..89c5fd3a196 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js
@@ -34,7 +34,8 @@ describe('#compileStage()', () => {
     awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless, options);
     stageLogicalId = awsCompileWebsocketsEvents.provider.naming.getWebsocketsStageLogicalId();
     logGroupLogicalId = awsCompileWebsocketsEvents.provider.naming.getWebsocketsLogGroupLogicalId();
-    awsCompileWebsocketsEvents.websocketsApiLogicalId = awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
+    awsCompileWebsocketsEvents.websocketsApiLogicalId =
+      awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
   });
 
   it('should create a stage resource if no websocketApiId specified', () =>
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index b787974cbf9..ee9af17e991 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -450,17 +450,18 @@ describe('AwsCompileFunctions', () => {
       describe('when IamRoleLambdaExecution is used', () => {
         beforeEach(() => {
           // pretend that the IamRoleLambdaExecution is used
-          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = {
-            Properties: {
-              Policies: [
-                {
-                  PolicyDocument: {
-                    Statement: [],
+          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+            {
+              Properties: {
+                Policies: [
+                  {
+                    PolicyDocument: {
+                      Statement: [],
+                    },
                   },
-                },
-              ],
-            },
-          };
+                ],
+              },
+            };
         });
 
         it('should create necessary resources if a SNS arn is provided', () => {
@@ -804,17 +805,18 @@ describe('AwsCompileFunctions', () => {
       describe('when IamRoleLambdaExecution is used', () => {
         beforeEach(() => {
           // pretend that the IamRoleLambdaExecution is used
-          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = {
-            Properties: {
-              Policies: [
-                {
-                  PolicyDocument: {
-                    Statement: [],
+          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+            {
+              Properties: {
+                Policies: [
+                  {
+                    PolicyDocument: {
+                      Statement: [],
+                    },
                   },
-                },
-              ],
-            },
-          };
+                ],
+              },
+            };
         });
 
         it('should create necessary resources if a KMS key arn is provided', () => {
@@ -878,17 +880,18 @@ describe('AwsCompileFunctions', () => {
       describe('when IamRoleLambdaExecution is used', () => {
         beforeEach(() => {
           // pretend that the IamRoleLambdaExecution is used
-          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = {
-            Properties: {
-              Policies: [
-                {
-                  PolicyDocument: {
-                    Statement: [],
+          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+            {
+              Properties: {
+                Policies: [
+                  {
+                    PolicyDocument: {
+                      Statement: [],
+                    },
                   },
-                },
-              ],
-            },
-          };
+                ],
+              },
+            };
         });
 
         it('should create necessary resources if a tracing config is provided', () => {
@@ -1520,8 +1523,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
               handler: 'index.handler',
               fileSystemConfig: {
                 localMountPath: '/mnt/path',
-                arn:
-                  'arn:aws:elasticfilesystem:us-east-1:111111111111:access-point/fsap-a1a1a1a1a1a1a1a1a',
+                arn: 'arn:aws:elasticfilesystem:us-east-1:111111111111:access-point/fsap-a1a1a1a1a1a1a1a1a',
               },
             },
           },
@@ -1932,8 +1934,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
               },
               fileSystemConfig: {
                 localMountPath: '/mnt/path',
-                arn:
-                  'arn:aws:elasticfilesystem:us-east-1:111111111111:access-point/fsap-a1a1a1a1a1a1a1a1a',
+                arn: 'arn:aws:elasticfilesystem:us-east-1:111111111111:access-point/fsap-a1a1a1a1a1a1a1a1a',
               },
             },
             fnImage: {
@@ -2309,8 +2310,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
             foo: {
               fileSystemConfig: {
                 localMountPath: '/mnt/path',
-                arn:
-                  'arn:aws:elasticfilesystem:us-east-1:111111111111:access-point/fsap-a1a1a1a1a1a1a1a1a',
+                arn: 'arn:aws:elasticfilesystem:us-east-1:111111111111:access-point/fsap-a1a1a1a1a1a1a1a1a',
               },
             },
           },
diff --git a/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js b/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
index e750e820b84..f117d4f7a6d 100644
--- a/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
@@ -21,7 +21,8 @@ describe('mergeCustomProviderResources', () => {
       )
     );
 
-    awsPackage.serverless.service.provider.compiledCloudFormationTemplate = coreCloudFormationTemplate;
+    awsPackage.serverless.service.provider.compiledCloudFormationTemplate =
+      coreCloudFormationTemplate;
   });
 
   describe('#mergeCustomProviderResources()', () => {
diff --git a/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js b/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
index 74b5edc6a61..3f1e175ecec 100644
--- a/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
@@ -431,7 +431,11 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
       let serverless;
       const customFunctionName = 'foo-bar';
       before(async () => {
-        const { awsNaming, cfTemplate, serverless: serverlessInstance } = await runServerless({
+        const {
+          awsNaming,
+          cfTemplate,
+          serverless: serverlessInstance,
+        } = await runServerless({
           fixture: 'function',
           command: 'package',
           configExt: {
diff --git a/test/unit/lib/plugins/aws/provider.test.js b/test/unit/lib/plugins/aws/provider.test.js
index 355f099f758..db0fbce1cd3 100644
--- a/test/unit/lib/plugins/aws/provider.test.js
+++ b/test/unit/lib/plugins/aws/provider.test.js
@@ -813,8 +813,7 @@ aws_secret_access_key = CUSTOMSECRET
                 images: {
                   invalidimage: {
                     path: './',
-                    uri:
-                      '000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38',
+                    uri: '000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38',
                   },
                 },
               },
@@ -909,8 +908,7 @@ aws_secret_access_key = CUSTOMSECRET
               foo: {
                 image: {
                   name: 'baseimage',
-                  uri:
-                    '000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38',
+                  uri: '000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38',
                 },
               },
             },
diff --git a/test/unit/lib/plugins/aws/rollback.test.js b/test/unit/lib/plugins/aws/rollback.test.js
index 146d5bb72e4..0abdc97f6b1 100644
--- a/test/unit/lib/plugins/aws/rollback.test.js
+++ b/test/unit/lib/plugins/aws/rollback.test.js
@@ -91,8 +91,7 @@ describe('AwsRollback', () => {
       const s3Objects = [
         {
           // eslint-disable-next-line max-len
-          Key:
-            'serverless/rollback/dev/1476779096930-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json',
+          Key: 'serverless/rollback/dev/1476779096930-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json',
         },
         {
           Key: 'serverless/rollback/dev/1476779096930-2016-10-18T08:24:56.930Z/test.zip',
@@ -141,8 +140,7 @@ describe('AwsRollback', () => {
       const s3Objects = [
         {
           // eslint-disable-next-line max-len
-          Key:
-            'serverless/rollback/dev/2000000000000-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json',
+          Key: 'serverless/rollback/dev/2000000000000-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json',
         },
         {
           Key: 'serverless/rollback/dev/2000000000000-2016-10-18T08:24:56.930Z/test.zip',
@@ -176,8 +174,7 @@ describe('AwsRollback', () => {
       const s3Objects = [
         {
           // eslint-disable-next-line max-len
-          Key:
-            'serverless/rollback/dev/1476779096930-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json',
+          Key: 'serverless/rollback/dev/1476779096930-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json',
         },
         {
           Key: 'serverless/rollback/dev/1476779096930-2016-10-18T08:24:56.930Z/test.zip',
diff --git a/test/unit/lib/plugins/aws/utils/findAndGroupDeployments.test.js b/test/unit/lib/plugins/aws/utils/findAndGroupDeployments.test.js
index 4df749cc925..52e60f243a6 100644
--- a/test/unit/lib/plugins/aws/utils/findAndGroupDeployments.test.js
+++ b/test/unit/lib/plugins/aws/utils/findAndGroupDeployments.test.js
@@ -16,24 +16,21 @@ describe('#findAndGroupDeployments()', () => {
     const s3Objects = [
       {
         // eslint-disable-next-line max-len
-        Key:
-          'serverless/test/dev/1476779096930-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json',
+        Key: 'serverless/test/dev/1476779096930-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json',
       },
       {
         Key: 'serverless/test/dev/1476779096930-2016-10-18T08:24:56.930Z/test.zip',
       },
       {
         // eslint-disable-next-line max-len
-        Key:
-          'serverless/test/dev/1476779278222-2016-10-18T08:27:58.222Z/compiled-cloudformation-template.json',
+        Key: 'serverless/test/dev/1476779278222-2016-10-18T08:27:58.222Z/compiled-cloudformation-template.json',
       },
       {
         Key: 'serverless/test/dev/1476779278222-2016-10-18T08:27:58.222Z/test.zip',
       },
       {
         // eslint-disable-next-line max-len
-        Key:
-          'serverless/test/dev/1476781042481-2016-10-18T08:57:22.481Z/compiled-cloudformation-template.json',
+        Key: 'serverless/test/dev/1476781042481-2016-10-18T08:57:22.481Z/compiled-cloudformation-template.json',
       },
       {
         Key: 'serverless/test/dev/1476781042481-2016-10-18T08:57:22.481Z/test.zip',
diff --git a/test/unit/lib/plugins/aws/utils/getS3ObjectsFromStacks.test.js b/test/unit/lib/plugins/aws/utils/getS3ObjectsFromStacks.test.js
index 064737bd632..6cf20f71ef6 100644
--- a/test/unit/lib/plugins/aws/utils/getS3ObjectsFromStacks.test.js
+++ b/test/unit/lib/plugins/aws/utils/getS3ObjectsFromStacks.test.js
@@ -35,14 +35,12 @@ describe('#getS3ObjectsFromStacks()', () => {
     const expected = [
       // eslint-disable-next-line max-len
       {
-        Key:
-          'serverless/test/dev/1476779096930-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json',
+        Key: 'serverless/test/dev/1476779096930-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json',
       },
       { Key: 'serverless/test/dev/1476779096930-2016-10-18T08:24:56.930Z/test.zip' },
       // eslint-disable-next-line max-len
       {
-        Key:
-          'serverless/test/dev/1476779278222-2016-10-18T08:27:58.222Z/compiled-cloudformation-template.json',
+        Key: 'serverless/test/dev/1476779278222-2016-10-18T08:27:58.222Z/compiled-cloudformation-template.json',
       },
       { Key: 'serverless/test/dev/1476779278222-2016-10-18T08:27:58.222Z/test.zip' },
     ];

From 59fd478550549518824704fa6b94f8e027d6b7f5 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 10 May 2021 11:19:49 +0200
Subject: [PATCH 0068/1101] refactor: Use object-param for
 `resolveImageUriAndShaFromPath`

---
 lib/plugins/aws/provider.js | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 323a87417e0..131cf9341db 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -1862,7 +1862,7 @@ Object.defineProperties(
       { promise: true }
     ),
     resolveImageUriAndShaFromPath: d(
-      async function (imageName, imagePath, imageFilename, buildArgs, cacheFrom, scanOnPush) {
+      async function ({ imageName, imagePath, imageFilename, buildArgs, cacheFrom, scanOnPush }) {
         await this.ensureDockerIsAvailable();
 
         let isDockerfileAvailable = false;
@@ -2062,28 +2062,28 @@ Object.defineProperties(
             );
           }
           if (imageDefinedInProvider.path) {
-            return await this.resolveImageUriAndShaFromPath(
+            return await this.resolveImageUriAndShaFromPath({
               imageName,
-              imageDefinedInProvider.path,
-              imageDefinedInProvider.file || defaultDockerfile,
-              imageDefinedInProvider.buildArgs || defaultBuildArgs,
-              imageDefinedInProvider.cacheFrom || defaultCacheFrom,
-              imageScanDefinedInProvider
-            );
+              imagePath: imageDefinedInProvider.path,
+              imageFilename: imageDefinedInProvider.file || defaultDockerfile,
+              buildArgs: imageDefinedInProvider.buildArgs || defaultBuildArgs,
+              cacheFrom: imageDefinedInProvider.cacheFrom || defaultCacheFrom,
+              scanOnPush: imageScanDefinedInProvider,
+            });
           }
           return await this.resolveImageUriAndShaFromUri(imageDefinedInProvider.uri);
         }
         if (isEcrUri(imageDefinedInProvider)) {
           return await this.resolveImageUriAndShaFromUri(imageDefinedInProvider);
         }
-        return await this.resolveImageUriAndShaFromPath(
+        return await this.resolveImageUriAndShaFromPath({
           imageName,
-          imageDefinedInProvider,
-          defaultDockerfile,
-          imageDefinedInProvider.buildArgs || defaultBuildArgs,
-          imageDefinedInProvider.cacheFrom || defaultCacheFrom,
-          imageScanDefinedInProvider
-        );
+          imagePath: imageDefinedInProvider,
+          imageFilename: defaultDockerfile,
+          buildArgs: imageDefinedInProvider.buildArgs || defaultBuildArgs,
+          cacheFrom: imageDefinedInProvider.cacheFrom || defaultCacheFrom,
+          scanOnPush: imageScanDefinedInProvider,
+        });
       },
       { promise: true }
     ),

From 277f4e8e9c53c0572981407eb45cecba050462a7 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 10 May 2021 11:26:51 +0200
Subject: [PATCH 0069/1101] fix(AWS Lambda): Ensure that docker image is build
 and pushed only once

---
 lib/plugins/aws/provider.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 131cf9341db..f81cf0fba3b 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -16,6 +16,7 @@ const spawnExt = require('child-process-ext/spawn');
 const ServerlessError = require('../../serverless-error');
 const awsRequest = require('../../aws/request');
 const log = require('@serverless/utils/log');
+const deepSortObjectByKey = require('../../utils/deepSortObjectByKey');
 
 const isLambdaArn = RegExp.prototype.test.bind(/^arn:[^:]+:lambda:/);
 const isEcrUri = RegExp.prototype.test.bind(
@@ -1941,7 +1942,12 @@ Object.defineProperties(
           functionImageUri: `${repositoryUri}@${imageSha}`,
         };
       },
-      { promise: true }
+      {
+        promise: true,
+        normalizer: (args) => {
+          return JSON.stringify(deepSortObjectByKey(args[0]));
+        },
+      }
     ),
     resolveImageUriAndShaFromUri: d(
       async function (image) {

From 27e21e8fca560732df3fa5c36c56682ef89b53c5 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 10 May 2021 13:12:26 +0200
Subject: [PATCH 0070/1101] fix(CLI): Ensure to report only unrecognized
 sources as unrecognized

---
 scripts/serverless.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index 7ea97914577..6f1f8f44e2c 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -581,7 +581,6 @@ const processSpanPromise = (async () => {
         const unresolvedSources =
           require('../lib/configuration/variables/resolve-unresolved-source-types')(variablesMeta);
         if (!(configuration.variablesResolutionMode >= 20210326)) {
-          unresolvedSources.delete('opt');
           const legacyCfVarPropertyPaths = new Set();
           const legacySsmVarPropertyPaths = new Set();
           for (const [sourceType, propertyPaths] of unresolvedSources) {
@@ -620,12 +619,16 @@ const processSpanPromise = (async () => {
               { serviceConfig: configuration }
             );
           }
-          if (unresolvedSources.size) {
+          const recognizedSourceNames = new Set(Object.keys(resolverConfiguration.sources));
+          const unrecognizedSourceNames = Array.from(unresolvedSources.keys()).filter(
+            (sourceName) => !recognizedSourceNames.has(sourceName)
+          );
+          if (unrecognizedSourceNames.length) {
             logDeprecation(
               'NEW_VARIABLES_RESOLVER',
-              `Approached unrecognized configuration variable sources: "${Array.from(
-                unresolvedSources.keys()
-              ).join('", "')}".\n` +
+              `Approached unrecognized configuration variable sources: "${unrecognizedSourceNames.join(
+                '", "'
+              )}".\n` +
                 'From a next major this will be communicated with a thrown error.\n' +
                 'Set "variablesResolutionMode: 20210326" in your service config, ' +
                 'to adapt to new behavior now',

From 7361e049608d40e4199c797abbad552ea831f5a5 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 10 May 2021 12:08:49 +0200
Subject: [PATCH 0071/1101] fix(Telemetry): Ensure telemetry only matches js
 stacktrace paths

---
 lib/utils/telemetry/resolve-error-location.js             | 2 +-
 .../lib/utils/telemetry/resolve-error-location.test.js    | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/utils/telemetry/resolve-error-location.js b/lib/utils/telemetry/resolve-error-location.js
index 3ddc7d18942..3b5ebb400df 100644
--- a/lib/utils/telemetry/resolve-error-location.js
+++ b/lib/utils/telemetry/resolve-error-location.js
@@ -8,7 +8,7 @@ const resolveErrorLocation = (exceptionTokens) => {
   const splittedStack = exceptionTokens.stack.split(/[\r\n]+/);
   if (splittedStack.length === 1 && exceptionTokens.code) return '<not available>';
 
-  const stacktraceLineRegex = /(?:\s*at.*\((.*)\).?|\s*at\s(.*))/;
+  const stacktraceLineRegex = /(?:\s*at.*\((.*:\d+:\d+)\).?|\s*at\s(.*:\d+:\d+))/;
   const stacktracePaths = [];
   for (const line of splittedStack) {
     const match = line.match(stacktraceLineRegex) || [];
diff --git a/test/unit/lib/utils/telemetry/resolve-error-location.test.js b/test/unit/lib/utils/telemetry/resolve-error-location.test.js
index c7ad4d678d6..cf62cf0d7ea 100644
--- a/test/unit/lib/utils/telemetry/resolve-error-location.test.js
+++ b/test/unit/lib/utils/telemetry/resolve-error-location.test.js
@@ -28,6 +28,14 @@ describe('test/unit/lib/utils/resolve-error-location.test.js', () => {
     expect(result).to.equal('<not reflected in stack>');
   });
 
+  it('should not capture non-stacktrace paths', () => {
+    const err = new Error('test');
+    err.stack =
+      'Could not find a version that satisfies the requirement flask (from versions: none) No matching distribution found for flask.';
+    const result = resolveErrorLocation(tokenizeException(err));
+    expect(result).to.equal('<not reflected in stack>');
+  });
+
   if (process.platform !== 'win32') {
     it('should correctly handle paths not enclosed in parentheses', () => {
       const err = new Error('test');

From 4d077d1653fcc41e362587e5d13dfa8dd43d3bc3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 10 May 2021 14:59:21 +0200
Subject: [PATCH 0072/1101] fix(Telemetry): Let old versions report telemetry
 old way

---
 lib/cli/handle-error.js | 7 ++++++-
 scripts/serverless.js   | 8 ++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 6da59ab7a21..980f8cc7e17 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -143,7 +143,12 @@ module.exports = async (exception, options = {}) => {
 
   // If `hasTelemetryBeenReported` is not defined, we don't want to publish telemetry, similarily for when `commandSchema` is not available
   const { commandSchema } = resolveInput();
-  if (commandSchema && !isTelemetryDisabled && hasTelemetryBeenReported === false) {
+  if (
+    commandSchema &&
+    !isTelemetryDisabled &&
+    hasTelemetryBeenReported === false &&
+    (serverless ? serverless.isTelemetryReportedExternally : true)
+  ) {
     const telemetryPayload = await generateTelemetryPayload(serverless);
     const failureReason = {
       kind: isUserError ? 'user' : 'programmer',
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 6f1f8f44e2c..ea52728a9ec 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -387,10 +387,6 @@ const processSpanPromise = (async () => {
     try {
       serverless.onExitPromise = processSpanPromise;
       serverless.invocationId = uuid.v4();
-      // TODO: REMOVE WITH NEXT MAJOR
-      // The purpose of below logic is to ensure that locally resolved `serverless` instance
-      // that might be in lower version will not attempt to handle telemetry on its own
-      process.env.SLS_TRACKING_DISABLED = '1';
       await serverless.init();
       if (serverless.invokedInstance) {
         // Local (in service) installation was found and initialized internally,
@@ -653,8 +649,8 @@ const processSpanPromise = (async () => {
         await serverless.run();
       }
 
-      if (!isTelemetryDisabled && !isHelpRequest) {
-        hasTelemetryBeenReported = true;
+      hasTelemetryBeenReported = true;
+      if (!isTelemetryDisabled && !isHelpRequest && serverless.isTelemetryReportedExternally) {
         const telemetryPayload = await generateTelemetryPayload(serverless);
         await storeTelemetryLocally({ ...telemetryPayload, outcome: 'success' });
         let backendNotificationRequest;

From fa8c076c564377ec632992a6a156bc4937ec08e1 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 10 May 2021 15:56:44 +0200
Subject: [PATCH 0073/1101] fix(CLI): Fix local installation fallback

Older versions expose just `serverless.isInvokedByGlobalInstallation` property, not `serverless._isInvokedByGlobalInstallation`
---
 lib/cli/handle-error.js                | 2 +-
 lib/utils/telemetry/generatePayload.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 980f8cc7e17..8ed5e7cd834 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -51,7 +51,7 @@ module.exports = async (exception, options = {}) => {
 
   const isLocallyInstalled = serverless ? serverless.isLocallyInstalled : passedIsLocallyInstalled;
   const isInvokedByGlobalInstallation = serverless
-    ? serverless._isInvokedByGlobalInstallation
+    ? serverless.isInvokedByGlobalInstallation
     : passedIsInvokedByGlobalInstallation;
 
   if (isInvokedByGlobalInstallation) {
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index baf65f7108d..f8a4997a651 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -151,7 +151,7 @@ module.exports = async (serverless = null) => {
       if (!isLocallyInstalled) {
         return (await isNpmGlobal()) ? 'global:npm' : 'global:other';
       }
-      if (serverless && serverless._isInvokedByGlobalInstallation) return 'local:fallback';
+      if (serverless && serverless.isInvokedByGlobalInstallation) return 'local:fallback';
       return 'local:direct';
     })(),
     isAutoUpdateEnabled: Boolean(userConfig.get('autoUpdate.enabled')),

From 3804aebd2959d5ff4800a10b717877e15d4571de Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 10 May 2021 16:26:18 +0200
Subject: [PATCH 0074/1101] test: Improve test title

---
 test/unit/lib/utils/telemetry/generatePayload.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index b5e56064e46..d2e879079ed 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -15,7 +15,7 @@ const versions = {
   '@serverless/enterprise-plugin': require('@serverless/enterprise-plugin/package').version,
 };
 
-describe('lib/utils/telemetry/generatePayload', () => {
+describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   // In order for tests below to return `commandDurationMs`
   EvalError.$serverlessCommandStartTime = process.hrtime();
 

From 2672047c2f388b5bb5645571e050269676eeab9a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 10 May 2021 16:28:48 +0200
Subject: [PATCH 0075/1101] refactor: Resolve path to package in
 `resolveLocalServerlessPath`

---
 lib/Serverless.js                               |  4 +++-
 lib/cli/handle-error.js                         |  4 ++--
 lib/cli/render-version.js                       |  2 +-
 lib/cli/resolve-local-serverless-path.js        |  6 +++++-
 lib/utils/is-locally-installed.js               |  2 +-
 .../locallyInstalledServerless/_setup.js        |  2 +-
 .../serverless/{index.js => lib/Serverless.js}  |  0
 .../node_modules/serverless/package.json        |  1 +
 .../cli/resolve-local-serverless-path.test.js   | 17 ++++++++++++-----
 9 files changed, 26 insertions(+), 12 deletions(-)
 rename test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/{index.js => lib/Serverless.js} (100%)
 create mode 100644 test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/package.json

diff --git a/lib/Serverless.js b/lib/Serverless.js
index 6cabd3a3548..d02d6984454 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -25,6 +25,8 @@ const resolveCliInput = require('./cli/resolve-input');
 const readConfiguration = require('./configuration/read');
 const conditionallyLoadDotenv = require('./cli/conditionally-load-dotenv');
 
+const serverlessPath = path.resolve(__dirname, '..');
+
 class Serverless {
   constructor(config) {
     let configObject = config;
@@ -222,7 +224,7 @@ class Serverless {
     if (this.isLocallyInstalled) return;
     const localServerlessPath = await resolveLocalServerlessPath();
     if (!localServerlessPath) return;
-    if (localServerlessPath === __filename) {
+    if (localServerlessPath === serverlessPath) {
       this.isLocallyInstalled = true;
       return;
     }
diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 8ed5e7cd834..2b535cb6e5e 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -61,7 +61,7 @@ module.exports = async (exception, options = {}) => {
       // Attempt to use error handler from local version
       // TODO: Remove local version fallback with next major (when its moved to the top of the process)
       try {
-        require(path.resolve(localServerlessPath, '../cli/handle-error'))(exception, {
+        require(path.resolve(localServerlessPath, 'lib/cli/handle-error'))(exception, {
           serverless,
           isLocallyInstalled,
           isUncaughtException,
@@ -72,7 +72,7 @@ module.exports = async (exception, options = {}) => {
         // Pass and attempt to use old-style error handler from local version
 
         // Ugly mock of serverless below is used to ensure that Framework version will be logged with `(local)` suffix
-        require(path.resolve(localServerlessPath, '../classes/Error')).logError(exception, {
+        require(path.resolve(localServerlessPath, 'lib/classes/Error')).logError(exception, {
           serverless: serverless || { isLocallyInstalled },
           forceExit: isUncaughtException,
         });
diff --git a/lib/cli/render-version.js b/lib/cli/render-version.js
index 94e10a939d8..f39fc59a669 100644
--- a/lib/cli/render-version.js
+++ b/lib/cli/render-version.js
@@ -10,7 +10,7 @@ const resolveLocalServerlessPath = require('./resolve-local-serverless-path');
 const chalk = require('chalk');
 const ServerlessError = require('../serverless-error');
 
-const serverlessPath = path.resolve(__dirname, '../Serverless.js');
+const serverlessPath = path.resolve(__dirname, '../..');
 
 module.exports = async () => {
   const localServerlessPath = await resolveLocalServerlessPath();
diff --git a/lib/cli/resolve-local-serverless-path.js b/lib/cli/resolve-local-serverless-path.js
index 7ac16114137..5224962a9b8 100644
--- a/lib/cli/resolve-local-serverless-path.js
+++ b/lib/cli/resolve-local-serverless-path.js
@@ -1,12 +1,16 @@
 'use strict';
 
+const path = require('path');
 const memoizee = require('memoizee');
 const resolve = require('ncjsm/resolve');
 
 module.exports = memoizee(
   async () => {
     try {
-      return (await resolve(process.cwd(), 'serverless')).realPath;
+      return path.resolve(
+        path.dirname((await resolve(process.cwd(), 'serverless')).realPath),
+        '..'
+      );
     } catch {
       return null;
     }
diff --git a/lib/utils/is-locally-installed.js b/lib/utils/is-locally-installed.js
index 697a4eb158a..e65f8b8cb55 100644
--- a/lib/utils/is-locally-installed.js
+++ b/lib/utils/is-locally-installed.js
@@ -3,7 +3,7 @@
 const path = require('path');
 const resolveLocalServerlessPath = require('../cli/resolve-local-serverless-path');
 
-const serverlessPath = path.resolve(__dirname, '../Serverless.js');
+const serverlessPath = path.resolve(__dirname, '../..');
 
 module.exports = async () => {
   const localServerlessPath = await resolveLocalServerlessPath();
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/_setup.js b/test/fixtures/programmatic/locallyInstalledServerless/_setup.js
index 08248290f87..ab4eaee96e2 100644
--- a/test/fixtures/programmatic/locallyInstalledServerless/_setup.js
+++ b/test/fixtures/programmatic/locallyInstalledServerless/_setup.js
@@ -4,7 +4,7 @@ const fs = require('fs');
 const path = require('path');
 
 const fixturePath = path.resolve(__dirname, 'node_modules/serverless');
-const fixtureModulePath = path.resolve(fixturePath, 'index.js');
+const fixtureModulePath = path.resolve(fixturePath, 'lib/Serverless.js');
 
 module.exports = (originalFixturePath) => {
   const content = fs.readFileSync(fixtureModulePath);
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/index.js b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/Serverless.js
similarity index 100%
rename from test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/index.js
rename to test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/Serverless.js
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/package.json b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/package.json
new file mode 100644
index 00000000000..f94da9f08e7
--- /dev/null
+++ b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/package.json
@@ -0,0 +1 @@
+{ "main": "lib/Serverless.js" }
diff --git a/test/unit/lib/cli/resolve-local-serverless-path.test.js b/test/unit/lib/cli/resolve-local-serverless-path.test.js
index f20cce25570..802466e799e 100644
--- a/test/unit/lib/cli/resolve-local-serverless-path.test.js
+++ b/test/unit/lib/cli/resolve-local-serverless-path.test.js
@@ -3,7 +3,7 @@
 const { expect } = require('chai');
 const path = require('path');
 const os = require('os');
-const fs = require('fs');
+const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const resolveLocalServerless = require('../../../../lib/cli/resolve-local-serverless-path');
 
@@ -14,10 +14,17 @@ describe('test/unit/lib/cli/resolve-local-serverless.test.js', () => {
   it('should resolve with `null` when no local installation is found', async () => {
     resolveLocalServerless.delete();
     const tmpServerlessPath = path.resolve(
-      await fs.promises.realpath(os.homedir()),
-      'node_modules/serverless.js'
+      await fsp.realpath(os.homedir()),
+      'node_modules/serverless'
     );
-    await fse.ensureFile(tmpServerlessPath);
-    expect(await fs.promises.realpath(await resolveLocalServerless())).to.equal(tmpServerlessPath);
+    await fse.ensureDir(path.resolve(tmpServerlessPath, 'lib'));
+    await Promise.all([
+      fse.ensureFile(path.resolve(tmpServerlessPath, 'lib/Serverless.js')),
+      fsp.writeFile(
+        path.resolve(tmpServerlessPath, 'package.json'),
+        JSON.stringify({ main: 'lib/Serverless.js' })
+      ),
+    ]);
+    expect(await fsp.realpath(await resolveLocalServerless())).to.equal(tmpServerlessPath);
   });
 });

From 420e13479f1456df48f4d2e5f4235abffc315048 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 10 May 2021 17:43:57 +0200
Subject: [PATCH 0076/1101] test: Put setup into `before`

---
 test/unit/lib/utils/telemetry/generatePayload.test.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index d2e879079ed..8f986130411 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -16,8 +16,10 @@ const versions = {
 };
 
 describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
-  // In order for tests below to return `commandDurationMs`
-  EvalError.$serverlessCommandStartTime = process.hrtime();
+  before(() => {
+    // In order for tests below to return `commandDurationMs`
+    EvalError.$serverlessCommandStartTime = process.hrtime();
+  });
 
   it('Should resolve payload for AWS service', async () => {
     const { servicePath: serviceDir } = await fixtures.setup('httpApi', {

From 096ed9652bff399965c81c9aedb93b42c2b8caf5 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 10 May 2021 17:45:54 +0200
Subject: [PATCH 0077/1101] fix(Telemetry): For local fallback ensure to report
 locally used version

---
 lib/utils/telemetry/generatePayload.js        | 25 ++++++++++++++-----
 .../enterprise-plugin/package.json            |  3 +++
 .../node_modules/serverless/package.json      |  2 +-
 .../utils/telemetry/generatePayload.test.js   | 18 ++++++++++---
 4 files changed, 38 insertions(+), 10 deletions(-)
 create mode 100644 test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/node_modules/@serverless/enterprise-plugin/package.json

diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index f8a4997a651..26b653592b6 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -3,20 +3,17 @@
 const path = require('path');
 const os = require('os');
 const fs = require('fs').promises;
+const resolve = require('ncjsm/resolve');
 const userConfig = require('@serverless/utils/config');
 const isStandalone = require('../isStandaloneExecutable');
 const { triggeredDeprecations } = require('../logDeprecation');
 const isNpmGlobal = require('../npmPackage/isGlobal');
 const noServiceCommands = require('../../cli/commands-schema/no-service');
 const resolveInput = require('../../cli/resolve-input');
+const resolveLocalServerlessPath = require('../../cli/resolve-local-serverless-path');
 const resolveIsLocallyInstalled = require('../../utils/is-locally-installed');
 const ci = require('ci-info');
 
-const versions = {
-  'serverless': require('../../../package').version,
-  '@serverless/enterprise-plugin': require('@serverless/enterprise-plugin/package').version,
-};
-
 const checkIsTabAutocompletionInstalled = async () => {
   try {
     return (await fs.readdir(path.resolve(os.homedir(), '.config/tabtab'))).some((filename) =>
@@ -127,6 +124,22 @@ module.exports = async (serverless = null) => {
     return resolveIsLocallyInstalled();
   })();
 
+  const usedVersions = await (async () => {
+    if (!isLocallyInstalled || (await resolveIsLocallyInstalled())) {
+      return {
+        'serverless': require('../../../package').version,
+        '@serverless/enterprise-plugin': require('@serverless/enterprise-plugin/package').version,
+      };
+    }
+    const localServerlessPath = await resolveLocalServerlessPath();
+    return {
+      'serverless': require(path.resolve(localServerlessPath, 'package.json')).version,
+      '@serverless/enterprise-plugin': require((
+        await resolve(localServerlessPath, '@serverless/enterprise-plugin/package')
+      ).realPath).version,
+    };
+  })();
+
   const { command, options, commandSchema } = resolveInput();
 
   // We only consider options that are present in command schema
@@ -159,7 +172,7 @@ module.exports = async (serverless = null) => {
     timestamp: Date.now(),
     timezone,
     triggeredDeprecations: Array.from(triggeredDeprecations),
-    versions,
+    versions: usedVersions,
   };
 
   if (commandDurationMs != null) {
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/node_modules/@serverless/enterprise-plugin/package.json b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/node_modules/@serverless/enterprise-plugin/package.json
new file mode 100644
index 00000000000..a5a5ef45e86
--- /dev/null
+++ b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/node_modules/@serverless/enterprise-plugin/package.json
@@ -0,0 +1,3 @@
+{
+  "version": "4.0.0-local"
+}
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/package.json b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/package.json
index f94da9f08e7..5a2c27f5e7f 100644
--- a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/package.json
+++ b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/package.json
@@ -1 +1 @@
-{ "main": "lib/Serverless.js" }
+{ "main": "lib/Serverless.js", "version": "2.0.0-local" }
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index 8f986130411..8ee027b272a 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -5,7 +5,9 @@ const path = require('path');
 const fs = require('fs');
 const os = require('os');
 const overrideEnv = require('process-utils/override-env');
+const overrideCwd = require('process-utils/override-cwd');
 
+const resolveLocalServerless = require('../../../../../lib/cli/resolve-local-serverless-path');
 const generatePayload = require('../../../../../lib/utils/telemetry/generatePayload');
 const runServerless = require('../../../../utils/run-serverless');
 const fixtures = require('../../../../fixtures/programmatic');
@@ -21,6 +23,10 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     EvalError.$serverlessCommandStartTime = process.hrtime();
   });
 
+  beforeEach(() => {
+    resolveLocalServerless.clear();
+  });
+
   it('Should resolve payload for AWS service', async () => {
     const { servicePath: serviceDir } = await fixtures.setup('httpApi', {
       configExt: {
@@ -150,12 +156,15 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should recognize local fallback', async () => {
-    const { serverless } = await runServerless({
+    const {
+      serverless,
+      fixtureData: { servicePath: serviceDir },
+    } = await runServerless({
       fixture: 'locallyInstalledServerless',
       command: 'print',
       modulesCacheStub: {},
     });
-    const payload = await generatePayload(serverless);
+    const payload = await overrideCwd(serviceDir, async () => generatePayload(serverless));
 
     expect(payload).to.have.property('frameworkLocalUserId');
     delete payload.frameworkLocalUserId;
@@ -190,7 +199,10 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       npmDependencies: [],
       triggeredDeprecations: [],
       installationType: 'local:fallback',
-      versions,
+      versions: {
+        'serverless': '2.0.0-local',
+        '@serverless/enterprise-plugin': '4.0.0-local',
+      },
     });
   });
 

From 56f85874c6b9da44b8fbc326dfe3bce33bf8c41e Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 10 May 2021 20:31:49 +0200
Subject: [PATCH 0078/1101] fix(AWS API Gateway): Support `Fn::Split` for
 `vpcEndpointIds` schema

---
 lib/plugins/aws/provider.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index f81cf0fba3b..9b59845ce83 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -307,6 +307,15 @@ class AwsProvider {
             type: 'string',
             pattern: '^arn:',
           },
+          awsCfArrayInstruction: {
+            anyOf: [
+              {
+                type: 'array',
+                items: { $ref: '#/definitions/awsCfInstruction' },
+              },
+              { $ref: '#/definitions/awsCfSplit' },
+            ],
+          },
           awsCfFunction: {
             anyOf: [
               { $ref: '#/definitions/awsCfImport' },
@@ -1105,10 +1114,7 @@ class AwsProvider {
               ],
             },
             vpc: { $ref: '#/definitions/awsLambdaVpcConfig' },
-            vpcEndpointIds: {
-              type: 'array',
-              items: { $ref: '#/definitions/awsCfInstruction' },
-            },
+            vpcEndpointIds: { $ref: '#/definitions/awsCfArrayInstruction' },
             versionFunctions: { $ref: '#/definitions/awsLambdaVersioning' },
             websocketsApiName: { type: 'string' },
             websocketsApiRouteSelectionExpression: { type: 'string' },

From e22b3cc70bd21ed06ce78c2f126b3336aff4be7a Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 11 May 2021 09:49:53 +0200
Subject: [PATCH 0079/1101] chore: Bump dependencies

---
 package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index be0b92a5bf8..893f4177588 100644
--- a/package.json
+++ b/package.json
@@ -24,12 +24,12 @@
   "dependencies": {
     "@serverless/cli": "^1.5.2",
     "@serverless/components": "^3.9.2",
-    "@serverless/enterprise-plugin": "^4.5.3",
+    "@serverless/enterprise-plugin": "^4.6.0",
     "@serverless/utils": "^4.1.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.901.0",
+    "aws-sdk": "^2.904.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
@@ -79,8 +79,8 @@
     "@serverless/test": "^8.1.0",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "cos-nodejs-sdk-v5": "^2.9.14",
-    "eslint": "^7.25.0",
+    "cos-nodejs-sdk-v5": "^2.9.15",
+    "eslint": "^7.26.0",
     "eslint-plugin-import": "^2.22.1",
     "git-list-updated": "^1.2.1",
     "github-release-from-cc-changelog": "^2.2.0",
@@ -89,7 +89,7 @@
     "lint-staged": "^10.5.4",
     "log": "^6.0.0",
     "log-node": "^7.0.0",
-    "mocha": "^8.3.2",
+    "mocha": "^8.4.0",
     "mock-require": "^3.0.3",
     "nyc": "^15.1.0",
     "pkg": "^4.5.1",

From 3c5d713da6cab0bb8001f61e56c666d5aa7fca50 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 11 May 2021 10:01:05 +0200
Subject: [PATCH 0080/1101] chore: Release 2.41.0

---
 CHANGELOG.md | 23 +++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db7b0984909..fa79e035396 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,29 @@
 
 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.
 
+## [2.41.0](https://github.com/serverless/serverless/compare/v2.40.0...v2.41.0) (2021-05-11)
+
+### Features
+
+- **AWS API Gateway:** Support disabling default endpoint ([#9404](https://github.com/serverless/serverless/issues/9404)) ([ec90945](https://github.com/serverless/serverless/commit/ec909452b5167e05d892d2c44bc46b4ff7d7470a)) ([lyndoh](https://github.com/lyndoh))
+- **AWS Lambda:** Deprecate `nodejs12.x` as default runtime ([#9416](https://github.com/serverless/serverless/issues/9416)) ([9e558ee](https://github.com/serverless/serverless/commit/9e558eefd66e9dafcb16b3636b934d753ade001e)) ([Jaakko Lappalainen](https://github.com/jkklapp))
+
+### Bug Fixes
+
+- **AWS API Gateway:** Support `Fn::Split` for `vpcEndpointIds` schema ([#9455](https://github.com/serverless/serverless/pull/9455)) ([56f8587](https://github.com/serverless/serverless/commit/56f85874c6b9da44b8fbc326dfe3bce33bf8c41e)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS Lambda:** Ensure that docker image is build and pushed only once ([#9446](https://github.com/serverless/serverless/pull/9446)) ([277f4e8](https://github.com/serverless/serverless/commit/277f4e8e9c53c0572981407eb45cecba050462a7)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI:**
+  - Ensure to report only unrecognized sources as unrecognized ([#9449](https://github.com/serverless/serverless/pull/9449)) ([27e21e8](https://github.com/serverless/serverless/commit/27e21e8fca560732df3fa5c36c56682ef89b53c5)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Fix local installation fallback ([#9454](https://github.com/serverless/serverless/pull/9454)) ([fa8c076](https://github.com/serverless/serverless/commit/fa8c076c564377ec632992a6a156bc4937ec08e1)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Packaging:** Fix support of the artifact S3 uri with region ([#9411](https://github.com/serverless/serverless/issues/9411)) ([40e56fc](https://github.com/serverless/serverless/commit/40e56fc0e9f71f06068d7d4c30178db8b2260357)) ([Zach Whaley](https://github.com/zachwhaley))
+
+### Maintenance Improvements
+
+- **Telemetry:**
+  - Ensure telemetry only matches js stacktrace paths ([#9447](https://github.com/serverless/serverless/pull/9447)) ([7361e04](https://github.com/serverless/serverless/commit/7361e049608d40e4199c797abbad552ea831f5a5)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - For local fallback ensure to report locally used version ([#9454](https://github.com/serverless/serverless/pull/9454)) ([096ed96](https://github.com/serverless/serverless/commit/096ed9652bff399965c81c9aedb93b42c2b8caf5)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Let old versions report telemetry old way ([#9454](https://github.com/serverless/serverless/pull/9454)) ([4d077d1](https://github.com/serverless/serverless/commit/4d077d1653fcc41e362587e5d13dfa8dd43d3bc3)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ## [2.40.0](https://github.com/serverless/serverless/compare/v2.39.2...v2.40.0) (2021-05-06)
 
 ### Features
diff --git a/package.json b/package.json
index 893f4177588..045b0f4faf3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.40.0",
+  "version": "2.41.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From bbfe742b2458f31254b11128b8ed506a47293abe Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 11 May 2021 13:29:37 +0200
Subject: [PATCH 0081/1101] fix(CLI): Correctly resolve version during local
 fallback

---
 lib/cli/render-version.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/cli/render-version.js b/lib/cli/render-version.js
index f39fc59a669..f8798d4187a 100644
--- a/lib/cli/render-version.js
+++ b/lib/cli/render-version.js
@@ -26,14 +26,13 @@ module.exports = async () => {
           'Running "serverless" installed locally (in service node_modules)'
         )}\n`
       );
-      const localServerlessDir = path.resolve(path.dirname(localServerlessPath), '..');
 
       try {
         try {
-          require(path.resolve(localServerlessDir, 'bin/serverless.js'));
+          require(path.resolve(localServerlessPath, 'bin/serverless.js'));
         } catch {
           // Pass and attempt to use `bin/serverless` that was used by older version of the Framework
-          require(path.resolve(localServerlessDir, 'bin/serverless'));
+          require(path.resolve(localServerlessPath, 'bin/serverless'));
         }
       } catch {
         // This is just a fallback as for most (all?) versions it shouldn't happen

From ad63a8f732e95fd603f6cd59134cc91334f7e05d Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 11 May 2021 13:46:11 +0200
Subject: [PATCH 0082/1101] chore: Release 2.41.1

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa79e035396..5c80606c41b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 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.
 
+### [2.41.1](https://github.com/serverless/serverless/compare/v2.41.0...v2.41.1) (2021-05-11)
+
+### Bug Fixes
+
+- **CLI:** Correctly resolve version during local fallback ([#9463](https://github.com/serverless/serverless/pull/9463)) ([bbfe742](https://github.com/serverless/serverless/commit/bbfe742b2458f31254b11128b8ed506a47293abe)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
 ## [2.41.0](https://github.com/serverless/serverless/compare/v2.40.0...v2.41.0) (2021-05-11)
 
 ### Features
diff --git a/package.json b/package.json
index 045b0f4faf3..10c747f4f73 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.41.0",
+  "version": "2.41.1",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 2f3d33d3473aef57844a1ce193933ba9f5f7bb04 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 11 May 2021 13:38:42 +0200
Subject: [PATCH 0083/1101] test: Improve test title

---
 test/unit/lib/classes/ConfigSchemaHandler/index.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/lib/classes/ConfigSchemaHandler/index.test.js b/test/unit/lib/classes/ConfigSchemaHandler/index.test.js
index 91cdb9ef971..ccd0b5b2687 100644
--- a/test/unit/lib/classes/ConfigSchemaHandler/index.test.js
+++ b/test/unit/lib/classes/ConfigSchemaHandler/index.test.js
@@ -8,7 +8,7 @@ chai.use(require('chai-as-promised'));
 const expect = chai.expect;
 const FUNCTION_NAME_PATTERN = '^[a-zA-Z0-9-_]+$';
 
-describe('ConfigSchemaHandler', () => {
+describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
   describe('#constructor', () => {
     it('should freeze parts of schema for service', () => {
       return runServerless({

From 80281eef64a36fcb044fb69af8cd83b82f6ed998 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 11 May 2021 13:41:30 +0200
Subject: [PATCH 0084/1101] test: Ensure no deprecations logs (after default
 runtime deprecation)

---
 test/fixtures/programmatic/apiGateway/serverless.yml             | 1 +
 test/fixtures/programmatic/checkForChanges/serverless.yml        | 1 +
 .../programmatic/configSchemaExtensionsError/serverless.yml      | 1 +
 test/fixtures/programmatic/ecr/serverless.yml                    | 1 +
 test/fixtures/programmatic/function/serverless.yml               | 1 +
 test/fixtures/programmatic/functionCloudFront/serverless.yml     | 1 +
 test/fixtures/programmatic/functionDestinations/serverless.yml   | 1 +
 test/fixtures/programmatic/functionLayers/serverless.yml         | 1 +
 test/fixtures/programmatic/httpApi/serverless.yml                | 1 +
 test/fixtures/programmatic/httpApiCatchAll/serverless.yml        | 1 +
 test/fixtures/programmatic/httpApiExport/serverless.yml          | 1 +
 test/fixtures/programmatic/invocation/serverless.yml             | 1 +
 test/fixtures/programmatic/layer/serverless.yml                  | 1 +
 test/fixtures/programmatic/packageArtifact/serverless.yml        | 1 +
 .../programmatic/packageArtifactInServerlessDir/serverless.yml   | 1 +
 test/fixtures/programmatic/packaging/serverless.yml              | 1 +
 test/fixtures/programmatic/plugin/serverless.yml                 | 1 +
 test/fixtures/programmatic/requestSchema/serverless.yml          | 1 +
 18 files changed, 18 insertions(+)

diff --git a/test/fixtures/programmatic/apiGateway/serverless.yml b/test/fixtures/programmatic/apiGateway/serverless.yml
index 2d7e1f9b0a2..e0d9dc301b7 100644
--- a/test/fixtures/programmatic/apiGateway/serverless.yml
+++ b/test/fixtures/programmatic/apiGateway/serverless.yml
@@ -6,6 +6,7 @@ frameworkVersion: '*'
 provider:
   name: aws
   lambdaHashingVersion: 20201221
+  runtime: nodejs12.x
   apiGateway:
     shouldStartNameWithService: true
 
diff --git a/test/fixtures/programmatic/checkForChanges/serverless.yml b/test/fixtures/programmatic/checkForChanges/serverless.yml
index b5133b429e1..5fd17eeba56 100644
--- a/test/fixtures/programmatic/checkForChanges/serverless.yml
+++ b/test/fixtures/programmatic/checkForChanges/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  runtime: nodejs12.x
   lambdaHashingVersion: 20201221
 
 functions:
diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/serverless.yml b/test/fixtures/programmatic/configSchemaExtensionsError/serverless.yml
index 852effa65c0..ce65b8062d6 100644
--- a/test/fixtures/programmatic/configSchemaExtensionsError/serverless.yml
+++ b/test/fixtures/programmatic/configSchemaExtensionsError/serverless.yml
@@ -2,6 +2,7 @@ service: configSchemaExtensionsError
 
 provider:
   name: someProvider
+  runtime: nodejs12.x
 
 configValidationMode: error
 frameworkVersion: '*'
diff --git a/test/fixtures/programmatic/ecr/serverless.yml b/test/fixtures/programmatic/ecr/serverless.yml
index 1e14efb7b62..462121bf222 100644
--- a/test/fixtures/programmatic/ecr/serverless.yml
+++ b/test/fixtures/programmatic/ecr/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  runtime: nodejs12.x
   ecr:
     images:
       baseimage:
diff --git a/test/fixtures/programmatic/function/serverless.yml b/test/fixtures/programmatic/function/serverless.yml
index 889ae366dbf..9ddb22850ac 100644
--- a/test/fixtures/programmatic/function/serverless.yml
+++ b/test/fixtures/programmatic/function/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  runtime: nodejs12.x
   lambdaHashingVersion: 20201221
 
 functions:
diff --git a/test/fixtures/programmatic/functionCloudFront/serverless.yml b/test/fixtures/programmatic/functionCloudFront/serverless.yml
index be9ba4592b1..3bbf8c5146f 100644
--- a/test/fixtures/programmatic/functionCloudFront/serverless.yml
+++ b/test/fixtures/programmatic/functionCloudFront/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  runtime: nodejs12.x
   lambdaHashingVersion: 20201221
 
 functions:
diff --git a/test/fixtures/programmatic/functionDestinations/serverless.yml b/test/fixtures/programmatic/functionDestinations/serverless.yml
index 1f37be3ba35..9c08b34dfe9 100644
--- a/test/fixtures/programmatic/functionDestinations/serverless.yml
+++ b/test/fixtures/programmatic/functionDestinations/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  runtime: nodejs12.x
   lambdaHashingVersion: 20201221
 
 functions:
diff --git a/test/fixtures/programmatic/functionLayers/serverless.yml b/test/fixtures/programmatic/functionLayers/serverless.yml
index d3fd805bb14..d408249e207 100644
--- a/test/fixtures/programmatic/functionLayers/serverless.yml
+++ b/test/fixtures/programmatic/functionLayers/serverless.yml
@@ -1,6 +1,7 @@
 service: service
 provider:
   name: aws
+  runtime: nodejs12.x
   lambdaHashingVersion: 20201221
 
 layers:
diff --git a/test/fixtures/programmatic/httpApi/serverless.yml b/test/fixtures/programmatic/httpApi/serverless.yml
index cd79952109f..686b5acb850 100644
--- a/test/fixtures/programmatic/httpApi/serverless.yml
+++ b/test/fixtures/programmatic/httpApi/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  runtime: nodejs12.x
   logRetentionInDays: 14
   lambdaHashingVersion: 20201221
 
diff --git a/test/fixtures/programmatic/httpApiCatchAll/serverless.yml b/test/fixtures/programmatic/httpApiCatchAll/serverless.yml
index 28a5ebb31f4..7fdad70e4ac 100644
--- a/test/fixtures/programmatic/httpApiCatchAll/serverless.yml
+++ b/test/fixtures/programmatic/httpApiCatchAll/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  runtime: nodejs12.x
   lambdaHashingVersion: 20201221
 
 functions:
diff --git a/test/fixtures/programmatic/httpApiExport/serverless.yml b/test/fixtures/programmatic/httpApiExport/serverless.yml
index 66fdbafd507..7e46297bfc7 100644
--- a/test/fixtures/programmatic/httpApiExport/serverless.yml
+++ b/test/fixtures/programmatic/httpApiExport/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  runtime: nodejs12.x
   lambdaHashingVersion: 20201221
 
 resources:
diff --git a/test/fixtures/programmatic/invocation/serverless.yml b/test/fixtures/programmatic/invocation/serverless.yml
index a2c1b09f301..cbdef151e5a 100644
--- a/test/fixtures/programmatic/invocation/serverless.yml
+++ b/test/fixtures/programmatic/invocation/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  runtime: nodejs12.x
   lambdaHashingVersion: 20201221
 
 functions:
diff --git a/test/fixtures/programmatic/layer/serverless.yml b/test/fixtures/programmatic/layer/serverless.yml
index 550975f5dd8..2980a939776 100644
--- a/test/fixtures/programmatic/layer/serverless.yml
+++ b/test/fixtures/programmatic/layer/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  runtime: nodejs12.x
   lambdaHashingVersion: 20201221
 
 functions:
diff --git a/test/fixtures/programmatic/packageArtifact/serverless.yml b/test/fixtures/programmatic/packageArtifact/serverless.yml
index 57307593bdc..3c11b9f9032 100644
--- a/test/fixtures/programmatic/packageArtifact/serverless.yml
+++ b/test/fixtures/programmatic/packageArtifact/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  runtime: nodejs12.x
   lambdaHashingVersion: 20201221
 
 package:
diff --git a/test/fixtures/programmatic/packageArtifactInServerlessDir/serverless.yml b/test/fixtures/programmatic/packageArtifactInServerlessDir/serverless.yml
index 097748ccf09..400dfbf323e 100644
--- a/test/fixtures/programmatic/packageArtifactInServerlessDir/serverless.yml
+++ b/test/fixtures/programmatic/packageArtifactInServerlessDir/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  runtime: nodejs12.x
   lambdaHashingVersion: 20201221
 
 plugins:
diff --git a/test/fixtures/programmatic/packaging/serverless.yml b/test/fixtures/programmatic/packaging/serverless.yml
index bf6e0073b68..fcee3661fd8 100644
--- a/test/fixtures/programmatic/packaging/serverless.yml
+++ b/test/fixtures/programmatic/packaging/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  runtime: nodejs12.x
   lambdaHashingVersion: 20201221
 
 functions:
diff --git a/test/fixtures/programmatic/plugin/serverless.yml b/test/fixtures/programmatic/plugin/serverless.yml
index 43d21b831ec..b5954d13f16 100644
--- a/test/fixtures/programmatic/plugin/serverless.yml
+++ b/test/fixtures/programmatic/plugin/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  runtime: nodejs12.x
   lambdaHashingVersion: 20201221
 
 plugins:
diff --git a/test/fixtures/programmatic/requestSchema/serverless.yml b/test/fixtures/programmatic/requestSchema/serverless.yml
index 7b321bcc466..a48b7a26050 100644
--- a/test/fixtures/programmatic/requestSchema/serverless.yml
+++ b/test/fixtures/programmatic/requestSchema/serverless.yml
@@ -2,6 +2,7 @@ service: service
 
 provider:
   name: aws
+  runtime: nodejs12.x
   lambdaHashingVersion: 20201221
   apiGateway:
     request:

From 9cc05ad2f659709746d1df9811b95118c583db27 Mon Sep 17 00:00:00 2001
From: Corentin Doue <31917261+CorentinDoue@users.noreply.github.com>
Date: Wed, 12 May 2021 11:02:44 +0200
Subject: [PATCH 0085/1101] feat(Templates): Add `google-nodejs-typescript`
 template (#9445)

---
 docs/providers/google/cli-reference/create.md |  1 +
 .../google-nodejs-typescript/.gitignore       | 11 +++
 .../templates/google-nodejs-typescript/.nvmrc |  1 +
 .../google-nodejs-typescript/README.md        | 51 +++++++++++++
 .../google-nodejs-typescript/index.ts         |  2 +
 .../google-nodejs-typescript/package.json     | 31 ++++++++
 .../google-nodejs-typescript/serverless.ts    | 22 ++++++
 .../src/functions/config.ts                   |  7 ++
 .../src/functions/eventHello/config.ts        | 16 +++++
 .../src/functions/eventHello/handler.ts       | 13 ++++
 .../src/functions/httpHello/config.ts         |  8 +++
 .../src/functions/httpHello/handler.ts        | 19 +++++
 .../src/libs/errorHandler.ts                  | 30 ++++++++
 .../google-nodejs-typescript/src/libs/logs.ts | 72 +++++++++++++++++++
 .../google-nodejs-typescript/tsconfig.json    | 18 +++++
 .../tsconfig.paths.json                       |  9 +++
 .../webpack.config.js                         | 52 ++++++++++++++
 17 files changed, 363 insertions(+)
 create mode 100644 lib/plugins/create/templates/google-nodejs-typescript/.gitignore
 create mode 100644 lib/plugins/create/templates/google-nodejs-typescript/.nvmrc
 create mode 100644 lib/plugins/create/templates/google-nodejs-typescript/README.md
 create mode 100644 lib/plugins/create/templates/google-nodejs-typescript/index.ts
 create mode 100644 lib/plugins/create/templates/google-nodejs-typescript/package.json
 create mode 100644 lib/plugins/create/templates/google-nodejs-typescript/serverless.ts
 create mode 100644 lib/plugins/create/templates/google-nodejs-typescript/src/functions/config.ts
 create mode 100644 lib/plugins/create/templates/google-nodejs-typescript/src/functions/eventHello/config.ts
 create mode 100644 lib/plugins/create/templates/google-nodejs-typescript/src/functions/eventHello/handler.ts
 create mode 100644 lib/plugins/create/templates/google-nodejs-typescript/src/functions/httpHello/config.ts
 create mode 100644 lib/plugins/create/templates/google-nodejs-typescript/src/functions/httpHello/handler.ts
 create mode 100644 lib/plugins/create/templates/google-nodejs-typescript/src/libs/errorHandler.ts
 create mode 100644 lib/plugins/create/templates/google-nodejs-typescript/src/libs/logs.ts
 create mode 100644 lib/plugins/create/templates/google-nodejs-typescript/tsconfig.json
 create mode 100644 lib/plugins/create/templates/google-nodejs-typescript/tsconfig.paths.json
 create mode 100644 lib/plugins/create/templates/google-nodejs-typescript/webpack.config.js

diff --git a/docs/providers/google/cli-reference/create.md b/docs/providers/google/cli-reference/create.md
index c94ea9a932d..d8516d65cf7 100644
--- a/docs/providers/google/cli-reference/create.md
+++ b/docs/providers/google/cli-reference/create.md
@@ -43,6 +43,7 @@ To see a list of available templates run `serverless create --help`
 Most commonly used templates:
 
 - google-nodejs
+- google-nodejs-typescript
 - google-go
 - google-python
 
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/.gitignore b/lib/plugins/create/templates/google-nodejs-typescript/.gitignore
new file mode 100644
index 00000000000..4ff723def61
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/.gitignore
@@ -0,0 +1,11 @@
+# package directories
+node_modules
+
+# Serverless directories
+.serverless
+
+# Webpack directories
+.webpack
+
+# Typescript output dir
+dist
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/.nvmrc b/lib/plugins/create/templates/google-nodejs-typescript/.nvmrc
new file mode 100644
index 00000000000..518633e1687
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/.nvmrc
@@ -0,0 +1 @@
+lts/fermium
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/README.md b/lib/plugins/create/templates/google-nodejs-typescript/README.md
new file mode 100644
index 00000000000..298760c6cc1
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/README.md
@@ -0,0 +1,51 @@
+# Serverless - Google Node.js Typescript
+
+This project has been generated using the `google-nodejs-typescript` template from the [Serverless framework](https://www.serverless.com/).
+
+For detailed instructions, please refer to the [documentation](https://www.serverless.com/framework/docs/providers/google/).
+
+## Installation/deployment instructions
+
+Depending on your preferred package manager, follow the instructions below to deploy your project.
+
+> **Requirements**: NodeJS `lts/fermium (v.14.15.0)`. If you're using [nvm](https://github.com/nvm-sh/nvm), run `nvm use` to ensure you're using the same Node version in local and in your cloud function's runtime.
+
+### Setup your google project
+
+1. Go to the [API dashboard](https://console.cloud.google.com/apis/dashboard), select your project and enable the following APIs (if not already enabled):
+
+   - Cloud Functions API
+   - Cloud Deployment Manager V2 API
+   - Cloud Build API
+   - Cloud Storage
+   - Cloud Logging API
+
+2. Replace `<your-gcp-project-id>` with your project id in `serverles.ts`
+
+### Authenticate
+
+Follow [the authentication doc](https://www.serverless.com/framework/docs/providers/google/guide/credentials/).
+
+**TL;DR**
+
+```shell
+gcloud auth application-default login
+```
+
+### Install the dependencies
+
+```shell
+# with npm
+npm i
+# or yarn
+yarn
+```
+
+### Deploy
+
+```shell
+# with npm
+npm run deploy
+# or yarn
+yarn deploy
+```
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/index.ts b/lib/plugins/create/templates/google-nodejs-typescript/index.ts
new file mode 100644
index 00000000000..bd3737f6265
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/index.ts
@@ -0,0 +1,2 @@
+export { eventHello } from '@functions/eventHello/handler';
+export { httpHello } from '@functions/httpHello/handler';
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/package.json b/lib/plugins/create/templates/google-nodejs-typescript/package.json
new file mode 100644
index 00000000000..cc58fca496d
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "google-nodejs-typescript",
+  "version": "1.0.0",
+  "description": "Serverless google-nodejs-typescript template",
+  "main": "serverless.ts",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "deploy": "sls deploy"
+  },
+  "engines": {
+    "node": ">=14.15.0"
+  },
+  "devDependencies": {
+    "@serverless/typescript": "^2.23.0",
+    "@types/express": "^4.17.11",
+    "@types/node": "^14.14.25",
+    "express": "^4.17.1",
+    "serverless": "^2.23.0",
+    "serverless-google-cloudfunctions": "^4.0.0",
+    "serverless-webpack": "^5.3.5",
+    "ts-loader": "^8.0.15",
+    "ts-node": "^9.1.1",
+    "tsconfig-paths": "^3.9.0",
+    "tsconfig-paths-webpack-plugin": "^3.3.0",
+    "typescript": "^4.1.3",
+    "webpack": "^5.20.2",
+    "webpack-node-externals": "^2.5.2"
+  },
+  "author": "Corentin Doué",
+  "license": "MIT"
+}
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/serverless.ts b/lib/plugins/create/templates/google-nodejs-typescript/serverless.ts
new file mode 100644
index 00000000000..4cc31920b07
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/serverless.ts
@@ -0,0 +1,22 @@
+import { functions } from '@functions/config';
+
+const serverlessConfiguration = {
+  service: 'gcf-nodejs-typescript-template', // NOTE: Don't put the word "google" in here
+  frameworkVersion: '2',
+  custom: {
+    webpack: {
+      webpackConfig: './webpack.config.js',
+      includeModules: true,
+    },
+  },
+  plugins: ['serverless-google-cloudfunctions', 'serverless-webpack'],
+  provider: {
+    name: 'google',
+    runtime: 'nodejs14',
+    region: 'europe-west1',
+    project: '<your-gcp-project-id>',
+  },
+  functions,
+};
+
+module.exports = serverlessConfiguration;
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/config.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/config.ts
new file mode 100644
index 00000000000..7a37073912b
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/config.ts
@@ -0,0 +1,7 @@
+// import { eventHello } from './eventHello/config';
+import { httpHello } from './httpHello/config';
+
+export const functions = {
+  // eventHello, // cf ./eventHello/config.ts
+  httpHello
+};
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/eventHello/config.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/eventHello/config.ts
new file mode 100644
index 00000000000..bc9210534b5
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/eventHello/config.ts
@@ -0,0 +1,16 @@
+// This function is not deployed by default because the topic does not exist
+// 1. Create a Topic
+// 2. Replace events[0].event.resource with the topic name
+// 3. Uncomment the eventHello import and declaration in src/functions/config.ts
+
+export const eventHello = {
+  handler: 'eventHello',
+  events: [
+    {
+      event: {
+        eventType: 'providers/cloud.pubsub/eventTypes/topic.publish',
+        resource: 'projects/<your-gcp-project-id>/topics/<your-topic-name>', // This is the name of the topic
+      },
+    },
+  ],
+};
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/eventHello/handler.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/eventHello/handler.ts
new file mode 100644
index 00000000000..220596dbb05
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/eventHello/handler.ts
@@ -0,0 +1,13 @@
+import { logger } from '@libs/logs';
+import { eventErrorHandler } from '@libs/errorHandler';
+
+type Event = {
+  message: string;
+};
+
+export const eventHello = eventErrorHandler(
+  async (event: Event): Promise<void> => {
+    const { message } = event;
+    logger.log({ message });
+  }
+);
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/httpHello/config.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/httpHello/config.ts
new file mode 100644
index 00000000000..f1b484b3f38
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/httpHello/config.ts
@@ -0,0 +1,8 @@
+export const httpHello = {
+  handler: 'httpHello',
+  events: [
+    {
+      http: 'hello',
+    },
+  ],
+};
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/httpHello/handler.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/httpHello/handler.ts
new file mode 100644
index 00000000000..0be9467a44a
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/httpHello/handler.ts
@@ -0,0 +1,19 @@
+import type { Request as ExpressRequest, Response } from 'express';
+import { logger } from '@libs/logs';
+import { httpErrorHandler } from '@libs/errorHandler';
+
+type Body = {
+  message: string;
+};
+type Request = ExpressRequest<Record<string, string>, void, Body>;
+
+export const httpHello = httpErrorHandler(
+  async (req: Request, res: Response): Promise<void> => {
+    const {
+      body: { message },
+    } = req;
+    logger.log({ message });
+
+    res.status(200).send();
+  }
+);
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/libs/errorHandler.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/libs/errorHandler.ts
new file mode 100644
index 00000000000..df732fc82dc
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/src/libs/errorHandler.ts
@@ -0,0 +1,30 @@
+import type { Request, Response } from 'express';
+import { logger } from '@libs/logs';
+
+type HttpHandler = (req: Request, res: Response) => unknown | Promise<unknown>;
+export const httpErrorHandler = (handler: HttpHandler) => async (
+  req: Request,
+  res: Response
+): Promise<void> => {
+  logger.init(req);
+  try {
+    await handler(req, res);
+  } catch (error) {
+    logger.error(error);
+    res.status(500).send();
+  }
+};
+
+type EventHandler<E> = (event: E) => void | Promise<void>;
+
+export const HANDLER_ERROR_MESSAGE = 'An error occurred during the handle of the event';
+export const eventErrorHandler = <E>(handler: EventHandler<E>) => async (
+  event: E
+): Promise<void> => {
+  try {
+    await handler(event);
+  } catch (error) {
+    logger.error(error);
+    throw new Error(HANDLER_ERROR_MESSAGE);
+  }
+};
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/libs/logs.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/libs/logs.ts
new file mode 100644
index 00000000000..f8e450dd74a
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/src/libs/logs.ts
@@ -0,0 +1,72 @@
+import type { Request } from 'express';
+
+export enum GCPLogEntrySeverity {
+  DEFAULT = 'DEFAULT', // (0) The log entry has no assigned severity level.
+  DEBUG = 'DEBUG', // (100) Debug or trace information.
+  INFO = 'INFO', // (200) Routine information, such as ongoing status or performance.
+  NOTICE = 'NOTICE', // (300) Normal but significant events, such as start up, shut down, or a configuration change.
+  WARNING = 'WARNING', // (400) Warning events might cause problems.
+  ERROR = 'ERROR', // (500) Error events are likely to cause problems.
+  CRITICAL = 'CRITICAL', // (600) Critical events cause more severe problems or outages.
+  ALERT = 'ALERT', // (700) A person must take an action immediately.
+  EMERGENCY = 'EMERGENCY', // (800) One or more systems are unusable.
+}
+type JSONPayload = {
+  message?: string;
+  [key: string]: Record<string, unknown> | string | undefined;
+};
+type Payload = string | JSONPayload;
+export const JSON_PAYLOAD_MESSAGE =
+  'This log contains a JSON payload, use GCP log explorer to see it';
+
+class Logger {
+  req: Request | undefined;
+
+  init = (req: Request) => {
+    this.req = req;
+  };
+
+  log = (payload: Payload): void => {
+    const entry = this.logEntry();
+    let message: string;
+    let jsonPayload: JSONPayload | undefined;
+    if (typeof payload === 'object') {
+      message = payload.message ?? JSON_PAYLOAD_MESSAGE;
+      jsonPayload = payload;
+    } else {
+      message = payload;
+    }
+    console.log(JSON.stringify(entry(GCPLogEntrySeverity.INFO, message, jsonPayload)));
+  };
+
+  error = (error: Error): void => {
+    const entry = this.logEntry();
+    const { message, stack } = error;
+
+    console.log(JSON.stringify(entry(GCPLogEntrySeverity.ERROR, message, { stack })));
+  };
+
+  logEntry = () => (
+    severity: GCPLogEntrySeverity,
+    message: string,
+    jsonPayload: JSONPayload = {}
+  ): Record<string, unknown> => ({
+    severity,
+    message,
+    ...jsonPayload,
+    ...this.getCloudTrace(),
+  });
+
+  getCloudTrace = (): Record<string, string> => {
+    const project = process.env.GCP_PROJECT; // GCP_PROJECT is always set by the runner of the cloud function
+
+    const traceHeader = this.req?.header('X-Cloud-Trace-Context');
+    if (traceHeader !== undefined && project !== undefined) {
+      const [trace] = traceHeader.split('/');
+      return { 'logging.googleapis.com/trace': `projects/${project}/traces/${trace}` };
+    }
+    return {};
+  };
+}
+
+export const logger = new Logger();
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/tsconfig.json b/lib/plugins/create/templates/google-nodejs-typescript/tsconfig.json
new file mode 100644
index 00000000000..7f99a3452f8
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/tsconfig.json
@@ -0,0 +1,18 @@
+{
+  "extends": "./tsconfig.paths.json",
+  "compilerOptions": {
+    "lib": ["ESNext"],
+    "moduleResolution": "node",
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "removeComments": true,
+    "sourceMap": true,
+    "target": "ES2020",
+    "outDir": "dist"
+  },
+  "include": ["**/*.ts", "serverless.ts"],
+  "exclude": ["node_modules/**/*", ".serverless/**/*", ".webpack/**/*", ".vscode/**/*"],
+  "ts-node": {
+    "require": ["tsconfig-paths/register"]
+  }
+}
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/tsconfig.paths.json b/lib/plugins/create/templates/google-nodejs-typescript/tsconfig.paths.json
new file mode 100644
index 00000000000..2e664635932
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/tsconfig.paths.json
@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@functions/*": ["src/functions/*"],
+      "@libs/*": ["src/libs/*"]
+    }
+  }
+}
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/webpack.config.js b/lib/plugins/create/templates/google-nodejs-typescript/webpack.config.js
new file mode 100644
index 00000000000..928e7d76b4d
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/webpack.config.js
@@ -0,0 +1,52 @@
+const path = require('path');
+const slsw = require('serverless-webpack');
+const nodeExternals = require('webpack-node-externals');
+const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
+
+module.exports = {
+  context: __dirname,
+  mode: slsw.lib.webpack.isLocal ? 'development' : 'production',
+  entry: 'index.ts',
+  devtool: slsw.lib.webpack.isLocal ? 'eval-cheap-module-source-map' : 'source-map',
+  resolve: {
+    extensions: ['.mjs', '.json', '.ts'],
+    symlinks: false,
+    cacheWithContext: false,
+    plugins: [
+      new TsconfigPathsPlugin({
+        configFile: './tsconfig.paths.json',
+      }),
+    ],
+  },
+  output: {
+    libraryTarget: 'commonjs',
+    path: path.join(__dirname, '.webpack'),
+    filename: 'index.js',
+  },
+  optimization: {
+    concatenateModules: false,
+  },
+  target: 'node',
+  externals: [nodeExternals()],
+  module: {
+    rules: [
+      // all files with a `.ts` or `.tsx` extension will be handled by `ts-loader`
+      {
+        test: /\.(tsx?)$/,
+        loader: 'ts-loader',
+        exclude: [
+          [
+            path.resolve(__dirname, 'node_modules'),
+            path.resolve(__dirname, '.serverless'),
+            path.resolve(__dirname, '.webpack'),
+          ],
+        ],
+        options: {
+          transpileOnly: true,
+          experimentalWatchApi: true,
+        },
+      },
+    ],
+  },
+  plugins: [],
+};

From 05588f77c0bbc900198ce458099ea2db066f3601 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 27 Apr 2021 15:08:13 +0200
Subject: [PATCH 0086/1101] refactor(CLI): Rely internally on
 `@serverless/utils/log`

---
 lib/classes/CLI.js                            | 13 +---
 test/unit/lib/classes/CLI.test.js             | 60 -------------------
 .../lib/plugins/aws/rollbackFunction.test.js  | 10 ----
 test/unit/lib/plugins/plugin/install.test.js  |  8 ---
 .../unit/lib/plugins/plugin/uninstall.test.js |  6 --
 5 files changed, 2 insertions(+), 95 deletions(-)

diff --git a/lib/classes/CLI.js b/lib/classes/CLI.js
index 070be72fc24..699d20309a0 100644
--- a/lib/classes/CLI.js
+++ b/lib/classes/CLI.js
@@ -3,6 +3,7 @@
 const version = require('../../package.json').version;
 const os = require('os');
 const chalk = require('chalk');
+const log = require('@serverless/utils/log');
 const resolveCliInput = require('../cli/resolve-input');
 const renderHelp = require('../cli/render-help');
 
@@ -68,17 +69,7 @@ class CLI {
   }
 
   log(message, entity, opts) {
-    const underline = opts ? opts.underline : false;
-    const bold = opts ? opts.bold : false;
-    const color = opts ? opts.color : null;
-
-    let print = chalk.yellow;
-
-    if (color) print = chalk.keyword(color);
-    if (underline) print = print.underline;
-    if (bold) print = print.bold;
-
-    this.consoleLog(`${entity || 'Serverless'}: ${print(message)}`);
+    log(message, { ...opts, entity: entity || 'Serverless' });
   }
 
   consoleLog(message) {
diff --git a/test/unit/lib/classes/CLI.test.js b/test/unit/lib/classes/CLI.test.js
index 44cd1d5187f..2bfa1d1cb9e 100644
--- a/test/unit/lib/classes/CLI.test.js
+++ b/test/unit/lib/classes/CLI.test.js
@@ -4,7 +4,6 @@ const chai = require('chai');
 const sinon = require('sinon');
 const CLI = require('../../../../lib/classes/CLI');
 const overrideArgv = require('process-utils/override-argv');
-const stripAnsi = require('strip-ansi');
 const Serverless = require('../../../../lib/Serverless');
 const resolveInput = require('../../../../lib/cli/resolve-input');
 
@@ -114,63 +113,4 @@ describe('CLI', () => {
       expect(consoleLogStub.calledOnce).to.equal(true);
     });
   });
-
-  describe('#log', () => {
-    let consoleLogSpy;
-
-    beforeEach(() => {
-      cli = new CLI(serverless);
-      consoleLogSpy = sinon.spy(cli, 'consoleLog');
-    });
-
-    afterEach(() => {
-      cli.consoleLog.restore();
-    });
-
-    it('should log messages', () => {
-      const msg = 'Hello World!';
-
-      cli.log(msg);
-
-      expect(consoleLogSpy.callCount).to.equal(1);
-      expect(stripAnsi(consoleLogSpy.firstCall.args[0])).to.equal('Serverless: Hello World!');
-    });
-
-    it('should support different entities', () => {
-      const msg = 'Hello World!';
-      const entity = 'Entity';
-
-      cli.log(msg, entity);
-
-      expect(consoleLogSpy.callCount).to.equal(1);
-      expect(stripAnsi(consoleLogSpy.firstCall.args[0])).to.equal('Entity: Hello World!');
-    });
-
-    // NOTE: Here we're just testing that it won't break
-    it('should support logging options', () => {
-      const msg = 'Hello World!';
-      const opts = {
-        color: 'orange',
-        bold: true,
-        underline: true,
-      };
-
-      cli.log(msg, 'Serverless', opts);
-
-      expect(consoleLogSpy.callCount).to.equal(1);
-      expect(stripAnsi(consoleLogSpy.firstCall.args[0])).to.equal('Serverless: Hello World!');
-    });
-
-    it('should ignore invalid logging options', () => {
-      const msg = 'Hello World!';
-      const opts = {
-        invalid: 'option',
-      };
-
-      cli.log(msg, 'Serverless', opts);
-
-      expect(consoleLogSpy.callCount).to.equal(1);
-      expect(stripAnsi(consoleLogSpy.firstCall.args[0])).to.equal('Serverless: Hello World!');
-    });
-  });
 });
diff --git a/test/unit/lib/plugins/aws/rollbackFunction.test.js b/test/unit/lib/plugins/aws/rollbackFunction.test.js
index ae9885680ce..979121439c6 100644
--- a/test/unit/lib/plugins/aws/rollbackFunction.test.js
+++ b/test/unit/lib/plugins/aws/rollbackFunction.test.js
@@ -10,7 +10,6 @@ const proxyquire = require('proxyquire');
 describe('AwsRollbackFunction', () => {
   let serverless;
   let awsRollbackFunction;
-  let consoleLogStub;
   let fetchStub;
   let AwsRollbackFunction;
 
@@ -34,11 +33,6 @@ describe('AwsRollbackFunction', () => {
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.cli = new CLI(serverless);
     awsRollbackFunction = new AwsRollbackFunction(serverless, options);
-    consoleLogStub = sinon.stub(serverless.cli, 'consoleLog').returns();
-  });
-
-  afterEach(() => {
-    serverless.cli.consoleLog.restore();
   });
 
   describe('#constructor()', () => {
@@ -108,7 +102,6 @@ describe('AwsRollbackFunction', () => {
               Qualifier: '4711',
             })
           ).to.equal(true);
-          expect(consoleLogStub.called).to.equal(true);
           expect(result).to.deep.equal({ function: 'hello' });
         });
       });
@@ -140,7 +133,6 @@ describe('AwsRollbackFunction', () => {
               Qualifier: '4711',
             })
           ).to.equal(true);
-          expect(consoleLogStub.called).to.equal(true);
         });
       });
     });
@@ -171,7 +163,6 @@ describe('AwsRollbackFunction', () => {
               Qualifier: '4711',
             })
           ).to.equal(true);
-          expect(consoleLogStub.called).to.equal(true);
         });
       });
     });
@@ -214,7 +205,6 @@ describe('AwsRollbackFunction', () => {
             ZipFile: zipBuffer,
           })
         ).to.equal(true);
-        expect(consoleLogStub.called).to.equal(true);
       });
     });
   });
diff --git a/test/unit/lib/plugins/plugin/install.test.js b/test/unit/lib/plugins/plugin/install.test.js
index 9db3deb18ed..8c935c412c4 100644
--- a/test/unit/lib/plugins/plugin/install.test.js
+++ b/test/unit/lib/plugins/plugin/install.test.js
@@ -19,7 +19,6 @@ chai.use(require('chai-as-promised'));
 describe('PluginInstall', () => {
   let pluginInstall;
   let serverless;
-  let consoleLogStub;
   let serverlessErrorStub;
   const plugins = [
     {
@@ -49,12 +48,10 @@ describe('PluginInstall', () => {
     serverless.cli = new CLI(serverless);
     const options = {};
     pluginInstall = new PluginInstall(serverless, options);
-    consoleLogStub = sinon.stub(serverless.cli, 'consoleLog').returns();
     serverlessErrorStub = sinon.stub(serverless.classes, 'Error').throws();
   });
 
   afterEach(() => {
-    serverless.cli.consoleLog.restore();
     serverless.classes.Error.restore();
   });
 
@@ -146,7 +143,6 @@ describe('PluginInstall', () => {
         expect(validateStub.calledOnce).to.equal(true);
         expect(getPluginsStub.calledOnce).to.equal(true);
         expect(pluginInstallStub.calledOnce).to.equal(true);
-        expect(consoleLogStub.called).to.equal(true);
         expect(serverlessErrorStub.calledOnce).to.equal(false);
         expect(addPluginToServerlessFileStub.calledOnce).to.equal(true);
         expect(installPeerDependenciesStub.calledOnce).to.equal(true);
@@ -167,7 +163,6 @@ describe('PluginInstall', () => {
         expect(validateStub.calledOnce).to.equal(true);
         expect(getPluginsStub.calledOnce).to.equal(true);
         expect(pluginInstallStub.calledOnce).to.equal(true);
-        expect(consoleLogStub.called).to.equal(true);
         expect(serverlessErrorStub.calledOnce).to.equal(false);
         expect(addPluginToServerlessFileStub.calledOnce).to.equal(true);
         expect(installPeerDependenciesStub.calledOnce).to.equal(true);
@@ -187,7 +182,6 @@ describe('PluginInstall', () => {
         expect(validateStub.calledOnce).to.equal(true);
         expect(getPluginsStub.calledOnce).to.equal(true);
         expect(pluginInstallStub.calledOnce).to.equal(true);
-        expect(consoleLogStub.called).to.equal(true);
         expect(serverlessErrorStub.calledOnce).to.equal(false);
         expect(addPluginToServerlessFileStub.calledOnce).to.equal(true);
         expect(installPeerDependenciesStub.calledOnce).to.equal(true);
@@ -283,7 +277,6 @@ describe('PluginInstall', () => {
 
       return expect(pluginInstall.pluginInstall()).to.be.fulfilled.then(() =>
         Promise.all([
-          expect(consoleLogStub.called).to.equal(true),
           expect(
             npmInstallStub.calledWithExactly('npm install --save-dev serverless-plugin-1@latest', {
               stdio: 'ignore',
@@ -296,7 +289,6 @@ describe('PluginInstall', () => {
 
     it('should generate a package.json file in the service directory if not present', () =>
       expect(pluginInstall.pluginInstall()).to.be.fulfilled.then(() => {
-        expect(consoleLogStub.called).to.equal(true);
         expect(
           npmInstallStub.calledWithExactly('npm install --save-dev serverless-plugin-1@latest', {
             stdio: 'ignore',
diff --git a/test/unit/lib/plugins/plugin/uninstall.test.js b/test/unit/lib/plugins/plugin/uninstall.test.js
index 29632a0dfa9..02e9b1923ea 100644
--- a/test/unit/lib/plugins/plugin/uninstall.test.js
+++ b/test/unit/lib/plugins/plugin/uninstall.test.js
@@ -18,7 +18,6 @@ chai.use(require('chai-as-promised'));
 describe('PluginUninstall', () => {
   let pluginUninstall;
   let serverless;
-  let consoleLogStub;
   let serverlessErrorStub;
 
   const plugins = [
@@ -44,12 +43,10 @@ describe('PluginUninstall', () => {
     serverless.cli = new CLI(serverless);
     const options = {};
     pluginUninstall = new PluginUninstall(serverless, options);
-    consoleLogStub = sinon.stub(serverless.cli, 'consoleLog').returns();
     serverlessErrorStub = sinon.stub(serverless.classes, 'Error').throws();
   });
 
   afterEach(() => {
-    serverless.cli.consoleLog.restore();
     serverless.classes.Error.restore();
   });
 
@@ -145,7 +142,6 @@ describe('PluginUninstall', () => {
         expect(validateStub.calledOnce).to.equal(true);
         expect(getPluginsStub.calledOnce).to.equal(true);
         expect(pluginUninstallStub.calledOnce).to.equal(true);
-        expect(consoleLogStub.called).to.equal(true);
         expect(serverlessErrorStub.calledOnce).to.equal(false);
         expect(removePluginFromServerlessFileStub.calledOnce).to.equal(true);
         expect(uninstallPeerDependenciesStub.calledOnce).to.equal(true);
@@ -166,7 +162,6 @@ describe('PluginUninstall', () => {
         expect(validateStub.calledOnce).to.equal(true);
         expect(getPluginsStub.calledOnce).to.equal(true);
         expect(pluginUninstallStub.calledOnce).to.equal(true);
-        expect(consoleLogStub.called).to.equal(true);
         expect(serverlessErrorStub.calledOnce).to.equal(false);
         expect(removePluginFromServerlessFileStub.calledOnce).to.equal(true);
         expect(uninstallPeerDependenciesStub.calledOnce).to.equal(true);
@@ -223,7 +218,6 @@ describe('PluginUninstall', () => {
       serverless.utils.writeFileSync(packageJsonFilePath, packageJson);
 
       return expect(pluginUninstall.pluginUninstall()).to.be.fulfilled.then(() => {
-        expect(consoleLogStub.called).to.equal(true);
         expect(
           npmUninstallStub.calledWithExactly('npm uninstall --save-dev serverless-plugin-1', {
             stdio: 'ignore',

From b915cc467183d146785466965abbe318c349f0c9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 27 Apr 2021 15:11:32 +0200
Subject: [PATCH 0087/1101] refactor: Refactor `isNpmPackageWritable` to not
 depend on `serverless`

---
 lib/plugins/config.js                    | 2 +-
 lib/plugins/interactiveCli/autoUpdate.js | 2 +-
 lib/utils/eventuallyUpdate.js            | 2 +-
 lib/utils/npmPackage/isWritable.js       | 7 +++----
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/plugins/config.js b/lib/plugins/config.js
index 525c00d13d4..ae295c04e7e 100644
--- a/lib/plugins/config.js
+++ b/lib/plugins/config.js
@@ -94,7 +94,7 @@ class Config {
         if (!(await isNpmGlobalPackage())) {
           throw new ServerlessError(noSupportErrorMessage, 'AUTO_UPDATE_NOT_SUPPORTED');
         }
-        if (!(await isNpmPackageWritable(this.serverless))) {
+        if (!(await isNpmPackageWritable())) {
           throw new ServerlessError(
             'Auto update cannot be set, due to missing write access to npm global installation',
             'AUTO_UPDATE_NOT_SET_MISSING_WRITE_ACCESS'
diff --git a/lib/plugins/interactiveCli/autoUpdate.js b/lib/plugins/interactiveCli/autoUpdate.js
index a4de55c8301..03ba41bbe6a 100644
--- a/lib/plugins/interactiveCli/autoUpdate.js
+++ b/lib/plugins/interactiveCli/autoUpdate.js
@@ -11,7 +11,7 @@ module.exports = {
     if (serverless.isLocallyInstalled) return false;
     if (!serverless.isStandaloneExecutable) {
       if (!(await isNpmGlobalPackage())) return false;
-      if (!(await isNpmPackageWritable(serverless))) return false;
+      if (!(await isNpmPackageWritable())) return false;
     }
     const autoUpdateConfig = configUtils.get('autoUpdate');
     if (!autoUpdateConfig) return true;
diff --git a/lib/utils/eventuallyUpdate.js b/lib/utils/eventuallyUpdate.js
index e087af0f377..9cba7195044 100644
--- a/lib/utils/eventuallyUpdate.js
+++ b/lib/utils/eventuallyUpdate.js
@@ -25,7 +25,7 @@ const serverlessTmpDir = path.resolve(os.tmpdir(), 'tmpdirs-serverless');
 const CHECK_INTERVAL = 1000 * 60 * 30; // 30 minutes
 
 const npmUpdate = async (serverless, { newVersion, tarballUrl, abortHandler }) => {
-  const npmPackageRoot = await isNpmPackageWritable(serverless);
+  const npmPackageRoot = await isNpmPackageWritable();
 
   if (!npmPackageRoot) {
     serverless.cli.log(
diff --git a/lib/utils/npmPackage/isWritable.js b/lib/utils/npmPackage/isWritable.js
index 91bb772b541..75a273dcdff 100644
--- a/lib/utils/npmPackage/isWritable.js
+++ b/lib/utils/npmPackage/isWritable.js
@@ -3,18 +3,17 @@
 const { format } = require('util');
 const path = require('path');
 const fs = require('fs').promises;
+const log = require('@serverless/utils/log');
 
 const npmPackageRoot = path.resolve(__dirname, '../../../');
 
-module.exports = async (serverless) => {
+module.exports = async () => {
   const stats = await fs.stat(npmPackageRoot);
   try {
     await fs.utimes(npmPackageRoot, String(stats.atimeMs / 1000), String(stats.mtimeMs / 1000));
     return true;
   } catch (error) {
-    if (process.env.SLS_DEBUG) {
-      serverless.cli.log(format('Auto update: file access error: %O', error));
-    }
+    if (process.env.SLS_DEBUG) log(format('Auto update: file access error: %O', error));
     return false;
   }
 };

From 4f6a50a2e145e664405b00661d801b6ad094f418 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 30 Apr 2021 10:33:28 +0200
Subject: [PATCH 0088/1101] refactor(Telemetry): Make `generatePayload`
 `serverless` independent

---
 lib/classes/PluginManager.js                  |   9 +-
 lib/cli/handle-error.js                       |  20 +++-
 lib/utils/telemetry/generatePayload.js        |  98 ++++++++--------
 scripts/serverless.js                         |  39 +++++--
 .../utils/telemetry/generatePayload.test.js   | 107 ++++++++++++++----
 5 files changed, 193 insertions(+), 80 deletions(-)

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index f7d3f885386..fa203017e80 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -604,7 +604,14 @@ class PluginManager {
     // TODO: Remove this logic with `v3.0.0` along with removal of `isTelemetryReportedExternally`
     // After we are ensured that local fallback from `v3` will always fall back to `v3` local installation
     if (!this.serverless.isTelemetryReportedExternally && !isTelemetryDisabled) {
-      await storeTelemetryLocally(await generateTelemetryPayload(this.serverless));
+      await storeTelemetryLocally(
+        await generateTelemetryPayload({
+          ...resolveCliInput(),
+          serviceDir: this.serverless.serviceDir,
+          configuration: this.serverless.configurationInput,
+          serverless: this.serverless,
+        })
+      );
       if (commandsArray.join(' ') === 'deploy') {
         deferredBackendNotificationRequest = sendTelemetry({
           serverlessExecutionSpan: this.serverless.onExitPromise,
diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 2b535cb6e5e..ee8b457356e 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -45,6 +45,11 @@ module.exports = async (exception, options = {}) => {
     isUncaughtException,
     isLocallyInstalled: passedIsLocallyInstalled,
     isInvokedByGlobalInstallation: passedIsInvokedByGlobalInstallation,
+    command,
+    options: cliOptions,
+    commandSchema,
+    serviceDir,
+    configuration,
     serverless,
     hasTelemetryBeenReported,
   } = options;
@@ -141,15 +146,20 @@ module.exports = async (exception, options = {}) => {
   consoleLog(chalk.yellow(`     Components Version:        ${componentsVersion}`));
   consoleLog(' ');
 
-  // If `hasTelemetryBeenReported` is not defined, we don't want to publish telemetry, similarily for when `commandSchema` is not available
-  const { commandSchema } = resolveInput();
   if (
-    commandSchema &&
     !isTelemetryDisabled &&
     hasTelemetryBeenReported === false &&
-    (serverless ? serverless.isTelemetryReportedExternally : true)
+    (serverless ? serverless.isTelemetryReportedExternally : true) &&
+    resolveInput().commandSchema // Do not report for unrecognized commands
   ) {
-    const telemetryPayload = await generateTelemetryPayload(serverless);
+    const telemetryPayload = await generateTelemetryPayload({
+      command,
+      options: cliOptions,
+      commandSchema,
+      serviceDir,
+      configuration,
+      serverless,
+    });
     const failureReason = {
       kind: isUserError ? 'user' : 'programmer',
       code: exception.code,
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index 26b653592b6..6793672965d 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -4,12 +4,12 @@ const path = require('path');
 const os = require('os');
 const fs = require('fs').promises;
 const resolve = require('ncjsm/resolve');
+const _ = require('lodash');
+const isObject = require('type/object/is');
 const userConfig = require('@serverless/utils/config');
 const isStandalone = require('../isStandaloneExecutable');
 const { triggeredDeprecations } = require('../logDeprecation');
 const isNpmGlobal = require('../npmPackage/isGlobal');
-const noServiceCommands = require('../../cli/commands-schema/no-service');
-const resolveInput = require('../../cli/resolve-input');
 const resolveLocalServerlessPath = require('../../cli/resolve-local-serverless-path');
 const resolveIsLocallyInstalled = require('../../utils/is-locally-installed');
 const ci = require('ci-info');
@@ -24,55 +24,63 @@ const checkIsTabAutocompletionInstalled = async () => {
   }
 };
 
-const shouldIncludeServiceSpecificConfig = (serverless) => {
-  if (!serverless || !serverless.serviceDir) {
-    return false;
-  }
-
-  const { command } = resolveInput();
-  const noServiceCommand = noServiceCommands.get(command);
-  if (noServiceCommand && !noServiceCommand.serviceDependencyMode) {
-    return false;
-  }
-
-  return true;
-};
+const getServiceConfig = ({ configuration, options }) => {
+  const providerName = isObject(configuration.provider)
+    ? configuration.provider.name
+    : configuration.provider;
 
-const getServiceConfig = (serverless) => {
-  const { service: serviceConfig } = serverless;
-  const { provider: providerConfig } = serviceConfig;
-  const provider = serverless.getProvider(providerConfig.name);
+  const isAwsProvider = providerName === 'aws';
 
-  const isAwsProvider = providerConfig.name === 'aws';
+  const defaultRuntime = isAwsProvider
+    ? configuration.provider.runtime || 'nodejs12.x'
+    : _.get(configuration, 'provider.runtime');
 
-  const defaultRuntime = isAwsProvider ? provider.getRuntime() : providerConfig.runtime;
+  const functions = (() => {
+    if (isObject(configuration.functions)) return configuration.functions;
+    if (!Array.isArray(configuration.functions)) return {};
+    const result = {};
+    for (const functionsBlock of configuration.functions) Object.assign(result, functionsBlock);
+    return result;
+  })();
 
   return {
     provider: {
-      name: providerConfig.name,
+      name: providerName,
       runtime: defaultRuntime,
-      stage: isAwsProvider ? provider.getStage() : providerConfig.stage,
-      region: isAwsProvider ? provider.getRegion() : providerConfig.region,
+      stage: options.stage || _.get(configuration, 'provider.stage') || 'dev',
+      region: isAwsProvider
+        ? options.region || configuration.provider.region || 'us-east-1'
+        : _.get(configuration, 'provider.region'),
     },
-    plugins: serviceConfig.plugins ? serviceConfig.plugins.modules || serviceConfig.plugins : [],
-    functions: Object.values(serviceConfig.functions).map((functionConfig) => {
-      const functionEvents = functionConfig.events || [];
-      const functionRuntime = (() => {
-        if (functionConfig.image) return '$containerimage';
-        return functionConfig.runtime || defaultRuntime;
-      })();
-
-      return {
-        runtime: functionRuntime,
-        events: functionEvents.map((eventConfig) => ({
-          type: Object.keys(eventConfig)[0] || null,
-        })),
-      };
-    }),
+    plugins: configuration.plugins ? configuration.plugins.modules || configuration.plugins : [],
+    functions: Object.values(functions)
+      .map((functionConfig) => {
+        if (!functionConfig) return null;
+        const functionEvents = Array.isArray(functionConfig.events) ? functionConfig.events : [];
+        const functionRuntime = (() => {
+          if (functionConfig.image) return '$containerimage';
+          return functionConfig.runtime || defaultRuntime;
+        })();
+
+        return {
+          runtime: functionRuntime,
+          events: functionEvents.map((eventConfig) => ({
+            type: isObject(eventConfig) ? Object.keys(eventConfig)[0] || null : null,
+          })),
+        };
+      })
+      .filter(Boolean),
   };
 };
 
-module.exports = async (serverless = null) => {
+module.exports = async ({
+  command,
+  options,
+  commandSchema,
+  serviceDir,
+  configuration,
+  serverless,
+}) => {
   let commandDurationMs;
 
   if (EvalError.$serverlessCommandStartTime) {
@@ -140,8 +148,6 @@ module.exports = async (serverless = null) => {
     };
   })();
 
-  const { command, options, commandSchema } = resolveInput();
-
   // We only consider options that are present in command schema
   const availableOptionNames = new Set(Object.keys(commandSchema.options));
   const commandOptionNames = Object.keys(options).filter((x) => availableOptionNames.has(x));
@@ -179,11 +185,11 @@ module.exports = async (serverless = null) => {
     payload.commandDurationMs = commandDurationMs;
   }
 
-  if (shouldIncludeServiceSpecificConfig(serverless)) {
+  if (configuration && commandSchema.serviceDependencyMode) {
     const npmDependencies = (() => {
       const pkgJson = (() => {
         try {
-          return require(path.resolve(serverless.serviceDir, 'package.json'));
+          return require(path.resolve(serviceDir, 'package.json'));
         } catch (error) {
           return null;
         }
@@ -199,8 +205,8 @@ module.exports = async (serverless = null) => {
     })();
 
     payload.npmDependencies = npmDependencies;
-    payload.config = getServiceConfig(serverless);
-    payload.dashboard.orgUid = serverless.service.orgUid;
+    payload.config = getServiceConfig({ configuration, options });
+    payload.dashboard.orgUid = serverless && serverless.service.orgUid;
   }
 
   return payload;
diff --git a/scripts/serverless.js b/scripts/serverless.js
index ea52728a9ec..5b7317c9b0c 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -24,13 +24,23 @@ const generateTelemetryPayload = require('../lib/utils/telemetry/generatePayload
 const processBackendNotificationRequest = require('../lib/utils/processBackendNotificationRequest');
 const isTelemetryDisabled = require('../lib/utils/telemetry/areDisabled');
 
+let command;
+let options;
+let commandSchema;
+let serviceDir = null;
+let configuration = null;
 let serverless;
 
-let hasTelemetryBeenReported = false;
+const hasTelemetryBeenReported = false;
 
 process.once('uncaughtException', (error) =>
   handleError(error, {
     isUncaughtException: true,
+    command,
+    options,
+    commandSchema,
+    serviceDir,
+    configuration,
     serverless,
     hasTelemetryBeenReported,
   })
@@ -43,10 +53,12 @@ const processSpanPromise = (async () => {
 
     const resolveInput = require('../lib/cli/resolve-input');
 
+    let commands;
+    let isHelpRequest;
     // Parse args against schemas of commands which do not require to be run in service context
-    let { command, commands, options, isHelpRequest, commandSchema } = resolveInput(
+    ({ command, commands, options, isHelpRequest, commandSchema } = resolveInput(
       require('../lib/cli/commands-schema/no-service')
-    );
+    ));
 
     // If version number request, show it and abort
     if (options.version) {
@@ -74,8 +86,6 @@ const processSpanPromise = (async () => {
     const logDeprecation = require('../lib/utils/logDeprecation');
 
     let configurationPath = null;
-    let configuration = null;
-    let serviceDir = null;
     let providerName;
     let variablesMeta;
     let resolverConfiguration;
@@ -649,10 +659,18 @@ const processSpanPromise = (async () => {
         await serverless.run();
       }
 
-      hasTelemetryBeenReported = true;
       if (!isTelemetryDisabled && !isHelpRequest && serverless.isTelemetryReportedExternally) {
-        const telemetryPayload = await generateTelemetryPayload(serverless);
-        await storeTelemetryLocally({ ...telemetryPayload, outcome: 'success' });
+        await storeTelemetryLocally({
+          ...(await generateTelemetryPayload({
+            command,
+            options,
+            commandSchema,
+            serviceDir,
+            configuration,
+            serverless,
+          })),
+          outcome: 'success',
+        });
         let backendNotificationRequest;
         if (commands.join(' ') === 'deploy') {
           backendNotificationRequest = await sendTelemetry({
@@ -689,6 +707,11 @@ const processSpanPromise = (async () => {
     }
   } catch (error) {
     handleError(error, {
+      command,
+      options,
+      commandSchema,
+      serviceDir,
+      configuration,
       serverless,
       hasTelemetryBeenReported,
     });
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index 8ee027b272a..6e344119232 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -8,6 +8,7 @@ const overrideEnv = require('process-utils/override-env');
 const overrideCwd = require('process-utils/override-cwd');
 
 const resolveLocalServerless = require('../../../../../lib/cli/resolve-local-serverless-path');
+const commandsSchema = require('../../../../../lib/cli/commands-schema');
 const generatePayload = require('../../../../../lib/utils/telemetry/generatePayload');
 const runServerless = require('../../../../utils/run-serverless');
 const fixtures = require('../../../../fixtures/programmatic');
@@ -63,7 +64,13 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       cwd: serviceDir,
       command: 'print',
     });
-    const payload = await generatePayload(serverless);
+    const payload = await generatePayload({
+      command: 'print',
+      options: {},
+      commandSchema: commandsSchema.get('print'),
+      serviceDir,
+      configuration: serverless.configurationInput,
+    });
 
     expect(payload).to.have.property('frameworkLocalUserId');
     delete payload.frameworkLocalUserId;
@@ -113,7 +120,14 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       fixture: 'customProvider',
       command: 'print',
     });
-    const payload = await generatePayload(serverless);
+    const payload = await generatePayload({
+      command: 'print',
+      options: {},
+      commandSchema: commandsSchema.get('print'),
+      serviceDir: serverless.serviceDir,
+      configuration: serverless.configurationInput,
+      serverless,
+    });
 
     expect(payload).to.have.property('frameworkLocalUserId');
     delete payload.frameworkLocalUserId;
@@ -164,7 +178,16 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       command: 'print',
       modulesCacheStub: {},
     });
-    const payload = await overrideCwd(serviceDir, async () => generatePayload(serverless));
+    const payload = await overrideCwd(serviceDir, async () =>
+      generatePayload({
+        command: 'print',
+        options: {},
+        commandSchema: commandsSchema.get('print'),
+        serviceDir: serverless.serviceDir,
+        configuration: serverless.configurationInput,
+        serverless,
+      })
+    );
 
     expect(payload).to.have.property('frameworkLocalUserId');
     delete payload.frameworkLocalUserId;
@@ -211,7 +234,13 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       fixture: 'aws',
       command: 'config',
     });
-    const payload = await generatePayload(serverless);
+    const payload = await generatePayload({
+      command: 'config',
+      options: {},
+      commandSchema: commandsSchema.get('config'),
+      serviceDir: serverless.serviceDir,
+      configuration: serverless.configurationInput,
+    });
 
     expect(payload).to.have.property('frameworkLocalUserId');
     delete payload.frameworkLocalUserId;
@@ -239,12 +268,18 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     });
   });
 
-  it('Should resolve service-agnostic payload for command with `serviceDependencyMode`', async () => {
+  it('Should resolve service-agnostic payload for command with `serviceDependencyMode: "optional"`', async () => {
     const { serverless } = await runServerless({
       fixture: 'httpApi',
-      command: 'help',
+      command: 'print',
+    });
+    const payload = await generatePayload({
+      command: '',
+      options: {},
+      commandSchema: commandsSchema.get(''),
+      serviceDir: serverless.serviceDir,
+      configuration: serverless.configurationInput,
     });
-    const payload = await generatePayload(serverless);
 
     expect(payload).to.have.property('frameworkLocalUserId');
     delete payload.frameworkLocalUserId;
@@ -261,7 +296,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     expect(payload).to.have.property('commandDurationMs');
     delete payload.commandDurationMs;
     expect(payload).to.deep.equal({
-      command: 'help',
+      command: '',
       commandOptionNames: [],
       cliName: 'serverless',
       config: {
@@ -289,14 +324,12 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should correctly resolve payload with missing `serverless` instance', async () => {
-    // Run serverless in order to ensure command resolution
-    await runServerless({
-      fixture: 'aws',
-      command: 'print',
+    const payload = await generatePayload({
+      command: 'plugin list',
+      options: {},
+      commandSchema: commandsSchema.get('plugin list'),
     });
 
-    const payload = await generatePayload();
-
     expect(payload).to.have.property('frameworkLocalUserId');
     delete payload.frameworkLocalUserId;
     expect(payload).to.have.property('firstLocalInstallationTimestamp');
@@ -313,7 +346,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     delete payload.commandDurationMs;
     expect(payload).to.deep.equal({
       cliName: 'serverless',
-      command: 'print',
+      command: 'plugin list',
       commandOptionNames: [],
       isAutoUpdateEnabled: false,
       isTabAutocompletionInstalled: false,
@@ -340,7 +373,13 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       })
     );
 
-    const payload = await generatePayload(serverless);
+    const payload = await generatePayload({
+      command: 'config',
+      options: {},
+      commandSchema: commandsSchema.get('config'),
+      serviceDir: serverless.serviceDir,
+      configuration: serverless.configurationInput,
+    });
     expect(payload.dashboard.userId).to.equal('some-user-id');
     expect(payload.frameworkLocalUserId).to.equal('123');
     expect(payload.firstLocalInstallationTimestamp).to.equal(1616151998);
@@ -364,7 +403,13 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     let payload;
 
     await overrideEnv({ variables: { SERVERLESS_ACCESS_KEY: 'some-key' } }, async () => {
-      payload = await generatePayload(serverless);
+      payload = await generatePayload({
+        command: 'config',
+        options: {},
+        commandSchema: commandsSchema.get('config'),
+        serviceDir: serverless.serviceDir,
+        configuration: serverless.configurationInput,
+      });
     });
     expect(payload.dashboard.userId).to.be.null;
     expect(payload.frameworkLocalUserId).to.equal('123');
@@ -379,7 +424,13 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     let payload;
 
     await overrideEnv({ variables: { SERVERLESS_CI_CD: 'true' } }, async () => {
-      payload = await generatePayload(serverless);
+      payload = await generatePayload({
+        command: 'config',
+        options: {},
+        commandSchema: commandsSchema.get('config'),
+        serviceDir: serverless.serviceDir,
+        configuration: serverless.configurationInput,
+      });
     });
     expect(payload.ciName).to.equal('Serverless CI/CD');
   });
@@ -394,7 +445,13 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     let payload;
 
     await overrideEnv({ variables: { SEED_APP_NAME: 'some-app' } }, async () => {
-      payload = await generatePayload(serverless);
+      payload = await generatePayload({
+        command: 'config',
+        options: {},
+        commandSchema: commandsSchema.get('config'),
+        serviceDir: serverless.serviceDir,
+        configuration: serverless.configurationInput,
+      });
     });
     expect(payload.ciName).to.equal('Seed');
   });
@@ -409,7 +466,17 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
         path: 'provider.name',
       },
     });
-    const payload = await generatePayload(serverless);
+    const payload = await generatePayload({
+      command: 'print',
+      options: {
+        region: 'eu-west-1',
+        format: 'json',
+        path: 'provider.name',
+      },
+      commandSchema: commandsSchema.get('print'),
+      serviceDir: serverless.serviceDir,
+      configuration: serverless.configurationInput,
+    });
 
     expect(new Set(payload.commandOptionNames)).to.deep.equal(
       new Set(['region', 'format', 'path'])

From c13586ee23614da75d71f40ff24037b9aad46c2c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 30 Apr 2021 13:50:15 +0200
Subject: [PATCH 0089/1101] refactor(CLI Onboarding): Simplify tabcompletion
 support check

---
 lib/utils/tabCompletion/isSupported.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/tabCompletion/isSupported.js b/lib/utils/tabCompletion/isSupported.js
index 5bc00beaf98..1d1e489c868 100644
--- a/lib/utils/tabCompletion/isSupported.js
+++ b/lib/utils/tabCompletion/isSupported.js
@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = process.platform !== 'win32' && process.version.match(/\d+/)[0] >= 8;
+module.exports = process.platform !== 'win32';

From 7864f4d28d4c4ed8325e64c8dfca891845edf392 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 30 Apr 2021 14:11:40 +0200
Subject: [PATCH 0090/1101] refactor(CLI Onboarding): Seclude from internal
 Framework logic

---
 .../interactive-setup/auto-update.js}         |  10 +-
 .../interactive-setup/aws-credentials.js}     |  38 ++--
 lib/cli/interactive-setup/index.js            |  17 ++
 .../interactive-setup/service.js}             |  33 ++-
 .../interactive-setup/tab-completion.js}      |   2 +-
 .../interactive-setup}/utils.js               |   0
 lib/cli/resolve-configuration-path.js         |  16 +-
 lib/plugins/interactiveCli/index.js           |  65 ++----
 scripts/serverless.js                         |  43 +++-
 test/unit/lib/classes/PluginManager.test.js   |   2 +-
 .../cli/interactive-setup/auto-update.test.js |  68 ++++++
 .../interactive-setup/aws-credentials.test.js | 186 ++++++++++++++++
 .../lib/cli/interactive-setup/index.test.js   |  75 +++++++
 .../lib/cli/interactive-setup/service.test.js |  82 +++++++
 .../interactive-setup/tab-completion.test.js  |  76 +++++++
 .../cli/resolve-configuration-path.test.js    |  25 +++
 .../plugins/interactiveCli/autoUpdate.test.js | 116 ----------
 .../fixtures/some-aws-service/serverless.yml  |   2 -
 .../some-other-service/serverless.yml         |   2 -
 .../lib/plugins/interactiveCli/index.test.js  |  28 ---
 .../interactiveCli/initializeService.test.js  | 122 -----------
 .../plugins/interactiveCli/setupAws.test.js   | 200 ------------------
 .../interactiveCli/tabCompletion.test.js      | 104 ---------
 23 files changed, 638 insertions(+), 674 deletions(-)
 rename lib/{plugins/interactiveCli/autoUpdate.js => cli/interactive-setup/auto-update.js} (75%)
 rename lib/{plugins/interactiveCli/setupAws.js => cli/interactive-setup/aws-credentials.js} (82%)
 create mode 100644 lib/cli/interactive-setup/index.js
 rename lib/{plugins/interactiveCli/initializeService.js => cli/interactive-setup/service.js} (68%)
 rename lib/{plugins/interactiveCli/tabCompletion.js => cli/interactive-setup/tab-completion.js} (99%)
 rename lib/{plugins/interactiveCli => cli/interactive-setup}/utils.js (100%)
 create mode 100644 test/unit/lib/cli/interactive-setup/auto-update.test.js
 create mode 100644 test/unit/lib/cli/interactive-setup/aws-credentials.test.js
 create mode 100644 test/unit/lib/cli/interactive-setup/index.test.js
 create mode 100644 test/unit/lib/cli/interactive-setup/service.test.js
 create mode 100644 test/unit/lib/cli/interactive-setup/tab-completion.test.js
 delete mode 100644 test/unit/lib/plugins/interactiveCli/autoUpdate.test.js
 delete mode 100644 test/unit/lib/plugins/interactiveCli/fixtures/some-aws-service/serverless.yml
 delete mode 100644 test/unit/lib/plugins/interactiveCli/fixtures/some-other-service/serverless.yml
 delete mode 100644 test/unit/lib/plugins/interactiveCli/index.test.js
 delete mode 100644 test/unit/lib/plugins/interactiveCli/initializeService.test.js
 delete mode 100644 test/unit/lib/plugins/interactiveCli/setupAws.test.js
 delete mode 100644 test/unit/lib/plugins/interactiveCli/tabCompletion.test.js

diff --git a/lib/plugins/interactiveCli/autoUpdate.js b/lib/cli/interactive-setup/auto-update.js
similarity index 75%
rename from lib/plugins/interactiveCli/autoUpdate.js
rename to lib/cli/interactive-setup/auto-update.js
index 03ba41bbe6a..9680d41927b 100644
--- a/lib/plugins/interactiveCli/autoUpdate.js
+++ b/lib/cli/interactive-setup/auto-update.js
@@ -4,12 +4,14 @@ const chalk = require('chalk');
 const configUtils = require('@serverless/utils/config');
 const isNpmPackageWritable = require('../../utils/npmPackage/isWritable');
 const isNpmGlobalPackage = require('../../utils/npmPackage/isGlobal');
-const { confirm } = require('./utils');
+const isStandaloneExecutable = require('../../utils/isStandaloneExecutable');
+const isLocallyInstalled = require('../../utils/is-locally-installed');
+const { confirm } = require('../../cli/interactive-setup/utils');
 
 module.exports = {
-  async check(serverless) {
-    if (serverless.isLocallyInstalled) return false;
-    if (!serverless.isStandaloneExecutable) {
+  async isApplicable() {
+    if (!isStandaloneExecutable && !process.env.SLS_INTERACTIVE_SETUP_TEST) {
+      if (await isLocallyInstalled()) return false;
       if (!(await isNpmGlobalPackage())) return false;
       if (!(await isNpmPackageWritable())) return false;
     }
diff --git a/lib/plugins/interactiveCli/setupAws.js b/lib/cli/interactive-setup/aws-credentials.js
similarity index 82%
rename from lib/plugins/interactiveCli/setupAws.js
rename to lib/cli/interactive-setup/aws-credentials.js
index a1dd0af421f..21ea33d2498 100644
--- a/lib/plugins/interactiveCli/setupAws.js
+++ b/lib/cli/interactive-setup/aws-credentials.js
@@ -1,9 +1,12 @@
 'use strict';
 
-const BbPromise = require('bluebird');
 const chalk = require('chalk');
+const _ = require('lodash');
 const inquirer = require('@serverless/utils/inquirer');
-const awsCredentials = require('../aws/utils/credentials');
+
+const AWS = require('aws-sdk');
+
+const awsCredentials = require('../../plugins/aws/utils/credentials');
 const { confirm } = require('./utils');
 const openBrowser = require('../../utils/openBrowser');
 
@@ -62,8 +65,8 @@ const steps = {
       }
       return null;
     }),
-  ensureAwsCredentials: (serverless) => {
-    const region = serverless.getProvider('aws').getRegion();
+  ensureAwsCredentials: ({ options, configuration }) => {
+    const region = options.region || configuration.provider.region || 'us-east-1';
     openBrowser(
       `https://console.aws.amazon.com/iam/home?region=${region}#/users$new?step=final&accessKey&userNames=serverless&permissionType=policies&policies=arn:aws:iam::aws:policy%2FAdministratorAccess`
     );
@@ -94,30 +97,31 @@ const steps = {
 };
 
 module.exports = {
-  check(serverless) {
-    return BbPromise.try(() => {
-      if (serverless.service.provider.name !== 'aws') return false;
-      if (serverless.getProvider('aws').cachedCredentials) return false;
-      return BbPromise.all([
-        awsCredentials.resolveFileProfiles(),
-        awsCredentials.resolveEnvCredentials(),
-      ]).then(([fileProfiles, envCredentials]) => !fileProfiles.size && !envCredentials);
-    });
+  async isApplicable({ configuration }) {
+    if (
+      _.get(configuration, 'provider') !== 'aws' &&
+      _.get(configuration, 'provider.name') !== 'aws'
+    ) {
+      return false;
+    }
+    if (new AWS.S3().config.credentials) return false;
+    return !(await awsCredentials.resolveFileProfiles()).size;
   },
-  run(serverless) {
+  run(data) {
     process.stdout.write(
       'No AWS credentials were found on your computer, ' +
         'you need these to host your application.\n\n'
     );
-    return module.exports.runSteps(serverless);
+
+    return module.exports.runSteps(data);
   },
   steps,
-  runSteps: (serverless) =>
+  runSteps: (context) =>
     steps.shouldSetupAwsCredentials().then((isConfirmed) => {
       if (!isConfirmed) return null;
       return steps
         .ensureAwsAccount()
-        .then(() => steps.ensureAwsCredentials(serverless))
+        .then(() => steps.ensureAwsCredentials(context))
         .then(steps.inputAwsCredentials);
     }),
 };
diff --git a/lib/cli/interactive-setup/index.js b/lib/cli/interactive-setup/index.js
new file mode 100644
index 00000000000..9f121eaf64c
--- /dev/null
+++ b/lib/cli/interactive-setup/index.js
@@ -0,0 +1,17 @@
+'use strict';
+
+const steps = {
+  service: require('./service'),
+  awsCredentials: require('./aws-credentials'),
+  autoUpdate: require('./auto-update'),
+  tabCompletion: require('./tab-completion'),
+};
+
+module.exports = async (context) => {
+  for (const step of Object.values(steps)) {
+    if (await step.isApplicable(context)) {
+      process.stdout.write('\n');
+      await step.run(context);
+    }
+  }
+};
diff --git a/lib/plugins/interactiveCli/initializeService.js b/lib/cli/interactive-setup/service.js
similarity index 68%
rename from lib/plugins/interactiveCli/initializeService.js
rename to lib/cli/interactive-setup/service.js
index 03a92eef1ce..7e78475c7d1 100644
--- a/lib/plugins/interactiveCli/initializeService.js
+++ b/lib/cli/interactive-setup/service.js
@@ -4,9 +4,10 @@ const { join } = require('path');
 const chalk = require('chalk');
 const fs = require('fs');
 const inquirer = require('@serverless/utils/inquirer');
-const resolveConfigurationPath = require('../../../lib/cli/resolve-configuration-path');
-const readConfiguration = require('../../../lib/configuration/read');
+const resolveConfigurationPath = require('../resolve-configuration-path');
+const readConfiguration = require('../../configuration/read');
 const createFromTemplate = require('../../utils/createFromTemplate');
+const resolveVariables = require('../../configuration/variables');
 const { confirm } = require('./utils');
 
 const isValidServiceName = RegExp.prototype.test.bind(/^[a-zA-Z][a-zA-Z0-9-]{0,100}$/);
@@ -23,7 +24,7 @@ const projectTypeChoice = async () =>
       message: 'What do you want to make?',
       type: 'list',
       name: 'projectType',
-      choices: module.exports.initializeProjectChoices,
+      choices: initializeProjectChoices,
     })
   ).projectType;
 
@@ -55,12 +56,11 @@ const projectNameInput = async (workingDir) =>
   ).projectName.trim();
 
 module.exports = {
-  initializeProjectChoices,
-  check(serverless) {
-    return !serverless.serviceDir;
+  isApplicable({ serviceDir }) {
+    return !serviceDir;
   },
-  async run(serverless) {
-    const workingDir = process.cwd();
+  async run(context) {
+    const workingDir = context.cwd || process.cwd();
     const isConfirmed = await confirm('No project detected. Do you want to create a new one?', {
       name: 'shouldCreateNewProject',
     });
@@ -80,17 +80,10 @@ module.exports = {
       `\n${chalk.green(`Project successfully created in '${projectName}' folder.`)}\n`
     );
 
-    process.chdir(projectDir);
-    const configurationPath = await resolveConfigurationPath();
-    serverless.serviceDir = serverless.serviceDir = projectDir;
-    serverless.configurationFilename = configurationPath.slice(serverless.serviceDir.length + 1);
-    serverless.configurationInput = await readConfiguration(configurationPath);
-    await serverless.service.load();
-    await serverless.variables.populateService();
-    serverless.service.mergeArrays();
-    serverless.service.setFunctionNames();
-    // TODO: Temporary workaround for https://github.com/serverless/serverless/issues/8257
-    serverless.service.configValidationMode = 'off';
-    await serverless.service.validate();
+    context.serviceDir = projectDir;
+    const configurationPath = await resolveConfigurationPath({ cwd: projectDir, options: {} });
+    context.configurationFilename = configurationPath.slice(projectDir.length + 1);
+    context.configuration = await readConfiguration(configurationPath);
+    await resolveVariables(context);
   },
 };
diff --git a/lib/plugins/interactiveCli/tabCompletion.js b/lib/cli/interactive-setup/tab-completion.js
similarity index 99%
rename from lib/plugins/interactiveCli/tabCompletion.js
rename to lib/cli/interactive-setup/tab-completion.js
index 8d35c3e2bba..9ced46520dc 100644
--- a/lib/plugins/interactiveCli/tabCompletion.js
+++ b/lib/cli/interactive-setup/tab-completion.js
@@ -18,7 +18,7 @@ const { confirm } = require('./utils');
 BbPromise.promisifyAll(fs);
 
 module.exports = {
-  check() {
+  isApplicable() {
     return BbPromise.try(() => {
       if (!isTabTabCompletionSupported) return false;
 
diff --git a/lib/plugins/interactiveCli/utils.js b/lib/cli/interactive-setup/utils.js
similarity index 100%
rename from lib/plugins/interactiveCli/utils.js
rename to lib/cli/interactive-setup/utils.js
diff --git a/lib/cli/resolve-configuration-path.js b/lib/cli/resolve-configuration-path.js
index a3d3925cfc9..7d4767d6fe4 100644
--- a/lib/cli/resolve-configuration-path.js
+++ b/lib/cli/resolve-configuration-path.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const ensurePlainObject = require('type/plain-object/ensure');
+const ensureString = require('type/string/ensure');
 const path = require('path');
 const fs = require('fs').promises;
 const ServerlessError = require('../serverless-error');
@@ -9,11 +11,15 @@ const resolveInput = require('./resolve-input');
 
 const supportedExtensions = new Set(['yml', 'yaml', 'json', 'js', 'ts']);
 
-module.exports = async () => {
-  const customConfigName = resolveInput().options.config;
+module.exports = async (options = {}) => {
+  if (!options) options = {};
+  const cliOptions =
+    ensurePlainObject(options.options, { isOptional: true }) || resolveInput().options;
+  const cwd = path.resolve(ensureString(options.cwd, { isOptional: true }) || process.cwd());
+  const customConfigName = cliOptions.config;
 
   if (customConfigName) {
-    const customConfigPath = path.resolve(customConfigName);
+    const customConfigPath = path.resolve(cwd, customConfigName);
     if (!supportedExtensions.has(path.extname(customConfigPath).slice(1))) {
       throw new ServerlessError(
         'Invalid "--config" value: Unsupported file extension ' +
@@ -43,7 +49,7 @@ module.exports = async () => {
         'INVALID_SERVICE_CONFIG_PATH'
       );
     }
-    if (process.cwd() !== path.dirname(customConfigPath)) {
+    if (cwd !== path.dirname(customConfigPath)) {
       logDeprecation(
         'NESTED_CUSTOM_CONFIGURATION_PATH',
         'Service configuration is expected to be placed in a root of a service (working directory). All paths, function handlers in a configuration are resolved against service directory".\n' +
@@ -54,7 +60,7 @@ module.exports = async () => {
   }
 
   for (const extension of supportedExtensions) {
-    const eventualServiceConfigPath = path.resolve(process.cwd(), `serverless.${extension}`);
+    const eventualServiceConfigPath = path.resolve(cwd, `serverless.${extension}`);
     if (await fileExists(eventualServiceConfigPath)) return eventualServiceConfigPath;
   }
   return null;
diff --git a/lib/plugins/interactiveCli/index.js b/lib/plugins/interactiveCli/index.js
index fa4b1320269..57f32179e00 100644
--- a/lib/plugins/interactiveCli/index.js
+++ b/lib/plugins/interactiveCli/index.js
@@ -1,11 +1,9 @@
+// TODO: Remove with next major release
+
 'use strict';
 
-const inquirer = require('@serverless/utils/inquirer');
+const ServerlessError = require('../../serverless-error');
 const cliCommandsSchema = require('../../cli/commands-schema');
-const initializeService = require('./initializeService');
-const setupAws = require('./setupAws');
-const tabCompletion = require('./tabCompletion');
-const autoUpdate = require('./autoUpdate');
 
 module.exports = class InteractiveCli {
   constructor(serverless) {
@@ -17,42 +15,8 @@ module.exports = class InteractiveCli {
         isHidden: true,
       },
     };
-
-    this.hooks = {
-      'initialize': () => {
-        if (!this.serverless.interactiveCli) return;
-        const { processedInput } = this.serverless;
-        // After `sls.init()`, if any external plugins are loaded, commands are re-resolved
-        // (in `scripts/serverless.js`) and that reverts patch applied in asyncInit() below.
-        // Bring it back
-        if (!processedInput.commands.length) processedInput.commands.push('interactiveCli');
-      },
-      'interactiveCli:initializeService': () => {
-        if (!initializeService.check(serverless)) return null;
-        process.stdout.write('\n');
-        return initializeService.run(serverless);
-      },
-      'interactiveCli:setupAws': () => {
-        return setupAws.check(serverless).then((isApplicable) => {
-          if (!isApplicable) return null;
-          process.stdout.write('\n');
-          return setupAws.run(serverless);
-        });
-      },
-      'interactiveCli:autoUpdate': async () => {
-        if (!(await autoUpdate.check(serverless))) return;
-        process.stdout.write('\n');
-        await autoUpdate.run(serverless);
-      },
-      'interactiveCli:tabCompletion': () => {
-        return tabCompletion.check(serverless).then((isApplicable) => {
-          if (!isApplicable) return null;
-          process.stdout.write('\n');
-          return tabCompletion.run(serverless);
-        });
-      },
-    };
   }
+
   asyncInit() {
     /*
      * The majority of setup is done here to allow other plugins to modify
@@ -79,15 +43,16 @@ module.exports = class InteractiveCli {
 
     if (usedOptions.size) return;
 
-    // Enforce interactive CLI
-    processedInput.commands.push('interactiveCli');
-
-    // Expose customized inquirer, and setupAws configuration for other plugins
-    // setupAws is further customized by dashboard plugin
-    this.serverless.interactiveCli = {
-      inquirer,
-      awsSetupConfiguration: setupAws,
-      initializeServiceConfiguration: initializeService,
-    };
+    if (this.serverless._isInvokedByGlobalInstallation) {
+      throw new ServerlessError(
+        "Outdated global installation of 'serverless'. Please upgrade. " +
+          "It's needed to ensure desired interactive CLI experience"
+      );
+    }
+    throw new Error(
+      'Unexpected interactive CLI fallback (please report at ' +
+        'https://github.com/serverless/serverless/issues/new' +
+        '?assignees=&labels=&template=bug_report.md'
+    );
   }
 };
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 5b7317c9b0c..c75724adb7c 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -31,7 +31,7 @@ let serviceDir = null;
 let configuration = null;
 let serverless;
 
-const hasTelemetryBeenReported = false;
+let hasTelemetryBeenReported = false;
 
 process.once('uncaughtException', (error) =>
   handleError(error, {
@@ -89,6 +89,7 @@ const processSpanPromise = (async () => {
     let providerName;
     let variablesMeta;
     let resolverConfiguration;
+    let isInteractiveSetup;
 
     const ensureResolvedProperty = (propertyPath, { shouldSilentlyReturnIfLegacyMode } = {}) => {
       if (isPropertyResolved(variablesMeta, propertyPath)) return true;
@@ -119,6 +120,8 @@ const processSpanPromise = (async () => {
     if (!commandSchema || commandSchema.serviceDependencyMode) {
       // Command is potentially service specific, follow up with resolution of service config
 
+      isInteractiveSetup = !isHelpRequest && command === '';
+
       const resolveConfigurationPath = require('../lib/cli/resolve-configuration-path');
       const readConfiguration = require('../lib/configuration/read');
 
@@ -234,6 +237,7 @@ const processSpanPromise = (async () => {
               fulfilledSources: new Set(['file', 'self', 'strToBool']),
               propertyPathsToResolve: new Set(['provider\0name', 'provider\0stage', 'useDotenv']),
             };
+            if (isInteractiveSetup) resolverConfiguration.fulfilledSources.add('opt');
             await resolveVariables(resolverConfiguration);
 
             if (
@@ -382,10 +386,44 @@ const processSpanPromise = (async () => {
       }
     }
 
+    const configurationFilename = configuration && configurationPath.slice(serviceDir.length + 1);
+
+    if (isInteractiveSetup) {
+      require('../lib/cli/ensure-supported-command')(configuration);
+
+      if (!process.stdin.isTTY && !process.env.SLS_INTERACTIVE_SETUP_ENABLE) {
+        throw new ServerlessError(
+          'Attempted to run an interactive setup in non TTY environment.\n' +
+            "If that's intentended enforce with SLS_INTERACTIVE_SETUP_ENABLE=1 environment variable",
+          'INTERACTIVE_SETUP_IN_NON_TTY'
+        );
+      }
+      await require('../lib/cli/interactive-setup')({
+        configuration,
+        serviceDir,
+        configurationFilename,
+        options,
+      });
+      hasTelemetryBeenReported = true;
+      if (!isTelemetryDisabled) {
+        await storeTelemetryLocally(
+          await generateTelemetryPayload({
+            command,
+            options,
+            commandSchema,
+            serviceDir,
+            configuration,
+          })
+        );
+        await sendTelemetry({ serverlessExecutionSpan: processSpanPromise });
+      }
+      return;
+    }
+
     serverless = new Serverless({
       configuration,
       serviceDir,
-      configurationFilename: configuration && configurationPath.slice(serviceDir.length + 1),
+      configurationFilename,
       isConfigurationResolved:
         commands[0] === 'plugin' || Boolean(variablesMeta && !variablesMeta.size),
       hasResolvedCommandsExternally: true,
@@ -659,6 +697,7 @@ const processSpanPromise = (async () => {
         await serverless.run();
       }
 
+      hasTelemetryBeenReported = true;
       if (!isTelemetryDisabled && !isHelpRequest && serverless.isTelemetryReportedExternally) {
         await storeTelemetryLocally({
           ...(await generateTelemetryPayload({
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
index c254952e8ef..67dffeab42a 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/PluginManager.test.js
@@ -412,7 +412,7 @@ describe('PluginManager', () => {
     ({ restoreEnv } = overrideEnv({ whitelist: ['APPDATA', 'PATH'] }));
     serverless = new Serverless();
     serverless.cli = new CLI();
-    serverless.processedInput = { commands: [], options: {} };
+    serverless.processedInput = { commands: ['print'], options: {} };
     pluginManager = new PluginManager(serverless);
     serviceDir = pluginManager.serverless.serviceDir = 'foo';
   });
diff --git a/test/unit/lib/cli/interactive-setup/auto-update.test.js b/test/unit/lib/cli/interactive-setup/auto-update.test.js
new file mode 100644
index 00000000000..98605f05d1b
--- /dev/null
+++ b/test/unit/lib/cli/interactive-setup/auto-update.test.js
@@ -0,0 +1,68 @@
+'use strict';
+
+const { expect } = require('chai');
+const sinon = require('sinon');
+const proxyquire = require('proxyquire');
+const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
+const configUtils = require('@serverless/utils/config');
+const inquirer = require('@serverless/utils/inquirer');
+const step = require('../../../../../lib/cli/interactive-setup/auto-update');
+
+describe('test/unit/lib/cli/interactive-setup/auto-update.test.js', () => {
+  afterEach(() => {
+    configUtils.set('autoUpdate.isInteractiveSetupPromptDisabled', false);
+    sinon.restore();
+  });
+
+  it('Should not suggest auto update in non supported environments', async () => {
+    let uncachedStep = proxyquire('../../../../../lib/cli/interactive-setup/auto-update', {
+      '../../utils/isStandaloneExecutable': false,
+      '../../utils/is-locally-installed': async () => true,
+      '../../utils/npmPackage/isGlobal': async () => true,
+      '../../utils/npmPackage/isWritable': async () => true,
+    });
+    expect(await uncachedStep.isApplicable({})).to.equal(false);
+    uncachedStep = proxyquire('../../../../../lib/cli/interactive-setup/auto-update', {
+      '../../utils/isStandaloneExecutable': false,
+      '../../utils/is-locally-installed': async () => false,
+      '../../utils/npmPackage/isGlobal': async () => false,
+      '../../utils/npmPackage/isWritable': async () => true,
+    });
+    expect(await uncachedStep.isApplicable({})).to.equal(false);
+    uncachedStep = proxyquire('../../../../../lib/cli/interactive-setup/auto-update', {
+      '../../utils/isStandaloneExecutable': false,
+      '../../utils/is-locally-installed': async () => false,
+      '../../utils/npmPackage/isGlobal': async () => true,
+      '../../utils/npmPackage/isWritable': async () => false,
+    });
+    expect(await uncachedStep.isApplicable({})).to.equal(false);
+  });
+
+  it('Should abort if user does not want to setup auto update', async () => {
+    configureInquirerStub(inquirer, {
+      confirm: { shouldSetupAutoUpdate: false },
+    });
+    await step.run({});
+    expect(configUtils.get('autoUpdate.enabled')).to.be.undefined;
+    expect(configUtils.get('autoUpdate.isInteractiveSetupPromptDisabled')).to.be.true;
+  });
+
+  it('Should not prompt again is user opt out from setup', async () => {
+    configUtils.set('autoUpdate.isInteractiveSetupPromptDisabled', true);
+    const uncachedStep = proxyquire('../../../../../lib/cli/interactive-setup/auto-update', {
+      '../../utils/isStandaloneExecutable': false,
+      '../../utils/is-locally-installed': async () => false,
+      '../../utils/npmPackage/isGlobal': async () => true,
+      '../../utils/npmPackage/isWritable': async () => true,
+    });
+    expect(await uncachedStep.isApplicable({})).to.equal(false);
+  });
+
+  it('Should setup auto update on user request', async () => {
+    configureInquirerStub(inquirer, {
+      confirm: { shouldSetupAutoUpdate: true },
+    });
+    await step.run({});
+    expect(configUtils.get('autoUpdate.enabled')).to.be.true;
+  });
+});
diff --git a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
new file mode 100644
index 00000000000..ea20226d413
--- /dev/null
+++ b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
@@ -0,0 +1,186 @@
+'use strict';
+
+const chai = require('chai');
+const sinon = require('sinon');
+const proxyquire = require('proxyquire');
+const overrideEnv = require('process-utils/override-env');
+const requireUncached = require('ncjsm/require-uncached');
+
+const { expect } = chai;
+
+chai.use(require('chai-as-promised'));
+
+const { join, resolve } = require('path');
+const BbPromise = require('bluebird');
+const fsp = require('fs').promises;
+const { remove: rmDir, outputFile: writeFile } = require('fs-extra');
+const { resolveFileProfiles } = require('../../../../../lib/plugins/aws/utils/credentials');
+
+const step = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+  '../../utils/openBrowser': (url) =>
+    BbPromise.try(() => {
+      openBrowserUrls.push(url);
+    }),
+});
+const inquirer = require('@serverless/utils/inquirer');
+const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
+
+const openBrowserUrls = [];
+
+const confirmEmptyWorkingDir = async () =>
+  expect(await fsp.readdir(process.cwd())).to.deep.equal([]);
+
+describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
+  const accessKeyId = 'AKIAIOSFODNN7EXAMPLE';
+  const secretAccessKey = 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY';
+
+  afterEach(() => {
+    openBrowserUrls.length = 0;
+    sinon.restore();
+  });
+
+  it('Should be ineffective, when not at service path', async () =>
+    expect(await step.isApplicable({})).to.equal(false));
+
+  it('Should be ineffective, when not at AWS service', async () =>
+    expect(
+      await step.isApplicable({
+        serviceDir: process.cwd(),
+        configuration: {},
+        configurationFilename: 'serverless.yml',
+      })
+    ).to.equal(false));
+
+  it('Should be effective, at AWS service and no credentials are set', async () =>
+    expect(
+      await step.isApplicable({
+        serviceDir: process.cwd(),
+        configuration: { provider: { name: 'aws' } },
+        configurationFilename: 'serverless.yml',
+      })
+    ).to.equal(true));
+
+  describe('In environment credentials', () => {
+    let restoreEnv;
+    let uncachedStep;
+
+    before(() => {
+      ({ restoreEnv } = overrideEnv({ asCopy: true }));
+      process.env.AWS_ACCESS_KEY_ID = accessKeyId;
+      process.env.AWS_SECRET_ACCESS_KEY = secretAccessKey;
+      uncachedStep = requireUncached(() =>
+        require('../../../../../lib/cli/interactive-setup/aws-credentials')
+      );
+    });
+
+    after(() => restoreEnv);
+
+    it('Should be ineffective, when credentials are set in environment', async () => {
+      expect(
+        await uncachedStep.isApplicable({
+          serviceDir: process.cwd(),
+          configuration: { provider: { name: 'aws' } },
+          configurationFilename: 'serverless.yml',
+        })
+      ).to.equal(false);
+    });
+  });
+
+  it("Should not setup if user doesn't the setup", async () => {
+    configureInquirerStub(inquirer, { confirm: { shouldSetupAwsCredentials: false } });
+    await step.run({ configuration: { provider: {} }, options: {} });
+    return confirmEmptyWorkingDir();
+  });
+
+  describe('AWS config handling', () => {
+    let credentialsDirPath;
+    let credentialsFilePath;
+
+    before(() => {
+      credentialsDirPath = resolve('.aws');
+      credentialsFilePath = join(credentialsDirPath, 'credentials');
+    });
+
+    afterEach(() => rmDir(credentialsDirPath));
+
+    describe('Existing credentials case', () => {
+      before(() =>
+        writeFile(
+          credentialsFilePath,
+          [
+            '[some-profile]',
+            `aws_access_key_id = ${accessKeyId}`,
+            `aws_secret_access_key = ${secretAccessKey}`,
+          ].join('\n')
+        )
+      );
+
+      it('Should be ineffective, When credentials are set in AWS config', async () =>
+        expect(
+          await step.isApplicable({
+            serviceDir: process.cwd(),
+            configuration: { provider: { name: 'aws' } },
+            configurationFilename: 'serverless.yml',
+          })
+        ).to.equal(false));
+    });
+
+    it('Should setup credentials for users not having an AWS account', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldSetupAwsCredentials: true, hasAwsAccount: false },
+        input: {
+          createAwsAccountPrompt: '',
+          generateAwsCredsPrompt: '',
+          accessKeyId,
+          secretAccessKey,
+        },
+      });
+      await step.run({ configuration: { provider: {} }, options: {} });
+      expect(openBrowserUrls.length).to.equal(2);
+      expect(openBrowserUrls[0].includes('signup')).to.be.true;
+      expect(openBrowserUrls[1].includes('console.aws.amazon.com')).to.be.true;
+      resolveFileProfiles().then((profiles) => {
+        expect(profiles).to.deep.equal(new Map([['default', { accessKeyId, secretAccessKey }]]));
+      });
+    });
+
+    it('Should setup credentials for users having an AWS account', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldSetupAwsCredentials: true, hasAwsAccount: true },
+        input: { generateAwsCredsPrompt: '', accessKeyId, secretAccessKey },
+      });
+      await step.run({ configuration: { provider: {} }, options: {} });
+      expect(openBrowserUrls.length).to.equal(1);
+      expect(openBrowserUrls[0].includes('console.aws.amazon.com')).to.be.true;
+      return resolveFileProfiles().then((profiles) => {
+        expect(profiles).to.deep.equal(new Map([['default', { accessKeyId, secretAccessKey }]]));
+      });
+    });
+
+    it('Should not accept invalid access key id', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldSetupAwsCredentials: true, hasAwsAccount: true },
+        input: { generateAwsCredsPrompt: '', accessKeyId: 'foo', secretAccessKey },
+      });
+      await expect(
+        step.run({
+          configuration: { provider: {} },
+          options: {},
+        })
+      ).to.eventually.be.rejected.and.have.property('code', 'INVALID_ANSWER');
+    });
+
+    it('Should not accept invalid secret access key', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldSetupAwsCredentials: true, hasAwsAccount: true },
+        input: { generateAwsCredsPrompt: '', accessKeyId, secretAccessKey: 'foo' },
+      });
+      await expect(
+        step.run({
+          configuration: { provider: {} },
+          options: {},
+        })
+      ).to.eventually.be.rejected.and.have.property('code', 'INVALID_ANSWER');
+    });
+  });
+});
diff --git a/test/unit/lib/cli/interactive-setup/index.test.js b/test/unit/lib/cli/interactive-setup/index.test.js
new file mode 100644
index 00000000000..1977c703db9
--- /dev/null
+++ b/test/unit/lib/cli/interactive-setup/index.test.js
@@ -0,0 +1,75 @@
+// Sanity tests that confirms a happy path interactive setup flow e2e way
+
+'use strict';
+
+const spawn = require('child-process-ext/spawn');
+const path = require('path');
+const isTabCompletionSupported = require('../../../../../lib/utils/tabCompletion/isSupported');
+
+const serverlessPath = path.resolve(__dirname, '../../../../../scripts/serverless.js');
+
+describe('test/unit/lib/cli/interactive-setup/index.test.js', () => {
+  it('should configure interactive setup flow', async () => {
+    const slsProcessPromise = spawn('node', [serverlessPath], {
+      env: {
+        ...process.env,
+        SLS_INTERACTIVE_SETUP_ENABLE: '1',
+        SLS_INTERACTIVE_SETUP_TEST: '1',
+        BROWSER: 'none',
+      },
+    });
+    const slsProcess = slsProcessPromise.child;
+    let output = '';
+    const program = [
+      // service
+      {
+        instructionString: 'No project detected. Do you want to create a new one?',
+        input: 'Y',
+      },
+      { instructionString: 'AWS Node.js' },
+      {
+        instructionString: 'What do you want to call this project?',
+        input: 'interactive-setup-test',
+      },
+
+      // aws-credentials
+      { instructionString: 'Do you want to set them up now?', input: 'Y' },
+      { instructionString: 'AWS account', input: 'Y' },
+      { instructionString: 'Press Enter to continue' },
+      {
+        instructionString: 'AWS Access Key Id',
+        input: 'AKIAIOSFODNN7EXAMPLE',
+      },
+      {
+        instructionString: 'AWS Secret Access Key',
+        input: 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY',
+      },
+
+      // auto-update
+      { instructionString: 'to update automatically?', input: 'Y' },
+
+      // tab-completion
+      ...(isTabCompletionSupported
+        ? [
+            { instructionString: 'command line <tab> completion', input: 'Y' },
+            { instructionString: 'bash' },
+            { instructionString: 'to ~/.bashrc' },
+          ]
+        : []),
+    ];
+    slsProcess.stdout.on('data', (data) => {
+      output += data;
+      const programItem = program[0];
+      if (!programItem) return;
+      if (output.includes(programItem.instructionString)) {
+        program.shift();
+        output = '';
+        slsProcess.stdin.write(`${programItem.input || ''}\n`);
+      }
+    });
+    slsProcess.stdout.pipe(process.stdout);
+    slsProcess.stderr.pipe(process.stderr);
+
+    await slsProcessPromise;
+  });
+});
diff --git a/test/unit/lib/cli/interactive-setup/service.test.js b/test/unit/lib/cli/interactive-setup/service.test.js
new file mode 100644
index 00000000000..68a470c92e8
--- /dev/null
+++ b/test/unit/lib/cli/interactive-setup/service.test.js
@@ -0,0 +1,82 @@
+'use strict';
+
+const chai = require('chai');
+const sinon = require('sinon');
+const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
+const step = require('../../../../../lib/cli/interactive-setup/service');
+
+const { expect } = chai;
+
+chai.use(require('chai-as-promised'));
+
+const fsp = require('fs').promises;
+const inquirer = require('@serverless/utils/inquirer');
+
+const confirmEmptyWorkingDir = async () =>
+  expect(await fsp.readdir(process.cwd())).to.deep.equal([]);
+
+describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
+  afterEach(() => sinon.restore());
+
+  it('Should be not applied, when at service path', () =>
+    expect(step.isApplicable({ serviceDir: '/foo' })).to.equal(false));
+  it('Should be applied, when not at service path', () =>
+    expect(step.isApplicable({})).to.equal(true));
+
+  it("Should abort if user doesn't want setup", async () => {
+    configureInquirerStub(inquirer, {
+      confirm: { shouldCreateNewProject: false },
+    });
+    await step.run({});
+    return confirmEmptyWorkingDir();
+  });
+
+  it("Should abort if user choses 'other' template", async () => {
+    configureInquirerStub(inquirer, {
+      confirm: { shouldCreateNewProject: true },
+      list: { projectType: 'other' },
+    });
+    await step.run({});
+    return confirmEmptyWorkingDir();
+  });
+
+  describe('Create new project', () => {
+    it('Should create project at not existing directory', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldCreateNewProject: true },
+        list: { projectType: 'aws-nodejs' },
+        input: { projectName: 'test-project' },
+      });
+      await step.run({});
+      const stats = await fsp.lstat('test-project/serverless.yml');
+      expect(stats.isFile()).to.be.true;
+    });
+  });
+
+  it('Should not allow project creation in a directory in which already service is configured', async () => {
+    configureInquirerStub(inquirer, {
+      confirm: { shouldCreateNewProject: true },
+      list: { projectType: 'aws-nodejs' },
+      input: { projectName: 'existing' },
+    });
+
+    await fsp.mkdir('existing');
+
+    await expect(step.run({})).to.eventually.be.rejected.and.have.property(
+      'code',
+      'INVALID_ANSWER'
+    );
+  });
+
+  it('Should not allow project creation using an invalid project name', async () => {
+    configureInquirerStub(inquirer, {
+      confirm: { shouldCreateNewProject: true },
+      list: { projectType: 'aws-nodejs' },
+      input: { projectName: 'elo grzegżółka' },
+    });
+    await expect(step.run({})).to.eventually.be.rejected.and.have.property(
+      'code',
+      'INVALID_ANSWER'
+    );
+  });
+});
diff --git a/test/unit/lib/cli/interactive-setup/tab-completion.test.js b/test/unit/lib/cli/interactive-setup/tab-completion.test.js
new file mode 100644
index 00000000000..bcbb15259a5
--- /dev/null
+++ b/test/unit/lib/cli/interactive-setup/tab-completion.test.js
@@ -0,0 +1,76 @@
+'use strict';
+
+const chai = require('chai');
+const sinon = require('sinon');
+
+const { expect } = chai;
+
+chai.use(require('chai-as-promised'));
+
+const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
+
+const os = require('os');
+const fs = require('fs');
+const path = require('path');
+const BbPromise = require('bluebird');
+const configUtils = require('@serverless/utils/config');
+const promptDisabledConfigPropertyName = require('../../../../../lib/utils/tabCompletion/promptDisabledConfigPropertyName');
+const isTabCompletionSupported = require('../../../../../lib/utils/tabCompletion/isSupported');
+const step = require('../../../../../lib/cli/interactive-setup/tab-completion');
+
+const inquirer = require('@serverless/utils/inquirer');
+
+BbPromise.promisifyAll(fs);
+
+describe('test/unit/lib/cli/interactive-setup/tab-completion.test.js', () => {
+  before(() => {
+    process.env.SHELL = 'bash';
+  });
+  afterEach(() => {
+    configUtils.set(promptDisabledConfigPropertyName, false);
+    sinon.restore();
+  });
+
+  if (!isTabCompletionSupported) {
+    it('Should not suggest tab completion setup in non supported environments', async () => {
+      expect(await step.isApplicable({})).to.equal(false);
+    });
+    return;
+  }
+
+  it('Should abort if user does not want to setup tab completion', async () => {
+    configureInquirerStub(inquirer, {
+      confirm: { shouldSetupTabCompletion: false },
+    });
+    await step.run({});
+  });
+
+  it('Should not prompt again is user opt out from setup', async () => {
+    configureInquirerStub(inquirer, {
+      confirm: { shouldSetupTabCompletion: false, locationOK: true },
+      list: { shell: 'bash' },
+    });
+    await step.run({});
+    await expect(fs.readFileAsync('.bashrc')).to.eventually.be.rejected.and.have.property(
+      'code',
+      'ENOENT'
+    );
+  });
+
+  it('Should setup tab completion on user request', async () => {
+    configureInquirerStub(inquirer, {
+      confirm: { shouldSetupTabCompletion: true, locationOK: true },
+      list: { shell: 'bash' },
+    });
+    await step.run({});
+    await Promise.all([
+      fs
+        .readFileAsync(path.resolve(os.homedir(), '.bashrc'), 'utf8')
+        .then((bashRcContent) =>
+          expect(bashRcContent).to.include(' ~/.config/tabtab/__tabtab.bash')
+        ),
+      fs.readFileAsync(path.resolve(os.homedir(), '.config/tabtab/serverless.bash'), 'utf8'),
+      fs.readFileAsync(path.resolve(os.homedir(), '.config/tabtab/sls.bash'), 'utf8'),
+    ]);
+  });
+});
diff --git a/test/unit/lib/cli/resolve-configuration-path.test.js b/test/unit/lib/cli/resolve-configuration-path.test.js
index fd88fa36afb..cd7a04561e7 100644
--- a/test/unit/lib/cli/resolve-configuration-path.test.js
+++ b/test/unit/lib/cli/resolve-configuration-path.test.js
@@ -146,4 +146,29 @@ describe('test/unit/lib/cli/resolve-service-config-path.test.js', () => {
       );
     });
   });
+
+  describe('options support', () => {
+    before(async () =>
+      Promise.all([
+        fse.ensureFile(path.resolve('custom/custom.yml')),
+        fse.ensureFile(path.resolve('normal/serverless.yml')),
+      ])
+    );
+    beforeEach(() => {
+      triggeredDeprecations.clear();
+      resolveInput.clear();
+    });
+    after(() => triggeredDeprecations.clear());
+
+    it('should support custom cwd', async () => {
+      expect(await resolveServerlessConfigPath({ cwd: 'normal' })).to.equal(
+        path.resolve('normal/serverless.yml')
+      );
+    });
+    it('should support custom cli options', async () => {
+      expect(
+        await resolveServerlessConfigPath({ cwd: 'custom', options: { config: 'custom.yml' } })
+      ).to.equal(path.resolve('custom/custom.yml'));
+    });
+  });
 });
diff --git a/test/unit/lib/plugins/interactiveCli/autoUpdate.test.js b/test/unit/lib/plugins/interactiveCli/autoUpdate.test.js
deleted file mode 100644
index 993ef6bbece..00000000000
--- a/test/unit/lib/plugins/interactiveCli/autoUpdate.test.js
+++ /dev/null
@@ -1,116 +0,0 @@
-'use strict';
-
-const { expect } = require('chai');
-const sinon = require('sinon');
-const runServerless = require('../../../../utils/run-serverless');
-const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
-
-const fs = require('fs');
-const BbPromise = require('bluebird');
-const configUtils = require('@serverless/utils/config');
-const inquirer = require('@serverless/utils/inquirer');
-
-const lifecycleHookNamesBlacklist = [
-  'before:interactiveCli:setupAws',
-  'interactiveCli:initializeService',
-  'interactiveCli:setupAws',
-  'interactiveCli:tabCompletion',
-];
-
-BbPromise.promisifyAll(fs);
-
-const modulesCacheStub = {
-  './lib/utils/npmPackage/isGlobal.js': async () => true,
-  './lib/utils/npmPackage/isWritable.js': async () => true,
-  '@serverless/utils/inquirer': inquirer,
-};
-
-describe('interactiveCli: autoUpdate', () => {
-  let backupIsTTY;
-
-  before(() => {
-    backupIsTTY = process.stdin.isTTY;
-    process.stdin.isTTY = true;
-  });
-  after(() => {
-    process.stdin.isTTY = backupIsTTY;
-  });
-
-  afterEach(() => {
-    configUtils.set('autoUpdate.isInteractiveSetupPromptDisabled', false);
-    sinon.restore();
-  });
-
-  it('Should not suggest auto update in non supported environments', async () => {
-    await runServerless({
-      noService: true,
-      command: '',
-      lifecycleHookNamesBlacklist,
-      modulesCacheStub: {
-        ...modulesCacheStub,
-        './lib/utils/npmPackage/isGlobal.js': async () => false,
-      },
-    });
-    expect(configUtils.get('autoUpdate.enabled')).to.be.undefined;
-    await runServerless({
-      noService: true,
-      command: '',
-      lifecycleHookNamesBlacklist,
-      modulesCacheStub: {
-        ...modulesCacheStub,
-        './lib/utils/npmPackage/isWritable.js': async () => false,
-      },
-    });
-    expect(configUtils.get('autoUpdate.enabled')).to.be.undefined;
-  });
-
-  it('Should abort if user does not want to setup auto update', async () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldSetupAutoUpdate: false },
-    });
-    await runServerless({
-      noService: true,
-      command: '',
-      lifecycleHookNamesBlacklist,
-      modulesCacheStub,
-    });
-    expect(configUtils.get('autoUpdate.enabled')).to.be.undefined;
-  });
-
-  it('Should not prompt again is user opt out from setup', async () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldSetupAutoUpdate: false },
-    });
-    await runServerless({
-      noService: true,
-      command: '',
-      lifecycleHookNamesBlacklist,
-      modulesCacheStub,
-    });
-    expect(configUtils.get('autoUpdate.enabled')).to.be.undefined;
-    inquirer.prompt.restore();
-    await runServerless({
-      noService: true,
-      command: '',
-      lifecycleHookNamesBlacklist,
-      modulesCacheStub: {
-        './lib/utils/npmPackage/isGlobal.js': async () => true,
-        './lib/utils/npmPackage/isWritable.js': async () => true,
-      },
-    });
-    expect(configUtils.get('autoUpdate.enabled')).to.be.undefined;
-  });
-
-  it('Should setup auto update on user request', async () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldSetupAutoUpdate: true },
-    });
-    await runServerless({
-      noService: true,
-      command: '',
-      lifecycleHookNamesBlacklist,
-      modulesCacheStub,
-    });
-    expect(configUtils.get('autoUpdate.enabled')).to.be.true;
-  });
-});
diff --git a/test/unit/lib/plugins/interactiveCli/fixtures/some-aws-service/serverless.yml b/test/unit/lib/plugins/interactiveCli/fixtures/some-aws-service/serverless.yml
deleted file mode 100644
index 6d6f420b4a5..00000000000
--- a/test/unit/lib/plugins/interactiveCli/fixtures/some-aws-service/serverless.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-service: 'some-aws-service'
-provider: 'aws'
diff --git a/test/unit/lib/plugins/interactiveCli/fixtures/some-other-service/serverless.yml b/test/unit/lib/plugins/interactiveCli/fixtures/some-other-service/serverless.yml
deleted file mode 100644
index 8a1254a3f72..00000000000
--- a/test/unit/lib/plugins/interactiveCli/fixtures/some-other-service/serverless.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-service: 'some-other-service'
-provider: 'other'
diff --git a/test/unit/lib/plugins/interactiveCli/index.test.js b/test/unit/lib/plugins/interactiveCli/index.test.js
deleted file mode 100644
index 2dfe0f54f57..00000000000
--- a/test/unit/lib/plugins/interactiveCli/index.test.js
+++ /dev/null
@@ -1,28 +0,0 @@
-'use strict';
-
-const chai = require('chai');
-const InteractiveCli = require('../../../../../lib/plugins/interactiveCli');
-const Serverless = require('../../../../../lib/Serverless');
-
-const expect = chai.expect;
-chai.use(require('chai-as-promised'));
-chai.use(require('sinon-chai'));
-
-describe('interactiveCli', () => {
-  let interactiveCli;
-  let serverless;
-
-  beforeEach(() => {
-    serverless = new Serverless();
-    serverless.processedInput = { commands: [], options: {} };
-    const backupIsTTY = process.stdin.isTTY;
-    process.stdin.isTTY = true;
-    try {
-      interactiveCli = new InteractiveCli(serverless);
-    } finally {
-      process.stdin.isTTY = backupIsTTY;
-    }
-  });
-
-  it('should have commands', () => expect(interactiveCli.commands).to.be.not.empty);
-});
diff --git a/test/unit/lib/plugins/interactiveCli/initializeService.test.js b/test/unit/lib/plugins/interactiveCli/initializeService.test.js
deleted file mode 100644
index ad77398daaa..00000000000
--- a/test/unit/lib/plugins/interactiveCli/initializeService.test.js
+++ /dev/null
@@ -1,122 +0,0 @@
-'use strict';
-
-const chai = require('chai');
-const sinon = require('sinon');
-const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
-
-const { expect } = chai;
-
-chai.use(require('chai-as-promised'));
-
-const { join } = require('path');
-const { remove: rmDir, lstat } = require('fs-extra');
-const runServerless = require('../../../../utils/run-serverless');
-const inquirer = require('@serverless/utils/inquirer');
-
-const fixturesPath = join(__dirname, 'fixtures');
-const lifecycleHookNamesBlacklist = [
-  'before:interactiveCli:setupAws',
-  'interactiveCli:setupAws',
-  'interactiveCli:autoUpdate',
-  'interactiveCli:tabCompletion',
-];
-
-describe('interactiveCli: initializeService', () => {
-  const existingProjectName = 'some-other-service';
-  const newProjectName = 'foo-bar';
-  const newProjectPath = join(fixturesPath, newProjectName);
-  let backupIsTTY;
-
-  before(() => {
-    backupIsTTY = process.stdin.isTTY;
-    process.stdin.isTTY = true;
-  });
-  after(() => (process.stdin.isTTY = backupIsTTY));
-
-  afterEach(() => sinon.restore());
-
-  it('Should be ineffective, when at service path', async () =>
-    runServerless({
-      cwd: join(fixturesPath, 'some-other-service'),
-      command: '',
-      lifecycleHookNamesBlacklist,
-    }));
-
-  it("Should abort if user doesn't want setup", async () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldCreateNewProject: false },
-    });
-    return runServerless({
-      cwd: fixturesPath,
-      command: '',
-      pluginPathsWhitelist: ['./lib/plugins/interactiveCli'],
-      lifecycleHookNamesBlacklist,
-    });
-  });
-
-  it("Should abort if user choses 'other' template", async () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldCreateNewProject: true },
-      list: { projectType: 'other' },
-    });
-    return runServerless({
-      cwd: fixturesPath,
-      command: '',
-      pluginPathsWhitelist: ['./lib/plugins/interactiveCli'],
-      lifecycleHookNamesBlacklist,
-    });
-  });
-
-  describe('Create new project', () => {
-    after(async () => rmDir(newProjectPath));
-
-    it('Should create project at not existing directory', async () => {
-      configureInquirerStub(inquirer, {
-        confirm: { shouldCreateNewProject: true },
-        list: { projectType: 'aws-nodejs' },
-        input: { projectName: newProjectName },
-      });
-      await runServerless({
-        cwd: fixturesPath,
-        command: '',
-        pluginPathsWhitelist: ['./lib/plugins/interactiveCli'],
-        lifecycleHookNamesBlacklist,
-      });
-      const stats = await lstat(join(newProjectPath, 'serverless.yml'));
-      expect(stats.isFile()).to.be.true;
-    });
-  });
-
-  it('Should not allow project creation in a directory in which already service is configured', async () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldCreateNewProject: true },
-      list: { projectType: 'aws-nodejs' },
-      input: { projectName: existingProjectName },
-    });
-
-    await expect(
-      runServerless({
-        cwd: fixturesPath,
-        command: '',
-        pluginPathsWhitelist: ['./lib/plugins/interactiveCli'],
-        lifecycleHookNamesBlacklist,
-      })
-    ).to.eventually.be.rejected.and.have.property('code', 'INVALID_ANSWER');
-  });
-
-  it('Should not allow project creation using an invalid project name', async () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldCreateNewProject: true },
-      list: { projectType: 'aws-nodejs' },
-      input: { projectName: 'elo grzegżółka' },
-    });
-    await expect(
-      runServerless({
-        cwd: fixturesPath,
-        command: '',
-        pluginPathsWhitelist: ['./lib/plugins/interactiveCli'],
-        lifecycleHookNamesBlacklist,
-      })
-    ).to.eventually.be.rejected.and.have.property('code', 'INVALID_ANSWER');
-  });
-});
diff --git a/test/unit/lib/plugins/interactiveCli/setupAws.test.js b/test/unit/lib/plugins/interactiveCli/setupAws.test.js
deleted file mode 100644
index ba5f8400d5d..00000000000
--- a/test/unit/lib/plugins/interactiveCli/setupAws.test.js
+++ /dev/null
@@ -1,200 +0,0 @@
-'use strict';
-
-const { join } = require('path');
-const { homedir: getHomedir } = require('os');
-const { expect } = require('chai');
-const sinon = require('sinon');
-const BbPromise = require('bluebird');
-const { remove: rmDir, lstat, outputFile: writeFile } = require('fs-extra');
-const { resolveFileProfiles } = require('../../../../../lib/plugins/aws/utils/credentials');
-const inquirer = require('@serverless/utils/inquirer');
-const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
-const runServerless = require('../../../../utils/run-serverless');
-
-const fixturesPath = join(__dirname, 'fixtures');
-const lifecycleHookNamesBlacklist = [
-  'before:interactiveCli:setupAws',
-  'interactiveCli:initializeService',
-  'interactiveCli:autoUpdate',
-  'interactiveCli:tabCompletion',
-];
-
-const openBrowserUrls = [];
-const modulesCacheStub = {
-  './lib/utils/openBrowser': (url) =>
-    BbPromise.try(() => {
-      openBrowserUrls.push(url);
-    }),
-  // Ensure to rely on same inquirer module that we mock in tests
-  '@serverless/utils/inquirer': inquirer,
-};
-
-describe('interactiveCli: setupAws', () => {
-  const awsProjectPath = join(fixturesPath, 'some-aws-service');
-  const accessKeyId = 'AKIAIOSFODNN7EXAMPLE';
-  const secretAccessKey = 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY';
-  let backupIsTTY;
-
-  before(() => {
-    backupIsTTY = process.stdin.isTTY;
-    process.stdin.isTTY = true;
-  });
-  after(() => (process.stdin.isTTY = backupIsTTY));
-
-  afterEach(() => {
-    openBrowserUrls.length = 0;
-    sinon.restore();
-  });
-
-  it('Should be ineffective, when not at service path', () =>
-    runServerless({
-      cwd: fixturesPath,
-      command: '',
-      lifecycleHookNamesBlacklist,
-    }));
-
-  it('Should be ineffective, when not at AWS service', () =>
-    runServerless({
-      cwd: join(fixturesPath, 'some-other-service'),
-      command: '',
-      lifecycleHookNamesBlacklist,
-    }));
-
-  it('Should be ineffective, when credentials are set in environment', () =>
-    runServerless({
-      cwd: awsProjectPath,
-      command: '',
-      env: { AWS_ACCESS_KEY_ID: accessKeyId, AWS_SECRET_ACCESS_KEY: secretAccessKey },
-      lifecycleHookNamesBlacklist,
-    }));
-
-  it("Should not setup if user doesn't the setup", () => {
-    configureInquirerStub(inquirer, { confirm: { shouldSetupAwsCredentials: false } });
-    return runServerless({
-      cwd: awsProjectPath,
-      command: '',
-      lifecycleHookNamesBlacklist,
-    });
-  });
-
-  describe('AWS config handling', () => {
-    const credentialsDirPath = join(getHomedir(), '.aws');
-    const credentialsFilePath = join(credentialsDirPath, 'credentials');
-
-    before(() => {
-      // Abort if credentials are found in home directory
-      // (it should not be the case, as home directory is mocked to point temp dir)
-      return lstat(credentialsDirPath).then(
-        () => {
-          throw new Error('Unexpected ~/.aws directory, related tests aborted');
-        },
-        (error) => {
-          if (error.code === 'ENOENT') return;
-          throw error;
-        }
-      );
-    });
-
-    afterEach(() => rmDir(credentialsDirPath));
-
-    describe('Existing credentials case', () => {
-      before(() =>
-        writeFile(
-          credentialsFilePath,
-          [
-            '[some-profile]',
-            `aws_access_key_id = ${accessKeyId}`,
-            `aws_secret_access_key = ${secretAccessKey}`,
-          ].join('\n')
-        )
-      );
-
-      it('Should be ineffective, When credentials are set in AWS config', () =>
-        runServerless({
-          cwd: awsProjectPath,
-          command: '',
-          lifecycleHookNamesBlacklist,
-        }));
-    });
-
-    it('Should setup credentials for users not having an AWS account', () => {
-      configureInquirerStub(inquirer, {
-        confirm: { shouldSetupAwsCredentials: true, hasAwsAccount: false },
-        input: {
-          createAwsAccountPrompt: '',
-          generateAwsCredsPrompt: '',
-          accessKeyId,
-          secretAccessKey,
-        },
-      });
-      return runServerless({
-        cwd: awsProjectPath,
-        command: '',
-        lifecycleHookNamesBlacklist,
-        modulesCacheStub,
-      }).then(() => {
-        expect(openBrowserUrls.length).to.equal(2);
-        expect(openBrowserUrls[0].includes('signup')).to.be.true;
-        expect(openBrowserUrls[1].includes('console.aws.amazon.com')).to.be.true;
-        return resolveFileProfiles().then((profiles) => {
-          expect(profiles).to.deep.equal(new Map([['default', { accessKeyId, secretAccessKey }]]));
-        });
-      });
-    });
-
-    it('Should setup credentials for users having an AWS account', () => {
-      configureInquirerStub(inquirer, {
-        confirm: { shouldSetupAwsCredentials: true, hasAwsAccount: true },
-        input: { generateAwsCredsPrompt: '', accessKeyId, secretAccessKey },
-      });
-      return runServerless({
-        cwd: awsProjectPath,
-        command: '',
-        lifecycleHookNamesBlacklist,
-        modulesCacheStub,
-      }).then(() => {
-        expect(openBrowserUrls.length).to.equal(1);
-        expect(openBrowserUrls[0].includes('console.aws.amazon.com')).to.be.true;
-        return resolveFileProfiles().then((profiles) => {
-          expect(profiles).to.deep.equal(new Map([['default', { accessKeyId, secretAccessKey }]]));
-        });
-      });
-    });
-
-    it('Should not accept invalid access key id', () => {
-      configureInquirerStub(inquirer, {
-        confirm: { shouldSetupAwsCredentials: true, hasAwsAccount: true },
-        input: { generateAwsCredsPrompt: '', accessKeyId: 'foo', secretAccessKey },
-      });
-      return runServerless({
-        cwd: awsProjectPath,
-        command: '',
-        lifecycleHookNamesBlacklist,
-        modulesCacheStub,
-      }).then(
-        () => {
-          throw new Error('Unexpected');
-        },
-        (error) => expect(error.code).to.equal('INVALID_ANSWER')
-      );
-    });
-
-    it('Should not accept invalid secret access key', () => {
-      configureInquirerStub(inquirer, {
-        confirm: { shouldSetupAwsCredentials: true, hasAwsAccount: true },
-        input: { generateAwsCredsPrompt: '', accessKeyId, secretAccessKey: 'foo' },
-      });
-      return runServerless({
-        cwd: awsProjectPath,
-        command: '',
-        lifecycleHookNamesBlacklist,
-        modulesCacheStub,
-      }).then(
-        () => {
-          throw new Error('Unexpected');
-        },
-        (error) => expect(error.code).to.equal('INVALID_ANSWER')
-      );
-    });
-  });
-});
diff --git a/test/unit/lib/plugins/interactiveCli/tabCompletion.test.js b/test/unit/lib/plugins/interactiveCli/tabCompletion.test.js
deleted file mode 100644
index f55e22d9dd1..00000000000
--- a/test/unit/lib/plugins/interactiveCli/tabCompletion.test.js
+++ /dev/null
@@ -1,104 +0,0 @@
-'use strict';
-
-const { expect } = require('chai');
-const sinon = require('sinon');
-const runServerless = require('../../../../utils/run-serverless');
-const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
-
-const os = require('os');
-const fs = require('fs');
-const path = require('path');
-const BbPromise = require('bluebird');
-const configUtils = require('@serverless/utils/config');
-const promptDisabledConfigPropertyName = require('../../../../../lib/utils/tabCompletion/promptDisabledConfigPropertyName');
-const isTabCompletionSupported = require('../../../../../lib/utils/tabCompletion/isSupported');
-const inquirer = require('@serverless/utils/inquirer');
-
-const lifecycleHookNamesBlacklist = [
-  'before:interactiveCli:setupAws',
-  'interactiveCli:initializeService',
-  'interactiveCli:setupAws',
-  'interactiveCli:autoUpdate',
-];
-
-BbPromise.promisifyAll(fs);
-
-describe('interactiveCli: tabCompletion', () => {
-  let backupIsTTY;
-
-  before(() => {
-    backupIsTTY = process.stdin.isTTY;
-    process.stdin.isTTY = true;
-  });
-  after(() => {
-    process.stdin.isTTY = backupIsTTY;
-  });
-
-  afterEach(() => {
-    configUtils.set(promptDisabledConfigPropertyName, false);
-    sinon.restore();
-  });
-
-  if (!isTabCompletionSupported) {
-    it('Should not suggest tab completion setup in non supported environments', () => {
-      return runServerless({
-        cwd: os.homedir(),
-        command: '',
-        lifecycleHookNamesBlacklist,
-      });
-    });
-    return;
-  }
-
-  it('Should abort if user does not want to setup tab completion', () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldSetupTabCompletion: false },
-    });
-    return runServerless({
-      cwd: os.homedir(),
-      command: '',
-      lifecycleHookNamesBlacklist,
-    });
-  });
-
-  it('Should not prompt again is user opt out from setup', () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldSetupTabCompletion: false },
-    });
-    return runServerless({
-      cwd: os.homedir(),
-      command: '',
-      lifecycleHookNamesBlacklist,
-    }).then(() => {
-      inquirer.prompt.restore();
-      return runServerless({
-        cwd: os.homedir(),
-        command: '',
-        lifecycleHookNamesBlacklist,
-      });
-    });
-  });
-
-  it('Should setup tab completion on user request', () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldSetupTabCompletion: true, locationOK: true },
-      list: { shell: 'bash' },
-    });
-    return runServerless({
-      cwd: os.homedir(),
-      command: '',
-      env: { SHELL: 'bash' },
-      lifecycleHookNamesBlacklist,
-    }).then(() =>
-      Promise.all([
-        fs
-          .readFileAsync(path.resolve(os.homedir(), '.bashrc'), 'utf8')
-          .then((bashRcContent) =>
-            expect(bashRcContent).to.include(' ~/.config/tabtab/__tabtab.bash')
-          ),
-        fs.readFileAsync(path.resolve(os.homedir(), '.config/tabtab/serverless.bash'), 'utf8'),
-        fs.readFileAsync(path.resolve(os.homedir(), '.config/tabtab/sls.bash'), 'utf8'),
-      ])
-    );
-  });
-});

From 1060d1468ba587519df482e95a54bbc8d199cad8 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 30 Apr 2021 15:28:06 +0200
Subject: [PATCH 0091/1101] refactor(CLI Onboarding): Refactor to async/await

---
 lib/cli/interactive-setup/aws-credentials.js | 99 +++++++++-----------
 lib/cli/interactive-setup/tab-completion.js  | 94 ++++++++-----------
 lib/cli/interactive-setup/utils.js           |  8 +-
 3 files changed, 89 insertions(+), 112 deletions(-)

diff --git a/lib/cli/interactive-setup/aws-credentials.js b/lib/cli/interactive-setup/aws-credentials.js
index 21ea33d2498..8dbf5d657b9 100644
--- a/lib/cli/interactive-setup/aws-credentials.js
+++ b/lib/cli/interactive-setup/aws-credentials.js
@@ -13,9 +13,9 @@ const openBrowser = require('../../utils/openBrowser');
 const isValidAwsAccessKeyId = RegExp.prototype.test.bind(/^[A-Z0-9]{10,}$/);
 const isValidAwsSecretAccessKey = RegExp.prototype.test.bind(/^[a-zA-Z0-9/+]{10,}$/);
 
-const awsAccessKeyIdInput = () =>
-  inquirer
-    .prompt({
+const awsAccessKeyIdInput = async () =>
+  (
+    await inquirer.prompt({
       message: 'AWS Access Key Id:',
       type: 'input',
       name: 'accessKeyId',
@@ -24,11 +24,11 @@ const awsAccessKeyIdInput = () =>
         return 'AWS Access Key Id seems not valid.\n   Expected something like AKIAIOSFODNN7EXAMPLE';
       },
     })
-    .then(({ accessKeyId }) => accessKeyId.trim());
+  ).accessKeyId.trim();
 
-const awsSecretAccessKeyInput = () =>
-  inquirer
-    .prompt({
+const awsSecretAccessKeyInput = async () =>
+  (
+    await inquirer.prompt({
       message: 'AWS Secret Access Key:',
       type: 'input',
       name: 'secretAccessKey',
@@ -40,58 +40,50 @@ const awsSecretAccessKeyInput = () =>
         );
       },
     })
-    .then(({ secretAccessKey }) => secretAccessKey.trim());
+  ).secretAccessKey.trim();
 
 const steps = {
   writeOnSetupSkip: () =>
     process.stdout.write(`\nYou can setup your AWS account later. More details available here:
 
   http://slss.io/aws-creds-setup\n`),
-  shouldSetupAwsCredentials: () =>
-    confirm('Do you want to set them up now?', { name: 'shouldSetupAwsCredentials' }).then(
-      (isConfirmed) => {
-        if (!isConfirmed) steps.writeOnSetupSkip();
-        return isConfirmed;
-      }
-    ),
-  ensureAwsAccount: () =>
-    confirm('Do you have an AWS account?', { name: 'hasAwsAccount' }).then((hasAccount) => {
-      if (!hasAccount) {
-        openBrowser('https://portal.aws.amazon.com/billing/signup');
-        return inquirer.prompt({
-          message: 'Press Enter to continue after creating an AWS account',
-          name: 'createAwsAccountPrompt',
-        });
-      }
-      return null;
-    }),
-  ensureAwsCredentials: ({ options, configuration }) => {
+
+  shouldSetupAwsCredentials: async () => {
+    if (await confirm('Do you want to set them up now?', { name: 'shouldSetupAwsCredentials' })) {
+      return true;
+    }
+    steps.writeOnSetupSkip();
+    return false;
+  },
+
+  ensureAwsAccount: async () => {
+    if (await confirm('Do you have an AWS account?', { name: 'hasAwsAccount' })) return;
+    openBrowser('https://portal.aws.amazon.com/billing/signup');
+    await inquirer.prompt({
+      message: 'Press Enter to continue after creating an AWS account',
+      name: 'createAwsAccountPrompt',
+    });
+  },
+  ensureAwsCredentials: async ({ options, configuration }) => {
     const region = options.region || configuration.provider.region || 'us-east-1';
     openBrowser(
       `https://console.aws.amazon.com/iam/home?region=${region}#/users$new?step=final&accessKey&userNames=serverless&permissionType=policies&policies=arn:aws:iam::aws:policy%2FAdministratorAccess`
     );
-    return inquirer.prompt({
+    await inquirer.prompt({
       message: 'Press Enter to continue after creating an AWS user with access keys',
       name: 'generateAwsCredsPrompt',
     });
   },
-  inputAwsCredentials: () => {
-    return awsAccessKeyIdInput().then((accessKeyId) =>
-      awsSecretAccessKeyInput().then((secretAccessKey) =>
-        awsCredentials
-          .saveFileProfiles(new Map([['default', { accessKeyId, secretAccessKey }]]))
-          .then(() =>
-            process.stdout.write(
-              `\n${chalk.green(
-                `AWS credentials saved on your machine at ${chalk.bold(
-                  process.platform === 'win32'
-                    ? '%userprofile%\\.aws\\credentials'
-                    : '~/.aws/credentials'
-                )}. Go there to change them at any time.`
-              )}\n`
-            )
-          )
-      )
+  inputAwsCredentials: async () => {
+    const accessKeyId = await awsAccessKeyIdInput();
+    const secretAccessKey = await awsSecretAccessKeyInput();
+    await awsCredentials.saveFileProfiles(new Map([['default', { accessKeyId, secretAccessKey }]]));
+    process.stdout.write(
+      `\n${chalk.green(
+        `AWS credentials saved on your machine at ${chalk.bold(
+          process.platform === 'win32' ? '%userprofile%\\.aws\\credentials' : '~/.aws/credentials'
+        )}. Go there to change them at any time.`
+      )}\n`
     );
   },
 };
@@ -107,7 +99,7 @@ module.exports = {
     if (new AWS.S3().config.credentials) return false;
     return !(await awsCredentials.resolveFileProfiles()).size;
   },
-  run(data) {
+  async run(data) {
     process.stdout.write(
       'No AWS credentials were found on your computer, ' +
         'you need these to host your application.\n\n'
@@ -116,12 +108,11 @@ module.exports = {
     return module.exports.runSteps(data);
   },
   steps,
-  runSteps: (context) =>
-    steps.shouldSetupAwsCredentials().then((isConfirmed) => {
-      if (!isConfirmed) return null;
-      return steps
-        .ensureAwsAccount()
-        .then(() => steps.ensureAwsCredentials(context))
-        .then(steps.inputAwsCredentials);
-    }),
+  runSteps: async (context) => {
+    if (!(await steps.shouldSetupAwsCredentials())) return;
+    await steps.ensureAwsAccount();
+
+    await steps.ensureAwsCredentials(context);
+    await steps.inputAwsCredentials();
+  },
 };
diff --git a/lib/cli/interactive-setup/tab-completion.js b/lib/cli/interactive-setup/tab-completion.js
index 9ced46520dc..95f0637cae2 100644
--- a/lib/cli/interactive-setup/tab-completion.js
+++ b/lib/cli/interactive-setup/tab-completion.js
@@ -2,9 +2,8 @@
 
 const path = require('path');
 const os = require('os');
-const fs = require('fs');
+const fs = require('fs').promises;
 const chalk = require('chalk');
-const BbPromise = require('bluebird');
 const requireUncached = require('ncjsm/require-uncached');
 const resolve = require('ncjsm/resolve/sync');
 const configUtils = require('@serverless/utils/config');
@@ -15,64 +14,51 @@ const promptDisabledConfigPropertyName = require('../../utils/tabCompletion/prom
 const inquirer = require('@serverless/utils/inquirer');
 const { confirm } = require('./utils');
 
-BbPromise.promisifyAll(fs);
-
 module.exports = {
-  isApplicable() {
-    return BbPromise.try(() => {
-      if (!isTabTabCompletionSupported) return false;
+  async isApplicable() {
+    if (!isTabTabCompletionSupported) return false;
 
-      const shellExtension = require('tabtab/lib/utils/systemShell')();
-      return fs
-        .statAsync(path.resolve(os.homedir(), `.config/tabtab/serverless.${shellExtension}`))
-        .then(
-          () => false,
-          (error) => {
-            if (error.code !== 'ENOENT') throw error;
-            return !configUtils.get(promptDisabledConfigPropertyName);
-          }
-        );
-    });
+    const shellExtension = require('tabtab/lib/utils/systemShell')();
+    try {
+      await fs.stat(path.resolve(os.homedir(), `.config/tabtab/serverless.${shellExtension}`));
+      return false;
+    } catch (error) {
+      if (error.code !== 'ENOENT') throw error;
+      return !configUtils.get(promptDisabledConfigPropertyName);
+    }
   },
-  run() {
-    return BbPromise.try(() => {
-      return confirm('Would you like to setup a command line <tab> completion?', {
+  async run() {
+    if (
+      !(await confirm('Would you like to setup a command line <tab> completion?', {
         name: 'shouldSetupTabCompletion',
-      }).then((isConfirmed) => {
-        if (!isConfirmed) {
-          configUtils.set(promptDisabledConfigPropertyName, true);
-          return null;
-        }
+      }))
+    ) {
+      configUtils.set(promptDisabledConfigPropertyName, true);
+      return;
+    }
 
-        const promptPath = require.resolve('tabtab/lib/prompt');
-        const tabtabsInquirerPath = resolve(path.dirname(promptPath), 'inquirer').realPath;
+    const promptPath = require.resolve('tabtab/lib/prompt');
+    const tabtabsInquirerPath = resolve(path.dirname(promptPath), 'inquirer').realPath;
 
-        // Hack tabtabs prompt to use our inquirer customization
-        const prompt = requireUncached([promptPath, tabtabsInquirerPath], () => {
-          require(tabtabsInquirerPath);
-          require.cache[tabtabsInquirerPath].exports = inquirer;
-          return require(promptPath);
-        });
-        const { install } = require('tabtab/lib/installer');
-        return prompt().then(({ location }) =>
-          muteConsoleLog(() =>
-            tabtabOptions.reduce(
-              (previousOperation, options) =>
-                previousOperation.then(() => install(Object.assign({ location }, options))),
-              BbPromise.resolve()
-            )
-          ).then(() =>
-            process.stdout.write(
-              `\n${chalk.green(
-                `Command line <tab> completion was successfully setup. ${chalk.bold(
-                  'Make sure to reload your SHELL'
-                )}.\n` +
-                  'You may uninstall it by running: serverless config tabcompletion uninstall'
-              )}\n`
-            )
-          )
-        );
-      });
+    // Hack tabtabs prompt to use our inquirer customization
+    const prompt = requireUncached([promptPath, tabtabsInquirerPath], () => {
+      require(tabtabsInquirerPath);
+      require.cache[tabtabsInquirerPath].exports = inquirer;
+      return require(promptPath);
+    });
+    const { install } = require('tabtab/lib/installer');
+    const location = (await prompt()).location;
+    await muteConsoleLog(async () => {
+      for (const options of tabtabOptions) {
+        await install(Object.assign({ location }, options));
+      }
     });
+    process.stdout.write(
+      `\n${chalk.green(
+        `Command line <tab> completion was successfully setup. ${chalk.bold(
+          'Make sure to reload your SHELL'
+        )}.\nYou may uninstall it by running: serverless config tabcompletion uninstall`
+      )}\n`
+    );
   },
 };
diff --git a/lib/cli/interactive-setup/utils.js b/lib/cli/interactive-setup/utils.js
index b29b060bb9c..2364000d646 100644
--- a/lib/cli/interactive-setup/utils.js
+++ b/lib/cli/interactive-setup/utils.js
@@ -3,14 +3,14 @@
 const inquirer = require('@serverless/utils/inquirer');
 
 module.exports = {
-  confirm: (message, options = {}) => {
+  confirm: async (message, options = {}) => {
     const name = options.name || 'isConfirmed';
-    return inquirer
-      .prompt({
+    return (
+      await inquirer.prompt({
         message,
         type: 'confirm',
         name,
       })
-      .then((result) => result[name]);
+    )[name];
   },
 };

From a26a21ff3f4c9f2d494aeef79f3d0261071ebd66 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 4 May 2021 13:04:31 +0200
Subject: [PATCH 0092/1101] test(CLI Onboarding): Remove `bluebird` dependency

---
 .../cli/interactive-setup/aws-credentials.test.js |  8 +++-----
 .../cli/interactive-setup/tab-completion.test.js  | 15 ++++++---------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
index ea20226d413..847678a51af 100644
--- a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
+++ b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
@@ -11,16 +11,14 @@ const { expect } = chai;
 chai.use(require('chai-as-promised'));
 
 const { join, resolve } = require('path');
-const BbPromise = require('bluebird');
 const fsp = require('fs').promises;
 const { remove: rmDir, outputFile: writeFile } = require('fs-extra');
 const { resolveFileProfiles } = require('../../../../../lib/plugins/aws/utils/credentials');
 
 const step = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
-  '../../utils/openBrowser': (url) =>
-    BbPromise.try(() => {
-      openBrowserUrls.push(url);
-    }),
+  '../../utils/openBrowser': async (url) => {
+    openBrowserUrls.push(url);
+  },
 });
 const inquirer = require('@serverless/utils/inquirer');
 const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
diff --git a/test/unit/lib/cli/interactive-setup/tab-completion.test.js b/test/unit/lib/cli/interactive-setup/tab-completion.test.js
index bcbb15259a5..ea47f4876c4 100644
--- a/test/unit/lib/cli/interactive-setup/tab-completion.test.js
+++ b/test/unit/lib/cli/interactive-setup/tab-completion.test.js
@@ -10,9 +10,8 @@ chai.use(require('chai-as-promised'));
 const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
 
 const os = require('os');
-const fs = require('fs');
+const fsp = require('fs').promises;
 const path = require('path');
-const BbPromise = require('bluebird');
 const configUtils = require('@serverless/utils/config');
 const promptDisabledConfigPropertyName = require('../../../../../lib/utils/tabCompletion/promptDisabledConfigPropertyName');
 const isTabCompletionSupported = require('../../../../../lib/utils/tabCompletion/isSupported');
@@ -20,8 +19,6 @@ const step = require('../../../../../lib/cli/interactive-setup/tab-completion');
 
 const inquirer = require('@serverless/utils/inquirer');
 
-BbPromise.promisifyAll(fs);
-
 describe('test/unit/lib/cli/interactive-setup/tab-completion.test.js', () => {
   before(() => {
     process.env.SHELL = 'bash';
@@ -51,7 +48,7 @@ describe('test/unit/lib/cli/interactive-setup/tab-completion.test.js', () => {
       list: { shell: 'bash' },
     });
     await step.run({});
-    await expect(fs.readFileAsync('.bashrc')).to.eventually.be.rejected.and.have.property(
+    await expect(fsp.readFile('.bashrc')).to.eventually.be.rejected.and.have.property(
       'code',
       'ENOENT'
     );
@@ -64,13 +61,13 @@ describe('test/unit/lib/cli/interactive-setup/tab-completion.test.js', () => {
     });
     await step.run({});
     await Promise.all([
-      fs
-        .readFileAsync(path.resolve(os.homedir(), '.bashrc'), 'utf8')
+      fsp
+        .readFile(path.resolve(os.homedir(), '.bashrc'), 'utf8')
         .then((bashRcContent) =>
           expect(bashRcContent).to.include(' ~/.config/tabtab/__tabtab.bash')
         ),
-      fs.readFileAsync(path.resolve(os.homedir(), '.config/tabtab/serverless.bash'), 'utf8'),
-      fs.readFileAsync(path.resolve(os.homedir(), '.config/tabtab/sls.bash'), 'utf8'),
+      fsp.readFile(path.resolve(os.homedir(), '.config/tabtab/serverless.bash'), 'utf8'),
+      fsp.readFile(path.resolve(os.homedir(), '.config/tabtab/sls.bash'), 'utf8'),
     ]);
   });
 });

From 105807a674820f2d8501f3b8539c3725fceab215 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 11 May 2021 17:45:51 +0200
Subject: [PATCH 0093/1101] refactor(CLI Onboarding): Integrate steps from
 dashboard plugin

---
 .github/prepare-canary.js                     |  2 +-
 lib/Serverless.js                             |  2 +-
 lib/classes/PluginManager.js                  | 76 ++++++++++---------
 lib/cli/handle-error.js                       |  4 +-
 lib/cli/interactive-setup/index.js            | 10 ++-
 lib/cli/render-version.js                     |  4 +-
 lib/utils/telemetry/generatePayload.js        | 24 +++++-
 package.json                                  |  2 +-
 scripts/pkg/config.js                         |  6 +-
 .../package.json                              |  0
 test/unit/lib/classes/PluginManager.test.js   |  4 +-
 .../lib/cli/interactive-setup/index.test.js   | 13 ++++
 .../aws/package/compile/functions.test.js     |  2 +-
 .../utils/telemetry/generatePayload.test.js   |  5 +-
 14 files changed, 97 insertions(+), 57 deletions(-)
 rename test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/node_modules/@serverless/{enterprise-plugin => dashboard-plugin}/package.json (100%)

diff --git a/.github/prepare-canary.js b/.github/prepare-canary.js
index f9bc05da9a6..81c17ed9924 100755
--- a/.github/prepare-canary.js
+++ b/.github/prepare-canary.js
@@ -11,6 +11,6 @@ const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
 
 packageJson.version = `${packageJson.version}-${process.env.GITHUB_SHA.slice(0, 8)}`;
 packageJson.dependencies['@serverless/components'] = 'canary';
-packageJson.dependencies['@serverless/enterprise-plugin'] = 'canary';
+packageJson.dependencies['@serverless/dashboard-plugin'] = 'canary';
 
 fs.writeFileSync(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}\n`);
diff --git a/lib/Serverless.js b/lib/Serverless.js
index d02d6984454..e31c5c70a18 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -144,7 +144,7 @@ class Serverless {
     this.isLocallyInstalled = false;
     this.triggeredDeprecations = logDeprecation.triggeredDeprecations;
 
-    // TODO: Remove once "@serverless/enterprise-plugin" is integrated into this repository
+    // TODO: Remove once "@serverless/dashboard-plugin" is integrated into this repository
     this._commandsSchema = commmandsSchema;
   }
 
diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index fa203017e80..91b1795468b 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -165,48 +165,52 @@ class PluginManager {
   resolveServicePlugins(servicePlugs) {
     const pluginsObject = this.parsePluginsObject(servicePlugs);
     const serviceDir = this.serverless.serviceDir;
-    return pluginsObject.modules
-      .filter((name) => name !== '@serverless/enterprise-plugin')
-      .map((name) => {
-        let Plugin;
-        try {
-          Plugin = requireServicePlugin(serviceDir, name, pluginsObject.localPath);
-        } catch (error) {
-          if (!isModuleNotFoundError(error, name)) throw error;
-
-          // Plugin not installed
-          if (
-            resolveCliInput().isHelpRequest ||
-            this.pluginIndependentCommands.has(this.cliCommands[0])
-          ) {
-            // User may intend to install plugins just listed in serverless config
-            // Therefore skip on MODULE_NOT_FOUND case
-            return null;
-          }
+    return (
+      pluginsObject.modules
+        // Initially @serverless/enterprise-plugin was published as external plugin
+        // We ensure to not load it, if for some reason it's still in service configuration
+        .filter((name) => name !== '@serverless/enterprise-plugin')
+        .map((name) => {
+          let Plugin;
+          try {
+            Plugin = requireServicePlugin(serviceDir, name, pluginsObject.localPath);
+          } catch (error) {
+            if (!isModuleNotFoundError(error, name)) throw error;
+
+            // Plugin not installed
+            if (
+              resolveCliInput().isHelpRequest ||
+              this.pluginIndependentCommands.has(this.cliCommands[0])
+            ) {
+              // User may intend to install plugins just listed in serverless config
+              // Therefore skip on MODULE_NOT_FOUND case
+              return null;
+            }
 
-          throw new ServerlessError(
-            [
-              `Serverless plugin "${name}" not found.`,
-              ' Make sure it\'s installed and listed in the "plugins" section',
-              ' of your serverless config file.',
-            ].join(''),
-            'PLUGIN_NOT_FOUND'
-          );
-        }
-        if (!Plugin) {
-          throw new ServerlessError(
-            `Serverless plugin "${name}", didn't export Plugin constructor.`,
-            'MISSING_PLUGIN_NAME'
-          );
-        }
-        return Plugin;
-      });
+            throw new ServerlessError(
+              [
+                `Serverless plugin "${name}" not found.`,
+                ' Make sure it\'s installed and listed in the "plugins" section',
+                ' of your serverless config file.',
+              ].join(''),
+              'PLUGIN_NOT_FOUND'
+            );
+          }
+          if (!Plugin) {
+            throw new ServerlessError(
+              `Serverless plugin "${name}", didn't export Plugin constructor.`,
+              'MISSING_PLUGIN_NAME'
+            );
+          }
+          return Plugin;
+        })
+    );
   }
 
   resolveEnterprisePlugin() {
     if (config.getConfig().enterpriseDisabled) return null;
     this.pluginIndependentCommands.add('login').add('logout').add('dashboard');
-    return require('@serverless/enterprise-plugin');
+    return require('@serverless/dashboard-plugin');
   }
 
   parsePluginsObject(servicePlugs) {
diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index ee8b457356e..62991884895 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -6,8 +6,8 @@ const chalk = require('chalk');
 const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
 const resolveLocalServerlessPath = require('./resolve-local-serverless-path');
 const slsVersion = require('./../../package').version;
-const sfeVersion = require('@serverless/enterprise-plugin/package.json').version;
-const { platformClientVersion } = require('@serverless/enterprise-plugin');
+const sfeVersion = require('@serverless/dashboard-plugin/package.json').version;
+const { platformClientVersion } = require('@serverless/dashboard-plugin');
 const ServerlessError = require('../serverless-error');
 const tokenizeException = require('../utils/tokenize-exception');
 const resolveIsLocallyInstalled = require('../utils/is-locally-installed');
diff --git a/lib/cli/interactive-setup/index.js b/lib/cli/interactive-setup/index.js
index 9f121eaf64c..8f29b79e0f0 100644
--- a/lib/cli/interactive-setup/index.js
+++ b/lib/cli/interactive-setup/index.js
@@ -1,17 +1,23 @@
 'use strict';
 
+const inquirer = require('@serverless/utils/inquirer');
+
 const steps = {
   service: require('./service'),
+  dashboardLogin: require('@serverless/dashboard-plugin/lib/cli/interactive-setup/dashboard-login'),
+  dashboardSetOrg: require('@serverless/dashboard-plugin/lib/cli/interactive-setup/dashboard-set-org'),
   awsCredentials: require('./aws-credentials'),
   autoUpdate: require('./auto-update'),
   tabCompletion: require('./tab-completion'),
 };
 
 module.exports = async (context) => {
+  context = { ...context, inquirer };
   for (const step of Object.values(steps)) {
-    if (await step.isApplicable(context)) {
+    const stepData = await step.isApplicable(context);
+    if (stepData) {
       process.stdout.write('\n');
-      await step.run(context);
+      await step.run(context, stepData);
     }
   }
 };
diff --git a/lib/cli/render-version.js b/lib/cli/render-version.js
index f8798d4187a..f77b245619f 100644
--- a/lib/cli/render-version.js
+++ b/lib/cli/render-version.js
@@ -2,9 +2,9 @@
 
 const path = require('path');
 const { version } = require('../../package');
-const { version: dashboardPluginVersion } = require('@serverless/enterprise-plugin/package');
+const { version: dashboardPluginVersion } = require('@serverless/dashboard-plugin/package');
 const { version: componentsVersion } = require('@serverless/components/package');
-const { platformClientVersion } = require('@serverless/enterprise-plugin');
+const { platformClientVersion } = require('@serverless/dashboard-plugin');
 const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
 const resolveLocalServerlessPath = require('./resolve-local-serverless-path');
 const chalk = require('chalk');
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index 6793672965d..451d13fdded 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -136,15 +136,31 @@ module.exports = async ({
     if (!isLocallyInstalled || (await resolveIsLocallyInstalled())) {
       return {
         'serverless': require('../../../package').version,
-        '@serverless/enterprise-plugin': require('@serverless/enterprise-plugin/package').version,
+        '@serverless/dashboard-plugin': require('@serverless/dashboard-plugin/package').version,
       };
     }
     const localServerlessPath = await resolveLocalServerlessPath();
     return {
       'serverless': require(path.resolve(localServerlessPath, 'package.json')).version,
-      '@serverless/enterprise-plugin': require((
-        await resolve(localServerlessPath, '@serverless/enterprise-plugin/package')
-      ).realPath).version,
+      // Since v2.42.0 it's "@serverless/dashboard-plugin"
+      '@serverless/dashboard-plugin': await (async () => {
+        try {
+          return require((
+            await resolve(localServerlessPath, '@serverless/dashboard-plugin/package')
+          ).realPath).version;
+        } catch {
+          return undefined;
+        }
+      })(),
+      '@serverless/enterprise-plugin': await (async () => {
+        try {
+          return require((
+            await resolve(localServerlessPath, '@serverless/enterprise-plugin/package')
+          ).realPath).version;
+        } catch {
+          return undefined;
+        }
+      })(),
     };
   })();
 
diff --git a/package.json b/package.json
index 10c747f4f73..5ef9e2222a0 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "@serverless/cli": "^1.5.2",
     "@serverless/components": "^3.9.2",
-    "@serverless/enterprise-plugin": "^4.6.0",
+    "@serverless/dashboard-plugin": "^5.0.0",
     "@serverless/utils": "^4.1.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
diff --git a/scripts/pkg/config.js b/scripts/pkg/config.js
index 541147c650c..62ce9536a13 100644
--- a/scripts/pkg/config.js
+++ b/scripts/pkg/config.js
@@ -14,10 +14,10 @@ module.exports = {
     // Local invocation artifacts
     '../../lib/plugins/aws/invokeLocal/runtimeWrappers',
     // Dashboard policies
-    '../../node_modules/@serverless/enterprise-plugin/lib/safeguards/policies',
+    '../../node_modules/@serverless/dashboard-plugin/lib/safeguards/policies',
     // Dashboard wrappers
-    '../../node_modules/@serverless/enterprise-plugin/sdk-js/dist/index.js',
-    '../../node_modules/@serverless/enterprise-plugin/sdk-py',
+    '../../node_modules/@serverless/dashboard-plugin/sdk-js/dist/index.js',
+    '../../node_modules/@serverless/dashboard-plugin/sdk-py',
     // Ensure npm is bundled as a dependency
     '../../node_modules/npm/bin/npm-cli.js',
     // Below module is not automatically traced by pkg, we need to point it manually
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/node_modules/@serverless/enterprise-plugin/package.json b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/node_modules/@serverless/dashboard-plugin/package.json
similarity index 100%
rename from test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/node_modules/@serverless/enterprise-plugin/package.json
rename to test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/node_modules/@serverless/dashboard-plugin/package.json
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
index 67dffeab42a..302907c269f 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/PluginManager.test.js
@@ -657,7 +657,7 @@ describe('PluginManager', () => {
       mockRequire('ServicePluginMock1', ServicePluginMock1);
       mockRequire('ServicePluginMock2', ServicePluginMock2);
       mockRequire('BrokenPluginMock', BrokenPluginMock);
-      mockRequire('@serverless/enterprise-plugin', EnterprisePluginMock);
+      mockRequire('@serverless/dashboard-plugin', EnterprisePluginMock);
     });
 
     it('should load only core plugins when no service plugins are given', () => {
@@ -742,7 +742,7 @@ describe('PluginManager', () => {
       mockRequire.stop('ServicePluginMock1');
       mockRequire.stop('ServicePluginMock2');
       mockRequire.stop('BrokenPluginMock');
-      mockRequire.stop('@serverless/enterprise-plugin');
+      mockRequire.stop('@serverless/dashboard-plugin');
     });
   });
 
diff --git a/test/unit/lib/cli/interactive-setup/index.test.js b/test/unit/lib/cli/interactive-setup/index.test.js
index 1977c703db9..12084579790 100644
--- a/test/unit/lib/cli/interactive-setup/index.test.js
+++ b/test/unit/lib/cli/interactive-setup/index.test.js
@@ -32,6 +32,19 @@ describe('test/unit/lib/cli/interactive-setup/index.test.js', () => {
         input: 'interactive-setup-test',
       },
 
+      // dashboard-login
+      {
+        instructionString: 'Would you like to enable this?',
+        input: 'Y',
+      },
+      {
+        instructionString: 'login or register?',
+        input: 'j',
+      },
+
+      // dashboard-set-org
+      // Skipped, as internally depends on remote state of data and cannot be easily tested offline
+
       // aws-credentials
       { instructionString: 'Do you want to set them up now?', input: 'Y' },
       { instructionString: 'AWS account', input: 'Y' },
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index ee9af17e991..a6123d07248 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -2588,7 +2588,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       //    - Corresponding url is configured in CF template
       // Test with "deploy" command, and configure `lastLifecycleHookName` to 'aws:deploy:deploy:uploadArtifact'
       // It'll demand stubbing few other AWS calls for that follow this stub:
-      // https://github.com/serverless/enterprise-plugin/blob/cdd53df45dfad18d8bdd79969194a61cb8178671/lib/deployment/parse.test.js#L1585-L1627
+      // https://github.com/serverless/dashboard-plugin/blob/cdd53df45dfad18d8bdd79969194a61cb8178671/lib/deployment/parse.test.js#L1585-L1627
       // Confirm same artifact is used for all functions
     });
 
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index 6e344119232..7be4fcca6d1 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -15,7 +15,7 @@ const fixtures = require('../../../../fixtures/programmatic');
 
 const versions = {
   'serverless': require('../../../../../package').version,
-  '@serverless/enterprise-plugin': require('@serverless/enterprise-plugin/package').version,
+  '@serverless/dashboard-plugin': require('@serverless/dashboard-plugin/package').version,
 };
 
 describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
@@ -224,7 +224,8 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       installationType: 'local:fallback',
       versions: {
         'serverless': '2.0.0-local',
-        '@serverless/enterprise-plugin': '4.0.0-local',
+        '@serverless/dashboard-plugin': '4.0.0-local',
+        '@serverless/enterprise-plugin': undefined,
       },
     });
   });

From 7047c349299ea829b0d43efedd191782dad10219 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 13 May 2021 10:41:41 +0200
Subject: [PATCH 0094/1101] fix(CLI): Fallback to local version only if we're
 not in its context

---
 lib/cli/handle-error.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 62991884895..8e3439dea72 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -59,7 +59,9 @@ module.exports = async (exception, options = {}) => {
     ? serverless.isInvokedByGlobalInstallation
     : passedIsInvokedByGlobalInstallation;
 
-  if (isInvokedByGlobalInstallation) {
+  // If provided serverless instance is a local fallback, and we're not in context of it
+  // Pass error handling to this local fallback implementation
+  if (isInvokedByGlobalInstallation && !(await resolveIsLocallyInstalled())) {
     const localServerlessPath = await resolveLocalServerlessPath();
 
     try {

From 65a1f3875cda7f06d3ab47f21362a630d7d0415f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 13 May 2021 10:43:16 +0200
Subject: [PATCH 0095/1101] fix(CLI): Ensure resolved CLI params are correct in
 local fallback

---
 lib/Serverless.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index e31c5c70a18..18de4a07a0f 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -270,9 +270,8 @@ class Serverless {
   }
 
   async run() {
-    if (!this.hasResolvedCommandsExternally) {
-      // Invoked by older global version. Ensure to have command schema saturated
-      // which is needed for complete help output
+    if (this._isInvokedByGlobalInstallation) {
+      // Ensure to have resolve-input populated with right result
       // TODO: Remove with next major
       const commandsSchema = require('./cli/commands-schema/resolve-final')(
         this.pluginManager.externalPlugins,

From eeddf9f518612f6f7ef805eb3ed9b13fb3036114 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 13 May 2021 12:24:58 +0200
Subject: [PATCH 0096/1101] fix(Telemetry): If global & local report outcome,
 report with global

---
 lib/Serverless.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index 18de4a07a0f..66e99ac943b 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -249,6 +249,7 @@ class Serverless {
       configuration: this.configurationInput,
       isConfigurationResolved: this.isConfigurationInputResolved,
       hasResolvedCommandsExternally: this.hasResolvedCommandsExternally,
+      isTelemetryReportedExternally: this.isTelemetryReportedExternally,
       commands: this.processedInput.commands,
       options: this.processedInput.options,
       _isInvokedByGlobalInstallation: true,

From 340566a82ec2b48c13e69bd546f151239202a807 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 13 May 2021 13:33:56 +0200
Subject: [PATCH 0097/1101] chore: Bump dependencies

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 5ef9e2222a0..d395ae5318c 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.904.0",
+    "aws-sdk": "^2.906.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
@@ -74,7 +74,7 @@
     "yaml-ast-parser": "0.0.43"
   },
   "devDependencies": {
-    "@commitlint/cli": "^12.1.2",
+    "@commitlint/cli": "^12.1.4",
     "@serverless/eslint-config": "^3.0.0",
     "@serverless/test": "^8.1.0",
     "chai": "^4.3.4",

From f2a8e66d41c953a3502854c499c81862605c54ab Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 13 May 2021 13:35:18 +0200
Subject: [PATCH 0098/1101] chore: Upgrade `dotenv` to v9

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d395ae5318c..18a3fcc0110 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "d": "^1.0.1",
     "dayjs": "^1.10.4",
     "decompress": "^4.2.1",
-    "dotenv": "^8.6.0",
+    "dotenv": "^9.0.2",
     "download": "^8.0.0",
     "essentials": "^1.1.1",
     "fastest-levenshtein": "^1.0.12",

From 0d92eb2ec63d2769cc38ee996f1f8d9fa35347a3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 13 May 2021 13:45:46 +0200
Subject: [PATCH 0099/1101] chore: Release v2.41.2

---
 CHANGELOG.md | 24 ++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c80606c41b..bfb941d7a53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,30 @@
 
 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.
 
+## [2.41.2](https://github.com/serverless/serverless/compare/v2.41.1...v2.41.2) (2021-05-13)
+
+### Bug Fixes
+
+- **CLI:**
+  - In error handler fallback to local version only if we're not in its context (fix infinite recursion issue which put `serverless` process on stall) ([#9472](https://github.com/serverless/serverless/pull/9472)) ([7047c34](https://github.com/serverless/serverless/commit/7047c349299ea829b0d43efedd191782dad10219)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Ensure resolved CLI params are correct in local fallback ([#9472](https://github.com/serverless/serverless/pull/9472)) ([65a1f38](https://github.com/serverless/serverless/commit/65a1f3875cda7f06d3ab47f21362a630d7d0415f)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Telemetry:** If global & local fallback versions are recent enough to report outcome, report with global ([#9472](https://github.com/serverless/serverless/pull/9472)) ([eeddf9f](https://github.com/serverless/serverless/commit/eeddf9f518612f6f7ef805eb3ed9b13fb3036114)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Templates
+
+- **Templates:** Add `google-nodejs-typescript` template ([#9445](https://github.com/serverless/serverless/issues/9445)) ([9cc05ad](https://github.com/serverless/serverless/commit/9cc05ad2f659709746d1df9811b95118c583db27)) ([Corentin Doue](https://github.com/CorentinDoue))
+
+### Maintenance Improvements
+
+- **CLI Onboarding:**
+  - Seclude from internal Framework logic ([#9410](https://github.com/serverless/serverless/pull/9410)) ([7864f4d](https://github.com/serverless/serverless/commit/7864f4d28d4c4ed8325e64c8dfca891845edf392)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Integrate steps from dashboard plugin ([#9410](https://github.com/serverless/serverless/pull/9410)) ([105807a](https://github.com/serverless/serverless/commit/105807a674820f2d8501f3b8539c3725fceab215)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Refactor to async/await ([#9410](https://github.com/serverless/serverless/pull/9410)) ([1060d14](https://github.com/serverless/serverless/commit/1060d1468ba587519df482e95a54bbc8d199cad8)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Simplify tabcompletion support check ([#9410](https://github.com/serverless/serverless/pull/9410)) ([c13586e](https://github.com/serverless/serverless/commit/c13586ee23614da75d71f40ff24037b9aad46c2c)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Telemetry:** Make `generatePayload` `serverless` independent ([#9410](https://github.com/serverless/serverless/pull/9410)) ([4f6a50a](https://github.com/serverless/serverless/commit/4f6a50a2e145e664405b00661d801b6ad094f418)) ([Mariusz Nowak](https://github.com/medikoo))
+- **CLI:** Rely internally on `@serverless/utils/log` ([#9410](https://github.com/serverless/serverless/pull/9410)) ([05588f7](https://github.com/serverless/serverless/commit/05588f77c0bbc900198ce458099ea2db066f3601)) ([Mariusz Nowak](https://github.com/medikoo))
+- Refactor `isNpmPackageWritable` to not depend on `serverless` ([b915cc4](https://github.com/serverless/serverless/commit/b915cc467183d146785466965abbe318c349f0c9)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ### [2.41.1](https://github.com/serverless/serverless/compare/v2.41.0...v2.41.1) (2021-05-11)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 18a3fcc0110..7634a7acc4e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.41.1",
+  "version": "2.41.2",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From b86128b2503e3df18c260264721bd913e676ada4 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 13 May 2021 13:54:31 +0200
Subject: [PATCH 0100/1101] test: Workaround race conditions

---
 test/integration/stream.test.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/integration/stream.test.js b/test/integration/stream.test.js
index 5055fca1fa6..4af92ddd42e 100644
--- a/test/integration/stream.test.js
+++ b/test/integration/stream.test.js
@@ -48,7 +48,10 @@ describe('AWS - Stream Integration Test', function () {
       return confirmCloudWatchLogs(
         `/aws/lambda/${stackName}-${functionName}`,
         () => putKinesisRecord(streamName, message),
-        { timeout: 120 * 1000 }
+        {
+          checkIsComplete: (events) =>
+            events.reduce((data, event) => data + event.message, '').includes(functionName),
+        }
       ).then((events) => {
         const logs = events.reduce((data, event) => data + event.message, '');
         expect(logs).to.include(functionName);

From f6b7cfaaaff81b84011f0f6168a651979089e1c9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 14 May 2021 13:12:38 +0200
Subject: [PATCH 0101/1101] fix(Variables): Fix reporting of variable
 resolution errors

---
 lib/configuration/variables/sources/file.js         | 12 ++++++++++++
 .../configuration/variables/sources/file.test.js    | 13 +++++++++++++
 .../file-function-variable-missing-source.js        |  5 +++++
 ...ile-property-function-variable-missing-source.js |  5 +++++
 4 files changed, 35 insertions(+)
 create mode 100644 test/unit/lib/configuration/variables/sources/fixture/file-function-variable-missing-source.js
 create mode 100644 test/unit/lib/configuration/variables/sources/fixture/file-property-function-variable-missing-source.js

diff --git a/lib/configuration/variables/sources/file.js b/lib/configuration/variables/sources/file.js
index 4b6ad596bc8..634c0ae58e1 100644
--- a/lib/configuration/variables/sources/file.js
+++ b/lib/configuration/variables/sources/file.js
@@ -126,6 +126,12 @@ module.exports = {
               return await result({ options, resolveConfigurationProperty, resolveVariable });
             } catch (error) {
               if (error.code === 'MISSING_VARIABLE_DEPENDENCY') throw error;
+              if (
+                error.constructor.name === 'ServerlessError' &&
+                error.message.startsWith('Cannot resolve variable at ')
+              ) {
+                throw error;
+              }
               throw new ServerlessError(
                 `Cannot resolve "${path.basename(filePath)}": Returned JS function errored with: ${
                   error && error.stack ? error.stack : error
@@ -173,6 +179,12 @@ module.exports = {
           result = await result({ options, resolveConfigurationProperty, resolveVariable });
         } catch (error) {
           if (error.code === 'MISSING_VARIABLE_DEPENDENCY') throw error;
+          if (
+            error.constructor.name === 'ServerlessError' &&
+            error.message.startsWith('Cannot resolve variable at ')
+          ) {
+            throw error;
+          }
           throw new ServerlessError(
             `Cannot resolve "${address}" out of "${path.basename(filePath)}": Received rejection: ${
               error && error.stack ? error.stack : error
diff --git a/test/unit/lib/configuration/variables/sources/file.test.js b/test/unit/lib/configuration/variables/sources/file.test.js
index 2ee882d53e4..93269a11b3e 100644
--- a/test/unit/lib/configuration/variables/sources/file.test.js
+++ b/test/unit/lib/configuration/variables/sources/file.test.js
@@ -24,7 +24,10 @@ describe('test/unit/lib/configuration/variables/sources/file.test.js', () => {
       jsPropertyFunctionProperty: '${file(file-property-function.js):property.result}',
       addressSupport: '${file(file.json):result}',
       jsFunctionResolveVariable: '${file(file-function-variable.js)}',
+      jsFunctionResolveVariableMissingSource: '${file(file-function-variable-missing-source.js)}',
       jsPropertyFunctionResolveVariable: '${file(file-property-function-variable.js):property}',
+      jsPropertyFunctionResolveVariableMissingSource:
+        '${file(file-property-function-variable-missing-source.js):property}',
       nonExistingYaml: '${file(not-existing.yaml), null}',
       nonExistingJson: '${file(not-existing.json), null}',
       nonExistingJs: '${file(not-existing.js), null}',
@@ -185,6 +188,16 @@ describe('test/unit/lib/configuration/variables/sources/file.test.js', () => {
     expect(variablesMeta.get('invalidJs2').error.code).to.equal('VARIABLE_RESOLUTION_ERROR');
   });
 
+  it('should report with an error if JS function attempts to resolve missing source', () =>
+    expect(variablesMeta.get('jsFunctionResolveVariableMissingSource').error.code).to.equal(
+      'MISSING_VARIABLE_RESULT'
+    ));
+
+  it('should report with an error if JS function property attempts to resolve missing source', () =>
+    expect(variablesMeta.get('jsPropertyFunctionResolveVariableMissingSource').error.code).to.equal(
+      'MISSING_VARIABLE_RESULT'
+    ));
+
   it('should not support function resolvers in "js" file sources not confirmed to work with new resolver', async () => {
     configuration = {
       jsFunction: '${file(file-function.js)}',
diff --git a/test/unit/lib/configuration/variables/sources/fixture/file-function-variable-missing-source.js b/test/unit/lib/configuration/variables/sources/fixture/file-function-variable-missing-source.js
new file mode 100644
index 00000000000..9a1cfc185ac
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/fixture/file-function-variable-missing-source.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = async ({ resolveVariable }) => ({
+  varResult: await resolveVariable('file(missing.yaml)'),
+});
diff --git a/test/unit/lib/configuration/variables/sources/fixture/file-property-function-variable-missing-source.js b/test/unit/lib/configuration/variables/sources/fixture/file-property-function-variable-missing-source.js
new file mode 100644
index 00000000000..fe8b53ee1e9
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/fixture/file-property-function-variable-missing-source.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports.property = async ({ resolveVariable }) => ({
+  varResult: await resolveVariable('file(missing.json)'),
+});

From 9eea885b390fc88bb62c1e2a5c3d108444139703 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 14 May 2021 11:18:48 +0200
Subject: [PATCH 0102/1101] refactor(CLI Onboarding): Add `history` and
 `stepHistory` to `context`

---
 lib/cli/interactive-setup/index.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/cli/interactive-setup/index.js b/lib/cli/interactive-setup/index.js
index 8f29b79e0f0..8f96cff5ced 100644
--- a/lib/cli/interactive-setup/index.js
+++ b/lib/cli/interactive-setup/index.js
@@ -12,11 +12,14 @@ const steps = {
 };
 
 module.exports = async (context) => {
-  context = { ...context, inquirer };
-  for (const step of Object.values(steps)) {
+  context = { ...context, inquirer, history: new Map() };
+  for (const [stepName, step] of Object.entries(steps)) {
+    delete context.stepHistory;
     const stepData = await step.isApplicable(context);
     if (stepData) {
       process.stdout.write('\n');
+      context.stepHistory = [];
+      context.history.set(stepName, context.stepHistory);
       await step.run(context, stepData);
     }
   }

From 03011baf07d262a5b9702b34b75a997e3f525d28 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 13 May 2021 10:15:17 +0200
Subject: [PATCH 0103/1101] refactor: Add `create-from-local-template` util

---
 lib/utils/create-from-local-template.js       | 27 ++++++++
 .../utils/create-from-local-template.test.js  | 65 +++++++++++++++++++
 2 files changed, 92 insertions(+)
 create mode 100644 lib/utils/create-from-local-template.js
 create mode 100644 test/unit/lib/utils/create-from-local-template.test.js

diff --git a/lib/utils/create-from-local-template.js b/lib/utils/create-from-local-template.js
new file mode 100644
index 00000000000..ac4eb9e0387
--- /dev/null
+++ b/lib/utils/create-from-local-template.js
@@ -0,0 +1,27 @@
+'use strict';
+
+const copyDirContentsSync = require('./fs/copyDirContentsSync');
+const untildify = require('untildify');
+const { renameService } = require('./renameService');
+
+const ServerlessError = require('../serverless-error');
+
+module.exports = ({ templatePath, projectDir, projectName }) => {
+  const sourcePath = untildify(templatePath);
+
+  try {
+    copyDirContentsSync(sourcePath, projectDir, { noLinks: true });
+  } catch (err) {
+    if (err.code === 'ENOENT') {
+      throw new ServerlessError(
+        `Could not find a template under provider path: ${sourcePath}`,
+        'INVALID_TEMPLATE_PATH'
+      );
+    }
+    throw err;
+  }
+
+  if (projectName) {
+    renameService(projectName, projectDir);
+  }
+};
diff --git a/test/unit/lib/utils/create-from-local-template.test.js b/test/unit/lib/utils/create-from-local-template.test.js
new file mode 100644
index 00000000000..f37acab3b57
--- /dev/null
+++ b/test/unit/lib/utils/create-from-local-template.test.js
@@ -0,0 +1,65 @@
+'use strict';
+
+const path = require('path');
+const chai = require('chai');
+const fsp = require('fs').promises;
+const { load: yamlParse } = require('js-yaml');
+const createFromLocalTemplate = require('../../../../lib/utils/create-from-local-template');
+const { getTmpDirPath } = require('../../../utils/fs');
+
+const templatesPath = path.resolve(__dirname, '../../../../lib/plugins/create/templates');
+
+chai.use(require('chai-as-promised'));
+
+const expect = chai.expect;
+
+describe('test/unit/lib/utils/create-from-local-template.test.js', () => {
+  describe('Without `projectName` provided', () => {
+    it('should create from template referenced locally', async () => {
+      const tmpDirPath = path.join(getTmpDirPath(), 'some-service');
+      createFromLocalTemplate({
+        templatePath: path.join(templatesPath, 'aws-nodejs'),
+        projectDir: tmpDirPath,
+      });
+      const stats = await fsp.lstat(path.join(tmpDirPath, 'serverless.yml'));
+      expect(stats.isFile()).to.be.true;
+    });
+  });
+
+  describe('When `templatePath` does not exist', () => {
+    it('should result in an error', async () => {
+      const tmpDirPath = path.join(getTmpDirPath(), 'some-service');
+      expect(() =>
+        createFromLocalTemplate({
+          templatePath: path.join(templatesPath, 'nonexistent'),
+          projectDir: tmpDirPath,
+        })
+      )
+        .to.throw()
+        .and.have.property('code', 'INVALID_TEMPLATE_PATH');
+    });
+  });
+
+  describe('With `projectName` provided', () => {
+    let tmpDirPath;
+
+    before(() => {
+      tmpDirPath = path.join(getTmpDirPath(), 'some-service');
+      createFromLocalTemplate({
+        templatePath: path.join(templatesPath, 'fn-nodejs'),
+        projectDir: tmpDirPath,
+        projectName: 'testproj',
+      });
+    });
+
+    it('should set service name in serverless.yml', async () =>
+      expect(
+        yamlParse(await fsp.readFile(path.join(tmpDirPath, 'serverless.yml'))).service
+      ).to.equal('testproj'));
+
+    it('should set name in package.json', async () =>
+      expect(JSON.parse(await fsp.readFile(path.join(tmpDirPath, 'package.json'))).name).to.equal(
+        'testproj'
+      ));
+  });
+});

From 98c9700bcda328552f04116a51549f66e3d7b026 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 13 May 2021 10:23:01 +0200
Subject: [PATCH 0104/1101] feat(CLI Onboarding): Support `template-path` param

---
 lib/cli/commands-schema/no-service.js         |  3 ++
 lib/cli/interactive-setup/service.js          | 36 +++++++++++++------
 .../lib/cli/interactive-setup/service.test.js | 13 +++++++
 3 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/lib/cli/commands-schema/no-service.js b/lib/cli/commands-schema/no-service.js
index e4908975e67..81d54ad52c1 100644
--- a/lib/cli/commands-schema/no-service.js
+++ b/lib/cli/commands-schema/no-service.js
@@ -12,6 +12,9 @@ commands.set('', {
   hasAwsExtension: true,
   options: {
     'help-interactive': { usage: 'Show this message', type: 'boolean' },
+    'template-path': {
+      usage: 'Template local path for the service.',
+    },
   },
   lifecycleEvents: ['initializeService', 'setupAws', 'autoUpdate', 'tabCompletion', 'end'],
 });
diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index 7e78475c7d1..34f2a4403dc 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -9,6 +9,7 @@ const readConfiguration = require('../../configuration/read');
 const createFromTemplate = require('../../utils/createFromTemplate');
 const resolveVariables = require('../../configuration/variables');
 const { confirm } = require('./utils');
+const createFromLocalTemplate = require('../../utils/create-from-local-template');
 
 const isValidServiceName = RegExp.prototype.test.bind(/^[a-zA-Z][a-zA-Z0-9-]{0,100}$/);
 
@@ -65,17 +66,32 @@ module.exports = {
       name: 'shouldCreateNewProject',
     });
     if (!isConfirmed) return;
-    const projectType = await projectTypeChoice();
-    if (projectType === 'other') {
-      process.stdout.write(
-        '\nRun “serverless create --help” to view available templates and create a new project ' +
-          'from one of those templates.\n'
-      );
-      return;
+
+    let projectDir;
+    // TOOD: CLEANUP
+    let projectName;
+    if (context.options && context.options['template-path']) {
+      projectName = await projectNameInput(workingDir);
+      projectDir = join(workingDir, projectName);
+      createFromLocalTemplate({
+        templatePath: context.options['template-path'],
+        projectDir,
+        projectName,
+      });
+    } else {
+      const projectType = await projectTypeChoice();
+      if (projectType === 'other') {
+        process.stdout.write(
+          '\nRun “serverless create --help” to view available templates and create a new project ' +
+            'from one of those templates.\n'
+        );
+        return;
+      }
+      projectName = await projectNameInput(workingDir);
+      projectDir = join(workingDir, projectName);
+      await createFromTemplate(projectType, projectDir);
     }
-    const projectName = await projectNameInput(workingDir);
-    const projectDir = join(workingDir, projectName);
-    await createFromTemplate(projectType, projectDir);
+
     process.stdout.write(
       `\n${chalk.green(`Project successfully created in '${projectName}' folder.`)}\n`
     );
diff --git a/test/unit/lib/cli/interactive-setup/service.test.js b/test/unit/lib/cli/interactive-setup/service.test.js
index 68a470c92e8..c4f73617b7c 100644
--- a/test/unit/lib/cli/interactive-setup/service.test.js
+++ b/test/unit/lib/cli/interactive-setup/service.test.js
@@ -1,10 +1,13 @@
 'use strict';
 
 const chai = require('chai');
+const path = require('path');
 const sinon = require('sinon');
 const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
 const step = require('../../../../../lib/cli/interactive-setup/service');
 
+const templatesPath = path.resolve(__dirname, '../../../../../lib/plugins/create/templates');
+
 const { expect } = chai;
 
 chai.use(require('chai-as-promised'));
@@ -51,6 +54,16 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       const stats = await fsp.lstat('test-project/serverless.yml');
       expect(stats.isFile()).to.be.true;
     });
+
+    it('Should create project at not existing directory from a provided `template-path`', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldCreateNewProject: true },
+        input: { projectName: 'test-project-from-local-template' },
+      });
+      await step.run({ options: { 'template-path': path.join(templatesPath, 'aws-nodejs') } });
+      const stats = await fsp.lstat('test-project-from-local-template/serverless.yml');
+      expect(stats.isFile()).to.be.true;
+    });
   });
 
   it('Should not allow project creation in a directory in which already service is configured', async () => {

From 53575dc36017ded5ff60e5edf18fb7a9fd9d30e9 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 13 May 2021 10:56:04 +0200
Subject: [PATCH 0105/1101] feat(CLI Onboarding): Support `--name` CLI option

---
 lib/cli/commands-schema/no-service.js         |  3 ++
 lib/cli/interactive-setup/service.js          | 50 +++++++++++++++----
 lib/utils/create-from-local-template.js       | 15 ++++--
 .../lib/cli/interactive-setup/service.test.js | 43 ++++++++++++++--
 .../utils/create-from-local-template.test.js  | 12 ++---
 5 files changed, 96 insertions(+), 27 deletions(-)

diff --git a/lib/cli/commands-schema/no-service.js b/lib/cli/commands-schema/no-service.js
index 81d54ad52c1..4945170cd11 100644
--- a/lib/cli/commands-schema/no-service.js
+++ b/lib/cli/commands-schema/no-service.js
@@ -15,6 +15,9 @@ commands.set('', {
     'template-path': {
       usage: 'Template local path for the service.',
     },
+    'name': {
+      usage: 'Name for the service.',
+    },
   },
   lifecycleEvents: ['initializeService', 'setupAws', 'autoUpdate', 'tabCompletion', 'end'],
 });
diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index 34f2a4403dc..7b89dd835a8 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -10,6 +10,7 @@ const createFromTemplate = require('../../utils/createFromTemplate');
 const resolveVariables = require('../../configuration/variables');
 const { confirm } = require('./utils');
 const createFromLocalTemplate = require('../../utils/create-from-local-template');
+const ServerlessError = require('../../serverless-error');
 
 const isValidServiceName = RegExp.prototype.test.bind(/^[a-zA-Z][a-zA-Z0-9-]{0,100}$/);
 
@@ -29,6 +30,12 @@ const projectTypeChoice = async () =>
     })
   ).projectType;
 
+const INVALID_PROJECT_NAME_MESSAGE =
+  'Project name is not valid.\n' +
+  '   - It should only contain alphanumeric and hyphens.\n' +
+  '   - It should start with an alphabetic character.\n' +
+  "   - Shouldn't exceed 128 characters";
+
 const projectNameInput = async (workingDir) =>
   (
     await inquirer.prompt({
@@ -38,12 +45,7 @@ const projectNameInput = async (workingDir) =>
       validate: async (input) => {
         input = input.trim();
         if (!isValidServiceName(input)) {
-          return (
-            'Project name is not valid.\n' +
-            '   - It should only contain alphanumeric and hyphens.\n' +
-            '   - It should start with an alphabetic character.\n' +
-            "   - Shouldn't exceed 128 characters"
-          );
+          return INVALID_PROJECT_NAME_MESSAGE;
         }
 
         try {
@@ -56,6 +58,33 @@ const projectNameInput = async (workingDir) =>
     })
   ).projectName.trim();
 
+const resolveProjectNameInput = async (options, workingDir) => {
+  if (options.name) {
+    if (!isValidServiceName(options.name)) {
+      throw new ServerlessError(INVALID_PROJECT_NAME_MESSAGE, 'INVALID_PROJECT_NAME');
+    }
+
+    let alreadyTaken = false;
+    try {
+      await fs.promises.access(join(workingDir, options.name));
+      alreadyTaken = true;
+    } catch {
+      // Pass
+    }
+
+    if (alreadyTaken) {
+      throw new ServerlessError(
+        `Path ${options.name} is already taken`,
+        'TARGET_FOLDER_ALREADY_EXISTS'
+      );
+    }
+
+    return options.name;
+  }
+
+  return projectNameInput(workingDir);
+};
+
 module.exports = {
   isApplicable({ serviceDir }) {
     return !serviceDir;
@@ -68,12 +97,11 @@ module.exports = {
     if (!isConfirmed) return;
 
     let projectDir;
-    // TOOD: CLEANUP
     let projectName;
-    if (context.options && context.options['template-path']) {
-      projectName = await projectNameInput(workingDir);
+    if (context.options['template-path']) {
+      projectName = await resolveProjectNameInput(context.options, workingDir);
       projectDir = join(workingDir, projectName);
-      createFromLocalTemplate({
+      await createFromLocalTemplate({
         templatePath: context.options['template-path'],
         projectDir,
         projectName,
@@ -87,7 +115,7 @@ module.exports = {
         );
         return;
       }
-      projectName = await projectNameInput(workingDir);
+      projectName = await resolveProjectNameInput(context.options, workingDir);
       projectDir = join(workingDir, projectName);
       await createFromTemplate(projectType, projectDir);
     }
diff --git a/lib/utils/create-from-local-template.js b/lib/utils/create-from-local-template.js
index ac4eb9e0387..473661f9cc4 100644
--- a/lib/utils/create-from-local-template.js
+++ b/lib/utils/create-from-local-template.js
@@ -1,16 +1,22 @@
 'use strict';
 
-const copyDirContentsSync = require('./fs/copyDirContentsSync');
 const untildify = require('untildify');
+const fse = require('fs-extra');
 const { renameService } = require('./renameService');
 
 const ServerlessError = require('../serverless-error');
 
-module.exports = ({ templatePath, projectDir, projectName }) => {
+module.exports = async ({ templatePath, projectDir, projectName }) => {
   const sourcePath = untildify(templatePath);
 
   try {
-    copyDirContentsSync(sourcePath, projectDir, { noLinks: true });
+    await fse.copy(sourcePath, projectDir, {
+      dereference: true,
+      filter: async (src) => {
+        const stats = await fse.lstat(src);
+        return !stats.isSymbolicLink();
+      },
+    });
   } catch (err) {
     if (err.code === 'ENOENT') {
       throw new ServerlessError(
@@ -18,7 +24,8 @@ module.exports = ({ templatePath, projectDir, projectName }) => {
         'INVALID_TEMPLATE_PATH'
       );
     }
-    throw err;
+
+    throw new ServerlessError(`Cannot copy template: ${err.message}`, 'COPY_LOCAL_TEMPLATE_ERROR');
   }
 
   if (projectName) {
diff --git a/test/unit/lib/cli/interactive-setup/service.test.js b/test/unit/lib/cli/interactive-setup/service.test.js
index c4f73617b7c..089b1e643e4 100644
--- a/test/unit/lib/cli/interactive-setup/service.test.js
+++ b/test/unit/lib/cli/interactive-setup/service.test.js
@@ -30,7 +30,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
     configureInquirerStub(inquirer, {
       confirm: { shouldCreateNewProject: false },
     });
-    await step.run({});
+    await step.run({ options: {} });
     return confirmEmptyWorkingDir();
   });
 
@@ -39,7 +39,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       confirm: { shouldCreateNewProject: true },
       list: { projectType: 'other' },
     });
-    await step.run({});
+    await step.run({ options: {} });
     return confirmEmptyWorkingDir();
   });
 
@@ -50,7 +50,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
         list: { projectType: 'aws-nodejs' },
         input: { projectName: 'test-project' },
       });
-      await step.run({});
+      await step.run({ options: {} });
       const stats = await fsp.lstat('test-project/serverless.yml');
       expect(stats.isFile()).to.be.true;
     });
@@ -64,6 +64,16 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       const stats = await fsp.lstat('test-project-from-local-template/serverless.yml');
       expect(stats.isFile()).to.be.true;
     });
+
+    it('Should create project at not existing directory with provided `name`', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldCreateNewProject: true },
+        list: { projectType: 'aws-nodejs' },
+      });
+      await step.run({ options: { name: 'test-project-from-cli-option' } });
+      const stats = await fsp.lstat('test-project-from-cli-option/serverless.yml');
+      expect(stats.isFile()).to.be.true;
+    });
   });
 
   it('Should not allow project creation in a directory in which already service is configured', async () => {
@@ -75,21 +85,44 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
 
     await fsp.mkdir('existing');
 
-    await expect(step.run({})).to.eventually.be.rejected.and.have.property(
+    await expect(step.run({ options: {} })).to.eventually.be.rejected.and.have.property(
       'code',
       'INVALID_ANSWER'
     );
   });
 
+  it('Should not allow project creation in a directory in which already service is configured when `name` flag provided', async () => {
+    configureInquirerStub(inquirer, {
+      confirm: { shouldCreateNewProject: true },
+      list: { projectType: 'aws-nodejs' },
+    });
+
+    await fsp.mkdir('anotherexisting');
+
+    await expect(
+      step.run({ options: { name: 'anotherexisting' } })
+    ).to.eventually.be.rejected.and.have.property('code', 'TARGET_FOLDER_ALREADY_EXISTS');
+  });
+
   it('Should not allow project creation using an invalid project name', async () => {
     configureInquirerStub(inquirer, {
       confirm: { shouldCreateNewProject: true },
       list: { projectType: 'aws-nodejs' },
       input: { projectName: 'elo grzegżółka' },
     });
-    await expect(step.run({})).to.eventually.be.rejected.and.have.property(
+    await expect(step.run({ options: {} })).to.eventually.be.rejected.and.have.property(
       'code',
       'INVALID_ANSWER'
     );
   });
+
+  it('Should not allow project creation using an invalid project name when `name` flag provided', async () => {
+    configureInquirerStub(inquirer, {
+      confirm: { shouldCreateNewProject: true },
+      list: { projectType: 'aws-nodejs' },
+    });
+    await expect(
+      step.run({ options: { name: 'elo grzegżółka' } })
+    ).to.eventually.be.rejected.and.have.property('code', 'INVALID_PROJECT_NAME');
+  });
 });
diff --git a/test/unit/lib/utils/create-from-local-template.test.js b/test/unit/lib/utils/create-from-local-template.test.js
index f37acab3b57..4abe6c35f5e 100644
--- a/test/unit/lib/utils/create-from-local-template.test.js
+++ b/test/unit/lib/utils/create-from-local-template.test.js
@@ -17,7 +17,7 @@ describe('test/unit/lib/utils/create-from-local-template.test.js', () => {
   describe('Without `projectName` provided', () => {
     it('should create from template referenced locally', async () => {
       const tmpDirPath = path.join(getTmpDirPath(), 'some-service');
-      createFromLocalTemplate({
+      await createFromLocalTemplate({
         templatePath: path.join(templatesPath, 'aws-nodejs'),
         projectDir: tmpDirPath,
       });
@@ -29,23 +29,21 @@ describe('test/unit/lib/utils/create-from-local-template.test.js', () => {
   describe('When `templatePath` does not exist', () => {
     it('should result in an error', async () => {
       const tmpDirPath = path.join(getTmpDirPath(), 'some-service');
-      expect(() =>
+      await expect(
         createFromLocalTemplate({
           templatePath: path.join(templatesPath, 'nonexistent'),
           projectDir: tmpDirPath,
         })
-      )
-        .to.throw()
-        .and.have.property('code', 'INVALID_TEMPLATE_PATH');
+      ).to.eventually.be.rejected.and.have.property('code', 'INVALID_TEMPLATE_PATH');
     });
   });
 
   describe('With `projectName` provided', () => {
     let tmpDirPath;
 
-    before(() => {
+    before(async () => {
       tmpDirPath = path.join(getTmpDirPath(), 'some-service');
-      createFromLocalTemplate({
+      await createFromLocalTemplate({
         templatePath: path.join(templatesPath, 'fn-nodejs'),
         projectDir: tmpDirPath,
         projectName: 'testproj',

From e63302bcb5cd8e20db4272d1d73b6c9e4cb09958 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 13 May 2021 13:08:12 +0200
Subject: [PATCH 0106/1101] feat(CLI Onboarding): Skip "enable" question when
 options provided

---
 lib/cli/interactive-setup/service.js                | 11 +++++++----
 test/unit/lib/cli/interactive-setup/service.test.js |  8 ++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index 7b89dd835a8..00a67ca1ba0 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -91,10 +91,13 @@ module.exports = {
   },
   async run(context) {
     const workingDir = context.cwd || process.cwd();
-    const isConfirmed = await confirm('No project detected. Do you want to create a new one?', {
-      name: 'shouldCreateNewProject',
-    });
-    if (!isConfirmed) return;
+
+    if (!context.options.name && !context.options['template-path']) {
+      const isConfirmed = await confirm('No project detected. Do you want to create a new one?', {
+        name: 'shouldCreateNewProject',
+      });
+      if (!isConfirmed) return;
+    }
 
     let projectDir;
     let projectName;
diff --git a/test/unit/lib/cli/interactive-setup/service.test.js b/test/unit/lib/cli/interactive-setup/service.test.js
index 089b1e643e4..c678034d82d 100644
--- a/test/unit/lib/cli/interactive-setup/service.test.js
+++ b/test/unit/lib/cli/interactive-setup/service.test.js
@@ -22,9 +22,9 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
   afterEach(() => sinon.restore());
 
   it('Should be not applied, when at service path', () =>
-    expect(step.isApplicable({ serviceDir: '/foo' })).to.equal(false));
+    expect(step.isApplicable({ serviceDir: '/foo', options: {} })).to.equal(false));
   it('Should be applied, when not at service path', () =>
-    expect(step.isApplicable({})).to.equal(true));
+    expect(step.isApplicable({ options: {} })).to.equal(true));
 
   it("Should abort if user doesn't want setup", async () => {
     configureInquirerStub(inquirer, {
@@ -57,7 +57,6 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
 
     it('Should create project at not existing directory from a provided `template-path`', async () => {
       configureInquirerStub(inquirer, {
-        confirm: { shouldCreateNewProject: true },
         input: { projectName: 'test-project-from-local-template' },
       });
       await step.run({ options: { 'template-path': path.join(templatesPath, 'aws-nodejs') } });
@@ -67,7 +66,6 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
 
     it('Should create project at not existing directory with provided `name`', async () => {
       configureInquirerStub(inquirer, {
-        confirm: { shouldCreateNewProject: true },
         list: { projectType: 'aws-nodejs' },
       });
       await step.run({ options: { name: 'test-project-from-cli-option' } });
@@ -93,7 +91,6 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
 
   it('Should not allow project creation in a directory in which already service is configured when `name` flag provided', async () => {
     configureInquirerStub(inquirer, {
-      confirm: { shouldCreateNewProject: true },
       list: { projectType: 'aws-nodejs' },
     });
 
@@ -118,7 +115,6 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
 
   it('Should not allow project creation using an invalid project name when `name` flag provided', async () => {
     configureInquirerStub(inquirer, {
-      confirm: { shouldCreateNewProject: true },
       list: { projectType: 'aws-nodejs' },
     });
     await expect(

From 7e8e1b62bb2b454ba23387a4c93b906b6de07890 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 13 May 2021 13:11:42 +0200
Subject: [PATCH 0107/1101] feat(CLI Onboarding): Dont allow setup with options
 in service dir

---
 lib/cli/interactive-setup/service.js                | 9 ++++++++-
 test/unit/lib/cli/interactive-setup/service.test.js | 8 ++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index 00a67ca1ba0..2acd167c345 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -86,7 +86,14 @@ const resolveProjectNameInput = async (options, workingDir) => {
 };
 
 module.exports = {
-  isApplicable({ serviceDir }) {
+  isApplicable({ options, serviceDir }) {
+    if (serviceDir && (options.name || options['template-path'])) {
+      throw new ServerlessError(
+        'Cannot setup a new service when being in context of another service ("--name" and "--template-path" options cannot be applied)',
+        'NOT_APPLICABLE_SERVICE_OPTIONS'
+      );
+    }
+
     return !serviceDir;
   },
   async run(context) {
diff --git a/test/unit/lib/cli/interactive-setup/service.test.js b/test/unit/lib/cli/interactive-setup/service.test.js
index c678034d82d..2782f5ba3f4 100644
--- a/test/unit/lib/cli/interactive-setup/service.test.js
+++ b/test/unit/lib/cli/interactive-setup/service.test.js
@@ -26,6 +26,14 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
   it('Should be applied, when not at service path', () =>
     expect(step.isApplicable({ options: {} })).to.equal(true));
 
+  it('Should result in an error when at service path with `template-path` options provided', () => {
+    expect(() =>
+      step.isApplicable({ serviceDir: '/foo', options: { 'template-path': 'path/to/template' } })
+    )
+      .to.throw()
+      .and.have.property('code', 'NOT_APPLICABLE_SERVICE_OPTIONS');
+  });
+
   it("Should abort if user doesn't want setup", async () => {
     configureInquirerStub(inquirer, {
       confirm: { shouldCreateNewProject: false },

From 2aaf7e6acaadd0f065f6040ab17e4877fcd652a6 Mon Sep 17 00:00:00 2001
From: Joseph Cha <josephcha4@gmail.com>
Date: Mon, 17 May 2021 20:41:47 +1000
Subject: [PATCH 0108/1101] test: Refactor `aws/invoke.test.js` unit tests
 (#9477)

---
 test/unit/lib/plugins/aws/invoke.test.js | 467 +++++++++--------------
 1 file changed, 178 insertions(+), 289 deletions(-)

diff --git a/test/unit/lib/plugins/aws/invoke.test.js b/test/unit/lib/plugins/aws/invoke.test.js
index ce032ac2b83..709342d35f4 100644
--- a/test/unit/lib/plugins/aws/invoke.test.js
+++ b/test/unit/lib/plugins/aws/invoke.test.js
@@ -3,244 +3,16 @@
 const chai = require('chai');
 const sinon = require('sinon');
 const path = require('path');
-const proxyquire = require('proxyquire');
-const AwsProvider = require('../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../lib/Serverless');
 const { getTmpDirPath } = require('../../../../utils/fs');
 const runServerless = require('../../../../utils/run-serverless');
 const ServerlessError = require('../../../../../lib/serverless-error');
+const fixtures = require('../../../../fixtures/programmatic');
 
 chai.use(require('chai-as-promised'));
 chai.use(require('sinon-chai'));
 
 const expect = chai.expect;
 
-describe('AwsInvoke', () => {
-  let AwsInvoke;
-  let awsInvoke;
-  let serverless;
-  let stdinStub;
-  const options = {
-    stage: 'dev',
-    region: 'us-east-1',
-    function: 'first',
-  };
-
-  beforeEach(() => {
-    stdinStub = sinon.stub().resolves('');
-    AwsInvoke = proxyquire('../../../../../lib/plugins/aws/invoke', {
-      'get-stdin': stdinStub,
-    });
-    serverless = new Serverless();
-    serverless.setProvider('aws', new AwsProvider(serverless, options));
-    serverless.processedInput = { commands: ['invoke'] };
-    awsInvoke = new AwsInvoke(serverless, options);
-  });
-
-  describe('#extendedValidate()', () => {
-    let backupIsTTY;
-    beforeEach(() => {
-      serverless.serviceDir = true;
-      serverless.service.environment = {
-        vars: {},
-        stages: {
-          dev: {
-            vars: {},
-            regions: {
-              'us-east-1': {
-                vars: {},
-              },
-            },
-          },
-        },
-      };
-      serverless.service.functions = {
-        first: {
-          handler: true,
-        },
-      };
-      awsInvoke.options.data = null;
-      awsInvoke.options.path = false;
-      awsInvoke.provider.cachedCredentials = { accessKeyId: 'foo', secretAccessKey: 'bar' };
-
-      // Ensure there's no attempt to read path from stdin
-      backupIsTTY = process.stdin.isTTY;
-      process.stdin.isTTY = true;
-    });
-
-    afterEach(() => {
-      if (backupIsTTY) process.stdin.isTTY = backupIsTTY;
-      else delete process.stdin.isTTY;
-    });
-
-    it('it should throw error if function is not provided', () => {
-      serverless.service.functions = null;
-      return expect(awsInvoke.extendedValidate()).to.be.rejected;
-    });
-
-    it('should not throw error when there is no input data', async () => {
-      awsInvoke.options.data = undefined;
-
-      await expect(awsInvoke.extendedValidate()).to.be.fulfilled;
-
-      expect(awsInvoke.options.data).to.equal('');
-    });
-
-    it('should keep data if it is a simple string', async () => {
-      awsInvoke.options.data = 'simple-string';
-
-      await expect(awsInvoke.extendedValidate()).to.be.fulfilled;
-
-      expect(awsInvoke.options.data).to.equal('simple-string');
-    });
-
-    it('should parse data if it is a json string', async () => {
-      awsInvoke.options.data = '{"key": "value"}';
-
-      await expect(awsInvoke.extendedValidate()).to.be.fulfilled;
-
-      expect(awsInvoke.options.data).to.deep.equal({ key: 'value' });
-    });
-
-    it('should skip parsing data if "raw" requested', async () => {
-      awsInvoke.options.data = '{"key": "value"}';
-      awsInvoke.options.raw = true;
-
-      await expect(awsInvoke.extendedValidate()).to.be.fulfilled;
-
-      expect(awsInvoke.options.data).to.deep.equal('{"key": "value"}');
-    });
-
-    it('it should parse file if relative file path is provided', async () => {
-      serverless.serviceDir = getTmpDirPath();
-      const data = {
-        testProp: 'testValue',
-      };
-      serverless.utils.writeFileSync(
-        path.join(serverless.serviceDir, 'data.json'),
-        JSON.stringify(data)
-      );
-      awsInvoke.options.path = 'data.json';
-
-      await expect(awsInvoke.extendedValidate()).to.be.fulfilled;
-
-      expect(awsInvoke.options.data).to.deep.equal(data);
-    });
-
-    it('it should parse file if absolute file path is provided', async () => {
-      serverless.serviceDir = getTmpDirPath();
-      const data = {
-        testProp: 'testValue',
-      };
-      const dataFile = path.join(serverless.serviceDir, 'data.json');
-      serverless.utils.writeFileSync(dataFile, JSON.stringify(data));
-      awsInvoke.options.path = dataFile;
-
-      await expect(awsInvoke.extendedValidate()).to.be.fulfilled;
-
-      expect(awsInvoke.options.data).to.deep.equal(data);
-    });
-
-    it('it should parse a yaml file if file path is provided', async () => {
-      serverless.serviceDir = getTmpDirPath();
-      const yamlContent = 'testProp: testValue';
-
-      serverless.utils.writeFileSync(path.join(serverless.serviceDir, 'data.yml'), yamlContent);
-      awsInvoke.options.path = 'data.yml';
-
-      await expect(awsInvoke.extendedValidate()).to.be.fulfilled;
-
-      expect(awsInvoke.options.data).to.deep.equal({
-        testProp: 'testValue',
-      });
-    });
-
-    it('it should throw error if file path does not exist', () => {
-      serverless.serviceDir = getTmpDirPath();
-      awsInvoke.options.path = 'some/path';
-
-      return expect(awsInvoke.extendedValidate()).to.be.rejectedWith(
-        'The file you provided does not exist.'
-      );
-    });
-
-    it('should resolve if path is not given', () => {
-      awsInvoke.options.path = false;
-      return expect(awsInvoke.extendedValidate()).to.be.fulfilled;
-    });
-  });
-
-  describe('#invoke()', () => {
-    let invokeStub;
-    beforeEach(() => {
-      invokeStub = sinon.stub(awsInvoke.provider, 'request').resolves();
-      awsInvoke.serverless.service.service = 'new-service';
-      awsInvoke.options = {
-        stage: 'dev',
-        function: 'first',
-        functionObj: {
-          name: 'customName',
-        },
-      };
-    });
-
-    it('should invoke with other invocation type', async () => {
-      awsInvoke.options.type = 'OtherType';
-
-      await awsInvoke.invoke();
-      expect(invokeStub.calledOnce).to.be.equal(true);
-      expect(
-        invokeStub.calledWithExactly('Lambda', 'invoke', {
-          FunctionName: 'customName',
-          InvocationType: 'OtherType',
-          LogType: 'None',
-          Payload: Buffer.from(JSON.stringify({})),
-        })
-      ).to.be.equal(true);
-      awsInvoke.provider.request.restore();
-    });
-
-    it('should be able to invoke with a qualifier', async () => {
-      awsInvoke.options.qualifier = 'somelongqualifier';
-
-      await awsInvoke.invoke();
-
-      expect(invokeStub.calledOnce).to.be.equal(true);
-
-      expect(
-        invokeStub.calledWithExactly('Lambda', 'invoke', {
-          FunctionName: 'customName',
-          InvocationType: 'RequestResponse',
-          LogType: 'None',
-          Payload: Buffer.from(JSON.stringify({})),
-          Qualifier: 'somelongqualifier',
-        })
-      ).to.be.equal(true);
-
-      awsInvoke.provider.request.restore();
-    });
-  });
-
-  describe('#log()', () => {
-    it('rejects the promise for failed invocations', () => {
-      const invocationReplyMock = {
-        Payload: `
-        {
-         "testProp": "testValue"
-        }
-        `,
-        LogResult: 'test',
-        FunctionError: true,
-      };
-
-      return expect(() => awsInvoke.log(invocationReplyMock)).to.throw(
-        Error,
-        'Invoked function failed'
-      );
-    });
-  });
-});
-
 describe('test/unit/lib/plugins/aws/invoke.test.js', () => {
   describe('Common', () => {
     let lambdaInvokeStub;
@@ -281,9 +53,13 @@ describe('test/unit/lib/plugins/aws/invoke.test.js', () => {
       });
     });
 
-    xit('TODO: should support JSON string data', async () => {
-      // Replaces
-      // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L123-L129
+    it('should support JSON string data', async () => {
+      expect(lambdaInvokeStub).to.be.calledWith({
+        FunctionName: result.serverless.service.getFunction('callback').name,
+        InvocationType: 'RequestResponse',
+        LogType: 'Tail',
+        Payload: Buffer.from(JSON.stringify({ inputKey: 'inputValue' })),
+      });
     });
 
     it('should log payload', () => {
@@ -293,37 +69,60 @@ describe('test/unit/lib/plugins/aws/invoke.test.js', () => {
     });
   });
 
-  xit('TODO: should accept no data', async () => {
-    await runServerless({
+  it('should accept no data', async () => {
+    const lambdaInvokeStub = sinon.stub();
+    const result = await runServerless({
       fixture: 'invocation',
       command: 'invoke',
-      options: { function: 'callback' },
+      options: {
+        function: 'callback',
+      },
       awsRequestStubMap: {
-        // Stub AWS SDK invocation, and confirm `Payload` param
+        Lambda: {
+          invoke: (args) => {
+            lambdaInvokeStub.returns('payload');
+            return lambdaInvokeStub(args);
+          },
+        },
       },
     });
-    // Replaces
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L107-L113
+    expect(lambdaInvokeStub.args[0][0]).to.deep.equal({
+      FunctionName: result.serverless.service.getFunction('callback').name,
+      InvocationType: 'RequestResponse',
+      LogType: 'None',
+      Payload: Buffer.from('{}'),
+    });
   });
 
-  xit('TODO: should support plain string data', async () => {
-    await runServerless({
+  it('should support plain string data', async () => {
+    const lambdaInvokeStub = sinon.stub();
+    const result = await runServerless({
       fixture: 'invocation',
       command: 'invoke',
       options: {
         function: 'callback',
-        data: 'inputData',
+        data: 'simple-string',
       },
       awsRequestStubMap: {
-        // Stub AWS SDK invocation, and confirm `Payload` param
+        Lambda: {
+          invoke: (args) => {
+            lambdaInvokeStub.returns('payload');
+            return lambdaInvokeStub(args);
+          },
+        },
       },
     });
-    // Replaces
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L115-L121
+    expect(lambdaInvokeStub.args[0][0]).to.deep.equal({
+      FunctionName: result.serverless.service.getFunction('callback').name,
+      InvocationType: 'RequestResponse',
+      LogType: 'None',
+      Payload: Buffer.from(JSON.stringify('simple-string')),
+    });
   });
 
-  xit('TODO: should should not attempt to parse data with raw option', async () => {
-    await runServerless({
+  it('should should not attempt to parse data with raw option', async () => {
+    const lambdaInvokeStub = sinon.stub();
+    const result = await runServerless({
       fixture: 'invocation',
       command: 'invoke',
       options: {
@@ -332,15 +131,25 @@ describe('test/unit/lib/plugins/aws/invoke.test.js', () => {
         raw: true,
       },
       awsRequestStubMap: {
-        // Stub AWS SDK invocation, and confirm `Payload` param
+        Lambda: {
+          invoke: (args) => {
+            lambdaInvokeStub.returns('payload');
+            return lambdaInvokeStub(args);
+          },
+        },
       },
     });
-    // Replaces
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L131-L138
+    expect(lambdaInvokeStub.args[0][0]).to.deep.equal({
+      FunctionName: result.serverless.service.getFunction('callback').name,
+      InvocationType: 'RequestResponse',
+      LogType: 'None',
+      Payload: Buffer.from(JSON.stringify('{"inputKey":"inputValue"}')),
+    });
   });
 
-  xit('TODO: should support JSON file path as data', async () => {
-    await runServerless({
+  it('should support JSON file path as data', async () => {
+    const lambdaInvokeStub = sinon.stub();
+    const result = await runServerless({
       fixture: 'invocation',
       command: 'invoke',
       options: {
@@ -348,31 +157,53 @@ describe('test/unit/lib/plugins/aws/invoke.test.js', () => {
         path: 'payload.json',
       },
       awsRequestStubMap: {
-        // Stub AWS SDK invocation, and confirm `Payload` param
+        Lambda: {
+          invoke: (args) => {
+            lambdaInvokeStub.returns('payload');
+            return lambdaInvokeStub(args);
+          },
+        },
       },
     });
-    // Replaces
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L140-L154
+    expect(lambdaInvokeStub.args[0][0]).to.deep.equal({
+      FunctionName: result.serverless.service.getFunction('callback').name,
+      InvocationType: 'RequestResponse',
+      LogType: 'None',
+      Payload: Buffer.from(JSON.stringify({ dataInputKey: 'dataInputValue' })),
+    });
   });
 
-  xit('TODO: should support absolute file path as data', async () => {
-    await runServerless({
-      fixture: 'invocation',
+  it('should support absolute file path as data', async () => {
+    const lambdaInvokeStub = sinon.stub();
+    const { servicePath: serviceDir } = await fixtures.setup('invocation');
+    const pathToPayload = path.join(serviceDir, 'payload.json');
+    const result = await runServerless({
+      cwd: serviceDir,
       command: 'invoke',
       options: {
         function: 'callback',
-        path: '' /* TODO: Pass absolute path to payload.json in fixture */,
+        path: pathToPayload,
       },
       awsRequestStubMap: {
-        // Stub AWS SDK invocation, and confirm `Payload` param
+        Lambda: {
+          invoke: (args) => {
+            lambdaInvokeStub.returns('payload');
+            return lambdaInvokeStub(args);
+          },
+        },
       },
     });
-    // Replaces
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L156-L168
+    expect(lambdaInvokeStub.args[0][0]).to.deep.equal({
+      FunctionName: result.serverless.service.getFunction('callback').name,
+      InvocationType: 'RequestResponse',
+      LogType: 'None',
+      Payload: Buffer.from(JSON.stringify({ dataInputKey: 'dataInputValue' })),
+    });
   });
 
-  xit('TODO: should support YAML file path as data', async () => {
-    await runServerless({
+  it('should support YAML file path as data', async () => {
+    const lambdaInvokeStub = sinon.stub();
+    const result = await runServerless({
       fixture: 'invocation',
       command: 'invoke',
       options: {
@@ -380,14 +211,23 @@ describe('test/unit/lib/plugins/aws/invoke.test.js', () => {
         path: 'payload.yaml',
       },
       awsRequestStubMap: {
-        // Stub AWS SDK invocation, and confirm `Payload` param
+        Lambda: {
+          invoke: (args) => {
+            lambdaInvokeStub.returns('payload');
+            return lambdaInvokeStub(args);
+          },
+        },
       },
     });
-    // Replaces
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L170-L185
+    expect(lambdaInvokeStub.args[0][0]).to.deep.equal({
+      FunctionName: result.serverless.service.getFunction('callback').name,
+      InvocationType: 'RequestResponse',
+      LogType: 'None',
+      Payload: Buffer.from(JSON.stringify({ dataInputKey: 'dataInputValue' })),
+    });
   });
 
-  xit('TODO: should throw error if data file path does not exist', async () => {
+  it('should throw error if data file path does not exist', async () => {
     await expect(
       runServerless({
         fixture: 'invocation',
@@ -397,25 +237,22 @@ describe('test/unit/lib/plugins/aws/invoke.test.js', () => {
           path: 'not-existing.yaml',
         },
       })
-    ).to.eventually.be.rejected.and.have.property('code', 'TODO');
-    // Replaces
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L192-L199
+    ).to.eventually.be.rejected.and.have.property('code', 'FILE_NOT_FOUND');
   });
 
-  xit('TODO: should throw error if function is not provided', async () => {
+  it('should throw error if function is not provided', async () => {
     await expect(
       runServerless({
         fixture: 'invocation',
         command: 'invoke',
         options: { function: 'notExisting' },
       })
-    ).to.eventually.be.rejected.and.have.property('code', 'TODO');
-    // Replaces
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L102-L105
+    ).to.eventually.be.rejected.and.have.property('code', 'FUNCTION_MISSING_IN_SERVICE');
   });
 
-  xit('TODO: should support --type option', async () => {
-    await runServerless({
+  it('should support --type option', async () => {
+    const lambdaInvokeStub = sinon.stub();
+    const result = await runServerless({
       fixture: 'invocation',
       command: 'invoke',
       options: {
@@ -423,15 +260,25 @@ describe('test/unit/lib/plugins/aws/invoke.test.js', () => {
         type: 'Event',
       },
       awsRequestStubMap: {
-        // Stub AWS SDK invocation, and confirm `InvocationType` param
+        Lambda: {
+          invoke: (args) => {
+            lambdaInvokeStub.returns('payload');
+            return lambdaInvokeStub(args);
+          },
+        },
       },
     });
-    // Replaces
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L253-L267
+    expect(lambdaInvokeStub.args[0][0]).to.deep.equal({
+      FunctionName: result.serverless.service.getFunction('callback').name,
+      InvocationType: 'Event',
+      LogType: 'None',
+      Payload: Buffer.from('{}'),
+    });
   });
 
-  xit('TODO: should support --qualifier option', async () => {
-    await runServerless({
+  it('should support --qualifier option', async () => {
+    const lambdaInvokeStub = sinon.stub();
+    const result = await runServerless({
       fixture: 'invocation',
       command: 'invoke',
       options: {
@@ -439,11 +286,21 @@ describe('test/unit/lib/plugins/aws/invoke.test.js', () => {
         qualifier: 'foo',
       },
       awsRequestStubMap: {
-        // Stub AWS SDK invocation, and confirm `Qualifier` param
+        Lambda: {
+          invoke: (args) => {
+            lambdaInvokeStub.returns('payload');
+            return lambdaInvokeStub(args);
+          },
+        },
       },
     });
-    // Replaces
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L269-L287
+    expect(lambdaInvokeStub.args[0][0]).to.deep.equal({
+      FunctionName: result.serverless.service.getFunction('callback').name,
+      InvocationType: 'RequestResponse',
+      LogType: 'None',
+      Qualifier: 'foo',
+      Payload: Buffer.from('{}'),
+    });
   });
 
   it('should support `--context` param', async () => {
@@ -573,18 +430,50 @@ describe('test/unit/lib/plugins/aws/invoke.test.js', () => {
     expect(lambdaInvokeStub).to.have.been.callCount(0);
   });
 
-  xit('TODO: should fail the process for failed invocations', async () => {
+  it('should fail the process for failed invocations', async () => {
+    const lambdaInvokeStub = sinon.stub();
     await expect(
       runServerless({
         fixture: 'invocation',
         command: 'invoke',
         options: {
           function: 'callback',
-          path: 'not-existing.yaml',
+        },
+        awsRequestStubMap: {
+          Lambda: {
+            invoke: (args) => {
+              lambdaInvokeStub.returns({
+                Payload: args.Payload,
+                LogResult: Buffer.from('test').toString('base64'),
+                FunctionError: true,
+              });
+              return lambdaInvokeStub(args);
+            },
+          },
+        },
+      })
+    ).to.be.eventually.rejectedWith(Error, 'Invoked function failed');
+  });
+
+  it('should resolve if path is not given', async () => {
+    const lambdaInvokeStub = sinon.stub();
+    await expect(
+      runServerless({
+        fixture: 'invocation',
+        command: 'invoke',
+        options: {
+          function: 'callback',
+          path: false,
+        },
+        awsRequestStubMap: {
+          Lambda: {
+            invoke: (args) => {
+              lambdaInvokeStub.returns('payload');
+              return lambdaInvokeStub(args);
+            },
+          },
         },
       })
-    ).to.eventually.be.rejected.and.have.property('code', 'TODO');
-    // Replace
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L317-L332
+    ).to.be.eventually.fulfilled;
   });
 });

From e4ea50d401628cb22612196b7e9b50c4344dab8a Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 14 May 2021 16:18:17 +0200
Subject: [PATCH 0109/1101] feat(CLI Onboarding): Fetch templates from
 `serverless/examples`

---
 lib/cli/interactive-setup/service.js          | 36 ++++++++---
 lib/utils/downloadTemplateFromRepo.js         |  6 +-
 .../lib/cli/interactive-setup/index.test.js   | 26 ++++----
 .../lib/cli/interactive-setup/service.test.js | 61 ++++++++++++++++++-
 4 files changed, 104 insertions(+), 25 deletions(-)

diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index 2acd167c345..28dc893e5cf 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -2,21 +2,32 @@
 
 const { join } = require('path');
 const chalk = require('chalk');
-const fs = require('fs');
+const fsp = require('fs').promises;
 const inquirer = require('@serverless/utils/inquirer');
 const resolveConfigurationPath = require('../resolve-configuration-path');
 const readConfiguration = require('../../configuration/read');
-const createFromTemplate = require('../../utils/createFromTemplate');
 const resolveVariables = require('../../configuration/variables');
 const { confirm } = require('./utils');
 const createFromLocalTemplate = require('../../utils/create-from-local-template');
 const ServerlessError = require('../../serverless-error');
+const { downloadTemplateFromRepo } = require('../../utils/downloadTemplateFromRepo');
 
 const isValidServiceName = RegExp.prototype.test.bind(/^[a-zA-Z][a-zA-Z0-9-]{0,100}$/);
 
 const initializeProjectChoices = [
-  { name: 'AWS Node.js', value: 'aws-nodejs' },
-  { name: 'AWS Python', value: 'aws-python3' },
+  { name: 'AWS - Node.js - Empty', value: 'aws-node' },
+  { name: 'AWS - Node.js - REST API', value: 'aws-node-rest-api' },
+  { name: 'AWS - Node.js - Scheduled Task', value: 'aws-node-scheduled-cron' },
+  { name: 'AWS - Node.js - SQS Worker', value: 'aws-node-sqs-worker' },
+  { name: 'AWS - Node.js - Express API', value: 'aws-node-express-api' },
+  { name: 'AWS - Node.js - Express API with DynamoDB', value: 'aws-node-express-dynamodb-api' },
+
+  { name: 'AWS - Python - Empty', value: 'aws-python' },
+  { name: 'AWS - Python - REST API', value: 'aws-python-rest-api' },
+  { name: 'AWS - Python - Scheduled Task', value: 'aws-python-scheduled-cron' },
+  { name: 'AWS - Python - SQS Worker', value: 'aws-python-sqs-worker' },
+  { name: 'AWS - Python - Flask API', value: 'aws-python-flask-api' },
+  { name: 'AWS - Python - Flask API with DynamoDB', value: 'aws-python-flask-dynamodb-api' },
   { name: 'Other', value: 'other' },
 ];
 
@@ -27,6 +38,7 @@ const projectTypeChoice = async () =>
       type: 'list',
       name: 'projectType',
       choices: initializeProjectChoices,
+      pageSize: 13,
     })
   ).projectType;
 
@@ -49,7 +61,7 @@ const projectNameInput = async (workingDir) =>
         }
 
         try {
-          await fs.promises.access(join(workingDir, input));
+          await fsp.access(join(workingDir, input));
           return `Path ${input} is already taken`;
         } catch {
           return true;
@@ -66,7 +78,7 @@ const resolveProjectNameInput = async (options, workingDir) => {
 
     let alreadyTaken = false;
     try {
-      await fs.promises.access(join(workingDir, options.name));
+      await fsp.access(join(workingDir, options.name));
       alreadyTaken = true;
     } catch {
       // Pass
@@ -127,13 +139,21 @@ module.exports = {
       }
       projectName = await resolveProjectNameInput(context.options, workingDir);
       projectDir = join(workingDir, projectName);
-      await createFromTemplate(projectType, projectDir);
+      const templateUrl = `https://github.com/serverless/examples/tree/master/${projectType}`;
+      try {
+        process.stdout.write(`\n${chalk.green(`Downloading "${projectType}" template...`)}\n`);
+        await downloadTemplateFromRepo(templateUrl, projectType, projectName, true);
+      } catch (err) {
+        throw new ServerlessError(
+          'Could not download template. Ensure that you are using the latest version of Serverless Framework.',
+          'TEMPLATE_DOWNLOAD_FAILED'
+        );
+      }
     }
 
     process.stdout.write(
       `\n${chalk.green(`Project successfully created in '${projectName}' folder.`)}\n`
     );
-
     context.serviceDir = projectDir;
     const configurationPath = await resolveConfigurationPath({ cwd: projectDir, options: {} });
     context.configurationFilename = configurationPath.slice(projectDir.length + 1);
diff --git a/lib/utils/downloadTemplateFromRepo.js b/lib/utils/downloadTemplateFromRepo.js
index 63816ad8d1c..5999a7e7021 100644
--- a/lib/utils/downloadTemplateFromRepo.js
+++ b/lib/utils/downloadTemplateFromRepo.js
@@ -254,7 +254,7 @@ function parseRepoURL(inputUrl) {
  * @param {string} [path]
  * @returns {Promise}
  */
-function downloadTemplateFromRepo(inputUrl, templateName, downloadPath) {
+function downloadTemplateFromRepo(inputUrl, templateName, downloadPath, silent = false) {
   return parseRepoURL(inputUrl).then((repoInformation) => {
     let serviceName;
     let dirName;
@@ -280,7 +280,9 @@ function downloadTemplateFromRepo(inputUrl, templateName, downloadPath) {
       throw new ServerlessError(errorMessage, 'TARGET_FOLDER_ALREADY_EXISTS');
     }
 
-    log(`Downloading and installing "${serviceName}"...`);
+    if (!silent) {
+      log(`Downloading and installing "${serviceName}"...`);
+    }
 
     if (isPlainGitURL(inputUrl)) {
       return spawn('git', ['clone', inputUrl, downloadServicePath]).then(() => {
diff --git a/test/unit/lib/cli/interactive-setup/index.test.js b/test/unit/lib/cli/interactive-setup/index.test.js
index 12084579790..24f68f0e5ff 100644
--- a/test/unit/lib/cli/interactive-setup/index.test.js
+++ b/test/unit/lib/cli/interactive-setup/index.test.js
@@ -7,26 +7,26 @@ const path = require('path');
 const isTabCompletionSupported = require('../../../../../lib/utils/tabCompletion/isSupported');
 
 const serverlessPath = path.resolve(__dirname, '../../../../../scripts/serverless.js');
+const templatesPath = path.resolve(__dirname, '../../../../../lib/plugins/create/templates');
 
 describe('test/unit/lib/cli/interactive-setup/index.test.js', () => {
   it('should configure interactive setup flow', async () => {
-    const slsProcessPromise = spawn('node', [serverlessPath], {
-      env: {
-        ...process.env,
-        SLS_INTERACTIVE_SETUP_ENABLE: '1',
-        SLS_INTERACTIVE_SETUP_TEST: '1',
-        BROWSER: 'none',
-      },
-    });
+    const slsProcessPromise = spawn(
+      'node',
+      [serverlessPath, '--template-path', path.join(templatesPath, 'aws-nodejs')],
+      {
+        env: {
+          ...process.env,
+          SLS_INTERACTIVE_SETUP_ENABLE: '1',
+          SLS_INTERACTIVE_SETUP_TEST: '1',
+          BROWSER: 'none',
+        },
+      }
+    );
     const slsProcess = slsProcessPromise.child;
     let output = '';
     const program = [
       // service
-      {
-        instructionString: 'No project detected. Do you want to create a new one?',
-        input: 'Y',
-      },
-      { instructionString: 'AWS Node.js' },
       {
         instructionString: 'What do you want to call this project?',
         input: 'interactive-setup-test',
diff --git a/test/unit/lib/cli/interactive-setup/service.test.js b/test/unit/lib/cli/interactive-setup/service.test.js
index 2782f5ba3f4..3c097166606 100644
--- a/test/unit/lib/cli/interactive-setup/service.test.js
+++ b/test/unit/lib/cli/interactive-setup/service.test.js
@@ -5,6 +5,7 @@ const path = require('path');
 const sinon = require('sinon');
 const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
 const step = require('../../../../../lib/cli/interactive-setup/service');
+const proxyquire = require('proxyquire');
 
 const templatesPath = path.resolve(__dirname, '../../../../../lib/plugins/create/templates');
 
@@ -53,14 +54,37 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
 
   describe('Create new project', () => {
     it('Should create project at not existing directory', async () => {
+      const downloadTemplateFromRepoStub = sinon.stub();
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        '../../utils/downloadTemplateFromRepo': {
+          downloadTemplateFromRepo: downloadTemplateFromRepoStub.callsFake(
+            async (templateUrl, projectType, projectName) => {
+              await fsp.mkdir(projectName);
+              const serverlessYmlContent = `
+            service: service
+            provider:
+              name: aws
+           `;
+
+              await fsp.writeFile(path.join(projectName, 'serverless.yml'), serverlessYmlContent);
+            }
+          ),
+        },
+      });
+
       configureInquirerStub(inquirer, {
         confirm: { shouldCreateNewProject: true },
         list: { projectType: 'aws-nodejs' },
         input: { projectName: 'test-project' },
       });
-      await step.run({ options: {} });
+      await mockedStep.run({ options: {} });
       const stats = await fsp.lstat('test-project/serverless.yml');
       expect(stats.isFile()).to.be.true;
+      expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
+        'https://github.com/serverless/examples/tree/master/aws-nodejs',
+        'aws-nodejs',
+        'test-project'
+      );
     });
 
     it('Should create project at not existing directory from a provided `template-path`', async () => {
@@ -73,13 +97,46 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
     });
 
     it('Should create project at not existing directory with provided `name`', async () => {
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        '../../utils/downloadTemplateFromRepo': {
+          downloadTemplateFromRepo: sinon
+            .stub()
+            .callsFake(async (templateUrl, projectType, projectName) => {
+              await fsp.mkdir(projectName);
+              const serverlessYmlContent = `
+            service: service
+            provider:
+              name: aws
+           `;
+
+              await fsp.writeFile(path.join(projectName, 'serverless.yml'), serverlessYmlContent);
+            }),
+        },
+      });
       configureInquirerStub(inquirer, {
         list: { projectType: 'aws-nodejs' },
       });
-      await step.run({ options: { name: 'test-project-from-cli-option' } });
+      await mockedStep.run({ options: { name: 'test-project-from-cli-option' } });
       const stats = await fsp.lstat('test-project-from-cli-option/serverless.yml');
       expect(stats.isFile()).to.be.true;
     });
+
+    it('Should throw an error when template cannot be downloaded', async () => {
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        '../../utils/downloadTemplateFromRepo': {
+          downloadTemplateFromRepo: sinon.stub().rejects(),
+        },
+      });
+      configureInquirerStub(inquirer, {
+        confirm: { shouldCreateNewProject: true },
+        list: { projectType: 'aws-nodejs' },
+        input: { projectName: 'test-error-during-download' },
+      });
+      await expect(mockedStep.run({ options: {} })).to.be.eventually.rejected.and.have.property(
+        'code',
+        'TEMPLATE_DOWNLOAD_FAILED'
+      );
+    });
   });
 
   it('Should not allow project creation in a directory in which already service is configured', async () => {

From acc9010d7906dc7e56a97b60e25bf1920f402925 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 14 May 2021 16:19:19 +0200
Subject: [PATCH 0110/1101] feat(CLI Onboarding): Run `npm i` after fetching
 template

---
 lib/cli/interactive-setup/service.js          |  30 +++++
 .../lib/cli/interactive-setup/service.test.js | 110 ++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index 28dc893e5cf..aa94f17fa18 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -3,12 +3,14 @@
 const { join } = require('path');
 const chalk = require('chalk');
 const fsp = require('fs').promises;
+const spawn = require('child-process-ext/spawn');
 const inquirer = require('@serverless/utils/inquirer');
 const resolveConfigurationPath = require('../resolve-configuration-path');
 const readConfiguration = require('../../configuration/read');
 const resolveVariables = require('../../configuration/variables');
 const { confirm } = require('./utils');
 const createFromLocalTemplate = require('../../utils/create-from-local-template');
+const npmCommandDeferred = require('../../utils/npm-command-deferred');
 const ServerlessError = require('../../serverless-error');
 const { downloadTemplateFromRepo } = require('../../utils/downloadTemplateFromRepo');
 
@@ -151,6 +153,34 @@ module.exports = {
       }
     }
 
+    let hasPackageJson = false;
+    try {
+      await fsp.access(join(projectDir, 'package.json'));
+      hasPackageJson = true;
+    } catch {
+      // pass
+    }
+
+    if (hasPackageJson) {
+      process.stdout.write(
+        `\n${chalk.green(`Installing dependencies with "npm" in "${projectName}" folder.`)}\n`
+      );
+      const npmCommand = await npmCommandDeferred;
+      try {
+        await spawn(npmCommand, ['install'], { cwd: projectDir });
+      } catch (err) {
+        if (err.code === 'ENOENT') {
+          process.stdout.write(
+            `\n${chalk.yellow(
+              'Cannot install dependencies as "npm" installation could not be found. Please install npm and run "npm install" in directory of created service.'
+            )}\n`
+          );
+        } else {
+          throw new ServerlessError(`Cannot install dependencies: ${err.message}`, 'DEPENDENCIES_INSTALL_FAILED');
+        }
+      }
+    }
+
     process.stdout.write(
       `\n${chalk.green(`Project successfully created in '${projectName}' folder.`)}\n`
     );
diff --git a/test/unit/lib/cli/interactive-setup/service.test.js b/test/unit/lib/cli/interactive-setup/service.test.js
index 3c097166606..fe23fef3aea 100644
--- a/test/unit/lib/cli/interactive-setup/service.test.js
+++ b/test/unit/lib/cli/interactive-setup/service.test.js
@@ -6,12 +6,14 @@ const sinon = require('sinon');
 const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
 const step = require('../../../../../lib/cli/interactive-setup/service');
 const proxyquire = require('proxyquire');
+const overrideStdoutWrite = require('process-utils/override-stdout-write');
 
 const templatesPath = path.resolve(__dirname, '../../../../../lib/plugins/create/templates');
 
 const { expect } = chai;
 
 chai.use(require('chai-as-promised'));
+chai.use(require('sinon-chai'));
 
 const fsp = require('fs').promises;
 const inquirer = require('@serverless/utils/inquirer');
@@ -87,6 +89,114 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       );
     });
 
+    it('Should run `npm install` if `package.json` present', async () => {
+      const downloadTemplateFromRepoStub = sinon.stub();
+      const spawnStub = sinon.stub();
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        'child-process-ext/spawn': spawnStub,
+        '../../utils/downloadTemplateFromRepo': {
+          downloadTemplateFromRepo: downloadTemplateFromRepoStub.callsFake(
+            async (templateUrl, projectType, projectName) => {
+              await fsp.mkdir(projectName);
+              const serverlessYmlContent = `
+            service: service
+            provider:
+              name: aws
+           `;
+
+              await fsp.writeFile(path.join(projectName, 'serverless.yml'), serverlessYmlContent);
+              await fsp.writeFile(path.join(projectName, 'package.json'), '{}');
+            }
+          ),
+        },
+      });
+
+      configureInquirerStub(inquirer, {
+        confirm: { shouldCreateNewProject: true },
+        list: { projectType: 'aws-nodejs' },
+        input: { projectName: 'test-project-package-json' },
+      });
+      await mockedStep.run({ options: {} });
+      const stats = await fsp.lstat('test-project-package-json/serverless.yml');
+      expect(stats.isFile()).to.be.true;
+      expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
+        'https://github.com/serverless/examples/tree/master/aws-nodejs',
+        'aws-nodejs',
+        'test-project-package-json'
+      );
+      expect(spawnStub).to.have.been.calledWith('npm', ['install'], {
+        cwd: path.join(process.cwd(), 'test-project-package-json'),
+      });
+    });
+
+    it('Should emit warning if npm installation not found', async () => {
+      const downloadTemplateFromRepoStub = sinon.stub();
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        'child-process-ext/spawn': sinon.stub().rejects({ code: 'ENOENT' }),
+        '../../utils/downloadTemplateFromRepo': {
+          downloadTemplateFromRepo: downloadTemplateFromRepoStub.callsFake(
+            async (templateUrl, projectType, projectName) => {
+              await fsp.mkdir(projectName);
+              const serverlessYmlContent = `
+            service: service
+            provider:
+              name: aws
+           `;
+
+              await fsp.writeFile(path.join(projectName, 'serverless.yml'), serverlessYmlContent);
+              await fsp.writeFile(path.join(projectName, 'package.json'), '{}');
+            }
+          ),
+        },
+      });
+
+      configureInquirerStub(inquirer, {
+        confirm: { shouldCreateNewProject: true },
+        list: { projectType: 'aws-nodejs' },
+        input: { projectName: 'test-project-missing-npm' },
+      });
+
+      let stdoutData = '';
+      await overrideStdoutWrite(
+        (data) => (stdoutData += data),
+        async () => mockedStep.run({ options: {} })
+      );
+
+      const stats = await fsp.lstat('test-project-missing-npm/serverless.yml');
+      expect(stats.isFile()).to.be.true;
+      expect(stdoutData).to.include('Cannot install dependencies');
+    });
+
+    it('Should emit warning if npm installation not found', async () => {
+      const downloadTemplateFromRepoStub = sinon.stub();
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        'child-process-ext/spawn': sinon.stub().rejects({ message: 'Error message' }),
+        '../../utils/downloadTemplateFromRepo': {
+          downloadTemplateFromRepo: downloadTemplateFromRepoStub.callsFake(
+            async (templateUrl, projectType, projectName) => {
+              await fsp.mkdir(projectName);
+              const serverlessYmlContent = `
+            service: service
+            provider:
+              name: aws
+           `;
+
+              await fsp.writeFile(path.join(projectName, 'serverless.yml'), serverlessYmlContent);
+              await fsp.writeFile(path.join(projectName, 'package.json'), '{}');
+            }
+          ),
+        },
+      });
+
+      configureInquirerStub(inquirer, {
+        confirm: { shouldCreateNewProject: true },
+        list: { projectType: 'aws-nodejs' },
+        input: { projectName: 'test-project-failed-install' },
+      });
+
+      await expect(mockedStep.run({ options: {} })).to.be.eventually.rejected.and.have.property('code', 'DEPENDENCIES_INSTALL_FAILED')
+    });
+
     it('Should create project at not existing directory from a provided `template-path`', async () => {
       configureInquirerStub(inquirer, {
         input: { projectName: 'test-project-from-local-template' },

From da7a70d83f1c77814c34a21c39116f39335ba9c4 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 17 May 2021 15:02:07 +0200
Subject: [PATCH 0111/1101] feat(CLI Onboarding): Remove
 `serverless.template.yml` from template

---
 lib/cli/interactive-setup/service.js          | 14 +++++-
 lib/utils/downloadTemplateFromRepo.js         |  4 +-
 .../lib/cli/interactive-setup/service.test.js | 43 ++++++++++++++++++-
 3 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index aa94f17fa18..25c9486a455 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -144,7 +144,7 @@ module.exports = {
       const templateUrl = `https://github.com/serverless/examples/tree/master/${projectType}`;
       try {
         process.stdout.write(`\n${chalk.green(`Downloading "${projectType}" template...`)}\n`);
-        await downloadTemplateFromRepo(templateUrl, projectType, projectName, true);
+        await downloadTemplateFromRepo(templateUrl, projectType, projectName, { silent: true });
       } catch (err) {
         throw new ServerlessError(
           'Could not download template. Ensure that you are using the latest version of Serverless Framework.',
@@ -176,11 +176,21 @@ module.exports = {
             )}\n`
           );
         } else {
-          throw new ServerlessError(`Cannot install dependencies: ${err.message}`, 'DEPENDENCIES_INSTALL_FAILED');
+          throw new ServerlessError(
+            `Cannot install dependencies: ${err.message}`,
+            'DEPENDENCIES_INSTALL_FAILED'
+          );
         }
       }
     }
 
+    try {
+      // Try to remove `serverless.template.yml` file from created project if its present
+      await fsp.unlink(join(projectDir, 'serverless.template.yml'));
+    } catch {
+      // pass
+    }
+
     process.stdout.write(
       `\n${chalk.green(`Project successfully created in '${projectName}' folder.`)}\n`
     );
diff --git a/lib/utils/downloadTemplateFromRepo.js b/lib/utils/downloadTemplateFromRepo.js
index 5999a7e7021..da061a496e7 100644
--- a/lib/utils/downloadTemplateFromRepo.js
+++ b/lib/utils/downloadTemplateFromRepo.js
@@ -254,7 +254,7 @@ function parseRepoURL(inputUrl) {
  * @param {string} [path]
  * @returns {Promise}
  */
-function downloadTemplateFromRepo(inputUrl, templateName, downloadPath, silent = false) {
+function downloadTemplateFromRepo(inputUrl, templateName, downloadPath, options = {}) {
   return parseRepoURL(inputUrl).then((repoInformation) => {
     let serviceName;
     let dirName;
@@ -280,7 +280,7 @@ function downloadTemplateFromRepo(inputUrl, templateName, downloadPath, silent =
       throw new ServerlessError(errorMessage, 'TARGET_FOLDER_ALREADY_EXISTS');
     }
 
-    if (!silent) {
+    if (!options.silent) {
       log(`Downloading and installing "${serviceName}"...`);
     }
 
diff --git a/test/unit/lib/cli/interactive-setup/service.test.js b/test/unit/lib/cli/interactive-setup/service.test.js
index fe23fef3aea..af4014826c7 100644
--- a/test/unit/lib/cli/interactive-setup/service.test.js
+++ b/test/unit/lib/cli/interactive-setup/service.test.js
@@ -89,6 +89,44 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       );
     });
 
+    it('Should remove `serverless.template.yml` if its a part of the template', async () => {
+      const downloadTemplateFromRepoStub = sinon.stub();
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        '../../utils/downloadTemplateFromRepo': {
+          downloadTemplateFromRepo: downloadTemplateFromRepoStub.callsFake(
+            async (templateUrl, projectType, projectName) => {
+              await fsp.mkdir(projectName);
+              const serverlessYmlContent = `
+            service: service
+            provider:
+              name: aws
+           `;
+
+              await fsp.writeFile(path.join(projectName, 'serverless.yml'), serverlessYmlContent);
+              await fsp.writeFile(path.join(projectName, 'serverless.template.yml'), '');
+            }
+          ),
+        },
+      });
+
+      configureInquirerStub(inquirer, {
+        confirm: { shouldCreateNewProject: true },
+        list: { projectType: 'aws-nodejs' },
+        input: { projectName: 'test-project-template' },
+      });
+      await mockedStep.run({ options: {} });
+      const stats = await fsp.lstat('test-project-template/serverless.yml');
+      expect(stats.isFile()).to.be.true;
+      expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
+        'https://github.com/serverless/examples/tree/master/aws-nodejs',
+        'aws-nodejs',
+        'test-project-template'
+      );
+      await expect(
+        fsp.lstat('test-proejct-template/serverless.template.yml')
+      ).to.eventually.be.rejected.and.have.property('code', 'ENOENT');
+    });
+
     it('Should run `npm install` if `package.json` present', async () => {
       const downloadTemplateFromRepoStub = sinon.stub();
       const spawnStub = sinon.stub();
@@ -194,7 +232,10 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
         input: { projectName: 'test-project-failed-install' },
       });
 
-      await expect(mockedStep.run({ options: {} })).to.be.eventually.rejected.and.have.property('code', 'DEPENDENCIES_INSTALL_FAILED')
+      await expect(mockedStep.run({ options: {} })).to.be.eventually.rejected.and.have.property(
+        'code',
+        'DEPENDENCIES_INSTALL_FAILED'
+      );
     });
 
     it('Should create project at not existing directory from a provided `template-path`', async () => {

From ed25868110b0a6c4beb4661c364edabc955dc84e Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 17 May 2021 17:14:18 +0200
Subject: [PATCH 0112/1101] test: Adjust interactive CLI test after plugin
 changes

---
 package.json                                      | 2 +-
 test/unit/lib/cli/interactive-setup/index.test.js | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 7634a7acc4e..61101fed9b4 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "@serverless/cli": "^1.5.2",
     "@serverless/components": "^3.9.2",
-    "@serverless/dashboard-plugin": "^5.0.0",
+    "@serverless/dashboard-plugin": "^5.1.0",
     "@serverless/utils": "^4.1.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
diff --git a/test/unit/lib/cli/interactive-setup/index.test.js b/test/unit/lib/cli/interactive-setup/index.test.js
index 24f68f0e5ff..6dc61b3553d 100644
--- a/test/unit/lib/cli/interactive-setup/index.test.js
+++ b/test/unit/lib/cli/interactive-setup/index.test.js
@@ -34,12 +34,7 @@ describe('test/unit/lib/cli/interactive-setup/index.test.js', () => {
 
       // dashboard-login
       {
-        instructionString: 'Would you like to enable this?',
-        input: 'Y',
-      },
-      {
-        instructionString: 'login or register?',
-        input: 'j',
+        instructionString: 'Do you want to login/register to Serverless Dashboard?',
       },
 
       // dashboard-set-org

From 5601025dd8a4075cb463e2dcfb67d6c52984582a Mon Sep 17 00:00:00 2001
From: lyndoh <20314316+lyndoh@users.noreply.github.com>
Date: Tue, 18 May 2021 17:48:47 +1000
Subject: [PATCH 0113/1101] fix(AWS API Gateway): Fix schema for `apiKeys` and
 `permissionsBoundary`

---
 lib/plugins/aws/provider.js                   |  31 ++--
 .../events/apiGateway/lib/apiKeys.test.js     | 167 ++++++++----------
 .../aws/package/lib/mergeIamTemplates.test.js |  26 +++
 3 files changed, 118 insertions(+), 106 deletions(-)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 9b59845ce83..ef3e203fd70 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -276,27 +276,34 @@ class AwsProvider {
               anyOf: [
                 { type: 'string' },
                 {
-                  type: 'object',
-                  properties: {
-                    name: { type: 'string' },
-                    value: { type: 'string' },
-                    description: { type: 'string' },
-                    customerId: { type: 'string' },
-                  },
-                  anyOf: [{ required: ['name'] }, { required: ['value'] }],
-                  additionalProperties: false,
+                  $ref: '#/definitions/awsApiGatewayApiKeysProperties',
                 },
                 {
                   type: 'object',
                   maxProperties: 1,
                   additionalProperties: {
                     type: 'array',
-                    items: { type: 'string' },
+                    items: {
+                      oneOf: [
+                        { type: 'string' },
+                        { $ref: '#/definitions/awsApiGatewayApiKeysProperties' },
+                      ],
+                    },
                   },
                 },
               ],
             },
           },
+          awsApiGatewayApiKeysProperties: {
+            type: 'object',
+            properties: {
+              name: { type: 'string' },
+              value: { type: 'string' },
+              description: { type: 'string' },
+              customerId: { type: 'string' },
+            },
+            additionalProperties: false,
+          },
           awsArn: {
             anyOf: [
               { $ref: '#/definitions/awsArnString' },
@@ -907,8 +914,8 @@ class AwsProvider {
                           items: { $ref: '#/definitions/awsArn' },
                         },
                         statements: { $ref: '#/definitions/awsIamPolicyStatements' },
-                        permissionBoundary: { $ref: '#/definitions/awsArnString' },
-                        permissionsBoundary: { $ref: '#/definitions/awsArnString' },
+                        permissionBoundary: { $ref: '#/definitions/awsArn' },
+                        permissionsBoundary: { $ref: '#/definitions/awsArn' },
                         tags: { $ref: '#/definitions/awsResourceTags' },
                       },
                       additionalProperties: false,
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js
index cdefc50eb2d..70c8d5d2b56 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js
@@ -4,6 +4,7 @@ const expect = require('chai').expect;
 const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
 const Serverless = require('../../../../../../../../../../lib/Serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
+const runServerless = require('../../../../../../../../../utils/run-serverless');
 
 describe('#compileApiKeys()', () => {
   let serverless;
@@ -135,101 +136,79 @@ describe('#compileApiKeys()', () => {
       ).to.equal('ApiGatewayDeploymentTest');
     });
   });
+});
+
+describe('lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js', () => {
+  it('should support usage plan notation', async () => {
+    const apiGatewayExt = {
+      apiKeys: [
+        {
+          free: [
+            '1234567890',
+            { name: '2345678901' },
+            {
+              value: 'valueForKeyWithoutName',
+              description: 'Api key description',
+            },
+            { name: '3456789012', value: 'valueForKey3456789012' },
+            { description: 'descriptionForKeyWithoutNameOrValue' },
+          ],
+        },
+        { paid: ['0987654321', 'jihgfedcba'] },
+      ],
+      usagePlan: [{ free: {} }, { paid: {} }],
+    };
+    const { awsNaming, cfTemplate, serverless } = await runServerless({
+      fixture: 'apiGateway',
+      command: 'package',
+      configExt: {
+        provider: {
+          apiGateway: apiGatewayExt,
+        },
+      },
+    });
+    const resources = cfTemplate.Resources;
 
-  describe('when using usage plan notation', () => {
-    it('should support usage plan notation', () => {
-      awsCompileApigEvents.serverless.service.provider.apiGateway = {
-        apiKeys: [
-          {
-            free: [
-              '1234567890',
-              { name: '2345678901' },
-              {
-                value: 'valueForKeyWithoutName',
-                description: 'Api key description',
-              },
-              { name: '3456789012', value: 'valueForKey3456789012' },
-            ],
-          },
-          { paid: ['0987654321', 'jihgfedcba'] },
-        ],
-        usagePlan: [{ free: [] }, { paid: [] }],
-      };
-
-      awsCompileApigEvents.compileApiKeys();
-      const expectedApiKeys = {
-        free: [
-          { name: '1234567890', value: undefined, description: undefined },
-          { name: '2345678901', value: undefined, description: undefined },
-          {
-            name: undefined,
-            value: 'valueForKeyWithoutName',
-            description: 'Api key description',
-          },
-          {
-            name: '3456789012',
-            value: 'valueForKey3456789012',
-            description: undefined,
-          },
-        ],
-        paid: [
-          { name: '0987654321', value: undefined, description: undefined },
-          { name: 'jihgfedcba', value: undefined, description: undefined },
-        ],
-      };
-      awsCompileApigEvents.serverless.service.provider.apiGateway.apiKeys.forEach((plan) => {
-        const planName = Object.keys(plan)[0]; // free || paid
-        const apiKeys = expectedApiKeys[planName];
-        apiKeys.forEach((apiKey, index) => {
-          expect(
-            awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate
-              .Resources[
-              awsCompileApigEvents.provider.naming.getApiKeyLogicalId(index + 1, planName)
-            ].Type
-          ).to.equal('AWS::ApiGateway::ApiKey');
-          expect(
-            awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate
-              .Resources[
-              awsCompileApigEvents.provider.naming.getApiKeyLogicalId(index + 1, planName)
-            ].Properties.Enabled
-          ).to.equal(true);
-          expect(
-            awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate
-              .Resources[
-              awsCompileApigEvents.provider.naming.getApiKeyLogicalId(index + 1, planName)
-            ].Properties.Name
-          ).to.equal(apiKey.name);
-          expect(
-            awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate
-              .Resources[
-              awsCompileApigEvents.provider.naming.getApiKeyLogicalId(index + 1, planName)
-            ].Properties.Description
-          ).to.equal(apiKey.description);
-          expect(
-            awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate
-              .Resources[
-              awsCompileApigEvents.provider.naming.getApiKeyLogicalId(index + 1, planName)
-            ].Properties.Value
-          ).to.equal(apiKey.value);
-          expect(
-            awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate
-              .Resources[
-              awsCompileApigEvents.provider.naming.getApiKeyLogicalId(index + 1, planName)
-            ].Properties.StageKeys[0].RestApiId.Ref
-          ).to.equal('ApiGatewayRestApi');
-          expect(
-            awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate
-              .Resources[
-              awsCompileApigEvents.provider.naming.getApiKeyLogicalId(index + 1, planName)
-            ].Properties.StageKeys[0].StageName
-          ).to.equal('dev');
-          expect(
-            awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate
-              .Resources[
-              awsCompileApigEvents.provider.naming.getApiKeyLogicalId(index + 1, planName)
-            ].DependsOn
-          ).to.equal('ApiGatewayDeploymentTest');
-        });
+    const expectedApiKeys = {
+      free: [
+        { name: '1234567890', value: undefined, description: undefined },
+        { name: '2345678901', value: undefined, description: undefined },
+        {
+          name: undefined,
+          value: 'valueForKeyWithoutName',
+          description: 'Api key description',
+        },
+        {
+          name: '3456789012',
+          value: 'valueForKey3456789012',
+          description: undefined,
+        },
+        {
+          name: undefined,
+          value: undefined,
+          description: 'descriptionForKeyWithoutNameOrValue',
+        },
+      ],
+      paid: [
+        { name: '0987654321', value: undefined, description: undefined },
+        { name: 'jihgfedcba', value: undefined, description: undefined },
+      ],
+    };
+    apiGatewayExt.apiKeys.forEach((plan) => {
+      const planName = Object.keys(plan)[0]; // free || paid
+      const apiKeys = expectedApiKeys[planName];
+      apiKeys.forEach((apiKey, index) => {
+        const resource = resources[awsNaming.getApiKeyLogicalId(index + 1, planName)];
+        expect(resource.Type).to.equal('AWS::ApiGateway::ApiKey');
+        expect(resource.Properties.Enabled).to.equal(true);
+        expect(resource.Properties.Name).to.equal(apiKey.name);
+        expect(resource.Properties.Description).to.equal(apiKey.description);
+        expect(resource.Properties.Value).to.equal(apiKey.value);
+        expect(resource.Properties.StageKeys[0].RestApiId.Ref).to.equal('ApiGatewayRestApi');
+        expect(resource.Properties.StageKeys[0].StageName).to.equal('dev');
+        expect(resource.DependsOn).to.equal(
+          awsNaming.generateApiGatewayDeploymentLogicalId(serverless.instanceId)
+        );
       });
     });
   });
diff --git a/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js b/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
index 3f1e175ecec..59bd555d7ea 100644
--- a/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
@@ -376,6 +376,32 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
         );
       });
 
+      it('should support `provider.iam.role.permissionsBoundary` defined with CF intrinsic functions', async () => {
+        const { cfTemplate, awsNaming } = await runServerless({
+          fixture: 'function',
+          command: 'package',
+          configExt: {
+            provider: {
+              iam: {
+                role: {
+                  permissionsBoundary: {
+                    'Fn::Sub': 'arn:aws:iam::${AWS::AccountId}:policy/XCompanyBoundaries',
+                  },
+                },
+              },
+            },
+          },
+        });
+
+        const IamRoleLambdaExecution = awsNaming.getRoleLogicalId();
+        const {
+          Properties: { PermissionsBoundary },
+        } = cfTemplate.Resources[IamRoleLambdaExecution];
+        expect(PermissionsBoundary).to.deep.includes({
+          'Fn::Sub': 'arn:aws:iam::${AWS::AccountId}:policy/XCompanyBoundaries',
+        });
+      });
+
       it('should ensure needed IAM configuration when `provider.vpc` is configured', () => {
         const IamRoleLambdaExecution = naming.getRoleLogicalId();
         const iamResource = cfResources[IamRoleLambdaExecution];

From f4cfcbb1a34230fb31852dcfb7f0b1424b5b80c1 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 11 May 2021 15:53:04 +0200
Subject: [PATCH 0114/1101] style: Whitespace

---
 lib/plugins/aws/deploy/lib/validateTemplate.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/plugins/aws/deploy/lib/validateTemplate.js b/lib/plugins/aws/deploy/lib/validateTemplate.js
index 2bb32204c02..d50aa34aaad 100644
--- a/lib/plugins/aws/deploy/lib/validateTemplate.js
+++ b/lib/plugins/aws/deploy/lib/validateTemplate.js
@@ -1,4 +1,5 @@
 'use strict';
+
 const getCompiledTemplateS3Suffix = require('../../lib/naming').getCompiledTemplateS3Suffix;
 const getS3EndpointForRegion = require('../../utils/getS3EndpointForRegion');
 

From 07b60a6bb42796e6f060730ce4bf22762942b0b8 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 11 May 2021 15:54:59 +0200
Subject: [PATCH 0115/1101] fix: Expose template errror with user error

---
 lib/plugins/aws/deploy/lib/validateTemplate.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/aws/deploy/lib/validateTemplate.js b/lib/plugins/aws/deploy/lib/validateTemplate.js
index d50aa34aaad..29dc2728d55 100644
--- a/lib/plugins/aws/deploy/lib/validateTemplate.js
+++ b/lib/plugins/aws/deploy/lib/validateTemplate.js
@@ -2,6 +2,7 @@
 
 const getCompiledTemplateS3Suffix = require('../../lib/naming').getCompiledTemplateS3Suffix;
 const getS3EndpointForRegion = require('../../utils/getS3EndpointForRegion');
+const ServerlessError = require('../../../../serverless-error');
 
 module.exports = {
   async validateTemplate() {
@@ -18,7 +19,7 @@ module.exports = {
       const errorMessage = ['The CloudFormation template is invalid:', ` ${error.message}`].join(
         ''
       );
-      throw new Error(errorMessage);
+      throw new ServerlessError(errorMessage, 'INVALID_AWS_CLOUDFORMATION_TEMPLATE');
     });
   },
 };

From 8f3d4e4bdb1df1e107c5113d013164a2396f0f64 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 11 May 2021 15:57:47 +0200
Subject: [PATCH 0116/1101] fix: Expose remote lambda invocation failure as
 user error

---
 lib/plugins/aws/invoke.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/aws/invoke.js b/lib/plugins/aws/invoke.js
index 91b14a8b643..1da7d65c5a6 100644
--- a/lib/plugins/aws/invoke.js
+++ b/lib/plugins/aws/invoke.js
@@ -118,7 +118,7 @@ class AwsInvoke {
     }
 
     if (invocationReply.FunctionError) {
-      throw new Error('Invoked function failed');
+      throw new ServerlessError('Invoked function failed', 'AWS_LAMBDA_INVOCATION_FAILED');
     }
   }
 

From a2297ee916dd79463d4efcfd6f7fe1f8e0e50d87 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 13 May 2021 17:43:12 +0200
Subject: [PATCH 0117/1101] fix(AWS Local Invocation): Report invalid handler
 path meaningfully

---
 lib/plugins/aws/invokeLocal/index.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invokeLocal/index.js
index 43e2fb92160..0faafe05efc 100644
--- a/lib/plugins/aws/invokeLocal/index.js
+++ b/lib/plugins/aws/invokeLocal/index.js
@@ -749,6 +749,13 @@ class AwsInvokeLocal {
       throw new Error(`Exception encountered when loading ${pathToHandler}`);
     }
 
+    if (typeof lambda !== 'function') {
+      throw new ServerlessError(
+        `Lambda handler "${handlerPath}" does not point function property`,
+        'INVALID_LAMBDA_HANDLER_PATH'
+      );
+    }
+
     function handleError(err) {
       let errorResult;
       if (err instanceof Error) {

From a8f4aebe5d482a491d86d3427b259db00674cc72 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 14 May 2021 14:10:03 +0200
Subject: [PATCH 0118/1101] fix(Variables): Ensure report user error as user
 error

---
 lib/configuration/variables/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/configuration/variables/index.js b/lib/configuration/variables/index.js
index 7ea01aeaea0..2dc5e6538ff 100644
--- a/lib/configuration/variables/index.js
+++ b/lib/configuration/variables/index.js
@@ -5,6 +5,7 @@
 
 const ensureString = require('type/string/ensure');
 const ensurePlainObject = require('type/plain-object/ensure');
+const ServerlessError = require('../../serverless-error');
 const resolveMeta = require('./resolve-meta');
 const resolve = require('./resolve');
 
@@ -23,7 +24,7 @@ const reportEventualErrors = (variablesMeta) => {
 
   if (!resolutionErrors.size) return;
 
-  throw new Error(
+  throw new ServerlessError(
     `Variables resolution errored with:${Array.from(
       resolutionErrors,
       (error) => `\n  - ${error.message}`

From 91b10ed208f2dee4b690df633f4275f658355044 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 14 May 2021 14:11:47 +0200
Subject: [PATCH 0119/1101] refactor(Telemetry): Remove dead path error
 handling

---
 lib/plugins/slstats.js                | 22 ++++++----------------
 test/unit/lib/plugins/slstats.test.js | 21 ---------------------
 2 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/lib/plugins/slstats.js b/lib/plugins/slstats.js
index 1cb0120a599..fbe007debfb 100644
--- a/lib/plugins/slstats.js
+++ b/lib/plugins/slstats.js
@@ -23,23 +23,13 @@ class SlStats {
     const enableStats = this.options.enable && !this.options.disable;
     const disabledStats = this.options.disable && !this.options.enable;
     if (enableStats) {
-      try {
-        // set .serverlessrc config
-        config.set('trackingDisabled', false);
-        this.serverless.cli.log('Stats successfully enabled');
-      } catch (error) {
-        const message = error;
-        throw new Error(`Enabling / Disabling of statistics failed: ${message}`);
-      }
+      // set .serverlessrc config
+      config.set('trackingDisabled', false);
+      this.serverless.cli.log('Stats successfully enabled');
     } else if (disabledStats) {
-      try {
-        // set .serverlessrc config
-        config.set('trackingDisabled', true);
-        this.serverless.cli.log('Stats successfully disabled');
-      } catch (error) {
-        const message = error;
-        throw new Error(`Enabling / Disabling of statistics failed: ${message}`);
-      }
+      // set .serverlessrc config
+      config.set('trackingDisabled', true);
+      this.serverless.cli.log('Stats successfully disabled');
     }
   }
 }
diff --git a/test/unit/lib/plugins/slstats.test.js b/test/unit/lib/plugins/slstats.test.js
index 8126d70717c..afe6e869d68 100644
--- a/test/unit/lib/plugins/slstats.test.js
+++ b/test/unit/lib/plugins/slstats.test.js
@@ -63,26 +63,5 @@ describe('SlStats', () => {
       slStats.toggleStats();
       expect(setStub.calledOnce).to.equal(false);
     });
-
-    it('should catch the error if enabling fails', () => {
-      // here we assume that the tracking fails
-      setStub.throws();
-
-      slStats.options = { enable: true };
-
-      expect(() => slStats.toggleStats()).to.throw(/of statistics failed/);
-      expect(setStub.calledOnce).to.equal(true);
-      expect(setStub.calledWithExactly('trackingDisabled', false)).to.be.true;
-    });
-
-    it('should catch the error if enabling fails', () => {
-      // here we assume that the config setting fails
-      setStub.throws('error while updating config file');
-      slStats.options = { disable: true };
-
-      expect(() => slStats.toggleStats()).to.throw(/of statistics failed/);
-      expect(setStub.calledOnce).to.equal(true);
-      expect(setStub.calledWithExactly('trackingDisabled', true)).to.be.true;
-    });
   });
 });

From 277d66c75b61c6ec128c7bcf7807c35159ef930f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 17 May 2021 14:12:03 +0200
Subject: [PATCH 0120/1101] test(AWS Local Invocation): Move fixtures to test
 folder

---
 test/unit/lib/plugins/aws/invokeLocal/fixture/.gitignore        | 1 +
 .../unit/lib}/plugins/aws/invokeLocal/fixture/__init__.py       | 0
 .../plugins/aws/invokeLocal/fixture/asyncHandlerWithError.js    | 0
 .../plugins/aws/invokeLocal/fixture/asyncHandlerWithSuccess.js  | 0
 .../unit/lib}/plugins/aws/invokeLocal/fixture/handler.py        | 0
 .../unit/lib}/plugins/aws/invokeLocal/fixture/handler.rb        | 0
 .../lib}/plugins/aws/invokeLocal/fixture/handlerWithError.js    | 0
 .../aws/invokeLocal/fixture/handlerWithInitializationError.js   | 0
 .../plugins/aws/invokeLocal/fixture/handlerWithLoadingError.js  | 0
 .../lib}/plugins/aws/invokeLocal/fixture/handlerWithSuccess.js  | 0
 test/unit/lib/plugins/aws/invokeLocal/index.test.js             | 2 +-
 11 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 test/unit/lib/plugins/aws/invokeLocal/fixture/.gitignore
 rename {lib => test/unit/lib}/plugins/aws/invokeLocal/fixture/__init__.py (100%)
 rename {lib => test/unit/lib}/plugins/aws/invokeLocal/fixture/asyncHandlerWithError.js (100%)
 rename {lib => test/unit/lib}/plugins/aws/invokeLocal/fixture/asyncHandlerWithSuccess.js (100%)
 rename {lib => test/unit/lib}/plugins/aws/invokeLocal/fixture/handler.py (100%)
 rename {lib => test/unit/lib}/plugins/aws/invokeLocal/fixture/handler.rb (100%)
 rename {lib => test/unit/lib}/plugins/aws/invokeLocal/fixture/handlerWithError.js (100%)
 rename {lib => test/unit/lib}/plugins/aws/invokeLocal/fixture/handlerWithInitializationError.js (100%)
 rename {lib => test/unit/lib}/plugins/aws/invokeLocal/fixture/handlerWithLoadingError.js (100%)
 rename {lib => test/unit/lib}/plugins/aws/invokeLocal/fixture/handlerWithSuccess.js (100%)

diff --git a/test/unit/lib/plugins/aws/invokeLocal/fixture/.gitignore b/test/unit/lib/plugins/aws/invokeLocal/fixture/.gitignore
new file mode 100644
index 00000000000..0d20b6487c6
--- /dev/null
+++ b/test/unit/lib/plugins/aws/invokeLocal/fixture/.gitignore
@@ -0,0 +1 @@
+*.pyc
diff --git a/lib/plugins/aws/invokeLocal/fixture/__init__.py b/test/unit/lib/plugins/aws/invokeLocal/fixture/__init__.py
similarity index 100%
rename from lib/plugins/aws/invokeLocal/fixture/__init__.py
rename to test/unit/lib/plugins/aws/invokeLocal/fixture/__init__.py
diff --git a/lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithError.js b/test/unit/lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithError.js
similarity index 100%
rename from lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithError.js
rename to test/unit/lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithError.js
diff --git a/lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithSuccess.js b/test/unit/lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithSuccess.js
similarity index 100%
rename from lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithSuccess.js
rename to test/unit/lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithSuccess.js
diff --git a/lib/plugins/aws/invokeLocal/fixture/handler.py b/test/unit/lib/plugins/aws/invokeLocal/fixture/handler.py
similarity index 100%
rename from lib/plugins/aws/invokeLocal/fixture/handler.py
rename to test/unit/lib/plugins/aws/invokeLocal/fixture/handler.py
diff --git a/lib/plugins/aws/invokeLocal/fixture/handler.rb b/test/unit/lib/plugins/aws/invokeLocal/fixture/handler.rb
similarity index 100%
rename from lib/plugins/aws/invokeLocal/fixture/handler.rb
rename to test/unit/lib/plugins/aws/invokeLocal/fixture/handler.rb
diff --git a/lib/plugins/aws/invokeLocal/fixture/handlerWithError.js b/test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithError.js
similarity index 100%
rename from lib/plugins/aws/invokeLocal/fixture/handlerWithError.js
rename to test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithError.js
diff --git a/lib/plugins/aws/invokeLocal/fixture/handlerWithInitializationError.js b/test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithInitializationError.js
similarity index 100%
rename from lib/plugins/aws/invokeLocal/fixture/handlerWithInitializationError.js
rename to test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithInitializationError.js
diff --git a/lib/plugins/aws/invokeLocal/fixture/handlerWithLoadingError.js b/test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithLoadingError.js
similarity index 100%
rename from lib/plugins/aws/invokeLocal/fixture/handlerWithLoadingError.js
rename to test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithLoadingError.js
diff --git a/lib/plugins/aws/invokeLocal/fixture/handlerWithSuccess.js b/test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithSuccess.js
similarity index 100%
rename from lib/plugins/aws/invokeLocal/fixture/handlerWithSuccess.js
rename to test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithSuccess.js
diff --git a/test/unit/lib/plugins/aws/invokeLocal/index.test.js b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
index 6fbbd25657f..e0985ebb4fd 100644
--- a/test/unit/lib/plugins/aws/invokeLocal/index.test.js
+++ b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
@@ -16,7 +16,7 @@ const skipWithNotice = require('@serverless/test/skip-with-notice');
 const log = require('log').get('serverless:test');
 const runServerless = require('../../../../../utils/run-serverless');
 
-const tmpServicePath = path.resolve(__dirname, '../../../../../../lib/plugins/aws/invokeLocal');
+const tmpServicePath = __dirname;
 
 chai.use(require('chai-as-promised'));
 

From c563581ac98764edf653c1a5337d1b7d2b61ea63 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 17 May 2021 14:19:48 +0200
Subject: [PATCH 0121/1101] refactor: Construct user errors with
 ServerlessError

---
 lib/classes/PluginManager.js                  | 23 +++++++----
 lib/classes/Service.js                        |  5 ++-
 lib/configuration/read.js                     | 30 +++++++++++---
 lib/plugins/aws/deployFunction.js             |  5 ++-
 lib/plugins/aws/invokeLocal/index.js          | 40 +++++++++++++++----
 .../aws/package/compile/events/cloudFront.js  | 10 +++--
 .../lib/mergeCustomProviderResources.js       |  6 ++-
 lib/plugins/aws/provider.js                   |  5 ++-
 lib/plugins/aws/rollbackFunction.js           |  8 +++-
 lib/plugins/aws/utils/credentials.js          |  8 +++-
 lib/plugins/package/package.js                |  5 ++-
 lib/plugins/plugin/install.js                 |  6 ++-
 12 files changed, 116 insertions(+), 35 deletions(-)

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 91b1795468b..b933caeb889 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -372,24 +372,31 @@ class PluginManager {
         };
       }
       if (!_.isObject(options)) {
-        throw new Error(
+        throw new ServerlessError(
           `Custom variable resolver {${variablePrefix}: ${JSON.stringify(
             options
-          )}} defined by ${pluginName} isn't an object`
+          )}} defined by ${pluginName} isn't an object`,
+          'CUSTOM_LEGACY_VARIABLES_RESOLVER_INVALID_FORMAT'
         );
       } else if (!variablePrefix.match(/[0-9a-zA-Z_-]+/)) {
-        throw new Error(
-          `Custom variable resolver prefix ${variablePrefix} defined by ${pluginName} may only contain alphanumeric characters, hyphens or underscores.`
+        throw new ServerlessError(
+          `Custom variable resolver prefix ${variablePrefix} defined by ${pluginName} ` +
+            'may only contain alphanumeric characters, hyphens or underscores.',
+          'CUSTOM_LEGACY_VARIABLES_RESOLVER_INVALID_PREFIX'
         );
       }
       if (typeof options.resolver !== 'function') {
-        throw new Error(
-          `Custom variable resolver for ${variablePrefix} defined by ${pluginName} specifies a resolver that isn't a function: ${options.resolver}`
+        throw new ServerlessError(
+          `Custom variable resolver for ${variablePrefix} defined by ${pluginName} ` +
+            `specifies a resolver that isn't a function: ${options.resolver}`,
+          'CUSTOM_LEGACY_VARIABLES_RESOLVER_INVALID_FORMAT'
         );
       }
       if (options.isDisabledAtPrepopulation && typeof options.serviceName !== 'string') {
-        throw new Error(
-          `Custom variable resolver for ${variablePrefix} defined by ${pluginName} specifies isDisabledAtPrepopulation but doesn't provide a string for a name`
+        throw new ServerlessError(
+          `Custom variable resolver for ${variablePrefix} defined by ${pluginName} ` +
+            "specifies isDisabledAtPrepopulation but doesn't provide a string for a name",
+          'CUSTOM_LEGACY_VARIABLES_RESOLVER_INVALID_CONFIGURATION'
         );
       }
       this.serverless.variables.variableResolvers.push({
diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index bb7fddfc340..cdf9e294923 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -206,7 +206,10 @@ class Service {
             if (typeof value === 'object') {
               return _.merge(memo, value);
             }
-            throw new Error(`Non-object value specified in ${key} array: ${value}`);
+            throw new ServerlessError(
+              `Non-object value specified in ${key} array: ${value}`,
+              'LEGACY_CONFIGURATION_PROPERTY_MERGE_INVALID_INPUT'
+            );
           }
 
           return memo;
diff --git a/lib/configuration/read.js b/lib/configuration/read.js
index 89fe28dc6be..621f7a7c30c 100644
--- a/lib/configuration/read.js
+++ b/lib/configuration/read.js
@@ -16,27 +16,47 @@ const resolveTsNode = async (serviceDir) => {
   try {
     return (await resolveModulePath(__dirname, 'ts-node')).realPath;
   } catch (slsDepError) {
-    if (slsDepError.code !== 'MODULE_NOT_FOUND') throw slsDepError;
+    if (slsDepError.code !== 'MODULE_NOT_FOUND') {
+      throw new ServerlessError(
+        `Cannot resolve "ts-node" due to: ${slsDepError.message}`,
+        'TS_NODE_RESOLUTION_ERROR'
+      );
+    }
 
     // 2. If installed in a service, use it
     try {
       return (await resolveModulePath(serviceDir, 'ts-node')).realPath;
     } catch (serviceDepError) {
-      if (serviceDepError.code !== 'MODULE_NOT_FOUND') throw serviceDepError;
+      if (serviceDepError.code !== 'MODULE_NOT_FOUND') {
+        throw new ServerlessError(
+          `Cannot resolve "ts-node" due to: ${serviceDepError.message}`,
+          'TS_NODE_IN_SERVICE_RESOLUTION_ERROR'
+        );
+      }
 
       // 3. If installed globally, use it
       const { stdoutBuffer } = await (async () => {
         try {
           return await spawn('npm', ['root', '-g']);
         } catch (error) {
-          if (error.code !== 'ENOENT') throw error;
-          throw new Error('"ts-node" not found');
+          if (error.code !== 'ENOENT') {
+            throw new ServerlessError(
+              `Cannot resolve "ts-node" due to unexpected "npm" error: ${error.message}`,
+              'TS_NODE_NPM_RESOLUTION_ERROR'
+            );
+          }
+          throw new ServerlessError('"ts-node" not found', 'TS_NODE_NOT_FOUND');
         }
       })();
       try {
         return require.resolve(`${String(stdoutBuffer).trim()}/ts-node`);
       } catch (globalDepError) {
-        if (globalDepError.code !== 'MODULE_NOT_FOUND') throw globalDepError;
+        if (globalDepError.code !== 'MODULE_NOT_FOUND') {
+          throw new ServerlessError(
+            `Cannot resolve "ts-node" due to: ${globalDepError.message}`,
+            'TS_NODE_NPM_GLOBAL_RESOLUTION_ERROR'
+          );
+        }
         throw new ServerlessError('"ts-node" not found', 'TS_NODE_NOT_FOUND');
       }
     }
diff --git a/lib/plugins/aws/deployFunction.js b/lib/plugins/aws/deployFunction.js
index 45545b9b3a6..fb30c7c7f26 100644
--- a/lib/plugins/aws/deployFunction.js
+++ b/lib/plugins/aws/deployFunction.js
@@ -116,7 +116,10 @@ class AwsDeployFunction {
       const roleResource = this.serverless.service.resources.Resources[role];
 
       if (roleResource.Type !== 'AWS::IAM::Role') {
-        throw new Error('Provided resource is not IAM Role.');
+        throw new ServerlessError(
+          'Provided resource is not IAM Role',
+          'ROLE_REFERENCES_NON_AWS_IAM_ROLE'
+        );
       }
       const roleProperties = roleResource.Properties;
       if (!roleProperties.RoleName) {
diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invokeLocal/index.js
index 0faafe05efc..4d4080c5a58 100644
--- a/lib/plugins/aws/invokeLocal/index.js
+++ b/lib/plugins/aws/invokeLocal/index.js
@@ -198,7 +198,10 @@ class AwsInvokeLocal {
           } else if (value.Ref) {
             configuredEnvVars[name] = await resolveCfRefValue(this.provider, value.Ref);
           } else {
-            throw new Error(`Unsupported format: ${inspect(value)}`);
+            throw new ServerlessError(
+              `Unsupported environment variable format: ${inspect(value)}`,
+              'INVOKE_LOCAL_UNSUPPORTED_ENV_VARIABLE'
+            );
           }
         } catch (error) {
           throw new ServerlessError(
@@ -282,7 +285,10 @@ class AwsInvokeLocal {
     try {
       return await spawnExt('docker', ['version']);
     } catch {
-      throw new Error('Please start the Docker daemon to use the invoke local Docker integration.');
+      throw new ServerlessError(
+        'Please start the Docker daemon to use the invoke local Docker integration.',
+        'DOCKER_DAEMON_NOT_FOUND'
+      );
     }
   }
 
@@ -410,7 +416,10 @@ class AwsInvokeLocal {
       if (err.stdBuffer) {
         process.stdout.write(err.stdBuffer);
       }
-      throw new Error(`Failed to build docker image (exit code ${err.code}})`);
+      throw new ServerlessError(
+        `Failed to build docker image (exit code ${err.code}})`,
+        'DOCKER_IMAGE_BUILD_FAILED'
+      );
     }
   }
 
@@ -518,7 +527,10 @@ class AwsInvokeLocal {
       if (err.stdBuffer) {
         process.stdout.write(err.stdBuffer);
       }
-      throw new Error(`Failed to run docker for ${runtime} image (exit code ${err.code}})`);
+      throw new ServerlessError(
+        `Failed to run docker for ${runtime} image (exit code ${err.code}})`,
+        'DOCKER_IMAGE_RUN_FAILED'
+      );
     }
   }
 
@@ -625,7 +637,10 @@ class AwsInvokeLocal {
     try {
       await fse.stat(artifactPath);
     } catch {
-      throw new Error(`Artifact ${artifactPath} doesn't exists, please compile it first.`);
+      throw new ServerlessError(
+        `Artifact ${artifactPath} doesn't exists, please compile it first.`,
+        'JAVA_ARTIFACT_NOT_FOUND'
+      );
     }
     const timeout =
       Number(this.options.functionObj.timeout) ||
@@ -685,7 +700,10 @@ class AwsInvokeLocal {
             }
             isRejected = true;
             reject(
-              new Error(`Failed to build the Java bridge. exit code=${code} signal=${signal}`)
+              new ServerlessError(
+                `Failed to build the Java bridge. exit code=${code} signal=${signal}`,
+                'JAVA_BRIDGE_BUILD_FAILED'
+              )
             );
           }
         });
@@ -746,7 +764,10 @@ class AwsInvokeLocal {
       lambda = handlersContainer[handlerName];
     } catch (error) {
       this.serverless.cli.consoleLog(chalk.red(inspect(error)));
-      throw new Error(`Exception encountered when loading ${pathToHandler}`);
+      throw new ServerlessError(
+        `Exception encountered when loading ${pathToHandler}`,
+        'INVOKE_LOCAL_LAMBDA_INITIALIZATION_FAILED'
+      );
     }
 
     if (typeof lambda !== 'function') {
@@ -785,7 +806,10 @@ class AwsInvokeLocal {
               body: JSON.parse(result.body),
             });
           } catch (e) {
-            throw new Error('Content-Type of response is application/json but body is not json');
+            throw new ServerlessError(
+              'Content-Type of response is application/json but body is not json',
+              'INVOKE_LOCAL_RESPONSE_TYPE_MISMATCH'
+            );
           }
         }
       }
diff --git a/lib/plugins/aws/package/compile/events/cloudFront.js b/lib/plugins/aws/package/compile/events/cloudFront.js
index c1bf444773c..4438917aad6 100644
--- a/lib/plugins/aws/package/compile/events/cloudFront.js
+++ b/lib/plugins/aws/package/compile/events/cloudFront.js
@@ -262,13 +262,15 @@ class AwsCompileCloudFrontEvents {
         const { eventType = 'default' } = cloudFront;
         const { maxMemorySize, maxTimeout } = this.lambdaEdgeLimits[eventType];
         if (functionObj.memorySize && functionObj.memorySize > maxMemorySize) {
-          throw new Error(
-            `"${functionName}" memorySize is greater than ${maxMemorySize} which is not supported by Lambda@Edge functions of type "${eventType}"`
+          throw new ServerlessError(
+            `"${functionName}" memorySize is greater than ${maxMemorySize} which is not supported by Lambda@Edge functions of type "${eventType}"`,
+            'LAMBDA_EDGE_UNSUPPORTED_MEMORY_SIZE'
           );
         }
         if (functionObj.timeout && functionObj.timeout > maxTimeout) {
-          throw new Error(
-            `"${functionName}" timeout is greater than ${maxTimeout} which is not supported by Lambda@Edge functions of type "${eventType}"`
+          throw new ServerlessError(
+            `"${functionName}" timeout is greater than ${maxTimeout} which is not supported by Lambda@Edge functions of type "${eventType}"`,
+            'LAMBDA_EDGE_UNSUPPORTED_TIMEOUT_VALUE'
           );
         }
       });
diff --git a/lib/plugins/aws/package/lib/mergeCustomProviderResources.js b/lib/plugins/aws/package/lib/mergeCustomProviderResources.js
index 4ac48103148..85a99005a35 100644
--- a/lib/plugins/aws/package/lib/mergeCustomProviderResources.js
+++ b/lib/plugins/aws/package/lib/mergeCustomProviderResources.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
+const ServerlessError = require('../../../../serverless-error');
 
 module.exports = {
   mergeCustomProviderResources() {
@@ -71,11 +72,12 @@ module.exports = {
 
             // default includes any future attributes we don't know about yet.
             default:
-              throw new Error(
+              throw new ServerlessError(
                 `${resourceName}: Sorry, extending the ${extensionAttributeName} resource ` +
                   'attribute at this point is not supported. Feel free to propose support ' +
                   'for it in the Framework issue tracker: ' +
-                  'https://github.com/serverless/serverless/issues'
+                  'https://github.com/serverless/serverless/issues',
+                'RESOURCE_EXTENSION_UNSUPPORTED_ATTRIBUTE'
               );
           }
         }
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index ef3e203fd70..b09526a5583 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -1588,7 +1588,10 @@ class AwsProvider {
       if (!alias) return arnGetter;
       return { 'Fn::Join': [':', [arnGetter, alias.name]] };
     }
-    throw new Error(`Unrecognized function address ${functionAddress}`);
+    throw new ServerlessError(
+      `Unrecognized function address ${functionAddress}`,
+      'UNRECOGNIZED_FUNCTION_ADDRESS'
+    );
   }
 
   resolveLayerArtifactName(layerName) {
diff --git a/lib/plugins/aws/rollbackFunction.js b/lib/plugins/aws/rollbackFunction.js
index de288d8b893..cb22afe44d3 100644
--- a/lib/plugins/aws/rollbackFunction.js
+++ b/lib/plugins/aws/rollbackFunction.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const BbPromise = require('bluebird');
+const ServerlessError = require('../../serverless-error');
 const validate = require('./lib/validate');
 const fetch = require('node-fetch');
 
@@ -49,9 +50,12 @@ class AwsRollbackFunction {
             ` and version "${funcVersion}" is available for this function.`,
             ' Please check the docs for more info.',
           ].join('');
-          throw new Error(errorMessage);
+          throw new ServerlessError(errorMessage, 'AWS_FUNCTION_NOT_FOUND');
         }
-        throw new Error(error.message);
+        throw new ServerlessError(
+          `Cannot resolve function "${funcName}": ${error.message}`,
+          'AWS_FUNCTION_NOT_ACCESIBLE'
+        );
       });
   }
 
diff --git a/lib/plugins/aws/utils/credentials.js b/lib/plugins/aws/utils/credentials.js
index e603e009c87..24e008e3a9a 100644
--- a/lib/plugins/aws/utils/credentials.js
+++ b/lib/plugins/aws/utils/credentials.js
@@ -4,6 +4,7 @@ const { join } = require('path');
 const { constants, readFile, writeFile, mkdir } = require('fs');
 const os = require('os');
 const BbPromise = require('bluebird');
+const ServerlessError = require('../../../serverless-error');
 
 const homedir = os.homedir();
 const awsConfigDirPath = join(homedir, '.aws');
@@ -101,7 +102,12 @@ module.exports = {
 
   saveFileProfiles(profiles) {
     return new BbPromise((resolve) => {
-      if (!credentialsFilePath) throw new Error('Could not resolve path to user credentials file');
+      if (!credentialsFilePath) {
+        throw new ServerlessError(
+          'Could not resolve path to user credentials file',
+          'UNKNOWN_AWS_CREDENTIALS_PATH'
+        );
+      }
       resolve(
         writeCredentialsContent(
           `${Array.from(profiles)
diff --git a/lib/plugins/package/package.js b/lib/plugins/package/package.js
index 18d525478f8..c0bf6e46885 100644
--- a/lib/plugins/package/package.js
+++ b/lib/plugins/package/package.js
@@ -2,6 +2,7 @@
 
 const BbPromise = require('bluebird');
 const path = require('path');
+const ServerlessError = require('../../serverless-error');
 const cliCommandsSchema = require('../../cli/commands-schema');
 const zipService = require('./lib/zipService');
 const packageService = require('./lib/packageService');
@@ -57,7 +58,9 @@ class Package {
           this.serverless.cli.log(`Packaging function: ${this.options.function}...`);
           return BbPromise.resolve(this.packageFunction(this.options.function));
         }
-        return BbPromise.reject(new Error('Function name must be set'));
+        return BbPromise.reject(
+          new ServerlessError('Function name must be set', 'PACKAGE_MISSING_FUNCTION_OPTION')
+        );
       },
     };
   }
diff --git a/lib/plugins/plugin/install.js b/lib/plugins/plugin/install.js
index cdabafd8a50..d9826cefd1c 100644
--- a/lib/plugins/plugin/install.js
+++ b/lib/plugins/plugin/install.js
@@ -5,6 +5,7 @@ const childProcess = BbPromise.promisifyAll(require('child_process'));
 const fse = require('fs-extra');
 const path = require('path');
 const _ = require('lodash');
+const ServerlessError = require('../../serverless-error');
 const cliCommandsSchema = require('../../cli/commands-schema');
 const yamlAstParser = require('../../utils/yamlAstParser');
 const fileExists = require('../../utils/fs/fileExists');
@@ -116,7 +117,10 @@ class PluginInstall {
         : newServerlessFileObj.plugins.modules;
 
       if (plugins == null) {
-        throw new Error('plugins modules property must be present');
+        throw new ServerlessError(
+          'plugins modules property must be present',
+          'PLUGINS_MODULES_MISSING'
+        );
       }
 
       plugins.push(this.options.pluginName);

From 07d5b9c19e9f5365af322a4862b03ccdca05655c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 17 May 2021 15:10:38 +0200
Subject: [PATCH 0122/1101] refactor(Telemetry): Report error location for
 non-normative error codes

---
 lib/cli/handle-error.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 8e3439dea72..8f07c16ba42 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -36,6 +36,8 @@ const writeMessage = (title, message) => {
   consoleLog(' ');
 };
 
+const isErrorCodeNormative = RegExp.prototype.test.bind(/^[A-Z][A-Z0-9]*(?:_[A-Z0-9]+)*$/);
+
 module.exports = async (exception, options = {}) => {
   if (!isObject(options)) options = {};
   // Due to the fact that the handler can be invoked via fallback, we need to support both `serverless`
@@ -167,7 +169,7 @@ module.exports = async (exception, options = {}) => {
       code: exception.code,
     };
 
-    if (!isUserError || !exception.code) {
+    if (!isUserError || !exception.code || !isErrorCodeNormative(exception.code)) {
       failureReason.location = resolveErrorLocation(exceptionTokens);
     }
     await storeTelemetryLocally({ ...telemetryPayload, failureReason, outcome: 'failure' });

From 5a23931734ee80b80182008197c92985975f1646 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 18 May 2021 14:29:12 +0200
Subject: [PATCH 0123/1101] refactor(Telemetry): Normalize AWS request error
 codes

---
 lib/aws/request.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/aws/request.js b/lib/aws/request.js
index b45d1fb7f66..e13bfdf833a 100644
--- a/lib/aws/request.js
+++ b/lib/aws/request.js
@@ -115,6 +115,11 @@ const getServiceInstance = memoize(
   }
 );
 
+const normalizerPattern = /(?<!^)([A-Z])/g;
+const normalizeErrorCodePostfix = (name) => {
+  return name.replace(normalizerPattern, '_$1').toUpperCase();
+};
+
 /** Execute request to AWS service
  * @param {Object|string} [service] - Description of the service to call
  * @prop [service.name] - Name of the service to call, support subclasses
@@ -198,13 +203,17 @@ async function awsRequest(service, method, ...args) {
             providerError: Object.assign({}, err, { retryable: false }),
           });
         }
+        const providerErrorCodeExtension = err.code ? normalizeErrorCodePostfix(err.code) : 'ERROR';
         throw Object.assign(
           new ServerlessError(
             process.env.SLS_DEBUG && err.stack ? `${err.stack}\n${'-'.repeat(100)}` : message,
-            err.code
+            `AWS_${normalizeErrorCodePostfix(service.name)}_${normalizeErrorCodePostfix(
+              method
+            )}_${providerErrorCodeExtension}`
           ),
           {
             providerError: err,
+            providerErrorCodeExtension,
           }
         );
       }

From f87aee268dd19f9b90a7018032c77454d2084f12 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 18 May 2021 14:38:46 +0200
Subject: [PATCH 0124/1101] fix: Do not stumble on missing resource properties

---
 lib/plugins/aws/lib/normalizeFiles.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/plugins/aws/lib/normalizeFiles.js b/lib/plugins/aws/lib/normalizeFiles.js
index 0672ebb7b52..600ebbe02c5 100644
--- a/lib/plugins/aws/lib/normalizeFiles.js
+++ b/lib/plugins/aws/lib/normalizeFiles.js
@@ -18,15 +18,19 @@ module.exports = {
           WebsocketsDeployment: normalizedTemplate.Resources[key],
         })[key];
       }
-      if (key === 'WebsocketsDeploymentStage') {
+      if (key === 'WebsocketsDeploymentStage' && _.get(value.Properties, 'DeploymentId')) {
         const newVal = value;
         newVal.Properties.DeploymentId.Ref = 'WebsocketsDeployment';
       }
-      if (value.Type && value.Type === 'AWS::Lambda::Function') {
+      if (value.Type && value.Type === 'AWS::Lambda::Function' && _.get(value.Properties, 'Code')) {
         const newVal = value;
         newVal.Properties.Code.S3Key = '';
       }
-      if (value.Type && value.Type === 'AWS::Lambda::LayerVersion') {
+      if (
+        value.Type &&
+        value.Type === 'AWS::Lambda::LayerVersion' &&
+        _.get(value.Properties, 'Content')
+      ) {
         const newVal = value;
         newVal.Properties.Content.S3Key = '';
       }

From a46abe3d56cd667ad436fbceb283dd9e0f747d7b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 18 May 2021 15:16:47 +0200
Subject: [PATCH 0125/1101] refactor: Ensure to propagate as is stack
 monitoring error

---
 lib/plugins/aws/lib/monitorStack.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js
index 9905fdcb53e..327cff9b755 100644
--- a/lib/plugins/aws/lib/monitorStack.js
+++ b/lib/plugins/aws/lib/monitorStack.js
@@ -102,7 +102,7 @@ module.exports = {
                 stackStatus = 'DELETE_COMPLETE';
                 return;
               }
-              throw new ServerlessError(e.message, 'STACK_OPERATION_FAILURE');
+              throw e;
             }
           )
       )

From a6f4dc3b2be2aa9ba2255d57cf9a9d23eae02994 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 19 May 2021 12:09:18 +0200
Subject: [PATCH 0126/1101] refactor: Improve granularity of stack deployment
 error codes

---
 lib/plugins/aws/lib/monitorStack.js           | 23 ++++++++++++++++++-
 .../lib/plugins/aws/lib/monitorStack.test.js  |  2 +-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js
index 327cff9b755..494f814e1e9 100644
--- a/lib/plugins/aws/lib/monitorStack.js
+++ b/lib/plugins/aws/lib/monitorStack.js
@@ -7,6 +7,17 @@ const ServerlessError = require('../../../serverless-error');
 
 const validStatuses = new Set(['CREATE_COMPLETE', 'UPDATE_COMPLETE', 'DELETE_COMPLETE']);
 
+const normalizerPattern = /(?<!^)([A-Z])/g;
+const resourceTypePattern = /^(?<domain>[^:]+)::(?<service>[^:]+)(?:::(?<method>.+))?$/;
+const resourceTypeToErrorCodePostfix = (resourceType) => {
+  const { domain, service, method } = resourceType.match(resourceTypePattern).groups;
+  if (domain !== 'AWS') return `_${domain.replace(normalizerPattern, '_$1').toUpperCase()}`;
+  return `_${service.replace(normalizerPattern, '_$1')}_${method.replace(
+    normalizerPattern,
+    '_$1'
+  )}`.toUpperCase();
+};
+
 module.exports = {
   async checkStackProgress(
     action,
@@ -91,7 +102,17 @@ module.exports = {
                 let errorMessage = 'An error occurred: ';
                 errorMessage += `${stackLatestError.LogicalResourceId} - `;
                 errorMessage += `${stackLatestError.ResourceStatusReason}.`;
-                throw new ServerlessError(errorMessage, 'STACK_OPERATION_FAILURE');
+                const errorCode = (() => {
+                  if (
+                    stackLatestError.ResourceStatusReason.startsWith('Properties validation failed')
+                  ) {
+                    return `AWS_STACK_${action.toUpperCase()}_VALIDATION_ERROR`;
+                  }
+                  return `AWS_STACK_${action.toUpperCase()}${resourceTypeToErrorCodePostfix(
+                    stackLatestError.ResourceType
+                  )}_${stackLatestError.ResourceStatus}`;
+                })();
+                throw new ServerlessError(errorMessage, errorCode);
               }
             },
             (e) => {
diff --git a/test/unit/lib/plugins/aws/lib/monitorStack.test.js b/test/unit/lib/plugins/aws/lib/monitorStack.test.js
index 604f23f3134..a27caf69143 100644
--- a/test/unit/lib/plugins/aws/lib/monitorStack.test.js
+++ b/test/unit/lib/plugins/aws/lib/monitorStack.test.js
@@ -407,7 +407,7 @@ describe('monitorStack', () => {
             EventId: '1e2f3g4h',
             StackName: 'new-service-dev',
             LogicalResourceId: 'mochaS3',
-            ResourceType: 'S3::Bucket',
+            ResourceType: 'AWS::S3::Bucket',
             Timestamp: new Date(),
             ResourceStatus: 'CREATE_FAILED',
             ResourceStatusReason: 'Bucket already exists',

From f1a288ce2c30e1377d8b411a90db3b1b2857d4fb Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 18 May 2021 12:45:28 +0200
Subject: [PATCH 0127/1101] feat(CLI Onboarding): Support `template` and
 `template-url` options

---
 lib/cli/commands-schema/no-service.js         |  10 +-
 lib/cli/interactive-setup/service.js          |  78 +++++++++---
 .../lib/cli/interactive-setup/service.test.js | 119 +++++++++++++++++-
 3 files changed, 189 insertions(+), 18 deletions(-)

diff --git a/lib/cli/commands-schema/no-service.js b/lib/cli/commands-schema/no-service.js
index 4945170cd11..cfc0c732960 100644
--- a/lib/cli/commands-schema/no-service.js
+++ b/lib/cli/commands-schema/no-service.js
@@ -12,11 +12,17 @@ commands.set('', {
   hasAwsExtension: true,
   options: {
     'help-interactive': { usage: 'Show this message', type: 'boolean' },
+    'name': {
+      usage: 'Name for the service.',
+    },
+    'template': {
+      usage: 'Name of template for the service.',
+    },
     'template-path': {
       usage: 'Template local path for the service.',
     },
-    'name': {
-      usage: 'Name for the service.',
+    'template-url': {
+      usage: 'Template url for the service.',
     },
   },
   lifecycleEvents: ['initializeService', 'setupAws', 'autoUpdate', 'tabCompletion', 'end'],
diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index 25c9486a455..af1b6336143 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -101,9 +101,14 @@ const resolveProjectNameInput = async (options, workingDir) => {
 
 module.exports = {
   isApplicable({ options, serviceDir }) {
-    if (serviceDir && (options.name || options['template-path'])) {
+    const notApplicableOptions = new Set(['name', 'template-path', 'template', 'template-url']);
+    if (serviceDir && Object.keys(options).some((key) => notApplicableOptions.has(key))) {
       throw new ServerlessError(
-        'Cannot setup a new service when being in context of another service ("--name" and "--template-path" options cannot be applied)',
+        `Cannot setup a new service when being in context of another service (${[
+          ...notApplicableOptions,
+        ]
+          .map((opt) => `"--${opt}"`)
+          .join(', ')} options cannot be applied)`,
         'NOT_APPLICABLE_SERVICE_OPTIONS'
       );
     }
@@ -113,7 +118,23 @@ module.exports = {
   async run(context) {
     const workingDir = context.cwd || process.cwd();
 
-    if (!context.options.name && !context.options['template-path']) {
+    // Validate if user did not provide more than one of: `template', 'template-url` and `template-path` options
+    const templateOptions = new Set(['template-path', 'template', 'template-url']);
+    if (Object.keys(context.options).filter((key) => templateOptions.has(key)).length > 1) {
+      throw new ServerlessError(
+        `You can provide only one of: ${[...templateOptions]
+          .map((opt) => `"--${opt}"`)
+          .join(', ')} options`,
+        'MULTIPLE_TEMPLATE_OPTIONS_PROVIDED'
+      );
+    }
+
+    if (
+      !context.options.name &&
+      !context.options['template-path'] &&
+      !context.options.template &&
+      !context.options['template-url']
+    ) {
       const isConfirmed = await confirm('No project detected. Do you want to create a new one?', {
         name: 'shouldCreateNewProject',
       });
@@ -130,24 +151,53 @@ module.exports = {
         projectDir,
         projectName,
       });
-    } else {
-      const projectType = await projectTypeChoice();
-      if (projectType === 'other') {
-        process.stdout.write(
-          '\nRun “serverless create --help” to view available templates and create a new project ' +
-            'from one of those templates.\n'
+    } else if (context.options['template-url']) {
+      projectName = await resolveProjectNameInput(context.options, workingDir);
+      projectDir = join(workingDir, projectName);
+      const templateUrl = context.options['template-url'];
+      process.stdout.write(`\nDownloading template from provided url: ${templateUrl}...\n`);
+      try {
+        await downloadTemplateFromRepo(templateUrl, null, projectName, { silent: true });
+      } catch (err) {
+        if (err.constructor.name !== 'ServerlessError') throw err;
+
+        throw new ServerlessError(
+          `Could not download template from provided url. Ensure that the template provided with "--template-url" exists: ${err.message}`,
+          'INVALID_TEMPLATE_URL'
         );
-        return;
+      }
+    } else {
+      let projectType;
+      if (context.options.template) {
+        projectType = context.options.template;
+      } else {
+        projectType = await projectTypeChoice();
+        if (projectType === 'other') {
+          process.stdout.write(
+            '\nRun “serverless create --help” to view available templates and create a new project ' +
+              'from one of those templates.\n'
+          );
+          return;
+        }
       }
       projectName = await resolveProjectNameInput(context.options, workingDir);
       projectDir = join(workingDir, projectName);
       const templateUrl = `https://github.com/serverless/examples/tree/master/${projectType}`;
+      process.stdout.write(`\nDownloading "${projectType}" template...\n`);
       try {
-        process.stdout.write(`\n${chalk.green(`Downloading "${projectType}" template...`)}\n`);
         await downloadTemplateFromRepo(templateUrl, projectType, projectName, { silent: true });
       } catch (err) {
+        if (err.code === 'ENOENT' && context.options.template) {
+          throw new ServerlessError(
+            'Could not find provided template. Ensure that the template provided with "--template" exists.',
+            'INVALID_TEMPLATE'
+          );
+        }
+
+        if (err.constructor.name !== 'ServerlessError') throw err;
+
         throw new ServerlessError(
-          'Could not download template. Ensure that you are using the latest version of Serverless Framework.',
+          `Could not download template. Ensure that you are using the latest version of Serverless Framework: ${err.message}`,
           'TEMPLATE_DOWNLOAD_FAILED'
         );
       }
@@ -162,9 +212,7 @@ module.exports = {
     }
 
     if (hasPackageJson) {
-      process.stdout.write(
-        `\n${chalk.green(`Installing dependencies with "npm" in "${projectName}" folder.`)}\n`
-      );
+      process.stdout.write(`\nInstalling dependencies with "npm" in "${projectName}" folder.\n`);
       const npmCommand = await npmCommandDeferred;
       try {
         await spawn(npmCommand, ['install'], { cwd: projectDir });
diff --git a/test/unit/lib/cli/interactive-setup/service.test.js b/test/unit/lib/cli/interactive-setup/service.test.js
index af4014826c7..631184bbedd 100644
--- a/test/unit/lib/cli/interactive-setup/service.test.js
+++ b/test/unit/lib/cli/interactive-setup/service.test.js
@@ -7,6 +7,7 @@ const configureInquirerStub = require('@serverless/test/configure-inquirer-stub'
 const step = require('../../../../../lib/cli/interactive-setup/service');
 const proxyquire = require('proxyquire');
 const overrideStdoutWrite = require('process-utils/override-stdout-write');
+const ServerlessError = require('../../../../../lib/serverless-error');
 
 const templatesPath = path.resolve(__dirname, '../../../../../lib/plugins/create/templates');
 
@@ -37,6 +38,20 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       .and.have.property('code', 'NOT_APPLICABLE_SERVICE_OPTIONS');
   });
 
+  it('Should result in an error when at service path with `template` option provided', () => {
+    expect(() => step.isApplicable({ serviceDir: '/foo', options: { template: 'test-template' } }))
+      .to.throw()
+      .and.have.property('code', 'NOT_APPLICABLE_SERVICE_OPTIONS');
+  });
+
+  it('Should result in an error when at service path with `template-url` option provided', () => {
+    expect(() =>
+      step.isApplicable({ serviceDir: '/foo', options: { 'template-url': 'test-template' } })
+    )
+      .to.throw()
+      .and.have.property('code', 'NOT_APPLICABLE_SERVICE_OPTIONS');
+  });
+
   it("Should abort if user doesn't want setup", async () => {
     configureInquirerStub(inquirer, {
       confirm: { shouldCreateNewProject: false },
@@ -272,10 +287,76 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       expect(stats.isFile()).to.be.true;
     });
 
+    it('Should create project at not existing directory with provided template', async () => {
+      const downloadTemplateFromRepoStub = sinon.stub();
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        '../../utils/downloadTemplateFromRepo': {
+          downloadTemplateFromRepo: downloadTemplateFromRepoStub.callsFake(
+            async (templateUrl, projectType, projectName) => {
+              const serverlessYmlContent = `
+            service: service
+            provider:
+              name: aws
+           `;
+
+              await fsp.mkdir(projectName);
+              await fsp.writeFile(path.join(projectName, 'serverless.yml'), serverlessYmlContent);
+            }
+          ),
+        },
+      });
+      configureInquirerStub(inquirer, {
+        input: { projectName: 'test-project-from-provided-template' },
+      });
+      await mockedStep.run({ options: { template: 'test-template' } });
+      const stats = await fsp.lstat('test-project-from-provided-template/serverless.yml');
+      expect(stats.isFile()).to.be.true;
+      expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
+        'https://github.com/serverless/examples/tree/master/test-template',
+        'test-template',
+        'test-project-from-provided-template'
+      );
+    });
+
+    it('Should create project at not existing directory with provided `template-url`', async () => {
+      const providedTemplateUrl =
+        'https://github.com/serverless/examples/tree/master/test-template';
+      const downloadTemplateFromRepoStub = sinon.stub();
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        '../../utils/downloadTemplateFromRepo': {
+          downloadTemplateFromRepo: downloadTemplateFromRepoStub.callsFake(
+            async (templateUrl, projectType, projectName) => {
+              const serverlessYmlContent = `
+            service: service
+            provider:
+              name: aws
+           `;
+
+              await fsp.mkdir(projectName);
+              await fsp.writeFile(path.join(projectName, 'serverless.yml'), serverlessYmlContent);
+            }
+          ),
+        },
+      });
+      configureInquirerStub(inquirer, {
+        input: { projectName: 'test-project-from-provided-template-url' },
+      });
+      await mockedStep.run({ options: { 'template-url': providedTemplateUrl } });
+      const stats = await fsp.lstat('test-project-from-provided-template-url/serverless.yml');
+      expect(stats.isFile()).to.be.true;
+      expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
+        providedTemplateUrl,
+        null,
+        'test-project-from-provided-template-url'
+      );
+    });
+
     it('Should throw an error when template cannot be downloaded', async () => {
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
         '../../utils/downloadTemplateFromRepo': {
-          downloadTemplateFromRepo: sinon.stub().rejects(),
+          downloadTemplateFromRepo: sinon.stub().callsFake(async () => {
+            throw new ServerlessError();
+          }),
         },
       });
       configureInquirerStub(inquirer, {
@@ -288,6 +369,36 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
         'TEMPLATE_DOWNLOAD_FAILED'
       );
     });
+
+    it('Should throw an error when provided template cannot be found', async () => {
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        '../../utils/downloadTemplateFromRepo': {
+          downloadTemplateFromRepo: sinon.stub().rejects({ code: 'ENOENT' }),
+        },
+      });
+      configureInquirerStub(inquirer, {
+        input: { projectName: 'test-error-during-download' },
+      });
+      await expect(
+        mockedStep.run({ options: { template: 'test-template' } })
+      ).to.be.eventually.rejected.and.have.property('code', 'INVALID_TEMPLATE');
+    });
+
+    it('Should throw an error when template provided with url cannot be found', async () => {
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        '../../utils/downloadTemplateFromRepo': {
+          downloadTemplateFromRepo: sinon.stub().callsFake(async () => {
+            throw new ServerlessError();
+          }),
+        },
+      });
+      configureInquirerStub(inquirer, {
+        input: { projectName: 'test-error-during-download-custom-template' },
+      });
+      await expect(
+        mockedStep.run({ options: { 'template-url': 'test-template-url' } })
+      ).to.be.eventually.rejected.and.have.property('code', 'INVALID_TEMPLATE_URL');
+    });
   });
 
   it('Should not allow project creation in a directory in which already service is configured', async () => {
@@ -337,4 +448,10 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       step.run({ options: { name: 'elo grzegżółka' } })
     ).to.eventually.be.rejected.and.have.property('code', 'INVALID_PROJECT_NAME');
   });
+
+  it('Should not allow project creation if multiple template-related options are provided', async () => {
+    await expect(
+      step.run({ options: { 'template': 'some-template', 'template-url': 'https://template.com' } })
+    ).to.eventually.be.rejected.and.have.property('code', 'MULTIPLE_TEMPLATE_OPTIONS_PROVIDED');
+  });
 });

From 8d0ff078f7f0b565c1d35af1319f76a407afeb4b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 19 May 2021 14:06:01 +0200
Subject: [PATCH 0128/1101] feat(Telemetry): Report awsUserResourceTypes

---
 lib/utils/telemetry/generatePayload.js        | 25 +++++++++++++
 .../utils/telemetry/generatePayload.test.js   | 35 +++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index 451d13fdded..43807fd1cc7 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -5,6 +5,7 @@ const os = require('os');
 const fs = require('fs').promises;
 const resolve = require('ncjsm/resolve');
 const _ = require('lodash');
+const isPlainObject = require('type/plain-object/is');
 const isObject = require('type/object/is');
 const userConfig = require('@serverless/utils/config');
 const isStandalone = require('../isStandaloneExecutable');
@@ -43,6 +44,29 @@ const getServiceConfig = ({ configuration, options }) => {
     return result;
   })();
 
+  const resolveResourceTypes = (resources) => {
+    if (!isPlainObject(resources)) return [];
+    return [
+      ...new Set(
+        Object.values(resources)
+          .map((resource) => {
+            const type = _.get(resource, 'Type');
+            if (typeof type !== 'string' || !type.includes('::')) return null;
+            const domain = type.slice(0, type.indexOf(':'));
+            return domain === 'AWS' ? type : domain;
+          })
+          .filter(Boolean)
+      ),
+    ];
+  };
+
+  const resources = (() => {
+    if (!isAwsProvider) return undefined;
+    return {
+      general: resolveResourceTypes(_.get(configuration.resources, 'Resources')),
+    };
+  })();
+
   return {
     provider: {
       name: providerName,
@@ -70,6 +94,7 @@ const getServiceConfig = ({ configuration, options }) => {
         };
       })
       .filter(Boolean),
+    resources,
   };
 };
 
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index 7be4fcca6d1..bf1b1d3a5b8 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -40,6 +40,35 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
               '000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38',
           },
         },
+        resources: {
+          Resources: {
+            ExtraLogGroup: {
+              Type: 'AWS::Logs::LogGroup',
+              Properties: {
+                LogGroupName: '/aws/lambda/extra-log',
+              },
+            },
+            AnotherExtraLogGroup: {
+              Type: 'AWS::Logs::LogGroup',
+              Properties: {
+                LogGroupName: '/aws/lambda/extra-log-2',
+              },
+            },
+            ExtraBucket: {
+              Type: 'AWS::S3::Bucket',
+            },
+            ExtraCustom: {
+              Type: 'Custom::Matthieu',
+            },
+          },
+          extensions: {
+            FunctionLambdaFunction: {
+              Properties: {
+                Runtime: 'nodejs14.x',
+              },
+            },
+          },
+        },
       },
     });
     await fs.promises.writeFile(
@@ -105,6 +134,9 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
           { runtime: 'nodejs14.x', events: [] },
           { runtime: '$containerimage', events: [] },
         ],
+        resources: {
+          general: ['AWS::Logs::LogGroup', 'AWS::S3::Bucket', 'Custom'],
+        },
       },
       isAutoUpdateEnabled: false,
       isTabAutocompletionInstalled: false,
@@ -159,6 +191,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
           { runtime: 'foo', events: [{ type: 'someEvent' }] },
           { runtime: 'bar', events: [] },
         ],
+        resources: undefined,
       },
       isAutoUpdateEnabled: false,
       isTabAutocompletionInstalled: false,
@@ -216,6 +249,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
         },
         plugins: [],
         functions: [],
+        resources: { general: [] },
       },
       isAutoUpdateEnabled: false,
       isTabAutocompletionInstalled: false,
@@ -314,6 +348,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
           { runtime: 'nodejs12.x', events: [] },
           { runtime: 'nodejs12.x', events: [] },
         ],
+        resources: { general: [] },
       },
       isAutoUpdateEnabled: false,
       isTabAutocompletionInstalled: false,

From 71e1cf4b8d798c6d70999872c09335976103ccf5 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 19 May 2021 15:35:00 +0200
Subject: [PATCH 0129/1101] chore: Bump dependencies

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 61101fed9b4..820f474a89f 100644
--- a/package.json
+++ b/package.json
@@ -24,12 +24,12 @@
   "dependencies": {
     "@serverless/cli": "^1.5.2",
     "@serverless/components": "^3.9.2",
-    "@serverless/dashboard-plugin": "^5.1.0",
+    "@serverless/dashboard-plugin": "^5.1.2",
     "@serverless/utils": "^4.1.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.906.0",
+    "aws-sdk": "^2.909.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
@@ -81,7 +81,7 @@
     "chai-as-promised": "^7.1.1",
     "cos-nodejs-sdk-v5": "^2.9.15",
     "eslint": "^7.26.0",
-    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-import": "^2.23.2",
     "git-list-updated": "^1.2.1",
     "github-release-from-cc-changelog": "^2.2.0",
     "husky": "^4.3.8",

From afa3581064a8a9a33587a97913ea097f788e855e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 19 May 2021 15:35:29 +0200
Subject: [PATCH 0130/1101] chore: Upgrade `@serverless/utils` to v5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 820f474a89f..4c890b18d34 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@serverless/cli": "^1.5.2",
     "@serverless/components": "^3.9.2",
     "@serverless/dashboard-plugin": "^5.1.2",
-    "@serverless/utils": "^4.1.0",
+    "@serverless/utils": "^5.1.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",

From 225c5acb9dbbbe528b9f2e0a5cf1d888d6be3ee3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 19 May 2021 15:58:20 +0200
Subject: [PATCH 0131/1101] chore: Release v2.42.0

---
 CHANGELOG.md | 34 ++++++++++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfb941d7a53..6b07dc3dd5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,40 @@
 
 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.
 
+## [2.42.0](https://github.com/serverless/serverless/compare/v2.41.2...v2.42.0) (2021-05-19)
+
+### Features
+
+- **CLI Onboarding:**
+  - Switch to templates hosted at [`serverless/examples`](https://github.com/serverless/examples/) ([#9484](https://github.com/serverless/serverless/pull/9484)) ([e4ea50d](https://github.com/serverless/serverless/commit/e4ea50d401628cb22612196b7e9b50c4344dab8a)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Support `--name` CLI option for `service` step ([#9471](https://github.com/serverless/serverless/pull/9471)) ([53575dc](https://github.com/serverless/serverless/commit/53575dc36017ded5ff60e5edf18fb7a9fd9d30e9)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Support `template-path` CLI option for `service` step ([#9471](https://github.com/serverless/serverless/pull/9471)) ([98c9700](https://github.com/serverless/serverless/commit/98c9700bcda328552f04116a51549f66e3d7b026)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Support `template` and `template-url` options for `service` step ([#9495](https://github.com/serverless/serverless/pull/9495)) ([f1a288c](https://github.com/serverless/serverless/commit/f1a288ce2c30e1377d8b411a90db3b1b2857d4fb)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **AWS API Gateway:** Fix schema for `apiKeys` and `permissionsBoundary` ([#9489](https://github.com/serverless/serverless/pull/9489)) ([5601025](https://github.com/serverless/serverless/commit/5601025dd8a4075cb463e2dcfb67d6c52984582a)) ([lyndoh](https://github.com/lyndoh))
+- **AWS Local Invocation:** Report invalid handler path meaningfully ([#9499](https://github.com/serverless/serverless/pull/9499)) ([a2297ee](https://github.com/serverless/serverless/commit/a2297ee916dd79463d4efcfd6f7fe1f8e0e50d87)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Variables:**
+  - Fix reporting of variable resolution errors trigger by variable resolution made in JS function resolvers ([#9482](https://github.com/serverless/serverless/pull/9482)) ([f6b7cfa](https://github.com/serverless/serverless/commit/f6b7cfaaaff81b84011f0f6168a651979089e1c9)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Ensure report user error as user error ([#9499](https://github.com/serverless/serverless/pull/9499)) ([a8f4aeb](https://github.com/serverless/serverless/commit/a8f4aebe5d482a491d86d3427b259db00674cc72)) ([Mariusz Nowak](https://github.com/medikoo))
+- Expose remote lambda invocation failure as user error (([#9499](https://github.com/serverless/serverless/pull/9499)) [8f3d4e4](https://github.com/serverless/serverless/commit/8f3d4e4bdb1df1e107c5113d013164a2396f0f64)) ([Mariusz Nowak](https://github.com/medikoo))
+- Expose template error with user error ([#9499](https://github.com/serverless/serverless/pull/9499)) ([07b60a6](https://github.com/serverless/serverless/commit/07b60a6bb42796e6f060730ce4bf22762942b0b8)) ([Mariusz Nowak](https://github.com/medikoo))
+- Construct user errors with `ServerlessError` ([#9499](https://github.com/serverless/serverless/pull/9499)) ([c563581](https://github.com/serverless/serverless/commit/c563581ac98764edf653c1a5337d1b7d2b61ea63)) ([Mariusz Nowak](https://github.com/medikoo))
+- Do not stumble on missing resource properties ([#9499](https://github.com/serverless/serverless/pull/9499)) ([f87aee2](https://github.com/serverless/serverless/commit/f87aee268dd19f9b90a7018032c77454d2084f12)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **Telemetry:**
+  - Report resource types for user configured resources at `resources.Resources` ([#9501](https://github.com/serverless/serverless/pull/9501)) ([8d0ff07](https://github.com/serverless/serverless/commit/8d0ff078f7f0b565c1d35af1319f76a407afeb4b)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Normalize AWS request error codes ([#9499](https://github.com/serverless/serverless/pull/9499)) ([5a23931](https://github.com/serverless/serverless/commit/5a23931734ee80b80182008197c92985975f1646)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Report error location for non-normative error codes ([#9499](https://github.com/serverless/serverless/pull/9499)) ([07d5b9c](https://github.com/serverless/serverless/commit/07d5b9c19e9f5365af322a4862b03ccdca05655c)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Remove dead path error handling ([#9499](https://github.com/serverless/serverless/pull/9499)) ([91b10ed](https://github.com/serverless/serverless/commit/91b10ed208f2dee4b690df633f4275f658355044)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Improve granularity of stack deployment error codes ([#9499](https://github.com/serverless/serverless/pull/9499)) ([a6f4dc3](https://github.com/serverless/serverless/commit/a6f4dc3b2be2aa9ba2255d57cf9a9d23eae02994)) ([Mariusz Nowak](https://github.com/medikoo))
+- **CLI Onboarding:** Add `history` and `stepHistory` to `context` ([#9481](https://github.com/serverless/serverless/pull/9481)) ([9eea885](https://github.com/serverless/serverless/commit/9eea885b390fc88bb62c1e2a5c3d108444139703)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Add `create-from-local-template` util ([#9471](https://github.com/serverless/serverless/pull/9471)) ([03011ba](https://github.com/serverless/serverless/commit/03011baf07d262a5b9702b34b75a997e3f525d28)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Ensure to propagate as is stack monitoring error ([#9499](https://github.com/serverless/serverless/pull/9499)) ([a46abe3](https://github.com/serverless/serverless/commit/a46abe3d56cd667ad436fbceb283dd9e0f747d7b)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ## [2.41.2](https://github.com/serverless/serverless/compare/v2.41.1...v2.41.2) (2021-05-13)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 4c890b18d34..cb90f8747d5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.41.2",
+  "version": "2.42.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From dee54ed55c0a0697eefdde99d5ec8aee321ce041 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 19 May 2021 16:02:19 +0200
Subject: [PATCH 0132/1101] feat(CLI Onboarding): Present default project name
 if possible

---
 lib/cli/interactive-setup/service.js          | 23 +++++++++------
 .../lib/cli/interactive-setup/service.test.js | 29 +++++++------------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index af1b6336143..44ce0d93d00 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -8,7 +8,6 @@ const inquirer = require('@serverless/utils/inquirer');
 const resolveConfigurationPath = require('../resolve-configuration-path');
 const readConfiguration = require('../../configuration/read');
 const resolveVariables = require('../../configuration/variables');
-const { confirm } = require('./utils');
 const createFromLocalTemplate = require('../../utils/create-from-local-template');
 const npmCommandDeferred = require('../../utils/npm-command-deferred');
 const ServerlessError = require('../../serverless-error');
@@ -50,12 +49,13 @@ const INVALID_PROJECT_NAME_MESSAGE =
   '   - It should start with an alphabetic character.\n' +
   "   - Shouldn't exceed 128 characters";
 
-const projectNameInput = async (workingDir) =>
+const projectNameInput = async (workingDir, projectType) =>
   (
     await inquirer.prompt({
       message: 'What do you want to call this project?',
       type: 'input',
       name: 'projectName',
+      default: projectType ? `${projectType}-project` : null,
       validate: async (input) => {
         input = input.trim();
         if (!isValidServiceName(input)) {
@@ -72,7 +72,7 @@ const projectNameInput = async (workingDir) =>
     })
   ).projectName.trim();
 
-const resolveProjectNameInput = async (options, workingDir) => {
+const resolveProjectNameInput = async (options, workingDir, projectType = null) => {
   if (options.name) {
     if (!isValidServiceName(options.name)) {
       throw new ServerlessError(INVALID_PROJECT_NAME_MESSAGE, 'INVALID_PROJECT_NAME');
@@ -96,7 +96,7 @@ const resolveProjectNameInput = async (options, workingDir) => {
     return options.name;
   }
 
-  return projectNameInput(workingDir);
+  return projectNameInput(workingDir, projectType);
 };
 
 module.exports = {
@@ -135,10 +135,15 @@ module.exports = {
       !context.options.template &&
       !context.options['template-url']
     ) {
-      const isConfirmed = await confirm('No project detected. Do you want to create a new one?', {
-        name: 'shouldCreateNewProject',
-      });
-      if (!isConfirmed) return;
+      const isConfirmed = (
+        await inquirer.prompt({
+          message: 'No project detected. Do you want to create a new one?',
+          type: 'list',
+          name: 'shouldCreateNewProject',
+          choices: ['Yes', 'No'],
+        })
+      ).shouldCreateNewProject;
+      if (isConfirmed !== 'Yes') return;
     }
 
     let projectDir;
@@ -180,7 +185,7 @@ module.exports = {
           return;
         }
       }
-      projectName = await resolveProjectNameInput(context.options, workingDir);
+      projectName = await resolveProjectNameInput(context.options, workingDir, projectType);
       projectDir = join(workingDir, projectName);
       const templateUrl = `https://github.com/serverless/examples/tree/master/${projectType}`;
       process.stdout.write(`\nDownloading "${projectType}" template...\n`);
diff --git a/test/unit/lib/cli/interactive-setup/service.test.js b/test/unit/lib/cli/interactive-setup/service.test.js
index 631184bbedd..fd9f9754d9a 100644
--- a/test/unit/lib/cli/interactive-setup/service.test.js
+++ b/test/unit/lib/cli/interactive-setup/service.test.js
@@ -54,7 +54,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
 
   it("Should abort if user doesn't want setup", async () => {
     configureInquirerStub(inquirer, {
-      confirm: { shouldCreateNewProject: false },
+      list: { shouldCreateNewProject: 'No' },
     });
     await step.run({ options: {} });
     return confirmEmptyWorkingDir();
@@ -62,8 +62,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
 
   it("Should abort if user choses 'other' template", async () => {
     configureInquirerStub(inquirer, {
-      confirm: { shouldCreateNewProject: true },
-      list: { projectType: 'other' },
+      list: { projectType: 'other', shouldCreateNewProject: 'Yes' },
     });
     await step.run({ options: {} });
     return confirmEmptyWorkingDir();
@@ -90,8 +89,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       });
 
       configureInquirerStub(inquirer, {
-        confirm: { shouldCreateNewProject: true },
-        list: { projectType: 'aws-nodejs' },
+        list: { projectType: 'aws-nodejs', shouldCreateNewProject: 'Yes' },
         input: { projectName: 'test-project' },
       });
       await mockedStep.run({ options: {} });
@@ -125,8 +123,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       });
 
       configureInquirerStub(inquirer, {
-        confirm: { shouldCreateNewProject: true },
-        list: { projectType: 'aws-nodejs' },
+        list: { projectType: 'aws-nodejs', shouldCreateNewProject: 'Yes' },
         input: { projectName: 'test-project-template' },
       });
       await mockedStep.run({ options: {} });
@@ -165,8 +162,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       });
 
       configureInquirerStub(inquirer, {
-        confirm: { shouldCreateNewProject: true },
-        list: { projectType: 'aws-nodejs' },
+        list: { shouldCreateNewProject: 'Yes', projectType: 'aws-nodejs' },
         input: { projectName: 'test-project-package-json' },
       });
       await mockedStep.run({ options: {} });
@@ -204,8 +200,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       });
 
       configureInquirerStub(inquirer, {
-        confirm: { shouldCreateNewProject: true },
-        list: { projectType: 'aws-nodejs' },
+        list: { projectType: 'aws-nodejs', shouldCreateNewProject: 'Yes' },
         input: { projectName: 'test-project-missing-npm' },
       });
 
@@ -242,8 +237,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       });
 
       configureInquirerStub(inquirer, {
-        confirm: { shouldCreateNewProject: true },
-        list: { projectType: 'aws-nodejs' },
+        list: { projectType: 'aws-nodejs', shouldCreateNewProject: 'Yes' },
         input: { projectName: 'test-project-failed-install' },
       });
 
@@ -360,8 +354,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
         },
       });
       configureInquirerStub(inquirer, {
-        confirm: { shouldCreateNewProject: true },
-        list: { projectType: 'aws-nodejs' },
+        list: { projectType: 'aws-nodejs', shouldCreateNewProject: 'Yes' },
         input: { projectName: 'test-error-during-download' },
       });
       await expect(mockedStep.run({ options: {} })).to.be.eventually.rejected.and.have.property(
@@ -403,8 +396,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
 
   it('Should not allow project creation in a directory in which already service is configured', async () => {
     configureInquirerStub(inquirer, {
-      confirm: { shouldCreateNewProject: true },
-      list: { projectType: 'aws-nodejs' },
+      list: { projectType: 'aws-nodejs', shouldCreateNewProject: 'Yes' },
       input: { projectName: 'existing' },
     });
 
@@ -430,8 +422,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
 
   it('Should not allow project creation using an invalid project name', async () => {
     configureInquirerStub(inquirer, {
-      confirm: { shouldCreateNewProject: true },
-      list: { projectType: 'aws-nodejs' },
+      list: { projectType: 'aws-nodejs', shouldCreateNewProject: 'Yes' },
       input: { projectName: 'elo grzegżółka' },
     });
     await expect(step.run({ options: {} })).to.eventually.be.rejected.and.have.property(

From 29f0e9c840e4b1ae9949925bc5a2a9d2de742271 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 19 May 2021 16:54:00 +0200
Subject: [PATCH 0133/1101] fix: Dont depend on default execution role when
 custom role provided

---
 lib/plugins/aws/provider.js                   |  5 +--
 .../aws/package/compile/events/sqs.test.js    | 32 +++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index b09526a5583..9b4703dfdd0 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -1625,9 +1625,10 @@ class AwsProvider {
         return customRole['Fn::GetAtt'][0];
       }
       if (
-        // otherwise, check if we have an import or parameters ref
+        // otherwise, check if we have an import, parameters ref or sub
         customRole['Fn::ImportValue'] ||
-        customRole.Ref
+        customRole.Ref ||
+        customRole['Fn::Sub']
       ) {
         return null;
       }
diff --git a/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js b/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
index 8f49098b3bb..ba35dbe4303 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
@@ -643,4 +643,36 @@ describe('AwsCompileSQSEvents #2', () => {
       expect(eventSourceMappingResource.Properties.MaximumBatchingWindowInSeconds).to.equal(100);
     });
   });
+
+  it('should not depend on default IAM role when custom role defined', async () => {
+    const { awsNaming, cfTemplate } = await runServerless({
+      fixture: 'function',
+      configExt: {
+        provider: {
+          iam: {
+            role: {
+              'Fn::Sub': 'arn:aws:iam::${AWS::AccountId}:role/iam-role-name',
+            },
+          },
+        },
+        functions: {
+          foo: {
+            events: [
+              {
+                sqs: {
+                  arn: 'arn:aws:sqs:region:account:MyQueue',
+                },
+              },
+            ],
+          },
+        },
+      },
+      command: 'package',
+    });
+
+    const queueLogicalId = awsNaming.getQueueLogicalId('foo', 'MyQueue');
+    const eventSourceMappingResource = cfTemplate.Resources[queueLogicalId];
+
+    expect(eventSourceMappingResource.DependsOn).to.deep.equal([]);
+  });
 });

From 18a9b2b6f5734083de751cf182c6be61736be11f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 20 May 2021 12:05:42 +0200
Subject: [PATCH 0134/1101] fix(AWS Deploy): Fix stack errors processing

---
 lib/plugins/aws/lib/monitorStack.js                | 5 ++++-
 test/unit/lib/plugins/aws/lib/monitorStack.test.js | 3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js
index 494f814e1e9..e1ea3de499c 100644
--- a/lib/plugins/aws/lib/monitorStack.js
+++ b/lib/plugins/aws/lib/monitorStack.js
@@ -101,9 +101,12 @@ module.exports = {
                 this.serverless.cli.log(`View the full error output: ${stackUrl}`);
                 let errorMessage = 'An error occurred: ';
                 errorMessage += `${stackLatestError.LogicalResourceId} - `;
-                errorMessage += `${stackLatestError.ResourceStatusReason}.`;
+                errorMessage += `${
+                  stackLatestError.ResourceStatusReason || stackLatestError.ResourceStatus
+                }.`;
                 const errorCode = (() => {
                   if (
+                    stackLatestError.ResourceStatusReason &&
                     stackLatestError.ResourceStatusReason.startsWith('Properties validation failed')
                   ) {
                     return `AWS_STACK_${action.toUpperCase()}_VALIDATION_ERROR`;
diff --git a/test/unit/lib/plugins/aws/lib/monitorStack.test.js b/test/unit/lib/plugins/aws/lib/monitorStack.test.js
index a27caf69143..33badff6d05 100644
--- a/test/unit/lib/plugins/aws/lib/monitorStack.test.js
+++ b/test/unit/lib/plugins/aws/lib/monitorStack.test.js
@@ -921,7 +921,6 @@ describe('monitorStack', () => {
             ResourceType: 'AWS::CloudFormation::Stack',
             Timestamp: new Date(),
             ResourceStatus: 'UPDATE_ROLLBACK_IN_PROGRESS',
-            ResourceStatusReason: 'Export is in use',
           },
         ],
       };
@@ -943,7 +942,7 @@ describe('monitorStack', () => {
 
       return awsPlugin.monitorStack('update', cfDataMock, { frequency: 10 }).catch((e) => {
         let errorMessage = 'An error occurred: ';
-        errorMessage += 'mocha - Export is in use.';
+        errorMessage += 'mocha - UPDATE_ROLLBACK_IN_PROGRESS.';
         expect(e.name).to.be.equal('ServerlessError');
         expect(e.message).to.be.equal(errorMessage);
         // callCount is 2 because Serverless will immediately exits and shows the error

From 6adaa9f56ed6e9708065767be602f484d0091679 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 20 May 2021 12:37:53 +0200
Subject: [PATCH 0135/1101] refactor: Ensure codes for user errors

---
 scripts/serverless.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index c75724adb7c..a11350f57a6 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -71,7 +71,8 @@ const processSpanPromise = (async () => {
     // Abort if command is not supported in this environment
     if (commandSchema && commandSchema.isHidden && commandSchema.noSupportNotice) {
       throw new ServerlessError(
-        `Cannot run \`${command}\` command: ${commandSchema.noSupportNotice}`
+        `Cannot run \`${command}\` command: ${commandSchema.noSupportNotice}`,
+        'NOT_SUPPORTED_COMMAND'
       );
     }
 
@@ -101,7 +102,8 @@ const processSpanPromise = (async () => {
           `Cannot resolve ${path.basename(
             configurationPath
           )}: "${humanizedPropertyPath}" property is not accessible ` +
-            '(configured behind variables which cannot be resolved at this stage)'
+            '(configured behind variables which cannot be resolved at this stage)',
+          'INACCESSIBLE_CONFIGURATION_PROPERTY'
         );
       }
       logDeprecation(
@@ -165,7 +167,8 @@ const processSpanPromise = (async () => {
                 `Cannot resolve ${path.basename(
                   configurationPath
                 )}: "variableSyntax" is not supported with new variables resolver. ` +
-                  'Please drop this setting'
+                  'Please drop this setting',
+                'UNSUPPORTED_VARIABLE_SYNTAX_CONFIGURATION'
               );
             }
             logDeprecation(
@@ -563,6 +566,7 @@ const processSpanPromise = (async () => {
                 'Invalid "configurationVariablesSources" ' +
                 `configuration on "${pluginName}", expected object, got: %v"`,
               Error: ServerlessError,
+              errorCode: 'INVALID_VARIABLE_SOURCES_CONFIGURATION',
             });
 
             for (const [sourceName, sourceConfig] of Object.entries(
@@ -572,7 +576,8 @@ const processSpanPromise = (async () => {
                 throw new ServerlessError(
                   `Cannot add "${sourceName}" configuration variable source ` +
                     `(through "${pluginName}" plugin) as resolution rules ` +
-                    'for this source name are already configured'
+                    'for this source name are already configured',
+                  'DUPLICATE_VARIABLE_SOURCE_CONFIGURATION'
                 );
               }
               ensurePlainFunction(
@@ -581,12 +586,14 @@ const processSpanPromise = (async () => {
                     `Invalid "configurationVariablesSources.${sourceName}" ` +
                     `configuration on "${pluginName}", expected object, got: %v"`,
                   Error: ServerlessError,
+                  errorCode: 'INVALID_VARIABLE_SOURCE_CONFIGURATION',
                 }).resolve,
                 {
                   errorMessage:
                     `Invalid "configurationVariablesSources.${sourceName}.resolve" ` +
                     `value on "${pluginName}", expected function, got: %v"`,
                   Error: ServerlessError,
+                  errorCode: 'INVALID_VARIABLE_SOURCE_RESOLVER_CONFIGURATION',
                 }
               );
 

From bab39c67a1b46937cf2051fa1fe37515afc3382a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 20 May 2021 13:11:24 +0200
Subject: [PATCH 0136/1101] test: Convert to async/await

---
 test/unit/lib/plugins/plugin/install.test.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/unit/lib/plugins/plugin/install.test.js b/test/unit/lib/plugins/plugin/install.test.js
index 8c935c412c4..c8124ecf641 100644
--- a/test/unit/lib/plugins/plugin/install.test.js
+++ b/test/unit/lib/plugins/plugin/install.test.js
@@ -392,7 +392,7 @@ describe('PluginInstall', () => {
         });
     });
 
-    it('should not modify serverless .js file', () => {
+    it('should not modify serverless .js file', async () => {
       const serverlessJsFilePath = path.join(serviceDir, 'serverless.js');
       pluginInstall.serverless.configurationFilename = 'serverless.js';
       const serverlessJson = {
@@ -405,11 +405,10 @@ describe('PluginInstall', () => {
         `module.exports = ${JSON.stringify(serverlessJson)};`
       );
       pluginInstall.options.pluginName = 'serverless-plugin-1';
-      return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
-        // use require to load serverless.js
-        // eslint-disable-next-line global-require
-        expect(require(serverlessJsFilePath).plugins).to.be.deep.equal([]);
-      });
+      await pluginInstall.addPluginToServerlessFile();
+      // use require to load serverless.js
+      // eslint-disable-next-line global-require
+      expect(require(serverlessJsFilePath).plugins).to.be.deep.equal([]);
     });
 
     it('should not modify serverless .ts file', () => {

From aa8f7bec1caed4211adcb87ad0a73cd796f065d5 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 20 May 2021 13:11:59 +0200
Subject: [PATCH 0137/1101] refactor: Do not rely on serverless.yamlParser

---
 lib/plugins/plugin/install.js   | 36 ++++++++++++++++++++++++++++-----
 lib/plugins/plugin/uninstall.js | 36 ++++++++++++++++++++++++++++-----
 2 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/lib/plugins/plugin/install.js b/lib/plugins/plugin/install.js
index d9826cefd1c..243fb20daba 100644
--- a/lib/plugins/plugin/install.js
+++ b/lib/plugins/plugin/install.js
@@ -2,9 +2,14 @@
 
 const BbPromise = require('bluebird');
 const childProcess = BbPromise.promisifyAll(require('child_process'));
+const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const path = require('path');
 const _ = require('lodash');
+const isPlainObject = require('type/plain-object/is');
+const yaml = require('js-yaml');
+const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
+const log = require('@serverless/utils/log');
 const ServerlessError = require('../../serverless-error');
 const cliCommandsSchema = require('../../cli/commands-schema');
 const yamlAstParser = require('../../utils/yamlAstParser');
@@ -12,6 +17,12 @@ const fileExists = require('../../utils/fs/fileExists');
 const pluginUtils = require('./lib/utils');
 const npmCommandDeferred = require('../../utils/npm-command-deferred');
 
+const requestManualUpdate = (serverlessFilePath) =>
+  log(`
+  Can't automatically add plugin into "${path.basename(serverlessFilePath)}" file.
+  Please make it manually.
+`);
+
 class PluginInstall {
   constructor(serverless, options) {
     this.serverless = serverless;
@@ -97,10 +108,7 @@ class PluginInstall {
     const serverlessFilePath = this.getServerlessFilePath();
     const fileExtension = path.extname(serverlessFilePath);
     if (fileExtension === '.js' || fileExtension === '.ts') {
-      this.serverless.cli.log(`
-          Can't automatically add plugin into "${path.basename(serverlessFilePath)}" file.
-          Please make it manually.
-        `);
+      requestManualUpdate(serverlessFilePath);
       return;
     }
 
@@ -136,7 +144,25 @@ class PluginInstall {
       return;
     }
 
-    const serverlessFileObj = await this.serverless.yamlParser.parse(serverlessFilePath);
+    const serverlessFileObj = yaml.load(await fsp.readFile(serverlessFilePath, 'utf8'), {
+      filename: serverlessFilePath,
+      schema: cloudformationSchema,
+    });
+    if (serverlessFileObj.plugins != null) {
+      // Plugins section can be behind veriables, opt-out in such case
+      if (isPlainObject(serverlessFileObj.plugins)) {
+        if (
+          serverlessFileObj.plugins.modules != null &&
+          !Array.isArray(serverlessFileObj.plugins.modules)
+        ) {
+          requestManualUpdate(serverlessFilePath);
+          return;
+        }
+      } else if (!Array.isArray(serverlessFileObj.plugins)) {
+        requestManualUpdate(serverlessFilePath);
+        return;
+      }
+    }
     await yamlAstParser.addNewArrayItem(
       serverlessFilePath,
       checkIsArrayPluginsObject(serverlessFileObj.plugins) ? 'plugins' : 'plugins.modules',
diff --git a/lib/plugins/plugin/uninstall.js b/lib/plugins/plugin/uninstall.js
index 64e9a6efb40..4a891c07245 100644
--- a/lib/plugins/plugin/uninstall.js
+++ b/lib/plugins/plugin/uninstall.js
@@ -2,13 +2,24 @@
 
 const BbPromise = require('bluebird');
 const childProcess = BbPromise.promisifyAll(require('child_process'));
+const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const path = require('path');
 const _ = require('lodash');
+const isPlainObject = require('type/plain-object/is');
+const yaml = require('js-yaml');
+const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
+const log = require('@serverless/utils/log');
 const cliCommandsSchema = require('../../cli/commands-schema');
 const yamlAstParser = require('../../utils/yamlAstParser');
 const pluginUtils = require('./lib/utils');
 
+const requestManualUpdate = (serverlessFilePath) =>
+  log(`
+  Can't automatically add plugin into "${path.basename(serverlessFilePath)}" file.
+  Please make it manually.
+`);
+
 class PluginUninstall {
   constructor(serverless, options) {
     this.serverless = serverless;
@@ -67,10 +78,7 @@ class PluginUninstall {
     const serverlessFilePath = this.getServerlessFilePath();
     const fileExtension = path.extname(serverlessFilePath);
     if (fileExtension === '.js' || fileExtension === '.ts') {
-      this.serverless.cli.log(`
-          Can't automatically remove plugin from "serverless.js" file.
-          Please make it manually.
-        `);
+      requestManualUpdate(serverlessFilePath);
       return;
     }
 
@@ -95,7 +103,25 @@ class PluginUninstall {
       return;
     }
 
-    const serverlessFileObj = await this.serverless.yamlParser.parse(serverlessFilePath);
+    const serverlessFileObj = yaml.load(await fsp.readFile(serverlessFilePath, 'utf8'), {
+      filename: serverlessFilePath,
+      schema: cloudformationSchema,
+    });
+    if (serverlessFileObj.plugins != null) {
+      // Plugins section can be behind veriables, opt-out in such case
+      if (isPlainObject(serverlessFileObj.plugins)) {
+        if (
+          serverlessFileObj.plugins.modules != null &&
+          !Array.isArray(serverlessFileObj.plugins.modules)
+        ) {
+          requestManualUpdate(serverlessFilePath);
+          return;
+        }
+      } else if (!Array.isArray(serverlessFileObj.plugins)) {
+        requestManualUpdate(serverlessFilePath);
+        return;
+      }
+    }
     await yamlAstParser.removeExistingArrayItem(
       serverlessFilePath,
       Array.isArray(serverlessFileObj.plugins) ? 'plugins' : 'plugins.modules',

From db16df2faad9cc63eb8e98ce90829642707546fb Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 20 May 2021 13:15:42 +0200
Subject: [PATCH 0138/1101] refactor: Do not recognize YAML Exception as user
 error

---
 lib/utils/tokenize-exception.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/tokenize-exception.js b/lib/utils/tokenize-exception.js
index 45122aa0f40..7b1266d80b4 100644
--- a/lib/utils/tokenize-exception.js
+++ b/lib/utils/tokenize-exception.js
@@ -3,7 +3,7 @@
 const { inspect } = require('util');
 const isError = require('type/error/is');
 
-const userErrorNames = new Set(['ServerlessError', 'YAMLException']);
+const userErrorNames = new Set(['ServerlessError']);
 
 module.exports = (exception) => {
   if (isError(exception)) {

From abe42f2decbb0b0f32e10b60f22057e8394bb324 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 20 May 2021 14:58:27 +0200
Subject: [PATCH 0139/1101] chore: Bump dependencies

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index cb90f8747d5..e3086a585c3 100644
--- a/package.json
+++ b/package.json
@@ -23,13 +23,13 @@
   },
   "dependencies": {
     "@serverless/cli": "^1.5.2",
-    "@serverless/components": "^3.9.2",
-    "@serverless/dashboard-plugin": "^5.1.2",
+    "@serverless/components": "^3.10.0",
+    "@serverless/dashboard-plugin": "^5.1.3",
     "@serverless/utils": "^5.1.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.909.0",
+    "aws-sdk": "^2.910.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",

From 06c28e2c46fae115e487be09706c395b95f613c7 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 20 May 2021 15:01:37 +0200
Subject: [PATCH 0140/1101] chore: Release v2.43.0

---
 CHANGELOG.md | 17 +++++++++++++++++
 package.json |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b07dc3dd5b..0bb39994ad1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,23 @@
 
 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.
 
+## [2.43.0](https://github.com/serverless/serverless/compare/v2.42.0...v2.43.0) (2021-05-20)
+
+### Features
+
+- **CLI Onboarding:** In `service` step, if possible propose a default project name ([#9503](https://github.com/serverless/serverless/pull/9503)) ([dee54ed](https://github.com/serverless/serverless/commit/dee54ed55c0a0697eefdde99d5ec8aee321ce041)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **AWS Deploy:** Fix stack errors processing ([#9505](https://github.com/serverless/serverless/pull/9505)) ([18a9b2b](https://github.com/serverless/serverless/commit/18a9b2b6f5734083de751cf182c6be61736be11f)) ([Mariusz Nowak](https://github.com/medikoo))
+- **AWS IAM:** Do not depend on default execution role when custom role provided ([29f0e9c](https://github.com/serverless/serverless/commit/29f0e9c840e4b1ae9949925bc5a2a9d2de742271)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Maintenance Improvements
+
+- Do not recognize YAML Exception as user error ([#9505](https://github.com/serverless/serverless/pull/9505)) ([db16df2](https://github.com/serverless/serverless/commit/db16df2faad9cc63eb8e98ce90829642707546fb)) ([Mariusz Nowak](https://github.com/medikoo))
+- Do not rely on `serverless.yamlParser` ([#9505](https://github.com/serverless/serverless/pull/9505)) ([aa8f7be](https://github.com/serverless/serverless/commit/aa8f7bec1caed4211adcb87ad0a73cd796f065d5)) ([Mariusz Nowak](https://github.com/medikoo))
+- Ensure codes for user errors ([#9505](https://github.com/serverless/serverless/pull/9505)) ([6adaa9f](https://github.com/serverless/serverless/commit/6adaa9f56ed6e9708065767be602f484d0091679)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ## [2.42.0](https://github.com/serverless/serverless/compare/v2.41.2...v2.42.0) (2021-05-19)
 
 ### Features
diff --git a/package.json b/package.json
index e3086a585c3..98d14bb6d8b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.42.0",
+  "version": "2.43.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From bbff0290db8a56cf599522c5ec0abc901359a0f9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 21 May 2021 13:57:42 +0200
Subject: [PATCH 0141/1101] fix(AWS Local Invocation): Fix invalid result
 handling

---
 lib/plugins/aws/invokeLocal/index.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invokeLocal/index.js
index 4d4080c5a58..6e73fc60f6e 100644
--- a/lib/plugins/aws/invokeLocal/index.js
+++ b/lib/plugins/aws/invokeLocal/index.js
@@ -799,7 +799,17 @@ class AwsInvokeLocal {
       if (result instanceof Error) {
         handleError.call(this, result);
         return;
-      } else if (result.headers && result.headers['Content-Type'] === 'application/json') {
+      }
+      try {
+        JSON.stringify(result);
+      } catch (error) {
+        throw new ServerlessError(
+          `Function returned invalid (not a JSON stringifiable) value: ${inspect(result)}`,
+          'INVALID_INVOKE_LOCAL_RESULT'
+        );
+      }
+
+      if (result.headers && result.headers['Content-Type'] === 'application/json') {
         if (result.body) {
           try {
             Object.assign(result, {

From c265905f518f8cbea170c5a2774670c60de0e36c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <mariusz@medikoo.com>
Date: Mon, 24 May 2021 09:34:08 +0200
Subject: [PATCH 0142/1101] refactor(Telemetry): Improve AWS stack error codes
 (#9510)

---
 lib/plugins/aws/lib/monitorStack.js | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js
index e1ea3de499c..6d500c993ca 100644
--- a/lib/plugins/aws/lib/monitorStack.js
+++ b/lib/plugins/aws/lib/monitorStack.js
@@ -105,15 +105,26 @@ module.exports = {
                   stackLatestError.ResourceStatusReason || stackLatestError.ResourceStatus
                 }.`;
                 const errorCode = (() => {
-                  if (
-                    stackLatestError.ResourceStatusReason &&
-                    stackLatestError.ResourceStatusReason.startsWith('Properties validation failed')
-                  ) {
-                    return `AWS_STACK_${action.toUpperCase()}_VALIDATION_ERROR`;
+                  if (stackLatestError.ResourceStatusReason) {
+                    if (
+                      stackLatestError.ResourceStatusReason.startsWith(
+                        'Properties validation failed'
+                      )
+                    ) {
+                      return `AWS_CLOUD_FORMATION_${action.toUpperCase()}_STACK_INTERNAL_VALIDATION_ERROR`;
+                    }
+                    if (
+                      stackLatestError.ResourceStatusReason.includes('is not authorized to perform')
+                    ) {
+                      return `AWS_CLOUD_FORMATION_${action.toUpperCase()}_STACK_INTERNAL_INSUFFICIENT_PERMISSIONS`;
+                    }
                   }
-                  return `AWS_STACK_${action.toUpperCase()}${resourceTypeToErrorCodePostfix(
-                    stackLatestError.ResourceType
-                  )}_${stackLatestError.ResourceStatus}`;
+                  return (
+                    `AWS_CLOUD_FORMATION_${action.toUpperCase()}_STACK_INTERNAL` +
+                    `${resourceTypeToErrorCodePostfix(stackLatestError.ResourceType)}_${
+                      stackLatestError.ResourceStatus
+                    }`
+                  );
                 })();
                 throw new ServerlessError(errorMessage, errorCode);
               }

From 716b31216e4873bbb986c5a2a54fda708a591cd1 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 24 May 2021 11:28:51 +0200
Subject: [PATCH 0143/1101] refactor: Use `download` from `@serverless/utils`

---
 lib/plugins/aws/invokeLocal/index.js          |  2 +-
 lib/utils/downloadTemplateFromRepo.js         | 27 +++++++++++-----
 package.json                                  |  1 -
 .../utils/downloadTemplateFromRepo.test.js    | 32 ++++++++++++-------
 4 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invokeLocal/index.js
index 6e73fc60f6e..bd84c8eb09b 100644
--- a/lib/plugins/aws/invokeLocal/index.js
+++ b/lib/plugins/aws/invokeLocal/index.js
@@ -10,7 +10,7 @@ const stdin = require('get-stdin');
 const spawnExt = require('child-process-ext/spawn');
 const { spawn } = require('child_process');
 const inspect = require('util').inspect;
-const download = require('download');
+const download = require('@serverless/utils/download');
 const { ensureDir } = require('fs-extra');
 const cachedir = require('cachedir');
 const decompress = require('decompress');
diff --git a/lib/utils/downloadTemplateFromRepo.js b/lib/utils/downloadTemplateFromRepo.js
index da061a496e7..c174aef3af7 100644
--- a/lib/utils/downloadTemplateFromRepo.js
+++ b/lib/utils/downloadTemplateFromRepo.js
@@ -3,7 +3,7 @@
 const path = require('path');
 const os = require('os');
 const URL = require('url');
-const download = require('download');
+const download = require('@serverless/utils/download');
 const BbPromise = require('bluebird');
 const fse = require('fs-extra');
 const qs = require('querystring');
@@ -81,7 +81,8 @@ function parseGitHubURL(url) {
     downloadUrl,
     isSubdirectory,
     pathToDirectory: getPathDirectory(pathLength + 1, parts),
-    auth: url.auth || '',
+    username: url.username || '',
+    password: url.password || '',
   };
 }
 
@@ -111,7 +112,8 @@ function parseBitbucketURL(url) {
     downloadUrl,
     isSubdirectory,
     pathToDirectory: getPathDirectory(pathLength + 1, parts),
-    auth: '',
+    username: url.username || '',
+    password: url.password || '',
   };
 }
 
@@ -134,7 +136,8 @@ function parseBitbucketServerURL(url) {
     downloadUrl,
     isSubdirectory,
     pathToDirectory: getPathDirectory(pathLength + 1, parts),
-    auth: url.auth || '',
+    username: url.username || '',
+    password: url.password || '',
   };
 }
 
@@ -176,7 +179,8 @@ function parseGitlabURL(url) {
     downloadUrl,
     isSubdirectory,
     pathToDirectory: getPathDirectory(pathLength + 1, parts),
-    auth: '',
+    username: url.username || '',
+    password: url.password || '',
   };
 }
 
@@ -197,7 +201,8 @@ function parsePlainGitURL(url) {
     branch,
     downloadUrl,
     isSubdirectory,
-    auth: url.auth || '',
+    username: url.username || '',
+    password: url.password || '',
   };
 }
 
@@ -215,6 +220,11 @@ function parseRepoURL(inputUrl) {
     }
 
     const url = URL.parse(inputUrl.replace(/\/$/, ''));
+    if (url.auth) {
+      const [username, password] = url.auth.split(':');
+      url.username = username;
+      url.password = password;
+    }
 
     // check if url parameter is a valid url
     if (!url.host && !url.href.startsWith('git@')) {
@@ -259,7 +269,7 @@ function downloadTemplateFromRepo(inputUrl, templateName, downloadPath, options
     let serviceName;
     let dirName;
     let downloadServicePath;
-    const { auth } = repoInformation;
+    const { username, password } = repoInformation;
 
     if (repoInformation.isSubdirectory) {
       const folderName = repoInformation.pathToDirectory.split('/').splice(-1)[0];
@@ -296,7 +306,8 @@ function downloadTemplateFromRepo(inputUrl, templateName, downloadPath, options
       extract: true,
       strip: 1,
       mode: '755',
-      auth,
+      username,
+      password,
     };
     // download service
     return download(repoInformation.downloadUrl, downloadServicePath, downloadOptions)
diff --git a/package.json b/package.json
index 98d14bb6d8b..cdca3fdca76 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,6 @@
     "dayjs": "^1.10.4",
     "decompress": "^4.2.1",
     "dotenv": "^9.0.2",
-    "download": "^8.0.0",
     "essentials": "^1.1.1",
     "fastest-levenshtein": "^1.0.12",
     "filesize": "^6.3.0",
diff --git a/test/unit/lib/utils/downloadTemplateFromRepo.test.js b/test/unit/lib/utils/downloadTemplateFromRepo.test.js
index 80bd4b88733..007cbd1a146 100644
--- a/test/unit/lib/utils/downloadTemplateFromRepo.test.js
+++ b/test/unit/lib/utils/downloadTemplateFromRepo.test.js
@@ -57,7 +57,7 @@ describe('downloadTemplateFromRepo', () => {
 
           return BbPromise.reject(Error('unknown server type'));
         },
-        'download': downloadStub,
+        '@serverless/utils/download': downloadStub,
         'child-process-ext/spawn': spawnStub,
       }
     );
@@ -262,7 +262,8 @@ describe('downloadTemplateFromRepo', () => {
             downloadUrl: 'https://github.com/serverless/serverless/archive/master.zip',
             isSubdirectory: false,
             pathToDirectory: '',
-            auth: '',
+            username: '',
+            password: '',
           });
         }
       );
@@ -279,7 +280,8 @@ describe('downloadTemplateFromRepo', () => {
           downloadUrl: 'https://github.com/serverless/serverless/archive/master.zip',
           isSubdirectory: true,
           pathToDirectory: 'assets',
-          auth: '',
+          username: '',
+          password: '',
         });
       });
     });
@@ -295,7 +297,8 @@ describe('downloadTemplateFromRepo', () => {
           downloadUrl: 'https://github.mydomain.com/serverless/serverless/archive/master.zip',
           isSubdirectory: false,
           pathToDirectory: '',
-          auth: '',
+          username: '',
+          password: '',
         });
       });
     });
@@ -311,7 +314,8 @@ describe('downloadTemplateFromRepo', () => {
           downloadUrl: 'https://github.mydomain.com/serverless/serverless/archive/master.zip',
           isSubdirectory: true,
           pathToDirectory: 'assets',
-          auth: '',
+          username: '',
+          password: '',
         });
       });
     });
@@ -326,7 +330,8 @@ describe('downloadTemplateFromRepo', () => {
           branch: 'master',
           downloadUrl: 'https://github.com/serverless/serverless/archive/master.zip',
           isSubdirectory: false,
-          auth: 'username:password',
+          username: 'username',
+          password: 'password',
           pathToDirectory: '',
         });
       });
@@ -341,7 +346,8 @@ describe('downloadTemplateFromRepo', () => {
           downloadUrl: 'https://bitbucket.org/atlassian/localstack/get/master.zip',
           isSubdirectory: false,
           pathToDirectory: '',
-          auth: '',
+          username: '',
+          password: '',
         });
       });
     });
@@ -357,7 +363,8 @@ describe('downloadTemplateFromRepo', () => {
           downloadUrl: 'https://bitbucket.org/atlassian/localstack/get/mvn.zip',
           isSubdirectory: true,
           pathToDirectory: `localstack${path.sep}dashboard`,
-          auth: '',
+          username: '',
+          password: '',
         });
       });
     });
@@ -374,7 +381,8 @@ describe('downloadTemplateFromRepo', () => {
             'https://mybitbucket.server.ltd/rest/api/latest/projects/myproject/repos/myrepo/archive?at=refs%2Fheads%2Fdevelop&format=zip',
           isSubdirectory: false,
           pathToDirectory: '',
-          auth: 'user:pass',
+          username: 'user',
+          password: 'pass',
         });
       });
     });
@@ -389,7 +397,8 @@ describe('downloadTemplateFromRepo', () => {
             'https://gitlab.com/serverless/serverless/-/archive/master/serverless-master.zip',
           isSubdirectory: false,
           pathToDirectory: '',
-          auth: '',
+          username: '',
+          password: '',
         });
       });
     });
@@ -405,7 +414,8 @@ describe('downloadTemplateFromRepo', () => {
               'https://gitlab.com/serverless/serverless/-/archive/dev/serverless-dev.zip',
             isSubdirectory: true,
             pathToDirectory: 'subdir',
-            auth: '',
+            username: '',
+            password: '',
           });
         }
       );

From 2984adb0456f7d6e93b0c778a1c588ee20459928 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 24 May 2021 11:31:49 +0200
Subject: [PATCH 0144/1101] refactor(CLI Onboarding): Use "Starter" not "Empty"
 for templates

---
 lib/cli/interactive-setup/service.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index 44ce0d93d00..e86ed3d797a 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -16,14 +16,14 @@ const { downloadTemplateFromRepo } = require('../../utils/downloadTemplateFromRe
 const isValidServiceName = RegExp.prototype.test.bind(/^[a-zA-Z][a-zA-Z0-9-]{0,100}$/);
 
 const initializeProjectChoices = [
-  { name: 'AWS - Node.js - Empty', value: 'aws-node' },
+  { name: 'AWS - Node.js - Starter', value: 'aws-node' },
   { name: 'AWS - Node.js - REST API', value: 'aws-node-rest-api' },
   { name: 'AWS - Node.js - Scheduled Task', value: 'aws-node-scheduled-cron' },
   { name: 'AWS - Node.js - SQS Worker', value: 'aws-node-sqs-worker' },
   { name: 'AWS - Node.js - Express API', value: 'aws-node-express-api' },
   { name: 'AWS - Node.js - Express API with DynamoDB', value: 'aws-node-express-dynamodb-api' },
 
-  { name: 'AWS - Python - Empty', value: 'aws-python' },
+  { name: 'AWS - Python - Starter', value: 'aws-python' },
   { name: 'AWS - Python - REST API', value: 'aws-python-rest-api' },
   { name: 'AWS - Python - Scheduled Task', value: 'aws-python-scheduled-cron' },
   { name: 'AWS - Python - SQS Worker', value: 'aws-python-sqs-worker' },

From ee66585fdcfc32d135ed0cdc6bad8d440c7e9e38 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 25 May 2021 11:51:34 +0200
Subject: [PATCH 0145/1101] fix(Variables): Ensure proper resolution in case of
 errors

---
 .../variables/sources/instance-dependent/get-cf.js           | 5 ++++-
 .../variables/sources/instance-dependent/get-s3.js           | 3 ++-
 .../variables/sources/instance-dependent/get-ssm.js          | 3 ++-
 .../variables/sources/instance-dependent/get-cf.test.js      | 2 +-
 .../variables/sources/instance-dependent/get-s3.test.js      | 2 +-
 .../variables/sources/instance-dependent/get-ssm.test.js     | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/configuration/variables/sources/instance-dependent/get-cf.js b/lib/configuration/variables/sources/instance-dependent/get-cf.js
index 84bf9374bd1..26a14dce277 100644
--- a/lib/configuration/variables/sources/instance-dependent/get-cf.js
+++ b/lib/configuration/variables/sources/instance-dependent/get-cf.js
@@ -41,7 +41,10 @@ module.exports = (serverlessInstance) => {
               { useCache: true, region: params && params[0] }
             );
         } catch (error) {
-          if (error.code === 'ValidationError' && error.message.includes('does not exist')) {
+          if (
+            error.code === 'AWS_CLOUD_FORMATION_DESCRIBE_STACKS_VALIDATION_ERROR' &&
+            error.message.includes('does not exist')
+          ) {
             return null;
           }
           throw error;
diff --git a/lib/configuration/variables/sources/instance-dependent/get-s3.js b/lib/configuration/variables/sources/instance-dependent/get-s3.js
index 4726c499110..32a12044619 100644
--- a/lib/configuration/variables/sources/instance-dependent/get-s3.js
+++ b/lib/configuration/variables/sources/instance-dependent/get-s3.js
@@ -35,7 +35,8 @@ module.exports = (serverlessInstance) => {
             .getProvider('aws')
             .request('S3', 'getObject', { Bucket: bucketName, Key: key }, { useCache: true });
         } catch (error) {
-          if (error.code === 'NoSuchKey') return null;
+          // Check for normalized error code instead of native one
+          if (error.code === 'AWS_S3_GET_OBJECT_NO_SUCH_KEY') return null;
           throw error;
         }
       })();
diff --git a/lib/configuration/variables/sources/instance-dependent/get-ssm.js b/lib/configuration/variables/sources/instance-dependent/get-ssm.js
index 83ff2ea7ea2..4eefc448446 100644
--- a/lib/configuration/variables/sources/instance-dependent/get-ssm.js
+++ b/lib/configuration/variables/sources/instance-dependent/get-ssm.js
@@ -63,7 +63,8 @@ module.exports = (serverlessInstance) => {
             { useCache: true, region }
           );
         } catch (error) {
-          if (error.code === 'ParameterNotFound') return null;
+          // Check for normalized error code instead of native one
+          if (error.code === 'AWS_S_S_M_GET_PARAMETER_PARAMETER_NOT_FOUND') return null;
           throw error;
         }
       })();
diff --git a/test/unit/lib/configuration/variables/sources/instance-dependent/get-cf.test.js b/test/unit/lib/configuration/variables/sources/instance-dependent/get-cf.test.js
index 6baed7eea64..a4372c73a68 100644
--- a/test/unit/lib/configuration/variables/sources/instance-dependent/get-cf.test.js
+++ b/test/unit/lib/configuration/variables/sources/instance-dependent/get-cf.test.js
@@ -41,7 +41,7 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-c
           }
           if (StackName === 'notExisting') {
             throw Object.assign(new Error('Stack with id not-existing does not exist'), {
-              code: 'ValidationError',
+              code: 'AWS_CLOUD_FORMATION_DESCRIBE_STACKS_VALIDATION_ERROR',
             });
           }
           throw new Error('Unexpected call');
diff --git a/test/unit/lib/configuration/variables/sources/instance-dependent/get-s3.test.js b/test/unit/lib/configuration/variables/sources/instance-dependent/get-s3.test.js
index b401650c6e1..f9140ecf010 100644
--- a/test/unit/lib/configuration/variables/sources/instance-dependent/get-s3.test.js
+++ b/test/unit/lib/configuration/variables/sources/instance-dependent/get-s3.test.js
@@ -34,7 +34,7 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
           if (Bucket === 'existing') {
             if (Key === 'someKey') return { Body: 'foo' };
             throw Object.assign(new Error('The specified key does not exist.'), {
-              code: 'NoSuchKey',
+              code: 'AWS_S3_GET_OBJECT_NO_SUCH_KEY',
             });
           }
           throw Object.assign(new Error('The specified bucket does not exist.'), {
diff --git a/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js b/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js
index bcbf3d8260f..39f93cfeb10 100644
--- a/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js
+++ b/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js
@@ -56,7 +56,7 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
                     '(ParameterNotFound) when referencing Secrets Manager'
                 ),
                 {
-                  code: 'ParameterNotFound',
+                  code: 'AWS_S_S_M_GET_PARAMETER_PARAMETER_NOT_FOUND',
                 }
               );
             }

From 9b2a1114850914a4ac96b19c7fcb0bf031822ea4 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 25 May 2021 13:09:36 +0200
Subject: [PATCH 0146/1101] fix(Telemetry): Ensure to pass proper config for
 local fallback

---
 lib/cli/handle-error.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 8f07c16ba42..d68b7151fc9 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -74,6 +74,11 @@ module.exports = async (exception, options = {}) => {
           serverless,
           isLocallyInstalled,
           isUncaughtException,
+          command,
+          options: cliOptions,
+          commandSchema,
+          serviceDir,
+          configuration,
           hasTelemetryBeenReported,
         });
         return;

From 79a1f1a334e082ff6c1442e4f7e065e54254cec3 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 25 May 2021 13:22:22 +0200
Subject: [PATCH 0147/1101] chore: Bump dependencies

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index cdca3fdca76..5c30f66eb4d 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.910.0",
+    "aws-sdk": "^2.913.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
@@ -79,8 +79,8 @@
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "cos-nodejs-sdk-v5": "^2.9.15",
-    "eslint": "^7.26.0",
-    "eslint-plugin-import": "^2.23.2",
+    "eslint": "^7.27.0",
+    "eslint-plugin-import": "^2.23.3",
     "git-list-updated": "^1.2.1",
     "github-release-from-cc-changelog": "^2.2.0",
     "husky": "^4.3.8",

From a1fcaa6c96952e907cd76126e047eb2997f33b9d Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 25 May 2021 13:27:19 +0200
Subject: [PATCH 0148/1101] chore: Release 2.43.1

---
 CHANGELOG.md | 14 ++++++++++++++
 package.json |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bb39994ad1..2674f1fb90d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 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.
 
+### [2.43.1](https://github.com/serverless/serverless/compare/v2.43.0...v2.43.1) (2021-05-25)
+
+### Bug Fixes
+
+- **AWS Local Invocation:** Fix invalid result handling ([#9507](https://github.com/serverless/serverless/pull/9507)) ([bbff029](https://github.com/serverless/serverless/commit/bbff0290db8a56cf599522c5ec0abc901359a0f9)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Telemetry:** Ensure to pass proper config for local fallback error handler ([#9519](https://github.com/serverless/serverless/pull/9519)) ([9b2a111](https://github.com/serverless/serverless/commit/9b2a1114850914a4ac96b19c7fcb0bf031822ea4)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **Variables:** Ensure proper resolution of AWS-related variables in case of errors ([#9518](https://github.com/serverless/serverless/pull/9518)) ([ee66585](https://github.com/serverless/serverless/commit/ee66585fdcfc32d135ed0cdc6bad8d440c7e9e38)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Maintenance Improvements
+
+- Use `download` from `@serverless/utils` ([#9513](https://github.com/serverless/serverless/pull/9513)) ([716b312](https://github.com/serverless/serverless/commit/716b31216e4873bbb986c5a2a54fda708a591cd1)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI Onboarding:** Use "Starter" not "Empty" for templates ([#9514](https://github.com/serverless/serverless/pull/9514)) ([2984adb](https://github.com/serverless/serverless/commit/2984adb0456f7d6e93b0c778a1c588ee20459928)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **Telemetry:** Improve AWS stack error codes ([#9510](https://github.com/serverless/serverless/issues/9510)) ([c265905](https://github.com/serverless/serverless/commit/c265905f518f8cbea170c5a2774670c60de0e36c)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ## [2.43.0](https://github.com/serverless/serverless/compare/v2.42.0...v2.43.0) (2021-05-20)
 
 ### Features
diff --git a/package.json b/package.json
index 5c30f66eb4d..536115ad29a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.43.0",
+  "version": "2.43.1",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From d5e2baf714958c5718610659887f485f9bd161e4 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 27 May 2021 16:34:32 +0200
Subject: [PATCH 0149/1101] feat(CLI Onboarding): Remove initial `confirm`
 question from the flow

---
 lib/cli/interactive-setup/service.js          | 17 ------------
 package.json                                  |  2 +-
 .../lib/cli/interactive-setup/service.test.js | 26 +++++++------------
 3 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index e86ed3d797a..038756f9cbc 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -129,23 +129,6 @@ module.exports = {
       );
     }
 
-    if (
-      !context.options.name &&
-      !context.options['template-path'] &&
-      !context.options.template &&
-      !context.options['template-url']
-    ) {
-      const isConfirmed = (
-        await inquirer.prompt({
-          message: 'No project detected. Do you want to create a new one?',
-          type: 'list',
-          name: 'shouldCreateNewProject',
-          choices: ['Yes', 'No'],
-        })
-      ).shouldCreateNewProject;
-      if (isConfirmed !== 'Yes') return;
-    }
-
     let projectDir;
     let projectName;
     if (context.options['template-path']) {
diff --git a/package.json b/package.json
index 536115ad29a..04262593f4e 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "@serverless/cli": "^1.5.2",
     "@serverless/components": "^3.10.0",
-    "@serverless/dashboard-plugin": "^5.1.3",
+    "@serverless/dashboard-plugin": "^5.1.4",
     "@serverless/utils": "^5.1.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
diff --git a/test/unit/lib/cli/interactive-setup/service.test.js b/test/unit/lib/cli/interactive-setup/service.test.js
index fd9f9754d9a..0f01bb257ea 100644
--- a/test/unit/lib/cli/interactive-setup/service.test.js
+++ b/test/unit/lib/cli/interactive-setup/service.test.js
@@ -52,17 +52,9 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       .and.have.property('code', 'NOT_APPLICABLE_SERVICE_OPTIONS');
   });
 
-  it("Should abort if user doesn't want setup", async () => {
-    configureInquirerStub(inquirer, {
-      list: { shouldCreateNewProject: 'No' },
-    });
-    await step.run({ options: {} });
-    return confirmEmptyWorkingDir();
-  });
-
   it("Should abort if user choses 'other' template", async () => {
     configureInquirerStub(inquirer, {
-      list: { projectType: 'other', shouldCreateNewProject: 'Yes' },
+      list: { projectType: 'other' },
     });
     await step.run({ options: {} });
     return confirmEmptyWorkingDir();
@@ -89,7 +81,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       });
 
       configureInquirerStub(inquirer, {
-        list: { projectType: 'aws-nodejs', shouldCreateNewProject: 'Yes' },
+        list: { projectType: 'aws-nodejs' },
         input: { projectName: 'test-project' },
       });
       await mockedStep.run({ options: {} });
@@ -123,7 +115,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       });
 
       configureInquirerStub(inquirer, {
-        list: { projectType: 'aws-nodejs', shouldCreateNewProject: 'Yes' },
+        list: { projectType: 'aws-nodejs' },
         input: { projectName: 'test-project-template' },
       });
       await mockedStep.run({ options: {} });
@@ -162,7 +154,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       });
 
       configureInquirerStub(inquirer, {
-        list: { shouldCreateNewProject: 'Yes', projectType: 'aws-nodejs' },
+        list: { projectType: 'aws-nodejs' },
         input: { projectName: 'test-project-package-json' },
       });
       await mockedStep.run({ options: {} });
@@ -200,7 +192,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       });
 
       configureInquirerStub(inquirer, {
-        list: { projectType: 'aws-nodejs', shouldCreateNewProject: 'Yes' },
+        list: { projectType: 'aws-nodejs' },
         input: { projectName: 'test-project-missing-npm' },
       });
 
@@ -237,7 +229,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       });
 
       configureInquirerStub(inquirer, {
-        list: { projectType: 'aws-nodejs', shouldCreateNewProject: 'Yes' },
+        list: { projectType: 'aws-nodejs' },
         input: { projectName: 'test-project-failed-install' },
       });
 
@@ -354,7 +346,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
         },
       });
       configureInquirerStub(inquirer, {
-        list: { projectType: 'aws-nodejs', shouldCreateNewProject: 'Yes' },
+        list: { projectType: 'aws-nodejs' },
         input: { projectName: 'test-error-during-download' },
       });
       await expect(mockedStep.run({ options: {} })).to.be.eventually.rejected.and.have.property(
@@ -396,7 +388,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
 
   it('Should not allow project creation in a directory in which already service is configured', async () => {
     configureInquirerStub(inquirer, {
-      list: { projectType: 'aws-nodejs', shouldCreateNewProject: 'Yes' },
+      list: { projectType: 'aws-nodejs' },
       input: { projectName: 'existing' },
     });
 
@@ -422,7 +414,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
 
   it('Should not allow project creation using an invalid project name', async () => {
     configureInquirerStub(inquirer, {
-      list: { projectType: 'aws-nodejs', shouldCreateNewProject: 'Yes' },
+      list: { projectType: 'aws-nodejs' },
       input: { projectName: 'elo grzegżółka' },
     });
     await expect(step.run({ options: {} })).to.eventually.be.rejected.and.have.property(

From 955c0c8360f619c5c000a68294d17613360e984b Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 28 May 2021 15:01:27 +0200
Subject: [PATCH 0150/1101] docs: Improve `autoupdate` and `tabcompletion`
 command docs

---
 .../aws/cli-reference/config-tabcompletion.md | 36 +++++++++++++++++
 docs/providers/aws/cli-reference/config.md    | 40 +++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 docs/providers/aws/cli-reference/config-tabcompletion.md
 create mode 100644 docs/providers/aws/cli-reference/config.md

diff --git a/docs/providers/aws/cli-reference/config-tabcompletion.md b/docs/providers/aws/cli-reference/config-tabcompletion.md
new file mode 100644
index 00000000000..2fcab3e3b8c
--- /dev/null
+++ b/docs/providers/aws/cli-reference/config-tabcompletion.md
@@ -0,0 +1,36 @@
+<!--
+title: Serverless Framework Commands - AWS Lambda - Config Tabcompletion
+menuText: config tabcompletion
+menuOrder: 1
+description: Configure Serverless Tabcompletion
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/cli-reference/config-tabcompletion)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# AWS - Config
+
+The purpose of `serverless config tabcompletion` is to allow to enable or disable tab completion for the Framework in your shell. Currently supported shells are `fish`, `bash` and `zsh`.
+
+## Provided lifecycle events
+
+- `config:tabcompletion:install:install`
+- `config:tabcompletion:uninstall:uninstall`
+
+## Examples
+
+### Enable tab completion
+
+```
+serverless config tabcompletion install
+```
+
+### Disable tab completion
+
+```
+serverless config tabcompletion uninstall
+```
diff --git a/docs/providers/aws/cli-reference/config.md b/docs/providers/aws/cli-reference/config.md
new file mode 100644
index 00000000000..10540d6fa77
--- /dev/null
+++ b/docs/providers/aws/cli-reference/config.md
@@ -0,0 +1,40 @@
+<!--
+title: Serverless Framework Commands - AWS Lambda - Config
+menuText: config
+menuOrder: 1
+description: Configure Serverless
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/cli-reference/config)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# AWS - Config
+
+The purpose of `serverless config` is to allow to enable or disable automatic update mechanism of the Framework. Additionally, it supports two subcommands, `config credentials` and `config tabcompletion`. For more details about them, please refer to their corresponding documentation pages. Auto update mechanism is supported for global installations across all operating systems with the exception of standalone binary installation on Windows.
+
+## Options
+
+- `--autoupdate` Turn on auto update mechanism
+- `--no-autoupdate` Turn off auto update mechanism
+
+## Provided lifecycle events
+
+- `config:config`
+
+## Examples
+
+### Turn on auto update mechanism
+
+```
+serverless config --autoupdate
+```
+
+### Turn off auto update mechanism
+
+```
+serverless config --no-autoupdate
+```

From 3bac0f37f0f23abed387f0952772e3cdf5d47320 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 28 May 2021 14:40:22 +0200
Subject: [PATCH 0151/1101] feat(CLI Onboarding): Remove `tab-completion` from
 interactive flow

---
 lib/cli/interactive-setup/index.js            |  1 -
 lib/cli/interactive-setup/tab-completion.js   | 64 ----------------
 .../lib/cli/interactive-setup/index.test.js   | 10 ---
 .../interactive-setup/tab-completion.test.js  | 73 -------------------
 4 files changed, 148 deletions(-)
 delete mode 100644 lib/cli/interactive-setup/tab-completion.js
 delete mode 100644 test/unit/lib/cli/interactive-setup/tab-completion.test.js

diff --git a/lib/cli/interactive-setup/index.js b/lib/cli/interactive-setup/index.js
index 8f96cff5ced..eec3fc08121 100644
--- a/lib/cli/interactive-setup/index.js
+++ b/lib/cli/interactive-setup/index.js
@@ -8,7 +8,6 @@ const steps = {
   dashboardSetOrg: require('@serverless/dashboard-plugin/lib/cli/interactive-setup/dashboard-set-org'),
   awsCredentials: require('./aws-credentials'),
   autoUpdate: require('./auto-update'),
-  tabCompletion: require('./tab-completion'),
 };
 
 module.exports = async (context) => {
diff --git a/lib/cli/interactive-setup/tab-completion.js b/lib/cli/interactive-setup/tab-completion.js
deleted file mode 100644
index 95f0637cae2..00000000000
--- a/lib/cli/interactive-setup/tab-completion.js
+++ /dev/null
@@ -1,64 +0,0 @@
-'use strict';
-
-const path = require('path');
-const os = require('os');
-const fs = require('fs').promises;
-const chalk = require('chalk');
-const requireUncached = require('ncjsm/require-uncached');
-const resolve = require('ncjsm/resolve/sync');
-const configUtils = require('@serverless/utils/config');
-const muteConsoleLog = require('../../utils/log/muteConsoleLog');
-const isTabTabCompletionSupported = require('../../utils/tabCompletion/isSupported');
-const tabtabOptions = require('../../utils/tabCompletion/tabtabOptions');
-const promptDisabledConfigPropertyName = require('../../utils/tabCompletion/promptDisabledConfigPropertyName');
-const inquirer = require('@serverless/utils/inquirer');
-const { confirm } = require('./utils');
-
-module.exports = {
-  async isApplicable() {
-    if (!isTabTabCompletionSupported) return false;
-
-    const shellExtension = require('tabtab/lib/utils/systemShell')();
-    try {
-      await fs.stat(path.resolve(os.homedir(), `.config/tabtab/serverless.${shellExtension}`));
-      return false;
-    } catch (error) {
-      if (error.code !== 'ENOENT') throw error;
-      return !configUtils.get(promptDisabledConfigPropertyName);
-    }
-  },
-  async run() {
-    if (
-      !(await confirm('Would you like to setup a command line <tab> completion?', {
-        name: 'shouldSetupTabCompletion',
-      }))
-    ) {
-      configUtils.set(promptDisabledConfigPropertyName, true);
-      return;
-    }
-
-    const promptPath = require.resolve('tabtab/lib/prompt');
-    const tabtabsInquirerPath = resolve(path.dirname(promptPath), 'inquirer').realPath;
-
-    // Hack tabtabs prompt to use our inquirer customization
-    const prompt = requireUncached([promptPath, tabtabsInquirerPath], () => {
-      require(tabtabsInquirerPath);
-      require.cache[tabtabsInquirerPath].exports = inquirer;
-      return require(promptPath);
-    });
-    const { install } = require('tabtab/lib/installer');
-    const location = (await prompt()).location;
-    await muteConsoleLog(async () => {
-      for (const options of tabtabOptions) {
-        await install(Object.assign({ location }, options));
-      }
-    });
-    process.stdout.write(
-      `\n${chalk.green(
-        `Command line <tab> completion was successfully setup. ${chalk.bold(
-          'Make sure to reload your SHELL'
-        )}.\nYou may uninstall it by running: serverless config tabcompletion uninstall`
-      )}\n`
-    );
-  },
-};
diff --git a/test/unit/lib/cli/interactive-setup/index.test.js b/test/unit/lib/cli/interactive-setup/index.test.js
index 6dc61b3553d..78cadf53267 100644
--- a/test/unit/lib/cli/interactive-setup/index.test.js
+++ b/test/unit/lib/cli/interactive-setup/index.test.js
@@ -4,7 +4,6 @@
 
 const spawn = require('child-process-ext/spawn');
 const path = require('path');
-const isTabCompletionSupported = require('../../../../../lib/utils/tabCompletion/isSupported');
 
 const serverlessPath = path.resolve(__dirname, '../../../../../scripts/serverless.js');
 const templatesPath = path.resolve(__dirname, '../../../../../lib/plugins/create/templates');
@@ -55,15 +54,6 @@ describe('test/unit/lib/cli/interactive-setup/index.test.js', () => {
 
       // auto-update
       { instructionString: 'to update automatically?', input: 'Y' },
-
-      // tab-completion
-      ...(isTabCompletionSupported
-        ? [
-            { instructionString: 'command line <tab> completion', input: 'Y' },
-            { instructionString: 'bash' },
-            { instructionString: 'to ~/.bashrc' },
-          ]
-        : []),
     ];
     slsProcess.stdout.on('data', (data) => {
       output += data;
diff --git a/test/unit/lib/cli/interactive-setup/tab-completion.test.js b/test/unit/lib/cli/interactive-setup/tab-completion.test.js
deleted file mode 100644
index ea47f4876c4..00000000000
--- a/test/unit/lib/cli/interactive-setup/tab-completion.test.js
+++ /dev/null
@@ -1,73 +0,0 @@
-'use strict';
-
-const chai = require('chai');
-const sinon = require('sinon');
-
-const { expect } = chai;
-
-chai.use(require('chai-as-promised'));
-
-const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
-
-const os = require('os');
-const fsp = require('fs').promises;
-const path = require('path');
-const configUtils = require('@serverless/utils/config');
-const promptDisabledConfigPropertyName = require('../../../../../lib/utils/tabCompletion/promptDisabledConfigPropertyName');
-const isTabCompletionSupported = require('../../../../../lib/utils/tabCompletion/isSupported');
-const step = require('../../../../../lib/cli/interactive-setup/tab-completion');
-
-const inquirer = require('@serverless/utils/inquirer');
-
-describe('test/unit/lib/cli/interactive-setup/tab-completion.test.js', () => {
-  before(() => {
-    process.env.SHELL = 'bash';
-  });
-  afterEach(() => {
-    configUtils.set(promptDisabledConfigPropertyName, false);
-    sinon.restore();
-  });
-
-  if (!isTabCompletionSupported) {
-    it('Should not suggest tab completion setup in non supported environments', async () => {
-      expect(await step.isApplicable({})).to.equal(false);
-    });
-    return;
-  }
-
-  it('Should abort if user does not want to setup tab completion', async () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldSetupTabCompletion: false },
-    });
-    await step.run({});
-  });
-
-  it('Should not prompt again is user opt out from setup', async () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldSetupTabCompletion: false, locationOK: true },
-      list: { shell: 'bash' },
-    });
-    await step.run({});
-    await expect(fsp.readFile('.bashrc')).to.eventually.be.rejected.and.have.property(
-      'code',
-      'ENOENT'
-    );
-  });
-
-  it('Should setup tab completion on user request', async () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldSetupTabCompletion: true, locationOK: true },
-      list: { shell: 'bash' },
-    });
-    await step.run({});
-    await Promise.all([
-      fsp
-        .readFile(path.resolve(os.homedir(), '.bashrc'), 'utf8')
-        .then((bashRcContent) =>
-          expect(bashRcContent).to.include(' ~/.config/tabtab/__tabtab.bash')
-        ),
-      fsp.readFile(path.resolve(os.homedir(), '.config/tabtab/serverless.bash'), 'utf8'),
-      fsp.readFile(path.resolve(os.homedir(), '.config/tabtab/sls.bash'), 'utf8'),
-    ]);
-  });
-});

From 334876ea49ef455bff23dc16627dc0c4613d4aa3 Mon Sep 17 00:00:00 2001
From: Costas K <kourmpoglou@gmail.com>
Date: Tue, 1 Jun 2021 15:39:25 +0100
Subject: [PATCH 0152/1101] docs: Cleanup variables docs (#9526)

---
 docs/providers/aws/guide/variables.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/providers/aws/guide/variables.md b/docs/providers/aws/guide/variables.md
index c0eb6e6abf9..08af750d429 100644
--- a/docs/providers/aws/guide/variables.md
+++ b/docs/providers/aws/guide/variables.md
@@ -48,8 +48,8 @@ You can define your own variable syntax (regex) if it conflicts with CloudFormat
 - [Variables from AWS Secrets Manager](#reference-variables-using-aws-secrets-manager)
 - [CloudFormation stack outputs](#reference-cloudformation-outputs)
 - [Properties exported from Javascript files (sync or async)](#reference-variables-in-javascript-files)
-- [Pseudo Parameters Reference](#pseudo-parameters-reference)
 - [Read String Variable Values as Boolean Values](#read-string-variable-values-as-boolean-values)
+- [Pseudo Parameters Reference](#aws-cloudformation-pseudo-parameters-and-intrinsic-functions)
 
 ## Casting string variables to boolean values
 
@@ -311,6 +311,8 @@ For that please ensure to add `variablesResolutionMode: 20210326` to your servic
 
 All `SecureString` type parameters are automatically decrypted, and automatically parsed if they export stringified JSON content (Note: you can turn off parsing by passing `raw` instruction into variable as: `${ssm(raw):/path/to/secureparam}`, if you need to also pass custom region, put it first as: `${ssm(eu-west-1, raw):/path/to/secureparam}`)
 
+## Reference Variables using AWS Secrets Manager
+
 Variables in [AWS Secrets Manager](https://aws.amazon.com/secrets-manager/) can be referenced [using SSM](https://docs.aws.amazon.com/systems-manager/latest/userguide/integration-ps-secretsmanager.html), just use the `ssm:/aws/reference/secretsmanager/secret_ID_in_Secrets_Manager` syntax. For example:
 
 ```yml

From 1b90dfb0659dab3852ace330fd7c497321b80710 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 1 Jun 2021 13:43:24 +0200
Subject: [PATCH 0153/1101] fix(Telemetry): Ensure to gently handle older
 globals

---
 lib/cli/handle-error.js | 61 +++++++++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 24 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index d68b7151fc9..e925a770f18 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -47,14 +47,10 @@ module.exports = async (exception, options = {}) => {
     isUncaughtException,
     isLocallyInstalled: passedIsLocallyInstalled,
     isInvokedByGlobalInstallation: passedIsInvokedByGlobalInstallation,
-    command,
-    options: cliOptions,
-    commandSchema,
-    serviceDir,
-    configuration,
     serverless,
     hasTelemetryBeenReported,
   } = options;
+  let { command, options: cliOptions, commandSchema, serviceDir, configuration } = options;
 
   const isLocallyInstalled = serverless ? serverless.isLocallyInstalled : passedIsLocallyInstalled;
   const isInvokedByGlobalInstallation = serverless
@@ -158,27 +154,44 @@ module.exports = async (exception, options = {}) => {
   if (
     !isTelemetryDisabled &&
     hasTelemetryBeenReported === false &&
-    (serverless ? serverless.isTelemetryReportedExternally : true) &&
-    resolveInput().commandSchema // Do not report for unrecognized commands
+    (serverless ? serverless.isTelemetryReportedExternally : true)
   ) {
-    const telemetryPayload = await generateTelemetryPayload({
-      command,
-      options: cliOptions,
-      commandSchema,
-      serviceDir,
-      configuration,
-      serverless,
-    });
-    const failureReason = {
-      kind: isUserError ? 'user' : 'programmer',
-      code: exception.code,
-    };
-
-    if (!isUserError || !exception.code || !isErrorCodeNormative(exception.code)) {
-      failureReason.location = resolveErrorLocation(exceptionTokens);
+    if (command == null) {
+      // We're in local fallback and older global didn't pass CLI command data, resolve it here
+      if (serverless) {
+        configuration = serverless.configurationInput;
+        serviceDir = serverless.serviceDir;
+      }
+      const commandsSchema = configuration
+        ? require('./commands-schema/resolve-final')(serverless.pluginManager.externalPlugins, {
+            providerName: serverless.service.provider.name,
+            configuration,
+          })
+        : require('./commands-schema/aws-service');
+      ({ command, options: cliOptions, commandSchema } = resolveInput(commandsSchema));
+    }
+
+    if (commandSchema) {
+      // Report only for recognized commands
+      const telemetryPayload = await generateTelemetryPayload({
+        command,
+        options: cliOptions,
+        commandSchema,
+        serviceDir,
+        configuration,
+        serverless,
+      });
+      const failureReason = {
+        kind: isUserError ? 'user' : 'programmer',
+        code: exception.code,
+      };
+
+      if (!isUserError || !exception.code || !isErrorCodeNormative(exception.code)) {
+        failureReason.location = resolveErrorLocation(exceptionTokens);
+      }
+      await storeTelemetryLocally({ ...telemetryPayload, failureReason, outcome: 'failure' });
+      await sendTelemetry();
     }
-    await storeTelemetryLocally({ ...telemetryPayload, failureReason, outcome: 'failure' });
-    await sendTelemetry();
   }
 
   process.exitCode = 1;

From 6efc161e5f7892275c798f6003ea5ee557bf3b26 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 2 Jun 2021 10:26:44 +0200
Subject: [PATCH 0154/1101] refactor(Variables): Seclude resolution of sources
 from external plugins

---
 .../resolve-external-plugin-sources.js        | 66 ++++++++++++++
 scripts/serverless.js                         | 66 ++------------
 .../resolve-external-plugin-resources.test.js | 90 +++++++++++++++++++
 3 files changed, 162 insertions(+), 60 deletions(-)
 create mode 100644 lib/configuration/variables/sources/resolve-external-plugin-sources.js
 create mode 100644 test/unit/lib/configuration/variables/sources/resolve-external-plugin-resources.test.js

diff --git a/lib/configuration/variables/sources/resolve-external-plugin-sources.js b/lib/configuration/variables/sources/resolve-external-plugin-sources.js
new file mode 100644
index 00000000000..39bbc818ac9
--- /dev/null
+++ b/lib/configuration/variables/sources/resolve-external-plugin-sources.js
@@ -0,0 +1,66 @@
+'use strict';
+
+const ensurePlainObject = require('type/plain-object/ensure');
+const ensurePlainFunction = require('type/plain-function/ensure');
+const ServerlessError = require('../../../serverless-error');
+const logDeprecation = require('../../../utils/logDeprecation');
+
+module.exports = (configuration, resolverConfiguration, externalPlugins) => {
+  for (const externalPlugin of externalPlugins) {
+    const pluginName = externalPlugin.constructor.name;
+    if (externalPlugin.configurationVariablesSources != null) {
+      ensurePlainObject(externalPlugin.configurationVariablesSources, {
+        errorMessage:
+          'Invalid "configurationVariablesSources" ' +
+          `configuration on "${pluginName}", expected object, got: %v"`,
+        Error: ServerlessError,
+        errorCode: 'INVALID_VARIABLE_SOURCES_CONFIGURATION',
+      });
+
+      for (const [sourceName, sourceConfig] of Object.entries(
+        externalPlugin.configurationVariablesSources
+      )) {
+        if (resolverConfiguration.sources[sourceName]) {
+          throw new ServerlessError(
+            `Cannot add "${sourceName}" configuration variable source ` +
+              `(through "${pluginName}" plugin) as resolution rules ` +
+              'for this source name are already configured',
+            'DUPLICATE_VARIABLE_SOURCE_CONFIGURATION'
+          );
+        }
+        ensurePlainFunction(
+          ensurePlainObject(sourceConfig, {
+            errorMessage:
+              `Invalid "configurationVariablesSources.${sourceName}" ` +
+              `configuration on "${pluginName}", expected object, got: %v"`,
+            Error: ServerlessError,
+            errorCode: 'INVALID_VARIABLE_SOURCE_CONFIGURATION',
+          }).resolve,
+          {
+            errorMessage:
+              `Invalid "configurationVariablesSources.${sourceName}.resolve" ` +
+              `value on "${pluginName}", expected function, got: %v"`,
+            Error: ServerlessError,
+            errorCode: 'INVALID_VARIABLE_SOURCE_RESOLVER_CONFIGURATION',
+          }
+        );
+
+        resolverConfiguration.sources[sourceName] = sourceConfig;
+        resolverConfiguration.fulfilledSources.add(sourceName);
+      }
+    } else if (
+      externalPlugin.variableResolvers &&
+      configuration.variablesResolutionMode < 20210326
+    ) {
+      logDeprecation(
+        'NEW_VARIABLES_RESOLVER',
+        `Plugin "${pluginName}" attempts to extend old variables resolver. ` +
+          'Ensure to rely on latest version of a plugin and if this warning is ' +
+          'still displayed please report the problem at plugin issue tracker' +
+          'Starting with next major release, ' +
+          'old variables resolver will not be supported.\n',
+        { serviceConfig: configuration }
+      );
+    }
+  }
+};
diff --git a/scripts/serverless.js b/scripts/serverless.js
index a11350f57a6..18840d9b0c4 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -554,67 +554,13 @@ const processSpanPromise = (async () => {
           }
         }
 
-        const ensurePlainFunction = require('type/plain-function/ensure');
-        const ensurePlainObject = require('type/plain-object/ensure');
-
         // Register variable source resolvers provided by external plugins
-        for (const externalPlugin of serverless.pluginManager.externalPlugins) {
-          const pluginName = externalPlugin.constructor.name;
-          if (externalPlugin.configurationVariablesSources != null) {
-            ensurePlainObject(externalPlugin.configurationVariablesSources, {
-              errorMessage:
-                'Invalid "configurationVariablesSources" ' +
-                `configuration on "${pluginName}", expected object, got: %v"`,
-              Error: ServerlessError,
-              errorCode: 'INVALID_VARIABLE_SOURCES_CONFIGURATION',
-            });
-
-            for (const [sourceName, sourceConfig] of Object.entries(
-              externalPlugin.configurationVariablesSources
-            )) {
-              if (resolverConfiguration.sources[sourceName]) {
-                throw new ServerlessError(
-                  `Cannot add "${sourceName}" configuration variable source ` +
-                    `(through "${pluginName}" plugin) as resolution rules ` +
-                    'for this source name are already configured',
-                  'DUPLICATE_VARIABLE_SOURCE_CONFIGURATION'
-                );
-              }
-              ensurePlainFunction(
-                ensurePlainObject(sourceConfig, {
-                  errorMessage:
-                    `Invalid "configurationVariablesSources.${sourceName}" ` +
-                    `configuration on "${pluginName}", expected object, got: %v"`,
-                  Error: ServerlessError,
-                  errorCode: 'INVALID_VARIABLE_SOURCE_CONFIGURATION',
-                }).resolve,
-                {
-                  errorMessage:
-                    `Invalid "configurationVariablesSources.${sourceName}.resolve" ` +
-                    `value on "${pluginName}", expected function, got: %v"`,
-                  Error: ServerlessError,
-                  errorCode: 'INVALID_VARIABLE_SOURCE_RESOLVER_CONFIGURATION',
-                }
-              );
-
-              resolverConfiguration.sources[sourceName] = sourceConfig;
-              resolverConfiguration.fulfilledSources.add(sourceName);
-            }
-          } else if (
-            externalPlugin.variableResolvers &&
-            configuration.variablesResolutionMode < 20210326
-          ) {
-            logDeprecation(
-              'NEW_VARIABLES_RESOLVER',
-              `Plugin "${pluginName}" attempts to extend old variables resolver. ` +
-                'Ensure to rely on latest version of a plugin and if this warning is ' +
-                'still displayed please report the problem at plugin issue tracker' +
-                'Starting with next major release, ' +
-                'old variables resolver will not be supported.\n',
-              { serviceConfig: configuration }
-            );
-          }
-        }
+        const resolverExternalPluginSources = require('../lib/configuration/variables/sources/resolve-external-plugin-sources');
+        resolverExternalPluginSources(
+          configuration,
+          resolverConfiguration,
+          serverless.pluginManager.externalPlugins
+        );
 
         // Having all source resolvers configured, resolve variables
         await resolveVariables(resolverConfiguration);
diff --git a/test/unit/lib/configuration/variables/sources/resolve-external-plugin-resources.test.js b/test/unit/lib/configuration/variables/sources/resolve-external-plugin-resources.test.js
new file mode 100644
index 00000000000..52978b18342
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/resolve-external-plugin-resources.test.js
@@ -0,0 +1,90 @@
+'use strict';
+
+const { expect } = require('chai');
+
+const ServerlessError = require('../../../../../../lib/serverless-error');
+const resolveExternalPluginSources = require('../../../../../../lib/configuration/variables/sources/resolve-external-plugin-sources');
+
+describe('test/unit/lib/configuration/variables/sources/resolve-external-plugin-resources.test.js', () => {
+  it('should resolve external plugin sources', () => {
+    const sources = {};
+    const fulfilledSources = new Set();
+    const externalPlugins = [
+      {
+        configurationVariablesSources: {
+          ext1: { resolve: () => {} },
+          ext2: { resolve: () => {} },
+        },
+      },
+      {
+        configurationVariablesSources: {
+          ext3: { resolve: () => {} },
+        },
+      },
+    ];
+    resolveExternalPluginSources({}, { sources, fulfilledSources }, new Set(externalPlugins));
+    expect(sources).to.deep.equal({
+      ...externalPlugins[0].configurationVariablesSources,
+      ...externalPlugins[1].configurationVariablesSources,
+    });
+    expect(fulfilledSources).to.deep.equal(new Set(Object.keys(sources)));
+  });
+
+  it('should reject meaningfully invalid sources configuration', () => {
+    expect(() =>
+      resolveExternalPluginSources(
+        {},
+        { sources: {}, fulfilledSources: new Set() },
+        new Set([
+          {
+            configurationVariablesSources: 'foo',
+          },
+        ])
+      )
+    )
+      .to.throw(ServerlessError)
+      .with.property('code', 'INVALID_VARIABLE_SOURCES_CONFIGURATION');
+
+    expect(() =>
+      resolveExternalPluginSources(
+        {},
+        { sources: { existing: { resolve: () => {} } }, fulfilledSources: new Set(['existing']) },
+        new Set([
+          {
+            configurationVariablesSources: { existing: { resolve: () => {} } },
+          },
+        ])
+      )
+    )
+      .to.throw(ServerlessError)
+      .with.property('code', 'DUPLICATE_VARIABLE_SOURCE_CONFIGURATION');
+
+    expect(() =>
+      resolveExternalPluginSources(
+        {},
+        { sources: {}, fulfilledSources: new Set() },
+        new Set([
+          {
+            configurationVariablesSources: { source: 'foo' },
+          },
+        ])
+      )
+    )
+      .to.throw(ServerlessError)
+      .with.property('code', 'INVALID_VARIABLE_SOURCE_CONFIGURATION');
+
+    expect(() =>
+      resolveExternalPluginSources(
+        {},
+        { sources: {}, fulfilledSources: new Set() },
+        new Set([
+          {
+            configurationVariablesSources: { source: { resolve: 'foo ' } },
+          },
+        ])
+      )
+    )
+      .to.throw(ServerlessError)
+      .with.property('code', 'INVALID_VARIABLE_SOURCE_RESOLVER_CONFIGURATION');
+  });
+});

From 582d150ceb01d3f597a30fcc82201ffa325c4617 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 2 Jun 2021 12:02:56 +0200
Subject: [PATCH 0155/1101] refactor(Variables): Cleanup handling of
 `variableSyntax` default

---
 lib/classes/ConfigSchemaHandler/index.js                | 5 -----
 lib/classes/Service.js                                  | 4 ----
 lib/classes/Variables.js                                | 5 ++++-
 test/unit/lib/classes/ConfigSchemaHandler/index.test.js | 1 -
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/lib/classes/ConfigSchemaHandler/index.js b/lib/classes/ConfigSchemaHandler/index.js
index 8456310ed51..ae8366cf1f3 100644
--- a/lib/classes/ConfigSchemaHandler/index.js
+++ b/lib/classes/ConfigSchemaHandler/index.js
@@ -224,11 +224,6 @@ class ConfigSchemaHandler {
         properties: { stage: { type: 'string' } },
       });
     }
-    if (!this.schema.properties.provider.properties.variableSyntax) {
-      addPropertiesToSchema(this.schema.properties.provider, {
-        properties: { variableSyntax: { type: 'string' } },
-      });
-    }
   }
 
   defineCustomProperties(configSchemaParts) {
diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index cdf9e294923..cdd262c5686 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -19,7 +19,6 @@ class Service {
     this.serviceObject = null;
     this.provider = {
       stage: 'dev',
-      variableSyntax: '\\${([^{}:]+?(?:\\(|:)(?:[^:{}][^{}]*?)?)}',
     };
     this.custom = {};
     this.plugins = [];
@@ -149,9 +148,6 @@ class Service {
       if (serverlessFile.provider.stage == null) {
         serverlessFile.provider.stage = this.provider.stage;
       }
-      if (serverlessFile.provider.variableSyntax == null) {
-        serverlessFile.provider.variableSyntax = this.provider.variableSyntax;
-      }
       this.provider = serverlessFile.provider;
     }
 
diff --git a/lib/classes/Variables.js b/lib/classes/Variables.js
index 2431f73340d..d68fb681bd8 100644
--- a/lib/classes/Variables.js
+++ b/lib/classes/Variables.js
@@ -103,7 +103,10 @@ class Variables {
   }
 
   loadVariableSyntax() {
-    this.variableSyntax = RegExp(this.service.provider.variableSyntax, 'g');
+    this.variableSyntax = RegExp(
+      this.service.provider.variableSyntax || '\\${([^{}:]+?(?:\\(|:)(?:[^:{}][^{}]*?)?)}',
+      'g'
+    );
   }
 
   initialCall(func) {
diff --git a/test/unit/lib/classes/ConfigSchemaHandler/index.test.js b/test/unit/lib/classes/ConfigSchemaHandler/index.test.js
index ccd0b5b2687..c0ab6fa5935 100644
--- a/test/unit/lib/classes/ConfigSchemaHandler/index.test.js
+++ b/test/unit/lib/classes/ConfigSchemaHandler/index.test.js
@@ -318,7 +318,6 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
           properties: {
             name: { const: 'someProvider' },
             stage: { type: 'string' },
-            variableSyntax: { type: 'string' },
           },
           required: ['name'],
           additionalProperties: false,

From 14a5275c0d6a127e211935b8b8f57a949e1ffad6 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 2 Jun 2021 12:07:41 +0200
Subject: [PATCH 0156/1101] fix(Variables): Ensure to apply a new resolver in a
 local version

---
 lib/Serverless.js | 104 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 102 insertions(+), 2 deletions(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index 66e99ac943b..ba4ba0e89eb 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -5,6 +5,7 @@ const os = require('os');
 const ensureString = require('type/string/ensure');
 const ensureArray = require('type/array/ensure');
 const ensurePlainObject = require('type/plain-object/ensure');
+const _ = require('lodash');
 const CLI = require('./classes/CLI');
 const Config = require('./classes/Config');
 const YamlParser = require('./classes/YamlParser');
@@ -272,8 +273,8 @@ class Serverless {
 
   async run() {
     if (this._isInvokedByGlobalInstallation) {
-      // Ensure to have resolve-input populated with right result
       // TODO: Remove with next major
+      // Ensure to have resolve-input populated with right result
       const commandsSchema = require('./cli/commands-schema/resolve-final')(
         this.pluginManager.externalPlugins,
         {
@@ -283,7 +284,106 @@ class Serverless {
       );
       const resolveInput = require('./cli/resolve-input');
       resolveInput.clear();
-      resolveInput(commandsSchema);
+      const { options, isHelpRequest } = resolveInput(commandsSchema);
+      if (
+        !this.isConfigurationInputResolved &&
+        this.serviceDir &&
+        !_.get(this.configurationInput, 'provider.variableSyntax')
+      ) {
+        // We're in a local fallback from other version which may not have a new variables engine
+        // (or have it incomplete). Therefore resolve variables with a new resolver
+        const resolveVariablesMeta = require('./configuration/variables/resolve-meta');
+        const isPropertyResolved = require('./configuration/variables/is-property-resolved');
+        const resolveVariables = require('./configuration/variables/resolve');
+        const eventuallyReportVariableResolutionErrors = require('./configuration/variables/eventually-report-resolution-errors');
+        const resolveProviderName = require('./configuration/resolve-provider-name');
+        const filterSupportedOptions = require('./cli/filter-supported-options');
+
+        const variablesMeta = resolveVariablesMeta(this.configurationInput);
+        // IIFE for maintanance convinience
+        await (async () => {
+          if (!variablesMeta.size) return;
+          const configurationPath = path.resolve(this.serviceDir, this.configurationFilename);
+          if (
+            eventuallyReportVariableResolutionErrors(
+              configurationPath,
+              this.configurationInput,
+              variablesMeta
+            )
+          ) {
+            return;
+          }
+
+          for (const coreProperty of [
+            'app',
+            'disabledDeprecations',
+            'org',
+            'provider\0name',
+            'useDotenv',
+            'variablesResolutionMode',
+          ]) {
+            if (!isPropertyResolved(variablesMeta, coreProperty)) return;
+          }
+          const providerName = resolveProviderName(this.configurationInput);
+          const resolverConfiguration = {
+            serviceDir: this.serviceDir,
+            configuration: this.configurationInput,
+            variablesMeta,
+            sources: {
+              env: require('./configuration/variables/sources/env'),
+              file: require('./configuration/variables/sources/file'),
+              opt: require('./configuration/variables/sources/opt'),
+              self: require('./configuration/variables/sources/self'),
+              strToBool: require('./configuration/variables/sources/str-to-bool'),
+              sls: require('./configuration/variables/sources/instance-dependent/get-sls')(this),
+            },
+            options: filterSupportedOptions(options, {
+              commandSchema: resolveInput.commandSchema,
+              providerName,
+            }),
+            propertyPathsToResolve: isHelpRequest ? new Set(['plugins']) : null,
+          };
+          if (providerName === 'aws') {
+            Object.assign(resolverConfiguration.sources, {
+              cf: require('./configuration/variables/sources/instance-dependent/get-cf')(this),
+              s3: require('./configuration/variables/sources/instance-dependent/get-s3')(this),
+              ssm: require('./configuration/variables/sources/instance-dependent/get-ssm')(this),
+            });
+          }
+          if (this.configurationInput.org && this.pluginManager.dashboardPlugin) {
+            for (const [sourceName, sourceConfig] of Object.entries(
+              this.pluginManager.dashboardPlugin.configurationVariablesSources
+            )) {
+              resolverConfiguration.sources[sourceName] = sourceConfig;
+            }
+          }
+          resolverConfiguration.fulfilledSources = new Set(
+            Object.keys(resolverConfiguration.sources)
+          );
+          if (!(this.configurationInput.variablesResolutionMode >= 20210326)) {
+            // New resolver, resolves just recognized CLI options. Therefore we cannot assume
+            // we have full "opt" source data if user didn't explicitly switch to new resolver
+            resolverConfiguration.fulfilledSources.delete('opt');
+          }
+
+          const resolverExternalPluginSources = require('../lib/configuration/variables/sources/resolve-external-plugin-sources');
+          resolverExternalPluginSources(
+            this.configurationInput,
+            resolverConfiguration,
+            this.pluginManager.externalPlugins
+          );
+          await resolveVariables(resolverConfiguration);
+          if (!variablesMeta.size) {
+            this.isConfigurationInputResolved = true;
+            return;
+          }
+          eventuallyReportVariableResolutionErrors(
+            configurationPath,
+            this.configurationInput,
+            variablesMeta
+          );
+        })();
+      }
     }
     if (this.cli.displayHelp(this.processedInput)) {
       return;

From e6f6fd2e0a18f19fefc6ea80d66d2e990e945e58 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 1 Jun 2021 13:16:17 +0200
Subject: [PATCH 0157/1101] test: Improve test coverage

---
 test/unit/lib/aws/request.test.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/unit/lib/aws/request.test.js b/test/unit/lib/aws/request.test.js
index 641f94c03b4..f629d2a8d18 100644
--- a/test/unit/lib/aws/request.test.js
+++ b/test/unit/lib/aws/request.test.js
@@ -233,9 +233,10 @@ describe('#request', () => {
       const error = {
         statusCode: 500,
         message: 'Some error message',
+        code: 'SomeError',
       };
       class FakeS3 {
-        error() {
+        test() {
           return {
             promise: async () => {
               throw error;
@@ -246,7 +247,10 @@ describe('#request', () => {
       const awsRequest = proxyquire('../../../../lib/aws/request', {
         'aws-sdk': { S3: FakeS3 },
       });
-      return expect(awsRequest({ name: 'S3' }, 'error')).to.be.rejected;
+      return expect(awsRequest({ name: 'S3' }, 'test')).to.eventually.be.rejected.and.have.property(
+        'code',
+        'AWS_S3_TEST_SOME_ERROR'
+      );
     });
   });
 

From f2cdbae1eb6d327935336a38deda099b8f5ffee2 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 1 Jun 2021 13:10:14 +0200
Subject: [PATCH 0158/1101] fix: Fix handling of numeric error codes coming
 from AWS SDK requests

---
 lib/aws/request.js                |  6 +++++-
 test/unit/lib/aws/request.test.js | 24 ++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/lib/aws/request.js b/lib/aws/request.js
index e13bfdf833a..ac454184bbb 100644
--- a/lib/aws/request.js
+++ b/lib/aws/request.js
@@ -203,7 +203,11 @@ async function awsRequest(service, method, ...args) {
             providerError: Object.assign({}, err, { retryable: false }),
           });
         }
-        const providerErrorCodeExtension = err.code ? normalizeErrorCodePostfix(err.code) : 'ERROR';
+        const providerErrorCodeExtension = (() => {
+          if (!err.code) return 'ERROR';
+          if (typeof err.code === 'number') return `HTTP_${err.code}_ERROR`;
+          return normalizeErrorCodePostfix(err.code);
+        })();
         throw Object.assign(
           new ServerlessError(
             process.env.SLS_DEBUG && err.stack ? `${err.stack}\n${'-'.repeat(100)}` : message,
diff --git a/test/unit/lib/aws/request.test.js b/test/unit/lib/aws/request.test.js
index f629d2a8d18..3a5723b8af5 100644
--- a/test/unit/lib/aws/request.test.js
+++ b/test/unit/lib/aws/request.test.js
@@ -252,6 +252,30 @@ describe('#request', () => {
         'AWS_S3_TEST_SOME_ERROR'
       );
     });
+
+    it('should handle numeric error codes', () => {
+      const error = {
+        statusCode: 500,
+        message: 'Some error message',
+        code: 500,
+      };
+      class FakeS3 {
+        test() {
+          return {
+            promise: async () => {
+              throw error;
+            },
+          };
+        }
+      }
+      const awsRequest = proxyquire('../../../../lib/aws/request', {
+        'aws-sdk': { S3: FakeS3 },
+      });
+      return expect(awsRequest({ name: 'S3' }, 'test')).to.eventually.be.rejected.and.have.property(
+        'code',
+        'AWS_S3_TEST_HTTP_500_ERROR'
+      );
+    });
   });
 
   it('should expose original error message in thrown error message', () => {

From 3715989a88879e5a240a3eae084f013ca6ad5f39 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 2 Jun 2021 12:55:22 +0200
Subject: [PATCH 0159/1101] test: Refactor to async/await

---
 test/unit/lib/aws/request.test.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/unit/lib/aws/request.test.js b/test/unit/lib/aws/request.test.js
index 3a5723b8af5..0c2ac1e7c4a 100644
--- a/test/unit/lib/aws/request.test.js
+++ b/test/unit/lib/aws/request.test.js
@@ -229,7 +229,7 @@ describe('#request', () => {
       return expect(sendFake.promise).to.have.been.calledOnce;
     });
 
-    it('should expose non-retryable errors', () => {
+    it('should expose non-retryable errors', async () => {
       const error = {
         statusCode: 500,
         message: 'Some error message',
@@ -247,13 +247,13 @@ describe('#request', () => {
       const awsRequest = proxyquire('../../../../lib/aws/request', {
         'aws-sdk': { S3: FakeS3 },
       });
-      return expect(awsRequest({ name: 'S3' }, 'test')).to.eventually.be.rejected.and.have.property(
+      await expect(awsRequest({ name: 'S3' }, 'test')).to.eventually.be.rejected.and.have.property(
         'code',
         'AWS_S3_TEST_SOME_ERROR'
       );
     });
 
-    it('should handle numeric error codes', () => {
+    it('should handle numeric error codes', async () => {
       const error = {
         statusCode: 500,
         message: 'Some error message',
@@ -271,7 +271,7 @@ describe('#request', () => {
       const awsRequest = proxyquire('../../../../lib/aws/request', {
         'aws-sdk': { S3: FakeS3 },
       });
-      return expect(awsRequest({ name: 'S3' }, 'test')).to.eventually.be.rejected.and.have.property(
+      await expect(awsRequest({ name: 'S3' }, 'test')).to.eventually.be.rejected.and.have.property(
         'code',
         'AWS_S3_TEST_HTTP_500_ERROR'
       );

From bb3b766946311848c707abc0fc7e749393f4527c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 2 Jun 2021 13:47:44 +0200
Subject: [PATCH 0160/1101] fix(Variables): Unify error messaging for function
 resolvers

---
 lib/configuration/variables/sources/file.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/configuration/variables/sources/file.js b/lib/configuration/variables/sources/file.js
index 634c0ae58e1..0f7741544aa 100644
--- a/lib/configuration/variables/sources/file.js
+++ b/lib/configuration/variables/sources/file.js
@@ -169,8 +169,9 @@ module.exports = {
           throw new ServerlessError(
             `Cannot resolve "${address}" out of "${path.basename(
               filePath
-            )}": Resolved a JS function not confirmed to work with a new parser, ` +
-              'falling back to old resolver',
+            )}": Approached a JS function resolver, confirm it's updated to work with a ` +
+              'new parser by setting "variablesResolutionMode: 20210326" in service config. ' +
+              'Falling back to old resolver',
             'FILE_CONTENT_RESOLUTION_ERROR'
           );
         }

From 0d0498fc67001e08de30c4a189b9b4624c23ff1b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 2 Jun 2021 15:42:33 +0200
Subject: [PATCH 0161/1101] docs(Variables): Improve function resolver
 documentation

---
 docs/providers/aws/guide/variables.md | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/docs/providers/aws/guide/variables.md b/docs/providers/aws/guide/variables.md
index 08af750d429..fda60587e00 100644
--- a/docs/providers/aws/guide/variables.md
+++ b/docs/providers/aws/guide/variables.md
@@ -474,13 +474,19 @@ functions:
 
 ### Exporting a function
 
-With a new variables resolver (_which will be the only used resolver in v3 of a Framework, and which can be turned on now by setting `variablesResolutionMode: 20210326` in service config_) functions receives an object, with two properties:
+#### With a new variables resolver
+
+_Note: works only with `variablesResolutionMode: 20210326` set in service configuration_
+
+With a new variables resolver (_which will be the only used resolver in v3 of a Framework_) functions receives an object, with following properties:
 
 - `options` - An object referencing resolved CLI params as passed to the command
-- `resolveConfigurationProperty([key1, key2, ...keyN])` - Async function which resolves specific service configuration property. It returns a fully resolved value of configuration property. If circular reference is detected resolution will be rejected.
 - `resolveVariable(variableString)` - Async function which resolves provided variable string. String should be passed without wrapping (`${` and `}`) braces. Example valid values:
   - `file(./config.js):SOME_VALUE`
   - `env:SOME_ENV_VAR, null` (end with `, null`, if missing value at the variable source should be resolved with `null`, and not with a thrown error)
+- `resolveConfigurationProperty([key1, key2, ...keyN])` - Async function which resolves specific service configuration property. It returns a fully resolved value of configuration property. If circular reference is detected resolution will be rejected.
+
+Resolver function can be either _sync_ or _async_. Still both `resolveConfigurationProperty` and `resolveVariable` utils provided to it are _async_, so if there's an intention to rely on it naturally resolver function should be _async_.
 
 Example on how to obtain some Serverless Framework configuration values:
 
@@ -490,10 +496,18 @@ module.exports = async ({ options, resolveVariable }) => {
   const stage = await resolveVariable('sls:stage');
   const region = await resolveVariable('opt:region, self:provider.region, "us-east-1"');
   ...
+
+  // Resolver may return any JSON value (null, boolean, string, number, array or plain object)
+  return {
+    prop1: someValue // if we want to directly access this value, variable should be constructed as ${file(./config):prop1}
+    prop2: someOther value
+  }
 }
 ```
 
-In the old legacy resolver (which is deprecated, but stays as default in v2) function receives a reference to the Serverless object containing your configuration.
+#### With a legacy (depracated) resolver
+
+In old legacy resolver (deprecated, but still default in v2) function receives a reference to the Serverless object containing your configuration.
 
 _**Notice:** Configuration is yet in unresolved state, so any properties configured with variables may still be presented with variables in it_
 

From efa7dae2931fc601f771b8a8f4669faee1fe9ad1 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 2 Jun 2021 16:39:30 +0200
Subject: [PATCH 0162/1101] test(AWS Stream): Improve race condition handling

---
 test/integration/stream.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/stream.test.js b/test/integration/stream.test.js
index 4af92ddd42e..389fad8a9e8 100644
--- a/test/integration/stream.test.js
+++ b/test/integration/stream.test.js
@@ -50,7 +50,7 @@ describe('AWS - Stream Integration Test', function () {
         () => putKinesisRecord(streamName, message),
         {
           checkIsComplete: (events) =>
-            events.reduce((data, event) => data + event.message, '').includes(functionName),
+            events.reduce((data, event) => data + event.message, '').includes(message),
         }
       ).then((events) => {
         const logs = events.reduce((data, event) => data + event.message, '');

From 0ce5b7cb51c008c0490eab0a3a0d73d86b373959 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 2 Jun 2021 16:45:40 +0200
Subject: [PATCH 0163/1101] chore: Bump dependencies

---
 package.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 04262593f4e..1f0b7d23ccc 100644
--- a/package.json
+++ b/package.json
@@ -23,21 +23,21 @@
   },
   "dependencies": {
     "@serverless/cli": "^1.5.2",
-    "@serverless/components": "^3.10.0",
+    "@serverless/components": "^3.11.0",
     "@serverless/dashboard-plugin": "^5.1.4",
-    "@serverless/utils": "^5.1.0",
+    "@serverless/utils": "^5.2.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.913.0",
+    "aws-sdk": "^2.919.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
     "chalk": "^4.1.1",
     "child-process-ext": "^2.1.1",
-    "ci-info": "^3.1.1",
+    "ci-info": "^3.2.0",
     "d": "^1.0.1",
-    "dayjs": "^1.10.4",
+    "dayjs": "^1.10.5",
     "decompress": "^4.2.1",
     "dotenv": "^9.0.2",
     "essentials": "^1.1.1",
@@ -59,7 +59,7 @@
     "micromatch": "^4.0.4",
     "ncjsm": "^4.2.0",
     "node-fetch": "^2.6.1",
-    "object-hash": "^2.1.1",
+    "object-hash": "^2.2.0",
     "path2": "^0.1.0",
     "promise-queue": "^2.2.5",
     "replaceall": "^0.1.6",
@@ -78,9 +78,9 @@
     "@serverless/test": "^8.1.0",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "cos-nodejs-sdk-v5": "^2.9.15",
+    "cos-nodejs-sdk-v5": "^2.9.17",
     "eslint": "^7.27.0",
-    "eslint-plugin-import": "^2.23.3",
+    "eslint-plugin-import": "^2.23.4",
     "git-list-updated": "^1.2.1",
     "github-release-from-cc-changelog": "^2.2.0",
     "husky": "^4.3.8",
@@ -97,10 +97,10 @@
     "proxyquire": "^2.1.3",
     "semver-regex": "^3.1.2",
     "sinon": "^10.0.0",
-    "sinon-chai": "^3.6.0",
+    "sinon-chai": "^3.7.0",
     "standard-version": "^9.3.0",
     "strip-ansi": "^6.0.0",
-    "ws": "^7.4.5",
+    "ws": "^7.4.6",
     "xml2js": "^0.4.23"
   },
   "eslintConfig": {

From fbb1ef8fa38b097096c04db3339f9f05a97f16af Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 2 Jun 2021 17:18:46 +0200
Subject: [PATCH 0164/1101] chore: Release v2.44.0

---
 CHANGELOG.md | 23 +++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2674f1fb90d..b3ef7e58c2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,29 @@
 
 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.
 
+## [2.44.0](https://github.com/serverless/serverless/compare/v2.43.1...v2.44.0) (2021-06-02)
+
+### Features
+
+- **CLI Onboarding:** Make it service setup specific:
+  - If not in service context, immediately go into project setup questions (skip "Do you want to create a new project" question) ([#9524](https://github.com/serverless/serverless/pull/9524)) ([d5e2baf](https://github.com/serverless/serverless/commit/d5e2baf714958c5718610659887f485f9bd161e4)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Remove `tab-completion` from interactive flow ([#9531](https://github.com/serverless/serverless/pull/9531)) ([3bac0f3](https://github.com/serverless/serverless/commit/3bac0f37f0f23abed387f0952772e3cdf5d47320)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **Variables:**
+  - Unify error messaging for function resolvers ([#9545](https://github.com/serverless/serverless/pull/9545)) ([bb3b766](https://github.com/serverless/serverless/commit/bb3b766946311848c707abc0fc7e749393f4527c)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Ensure to apply a resolution with a new resolver in case of a fallback to a local version ([#9544](https://github.com/serverless/serverless/pull/9544)) ([14a5275](https://github.com/serverless/serverless/commit/14a5275c0d6a127e211935b8b8f57a949e1ffad6)) ([Mariusz Nowak](https://github.com/medikoo))
+- **CLI:**
+  - Ensure to gently handle missing data from global installation in case of local fallback ([#9539](https://github.com/serverless/serverless/pull/9539)) ([1b90dfb](https://github.com/serverless/serverless/commit/1b90dfb0659dab3852ace330fd7c497321b80710)) ([Mariusz Nowak](https://github.com/medikoo))
+- Fix handling of numeric error codes coming from AWS SDK requests ([#9538](https://github.com/serverless/serverless/pull/9538)) ([f2cdbae](https://github.com/serverless/serverless/commit/f2cdbae1eb6d327935336a38deda099b8f5ffee2)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **Variables:**
+  - Cleanup handling of `variableSyntax` default ([#9544](https://github.com/serverless/serverless/pull/9544)) ([582d150](https://github.com/serverless/serverless/commit/582d150ceb01d3f597a30fcc82201ffa325c4617)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Seclude resolution of sources from external plugins ([#9544](https://github.com/serverless/serverless/pull/9544)) ([6efc161](https://github.com/serverless/serverless/commit/6efc161e5f7892275c798f6003ea5ee557bf3b26)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ### [2.43.1](https://github.com/serverless/serverless/compare/v2.43.0...v2.43.1) (2021-05-25)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 1f0b7d23ccc..ab742cc8469 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.43.1",
+  "version": "2.44.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 7d6bc45b0d1967984b037f3955173d9594f63a8a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 2 Jun 2021 18:57:24 +0200
Subject: [PATCH 0165/1101] chore: Bump `@serverless/dashboard-plugin`

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ab742cc8469..90918ac7fe7 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "@serverless/cli": "^1.5.2",
     "@serverless/components": "^3.11.0",
-    "@serverless/dashboard-plugin": "^5.1.4",
+    "@serverless/dashboard-plugin": "^5.2.0",
     "@serverless/utils": "^5.2.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",

From ddab62463ba5dd7ddda14ad500f39ab70f27265c Mon Sep 17 00:00:00 2001
From: Maciej Skierkowski <maciej@skierkowski.com>
Date: Fri, 4 Jun 2021 04:03:40 -0400
Subject: [PATCH 0166/1101] docs: Add details on using a custom policy/role
 (#9550)

---
 docs/guides/providers.md | 96 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)

diff --git a/docs/guides/providers.md b/docs/guides/providers.md
index ce5e30c2aac..a54c36d19d2 100644
--- a/docs/guides/providers.md
+++ b/docs/guides/providers.md
@@ -86,3 +86,99 @@ Now if you deploy to a preview stage, like `feature-x` it will automatically use
 To use providers with serverless.yml you do not need to do anything. Upon deployment the Serverless Framework will retrieve the necessary credentials from the provider associate with the instance or service, and it will use those credentials to deploy.
 
 If the providers are not found, then the Serverless Framework will look for credentials locally.
+
+# Using a Custom IAM Role and Policy
+
+Creating a provider with an IAM Role and default policy using the provided Cloud Formation template is the easiest and most secure way to enable Serverless Framework to deploy from CI/CD, monitor your services, and deploy a range of resources to your AWS account using short-lived credentials. However, advanced IAM users may want to create a custom IAM Role and Policy with more restrictive permissions.
+
+Please be aware that this policy is used to _provision_ your Serverless applications to your AWS account(s). The lambda function will also require a role, which is created by the Serverless Framework during deployments, hence why `iam:CreateRole` is required.
+
+Using a custom policy provides additional control and granularity, but it will require your organization to manage and maintain the policy and role to ensure it provides both minimal and sufficient access for Serverless Framework deployments to work correctly.
+
+Below is a sample IAM Policy you can use to get started. This policy works with the Serverless Framework dashboard to enable all the functionality, and deploy a basic Node.js Lambda function.
+
+If you are create a custom IAM Role with this policy, you will need to add a Trust relationship to the AWS Account with ID 377024778620 (arn:aws:iam::377024778620:root) in order for the Serverless Framework to Assume the Role with the provided policy.
+
+**Sample IAM Policy**
+
+```
+{
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Effect": "Allow",
+            "Action": [
+                "lambda:CreateFunction",
+                "logs:DeleteSubscriptionFilter",
+                "s3:CreateBucket",
+                "iam:CreateRole",
+                "lambda:GetFunctionConfiguration",
+                "cloudformation:DescribeStackResource",
+                "iam:PutRolePolicy",
+                "s3:GetObject*",
+                "cloudformation:DescribeStackEvents",
+                "s3:DeleteBucketWebsite",
+                "logs:GetLogEvents",
+                "cloudformation:UpdateStack",
+                "lambda:ListLayerVersions",
+                "lambda:ListLayers",
+                "lambda:DeleteFunction",
+                "events:RemoveTargets",
+                "logs:FilterLogEvents",
+                "lambda:GetAlias",
+                "s3:DeleteObject",
+                "s3:ListBucket",
+                "apigateway:GET",
+                "cloudformation:ListStackResources",
+                "iam:GetRole",
+                "events:DescribeRule",
+                "lambda:ListFunctions",
+                "lambda:InvokeFunction",
+                "lambda:GetEventSourceMapping",
+                "lambda:ListAliases",
+                "iam:DeleteRole",
+                "iam:UpdateAssumeRolePolicy",
+                "s3:DeleteBucketPolicy",
+                "logs:CreateLogGroup",
+                "cloudformation:DescribeStacks",
+                "lambda:UpdateFunctionCode",
+                "s3:PutObject",
+                "cloudformation:DeleteStack",
+                "lambda:ListEventSourceMappings",
+                "lambda:PublishVersion",
+                "logs:PutSubscriptionFilter",
+                "apigateway:POST",
+                "cloudformation:ValidateTemplate",
+                "lambda:ListVersionsByFunction",
+                "lambda:GetLayerVersion",
+                "s3:DeleteObjectVersion",
+                "events:PutRule",
+                "lambda:GetAccountSettings",
+                "s3:ListBucket",
+                "lambda:GetLayerVersionPolicy",
+                "s3:PutEncryptionConfiguration",
+                "apigateway:DELETE",
+                "iam:PassRole",
+                "lambda:ListTags",
+                "iam:DeleteRolePolicy",
+                "apigateway:PATCH",
+                "s3:DeleteBucket",
+                "logs:DescribeLogGroups",
+                "logs:DeleteLogGroup",
+                "apigateway:PUT",
+                "lambda:GetFunction",
+                "lambda:UpdateFunctionConfiguration",
+                "events:PutTargets",
+                "lambda:AddPermission",
+                "cloudformation:CreateStack",
+                "s3:PutBucketPolicy",
+                "sts:GetCallerIdentity",
+                "lambda:RemovePermission",
+                "s3:GetBucketLocation",
+                "lambda:GetPolicy"
+            ],
+            "Resource": "*"
+        }
+    ]
+}
+```

From accf5bd082400f654eba5e7d322bcb205c9ae709 Mon Sep 17 00:00:00 2001
From: Corentin Doue <31917261+CorentinDoue@users.noreply.github.com>
Date: Mon, 7 Jun 2021 13:21:52 +0200
Subject: [PATCH 0167/1101] fix(Templates): Allow usage of
 `google-nodejs-typescript` template

---
 lib/templates/recommended-list/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/templates/recommended-list/index.js b/lib/templates/recommended-list/index.js
index 2c4d924ad06..8b4e535ab26 100644
--- a/lib/templates/recommended-list/index.js
+++ b/lib/templates/recommended-list/index.js
@@ -40,6 +40,7 @@ module.exports = [
   'fn-nodejs',
   'fn-go',
   'google-nodejs',
+  'google-nodejs-typescript',
   'google-python',
   'google-go',
   'kubeless-python',

From 9a03116899b78b9d5c191fe3fad224c9b7ac7ddb Mon Sep 17 00:00:00 2001
From: Ikko Ashimine <eltociear@gmail.com>
Date: Mon, 7 Jun 2021 20:47:24 +0900
Subject: [PATCH 0168/1101] chore: Fix typo in `resolve-input.js` (#9554)

intially -> initially
---
 lib/cli/resolve-input.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli/resolve-input.js b/lib/cli/resolve-input.js
index 1d41f45b1b3..7d17895ff36 100644
--- a/lib/cli/resolve-input.js
+++ b/lib/cli/resolve-input.js
@@ -62,7 +62,7 @@ module.exports = memoizee((commandsSchema = require('./commands-schema')) => {
     }
     // Unlikely scenario, where after applying the command schema different command resolves
     // It can happen only in cases where e.g. for "sls deploy --force  function -f foo"
-    // we intially assume "deploy" command, while after applying "deploy" command schema it's
+    // we initially assume "deploy" command, while after applying "deploy" command schema it's
     // actually a "deploy function" command that resolves
     command = resolvedCommand;
     commandSchema = commandsSchema.get(resolvedCommand);

From a116dfec22697dd0511623c6a1e6d2d829d4ba10 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 7 Jun 2021 12:54:15 +0200
Subject: [PATCH 0169/1101] fix(AWS API Gateway): Dont create logGroup if logs
 disabled

---
 .../compile/events/apiGateway/lib/stage.js    |  2 +-
 .../events/apiGateway/lib/stage/index.test.js | 65 +++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/stage.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/stage.js
index f9f90ad1e2e..b3eac580e77 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/stage.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/stage.js
@@ -59,7 +59,7 @@ module.exports = {
       // --------------------------------------------------------------------------------
 
       // create log-specific resources
-      if (logs) {
+      if (logs && (logs.accessLogging == null || logs.accessLogging)) {
         // --- currently commented out since this is done via the SDK in updateStage.js ---
         // _.merge(stageResource.Properties, {
         //   AccessLogSetting: {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js
index 6b51f082a98..72b83a30ddf 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js
@@ -9,6 +9,7 @@ const AwsCompileApigEvents = require('../../../../../../../../../../../lib/plugi
 const Serverless = require('../../../../../../../../../../../lib/Serverless');
 const AwsProvider = require('../../../../../../../../../../../lib/plugins/aws/provider');
 const { createTmpDir } = require('../../../../../../../../../../utils/fs');
+const runServerless = require('../../../../../../../../../../utils/run-serverless');
 
 describe('#compileStage()', () => {
   let serverless;
@@ -315,3 +316,67 @@ describe('#compileStage()', () => {
     });
   });
 });
+
+describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js', () => {
+  it('should not create LogGroup if `accessLogging` set to false', async () => {
+    const { cfTemplate, awsNaming } = await runServerless({
+      fixture: 'apiGateway',
+      command: 'package',
+      configExt: {
+        provider: {
+          logs: {
+            restApi: {
+              accessLogging: false,
+            },
+          },
+        },
+      },
+    });
+
+    expect(cfTemplate.Resources[awsNaming.getApiGatewayLogGroupLogicalId()]).to.be.undefined;
+  });
+
+  it('should create LogGroup with `logs.restApi` set to `true`', async () => {
+    const { cfTemplate, awsNaming, serverless } = await runServerless({
+      fixture: 'apiGateway',
+      command: 'package',
+      configExt: {
+        provider: {
+          logs: {
+            restApi: true,
+          },
+        },
+      },
+    });
+
+    expect(cfTemplate.Resources[awsNaming.getApiGatewayLogGroupLogicalId()]).to.deep.equal({
+      Type: 'AWS::Logs::LogGroup',
+      Properties: {
+        LogGroupName: `/aws/api-gateway/${serverless.service.service}-dev`,
+      },
+    });
+  });
+
+  it('should create LogGroup with default setting for `accessLogging`', async () => {
+    const { cfTemplate, awsNaming, serverless } = await runServerless({
+      fixture: 'apiGateway',
+      command: 'package',
+      configExt: {
+        provider: {
+          logs: {
+            restApi: {
+              executionLogging: false,
+            },
+          },
+        },
+      },
+    });
+
+    expect(cfTemplate.Resources[awsNaming.getApiGatewayLogGroupLogicalId()]).to.deep.equal({
+      Type: 'AWS::Logs::LogGroup',
+      Properties: {
+        LogGroupName: `/aws/api-gateway/${serverless.service.service}-dev`,
+      },
+    });
+  });
+});

From d6e4b49ae28d5898d92b913a0d2c100bd29f4303 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 7 Jun 2021 21:28:58 +0200
Subject: [PATCH 0170/1101] feat: Introduce project directory setting,
 configurable via `projectDir`

---
 docs/providers/aws/guide/serverless.yml.md | 2 ++
 lib/configSchema.js                        | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 7358c3ac369..49e87b47cb5 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -21,6 +21,8 @@ Here is a list of all available properties in `serverless.yml` when the provider
 
 service: myService
 
+projectDir: ./ # Boundary of a project in which service is configured. Influences file resolution
+
 frameworkVersion: '2'
 configValidationMode: warn # Modes for config validation. `error` throws an exception, `warn` logs error to console, `off` disables validation at all. The default is warn.
 enableLocalInstallationFallback: false # If set to 'true', guarantees that it's a locally (for service, in its node_modules) installed framework which processes the command
diff --git a/lib/configSchema.js b/lib/configSchema.js
index ae1a04ed24f..744dc0e7a55 100644
--- a/lib/configSchema.js
+++ b/lib/configSchema.js
@@ -96,6 +96,10 @@ const schema = {
         { type: 'array', items: { type: 'string' } },
       ],
     },
+    projectDir: {
+      type: 'string',
+      pattern: '/^(\\.\\/?|(\\.\\/)?\\.\\.(\\/\\.\\.)*\\/?)$/',
+    },
     /*
      * Provider specific properties are extended in respected provider plugins.
      */

From 8dbb56ecbda2c6b8e8eaccbba7c7842ba8382847 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 7 Jun 2021 21:37:25 +0200
Subject: [PATCH 0171/1101] feat(Variables): Allow to reference files in scope
 of project directory

---
 docs/providers/aws/guide/variables.md           |  2 ++
 lib/configuration/variables/sources/file.js     | 10 +++++++---
 .../variables/sources/file.test.js              | 17 +++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/docs/providers/aws/guide/variables.md b/docs/providers/aws/guide/variables.md
index fda60587e00..9a6c5dea0f9 100644
--- a/docs/providers/aws/guide/variables.md
+++ b/docs/providers/aws/guide/variables.md
@@ -449,6 +449,8 @@ functions:
 
 You can reference JavaScript modules to add dynamic data into your variables.
 
+Modules need to be referenced by relative paths, which should not reach out beyond project directory (by default service directory). If you work with multi-service project, you can change project directory boundary with `projectDir` setting (e.g. set `projectDir: ../` if you're service is nested in top level _service-x_ directory)
+
 ### Exporting an object
 
 To rely on exported `someModule` property in `myFile.js` you'd use the following code `${file(./myFile.js):someModule}`)
diff --git a/lib/configuration/variables/sources/file.js b/lib/configuration/variables/sources/file.js
index 0f7741544aa..8fbf5285d9f 100644
--- a/lib/configuration/variables/sources/file.js
+++ b/lib/configuration/variables/sources/file.js
@@ -43,10 +43,14 @@ module.exports = {
         errorCode: 'INVALID_FILE_SOURCE_PATH_ARGUMENT',
       })
     );
-    if (!filePath.startsWith(`${serviceDir}${path.sep}`)) {
+    const projectDir = path.resolve(
+      serviceDir,
+      (await resolveConfigurationProperty(['projectDir'])) || '.'
+    );
+    if (!filePath.startsWith(`${projectDir}${path.sep}`)) {
       throw new ServerlessError(
-        'Cannot load file from outside of service folder',
-        'FILE_SOURCE_PATH_OUTSIDE_OF_SERVICE'
+        'Cannot load file from outside of a project directory (with "projectDir" setting you may extend project boundary)',
+        'FILE_SOURCE_PATH_OUTSIDE_OF_PROJECT'
       );
     }
     if (address != null) {
diff --git a/test/unit/lib/configuration/variables/sources/file.test.js b/test/unit/lib/configuration/variables/sources/file.test.js
index 93269a11b3e..b2714e0a36b 100644
--- a/test/unit/lib/configuration/variables/sources/file.test.js
+++ b/test/unit/lib/configuration/variables/sources/file.test.js
@@ -217,4 +217,21 @@ describe('test/unit/lib/configuration/variables/sources/file.test.js', () => {
       'VARIABLE_RESOLUTION_ERROR'
     );
   });
+
+  it('should support "projectDir"', async () => {
+    configuration = {
+      projectDir: '..',
+      yml: '${file(../file.yml)}',
+    };
+    variablesMeta = resolveMeta(configuration);
+    await resolve({
+      serviceDir: path.resolve(serviceDir, 'foo'),
+      configuration,
+      variablesMeta,
+      sources: { file: fileSource },
+      options: {},
+      fulfilledSources: new Set(['file']),
+    });
+    expect(configuration.yml).to.deep.equal({ result: 'yml' });
+  });
 });

From 99d1697050ac2b2ca675794501c08230f2cc3f7b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 8 Jun 2021 10:54:46 +0200
Subject: [PATCH 0172/1101] chore: Upgrade `dotenv` to v10

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 90918ac7fe7..aa1ff08ff18 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "d": "^1.0.1",
     "dayjs": "^1.10.5",
     "decompress": "^4.2.1",
-    "dotenv": "^9.0.2",
+    "dotenv": "^10.0.0",
     "essentials": "^1.1.1",
     "fastest-levenshtein": "^1.0.12",
     "filesize": "^6.3.0",

From e4ebaeecee0fce3bf2024a93f218a045a8c1a2c3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 8 Jun 2021 11:21:18 +0200
Subject: [PATCH 0173/1101] chore: Upgrade `sinon` to v11

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index aa1ff08ff18..e09fe92550f 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "process-utils": "^4.0.0",
     "proxyquire": "^2.1.3",
     "semver-regex": "^3.1.2",
-    "sinon": "^10.0.0",
+    "sinon": "^11.1.1",
     "sinon-chai": "^3.7.0",
     "standard-version": "^9.3.0",
     "strip-ansi": "^6.0.0",

From 87f9d32bf93941e20c7093d1b0381ac228e27cbf Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 8 Jun 2021 12:44:57 +0200
Subject: [PATCH 0174/1101] chore: Bump dependencies

---
 package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index e09fe92550f..85c97ad7004 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.919.0",
+    "aws-sdk": "^2.923.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
@@ -78,8 +78,8 @@
     "@serverless/test": "^8.1.0",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "cos-nodejs-sdk-v5": "^2.9.17",
-    "eslint": "^7.27.0",
+    "cos-nodejs-sdk-v5": "^2.9.18",
+    "eslint": "^7.28.0",
     "eslint-plugin-import": "^2.23.4",
     "git-list-updated": "^1.2.1",
     "github-release-from-cc-changelog": "^2.2.0",
@@ -92,7 +92,7 @@
     "mock-require": "^3.0.3",
     "nyc": "^15.1.0",
     "pkg": "^4.5.1",
-    "prettier": "^2.3.0",
+    "prettier": "^2.3.1",
     "process-utils": "^4.0.0",
     "proxyquire": "^2.1.3",
     "semver-regex": "^3.1.2",

From b30893c1cb5cc3784ab84ab777dc7b7213de7e4d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 8 Jun 2021 12:50:39 +0200
Subject: [PATCH 0175/1101] chore: Release v2.45.0

---
 CHANGELOG.md | 16 ++++++++++++++++
 package.json |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3ef7e58c2b..da824b9146b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 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.
 
+## [2.45.0](https://github.com/serverless/serverless/compare/v2.44.0...v2.45.0) (2021-06-08)
+
+### Features
+
+- **Variables:** Allow to reference files in scope of a project directory ([#9561](https://github.com/serverless/serverless/pull/9561)) ([8dbb56e](https://github.com/serverless/serverless/commit/8dbb56ecbda2c6b8e8eaccbba7c7842ba8382847)) ([Mariusz Nowak](https://github.com/medikoo))
+- Introduce project directory setting, configurable via `projectDir` ([#9561](https://github.com/serverless/serverless/pull/9561)) ([d6e4b49](https://github.com/serverless/serverless/commit/d6e4b49ae28d5898d92b913a0d2c100bd29f4303)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **AWS API Gateway:** Don't create log group resource if access logs are disabled ([#9560](https://github.com/serverless/serverless/pull/9560)) ([a116dfe](https://github.com/serverless/serverless/commit/a116dfec22697dd0511623c6a1e6d2d829d4ba10)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **Templates:** Allow usage of `google-nodejs-typescript` template ([#9557](https://github.com/serverless/serverless/pull/9557)) ([accf5bd](https://github.com/serverless/serverless/commit/accf5bd082400f654eba5e7d322bcb205c9ae709)) ([Corentin Doue](https://github.com/CorentinDoue))
+
+### Maintenance Improvements
+
+- Upgrade `dotenv` to v10 ([#9569](https://github.com/serverless/serverless/pull/9569)) ([99d1697](https://github.com/serverless/serverless/commit/99d1697050ac2b2ca675794501c08230f2cc3f7b)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ## [2.44.0](https://github.com/serverless/serverless/compare/v2.43.1...v2.44.0) (2021-06-02)
 
 ### Features
diff --git a/package.json b/package.json
index 85c97ad7004..feee8afa04a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.44.0",
+  "version": "2.45.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From fcd8d649dd69b5d7a28fae0e49dbb3907efb97e5 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 8 Jun 2021 12:59:27 +0200
Subject: [PATCH 0176/1101] test(AWS S3): Improve reliability of tests

---
 test/integration/s3.test.js | 123 +++++++++++++++++++++++++++---------
 1 file changed, 92 insertions(+), 31 deletions(-)

diff --git a/test/integration/s3.test.js b/test/integration/s3.test.js
index 51d4573b969..6ceda8724c2 100644
--- a/test/integration/s3.test.js
+++ b/test/integration/s3.test.js
@@ -54,8 +54,15 @@ describe('AWS - S3 Integration Test', function () {
       const functionName = 'minimal';
       const expectedMessage = `Hello from S3! - (${functionName})`;
 
-      return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
-        createAndRemoveInBucket(bucketMinimalSetup)
+      return confirmCloudWatchLogs(
+        `/aws/lambda/${stackName}-${functionName}`,
+        () => createAndRemoveInBucket(bucketMinimalSetup),
+        {
+          checkIsComplete: (soFarEvents) => {
+            const logs = soFarEvents.reduce((data, event) => data + event.message, '');
+            return logs.includes('ObjectCreated:Put');
+          },
+        }
       ).then((events) => {
         const logs = events.reduce((data, event) => data + event.message, '');
         expect(/aws:s3/g.test(logs)).to.equal(true);
@@ -70,8 +77,15 @@ describe('AWS - S3 Integration Test', function () {
       const functionName = 'extended';
       const expectedMessage = `Hello from S3! - (${functionName})`;
 
-      return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
-        createAndRemoveInBucket(bucketExtendedSetup, { prefix: 'photos/', suffix: '.jpg' })
+      return confirmCloudWatchLogs(
+        `/aws/lambda/${stackName}-${functionName}`,
+        () => createAndRemoveInBucket(bucketExtendedSetup, { prefix: 'photos/', suffix: '.jpg' }),
+        {
+          checkIsComplete: (soFarEvents) => {
+            const logs = soFarEvents.reduce((data, event) => data + event.message, '');
+            return logs.includes('ObjectRemoved:Delete');
+          },
+        }
       ).then((events) => {
         const logs = events.reduce((data, event) => data + event.message, '');
         expect(/aws:s3/g.test(logs)).to.equal(true);
@@ -86,8 +100,15 @@ describe('AWS - S3 Integration Test', function () {
       const functionName = 'custom';
       const expectedMessage = `Hello from S3! - (${functionName})`;
 
-      return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
-        createAndRemoveInBucket(bucketCustomName)
+      return confirmCloudWatchLogs(
+        `/aws/lambda/${stackName}-${functionName}`,
+        () => createAndRemoveInBucket(bucketCustomName),
+        {
+          checkIsComplete: (soFarEvents) => {
+            const logs = soFarEvents.reduce((data, event) => data + event.message, '');
+            return logs.includes('ObjectCreated:Put');
+          },
+        }
       ).then((events) => {
         const logs = events.reduce((data, event) => data + event.message, '');
         expect(/aws:s3/g.test(logs)).to.equal(true);
@@ -103,11 +124,19 @@ describe('AWS - S3 Integration Test', function () {
         const functionName = 'existing';
         const expectedMessage = `Hello from S3! - (${functionName})`;
 
-        return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
-          createAndRemoveInBucket(bucketExistingSimpleSetup, {
-            prefix: 'Files/',
-            suffix: '.TXT',
-          })
+        return confirmCloudWatchLogs(
+          `/aws/lambda/${stackName}-${functionName}`,
+          () =>
+            createAndRemoveInBucket(bucketExistingSimpleSetup, {
+              prefix: 'Files/',
+              suffix: '.TXT',
+            }),
+          {
+            checkIsComplete: (soFarEvents) => {
+              const logs = soFarEvents.reduce((data, event) => data + event.message, '');
+              return logs.includes('ObjectCreated:Put');
+            },
+          }
         ).then((events) => {
           const logs = events.reduce((data, event) => data + event.message, '');
           expect(/aws:s3/g.test(logs)).to.equal(true);
@@ -122,11 +151,19 @@ describe('AWS - S3 Integration Test', function () {
         const functionName = 'existingCreated';
         const expectedMessage = `Hello from S3! - (${functionName})`;
 
-        return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
-          createAndRemoveInBucket(bucketExistingComplexSetup, {
-            prefix: 'photos',
-            suffix: '.jpg',
-          })
+        return confirmCloudWatchLogs(
+          `/aws/lambda/${stackName}-${functionName}`,
+          () =>
+            createAndRemoveInBucket(bucketExistingComplexSetup, {
+              prefix: 'photos',
+              suffix: '.jpg',
+            }),
+          {
+            checkIsComplete: (soFarEvents) => {
+              const logs = soFarEvents.reduce((data, event) => data + event.message, '');
+              return logs.includes('ObjectCreated:Put');
+            },
+          }
         ).then((events) => {
           const logs = events.reduce((data, event) => data + event.message, '');
           expect(/aws:s3/g.test(logs)).to.equal(true);
@@ -138,11 +175,19 @@ describe('AWS - S3 Integration Test', function () {
         const functionName = 'existingRemoved';
         const expectedMessage = `Hello from S3! - (${functionName})`;
 
-        return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
-          createAndRemoveInBucket(bucketExistingComplexSetup, {
-            prefix: 'photos',
-            suffix: '.jpg',
-          })
+        return confirmCloudWatchLogs(
+          `/aws/lambda/${stackName}-${functionName}`,
+          () =>
+            createAndRemoveInBucket(bucketExistingComplexSetup, {
+              prefix: 'photos',
+              suffix: '.jpg',
+            }),
+          {
+            checkIsComplete: (soFarEvents) => {
+              const logs = soFarEvents.reduce((data, event) => data + event.message, '');
+              return logs.includes('ObjectRemoved:Delete');
+            },
+          }
         ).then((events) => {
           const logs = events.reduce((data, event) => data + event.message, '');
           expect(/aws:s3/g.test(logs)).to.equal(true);
@@ -154,11 +199,19 @@ describe('AWS - S3 Integration Test', function () {
         const functionName = 'existingCreated';
         const expectedMessage = `Hello from S3! - (${functionName})`;
 
-        return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
-          createAndRemoveInBucket(bucketExistingComplexSetup, {
-            prefix: 'photos',
-            suffix: '.png',
-          })
+        return confirmCloudWatchLogs(
+          `/aws/lambda/${stackName}-${functionName}`,
+          () =>
+            createAndRemoveInBucket(bucketExistingComplexSetup, {
+              prefix: 'photos',
+              suffix: '.png',
+            }),
+          {
+            checkIsComplete: (soFarEvents) => {
+              const logs = soFarEvents.reduce((data, event) => data + event.message, '');
+              return logs.includes('ObjectCreated:Put');
+            },
+          }
         ).then((events) => {
           const logs = events.reduce((data, event) => data + event.message, '');
           expect(/aws:s3/g.test(logs)).to.equal(true);
@@ -170,11 +223,19 @@ describe('AWS - S3 Integration Test', function () {
         const functionName = 'existingRemoved';
         const expectedMessage = `Hello from S3! - (${functionName})`;
 
-        return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
-          createAndRemoveInBucket(bucketExistingComplexSetup, {
-            prefix: 'photos',
-            suffix: '.png',
-          })
+        return confirmCloudWatchLogs(
+          `/aws/lambda/${stackName}-${functionName}`,
+          () =>
+            createAndRemoveInBucket(bucketExistingComplexSetup, {
+              prefix: 'photos',
+              suffix: '.png',
+            }),
+          {
+            checkIsComplete: (soFarEvents) => {
+              const logs = soFarEvents.reduce((data, event) => data + event.message, '');
+              return logs.includes('ObjectRemoved:Delete');
+            },
+          }
         ).then((events) => {
           const logs = events.reduce((data, event) => data + event.message, '');
           expect(/aws:s3/g.test(logs)).to.equal(true);

From 58f5215f0230cc1f1ca0c156295ae466294963d4 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 8 Jun 2021 13:54:20 +0200
Subject: [PATCH 0177/1101] docs(Variables): Improve documentation

---
 docs/providers/aws/guide/variables.md | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/docs/providers/aws/guide/variables.md b/docs/providers/aws/guide/variables.md
index 9a6c5dea0f9..d37e208455e 100644
--- a/docs/providers/aws/guide/variables.md
+++ b/docs/providers/aws/guide/variables.md
@@ -42,7 +42,7 @@ You can define your own variable syntax (regex) if it conflicts with CloudFormat
 - [Environment variables](#referencing-environment-variables)
 - [CLI options](#referencing-cli-options)
 - [Other properties defined in `serverless.yml`](#reference-properties-in-serverlessyml)
-- [External YAML/JSON files](#reference-variables-in-other-files)
+- [External YAML/JSON files](#reference-properties-in-other-files)
 - [Variables from S3](#referencing-s3-objects)
 - [Variables from AWS SSM Parameter Store](#reference-variables-using-the-ssm-parameter-store)
 - [Variables from AWS Secrets Manager](#reference-variables-using-aws-secrets-manager)
@@ -378,9 +378,15 @@ custom:
   myArrayVar: ${ssm:/path/to/stringlistparam}
 ```
 
-## Reference Variables in Other Files
+## Reference Properties in Other Files
 
-You can reference variables in other YAML or JSON files. To reference variables in other YAML files use the `${file(./myFile.yml):someProperty}` syntax in your `serverless.yml` configuration file. To reference variables in other JSON files use the `${file(./myFile.json):someProperty}` syntax. It is important that the file you are referencing has the correct suffix, or file extension, for its file type (`.yml` for YAML or `.json` for JSON) in order for it to be interpreted correctly. Here's an example:
+You can reference properties in other YAML or JSON files. To reference properties in other YAML files use the `${file(./myFile.yml):someProperty}` syntax in your `serverless.yml` configuration file.
+
+Files need to be referenced by relative paths, which should not reach out beyond project directory (by default service directory). If you work with multi-service project, you can change project directory boundary with `projectDir` setting (e.g. set `projectDir: ../` if you're service is nested in top level _service-x_ directory)
+
+To reference properties in other JSON files use the `${file(./myFile.json):someProperty}` syntax. It is important that the file you are referencing has the correct suffix, or file extension, for its file type (`.yml` for YAML or `.json` for JSON) in order for it to be interpreted correctly.
+
+Here's an example:
 
 ```yml
 # myCustomFile.yml
@@ -449,8 +455,6 @@ functions:
 
 You can reference JavaScript modules to add dynamic data into your variables.
 
-Modules need to be referenced by relative paths, which should not reach out beyond project directory (by default service directory). If you work with multi-service project, you can change project directory boundary with `projectDir` setting (e.g. set `projectDir: ../` if you're service is nested in top level _service-x_ directory)
-
 ### Exporting an object
 
 To rely on exported `someModule` property in `myFile.js` you'd use the following code `${file(./myFile.js):someModule}`)

From 8954b5f9cc3e2431036ccb876c46fb8cc99dc0d9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 8 Jun 2021 15:11:55 +0200
Subject: [PATCH 0178/1101] fix: Fix `projectDir` pattern in config schema

---
 lib/configSchema.js                           |  2 +-
 .../programmatic/multiService/file.json       |  3 +++
 .../multiService/serviceA/index.js            |  7 ++++++
 .../multiService/serviceA/serverless.yml      | 24 +++++++++++++++++++
 test/unit/scripts/serverless.test.js          | 12 ++++++++++
 5 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 test/fixtures/programmatic/multiService/file.json
 create mode 100644 test/fixtures/programmatic/multiService/serviceA/index.js
 create mode 100644 test/fixtures/programmatic/multiService/serviceA/serverless.yml

diff --git a/lib/configSchema.js b/lib/configSchema.js
index 744dc0e7a55..6017bb13856 100644
--- a/lib/configSchema.js
+++ b/lib/configSchema.js
@@ -98,7 +98,7 @@ const schema = {
     },
     projectDir: {
       type: 'string',
-      pattern: '/^(\\.\\/?|(\\.\\/)?\\.\\.(\\/\\.\\.)*\\/?)$/',
+      pattern: '^(\\.\\/?|(\\.\\/)?\\.\\.(\\/\\.\\.)*\\/?)$',
     },
     /*
      * Provider specific properties are extended in respected provider plugins.
diff --git a/test/fixtures/programmatic/multiService/file.json b/test/fixtures/programmatic/multiService/file.json
new file mode 100644
index 00000000000..c8c4105eb57
--- /dev/null
+++ b/test/fixtures/programmatic/multiService/file.json
@@ -0,0 +1,3 @@
+{
+  "foo": "bar"
+}
diff --git a/test/fixtures/programmatic/multiService/serviceA/index.js b/test/fixtures/programmatic/multiService/serviceA/index.js
new file mode 100644
index 00000000000..11bceba2d4e
--- /dev/null
+++ b/test/fixtures/programmatic/multiService/serviceA/index.js
@@ -0,0 +1,7 @@
+'use strict';
+
+module.exports.handler = (event, context, callback) =>
+  callback(null, {
+    statusCode: 200,
+    body: JSON.stringify({}),
+  });
diff --git a/test/fixtures/programmatic/multiService/serviceA/serverless.yml b/test/fixtures/programmatic/multiService/serviceA/serverless.yml
new file mode 100644
index 00000000000..40b0ffaf722
--- /dev/null
+++ b/test/fixtures/programmatic/multiService/serviceA/serverless.yml
@@ -0,0 +1,24 @@
+service: service
+
+configValidationMode: error
+frameworkVersion: '*'
+
+projectDir: ../
+
+provider:
+  name: aws
+  runtime: nodejs12.x
+  lambdaHashingVersion: 20201221
+
+custom:
+  env: ${env:ENV_SOURCE_TEST, null}
+  file: ${file(../file.json)}
+  opt: ${opt:stage, null}
+  self: ${self:custom.file.foo}
+  strToBool: ${strToBool('false')}
+
+functions:
+  foo:
+    handler: index.handler
+  other:
+    handler: index.handler
diff --git a/test/unit/scripts/serverless.test.js b/test/unit/scripts/serverless.test.js
index 17df68a9edf..e01e1d1ae82 100644
--- a/test/unit/scripts/serverless.test.js
+++ b/test/unit/scripts/serverless.test.js
@@ -100,6 +100,18 @@ describe('test/unit/scripts/serverless.test.js', () => {
     ).to.include('nestedInPrototype: bar-in-prototype');
   });
 
+  it('should support multi service project', async () => {
+    expect(
+      String(
+        (
+          await spawn('node', [serverlessPath, 'print'], {
+            cwd: path.resolve(programmaticFixturesPath, 'multiService/serviceA'),
+          })
+        ).stdoutBuffer
+      )
+    ).to.include('self: bar');
+  });
+
   it('should rejected unresolved "provider" section', async () => {
     try {
       await spawn('node', [serverlessPath, 'print'], {

From e9778ea5a440f15462cb9e64778aa54174798baa Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 8 Jun 2021 15:20:11 +0200
Subject: [PATCH 0179/1101] chore: Bump dependencies

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index feee8afa04a..41ed23a5b9e 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "@serverless/cli": "^1.5.2",
     "@serverless/components": "^3.11.0",
-    "@serverless/dashboard-plugin": "^5.2.0",
+    "@serverless/dashboard-plugin": "^5.3.0",
     "@serverless/utils": "^5.2.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
@@ -75,7 +75,7 @@
   "devDependencies": {
     "@commitlint/cli": "^12.1.4",
     "@serverless/eslint-config": "^3.0.0",
-    "@serverless/test": "^8.1.0",
+    "@serverless/test": "^8.1.1",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "cos-nodejs-sdk-v5": "^2.9.18",

From 8fbb56b1edcbe84377fc83cb9b5490074b0fa945 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 8 Jun 2021 15:21:02 +0200
Subject: [PATCH 0180/1101] chore: Release v2.45.1

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da824b9146b..670d04587fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 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.
 
+### [2.45.1](https://github.com/serverless/serverless/compare/v2.45.0...v2.45.1) (2021-06-08)
+
+### Bug Fixes
+
+- Fix `projectDir` pattern in config schema ([#9574](https://github.com/serverless/serverless/pull/9574)) ([8954b5f](https://github.com/serverless/serverless/commit/8954b5f9cc3e2431036ccb876c46fb8cc99dc0d9)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ## [2.45.0](https://github.com/serverless/serverless/compare/v2.44.0...v2.45.0) (2021-06-08)
 
 ### Features
diff --git a/package.json b/package.json
index 41ed23a5b9e..175048ccc69 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.45.0",
+  "version": "2.45.1",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From a0fa417298097f97fe813f76caaf39ed24ebb8ab Mon Sep 17 00:00:00 2001
From: Tyler Garner <garnertb@gmail.com>
Date: Wed, 9 Jun 2021 04:43:28 -0400
Subject: [PATCH 0181/1101] docs: Fix typo in `variables.md` (#9577)

depracated  -> deprecated
---
 docs/providers/aws/guide/variables.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/providers/aws/guide/variables.md b/docs/providers/aws/guide/variables.md
index d37e208455e..283e2d6aace 100644
--- a/docs/providers/aws/guide/variables.md
+++ b/docs/providers/aws/guide/variables.md
@@ -511,7 +511,7 @@ module.exports = async ({ options, resolveVariable }) => {
 }
 ```
 
-#### With a legacy (depracated) resolver
+#### With a legacy (deprecated) resolver
 
 In old legacy resolver (deprecated, but still default in v2) function receives a reference to the Serverless object containing your configuration.
 

From b313f7f5aeba4a8b1512834771d4fbf624408073 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 9 Jun 2021 10:31:11 +0200
Subject: [PATCH 0182/1101] test: Nest AWS integration tests in "aws" folder

---
 test/integration/{ => aws}/apiGateway.test.js    |  6 +++---
 .../{ => aws}/apiGatewayExternal.test.js         |  6 +++---
 .../{ => aws}/cognitoUserPool.test.js            |  8 ++++----
 .../{ => aws}/custom-deployment-bucket.test.js   |  6 +++---
 test/integration/{ => aws}/eventBridge.test.js   |  8 ++++----
 .../{ => aws}/functionDestinations.test.js       |  6 +++---
 test/integration/{ => aws}/httpApi.test.js       |  6 +++---
 .../infra-dependent/fileSystemConfig.test.js     |  6 +++---
 .../{ => aws}/infra-dependent/msk.test.js        |  8 ++++----
 test/integration/{ => aws}/iot.test.js           |  8 ++++----
 .../{ => aws}/iotFleetProvisioning.test.js       |  6 +++---
 .../{ => aws}/provisionedConcurrency.test.js     | 14 +++++++++-----
 test/integration/{ => aws}/s3.test.js            |  8 ++++----
 test/integration/{ => aws}/schedule.test.js      |  6 +++---
 test/integration/{ => aws}/sns.test.js           |  8 ++++----
 test/integration/{ => aws}/sqs.test.js           |  8 ++++----
 test/integration/{ => aws}/stream.test.js        | 14 +++++++++-----
 test/integration/{ => aws}/websocket.test.js     | 16 +++++++++++-----
 18 files changed, 81 insertions(+), 67 deletions(-)
 rename test/integration/{ => aws}/apiGateway.test.js (97%)
 rename test/integration/{ => aws}/apiGatewayExternal.test.js (93%)
 rename test/integration/{ => aws}/cognitoUserPool.test.js (96%)
 rename test/integration/{ => aws}/custom-deployment-bucket.test.js (83%)
 rename test/integration/{ => aws}/eventBridge.test.js (98%)
 rename test/integration/{ => aws}/functionDestinations.test.js (85%)
 rename test/integration/{ => aws}/httpApi.test.js (98%)
 rename test/integration/{ => aws}/infra-dependent/fileSystemConfig.test.js (93%)
 rename test/integration/{ => aws}/infra-dependent/msk.test.js (91%)
 rename test/integration/{ => aws}/iot.test.js (83%)
 rename test/integration/{ => aws}/iotFleetProvisioning.test.js (93%)
 rename test/integration/{ => aws}/provisionedConcurrency.test.js (88%)
 rename test/integration/{ => aws}/s3.test.js (97%)
 rename test/integration/{ => aws}/schedule.test.js (90%)
 rename test/integration/{ => aws}/sns.test.js (95%)
 rename test/integration/{ => aws}/sqs.test.js (88%)
 rename test/integration/{ => aws}/stream.test.js (88%)
 rename test/integration/{ => aws}/websocket.test.js (94%)

diff --git a/test/integration/apiGateway.test.js b/test/integration/aws/apiGateway.test.js
similarity index 97%
rename from test/integration/apiGateway.test.js
rename to test/integration/aws/apiGateway.test.js
index 9d1dab2e9ff..f57eeeba8cc 100644
--- a/test/integration/apiGateway.test.js
+++ b/test/integration/aws/apiGateway.test.js
@@ -3,10 +3,10 @@
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
 const awsRequest = require('@serverless/test/aws-request');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
-const { confirmCloudWatchLogs } = require('../utils/misc');
-const { deployService, removeService, fetch } = require('../utils/integration');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
+const { deployService, removeService, fetch } = require('../../utils/integration');
 
 describe('AWS - API Gateway Integration Test', function () {
   this.timeout(1000 * 60 * 10); // Involves time-taking deploys
diff --git a/test/integration/apiGatewayExternal.test.js b/test/integration/aws/apiGatewayExternal.test.js
similarity index 93%
rename from test/integration/apiGatewayExternal.test.js
rename to test/integration/aws/apiGatewayExternal.test.js
index 1dffef68e42..b2eee078edc 100644
--- a/test/integration/apiGatewayExternal.test.js
+++ b/test/integration/aws/apiGatewayExternal.test.js
@@ -3,10 +3,10 @@
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
 const awsRequest = require('@serverless/test/aws-request');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
-const { deployService, removeService, fetch } = require('../utils/integration');
-const { createRestApi, deleteRestApi, getResources } = require('../utils/apiGateway');
+const { deployService, removeService, fetch } = require('../../utils/integration');
+const { createRestApi, deleteRestApi, getResources } = require('../../utils/apiGateway');
 
 describe('AWS - API Gateway with External REST API Integration Test', function () {
   this.timeout(1000 * 60 * 10); // Involves time-taking deploys
diff --git a/test/integration/cognitoUserPool.test.js b/test/integration/aws/cognitoUserPool.test.js
similarity index 96%
rename from test/integration/cognitoUserPool.test.js
rename to test/integration/aws/cognitoUserPool.test.js
index 16dcd7bdae9..137505881c7 100644
--- a/test/integration/cognitoUserPool.test.js
+++ b/test/integration/aws/cognitoUserPool.test.js
@@ -4,7 +4,7 @@ const BbPromise = require('bluebird');
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
 const hasFailed = require('@serverless/test/has-failed');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
 const {
   createUserPool,
@@ -15,9 +15,9 @@ const {
   createUserPoolClient,
   setUserPassword,
   initiateAuth,
-} = require('../utils/cognito');
-const { deployService, removeService } = require('../utils/integration');
-const { confirmCloudWatchLogs } = require('../utils/misc');
+} = require('../../utils/cognito');
+const { deployService, removeService } = require('../../utils/integration');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
 
 describe('AWS - Cognito User Pool Integration Test', function () {
   this.timeout(1000 * 60 * 10); // Involves time-taking deploys
diff --git a/test/integration/custom-deployment-bucket.test.js b/test/integration/aws/custom-deployment-bucket.test.js
similarity index 83%
rename from test/integration/custom-deployment-bucket.test.js
rename to test/integration/aws/custom-deployment-bucket.test.js
index befc4dc658d..56a06213d29 100644
--- a/test/integration/custom-deployment-bucket.test.js
+++ b/test/integration/aws/custom-deployment-bucket.test.js
@@ -2,10 +2,10 @@
 
 const uuid = require('uuid');
 const { expect } = require('chai');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 const awsRequest = require('@serverless/test/aws-request');
-const { deployService, removeService } = require('../utils/integration');
-const { createBucket, deleteBucket } = require('../utils/s3');
+const { deployService, removeService } = require('../../utils/integration');
+const { createBucket, deleteBucket } = require('../../utils/s3');
 
 describe('Base AWS provider test', function () {
   this.timeout(1000 * 60 * 10);
diff --git a/test/integration/eventBridge.test.js b/test/integration/aws/eventBridge.test.js
similarity index 98%
rename from test/integration/eventBridge.test.js
rename to test/integration/aws/eventBridge.test.js
index f24d993b7e2..eb794f16178 100644
--- a/test/integration/eventBridge.test.js
+++ b/test/integration/aws/eventBridge.test.js
@@ -2,17 +2,17 @@
 
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
-const { confirmCloudWatchLogs } = require('../utils/misc');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
 const {
   createEventBus,
   putEvents,
   deleteEventBus,
   describeEventBus,
-} = require('../utils/eventBridge');
+} = require('../../utils/eventBridge');
 
-const { deployService, removeService, getMarkers } = require('../utils/integration');
+const { deployService, removeService, getMarkers } = require('../../utils/integration');
 
 describe('AWS - Event Bridge Integration Test', () => {
   describe('Using deprecated CustomResource deployment pattern', function () {
diff --git a/test/integration/functionDestinations.test.js b/test/integration/aws/functionDestinations.test.js
similarity index 85%
rename from test/integration/functionDestinations.test.js
rename to test/integration/aws/functionDestinations.test.js
index 75a381d4462..81f320cb429 100644
--- a/test/integration/functionDestinations.test.js
+++ b/test/integration/aws/functionDestinations.test.js
@@ -2,10 +2,10 @@
 
 const { expect } = require('chai');
 const awsRequest = require('@serverless/test/aws-request');
-const fixtures = require('../fixtures/programmatic');
-const { confirmCloudWatchLogs } = require('../utils/misc');
+const fixtures = require('../../fixtures/programmatic');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
 
-const { deployService, removeService } = require('../utils/integration');
+const { deployService, removeService } = require('../../utils/integration');
 
 describe('Function destinations Integration Test', function () {
   this.timeout(1000 * 60 * 20); // Involves time-taking deploys
diff --git a/test/integration/httpApi.test.js b/test/integration/aws/httpApi.test.js
similarity index 98%
rename from test/integration/httpApi.test.js
rename to test/integration/aws/httpApi.test.js
index 770f1f8a7e9..bdec5f3ba0e 100644
--- a/test/integration/httpApi.test.js
+++ b/test/integration/aws/httpApi.test.js
@@ -3,10 +3,10 @@
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
 const awsRequest = require('@serverless/test/aws-request');
-const fixtures = require('../fixtures/programmatic');
-const { confirmCloudWatchLogs } = require('../utils/misc');
+const fixtures = require('../../fixtures/programmatic');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
 
-const { deployService, removeService, fetch } = require('../utils/integration');
+const { deployService, removeService, fetch } = require('../../utils/integration');
 
 describe('HTTP API Integration Test', function () {
   this.timeout(1000 * 60 * 20); // Involves time-taking deploys
diff --git a/test/integration/infra-dependent/fileSystemConfig.test.js b/test/integration/aws/infra-dependent/fileSystemConfig.test.js
similarity index 93%
rename from test/integration/infra-dependent/fileSystemConfig.test.js
rename to test/integration/aws/infra-dependent/fileSystemConfig.test.js
index 0a28b3aef8e..2d89c4bdee7 100644
--- a/test/integration/infra-dependent/fileSystemConfig.test.js
+++ b/test/integration/aws/infra-dependent/fileSystemConfig.test.js
@@ -2,15 +2,15 @@
 
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../../fixtures/programmatic');
+const fixtures = require('../../../fixtures/programmatic');
 
 const awsRequest = require('@serverless/test/aws-request');
 const crypto = require('crypto');
-const { deployService, removeService } = require('../../utils/integration');
+const { deployService, removeService } = require('../../../utils/integration');
 const {
   isDependencyStackAvailable,
   getDependencyStackOutputMap,
-} = require('../../utils/cloudformation');
+} = require('../../../utils/cloudformation');
 
 const EFS_MAX_PROPAGATION_TIME = 1000 * 60 * 5;
 
diff --git a/test/integration/infra-dependent/msk.test.js b/test/integration/aws/infra-dependent/msk.test.js
similarity index 91%
rename from test/integration/infra-dependent/msk.test.js
rename to test/integration/aws/infra-dependent/msk.test.js
index e49549202fd..8d73b5d07c1 100644
--- a/test/integration/infra-dependent/msk.test.js
+++ b/test/integration/aws/infra-dependent/msk.test.js
@@ -2,16 +2,16 @@
 
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../../fixtures/programmatic');
-const { confirmCloudWatchLogs } = require('../../utils/misc');
+const fixtures = require('../../../fixtures/programmatic');
+const { confirmCloudWatchLogs } = require('../../../utils/misc');
 const {
   isDependencyStackAvailable,
   getDependencyStackOutputMap,
-} = require('../../utils/cloudformation');
+} = require('../../../utils/cloudformation');
 
 const awsRequest = require('@serverless/test/aws-request');
 const crypto = require('crypto');
-const { deployService, removeService } = require('../../utils/integration');
+const { deployService, removeService } = require('../../../utils/integration');
 
 describe('AWS - MSK Integration Test', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
diff --git a/test/integration/iot.test.js b/test/integration/aws/iot.test.js
similarity index 83%
rename from test/integration/iot.test.js
rename to test/integration/aws/iot.test.js
index 7b07b8ad6ca..3eab6fb592f 100644
--- a/test/integration/iot.test.js
+++ b/test/integration/aws/iot.test.js
@@ -1,11 +1,11 @@
 'use strict';
 
 const { expect } = require('chai');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
-const { publishIotData } = require('../utils/iot');
-const { confirmCloudWatchLogs } = require('../utils/misc');
-const { deployService, removeService } = require('../utils/integration');
+const { publishIotData } = require('../../utils/iot');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
+const { deployService, removeService } = require('../../utils/integration');
 
 describe('AWS - IoT Integration Test', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
diff --git a/test/integration/iotFleetProvisioning.test.js b/test/integration/aws/iotFleetProvisioning.test.js
similarity index 93%
rename from test/integration/iotFleetProvisioning.test.js
rename to test/integration/aws/iotFleetProvisioning.test.js
index d78fd46d401..abd3dc229fb 100644
--- a/test/integration/iotFleetProvisioning.test.js
+++ b/test/integration/aws/iotFleetProvisioning.test.js
@@ -2,9 +2,9 @@
 
 const awsRequest = require('@serverless/test/aws-request');
 const { expect } = require('chai');
-const fixtures = require('../fixtures/programmatic');
-const { deployService, removeService } = require('../utils/integration');
-const { resolveIotEndpoint } = require('../utils/iot');
+const fixtures = require('../../fixtures/programmatic');
+const { deployService, removeService } = require('../../utils/integration');
+const { resolveIotEndpoint } = require('../../utils/iot');
 
 describe('test/integration/iotFleetProvisioning.test.js', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
diff --git a/test/integration/provisionedConcurrency.test.js b/test/integration/aws/provisionedConcurrency.test.js
similarity index 88%
rename from test/integration/provisionedConcurrency.test.js
rename to test/integration/aws/provisionedConcurrency.test.js
index e7ad8e04b4e..7fdb1624799 100644
--- a/test/integration/provisionedConcurrency.test.js
+++ b/test/integration/aws/provisionedConcurrency.test.js
@@ -2,12 +2,16 @@
 
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
-const { createKinesisStream, deleteKinesisStream, putKinesisRecord } = require('../utils/kinesis');
-const { createSqsQueue, deleteSqsQueue, sendSqsMessage } = require('../utils/sqs');
-const { confirmCloudWatchLogs } = require('../utils/misc');
-const { deployService, removeService } = require('../utils/integration');
+const {
+  createKinesisStream,
+  deleteKinesisStream,
+  putKinesisRecord,
+} = require('../../utils/kinesis');
+const { createSqsQueue, deleteSqsQueue, sendSqsMessage } = require('../../utils/sqs');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
+const { deployService, removeService } = require('../../utils/integration');
 
 describe('AWS - Provisioned Concurrency Integration Test', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
diff --git a/test/integration/s3.test.js b/test/integration/aws/s3.test.js
similarity index 97%
rename from test/integration/s3.test.js
rename to test/integration/aws/s3.test.js
index 6ceda8724c2..c023fe64bc2 100644
--- a/test/integration/s3.test.js
+++ b/test/integration/aws/s3.test.js
@@ -3,11 +3,11 @@
 const BbPromise = require('bluebird');
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
-const { createBucket, createAndRemoveInBucket, deleteBucket } = require('../utils/s3');
-const { deployService, removeService } = require('../utils/integration');
-const { confirmCloudWatchLogs } = require('../utils/misc');
+const { createBucket, createAndRemoveInBucket, deleteBucket } = require('../../utils/s3');
+const { deployService, removeService } = require('../../utils/integration');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
 
 describe('AWS - S3 Integration Test', function () {
   this.timeout(1000 * 60 * 10); // Involves time-taking deploys
diff --git a/test/integration/schedule.test.js b/test/integration/aws/schedule.test.js
similarity index 90%
rename from test/integration/schedule.test.js
rename to test/integration/aws/schedule.test.js
index 221fa7a30a2..345568d0f36 100644
--- a/test/integration/schedule.test.js
+++ b/test/integration/aws/schedule.test.js
@@ -1,10 +1,10 @@
 'use strict';
 
 const { expect } = require('chai');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
-const { deployService, removeService } = require('../utils/integration');
-const { confirmCloudWatchLogs } = require('../utils/misc');
+const { deployService, removeService } = require('../../utils/integration');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
 
 describe('AWS - Schedule Integration Test', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
diff --git a/test/integration/sns.test.js b/test/integration/aws/sns.test.js
similarity index 95%
rename from test/integration/sns.test.js
rename to test/integration/aws/sns.test.js
index 218288bf483..533bbcb7841 100644
--- a/test/integration/sns.test.js
+++ b/test/integration/aws/sns.test.js
@@ -3,11 +3,11 @@
 const BbPromise = require('bluebird');
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
-const { confirmCloudWatchLogs } = require('../utils/misc');
-const { createSnsTopic, removeSnsTopic, publishSnsMessage } = require('../utils/sns');
-const { deployService, removeService } = require('../utils/integration');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
+const { createSnsTopic, removeSnsTopic, publishSnsMessage } = require('../../utils/sns');
+const { deployService, removeService } = require('../../utils/integration');
 
 describe('AWS - SNS Integration Test', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
diff --git a/test/integration/sqs.test.js b/test/integration/aws/sqs.test.js
similarity index 88%
rename from test/integration/sqs.test.js
rename to test/integration/aws/sqs.test.js
index 435187022a8..b35783cdcde 100644
--- a/test/integration/sqs.test.js
+++ b/test/integration/aws/sqs.test.js
@@ -3,11 +3,11 @@
 const { expect } = require('chai');
 const hasFailed = require('@serverless/test/has-failed');
 const log = require('log').get('serverless:test');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
-const { createSqsQueue, deleteSqsQueue, sendSqsMessage } = require('../utils/sqs');
-const { confirmCloudWatchLogs } = require('../utils/misc');
-const { deployService, removeService } = require('../utils/integration');
+const { createSqsQueue, deleteSqsQueue, sendSqsMessage } = require('../../utils/sqs');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
+const { deployService, removeService } = require('../../utils/integration');
 
 describe('AWS - SQS Integration Test', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
diff --git a/test/integration/stream.test.js b/test/integration/aws/stream.test.js
similarity index 88%
rename from test/integration/stream.test.js
rename to test/integration/aws/stream.test.js
index 389fad8a9e8..32a884f4f9e 100644
--- a/test/integration/stream.test.js
+++ b/test/integration/aws/stream.test.js
@@ -2,12 +2,16 @@
 
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
-const { createKinesisStream, deleteKinesisStream, putKinesisRecord } = require('../utils/kinesis');
-const { putDynamoDbItem } = require('../utils/dynamodb');
-const { confirmCloudWatchLogs } = require('../utils/misc');
-const { deployService, removeService } = require('../utils/integration');
+const {
+  createKinesisStream,
+  deleteKinesisStream,
+  putKinesisRecord,
+} = require('../../utils/kinesis');
+const { putDynamoDbItem } = require('../../utils/dynamodb');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
+const { deployService, removeService } = require('../../utils/integration');
 
 describe('AWS - Stream Integration Test', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
diff --git a/test/integration/websocket.test.js b/test/integration/aws/websocket.test.js
similarity index 94%
rename from test/integration/websocket.test.js
rename to test/integration/aws/websocket.test.js
index c3fbfe630e1..6789c705b55 100644
--- a/test/integration/websocket.test.js
+++ b/test/integration/aws/websocket.test.js
@@ -5,11 +5,17 @@ const { expect } = require('chai');
 const awsRequest = require('@serverless/test/aws-request');
 const log = require('log').get('serverless:test');
 const wait = require('timers-ext/promise/sleep');
-const fixtures = require('../fixtures/programmatic');
-
-const { confirmCloudWatchLogs } = require('../utils/misc');
-const { deployService, removeService } = require('../utils/integration');
-const { createApi, deleteApi, getRoutes, createStage, deleteStage } = require('../utils/websocket');
+const fixtures = require('../../fixtures/programmatic');
+
+const { confirmCloudWatchLogs } = require('../../utils/misc');
+const { deployService, removeService } = require('../../utils/integration');
+const {
+  createApi,
+  deleteApi,
+  getRoutes,
+  createStage,
+  deleteStage,
+} = require('../../utils/websocket');
 
 describe('AWS - API Gateway Websocket Integration Test', function () {
   this.timeout(1000 * 60 * 10); // Involves time-taking deploys

From 93b89fcb51759d0fe938a40e7de76b6abd313efd Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 9 Jun 2021 10:10:21 +0200
Subject: [PATCH 0183/1101] fix(Variables): Skip unrecognized sources check
 with partial resolution

---
 scripts/serverless.js                   |  3 +++
 test/integration/plugin-install.test.js | 29 +++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 test/integration/plugin-install.test.js

diff --git a/scripts/serverless.js b/scripts/serverless.js
index 18840d9b0c4..cc0e74e9141 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -574,6 +574,9 @@ const processSpanPromise = (async () => {
           return;
         }
 
+        // Do not confirm on unresolved sources with partially resolved configuration
+        if (resolverConfiguration.propertyPathsToResolve) return;
+
         // Report unrecognized variable sources found in variables configured in service config
         const unresolvedSources =
           require('../lib/configuration/variables/resolve-unresolved-source-types')(variablesMeta);
diff --git a/test/integration/plugin-install.test.js b/test/integration/plugin-install.test.js
new file mode 100644
index 00000000000..5498723c7b1
--- /dev/null
+++ b/test/integration/plugin-install.test.js
@@ -0,0 +1,29 @@
+'use strict';
+
+const path = require('path');
+const fsp = require('fs').promises;
+const spawn = require('child-process-ext/spawn');
+const fixturesEngine = require('../fixtures/programmatic');
+
+const serverlessExec = require('../serverlessBinary');
+
+describe('test/integration/plugin-install.test.js', function () {
+  this.timeout(1000 * 60 * 10); // Involves time-taking npm install
+
+  let serviceDir;
+  before(async () => {
+    serviceDir = (
+      await fixturesEngine.setup('function', {
+        // Unresolved variables should not block "plugin install" command
+        configExt: { variablesResolutionMode: '20210326', custom: { foo: '${foo:bar}' } },
+      })
+    ).servicePath;
+    await spawn(serverlessExec, ['plugin', 'install', '-n', 'serverless-offline'], {
+      cwd: serviceDir,
+    });
+  });
+
+  it('should install plugin', async () => {
+    await fsp.access(path.resolve(serviceDir, 'node_modules/serverless-offline'));
+  });
+});

From 98701f367907aa4c0ed61de7c3aeb4a7b7eac174 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 9 Jun 2021 10:10:44 +0200
Subject: [PATCH 0184/1101] fix(Variables): Ensure to report only unrecognized
 sources

---
 scripts/serverless.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index cc0e74e9141..6cf81fc4e36 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -580,6 +580,7 @@ const processSpanPromise = (async () => {
         // Report unrecognized variable sources found in variables configured in service config
         const unresolvedSources =
           require('../lib/configuration/variables/resolve-unresolved-source-types')(variablesMeta);
+        const recognizedSourceNames = new Set(Object.keys(resolverConfiguration.sources));
         if (!(configuration.variablesResolutionMode >= 20210326)) {
           const legacyCfVarPropertyPaths = new Set();
           const legacySsmVarPropertyPaths = new Set();
@@ -619,7 +620,7 @@ const processSpanPromise = (async () => {
               { serviceConfig: configuration }
             );
           }
-          const recognizedSourceNames = new Set(Object.keys(resolverConfiguration.sources));
+
           const unrecognizedSourceNames = Array.from(unresolvedSources.keys()).filter(
             (sourceName) => !recognizedSourceNames.has(sourceName)
           );
@@ -636,10 +637,13 @@ const processSpanPromise = (async () => {
             );
           }
         } else {
+          const unrecognizedSourceNames = Array.from(unresolvedSources.keys()).filter(
+            (sourceName) => !recognizedSourceNames.has(sourceName)
+          );
           throw new ServerlessError(
-            `Approached unrecognized configuration variable sources: "${Array.from(
-              unresolvedSources.keys()
-            ).join('", "')}"`,
+            `Approached unrecognized configuration variable sources: "${unrecognizedSourceNames.join(
+              '", "'
+            )}"`,
             'UNRECOGNIZED_VARIABLE_SOURCES'
           );
         }

From 28286bc3e5f48c71b15f4bbd2968931f45fe44af Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 9 Jun 2021 10:51:29 +0200
Subject: [PATCH 0185/1101] docs: Fix typo

---
 docs/deprecations.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 5195998348e..bd034369b96 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -82,7 +82,7 @@ Ensure to always format CLI command as `sls [command..] [options...]`
 
 <a name="CONFIG_VALIDATION_MODE_DEFAULT"><div>&nbsp;</div></a>
 
-## `configValidationMode: error` will be new default`
+## `configValidationMode: error` will be new default
 
 Deprecation code: `CONFIG_VALIDATION_MODE_DEFAULT`
 

From 0d22163acd2b987176925735c8c4ee11c53b2248 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 9 Jun 2021 10:53:33 +0200
Subject: [PATCH 0186/1101] docs: Improve unsupported options validation
 reasoning

---
 docs/deprecations.md | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index bd034369b96..001f620fd60 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -61,15 +61,24 @@ Please use `package.patterns`. `package.include` and `package.exclude` will be r
 
 Deprecation code: `UNSUPPORTED_CLI_OPTIONS`
 
-So far Framework ignored any not recognized CLI options as passed with a CLI command. Still such handling
-is error prone, as due to e.g. accidental typos, important information may not be passed to the command and lead to unwanted results.
+Framework was upgraded with extensive CLI options validation and that required dropping support for _free form_ CLI options (keeping that in will make not possible to reliably detect accidental typos in option names).
 
-Starting with v3.0.0, Serverless will report unrecognized options with a thrown error.
+For _free form_ process configuration options it is adviced to rely on environment variables instead, as e.g.:
+
+```yaml
+provider:
+  stackName: ${env:STACK_NAME, 'T001'}
+```
 
-_Note: If you've used such options to aid dynamic resolution of service configuration (passing custom values to `${opt:..}` resolvers)._
-_We suggest to rely on environment variables instead. Setup of environment variables is also way more
+```bash
+STACK_NAME=test sls deploy
+```
+
+_Note that setup of environment variables is way more
 convenient since we've added support for [`.env`](/framework/docs/environment-variables#support-for-env-files) files._
 
+Starting with v3.0.0, Serverless will report unrecognized options with a thrown error.
+
 <a name="CLI_OPTIONS_BEFORE_COMMAND"><div>&nbsp;</div></a>
 
 ## CLI command options should follow command

From ebdbccef095528c3c5f417917ae0d339f6901908 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 9 Jun 2021 11:39:52 +0200
Subject: [PATCH 0187/1101] chore: Bump dependencies

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 175048ccc69..46d4e43bd66 100644
--- a/package.json
+++ b/package.json
@@ -23,13 +23,13 @@
   },
   "dependencies": {
     "@serverless/cli": "^1.5.2",
-    "@serverless/components": "^3.11.0",
+    "@serverless/components": "^3.12.0",
     "@serverless/dashboard-plugin": "^5.3.0",
     "@serverless/utils": "^5.2.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.923.0",
+    "aws-sdk": "^2.924.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",

From e63c1a7116f5d6d183a421b5457b75f9890723e9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 9 Jun 2021 11:41:36 +0200
Subject: [PATCH 0188/1101] chore: Release v2.45.2

---
 CHANGELOG.md | 8 ++++++++
 package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 670d04587fb..65f31613088 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 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.
 
+### [2.45.2](https://github.com/serverless/serverless/compare/v2.45.1...v2.45.2) (2021-06-09)
+
+### Bug Fixes
+
+- **Variables:**
+  - Skip unrecognized sources check with partial resolution ([#9579](https://github.com/serverless/serverless/pull/9579)) ([93b89fc](https://github.com/serverless/serverless/commit/93b89fcb51759d0fe938a40e7de76b6abd313efd)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Ensure to report only unrecognized sources ([#9579](https://github.com/serverless/serverless/pull/9579)) ([98701f3](https://github.com/serverless/serverless/commit/98701f367907aa4c0ed61de7c3aeb4a7b7eac174)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ### [2.45.1](https://github.com/serverless/serverless/compare/v2.45.0...v2.45.1) (2021-06-08)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 46d4e43bd66..58a9631f419 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.45.1",
+  "version": "2.45.2",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 519f77e1a876cea62843a99e58bab1e011e62fa3 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 9 Jun 2021 12:02:51 +0200
Subject: [PATCH 0189/1101] refactor(CLI Onboarding): Remove `auto-update` step

---
 lib/cli/interactive-setup/auto-update.js      | 40 -----------
 lib/cli/interactive-setup/index.js            |  1 -
 .../cli/interactive-setup/auto-update.test.js | 68 -------------------
 3 files changed, 109 deletions(-)
 delete mode 100644 lib/cli/interactive-setup/auto-update.js
 delete mode 100644 test/unit/lib/cli/interactive-setup/auto-update.test.js

diff --git a/lib/cli/interactive-setup/auto-update.js b/lib/cli/interactive-setup/auto-update.js
deleted file mode 100644
index 9680d41927b..00000000000
--- a/lib/cli/interactive-setup/auto-update.js
+++ /dev/null
@@ -1,40 +0,0 @@
-'use strict';
-
-const chalk = require('chalk');
-const configUtils = require('@serverless/utils/config');
-const isNpmPackageWritable = require('../../utils/npmPackage/isWritable');
-const isNpmGlobalPackage = require('../../utils/npmPackage/isGlobal');
-const isStandaloneExecutable = require('../../utils/isStandaloneExecutable');
-const isLocallyInstalled = require('../../utils/is-locally-installed');
-const { confirm } = require('../../cli/interactive-setup/utils');
-
-module.exports = {
-  async isApplicable() {
-    if (!isStandaloneExecutable && !process.env.SLS_INTERACTIVE_SETUP_TEST) {
-      if (await isLocallyInstalled()) return false;
-      if (!(await isNpmGlobalPackage())) return false;
-      if (!(await isNpmPackageWritable())) return false;
-    }
-    const autoUpdateConfig = configUtils.get('autoUpdate');
-    if (!autoUpdateConfig) return true;
-    if (autoUpdateConfig.enabled) return false;
-    return !autoUpdateConfig.isInteractiveSetupPromptDisabled;
-  },
-  async run() {
-    const isConfirmed = await confirm('Would you like the Framework to update automatically?', {
-      name: 'shouldSetupAutoUpdate',
-    });
-    if (!isConfirmed) {
-      configUtils.set('autoUpdate.isInteractiveSetupPromptDisabled', true);
-      return;
-    }
-    configUtils.set('autoUpdate.enabled', true);
-
-    process.stdout.write(
-      `\n${chalk.green(
-        'Auto updates were succesfully turned on.\n' +
-          'You may turn off at any time with "serverless config --no-autoupdate"'
-      )}\n`
-    );
-  },
-};
diff --git a/lib/cli/interactive-setup/index.js b/lib/cli/interactive-setup/index.js
index eec3fc08121..c262a3b0804 100644
--- a/lib/cli/interactive-setup/index.js
+++ b/lib/cli/interactive-setup/index.js
@@ -7,7 +7,6 @@ const steps = {
   dashboardLogin: require('@serverless/dashboard-plugin/lib/cli/interactive-setup/dashboard-login'),
   dashboardSetOrg: require('@serverless/dashboard-plugin/lib/cli/interactive-setup/dashboard-set-org'),
   awsCredentials: require('./aws-credentials'),
-  autoUpdate: require('./auto-update'),
 };
 
 module.exports = async (context) => {
diff --git a/test/unit/lib/cli/interactive-setup/auto-update.test.js b/test/unit/lib/cli/interactive-setup/auto-update.test.js
deleted file mode 100644
index 98605f05d1b..00000000000
--- a/test/unit/lib/cli/interactive-setup/auto-update.test.js
+++ /dev/null
@@ -1,68 +0,0 @@
-'use strict';
-
-const { expect } = require('chai');
-const sinon = require('sinon');
-const proxyquire = require('proxyquire');
-const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
-const configUtils = require('@serverless/utils/config');
-const inquirer = require('@serverless/utils/inquirer');
-const step = require('../../../../../lib/cli/interactive-setup/auto-update');
-
-describe('test/unit/lib/cli/interactive-setup/auto-update.test.js', () => {
-  afterEach(() => {
-    configUtils.set('autoUpdate.isInteractiveSetupPromptDisabled', false);
-    sinon.restore();
-  });
-
-  it('Should not suggest auto update in non supported environments', async () => {
-    let uncachedStep = proxyquire('../../../../../lib/cli/interactive-setup/auto-update', {
-      '../../utils/isStandaloneExecutable': false,
-      '../../utils/is-locally-installed': async () => true,
-      '../../utils/npmPackage/isGlobal': async () => true,
-      '../../utils/npmPackage/isWritable': async () => true,
-    });
-    expect(await uncachedStep.isApplicable({})).to.equal(false);
-    uncachedStep = proxyquire('../../../../../lib/cli/interactive-setup/auto-update', {
-      '../../utils/isStandaloneExecutable': false,
-      '../../utils/is-locally-installed': async () => false,
-      '../../utils/npmPackage/isGlobal': async () => false,
-      '../../utils/npmPackage/isWritable': async () => true,
-    });
-    expect(await uncachedStep.isApplicable({})).to.equal(false);
-    uncachedStep = proxyquire('../../../../../lib/cli/interactive-setup/auto-update', {
-      '../../utils/isStandaloneExecutable': false,
-      '../../utils/is-locally-installed': async () => false,
-      '../../utils/npmPackage/isGlobal': async () => true,
-      '../../utils/npmPackage/isWritable': async () => false,
-    });
-    expect(await uncachedStep.isApplicable({})).to.equal(false);
-  });
-
-  it('Should abort if user does not want to setup auto update', async () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldSetupAutoUpdate: false },
-    });
-    await step.run({});
-    expect(configUtils.get('autoUpdate.enabled')).to.be.undefined;
-    expect(configUtils.get('autoUpdate.isInteractiveSetupPromptDisabled')).to.be.true;
-  });
-
-  it('Should not prompt again is user opt out from setup', async () => {
-    configUtils.set('autoUpdate.isInteractiveSetupPromptDisabled', true);
-    const uncachedStep = proxyquire('../../../../../lib/cli/interactive-setup/auto-update', {
-      '../../utils/isStandaloneExecutable': false,
-      '../../utils/is-locally-installed': async () => false,
-      '../../utils/npmPackage/isGlobal': async () => true,
-      '../../utils/npmPackage/isWritable': async () => true,
-    });
-    expect(await uncachedStep.isApplicable({})).to.equal(false);
-  });
-
-  it('Should setup auto update on user request', async () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldSetupAutoUpdate: true },
-    });
-    await step.run({});
-    expect(configUtils.get('autoUpdate.enabled')).to.be.true;
-  });
-});

From 93c88c0b8d1eea6455ca6ecb9a022f814f8e79b3 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 9 Jun 2021 12:03:21 +0200
Subject: [PATCH 0190/1101] refactor: Add note about `autoupdate` in
 postinstall script

---
 scripts/postinstall.js | 55 ++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 21 deletions(-)

diff --git a/scripts/postinstall.js b/scripts/postinstall.js
index bebf691af91..626af6045b2 100644
--- a/scripts/postinstall.js
+++ b/scripts/postinstall.js
@@ -8,26 +8,39 @@ const isWindows = process.platform === 'win32';
 
 const truthyStr = (val) => val && !['0', 'false', 'f', 'n', 'no'].includes(val.toLowerCase());
 const { CI, ADBLOCK, SILENT } = process.env;
-if (!truthyStr(CI) && !truthyStr(ADBLOCK) && !truthyStr(SILENT)) {
-  const messageTokens = ['Serverless Framework successfully installed!'];
-  if (isStandaloneExecutable && !isWindows) {
-    messageTokens.push(
-      'To start your first project, please open another terminal and run “serverless”.',
-      'You can uninstall at anytime by running “serverless uninstall”.'
+const isNpmGlobalPackage = require('../lib/utils/npmPackage/isGlobal');
+
+(async () => {
+  if (!truthyStr(CI) && !truthyStr(ADBLOCK) && !truthyStr(SILENT)) {
+    const messageTokens = ['Serverless Framework successfully installed!'];
+
+    if (isStandaloneExecutable && !isWindows) {
+      messageTokens.push(
+        'To start your first project, please open another terminal and run “serverless”.'
+      );
+    } else {
+      messageTokens.push('To start your first project run “serverless”.');
+    }
+
+    if ((isStandaloneExecutable && !isWindows) || (await isNpmGlobalPackage())) {
+      messageTokens.push('Turn on automatic updates by running “serverless config --autoupdate”.');
+    }
+
+    if (isStandaloneExecutable && !isWindows) {
+      messageTokens.push('Uninstall at any time by running “serverless uninstall”.');
+    }
+
+    const message = messageTokens.join('\n\n');
+    process.stdout.write(
+      `${
+        isStandaloneExecutable && isWindows
+          ? message
+          : boxen(chalk.yellow(message), {
+              padding: 1,
+              margin: 1,
+              borderColor: 'yellow',
+            })
+      }\n`
     );
-  } else {
-    messageTokens.push("To start your first project run 'serverless'.");
   }
-  const message = messageTokens.join('\n\n');
-  process.stdout.write(
-    `${
-      isStandaloneExecutable && isWindows
-        ? message
-        : boxen(chalk.yellow(message), {
-            padding: 1,
-            margin: 1,
-            borderColor: 'yellow',
-          })
-    }\n`
-  );
-}
+})();

From f6a7d03b04bd13f91bc247e518a1ad12496ead8c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 9 Jun 2021 21:23:34 +0200
Subject: [PATCH 0191/1101] refactor(Telemetry): Reduce length of error
 location

---
 lib/utils/telemetry/anonymize-stacktrace-paths.js    | 10 ++++++----
 .../telemetry/anonymize-stacktrace-paths.test.js     | 12 ++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/utils/telemetry/anonymize-stacktrace-paths.js b/lib/utils/telemetry/anonymize-stacktrace-paths.js
index 15b653d11ad..1c146ba0153 100644
--- a/lib/utils/telemetry/anonymize-stacktrace-paths.js
+++ b/lib/utils/telemetry/anonymize-stacktrace-paths.js
@@ -15,11 +15,13 @@ const anonymizeStacktracePaths = (stacktracePaths) => {
     if (lastServerlessIndex !== -1) {
       commonPathPrefix = commonPathPrefix.slice(0, lastServerlessIndex);
     } else {
-      const lastNodeModulesIndex = commonPathPrefix.lastIndexOf(
-        `${path.sep}node_modules${path.sep}`
-      );
+      const nodeModulesPathPart = `${path.sep}node_modules${path.sep}`;
+      const lastNodeModulesIndex = commonPathPrefix.lastIndexOf(nodeModulesPathPart);
       if (lastNodeModulesIndex !== -1) {
-        commonPathPrefix = commonPathPrefix.slice(0, lastNodeModulesIndex);
+        commonPathPrefix = commonPathPrefix.slice(
+          0,
+          lastNodeModulesIndex + nodeModulesPathPart.length - 1
+        );
       }
     }
   }
diff --git a/test/unit/lib/utils/telemetry/anonymize-stacktrace-paths.test.js b/test/unit/lib/utils/telemetry/anonymize-stacktrace-paths.test.js
index 0a2d915bbca..6c1eb198a64 100644
--- a/test/unit/lib/utils/telemetry/anonymize-stacktrace-paths.test.js
+++ b/test/unit/lib/utils/telemetry/anonymize-stacktrace-paths.test.js
@@ -61,9 +61,9 @@ describe('test/unit/lib/utils/anonymize-stacktrace-paths.test.js', () => {
 
       const result = anonymizeStacktracePaths(stacktracePaths);
       expect(result).to.deep.equal([
-        '/node_modules/lib/plugins/aws/package/lib/getHashForFilePath.js:23:13',
-        '/node_modules/lib/plugins/otherfile.js:100:10',
-        '/node_modules/lib/plugins/another.js:100:10',
+        '/lib/plugins/aws/package/lib/getHashForFilePath.js:23:13',
+        '/lib/plugins/otherfile.js:100:10',
+        '/lib/plugins/another.js:100:10',
       ]);
     });
   }
@@ -130,9 +130,9 @@ describe('test/unit/lib/utils/anonymize-stacktrace-paths.test.js', () => {
 
       const result = anonymizeStacktracePaths(stacktracePaths);
       expect(result).to.deep.equal([
-        '\\node_modules\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:23:13',
-        '\\node_modules\\lib\\plugins\\otherfile.js:100:10',
-        '\\node_modules\\lib\\plugins\\another.js:100:10',
+        '\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        '\\lib\\plugins\\otherfile.js:100:10',
+        '\\lib\\plugins\\another.js:100:10',
       ]);
     });
   }

From 542b691a6472fc5a559e3c986e3b68eefcb6ad6e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 9 Jun 2021 21:28:53 +0200
Subject: [PATCH 0192/1101] refactor(Telemetry): Improve variable names

---
 .../telemetry/anonymize-stacktrace-paths.js   | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/utils/telemetry/anonymize-stacktrace-paths.js b/lib/utils/telemetry/anonymize-stacktrace-paths.js
index 1c146ba0153..dbe91ae9a17 100644
--- a/lib/utils/telemetry/anonymize-stacktrace-paths.js
+++ b/lib/utils/telemetry/anonymize-stacktrace-paths.js
@@ -3,30 +3,32 @@
 const path = require('path');
 const commonPath = require('path2/common');
 
-const anonymizeStacktracePaths = (stacktracePaths) => {
-  const absoluteStacktracePaths = stacktracePaths.filter((p) => path.isAbsolute(p));
+const anonymizeStacktracePaths = (stackFrames) => {
+  const stackFramesWithAbsolutePaths = stackFrames.filter((p) => path.isAbsolute(p));
   let commonPathPrefix = '';
 
-  if (absoluteStacktracePaths.length) {
-    commonPathPrefix = commonPath(...absoluteStacktracePaths);
+  if (stackFramesWithAbsolutePaths.length) {
+    commonPathPrefix = commonPath(...stackFramesWithAbsolutePaths);
 
-    const lastServerlessIndex = commonPathPrefix.lastIndexOf(`${path.sep}serverless${path.sep}`);
+    const lastServerlessPathIndex = commonPathPrefix.lastIndexOf(
+      `${path.sep}serverless${path.sep}`
+    );
 
-    if (lastServerlessIndex !== -1) {
-      commonPathPrefix = commonPathPrefix.slice(0, lastServerlessIndex);
+    if (lastServerlessPathIndex !== -1) {
+      commonPathPrefix = commonPathPrefix.slice(0, lastServerlessPathIndex);
     } else {
       const nodeModulesPathPart = `${path.sep}node_modules${path.sep}`;
-      const lastNodeModulesIndex = commonPathPrefix.lastIndexOf(nodeModulesPathPart);
-      if (lastNodeModulesIndex !== -1) {
+      const lastNodeModulesPathIndex = commonPathPrefix.lastIndexOf(nodeModulesPathPart);
+      if (lastNodeModulesPathIndex !== -1) {
         commonPathPrefix = commonPathPrefix.slice(
           0,
-          lastNodeModulesIndex + nodeModulesPathPart.length - 1
+          lastNodeModulesPathIndex + nodeModulesPathPart.length - 1
         );
       }
     }
   }
 
-  return stacktracePaths.map((s) => s.replace(commonPathPrefix, ''));
+  return stackFrames.map((stackFrame) => stackFrame.replace(commonPathPrefix, ''));
 };
 
 module.exports = anonymizeStacktracePaths;

From f3ff6d21758b61116c748746cefe8c1a3d6ab776 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 9 Jun 2021 22:03:05 +0200
Subject: [PATCH 0193/1101] refactor(Telemetry): Optimise error location length

---
 .../telemetry/anonymize-stacktrace-paths.js   | 16 +++++++-
 .../anonymize-stacktrace-paths.test.js        | 38 +++++++++++++++++++
 .../telemetry/resolve-error-location.test.js  |  8 ++--
 3 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/lib/utils/telemetry/anonymize-stacktrace-paths.js b/lib/utils/telemetry/anonymize-stacktrace-paths.js
index dbe91ae9a17..b77f2244e1b 100644
--- a/lib/utils/telemetry/anonymize-stacktrace-paths.js
+++ b/lib/utils/telemetry/anonymize-stacktrace-paths.js
@@ -28,7 +28,21 @@ const anonymizeStacktracePaths = (stackFrames) => {
     }
   }
 
-  return stackFrames.map((stackFrame) => stackFrame.replace(commonPathPrefix, ''));
+  let previousStackFramePath = null;
+  return stackFrames.map((stackFrame) => {
+    stackFrame = stackFrame.replace(commonPathPrefix, '');
+    const locationIndex = stackFrame.search(/:\d+:/);
+    if (locationIndex === -1) {
+      previousStackFramePath = null;
+      return stackFrame;
+    }
+    const currentStackFramePath = stackFrame.slice(0, locationIndex);
+    if (currentStackFramePath === previousStackFramePath) {
+      return `^${stackFrame.slice(currentStackFramePath.length)}`;
+    }
+    previousStackFramePath = currentStackFramePath;
+    return stackFrame;
+  });
 };
 
 module.exports = anonymizeStacktracePaths;
diff --git a/test/unit/lib/utils/telemetry/anonymize-stacktrace-paths.test.js b/test/unit/lib/utils/telemetry/anonymize-stacktrace-paths.test.js
index 6c1eb198a64..70303c70ee5 100644
--- a/test/unit/lib/utils/telemetry/anonymize-stacktrace-paths.test.js
+++ b/test/unit/lib/utils/telemetry/anonymize-stacktrace-paths.test.js
@@ -66,6 +66,25 @@ describe('test/unit/lib/utils/anonymize-stacktrace-paths.test.js', () => {
         '/lib/plugins/another.js:100:10',
       ]);
     });
+
+    it('Should strip same following file paths', () => {
+      const stacktracePaths = [
+        '/home/xxx/yyy/zzz-serverless/node_modules/lib/plugins/aws/package/lib/getHashForFilePath.js:23:13',
+        '/home/xxx/yyy/zzz-serverless/node_modules/lib/plugins/aws/package/lib/getHashForFilePath.js:3:3',
+        '/home/xxx/yyy/zzz-serverless/node_modules/lib/plugins/otherfile.js:100:10',
+        '/home/xxx/yyy/zzz-serverless/node_modules/lib/plugins/another.js:100:10',
+        '/home/xxx/yyy/zzz-serverless/node_modules/lib/plugins/another.js:4:12',
+      ];
+
+      const result = anonymizeStacktracePaths(stacktracePaths);
+      expect(result).to.deep.equal([
+        '/lib/plugins/aws/package/lib/getHashForFilePath.js:23:13',
+        '^:3:3',
+        '/lib/plugins/otherfile.js:100:10',
+        '/lib/plugins/another.js:100:10',
+        '^:4:12',
+      ]);
+    });
   }
 
   it('Should handle stacktrace with only relative paths', () => {
@@ -135,5 +154,24 @@ describe('test/unit/lib/utils/anonymize-stacktrace-paths.test.js', () => {
         '\\lib\\plugins\\another.js:100:10',
       ]);
     });
+
+    it('Should strip same following file paths', () => {
+      const stacktracePaths = [
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\node_modules\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\node_modules\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:3:3',
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\node_modules\\lib\\plugins\\otherfile.js:100:10',
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\node_modules\\lib\\plugins\\another.js:100:10',
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\node_modules\\lib\\plugins\\another.js:4:12',
+      ];
+
+      const result = anonymizeStacktracePaths(stacktracePaths);
+      expect(result).to.deep.equal([
+        '\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        '^:3:3',
+        '\\lib\\plugins\\otherfile.js:100:10',
+        '\\lib\\plugins\\another.js:100:10',
+        '^:4:12',
+      ]);
+    });
   }
 });
diff --git a/test/unit/lib/utils/telemetry/resolve-error-location.test.js b/test/unit/lib/utils/telemetry/resolve-error-location.test.js
index cf62cf0d7ea..bca95eb6a45 100644
--- a/test/unit/lib/utils/telemetry/resolve-error-location.test.js
+++ b/test/unit/lib/utils/telemetry/resolve-error-location.test.js
@@ -72,9 +72,9 @@ describe('test/unit/lib/utils/resolve-error-location.test.js', () => {
         [
           '/test/unit/lib/utils/resolve-error-location.test.js:10:17',
           '/node_modules/mocha/lib/runnable.js:366:21',
-          '/node_modules/mocha/lib/runnable.js:354:5',
+          '^:354:5',
           '/node_modules/mocha/lib/runner.js:677:10',
-          '/node_modules/mocha/lib/runner.js:801:12',
+          '^:801:12',
         ].join('\n')
       );
     });
@@ -116,9 +116,9 @@ describe('test/unit/lib/utils/resolve-error-location.test.js', () => {
         [
           '/test/unit/lib/utils/resolve-error-location.test.js:10:17',
           '/node_modules/mocha/lib/runnable.js:366:21',
-          '/node_modules/mocha/lib/runnable.js:354:5',
+          '^:354:5',
           '/node_modules/mocha/lib/runner.js:677:10',
-          '/node_modules/mocha/lib/runner.js:801:12',
+          '^:801:12',
         ].join('\n')
       );
     });

From 8ac249b1eadf3173359e02886e71bb89234ebd51 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 10 Jun 2021 10:17:58 +0200
Subject: [PATCH 0194/1101] refactor(Config Schema): Improve error messaging
 for same type variants

---
 .../ConfigSchemaHandler/normalizeAjvErrors.js | 11 ++++-
 .../normalizeAjvErrors.test.js                | 45 +++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.js b/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.js
index 5961495520a..fe5a6a536ae 100644
--- a/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.js
+++ b/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.js
@@ -190,9 +190,13 @@ const filterIrrelevantAnyOfErrors = (resultErrorsSet) => {
       }
       // 2.2.8 If more than one variant left, expose just "no matching variant" error
       for (const dataPathOneOfPathVariantErrors of dataPathOneOfPathVariants) {
+        const types = new Set();
         for (const dataPathOneOfPathVariantError of dataPathOneOfPathVariantErrors) {
+          const parentSchema = dataPathOneOfPathVariantError.parentSchema;
+          types.add(parentSchema.const ? 'const' : parentSchema.type);
           resultErrorsSet.delete(dataPathOneOfPathVariantError);
         }
+        if (types.size === 1) noMatchingVariantError.commonType = types.values().next().value;
       }
     });
   }
@@ -225,7 +229,12 @@ const improveMessages = (resultErrorsSet) => {
         }
       // fallthrough
       case 'oneOf':
-        error.message = 'unsupported configuration format';
+        if (error.commonType) {
+          if (error.commonType === 'const') error.message = 'unsupported value';
+          else error.message = `unsupported ${error.commonType} format`;
+        } else {
+          error.message = 'unsupported configuration format';
+        }
         break;
       case 'enum':
         if (error.params.allowedValues.every((value) => typeof value === 'string')) {
diff --git a/test/unit/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.test.js b/test/unit/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.test.js
index 79d73a84c6d..f17355f0dda 100644
--- a/test/unit/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.test.js
+++ b/test/unit/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.test.js
@@ -58,6 +58,19 @@ describe('#normalizeAjvErrors', () => {
               },
             ],
           },
+          someString: {
+            anyOf: [
+              {
+                type: 'string',
+                pattern: 'foo',
+              },
+              {
+                type: 'string',
+                pattern: 'bar',
+              },
+              { type: 'object' },
+            ],
+          },
         },
       },
       package: {
@@ -165,6 +178,7 @@ describe('#normalizeAjvErrors', () => {
       },
       custom: {
         someCustom: { name: 'third' },
+        someString: 'other',
       },
       package: { incclude: ['./folder'] },
       functions: {
@@ -336,6 +350,21 @@ describe('#normalizeAjvErrors', () => {
           })
         ).to.be.true
     );
+    it(
+      'should report in anyOf case, where two values of same (string) type are possible ' +
+        'and for all variants errors relate to paths of same depth',
+      () =>
+        expect(
+          errors.some((error) => {
+            if (error.dataPath !== '.custom.someString') {
+              return false;
+            }
+            if (error.keyword !== 'anyOf') return false;
+            error.isExpected = true;
+            return true;
+          })
+        ).to.be.true
+    );
     it('should report the duplicated erorr message if more than one dependency is missing only once', () => {
       const depsErrors = errors.filter((item) => item.keyword === 'dependencies');
       expect(depsErrors).to.have.lengthOf(1);
@@ -370,5 +399,21 @@ describe('#normalizeAjvErrors', () => {
           return true;
         }).message
       ).to.include('unsupported function event'));
+    it('should report value which do not match multiple constants with a meaningful message', () =>
+      expect(
+        errors.find((error) => {
+          if (error.dataPath !== '.custom.someCustom') return false;
+          if (error.keyword !== 'anyOf') return false;
+          return true;
+        }).message
+      ).to.include('unsupported value'));
+    it('should report value which do not match multiple string formats with a meaningful message', () =>
+      expect(
+        errors.find((error) => {
+          if (error.dataPath !== '.custom.someString') return false;
+          if (error.keyword !== 'anyOf') return false;
+          return true;
+        }).message
+      ).to.include('unsupported string format'));
   });
 });

From f009679bdd39cc94fe42cac850a617ab50bc748a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 10 Jun 2021 21:11:53 +0200
Subject: [PATCH 0195/1101] refactor: Remove no longer applicable comments

---
 lib/classes/Service.js |  8 --------
 lib/plugins/print.js   | 16 ----------------
 2 files changed, 24 deletions(-)

diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index cdd262c5686..6c2d5783fe7 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -103,14 +103,6 @@ class Service {
       );
     }
 
-    // #######################################################################
-    // ## KEEP SYNCHRONIZED WITH EQUIVALENT IN ~/lib/plugins/print/print.js ##
-    // #######################################################################
-    // #####################################################################
-    // ## KEEP SYNCHRONIZED WITH EQUIVALENT IN ~/lib/classes/Variables.js ##
-    // ##   there, see `getValueFromSelf`                                 ##
-    // ##   here, see below                                               ##
-    // #####################################################################
     if (!_.isObject(serverlessFile.provider)) {
       const providerName = serverlessFile.provider;
       serverlessFile.provider = {
diff --git a/lib/plugins/print.js b/lib/plugins/print.js
index bcce55016d1..20aa3de82fd 100644
--- a/lib/plugins/print.js
+++ b/lib/plugins/print.js
@@ -66,22 +66,6 @@ class Print {
     }
   }
   async print() {
-    // #####################################################################
-    // ## KEEP SYNCHRONIZED WITH EQUIVALENT IN ~/lib/classes/Variables.js ##
-    // ##   there, see `populateService`                                  ##
-    // ##   here, see below                                               ##
-    // #####################################################################
-    // ###################################################################
-    // ## KEEP SYNCHRONIZED WITH EQUIVALENT IN ~/lib/classes/Service.js ##
-    // ##   there, see `constructor` and `loadServiceFileParam`         ##
-    // ##   here, see `strip` and `adorn`                               ##
-    // ###################################################################
-    // The *already loaded* Service (i.e. serverless.yml) is adorned with extras for use by the
-    // framework and throughout its codebase.  We could try using the populated service but that
-    // would require playing whack-a-mole on issues as changes are made to the service anywhere in
-    // the codebase.  Avoiding that, this method must read the serverless.yml file itself, adorn it
-    // as the Service class would and then populate it, reversing the adornments thereafter in
-    // preparation for printing the service for the user.
     const svc = this.serverless.configurationInput;
     const service = svc;
     this.adorn(service);

From c86a76cb60038765404c988da13dfc6ffde28fe6 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 10 Jun 2021 22:08:31 +0200
Subject: [PATCH 0196/1101] refactor: Reorganize and document configuration
 dependencies

---
 lib/classes/Service.js | 47 +++++++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index 6c2d5783fe7..a783f10f48f 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -103,13 +103,34 @@ class Service {
       );
     }
 
+    this.initialServerlessConfig = serverlessFile;
+
+    // TODO: Ideally below approach should be replaced at some point with:
+    // 1. In "initialization" phase: Minimize reliance on service configuration
+    //    to few core properties
+    // 2. Before "run" phase: Validate and normalize (via AJV) `serverless.configurationInput`
+    //    into `serverless.configuration`
+    // 3. In "run" phase: Instead of relying on `serverless.service` rely on
+    //    `serverless.configuration` internally
+
+    // Below comments provide usage feedback helfpul for future refactor process.
+
+    // ## Properties currently accessed at "initialization" phase
+    //
+    // `provider` (`provder.name` by many plugin constructs, and few other core properties as
+    //              `provider.stage` are read by dashboard plugin)
     if (!_.isObject(serverlessFile.provider)) {
       const providerName = serverlessFile.provider;
       serverlessFile.provider = {
         name: providerName,
       };
     }
+    if (serverlessFile.provider.stage == null) {
+      serverlessFile.provider.stage = 'dev';
+    }
+    this.provider = serverlessFile.provider;
 
+    // `service` (read by dashboard plugin)
     if (_.isObject(serverlessFile.service)) {
       this.serverless._logDeprecation(
         'SERVICE_OBJECT_NOTATION',
@@ -123,38 +144,30 @@ class Service {
       this.service = serverlessFile.service;
     }
 
+    // (dashboard plugin)
     this.app = serverlessFile.app;
     this.tenant = serverlessFile.tenant;
     this.org = serverlessFile.org;
-    this.custom = serverlessFile.custom;
+
     this.plugins = serverlessFile.plugins;
-    this.resources = serverlessFile.resources;
-    this.functions = serverlessFile.functions || {};
-    this.configValidationMode = serverlessFile.configValidationMode || 'warn';
     this.disabledDeprecations = serverlessFile.disabledDeprecations;
-    this.unresolvedVariablesNotificationMode = serverlessFile.unresolvedVariablesNotificationMode;
-
-    // merge so that the default settings are still in place and
-    // won't be overwritten
-    if (serverlessFile.provider) {
-      if (serverlessFile.provider.stage == null) {
-        serverlessFile.provider.stage = this.provider.stage;
-      }
-      this.provider = serverlessFile.provider;
-    }
 
+    // `package.path` is read by few core plugins at initialization
     if (serverlessFile.package) {
       this.package = serverlessFile.package;
     }
 
+    // ## Properties accessed at "run" phase
+    this.custom = serverlessFile.custom; // (dashboard plugin)
+    this.resources = serverlessFile.resources;
+    this.functions = serverlessFile.functions || {};
+    this.configValidationMode = serverlessFile.configValidationMode || 'warn';
+    this.unresolvedVariablesNotificationMode = serverlessFile.unresolvedVariablesNotificationMode;
     if (this.provider.name === 'aws') {
       this.layers = serverlessFile.layers || {};
     }
-
     this.outputs = serverlessFile.outputs;
 
-    this.initialServerlessConfig = serverlessFile;
-
     return this;
   }
 

From 2d3bfac374fa6a4a9771c222a5daf05bfe4f08a9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 10 Jun 2021 22:17:21 +0200
Subject: [PATCH 0197/1101] refactor: Improve var name

---
 lib/classes/Service.js | 64 +++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index a783f10f48f..0f5248a3d75 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -51,17 +51,16 @@ class Service {
   }
 
   loadServiceFileParam() {
-    const serverlessFileParam = this.serverless.configurationInput;
     // Not used internally, left set to not break plugins which depend on it
     // TOOD: Remove with next major
     this.serviceFilename = this.serverless.configurationFilename;
 
-    const serverlessFile = serverlessFileParam;
+    const configurationInput = this.serverless.configurationInput;
     // basic service level validation
     const version = this.serverless.utils.getVersion();
-    let ymlVersion = serverlessFile.frameworkVersion;
+    let ymlVersion = configurationInput.frameworkVersion;
     if (ymlVersion && !semver.validRange(ymlVersion)) {
-      if (serverlessFile.configValidationMode === 'error') {
+      if (configurationInput.configValidationMode === 'error') {
         throw new ServerlessError(
           'Configured "frameworkVersion" does not represent a valid semver version range.',
           'INVALID_FRAMEWORK_VERSION'
@@ -90,20 +89,20 @@ class Service {
       ].join('');
       throw new ServerlessError(errorMessage, 'FRAMEWORK_VERSION_MISMATCH');
     }
-    if (!serverlessFile.service) {
+    if (!configurationInput.service) {
       throw new ServerlessError(
         `"service" property is missing in ${this.serverless.configurationFilename}`,
         'SERVICE_NAME_MISSING'
       );
     }
-    if (!serverlessFile.provider) {
+    if (!configurationInput.provider) {
       throw new ServerlessError(
         `"provider" property is missing in ${this.serverless.configurationFilename}`,
         'PROVIDER_NAME_MISSING'
       );
     }
 
-    this.initialServerlessConfig = serverlessFile;
+    this.initialServerlessConfig = configurationInput;
 
     // TODO: Ideally below approach should be replaced at some point with:
     // 1. In "initialization" phase: Minimize reliance on service configuration
@@ -119,54 +118,55 @@ class Service {
     //
     // `provider` (`provder.name` by many plugin constructs, and few other core properties as
     //              `provider.stage` are read by dashboard plugin)
-    if (!_.isObject(serverlessFile.provider)) {
-      const providerName = serverlessFile.provider;
-      serverlessFile.provider = {
+    if (!_.isObject(configurationInput.provider)) {
+      const providerName = configurationInput.provider;
+      configurationInput.provider = {
         name: providerName,
       };
     }
-    if (serverlessFile.provider.stage == null) {
-      serverlessFile.provider.stage = 'dev';
+    if (configurationInput.provider.stage == null) {
+      configurationInput.provider.stage = 'dev';
     }
-    this.provider = serverlessFile.provider;
+    this.provider = configurationInput.provider;
 
     // `service` (read by dashboard plugin)
-    if (_.isObject(serverlessFile.service)) {
+    if (_.isObject(configurationInput.service)) {
       this.serverless._logDeprecation(
         'SERVICE_OBJECT_NOTATION',
         'Starting from next major object notation for "service" property will no longer be ' +
           'recognized. Set "service" property directly with service name.'
       );
-      this.serviceObject = serverlessFile.service;
-      this.service = serverlessFile.service.name;
+      this.serviceObject = configurationInput.service;
+      this.service = configurationInput.service.name;
     } else {
-      this.serviceObject = { name: serverlessFile.service };
-      this.service = serverlessFile.service;
+      this.serviceObject = { name: configurationInput.service };
+      this.service = configurationInput.service;
     }
 
     // (dashboard plugin)
-    this.app = serverlessFile.app;
-    this.tenant = serverlessFile.tenant;
-    this.org = serverlessFile.org;
+    this.app = configurationInput.app;
+    this.tenant = configurationInput.tenant;
+    this.org = configurationInput.org;
 
-    this.plugins = serverlessFile.plugins;
-    this.disabledDeprecations = serverlessFile.disabledDeprecations;
+    this.plugins = configurationInput.plugins;
+    this.disabledDeprecations = configurationInput.disabledDeprecations;
 
     // `package.path` is read by few core plugins at initialization
-    if (serverlessFile.package) {
-      this.package = serverlessFile.package;
+    if (configurationInput.package) {
+      this.package = configurationInput.package;
     }
 
     // ## Properties accessed at "run" phase
-    this.custom = serverlessFile.custom; // (dashboard plugin)
-    this.resources = serverlessFile.resources;
-    this.functions = serverlessFile.functions || {};
-    this.configValidationMode = serverlessFile.configValidationMode || 'warn';
-    this.unresolvedVariablesNotificationMode = serverlessFile.unresolvedVariablesNotificationMode;
+    this.custom = configurationInput.custom; // (dashboard plugin)
+    this.resources = configurationInput.resources;
+    this.functions = configurationInput.functions || {};
+    this.configValidationMode = configurationInput.configValidationMode || 'warn';
+    this.unresolvedVariablesNotificationMode =
+      configurationInput.unresolvedVariablesNotificationMode;
     if (this.provider.name === 'aws') {
-      this.layers = serverlessFile.layers || {};
+      this.layers = configurationInput.layers || {};
     }
-    this.outputs = serverlessFile.outputs;
+    this.outputs = configurationInput.outputs;
 
     return this;
   }

From 727d7f4f089051223db88ceb85a62adabf07dc9e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 10 Jun 2021 22:29:57 +0200
Subject: [PATCH 0198/1101] fix(Variables): Improve properties resolution
 validation

So it ensures they're ready for internal handling
---
 scripts/serverless.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index 6cf81fc4e36..df30e7aa06d 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -364,11 +364,12 @@ const processSpanPromise = (async () => {
           if (!variablesMeta.size) return; // All properties successuflly resolved
 
           if (!ensureResolvedProperty('plugins')) return;
+          if (!ensureResolvedProperty('package\0path')) return;
 
           if (!ensureResolvedProperty('frameworkVersion')) return;
-          if (!ensureResolvedProperty('configValidationMode')) return;
           if (!ensureResolvedProperty('app')) return;
           if (!ensureResolvedProperty('org')) return;
+          if (!ensureResolvedProperty('tenant')) return;
           if (!ensureResolvedProperty('service', { shouldSilentlyReturnIfLegacyMode: true })) {
             return;
           }

From 004c6e26beec98fbfb757aab05f18a623a03cf76 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 10 Jun 2021 22:42:08 +0200
Subject: [PATCH 0199/1101] fix(Variables):  Ensure visibility of top level
 properties resolution

---
 lib/Serverless.js      |  4 ++++
 lib/classes/Service.js | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index ba4ba0e89eb..85cee171443 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -385,6 +385,10 @@ class Serverless {
         })();
       }
     }
+
+    // Ensure to pick eventual variable resolution that happens after all plugins are loaded
+    if (this.configurationInput) this.service.reloadServiceFileParam();
+
     if (this.cli.displayHelp(this.processedInput)) {
       return;
     }
diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index 0f5248a3d75..7b04d52e3f7 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -171,6 +171,27 @@ class Service {
     return this;
   }
 
+  reloadServiceFileParam() {
+    const configurationInput = this.initialServerlessConfig;
+    if (_.isObject(configurationInput.provider)) {
+      this.provider = configurationInput.provider;
+      if (this.provider.stage == null) this.provider.stage = 'dev';
+    }
+    if (configurationInput.package) {
+      this.package = configurationInput.package;
+    }
+    this.custom = configurationInput.custom;
+    this.resources = configurationInput.resources;
+    this.functions = configurationInput.functions || {};
+    this.configValidationMode = configurationInput.configValidationMode || 'warn';
+    this.unresolvedVariablesNotificationMode =
+      configurationInput.unresolvedVariablesNotificationMode;
+    if (this.provider.name === 'aws') {
+      this.layers = configurationInput.layers || {};
+    }
+    this.outputs = configurationInput.outputs;
+  }
+
   setFunctionNames(rawOptions) {
     const options = rawOptions || {};
     options.stage = options.stage || options.s;

From aa4587604476314485a8094bdae04e0148b9e53c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 11 Jun 2021 08:57:50 +0200
Subject: [PATCH 0200/1101] fix(Variables): Recognize `tenant` setting as it's
 recognized by plugin

---
 scripts/serverless.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index df30e7aa06d..e347aff1bd8 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -546,7 +546,11 @@ const processSpanPromise = (async () => {
         }
 
         // Register dashboard specific variable source resolvers
-        if (configuration.org && serverless.pluginManager.dashboardPlugin) {
+        if (
+          // TODO: Remove "tenant" support with next major
+          (configuration.org || configuration.tenant) &&
+          serverless.pluginManager.dashboardPlugin
+        ) {
           for (const [sourceName, sourceConfig] of Object.entries(
             serverless.pluginManager.dashboardPlugin.configurationVariablesSources
           )) {

From cc09c62301f15f89febc50120a7a398640935470 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 11 Jun 2021 09:17:46 +0200
Subject: [PATCH 0201/1101] fix(Variables): Meaningfully report misuse of
 dashboard sources

---
 scripts/serverless.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index e347aff1bd8..244ae92e04a 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -598,6 +598,17 @@ const processSpanPromise = (async () => {
               for (const propertyPath of propertyPaths) legacySsmVarPropertyPaths.add(propertyPath);
               unresolvedSources.delete(sourceType);
             }
+            if (sourceType === 'param' || sourceType === 'output') {
+              logDeprecation(
+                'NEW_VARIABLES_RESOLVER',
+                '"param" and "output" variable sources can be resolved only in context of ' +
+                  'services deployed to Serverless Dashboard (with "org" setting configured).\n' +
+                  'Starting with next major release, ' +
+                  'this will be communicated with a thrown error.\n',
+                { serviceConfig: configuration }
+              );
+              unresolvedSources.delete(sourceType);
+            }
           }
           if (legacyCfVarPropertyPaths.size) {
             logDeprecation(
@@ -645,6 +656,18 @@ const processSpanPromise = (async () => {
           const unrecognizedSourceNames = Array.from(unresolvedSources.keys()).filter(
             (sourceName) => !recognizedSourceNames.has(sourceName)
           );
+
+          if (
+            unrecognizedSourceNames.includes('param') ||
+            unrecognizedSourceNames.includes('output')
+          ) {
+            throw new ServerlessError(
+              '"Cannot resolve configuration: ' +
+                '"param" and "output" variable sources can be resolved only in context of ' +
+                'services deployed to Serverless Dashboard (with "org" setting configured)',
+              'DASHBOARD_VARIABLE_SOURCES_MISUSE'
+            );
+          }
           throw new ServerlessError(
             `Approached unrecognized configuration variable sources: "${unrecognizedSourceNames.join(
               '", "'

From 34c99cb9e9fec1847a9e577b4b9c81abd68a75b1 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 11 Jun 2021 10:28:47 +0200
Subject: [PATCH 0202/1101] chore: Bump dependencies

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 58a9631f419..182a56f341e 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.924.0",
+    "aws-sdk": "^2.926.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",

From 93233d1abe217068cceb5310c519eea6e7e77350 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 11 Jun 2021 10:42:50 +0200
Subject: [PATCH 0203/1101] chore: Release v2.46.0

---
 CHANGELOG.md | 23 +++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65f31613088..83726a5f6e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,29 @@
 
 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.
 
+### [2.46.0](https://github.com/serverless/serverless/compare/v2.45.2...v2.46.0) (2021-06-11)
+
+### Features
+
+- **CLI Onboarding:** Make it service setup specific, remove `auto-update` step ([#9582](https://github.com/serverless/serverless/pull/9582)) ([519f77e](https://github.com/serverless/serverless/commit/519f77e1a876cea62843a99e58bab1e011e62fa3)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **Config Schema:** Improve error messaging for same type variants ([#9588](https://github.com/serverless/serverless/pull/9588)) ([8ac249b](https://github.com/serverless/serverless/commit/8ac249b1eadf3173359e02886e71bb89234ebd51)) ([Mariusz Nowak](https://github.com/medikoo))
+- Show information on how to turn on auto updates in postinstall step ([#9582](https://github.com/serverless/serverless/pull/9582)) ([93c88c0](https://github.com/serverless/serverless/commit/93c88c0b8d1eea6455ca6ecb9a022f814f8e79b3)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **Variables:**
+  - Fix resolution visibility of top level properties (as `outputs`) ([#9591](https://github.com/serverless/serverless/pull/9591)) ([004c6e2](https://github.com/serverless/serverless/commit/004c6e26beec98fbfb757aab05f18a623a03cf76)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Improve required properties resolution validation order ([#9591](https://github.com/serverless/serverless/pull/9591)) ([727d7f4](https://github.com/serverless/serverless/commit/727d7f4f089051223db88ceb85a62adabf07dc9e)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Meaningfully report misuse of dashboard sources ([#9591](https://github.com/serverless/serverless/pull/9591)) ([cc09c62](https://github.com/serverless/serverless/commit/cc09c62301f15f89febc50120a7a398640935470)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Recognize `tenant` setting (while deprecated it's still recognized by plugin) ([#9591](https://github.com/serverless/serverless/pull/9591)) ([aa45876](https://github.com/serverless/serverless/commit/aa4587604476314485a8094bdae04e0148b9e53c)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- Reorganize and document service configuration dependencies ([#9591](https://github.com/serverless/serverless/pull/9591)) ([c86a76c](https://github.com/serverless/serverless/commit/c86a76cb60038765404c988da13dfc6ffde28fe6)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Telemetry:** Optimise reported error location length:
+  - Remove eventual `/node_modules` prefix ([#9587](https://github.com/serverless/serverless/pull/9587)) ([f3ff6d2](https://github.com/serverless/serverless/commit/f3ff6d21758b61116c748746cefe8c1a3d6ab776)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Replace repeated paths with `^` ([#9587](https://github.com/serverless/serverless/pull/9587)) ([f6a7d03](https://github.com/serverless/serverless/commit/f6a7d03b04bd13f91bc247e518a1ad12496ead8c)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ### [2.45.2](https://github.com/serverless/serverless/compare/v2.45.1...v2.45.2) (2021-06-09)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 182a56f341e..e2f0b5ba2ed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.45.2",
+  "version": "2.46.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From f61859fd25908b13b6d9638c550e88ef4a08392e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 14 Jun 2021 12:14:10 +0200
Subject: [PATCH 0204/1101] fix(Variables): Strip unrecognized legacy
 instructions

---
 .../sources/instance-dependent/get-ssm.js     | 32 ++++++++-----------
 .../instance-dependent/get-ssm.test.js        |  8 +++++
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/lib/configuration/variables/sources/instance-dependent/get-ssm.js b/lib/configuration/variables/sources/instance-dependent/get-ssm.js
index 4eefc448446..b7c58148ff7 100644
--- a/lib/configuration/variables/sources/instance-dependent/get-ssm.js
+++ b/lib/configuration/variables/sources/instance-dependent/get-ssm.js
@@ -4,8 +4,6 @@ const ensureString = require('type/string/ensure');
 const ServerlessError = require('../../../../serverless-error');
 const logDeprecation = require('../../../../utils/logDeprecation');
 
-const legacyInstructions = new Set(['true', 'split']);
-
 module.exports = (serverlessInstance) => {
   return {
     resolve: async ({ address, params, resolveConfigurationProperty }) => {
@@ -33,22 +31,20 @@ module.exports = (serverlessInstance) => {
         const legacyInstructionSeparator = address.lastIndexOf('~');
         if (legacyInstructionSeparator !== -1) {
           const instruction = address.slice(legacyInstructionSeparator + 1);
-          if (legacyInstructions.has(instruction)) {
-            address = address.slice(0, legacyInstructionSeparator);
-            if (instruction === 'true') legacyShouldEnforceDecrypt = true;
-            else legacyShouldEnforceSplit = true;
-            logDeprecation(
-              'NEW_VARIABLES_RESOLVER',
-              'Syntax for referencing SSM parameters was upgraded with ' +
-                'automatic type detection ' +
-                'and there\'s no need to add "~true" or "~split" postfixes to variable references.\n' +
-                'Drop those postfixes and set "variablesResolutionMode: 20210326" in your ' +
-                'service config to adapt to a new behavior.\n' +
-                'Starting with next major release, ' +
-                'this will be communicated with a thrown error.\n',
-              { serviceConfig: serverlessInstance.configurationInput }
-            );
-          }
+          address = address.slice(0, legacyInstructionSeparator);
+          if (instruction === 'true') legacyShouldEnforceDecrypt = true;
+          else if (instruction === 'split') legacyShouldEnforceSplit = true;
+          logDeprecation(
+            'NEW_VARIABLES_RESOLVER',
+            'Syntax for referencing SSM parameters was upgraded with ' +
+              'automatic type detection ' +
+              'and there\'s no need to add "~true" or "~split" postfixes to variable references.\n' +
+              'Drop those postfixes and set "variablesResolutionMode: 20210326" in your ' +
+              'service config to adapt to a new behavior.\n' +
+              'Starting with next major release, ' +
+              'this will be communicated with a thrown error.\n',
+            { serviceConfig: serverlessInstance.configurationInput }
+          );
         }
       }
       const result = await (async () => {
diff --git a/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js b/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js
index 39f93cfeb10..9d13197af39 100644
--- a/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js
+++ b/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js
@@ -147,6 +147,7 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
         custom: {
           existing: '${ssm:existing}',
           existingWithSplit: '${ssm:existing~split}',
+          existingWithUnrecognized: '${ssm:existing~other}',
           existingList: '${ssm:existingList}',
           existingListWithSplit: '${ssm:existingList~split}',
           secretManager: '${ssm:/aws/reference/secretsmanager/existing}',
@@ -213,6 +214,13 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
       );
     });
 
+    it('should ignore unrecognized legacy instructions', () => {
+      if (variablesMeta.get('custom\0existingWithUnrecognized')) {
+        throw variablesMeta.get('custom\0existing').error;
+      }
+      expect(configuration.custom.existingWithUnrecognized).to.equal('value');
+    });
+
     it('should resolve existing string list param', () => {
       if (variablesMeta.get('custom\0existingListWithSplit')) {
         throw variablesMeta.get('custom\0existingListWithSplit').error;

From 4a732e2ebf6c7d81f5e0fbdc2e9bcb4715e4cadf Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 14 Jun 2021 12:44:23 +0200
Subject: [PATCH 0205/1101] refactor(Variables): Improve error message

---
 lib/configuration/variables/sources/file.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/configuration/variables/sources/file.js b/lib/configuration/variables/sources/file.js
index 8fbf5285d9f..c928b7154b6 100644
--- a/lib/configuration/variables/sources/file.js
+++ b/lib/configuration/variables/sources/file.js
@@ -49,7 +49,8 @@ module.exports = {
     );
     if (!filePath.startsWith(`${projectDir}${path.sep}`)) {
       throw new ServerlessError(
-        'Cannot load file from outside of a project directory (with "projectDir" setting you may extend project boundary)',
+        'Cannot load file from outside of a project directory ' +
+          '(configure "projectDir" to extend project boundary)',
         'FILE_SOURCE_PATH_OUTSIDE_OF_PROJECT'
       );
     }

From f4c9b58b10a45ae342934e9a61dcdea0c2ef11e2 Mon Sep 17 00:00:00 2001
From: arunkc <arunkc91@gmail.com>
Date: Mon, 14 Jun 2021 17:30:28 +0530
Subject: [PATCH 0206/1101] fix(AWS Cognito): Correct `logicalIds` based on
 triggers (#9592)

* fix: strips nonalphanumerical characters

* fix: strips nonalphanumerical characters

* test: strips nonalphanumerical characters

* test: strips nonalphanumerical characters

* fix: prettier check
---
 lib/plugins/aws/lib/naming.js                | 2 +-
 test/unit/lib/plugins/aws/lib/naming.test.js | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/plugins/aws/lib/naming.js b/lib/plugins/aws/lib/naming.js
index c93353c6f5b..0df5f9dec96 100644
--- a/lib/plugins/aws/lib/naming.js
+++ b/lib/plugins/aws/lib/naming.js
@@ -519,7 +519,7 @@ module.exports = {
       functionName
     )}LambdaPermissionCognitoUserPool${this.normalizeNameToAlphaNumericOnly(
       poolId
-    )}TriggerSource${triggerSource}`;
+    )}TriggerSource${this.normalizeNameToAlphaNumericOnly(triggerSource)}`;
   },
   getLambdaAlbPermissionLogicalId(functionName) {
     return `${this.getNormalizedFunctionName(functionName)}LambdaPermissionAlb`;
diff --git a/test/unit/lib/plugins/aws/lib/naming.test.js b/test/unit/lib/plugins/aws/lib/naming.test.js
index f0a348ca5d6..9df0306593c 100644
--- a/test/unit/lib/plugins/aws/lib/naming.test.js
+++ b/test/unit/lib/plugins/aws/lib/naming.test.js
@@ -705,9 +705,11 @@ describe('#naming()', () => {
         sdk.naming.getLambdaCognitoUserPoolPermissionLogicalId(
           'functionName',
           'Pool1',
-          'CustomMessage'
+          'PreSignUp_ExternalProvider'
         )
-      ).to.equal('FunctionNameLambdaPermissionCognitoUserPoolPool1TriggerSourceCustomMessage');
+      ).to.equal(
+        'FunctionNameLambdaPermissionCognitoUserPoolPool1TriggerSourcePreSignUpExternalProvider'
+      );
     });
 
     describe('#getLambdaAlbPermissionLogicalId()', () => {

From 87ce28ee4ea0e975859b8d32be8f2edd824b4cda Mon Sep 17 00:00:00 2001
From: Nyambayar Turbat <t.nyambayar@gmail.com>
Date: Wed, 16 Jun 2021 22:17:56 +0800
Subject: [PATCH 0207/1101] feat(AWS HTTP API): Support `payload` version per
 function (#9551)

---
 docs/providers/aws/events/http-api.md              | 14 ++++++++++++++
 lib/plugins/aws/package/compile/events/httpApi.js  |  6 ++++--
 lib/plugins/aws/provider.js                        | 13 ++++++++++++-
 .../aws/package/compile/events/httpApi.test.js     | 10 ++++++++++
 4 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/docs/providers/aws/events/http-api.md b/docs/providers/aws/events/http-api.md
index 580370276f0..0d24ccae307 100644
--- a/docs/providers/aws/events/http-api.md
+++ b/docs/providers/aws/events/http-api.md
@@ -392,6 +392,20 @@ provider:
     payload: '1.0'
 ```
 
+The payload version can also be specified at the function level with httpApi.payload property and it will take precedence over the payload version configured at the provider level. It can be configured as:
+
+```yaml
+functions:
+  hello:
+    handler: index.handler
+    httpApi:
+      payload: '1.0'
+    events:
+      - httpApi:
+          path: /hello
+          method: GET
+```
+
 ### Detailed Metrics
 
 With HTTP API we may configure detailed metrics that can be used setup monitoring and alerting in Cloudwatch.
diff --git a/lib/plugins/aws/package/compile/events/httpApi.js b/lib/plugins/aws/package/compile/events/httpApi.js
index dc0fccaa16a..3d51932718d 100644
--- a/lib/plugins/aws/package/compile/events/httpApi.js
+++ b/lib/plugins/aws/package/compile/events/httpApi.js
@@ -649,14 +649,16 @@ Object.defineProperties(
       }
     }),
     compileIntegration: d(function (routeTargetData) {
+      const functionConfig = this.serverless.service.getFunction(routeTargetData.functionName);
+      const funcHttpApi = functionConfig.httpApi || {};
       const providerConfig = this.serverless.service.provider;
-      const userConfig = providerConfig.httpApi || {};
+      const providerHttpApi = providerConfig.httpApi || {};
 
       const properties = {
         ApiId: this.getApiIdConfig(),
         IntegrationType: 'AWS_PROXY',
         IntegrationUri: resolveTargetConfig(routeTargetData),
-        PayloadFormatVersion: userConfig.payload || '2.0',
+        PayloadFormatVersion: funcHttpApi.payload || providerHttpApi.payload || '2.0',
       };
       if (routeTargetData.timeout) {
         properties.TimeoutInMillis = Math.round(routeTargetData.timeout * 1000);
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 9b4703dfdd0..f88bc0ccff5 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -304,6 +304,10 @@ class AwsProvider {
             },
             additionalProperties: false,
           },
+          awsHttpApiPayload: {
+            type: 'string',
+            enum: ['1.0', '2.0'],
+          },
           awsArn: {
             anyOf: [
               { $ref: '#/definitions/awsArnString' },
@@ -845,7 +849,7 @@ class AwsProvider {
                           managedExternally: { type: 'boolean' },
                           resultTtlInSeconds: { type: 'integer', minimum: 0, maximum: 3600 },
                           enableSimpleResponses: { type: 'boolean' },
-                          payloadVersion: { type: 'string', enum: ['1.0', '2.0'] },
+                          payloadVersion: { $ref: '#/definitions/awsHttpApiPayload' },
                           identitySource: {
                             anyOf: [
                               { $ref: '#/definitions/awsCfInstruction' },
@@ -1230,6 +1234,13 @@ class AwsProvider {
             tracing: { $ref: '#/definitions/awsLambdaTracing' },
             versionFunction: { $ref: '#/definitions/awsLambdaVersioning' },
             vpc: { $ref: '#/definitions/awsLambdaVpcConfig' },
+            httpApi: {
+              type: 'object',
+              properties: {
+                payload: { $ref: '#/definitions/awsHttpApiPayload' },
+              },
+              additionalProperties: false,
+            },
           },
           additionalProperties: false,
         },
diff --git a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
index 78cbd654b9f..4a632cf69f8 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
@@ -36,6 +36,11 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
               handler: 'index.handler',
               events: [{ httpApi: { method: '*', path: '/method-catch-all' } }],
             },
+            payload: {
+              handler: 'index.handler',
+              httpApi: { payload: '1.0' },
+              events: [{ httpApi: { method: 'get', path: '/payload' } }],
+            },
           },
         },
       }).then(({ awsNaming, cfTemplate }) => {
@@ -125,6 +130,11 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       const apiResource = cfResources[naming.getHttpApiLogicalId()];
       expect(apiResource.Properties.DisableExecuteApiEndpoint).to.equal(undefined);
     });
+
+    it('should support payload format version per function', async () => {
+      const resource = cfResources[naming.getHttpApiIntegrationLogicalId('payload')];
+      expect(resource.Properties.PayloadFormatVersion).to.equal('1.0');
+    });
   });
 
   describe('Provider properties', () => {

From e24fdc9f08f9849aad4136261695e44476484b0d Mon Sep 17 00:00:00 2001
From: Milind Vaidya <milind.vaidya428@gmail.com>
Date: Wed, 16 Jun 2021 23:57:30 +0530
Subject: [PATCH 0208/1101] feat: Deprecate Node.js v10 (#9600)

---
 bin/serverless.js    | 21 ++++++++++++++-------
 docs/deprecations.md |  4 ++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/bin/serverless.js b/bin/serverless.js
index 607937045db..4fbbf6709ac 100755
--- a/bin/serverless.js
+++ b/bin/serverless.js
@@ -7,13 +7,20 @@ EvalError.$serverlessCommandStartTime = process.hrtime();
 
 const nodeVersion = Number(process.version.split('.')[0].slice(1));
 
-if (nodeVersion < 10) {
-  const serverlessVersion = Number(require('../package.json').version.split('.')[0]);
-  process.stdout.write(
-    `Serverless: \x1b[91mInitialization error: Node.js v${nodeVersion} is not supported by ` +
-      `Serverless Framework v${serverlessVersion}. Please upgrade\x1b[39m\n`
-  );
-  process.exit(1);
+if (nodeVersion < 12) {
+  if (nodeVersion >= 10) {
+    require('../lib/utils/logDeprecation')(
+      'OUTDATED_NODEJS',
+      'Support for Node.js versions below v12 will be dropped with next major release. Please upgrade at https://nodejs.org/en/'
+    );
+  } else {
+    const serverlessVersion = Number(require('../package.json').version.split('.')[0]);
+    process.stdout.write(
+      `Serverless: \x1b[91mInitialization error: Node.js v${nodeVersion} is not supported by ` +
+        `Serverless Framework v${serverlessVersion}. Please upgrade\x1b[39m\n`
+    );
+    process.exit(1);
+  }
 }
 
 if (require('../lib/utils/isStandaloneExecutable')) {
diff --git a/docs/deprecations.md b/docs/deprecations.md
index 001f620fd60..8ad5aec3293 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -384,9 +384,9 @@ Configure `httpApi.payload` explicitly to ensure seamless migration.
 
 Deprecation code: `OUTDATED_NODEJS`
 
-Support for Node.js v6 and v8 will be dropped with v2.0.0 release
+Support for Node.js v8 was dropped with v2 release, while support for Node.js v10 will be dropped with v3 release
 
-Ensure to rely on at least Node.js v10 (It's recommended to use LTS version, as listed at https://nodejs.org/en/)
+Ensure to rely on at least Node.js v12 (It's recommended to use LTS version, as listed at https://nodejs.org/en/)
 
 <a name="AWS_ALB_ALLOW_UNAUTHENTICATED"><div>&nbsp;</div></a>
 

From 42690a7352751581a8dbd44a4f776af17ab20da8 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 17 Jun 2021 14:31:10 +0200
Subject: [PATCH 0209/1101] feat(AWS S3): Support CF functions for `bucket`
 event property (#9617)

---
 .../aws/package/compile/events/s3/index.js    |  24 ++-
 .../package/compile/events/s3/index.test.js   | 152 ++++++++++++++----
 2 files changed, 139 insertions(+), 37 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/s3/index.js b/lib/plugins/aws/package/compile/events/s3/index.js
index 39f4b88ed3f..099bdf508f2 100644
--- a/lib/plugins/aws/package/compile/events/s3/index.js
+++ b/lib/plugins/aws/package/compile/events/s3/index.js
@@ -17,7 +17,9 @@ class AwsCompileS3Events {
         {
           type: 'object',
           properties: {
-            bucket: { type: 'string' },
+            bucket: {
+              anyOf: [{ type: 'string' }, { $ref: '#/definitions/awsCfFunction' }],
+            },
             event: { type: 'string', pattern: '^s3:.+$' },
             existing: { type: 'boolean' },
             rules: {
@@ -66,6 +68,12 @@ class AwsCompileS3Events {
             let filter = {};
 
             if (typeof event.s3 === 'object') {
+              if (_.isObject(event.s3.bucket)) {
+                throw new ServerlessError(
+                  'When specifying "s3.bucket" with CloudFormation intrinsic function, you need to specify that the bucket is existing via "existing: true" property.',
+                  'S3_INVALID_NEW_BUCKET_FORMAT'
+                );
+              }
               bucketRef = event.s3.bucket;
               if (event.s3.event) {
                 notificationEvent = event.s3.event;
@@ -271,16 +279,18 @@ class AwsCompileS3Events {
             numEventsForFunc++;
             let rules = null;
             const bucket = event.s3.bucket;
+            // In order to property use it as key and during comparisons below,
+            const stringifiedBucket = _.isObject(bucket) ? JSON.stringify(bucket) : bucket;
             const notificationEvent = event.s3.event || 's3:ObjectCreated:*';
             anyFuncUsesExistingS3Bucket = true;
 
             if (!currentBucketName) {
-              currentBucketName = bucket;
+              currentBucketName = stringifiedBucket;
             }
-            if (bucket !== currentBucketName) {
+            if (stringifiedBucket !== currentBucketName) {
               const errorMessage = [
                 'Only one S3 Bucket can be configured per function.',
-                ` In "${FunctionName}" you're attempting to configure "${currentBucketName}" and "${bucket}" at the same time.`,
+                ` In "${FunctionName}" you're attempting to configure "${currentBucketName}" and "${stringifiedBucket}" at the same time.`,
               ].join('');
               throw new ServerlessError(errorMessage, 'S3_MULTIPLE_BUCKETS_PER_FUNCTION');
             }
@@ -300,13 +310,13 @@ class AwsCompileS3Events {
               this.provider.naming.getCustomResourceS3ResourceLogicalId(functionName);
 
             // store how often the custom S3 resource is used
-            if (bucketResources[bucket]) {
-              bucketResources[bucket] = _.union(bucketResources[bucket], [
+            if (bucketResources[stringifiedBucket]) {
+              bucketResources[stringifiedBucket] = _.union(bucketResources[stringifiedBucket], [
                 customS3ResourceLogicalId,
               ]);
             } else {
               Object.assign(bucketResources, {
-                [bucket]: [customS3ResourceLogicalId],
+                [stringifiedBucket]: [customS3ResourceLogicalId],
               });
             }
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
index d1be3db4189..9df17153f75 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
@@ -830,9 +830,98 @@ describe('AwsCompileS3Events', () => {
 
       return expect(() => awsCompileS3Events.existingS3Buckets()).to.throw('Only one S3 Bucket');
     });
+  });
+});
+
+describe('test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js', () => {
+  let cfResources;
+  let naming;
+  let serverlessInstance;
+
+  before(async () => {
+    const { cfTemplate, awsNaming, serverless } = await runServerless({
+      fixture: 'function',
+      configExt: {
+        functions: {
+          foo: {
+            events: [
+              {
+                s3: {
+                  bucket: 'foo',
+                  event: 's3:ObjectCreated:*',
+                  existing: true,
+                },
+              },
+            ],
+          },
+          other: {
+            events: [
+              {
+                s3: {
+                  bucket: { Ref: 'SomeBucket' },
+                  event: 's3:ObjectCreated:*',
+                  existing: true,
+                },
+              },
+            ],
+          },
+        },
+      },
+      command: 'package',
+    });
+    cfResources = cfTemplate.Resources;
+    naming = awsNaming;
+    serverlessInstance = serverless;
+  });
+
+  it('should create lambda permissions policy with wild card', async () => {
+    const expectedResource = [
+      'arn',
+      {
+        Ref: 'AWS::Partition',
+      },
+      'lambda',
+      {
+        Ref: 'AWS::Region',
+      },
+      {
+        Ref: 'AWS::AccountId',
+      },
+      'function',
+      '*',
+    ];
 
-    it('should create lambda permissions policy with wild card', async () => {
-      const { cfTemplate } = await runServerless({
+    const lambdaPermissionsPolicies =
+      cfResources.IamRoleCustomResourcesLambdaExecution.Properties.Policies[
+        '0'
+      ].PolicyDocument.Statement.filter((x) => x.Action[0].includes('AddPermission'));
+
+    expect(lambdaPermissionsPolicies).to.have.length(1);
+
+    const actualResource = lambdaPermissionsPolicies[0].Resource['Fn::Join'][1];
+
+    expect(actualResource).to.deep.equal(expectedResource);
+  });
+
+  it('should support `bucket` provided as CF function', () => {
+    expect(cfResources[naming.getCustomResourceS3ResourceLogicalId('other')]).to.deep.equal({
+      Type: 'Custom::S3',
+      Version: 1,
+      DependsOn: ['OtherLambdaFunction', 'CustomDashresourceDashexistingDashs3LambdaFunction'],
+      Properties: {
+        ServiceToken: {
+          'Fn::GetAtt': ['CustomDashresourceDashexistingDashs3LambdaFunction', 'Arn'],
+        },
+        FunctionName: `${serverlessInstance.service.service}-dev-other`,
+        BucketName: { Ref: 'SomeBucket' },
+        BucketConfigs: [{ Event: 's3:ObjectCreated:*', Rules: [] }],
+      },
+    });
+  });
+
+  it('should disallow referencing multiple buckets in context of single function with CF references', async () => {
+    await expect(
+      runServerless({
         fixture: 'function',
         configExt: {
           functions: {
@@ -840,7 +929,14 @@ describe('AwsCompileS3Events', () => {
               events: [
                 {
                   s3: {
-                    bucket: 'foo',
+                    bucket: { Ref: 'SomeBucket' },
+                    event: 's3:ObjectCreated:*',
+                    existing: true,
+                  },
+                },
+                {
+                  s3: {
+                    bucket: { Ref: 'AnotherBucket' },
                     event: 's3:ObjectCreated:*',
                     existing: true,
                   },
@@ -850,34 +946,30 @@ describe('AwsCompileS3Events', () => {
           },
         },
         command: 'package',
-      });
+      })
+    ).to.be.eventually.rejected.and.have.property('code', 'S3_MULTIPLE_BUCKETS_PER_FUNCTION');
+  });
 
-      const expectedResource = [
-        'arn',
-        {
-          Ref: 'AWS::Partition',
-        },
-        'lambda',
-        {
-          Ref: 'AWS::Region',
-        },
-        {
-          Ref: 'AWS::AccountId',
+  it('should throw when `bucket` is specified as CF function but without setting `existing: true`', async () => {
+    await expect(
+      runServerless({
+        fixture: 'function',
+        configExt: {
+          functions: {
+            foo: {
+              events: [
+                {
+                  s3: {
+                    bucket: { Ref: 'SomeBucket' },
+                    event: 's3:ObjectCreated:*',
+                  },
+                },
+              ],
+            },
+          },
         },
-        'function',
-        '*',
-      ];
-
-      const lambdaPermissionsPolicies =
-        cfTemplate.Resources.IamRoleCustomResourcesLambdaExecution.Properties.Policies[
-          '0'
-        ].PolicyDocument.Statement.filter((x) => x.Action[0].includes('AddPermission'));
-
-      expect(lambdaPermissionsPolicies).to.have.length(1);
-
-      const actualResource = lambdaPermissionsPolicies[0].Resource['Fn::Join'][1];
-
-      expect(actualResource).to.deep.equal(expectedResource);
-    });
+        command: 'package',
+      })
+    ).to.be.eventually.rejected.and.have.property('code', 'S3_INVALID_NEW_BUCKET_FORMAT');
   });
 });

From 3c4c1b41ca7f09f776ca9e16a29926f9f8d34ebc Mon Sep 17 00:00:00 2001
From: Miles Spoor <github@likeminded.io>
Date: Thu, 17 Jun 2021 19:34:45 +0200
Subject: [PATCH 0210/1101] docs: Fix quotation marks on serverless hooks
 (#9618)

People copy pasting the config for hooks will copy invalid quotation marks and spend a while debugging it.
---
 docs/guides/cicd/custom-scripts.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guides/cicd/custom-scripts.md b/docs/guides/cicd/custom-scripts.md
index 06ffe7680ac..9a4f6b52e0a 100644
--- a/docs/guides/cicd/custom-scripts.md
+++ b/docs/guides/cicd/custom-scripts.md
@@ -85,7 +85,7 @@ plugins:
 custom:
   scripts:
     hooks:
-      ‘before:deploy:deploy': <your script>
+      'before:deploy:deploy': <your script>
 ```
 
 **After serverless deploy**
@@ -98,7 +98,7 @@ plugins:
 custom:
   scripts:
     hooks:
-      ‘deploy:finalize’: <your script>
+      'deploy:finalize': <your script>
 ```
 
 ## Additional lifecycle hooks

From 54da80e26497b8f1dbcd3027775628d11e1c6814 Mon Sep 17 00:00:00 2001
From: Corentin Doue <31917261+CorentinDoue@users.noreply.github.com>
Date: Fri, 18 Jun 2021 10:22:21 +0200
Subject: [PATCH 0211/1101] fix(AWS Invocation): Fix resolution of options with
 non-AWS provider (#9602)

---
 lib/plugins/invoke.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/plugins/invoke.js b/lib/plugins/invoke.js
index 9b39c8872d7..a9254a52cff 100644
--- a/lib/plugins/invoke.js
+++ b/lib/plugins/invoke.js
@@ -21,6 +21,9 @@ class Invoke {
     };
 
     this.hooks = {
+      'initialize': () => {
+        this.options = this.serverless.processedInput.options;
+      },
       'invoke:local:loadEnvVars': async () => BbPromise.bind(this).then(this.loadEnvVarsForLocal),
       'after:invoke:invoke': async () => BbPromise.bind(this).then(this.trackInvoke),
       'after:invoke:local:invoke': async () => BbPromise.bind(this).then(this.trackInvokeLocal),

From 9d3c4b9cd81fcb820293500f934cf6065eb41221 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 18 Jun 2021 10:48:51 +0200
Subject: [PATCH 0212/1101] chore: Bump dependencies

---
 package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index e2f0b5ba2ed..5a2ca8075f8 100644
--- a/package.json
+++ b/package.json
@@ -24,12 +24,12 @@
   "dependencies": {
     "@serverless/cli": "^1.5.2",
     "@serverless/components": "^3.12.0",
-    "@serverless/dashboard-plugin": "^5.3.0",
-    "@serverless/utils": "^5.2.0",
+    "@serverless/dashboard-plugin": "^5.4.0",
+    "@serverless/utils": "^5.3.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.926.0",
+    "aws-sdk": "^2.931.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
@@ -45,7 +45,7 @@
     "filesize": "^6.3.0",
     "fs-extra": "^9.1.0",
     "get-stdin": "^8.0.0",
-    "globby": "^11.0.3",
+    "globby": "^11.0.4",
     "got": "^11.8.2",
     "graceful-fs": "^4.2.6",
     "https-proxy-agent": "^5.0.0",
@@ -78,7 +78,7 @@
     "@serverless/test": "^8.1.1",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "cos-nodejs-sdk-v5": "^2.9.18",
+    "cos-nodejs-sdk-v5": "^2.9.20",
     "eslint": "^7.28.0",
     "eslint-plugin-import": "^2.23.4",
     "git-list-updated": "^1.2.1",
@@ -100,7 +100,7 @@
     "sinon-chai": "^3.7.0",
     "standard-version": "^9.3.0",
     "strip-ansi": "^6.0.0",
-    "ws": "^7.4.6",
+    "ws": "^7.5.0",
     "xml2js": "^0.4.23"
   },
   "eslintConfig": {

From 4bb5b34299faaedf2b06b4aa3da5854be3cc28e5 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 18 Jun 2021 10:56:37 +0200
Subject: [PATCH 0213/1101] chore: Release v2.47.0

---
 CHANGELOG.md | 18 ++++++++++++++++++
 package.json |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83726a5f6e1..9ff288526c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 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.
 
+## [2.47.0](https://github.com/serverless/serverless/compare/v2.46.0...v2.47.0) (2021-06-18)
+
+### Features
+
+- Deprecate Node.js v10 ([#9600](https://github.com/serverless/serverless/issues/9600)) ([e24fdc9](https://github.com/serverless/serverless/commit/e24fdc9f08f9849aad4136261695e44476484b0d)) ([Milind Vaidya](https://github.com/vaidyamilind))
+- **AWS HTTP API:** Support `payload` version per function ([#9551](https://github.com/serverless/serverless/issues/9551)) ([87ce28e](https://github.com/serverless/serverless/commit/87ce28ee4ea0e975859b8d32be8f2edd824b4cda)) ([Nyambayar Turbat](https://github.com/nyamba))
+- **AWS S3:** Support CloudFormation instrinsic functions at `functions[].events[].s3.bucket` property ([#9617](https://github.com/serverless/serverless/issues/9617)) ([42690a7](https://github.com/serverless/serverless/commit/42690a7352751581a8dbd44a4f776af17ab20da8)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **AWS Cognito:** Fix user pool premission resource logical id normalization ([#9592](https://github.com/serverless/serverless/issues/9592)) ([f4c9b58](https://github.com/serverless/serverless/commit/f4c9b58b10a45ae342934e9a61dcdea0c2ef11e2)) ([arunkc](https://github.com/Arun-kc))
+- **AWS Invocation:** Fix resolution of options with non-AWS provider ([#9602](https://github.com/serverless/serverless/issues/9602)) ([54da80e](https://github.com/serverless/serverless/commit/54da80e26497b8f1dbcd3027775628d11e1c6814)) ([Corentin Doue](https://github.com/CorentinDoue))
+- **Variables:** Ensure to strip unrecognized legacy `ssm` resolver instructions ([#9601](https://github.com/serverless/serverless/issues/9601)) ([f61859f](https://github.com/serverless/serverless/commit/f61859fd25908b13b6d9638c550e88ef4a08392e)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **Variables:** Improve error message ([#9601](https://github.com/serverless/serverless/issues/9601)) ([4a732e2](https://github.com/serverless/serverless/commit/4a732e2ebf6c7d81f5e0fbdc2e9bcb4715e4cadf)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ### [2.46.0](https://github.com/serverless/serverless/compare/v2.45.2...v2.46.0) (2021-06-11)
 
 ### Features
diff --git a/package.json b/package.json
index 5a2ca8075f8..f75f754c3e6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.46.0",
+  "version": "2.47.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From d7c39f082a874d8c913969866d11b15ef2e68b2f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 21 Jun 2021 09:09:46 +0200
Subject: [PATCH 0214/1101] docs(Variables): Improve "ssm" resolution docs

---
 docs/providers/aws/guide/variables.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/providers/aws/guide/variables.md b/docs/providers/aws/guide/variables.md
index 283e2d6aace..8466520484d 100644
--- a/docs/providers/aws/guide/variables.md
+++ b/docs/providers/aws/guide/variables.md
@@ -275,10 +275,13 @@ Buckets from all regions can be used without any additional specification due to
 
 ## Reference Variables using the SSM Parameter Store
 
+_Note: Ensure to add `variablesResolutionMode: 20210326` to your service configuration, to enable complete support for "ssm" variables resolution._
+
 You can reference SSM Parameters as the source of your variables with the `ssm:/path/to/param` syntax. For example:
 
 ```yml
 service: ${ssm:/path/to/service/id}-service
+variablesResolutionMode: 20210326
 provider:
   name: aws
 functions:
@@ -293,6 +296,7 @@ You can also reference SSM Parameters in another region with the `ssm(REGION):/p
 
 ```yml
 service: ${ssm(us-west-2):/path/to/service/id}-service
+variablesResolutionMode: 20210326
 provider:
   name: aws
 functions:
@@ -305,8 +309,6 @@ functions:
 
 New variable resolver, ensures that automatically other types as `SecureString` and `StringList` are resolved into expected forms.
 
-For that please ensure to add `variablesResolutionMode: 20210326` to your service configuration.
-
 #### Auto decrypting of `SecureString` type parameters.
 
 All `SecureString` type parameters are automatically decrypted, and automatically parsed if they export stringified JSON content (Note: you can turn off parsing by passing `raw` instruction into variable as: `${ssm(raw):/path/to/secureparam}`, if you need to also pass custom region, put it first as: `${ssm(eu-west-1, raw):/path/to/secureparam}`)

From 9e10ceaf81e8b9d13867937fedc9502a1ff4e320 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Sun, 20 Jun 2021 22:00:54 +0200
Subject: [PATCH 0215/1101] refactor(Telemetry): Recognize `constructs`

---
 lib/utils/telemetry/generatePayload.js        | 22 +++++++++-
 .../utils/telemetry/generatePayload.test.js   | 40 +++++++++++++++++++
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index 43807fd1cc7..9ecf3ef95aa 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -67,7 +67,11 @@ const getServiceConfig = ({ configuration, options }) => {
     };
   })();
 
-  return {
+  const plugins = configuration.plugins
+    ? configuration.plugins.modules || configuration.plugins
+    : [];
+
+  const result = {
     provider: {
       name: providerName,
       runtime: defaultRuntime,
@@ -76,7 +80,7 @@ const getServiceConfig = ({ configuration, options }) => {
         ? options.region || configuration.provider.region || 'us-east-1'
         : _.get(configuration, 'provider.region'),
     },
-    plugins: configuration.plugins ? configuration.plugins.modules || configuration.plugins : [],
+    plugins,
     functions: Object.values(functions)
       .map((functionConfig) => {
         if (!functionConfig) return null;
@@ -96,6 +100,20 @@ const getServiceConfig = ({ configuration, options }) => {
       .filter(Boolean),
     resources,
   };
+
+  // We want to recognize types of constructs from `serverless-lift` plugin if possible
+  if (plugins.includes('serverless-lift') && _.isObject(configuration.constructs)) {
+    result.constructs = Object.values(configuration.constructs)
+      .map((construct) => {
+        if (_.isObject(construct) && construct.type != null) {
+          return { type: construct.type };
+        }
+        return null;
+      })
+      .filter(Boolean);
+  }
+
+  return result;
 };
 
 module.exports = async ({
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index bf1b1d3a5b8..d17754c4847 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -518,4 +518,44 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       new Set(['region', 'format', 'path'])
     );
   });
+
+  it('Should correctly resolve `constructs` property', async () => {
+    const { serverless } = await runServerless({
+      fixture: 'httpApi',
+      command: 'print',
+    });
+    const payload = await generatePayload({
+      command: 'print',
+      commandSchema: commandsSchema.get('print'),
+      options: {},
+      serviceDir: serverless.serviceDir,
+      configuration: {
+        ...serverless.configurationInput,
+        constructs: {
+          jobs: {
+            type: 'queue',
+            worker: {
+              handler: 'some.handler',
+            },
+          },
+          another: {
+            type: 'queue',
+            worker: {
+              handler: 'other.handler',
+            },
+          },
+        },
+        plugins: ['serverless-lift'],
+      },
+    });
+
+    expect(payload.config.constructs).to.deep.equal([
+      {
+        type: 'queue',
+      },
+      {
+        type: 'queue',
+      },
+    ]);
+  });
 });

From c22a8b99f2f64a76c592e800a8cf698dbff75b9c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 17 Jun 2021 12:37:13 +0200
Subject: [PATCH 0216/1101] feat: Introduce an opt-in "error" deprecation
 notification mode

---
 docs/deprecations.md                       | 15 +++++++++++++++
 docs/providers/aws/guide/serverless.yml.md |  1 +
 lib/classes/Service.js                     |  1 +
 lib/configSchema.js                        |  3 +++
 lib/utils/logDeprecation.js                | 17 +++++++++++++++++
 scripts/serverless.js                      |  1 +
 test/unit/lib/utils/logDeprecation.test.js | 20 ++++++++++++++++++++
 7 files changed, 58 insertions(+)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 8ad5aec3293..2666726bd4d 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -17,6 +17,21 @@ disabledDeprecations:
   - '*' # To disable all deprecation messages
 ```
 
+## Notifications mode
+
+By default deprecations are logged as warnings. If there's an intention to work with _deprecation_ free service, reporting mode can be switched so approached deprecation is reported with a thrown error.
+
+Mode can be set via environment variable: `SLS_DEPRECATION_NOTIFICATION_MODE=error` or via top level service configuration setting:
+
+```yaml
+deprecationNotificationMode: error
+```
+
+Note:
+
+- Configuration setting is ineffective for deprecations reported before service configuration is read.
+- `SLS_DEPRECATION_DISABLE` env var and `disabledDeprecations` configuration setting remain respected, and no errors will be thrown for mentioned deprecation coodes.
+
 <a name="CHANGE_OF_DEFAULT_RUNTIME_TO_NODEJS14X"><div>&nbsp;</div></a>
 
 ## Change of default runtime to `nodejs14.x`
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 49e87b47cb5..c11cea51b16 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -29,6 +29,7 @@ enableLocalInstallationFallback: false # If set to 'true', guarantees that it's
 useDotenv: false # If set to 'true', environment variables will be automatically loaded from .env files
 variablesResolutionMode: null # To crash on variable resolution errors (as coming from new resolver), set this value to "20210326"
 unresolvedVariablesNotificationMode: warn # If set to 'error', references to variables that cannot be resolved will result in an error being thrown (applies to legacy resolver)
+deprecationNotificationMode: warn # If set to 'error' any reported deprection will result in an error being thrown
 
 disabledDeprecations: # Disable deprecation logs by their codes. Default is empty.
   - DEP_CODE_1 # Deprecation code to disable
diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index 7b04d52e3f7..17bd752bd06 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -150,6 +150,7 @@ class Service {
 
     this.plugins = configurationInput.plugins;
     this.disabledDeprecations = configurationInput.disabledDeprecations;
+    this.deprecationNotificationMode = configurationInput.deprecationNotificationMode;
 
     // `package.path` is read by few core plugins at initialization
     if (configurationInput.package) {
diff --git a/lib/configSchema.js b/lib/configSchema.js
index 6017bb13856..e69b4b2a351 100644
--- a/lib/configSchema.js
+++ b/lib/configSchema.js
@@ -20,6 +20,9 @@ const schema = {
       required: [],
       // User is free to add any properties for its own purpose
     },
+    deprecationsNotificationMode: {
+      enum: ['error', 'warn'],
+    },
     disabledDeprecations: {
       anyOf: [
         { const: '*' },
diff --git a/lib/utils/logDeprecation.js b/lib/utils/logDeprecation.js
index cb0a22e187f..755b826115a 100644
--- a/lib/utils/logDeprecation.js
+++ b/lib/utils/logDeprecation.js
@@ -2,9 +2,13 @@
 
 const chalk = require('chalk');
 const weakMemoizee = require('memoizee/weak');
+const _ = require('lodash');
+const ServerlessError = require('../serverless-error');
 
 const disabledCodesByEnv = extractCodes(process.env.SLS_DEPRECATION_DISABLE);
 
+const notificationModeByEnv = process.env.SLS_DEPRECATION_NOTIFICATION_MODE;
+
 const triggeredDeprecations = new Set();
 
 function extractCodes(codesStr) {
@@ -24,6 +28,11 @@ const resolveDeprecatedByService = weakMemoizee((serviceConfig) => {
   return new Set(disabledDeprecations);
 });
 
+const isErrorNotificationMode = (serviceConfig) => {
+  if (notificationModeByEnv) return notificationModeByEnv === 'error';
+  return _.get(serviceConfig, 'deprecationNotificationMode') === 'error';
+};
+
 function writeDeprecation(code, message) {
   const prefix = 'Serverless: ';
   const messageLines = message.split('\n');
@@ -53,6 +62,7 @@ module.exports = (code, message, { serviceConfig } = {}) => {
     ) {
       return;
     }
+
     if (serviceConfig) {
       const serviceDisabledCodes = resolveDeprecatedByService(serviceConfig);
       if (serviceDisabledCodes.has(code) || serviceDisabledCodes.has('*')) {
@@ -60,6 +70,13 @@ module.exports = (code, message, { serviceConfig } = {}) => {
       }
     }
 
+    if (isErrorNotificationMode(serviceConfig)) {
+      throw new ServerlessError(
+        `${message}\n  More Info: https://www.serverless.com/framework/docs/deprecations/#${code}`,
+        `REJECTED_DEPRECATION_${code}`
+      );
+    }
+
     writeDeprecation(code, message);
   } finally {
     triggeredDeprecations.add(code);
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 244ae92e04a..1d7ec5d2dd0 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -203,6 +203,7 @@ const processSpanPromise = (async () => {
           // variable resolution choices
           if (!ensureResolvedProperty('variablesResolutionMode')) return;
           if (!ensureResolvedProperty('disabledDeprecations')) return;
+          if (!ensureResolvedProperty('deprecationNotificationMode')) return;
 
           if (isPropertyResolved(variablesMeta, 'provider\0name')) {
             providerName = resolveProviderName(configuration);
diff --git a/test/unit/lib/utils/logDeprecation.test.js b/test/unit/lib/utils/logDeprecation.test.js
index cc798040923..faa47740ee1 100644
--- a/test/unit/lib/utils/logDeprecation.test.js
+++ b/test/unit/lib/utils/logDeprecation.test.js
@@ -6,6 +6,7 @@ const mockRequire = require('mock-require');
 const overrideEnv = require('process-utils/override-env');
 const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const runServerless = require('../../../utils/run-serverless');
+const ServerlessError = require('../../../../lib/serverless-error');
 
 describe('#logDeprecation()', () => {
   let restoreEnv;
@@ -91,6 +92,25 @@ describe('#logDeprecation()', () => {
     });
   });
 
+  it('Should throw on deprecation if env.SLS_DEPRECATION_NOTIFICATION_MODE=error', () => {
+    process.env.SLS_DEPRECATION_NOTIFICATION_MODE = 'error';
+    logDeprecation = mockRequire.reRequire('../../../../lib/utils/logDeprecation');
+    expect(() => logDeprecation('CODE1', 'Start using deprecation log'))
+      .to.throw(ServerlessError)
+      .with.property('code', 'REJECTED_DEPRECATION_CODE1');
+  });
+
+  it('Should throw on deprecation if error notifications mode set in service config', () => {
+    logDeprecation = mockRequire.reRequire('../../../../lib/utils/logDeprecation');
+    expect(() =>
+      logDeprecation('CODE1', 'Start using deprecation log', {
+        serviceConfig: { deprecationNotificationMode: 'error' },
+      })
+    )
+      .to.throw(ServerlessError)
+      .with.property('code', 'REJECTED_DEPRECATION_CODE1');
+  });
+
   it('Should not log deprecation twice', () => {
     let stdoutData = '';
     overrideStdoutWrite(

From 660201310e68061ccd0bf802b715a4355a56bb77 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 17 Jun 2021 12:38:57 +0200
Subject: [PATCH 0217/1101] refactor: Improve var naming

---
 lib/utils/logDeprecation.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/utils/logDeprecation.js b/lib/utils/logDeprecation.js
index 755b826115a..223876a2953 100644
--- a/lib/utils/logDeprecation.js
+++ b/lib/utils/logDeprecation.js
@@ -5,7 +5,7 @@ const weakMemoizee = require('memoizee/weak');
 const _ = require('lodash');
 const ServerlessError = require('../serverless-error');
 
-const disabledCodesByEnv = extractCodes(process.env.SLS_DEPRECATION_DISABLE);
+const disabledDeprecationCodesByEnv = extractCodes(process.env.SLS_DEPRECATION_DISABLE);
 
 const notificationModeByEnv = process.env.SLS_DEPRECATION_NOTIFICATION_MODE;
 
@@ -18,7 +18,7 @@ function extractCodes(codesStr) {
   return new Set(codesStr.split(','));
 }
 
-const resolveDeprecatedByService = weakMemoizee((serviceConfig) => {
+const resolveDisabledDeprecationsByService = weakMemoizee((serviceConfig) => {
   let disabledDeprecations = [];
   if (typeof serviceConfig.disabledDeprecations === 'string') {
     disabledDeprecations = [serviceConfig.disabledDeprecations];
@@ -57,14 +57,14 @@ module.exports = (code, message, { serviceConfig } = {}) => {
   try {
     if (
       triggeredDeprecations.has(code) ||
-      disabledCodesByEnv.has(code) ||
-      disabledCodesByEnv.has('*')
+      disabledDeprecationCodesByEnv.has(code) ||
+      disabledDeprecationCodesByEnv.has('*')
     ) {
       return;
     }
 
     if (serviceConfig) {
-      const serviceDisabledCodes = resolveDeprecatedByService(serviceConfig);
+      const serviceDisabledCodes = resolveDisabledDeprecationsByService(serviceConfig);
       if (serviceDisabledCodes.has(code) || serviceDisabledCodes.has('*')) {
         return;
       }

From 89444a40a8d7b12e88d2273a2f0bc94e90d71ee7 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 17 Jun 2021 12:52:31 +0200
Subject: [PATCH 0218/1101] test: Improve deprecations tests reliability

---
 test/unit/lib/utils/logDeprecation.test.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/test/unit/lib/utils/logDeprecation.test.js b/test/unit/lib/utils/logDeprecation.test.js
index faa47740ee1..cdf8658439b 100644
--- a/test/unit/lib/utils/logDeprecation.test.js
+++ b/test/unit/lib/utils/logDeprecation.test.js
@@ -2,7 +2,6 @@
 
 const sandbox = require('sinon');
 const expect = require('chai').expect;
-const mockRequire = require('mock-require');
 const overrideEnv = require('process-utils/override-env');
 const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const runServerless = require('../../../utils/run-serverless');
@@ -11,10 +10,9 @@ const ServerlessError = require('../../../../lib/serverless-error');
 describe('#logDeprecation()', () => {
   let restoreEnv;
   let originalEnv;
-  let logDeprecation;
 
   beforeEach(() => {
-    logDeprecation = mockRequire.reRequire('../../../../lib/utils/logDeprecation');
+    delete require.cache[require.resolve('../../../../lib/utils/logDeprecation')];
     ({ originalEnv, restoreEnv } = overrideEnv());
   });
 
@@ -24,6 +22,7 @@ describe('#logDeprecation()', () => {
   });
 
   it('Should log deprecation message if not disabled and first time', () => {
+    const logDeprecation = require('../../../../lib/utils/logDeprecation');
     let stdoutData = '';
     overrideStdoutWrite(
       (data) => (stdoutData += data),
@@ -37,7 +36,8 @@ describe('#logDeprecation()', () => {
 
   it('Should not log deprecation if disabled in env.SLS_DEPRECATION_DISABLE', () => {
     process.env.SLS_DEPRECATION_DISABLE = 'CODE1';
-    logDeprecation = mockRequire.reRequire('../../../../lib/utils/logDeprecation');
+    const logDeprecation = require('../../../../lib/utils/logDeprecation');
+
     let stdoutData = '';
     overrideStdoutWrite(
       (data) => (stdoutData += data),
@@ -49,6 +49,7 @@ describe('#logDeprecation()', () => {
   it('Should not log deprecation if disabled in serviceConfig', () => {
     // We need original process env variables for npm-conf
     Object.assign(process.env, originalEnv);
+    const logDeprecation = require('../../../../lib/utils/logDeprecation');
     return runServerless({
       fixture: 'function',
       configExt: { disabledDeprecations: ['CODE1'] },
@@ -66,7 +67,7 @@ describe('#logDeprecation()', () => {
 
   it('Should not log deprecation if disabled by wildcard in env', () => {
     process.env.SLS_DEPRECATION_DISABLE = '*';
-    logDeprecation = mockRequire.reRequire('../../../../lib/utils/logDeprecation');
+    const logDeprecation = require('../../../../lib/utils/logDeprecation');
     let stdoutData = '';
     overrideStdoutWrite(
       (data) => (stdoutData += data),
@@ -77,6 +78,7 @@ describe('#logDeprecation()', () => {
 
   it('Should not log deprecation if disabled by wildcard in service config', () => {
     Object.assign(process.env, originalEnv);
+    const logDeprecation = require('../../../../lib/utils/logDeprecation');
     return runServerless({
       fixture: 'function',
       configExt: { disabledDeprecations: '*' },
@@ -94,14 +96,14 @@ describe('#logDeprecation()', () => {
 
   it('Should throw on deprecation if env.SLS_DEPRECATION_NOTIFICATION_MODE=error', () => {
     process.env.SLS_DEPRECATION_NOTIFICATION_MODE = 'error';
-    logDeprecation = mockRequire.reRequire('../../../../lib/utils/logDeprecation');
+    const logDeprecation = require('../../../../lib/utils/logDeprecation');
     expect(() => logDeprecation('CODE1', 'Start using deprecation log'))
       .to.throw(ServerlessError)
       .with.property('code', 'REJECTED_DEPRECATION_CODE1');
   });
 
   it('Should throw on deprecation if error notifications mode set in service config', () => {
-    logDeprecation = mockRequire.reRequire('../../../../lib/utils/logDeprecation');
+    const logDeprecation = require('../../../../lib/utils/logDeprecation');
     expect(() =>
       logDeprecation('CODE1', 'Start using deprecation log', {
         serviceConfig: { deprecationNotificationMode: 'error' },
@@ -116,6 +118,7 @@ describe('#logDeprecation()', () => {
     overrideStdoutWrite(
       (data) => (stdoutData += data),
       () => {
+        const logDeprecation = require('../../../../lib/utils/logDeprecation');
         logDeprecation('CODE1', 'Start using deprecation log');
         expect(stdoutData).to.include('Start using deprecation log');
         stdoutData = '';

From d1c0e263e43286207f01300335ddd20338367cf1 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 17 Jun 2021 13:54:21 +0200
Subject: [PATCH 0219/1101] test: Fix description title

---
 test/unit/lib/cli/resolve-configuration-path.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/lib/cli/resolve-configuration-path.test.js b/test/unit/lib/cli/resolve-configuration-path.test.js
index cd7a04561e7..036a1734abb 100644
--- a/test/unit/lib/cli/resolve-configuration-path.test.js
+++ b/test/unit/lib/cli/resolve-configuration-path.test.js
@@ -13,7 +13,7 @@ const resolveServerlessConfigPath = require('../../../../lib/cli/resolve-configu
 const resolveInput = require('../../../../lib/cli/resolve-input');
 const { triggeredDeprecations } = require('../../../../lib/utils/logDeprecation');
 
-describe('test/unit/lib/cli/resolve-service-config-path.test.js', () => {
+describe('test/unit/lib/cli/resolve-configuration-path.test.js', () => {
   let configurationPath;
   afterEach(async () => {
     if (!configurationPath) return;

From 91c934b6d59da97c47a39ad4b1f5e96c9449a463 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 17 Jun 2021 14:14:23 +0200
Subject: [PATCH 0220/1101] test: Improve description title

---
 test/unit/lib/configSchema.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/lib/configSchema.test.js b/test/unit/lib/configSchema.test.js
index 7fd86a8e065..dd33937950b 100644
--- a/test/unit/lib/configSchema.test.js
+++ b/test/unit/lib/configSchema.test.js
@@ -3,7 +3,7 @@
 const runServerless = require('../../utils/run-serverless');
 const expect = require('chai').expect;
 
-describe('#configSchema', () => {
+describe('test/unit/lib/configSchema.test.js', () => {
   const cases = [
     {
       isValid: true,

From 011e0ce45cec4b1273268fcab4f99e377fae092e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 18 Jun 2021 12:17:56 +0200
Subject: [PATCH 0221/1101] fix: Ensure to support deprecation settings at
 early stage of processing

---
 lib/classes/Service.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index 17bd752bd06..2f8b8fab24b 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -115,7 +115,10 @@ class Service {
     // Below comments provide usage feedback helfpul for future refactor process.
 
     // ## Properties currently accessed at "initialization" phase
-    //
+
+    this.disabledDeprecations = configurationInput.disabledDeprecations;
+    this.deprecationNotificationMode = configurationInput.deprecationNotificationMode;
+
     // `provider` (`provder.name` by many plugin constructs, and few other core properties as
     //              `provider.stage` are read by dashboard plugin)
     if (!_.isObject(configurationInput.provider)) {
@@ -149,8 +152,6 @@ class Service {
     this.org = configurationInput.org;
 
     this.plugins = configurationInput.plugins;
-    this.disabledDeprecations = configurationInput.disabledDeprecations;
-    this.deprecationNotificationMode = configurationInput.deprecationNotificationMode;
 
     // `package.path` is read by few core plugins at initialization
     if (configurationInput.package) {

From 5330d2b46edafdc32587c0228b30cda1225a37b1 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 18 Jun 2021 12:27:46 +0200
Subject: [PATCH 0222/1101] test: Fix section title

---
 .../lib/plugins/aws/package/compile/events/cloudFront.test.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
index 48d64889369..5139cf6259c 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
@@ -1646,7 +1646,7 @@ describe('AwsCompileCloudFrontEvents', () => {
   });
 });
 
-describe('lib/plugins/aws/package/compile/events/cloudFront/index.new.test.js', () => {
+describe('test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js', () => {
   describe.skip('TODO: Removal notice', () => {
     it('should show preconfigured notice on "sls remove" if service has cloudFront event', async () => {
       // Replaces

From dd9c72c73694fef0147e3944fcf1ff92639f096a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 18 Jun 2021 12:37:59 +0200
Subject: [PATCH 0223/1101] test: Remove invalid test

---
 .../lib/mergeCustomProviderResources.test.js  | 42 -------------------
 1 file changed, 42 deletions(-)

diff --git a/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js b/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
index f117d4f7a6d..75b868dfc6f 100644
--- a/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
@@ -169,48 +169,6 @@ describe('mergeCustomProviderResources', () => {
       ).to.deep.equal(coreCloudFormationTemplate.Outputs.ServerlessDeploymentBucketName);
     });
 
-    it('should create non-existent resource / attributes for resources.extensions.*', () => {
-      awsPackage.serverless.service.provider.compiledCloudFormationTemplate.Resources = {};
-
-      awsPackage.serverless.service.resources = {
-        extensions: {
-          SampleResource: {
-            Properties: {
-              PropertyA: 'new',
-            },
-            DependsOn: ['new'],
-            Metadata: {
-              key: 'value',
-              anotherKey: {
-                key2: 'value2',
-              },
-            },
-          },
-        },
-      };
-
-      awsPackage.mergeCustomProviderResources();
-      expect(awsPackage.serverless.service.provider.compiledCloudFormationTemplate.extensions).to
-        .not.exist;
-
-      expect(
-        awsPackage.serverless.service.provider.compiledCloudFormationTemplate.Resources
-      ).to.deep.equal({
-        SampleResource: {
-          Properties: {
-            PropertyA: 'new',
-          },
-          DependsOn: ['new'],
-          Metadata: {
-            key: 'value',
-            anotherKey: {
-              key2: 'value2',
-            },
-          },
-        },
-      });
-    });
-
     it('should overwrite for resources.extensions.*.{CreationPolicy,DeletionPolicy,UpdatePolicy,UpdateReplacePolicy}', () => {
       awsPackage.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
         SampleResource: {

From 68c2a084f91b58832bd5417efaaa3fd6a6178d53 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 18 Jun 2021 12:45:08 +0200
Subject: [PATCH 0224/1101] fix(Packaging): Do not report hashing deprecations
 for container lambdas

---
 lib/plugins/aws/package/compile/functions.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index c4973abf133..0521ee39abe 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -50,6 +50,7 @@ class AwsCompileFunctions {
         if (
           !this.serverless.service.provider.lambdaHashingVersion &&
           Object.keys(this.serverless.service.functions).length &&
+          Object.values(this.serverless.service.functions).some(({ handler }) => handler) &&
           (this.serverless.service.provider.versionFunctions ||
             Object.values(this.serverless.service.functions).some(
               ({ versionFunction }) => versionFunction

From a7fd091b10460a7eafaa458a2ca31e069143ced5 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 18 Jun 2021 12:48:37 +0200
Subject: [PATCH 0225/1101] test: Fix describe title

---
 test/unit/lib/plugins/package/lib/packageService.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/lib/plugins/package/lib/packageService.test.js b/test/unit/lib/plugins/package/lib/packageService.test.js
index b593109a0b9..565205f166c 100644
--- a/test/unit/lib/plugins/package/lib/packageService.test.js
+++ b/test/unit/lib/plugins/package/lib/packageService.test.js
@@ -13,7 +13,7 @@ chai.use(require('chai-as-promised'));
 chai.use(require('sinon-chai'));
 const { expect } = require('chai');
 
-describe('lib/plugins/package/lib/packageService.test.js', () => {
+describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
   const mockedDescribeStacksResponse = {
     CloudFormation: {
       describeStacks: {

From 53b97621dccdef8f9f2e15e2f4f31045b46970e2 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 18 Jun 2021 13:13:14 +0200
Subject: [PATCH 0226/1101] fix: Ensure early access to configuration in
 logDeprecation method

---
 lib/Serverless.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index 85cee171443..597d7f49f84 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -445,7 +445,7 @@ class Serverless {
 
   // Only for internal use
   _logDeprecation(code, message) {
-    return logDeprecation(code, message, { serviceConfig: this.service });
+    return logDeprecation(code, message, { serviceConfig: this.configurationInput });
   }
 
   // To be used by external plugins

From d4e873a576e8418086318deab4a07c74e8a087f2 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 18 Jun 2021 13:43:35 +0200
Subject: [PATCH 0227/1101] test: Refactor to async/await

---
 test/unit/lib/classes/Variables.test.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/test/unit/lib/classes/Variables.test.js b/test/unit/lib/classes/Variables.test.js
index 5a098c9162b..64db99f9171 100644
--- a/test/unit/lib/classes/Variables.test.js
+++ b/test/unit/lib/classes/Variables.test.js
@@ -603,16 +603,13 @@ describe('Variables', () => {
           })
         ).to.be.fulfilled;
       });
-      it('should do nothing useful on * when not wrapped in quotes', () => {
+      it('should do nothing useful on * when not wrapped in quotes', async () => {
         service.custom = {
           val0: '${self:custom.*}',
         };
         const expected = { val0: undefined };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
+        const result = await serverless.variables.populateObject(service.custom);
+        expect(result).to.eql(expected);
       });
       it('should properly populate overwrites where the middle value is valid', () => {
         service.custom = {

From 64cd157b6fa32317b448473ac6808abcff2934f5 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 18 Jun 2021 13:50:11 +0200
Subject: [PATCH 0228/1101] test: Refactor to async/await

---
 test/unit/lib/classes/Variables.test.js | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/test/unit/lib/classes/Variables.test.js b/test/unit/lib/classes/Variables.test.js
index 64db99f9171..6598190c48a 100644
--- a/test/unit/lib/classes/Variables.test.js
+++ b/test/unit/lib/classes/Variables.test.js
@@ -1207,19 +1207,16 @@ module.exports = {
         .should.eventually.eql('my stage is prod');
     });
 
-    it('should not allow partially double-quoted string', () => {
+    it('should not allow partially double-quoted string', async () => {
       const property = '${opt:stage, prefix"prod"suffix}';
       serverless.variables.options = {};
       const handleUnresolvedSpy = sinon.spy(serverless.variables, 'handleUnresolved');
-      return serverless.variables
-        .populateProperty(property)
-        .should.become(undefined)
-        .then(() => {
-          expect(handleUnresolvedSpy.callCount).to.equal(1);
-        })
-        .finally(() => {
-          handleUnresolvedSpy.restore();
-        });
+      try {
+        expect(await serverless.variables.populateProperty(property)).to.equal(undefined);
+        expect(handleUnresolvedSpy.callCount).to.equal(1);
+      } finally {
+        handleUnresolvedSpy.restore();
+      }
     });
 
     it('should allow a boolean with value true if overwrite syntax provided', () => {

From 81ddcf8ecb9d8667ba27028a9bef7e70bb4d44df Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 18 Jun 2021 16:39:43 +0200
Subject: [PATCH 0229/1101] test: Upgrade from deprecated forms when not
 testing them intentionally

---
 .../checkForChanges/serverless.yml            |  2 +-
 .../functionLayers/serverless.yml             |  4 +-
 .../programmatic/packaging/serverless.yml     |  1 +
 .../programmatic/requestSchema/serverless.yml |  1 +
 test/integration/aws/eventBridge.test.js      |  1 +
 .../individually-function/serverless.yml      | 10 ++---
 .../fixtures/individually/serverless.yml      | 10 ++---
 test/integrationPackage/lambda-files.tests.js |  6 +--
 test/unit/lib/Serverless.test.js              | 27 ++++++++++----
 test/unit/lib/classes/PluginManager.test.js   | 18 ++++++++-
 test/unit/lib/classes/Service.test.js         |  3 ++
 test/unit/lib/classes/Variables.test.js       | 18 ++++++---
 .../cli/commands-schema/resolve-final.test.js |  4 ++
 test/unit/lib/cli/resolve-input.test.js       |  2 +
 test/unit/lib/configSchema.test.js            | 37 ++-----------------
 .../instance-dependent/get-sls.test.js        |  3 +-
 .../lib/plugins/aws/configCredentials.test.js |  2 +-
 .../plugins/aws/customResources/index.test.js | 15 +++-----
 .../aws/deploy/lib/createStack.test.js        |  2 +
 .../lib/plugins/aws/deployFunction.test.js    | 12 ++++--
 .../events/apiGateway/lib/usagePlan.test.js   |  1 -
 .../events/apiGateway/lib/validate.test.js    |  2 +-
 .../package/compile/events/cloudFront.test.js |  1 +
 .../compile/events/eventBridge/index.test.js  |  6 ++-
 .../aws/package/compile/functions.test.js     |  2 +
 .../aws/package/lib/mergeIamTemplates.test.js |  5 ++-
 test/unit/lib/plugins/install.test.js         |  2 +-
 .../package/lib/packageService.test.js        | 25 ++++++++-----
 test/unit/lib/plugins/package/package.test.js |  2 +-
 test/unit/lib/plugins/slstats.test.js         |  2 +-
 .../lib/utils/getCommandSuggestion.test.js    |  2 +-
 test/unit/lib/utils/renameService.test.js     |  2 +-
 32 files changed, 129 insertions(+), 101 deletions(-)

diff --git a/test/fixtures/programmatic/checkForChanges/serverless.yml b/test/fixtures/programmatic/checkForChanges/serverless.yml
index 5fd17eeba56..4a86560d160 100644
--- a/test/fixtures/programmatic/checkForChanges/serverless.yml
+++ b/test/fixtures/programmatic/checkForChanges/serverless.yml
@@ -16,4 +16,4 @@ functions:
   fnIndividually:
     handler: fnIndividually.handler
     package:
-      exclude: fn.js
+      patterns: '!fn.js'
diff --git a/test/fixtures/programmatic/functionLayers/serverless.yml b/test/fixtures/programmatic/functionLayers/serverless.yml
index d408249e207..45323a22442 100644
--- a/test/fixtures/programmatic/functionLayers/serverless.yml
+++ b/test/fixtures/programmatic/functionLayers/serverless.yml
@@ -18,8 +18,8 @@ layers:
     path: testLayer
 
 package:
-  exclude:
-    - extra_layers/**
+  patterns:
+    - '!extra_layers/**'
 
 functions:
   layerFunc:
diff --git a/test/fixtures/programmatic/packaging/serverless.yml b/test/fixtures/programmatic/packaging/serverless.yml
index fcee3661fd8..3eca74e636f 100644
--- a/test/fixtures/programmatic/packaging/serverless.yml
+++ b/test/fixtures/programmatic/packaging/serverless.yml
@@ -2,6 +2,7 @@ service: service
 
 configValidationMode: error
 frameworkVersion: '*'
+disabledDeprecations: LOAD_VARIABLES_FROM_ENV_FILES
 
 provider:
   name: aws
diff --git a/test/fixtures/programmatic/requestSchema/serverless.yml b/test/fixtures/programmatic/requestSchema/serverless.yml
index a48b7a26050..ec142d6142b 100644
--- a/test/fixtures/programmatic/requestSchema/serverless.yml
+++ b/test/fixtures/programmatic/requestSchema/serverless.yml
@@ -1,4 +1,5 @@
 service: service
+disabledDeprecations: AWS_API_GATEWAY_SCHEMAS
 
 provider:
   name: aws
diff --git a/test/integration/aws/eventBridge.test.js b/test/integration/aws/eventBridge.test.js
index eb794f16178..6d6349599be 100644
--- a/test/integration/aws/eventBridge.test.js
+++ b/test/integration/aws/eventBridge.test.js
@@ -50,6 +50,7 @@ describe('AWS - Event Bridge Integration Test', () => {
       arnEventBusArn = (await createEventBus(arnEventBusName)).EventBusArn;
       // update the YAML file with the arn
       await serviceData.updateConfig({
+        disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE'],
         functions: {
           eventBusDefaultArn: {
             events: [
diff --git a/test/integrationPackage/fixtures/individually-function/serverless.yml b/test/integrationPackage/fixtures/individually-function/serverless.yml
index aba9cf5d283..864c0e5e92e 100644
--- a/test/integrationPackage/fixtures/individually-function/serverless.yml
+++ b/test/integrationPackage/fixtures/individually-function/serverless.yml
@@ -12,15 +12,13 @@ functions:
     handler: handler.hello
     package:
       individually: true
-      include:
+      patterns:
         - handler.js
-      exclude:
-        - handler2.js
+        - '!handler2.js'
   hello2:
     handler: handler2.hello
     package:
       individually: true
-      include:
+      patterns:
         - handler2.js
-      exclude:
-        - handler.js
+        - '!handler.js'
diff --git a/test/integrationPackage/fixtures/individually/serverless.yml b/test/integrationPackage/fixtures/individually/serverless.yml
index 68377a33170..0d50543bad9 100644
--- a/test/integrationPackage/fixtures/individually/serverless.yml
+++ b/test/integrationPackage/fixtures/individually/serverless.yml
@@ -14,14 +14,12 @@ functions:
   hello:
     handler: handler.hello
     package:
-      include:
+      patterns:
         - handler.js
-      exclude:
-        - handler2.js
+        - '!handler2.js'
   hello2:
     handler: handler2.hello
     package:
-      include:
+      patterns:
         - handler2.js
-      exclude:
-        - handler.js
+        - '!handler.js'
diff --git a/test/integrationPackage/lambda-files.tests.js b/test/integrationPackage/lambda-files.tests.js
index 962257fd74b..38b083270b5 100644
--- a/test/integrationPackage/lambda-files.tests.js
+++ b/test/integrationPackage/lambda-files.tests.js
@@ -62,7 +62,7 @@ describe('Integration test - Packaging - Lambda Files', function () {
     await spawn('npm', ['init', '--yes'], { cwd });
     await fs.appendFile(
       path.resolve(cwd, 'serverless.yml'),
-      '\npackage: {exclude: ["package*.json"]}\n'
+      '\npackage: {patterns: ["!package*.json"]}\n'
     );
     await spawn('npm', ['i', 'lodash'], { cwd });
     await spawn(serverlessExec, ['package'], { cwd });
@@ -75,7 +75,7 @@ describe('Integration test - Packaging - Lambda Files', function () {
     expect(nonNodeModulesFiles).to.deep.equal(['handler.js']);
   });
 
-  it('handles package individually with include/excludes correctly', async () => {
+  it('handles package individually with patterns correctly', async () => {
     await fse.copy(fixturePaths.individually, cwd);
     await spawn(serverlessExec, ['package'], { cwd });
     expect(await listZipFiles(path.join(cwd, '.serverless/hello.zip'))).to.deep.equal([
@@ -86,7 +86,7 @@ describe('Integration test - Packaging - Lambda Files', function () {
     ]);
   });
 
-  it('handles package individually on function level with include/excludes correctly', async () => {
+  it('handles package individually on function level with patterns correctly', async () => {
     await fse.copy(fixturePaths.individuallyFunction, cwd);
     await spawn(serverlessExec, ['package'], { cwd });
     expect(await listZipFiles(path.join(cwd, '.serverless/hello.zip'))).to.deep.equal([
diff --git a/test/unit/lib/Serverless.test.js b/test/unit/lib/Serverless.test.js
index fa5016f19ff..7c67a120ba9 100644
--- a/test/unit/lib/Serverless.test.js
+++ b/test/unit/lib/Serverless.test.js
@@ -23,7 +23,7 @@ describe('Serverless', () => {
   let serverless;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: ['print'], options: {}, serviceDir: null });
   });
 
   describe('#constructor()', () => {
@@ -237,7 +237,6 @@ describe('test/unit/lib/Serverless.test.js', () => {
           expect(serverless.isLocalStub).to.be.true;
         }));
 
-      let serverlessWithDisabledLocalInstallationFallback;
       it('Should report deprecation notice when "enableLocalInstallationFallback" is set', () =>
         runServerless({
           fixture: 'locallyInstalledServerless',
@@ -245,7 +244,6 @@ describe('test/unit/lib/Serverless.test.js', () => {
           command: 'print',
           modulesCacheStub: {},
         }).then(({ serverless }) => {
-          serverlessWithDisabledLocalInstallationFallback = serverless;
           expect(Array.from(serverless.triggeredDeprecations)).to.deep.equal([
             'DISABLE_LOCAL_INSTALLATION_FALLBACK_SETTING',
           ]);
@@ -254,13 +252,26 @@ describe('test/unit/lib/Serverless.test.js', () => {
           expect(serverless.isLocalStub).to.not.exist;
         }));
 
-      it('Should not fallback to local when "enableLocalInstallationFallback" set to false', () =>
-        expect(serverlessWithDisabledLocalInstallationFallback.invokedInstance).to.not.exist);
+      it('Should not fallback to local when "enableLocalInstallationFallback" set to false', async () => {
+        const { serverless } = await runServerless({
+          fixture: 'locallyInstalledServerless',
+          configExt: {
+            disabledDeprecations: 'DISABLE_LOCAL_INSTALLATION_FALLBACK_SETTING',
+            enableLocalInstallationFallback: false,
+          },
+          command: 'print',
+          modulesCacheStub: {},
+        });
+        expect(serverless.invokedInstance).to.not.exist;
+      });
 
       it('Should fallback to local version when "enableLocalInstallationFallback" set to true', () =>
         runServerless({
           fixture: 'locallyInstalledServerless',
-          configExt: { enableLocalInstallationFallback: true },
+          configExt: {
+            disabledDeprecations: 'DISABLE_LOCAL_INSTALLATION_FALLBACK_SETTING',
+            enableLocalInstallationFallback: true,
+          },
           command: 'print',
           modulesCacheStub: {},
         }).then(({ serverless }) => {
@@ -314,7 +325,7 @@ describe('test/unit/lib/Serverless.test.js', () => {
             useDotenv: true,
             custom: {
               fromDefaultEnv: '${env:DEFAULT_ENV_VARIABLE}',
-              fromStageEnv: '${env:STAGE_ENV_VARIABLE}',
+              fromStageEnv: "${env:STAGE_ENV_VARIABLE, 'not-found'}",
             },
           },
         })
@@ -333,7 +344,7 @@ describe('test/unit/lib/Serverless.test.js', () => {
       });
 
       expect(result.serverless.service.custom.fromDefaultEnv).to.equal('valuefromdefault');
-      expect(result.serverless.service.custom.fromStageEnv).to.be.undefined;
+      expect(result.serverless.service.custom.fromStageEnv).to.equal('not-found');
     });
   });
 
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
index 302907c269f..22f894ff900 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/PluginManager.test.js
@@ -31,7 +31,6 @@ chai.use(require('sinon-chai'));
 const expect = chai.expect;
 
 describe('PluginManager', () => {
-  const env = resolveAwsEnv();
   let pluginManager;
   let serverless;
 
@@ -159,9 +158,11 @@ describe('PluginManager', () => {
           options: {
             resource: {
               usage: 'The resource you want to deploy (e.g. --resource db)',
+              type: 'string',
             },
             function: {
               usage: 'The function you want to deploy (e.g. --function create)',
+              type: 'string',
             },
           },
           commands: {
@@ -171,9 +172,11 @@ describe('PluginManager', () => {
               options: {
                 resource: {
                   usage: 'The resource you want to deploy (e.g. --resource db)',
+                  type: 'string',
                 },
                 function: {
                   usage: 'The function you want to deploy (e.g. --function create)',
+                  type: 'string',
                 },
               },
             },
@@ -209,9 +212,11 @@ describe('PluginManager', () => {
           options: {
             resource: {
               usage: 'The resource you want to deploy (e.g. --resource db)',
+              type: 'string',
             },
             function: {
               usage: 'The function you want to deploy (e.g. --function create)',
+              type: 'string',
             },
           },
           commands: {
@@ -222,9 +227,11 @@ describe('PluginManager', () => {
               options: {
                 resource: {
                   usage: 'The resource you want to deploy (e.g. --resource db)',
+                  type: 'string',
                 },
                 function: {
                   usage: 'The function you want to deploy (e.g. --function create)',
+                  type: 'string',
                 },
               },
             },
@@ -1997,10 +2004,17 @@ describe('PluginManager', () => {
     this.timeout(1000 * 60 * 10);
 
     let serverlessInstance;
+    let env;
     const serverlessExec = require('../../../serverlessBinary');
 
+    before(() => {
+      env = resolveAwsEnv();
+      // Test may be run against deprecated Node.js versions
+      env.SLS_DEPRECATION_DISABLE = 'OUTDATED_NODEJS';
+    });
+
     beforeEach(() => {
-      serverlessInstance = new Serverless();
+      serverlessInstance = new Serverless({ commands: ['print'], options: {}, serviceDir: null });
       return serverlessInstance.init().then(() => {
         // Cannot rely on shebang in severless.js to invoke script using NodeJS on Windows.
         const tmpDir = getTmpDirPath();
diff --git a/test/unit/lib/classes/Service.test.js b/test/unit/lib/classes/Service.test.js
index 0fc5cb155a8..9b48d323210 100644
--- a/test/unit/lib/classes/Service.test.js
+++ b/test/unit/lib/classes/Service.test.js
@@ -91,6 +91,9 @@ describe('Service', () => {
       runServerless({
         fixture: 'aws',
         configExt: {
+          provider: {
+            lambdaHashingVersion: 20201221,
+          },
           functions: [
             {
               a: {},
diff --git a/test/unit/lib/classes/Variables.test.js b/test/unit/lib/classes/Variables.test.js
index 6598190c48a..3398e9725ad 100644
--- a/test/unit/lib/classes/Variables.test.js
+++ b/test/unit/lib/classes/Variables.test.js
@@ -39,7 +39,13 @@ describe('Variables', () => {
 
   beforeEach(() => {
     ({ restoreEnv } = overrideEnv());
-    serverless = new Serverless();
+    serverless = new Serverless({
+      commands: ['print'],
+      options: {},
+      serviceDir: process.cwd(),
+      configuration: {},
+      configurationFilename: 'serverless.yml',
+    });
   });
 
   const afterCallback = () => restoreEnv();
@@ -508,7 +514,7 @@ describe('Variables', () => {
         service = makeDefault();
         // eslint-disable-next-line no-template-curly-in-string
         service.provider.variableSyntax = '\\${([ ~:a-zA-Z0-9._@\'",\\-\\/\\(\\)*?]+?)}'; // default
-        serverless.variables.service = service;
+        serverless.service = serverless.variables.service = service;
         serverless.variables.loadVariableSyntax();
         delete service.provider.variableSyntax;
       });
@@ -603,11 +609,11 @@ describe('Variables', () => {
           })
         ).to.be.fulfilled;
       });
-      it('should do nothing useful on * when not wrapped in quotes', async () => {
+      it("should treat '*' literally when not wrapped in quotes", async () => {
         service.custom = {
-          val0: '${self:custom.*}',
+          val0: "${self:custom.*, 'fallback'}",
         };
-        const expected = { val0: undefined };
+        const expected = { val0: 'fallback' };
         const result = await serverless.variables.populateObject(service.custom);
         expect(result).to.eql(expected);
       });
@@ -1210,6 +1216,7 @@ module.exports = {
     it('should not allow partially double-quoted string', async () => {
       const property = '${opt:stage, prefix"prod"suffix}';
       serverless.variables.options = {};
+      serverless.configurationInput.disabledDeprecations = ['VARIABLES_ERROR_ON_UNRESOLVED'];
       const handleUnresolvedSpy = sinon.spy(serverless.variables, 'handleUnresolved');
       try {
         expect(await serverless.variables.populateProperty(property)).to.equal(undefined);
@@ -2893,6 +2900,7 @@ describe('test/unit/lib/classes/Variables.test.js', () => {
           fixture: 'variables-legacy',
           command: 'print',
           configExt: {
+            disabledDeprecations: ['VARIABLES_ERROR_ON_UNRESOLVED'],
             custom: {
               myVariable1: '${env:missingEnvVar}',
               myVariable2: '${opt:missingOpt}',
diff --git a/test/unit/lib/cli/commands-schema/resolve-final.test.js b/test/unit/lib/cli/commands-schema/resolve-final.test.js
index 536c4bf99bb..071f830b56c 100644
--- a/test/unit/lib/cli/commands-schema/resolve-final.test.js
+++ b/test/unit/lib/cli/commands-schema/resolve-final.test.js
@@ -20,6 +20,7 @@ describe('test/unit/lib/cli/commands-schema/resolve-final.test.js', () => {
                       resourceGroup: {
                         usage: 'Resource group for the service',
                         shortcut: 'g',
+                        type: 'string',
                       },
                     },
                   },
@@ -32,6 +33,7 @@ describe('test/unit/lib/cli/commands-schema/resolve-final.test.js', () => {
                   dryrun: {
                     usage: 'Get a summary for what the deployment would look like',
                     shortcut: 'd',
+                    type: 'boolean',
                   },
                 },
               },
@@ -91,6 +93,7 @@ describe('test/unit/lib/cli/commands-schema/resolve-final.test.js', () => {
                       resourceGroup: {
                         usage: 'Resource group for the service',
                         shortcut: 'g',
+                        type: 'string',
                       },
                     },
                   },
@@ -103,6 +106,7 @@ describe('test/unit/lib/cli/commands-schema/resolve-final.test.js', () => {
                   dryrun: {
                     usage: 'Get a summary for what the deployment would look like',
                     shortcut: 'd',
+                    type: 'boolean',
                   },
                 },
               },
diff --git a/test/unit/lib/cli/resolve-input.test.js b/test/unit/lib/cli/resolve-input.test.js
index 69c2ad3a931..d885f5d4386 100644
--- a/test/unit/lib/cli/resolve-input.test.js
+++ b/test/unit/lib/cli/resolve-input.test.js
@@ -10,6 +10,8 @@ describe('test/unit/lib/cli/resolve-input.test.js', () => {
     let data;
     before(() => {
       resolveInput.clear();
+      delete require.cache[require.resolve('../../../../lib/utils/logDeprecation')];
+      process.env.SLS_DEPRECATION_DISABLE = 'CLI_OPTIONS_BEFORE_COMMAND';
       data = overrideArgv(
         {
           args: [
diff --git a/test/unit/lib/configSchema.test.js b/test/unit/lib/configSchema.test.js
index dd33937950b..84b8a27566a 100644
--- a/test/unit/lib/configSchema.test.js
+++ b/test/unit/lib/configSchema.test.js
@@ -15,7 +15,7 @@ describe('test/unit/lib/configSchema.test.js', () => {
       errorMessage: "should have required property 'name'",
       description: 'service required properties',
       mutation: {
-        service: {},
+        provider: { name: null },
       },
     },
     {
@@ -26,42 +26,12 @@ describe('test/unit/lib/configSchema.test.js', () => {
         service: '1-first-number-is-not-allowed',
       },
     },
-    {
-      isValid: false,
-      errorMessage: 'should match pattern "^[a-zA-Z][0-9a-zA-Z-]+$"',
-      description: 'service name in object typed service',
-      mutation: {
-        service: { name: '1-first-number-is-not-allowed' },
-      },
-    },
-    {
-      isValid: false,
-      errorMessage: 'should match pattern "^arn:aws[a-z-]*:kms',
-      description: 'service awsKmsKeyArn',
-      mutation: {
-        service: {
-          name: 'some-service',
-          awsKmsKeyArn: 'invalidArn',
-        },
-      },
-    },
-    {
-      isValid: true,
-      description: 'service awsKmsKeyArn',
-      mutation: {
-        service: {
-          name: 'some-service',
-          awsKmsKeyArn: 'arn:aws:kms:us-east-1:123456789012:key/some-hash',
-        },
-      },
-    },
     {
       isValid: false,
       errorMessage: 'unrecognized property',
       description: 'service unknown property',
       mutation: {
-        service: {
-          name: 'some-service',
+        provider: {
           unknownProp: 'this is not supported',
         },
       },
@@ -108,8 +78,7 @@ describe('test/unit/lib/configSchema.test.js', () => {
           individually: true,
           path: undefined,
           artifact: 'path/to/my-artifact.zip',
-          exclude: ['.git/**', '.travis.yml'],
-          include: ['src/**', 'handler.js'],
+          patterns: ['!.git/**', '!.travis.yml', 'src/**', 'handler.js'],
           excludeDevDependencies: false,
         },
       },
diff --git a/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js b/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js
index dc937b5234f..f4f0b07e272 100644
--- a/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js
+++ b/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js
@@ -35,7 +35,8 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
     variablesMeta = resolveMeta(configuration);
     serverlessInstance = new Serverless({
       configuration,
-      configurationPath: process.cwd(),
+      serviceDir: process.cwd(),
+      configurationFilename: 'serverless.yml',
       isConfigurationResolved: true,
       hasResolvedCommandsExternally: true,
       commands: ['package'],
diff --git a/test/unit/lib/plugins/aws/configCredentials.test.js b/test/unit/lib/plugins/aws/configCredentials.test.js
index eac88a4f6b6..00874dffd43 100644
--- a/test/unit/lib/plugins/aws/configCredentials.test.js
+++ b/test/unit/lib/plugins/aws/configCredentials.test.js
@@ -37,7 +37,7 @@ describe('AwsConfigCredentials', () => {
   });
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: ['print'], options: {}, serviceDir: null });
     return serverless.init().then(() => {
       const options = {
         provider: 'aws',
diff --git a/test/unit/lib/plugins/aws/customResources/index.test.js b/test/unit/lib/plugins/aws/customResources/index.test.js
index 8fa7b0b2c74..b59e130c9ef 100644
--- a/test/unit/lib/plugins/aws/customResources/index.test.js
+++ b/test/unit/lib/plugins/aws/customResources/index.test.js
@@ -204,14 +204,16 @@ describe('#addCustomResourceToService()', () => {
       ]);
     }));
 
-  it('should use custom role when cfnRole is provided', async () => {
+  it('should use custom role when deployment role is provided', async () => {
     const role = 'arn:aws:iam::999999999999:role/my-role';
     const { cfTemplate } = await runServerless({
       fixture: 'function',
       command: 'package',
       configExt: {
         provider: {
-          cfnRole: role,
+          iam: {
+            deploymentRole: role,
+          },
         },
         functions: {
           foo: {
@@ -219,12 +221,6 @@ describe('#addCustomResourceToService()', () => {
             events: [
               { s3: { bucket: 'my-bucket', existing: true } },
               { cognitoUserPool: { pool: 'my-user-pool', trigger: 'PreSignUp', existing: true } },
-              {
-                eventBridge: {
-                  eventBus: 'arn:aws:events:us-east-1:12345:event-bus/default',
-                  schedule: 'rate(10 minutes)',
-                },
-              },
             ],
           },
         },
@@ -235,8 +231,7 @@ describe('#addCustomResourceToService()', () => {
     expect([
       Resources.CustomDashresourceDashexistingDashs3LambdaFunction.Properties.Role, // S3
       Resources.CustomDashresourceDashexistingDashcupLambdaFunction.Properties.Role, // Cognito User Pool
-      Resources.CustomDashresourceDasheventDashbridgeLambdaFunction.Properties.Role, // Event Bridge
-    ]).to.eql([role, role, role]);
+    ]).to.eql([role, role]);
   });
 
   it('should setup CloudWatch Logs when logs.frameworkLambda is true', () => {
diff --git a/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js b/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js
index 804d35650ae..1eba20b83ff 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js
@@ -260,6 +260,7 @@ describe('createStack #2', () => {
       fixture: 'function',
       command: 'deploy',
       configExt: {
+        disabledDeprecations: ['PROVIDER_IAM_SETTINGS'],
         provider: {
           iam: {
             deploymentRole: 'arn:aws:iam::123456789012:role/role-a',
@@ -281,6 +282,7 @@ describe('createStack #2', () => {
       fixture: 'function',
       command: 'deploy',
       configExt: {
+        disabledDeprecations: ['PROVIDER_IAM_SETTINGS'],
         provider: {
           cfnRole: 'arn:aws:iam::123456789012:role/role-b',
         },
diff --git a/test/unit/lib/plugins/aws/deployFunction.test.js b/test/unit/lib/plugins/aws/deployFunction.test.js
index 7960927121e..25867a9620e 100644
--- a/test/unit/lib/plugins/aws/deployFunction.test.js
+++ b/test/unit/lib/plugins/aws/deployFunction.test.js
@@ -22,7 +22,7 @@ describe('AwsDeployFunction', () => {
   let cryptoStub;
 
   beforeEach(async () => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: ['print'], options: {}, serviceDir: null });
     serverless.servicePath = true;
     serverless.service.environment = {
       vars: {},
@@ -588,7 +588,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
         },
         functions: {
           foo: {
-            awsKmsKeyArn: kmsKeyArn,
+            kmsKeyArn,
             description,
             handler,
             environment: {
@@ -708,7 +708,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
             VARIABLE: 'value',
           },
           memorySize,
-          role,
+          iam: { role },
           timeout,
           vpc: {
             securityGroupIds: ['sg-111', 'sg-222'],
@@ -790,7 +790,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
         },
         functions: {
           foo: {
-            awsKmsKeyArn: kmsKeyArn,
+            kmsKeyArn,
             description,
             handler,
             environment: {
@@ -825,6 +825,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       lastLifecycleHookName: 'deploy:function:deploy',
       awsRequestStubMap,
       configExt: {
+        disabledDeprecations: ['AWS_KMS_KEY_ARN'],
         functions: {
           foo: {
             handler: 'index.handler',
@@ -853,6 +854,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       lastLifecycleHookName: 'deploy:function:deploy',
       awsRequestStubMap,
       configExt: {
+        disabledDeprecations: ['AWS_KMS_KEY_ARN', 'SERVICE_OBJECT_NOTATION'],
         functions: {
           foo: {
             handler: 'index.handler',
@@ -882,6 +884,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       lastLifecycleHookName: 'deploy:function:deploy',
       awsRequestStubMap,
       configExt: {
+        disabledDeprecations: ['AWS_KMS_KEY_ARN', 'SERVICE_OBJECT_NOTATION'],
         functions: {
           foo: {
             handler: 'index.handler',
@@ -910,6 +913,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       lastLifecycleHookName: 'deploy:function:deploy',
       awsRequestStubMap,
       configExt: {
+        disabledDeprecations: ['AWS_KMS_KEY_ARN'],
         functions: {
           foo: {
             handler: 'index.handler',
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js
index b6723aa837f..5b91a921fa9 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js
@@ -312,7 +312,6 @@ describe('UsagePlan', () => {
   const serverlessConfigurationExtension = {
     provider: {
       name: 'aws',
-      usagePlan: {},
     },
     functions: {
       foo: {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
index 740145de88d..6229ad10b5f 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
@@ -16,7 +16,7 @@ describe('#validate()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: ['print'], options: {}, serviceDir: null });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     awsCompileApigEvents = new AwsCompileApigEvents(serverless, options);
   });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
index 5139cf6259c..cdfe0ef7a46 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
@@ -1792,6 +1792,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js',
           fixture: 'function',
           command: 'package',
           configExt: {
+            disabledDeprecations: ['CLOUDFRONT_CACHE_BEHAVIOR_FORWARDED_VALUES_AND_TTL'],
             functions: {
               foo: {
                 handler: 'myLambdaAtEdge.handler',
diff --git a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
index 9a49fd8e935..b1097d44048 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
@@ -138,7 +138,10 @@ describe('EventBridgeEvents', () => {
     before(async () => {
       const { cfTemplate, awsNaming } = await runServerless({
         fixture: 'function',
-        configExt: serverlessConfigurationExtension,
+        configExt: {
+          disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE'],
+          ...serverlessConfigurationExtension,
+        },
         command: 'package',
       });
       cfResources = cfTemplate.Resources;
@@ -238,6 +241,7 @@ describe('EventBridgeEvents', () => {
         runServerless({
           fixture: 'function',
           configExt: {
+            disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE'],
             functions: {
               foo: {
                 events: [
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index a6123d07248..3b7ea4bc1e8 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -236,6 +236,7 @@ describe('AwsCompileFunctions', () => {
       const { cfTemplate } = await runServerless({
         fixture: 'function',
         configExt: {
+          disabledDeprecations: ['PROVIDER_IAM_SETTINGS'],
           provider: {
             role: 'role-a',
             iam: { role: 'role-b' },
@@ -1478,6 +1479,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
             name: 'service',
             awsKmsKeyArn: 'arn:aws:kms:region:accountid:pro/vider',
           },
+          disabledDeprecations: ['SERVICE_OBJECT_NOTATION', 'AWS_KMS_KEY_ARN'],
           provider: {
             vpc: {
               subnetIds: ['subnet-01010101'],
diff --git a/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js b/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
index 59bd555d7ea..808c9f83dfb 100644
--- a/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
@@ -18,11 +18,12 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
       expect(cfTemplate.Resources).to.not.have.property(iamRoleLambdaExecution);
     });
 
-    it('should not create role resource with `provider.role`', async () => {
+    it('should not create role resource with deprecated `provider.role`', async () => {
       const { cfTemplate, awsNaming } = await runServerless({
         fixture: 'function',
         command: 'package',
         configExt: {
+          disabledDeprecations: ['PROVIDER_IAM_SETTINGS'],
           provider: {
             name: 'aws',
             role: 'arn:aws:iam::YourAccountNumber:role/YourIamRole',
@@ -179,6 +180,7 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
           fixture: 'function',
           command: 'package',
           configExt: {
+            disabledDeprecations: ['PROVIDER_IAM_SETTINGS'],
             provider: {
               iamRoleStatements: [
                 {
@@ -245,6 +247,7 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
           fixture: 'function',
           command: 'package',
           configExt: {
+            disabledDeprecations: ['PROVIDER_IAM_SETTINGS'],
             provider: {
               iam: {
                 role: {
diff --git a/test/unit/lib/plugins/install.test.js b/test/unit/lib/plugins/install.test.js
index 0a6df6bc2c4..7e051307191 100644
--- a/test/unit/lib/plugins/install.test.js
+++ b/test/unit/lib/plugins/install.test.js
@@ -29,7 +29,7 @@ describe('Install', () => {
 
     serviceDir = tmpDir;
 
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: ['print'], options: {}, serviceDir: null });
     install = new Install(serverless);
     return serverless.init().then(() => {
       install.serverless.cli = new serverless.classes.CLI();
diff --git a/test/unit/lib/plugins/package/lib/packageService.test.js b/test/unit/lib/plugins/package/lib/packageService.test.js
index 565205f166c..1f5108c9325 100644
--- a/test/unit/lib/plugins/package/lib/packageService.test.js
+++ b/test/unit/lib/plugins/package/lib/packageService.test.js
@@ -49,12 +49,16 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
         awsRequestStubMap: mockedDescribeStacksResponse,
         configExt: {
           package: {
-            exclude: ['dir1/**', '!dir1/subdir3/**'],
-            include: ['dir1/subdir2/**', '!dir1/subdir2/subsubdir1'],
+            patterns: [
+              '!dir1/**',
+              'dir1/subdir3/**',
+              'dir1/subdir2/**',
+              '!dir1/subdir2/subsubdir1',
+            ],
           },
           functions: {
             fnIndividual: {
-              package: { include: 'dir1/subdir4/**', exclude: 'dir3/**' },
+              package: { patterns: ['dir1/subdir4/**', '!dir3/**'] },
             },
           },
         },
@@ -170,12 +174,16 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
         configExt: {
           package: {
             individually: true,
-            exclude: ['dir1/**', '!dir1/subdir3/**'],
-            include: ['dir1/subdir2/**', '!dir1/subdir2/subsubdir1'],
+            patterns: [
+              '!dir1/**',
+              'dir1/subdir3/**',
+              'dir1/subdir2/**',
+              '!dir1/subdir2/subsubdir1',
+            ],
           },
           functions: {
             fnIndividual: {
-              package: { include: 'dir1/subdir4/**', exclude: 'dir3/**' },
+              package: { patterns: ['dir1/subdir4/**', '!dir3/**'] },
             },
           },
           plugins: {
@@ -228,13 +236,12 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
         configExt: {
           package: {
             artifact: 'artifact.zip',
-            exclude: ['dir1', '!dir1/subdir3/**'],
-            include: ['dir1/subdir2/**', '!dir1/subdir2/subsubdir1'],
+            patterns: ['!dir1', 'dir1/subdir3/**', 'dir1/subdir2/**', '!dir1/subdir2/subsubdir1'],
           },
           functions: {
             fnIndividual: {
               handler: 'index.handler',
-              package: { individually: true, include: 'dir1/subdir3/**', exclude: 'dir1/subdir2' },
+              package: { individually: true, patterns: ['dir1/subdir3/**', '!dir1/subdir2'] },
             },
             fnArtifact: {
               handler: 'index.handler',
diff --git a/test/unit/lib/plugins/package/package.test.js b/test/unit/lib/plugins/package/package.test.js
index 1b29fc098eb..175b319799e 100644
--- a/test/unit/lib/plugins/package/package.test.js
+++ b/test/unit/lib/plugins/package/package.test.js
@@ -16,7 +16,7 @@ describe('Package', () => {
   let pkg;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: ['print'], options: {}, serviceDir: null });
     return serverless.init().then(() => {
       options = {
         stage: 'dev',
diff --git a/test/unit/lib/plugins/slstats.test.js b/test/unit/lib/plugins/slstats.test.js
index afe6e869d68..19402910777 100644
--- a/test/unit/lib/plugins/slstats.test.js
+++ b/test/unit/lib/plugins/slstats.test.js
@@ -11,7 +11,7 @@ describe('SlStats', () => {
   let serverless;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: ['print'], options: {}, serviceDir: null });
     return serverless.init().then(() => {
       slStats = new SlStats(serverless);
     });
diff --git a/test/unit/lib/utils/getCommandSuggestion.test.js b/test/unit/lib/utils/getCommandSuggestion.test.js
index 9a377a1fe51..38ddaa02cfd 100644
--- a/test/unit/lib/utils/getCommandSuggestion.test.js
+++ b/test/unit/lib/utils/getCommandSuggestion.test.js
@@ -8,7 +8,7 @@ describe('#getCommandSuggestion', () => {
   let serverless;
 
   before(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: ['print'], options: {}, serviceDir: null });
     return serverless.init();
   });
 
diff --git a/test/unit/lib/utils/renameService.test.js b/test/unit/lib/utils/renameService.test.js
index b5c758539fe..9af5b2c9c44 100644
--- a/test/unit/lib/utils/renameService.test.js
+++ b/test/unit/lib/utils/renameService.test.js
@@ -23,7 +23,7 @@ describe('renameService', () => {
 
     serviceDir = tmpDir;
 
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: ['print'], options: {}, serviceDir: null });
     return serverless.init();
   });
 

From bc3fc11d7906859e54f6d6123dbd065ae3039a6c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 18 Jun 2021 16:58:09 +0200
Subject: [PATCH 0230/1101] test: Adapt to deprecation notification error mode

---
 package.json                                  |  2 +-
 test/unit/lib/Serverless.test.js              | 33 +++++++++--------
 .../lib/cli/ensure-supported-command.test.js  |  5 +--
 .../cli/resolve-configuration-path.test.js    | 36 +++++++++++--------
 ...ventually-report-resolution-errors.test.js | 19 +++++-----
 .../report-deprecated-properties.test.js      | 15 ++++++--
 6 files changed, 65 insertions(+), 45 deletions(-)

diff --git a/package.json b/package.json
index f75f754c3e6..906cccc9bc6 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
   "devDependencies": {
     "@commitlint/cli": "^12.1.4",
     "@serverless/eslint-config": "^3.0.0",
-    "@serverless/test": "^8.1.1",
+    "@serverless/test": "^8.2.0",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "cos-nodejs-sdk-v5": "^2.9.20",
diff --git a/test/unit/lib/Serverless.test.js b/test/unit/lib/Serverless.test.js
index 7c67a120ba9..9b9a388ef4d 100644
--- a/test/unit/lib/Serverless.test.js
+++ b/test/unit/lib/Serverless.test.js
@@ -1,6 +1,11 @@
 'use strict';
 
-const expect = require('chai').expect;
+const chai = require('chai');
+
+chai.use(require('chai-as-promised'));
+
+const { expect } = chai;
+
 const Serverless = require('../../../lib/Serverless');
 const semverRegex = require('semver-regex');
 const path = require('path');
@@ -237,20 +242,18 @@ describe('test/unit/lib/Serverless.test.js', () => {
           expect(serverless.isLocalStub).to.be.true;
         }));
 
-      it('Should report deprecation notice when "enableLocalInstallationFallback" is set', () =>
-        runServerless({
-          fixture: 'locallyInstalledServerless',
-          configExt: { enableLocalInstallationFallback: false },
-          command: 'print',
-          modulesCacheStub: {},
-        }).then(({ serverless }) => {
-          expect(Array.from(serverless.triggeredDeprecations)).to.deep.equal([
-            'DISABLE_LOCAL_INSTALLATION_FALLBACK_SETTING',
-          ]);
-          expect(serverless._isInvokedByGlobalInstallation).to.be.false;
-          expect(serverless.isLocallyInstalled).to.be.false;
-          expect(serverless.isLocalStub).to.not.exist;
-        }));
+      it('Should report deprecation notice when "enableLocalInstallationFallback" is set', async () =>
+        expect(
+          runServerless({
+            fixture: 'locallyInstalledServerless',
+            configExt: { enableLocalInstallationFallback: false },
+            command: 'print',
+            modulesCacheStub: {},
+          })
+        ).to.eventually.be.rejected.and.have.property(
+          'code',
+          'REJECTED_DEPRECATION_DISABLE_LOCAL_INSTALLATION_FALLBACK_SETTING'
+        ));
 
       it('Should not fallback to local when "enableLocalInstallationFallback" set to false', async () => {
         const { serverless } = await runServerless({
diff --git a/test/unit/lib/cli/ensure-supported-command.test.js b/test/unit/lib/cli/ensure-supported-command.test.js
index ca21ebd3091..4b57eb7742d 100644
--- a/test/unit/lib/cli/ensure-supported-command.test.js
+++ b/test/unit/lib/cli/ensure-supported-command.test.js
@@ -57,8 +57,9 @@ describe('test/unit/lib/cli/ensure-supported-command.test.js', () => {
       },
       () => resolveInput()
     );
-    ensureSupportedCommand();
-    expect(triggeredDeprecations.has('UNSUPPORTED_CLI_OPTIONS')).to.be.true;
+    expect(() => ensureSupportedCommand())
+      .to.throw(ServerlessError)
+      .with.property('code', 'REJECTED_DEPRECATION_UNSUPPORTED_CLI_OPTIONS');
   });
 
   it('should reject missing options', async () => {
diff --git a/test/unit/lib/cli/resolve-configuration-path.test.js b/test/unit/lib/cli/resolve-configuration-path.test.js
index 036a1734abb..8435c7f457e 100644
--- a/test/unit/lib/cli/resolve-configuration-path.test.js
+++ b/test/unit/lib/cli/resolve-configuration-path.test.js
@@ -9,9 +9,10 @@ const path = require('path');
 const fs = require('fs').promises;
 const fse = require('fs-extra');
 const overrideArgv = require('process-utils/override-argv');
+const overrideEnv = require('process-utils/override-env');
+const requireUncached = require('ncjsm/require-uncached');
 const resolveServerlessConfigPath = require('../../../../lib/cli/resolve-configuration-path');
 const resolveInput = require('../../../../lib/cli/resolve-input');
-const { triggeredDeprecations } = require('../../../../lib/utils/logDeprecation');
 
 describe('test/unit/lib/cli/resolve-configuration-path.test.js', () => {
   let configurationPath;
@@ -68,10 +69,8 @@ describe('test/unit/lib/cli/resolve-configuration-path.test.js', () => {
       ])
     );
     beforeEach(() => {
-      triggeredDeprecations.clear();
       resolveInput.clear();
     });
-    after(() => triggeredDeprecations.clear());
 
     it('should accept absolute path, pointing configuration in current working directory', async () => {
       await overrideArgv(
@@ -83,15 +82,26 @@ describe('test/unit/lib/cli/resolve-configuration-path.test.js', () => {
     });
 
     it('should temporarily support nested path', async () => {
-      await overrideArgv(
-        {
-          args: ['serverless', '--config', 'nested/custom.yml'],
-        },
-        async () => {
-          expect(await resolveServerlessConfigPath()).to.equal(path.resolve('nested/custom.yml'));
-          expect(triggeredDeprecations.has('NESTED_CUSTOM_CONFIGURATION_PATH')).to.be.true;
-        }
-      );
+      await overrideEnv(async () => {
+        process.env.SLS_DEPRECATION_NOTIFICATION_MODE = 'warn';
+        const uncached = requireUncached(() => ({
+          resolveServerlessConfigPath: require('../../../../lib/cli/resolve-configuration-path'),
+          triggeredDeprecations: require('../../../../lib/utils/logDeprecation')
+            .triggeredDeprecations,
+        }));
+        await overrideArgv(
+          {
+            args: ['serverless', '--config', 'nested/custom.yml'],
+          },
+          async () => {
+            expect(await uncached.resolveServerlessConfigPath()).to.equal(
+              path.resolve('nested/custom.yml')
+            );
+            expect(uncached.triggeredDeprecations.has('NESTED_CUSTOM_CONFIGURATION_PATH')).to.be
+              .true;
+          }
+        );
+      });
     });
     it('should reject unsupported extension', async () => {
       await overrideArgv(
@@ -155,10 +165,8 @@ describe('test/unit/lib/cli/resolve-configuration-path.test.js', () => {
       ])
     );
     beforeEach(() => {
-      triggeredDeprecations.clear();
       resolveInput.clear();
     });
-    after(() => triggeredDeprecations.clear());
 
     it('should support custom cwd', async () => {
       expect(await resolveServerlessConfigPath({ cwd: 'normal' })).to.equal(
diff --git a/test/unit/lib/configuration/variables/eventually-report-resolution-errors.test.js b/test/unit/lib/configuration/variables/eventually-report-resolution-errors.test.js
index 3a3020ba069..081c57a3a39 100644
--- a/test/unit/lib/configuration/variables/eventually-report-resolution-errors.test.js
+++ b/test/unit/lib/configuration/variables/eventually-report-resolution-errors.test.js
@@ -43,18 +43,15 @@ describe('test/unit/lib/configuration/variables/eventually-report-resolution-err
     it('should log deprecation with no "variablesResolutionMode" set', () => {
       const configuration = { foo: '${foo:raz' };
       const variablesMeta = resolveMeta(configuration);
-      let stdoutData = '';
-      overrideArgv({ args: ['serverless', 'foo'] }, () =>
-        overrideStdoutWrite(
-          (data) => (stdoutData += data),
-          () =>
-            expect(
-              eventuallyReportResolutionErrors(process.cwd(), configuration, variablesMeta)
-            ).to.equal(true)
-        )
+      overrideArgv(
+        { args: ['serverless', 'foo'] },
+        () => () =>
+          expect(() =>
+            eventuallyReportResolutionErrors(process.cwd(), configuration, variablesMeta)
+          )
+            .to.throw(ServerlessError)
+            .with.property('code', 'REJECTED_DEPRECATION_VARIABLES_RESOLUTION_ERROR')
       );
-
-      expect(stdoutData).to.include('NEW_VARIABLES_RESOLVER');
     });
     it('should throw with no "variablesResolutionMode" set', () => {
       const configuration = { foo: '${foo:raz', variablesResolutionMode: 20210326 };
diff --git a/test/unit/lib/utils/report-deprecated-properties.test.js b/test/unit/lib/utils/report-deprecated-properties.test.js
index 7d614f762fb..e7c27300d41 100644
--- a/test/unit/lib/utils/report-deprecated-properties.test.js
+++ b/test/unit/lib/utils/report-deprecated-properties.test.js
@@ -1,12 +1,23 @@
 'use strict';
 
 const expect = require('chai').expect;
-const report = require('../../../../lib/utils/report-deprecated-properties');
-const { triggeredDeprecations } = require('../../../../lib/utils/logDeprecation');
+const requireUncached = require('ncjsm/require-uncached');
+
 const overrideStdoutWrite = require('process-utils/override-stdout-write');
 
 describe('report-deprecated-properties', () => {
   let stdoutData = '';
+  let report;
+  let triggeredDeprecations;
+
+  before(() => {
+    process.env.SLS_DEPRECATION_NOTIFICATION_MODE = 'warn';
+    requireUncached(() => {
+      report = require('../../../../lib/utils/report-deprecated-properties');
+      ({ triggeredDeprecations } = require('../../../../lib/utils/logDeprecation'));
+    });
+  });
+
   afterEach(() => {
     stdoutData = '';
     triggeredDeprecations.clear();

From c97ffcc0b976a4efe67b14858ac96580d7b9d4a9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 21 Jun 2021 13:37:22 +0200
Subject: [PATCH 0231/1101] test: Remove env var setting, which is already set
 by dependency

---
 test/mochaPatch.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test/mochaPatch.js b/test/mochaPatch.js
index 4e86c2c5b16..cc877850ec8 100644
--- a/test/mochaPatch.js
+++ b/test/mochaPatch.js
@@ -52,9 +52,6 @@ BbPromise.config({
   longStackTraces: true,
 });
 
-// In order to ensure that telemetry is not mistakenly emitted during test runs
-process.env.SLS_TELEMETRY_DISABLED = '1';
-
 const { runnerEmitter } = require('@serverless/test/setup/patch');
 
 runnerEmitter.on('runner', (runner) => {

From 488d37a6a00d9f406dc7eb666026f4d99231bbf9 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 21 Jun 2021 17:37:11 +0200
Subject: [PATCH 0232/1101] chore: Bump dependencies

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 906cccc9bc6..fe9977e4c8d 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "cos-nodejs-sdk-v5": "^2.9.20",
-    "eslint": "^7.28.0",
+    "eslint": "^7.29.0",
     "eslint-plugin-import": "^2.23.4",
     "git-list-updated": "^1.2.1",
     "github-release-from-cc-changelog": "^2.2.0",

From 56ec57bc9c4f60088c2dc42bbffc38aaedce0652 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 21 Jun 2021 17:40:11 +0200
Subject: [PATCH 0233/1101] chore: Release 2.48.0

---
 CHANGELOG.md | 16 ++++++++++++++++
 package.json |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ff288526c0..c965efbfb98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 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.
 
+## [2.48.0](https://github.com/serverless/serverless/compare/v2.47.0...v2.48.0) (2021-06-21)
+
+### Features
+
+- Introduce an opt-in "error" deprecation notification mode ([#9623](https://github.com/serverless/serverless/pull/9623)) ([c22a8b9](https://github.com/serverless/serverless/commit/c22a8b99f2f64a76c592e800a8cf698dbff75b9c)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **Packaging:** Do not report hashing deprecations for container lambdas ([#9623](https://github.com/serverless/serverless/pull/9623)) ([68c2a08](https://github.com/serverless/serverless/commit/68c2a084f91b58832bd5417efaaa3fd6a6178d53)) ([Mariusz Nowak](https://github.com/medikoo))
+- Ensure to support deprecation settings at early stage of processing ([#9623](https://github.com/serverless/serverless/pull/9623))([011e0ce](https://github.com/serverless/serverless/commit/011e0ce45cec4b1273268fcab4f99e377fae092e)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **Telemetry:** Recognize `constructs` ([#9628](https://github.com/serverless/serverless/pull/9628)) ([9e10cea](https://github.com/serverless/serverless/commit/9e10ceaf81e8b9d13867937fedc9502a1ff4e320)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Ensure early access to configuration in logDeprecation method ([#9623](https://github.com/serverless/serverless/pull/9623)) ([53b9762](https://github.com/serverless/serverless/commit/53b97621dccdef8f9f2e15e2f4f31045b46970e2)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ## [2.47.0](https://github.com/serverless/serverless/compare/v2.46.0...v2.47.0) (2021-06-18)
 
 ### Features
diff --git a/package.json b/package.json
index fe9977e4c8d..b590a7a4bbc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.47.0",
+  "version": "2.48.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 38e463a8cdd324a80bf8ffbc678aae32b8ef106f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 23 Jun 2021 08:25:53 +0200
Subject: [PATCH 0234/1101] docs(Packaging): Improve deprecation doc

---
 docs/deprecations.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 2666726bd4d..a55093a6d25 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -68,7 +68,9 @@ Starting with v3.0.0 any option extensions which does not have `type` defined wi
 
 Deprecation code: `NEW_PACKAGE_PATTERNS`
 
-Please use `package.patterns`. `package.include` and `package.exclude` will be removed with v3.0.0
+Support for `package.include` and `package.exclude` will be removed with v3.0.0. Instead please use `package.patterns` with which both _include_ and _exclude_ (prefixed with `!`) rules can be configured.
+
+Check [Packaging Patterns](/framework/docs/providers/aws/guide/packaging/#patterns) documentation for more info.
 
 <a name="UNSUPPORTED_CLI_OPTIONS"><div>&nbsp;</div></a>
 

From e6ff2286a55d8cb8f82e58d8173b0a386a4b1767 Mon Sep 17 00:00:00 2001
From: Sudipto Das <s.das001@yahoo.com>
Date: Thu, 24 Jun 2021 16:34:49 +0530
Subject: [PATCH 0235/1101] refactor: Replace `fse.rename` with
 `fs.promises.rename` (#9605)

---
 lib/plugins/standalone.js                                | 3 ++-
 lib/utils/eventuallyUpdate.js                            | 7 ++++---
 .../lib/plugins/aws/package/compile/functions.test.js    | 9 +++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/plugins/standalone.js b/lib/plugins/standalone.js
index 4acd1aeb9e3..33e55e0091a 100644
--- a/lib/plugins/standalone.js
+++ b/lib/plugins/standalone.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const fs = require('fs');
+const fsp = require('fs').promises;
 const os = require('os');
 const path = require('path');
 const stream = require('stream');
@@ -73,7 +74,7 @@ module.exports = class Standalone {
     }
     await fse.remove(BINARY_TMP_PATH);
     await pipeline(standaloneResponse.body, fs.createWriteStream(BINARY_TMP_PATH));
-    await fse.rename(BINARY_TMP_PATH, BINARY_PATH);
+    await fsp.rename(BINARY_TMP_PATH, BINARY_PATH);
     await fse.chmod(BINARY_PATH, 0o755);
     this.serverless.cli.log(`Successfully upgraded to ${tagName}`);
   }
diff --git a/lib/utils/eventuallyUpdate.js b/lib/utils/eventuallyUpdate.js
index 9cba7195044..a773726703a 100644
--- a/lib/utils/eventuallyUpdate.js
+++ b/lib/utils/eventuallyUpdate.js
@@ -7,6 +7,7 @@ const os = require('os');
 const stream = require('stream');
 const { promisify } = require('util');
 const fse = require('fs-extra');
+const fsp = require('fs').promises;
 const spawn = require('child-process-ext/spawn');
 const got = require('got');
 const tar = require('tar');
@@ -53,8 +54,8 @@ const npmUpdate = async (serverless, { newVersion, tarballUrl, abortHandler }) =
     const tempOldInstallationDir = path.resolve(serverlessTmpDir, 'npm-old-installation');
     await fse.remove(tempOldInstallationDir);
     return async () => {
-      await fse.rename(npmInstallationDir, tempOldInstallationDir);
-      await fse.rename(tempInstallationDir, npmInstallationDir);
+      await fsp.rename(npmInstallationDir, tempOldInstallationDir);
+      await fsp.rename(tempInstallationDir, npmInstallationDir);
       await fse.remove(tempOldInstallationDir);
     };
   } catch (error) {
@@ -74,7 +75,7 @@ const standaloneUpdate = async (serverless, { newVersion, abortHandler }) => {
     abortHandler.task = () => downloadStream.destroy();
     await pipeline(downloadStream, fse.createWriteStream(tempStandalonePath));
     await fse.chmod(tempStandalonePath, 0o755);
-    return () => fse.rename(tempStandalonePath, standaloneUtils.path);
+    return () => fsp.rename(tempStandalonePath, standaloneUtils.path);
   } catch (error) {
     if (!abortHandler.isAborted && process.env.SLS_DEBUG) {
       serverless.cli.log(format('Auto update: Could not update npm installation: %O', error));
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index 3b7ea4bc1e8..6422c416b38 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -2,6 +2,7 @@
 
 const AWS = require('aws-sdk');
 const fse = require('fs-extra');
+const fsp = require('fs').promises;
 const _ = require('lodash');
 const path = require('path');
 const chai = require('chai');
@@ -2528,14 +2529,14 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
             sourceChangeLayer = path.join(serviceDir, 'extra_layers', 'testLayerSourceChange');
             backupLayer = path.join(serviceDir, 'extra_layers', 'testLayerBackup');
 
-            await fse.rename(originalLayer, backupLayer);
-            await fse.rename(sourceChangeLayer, originalLayer);
+            await fsp.rename(originalLayer, backupLayer);
+            await fsp.rename(sourceChangeLayer, originalLayer);
             getHashForFilePath.clear();
           });
 
           afterEach(async () => {
-            await fse.rename(originalLayer, sourceChangeLayer);
-            await fse.rename(backupLayer, originalLayer);
+            await fsp.rename(originalLayer, sourceChangeLayer);
+            await fsp.rename(backupLayer, originalLayer);
           });
 
           it('should create different lambda version id', async () => {

From a36247b7ac1212a27f5e8d671ba39ba4c7e4de18 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 24 Jun 2021 16:36:15 +0200
Subject: [PATCH 0236/1101] refactor(Config Schema): Improve error message and
 documentation

---
 docs/configuration-validation.md         |  4 ++--
 lib/classes/ConfigSchemaHandler/index.js | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/docs/configuration-validation.md b/docs/configuration-validation.md
index 477cda032a6..b9da9afda91 100644
--- a/docs/configuration-validation.md
+++ b/docs/configuration-validation.md
@@ -8,12 +8,12 @@ layout: Doc
 
 The framework validates service configuration with the help of [AJV](https://ajv.js.org/) (JSON-schema validation engine).
 
-If you received a configuration warning it could mean that:
+If you were presented with configuration error (or a warning, depending on `configValidationMode` setting) it could mean that:
 
 - Service configuration is invalid and you need to correct an issue related to your serverless.yml
 - Configuration related to external plugin does not have an associated JSON Schema. In such cases, please report the issue with the plugin author and provide them the details on how to [extend validation schema](/framework/docs/providers/aws/guide/plugins/) in order to permanently correct the issue.
 - However unlikely, there may be a bug (or missing) schema configuration for the framework. If you believe this to be the case please report at [https://github.com/serverless/serverless/issues/new](https://github.com/serverless/serverless/issues/new?template=bug_report.md)
 
-**Note**: A configuration warning doesn't block framework commands in any way by default (e.g. `sls deploy` will still attempt to deploy the service). If you wish all deployments to be blocked if there is a configuarion warning, add `configValidationMode: error` to your serverless.yml, so the command is not processed further (it is likely to become a default setting in future)
+**Note**: In a warning mode (with `configValidationMode: warn` set in configuration) Framework commands are not blocked in any way, e.g. `sls deploy` will still attempt to deploy the service normally (still depending on the source of the warning, success of a deployment may vary)
 
 If you find this functionality problematic, you may also turn it off with `configValidationMode: off` setting.
diff --git a/lib/classes/ConfigSchemaHandler/index.js b/lib/classes/ConfigSchemaHandler/index.js
index ae8366cf1f3..c81372523ce 100644
--- a/lib/classes/ConfigSchemaHandler/index.js
+++ b/lib/classes/ConfigSchemaHandler/index.js
@@ -117,12 +117,14 @@ class ConfigSchemaHandler {
   handleErrorMessages(messages) {
     if (messages.length) {
       if (this.serverless.service.configValidationMode === 'error') {
-        const errorMessage =
-          messages.length > 1
-            ? `${ERROR_PREFIX}: \n     ${messages.join('\n     ')}`
-            : `${ERROR_PREFIX} ${messages[0]}`;
-
-        throw new ServerlessError(errorMessage, 'INVALID_NON_SCHEMA_COMPLIANT_CONFIGURATION');
+        throw new ServerlessError(
+          `${
+            messages.length > 1
+              ? `${ERROR_PREFIX}: \n     ${messages.join('\n     ')}`
+              : `${ERROR_PREFIX} ${messages[0]}`
+          }\n\nLearn more about configuration validation here: http://slss.io/configuration-validation`,
+          'INVALID_NON_SCHEMA_COMPLIANT_CONFIGURATION'
+        );
       } else {
         if (messages.length === 1) {
           this.serverless.cli.log(`${WARNING_PREFIX} ${messages[0]}`, 'Serverless', {

From 93b9027f0d48650df50d0a8352d0edaf2bd2e0da Mon Sep 17 00:00:00 2001
From: Nyambayar Turbat <t.nyambayar@gmail.com>
Date: Fri, 25 Jun 2021 16:20:20 +0800
Subject: [PATCH 0237/1101] fix(AWS API Gateway): Ensure that `method` depends
 on `permission`

---
 .../events/apiGateway/lib/method/index.js     |  4 ++++
 .../apiGateway/lib/method/index.test.js       | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.js
index ffa5f89dcd2..bec9aa77294 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.js
@@ -20,6 +20,9 @@ module.exports = {
         });
       }
 
+      const apiGatewayPermission = this.provider.naming.getLambdaApiGatewayPermissionLogicalId(
+        event.functionName
+      );
       const template = {
         Type: 'AWS::ApiGateway::Method',
         Properties: {
@@ -29,6 +32,7 @@ module.exports = {
           RestApiId: this.provider.getApiGatewayRestApiId(),
           OperationName: event.http.operationId,
         },
+        DependsOn: [apiGatewayPermission],
       };
 
       if (event.http.private) {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js
index 3fcdb65f8fa..285fa7c7cb8 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js
@@ -1816,4 +1816,23 @@ describe('#compileMethods v2()', () => {
       expect(apiGatewayTokenMethodConfig.Properties.AuthorizerId).to.deep.equal('another-id');
     });
   });
+
+  it('should depends on permission resource', async () => {
+    const {
+      awsNaming,
+      cfTemplate: { Resources: cfResources },
+    } = await runServerless({
+      command: 'package',
+      fixture: 'apiGateway',
+    });
+    const FooApiGatewayMethodConfig = cfResources[awsNaming.getMethodLogicalId('Foo', 'GET')];
+    const OtherApiGatewayMethodConfig =
+      cfResources[awsNaming.getMethodLogicalId('BarMarkoVar', 'GET')];
+
+    const permNameFoo = awsNaming.getLambdaApiGatewayPermissionLogicalId('Foo');
+    const permNameOther = awsNaming.getLambdaApiGatewayPermissionLogicalId('Other');
+
+    expect(FooApiGatewayMethodConfig.DependsOn).to.include(permNameFoo);
+    expect(OtherApiGatewayMethodConfig.DependsOn).to.include(permNameOther);
+  });
 });

From 1681af4897eeec20c1d1af292f9bfde5b1e9ffc3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 25 Jun 2021 11:15:41 +0200
Subject: [PATCH 0238/1101] fix(CLI): Fix standalone detection (case of a
 fallback from standalone)

---
 lib/utils/isStandaloneExecutable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/isStandaloneExecutable.js b/lib/utils/isStandaloneExecutable.js
index 0fc389acbc3..685d34ff718 100644
--- a/lib/utils/isStandaloneExecutable.js
+++ b/lib/utils/isStandaloneExecutable.js
@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = Boolean(process.pkg);
+module.exports = Boolean(process.pkg && __dirname.startsWith('/snapshot/'));

From 989cb82db313177a64e062cc800eb85ba501fab5 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 25 Jun 2021 11:16:33 +0200
Subject: [PATCH 0239/1101] fix(CLI): Ensure to list version in case of
 fallback from some versions

---
 lib/Serverless.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index 597d7f49f84..a5c6711a9c7 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -285,6 +285,10 @@ class Serverless {
       const resolveInput = require('./cli/resolve-input');
       resolveInput.clear();
       const { options, isHelpRequest } = resolveInput(commandsSchema);
+      if (options.version) {
+        require('./cli/render-version')();
+        return;
+      }
       if (
         !this.isConfigurationInputResolved &&
         this.serviceDir &&

From 378432d43f5f432f95055b5ad3b999de14404737 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 25 Jun 2021 15:55:29 +0200
Subject: [PATCH 0240/1101] chore: Bump dependencies

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index b590a7a4bbc..26f95409479 100644
--- a/package.json
+++ b/package.json
@@ -24,12 +24,12 @@
   "dependencies": {
     "@serverless/cli": "^1.5.2",
     "@serverless/components": "^3.12.0",
-    "@serverless/dashboard-plugin": "^5.4.0",
+    "@serverless/dashboard-plugin": "^5.4.2",
     "@serverless/utils": "^5.3.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.931.0",
+    "aws-sdk": "^2.934.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",

From 8026eafa623bd3d59735176d1426434f4ef3c614 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 25 Jun 2021 15:58:47 +0200
Subject: [PATCH 0241/1101] chore: Release 2.48.1

---
 CHANGELOG.md | 14 ++++++++++++++
 package.json |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c965efbfb98..c89b619ce9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 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.
 
+### [2.48.1](https://github.com/serverless/serverless/compare/v2.48.0...v2.48.1) (2021-06-25)
+
+### Bug Fixes
+
+- **AWS API Gateway:** Ensure that `Method` resource depends on `Permission` resource ([#9609](https://github.com/serverless/serverless/pull/9609)) ([93b9027](https://github.com/serverless/serverless/commit/93b9027f0d48650df50d0a8352d0edaf2bd2e0da)) ([Nyambayar Turbat](https://github.com/nyamba))
+- **CLI:**
+  - Ensure to list version in case of fallback from some versions ([#9641](https://github.com/serverless/serverless/pull/9641)) ([989cb82](https://github.com/serverless/serverless/commit/989cb82db313177a64e062cc800eb85ba501fab5)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Fix standalone detection (case of a fallback from standalone) ([#9641](https://github.com/serverless/serverless/pull/9641)) ([1681af4](https://github.com/serverless/serverless/commit/1681af4897eeec20c1d1af292f9bfde5b1e9ffc3)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **Config Schema:** Improve error message and documentation ([#9639](https://github.com/serverless/serverless/pull/9639)) ([a36247b](https://github.com/serverless/serverless/commit/a36247b7ac1212a27f5e8d671ba39ba4c7e4de18)) ([Mariusz Nowak](https://github.com/medikoo))
+- Replace `fse.rename` with `fs.promises.rename` ([#9605](https://github.com/serverless/serverless/issues/9605)) ([e6ff228](https://github.com/serverless/serverless/commit/e6ff2286a55d8cb8f82e58d8173b0a386a4b1767)) ([Sudipto Das](https://github.com/sdas13))
+
 ## [2.48.0](https://github.com/serverless/serverless/compare/v2.47.0...v2.48.0) (2021-06-21)
 
 ### Features
diff --git a/package.json b/package.json
index 26f95409479..57ca728b9f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.48.0",
+  "version": "2.48.1",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 70fb8b986133789b38fad93c0abab01eaf9dc0c7 Mon Sep 17 00:00:00 2001
From: Sean Dawson <contact@seandawson.info>
Date: Mon, 28 Jun 2021 17:54:58 +1000
Subject: [PATCH 0242/1101] fix(Packaging): Fix artifact generation with temp
 path on other device

(PR #9616)
---
 .../aws/customResources/generateZip.js        |   3 +-
 lib/utils/fs/safeMoveFile.js                  |  57 ++++++++
 .../aws/customResources/generateZip.test.js   |  27 ++++
 test/unit/lib/utils/fs/safeMoveFile.test.js   | 137 ++++++++++++++++++
 4 files changed, 223 insertions(+), 1 deletion(-)
 create mode 100644 lib/utils/fs/safeMoveFile.js
 create mode 100644 test/unit/lib/plugins/aws/customResources/generateZip.test.js
 create mode 100644 test/unit/lib/utils/fs/safeMoveFile.test.js

diff --git a/lib/plugins/aws/customResources/generateZip.js b/lib/plugins/aws/customResources/generateZip.js
index 2e572bccc08..d4b05ccf291 100644
--- a/lib/plugins/aws/customResources/generateZip.js
+++ b/lib/plugins/aws/customResources/generateZip.js
@@ -5,6 +5,7 @@ const fse = require('fs-extra');
 const getTmpDirPath = require('../../../utils/fs/getTmpDirPath');
 const createZipFile = require('../../../utils/fs/createZipFile');
 const ensureArtifact = require('../../../utils/ensureArtifact');
+const safeMoveFile = require('../../../utils/fs/safeMoveFile');
 
 const srcDirPath = path.join(__dirname, 'resources');
 
@@ -18,7 +19,7 @@ module.exports = async () => {
     const cachedZipFilePath = path.resolve(cachePath, artifactName);
     await fse.copy(srcDirPath, tmpInstalledLambdaPath);
     await createZipFile(tmpInstalledLambdaPath, tmpZipFilePath);
-    await fse.move(tmpZipFilePath, cachedZipFilePath);
+    await safeMoveFile(tmpZipFilePath, cachedZipFilePath);
   });
   return path.resolve(resultPath, artifactName);
 };
diff --git a/lib/utils/fs/safeMoveFile.js b/lib/utils/fs/safeMoveFile.js
new file mode 100644
index 00000000000..1c0b66854b6
--- /dev/null
+++ b/lib/utils/fs/safeMoveFile.js
@@ -0,0 +1,57 @@
+'use strict';
+
+const fsp = require('fs').promises;
+const crypto = require('crypto');
+const path = require('path');
+
+/**
+ * Given a path that designates a location of a file on another device,
+ * will return a path to file in the same folder, but with a unique name
+ * to avoid collisions.
+ *
+ * @param {*} destPath the path to the final location of the file being moved
+ * @returns a unique path to a file on the same device as the file being moved
+ */
+const generateTemporaryPathOnDestinationDevice = (destPath) => {
+  const dirName = path.dirname(destPath);
+  // Generate a unique destination file name to get the file onto the destination filesystem
+  const tempName = path.basename(destPath) + crypto.randomBytes(8).toString('hex');
+  return path.join(dirName, tempName);
+};
+
+/**
+ * Allows a file to be moved (renamed) even across filesystem boundaries.
+ *
+ * If the rename fails because the file is getting renamed across file system boundaries,
+ * the file is first copied to the destination file system under a temporary name,
+ * and then renamed from there.
+ *
+ * This is done because rename is atomic but copy is not, and can leave partially copied files.
+ *
+ * @param {*} oldPath the original file that should be moved
+ * @param {*} newPath the path to move the file to
+ */
+async function safeMoveFile(oldPath, newPath) {
+  try {
+    // Golden path, we simply rename the file in an atomic operation
+    await fsp.rename(oldPath, newPath);
+  } catch (err) {
+    // The EXDEV error indicates that the rename failed because the rename was across filesystem boundaries
+    // This might occur if a distro uses tmpfs for temporary directories
+    if (err.code === 'EXDEV') {
+      // Generate a unique destination file name to get the file onto the destination filesystem
+      const tempPath = generateTemporaryPathOnDestinationDevice(newPath);
+
+      // Copy onto the destination filesystem (not guaranteed to be atomic)
+      await fsp.copyFile(oldPath, tempPath);
+      // Atomically move the file onto the destination path, overwriting it
+      await fsp.rename(tempPath, newPath);
+      // Delete the old file once both the above operations succeed
+      await fsp.unlink(oldPath);
+    } else {
+      throw err;
+    }
+  }
+}
+
+module.exports = safeMoveFile;
diff --git a/test/unit/lib/plugins/aws/customResources/generateZip.test.js b/test/unit/lib/plugins/aws/customResources/generateZip.test.js
new file mode 100644
index 00000000000..450bf6bc4b4
--- /dev/null
+++ b/test/unit/lib/plugins/aws/customResources/generateZip.test.js
@@ -0,0 +1,27 @@
+'use strict';
+
+const path = require('path');
+const globby = require('globby');
+const { listZipFiles } = require('../../../../../utils/fs');
+const { expect } = require('chai');
+const generateZip = require('../../../../../../lib/plugins/aws/customResources/generateZip');
+
+// The directory that holds the files that generateZip zips up
+const resourcesDir = path.resolve(
+  __dirname,
+  '../../../../../../lib/plugins/aws/customResources/resources/'
+);
+
+describe('test/unit/lib/plugins/aws/customResources/generateZip.test.js', () => {
+  describe('when generating a zip file', () => {
+    it('should generate a zip file with the contents of the resources directory', async () => {
+      const zipFilePath = await generateZip();
+
+      // List the files in the zip to make sure it is valid
+      const filesInZip = await listZipFiles(zipFilePath);
+
+      const filesInResourceDir = await globby('**', { cwd: resourcesDir });
+      expect(filesInZip).to.have.all.members(filesInResourceDir);
+    });
+  });
+});
diff --git a/test/unit/lib/utils/fs/safeMoveFile.test.js b/test/unit/lib/utils/fs/safeMoveFile.test.js
new file mode 100644
index 00000000000..e7574a1d5d9
--- /dev/null
+++ b/test/unit/lib/utils/fs/safeMoveFile.test.js
@@ -0,0 +1,137 @@
+'use strict';
+
+const fse = require('fs-extra');
+const sinon = require('sinon');
+const chai = require('chai');
+const provisionTempDir = require('@serverless/test/provision-tmp-dir');
+const { join } = require('path');
+const { expect } = require('chai');
+const fsp = require('fs').promises;
+const fs = require('fs');
+const sinonChai = require('sinon-chai');
+const safeMoveFile = require('../../../../../lib/utils/fs/safeMoveFile');
+
+chai.use(sinonChai);
+
+/**
+ * Returns and Error object that resembles the EXDEV errors that are thrown
+ * when you try to rename across device boundaries.
+ *
+ * @returns an Error object that resembles the EXDEV errors are thrown
+ */
+const createFakeExDevError = () => {
+  // Properties captured by using fs.renameSync in the Node v12.20.1 REPL
+  const fakeCrossDeviceError = new Error(
+    "Error: EXDEV: cross-device link not permitted, rename '/foo/bar' -> '/bar/baz'"
+  );
+  // This is the important property that safeMoveFile looks for
+  // to fallback to copy then rename behaviour
+  fakeCrossDeviceError.code = 'EXDEV';
+
+  // These other properties aren't used but it doesn't hurt to have an accurate error object
+  fakeCrossDeviceError.errno = -18;
+  fakeCrossDeviceError.syscall = 'rename';
+  fakeCrossDeviceError.path = '/foo/bar';
+  fakeCrossDeviceError.dest = '/bar/baz';
+  return fakeCrossDeviceError;
+};
+
+/**
+ * The name of the file that will be moved
+ */
+const artifactName = 'foo-bar.zip';
+
+describe('test/unit/lib/utils/fs/safeMoveFile.test.js', () => {
+  let sourceDir;
+  let destinationDir;
+  let sourceFile;
+  let destinationFile;
+
+  let renameStub;
+
+  beforeEach(async () => {
+    sourceDir = await provisionTempDir();
+    destinationDir = await provisionTempDir();
+    sourceFile = join(sourceDir, artifactName);
+    destinationFile = join(destinationDir, artifactName);
+
+    renameStub = sinon.stub(fsp, 'rename');
+    // Allow the fs calls to act as normal until we want to force the rename to fail
+    renameStub.callThrough();
+
+    // Write a test file to rename
+    await fse.writeFile(sourceFile, 'source data');
+  });
+
+  afterEach(async () => {
+    // Clean up test directories after each test so they don't interfere with each other
+    await fse.remove(destinationDir);
+    await fse.remove(sourceDir);
+    // Reset stubbed methods
+    fsp.rename.restore();
+  });
+
+  /**
+   * Run the test suite with the provided post assertion function.
+   * The post assertion function will be called after each test scenario is executed
+   * so that the test scenarios can be reused.
+   *
+   * @param {*} postAssertion the function that is called after every test scenario
+   */
+  const runTestScenariosWithPostAssertion = (postAssertion) => {
+    describe('when file at target path does not exist', () => {
+      it('should move file to target destination', async () => {
+        await safeMoveFile(sourceFile, destinationFile);
+
+        const sourceExists = fs.existsSync(sourceFile);
+        const destinationExists = fs.existsSync(destinationFile);
+
+        expect(sourceExists).to.be.false;
+        expect(destinationExists).to.be.true;
+
+        postAssertion();
+      });
+    });
+
+    describe('when file at target path already exists', () => {
+      beforeEach(async () => {
+        // Create an existing file that is at the destination
+        fse.ensureFileSync(destinationFile);
+        fse.writeFileSync(destinationFile, 'existing destination data');
+      });
+
+      it('should overwrite the file at the target destination', async () => {
+        await safeMoveFile(sourceFile, destinationFile);
+
+        // Check that the file was actually overwritten
+        const cachedData = fse.readFileSync(destinationFile).toString();
+        expect(cachedData).not.to.eq('existing destination data');
+
+        const sourceExists = await fs.existsSync(sourceFile);
+        expect(sourceExists).to.be.false;
+
+        postAssertion();
+      });
+    });
+  };
+
+  describe('when file is moved in context of same device', () => {
+    runTestScenariosWithPostAssertion(() => {
+      // Happy path: Only rename is called
+      expect(renameStub).to.have.be.calledOnce;
+    });
+  });
+
+  describe('when file is moved to different device', () => {
+    beforeEach(async () => {
+      const error = createFakeExDevError();
+      renameStub.onFirstCall().rejects(error);
+    });
+
+    runTestScenariosWithPostAssertion(() => {
+      // Rename is called twice because the first call will fail due to the cross device rename
+      // The second call is across the same device
+      expect(renameStub).to.have.been.calledTwice;
+    });
+  });
+});

From 4bc8e2e1944364e2c218cbfc05039c43afa9ab01 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 28 Jun 2021 10:54:44 +0200
Subject: [PATCH 0243/1101] fix(CLI): Fix standalone detection on Windows

---
 lib/utils/isStandaloneExecutable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/isStandaloneExecutable.js b/lib/utils/isStandaloneExecutable.js
index 685d34ff718..252983da4f6 100644
--- a/lib/utils/isStandaloneExecutable.js
+++ b/lib/utils/isStandaloneExecutable.js
@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = Boolean(process.pkg && __dirname.startsWith('/snapshot/'));
+module.exports = Boolean(process.pkg && /^(?:\/snapshot\/|[A-Z]+:\\snapshot\\)/.test(__dirname));

From 09bb4fa12270807702dcc26483dbcb94cf733342 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 8 Jun 2021 15:02:57 +0200
Subject: [PATCH 0244/1101] refactor: Add `resolveStage` util

---
 lib/utils/resolve-stage.js                |  8 +++++++
 test/unit/lib/utils/resolve-stage.test.js | 29 +++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 lib/utils/resolve-stage.js
 create mode 100644 test/unit/lib/utils/resolve-stage.test.js

diff --git a/lib/utils/resolve-stage.js b/lib/utils/resolve-stage.js
new file mode 100644
index 00000000000..f255f0432a9
--- /dev/null
+++ b/lib/utils/resolve-stage.js
@@ -0,0 +1,8 @@
+'use strict';
+const _ = require('lodash');
+
+const resolveStage = ({ configuration, options }) => {
+  return options.stage || _.get(configuration, 'provider.stage') || 'dev';
+};
+
+module.exports = resolveStage;
diff --git a/test/unit/lib/utils/resolve-stage.test.js b/test/unit/lib/utils/resolve-stage.test.js
new file mode 100644
index 00000000000..cf9f4f52b42
--- /dev/null
+++ b/test/unit/lib/utils/resolve-stage.test.js
@@ -0,0 +1,29 @@
+'use strict';
+
+const chai = require('chai');
+
+const expect = chai.expect;
+const resolveStage = require('../../../../lib/utils/resolve-stage');
+
+describe('test/unit/lib/utils/resolve-stage.test.js', () => {
+  it('should return `stage` from options first if it is present', () => {
+    const result = resolveStage({
+      configuration: { provider: { stage: 'fromprovider' } },
+      options: { stage: 'fromoptions' },
+    });
+    expect(result).to.equal('fromoptions');
+  });
+
+  it('should return `stage` from configuration if stage is not passed in options', () => {
+    const result = resolveStage({
+      configuration: { provider: { stage: 'fromprovider' } },
+      options: {},
+    });
+    expect(result).to.equal('fromprovider');
+  });
+
+  it('should return default stage if both options and configuration do not have it defined', () => {
+    const result = resolveStage({ configuration: {}, options: {} });
+    expect(result).to.equal('dev');
+  });
+});

From 98e3668a2cbb701c109e1ff8dd70a0ece1770f7b Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 8 Jun 2021 15:03:53 +0200
Subject: [PATCH 0245/1101] refactor: Add `resolveRegion` util

---
 lib/utils/resolve-region.js                |  8 ++++++
 test/unit/lib/utils/resolve-region.test.js | 29 ++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 lib/utils/resolve-region.js
 create mode 100644 test/unit/lib/utils/resolve-region.test.js

diff --git a/lib/utils/resolve-region.js b/lib/utils/resolve-region.js
new file mode 100644
index 00000000000..035efff96bc
--- /dev/null
+++ b/lib/utils/resolve-region.js
@@ -0,0 +1,8 @@
+'use strict';
+const _ = require('lodash');
+
+const resolveRegion = ({ configuration, options }) => {
+  return options.region || _.get(configuration, 'provider.region') || 'us-east-1';
+};
+
+module.exports = resolveRegion;
diff --git a/test/unit/lib/utils/resolve-region.test.js b/test/unit/lib/utils/resolve-region.test.js
new file mode 100644
index 00000000000..ca34000c89f
--- /dev/null
+++ b/test/unit/lib/utils/resolve-region.test.js
@@ -0,0 +1,29 @@
+'use strict';
+
+const chai = require('chai');
+
+const expect = chai.expect;
+const resolveRegion = require('../../../../lib/utils/resolve-region');
+
+describe('test/unit/lib/utils/resolve-region.test.js', () => {
+  it('should return `region` from options first if it is present', () => {
+    const result = resolveRegion({
+      configuration: { provider: { region: 'fromprovider' } },
+      options: { region: 'fromoptions' },
+    });
+    expect(result).to.equal('fromoptions');
+  });
+
+  it('should return `region` from configuration if region is not passed in options', () => {
+    const result = resolveRegion({
+      configuration: { provider: { region: 'fromprovider' } },
+      options: {},
+    });
+    expect(result).to.equal('fromprovider');
+  });
+
+  it('should return default region if both options and configuration do not have it defined', () => {
+    const result = resolveRegion({ configuration: {}, options: {} });
+    expect(result).to.equal('us-east-1');
+  });
+});

From feb04219f6be186cc54462906394bbd82f9747b5 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 8 Jun 2021 15:52:28 +0200
Subject: [PATCH 0246/1101] feat(CLI Onboarding): Support provider creation
 flow

---
 lib/cli/interactive-setup/aws-credentials.js  | 369 ++++++++++-
 .../interactive-setup/aws-credentials.test.js | 599 +++++++++++++++++-
 .../lib/cli/interactive-setup/index.test.js   |   5 +-
 3 files changed, 935 insertions(+), 38 deletions(-)

diff --git a/lib/cli/interactive-setup/aws-credentials.js b/lib/cli/interactive-setup/aws-credentials.js
index 8dbf5d657b9..b543a7ce7bb 100644
--- a/lib/cli/interactive-setup/aws-credentials.js
+++ b/lib/cli/interactive-setup/aws-credentials.js
@@ -3,15 +3,100 @@
 const chalk = require('chalk');
 const _ = require('lodash');
 const inquirer = require('@serverless/utils/inquirer');
+const memoizee = require('memoizee');
+const configUtils = require('@serverless/utils/config');
 
 const AWS = require('aws-sdk');
 
 const awsCredentials = require('../../plugins/aws/utils/credentials');
 const { confirm } = require('./utils');
 const openBrowser = require('../../utils/openBrowser');
+const ServerlessError = require('../../serverless-error');
 
 const isValidAwsAccessKeyId = RegExp.prototype.test.bind(/^[A-Z0-9]{10,}$/);
 const isValidAwsSecretAccessKey = RegExp.prototype.test.bind(/^[a-zA-Z0-9/+]{10,}$/);
+const { getPlatformClientWithAccessKey } = require('@serverless/dashboard-plugin/lib/clientUtils');
+const resolveProviderCredentials = require('@serverless/dashboard-plugin/lib/resolveProviderCredentials');
+const resolveStage = require('../../utils/resolve-stage');
+const resolveRegion = require('../../utils/resolve-region');
+
+const CREDENTIALS_SETUP_CHOICE = {
+  LOCAL: '_local_',
+  CREATE_PROVIDER: '_create_provider_',
+  SKIP: '_skip_',
+};
+
+const getProviderLinkUid = ({ app, service, stage, region }) =>
+  `appName|${app}|serviceName|${service}|stage|${stage}|region|${region}`;
+
+const getSdkInstance = memoizee(
+  async (orgName) => {
+    return getPlatformClientWithAccessKey(orgName);
+  },
+  { promise: true }
+);
+
+const doesServiceInstanceHaveLinkedProvider = async ({ configuration, options }) => {
+  const region = resolveRegion({ configuration, options });
+  const stage = resolveStage({ configuration, options });
+  let result;
+  try {
+    result = await resolveProviderCredentials({ configuration, region, stage });
+  } catch (err) {
+    if (err.statusCode && err.statusCode >= 500) {
+      throw new ServerlessError(
+        'Dashboard service is currently unavailable, please try again later',
+        'DASHBOARD_UNAVAILABLE'
+      );
+    }
+    throw err;
+  }
+
+  return Boolean(result);
+};
+
+const getOrgUidByName = memoizee(
+  async (orgName) => {
+    const sdk = await getSdkInstance(orgName);
+    let organization;
+    try {
+      organization = await sdk.organizations.get({ orgName });
+    } catch (err) {
+      if (err.statusCode && err.statusCode >= 500) {
+        throw new ServerlessError(
+          'Dashboard service is currently unavailable, please try again later',
+          'DASHBOARD_UNAVAILABLE'
+        );
+      }
+      throw err;
+    }
+    return organization.orgUid;
+  },
+  { promise: true }
+);
+
+const getProviders = memoizee(
+  async (orgName) => {
+    const sdk = await getSdkInstance(orgName);
+    const orgUid = await getOrgUidByName(orgName);
+    let providers;
+    try {
+      providers = await sdk.getProviders(orgUid);
+    } catch (err) {
+      if (err.statusCode && err.statusCode >= 500) {
+        throw new ServerlessError(
+          'Dashboard service is currently unavailable, please try again later',
+          'DASHBOARD_UNAVAILABLE'
+        );
+      }
+      throw err;
+    }
+    return providers.result;
+  },
+  {
+    promise: true,
+  }
+);
 
 const awsAccessKeyIdInput = async () =>
   (
@@ -42,20 +127,58 @@ const awsSecretAccessKeyInput = async () =>
     })
   ).secretAccessKey.trim();
 
+const credentialsSetupChoice = async (providers) => {
+  let credentialsSetupChoices = [];
+  let message = 'No AWS credentials found, what credentials do you want to use?';
+
+  if (providers) {
+    // This is situation where we know that user has decided to link his service to an org
+    const hasExistingProviders = Boolean(providers.length);
+    if (hasExistingProviders) {
+      message = 'What credentials do you want to use?';
+    }
+    const createAccessRoleName = hasExistingProviders
+      ? 'Create a new AWS Access Role provider'
+      : 'AWS Access Role (most secure)';
+
+    const formatProviderName = (provider) => {
+      if (provider.providerType === 'roleArn') {
+        return `${provider.alias} (${provider.providerDetails.roleArn})`;
+      }
+      // Otherwise its `accessKey`-based provider
+
+      return `${provider.alias} (${provider.providerDetails.accessKeyId})`;
+    };
+    credentialsSetupChoices = [
+      ...providers.map((provider) => ({
+        name: formatProviderName(provider),
+        value: provider.providerUid,
+      })),
+      { name: createAccessRoleName, value: CREDENTIALS_SETUP_CHOICE.CREATE_PROVIDER },
+    ];
+  }
+
+  credentialsSetupChoices.push(
+    { name: 'Local AWS Access Keys', value: CREDENTIALS_SETUP_CHOICE.LOCAL },
+    { name: 'Skip', value: CREDENTIALS_SETUP_CHOICE.SKIP }
+  );
+
+  return (
+    await inquirer.prompt({
+      message,
+      type: 'list',
+      name: 'credentialsSetupChoice',
+      choices: credentialsSetupChoices,
+    })
+  ).credentialsSetupChoice;
+};
+
 const steps = {
   writeOnSetupSkip: () =>
     process.stdout.write(`\nYou can setup your AWS account later. More details available here:
 
   http://slss.io/aws-creds-setup\n`),
 
-  shouldSetupAwsCredentials: async () => {
-    if (await confirm('Do you want to set them up now?', { name: 'shouldSetupAwsCredentials' })) {
-      return true;
-    }
-    steps.writeOnSetupSkip();
-    return false;
-  },
-
   ensureAwsAccount: async () => {
     if (await confirm('Do you have an AWS account?', { name: 'hasAwsAccount' })) return;
     openBrowser('https://portal.aws.amazon.com/billing/signup');
@@ -86,10 +209,133 @@ const steps = {
       )}\n`
     );
   },
+  handleProviderCreation: async ({ configuration: { org: orgName } }) => {
+    const providersUrl = `https://app.serverless.com/${orgName}/settings/providers?source=cli&providerId=new&provider=aws`;
+    openBrowser(chalk.bold.white(providersUrl));
+    process.stdout.write(
+      'To learn more about providers, visit: http://slss.io/add-providers-dashboard\n'
+    );
+    process.stdout.write('\nWaiting for creation of AWS Access Role provider...\n');
+
+    let onEvent;
+    let showSkipPromptTimeout;
+
+    const p = new Promise((resolve) => {
+      let inquirerPrompt;
+
+      const timeoutDuration = 1000 * 30; // 30 seconds
+      showSkipPromptTimeout = setTimeout(() => {
+        inquirerPrompt = inquirer.prompt({
+          message:
+            '\n [If you approached an issue when setting up a provider, you may press Enter to skip this step]',
+          name: 'skipProviderSetup',
+        });
+
+        inquirerPrompt.then(() => resolve(null));
+      }, timeoutDuration);
+
+      onEvent = (event) => {
+        if (inquirerPrompt) {
+          // Disable inquirer prompt asking to skip without setting provider
+          inquirerPrompt.ui.close();
+        }
+
+        clearTimeout(showSkipPromptTimeout);
+        resolve(event);
+      };
+    });
+
+    // Listen for `provider.created` event to detect creation of new provider
+    const sdk = await getSdkInstance(orgName);
+    try {
+      await sdk.connect({
+        orgName,
+        onEvent,
+        filter: {
+          events: ['provider.created'],
+        },
+      });
+    } catch (err) {
+      // Ensure that prompt timeout is cleared in case of error
+      clearTimeout(showSkipPromptTimeout);
+
+      if (err.statusCode && err.statusCode >= 500) {
+        throw new ServerlessError(
+          'Dashboard service is currently unavailable, please try again later',
+          'DASHBOARD_UNAVAILABLE'
+        );
+      }
+      throw err;
+    }
+
+    let maybeEvent;
+    try {
+      maybeEvent = await p;
+    } finally {
+      sdk.disconnect();
+    }
+
+    if (maybeEvent) {
+      process.stdout.write(
+        `\n${chalk.green('AWS Access Role provider was successfully created')}\n`
+      );
+      return maybeEvent.data.object.provider_uid;
+    }
+
+    process.stdout.write(
+      '\nSkipping credentials provider setup. You can still setup credentials provider later.\n'
+    );
+    return null;
+  },
+  linkProviderToServiceInstance: async ({ providerUid, configuration, options }) => {
+    const { app, service, org } = configuration;
+    const stage = resolveStage({ configuration, options });
+    const region = resolveRegion({ configuration, options });
+    const sdk = await getSdkInstance(org);
+    const linkType = 'instance';
+    const linkUid = getProviderLinkUid({ app, service, region, stage });
+    let orgUid;
+    try {
+      orgUid = await getOrgUidByName(org);
+    } catch (err) {
+      if (err.code === 'DASHBOARD_UNAVAILABLE') {
+        process.stdout.write(`\n${chalk.yellow(err.message)}\n`);
+        return false;
+      }
+      throw err;
+    }
+    try {
+      await sdk.createProviderLink(orgUid, linkType, linkUid, providerUid);
+      return true;
+    } catch (err) {
+      if (err.statusCode && err.statusCode >= 500) {
+        process.stdout.write(
+          `\n${chalk.yellow(
+            'Dashboard service is currently unavailable, please try again later'
+          )}\n`
+        );
+        return false;
+      }
+      throw err;
+    }
+  },
+};
+
+const isUserLoggedIn = () => {
+  if (process.env.SERVERLESS_ACCESS_KEY) {
+    return true;
+  }
+
+  if (configUtils.getLoggedInUser()) {
+    return true;
+  }
+
+  return false;
 };
 
 module.exports = {
-  async isApplicable({ configuration }) {
+  async isApplicable(context) {
+    const { configuration, history, options } = context;
     if (
       _.get(configuration, 'provider') !== 'aws' &&
       _.get(configuration, 'provider.name') !== 'aws'
@@ -97,22 +343,99 @@ module.exports = {
       return false;
     }
     if (new AWS.S3().config.credentials) return false;
-    return !(await awsCredentials.resolveFileProfiles()).size;
-  },
-  async run(data) {
-    process.stdout.write(
-      'No AWS credentials were found on your computer, ' +
-        'you need these to host your application.\n\n'
-    );
+    if ((await awsCredentials.resolveFileProfiles()).size) return false;
+
+    const orgName = configuration.org;
+    if (orgName && isUserLoggedIn()) {
+      let providers;
+      try {
+        providers = await getProviders(orgName);
+      } catch (err) {
+        if (err.code === 'DASHBOARD_UNAVAILABLE') {
+          process.stdout.write(`\n${chalk.yellow(err.message)}\n`);
+          return false;
+        }
+        throw err;
+      }
+      const hasDefaultProvider = providers.some((provider) => provider.isDefault);
+
+      if (hasDefaultProvider) return false;
+
+      // For situation where it is invoked for already existing service
+      // We need to check if service already has a linked provider
+      if (
+        providers &&
+        !history.has('service') &&
+        (await doesServiceInstanceHaveLinkedProvider({ configuration, options }))
+      ) {
+        return false;
+      }
+    }
 
-    return module.exports.runSteps(data);
+    return true;
   },
-  steps,
-  runSteps: async (context) => {
-    if (!(await steps.shouldSetupAwsCredentials())) return;
-    await steps.ensureAwsAccount();
+  async run(context) {
+    let providers;
+
+    // It is possible that user decides to not configure org for his service and
+    // we still should allow setup of local credentials in such case
+    if (context.configuration.org && isUserLoggedIn()) {
+      try {
+        providers = await getProviders(context.configuration.org);
+      } catch (err) {
+        if (err.code === 'DASHBOARD_UNAVAILABLE') {
+          process.stdout.write(`\n${chalk.yellow(err.message)}\n`);
+          return;
+        }
+        throw err;
+      }
+    }
+    const credentialsSetupChoiceAnswer = await credentialsSetupChoice(providers);
+
+    if (credentialsSetupChoiceAnswer === CREDENTIALS_SETUP_CHOICE.CREATE_PROVIDER) {
+      try {
+        const createdProviderUid = await steps.handleProviderCreation(context);
+        const hadExistingProviders = Boolean(providers.length);
+        if (createdProviderUid && hadExistingProviders) {
+          // This is situation where user decided to create a new provider and already had previous providers setup
+          // In this case, we want to setup an explicit link between provider and service as the newly created provider
+          // might not be the default one.
+          await steps.linkProviderToServiceInstance({
+            configuration: context.configuration,
+            providerUid: createdProviderUid,
+            options: context.options,
+          });
+        }
+        return;
+      } catch (err) {
+        if (err.code === 'DASHBOARD_UNAVAILABLE') {
+          process.stdout.write(`\n${chalk.yellow(err.message)}\n`);
+          return;
+        }
+        throw err;
+      }
+    } else if (credentialsSetupChoiceAnswer === CREDENTIALS_SETUP_CHOICE.SKIP) {
+      steps.writeOnSetupSkip();
+      return;
+    } else if (credentialsSetupChoiceAnswer === CREDENTIALS_SETUP_CHOICE.LOCAL) {
+      await steps.ensureAwsAccount();
+      await steps.ensureAwsCredentials(context);
+      await steps.inputAwsCredentials();
+      return;
+    }
 
-    await steps.ensureAwsCredentials(context);
-    await steps.inputAwsCredentials();
+    // Otherwise user selected an existing provider
+    const linked = await steps.linkProviderToServiceInstance({
+      configuration: context.configuration,
+      providerUid: credentialsSetupChoiceAnswer,
+      options: context.options,
+    });
+
+    if (linked) {
+      process.stdout.write(
+        `\n${chalk.green('Selected provider was successfully linked to your service')}\n`
+      );
+    }
   },
+  steps,
 };
diff --git a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
index 847678a51af..01ab849d4bf 100644
--- a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
+++ b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
@@ -4,30 +4,46 @@ const chai = require('chai');
 const sinon = require('sinon');
 const proxyquire = require('proxyquire');
 const overrideEnv = require('process-utils/override-env');
+const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const requireUncached = require('ncjsm/require-uncached');
+const chalk = require('chalk');
 
 const { expect } = chai;
 
 chai.use(require('chai-as-promised'));
+chai.use(require('sinon-chai'));
 
 const { join, resolve } = require('path');
-const fsp = require('fs').promises;
 const { remove: rmDir, outputFile: writeFile } = require('fs-extra');
 const { resolveFileProfiles } = require('../../../../../lib/plugins/aws/utils/credentials');
 
+const mockedSdk = {
+  organizations: {
+    get: () => {
+      return {
+        orgUid: 'org-uid',
+      };
+    },
+  },
+  getProviders: async () => {
+    return { result: [] };
+  },
+};
+
 const step = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
   '../../utils/openBrowser': async (url) => {
     openBrowserUrls.push(url);
   },
+  '@serverless/dashboard-plugin/lib/clientUtils': {
+    getPlatformClientWithAccessKey: async () => mockedSdk,
+  },
 });
+
 const inquirer = require('@serverless/utils/inquirer');
 const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
 
 const openBrowserUrls = [];
 
-const confirmEmptyWorkingDir = async () =>
-  expect(await fsp.readdir(process.cwd())).to.deep.equal([]);
-
 describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
   const accessKeyId = 'AKIAIOSFODNN7EXAMPLE';
   const secretAccessKey = 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY';
@@ -49,6 +65,202 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       })
     ).to.equal(false));
 
+  it('Should be ineffective, when user has default provider set', async () => {
+    const internalMockedSdk = {
+      ...mockedSdk,
+      getProviders: async () => {
+        return {
+          result: [
+            {
+              alias: 'someprovider',
+              providerName: 'aws',
+              providerType: 'roleArn',
+              providerUid: 'provideruid',
+              isDefault: true,
+              providerDetails: {
+                roleArn: 'arn:xxx',
+              },
+            },
+          ],
+        };
+      },
+    };
+    const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+      '@serverless/dashboard-plugin/lib/clientUtils': {
+        getPlatformClientWithAccessKey: async () => internalMockedSdk,
+      },
+      '@serverless/utils/config': {
+        getLoggedInUser: () => {
+          return {
+            accessKeys: {
+              someorg: 'xxx',
+            },
+          };
+        },
+      },
+    });
+
+    expect(
+      await mockedStep.isApplicable({
+        serviceDir: process.cwd(),
+        configuration: { provider: { name: 'aws' }, org: 'someorg' },
+        configurationFilename: 'serverless.yml',
+      })
+    ).to.be.false;
+  });
+
+  it('Should be ineffective, when existing service already has a provider set', async () => {
+    const internalMockedSdk = {
+      ...mockedSdk,
+      getProviders: async () => {
+        return {
+          result: [
+            {
+              alias: 'someprovider',
+              providerName: 'aws',
+              providerType: 'roleArn',
+              providerUid: 'provideruid',
+              isDefault: false,
+              providerDetails: {
+                roleArn: 'arn:xxx',
+              },
+            },
+          ],
+        };
+      },
+    };
+    const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+      '@serverless/dashboard-plugin/lib/clientUtils': {
+        getPlatformClientWithAccessKey: async () => internalMockedSdk,
+      },
+      '@serverless/utils/config': {
+        getLoggedInUser: () => {
+          return {
+            accessKeys: {
+              someorg: 'xxx',
+            },
+          };
+        },
+      },
+      '@serverless/dashboard-plugin/lib/resolveProviderCredentials': () => {
+        return {
+          accessKeyId: 'somekey',
+          secretAccessKey: 'somesecret',
+          sessionToken: 'somesessiontoken',
+        };
+      },
+    });
+
+    expect(
+      await mockedStep.isApplicable({
+        history: new Set(),
+        serviceDir: process.cwd(),
+        configuration: {
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+          service: 'service',
+        },
+        options: {},
+        configurationFilename: 'serverless.yml',
+      })
+    ).to.be.false;
+  });
+
+  it('Should be effective, when existing service instance does not have a provider set', async () => {
+    const internalMockedSdk = {
+      ...mockedSdk,
+      getProviders: async () => {
+        return {
+          result: [
+            {
+              alias: 'someprovider',
+              providerName: 'aws',
+              providerType: 'roleArn',
+              providerUid: 'provideruid',
+              isDefault: false,
+              providerDetails: {
+                roleArn: 'arn:xxx',
+              },
+            },
+          ],
+        };
+      },
+    };
+    const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+      '@serverless/dashboard-plugin/lib/clientUtils': {
+        getPlatformClientWithAccessKey: async () => internalMockedSdk,
+      },
+      '@serverless/utils/config': {
+        getLoggedInUser: () => {
+          return {
+            accessKeys: {
+              someorg: 'xxx',
+            },
+          };
+        },
+      },
+      '@serverless/dashboard-plugin/lib/resolveProviderCredentials': () => {
+        return null;
+      },
+    });
+
+    expect(
+      await mockedStep.isApplicable({
+        history: new Set(),
+        serviceDir: process.cwd(),
+        configuration: {
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+          service: 'service',
+        },
+        options: {},
+        configurationFilename: 'serverless.yml',
+      })
+    ).to.be.true;
+  });
+
+  it('Should emit warning when dashboard is not available when fetching providers', async () => {
+    const internalMockedSdk = {
+      ...mockedSdk,
+      getProviders: async () => {
+        const err = new Error('unavailable');
+        err.statusCode = 500;
+        throw err;
+      },
+    };
+    const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+      '@serverless/dashboard-plugin/lib/clientUtils': {
+        getPlatformClientWithAccessKey: async () => internalMockedSdk,
+      },
+      '@serverless/utils/config': {
+        getLoggedInUser: () => {
+          return {
+            accessKeys: {
+              someorg: 'xxx',
+            },
+          };
+        },
+      },
+    });
+
+    let stdoutData = '';
+    await overrideStdoutWrite(
+      (data) => (stdoutData += data),
+      async () =>
+        expect(
+          await mockedStep.isApplicable({
+            serviceDir: process.cwd(),
+            configuration: { provider: { name: 'aws' }, org: 'someorg' },
+            configurationFilename: 'serverless.yml',
+          })
+        ).to.be.false
+    );
+
+    expect(stdoutData).to.include('Dashboard service is currently unavailable');
+  });
+
   it('Should be effective, at AWS service and no credentials are set', async () =>
     expect(
       await step.isApplicable({
@@ -58,6 +270,25 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       })
     ).to.equal(true));
 
+  it('Should emit a message when user decides to skip credentials setup', async () => {
+    configureInquirerStub(inquirer, {
+      list: { credentialsSetupChoice: '_skip_' },
+    });
+
+    let stdoutData = '';
+    await overrideStdoutWrite(
+      (data) => (stdoutData += data),
+      async () =>
+        await step.run({
+          serviceDir: process.cwd(),
+          configuration: { provider: { name: 'aws' }, org: 'someorg' },
+          configurationFilename: 'serverless.yml',
+        })
+    );
+
+    expect(stdoutData).to.include('You can setup your AWS account later');
+  });
+
   describe('In environment credentials', () => {
     let restoreEnv;
     let uncachedStep;
@@ -84,12 +315,6 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
     });
   });
 
-  it("Should not setup if user doesn't the setup", async () => {
-    configureInquirerStub(inquirer, { confirm: { shouldSetupAwsCredentials: false } });
-    await step.run({ configuration: { provider: {} }, options: {} });
-    return confirmEmptyWorkingDir();
-  });
-
   describe('AWS config handling', () => {
     let credentialsDirPath;
     let credentialsFilePath;
@@ -125,7 +350,8 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
 
     it('Should setup credentials for users not having an AWS account', async () => {
       configureInquirerStub(inquirer, {
-        confirm: { shouldSetupAwsCredentials: true, hasAwsAccount: false },
+        list: { credentialsSetupChoice: '_local_' },
+        confirm: { hasAwsAccount: false },
         input: {
           createAwsAccountPrompt: '',
           generateAwsCredsPrompt: '',
@@ -144,7 +370,8 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
 
     it('Should setup credentials for users having an AWS account', async () => {
       configureInquirerStub(inquirer, {
-        confirm: { shouldSetupAwsCredentials: true, hasAwsAccount: true },
+        list: { credentialsSetupChoice: '_local_' },
+        confirm: { hasAwsAccount: true },
         input: { generateAwsCredsPrompt: '', accessKeyId, secretAccessKey },
       });
       await step.run({ configuration: { provider: {} }, options: {} });
@@ -157,7 +384,8 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
 
     it('Should not accept invalid access key id', async () => {
       configureInquirerStub(inquirer, {
-        confirm: { shouldSetupAwsCredentials: true, hasAwsAccount: true },
+        list: { credentialsSetupChoice: '_local_' },
+        confirm: { hasAwsAccount: true },
         input: { generateAwsCredsPrompt: '', accessKeyId: 'foo', secretAccessKey },
       });
       await expect(
@@ -170,7 +398,8 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
 
     it('Should not accept invalid secret access key', async () => {
       configureInquirerStub(inquirer, {
-        confirm: { shouldSetupAwsCredentials: true, hasAwsAccount: true },
+        list: { credentialsSetupChoice: '_local_' },
+        confirm: { hasAwsAccount: true },
         input: { generateAwsCredsPrompt: '', accessKeyId, secretAccessKey: 'foo' },
       });
       await expect(
@@ -181,4 +410,346 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       ).to.eventually.be.rejected.and.have.property('code', 'INVALID_ANSWER');
     });
   });
+
+  describe('Provider config handling', () => {
+    it('Should correctly setup with newly created provider when no previous providers exist', async () => {
+      const mockedOpenBrowser = sinon.stub().returns();
+      const mockedDisconnect = sinon.stub().returns();
+      const mockedCreateProviderLink = sinon.stub().resolves();
+      const providerUid = 'provideruid';
+      const internalMockedSdk = {
+        ...mockedSdk,
+        connect: ({ onEvent }) => {
+          onEvent({
+            data: {
+              object: {
+                provider_uid: providerUid,
+              },
+            },
+          });
+        },
+        disconnect: mockedDisconnect,
+        createProviderLink: mockedCreateProviderLink,
+      };
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+        '@serverless/dashboard-plugin/lib/clientUtils': {
+          getPlatformClientWithAccessKey: async () => internalMockedSdk,
+        },
+        '../../utils/openBrowser': mockedOpenBrowser,
+        '@serverless/utils/config': {
+          getLoggedInUser: () => ({}),
+        },
+      });
+
+      configureInquirerStub(inquirer, {
+        list: { credentialsSetupChoice: '_create_provider_' },
+      });
+
+      let stdoutData = '';
+      await overrideStdoutWrite(
+        (data) => (stdoutData += data),
+        async () =>
+          await mockedStep.run({
+            serviceDir: process.cwd(),
+            configuration: {
+              service: 'someservice',
+              provider: { name: 'aws' },
+              org: 'someorg',
+              app: 'someapp',
+            },
+            options: {},
+            configurationFilename: 'serverless.yml',
+          })
+      );
+
+      expect(stdoutData).to.include('AWS Access Role provider was successfully created');
+      expect(mockedOpenBrowser).to.have.been.calledWith(
+        chalk.bold.white(
+          'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
+        )
+      );
+      expect(mockedDisconnect).to.have.been.called;
+      expect(mockedCreateProviderLink).not.to.have.been.called;
+    });
+
+    it('Should correctly setup with newly created provider when previous providers exist', async () => {
+      const mockedOpenBrowser = sinon.stub().returns();
+      const mockedDisconnect = sinon.stub().returns();
+      const mockedCreateProviderLink = sinon.stub().resolves();
+      const providerUid = 'provideruid';
+      const internalMockedSdk = {
+        ...mockedSdk,
+        connect: ({ onEvent }) => {
+          onEvent({
+            data: {
+              object: {
+                provider_uid: providerUid,
+              },
+            },
+          });
+        },
+        getProviders: async () => {
+          return {
+            result: [
+              {
+                alias: 'someprovider',
+                providerName: 'aws',
+                providerType: 'roleArn',
+                providerUid,
+                providerDetails: {
+                  roleArn: 'arn:xxx',
+                },
+              },
+            ],
+          };
+        },
+        disconnect: mockedDisconnect,
+        createProviderLink: mockedCreateProviderLink,
+      };
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+        '@serverless/dashboard-plugin/lib/clientUtils': {
+          getPlatformClientWithAccessKey: async () => internalMockedSdk,
+        },
+        '../../utils/openBrowser': mockedOpenBrowser,
+        '@serverless/utils/config': {
+          getLoggedInUser: () => ({}),
+        },
+      });
+
+      configureInquirerStub(inquirer, {
+        list: { credentialsSetupChoice: '_create_provider_' },
+      });
+
+      let stdoutData = '';
+      await overrideStdoutWrite(
+        (data) => (stdoutData += data),
+        async () =>
+          await mockedStep.run({
+            serviceDir: process.cwd(),
+            configuration: {
+              service: 'someservice',
+              provider: { name: 'aws' },
+              org: 'someorg',
+              app: 'someapp',
+            },
+            options: {},
+            configurationFilename: 'serverless.yml',
+          })
+      );
+
+      expect(stdoutData).to.include('AWS Access Role provider was successfully created');
+      expect(mockedOpenBrowser).to.have.been.calledWith(
+        chalk.bold.white(
+          'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
+        )
+      );
+      expect(mockedDisconnect).to.have.been.called;
+      expect(mockedCreateProviderLink).to.have.been.calledWith(
+        'org-uid',
+        'instance',
+        'appName|someapp|serviceName|someservice|stage|dev|region|us-east-1',
+        providerUid
+      );
+    });
+
+    it('Should emit warning when dashboard unavailable when connecting to it', async () => {
+      const mockedOpenBrowser = sinon.stub().returns();
+      const internalMockedSdk = {
+        ...mockedSdk,
+        connect: () => {
+          const err = new Error('error');
+          err.statusCode = 500;
+          throw err;
+        },
+      };
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+        '@serverless/dashboard-plugin/lib/clientUtils': {
+          getPlatformClientWithAccessKey: async () => internalMockedSdk,
+        },
+        '../../utils/openBrowser': mockedOpenBrowser,
+      });
+
+      configureInquirerStub(inquirer, {
+        list: { credentialsSetupChoice: '_create_provider_' },
+      });
+
+      let stdoutData = '';
+      await overrideStdoutWrite(
+        (data) => (stdoutData += data),
+        async () =>
+          await mockedStep.run({
+            serviceDir: process.cwd(),
+            configuration: {
+              service: 'someservice',
+              provider: { name: 'aws' },
+              org: 'someorg',
+              app: 'someapp',
+            },
+            configurationFilename: 'serverless.yml',
+          })
+      );
+
+      expect(stdoutData).to.include('Dashboard service is currently unavailable');
+      expect(mockedOpenBrowser).to.have.been.calledWith(
+        chalk.bold.white(
+          'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
+        )
+      );
+    });
+
+    it('Should correctly setup with existing provider', async () => {
+      const providerUid = 'provideruid';
+      const mockedCreateProviderLink = sinon.stub().resolves();
+      const internalMockedSdk = {
+        ...mockedSdk,
+        getProviders: async () => {
+          return {
+            result: [
+              {
+                alias: 'someprovider',
+                providerName: 'aws',
+                providerType: 'accessKey',
+                providerUid,
+                providerDetails: {
+                  accessKeyId: 'axx',
+                },
+              },
+            ],
+          };
+        },
+        createProviderLink: mockedCreateProviderLink,
+      };
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+        '@serverless/dashboard-plugin/lib/clientUtils': {
+          getPlatformClientWithAccessKey: async () => internalMockedSdk,
+        },
+      });
+
+      configureInquirerStub(inquirer, {
+        list: { credentialsSetupChoice: providerUid },
+      });
+
+      let stdoutData = '';
+      await overrideStdoutWrite(
+        (data) => (stdoutData += data),
+        async () =>
+          await mockedStep.run({
+            serviceDir: process.cwd(),
+            configuration: {
+              service: 'someservice',
+              provider: { name: 'aws' },
+              org: 'someorg',
+              app: 'someapp',
+            },
+            options: {},
+            configurationFilename: 'serverless.yml',
+          })
+      );
+
+      expect(mockedCreateProviderLink).to.have.been.calledWith(
+        'org-uid',
+        'instance',
+        'appName|someapp|serviceName|someservice|stage|dev|region|us-east-1',
+        'provideruid'
+      );
+      expect(stdoutData).to.include('Selected provider was successfully linked');
+    });
+
+    it('Should emit a warning when dashboard is not available and link cannot be created', async () => {
+      const providerUid = 'provideruid';
+      const mockedCreateProviderLink = sinon.stub().callsFake(async () => {
+        const err = new Error('error');
+        err.statusCode = 500;
+        throw err;
+      });
+      const internalMockedSdk = {
+        ...mockedSdk,
+        getProviders: async () => {
+          return {
+            result: [
+              {
+                alias: 'someprovider',
+                providerName: 'aws',
+                providerType: 'roleArn',
+                providerUid,
+                providerDetails: {
+                  roleArn: 'arn:xxx',
+                },
+              },
+            ],
+          };
+        },
+        createProviderLink: mockedCreateProviderLink,
+      };
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+        '@serverless/dashboard-plugin/lib/clientUtils': {
+          getPlatformClientWithAccessKey: async () => internalMockedSdk,
+        },
+      });
+
+      configureInquirerStub(inquirer, {
+        list: { credentialsSetupChoice: providerUid },
+      });
+
+      let stdoutData = '';
+      await overrideStdoutWrite(
+        (data) => (stdoutData += data),
+        async () =>
+          await mockedStep.run({
+            serviceDir: process.cwd(),
+            configuration: {
+              service: 'someservice',
+              provider: { name: 'aws' },
+              org: 'someorg',
+              app: 'someapp',
+            },
+            options: {},
+            configurationFilename: 'serverless.yml',
+          })
+      );
+
+      expect(stdoutData).to.include(
+        'Dashboard service is currently unavailable, please try again later'
+      );
+      expect(stdoutData).not.to.include('Selected provider was successfully linked');
+      expect(mockedCreateProviderLink).to.have.been.calledWith(
+        'org-uid',
+        'instance',
+        'appName|someapp|serviceName|someservice|stage|dev|region|us-east-1',
+        'provideruid'
+      );
+    });
+
+    it('Should emit a warning when dashboard is not available when fetching providers', async () => {
+      const internalMockedSdk = {
+        ...mockedSdk,
+        getProviders: async () => {
+          const err = new Error('unavailable');
+          err.statusCode = 500;
+          throw err;
+        },
+      };
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+        '@serverless/dashboard-plugin/lib/clientUtils': {
+          getPlatformClientWithAccessKey: async () => internalMockedSdk,
+        },
+        '@serverless/utils/config': {
+          getLoggedInUser: () => ({}),
+        },
+      });
+
+      let stdoutData = '';
+      await overrideStdoutWrite(
+        (data) => (stdoutData += data),
+        async () =>
+          await mockedStep.run({
+            serviceDir: process.cwd(),
+            configuration: { provider: { name: 'aws' }, org: 'someorg' },
+            configurationFilename: 'serverless.yml',
+          })
+      );
+
+      expect(stdoutData).to.include('Dashboard service is currently unavailable');
+    });
+  });
 });
diff --git a/test/unit/lib/cli/interactive-setup/index.test.js b/test/unit/lib/cli/interactive-setup/index.test.js
index 78cadf53267..7a65ad77c06 100644
--- a/test/unit/lib/cli/interactive-setup/index.test.js
+++ b/test/unit/lib/cli/interactive-setup/index.test.js
@@ -34,13 +34,16 @@ describe('test/unit/lib/cli/interactive-setup/index.test.js', () => {
       // dashboard-login
       {
         instructionString: 'Do you want to login/register to Serverless Dashboard?',
+        input: '\u001b[B', // Move cursor down by one line
       },
 
       // dashboard-set-org
       // Skipped, as internally depends on remote state of data and cannot be easily tested offline
 
       // aws-credentials
-      { instructionString: 'Do you want to set them up now?', input: 'Y' },
+      {
+        instructionString: 'No AWS credentials found, what credentials do you want to use?',
+      },
       { instructionString: 'AWS account', input: 'Y' },
       { instructionString: 'Press Enter to continue' },
       {

From d28147276e559afcb90550d6ca23fc362ccf97e9 Mon Sep 17 00:00:00 2001
From: Nick White <nickswhite89@gmail.com>
Date: Mon, 28 Jun 2021 11:05:48 +0100
Subject: [PATCH 0247/1101] docs: fix `provider.cloudFront.cachePolicies[]`
 example (#9649)

---
 docs/providers/aws/guide/serverless.yml.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index c11cea51b16..68c3f454b3a 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -90,7 +90,7 @@ provider:
         EnableAcceptEncodingBrotli: true # optional
         EnableAcceptEncodingGzip: true
         HeadersConfig:
-          HeadersBehavior: whitelist # Possible values are 'none' and 'whitelist'
+          HeaderBehavior: whitelist # Possible values are 'none' and 'whitelist'
           Headers:
             - authorization
             - content-type

From 28a06a05aba4306d2f28d26652067b44ed105151 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 1 Jun 2021 11:41:28 +0200
Subject: [PATCH 0248/1101] feat(CLI Onboarding): Add deploy step

---
 lib/cli/interactive-setup/aws-credentials.js  |  47 +---
 .../deploy-progress-plugin.js                 |  36 +++
 lib/cli/interactive-setup/deploy.js           | 177 ++++++++++++++
 lib/cli/interactive-setup/index.js            |   1 +
 lib/cli/interactive-setup/service.js          |   6 +-
 lib/cli/interactive-setup/utils.js            |  22 ++
 package.json                                  |   3 +-
 .../interactive-setup/aws-credentials.test.js | 137 ++++-------
 .../lib/cli/interactive-setup/deploy.test.js  | 228 ++++++++++++++++++
 .../lib/cli/interactive-setup/index.test.js   |   4 +-
 .../lib/cli/interactive-setup/utils.test.js   |  64 +++++
 11 files changed, 592 insertions(+), 133 deletions(-)
 create mode 100644 lib/cli/interactive-setup/deploy-progress-plugin.js
 create mode 100644 lib/cli/interactive-setup/deploy.js
 create mode 100644 test/unit/lib/cli/interactive-setup/deploy.test.js
 create mode 100644 test/unit/lib/cli/interactive-setup/utils.test.js

diff --git a/lib/cli/interactive-setup/aws-credentials.js b/lib/cli/interactive-setup/aws-credentials.js
index b543a7ce7bb..280f5d6ad55 100644
--- a/lib/cli/interactive-setup/aws-credentials.js
+++ b/lib/cli/interactive-setup/aws-credentials.js
@@ -4,21 +4,20 @@ const chalk = require('chalk');
 const _ = require('lodash');
 const inquirer = require('@serverless/utils/inquirer');
 const memoizee = require('memoizee');
-const configUtils = require('@serverless/utils/config');
 
 const AWS = require('aws-sdk');
 
 const awsCredentials = require('../../plugins/aws/utils/credentials');
-const { confirm } = require('./utils');
+const { confirm, doesServiceInstanceHaveLinkedProvider } = require('./utils');
 const openBrowser = require('../../utils/openBrowser');
 const ServerlessError = require('../../serverless-error');
+const resolveStage = require('../../utils/resolve-stage');
+const resolveRegion = require('../../utils/resolve-region');
 
 const isValidAwsAccessKeyId = RegExp.prototype.test.bind(/^[A-Z0-9]{10,}$/);
 const isValidAwsSecretAccessKey = RegExp.prototype.test.bind(/^[a-zA-Z0-9/+]{10,}$/);
 const { getPlatformClientWithAccessKey } = require('@serverless/dashboard-plugin/lib/clientUtils');
-const resolveProviderCredentials = require('@serverless/dashboard-plugin/lib/resolveProviderCredentials');
-const resolveStage = require('../../utils/resolve-stage');
-const resolveRegion = require('../../utils/resolve-region');
+const isAuthenticated = require('@serverless/dashboard-plugin/lib/isAuthenticated');
 
 const CREDENTIALS_SETUP_CHOICE = {
   LOCAL: '_local_',
@@ -36,25 +35,6 @@ const getSdkInstance = memoizee(
   { promise: true }
 );
 
-const doesServiceInstanceHaveLinkedProvider = async ({ configuration, options }) => {
-  const region = resolveRegion({ configuration, options });
-  const stage = resolveStage({ configuration, options });
-  let result;
-  try {
-    result = await resolveProviderCredentials({ configuration, region, stage });
-  } catch (err) {
-    if (err.statusCode && err.statusCode >= 500) {
-      throw new ServerlessError(
-        'Dashboard service is currently unavailable, please try again later',
-        'DASHBOARD_UNAVAILABLE'
-      );
-    }
-    throw err;
-  }
-
-  return Boolean(result);
-};
-
 const getOrgUidByName = memoizee(
   async (orgName) => {
     const sdk = await getSdkInstance(orgName);
@@ -321,18 +301,6 @@ const steps = {
   },
 };
 
-const isUserLoggedIn = () => {
-  if (process.env.SERVERLESS_ACCESS_KEY) {
-    return true;
-  }
-
-  if (configUtils.getLoggedInUser()) {
-    return true;
-  }
-
-  return false;
-};
-
 module.exports = {
   async isApplicable(context) {
     const { configuration, history, options } = context;
@@ -346,7 +314,7 @@ module.exports = {
     if ((await awsCredentials.resolveFileProfiles()).size) return false;
 
     const orgName = configuration.org;
-    if (orgName && isUserLoggedIn()) {
+    if (orgName && isAuthenticated()) {
       let providers;
       try {
         providers = await getProviders(orgName);
@@ -379,7 +347,7 @@ module.exports = {
 
     // It is possible that user decides to not configure org for his service and
     // we still should allow setup of local credentials in such case
-    if (context.configuration.org && isUserLoggedIn()) {
+    if (context.configuration.org && isAuthenticated()) {
       try {
         providers = await getProviders(context.configuration.org);
       } catch (err) {
@@ -396,7 +364,8 @@ module.exports = {
       try {
         const createdProviderUid = await steps.handleProviderCreation(context);
         const hadExistingProviders = Boolean(providers.length);
-        if (createdProviderUid && hadExistingProviders) {
+        const shouldLinkProvider = createdProviderUid && hadExistingProviders;
+        if (shouldLinkProvider) {
           // This is situation where user decided to create a new provider and already had previous providers setup
           // In this case, we want to setup an explicit link between provider and service as the newly created provider
           // might not be the default one.
diff --git a/lib/cli/interactive-setup/deploy-progress-plugin.js b/lib/cli/interactive-setup/deploy-progress-plugin.js
new file mode 100644
index 00000000000..990f7f4221e
--- /dev/null
+++ b/lib/cli/interactive-setup/deploy-progress-plugin.js
@@ -0,0 +1,36 @@
+'use strict';
+
+const cliProgressFooter = require('cli-progress-footer');
+const chalk = require('chalk');
+
+class InteractiveDeployProgress {
+  constructor(serverless) {
+    this.serverless = serverless;
+    this.progress = cliProgressFooter({ overrideStdout: false });
+    this.progress.shouldAddProgressAnimationPrefix = true;
+
+    this.hooks = {
+      'before:deploy:deploy': async () => {
+        this.progress.updateProgress('Deploying your project...\n');
+      },
+      'deploy:finalize': async () => {
+        this.progress.updateProgress('');
+        this.progress.writeStdout(chalk.green('\nDeployment succesful\n'));
+      },
+
+      'package:initialize': async () => {
+        this.progress.updateProgress('Packaging your project...\n');
+      },
+      'package:finalize': async () => {
+        this.progress.updateProgress('');
+        this.progress.writeStdout(chalk.green('\nPackaging succesful\n'));
+      },
+    };
+  }
+
+  handleError() {
+    this.progress.updateProgress('');
+  }
+}
+
+module.exports = InteractiveDeployProgress;
diff --git a/lib/cli/interactive-setup/deploy.js b/lib/cli/interactive-setup/deploy.js
new file mode 100644
index 00000000000..69ff597afc0
--- /dev/null
+++ b/lib/cli/interactive-setup/deploy.js
@@ -0,0 +1,177 @@
+'use strict';
+
+const Serverless = require('../../Serverless');
+const chalk = require('chalk');
+const { confirm, doesServiceInstanceHaveLinkedProvider } = require('./utils');
+const _ = require('lodash');
+const overrideStdoutWrite = require('process-utils/override-stdout-write');
+const { getDashboardInteractUrl } = require('@serverless/dashboard-plugin/lib/dashboard');
+const AWS = require('aws-sdk');
+const isAuthenticated = require('@serverless/dashboard-plugin/lib/isAuthenticated');
+
+const printMessage = ({
+  serviceName,
+  hasBeenDeployed,
+  dashboardPlugin,
+  isConfiguredWithDashboard,
+}) => {
+  if (isConfiguredWithDashboard) {
+    if (hasBeenDeployed) {
+      process.stdout.write(
+        [
+          `\n${chalk.green('Your project is live and available in ')}${chalk.white.bold(
+            `./${serviceName}`
+          )}`,
+          `\n  Run ${chalk.bold('serverless info')} in the project directory`,
+          '    View your endpoints and services',
+          `\n  Open ${chalk.bold(getDashboardInteractUrl(dashboardPlugin))}`,
+          '    Invoke your functions and view logs in the dashboard',
+          `\n  Run ${chalk.bold('serverless deploy')} in the project directory`,
+          "    Redeploy your service after you've updated your service code or configuration\n\n",
+        ].join('\n')
+      );
+
+      return;
+    }
+
+    process.stdout.write(
+      [
+        `\n${chalk.green(
+          'Your project is ready for deployment and available in '
+        )}${chalk.white.bold(`./${serviceName}`)}`,
+        `\n  Run ${chalk.bold('serverless deploy')} in the project directory`,
+        '    Deploy your newly created service',
+        `\n  Run ${chalk.bold('serverless info')} in the project directory after deployment`,
+        '    View your endpoints and services',
+        '\n  Open Serverless Dashboard after deployment',
+        '    Invoke your functions and view logs in the dashboard\n\n',
+      ].join('\n')
+    );
+    return;
+  }
+
+  if (hasBeenDeployed) {
+    process.stdout.write(
+      [
+        `\n${chalk.green('Your project is live and available in ')}${chalk.white.bold(
+          `./${serviceName}`
+        )}`,
+        `\n  Run ${chalk.bold('serverless info')} in the project directory`,
+        '    View your endpoints and services',
+        `\n  Run ${chalk.bold('serverless deploy')} in the directory`,
+        "    Redeploy your service after you've updated your service code or configuration",
+        `\n  Run ${chalk.bold('serverless invoke')} and ${chalk.bold(
+          'serverless logs'
+        )} in the project directory`,
+        '    Invoke your functions directly and view the logs',
+        `\n  Run ${chalk.bold('serverless')} in the project directory`,
+        '    Add metrics, alerts, and a log explorer, by enabling the dashboard functionality\n\n',
+      ].join('\n')
+    );
+    return;
+  }
+
+  process.stdout.write(
+    [
+      `\n${chalk.green('Your project is ready for deployment and available in ')}${chalk.white.bold(
+        `./${serviceName}`
+      )}`,
+      `\n  Run ${chalk.bold('serverless deploy')} in the project directory`,
+      '    Deploy your newly created service',
+      `\n  Run ${chalk.bold('serverless info')} in the project directory after deployment`,
+      '    View your endpoints and services',
+      `\n  Run ${chalk.bold('serverless invoke')} and ${chalk.bold(
+        'serverless logs'
+      )} in the project directory after deployment`,
+      '    Invoke your functions directly and view the logs',
+      `\n  Run ${chalk.bold('serverless')} in the project directory`,
+      '    Add metrics, alerts, and a log explorer, by enabling the dashboard functionality\n\n',
+    ].join('\n')
+  );
+};
+
+const configurePlugin = (serverless, originalStdWrite) => {
+  serverless.pluginManager.addPlugin(require('./deploy-progress-plugin'));
+  const interactivePlugin = serverless.pluginManager.plugins.find(
+    (plugin) => plugin.constructor.name === 'InteractiveDeployProgress'
+  );
+  interactivePlugin.progress._writeOriginalStdout = (data) => originalStdWrite(data);
+  return interactivePlugin;
+};
+
+module.exports = {
+  async isApplicable({ configuration, serviceDir, history, options }) {
+    if (!serviceDir) {
+      return false;
+    }
+
+    if (
+      _.get(configuration, 'provider') !== 'aws' &&
+      _.get(configuration, 'provider.name') !== 'aws'
+    ) {
+      return false;
+    }
+
+    // If `awsCredentials` step was not executed, we should proceed as it means that user has available credentials
+    if (!history.has('awsCredentials')) return true;
+
+    // We want to proceed if the service instance has a linked provider
+    if (
+      configuration.org &&
+      isAuthenticated() &&
+      (await doesServiceInstanceHaveLinkedProvider({ configuration, options }))
+    ) {
+      return true;
+    }
+
+    // We want to proceed if local credentials are available
+    if (new AWS.Config().credentials) return true;
+
+    return false;
+  },
+  async run({ configuration, configurationFilename, serviceDir }) {
+    const serviceName = configuration.service;
+    if (!(await confirm('Do you want to deploy your project?', { name: 'shouldDeploy' }))) {
+      printMessage({
+        serviceName,
+        hasBeenDeployed: false,
+        isConfiguredWithDashboard: Boolean(configuration.org),
+      });
+      return;
+    }
+
+    const serverless = new Serverless({
+      configuration,
+      serviceDir,
+      configurationFilename,
+      isConfigurationResolved: true,
+      hasResolvedCommandsExternally: true,
+      isTelemetryReportedExternally: true,
+      commands: ['deploy'],
+      options: {},
+    });
+
+    let interactiveOutputPlugin;
+
+    try {
+      await overrideStdoutWrite(
+        () => {},
+        async (originalStdWrite) => {
+          await serverless.init();
+          interactiveOutputPlugin = configurePlugin(serverless, originalStdWrite);
+          await serverless.run();
+        }
+      );
+    } catch (err) {
+      interactiveOutputPlugin.handleError();
+      throw err;
+    }
+
+    printMessage({
+      serviceName,
+      hasBeenDeployed: true,
+      isConfiguredWithDashboard: Boolean(configuration.org),
+      dashboardPlugin: serverless.pluginManager.dashboardPlugin,
+    });
+  },
+};
diff --git a/lib/cli/interactive-setup/index.js b/lib/cli/interactive-setup/index.js
index c262a3b0804..de6e3f3677c 100644
--- a/lib/cli/interactive-setup/index.js
+++ b/lib/cli/interactive-setup/index.js
@@ -7,6 +7,7 @@ const steps = {
   dashboardLogin: require('@serverless/dashboard-plugin/lib/cli/interactive-setup/dashboard-login'),
   dashboardSetOrg: require('@serverless/dashboard-plugin/lib/cli/interactive-setup/dashboard-set-org'),
   awsCredentials: require('./aws-credentials'),
+  deploy: require('./deploy'),
 };
 
 module.exports = async (context) => {
diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index 038756f9cbc..e9dadd5a9f4 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -200,7 +200,7 @@ module.exports = {
     }
 
     if (hasPackageJson) {
-      process.stdout.write(`\nInstalling dependencies with "npm" in "${projectName}" folder.\n`);
+      process.stdout.write(`\nInstalling dependencies with "npm" in "${projectName}" folder\n`);
       const npmCommand = await npmCommandDeferred;
       try {
         await spawn(npmCommand, ['install'], { cwd: projectDir });
@@ -228,7 +228,9 @@ module.exports = {
     }
 
     process.stdout.write(
-      `\n${chalk.green(`Project successfully created in '${projectName}' folder.`)}\n`
+      `\n${chalk.green(
+        `Project successfully created in ${chalk.white.bold(projectName)} folder`
+      )}\n`
     );
     context.serviceDir = projectDir;
     const configurationPath = await resolveConfigurationPath({ cwd: projectDir, options: {} });
diff --git a/lib/cli/interactive-setup/utils.js b/lib/cli/interactive-setup/utils.js
index 2364000d646..dfbc0060a27 100644
--- a/lib/cli/interactive-setup/utils.js
+++ b/lib/cli/interactive-setup/utils.js
@@ -1,6 +1,10 @@
 'use strict';
 
 const inquirer = require('@serverless/utils/inquirer');
+const ServerlessError = require('../../serverless-error');
+const resolveProviderCredentials = require('@serverless/dashboard-plugin/lib/resolveProviderCredentials');
+const resolveStage = require('../../utils/resolve-stage');
+const resolveRegion = require('../../utils/resolve-region');
 
 module.exports = {
   confirm: async (message, options = {}) => {
@@ -13,4 +17,22 @@ module.exports = {
       })
     )[name];
   },
+  doesServiceInstanceHaveLinkedProvider: async ({ configuration, options }) => {
+    const region = resolveRegion({ configuration, options });
+    const stage = resolveStage({ configuration, options });
+    let result;
+    try {
+      result = await resolveProviderCredentials({ configuration, region, stage });
+    } catch (err) {
+      if (err.statusCode && err.statusCode >= 500) {
+        throw new ServerlessError(
+          'Dashboard service is currently unavailable, please try again later',
+          'DASHBOARD_UNAVAILABLE'
+        );
+      }
+      throw err;
+    }
+
+    return Boolean(result);
+  },
 };
diff --git a/package.json b/package.json
index 57ca728b9f9..b59632efe67 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
     "chalk": "^4.1.1",
     "child-process-ext": "^2.1.1",
     "ci-info": "^3.2.0",
+    "cli-progress-footer": "^1.1.1",
     "d": "^1.0.1",
     "dayjs": "^1.10.5",
     "decompress": "^4.2.1",
@@ -61,6 +62,7 @@
     "node-fetch": "^2.6.1",
     "object-hash": "^2.2.0",
     "path2": "^0.1.0",
+    "process-utils": "^4.0.0",
     "promise-queue": "^2.2.5",
     "replaceall": "^0.1.6",
     "semver": "^7.3.5",
@@ -93,7 +95,6 @@
     "nyc": "^15.1.0",
     "pkg": "^4.5.1",
     "prettier": "^2.3.1",
-    "process-utils": "^4.0.0",
     "proxyquire": "^2.1.3",
     "semver-regex": "^3.1.2",
     "sinon": "^11.1.1",
diff --git a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
index 01ab849d4bf..2a6809fe530 100644
--- a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
+++ b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
@@ -89,15 +89,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       '@serverless/dashboard-plugin/lib/clientUtils': {
         getPlatformClientWithAccessKey: async () => internalMockedSdk,
       },
-      '@serverless/utils/config': {
-        getLoggedInUser: () => {
-          return {
-            accessKeys: {
-              someorg: 'xxx',
-            },
-          };
-        },
-      },
+      '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
     });
 
     expect(
@@ -133,21 +125,9 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       '@serverless/dashboard-plugin/lib/clientUtils': {
         getPlatformClientWithAccessKey: async () => internalMockedSdk,
       },
-      '@serverless/utils/config': {
-        getLoggedInUser: () => {
-          return {
-            accessKeys: {
-              someorg: 'xxx',
-            },
-          };
-        },
-      },
-      '@serverless/dashboard-plugin/lib/resolveProviderCredentials': () => {
-        return {
-          accessKeyId: 'somekey',
-          secretAccessKey: 'somesecret',
-          sessionToken: 'somesessiontoken',
-        };
+      '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
+      './utils': {
+        doesServiceInstanceHaveLinkedProvider: () => true,
       },
     });
 
@@ -191,17 +171,9 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       '@serverless/dashboard-plugin/lib/clientUtils': {
         getPlatformClientWithAccessKey: async () => internalMockedSdk,
       },
-      '@serverless/utils/config': {
-        getLoggedInUser: () => {
-          return {
-            accessKeys: {
-              someorg: 'xxx',
-            },
-          };
-        },
-      },
-      '@serverless/dashboard-plugin/lib/resolveProviderCredentials': () => {
-        return null;
+      '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
+      './utils': {
+        doesServiceInstanceHaveLinkedProvider: () => false,
       },
     });
 
@@ -234,15 +206,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       '@serverless/dashboard-plugin/lib/clientUtils': {
         getPlatformClientWithAccessKey: async () => internalMockedSdk,
       },
-      '@serverless/utils/config': {
-        getLoggedInUser: () => {
-          return {
-            accessKeys: {
-              someorg: 'xxx',
-            },
-          };
-        },
-      },
+      '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
     });
 
     let stdoutData = '';
@@ -436,9 +400,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
           getPlatformClientWithAccessKey: async () => internalMockedSdk,
         },
         '../../utils/openBrowser': mockedOpenBrowser,
-        '@serverless/utils/config': {
-          getLoggedInUser: () => ({}),
-        },
+        '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
       });
 
       configureInquirerStub(inquirer, {
@@ -446,20 +408,20 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       });
 
       let stdoutData = '';
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+        },
+        options: {},
+        configurationFilename: 'serverless.yml',
+      };
       await overrideStdoutWrite(
         (data) => (stdoutData += data),
-        async () =>
-          await mockedStep.run({
-            serviceDir: process.cwd(),
-            configuration: {
-              service: 'someservice',
-              provider: { name: 'aws' },
-              org: 'someorg',
-              app: 'someapp',
-            },
-            options: {},
-            configurationFilename: 'serverless.yml',
-          })
+        async () => await mockedStep.run(context)
       );
 
       expect(stdoutData).to.include('AWS Access Role provider was successfully created');
@@ -511,30 +473,28 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
           getPlatformClientWithAccessKey: async () => internalMockedSdk,
         },
         '../../utils/openBrowser': mockedOpenBrowser,
-        '@serverless/utils/config': {
-          getLoggedInUser: () => ({}),
-        },
+        '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
       });
 
       configureInquirerStub(inquirer, {
         list: { credentialsSetupChoice: '_create_provider_' },
       });
 
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+        },
+        options: {},
+        configurationFilename: 'serverless.yml',
+      };
       let stdoutData = '';
       await overrideStdoutWrite(
         (data) => (stdoutData += data),
-        async () =>
-          await mockedStep.run({
-            serviceDir: process.cwd(),
-            configuration: {
-              service: 'someservice',
-              provider: { name: 'aws' },
-              org: 'someorg',
-              app: 'someapp',
-            },
-            options: {},
-            configurationFilename: 'serverless.yml',
-          })
+        async () => await mockedStep.run(context)
       );
 
       expect(stdoutData).to.include('AWS Access Role provider was successfully created');
@@ -629,21 +589,21 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         list: { credentialsSetupChoice: providerUid },
       });
 
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+        },
+        options: {},
+        configurationFilename: 'serverless.yml',
+      };
       let stdoutData = '';
       await overrideStdoutWrite(
         (data) => (stdoutData += data),
-        async () =>
-          await mockedStep.run({
-            serviceDir: process.cwd(),
-            configuration: {
-              service: 'someservice',
-              provider: { name: 'aws' },
-              org: 'someorg',
-              app: 'someapp',
-            },
-            options: {},
-            configurationFilename: 'serverless.yml',
-          })
+        async () => await mockedStep.run(context)
       );
 
       expect(mockedCreateProviderLink).to.have.been.calledWith(
@@ -733,9 +693,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         '@serverless/dashboard-plugin/lib/clientUtils': {
           getPlatformClientWithAccessKey: async () => internalMockedSdk,
         },
-        '@serverless/utils/config': {
-          getLoggedInUser: () => ({}),
-        },
+        '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
       });
 
       let stdoutData = '';
@@ -745,6 +703,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
           await mockedStep.run({
             serviceDir: process.cwd(),
             configuration: { provider: { name: 'aws' }, org: 'someorg' },
+            options: {},
             configurationFilename: 'serverless.yml',
           })
       );
diff --git a/test/unit/lib/cli/interactive-setup/deploy.test.js b/test/unit/lib/cli/interactive-setup/deploy.test.js
new file mode 100644
index 00000000000..af4eceae271
--- /dev/null
+++ b/test/unit/lib/cli/interactive-setup/deploy.test.js
@@ -0,0 +1,228 @@
+'use strict';
+
+const chai = require('chai');
+const chalk = require('chalk');
+const sinon = require('sinon');
+const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
+const overrideEnv = require('process-utils/override-env');
+const step = require('../../../../../lib/cli/interactive-setup/deploy');
+const proxyquire = require('proxyquire');
+const overrideStdoutWrite = require('process-utils/override-stdout-write');
+
+const { expect } = chai;
+
+chai.use(require('chai-as-promised'));
+chai.use(require('sinon-chai'));
+
+const inquirer = require('@serverless/utils/inquirer');
+
+describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
+  it('Should be not applied, when not at service path', async () =>
+    expect(await step.isApplicable({ options: {} })).to.equal(false));
+
+  it('Should be not applied, when service is not configured with AWS provider', async () =>
+    expect(
+      await step.isApplicable({
+        configuration: { provider: { name: 'notaws' } },
+        serviceDir: '/foo',
+        options: {},
+        history: new Map(),
+      })
+    ).to.equal(false));
+
+  it('Should be applied, if awsCredentials step was not executed which means user already had credentials', async () =>
+    expect(
+      await step.isApplicable({
+        configuration: { provider: { name: 'aws' } },
+        serviceDir: '/foo',
+        options: {},
+        history: new Map(),
+      })
+    ).to.equal(true));
+
+  it('Should be applied if user configured local credentials', async () => {
+    await overrideEnv(
+      { variables: { AWS_ACCESS_KEY_ID: 'somekey', AWS_SECRET_ACCESS_KEY: 'somesecret' } },
+      async () => {
+        expect(
+          await step.isApplicable({
+            configuration: { provider: { name: 'aws' } },
+            serviceDir: '/foo',
+            options: {},
+            history: new Map([['awsCredentials', []]]),
+          })
+        ).to.equal(true);
+      }
+    );
+  });
+
+  it('Should be applied if service instance has a linked provider', async () => {
+    const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/deploy', {
+      '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
+      './utils': {
+        doesServiceInstanceHaveLinkedProvider: () => true,
+      },
+    });
+
+    expect(
+      await mockedStep.isApplicable({
+        configuration: { provider: { name: 'aws' }, org: 'someorg' },
+        serviceDir: '/foo',
+        options: {},
+        history: new Map([['awsCredentials', []]]),
+      })
+    ).to.equal(true);
+  });
+
+  describe('run', () => {
+    it('should correctly handle skipping deployment for service configured with dashboard', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldDeploy: false },
+      });
+
+      let stdoutData = '';
+      await overrideStdoutWrite(
+        (data) => (stdoutData += data),
+        async () =>
+          await step.run({
+            serviceDir: process.cwd(),
+            configuration: {
+              service: 'someservice',
+              provider: { name: 'aws' },
+            },
+            configurationFilename: 'serverless.yml',
+          })
+      );
+
+      expect(stdoutData).to.include('Your project is ready for deployment');
+      expect(stdoutData).to.include(`Run ${chalk.bold('serverless')} in the project directory`);
+    });
+
+    it('should correctly handle skipping deployment for service not configured with dashboard', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldDeploy: false },
+      });
+
+      let stdoutData = '';
+      await overrideStdoutWrite(
+        (data) => (stdoutData += data),
+        async () =>
+          await step.run({
+            serviceDir: process.cwd(),
+            configuration: {
+              service: 'someservice',
+              provider: { name: 'aws' },
+              org: 'someorg',
+              app: 'someapp',
+            },
+            configurationFilename: 'serverless.yml',
+          })
+      );
+
+      expect(stdoutData).to.include('Your project is ready for deployment');
+      expect(stdoutData).to.include('Invoke your functions and view logs in the dashboard');
+    });
+
+    it('should correctly handle deployment for service configured with dashboard', async () => {
+      const mockedInit = sinon.stub().resolves();
+      const mockedRun = sinon.stub().resolves();
+      class MockedServerless {
+        constructor() {
+          this.init = mockedInit;
+          this.run = mockedRun;
+          this.pluginManager = {
+            addPlugin: () => ({}),
+            plugins: [
+              {
+                constructor: {
+                  name: 'InteractiveDeployProgress',
+                },
+                progress: {},
+              },
+            ],
+            dashboardPlugin: {},
+          };
+        }
+      }
+
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/deploy', {
+        '../../Serverless': MockedServerless,
+        '@serverless/dashboard-plugin/lib/dashboard': {
+          getDashboardInteractUrl: () => 'https://app.serverless-dev.com/path/to/dashboard',
+        },
+      });
+
+      configureInquirerStub(inquirer, {
+        confirm: { shouldDeploy: true },
+      });
+
+      let stdoutData = '';
+      await overrideStdoutWrite(
+        (data) => (stdoutData += data),
+        async () =>
+          await mockedStep.run({
+            serviceDir: process.cwd(),
+            configuration: {
+              service: 'someservice',
+              provider: { name: 'aws' },
+              org: 'someorg',
+              app: 'someapp',
+            },
+            configurationFilename: 'serverless.yml',
+          })
+      );
+
+      expect(stdoutData).to.include('Your project is live and available');
+      expect(stdoutData).to.include(
+        `Open ${chalk.bold('https://app.serverless-dev.com/path/to/dashboard')}`
+      );
+    });
+
+    it('should correctly handle deployment for service not configured with dashboard', async () => {
+      const mockedInit = sinon.stub().resolves();
+      const mockedRun = sinon.stub().resolves();
+      class MockedServerless {
+        constructor() {
+          this.init = mockedInit;
+          this.run = mockedRun;
+          this.pluginManager = {
+            addPlugin: () => ({}),
+            plugins: [
+              {
+                constructor: {
+                  name: 'InteractiveDeployProgress',
+                },
+                progress: {},
+              },
+            ],
+          };
+        }
+      }
+
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/deploy', {
+        '../../Serverless': MockedServerless,
+      });
+
+      configureInquirerStub(inquirer, {
+        confirm: { shouldDeploy: true },
+      });
+
+      let stdoutData = '';
+      await overrideStdoutWrite(
+        (data) => (stdoutData += data),
+        async () =>
+          await mockedStep.run({
+            serviceDir: process.cwd(),
+            configuration: {
+              service: 'someservice',
+              provider: { name: 'aws' },
+            },
+            configurationFilename: 'serverless.yml',
+          })
+      );
+
+      expect(stdoutData).to.include('Your project is live and available');
+      expect(stdoutData).to.include(`Run ${chalk.bold('serverless')}`);
+    });
+  });
+});
diff --git a/test/unit/lib/cli/interactive-setup/index.test.js b/test/unit/lib/cli/interactive-setup/index.test.js
index 7a65ad77c06..a55d0267a4a 100644
--- a/test/unit/lib/cli/interactive-setup/index.test.js
+++ b/test/unit/lib/cli/interactive-setup/index.test.js
@@ -55,8 +55,8 @@ describe('test/unit/lib/cli/interactive-setup/index.test.js', () => {
         input: 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY',
       },
 
-      // auto-update
-      { instructionString: 'to update automatically?', input: 'Y' },
+      // deploy
+      { instructionString: 'Do you want to deploy your project?', input: 'n' },
     ];
     slsProcess.stdout.on('data', (data) => {
       output += data;
diff --git a/test/unit/lib/cli/interactive-setup/utils.test.js b/test/unit/lib/cli/interactive-setup/utils.test.js
new file mode 100644
index 00000000000..3ff2f29679d
--- /dev/null
+++ b/test/unit/lib/cli/interactive-setup/utils.test.js
@@ -0,0 +1,64 @@
+'use strict';
+
+const chai = require('chai');
+
+const proxyquire = require('proxyquire');
+
+const { expect } = chai;
+
+chai.use(require('chai-as-promised'));
+
+describe('test/unit/lib/cli/interactive-setup/utils.test.js', () => {
+  describe('doesServiceInstanceHaveLinkedProvider', () => {
+    const configuration = {
+      app: 'someapp',
+      service: 'someservice',
+      org: 'someorg',
+    };
+    const options = {};
+
+    it('correctly resolves when credentials resolved', async () => {
+      const { doesServiceInstanceHaveLinkedProvider } = proxyquire(
+        '../../../../../lib/cli/interactive-setup/utils',
+        {
+          '@serverless/dashboard-plugin/lib/resolveProviderCredentials': () => {
+            return {
+              accessKeyId: 'someaccess',
+              secretAccessKey: 'somesecret',
+              sessionToken: 'sometoken',
+            };
+          },
+        }
+      );
+      expect(await doesServiceInstanceHaveLinkedProvider({ configuration, options })).to.be.true;
+    });
+
+    it('correctly resolves when credentials missing', async () => {
+      const { doesServiceInstanceHaveLinkedProvider } = proxyquire(
+        '../../../../../lib/cli/interactive-setup/utils',
+        {
+          '@serverless/dashboard-plugin/lib/resolveProviderCredentials': () => {
+            return null;
+          },
+        }
+      );
+      expect(await doesServiceInstanceHaveLinkedProvider({ configuration, options })).to.be.false;
+    });
+
+    it('throws when credentials resolution results in an error', async () => {
+      const { doesServiceInstanceHaveLinkedProvider } = proxyquire(
+        '../../../../../lib/cli/interactive-setup/utils',
+        {
+          '@serverless/dashboard-plugin/lib/resolveProviderCredentials': () => {
+            const err = new Error('Error');
+            err.statusCode = 500;
+            throw err;
+          },
+        }
+      );
+      expect(
+        doesServiceInstanceHaveLinkedProvider({ configuration, options })
+      ).to.eventually.be.rejected.and.have.property('code', 'DASHBOARD_UNAVAILABLE');
+    });
+  });
+});

From de7dc5e1b8b4bd9103ca522e1f93360c659e16ba Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 28 Jun 2021 12:07:39 +0200
Subject: [PATCH 0249/1101] docs(AWS CloudFront): Fix
 `provider.cloudFront.cachePolicies` listing

---
 docs/providers/aws/guide/serverless.yml.md | 43 +++++++++++-----------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 68c3f454b3a..44f324a552b 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -77,27 +77,28 @@ provider:
         cacheFrom:
           - my-image:latest
   cloudFront:
-    myCachePolicy1: # used as a reference in function.events[].cloudfront.cachePolicy.name
-      DefaultTTL: 60
-      MinTTL: 30
-      MaxTTL: 3600
-      Comment: my brand new cloudfront cache policy # optional
-      ParametersInCacheKeyAndForwardedToOrigin:
-        CookiesConfig:
-          CookieBehavior: whitelist # Possible values are 'none', 'whitelist', 'allExcept' and 'all'
-          Cookies:
-            - my-public-cookie
-        EnableAcceptEncodingBrotli: true # optional
-        EnableAcceptEncodingGzip: true
-        HeadersConfig:
-          HeaderBehavior: whitelist # Possible values are 'none' and 'whitelist'
-          Headers:
-            - authorization
-            - content-type
-        QueryStringsConfig:
-          QueryStringBehavior: allExcept # Possible values are 'none', 'whitelist', 'allExcept' and 'all'
-          QueryStrings:
-            - not-cached-query-string
+    cachePolicies:
+      myCachePolicy1: # used as a reference in function.events[].cloudfront.cachePolicy.name
+        DefaultTTL: 60
+        MinTTL: 30
+        MaxTTL: 3600
+        Comment: my brand new cloudfront cache policy # optional
+        ParametersInCacheKeyAndForwardedToOrigin:
+          CookiesConfig:
+            CookieBehavior: whitelist # Possible values are 'none', 'whitelist', 'allExcept' and 'all'
+            Cookies:
+              - my-public-cookie
+          EnableAcceptEncodingBrotli: true # optional
+          EnableAcceptEncodingGzip: true
+          HeadersConfig:
+            HeaderBehavior: whitelist # Possible values are 'none' and 'whitelist'
+            Headers:
+              - authorization
+              - content-type
+          QueryStringsConfig:
+            QueryStringBehavior: allExcept # Possible values are 'none', 'whitelist', 'allExcept' and 'all'
+            QueryStrings:
+              - not-cached-query-string
   versionFunctions: false # Optional function versioning
   environment: # Service wide environment variables
     serviceEnvVar: 123456789

From e8681ee157a697bbc560ff8b6b0da9adde57c048 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 8 Jun 2021 15:52:28 +0200
Subject: [PATCH 0250/1101] feat(CLI Onboarding): Support provider creation
 flow

---
 lib/cli/interactive-setup/aws-credentials.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/cli/interactive-setup/aws-credentials.js b/lib/cli/interactive-setup/aws-credentials.js
index 280f5d6ad55..48b1197512a 100644
--- a/lib/cli/interactive-setup/aws-credentials.js
+++ b/lib/cli/interactive-setup/aws-credentials.js
@@ -4,15 +4,12 @@ const chalk = require('chalk');
 const _ = require('lodash');
 const inquirer = require('@serverless/utils/inquirer');
 const memoizee = require('memoizee');
-
 const AWS = require('aws-sdk');
 
 const awsCredentials = require('../../plugins/aws/utils/credentials');
 const { confirm, doesServiceInstanceHaveLinkedProvider } = require('./utils');
 const openBrowser = require('../../utils/openBrowser');
 const ServerlessError = require('../../serverless-error');
-const resolveStage = require('../../utils/resolve-stage');
-const resolveRegion = require('../../utils/resolve-region');
 
 const isValidAwsAccessKeyId = RegExp.prototype.test.bind(/^[A-Z0-9]{10,}$/);
 const isValidAwsSecretAccessKey = RegExp.prototype.test.bind(/^[a-zA-Z0-9/+]{10,}$/);

From f5c1c47fa293d3471ace071701cd1932cafce311 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 1 Jun 2021 11:41:28 +0200
Subject: [PATCH 0251/1101] feat(CLI Onboarding): Add deploy step

---
 lib/cli/interactive-setup/aws-credentials.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/cli/interactive-setup/aws-credentials.js b/lib/cli/interactive-setup/aws-credentials.js
index 48b1197512a..6f65153b8ab 100644
--- a/lib/cli/interactive-setup/aws-credentials.js
+++ b/lib/cli/interactive-setup/aws-credentials.js
@@ -10,6 +10,8 @@ const awsCredentials = require('../../plugins/aws/utils/credentials');
 const { confirm, doesServiceInstanceHaveLinkedProvider } = require('./utils');
 const openBrowser = require('../../utils/openBrowser');
 const ServerlessError = require('../../serverless-error');
+const resolveStage = require('../../utils/resolve-stage');
+const resolveRegion = require('../../utils/resolve-region');
 
 const isValidAwsAccessKeyId = RegExp.prototype.test.bind(/^[A-Z0-9]{10,}$/);
 const isValidAwsSecretAccessKey = RegExp.prototype.test.bind(/^[a-zA-Z0-9/+]{10,}$/);

From 0eba2dcdfeabba58920462ac2cd54d86e3101e05 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 11 Jun 2021 12:25:02 +0200
Subject: [PATCH 0252/1101] feat(CLI Onboarding): Add telemetry for interactive
 flow

---
 lib/cli/interactive-setup/aws-credentials.js  |  74 ++++--
 lib/cli/interactive-setup/deploy.js           |  16 +-
 lib/cli/interactive-setup/index.js            |  21 +-
 lib/cli/interactive-setup/service.js          |  51 +++-
 lib/utils/telemetry/generatePayload.js        |   5 +
 scripts/serverless.js                         |  16 +-
 .../interactive-setup/aws-credentials.test.js | 225 ++++++++++++------
 .../lib/cli/interactive-setup/deploy.test.js  | 118 +++++----
 .../lib/cli/interactive-setup/service.test.js | 178 +++++++++++---
 .../utils/telemetry/generatePayload.test.js   |   1 +
 10 files changed, 508 insertions(+), 197 deletions(-)

diff --git a/lib/cli/interactive-setup/aws-credentials.js b/lib/cli/interactive-setup/aws-credentials.js
index 6f65153b8ab..bcb236c8bf4 100644
--- a/lib/cli/interactive-setup/aws-credentials.js
+++ b/lib/cli/interactive-setup/aws-credentials.js
@@ -77,8 +77,8 @@ const getProviders = memoizee(
   }
 );
 
-const awsAccessKeyIdInput = async () =>
-  (
+const awsAccessKeyIdInput = async ({ stepHistory }) => {
+  const accessKeyId = (
     await inquirer.prompt({
       message: 'AWS Access Key Id:',
       type: 'input',
@@ -89,9 +89,12 @@ const awsAccessKeyIdInput = async () =>
       },
     })
   ).accessKeyId.trim();
+  stepHistory.set('accessKeyId', '_user_provided_');
+  return accessKeyId;
+};
 
-const awsSecretAccessKeyInput = async () =>
-  (
+const awsSecretAccessKeyInput = async ({ stepHistory }) => {
+  const secretAccessKey = (
     await inquirer.prompt({
       message: 'AWS Secret Access Key:',
       type: 'input',
@@ -105,8 +108,11 @@ const awsSecretAccessKeyInput = async () =>
       },
     })
   ).secretAccessKey.trim();
+  stepHistory.set('secretAccessKey', '_user_provided_');
+  return secretAccessKey;
+};
 
-const credentialsSetupChoice = async (providers) => {
+const credentialsSetupChoice = async (context, providers) => {
   let credentialsSetupChoices = [];
   let message = 'No AWS credentials found, what credentials do you want to use?';
 
@@ -142,7 +148,7 @@ const credentialsSetupChoice = async (providers) => {
     { name: 'Skip', value: CREDENTIALS_SETUP_CHOICE.SKIP }
   );
 
-  return (
+  const result = (
     await inquirer.prompt({
       message,
       type: 'list',
@@ -150,6 +156,12 @@ const credentialsSetupChoice = async (providers) => {
       choices: credentialsSetupChoices,
     })
   ).credentialsSetupChoice;
+
+  context.stepHistory.set(
+    'credentialsSetupChoice',
+    result.startsWith('_') ? result : '_user_provided_'
+  );
+  return result;
 };
 
 const steps = {
@@ -158,15 +170,16 @@ const steps = {
 
   http://slss.io/aws-creds-setup\n`),
 
-  ensureAwsAccount: async () => {
+  ensureAwsAccount: async ({ stepHistory }) => {
     if (await confirm('Do you have an AWS account?', { name: 'hasAwsAccount' })) return;
     openBrowser('https://portal.aws.amazon.com/billing/signup');
     await inquirer.prompt({
       message: 'Press Enter to continue after creating an AWS account',
       name: 'createAwsAccountPrompt',
     });
+    stepHistory.set('createAwsAccountPrompt', true);
   },
-  ensureAwsCredentials: async ({ options, configuration }) => {
+  ensureAwsCredentials: async ({ options, configuration, stepHistory }) => {
     const region = options.region || configuration.provider.region || 'us-east-1';
     openBrowser(
       `https://console.aws.amazon.com/iam/home?region=${region}#/users$new?step=final&accessKey&userNames=serverless&permissionType=policies&policies=arn:aws:iam::aws:policy%2FAdministratorAccess`
@@ -175,10 +188,11 @@ const steps = {
       message: 'Press Enter to continue after creating an AWS user with access keys',
       name: 'generateAwsCredsPrompt',
     });
+    stepHistory.set('generateAwsCredsPrompt', true);
   },
-  inputAwsCredentials: async () => {
-    const accessKeyId = await awsAccessKeyIdInput();
-    const secretAccessKey = await awsSecretAccessKeyInput();
+  inputAwsCredentials: async (context) => {
+    const accessKeyId = await awsAccessKeyIdInput(context);
+    const secretAccessKey = await awsSecretAccessKeyInput(context);
     await awsCredentials.saveFileProfiles(new Map([['default', { accessKeyId, secretAccessKey }]]));
     process.stdout.write(
       `\n${chalk.green(
@@ -188,7 +202,7 @@ const steps = {
       )}\n`
     );
   },
-  handleProviderCreation: async ({ configuration: { org: orgName } }) => {
+  handleProviderCreation: async ({ configuration: { org: orgName }, stepHistory }) => {
     const providersUrl = `https://app.serverless.com/${orgName}/settings/providers?source=cli&providerId=new&provider=aws`;
     openBrowser(chalk.bold.white(providersUrl));
     process.stdout.write(
@@ -210,7 +224,10 @@ const steps = {
           name: 'skipProviderSetup',
         });
 
-        inquirerPrompt.then(() => resolve(null));
+        inquirerPrompt.then(() => {
+          stepHistory.set('skipProviderSetup', true);
+          resolve(null);
+        });
       }, timeoutDuration);
 
       onEvent = (event) => {
@@ -307,10 +324,17 @@ module.exports = {
       _.get(configuration, 'provider') !== 'aws' &&
       _.get(configuration, 'provider.name') !== 'aws'
     ) {
+      context.inapplicabilityReasonCode = 'NON_AWS_PROVIDER';
+      return false;
+    }
+    if (new AWS.S3().config.credentials) {
+      context.inapplicabilityReasonCode = 'LOCAL_CREDENTIALS_CONFIGURED';
+      return false;
+    }
+    if ((await awsCredentials.resolveFileProfiles()).size) {
+      context.inapplicabilityReasonCode = 'LOCAL_CREDENTIAL_PROFILES_CONFIGURED';
       return false;
     }
-    if (new AWS.S3().config.credentials) return false;
-    if ((await awsCredentials.resolveFileProfiles()).size) return false;
 
     const orgName = configuration.org;
     if (orgName && isAuthenticated()) {
@@ -326,7 +350,10 @@ module.exports = {
       }
       const hasDefaultProvider = providers.some((provider) => provider.isDefault);
 
-      if (hasDefaultProvider) return false;
+      if (hasDefaultProvider) {
+        context.inapplicabilityReasonCode = 'DEFAULT_PROVIDER_CONFIGURED';
+        return false;
+      }
 
       // For situation where it is invoked for already existing service
       // We need to check if service already has a linked provider
@@ -335,6 +362,7 @@ module.exports = {
         !history.has('service') &&
         (await doesServiceInstanceHaveLinkedProvider({ configuration, options }))
       ) {
+        context.inapplicabilityReasonCode = 'LINKED_PROVIDER_CONFIGURED';
         return false;
       }
     }
@@ -357,7 +385,7 @@ module.exports = {
         throw err;
       }
     }
-    const credentialsSetupChoiceAnswer = await credentialsSetupChoice(providers);
+    const credentialsSetupChoiceAnswer = await credentialsSetupChoice(context, providers);
 
     if (credentialsSetupChoiceAnswer === CREDENTIALS_SETUP_CHOICE.CREATE_PROVIDER) {
       try {
@@ -386,9 +414,9 @@ module.exports = {
       steps.writeOnSetupSkip();
       return;
     } else if (credentialsSetupChoiceAnswer === CREDENTIALS_SETUP_CHOICE.LOCAL) {
-      await steps.ensureAwsAccount();
+      await steps.ensureAwsAccount(context);
       await steps.ensureAwsCredentials(context);
-      await steps.inputAwsCredentials();
+      await steps.inputAwsCredentials(context);
       return;
     }
 
@@ -406,4 +434,12 @@ module.exports = {
     }
   },
   steps,
+  configuredQuestions: [
+    'credentialsSetupChoice',
+    'createAwsAccountPrompt',
+    'generateAwsCredsPrompt',
+    'accessKeyId',
+    'secretAccessKey',
+    'skipProviderSetup',
+  ],
 };
diff --git a/lib/cli/interactive-setup/deploy.js b/lib/cli/interactive-setup/deploy.js
index 69ff597afc0..16c5d03453f 100644
--- a/lib/cli/interactive-setup/deploy.js
+++ b/lib/cli/interactive-setup/deploy.js
@@ -100,8 +100,10 @@ const configurePlugin = (serverless, originalStdWrite) => {
 };
 
 module.exports = {
-  async isApplicable({ configuration, serviceDir, history, options }) {
+  async isApplicable(context) {
+    const { configuration, serviceDir, history, options } = context;
     if (!serviceDir) {
+      context.inapplicabilityReasonCode = 'NOT_IN_SERVICE_DIRECTORY';
       return false;
     }
 
@@ -109,6 +111,7 @@ module.exports = {
       _.get(configuration, 'provider') !== 'aws' &&
       _.get(configuration, 'provider.name') !== 'aws'
     ) {
+      context.inapplicabilityReasonCode = 'NON_AWS_PROVIDER';
       return false;
     }
 
@@ -127,11 +130,17 @@ module.exports = {
     // We want to proceed if local credentials are available
     if (new AWS.Config().credentials) return true;
 
+    context.inapplicabilityReasonCode = 'NO_CREDENTIALS_CONFIGURED';
     return false;
   },
-  async run({ configuration, configurationFilename, serviceDir }) {
+  async run({ configuration, configurationFilename, serviceDir, stepHistory }) {
     const serviceName = configuration.service;
-    if (!(await confirm('Do you want to deploy your project?', { name: 'shouldDeploy' }))) {
+    const shouldDeploy = await confirm('Do you want to deploy your project?', {
+      name: 'shouldDeploy',
+    });
+    stepHistory.set('shouldDeploy', shouldDeploy);
+
+    if (!shouldDeploy) {
       printMessage({
         serviceName,
         hasBeenDeployed: false,
@@ -174,4 +183,5 @@ module.exports = {
       dashboardPlugin: serverless.pluginManager.dashboardPlugin,
     });
   },
+  configuredQuestions: ['shouldDeploy'],
 };
diff --git a/lib/cli/interactive-setup/index.js b/lib/cli/interactive-setup/index.js
index de6e3f3677c..c53ee3efbd1 100644
--- a/lib/cli/interactive-setup/index.js
+++ b/lib/cli/interactive-setup/index.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const inquirer = require('@serverless/utils/inquirer');
+const { StepHistory } = require('@serverless/utils/telemetry');
 
 const steps = {
   service: require('./service'),
@@ -12,14 +13,32 @@ const steps = {
 
 module.exports = async (context) => {
   context = { ...context, inquirer, history: new Map() };
+  const stepsDetails = new Map();
   for (const [stepName, step] of Object.entries(steps)) {
     delete context.stepHistory;
+    delete context.inapplicabilityReasonCode;
     const stepData = await step.isApplicable(context);
+    stepsDetails.set(stepName, {
+      isApplicable: Boolean(stepData),
+      inapplicabilityReasonCode: context.inapplicabilityReasonCode,
+      timestamp: Date.now(),
+      configuredQuestions: step.configuredQuestions,
+    });
     if (stepData) {
       process.stdout.write('\n');
-      context.stepHistory = [];
+      context.stepHistory = new StepHistory();
       context.history.set(stepName, context.stepHistory);
       await step.run(context, stepData);
     }
   }
+
+  const commandUsage = Array.from(stepsDetails.entries()).map(([step, stepDetails]) => {
+    const stepHistory = context.history.get(step);
+    return {
+      name: step,
+      ...stepDetails,
+      history: stepHistory ? stepHistory.toJSON() : [],
+    };
+  });
+  return { commandUsage, configuration: context.configuration };
 };
diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index e9dadd5a9f4..db4c25c5f50 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -32,8 +32,8 @@ const initializeProjectChoices = [
   { name: 'Other', value: 'other' },
 ];
 
-const projectTypeChoice = async () =>
-  (
+const projectTypeChoice = async (stepHistory) => {
+  const projectType = (
     await inquirer.prompt({
       message: 'What do you want to make?',
       type: 'list',
@@ -43,14 +43,18 @@ const projectTypeChoice = async () =>
     })
   ).projectType;
 
+  stepHistory.set('projectType', projectType);
+  return projectType;
+};
+
 const INVALID_PROJECT_NAME_MESSAGE =
   'Project name is not valid.\n' +
   '   - It should only contain alphanumeric and hyphens.\n' +
   '   - It should start with an alphabetic character.\n' +
   "   - Shouldn't exceed 128 characters";
 
-const projectNameInput = async (workingDir, projectType) =>
-  (
+const projectNameInput = async (workingDir, projectType, stepHistory) => {
+  const projectName = (
     await inquirer.prompt({
       message: 'What do you want to call this project?',
       type: 'input',
@@ -72,7 +76,11 @@ const projectNameInput = async (workingDir, projectType) =>
     })
   ).projectName.trim();
 
-const resolveProjectNameInput = async (options, workingDir, projectType = null) => {
+  stepHistory.set('projectName', '_user_provided_');
+  return projectName;
+};
+
+const resolveProjectNameInput = async ({ options, workingDir, projectType, stepHistory }) => {
   if (options.name) {
     if (!isValidServiceName(options.name)) {
       throw new ServerlessError(INVALID_PROJECT_NAME_MESSAGE, 'INVALID_PROJECT_NAME');
@@ -96,11 +104,12 @@ const resolveProjectNameInput = async (options, workingDir, projectType = null)
     return options.name;
   }
 
-  return projectNameInput(workingDir, projectType);
+  return projectNameInput(workingDir, projectType, stepHistory);
 };
 
 module.exports = {
-  isApplicable({ options, serviceDir }) {
+  isApplicable(context) {
+    const { options, serviceDir } = context;
     const notApplicableOptions = new Set(['name', 'template-path', 'template', 'template-url']);
     if (serviceDir && Object.keys(options).some((key) => notApplicableOptions.has(key))) {
       throw new ServerlessError(
@@ -113,7 +122,11 @@ module.exports = {
       );
     }
 
-    return !serviceDir;
+    const inServiceDir = Boolean(serviceDir);
+    if (inServiceDir) {
+      context.inapplicabilityReasonCode = 'IN_SERVICE_DIRECTORY';
+    }
+    return !inServiceDir;
   },
   async run(context) {
     const workingDir = context.cwd || process.cwd();
@@ -132,7 +145,11 @@ module.exports = {
     let projectDir;
     let projectName;
     if (context.options['template-path']) {
-      projectName = await resolveProjectNameInput(context.options, workingDir);
+      projectName = await resolveProjectNameInput({
+        options: context.options,
+        workingDir,
+        stepHistory: context.stepHistory,
+      });
       projectDir = join(workingDir, projectName);
       await createFromLocalTemplate({
         templatePath: context.options['template-path'],
@@ -140,7 +157,11 @@ module.exports = {
         projectName,
       });
     } else if (context.options['template-url']) {
-      projectName = await resolveProjectNameInput(context.options, workingDir);
+      projectName = await resolveProjectNameInput({
+        options: context.options,
+        workingDir,
+        stepHistory: context.stepHistory,
+      });
       projectDir = join(workingDir, projectName);
       const templateUrl = context.options['template-url'];
       process.stdout.write(`\nDownloading template from provided url: ${templateUrl}...\n`);
@@ -159,7 +180,7 @@ module.exports = {
       if (context.options.template) {
         projectType = context.options.template;
       } else {
-        projectType = await projectTypeChoice();
+        projectType = await projectTypeChoice(context.stepHistory);
         if (projectType === 'other') {
           process.stdout.write(
             '\nRun “serverless create --help” to view available templates and create a new project ' +
@@ -168,7 +189,12 @@ module.exports = {
           return;
         }
       }
-      projectName = await resolveProjectNameInput(context.options, workingDir, projectType);
+      projectName = await resolveProjectNameInput({
+        options: context.options,
+        workingDir,
+        projectType,
+        stepHistory: context.stepHistory,
+      });
       projectDir = join(workingDir, projectName);
       const templateUrl = `https://github.com/serverless/examples/tree/master/${projectType}`;
       process.stdout.write(`\nDownloading "${projectType}" template...\n`);
@@ -238,4 +264,5 @@ module.exports = {
     context.configuration = await readConfiguration(configurationPath);
     await resolveVariables(context);
   },
+  configuredQuestions: ['projectType', 'projectName'],
 };
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index 9ecf3ef95aa..10874ba75df 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -123,6 +123,7 @@ module.exports = async ({
   serviceDir,
   configuration,
   serverless,
+  commandUsage,
 }) => {
   let commandDurationMs;
 
@@ -268,5 +269,9 @@ module.exports = async ({
     payload.dashboard.orgUid = serverless && serverless.service.orgUid;
   }
 
+  if (commandUsage) {
+    payload.commandUsage = commandUsage;
+  }
+
   return payload;
 };
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 1d7ec5d2dd0..c44f0a7244f 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -403,12 +403,13 @@ const processSpanPromise = (async () => {
           'INTERACTIVE_SETUP_IN_NON_TTY'
         );
       }
-      await require('../lib/cli/interactive-setup')({
-        configuration,
-        serviceDir,
-        configurationFilename,
-        options,
-      });
+      const { commandUsage, configuration: configurationFromInteractive } =
+        await require('../lib/cli/interactive-setup')({
+          configuration,
+          serviceDir,
+          configurationFilename,
+          options,
+        });
       hasTelemetryBeenReported = true;
       if (!isTelemetryDisabled) {
         await storeTelemetryLocally(
@@ -417,7 +418,8 @@ const processSpanPromise = (async () => {
             options,
             commandSchema,
             serviceDir,
-            configuration,
+            configuration: configurationFromInteractive,
+            commandUsage,
           })
         );
         await sendTelemetry({ serverlessExecutionSpan: processSpanPromise });
diff --git a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
index 2a6809fe530..ba793afa5c3 100644
--- a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
+++ b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
@@ -7,6 +7,7 @@ const overrideEnv = require('process-utils/override-env');
 const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const requireUncached = require('ncjsm/require-uncached');
 const chalk = require('chalk');
+const { StepHistory } = require('@serverless/utils/telemetry');
 
 const { expect } = chai;
 
@@ -53,17 +54,21 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
     sinon.restore();
   });
 
-  it('Should be ineffective, when not at service path', async () =>
-    expect(await step.isApplicable({})).to.equal(false));
+  it('Should be ineffective, when not at service path', async () => {
+    const context = {};
+    expect(await step.isApplicable(context)).to.equal(false);
+    expect(context.inapplicabilityReasonCode).to.equal('NON_AWS_PROVIDER');
+  });
 
-  it('Should be ineffective, when not at AWS service', async () =>
-    expect(
-      await step.isApplicable({
-        serviceDir: process.cwd(),
-        configuration: {},
-        configurationFilename: 'serverless.yml',
-      })
-    ).to.equal(false));
+  it('Should be ineffective, when not at AWS service', async () => {
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: {},
+      configurationFilename: 'serverless.yml',
+    };
+    expect(await step.isApplicable(context)).to.equal(false);
+    expect(context.inapplicabilityReasonCode).to.equal('NON_AWS_PROVIDER');
+  });
 
   it('Should be ineffective, when user has default provider set', async () => {
     const internalMockedSdk = {
@@ -92,13 +97,13 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
     });
 
-    expect(
-      await mockedStep.isApplicable({
-        serviceDir: process.cwd(),
-        configuration: { provider: { name: 'aws' }, org: 'someorg' },
-        configurationFilename: 'serverless.yml',
-      })
-    ).to.be.false;
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: { provider: { name: 'aws' }, org: 'someorg' },
+      configurationFilename: 'serverless.yml',
+    };
+    expect(await mockedStep.isApplicable(context)).to.be.false;
+    expect(context.inapplicabilityReasonCode).to.equal('DEFAULT_PROVIDER_CONFIGURED');
   });
 
   it('Should be ineffective, when existing service already has a provider set', async () => {
@@ -131,20 +136,20 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       },
     });
 
-    expect(
-      await mockedStep.isApplicable({
-        history: new Set(),
-        serviceDir: process.cwd(),
-        configuration: {
-          provider: { name: 'aws' },
-          org: 'someorg',
-          app: 'someapp',
-          service: 'service',
-        },
-        options: {},
-        configurationFilename: 'serverless.yml',
-      })
-    ).to.be.false;
+    const context = {
+      history: new Set(),
+      serviceDir: process.cwd(),
+      configuration: {
+        provider: { name: 'aws' },
+        org: 'someorg',
+        app: 'someapp',
+        service: 'service',
+      },
+      options: {},
+      configurationFilename: 'serverless.yml',
+    };
+    expect(await mockedStep.isApplicable(context)).to.be.false;
+    expect(context.inapplicabilityReasonCode).to.equal('LINKED_PROVIDER_CONFIGURED');
   });
 
   it('Should be effective, when existing service instance does not have a provider set', async () => {
@@ -239,18 +244,23 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       list: { credentialsSetupChoice: '_skip_' },
     });
 
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: { provider: { name: 'aws' } },
+      configurationFilename: 'serverless.yml',
+      stepHistory: new StepHistory(),
+      options: {},
+    };
     let stdoutData = '';
     await overrideStdoutWrite(
       (data) => (stdoutData += data),
-      async () =>
-        await step.run({
-          serviceDir: process.cwd(),
-          configuration: { provider: { name: 'aws' }, org: 'someorg' },
-          configurationFilename: 'serverless.yml',
-        })
+      async () => await step.run(context)
     );
 
     expect(stdoutData).to.include('You can setup your AWS account later');
+    expect(context.stepHistory.valuesMap()).to.deep.equal(
+      new Map([['credentialsSetupChoice', '_skip_']])
+    );
   });
 
   describe('In environment credentials', () => {
@@ -323,13 +333,27 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
           secretAccessKey,
         },
       });
-      await step.run({ configuration: { provider: {} }, options: {} });
+      const context = {
+        configuration: { provider: {} },
+        options: {},
+        stepHistory: new StepHistory(),
+      };
+      await step.run(context);
       expect(openBrowserUrls.length).to.equal(2);
       expect(openBrowserUrls[0].includes('signup')).to.be.true;
       expect(openBrowserUrls[1].includes('console.aws.amazon.com')).to.be.true;
       resolveFileProfiles().then((profiles) => {
         expect(profiles).to.deep.equal(new Map([['default', { accessKeyId, secretAccessKey }]]));
       });
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['credentialsSetupChoice', '_local_'],
+          ['createAwsAccountPrompt', true],
+          ['generateAwsCredsPrompt', true],
+          ['accessKeyId', '_user_provided_'],
+          ['secretAccessKey', '_user_provided_'],
+        ])
+      );
     });
 
     it('Should setup credentials for users having an AWS account', async () => {
@@ -338,9 +362,22 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         confirm: { hasAwsAccount: true },
         input: { generateAwsCredsPrompt: '', accessKeyId, secretAccessKey },
       });
-      await step.run({ configuration: { provider: {} }, options: {} });
+      const context = {
+        configuration: { provider: {} },
+        options: {},
+        stepHistory: new StepHistory(),
+      };
+      await step.run(context);
       expect(openBrowserUrls.length).to.equal(1);
       expect(openBrowserUrls[0].includes('console.aws.amazon.com')).to.be.true;
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['credentialsSetupChoice', '_local_'],
+          ['generateAwsCredsPrompt', true],
+          ['accessKeyId', '_user_provided_'],
+          ['secretAccessKey', '_user_provided_'],
+        ])
+      );
       return resolveFileProfiles().then((profiles) => {
         expect(profiles).to.deep.equal(new Map([['default', { accessKeyId, secretAccessKey }]]));
       });
@@ -352,12 +389,21 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         confirm: { hasAwsAccount: true },
         input: { generateAwsCredsPrompt: '', accessKeyId: 'foo', secretAccessKey },
       });
-      await expect(
-        step.run({
-          configuration: { provider: {} },
-          options: {},
-        })
-      ).to.eventually.be.rejected.and.have.property('code', 'INVALID_ANSWER');
+      const context = {
+        configuration: { provider: {} },
+        options: {},
+        stepHistory: new StepHistory(),
+      };
+      await expect(step.run(context)).to.eventually.be.rejected.and.have.property(
+        'code',
+        'INVALID_ANSWER'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['credentialsSetupChoice', '_local_'],
+          ['generateAwsCredsPrompt', true],
+        ])
+      );
     });
 
     it('Should not accept invalid secret access key', async () => {
@@ -366,12 +412,22 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         confirm: { hasAwsAccount: true },
         input: { generateAwsCredsPrompt: '', accessKeyId, secretAccessKey: 'foo' },
       });
-      await expect(
-        step.run({
-          configuration: { provider: {} },
-          options: {},
-        })
-      ).to.eventually.be.rejected.and.have.property('code', 'INVALID_ANSWER');
+      const context = {
+        configuration: { provider: {} },
+        options: {},
+        stepHistory: new StepHistory(),
+      };
+      await expect(step.run(context)).to.eventually.be.rejected.and.have.property(
+        'code',
+        'INVALID_ANSWER'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['credentialsSetupChoice', '_local_'],
+          ['generateAwsCredsPrompt', true],
+          ['accessKeyId', '_user_provided_'],
+        ])
+      );
     });
   });
 
@@ -418,6 +474,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         },
         options: {},
         configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
       };
       await overrideStdoutWrite(
         (data) => (stdoutData += data),
@@ -432,6 +489,9 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       );
       expect(mockedDisconnect).to.have.been.called;
       expect(mockedCreateProviderLink).not.to.have.been.called;
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['credentialsSetupChoice', '_create_provider_']])
+      );
     });
 
     it('Should correctly setup with newly created provider when previous providers exist', async () => {
@@ -490,6 +550,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         },
         options: {},
         configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
       };
       let stdoutData = '';
       await overrideStdoutWrite(
@@ -510,6 +571,9 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         'appName|someapp|serviceName|someservice|stage|dev|region|us-east-1',
         providerUid
       );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['credentialsSetupChoice', '_create_provider_']])
+      );
     });
 
     it('Should emit warning when dashboard unavailable when connecting to it', async () => {
@@ -533,20 +597,21 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         list: { credentialsSetupChoice: '_create_provider_' },
       });
 
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+        },
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+      };
       let stdoutData = '';
       await overrideStdoutWrite(
         (data) => (stdoutData += data),
-        async () =>
-          await mockedStep.run({
-            serviceDir: process.cwd(),
-            configuration: {
-              service: 'someservice',
-              provider: { name: 'aws' },
-              org: 'someorg',
-              app: 'someapp',
-            },
-            configurationFilename: 'serverless.yml',
-          })
+        async () => await mockedStep.run(context)
       );
 
       expect(stdoutData).to.include('Dashboard service is currently unavailable');
@@ -555,6 +620,9 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
           'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
         )
       );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['credentialsSetupChoice', '_create_provider_']])
+      );
     });
 
     it('Should correctly setup with existing provider', async () => {
@@ -599,6 +667,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         },
         options: {},
         configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
       };
       let stdoutData = '';
       await overrideStdoutWrite(
@@ -613,6 +682,9 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         'provideruid'
       );
       expect(stdoutData).to.include('Selected provider was successfully linked');
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['credentialsSetupChoice', '_user_provided_']])
+      );
     });
 
     it('Should emit a warning when dashboard is not available and link cannot be created', async () => {
@@ -651,21 +723,22 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         list: { credentialsSetupChoice: providerUid },
       });
 
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+        },
+        options: {},
+        stepHistory: new StepHistory(),
+        configurationFilename: 'serverless.yml',
+      };
       let stdoutData = '';
       await overrideStdoutWrite(
         (data) => (stdoutData += data),
-        async () =>
-          await mockedStep.run({
-            serviceDir: process.cwd(),
-            configuration: {
-              service: 'someservice',
-              provider: { name: 'aws' },
-              org: 'someorg',
-              app: 'someapp',
-            },
-            options: {},
-            configurationFilename: 'serverless.yml',
-          })
+        async () => await mockedStep.run(context)
       );
 
       expect(stdoutData).to.include(
@@ -678,6 +751,10 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         'appName|someapp|serviceName|someservice|stage|dev|region|us-east-1',
         'provideruid'
       );
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['credentialsSetupChoice', '_user_provided_']])
+      );
     });
 
     it('Should emit a warning when dashboard is not available when fetching providers', async () => {
diff --git a/test/unit/lib/cli/interactive-setup/deploy.test.js b/test/unit/lib/cli/interactive-setup/deploy.test.js
index af4eceae271..b0a38c8e4d5 100644
--- a/test/unit/lib/cli/interactive-setup/deploy.test.js
+++ b/test/unit/lib/cli/interactive-setup/deploy.test.js
@@ -8,6 +8,7 @@ const overrideEnv = require('process-utils/override-env');
 const step = require('../../../../../lib/cli/interactive-setup/deploy');
 const proxyquire = require('proxyquire');
 const overrideStdoutWrite = require('process-utils/override-stdout-write');
+const { StepHistory } = require('@serverless/utils/telemetry');
 
 const { expect } = chai;
 
@@ -17,18 +18,24 @@ chai.use(require('sinon-chai'));
 const inquirer = require('@serverless/utils/inquirer');
 
 describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
-  it('Should be not applied, when not at service path', async () =>
-    expect(await step.isApplicable({ options: {} })).to.equal(false));
+  it('Should be not applied, when not at service path', async () => {
+    const context = {
+      options: {},
+    };
+    expect(await step.isApplicable(context)).to.equal(false);
+    expect(context.inapplicabilityReasonCode).to.equal('NOT_IN_SERVICE_DIRECTORY');
+  });
 
-  it('Should be not applied, when service is not configured with AWS provider', async () =>
-    expect(
-      await step.isApplicable({
-        configuration: { provider: { name: 'notaws' } },
-        serviceDir: '/foo',
-        options: {},
-        history: new Map(),
-      })
-    ).to.equal(false));
+  it('Should be not applied, when service is not configured with AWS provider', async () => {
+    const context = {
+      configuration: { provider: { name: 'notaws' } },
+      serviceDir: '/foo',
+      options: {},
+      history: new Map([['service', []]]),
+    };
+    expect(await step.isApplicable(context)).to.equal(false);
+    expect(context.inapplicabilityReasonCode).to.equal('NON_AWS_PROVIDER');
+  });
 
   it('Should be applied, if awsCredentials step was not executed which means user already had credentials', async () =>
     expect(
@@ -80,22 +87,24 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
         confirm: { shouldDeploy: false },
       });
 
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+        },
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+      };
       let stdoutData = '';
       await overrideStdoutWrite(
         (data) => (stdoutData += data),
-        async () =>
-          await step.run({
-            serviceDir: process.cwd(),
-            configuration: {
-              service: 'someservice',
-              provider: { name: 'aws' },
-            },
-            configurationFilename: 'serverless.yml',
-          })
+        async () => await step.run(context)
       );
 
       expect(stdoutData).to.include('Your project is ready for deployment');
       expect(stdoutData).to.include(`Run ${chalk.bold('serverless')} in the project directory`);
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', false]]));
     });
 
     it('should correctly handle skipping deployment for service not configured with dashboard', async () => {
@@ -103,24 +112,26 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
         confirm: { shouldDeploy: false },
       });
 
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+        },
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+      };
       let stdoutData = '';
       await overrideStdoutWrite(
         (data) => (stdoutData += data),
-        async () =>
-          await step.run({
-            serviceDir: process.cwd(),
-            configuration: {
-              service: 'someservice',
-              provider: { name: 'aws' },
-              org: 'someorg',
-              app: 'someapp',
-            },
-            configurationFilename: 'serverless.yml',
-          })
+        async () => await step.run(context)
       );
 
       expect(stdoutData).to.include('Your project is ready for deployment');
       expect(stdoutData).to.include('Invoke your functions and view logs in the dashboard');
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', false]]));
     });
 
     it('should correctly handle deployment for service configured with dashboard', async () => {
@@ -156,26 +167,29 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
         confirm: { shouldDeploy: true },
       });
 
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+        },
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+      };
       let stdoutData = '';
       await overrideStdoutWrite(
         (data) => (stdoutData += data),
-        async () =>
-          await mockedStep.run({
-            serviceDir: process.cwd(),
-            configuration: {
-              service: 'someservice',
-              provider: { name: 'aws' },
-              org: 'someorg',
-              app: 'someapp',
-            },
-            configurationFilename: 'serverless.yml',
-          })
+        async () => await mockedStep.run(context)
       );
 
       expect(stdoutData).to.include('Your project is live and available');
       expect(stdoutData).to.include(
         `Open ${chalk.bold('https://app.serverless-dev.com/path/to/dashboard')}`
       );
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', true]]));
     });
 
     it('should correctly handle deployment for service not configured with dashboard', async () => {
@@ -207,22 +221,24 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
         confirm: { shouldDeploy: true },
       });
 
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+        },
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+      };
       let stdoutData = '';
       await overrideStdoutWrite(
         (data) => (stdoutData += data),
-        async () =>
-          await mockedStep.run({
-            serviceDir: process.cwd(),
-            configuration: {
-              service: 'someservice',
-              provider: { name: 'aws' },
-            },
-            configurationFilename: 'serverless.yml',
-          })
+        async () => await mockedStep.run(context)
       );
 
       expect(stdoutData).to.include('Your project is live and available');
       expect(stdoutData).to.include(`Run ${chalk.bold('serverless')}`);
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', true]]));
     });
   });
 });
diff --git a/test/unit/lib/cli/interactive-setup/service.test.js b/test/unit/lib/cli/interactive-setup/service.test.js
index 0f01bb257ea..2dfda841e7f 100644
--- a/test/unit/lib/cli/interactive-setup/service.test.js
+++ b/test/unit/lib/cli/interactive-setup/service.test.js
@@ -8,6 +8,7 @@ const step = require('../../../../../lib/cli/interactive-setup/service');
 const proxyquire = require('proxyquire');
 const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const ServerlessError = require('../../../../../lib/serverless-error');
+const { StepHistory } = require('@serverless/utils/telemetry');
 
 const templatesPath = path.resolve(__dirname, '../../../../../lib/plugins/create/templates');
 
@@ -23,12 +24,24 @@ const confirmEmptyWorkingDir = async () =>
   expect(await fsp.readdir(process.cwd())).to.deep.equal([]);
 
 describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
-  afterEach(() => sinon.restore());
+  afterEach(() => {
+    sinon.restore();
+  });
+
+  it('Should be not applied, when at service path', () => {
+    const context = {
+      serviceDir: '/foo',
+      options: {},
+    };
+    expect(step.isApplicable(context)).to.equal(false);
+    expect(context.inapplicabilityReasonCode).to.equal('IN_SERVICE_DIRECTORY');
+  });
 
-  it('Should be not applied, when at service path', () =>
-    expect(step.isApplicable({ serviceDir: '/foo', options: {} })).to.equal(false));
-  it('Should be applied, when not at service path', () =>
-    expect(step.isApplicable({ options: {} })).to.equal(true));
+  it('Should be applied, when not at service path', () => {
+    const context = { options: {} };
+    expect(step.isApplicable(context)).to.equal(true);
+    expect(context.inapplicabilityReasonCode).to.be.undefined;
+  });
 
   it('Should result in an error when at service path with `template-path` options provided', () => {
     expect(() =>
@@ -56,7 +69,9 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
     configureInquirerStub(inquirer, {
       list: { projectType: 'other' },
     });
-    await step.run({ options: {} });
+    const context = { options: {}, stepHistory: new StepHistory() };
+    await step.run(context);
+    expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['projectType', 'other']]));
     return confirmEmptyWorkingDir();
   });
 
@@ -84,7 +99,8 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
         list: { projectType: 'aws-nodejs' },
         input: { projectName: 'test-project' },
       });
-      await mockedStep.run({ options: {} });
+      const context = { options: {}, stepHistory: new StepHistory() };
+      await mockedStep.run(context);
       const stats = await fsp.lstat('test-project/serverless.yml');
       expect(stats.isFile()).to.be.true;
       expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
@@ -92,6 +108,12 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
         'aws-nodejs',
         'test-project'
       );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['projectType', 'aws-nodejs'],
+          ['projectName', '_user_provided_'],
+        ])
+      );
     });
 
     it('Should remove `serverless.template.yml` if its a part of the template', async () => {
@@ -118,7 +140,8 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
         list: { projectType: 'aws-nodejs' },
         input: { projectName: 'test-project-template' },
       });
-      await mockedStep.run({ options: {} });
+      const context = { options: {}, stepHistory: new StepHistory() };
+      await mockedStep.run(context);
       const stats = await fsp.lstat('test-project-template/serverless.yml');
       expect(stats.isFile()).to.be.true;
       expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
@@ -129,6 +152,13 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       await expect(
         fsp.lstat('test-proejct-template/serverless.template.yml')
       ).to.eventually.be.rejected.and.have.property('code', 'ENOENT');
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['projectType', 'aws-nodejs'],
+          ['projectName', '_user_provided_'],
+        ])
+      );
     });
 
     it('Should run `npm install` if `package.json` present', async () => {
@@ -157,7 +187,8 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
         list: { projectType: 'aws-nodejs' },
         input: { projectName: 'test-project-package-json' },
       });
-      await mockedStep.run({ options: {} });
+      const context = { options: {}, stepHistory: new StepHistory() };
+      await mockedStep.run(context);
       const stats = await fsp.lstat('test-project-package-json/serverless.yml');
       expect(stats.isFile()).to.be.true;
       expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
@@ -168,6 +199,13 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       expect(spawnStub).to.have.been.calledWith('npm', ['install'], {
         cwd: path.join(process.cwd(), 'test-project-package-json'),
       });
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['projectType', 'aws-nodejs'],
+          ['projectName', '_user_provided_'],
+        ])
+      );
     });
 
     it('Should emit warning if npm installation not found', async () => {
@@ -196,15 +234,23 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
         input: { projectName: 'test-project-missing-npm' },
       });
 
+      const context = { options: {}, stepHistory: new StepHistory() };
       let stdoutData = '';
       await overrideStdoutWrite(
         (data) => (stdoutData += data),
-        async () => mockedStep.run({ options: {} })
+        async () => mockedStep.run(context)
       );
 
       const stats = await fsp.lstat('test-project-missing-npm/serverless.yml');
       expect(stats.isFile()).to.be.true;
       expect(stdoutData).to.include('Cannot install dependencies');
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['projectType', 'aws-nodejs'],
+          ['projectName', '_user_provided_'],
+        ])
+      );
     });
 
     it('Should emit warning if npm installation not found', async () => {
@@ -233,19 +279,35 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
         input: { projectName: 'test-project-failed-install' },
       });
 
-      await expect(mockedStep.run({ options: {} })).to.be.eventually.rejected.and.have.property(
+      const context = { options: {}, stepHistory: new StepHistory() };
+      await expect(mockedStep.run(context)).to.be.eventually.rejected.and.have.property(
         'code',
         'DEPENDENCIES_INSTALL_FAILED'
       );
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['projectType', 'aws-nodejs'],
+          ['projectName', '_user_provided_'],
+        ])
+      );
     });
 
     it('Should create project at not existing directory from a provided `template-path`', async () => {
       configureInquirerStub(inquirer, {
         input: { projectName: 'test-project-from-local-template' },
       });
-      await step.run({ options: { 'template-path': path.join(templatesPath, 'aws-nodejs') } });
+      const context = {
+        options: { 'template-path': path.join(templatesPath, 'aws-nodejs') },
+        stepHistory: new StepHistory(),
+      };
+      await step.run(context);
       const stats = await fsp.lstat('test-project-from-local-template/serverless.yml');
       expect(stats.isFile()).to.be.true;
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['projectName', '_user_provided_']])
+      );
     });
 
     it('Should create project at not existing directory with provided `name`', async () => {
@@ -268,9 +330,16 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       configureInquirerStub(inquirer, {
         list: { projectType: 'aws-nodejs' },
       });
-      await mockedStep.run({ options: { name: 'test-project-from-cli-option' } });
+      const context = {
+        options: { name: 'test-project-from-cli-option' },
+        stepHistory: new StepHistory(),
+      };
+      await mockedStep.run(context);
       const stats = await fsp.lstat('test-project-from-cli-option/serverless.yml');
       expect(stats.isFile()).to.be.true;
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['projectType', 'aws-nodejs']])
+      );
     });
 
     it('Should create project at not existing directory with provided template', async () => {
@@ -294,7 +363,8 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       configureInquirerStub(inquirer, {
         input: { projectName: 'test-project-from-provided-template' },
       });
-      await mockedStep.run({ options: { template: 'test-template' } });
+      const context = { options: { template: 'test-template' }, stepHistory: new StepHistory() };
+      await mockedStep.run(context);
       const stats = await fsp.lstat('test-project-from-provided-template/serverless.yml');
       expect(stats.isFile()).to.be.true;
       expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
@@ -302,6 +372,10 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
         'test-template',
         'test-project-from-provided-template'
       );
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['projectName', '_user_provided_']])
+      );
     });
 
     it('Should create project at not existing directory with provided `template-url`', async () => {
@@ -327,7 +401,11 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       configureInquirerStub(inquirer, {
         input: { projectName: 'test-project-from-provided-template-url' },
       });
-      await mockedStep.run({ options: { 'template-url': providedTemplateUrl } });
+      const context = {
+        options: { 'template-url': providedTemplateUrl },
+        stepHistory: new StepHistory(),
+      };
+      await mockedStep.run(context);
       const stats = await fsp.lstat('test-project-from-provided-template-url/serverless.yml');
       expect(stats.isFile()).to.be.true;
       expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
@@ -335,6 +413,10 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
         null,
         'test-project-from-provided-template-url'
       );
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['projectName', '_user_provided_']])
+      );
     });
 
     it('Should throw an error when template cannot be downloaded', async () => {
@@ -349,10 +431,18 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
         list: { projectType: 'aws-nodejs' },
         input: { projectName: 'test-error-during-download' },
       });
-      await expect(mockedStep.run({ options: {} })).to.be.eventually.rejected.and.have.property(
+      const context = { options: {}, stepHistory: new StepHistory() };
+      await expect(mockedStep.run(context)).to.be.eventually.rejected.and.have.property(
         'code',
         'TEMPLATE_DOWNLOAD_FAILED'
       );
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['projectType', 'aws-nodejs'],
+          ['projectName', '_user_provided_'],
+        ])
+      );
     });
 
     it('Should throw an error when provided template cannot be found', async () => {
@@ -364,9 +454,14 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       configureInquirerStub(inquirer, {
         input: { projectName: 'test-error-during-download' },
       });
-      await expect(
-        mockedStep.run({ options: { template: 'test-template' } })
-      ).to.be.eventually.rejected.and.have.property('code', 'INVALID_TEMPLATE');
+      const context = { options: { template: 'test-template' }, stepHistory: new StepHistory() };
+      await expect(mockedStep.run(context)).to.be.eventually.rejected.and.have.property(
+        'code',
+        'INVALID_TEMPLATE'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['projectName', '_user_provided_']])
+      );
     });
 
     it('Should throw an error when template provided with url cannot be found', async () => {
@@ -380,9 +475,18 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       configureInquirerStub(inquirer, {
         input: { projectName: 'test-error-during-download-custom-template' },
       });
-      await expect(
-        mockedStep.run({ options: { 'template-url': 'test-template-url' } })
-      ).to.be.eventually.rejected.and.have.property('code', 'INVALID_TEMPLATE_URL');
+      const context = {
+        options: { 'template-url': 'test-template-url' },
+        stepHistory: new StepHistory(),
+      };
+      await expect(mockedStep.run(context)).to.be.eventually.rejected.and.have.property(
+        'code',
+        'INVALID_TEMPLATE_URL'
+      );
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['projectName', '_user_provided_']])
+      );
     });
   });
 
@@ -394,10 +498,13 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
 
     await fsp.mkdir('existing');
 
-    await expect(step.run({ options: {} })).to.eventually.be.rejected.and.have.property(
+    const context = { options: {}, stepHistory: new StepHistory() };
+    await expect(step.run(context)).to.eventually.be.rejected.and.have.property(
       'code',
       'INVALID_ANSWER'
     );
+
+    expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['projectType', 'aws-nodejs']]));
   });
 
   it('Should not allow project creation in a directory in which already service is configured when `name` flag provided', async () => {
@@ -407,9 +514,13 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
 
     await fsp.mkdir('anotherexisting');
 
-    await expect(
-      step.run({ options: { name: 'anotherexisting' } })
-    ).to.eventually.be.rejected.and.have.property('code', 'TARGET_FOLDER_ALREADY_EXISTS');
+    const context = { options: { name: 'anotherexisting' }, stepHistory: new StepHistory() };
+    await expect(step.run(context)).to.eventually.be.rejected.and.have.property(
+      'code',
+      'TARGET_FOLDER_ALREADY_EXISTS'
+    );
+
+    expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['projectType', 'aws-nodejs']]));
   });
 
   it('Should not allow project creation using an invalid project name', async () => {
@@ -417,19 +528,26 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       list: { projectType: 'aws-nodejs' },
       input: { projectName: 'elo grzegżółka' },
     });
-    await expect(step.run({ options: {} })).to.eventually.be.rejected.and.have.property(
+    const context = { options: {}, stepHistory: new StepHistory() };
+    await expect(step.run(context)).to.eventually.be.rejected.and.have.property(
       'code',
       'INVALID_ANSWER'
     );
+
+    expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['projectType', 'aws-nodejs']]));
   });
 
   it('Should not allow project creation using an invalid project name when `name` flag provided', async () => {
     configureInquirerStub(inquirer, {
       list: { projectType: 'aws-nodejs' },
     });
-    await expect(
-      step.run({ options: { name: 'elo grzegżółka' } })
-    ).to.eventually.be.rejected.and.have.property('code', 'INVALID_PROJECT_NAME');
+    const context = { options: { name: 'elo grzegżółka' }, stepHistory: new StepHistory() };
+    await expect(step.run(context)).to.eventually.be.rejected.and.have.property(
+      'code',
+      'INVALID_PROJECT_NAME'
+    );
+
+    expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['projectType', 'aws-nodejs']]));
   });
 
   it('Should not allow project creation if multiple template-related options are provided', async () => {
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index d17754c4847..74744897163 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -6,6 +6,7 @@ const fs = require('fs');
 const os = require('os');
 const overrideEnv = require('process-utils/override-env');
 const overrideCwd = require('process-utils/override-cwd');
+const sinon = require('sinon');
 
 const resolveLocalServerless = require('../../../../../lib/cli/resolve-local-serverless-path');
 const commandsSchema = require('../../../../../lib/cli/commands-schema');

From 5e0d80579e857d016fb4db13288b9d81a3859ee1 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 22 Jun 2021 15:04:50 +0200
Subject: [PATCH 0253/1101] feat(Telemetry): Add `hasLocalCredentials`

---
 lib/cli/interactive-setup/aws-credentials.js  |   1 +
 lib/utils/telemetry/generatePayload.js        |   7 ++
 .../utils/telemetry/generatePayload.test.js   | 101 +++++++++++++++++-
 3 files changed, 107 insertions(+), 2 deletions(-)

diff --git a/lib/cli/interactive-setup/aws-credentials.js b/lib/cli/interactive-setup/aws-credentials.js
index bcb236c8bf4..349234d4f97 100644
--- a/lib/cli/interactive-setup/aws-credentials.js
+++ b/lib/cli/interactive-setup/aws-credentials.js
@@ -436,6 +436,7 @@ module.exports = {
   steps,
   configuredQuestions: [
     'credentialsSetupChoice',
+    'hasAwsAccount',
     'createAwsAccountPrompt',
     'generateAwsCredsPrompt',
     'accessKeyId',
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index 10874ba75df..934d4ee87c0 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -14,6 +14,7 @@ const isNpmGlobal = require('../npmPackage/isGlobal');
 const resolveLocalServerlessPath = require('../../cli/resolve-local-serverless-path');
 const resolveIsLocallyInstalled = require('../../utils/is-locally-installed');
 const ci = require('ci-info');
+const AWS = require('aws-sdk');
 
 const checkIsTabAutocompletionInstalled = async () => {
   try {
@@ -264,6 +265,12 @@ module.exports = async ({
       );
     })();
 
+    const providerName = isObject(configuration.provider)
+      ? configuration.provider.name
+      : configuration.provider;
+    const isAwsProvider = providerName === 'aws';
+
+    payload.hasLocalCredentials = isAwsProvider && Boolean(new AWS.Config().credentials);
     payload.npmDependencies = npmDependencies;
     payload.config = getServiceConfig({ configuration, options });
     payload.dashboard.orgUid = serverless && serverless.service.orgUid;
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index 74744897163..7aadfc03535 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -6,7 +6,6 @@ const fs = require('fs');
 const os = require('os');
 const overrideEnv = require('process-utils/override-env');
 const overrideCwd = require('process-utils/override-cwd');
-const sinon = require('sinon');
 
 const resolveLocalServerless = require('../../../../../lib/cli/resolve-local-serverless-path');
 const commandsSchema = require('../../../../../lib/cli/commands-schema');
@@ -144,6 +143,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       npmDependencies: ['fooDep', 'barDep', 'fooOpt', 'someDev', 'otherDev'],
       triggeredDeprecations: [],
       installationType: 'global:other',
+      hasLocalCredentials: false,
       versions,
     });
   });
@@ -198,6 +198,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       isTabAutocompletionInstalled: false,
       npmDependencies: [],
       triggeredDeprecations: [],
+      hasLocalCredentials: false,
       installationType: 'global:other',
       versions,
     });
@@ -257,6 +258,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       npmDependencies: [],
       triggeredDeprecations: [],
       installationType: 'local:fallback',
+      hasLocalCredentials: false,
       versions: {
         'serverless': '2.0.0-local',
         '@serverless/dashboard-plugin': '4.0.0-local',
@@ -356,6 +358,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       triggeredDeprecations: [],
       installationType: 'global:other',
       npmDependencies: [],
+      hasLocalCredentials: false,
       versions,
     });
   });
@@ -549,7 +552,6 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
         plugins: ['serverless-lift'],
       },
     });
-
     expect(payload.config.constructs).to.deep.equal([
       {
         type: 'queue',
@@ -559,4 +561,99 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       },
     ]);
   });
+
+  it('Should correctly resolve `hasLocalCredentials` property for AWS provider', async () => {
+    const { serverless } = await runServerless({
+      fixture: 'httpApi',
+      command: 'print',
+    });
+
+    let payload;
+    await overrideEnv(
+      { variables: { AWS_ACCESS_KEY_ID: 'someaccesskey', AWS_SECRET_ACCESS_KEY: 'secretkey' } },
+      async () => {
+        payload = await generatePayload({
+          command: 'print',
+          options: {},
+          commandSchema: commandsSchema.get('print'),
+          serviceDir: serverless.serviceDir,
+          configuration: serverless.configurationInput,
+        });
+      }
+    );
+
+    expect(payload.hasLocalCredentials).to.equal(true);
+  });
+
+  it('Should correctly resolve `hasLocalCredentials` property for non-AWS provider', async () => {
+    const { serverless } = await runServerless({
+      fixture: 'customProvider',
+      command: 'print',
+    });
+
+    let payload;
+    await overrideEnv(
+      { variables: { AWS_ACCESS_KEY_ID: 'someaccesskey', AWS_SECRET_ACCESS_KEY: 'secretkey' } },
+      async () => {
+        payload = await generatePayload({
+          command: 'print',
+          options: {},
+          commandSchema: commandsSchema.get('print'),
+          serviceDir: serverless.serviceDir,
+          configuration: serverless.configurationInput,
+        });
+      }
+    );
+
+    expect(payload.hasLocalCredentials).to.equal(false);
+  });
+
+  it('Should correctly resolve `commandUsage` property', async () => {
+    const { serverless } = await runServerless({
+      fixture: 'httpApi',
+      command: 'print',
+    });
+    const payload = await generatePayload({
+      command: 'print',
+      options: {},
+      commandSchema: commandsSchema.get('print'),
+      serviceDir: serverless.serviceDir,
+      configuration: serverless.configurationInput,
+      commandUsage: [
+        {
+          name: 'firstStep',
+          history: [
+            {
+              key: 'firstQuestion',
+              value: 'answer',
+              timestamp: 1626220800000,
+            },
+            {
+              key: 'otherQuestion',
+              value: 'otherAnswer',
+              timestamp: 1626220800000,
+            },
+          ],
+        },
+      ],
+    });
+
+    expect(payload.commandUsage).to.deep.equal([
+      {
+        name: 'firstStep',
+        history: [
+          {
+            key: 'firstQuestion',
+            value: 'answer',
+            timestamp: 1626220800000,
+          },
+          {
+            key: 'otherQuestion',
+            value: 'otherAnswer',
+            timestamp: 1626220800000,
+          },
+        ],
+      },
+    ]);
+  });
 });

From 3cad518d0d81f4fecdf966545591d7e7303adb4a Mon Sep 17 00:00:00 2001
From: Joakim Hedlund <Sleavely@users.noreply.github.com>
Date: Mon, 28 Jun 2021 15:28:34 +0200
Subject: [PATCH 0254/1101] docs: Improve `versionFunctions` description
 (#9651)

---
 docs/providers/aws/guide/functions.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/providers/aws/guide/functions.md b/docs/providers/aws/guide/functions.md
index ea1bfceeb06..554c1f6682e 100644
--- a/docs/providers/aws/guide/functions.md
+++ b/docs/providers/aws/guide/functions.md
@@ -463,15 +463,15 @@ functions:
 
 By default, the framework creates function versions for every deploy. This behavior is optional, and can be turned off in cases where you don't invoke past versions by their qualifier. If you would like to do this, you can invoke your functions as `arn:aws:lambda:....:function/myFunc:3` to invoke version 3 for example.
 
-To turn off this feature, set the provider-level option `versionFunctions`.
+Versions are not cleaned up by serverless, so make sure you use a plugin or other tool to prune sufficiently old versions. The framework can't clean up versions because it doesn't have information about whether older versions are invoked or not. This feature adds to the number of total stack outputs and resources because a function version is a separate resource from the function it refers to.
+
+To turn off function versioning, set the provider-level option `versionFunctions`.
 
 ```yml
 provider:
   versionFunctions: false
 ```
 
-These versions are not cleaned up by serverless, so make sure you use a plugin or other tool to prune sufficiently old versions. The framework can't clean up versions because it doesn't have information about whether older versions are invoked or not. This feature adds to the number of total stack outputs and resources because a function version is a separate resource from the function it refers to.
-
 ## Dead Letter Queue (DLQ)
 
 When AWS lambda functions fail, they are [retried](http://docs.aws.amazon.com/lambda/latest/dg/retries-on-errors.html). If the retries also fail, AWS has a feature to send information about the failed request to a SNS topic or SQS queue, called the [Dead Letter Queue](http://docs.aws.amazon.com/lambda/latest/dg/dlq.html), which you can use to track and diagnose and react to lambda failures.

From 83c772684d655b233522d1e75128476c29339c83 Mon Sep 17 00:00:00 2001
From: Sudipto Das <s.das001@yahoo.com>
Date: Mon, 28 Jun 2021 19:02:05 +0530
Subject: [PATCH 0255/1101] refactor: Replace `fse.chmod` with
 `fs.promises.chmod` (#9647)

---
 lib/plugins/standalone.js     | 2 +-
 lib/utils/eventuallyUpdate.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/standalone.js b/lib/plugins/standalone.js
index 33e55e0091a..066e19c934d 100644
--- a/lib/plugins/standalone.js
+++ b/lib/plugins/standalone.js
@@ -75,7 +75,7 @@ module.exports = class Standalone {
     await fse.remove(BINARY_TMP_PATH);
     await pipeline(standaloneResponse.body, fs.createWriteStream(BINARY_TMP_PATH));
     await fsp.rename(BINARY_TMP_PATH, BINARY_PATH);
-    await fse.chmod(BINARY_PATH, 0o755);
+    await fsp.chmod(BINARY_PATH, 0o755);
     this.serverless.cli.log(`Successfully upgraded to ${tagName}`);
   }
 
diff --git a/lib/utils/eventuallyUpdate.js b/lib/utils/eventuallyUpdate.js
index a773726703a..c6cde10d11b 100644
--- a/lib/utils/eventuallyUpdate.js
+++ b/lib/utils/eventuallyUpdate.js
@@ -74,7 +74,7 @@ const standaloneUpdate = async (serverless, { newVersion, abortHandler }) => {
     const downloadStream = got.stream(executableUrl);
     abortHandler.task = () => downloadStream.destroy();
     await pipeline(downloadStream, fse.createWriteStream(tempStandalonePath));
-    await fse.chmod(tempStandalonePath, 0o755);
+    await fsp.chmod(tempStandalonePath, 0o755);
     return () => fsp.rename(tempStandalonePath, standaloneUtils.path);
   } catch (error) {
     if (!abortHandler.isAborted && process.env.SLS_DEBUG) {

From cb9f7e20eedc1db7bb31671c97449e269e992ded Mon Sep 17 00:00:00 2001
From: Andrey Kabylin <andrey@kabylin.ru>
Date: Mon, 28 Jun 2021 22:06:07 +0700
Subject: [PATCH 0256/1101] fix(Templates): Use `amd64` arch for `aws-go`
 template (#9646)

---
 lib/plugins/create/templates/aws-go-dep/Makefile | 4 ++--
 lib/plugins/create/templates/aws-go-mod/Makefile | 4 ++--
 lib/plugins/create/templates/aws-go/Makefile     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/plugins/create/templates/aws-go-dep/Makefile b/lib/plugins/create/templates/aws-go-dep/Makefile
index e1a16281c80..d3556a5464e 100644
--- a/lib/plugins/create/templates/aws-go-dep/Makefile
+++ b/lib/plugins/create/templates/aws-go-dep/Makefile
@@ -2,8 +2,8 @@
 
 build:
 	dep ensure -v
-	env GOOS=linux go build -ldflags="-s -w" -o bin/hello hello/main.go
-	env GOOS=linux go build -ldflags="-s -w" -o bin/world world/main.go
+	env GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -o bin/hello hello/main.go
+	env GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -o bin/world world/main.go
 
 clean:
 	rm -rf ./bin ./vendor Gopkg.lock
diff --git a/lib/plugins/create/templates/aws-go-mod/Makefile b/lib/plugins/create/templates/aws-go-mod/Makefile
index 9622e9b36fd..c18bb3b47d3 100644
--- a/lib/plugins/create/templates/aws-go-mod/Makefile
+++ b/lib/plugins/create/templates/aws-go-mod/Makefile
@@ -2,8 +2,8 @@
 
 build: gomodgen
 	export GO111MODULE=on
-	env GOOS=linux go build -ldflags="-s -w" -o bin/hello hello/main.go
-	env GOOS=linux go build -ldflags="-s -w" -o bin/world world/main.go
+	env GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -o bin/hello hello/main.go
+	env GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -o bin/world world/main.go
 
 clean:
 	rm -rf ./bin ./vendor go.sum
diff --git a/lib/plugins/create/templates/aws-go/Makefile b/lib/plugins/create/templates/aws-go/Makefile
index 3623a7971be..96f31068d4d 100644
--- a/lib/plugins/create/templates/aws-go/Makefile
+++ b/lib/plugins/create/templates/aws-go/Makefile
@@ -1,8 +1,8 @@
 .PHONY: build clean deploy
 
 build:
-	env GOOS=linux go build -ldflags="-s -w" -o bin/hello hello/main.go
-	env GOOS=linux go build -ldflags="-s -w" -o bin/world world/main.go
+	env GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -o bin/hello hello/main.go
+	env GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -o bin/world world/main.go
 
 clean:
 	rm -rf ./bin

From 34a9d91870c36d154427830d3555425b5fd2d14c Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 29 Jun 2021 11:34:13 +0200
Subject: [PATCH 0257/1101] feat(AWS Lambda): Support `Fn::FindInMap` for `vpc`
 config

---
 lib/plugins/aws/provider.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index f88bc0ccff5..e7f31b3a032 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -405,6 +405,21 @@ class AwsProvider {
             required: ['Fn::Split'],
             additionalProperties: false,
           },
+          awsCfFindInMap: {
+            type: 'object',
+            properties: {
+              'Fn::FindInMap': {
+                type: 'array',
+                minItems: 3,
+                maxItems: 3,
+                items: {
+                  oneOf: [{ type: 'string' }, { $ref: '#/definitions/awsCfFunction' }],
+                },
+              },
+            },
+            required: ['Fn::FindInMap'],
+            additionalProperties: false,
+          },
           awsCfSub: {
             type: 'object',
             properties: {
@@ -533,6 +548,7 @@ class AwsProvider {
                     maxItems: 5,
                   },
                   { $ref: '#/definitions/awsCfSplit' },
+                  { $ref: '#/definitions/awsCfFindInMap' },
                 ],
               },
               subnetIds: {
@@ -543,6 +559,7 @@ class AwsProvider {
                     maxItems: 16,
                   },
                   { $ref: '#/definitions/awsCfSplit' },
+                  { $ref: '#/definitions/awsCfFindInMap' },
                 ],
               },
             },

From 58d64262fedf4349bd21f60f89d644f9225d87ab Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 29 Jun 2021 12:30:15 +0200
Subject: [PATCH 0258/1101] refactor(CLI Onboarding): Adjustments to `deploy`
 step output

---
 lib/cli/interactive-setup/deploy-progress-plugin.js | 2 +-
 package.json                                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/cli/interactive-setup/deploy-progress-plugin.js b/lib/cli/interactive-setup/deploy-progress-plugin.js
index 990f7f4221e..05ae2bbf488 100644
--- a/lib/cli/interactive-setup/deploy-progress-plugin.js
+++ b/lib/cli/interactive-setup/deploy-progress-plugin.js
@@ -11,7 +11,7 @@ class InteractiveDeployProgress {
 
     this.hooks = {
       'before:deploy:deploy': async () => {
-        this.progress.updateProgress('Deploying your project...\n');
+        this.progress.updateProgress('Deploying your project. This might take a few minutes...\n');
       },
       'deploy:finalize': async () => {
         this.progress.updateProgress('');
diff --git a/package.json b/package.json
index b59632efe67..789dbb06c33 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "@serverless/cli": "^1.5.2",
     "@serverless/components": "^3.12.0",
-    "@serverless/dashboard-plugin": "^5.4.2",
+    "@serverless/dashboard-plugin": "^5.4.3",
     "@serverless/utils": "^5.3.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",

From d28b6431e6f749db4b1a91573b27262df419a804 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 29 Jun 2021 13:19:57 +0200
Subject: [PATCH 0259/1101] chore: Bump dependencies

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 789dbb06c33..7366ffd5c16 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.934.0",
+    "aws-sdk": "^2.936.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
@@ -94,14 +94,14 @@
     "mock-require": "^3.0.3",
     "nyc": "^15.1.0",
     "pkg": "^4.5.1",
-    "prettier": "^2.3.1",
+    "prettier": "^2.3.2",
     "proxyquire": "^2.1.3",
     "semver-regex": "^3.1.2",
     "sinon": "^11.1.1",
     "sinon-chai": "^3.7.0",
     "standard-version": "^9.3.0",
     "strip-ansi": "^6.0.0",
-    "ws": "^7.5.0",
+    "ws": "^7.5.1",
     "xml2js": "^0.4.23"
   },
   "eslintConfig": {

From 20612ff85cbcf858826fe4e74c98ebe3ac8404a3 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 29 Jun 2021 13:29:00 +0200
Subject: [PATCH 0260/1101] chore: Release v2.49.0

---
 CHANGELOG.md | 27 +++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c89b619ce9d..0157093df38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,33 @@
 
 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.
 
+## [2.49.0](https://github.com/serverless/serverless/compare/v2.48.1...v2.49.0) (2021-06-29)
+
+### Features
+
+- **AWS Lambda:** Support `Fn::FindInMap` for `vpc` config ([#9653](https://github.com/serverless/serverless/pull/9653)) ([34a9d91](https://github.com/serverless/serverless/commit/34a9d91870c36d154427830d3555425b5fd2d14c)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI Onboarding:**
+  - Add deploy step ([#9536](https://github.com/serverless/serverless/pull/9536)) ([28a06a0](https://github.com/serverless/serverless/commit/28a06a05aba4306d2f28d26652067b44ed105151)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Allow to setup Dashboard Provider credentials during onboarding ([#9509](https://github.com/serverless/serverless/pull/9509)) ([feb0421](https://github.com/serverless/serverless/commit/feb04219f6be186cc54462906394bbd82f9747b5)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **CLI:** Fix standalone detection on Windows ([#9648](https://github.com/serverless/serverless/pull/9648)) ([4bc8e2e](https://github.com/serverless/serverless/commit/4bc8e2e1944364e2c218cbfc05039c43afa9ab01)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Packaging:** Fix artifact generation with temp path on other device ([#9616](https://github.com/serverless/serverless/issues/9616)) ([70fb8b9](https://github.com/serverless/serverless/commit/70fb8b986133789b38fad93c0abab01eaf9dc0c7)) ([Sean Dawson](https://github.com/NoxHarmonium))
+
+### Maintenance Improvements
+
+- Replace `fse.chmod` with `fs.promises.chmod` ([#9647](https://github.com/serverless/serverless/issues/9647)) ([83c7726](https://github.com/serverless/serverless/commit/83c772684d655b233522d1e75128476c29339c83)) ([Sudipto Das](https://github.com/sdas13))
+- Add `resolveRegion` util ([#9509](https://github.com/serverless/serverless/pull/9509)) ([98e3668](https://github.com/serverless/serverless/commit/98e3668a2cbb701c109e1ff8dd70a0ece1770f7b)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Add `resolveStage` util ([#9509](https://github.com/serverless/serverless/pull/9509)) ([09bb4fa](https://github.com/serverless/serverless/commit/09bb4fa12270807702dcc26483dbcb94cf733342)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **Telemetry:**
+  - Add `hasLocalCredentials` ([#9594](https://github.com/serverless/serverless/pull/9594)) ([5e0d805](https://github.com/serverless/serverless/commit/5e0d80579e857d016fb4db13288b9d81a3859ee1)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Add interactive flow support ([#9594](https://github.com/serverless/serverless/pull/9594)) ([0eba2dc](https://github.com/serverless/serverless/commit/0eba2dcdfeabba58920462ac2cd54d86e3101e05)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Templates
+
+- Use `amd64` arch for `aws-go` template ([#9646](https://github.com/serverless/serverless/issues/9646)) ([cb9f7e2](https://github.com/serverless/serverless/commit/cb9f7e20eedc1db7bb31671c97449e269e992ded)) ([Andrey Kabylin](https://github.com/sysint64))
+
 ### [2.48.1](https://github.com/serverless/serverless/compare/v2.48.0...v2.48.1) (2021-06-25)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 7366ffd5c16..50fdee11c2c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.48.1",
+  "version": "2.49.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From d861d119ef94baaaa266934783e00a50182d7434 Mon Sep 17 00:00:00 2001
From: Jaakko Lappalainen <jkk.lapp@gmail.com>
Date: Tue, 29 Jun 2021 13:37:37 +0100
Subject: [PATCH 0261/1101] refactor(AWS Deploy): Deprecate `function` option
 in `deploy` command

Co-authored-by: Piotr Grzesik <pj.grzesik@gmail.com>
---
 docs/deprecations.md                   |  8 ++++++++
 lib/cli/commands-schema/aws-service.js |  2 +-
 lib/plugins/deploy.js                  | 11 +++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index a55093a6d25..4dcb10de36c 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -32,6 +32,14 @@ Note:
 - Configuration setting is ineffective for deprecations reported before service configuration is read.
 - `SLS_DEPRECATION_DISABLE` env var and `disabledDeprecations` configuration setting remain respected, and no errors will be thrown for mentioned deprecation coodes.
 
+<a name="CLI_DEPLOY_FUNCTION_OPTION"><div>&nbsp;</div></a>
+
+## CLI `--function`/`-f` option for `deploy` command
+
+Deprecation code: `CLI_DEPLOY_FUNCTION_OPTION'`
+
+Starting with v3.0.0, `--function` or `-f` option for `deploy` command will be removed. In order to deploy a single function, please use `deploy function` command instead.
+
 <a name="CHANGE_OF_DEFAULT_RUNTIME_TO_NODEJS14X"><div>&nbsp;</div></a>
 
 ## Change of default runtime to `nodejs14.x`
diff --git a/lib/cli/commands-schema/aws-service.js b/lib/cli/commands-schema/aws-service.js
index 1c1cbe6b3cf..8421e8fee93 100644
--- a/lib/cli/commands-schema/aws-service.js
+++ b/lib/cli/commands-schema/aws-service.js
@@ -26,7 +26,7 @@ commands.set('deploy', {
       type: 'boolean',
     },
     'function': {
-      usage: "Function name. Deploys a single function (see 'deploy function')",
+      usage: "Function name. Deploys a single function. DEPRECATED: use 'deploy function' instead.",
       shortcut: 'f',
     },
     'aws-s3-accelerate': {
diff --git a/lib/plugins/deploy.js b/lib/plugins/deploy.js
index ae682625aa7..a808e5b7a79 100644
--- a/lib/plugins/deploy.js
+++ b/lib/plugins/deploy.js
@@ -29,6 +29,17 @@ class Deploy {
     };
 
     this.hooks = {
+      'initialize': () => {
+        const isDeployCommand =
+          this.serverless.processedInput.commands.length === 1 &&
+          this.serverless.processedInput.commands[0] === 'deploy';
+        if (isDeployCommand && this.options.function) {
+          this.serverless.logDeprecation(
+            'CLI_DEPLOY_FUNCTION_OPTION',
+            'Starting with v3.0.0, `--function` or `-f` option for `deploy` command will be removed. In order to deploy a single function, please use `deploy function` command instead.'
+          );
+        }
+      },
       'before:deploy:deploy': async () => {
         const provider = this.serverless.service.provider.name;
         if (!this.serverless.getProvider(provider)) {

From ac7efb1b7b1a2ae4ba1ab6bb2d47c718dcb62a17 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 21 Jun 2021 17:57:58 +0200
Subject: [PATCH 0262/1101] refactor(Variables): Remove redundancy

---
 lib/configuration/variables/resolve.js | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/lib/configuration/variables/resolve.js b/lib/configuration/variables/resolve.js
index c71aef5c244..aa899d5a19f 100644
--- a/lib/configuration/variables/resolve.js
+++ b/lib/configuration/variables/resolve.js
@@ -369,7 +369,7 @@ Object.defineProperties(
           // In such case resolution can be retried in later turn, after missing data is provided.
           //
           // Having `.error` means, resolution errored (with no recovery plan for it)
-          // Such error ideally should be exposed with command crash.
+          // Such error ideally should be exposed with command crash in resolution consumer logic
           return;
         }
 
@@ -520,19 +520,6 @@ Object.defineProperties(
           );
         }
         const resultValue = result.value;
-        if (isPlainObject(resultValue) || Array.isArray(resultValue)) {
-          try {
-            JSON.parse(JSON.stringify(resultValue));
-          } catch (error) {
-            throw new VariableSourceResolutionError(
-              `Source "${sourceData.type}" returned not supported result: "${util.inspect(
-                resultValue
-              )}"`,
-              'UNSUPPORTED_VARIABLE_RESOLUTION_RESULT'
-            );
-          }
-          return result;
-        }
         let normalizedResultValue;
         try {
           normalizedResultValue = JSON.parse(JSON.stringify(resultValue));
@@ -544,7 +531,11 @@ Object.defineProperties(
             'UNSUPPORTED_VARIABLE_RESOLUTION_RESULT'
           );
         }
-        if (resultValue !== normalizedResultValue) {
+        if (
+          !isPlainObject(resultValue) &&
+          !Array.isArray(resultValue) &&
+          resultValue !== normalizedResultValue
+        ) {
           throw new VariableSourceResolutionError(
             `Source "${sourceData.type}" returned not supported result: "${util.inspect(
               resultValue

From 0e3db01db8aeb08b03a98dd7f58a09b66ec8c49e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 29 Jun 2021 14:28:19 +0200
Subject: [PATCH 0263/1101] feat(Variables): Resolve vars in strings which are
 subject to be joined

---
 lib/configuration/variables/parse.js          | 12 +++-
 lib/configuration/variables/resolve.js        | 70 +++++++++++++------
 .../lib/configuration/variables/parse.test.js |  8 +--
 .../configuration/variables/resolve.test.js   |  6 ++
 4 files changed, 68 insertions(+), 28 deletions(-)

diff --git a/lib/configuration/variables/parse.js b/lib/configuration/variables/parse.js
index a73e2159d86..c43eb09cf2f 100644
--- a/lib/configuration/variables/parse.js
+++ b/lib/configuration/variables/parse.js
@@ -45,6 +45,16 @@ const finalizeVariable = () => {
 };
 
 const registerVarEscape = () => {
+  if (!variables) variables = [];
+  variables.push({
+    start: escapeVarStart - contextStart,
+    end: index - contextStart,
+    value: '\\'.repeat(Math.ceil((index - 1 - escapeVarStart - 1) / 2)) + value[index - 1],
+  });
+  escapeVarStart = null;
+};
+
+const registerSlashEscape = () => {
   if (!variables) variables = [];
   variables.push({
     start: escapeVarStart - contextStart,
@@ -194,7 +204,7 @@ module.exports = (inputValue) => {
           break;
         case 'maybeVariableOpen':
           if (char === '{') {
-            if (escapeVarStart != null) registerVarEscape();
+            if (escapeVarStart != null) registerSlashEscape();
             state = 'maybeTypeStart';
           } else {
             escapeVarStart = null;
diff --git a/lib/configuration/variables/resolve.js b/lib/configuration/variables/resolve.js
index aa899d5a19f..e2393926fb2 100644
--- a/lib/configuration/variables/resolve.js
+++ b/lib/configuration/variables/resolve.js
@@ -118,7 +118,7 @@ class VariablesResolver {
     // String value is either constructed from more than one variable
     // or is partially constructed with a variable.
     // In such case, end value is always a string, reconstructed below
-    const valueTokens = [];
+    const sourceValues = [];
     const rawValue = valueMeta.value;
     let lastIndex = 0;
     for (const { start, end, value } of valueMeta.variables) {
@@ -133,13 +133,13 @@ class VariablesResolver {
         );
         return;
       }
-      valueTokens.push(rawValue.slice(lastIndex, start), stringValue);
+      sourceValues.push(rawValue.slice(lastIndex, start), stringValue);
       lastIndex = end;
     }
-    valueTokens.push(rawValue.slice(lastIndex));
-    valueMeta.value = valueTokens.join('');
+    sourceValues.push(rawValue.slice(lastIndex));
+    valueMeta.value = sourceValues.join('');
+    valueMeta.sourceValues = sourceValues;
     delete valueMeta.variables;
-    valueMeta.isGeneratedFromMultipleSources = true;
   }
 
   async resolveVariable(resolutionBatchId, propertyPath, variableMeta) {
@@ -376,7 +376,7 @@ Object.defineProperties(
         // Variable(s) for a property where successfully resolved, still it can be an object
         // (or an array) containing a values with variables in it.
         const propertyPathKeys = propertyPath.split('\0');
-        const { value, isGeneratedFromMultipleSources } = valueMeta;
+        const { value, sourceValues } = valueMeta;
 
         const valueEntries = (() => {
           if (isPlainObject(value)) return Object.entries(value);
@@ -387,24 +387,48 @@ Object.defineProperties(
           propertyVariablesMeta = parseEntries(valueEntries, propertyPathKeys, new Map());
         } else if (typeof value === 'string') {
           const valueVariables = (() => {
-            if (isGeneratedFromMultipleSources) {
-              // Do not attempt to parse variables out of strings which are result of concatenation
-              // of values coming from multiple sources.
-              // Main reason, is to not re-attempt to parse values with eventually cleared escapes
-              // (e.g. escaped "\\${source:}" is at this point resolved to "${source:}".
-              // Parsing result string here will make escape in-effective).
-              return null;
-            }
-            try {
-              return parse(value);
-            } catch (error) {
-              error.message = `Cannot resolve variable at "${humanizePropertyPath(
-                propertyPathKeys
-              )}": Approached variable syntax error in resolved value "${value}": ${error.message}`;
-              delete valueMeta.value;
-              valueMeta.error = error;
-              return null;
+            const silentParse = (sourceValue) => {
+              try {
+                return parse(sourceValue);
+              } catch (error) {
+                error.message = `Cannot resolve variable at "${humanizePropertyPath(
+                  propertyPathKeys
+                )}": Approached variable syntax error in resolved value "${value}": ${
+                  error.message
+                }`;
+                delete valueMeta.value;
+                valueMeta.error = error;
+                return null;
+              }
+            };
+            if (sourceValues) {
+              // Value is a result of concatenation of string values coming from multiple sources.
+              // Parse variables in each string part individually - it's to avoid accidental
+              // resolution of variable-like notation which may surface after joining two values.
+              // Also that way we do not accidentally re-parse an escaped variables notation
+              let baseIndex = 0;
+              let resolvedValueVariables = null;
+              for (const sourceValue of sourceValues) {
+                const sourceValueVariables = silentParse(sourceValue);
+                if (valueMeta.error) return null;
+                if (sourceValueVariables) {
+                  for (const sourceValueVariable of sourceValueVariables) {
+                    if (sourceValueVariable.end) {
+                      sourceValueVariable.start += baseIndex;
+                      sourceValueVariable.end += baseIndex;
+                    } else {
+                      sourceValueVariable.start = baseIndex;
+                      sourceValueVariable.end = baseIndex + sourceValue.length;
+                    }
+                  }
+                  if (!resolvedValueVariables) resolvedValueVariables = [];
+                  resolvedValueVariables.push(...sourceValueVariables);
+                }
+                baseIndex += sourceValue.length;
+              }
+              return resolvedValueVariables;
             }
+            return silentParse(value);
           })();
 
           if (valueVariables) {
diff --git a/test/unit/lib/configuration/variables/parse.test.js b/test/unit/lib/configuration/variables/parse.test.js
index 53bd00d7221..db7a776dda7 100644
--- a/test/unit/lib/configuration/variables/parse.test.js
+++ b/test/unit/lib/configuration/variables/parse.test.js
@@ -543,8 +543,8 @@ describe('test/unit/lib/configuration/variables/parse.test.js', () => {
       expect(parse('e\\${s:}n\\$${s:}qe\\\\\\${s:}qn\\\\${s:}')).to.deep.equal([
         {
           start: 1,
-          end: 2,
-          value: '',
+          end: 3,
+          value: '$',
         },
         {
           start: 10,
@@ -553,8 +553,8 @@ describe('test/unit/lib/configuration/variables/parse.test.js', () => {
         },
         {
           start: 17,
-          end: 20,
-          value: '\\',
+          end: 21,
+          value: '\\$',
         },
         {
           start: 27,
diff --git a/test/unit/lib/configuration/variables/resolve.test.js b/test/unit/lib/configuration/variables/resolve.test.js
index 078716316a6..6f8e4abe72d 100644
--- a/test/unit/lib/configuration/variables/resolve.test.js
+++ b/test/unit/lib/configuration/variables/resolve.test.js
@@ -38,6 +38,8 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
       resolvesResultVariablesArray: '${sourceResultVariables(array)}',
       resolvesResultVariablesString: '${sourceResultVariables(string)}',
       resolvesResultVariablesStringInvalid: '${sourceResultVariables(stringInvalid)}',
+      resolveDeepVariablesConcat:
+        '${sourceResultVariables(string)}foo${sourceResultVariables(string)}',
       resolvesVariables: '${sourceResolveVariable("sourceParam(${sourceDirect:})")}',
       resolvesVariablesFallback: '${sourceResolveVariable("sourceMissing:, null"), null}',
       resolvesVariablesInvalid1: '${sourceResolveVariable("sourceDirect(")}',
@@ -243,6 +245,10 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
       expect(configuration.resolvesResultVariablesString).to.equal(234);
     });
 
+    it('should resolve variables in resolved strings which are subject to concatenation', () => {
+      expect(configuration.resolveDeepVariablesConcat).to.equal('234foo234');
+    });
+
     // https://github.com/serverless/serverless/issues/9016
     it('should resolve same sources across resolution batches without shared caching', () => {
       expect(configuration.sharedSourceResolution1).to.deep.equal({

From 80b76406ac305ccb7e55cabd0bd39be6ac7c67c6 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 29 Jun 2021 16:35:30 +0200
Subject: [PATCH 0264/1101] feat(Variables): Support variables across file
 address resolution

---
 lib/configuration/variables/resolve.js        | 19 +++++++++++++++++++
 lib/configuration/variables/sources/file.js   |  2 ++
 .../configuration/variables/resolve.test.js   | 13 +++++++++++++
 .../variables/sources/file.test.js            |  4 ++++
 .../fixture/file-variables-nest-1.yaml        |  1 +
 .../fixture/file-variables-nest-2.yaml        |  2 ++
 .../fixture/file-variables-nest-3.yaml        |  2 ++
 7 files changed, 43 insertions(+)
 create mode 100644 test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-1.yaml
 create mode 100644 test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-2.yaml
 create mode 100644 test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-3.yaml

diff --git a/lib/configuration/variables/resolve.js b/lib/configuration/variables/resolve.js
index e2393926fb2..c7c7804df15 100644
--- a/lib/configuration/variables/resolve.js
+++ b/lib/configuration/variables/resolve.js
@@ -531,6 +531,25 @@ Object.defineProperties(
             }
             return meta.value;
           },
+          resolveVariablesInString: async (stringValue) => {
+            stringValue = ensureString(stringValue, {
+              Error: ServerlessError,
+              name: 'variableString',
+              errorCode: 'INVALID_STRING_INPUT_TYPE',
+            });
+            const variableData = parse(stringValue);
+            if (!variableData) return stringValue;
+            const meta = {
+              value: stringValue,
+              variables: variableData,
+            };
+            await this.resolveVariables(resolutionBatchId, propertyPath, meta);
+            if (meta.error) throw meta.error;
+            if (meta.variables) {
+              throw new ServerlessError('Cannot resolve variable', 'MISSING_VARIABLE_DEPENDENCY');
+            }
+            return meta.value;
+          },
         });
         ensurePlainObject(result, {
           errorMessage: `Unexpected "${sourceData.type}" source result: %v`,
diff --git a/lib/configuration/variables/sources/file.js b/lib/configuration/variables/sources/file.js
index c928b7154b6..b37abf5546c 100644
--- a/lib/configuration/variables/sources/file.js
+++ b/lib/configuration/variables/sources/file.js
@@ -27,6 +27,7 @@ module.exports = {
     address,
     resolveConfigurationProperty,
     resolveVariable,
+    resolveVariablesInString,
     options,
   }) => {
     if (!params || !params[0]) {
@@ -167,6 +168,7 @@ module.exports = {
     const propertyKeys = address.split('.');
     let result = content;
     for (const propertyKey of propertyKeys) {
+      if (typeof result === 'string') result = await resolveVariablesInString(result);
       result = result[propertyKey];
       if (result == null) return { value: null };
       if (!isResolvedByFunction && isPlainFunction(result)) {
diff --git a/test/unit/lib/configuration/variables/resolve.test.js b/test/unit/lib/configuration/variables/resolve.test.js
index 6f8e4abe72d..f2aef59d658 100644
--- a/test/unit/lib/configuration/variables/resolve.test.js
+++ b/test/unit/lib/configuration/variables/resolve.test.js
@@ -40,6 +40,7 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
       resolvesResultVariablesStringInvalid: '${sourceResultVariables(stringInvalid)}',
       resolveDeepVariablesConcat:
         '${sourceResultVariables(string)}foo${sourceResultVariables(string)}',
+      resolveVariablesInString: "${sourceResolveVariablesInString('${sourceProperty(foo)}')}",
       resolvesVariables: '${sourceResolveVariable("sourceParam(${sourceDirect:})")}',
       resolvesVariablesFallback: '${sourceResolveVariable("sourceMissing:, null"), null}',
       resolvesVariablesInvalid1: '${sourceResolveVariable("sourceDirect(")}',
@@ -94,6 +95,11 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
           return { value: await resolveVariable(params[0]) };
         },
       },
+      sourceResolveVariablesInString: {
+        resolve: async ({ params, resolveVariablesInString }) => {
+          return { value: await resolveVariablesInString(params[0]) };
+        },
+      },
       sourceResultVariables: {
         resolve: ({ params: [type] }) => {
           switch (type) {
@@ -249,6 +255,13 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
       expect(configuration.resolveDeepVariablesConcat).to.equal('234foo234');
     });
 
+    it('should provide working resolveVariablesInString util', () => {
+      expect(configuration.resolveVariablesInString).to.deep.equal({
+        params: 'param1|param2',
+        varParam: '234',
+      });
+    });
+
     // https://github.com/serverless/serverless/issues/9016
     it('should resolve same sources across resolution batches without shared caching', () => {
       expect(configuration.sharedSourceResolution1).to.deep.equal({
diff --git a/test/unit/lib/configuration/variables/sources/file.test.js b/test/unit/lib/configuration/variables/sources/file.test.js
index b2714e0a36b..cc2828b1eee 100644
--- a/test/unit/lib/configuration/variables/sources/file.test.js
+++ b/test/unit/lib/configuration/variables/sources/file.test.js
@@ -28,6 +28,7 @@ describe('test/unit/lib/configuration/variables/sources/file.test.js', () => {
       jsPropertyFunctionResolveVariable: '${file(file-property-function-variable.js):property}',
       jsPropertyFunctionResolveVariableMissingSource:
         '${file(file-property-function-variable-missing-source.js):property}',
+      nestedVariablesAddressResolution: '${file(file-variables-nest-1.yaml):n1.n2.n3}',
       nonExistingYaml: '${file(not-existing.yaml), null}',
       nonExistingJson: '${file(not-existing.json), null}',
       nonExistingJs: '${file(not-existing.js), null}',
@@ -103,6 +104,9 @@ describe('test/unit/lib/configuration/variables/sources/file.test.js', () => {
     });
   });
 
+  it('should resolve variables across address resolution', () => {
+    expect(configuration.nestedVariablesAddressResolution).to.deep.equal('result');
+  });
   it('should uncoditionally split "address" property keys by "."', () =>
     expect(configuration.ambiguousAddress).to.equal('object'));
 
diff --git a/test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-1.yaml b/test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-1.yaml
new file mode 100644
index 00000000000..07112689c41
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-1.yaml
@@ -0,0 +1 @@
+n1: ${file(./file-variables-nest-2.yaml):root}
diff --git a/test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-2.yaml b/test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-2.yaml
new file mode 100644
index 00000000000..aebc2d442a1
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-2.yaml
@@ -0,0 +1,2 @@
+root:
+  n2: ${file(./file-variables-nest-3.yaml):root}
diff --git a/test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-3.yaml b/test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-3.yaml
new file mode 100644
index 00000000000..b35e5c8d3df
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-3.yaml
@@ -0,0 +1,2 @@
+root:
+  n3: result

From a80681ffbf23391cb31d34b8eecaef310d9599a3 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 29 Jun 2021 17:21:08 +0200
Subject: [PATCH 0265/1101] fix(CLI Onboarding): Only call `handleError` if
 plugin defined

---
 lib/cli/interactive-setup/deploy.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/cli/interactive-setup/deploy.js b/lib/cli/interactive-setup/deploy.js
index 16c5d03453f..f812b0cb39d 100644
--- a/lib/cli/interactive-setup/deploy.js
+++ b/lib/cli/interactive-setup/deploy.js
@@ -172,7 +172,9 @@ module.exports = {
         }
       );
     } catch (err) {
-      interactiveOutputPlugin.handleError();
+      if (interactiveOutputPlugin) {
+        interactiveOutputPlugin.handleError();
+      }
       throw err;
     }
 

From 2b7154ab90b0eb7156e2f368a609ded87ab5a43f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 18 Jun 2021 18:10:11 +0200
Subject: [PATCH 0266/1101] test: Test "serverless-offline" plugin

---
 .../programmatic/curated-plugins/_setup.js    |  9 +++++
 .../programmatic/curated-plugins/index.js     |  8 ++++
 .../programmatic/curated-plugins/package.json |  5 +++
 .../curated-plugins/serverless.yml            | 23 +++++++++++
 test/integration/curated-plugins.test.js      | 38 +++++++++++++++++++
 5 files changed, 83 insertions(+)
 create mode 100644 test/fixtures/programmatic/curated-plugins/_setup.js
 create mode 100644 test/fixtures/programmatic/curated-plugins/index.js
 create mode 100755 test/fixtures/programmatic/curated-plugins/package.json
 create mode 100644 test/fixtures/programmatic/curated-plugins/serverless.yml
 create mode 100644 test/integration/curated-plugins.test.js

diff --git a/test/fixtures/programmatic/curated-plugins/_setup.js b/test/fixtures/programmatic/curated-plugins/_setup.js
new file mode 100644
index 00000000000..fb374507b1c
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins/_setup.js
@@ -0,0 +1,9 @@
+'use strict';
+
+const path = require('path');
+const fsp = require('fs').promises;
+
+const slsDependencyDir = path.resolve(__dirname, 'node_modules/serverless');
+
+// Ensure to remove "serverless" installed as peer-dependency to avoid local fallback
+module.exports = async () => fsp.rm(slsDependencyDir, { recursive: true, force: true });
diff --git a/test/fixtures/programmatic/curated-plugins/index.js b/test/fixtures/programmatic/curated-plugins/index.js
new file mode 100644
index 00000000000..76d27d5b0a6
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins/index.js
@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports.handler = (event, context, callback) => {
+  callback(null, {
+    statusCode: 200,
+    body: JSON.stringify({ message: 'Test', input: event }, null, 2),
+  });
+};
diff --git a/test/fixtures/programmatic/curated-plugins/package.json b/test/fixtures/programmatic/curated-plugins/package.json
new file mode 100755
index 00000000000..49f5bc7bcee
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins/package.json
@@ -0,0 +1,5 @@
+{
+  "devDependencies": {
+    "serverless-offline": "7.0.0"
+  }
+}
diff --git a/test/fixtures/programmatic/curated-plugins/serverless.yml b/test/fixtures/programmatic/curated-plugins/serverless.yml
new file mode 100644
index 00000000000..c23569a22e7
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins/serverless.yml
@@ -0,0 +1,23 @@
+service: service
+
+configValidationMode: error
+frameworkVersion: '*'
+
+provider:
+  name: aws
+  runtime: nodejs14.x
+  lambdaHashingVersion: 20201221
+
+functions:
+  function:
+    handler: index.handler
+    events:
+      - http:
+          path: foo
+          method: GET
+      - http:
+          path: foo
+          method: POST
+
+plugins:
+  - serverless-offline
diff --git a/test/integration/curated-plugins.test.js b/test/integration/curated-plugins.test.js
new file mode 100644
index 00000000000..825329b7cb1
--- /dev/null
+++ b/test/integration/curated-plugins.test.js
@@ -0,0 +1,38 @@
+'use strict';
+
+const { expect } = require('chai');
+const spawn = require('child-process-ext/spawn');
+const got = require('got');
+const fixturesEngine = require('../fixtures/programmatic');
+
+const serverlessExec = require('../serverlessBinary');
+
+describe('test/integration/curated-plugins.test.js', function () {
+  this.timeout(1000 * 60 * 10); // Involves time-taking npm install
+
+  let serviceDir;
+  before(async () => {
+    serviceDir = (await fixturesEngine.setup('curated-plugins')).servicePath;
+  });
+
+  it('should be extended by "serverless-offline"', async () => {
+    const slsProcessPromise = spawn(serverlessExec, ['offline'], {
+      cwd: serviceDir,
+    });
+    const slsProcess = slsProcessPromise.child;
+    let output = '';
+    slsProcess.stdout.on('data', function self(data) {
+      output += data;
+      if (output.includes('server ready:')) {
+        slsProcess.stdout.off('data', self);
+        got('http://localhost:3000/dev/foo')
+          .json()
+          .then(async (responseBody) => {
+            expect(responseBody.message).to.equal('Test');
+          })
+          .finally(() => slsProcess.kill('SIGINT'));
+      }
+    });
+    await slsProcessPromise;
+  });
+});

From ae5be0f5dafaad933000e98142fcb1ec60e04555 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 29 Jun 2021 17:50:27 +0200
Subject: [PATCH 0267/1101] fix(CLI Onboarding): Do not attempt local fallback
 during onboarding

---
 lib/cli/interactive-setup/deploy.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/cli/interactive-setup/deploy.js b/lib/cli/interactive-setup/deploy.js
index f812b0cb39d..72359130079 100644
--- a/lib/cli/interactive-setup/deploy.js
+++ b/lib/cli/interactive-setup/deploy.js
@@ -166,8 +166,14 @@ module.exports = {
       await overrideStdoutWrite(
         () => {},
         async (originalStdWrite) => {
+          // This is a hack to disable local fallback for interactive setup
+          // After https://github.com/serverless/serverless/issues/1720 is addressed
+          // We can change the approach to deployment in interactive setup and remove this hack
+          serverless.isLocallyInstalled = true;
           await serverless.init();
           interactiveOutputPlugin = configurePlugin(serverless, originalStdWrite);
+          // Remove previously set `isLocallyInstalled` as it was only needed to avoid local fallback in `init()`
+          delete serverless.isLocallyInstalled;
           await serverless.run();
         }
       );

From 894ac5b6b67eb384dbc29b927161121679afce2d Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 30 Jun 2021 10:43:07 +0200
Subject: [PATCH 0268/1101] feat(AWS Lambda): Support `Fn::If` for
 `Principal.AWS`

---
 lib/plugins/aws/provider.js                   | 14 +++++++++
 .../events/apiGateway/lib/restApi.test.js     | 30 +++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index e7f31b3a032..3306c74500b 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -357,6 +357,19 @@ class AwsProvider {
             additionalProperties: false,
             required: ['Fn::ImportValue'],
           },
+          awsCfIf: {
+            type: 'object',
+            properties: {
+              'Fn::If': {
+                type: 'array',
+                minItems: 3,
+                maxItems: 3,
+                items: { type: 'string', minLength: 1 },
+              },
+            },
+            required: ['Fn::If'],
+            additionalProperties: false,
+          },
           awsCfImportLocallyResolvable: {
             type: 'object',
             properties: {
@@ -438,6 +451,7 @@ class AwsProvider {
                   AWS: {
                     anyOf: [
                       { const: '*' },
+                      { $ref: '#/definitions/awsCfIf' },
                       {
                         type: 'array',
                         items: {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
index d24a858caec..6ad0bd7f2ed 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
@@ -191,4 +191,34 @@ describe('lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js'
 
     expect(resource.Properties.DisableExecuteApiEndpoint).to.equal(true);
   });
+
+  it('should support `provider.apiGateway.resourcePolicy[].Principal.AWS with Fn::If`', async () => {
+    const { cfTemplate } = await runServerless({
+      fixture: 'apiGateway',
+      command: 'package',
+      configExt: {
+        provider: {
+          apiGateway: {
+            resourcePolicy: [
+              {
+                Effect: 'Allow',
+                Principal: {
+                  AWS: {
+                    'Fn::If': ['Condition', 'FirstVal', 'SecondVal'],
+                  },
+                },
+                Action: 'execute-api:Invoke',
+                Resource: ['execute-api:/*/*/*'],
+              },
+            ],
+          },
+        },
+      },
+    });
+    const resource = cfTemplate.Resources.ApiGatewayRestApi;
+
+    expect(resource.Properties.Policy.Statement[0].Principal.AWS).to.deep.equal({
+      'Fn::If': ['Condition', 'FirstVal', 'SecondVal'],
+    });
+  });
 });

From e836722f976af98eb69fc6d3a85781bb7434dfac Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 30 Jun 2021 12:37:27 +0200
Subject: [PATCH 0269/1101] fix(AWS Local Invocation): Fix error handling of
 invalid file content

---
 lib/plugins/aws/invokeLocal/index.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invokeLocal/index.js
index bd84c8eb09b..2970e7e6660 100644
--- a/lib/plugins/aws/invokeLocal/index.js
+++ b/lib/plugins/aws/invokeLocal/index.js
@@ -77,7 +77,16 @@ class AwsInvokeLocal {
       this.options[key] = require(absolutePath);
       return;
     }
-    const contents = await this.serverless.utils.readFile(absolutePath);
+    const contents = await (async () => {
+      try {
+        return await this.serverless.utils.readFile(absolutePath);
+      } catch (error) {
+        throw new ServerlessError(
+          `Parsing of "${absolutePath}" failed with: ${error.message}`,
+          'INVOKE_LOCAL_INVALID_FILE_CONTENT'
+        );
+      }
+    })();
     this.options[key] = contents;
   }
 

From 23c290e4b4049242d62cfb57f4be6aadff6aecf8 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 30 Jun 2021 12:44:03 +0200
Subject: [PATCH 0270/1101] fix(AWS Deploy): Report meaningfully inaccessible
 file artifacts

---
 lib/plugins/aws/deploy/lib/uploadArtifacts.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/aws/deploy/lib/uploadArtifacts.js b/lib/plugins/aws/deploy/lib/uploadArtifacts.js
index 5c9443b120a..0763a440b64 100644
--- a/lib/plugins/aws/deploy/lib/uploadArtifacts.js
+++ b/lib/plugins/aws/deploy/lib/uploadArtifacts.js
@@ -8,6 +8,7 @@ const BbPromise = require('bluebird');
 const filesize = require('filesize');
 const normalizeFiles = require('../../lib/normalizeFiles');
 const getLambdaLayerArtifactPath = require('../../utils/getLambdaLayerArtifactPath');
+const ServerlessError = require('../../../../serverless-error');
 
 const MAX_CONCURRENT_ARTIFACTS_UPLOADS =
   Number(process.env.SLS_MAX_CONCURRENT_ARTIFACTS_UPLOADS) || 3;
@@ -142,7 +143,17 @@ module.exports = {
     return BbPromise.map(
       artifactFilePaths,
       (artifactFilePath) => {
-        const stats = fs.statSync(artifactFilePath);
+        const stats = (() => {
+          try {
+            return fs.statSync(artifactFilePath);
+          } catch (error) {
+            throw new ServerlessError(
+              `Cannot read file artifact "${artifactFilePath}": ${error.message}`,
+              'INACCESSIBLE_FILE_ARTIFACT'
+            );
+          }
+        })();
+
         const fileName = path.basename(artifactFilePath);
         this.serverless.cli.log(
           `Uploading service ${fileName} file to S3 (${filesize(stats.size)})...`

From 33794ea504e714912137796009c29c802f2e24f0 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 29 Jun 2021 16:26:39 +0200
Subject: [PATCH 0271/1101] feat(Variables): Support `aws:region` and
 `aws:accountId` variables

---
 docs/providers/aws/guide/variables.md         |  26 +++++
 lib/Serverless.js                             |   1 +
 .../sources/instance-dependent/get-aws.js     |  43 +++++++
 scripts/serverless.js                         |   3 +
 .../instance-dependent/get-aws.test.js        | 110 ++++++++++++++++++
 5 files changed, 183 insertions(+)
 create mode 100644 lib/configuration/variables/sources/instance-dependent/get-aws.js
 create mode 100644 test/unit/lib/configuration/variables/sources/instance-dependent/get-aws.test.js

diff --git a/docs/providers/aws/guide/variables.md b/docs/providers/aws/guide/variables.md
index 8466520484d..b19f6433227 100644
--- a/docs/providers/aws/guide/variables.md
+++ b/docs/providers/aws/guide/variables.md
@@ -305,6 +305,32 @@ functions:
     handler: handler.hello
 ```
 
+## Referencing AWS-specific variables
+
+You can reference AWS-specific values as the source of your variables. Those values are exposed via the Serverless Variables system through the `{aws:}` variable prefix.
+
+The following variables are available:
+
+**accountId**
+
+Account ID of you AWS Account, based on the AWS Credentials that you have configured.
+
+```yml
+service: new-service
+provider: aws
+
+functions:
+  func1:
+    name: function-1
+    handler: handler.func1
+    environment:
+      ACCOUNT_ID: ${aws:accountId}
+```
+
+**region**
+
+The region used by the Serverless CLI. The `${aws:region}` variable is a shortcut for `${opt:region, self:provider.region, "us-east-1"}`.
+
 ### Resolution of non plain string types
 
 New variable resolver, ensures that automatically other types as `SecureString` and `StringList` are resolved into expected forms.
diff --git a/lib/Serverless.js b/lib/Serverless.js
index a5c6711a9c7..ef261d5a06d 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -352,6 +352,7 @@ class Serverless {
               cf: require('./configuration/variables/sources/instance-dependent/get-cf')(this),
               s3: require('./configuration/variables/sources/instance-dependent/get-s3')(this),
               ssm: require('./configuration/variables/sources/instance-dependent/get-ssm')(this),
+              aws: require('./configuration/variables/sources/instance-dependent/get-aws')(this),
             });
           }
           if (this.configurationInput.org && this.pluginManager.dashboardPlugin) {
diff --git a/lib/configuration/variables/sources/instance-dependent/get-aws.js b/lib/configuration/variables/sources/instance-dependent/get-aws.js
new file mode 100644
index 00000000000..45b7a021d01
--- /dev/null
+++ b/lib/configuration/variables/sources/instance-dependent/get-aws.js
@@ -0,0 +1,43 @@
+'use strict';
+
+const ensureString = require('type/string/ensure');
+const ServerlessError = require('../../../../serverless-error');
+
+module.exports = (serverlessInstance) => {
+  return {
+    resolve: async ({ address, options, resolveConfigurationProperty }) => {
+      if (!address) {
+        throw new ServerlessError(
+          'Missing address argument in variable "aws" source',
+          'MISSING_AWS_SOURCE_ADDRESS'
+        );
+      }
+
+      address = ensureString(address, {
+        Error: ServerlessError,
+        errorMessage: 'Non-string address argument in variable "sls" source: %v',
+        errorCode: 'INVALID_AWS_SOURCE_ADDRESS',
+      });
+
+      switch (address) {
+        case 'accountId': {
+          const { Account } = await serverlessInstance
+            .getProvider('aws')
+            .request('STS', 'getCallerIdentity', {}, { useCache: true });
+          return { value: Account };
+        }
+        case 'region': {
+          let region = options.region;
+          if (!region) region = await resolveConfigurationProperty(['provider', 'region']);
+          if (!region) region = 'us-east-1';
+          return { value: region };
+        }
+        default:
+          throw new ServerlessError(
+            `Unsupported "${address}" address argument in variable "aws" source`,
+            'UNSUPPORTED_AWS_SOURCE_ADDRESS'
+          );
+      }
+    },
+  };
+};
diff --git a/scripts/serverless.js b/scripts/serverless.js
index c44f0a7244f..b07c43e5b14 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -544,6 +544,9 @@ const processSpanPromise = (async () => {
             ssm: require('../lib/configuration/variables/sources/instance-dependent/get-ssm')(
               serverless
             ),
+            aws: require('../lib/configuration/variables/sources/instance-dependent/get-aws')(
+              serverless
+            ),
           });
           resolverConfiguration.fulfilledSources.add('cf').add('s3').add('ssm');
         }
diff --git a/test/unit/lib/configuration/variables/sources/instance-dependent/get-aws.test.js b/test/unit/lib/configuration/variables/sources/instance-dependent/get-aws.test.js
new file mode 100644
index 00000000000..3664f0613ea
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/instance-dependent/get-aws.test.js
@@ -0,0 +1,110 @@
+'use strict';
+
+const { expect } = require('chai');
+const _ = require('lodash');
+
+const resolveMeta = require('../../../../../../../lib/configuration/variables/resolve-meta');
+const resolve = require('../../../../../../../lib/configuration/variables/resolve');
+const selfSource = require('../../../../../../../lib/configuration/variables/sources/self');
+const getAwsSource = require('../../../../../../../lib/configuration/variables/sources/instance-dependent/get-aws');
+const Serverless = require('../../../../../../../lib/Serverless');
+
+describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-aws.test.js', () => {
+  let configuration;
+  let variablesMeta;
+  let serverlessInstance;
+
+  const initializeServerless = async (configExt, options) => {
+    configuration = {
+      service: 'foo',
+      provider: {
+        name: 'aws',
+      },
+      custom: {
+        region: '${aws:region}',
+        accountId: '${aws:accountId}',
+        missingAddress: '${aws:}',
+        invalidAddress: '${aws:invalid}',
+        nonStringAddress: '${aws:${self:custom.someObject}}',
+        someObject: {},
+      },
+    };
+    if (configExt) {
+      configuration = _.merge(configuration, configExt);
+    }
+    variablesMeta = resolveMeta(configuration);
+    serverlessInstance = new Serverless({
+      configuration,
+      serviceDir: process.cwd(),
+      configurationFilename: 'serverless.yml',
+      isConfigurationResolved: true,
+      hasResolvedCommandsExternally: true,
+      commands: ['package'],
+      options: {},
+    });
+    serverlessInstance.init();
+    serverlessInstance.getProvider = () => ({
+      constructor: {
+        getProviderName: () => 'aws',
+      },
+      request: async () => {
+        return {
+          Account: '1234567890',
+        };
+      },
+    });
+    await resolve({
+      serviceDir: process.cwd(),
+      configuration,
+      variablesMeta,
+      sources: { self: selfSource, aws: getAwsSource(serverlessInstance) },
+      options: options || {},
+      fulfilledSources: new Set(['self', 'aws']),
+    });
+  };
+
+  it('should resolve `accountId`', async () => {
+    await initializeServerless();
+    expect(configuration.custom.accountId).to.equal('1234567890');
+  });
+
+  it('should report with an error missing address', () =>
+    expect(variablesMeta.get('custom\0missingAddress').error.code).to.equal(
+      'VARIABLE_RESOLUTION_ERROR'
+    ));
+
+  it('should report with an error invalid address', () =>
+    expect(variablesMeta.get('custom\0invalidAddress').error.code).to.equal(
+      'VARIABLE_RESOLUTION_ERROR'
+    ));
+
+  it('should report with an error a non-string address', () =>
+    expect(variablesMeta.get('custom\0nonStringAddress').error.code).to.equal(
+      'VARIABLE_RESOLUTION_ERROR'
+    ));
+
+  it('should resolve ${aws:region}', async () => {
+    // us-east-1 by default
+    await initializeServerless();
+    expect(configuration.custom.region).to.equal('us-east-1');
+    // Resolves to provider.region if it exists
+    await initializeServerless({
+      provider: {
+        region: 'eu-west-1',
+      },
+    });
+    expect(configuration.custom.region).to.equal('eu-west-1');
+    // Resolves to `--region=` if the option is set
+    await initializeServerless(
+      {
+        provider: {
+          region: 'eu-west-1',
+        },
+      },
+      {
+        region: 'eu-central-1',
+      }
+    );
+    expect(configuration.custom.region).to.equal('eu-central-1');
+  });
+});

From 8fc52cdeec51d20addf00b97dcd6513f188cdd91 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 30 Jun 2021 10:49:47 +0200
Subject: [PATCH 0272/1101] ci: Add `node16` to testing matrix

---
 .github/workflows/integrate.yml | 54 ++++++++++++++++++++++++++-------
 .github/workflows/validate.yml  | 54 +++++++++++++++++++++++++++------
 2 files changed, 87 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
index f83c5dd3f30..6ac9e5789ea 100644
--- a/.github/workflows/integrate.yml
+++ b/.github/workflows/integrate.yml
@@ -100,8 +100,8 @@ jobs:
       - name: Unit tests
         run: npm test -- -b
 
-  linuxNode12:
-    name: '[Linux] Node.js 12: Isolated unit tests'
+  linuxNode16:
+    name: '[Linux] Node.js 16: Isolated unit tests'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -114,13 +114,13 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v12-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
-          restore-keys: npm-v12-${{ runner.os }}-${{ github.ref }}-
+          key: npm-v16-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          restore-keys: npm-v16-${{ runner.os }}-${{ github.ref }}-
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 16.x
 
       - name: Install dependencies
         if: steps.cacheNpm.outputs.cache-hit != 'true'
@@ -132,8 +132,8 @@ jobs:
         # Workaround taken from https://github.com/actions/runner/issues/241#issuecomment-577360161
         run: script -e -c "npm run test:isolated -- -b"
 
-  linuxNode10:
-    name: '[Linux] Node.js v10: Unit tests with coverage'
+  linuxNode12:
+    name: '[Linux] Node.js 12: Unit tests with coverage'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -146,13 +146,13 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v10-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
-          restore-keys: npm-v10-${{ runner.os }}-${{ github.ref }}-
+          key: npm-v12-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          restore-keys: npm-v12-${{ runner.os }}-${{ github.ref }}-
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 10.x
+          node-version: 12.x
 
       - name: Install dependencies
         if: steps.cacheNpm.outputs.cache-hit != 'true'
@@ -170,10 +170,42 @@ jobs:
           CODECOV_TOKEN: 3898f3e1-f317-453e-a3a9-0462390f93c5
         run: npx codecov
 
+  linuxNode10:
+    name: '[Linux] Node.js v10: Unit tests'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Retrieve dependencies from cache
+        id: cacheNpm
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.npm
+            node_modules
+          key: npm-v10-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          restore-keys: npm-v10-${{ runner.os }}-${{ github.ref }}-
+
+      - name: Install Node.js and npm
+        uses: actions/setup-node@v1
+        with:
+          node-version: 10.x
+
+      - name: Install dependencies
+        if: steps.cacheNpm.outputs.cache-hit != 'true'
+        run: |
+          npm update --no-save
+          npm update --save-dev --no-save
+      - name: Unit tests
+        # Some tests depend on TTY support, which is missing in GA runner
+        # Workaround taken from https://github.com/actions/runner/issues/241#issuecomment-577360161
+        run: script -e -c "npm test -- -b"
+
   integrate:
     name: Integrate
     runs-on: ubuntu-latest
-    needs: [linuxNode14, windowsNode14, linuxNode12, linuxNode10]
+    needs: [linuxNode14, windowsNode14, linuxNode16, linuxNode12, linuxNode10]
     timeout-minutes: 30 # Default is 360
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 0e1be5766a9..2b8342d6ad0 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -104,8 +104,42 @@ jobs:
       - name: Unit tests
         run: npm test -- -b
 
+  linuxNode16:
+    name: '[Linux] Node.js 16: Isolated unit tests'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Retrieve dependencies from cache
+        id: cacheNpm
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.npm
+            node_modules
+          key: npm-v16-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          restore-keys: |
+            npm-v16-${{ runner.os }}-${{ github.ref }}-
+            npm-v16-${{ runner.os }}-refs/heads/master-
+
+      - name: Install Node.js and npm
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16.x
+
+      - name: Install dependencies
+        if: steps.cacheNpm.outputs.cache-hit != 'true'
+        run: |
+          npm update --no-save
+          npm update --save-dev --no-save
+      - name: Unit tests
+        # Some tests depend on TTY support, which is missing in GA runner
+        # Workaround taken from https://github.com/actions/runner/issues/241#issuecomment-577360161
+        run: script -e -c "npm run test:isolated -- -b"
+
   linuxNode12:
-    name: '[Linux] Node.js 12: Isolated unit tests'
+    name: '[Linux] Node.js 12: Unit tests with coverage'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -136,10 +170,16 @@ jobs:
       - name: Unit tests
         # Some tests depend on TTY support, which is missing in GA runner
         # Workaround taken from https://github.com/actions/runner/issues/241#issuecomment-577360161
-        run: script -e -c "npm run test:isolated -- -b"
+        run: script -e -c "npm run coverage"
+      - name: Push coverage
+        # TODO: Remove inline token, once support for GA is added on Codecov side
+        # See: https://github.com/codecov/codecov-node/issues/118
+        env:
+          CODECOV_TOKEN: 3898f3e1-f317-453e-a3a9-0462390f93c5
+        run: npx codecov
 
   linuxNode10:
-    name: '[Linux] Node.js v10: Unit tests with coverage'
+    name: '[Linux] Node.js v10: Unit tests'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -170,10 +210,4 @@ jobs:
       - name: Unit tests
         # Some tests depend on TTY support, which is missing in GA runner
         # Workaround taken from https://github.com/actions/runner/issues/241#issuecomment-577360161
-        run: script -e -c "npm run coverage"
-      - name: Push coverage
-        # TODO: Remove inline token, once support for GA is added on Codecov side
-        # See: https://github.com/codecov/codecov-node/issues/118
-        env:
-          CODECOV_TOKEN: 3898f3e1-f317-453e-a3a9-0462390f93c5
-        run: npx codecov
+        run: script -e -c "npm test -- -b"

From 6a020d121ff2dacd6ad62a824964944ae391a662 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 30 Jun 2021 15:03:37 +0200
Subject: [PATCH 0273/1101] fix(Templates): Adjust `runtime` for
 `openwhisk-python` template

---
 lib/plugins/create/templates/openwhisk-python/serverless.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/create/templates/openwhisk-python/serverless.yml b/lib/plugins/create/templates/openwhisk-python/serverless.yml
index 6124ffba322..8432a4e6b9f 100644
--- a/lib/plugins/create/templates/openwhisk-python/serverless.yml
+++ b/lib/plugins/create/templates/openwhisk-python/serverless.yml
@@ -17,7 +17,7 @@ service: openwhisk-python # NOTE: update this with your service name
 # $ npm install
 provider:
   name: openwhisk
-  runtime: python
+  runtime: python:3
 
 functions:
   hello:

From ac03d832896eec26773e5ce06c22c249d240a9ed Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 30 Jun 2021 15:42:46 +0200
Subject: [PATCH 0274/1101] refactor(Telemetry): Include `commandUsage` in case
 of error

---
 lib/cli/handle-error.js                       |  1 +
 lib/cli/interactive-setup/index.js            | 59 +++++++++++--------
 lib/utils/tokenize-exception.js               |  1 +
 .../lib/cli/interactive-setup/index.test.js   | 20 +++++++
 .../unit/lib/utils/tokenize-exception.test.js |  7 +++
 5 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index e925a770f18..20145434d57 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -180,6 +180,7 @@ module.exports = async (exception, options = {}) => {
         serviceDir,
         configuration,
         serverless,
+        commandUsage: exceptionTokens.commandUsage,
       });
       const failureReason = {
         kind: isUserError ? 'user' : 'programmer',
diff --git a/lib/cli/interactive-setup/index.js b/lib/cli/interactive-setup/index.js
index c53ee3efbd1..32530773c49 100644
--- a/lib/cli/interactive-setup/index.js
+++ b/lib/cli/interactive-setup/index.js
@@ -11,34 +11,45 @@ const steps = {
   deploy: require('./deploy'),
 };
 
-module.exports = async (context) => {
-  context = { ...context, inquirer, history: new Map() };
-  const stepsDetails = new Map();
-  for (const [stepName, step] of Object.entries(steps)) {
-    delete context.stepHistory;
-    delete context.inapplicabilityReasonCode;
-    const stepData = await step.isApplicable(context);
-    stepsDetails.set(stepName, {
-      isApplicable: Boolean(stepData),
-      inapplicabilityReasonCode: context.inapplicabilityReasonCode,
-      timestamp: Date.now(),
-      configuredQuestions: step.configuredQuestions,
-    });
-    if (stepData) {
-      process.stdout.write('\n');
-      context.stepHistory = new StepHistory();
-      context.history.set(stepName, context.stepHistory);
-      await step.run(context, stepData);
-    }
-  }
-
-  const commandUsage = Array.from(stepsDetails.entries()).map(([step, stepDetails]) => {
-    const stepHistory = context.history.get(step);
+const generateCommandUsage = (stepsDetails, history) => {
+  return Array.from(stepsDetails.entries()).map(([step, stepDetails]) => {
+    const stepHistory = history.get(step);
     return {
       name: step,
       ...stepDetails,
       history: stepHistory ? stepHistory.toJSON() : [],
     };
   });
-  return { commandUsage, configuration: context.configuration };
+};
+
+module.exports = async (context) => {
+  context = { ...context, inquirer, history: new Map() };
+  const stepsDetails = new Map();
+  try {
+    for (const [stepName, step] of Object.entries(steps)) {
+      delete context.stepHistory;
+      delete context.inapplicabilityReasonCode;
+      const stepData = await step.isApplicable(context);
+      stepsDetails.set(stepName, {
+        isApplicable: Boolean(stepData),
+        inapplicabilityReasonCode: context.inapplicabilityReasonCode,
+        timestamp: Date.now(),
+        configuredQuestions: step.configuredQuestions,
+      });
+      if (stepData) {
+        process.stdout.write('\n');
+        context.stepHistory = new StepHistory();
+        context.history.set(stepName, context.stepHistory);
+        await step.run(context, stepData);
+      }
+    }
+  } catch (err) {
+    err.commandUsage = generateCommandUsage(stepsDetails, context.history);
+    throw err;
+  }
+
+  return {
+    commandUsage: generateCommandUsage(stepsDetails, context.history),
+    configuration: context.configuration,
+  };
 };
diff --git a/lib/utils/tokenize-exception.js b/lib/utils/tokenize-exception.js
index 7b1266d80b4..528609cf9f0 100644
--- a/lib/utils/tokenize-exception.js
+++ b/lib/utils/tokenize-exception.js
@@ -14,6 +14,7 @@ module.exports = (exception) => {
       message: exception.message,
       isUserError: userErrorNames.has(exception.name),
       code: exception.code,
+      commandUsage: exception.commandUsage,
     };
   }
   return {
diff --git a/test/unit/lib/cli/interactive-setup/index.test.js b/test/unit/lib/cli/interactive-setup/index.test.js
index a55d0267a4a..a615538230e 100644
--- a/test/unit/lib/cli/interactive-setup/index.test.js
+++ b/test/unit/lib/cli/interactive-setup/index.test.js
@@ -4,6 +4,12 @@
 
 const spawn = require('child-process-ext/spawn');
 const path = require('path');
+const proxyquire = require('proxyquire');
+const chai = require('chai');
+
+const { expect } = chai;
+
+chai.use(require('chai-as-promised'));
 
 const serverlessPath = path.resolve(__dirname, '../../../../../scripts/serverless.js');
 const templatesPath = path.resolve(__dirname, '../../../../../lib/plugins/create/templates');
@@ -73,4 +79,18 @@ describe('test/unit/lib/cli/interactive-setup/index.test.js', () => {
 
     await slsProcessPromise;
   });
+
+  it('should attach `commandUsage` to thrown error', async () => {
+    const mockedInteractiveSetup = proxyquire('../../../../../lib/cli/interactive-setup', {
+      './service': {
+        isApplicable: () => {
+          throw new Error('Error during processing');
+        },
+      },
+    });
+
+    await expect(mockedInteractiveSetup({})).to.be.eventually.rejected.and.have.property(
+      'commandUsage'
+    );
+  });
 });
diff --git a/test/unit/lib/utils/tokenize-exception.test.js b/test/unit/lib/utils/tokenize-exception.test.js
index 0e763f5da91..41df259da21 100644
--- a/test/unit/lib/utils/tokenize-exception.test.js
+++ b/test/unit/lib/utils/tokenize-exception.test.js
@@ -31,4 +31,11 @@ describe('test/unit/lib/utils/tokenize-exception.test.js', () => {
     expect(errorTokens.message).to.equal('null');
     expect(errorTokens.isUserError).to.equal(false);
   });
+
+  it('Should tokenize error with `commandUsage`', () => {
+    const err = new ServerlessError('Some error', 'ERR_CODE');
+    err.commandUsage = [];
+    const errorTokens = tokenizeError(err);
+    expect(errorTokens.commandUsage).to.deep.equal([]);
+  });
 });

From be083237cdc6039dea216ea7b4aa40764ff3b5b4 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 30 Jun 2021 16:02:54 +0200
Subject: [PATCH 0275/1101] ci: Remove explicit `CODECOV_TOKEN`

---
 .github/workflows/integrate.yml | 4 ----
 .github/workflows/validate.yml  | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
index 6ac9e5789ea..17e0f3feee6 100644
--- a/.github/workflows/integrate.yml
+++ b/.github/workflows/integrate.yml
@@ -164,10 +164,6 @@ jobs:
         # Workaround taken from https://github.com/actions/runner/issues/241#issuecomment-577360161
         run: script -e -c "npm run coverage"
       - name: Push coverage
-        # TODO: Remove inline token, once support for GA is added on Codecov side
-        # See: https://github.com/codecov/codecov-node/issues/118
-        env:
-          CODECOV_TOKEN: 3898f3e1-f317-453e-a3a9-0462390f93c5
         run: npx codecov
 
   linuxNode10:
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 2b8342d6ad0..db763c01e99 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -172,10 +172,6 @@ jobs:
         # Workaround taken from https://github.com/actions/runner/issues/241#issuecomment-577360161
         run: script -e -c "npm run coverage"
       - name: Push coverage
-        # TODO: Remove inline token, once support for GA is added on Codecov side
-        # See: https://github.com/codecov/codecov-node/issues/118
-        env:
-          CODECOV_TOKEN: 3898f3e1-f317-453e-a3a9-0462390f93c5
         run: npx codecov
 
   linuxNode10:

From 7264d1672e93fdb1046cf7ebe859b607c80e31ca Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 30 Jun 2021 13:42:25 +0200
Subject: [PATCH 0276/1101] refactor(Telemetry): Increase error location
 coverage

---
 lib/utils/telemetry/resolve-error-location.js    |  4 ++--
 .../telemetry/resolve-error-location.test.js     | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/lib/utils/telemetry/resolve-error-location.js b/lib/utils/telemetry/resolve-error-location.js
index 3b5ebb400df..48255f771a1 100644
--- a/lib/utils/telemetry/resolve-error-location.js
+++ b/lib/utils/telemetry/resolve-error-location.js
@@ -14,8 +14,8 @@ const resolveErrorLocation = (exceptionTokens) => {
     const match = line.match(stacktraceLineRegex) || [];
     const matchedPath = match[1] || match[2];
     if (matchedPath) {
-      // Limited to maximum 5 lines in location
-      if (stacktracePaths.push(matchedPath) === 5) break;
+      // Limited to maximum 7 lines in location
+      if (stacktracePaths.push(matchedPath) === 7) break;
     } else if (stacktracePaths.length) break;
   }
 
diff --git a/test/unit/lib/utils/telemetry/resolve-error-location.test.js b/test/unit/lib/utils/telemetry/resolve-error-location.test.js
index bca95eb6a45..3467eb44128 100644
--- a/test/unit/lib/utils/telemetry/resolve-error-location.test.js
+++ b/test/unit/lib/utils/telemetry/resolve-error-location.test.js
@@ -57,7 +57,7 @@ describe('test/unit/lib/utils/resolve-error-location.test.js', () => {
       );
     });
 
-    it('should return at most 5 lines', () => {
+    it('should return at most 7 lines', () => {
       const err = new Error('test');
       err.stack =
         'Error:\n' +
@@ -66,6 +66,10 @@ describe('test/unit/lib/utils/resolve-error-location.test.js', () => {
         '    at Test.Runnable.run (/home/xxx/serverless/node_modules/mocha/lib/runnable.js:354:5)\n' +
         '    at Runner.runTest (/home/xxx/serverless/node_modules/mocha/lib/runner.js:677:10)\n' +
         '    at next (/home/xxx/serverless/node_modules/mocha/lib/runner.js:801:12)\n' +
+        '    at next (/home/xxx/serverless/node_modules/mocha/lib/runner.js:802:12)\n' +
+        '    at next (/home/xxx/serverless/node_modules/mocha/lib/runner.js:803:12)\n' +
+        '    at next (/home/xxx/serverless/node_modules/mocha/lib/runner.js:804:12)\n' +
+        '    at next (/home/xxx/serverless/node_modules/mocha/lib/runner.js:805:12)\n' +
         '    at next (/home/xxx/serverless/node_modules/mocha/lib/runner.js:594:14)\n';
       const result = resolveErrorLocation(tokenizeException(err));
       expect(result).to.equal(
@@ -75,6 +79,8 @@ describe('test/unit/lib/utils/resolve-error-location.test.js', () => {
           '^:354:5',
           '/node_modules/mocha/lib/runner.js:677:10',
           '^:801:12',
+          '^:802:12',
+          '^:803:12',
         ].join('\n')
       );
     });
@@ -101,7 +107,7 @@ describe('test/unit/lib/utils/resolve-error-location.test.js', () => {
       );
     });
 
-    it('should return at most 5 lines and use `/` path separator', () => {
+    it('should return at most 7 lines and use `/` path separator', () => {
       const err = new Error('test');
       err.stack =
         'Error:\n' +
@@ -110,6 +116,10 @@ describe('test/unit/lib/utils/resolve-error-location.test.js', () => {
         '    at Test.Runnable.run (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runnable.js:354:5)\r\n' +
         '    at Runner.runTest (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:677:10)\r\n' +
         '    at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:801:12)\r\n' +
+        '    at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:802:12)\r\n' +
+        '    at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:803:12)\r\n' +
+        '    at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:804:12)\r\n' +
+        '    at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:805:12)\r\n' +
         '    at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:594:14)\r\n';
       const result = resolveErrorLocation(tokenizeException(err));
       expect(result).to.equal(
@@ -119,6 +129,8 @@ describe('test/unit/lib/utils/resolve-error-location.test.js', () => {
           '^:354:5',
           '/node_modules/mocha/lib/runner.js:677:10',
           '^:801:12',
+          '^:802:12',
+          '^:803:12',
         ].join('\n')
       );
     });

From 004ba08bd904611ca1f5f429a92610bde89879a9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 30 Jun 2021 13:42:44 +0200
Subject: [PATCH 0277/1101] test: Fix test title

---
 test/unit/lib/utils/telemetry/resolve-error-location.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/lib/utils/telemetry/resolve-error-location.test.js b/test/unit/lib/utils/telemetry/resolve-error-location.test.js
index 3467eb44128..f7baf402974 100644
--- a/test/unit/lib/utils/telemetry/resolve-error-location.test.js
+++ b/test/unit/lib/utils/telemetry/resolve-error-location.test.js
@@ -5,7 +5,7 @@ const expect = require('chai').expect;
 const resolveErrorLocation = require('../../../../../lib/utils/telemetry/resolve-error-location');
 const tokenizeException = require('../../../../../lib/utils/tokenize-exception');
 
-describe('test/unit/lib/utils/resolve-error-location.test.js', () => {
+describe('test/unit/lib/utils/telemetry/resolve-error-location.test.js', () => {
   it('should be null when stack missing', () => {
     const err = new Error('test');
     delete err.stack;

From 01439b4f51063995bbdd3f691eb156745f003b34 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 30 Jun 2021 13:59:22 +0200
Subject: [PATCH 0278/1101] test(Telemetry): Optimize to not rely
 `runServerless` when not needed

---
 .../utils/telemetry/generatePayload.test.js   | 111 ++++--------------
 1 file changed, 25 insertions(+), 86 deletions(-)

diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index 7aadfc03535..1c95397177f 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -268,16 +268,12 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should resolve service-agnostic payload', async () => {
-    const { serverless } = await runServerless({
-      fixture: 'aws',
-      command: 'config',
-    });
     const payload = await generatePayload({
       command: 'config',
       options: {},
       commandSchema: commandsSchema.get('config'),
-      serviceDir: serverless.serviceDir,
-      configuration: serverless.configurationInput,
+      serviceDir: process.cwd(),
+      configuration: { service: 'foo', provider: 'aws' },
     });
 
     expect(payload).to.have.property('frameworkLocalUserId');
@@ -307,16 +303,12 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should resolve service-agnostic payload for command with `serviceDependencyMode: "optional"`', async () => {
-    const { serverless } = await runServerless({
-      fixture: 'httpApi',
-      command: 'print',
-    });
     const payload = await generatePayload({
       command: '',
       options: {},
       commandSchema: commandsSchema.get(''),
-      serviceDir: serverless.serviceDir,
-      configuration: serverless.configurationInput,
+      serviceDir: process.cwd(),
+      configuration: { service: 'foo', provider: 'aws' },
     });
 
     expect(payload).to.have.property('frameworkLocalUserId');
@@ -345,12 +337,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
           region: 'us-east-1',
         },
         plugins: [],
-        functions: [
-          { runtime: 'nodejs12.x', events: [{ type: 'httpApi' }, { type: 'httpApi' }] },
-          { runtime: 'nodejs12.x', events: [{ type: 'httpApi' }] },
-          { runtime: 'nodejs12.x', events: [] },
-          { runtime: 'nodejs12.x', events: [] },
-        ],
+        functions: [],
         resources: { general: [] },
       },
       isAutoUpdateEnabled: false,
@@ -363,7 +350,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     });
   });
 
-  it('Should correctly resolve payload with missing `serverless` instance', async () => {
+  it('Should correctly resolve payload with missing service configuration', async () => {
     const payload = await generatePayload({
       command: 'plugin list',
       options: {},
@@ -397,11 +384,6 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should resolve payload with predefined local config', async () => {
-    const { serverless } = await runServerless({
-      fixture: 'customProvider',
-      command: 'config',
-    });
-
     await fs.promises.writeFile(
       path.resolve(os.homedir(), '.serverlessrc'),
       JSON.stringify({
@@ -417,8 +399,8 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       command: 'config',
       options: {},
       commandSchema: commandsSchema.get('config'),
-      serviceDir: serverless.serviceDir,
-      configuration: serverless.configurationInput,
+      serviceDir: process.cwd(),
+      configuration: { service: 'foo', provider: 'aws' },
     });
     expect(payload.dashboard.userId).to.equal('some-user-id');
     expect(payload.frameworkLocalUserId).to.equal('123');
@@ -426,12 +408,6 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should not include userId from local config if SERVERLESS_ACCESS_KEY used', async () => {
-    const { serverless } = await runServerless({
-      fixture: 'customProvider',
-      command: 'config',
-      commandOptionNames: [],
-    });
-
     await fs.promises.writeFile(
       path.resolve(os.homedir(), '.serverlessrc'),
       JSON.stringify({
@@ -447,8 +423,8 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
         command: 'config',
         options: {},
         commandSchema: commandsSchema.get('config'),
-        serviceDir: serverless.serviceDir,
-        configuration: serverless.configurationInput,
+        serviceDir: process.cwd(),
+        configuration: { service: 'foo', provider: 'aws' },
       });
     });
     expect(payload.dashboard.userId).to.be.null;
@@ -456,11 +432,6 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should correctly detect Serverless CI/CD', async () => {
-    const { serverless } = await runServerless({
-      fixture: 'customProvider',
-      command: 'config',
-    });
-
     let payload;
 
     await overrideEnv({ variables: { SERVERLESS_CI_CD: 'true' } }, async () => {
@@ -468,20 +439,14 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
         command: 'config',
         options: {},
         commandSchema: commandsSchema.get('config'),
-        serviceDir: serverless.serviceDir,
-        configuration: serverless.configurationInput,
+        serviceDir: process.cwd(),
+        configuration: { service: 'foo', provider: 'aws' },
       });
     });
     expect(payload.ciName).to.equal('Serverless CI/CD');
   });
 
   it('Should correctly detect Seed CI/CD', async () => {
-    const { serverless } = await runServerless({
-      fixture: 'customProvider',
-      command: 'config',
-      commandOptionNames: [],
-    });
-
     let payload;
 
     await overrideEnv({ variables: { SEED_APP_NAME: 'some-app' } }, async () => {
@@ -489,23 +454,14 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
         command: 'config',
         options: {},
         commandSchema: commandsSchema.get('config'),
-        serviceDir: serverless.serviceDir,
-        configuration: serverless.configurationInput,
+        serviceDir: process.cwd(),
+        configuration: { service: 'foo', provider: 'aws' },
       });
     });
     expect(payload.ciName).to.equal('Seed');
   });
 
   it('Should correctly resolve `commandOptionNames` property', async () => {
-    const { serverless } = await runServerless({
-      fixture: 'httpApi',
-      command: 'print',
-      options: {
-        region: 'eu-west-1',
-        format: 'json',
-        path: 'provider.name',
-      },
-    });
     const payload = await generatePayload({
       command: 'print',
       options: {
@@ -514,8 +470,8 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
         path: 'provider.name',
       },
       commandSchema: commandsSchema.get('print'),
-      serviceDir: serverless.serviceDir,
-      configuration: serverless.configurationInput,
+      serviceDir: process.cwd(),
+      configuration: { service: 'foo', provider: 'aws' },
     });
 
     expect(new Set(payload.commandOptionNames)).to.deep.equal(
@@ -524,17 +480,14 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should correctly resolve `constructs` property', async () => {
-    const { serverless } = await runServerless({
-      fixture: 'httpApi',
-      command: 'print',
-    });
     const payload = await generatePayload({
       command: 'print',
       commandSchema: commandsSchema.get('print'),
       options: {},
-      serviceDir: serverless.serviceDir,
+      serviceDir: process.cwd(),
       configuration: {
-        ...serverless.configurationInput,
+        service: 'foo',
+        provider: 'aws',
         constructs: {
           jobs: {
             type: 'queue',
@@ -563,11 +516,6 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should correctly resolve `hasLocalCredentials` property for AWS provider', async () => {
-    const { serverless } = await runServerless({
-      fixture: 'httpApi',
-      command: 'print',
-    });
-
     let payload;
     await overrideEnv(
       { variables: { AWS_ACCESS_KEY_ID: 'someaccesskey', AWS_SECRET_ACCESS_KEY: 'secretkey' } },
@@ -576,8 +524,8 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
           command: 'print',
           options: {},
           commandSchema: commandsSchema.get('print'),
-          serviceDir: serverless.serviceDir,
-          configuration: serverless.configurationInput,
+          serviceDir: process.cwd(),
+          configuration: { service: 'foo', provider: 'aws' },
         });
       }
     );
@@ -586,11 +534,6 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should correctly resolve `hasLocalCredentials` property for non-AWS provider', async () => {
-    const { serverless } = await runServerless({
-      fixture: 'customProvider',
-      command: 'print',
-    });
-
     let payload;
     await overrideEnv(
       { variables: { AWS_ACCESS_KEY_ID: 'someaccesskey', AWS_SECRET_ACCESS_KEY: 'secretkey' } },
@@ -599,8 +542,8 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
           command: 'print',
           options: {},
           commandSchema: commandsSchema.get('print'),
-          serviceDir: serverless.serviceDir,
-          configuration: serverless.configurationInput,
+          serviceDir: process.cwd(),
+          configuration: { service: 'foo', provider: 'other' },
         });
       }
     );
@@ -609,16 +552,12 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should correctly resolve `commandUsage` property', async () => {
-    const { serverless } = await runServerless({
-      fixture: 'httpApi',
-      command: 'print',
-    });
     const payload = await generatePayload({
       command: 'print',
       options: {},
       commandSchema: commandsSchema.get('print'),
-      serviceDir: serverless.serviceDir,
-      configuration: serverless.configurationInput,
+      serviceDir: process.cwd(),
+      configuration: { service: 'foo', provider: 'aws' },
       commandUsage: [
         {
           name: 'firstStep',

From 8e2d48fee5a471a960b6a7b55cbd12edc5eb07e6 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 30 Jun 2021 14:03:27 +0200
Subject: [PATCH 0279/1101] feat(Telemetry): Report `configValidationMode`

---
 lib/utils/telemetry/generatePayload.js        |  6 ++++++
 .../utils/telemetry/generatePayload.test.js   | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index 934d4ee87c0..5c701909d55 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -16,6 +16,8 @@ const resolveIsLocallyInstalled = require('../../utils/is-locally-installed');
 const ci = require('ci-info');
 const AWS = require('aws-sdk');
 
+const configValidationModeValues = new Set(['off', 'warn', 'error']);
+
 const checkIsTabAutocompletionInstalled = async () => {
   try {
     return (await fs.readdir(path.resolve(os.homedir(), '.config/tabtab'))).some((filename) =>
@@ -73,6 +75,10 @@ const getServiceConfig = ({ configuration, options }) => {
     : [];
 
   const result = {
+    // TODO: Update when upgrading the default for next major
+    configValidationMode: configValidationModeValues.has(configuration.configValidationMode)
+      ? configuration.configValidationMode
+      : 'warn',
     provider: {
       name: providerName,
       runtime: defaultRuntime,
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index 1c95397177f..d0b919ba4e2 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -120,6 +120,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       command: 'print',
       commandOptionNames: [],
       config: {
+        configValidationMode: 'error',
         provider: {
           name: 'aws',
           runtime: 'nodejs14.x',
@@ -181,6 +182,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       command: 'print',
       commandOptionNames: [],
       config: {
+        configValidationMode: 'warn',
         provider: {
           name: 'customProvider',
           runtime: 'foo',
@@ -243,6 +245,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       command: 'print',
       commandOptionNames: [],
       config: {
+        configValidationMode: 'error',
         provider: {
           name: 'aws',
           runtime: 'nodejs12.x',
@@ -330,6 +333,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       commandOptionNames: [],
       cliName: 'serverless',
       config: {
+        configValidationMode: 'warn',
         provider: {
           name: 'aws',
           runtime: 'nodejs12.x',
@@ -515,6 +519,21 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     ]);
   });
 
+  it('Should correctly resolve `configValidationMode` property', async () => {
+    const payload = await generatePayload({
+      command: 'print',
+      commandSchema: commandsSchema.get('print'),
+      options: {},
+      serviceDir: process.cwd(),
+      configuration: {
+        service: 'foo',
+        provider: 'aws',
+        configValidationMode: 'off',
+      },
+    });
+    expect(payload.config.configValidationMode).to.equal('off');
+  });
+
   it('Should correctly resolve `hasLocalCredentials` property for AWS provider', async () => {
     let payload;
     await overrideEnv(

From 01f158695b22d721320a77a9a0b68b166c63dc3f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 30 Jun 2021 16:49:16 +0200
Subject: [PATCH 0280/1101] feat(Telemetry): Report configuration validation
 result

---
 lib/classes/ConfigSchemaHandler/index.js             | 12 ++++++++++++
 lib/utils/telemetry/generatePayload.js               |  2 ++
 .../lib/classes/ConfigSchemaHandler/index.test.js    |  8 ++++++--
 .../unit/lib/utils/telemetry/generatePayload.test.js |  4 ++++
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/lib/classes/ConfigSchemaHandler/index.js b/lib/classes/ConfigSchemaHandler/index.js
index c81372523ce..b1c8ac40dfd 100644
--- a/lib/classes/ConfigSchemaHandler/index.js
+++ b/lib/classes/ConfigSchemaHandler/index.js
@@ -2,6 +2,7 @@
 
 const Ajv = require('ajv');
 const _ = require('lodash');
+const ensurePlainObject = require('type/plain-object/ensure');
 const schema = require('../../configSchema');
 const ServerlessError = require('../../serverless-error');
 const normalizeAjvErrors = require('./normalizeAjvErrors');
@@ -56,6 +57,8 @@ const denormalizeUserConfig = (userConfig, { removedValuesMap }) => {
   }
 };
 
+const configurationValidationResults = new WeakMap();
+
 class ConfigSchemaHandler {
   constructor(serverless) {
     this.serverless = serverless;
@@ -67,8 +70,14 @@ class ConfigSchemaHandler {
     deepFreeze(this.schema.properties.package);
   }
 
+  static getConfigurationValidationResult(configuration) {
+    if (!configurationValidationResults.has(ensurePlainObject(configuration))) return null;
+    return configurationValidationResults.get(ensurePlainObject(configuration));
+  }
+
   validateConfig(userConfig) {
     if (!this.schema.properties.provider.properties.name) {
+      configurationValidationResults.set(this.serverless.configurationInput, false);
       if (this.serverless.service.configValidationMode !== 'off') {
         this.serverless.cli.log(
           `${WARNING_PREFIX}: Unrecognized provider '${this.serverless.service.provider.name}'`,
@@ -108,6 +117,9 @@ class ConfigSchemaHandler {
     const denormalizeOptions = normalizeUserConfig(userConfig);
     validate(userConfig);
     denormalizeUserConfig(userConfig, denormalizeOptions);
+    if (!configurationValidationResults.has(this.serverless.configurationInput)) {
+      configurationValidationResults.set(this.serverless.configurationInput, !validate.errors);
+    }
     if (validate.errors && this.serverless.service.configValidationMode !== 'off') {
       const messages = normalizeAjvErrors(validate.errors).map((err) => err.message);
       this.handleErrorMessages(messages);
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index 5c701909d55..3678d8f50f3 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -9,6 +9,7 @@ const isPlainObject = require('type/plain-object/is');
 const isObject = require('type/object/is');
 const userConfig = require('@serverless/utils/config');
 const isStandalone = require('../isStandaloneExecutable');
+const { getConfigurationValidationResult } = require('../../classes/ConfigSchemaHandler');
 const { triggeredDeprecations } = require('../logDeprecation');
 const isNpmGlobal = require('../npmPackage/isGlobal');
 const resolveLocalServerlessPath = require('../../cli/resolve-local-serverless-path');
@@ -279,6 +280,7 @@ module.exports = async ({
     payload.hasLocalCredentials = isAwsProvider && Boolean(new AWS.Config().credentials);
     payload.npmDependencies = npmDependencies;
     payload.config = getServiceConfig({ configuration, options });
+    payload.isConfigValid = getConfigurationValidationResult(configuration);
     payload.dashboard.orgUid = serverless && serverless.service.orgUid;
   }
 
diff --git a/test/unit/lib/classes/ConfigSchemaHandler/index.test.js b/test/unit/lib/classes/ConfigSchemaHandler/index.test.js
index c0ab6fa5935..75896d41417 100644
--- a/test/unit/lib/classes/ConfigSchemaHandler/index.test.js
+++ b/test/unit/lib/classes/ConfigSchemaHandler/index.test.js
@@ -2,6 +2,9 @@
 
 const chai = require('chai');
 const runServerless = require('../../../../utils/run-serverless');
+const {
+  getConfigurationValidationResult,
+} = require('../../../../../lib/classes/ConfigSchemaHandler');
 
 chai.use(require('chai-as-promised'));
 
@@ -69,11 +72,12 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
   });
 
   describe('#validateConfig', () => {
-    it('should run without errors for valid config', () => {
-      return runServerless({
+    it('should run without errors for valid config', async () => {
+      const { serverless } = await runServerless({
         fixture: 'configSchemaExtensions',
         command: 'info',
       });
+      expect(getConfigurationValidationResult(serverless.configurationInput)).to.be.true;
     });
   });
 
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index d0b919ba4e2..411525068ca 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -119,6 +119,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       cliName: 'serverless',
       command: 'print',
       commandOptionNames: [],
+      isConfigValid: true,
       config: {
         configValidationMode: 'error',
         provider: {
@@ -181,6 +182,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       cliName: 'serverless',
       command: 'print',
       commandOptionNames: [],
+      isConfigValid: false, // No schema for custom provider
       config: {
         configValidationMode: 'warn',
         provider: {
@@ -244,6 +246,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       cliName: 'serverless',
       command: 'print',
       commandOptionNames: [],
+      isConfigValid: null,
       config: {
         configValidationMode: 'error',
         provider: {
@@ -332,6 +335,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       command: '',
       commandOptionNames: [],
       cliName: 'serverless',
+      isConfigValid: null,
       config: {
         configValidationMode: 'warn',
         provider: {

From 381638c8e6c73d28dc4bdcd5a2803a34719f5a24 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 1 Jul 2021 09:22:25 +0200
Subject: [PATCH 0281/1101] chore: Bump dependencies

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 50fdee11c2c..1fcb6666d23 100644
--- a/package.json
+++ b/package.json
@@ -23,13 +23,13 @@
   },
   "dependencies": {
     "@serverless/cli": "^1.5.2",
-    "@serverless/components": "^3.12.0",
+    "@serverless/components": "^3.13.1",
     "@serverless/dashboard-plugin": "^5.4.3",
     "@serverless/utils": "^5.3.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.936.0",
+    "aws-sdk": "^2.937.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
@@ -43,7 +43,7 @@
     "dotenv": "^10.0.0",
     "essentials": "^1.1.1",
     "fastest-levenshtein": "^1.0.12",
-    "filesize": "^6.3.0",
+    "filesize": "^6.4.0",
     "fs-extra": "^9.1.0",
     "get-stdin": "^8.0.0",
     "globby": "^11.0.4",

From a7b9a2556cbe5ffb124e69702f5dde62fba47443 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 1 Jul 2021 09:34:35 +0200
Subject: [PATCH 0282/1101] chore: Release 2.50.0

---
 CHANGELOG.md | 31 +++++++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0157093df38..d60e50b5943 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,37 @@
 
 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.
 
+## [2.50.0](https://github.com/serverless/serverless/compare/v2.49.0...v2.50.0) (2021-07-01)
+
+### Features
+
+- **AWS Lambda:** Support `Fn::If` for `Principal.AWS` ([#9664](https://github.com/serverless/serverless/pull/9664)) ([894ac5b](https://github.com/serverless/serverless/commit/894ac5b6b67eb384dbc29b927161121679afce2d)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS Deploy:** Deprecate `function` option in `deploy` command ([#9364](https://github.com/serverless/serverless/pull/9364)) ([d861d11](https://github.com/serverless/serverless/commit/d861d119ef94baaaa266934783e00a50182d7434)) ([Jaakko Lappalainen](https://github.com/jkklapp) & [Piotr Grzesik](https://github.com/pgrzesik))
+- **Variables:**
+  - Resolve vars in strings which are subject to be joined ([#9657](https://github.com/serverless/serverless/pull/9657)) ([0e3db01](https://github.com/serverless/serverless/commit/0e3db01db8aeb08b03a98dd7f58a09b66ec8c49e)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Support `aws:region` and `aws:accountId` variables ([#9662](https://github.com/serverless/serverless/pull/9662)) ([33794ea](https://github.com/serverless/serverless/commit/33794ea504e714912137796009c29c802f2e24f0)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Support variables across file address resolution ([#9657](https://github.com/serverless/serverless/pull/9657)) ([80b7640](https://github.com/serverless/serverless/commit/80b76406ac305ccb7e55cabd0bd39be6ac7c67c6)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **AWS Deploy:** Meaningfully report inaccessible file artifacts ([#9668](https://github.com/serverless/serverless/pull/9668)) ([23c290e](https://github.com/serverless/serverless/commit/23c290e4b4049242d62cfb57f4be6aadff6aecf8)) ([Mariusz Nowak](https://github.com/medikoo))
+- **AWS Local Invocation:** Fix error handling of invalid file content ([#9667](https://github.com/serverless/serverless/pull/9667)) ([e836722](https://github.com/serverless/serverless/commit/e836722f976af98eb69fc6d3a85781bb7434dfac)) ([Mariusz Nowak](https://github.com/medikoo))
+- **CLI Onboarding:**
+  - Do not attempt local fallback during onboarding ([#9660](https://github.com/serverless/serverless/pull/9660)) ([ae5be0f](https://github.com/serverless/serverless/commit/ae5be0f5dafaad933000e98142fcb1ec60e04555)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Only call `handleError` if plugin defined ([#9659](https://github.com/serverless/serverless/pull/9659)) ([a80681f](https://github.com/serverless/serverless/commit/a80681ffbf23391cb31d34b8eecaef310d9599a3)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Maintenance Improvements
+
+- **Telemetry:**
+  - Include `commandUsage` in case of error ([#9671](https://github.com/serverless/serverless/pull/9671)) ([ac03d83](https://github.com/serverless/serverless/commit/ac03d832896eec26773e5ce06c22c249d240a9ed)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Increase error location coverage ([#9669](https://github.com/serverless/serverless/pull/9669)) ([7264d16](https://github.com/serverless/serverless/commit/7264d1672e93fdb1046cf7ebe859b607c80e31ca)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Report `configValidationMode` ([#9669](https://github.com/serverless/serverless/pull/9669)) ([8e2d48f](https://github.com/serverless/serverless/commit/8e2d48fee5a471a960b6a7b55cbd12edc5eb07e6)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Report configuration validation result ([#9669](https://github.com/serverless/serverless/pull/9669)) ([01f1586](https://github.com/serverless/serverless/commit/01f158695b22d721320a77a9a0b68b166c63dc3f)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Templates
+
+- Adjust `runtime` for `openwhisk-python` template ([#9670](https://github.com/serverless/serverless/pull/9670)) ([6a020d1](https://github.com/serverless/serverless/commit/6a020d121ff2dacd6ad62a824964944ae391a662)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
 ## [2.49.0](https://github.com/serverless/serverless/compare/v2.48.1...v2.49.0) (2021-06-29)
 
 ### Features
diff --git a/package.json b/package.json
index 1fcb6666d23..db9bc94489a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.49.0",
+  "version": "2.50.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 151e98f585014faf7e4372ee9bcfe8d1649345b2 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 1 Jul 2021 13:04:34 +0200
Subject: [PATCH 0283/1101] test: When testing plugins load only tested plugin

---
 test/fixtures/programmatic/curated-plugins/serverless.yml | 3 ---
 test/integration/curated-plugins.test.js                  | 6 +++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/fixtures/programmatic/curated-plugins/serverless.yml b/test/fixtures/programmatic/curated-plugins/serverless.yml
index c23569a22e7..f92c01733fd 100644
--- a/test/fixtures/programmatic/curated-plugins/serverless.yml
+++ b/test/fixtures/programmatic/curated-plugins/serverless.yml
@@ -18,6 +18,3 @@ functions:
       - http:
           path: foo
           method: POST
-
-plugins:
-  - serverless-offline
diff --git a/test/integration/curated-plugins.test.js b/test/integration/curated-plugins.test.js
index 825329b7cb1..a81ef7db0ea 100644
--- a/test/integration/curated-plugins.test.js
+++ b/test/integration/curated-plugins.test.js
@@ -11,11 +11,15 @@ describe('test/integration/curated-plugins.test.js', function () {
   this.timeout(1000 * 60 * 10); // Involves time-taking npm install
 
   let serviceDir;
+  let updateConfig;
   before(async () => {
-    serviceDir = (await fixturesEngine.setup('curated-plugins')).servicePath;
+    ({ servicePath: serviceDir, updateConfig } = await fixturesEngine.setup('curated-plugins'));
   });
 
+  afterEach(async () => updateConfig({ plugins: null }));
+
   it('should be extended by "serverless-offline"', async () => {
+    await updateConfig({ plugins: ['serverless-offline'] });
     const slsProcessPromise = spawn(serverlessExec, ['offline'], {
       cwd: serviceDir,
     });

From 73f15d93b37d85c403d9e772860df5699febc9da Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 1 Jul 2021 13:06:26 +0200
Subject: [PATCH 0284/1101] test: Test `serverless-webpack`

---
 .../programmatic/curated-plugins/package.json |  4 +++-
 .../curated-plugins/webpack.config.js         |  3 +++
 test/integration/curated-plugins.test.js      | 19 ++++++++++++++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 test/fixtures/programmatic/curated-plugins/webpack.config.js

diff --git a/test/fixtures/programmatic/curated-plugins/package.json b/test/fixtures/programmatic/curated-plugins/package.json
index 49f5bc7bcee..856e98a1a37 100755
--- a/test/fixtures/programmatic/curated-plugins/package.json
+++ b/test/fixtures/programmatic/curated-plugins/package.json
@@ -1,5 +1,7 @@
 {
   "devDependencies": {
-    "serverless-offline": "7.0.0"
+    "serverless-offline": "7.0.0",
+    "webpack": "5.41.1",
+    "serverless-webpack": "5.5.1"
   }
 }
diff --git a/test/fixtures/programmatic/curated-plugins/webpack.config.js b/test/fixtures/programmatic/curated-plugins/webpack.config.js
new file mode 100644
index 00000000000..3c2e9769bef
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins/webpack.config.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = { entry: './index.js', target: 'node', mode: 'production' };
diff --git a/test/integration/curated-plugins.test.js b/test/integration/curated-plugins.test.js
index a81ef7db0ea..43812b67a97 100644
--- a/test/integration/curated-plugins.test.js
+++ b/test/integration/curated-plugins.test.js
@@ -1,6 +1,8 @@
 'use strict';
 
 const { expect } = require('chai');
+const path = require('path');
+const fsp = require('fs').promises;
 const spawn = require('child-process-ext/spawn');
 const got = require('got');
 const fixturesEngine = require('../fixtures/programmatic');
@@ -12,8 +14,13 @@ describe('test/integration/curated-plugins.test.js', function () {
 
   let serviceDir;
   let updateConfig;
+  let serviceConfig;
   before(async () => {
-    ({ servicePath: serviceDir, updateConfig } = await fixturesEngine.setup('curated-plugins'));
+    ({
+      servicePath: serviceDir,
+      updateConfig,
+      serviceConfig,
+    } = await fixturesEngine.setup('curated-plugins'));
   });
 
   afterEach(async () => updateConfig({ plugins: null }));
@@ -39,4 +46,14 @@ describe('test/integration/curated-plugins.test.js', function () {
     });
     await slsProcessPromise;
   });
+
+  it('should be extended by "serverless-webpack"', async () => {
+    await spawn(serverlessExec, ['package'], { cwd: serviceDir });
+    const packagePath = path.resolve(serviceDir, '.serverless', `${serviceConfig.service}.zip`);
+    const originalPackageSize = (await fsp.stat(packagePath)).size;
+    await updateConfig({ plugins: ['serverless-webpack'] });
+    await spawn(serverlessExec, ['package'], { cwd: serviceDir });
+    const bundledPackageSize = (await fsp.stat(packagePath)).size;
+    expect(originalPackageSize / 10).to.be.above(bundledPackageSize);
+  });
 });

From 3e14f063052385026425021379bfc883dac5ff74 Mon Sep 17 00:00:00 2001
From: Daniele Iasella <2861984+overbit@users.noreply.github.com>
Date: Thu, 1 Jul 2021 17:04:46 +0100
Subject: [PATCH 0285/1101] feat(AWS Lambda): Add support for `SASL/PLAIN` auth
 to `kafka` event

---
 docs/providers/aws/events/kafka.md            |  2 +-
 .../aws/package/compile/events/kafka.js       | 12 +++++++
 .../aws/package/compile/events/kafka.test.js  | 34 +++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/docs/providers/aws/events/kafka.md b/docs/providers/aws/events/kafka.md
index 73a8c43f18d..be5c060c577 100644
--- a/docs/providers/aws/events/kafka.md
+++ b/docs/providers/aws/events/kafka.md
@@ -21,7 +21,7 @@ In the following example, we specify that the `compute` function should be trigg
 
 In order to configure `kafka` event, you have to provide three required properties:
 
-- `accessConfigurations`, which is either secret credentials required to do [SASL_SCRAM auth](https://docs.confluent.io/platform/current/kafka/authentication_sasl/authentication_sasl_scram.html), or this is VPC configuration to allow Lambda to connect to your cluster
+- `accessConfigurations`, which is either secret credentials required to do [SASL_SCRAM auth](https://docs.confluent.io/platform/current/kafka/authentication_sasl/authentication_sasl_scram.html),[SASL_PLAIN auth](https://docs.confluent.io/platform/current/kafka/authentication_sasl/authentication_sasl_plain.html) or this is VPC configuration to allow Lambda to connect to your cluster. Valid options are: `saslPlainAuth`, `saslScram256Auth`, or `saslScram512Auth`
 - `topic` to consume messages from.
 - `bootstrapServers` an array of bootstrap server addresses for your Kafka cluster
 
diff --git a/lib/plugins/aws/package/compile/events/kafka.js b/lib/plugins/aws/package/compile/events/kafka.js
index 55a06443702..e435ad1fc9d 100644
--- a/lib/plugins/aws/package/compile/events/kafka.js
+++ b/lib/plugins/aws/package/compile/events/kafka.js
@@ -35,6 +35,14 @@ class AwsCompileKafkaEvents {
                 pattern: 'sg-[a-z0-9]+',
               },
             },
+            saslPlainAuth: {
+              type: 'array',
+              minItems: 1,
+              items: {
+                type: 'string',
+                pattern: secretsManagerArnRegex,
+              },
+            },
             saslScram256Auth: {
               type: 'array',
               minItems: 1,
@@ -159,6 +167,10 @@ class AwsCompileKafkaEvents {
                 prefix = 'security_group:';
                 needsEc2Permissions = true;
                 break;
+              case 'saslPlainAuth':
+                type = 'BASIC_AUTH';
+                needsSecretsManagerPermissions = true;
+                break;
               case 'saslScram256Auth':
                 type = 'SASL_SCRAM_256_AUTH';
                 needsSecretsManagerPermissions = true;
diff --git a/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js b/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js
index 16964878d7d..d541e3c4293 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js
@@ -241,6 +241,40 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
       await runCompileEventSourceMappingTest(eventConfig);
     });
 
+    it('should correctly compile EventSourceMapping resource properties for SASL_PLAIN_AUTH', async () => {
+      const eventConfig = {
+        event: {
+          topic,
+          bootstrapServers: ['abc.xyz:9092'],
+          accessConfigurations: {
+            saslPlainAuth:
+              'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslPlainSecretName',
+          },
+        },
+        resource: (awsNaming) => {
+          return {
+            SelfManagedEventSource: {
+              Endpoints: {
+                KafkaBootstrapServers: ['abc.xyz:9092'],
+              },
+            },
+            SourceAccessConfigurations: [
+              {
+                Type: 'BASIC_AUTH',
+                URI: 'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslPlainSecretName',
+              },
+            ],
+            StartingPosition: 'TRIM_HORIZON',
+            Topics: [topic],
+            FunctionName: {
+              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('foo'), 'Arn'],
+            },
+          };
+        },
+      };
+      await runCompileEventSourceMappingTest(eventConfig);
+    });
+
     it('should correctly compile EventSourceMapping resource properties for SASL_SCRAM_256_AUTH', async () => {
       const eventConfig = {
         event: {

From b21c1e415b67cdc8f1fb0ab14152eaf3c6550894 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 2 Jul 2021 09:59:15 +0200
Subject: [PATCH 0286/1101] fix(Telemetry): Properly handle not in service dir
 in credentials

---
 lib/cli/interactive-setup/aws-credentials.js              | 8 +++++++-
 .../lib/cli/interactive-setup/aws-credentials.test.js     | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/cli/interactive-setup/aws-credentials.js b/lib/cli/interactive-setup/aws-credentials.js
index 349234d4f97..0f70e5c6a45 100644
--- a/lib/cli/interactive-setup/aws-credentials.js
+++ b/lib/cli/interactive-setup/aws-credentials.js
@@ -319,7 +319,13 @@ const steps = {
 
 module.exports = {
   async isApplicable(context) {
-    const { configuration, history, options } = context;
+    const { configuration, history, options, serviceDir } = context;
+
+    if (!serviceDir) {
+      context.inapplicabilityReasonCode = 'NOT_IN_SERVICE_DIRECTORY';
+      return false;
+    }
+
     if (
       _.get(configuration, 'provider') !== 'aws' &&
       _.get(configuration, 'provider.name') !== 'aws'
diff --git a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
index ba793afa5c3..c813658d569 100644
--- a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
+++ b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
@@ -57,7 +57,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
   it('Should be ineffective, when not at service path', async () => {
     const context = {};
     expect(await step.isApplicable(context)).to.equal(false);
-    expect(context.inapplicabilityReasonCode).to.equal('NON_AWS_PROVIDER');
+    expect(context.inapplicabilityReasonCode).to.equal('NOT_IN_SERVICE_DIRECTORY');
   });
 
   it('Should be ineffective, when not at AWS service', async () => {

From db67b353c9ed578d7dd334d162efa1ec11fbfa18 Mon Sep 17 00:00:00 2001
From: Nyambayar Turbat <t.nyambayar@gmail.com>
Date: Fri, 2 Jul 2021 17:18:38 +0800
Subject: [PATCH 0287/1101] refactor: Use `async` in `lib/plugins/package`
 (#9644)

---
 lib/plugins/package/lib/packageService.js | 6 +++---
 lib/plugins/package/lib/zipService.js     | 8 ++++----
 lib/plugins/package/package.js            | 5 +++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/plugins/package/lib/packageService.js b/lib/plugins/package/lib/packageService.js
index 363ed6849d8..1b1304c272e 100644
--- a/lib/plugins/package/lib/packageService.js
+++ b/lib/plugins/package/lib/packageService.js
@@ -96,7 +96,7 @@ module.exports = {
     if (shouldPackageService && !this.serverless.service.package.artifact) await this.packageAll();
   },
 
-  packageAll() {
+  async packageAll() {
     const zipFileName = `${this.serverless.service.service}.zip`;
 
     return this.resolveFilePathsAll().then((filePaths) =>
@@ -145,7 +145,7 @@ module.exports = {
     return artifactPath;
   },
 
-  packageLayer(layerName) {
+  async packageLayer(layerName) {
     const layerObject = this.serverless.service.getLayer(layerName);
 
     const zipFileName = `${layerName}.zip`;
@@ -204,7 +204,7 @@ module.exports = {
     );
   },
 
-  resolveFilePathsFromPatterns(params, prefix) {
+  async resolveFilePathsFromPatterns(params, prefix) {
     const patterns = [];
     const devDependencyExcludeSet = params.devDependencyExcludeSet || new Set();
 
diff --git a/lib/plugins/package/lib/zipService.js b/lib/plugins/package/lib/zipService.js
index 265c1693065..9fbc13931cc 100644
--- a/lib/plugins/package/lib/zipService.js
+++ b/lib/plugins/package/lib/zipService.js
@@ -44,7 +44,7 @@ module.exports = {
     return params;
   },
 
-  zip(params) {
+  async zip(params) {
     return this.resolveFilePathsFromPatterns(params).then((filePaths) =>
       this.zipFiles(filePaths, params.zipFileName)
     );
@@ -56,7 +56,7 @@ module.exports = {
    * @param zipFiles - the filename to save the zip at
    * @param prefix - a prefix to strip from the file names. use for layers support
    */
-  zipFiles(files, zipFileName, prefix) {
+  async zipFiles(files, zipFileName, prefix) {
     if (files.length === 0) {
       const error = new ServerlessError('No files to package', 'NO_FILES_TO_PACKAGE');
       return BbPromise.reject(error);
@@ -103,7 +103,7 @@ module.exports = {
     });
   },
 
-  getFileContentAndStat(filePath) {
+  async getFileContentAndStat(filePath) {
     const fullPath = path.resolve(this.serverless.serviceDir, filePath);
 
     return BbPromise.all([
@@ -131,7 +131,7 @@ module.exports = {
   },
 };
 
-function excludeNodeDevDependencies(serviceDir) {
+async function excludeNodeDevDependencies(serviceDir) {
   const exAndIn = {
     include: [],
     exclude: [],
diff --git a/lib/plugins/package/package.js b/lib/plugins/package/package.js
index c0bf6e46885..33094f0ea96 100644
--- a/lib/plugins/package/package.js
+++ b/lib/plugins/package/package.js
@@ -51,9 +51,10 @@ class Package {
           );
         }
       },
-      'package:createDeploymentArtifacts': () => BbPromise.bind(this).then(this.packageService),
+      'package:createDeploymentArtifacts': async () =>
+        BbPromise.bind(this).then(this.packageService),
 
-      'package:function:package': () => {
+      'package:function:package': async () => {
         if (this.options.function) {
           this.serverless.cli.log(`Packaging function: ${this.options.function}...`);
           return BbPromise.resolve(this.packageFunction(this.options.function));

From f16c45f84b8be1e469bfdd92191fc760b8f1631e Mon Sep 17 00:00:00 2001
From: KIDANI Akito <a.kid.1985@gmail.com>
Date: Fri, 2 Jul 2021 20:31:53 +0900
Subject: [PATCH 0288/1101] refactor(CLI): Fix typo in error message (#9682)

---
 lib/configuration/read.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/configuration/read.js b/lib/configuration/read.js
index 621f7a7c30c..b13c3cb85a2 100644
--- a/lib/configuration/read.js
+++ b/lib/configuration/read.js
@@ -167,7 +167,7 @@ const parseConfigurationFile = async (configurationPath) => {
     }
     default:
       throw new ServerlessError(
-        `Cannot parse "${path.basename(configurationPath)}": Usupported file extension`,
+        `Cannot parse "${path.basename(configurationPath)}": Unsupported file extension`,
         'UNSUPPORTED_CONFIGURATION_TYPE'
       );
   }

From 3500f641f5212f196f75081e67d1d1518ac3bb6b Mon Sep 17 00:00:00 2001
From: Sudipto Das <s.das001@yahoo.com>
Date: Mon, 5 Jul 2021 13:19:04 +0530
Subject: [PATCH 0289/1101] refactor: Replace `fse.createWriteStream` with
 `fs.createWriteStream`

---
 lib/utils/eventuallyUpdate.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/utils/eventuallyUpdate.js b/lib/utils/eventuallyUpdate.js
index c6cde10d11b..becfab529f6 100644
--- a/lib/utils/eventuallyUpdate.js
+++ b/lib/utils/eventuallyUpdate.js
@@ -7,6 +7,7 @@ const os = require('os');
 const stream = require('stream');
 const { promisify } = require('util');
 const fse = require('fs-extra');
+const fs = require('fs');
 const fsp = require('fs').promises;
 const spawn = require('child-process-ext/spawn');
 const got = require('got');
@@ -73,7 +74,7 @@ const standaloneUpdate = async (serverless, { newVersion, abortHandler }) => {
     await fse.remove(tempStandalonePath);
     const downloadStream = got.stream(executableUrl);
     abortHandler.task = () => downloadStream.destroy();
-    await pipeline(downloadStream, fse.createWriteStream(tempStandalonePath));
+    await pipeline(downloadStream, fs.createWriteStream(tempStandalonePath));
     await fsp.chmod(tempStandalonePath, 0o755);
     return () => fsp.rename(tempStandalonePath, standaloneUtils.path);
   } catch (error) {

From 255b93fbe0662ca9e27b2672fc7c3319b4ccc523 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 5 Jul 2021 09:39:23 +0200
Subject: [PATCH 0290/1101] test: Cover `serverless-plugin-requirements` plugin

---
 .github/workflows/integrate.yml               |  6 ++++
 .../curated-plugins-python/_setup.js          |  9 +++++
 .../curated-plugins-python/handler.py         |  5 +++
 .../curated-plugins-python/package.json       |  5 +++
 .../curated-plugins-python/requirements.txt   |  1 +
 .../curated-plugins-python/serverless.yml     | 13 +++++++
 .../curated-plugins-python.test.js            | 34 +++++++++++++++++++
 7 files changed, 73 insertions(+)
 create mode 100644 test/fixtures/programmatic/curated-plugins-python/_setup.js
 create mode 100644 test/fixtures/programmatic/curated-plugins-python/handler.py
 create mode 100755 test/fixtures/programmatic/curated-plugins-python/package.json
 create mode 100644 test/fixtures/programmatic/curated-plugins-python/requirements.txt
 create mode 100644 test/fixtures/programmatic/curated-plugins-python/serverless.yml
 create mode 100644 test/integration/curated-plugins-python.test.js

diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
index 17e0f3feee6..8550e32d103 100644
--- a/.github/workflows/integrate.yml
+++ b/.github/workflows/integrate.yml
@@ -227,6 +227,12 @@ jobs:
             node_modules
           key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
 
+      # Potentially needed for test/integration/curated-plugins-python.test.js
+      # (current GA runtime comes with Python 3.8 preinstalled, but that might be subject to changes)
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.8'
+
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
diff --git a/test/fixtures/programmatic/curated-plugins-python/_setup.js b/test/fixtures/programmatic/curated-plugins-python/_setup.js
new file mode 100644
index 00000000000..fb374507b1c
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins-python/_setup.js
@@ -0,0 +1,9 @@
+'use strict';
+
+const path = require('path');
+const fsp = require('fs').promises;
+
+const slsDependencyDir = path.resolve(__dirname, 'node_modules/serverless');
+
+// Ensure to remove "serverless" installed as peer-dependency to avoid local fallback
+module.exports = async () => fsp.rm(slsDependencyDir, { recursive: true, force: true });
diff --git a/test/fixtures/programmatic/curated-plugins-python/handler.py b/test/fixtures/programmatic/curated-plugins-python/handler.py
new file mode 100644
index 00000000000..accfab5dd07
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins-python/handler.py
@@ -0,0 +1,5 @@
+
+import requests
+
+def hello(event, context):
+    return requests.get('https://httpbin.org/get').json()
diff --git a/test/fixtures/programmatic/curated-plugins-python/package.json b/test/fixtures/programmatic/curated-plugins-python/package.json
new file mode 100755
index 00000000000..0ac277e91d2
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins-python/package.json
@@ -0,0 +1,5 @@
+{
+  "devDependencies": {
+    "serverless-python-requirements": "5.1.1"
+  }
+}
diff --git a/test/fixtures/programmatic/curated-plugins-python/requirements.txt b/test/fixtures/programmatic/curated-plugins-python/requirements.txt
new file mode 100644
index 00000000000..f2293605cf1
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins-python/requirements.txt
@@ -0,0 +1 @@
+requests
diff --git a/test/fixtures/programmatic/curated-plugins-python/serverless.yml b/test/fixtures/programmatic/curated-plugins-python/serverless.yml
new file mode 100644
index 00000000000..301d0863baf
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins-python/serverless.yml
@@ -0,0 +1,13 @@
+service: service
+
+configValidationMode: error
+frameworkVersion: '*'
+
+provider:
+  name: aws
+  runtime: python3.8
+  lambdaHashingVersion: 20201221
+
+functions:
+  function:
+    handler: handler.hello
diff --git a/test/integration/curated-plugins-python.test.js b/test/integration/curated-plugins-python.test.js
new file mode 100644
index 00000000000..c4e5b03fb7e
--- /dev/null
+++ b/test/integration/curated-plugins-python.test.js
@@ -0,0 +1,34 @@
+'use strict';
+
+const { expect } = require('chai');
+const path = require('path');
+const spawn = require('child-process-ext/spawn');
+const fixturesEngine = require('../fixtures/programmatic');
+const { listZipFiles } = require('../utils/fs');
+
+const serverlessExec = require('../serverlessBinary');
+
+describe('test/integration/curated-plugins-python.test.js', function () {
+  this.timeout(1000 * 60 * 10); // Involves time-taking npm install
+
+  let serviceDir;
+  let updateConfig;
+  let serviceConfig;
+  before(async () => {
+    ({
+      servicePath: serviceDir,
+      updateConfig,
+      serviceConfig,
+    } = await fixturesEngine.setup('curated-plugins-python'));
+  });
+
+  afterEach(async () => updateConfig({ plugins: null }));
+
+  it('should be extended by "serverless-python-requirements"', async () => {
+    await updateConfig({ plugins: ['serverless-python-requirements'] });
+    await spawn(serverlessExec, ['package'], { cwd: serviceDir });
+    const packagePath = path.resolve(serviceDir, '.serverless', `${serviceConfig.service}.zip`);
+    const filesInZip = await listZipFiles(packagePath);
+    expect(filesInZip).to.include('requests/__init__.py');
+  });
+});

From b988ecf9a010bf57316c574d70b43e502a9350fc Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 5 Jul 2021 13:31:23 +0200
Subject: [PATCH 0291/1101] test: Cover `serverless-domain-manager` plugin

---
 .../programmatic/curated-plugins/package.json     |  3 ++-
 .../programmatic/curated-plugins/serverless.yml   |  4 ++++
 test/integration/curated-plugins.test.js          | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/test/fixtures/programmatic/curated-plugins/package.json b/test/fixtures/programmatic/curated-plugins/package.json
index 856e98a1a37..25b82671551 100755
--- a/test/fixtures/programmatic/curated-plugins/package.json
+++ b/test/fixtures/programmatic/curated-plugins/package.json
@@ -2,6 +2,7 @@
   "devDependencies": {
     "serverless-offline": "7.0.0",
     "webpack": "5.41.1",
-    "serverless-webpack": "5.5.1"
+    "serverless-webpack": "5.5.1",
+    "serverless-domain-manager": "5.1.0"
   }
 }
diff --git a/test/fixtures/programmatic/curated-plugins/serverless.yml b/test/fixtures/programmatic/curated-plugins/serverless.yml
index f92c01733fd..43df12fd258 100644
--- a/test/fixtures/programmatic/curated-plugins/serverless.yml
+++ b/test/fixtures/programmatic/curated-plugins/serverless.yml
@@ -3,6 +3,10 @@ service: service
 configValidationMode: error
 frameworkVersion: '*'
 
+custom:
+  customDomain:
+    domainName: api.example.com
+
 provider:
   name: aws
   runtime: nodejs14.x
diff --git a/test/integration/curated-plugins.test.js b/test/integration/curated-plugins.test.js
index 43812b67a97..97b2fab833f 100644
--- a/test/integration/curated-plugins.test.js
+++ b/test/integration/curated-plugins.test.js
@@ -5,6 +5,7 @@ const path = require('path');
 const fsp = require('fs').promises;
 const spawn = require('child-process-ext/spawn');
 const got = require('got');
+const { deployService, removeService } = require('../utils/integration');
 const fixturesEngine = require('../fixtures/programmatic');
 
 const serverlessExec = require('../serverlessBinary');
@@ -15,12 +16,20 @@ describe('test/integration/curated-plugins.test.js', function () {
   let serviceDir;
   let updateConfig;
   let serviceConfig;
+  let isDeployed = false;
   before(async () => {
     ({
       servicePath: serviceDir,
       updateConfig,
       serviceConfig,
     } = await fixturesEngine.setup('curated-plugins'));
+    // Needed to test "serverless-domain-manager"
+    await deployService(serviceDir);
+    isDeployed = true;
+  });
+  after(async () => {
+    if (!isDeployed) return;
+    await removeService(serviceDir);
   });
 
   afterEach(async () => updateConfig({ plugins: null }));
@@ -56,4 +65,10 @@ describe('test/integration/curated-plugins.test.js', function () {
     const bundledPackageSize = (await fsp.stat(packagePath)).size;
     expect(originalPackageSize / 10).to.be.above(bundledPackageSize);
   });
+
+  it('should be extended by "serverless-domain-manager"', async () => {
+    await updateConfig({ plugins: ['serverless-domain-manager'] });
+    const { stdoutBuffer } = await spawn(serverlessExec, ['info'], { cwd: serviceDir });
+    expect(String(stdoutBuffer)).to.include('Serverless Domain Manager:');
+  });
 });

From 24ca29f9d107cbf8eadff1231e7cb6b37cf94b24 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 5 Jul 2021 13:32:04 +0200
Subject: [PATCH 0292/1101] test: Cover `serverless-prune-plugin`

---
 test/fixtures/programmatic/curated-plugins/package.json | 3 ++-
 test/integration/curated-plugins.test.js                | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/test/fixtures/programmatic/curated-plugins/package.json b/test/fixtures/programmatic/curated-plugins/package.json
index 25b82671551..38ff4c81695 100755
--- a/test/fixtures/programmatic/curated-plugins/package.json
+++ b/test/fixtures/programmatic/curated-plugins/package.json
@@ -3,6 +3,7 @@
     "serverless-offline": "7.0.0",
     "webpack": "5.41.1",
     "serverless-webpack": "5.5.1",
-    "serverless-domain-manager": "5.1.0"
+    "serverless-domain-manager": "5.1.0",
+    "serverless-prune-plugin": "1.5.0"
   }
 }
diff --git a/test/integration/curated-plugins.test.js b/test/integration/curated-plugins.test.js
index 97b2fab833f..3c08a3c2bd6 100644
--- a/test/integration/curated-plugins.test.js
+++ b/test/integration/curated-plugins.test.js
@@ -71,4 +71,12 @@ describe('test/integration/curated-plugins.test.js', function () {
     const { stdoutBuffer } = await spawn(serverlessExec, ['info'], { cwd: serviceDir });
     expect(String(stdoutBuffer)).to.include('Serverless Domain Manager:');
   });
+
+  it('should be extended by "serverless-prune-plugin"', async () => {
+    await updateConfig({ plugins: ['serverless-prune-plugin'] });
+    const { stdoutBuffer } = await spawn(serverlessExec, ['prune', '-n', '10'], {
+      cwd: serviceDir,
+    });
+    expect(String(stdoutBuffer)).to.include('Prune: Pruning complete.');
+  });
 });

From cc24bc2ae280237b3d439e1934ab75710e0f259f Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 5 Jul 2021 12:42:46 +0200
Subject: [PATCH 0293/1101] refactor(Telemetry): Report `commandUsage` as
 object

---
 lib/cli/handle-error.js                       |  4 +-
 lib/cli/interactive-setup/index.js            | 64 +++++++++----------
 lib/utils/tokenize-exception.js               |  1 -
 scripts/serverless.js                         |  6 +-
 .../lib/cli/interactive-setup/index.test.js   | 20 ------
 .../unit/lib/utils/tokenize-exception.test.js |  7 --
 6 files changed, 39 insertions(+), 63 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 20145434d57..dc9aebe3231 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -49,6 +49,7 @@ module.exports = async (exception, options = {}) => {
     isInvokedByGlobalInstallation: passedIsInvokedByGlobalInstallation,
     serverless,
     hasTelemetryBeenReported,
+    commandUsage,
   } = options;
   let { command, options: cliOptions, commandSchema, serviceDir, configuration } = options;
 
@@ -76,6 +77,7 @@ module.exports = async (exception, options = {}) => {
           serviceDir,
           configuration,
           hasTelemetryBeenReported,
+          commandUsage,
         });
         return;
       } catch (error) {
@@ -180,7 +182,7 @@ module.exports = async (exception, options = {}) => {
         serviceDir,
         configuration,
         serverless,
-        commandUsage: exceptionTokens.commandUsage,
+        commandUsage,
       });
       const failureReason = {
         kind: isUserError ? 'user' : 'programmer',
diff --git a/lib/cli/interactive-setup/index.js b/lib/cli/interactive-setup/index.js
index 32530773c49..5c29dfd6afe 100644
--- a/lib/cli/interactive-setup/index.js
+++ b/lib/cli/interactive-setup/index.js
@@ -11,45 +11,43 @@ const steps = {
   deploy: require('./deploy'),
 };
 
-const generateCommandUsage = (stepsDetails, history) => {
-  return Array.from(stepsDetails.entries()).map(([step, stepDetails]) => {
-    const stepHistory = history.get(step);
-    return {
-      name: step,
-      ...stepDetails,
-      history: stepHistory ? stepHistory.toJSON() : [],
-    };
-  });
-};
-
 module.exports = async (context) => {
-  context = { ...context, inquirer, history: new Map() };
   const stepsDetails = new Map();
-  try {
-    for (const [stepName, step] of Object.entries(steps)) {
-      delete context.stepHistory;
-      delete context.inapplicabilityReasonCode;
-      const stepData = await step.isApplicable(context);
-      stepsDetails.set(stepName, {
-        isApplicable: Boolean(stepData),
-        inapplicabilityReasonCode: context.inapplicabilityReasonCode,
-        timestamp: Date.now(),
-        configuredQuestions: step.configuredQuestions,
-      });
-      if (stepData) {
-        process.stdout.write('\n');
-        context.stepHistory = new StepHistory();
-        context.history.set(stepName, context.stepHistory);
-        await step.run(context, stepData);
-      }
+  const { commandUsage } = context;
+  const history = new Map();
+  context = { ...context, inquirer, history };
+
+  commandUsage.stepsHistory = history;
+  commandUsage.stepsHistory.toJSON = () => {
+    return Array.from(stepsDetails.entries()).map(([step, stepDetails]) => {
+      const stepHistory = history.get(step);
+      return {
+        name: step,
+        ...stepDetails,
+        history: stepHistory ? stepHistory.toJSON() : [],
+      };
+    });
+  };
+
+  for (const [stepName, step] of Object.entries(steps)) {
+    delete context.stepHistory;
+    delete context.inapplicabilityReasonCode;
+    const stepData = await step.isApplicable(context);
+    stepsDetails.set(stepName, {
+      isApplicable: Boolean(stepData),
+      inapplicabilityReasonCode: context.inapplicabilityReasonCode,
+      timestamp: Date.now(),
+      configuredQuestions: step.configuredQuestions,
+    });
+    if (stepData) {
+      process.stdout.write('\n');
+      context.stepHistory = new StepHistory();
+      context.history.set(stepName, context.stepHistory);
+      await step.run(context, stepData);
     }
-  } catch (err) {
-    err.commandUsage = generateCommandUsage(stepsDetails, context.history);
-    throw err;
   }
 
   return {
-    commandUsage: generateCommandUsage(stepsDetails, context.history),
     configuration: context.configuration,
   };
 };
diff --git a/lib/utils/tokenize-exception.js b/lib/utils/tokenize-exception.js
index 528609cf9f0..7b1266d80b4 100644
--- a/lib/utils/tokenize-exception.js
+++ b/lib/utils/tokenize-exception.js
@@ -14,7 +14,6 @@ module.exports = (exception) => {
       message: exception.message,
       isUserError: userErrorNames.has(exception.name),
       code: exception.code,
-      commandUsage: exception.commandUsage,
     };
   }
   return {
diff --git a/scripts/serverless.js b/scripts/serverless.js
index b07c43e5b14..c8296fcac33 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -30,6 +30,7 @@ let commandSchema;
 let serviceDir = null;
 let configuration = null;
 let serverless;
+const commandUsage = {};
 
 let hasTelemetryBeenReported = false;
 
@@ -43,6 +44,7 @@ process.once('uncaughtException', (error) =>
     configuration,
     serverless,
     hasTelemetryBeenReported,
+    commandUsage,
   })
 );
 
@@ -403,12 +405,13 @@ const processSpanPromise = (async () => {
           'INTERACTIVE_SETUP_IN_NON_TTY'
         );
       }
-      const { commandUsage, configuration: configurationFromInteractive } =
+      const { configuration: configurationFromInteractive } =
         await require('../lib/cli/interactive-setup')({
           configuration,
           serviceDir,
           configurationFilename,
           options,
+          commandUsage,
         });
       hasTelemetryBeenReported = true;
       if (!isTelemetryDisabled) {
@@ -747,6 +750,7 @@ const processSpanPromise = (async () => {
       configuration,
       serverless,
       hasTelemetryBeenReported,
+      commandUsage,
     });
   }
 })();
diff --git a/test/unit/lib/cli/interactive-setup/index.test.js b/test/unit/lib/cli/interactive-setup/index.test.js
index a615538230e..a55d0267a4a 100644
--- a/test/unit/lib/cli/interactive-setup/index.test.js
+++ b/test/unit/lib/cli/interactive-setup/index.test.js
@@ -4,12 +4,6 @@
 
 const spawn = require('child-process-ext/spawn');
 const path = require('path');
-const proxyquire = require('proxyquire');
-const chai = require('chai');
-
-const { expect } = chai;
-
-chai.use(require('chai-as-promised'));
 
 const serverlessPath = path.resolve(__dirname, '../../../../../scripts/serverless.js');
 const templatesPath = path.resolve(__dirname, '../../../../../lib/plugins/create/templates');
@@ -79,18 +73,4 @@ describe('test/unit/lib/cli/interactive-setup/index.test.js', () => {
 
     await slsProcessPromise;
   });
-
-  it('should attach `commandUsage` to thrown error', async () => {
-    const mockedInteractiveSetup = proxyquire('../../../../../lib/cli/interactive-setup', {
-      './service': {
-        isApplicable: () => {
-          throw new Error('Error during processing');
-        },
-      },
-    });
-
-    await expect(mockedInteractiveSetup({})).to.be.eventually.rejected.and.have.property(
-      'commandUsage'
-    );
-  });
 });
diff --git a/test/unit/lib/utils/tokenize-exception.test.js b/test/unit/lib/utils/tokenize-exception.test.js
index 41df259da21..0e763f5da91 100644
--- a/test/unit/lib/utils/tokenize-exception.test.js
+++ b/test/unit/lib/utils/tokenize-exception.test.js
@@ -31,11 +31,4 @@ describe('test/unit/lib/utils/tokenize-exception.test.js', () => {
     expect(errorTokens.message).to.equal('null');
     expect(errorTokens.isUserError).to.equal(false);
   });
-
-  it('Should tokenize error with `commandUsage`', () => {
-    const err = new ServerlessError('Some error', 'ERR_CODE');
-    err.commandUsage = [];
-    const errorTokens = tokenizeError(err);
-    expect(errorTokens.commandUsage).to.deep.equal([]);
-  });
 });

From b1241522ec378f7b7b431050ddc861fef040efc4 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 5 Jul 2021 18:52:54 +0200
Subject: [PATCH 0294/1101] fix(CLI): Recognize `--verbose` option in `info`
 command

---
 lib/cli/commands-schema/aws-service.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/cli/commands-schema/aws-service.js b/lib/cli/commands-schema/aws-service.js
index 8421e8fee93..5fa78f66526 100644
--- a/lib/cli/commands-schema/aws-service.js
+++ b/lib/cli/commands-schema/aws-service.js
@@ -83,6 +83,11 @@ commands.set('info', {
       usage: 'Hide secrets from the output (e.g. API Gateway key values)',
       type: 'boolean',
     },
+    verbose: {
+      usage: 'List stack outputs',
+      shortcut: 'v',
+      type: 'boolean',
+    },
   },
   lifecycleEvents: ['info'],
 });

From 07a69a836c506e3ab8ab976ef27d4f3b672722f7 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 5 Jul 2021 14:45:31 +0200
Subject: [PATCH 0295/1101] refactor: Make deprecations default mode internally
 modifyable

---
 lib/utils/logDeprecation.js | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/lib/utils/logDeprecation.js b/lib/utils/logDeprecation.js
index 223876a2953..a8ce16398fc 100644
--- a/lib/utils/logDeprecation.js
+++ b/lib/utils/logDeprecation.js
@@ -28,9 +28,21 @@ const resolveDisabledDeprecationsByService = weakMemoizee((serviceConfig) => {
   return new Set(disabledDeprecations);
 });
 
-const isErrorNotificationMode = (serviceConfig) => {
-  if (notificationModeByEnv) return notificationModeByEnv === 'error';
-  return _.get(serviceConfig, 'deprecationNotificationMode') === 'error';
+const resolveMode = (serviceConfig) => {
+  switch (notificationModeByEnv) {
+    case 'error':
+    case 'warn':
+      return notificationModeByEnv;
+    default:
+  }
+  const modeByConfig = _.get(serviceConfig, 'deprecationNotificationMode');
+  switch (modeByConfig) {
+    case 'error':
+    case 'warn':
+      return modeByConfig;
+    default:
+      return module.exports.defaultMode;
+  }
 };
 
 function writeDeprecation(code, message) {
@@ -70,7 +82,7 @@ module.exports = (code, message, { serviceConfig } = {}) => {
       }
     }
 
-    if (isErrorNotificationMode(serviceConfig)) {
+    if (resolveMode(serviceConfig) === 'error') {
       throw new ServerlessError(
         `${message}\n  More Info: https://www.serverless.com/framework/docs/deprecations/#${code}`,
         `REJECTED_DEPRECATION_${code}`
@@ -84,3 +96,4 @@ module.exports = (code, message, { serviceConfig } = {}) => {
 };
 
 module.exports.triggeredDeprecations = triggeredDeprecations;
+module.exports.defaultMode = 'warn';

From 7fb7b700a6dbfdd020d93b209872c19ad9f1399c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 5 Jul 2021 16:55:26 +0200
Subject: [PATCH 0296/1101] test: Unify titles format

---
 test/unit/lib/utils/logDeprecation.test.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/unit/lib/utils/logDeprecation.test.js b/test/unit/lib/utils/logDeprecation.test.js
index cdf8658439b..554544debda 100644
--- a/test/unit/lib/utils/logDeprecation.test.js
+++ b/test/unit/lib/utils/logDeprecation.test.js
@@ -7,7 +7,7 @@ const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const runServerless = require('../../../utils/run-serverless');
 const ServerlessError = require('../../../../lib/serverless-error');
 
-describe('#logDeprecation()', () => {
+describe('test/unit/lib/utils/logDeprecation.test.js', () => {
   let restoreEnv;
   let originalEnv;
 
@@ -21,7 +21,7 @@ describe('#logDeprecation()', () => {
     restoreEnv();
   });
 
-  it('Should log deprecation message if not disabled and first time', () => {
+  it('should log deprecation message if not disabled and first time', () => {
     const logDeprecation = require('../../../../lib/utils/logDeprecation');
     let stdoutData = '';
     overrideStdoutWrite(
@@ -34,7 +34,7 @@ describe('#logDeprecation()', () => {
     expect(stdoutData).to.include('https://www.serverless.com/framework/docs/deprecations/#CODE1');
   });
 
-  it('Should not log deprecation if disabled in env.SLS_DEPRECATION_DISABLE', () => {
+  it('should not log deprecation if disabled in env.SLS_DEPRECATION_DISABLE', () => {
     process.env.SLS_DEPRECATION_DISABLE = 'CODE1';
     const logDeprecation = require('../../../../lib/utils/logDeprecation');
 
@@ -46,7 +46,7 @@ describe('#logDeprecation()', () => {
     expect(stdoutData).to.equal('');
   });
 
-  it('Should not log deprecation if disabled in serviceConfig', () => {
+  it('should not log deprecation if disabled in serviceConfig', () => {
     // We need original process env variables for npm-conf
     Object.assign(process.env, originalEnv);
     const logDeprecation = require('../../../../lib/utils/logDeprecation');
@@ -65,7 +65,7 @@ describe('#logDeprecation()', () => {
     });
   });
 
-  it('Should not log deprecation if disabled by wildcard in env', () => {
+  it('should not log deprecation if disabled by wildcard in env', () => {
     process.env.SLS_DEPRECATION_DISABLE = '*';
     const logDeprecation = require('../../../../lib/utils/logDeprecation');
     let stdoutData = '';
@@ -76,7 +76,7 @@ describe('#logDeprecation()', () => {
     expect(stdoutData).to.equal('');
   });
 
-  it('Should not log deprecation if disabled by wildcard in service config', () => {
+  it('should not log deprecation if disabled by wildcard in service config', () => {
     Object.assign(process.env, originalEnv);
     const logDeprecation = require('../../../../lib/utils/logDeprecation');
     return runServerless({
@@ -94,7 +94,7 @@ describe('#logDeprecation()', () => {
     });
   });
 
-  it('Should throw on deprecation if env.SLS_DEPRECATION_NOTIFICATION_MODE=error', () => {
+  it('should throw on deprecation if env.SLS_DEPRECATION_NOTIFICATION_MODE=error', () => {
     process.env.SLS_DEPRECATION_NOTIFICATION_MODE = 'error';
     const logDeprecation = require('../../../../lib/utils/logDeprecation');
     expect(() => logDeprecation('CODE1', 'Start using deprecation log'))
@@ -102,7 +102,7 @@ describe('#logDeprecation()', () => {
       .with.property('code', 'REJECTED_DEPRECATION_CODE1');
   });
 
-  it('Should throw on deprecation if error notifications mode set in service config', () => {
+  it('should throw on deprecation if error notifications mode set in service config', () => {
     const logDeprecation = require('../../../../lib/utils/logDeprecation');
     expect(() =>
       logDeprecation('CODE1', 'Start using deprecation log', {
@@ -113,7 +113,7 @@ describe('#logDeprecation()', () => {
       .with.property('code', 'REJECTED_DEPRECATION_CODE1');
   });
 
-  it('Should not log deprecation twice', () => {
+  it('should not log deprecation twice', () => {
     let stdoutData = '';
     overrideStdoutWrite(
       (data) => (stdoutData += data),

From 9b624a50677a0363c052b4ea567c050af7863073 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 5 Jul 2021 18:36:57 +0200
Subject: [PATCH 0297/1101] feat(CLI): New `warn:summary` (default)
 deprecations logging mode

To avoid confusion, in case of local fallback always resort to `warn`
---
 docs/deprecations.md                       |  8 +++-
 docs/providers/aws/guide/serverless.yml.md |  2 +-
 lib/Serverless.js                          |  7 ++-
 lib/cli/handle-error.js                    |  3 ++
 lib/configSchema.js                        |  2 +-
 lib/utils/logDeprecation.js                | 55 ++++++++++++++++++----
 scripts/serverless.js                      |  8 +++-
 test/unit/lib/utils/logDeprecation.test.js | 36 ++++++++++++++
 8 files changed, 107 insertions(+), 14 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 4dcb10de36c..c26fedd804e 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -19,7 +19,11 @@ disabledDeprecations:
 
 ## Notifications mode
 
-By default deprecations are logged as warnings. If there's an intention to work with _deprecation_ free service, reporting mode can be switched so approached deprecation is reported with a thrown error.
+By default deprecations are logged, after command finalizes with a warning summary (`warn:summary` mode)
+
+Alternatively deprecation warnings can be displayed as they're discovered, on the go, that can be turned on with `warn` mode (this mode is automatically pursued on in case we fallback to locally installed Serverless Framework installation)
+
+If there's an intention to work with _deprecation_ free service, reporting mode can be switched to `error`, so approached deprecation is reported with a thrown error.
 
 Mode can be set via environment variable: `SLS_DEPRECATION_NOTIFICATION_MODE=error` or via top level service configuration setting:
 
@@ -29,7 +33,7 @@ deprecationNotificationMode: error
 
 Note:
 
-- Configuration setting is ineffective for deprecations reported before service configuration is read.
+- In service configuration setting is ineffective for deprecations reported before service configuration is read.
 - `SLS_DEPRECATION_DISABLE` env var and `disabledDeprecations` configuration setting remain respected, and no errors will be thrown for mentioned deprecation coodes.
 
 <a name="CLI_DEPLOY_FUNCTION_OPTION"><div>&nbsp;</div></a>
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 44f324a552b..60450f828e2 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -29,7 +29,7 @@ enableLocalInstallationFallback: false # If set to 'true', guarantees that it's
 useDotenv: false # If set to 'true', environment variables will be automatically loaded from .env files
 variablesResolutionMode: null # To crash on variable resolution errors (as coming from new resolver), set this value to "20210326"
 unresolvedVariablesNotificationMode: warn # If set to 'error', references to variables that cannot be resolved will result in an error being thrown (applies to legacy resolver)
-deprecationNotificationMode: warn # If set to 'error' any reported deprection will result in an error being thrown
+deprecationNotificationMode: warn:summary # 'warn' reports deprecations on the go, 'error' will result with an exception being thrown on first approached deprecation
 
 disabledDeprecations: # Disable deprecation logs by their codes. Default is empty.
   - DEP_CODE_1 # Deprecation code to disable
diff --git a/lib/Serverless.js b/lib/Serverless.js
index ef261d5a06d..536c9c9c61e 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -150,7 +150,10 @@ class Serverless {
   }
 
   async init() {
-    if (!this._isInvokedByGlobalInstallation) {
+    if (this._isInvokedByGlobalInstallation) {
+      logDeprecation.defaultMode = 'warn';
+      logDeprecation.flushBuffered();
+    } else {
       if (this._shouldReportMissingServiceDeprecation) {
         this._logDeprecation(
           'MISSING_SERVICE_CONFIGURATION',
@@ -236,6 +239,8 @@ class Serverless {
     ) {
       return;
     }
+    logDeprecation.defaultMode = 'warn';
+    logDeprecation.flushBuffered();
     this.cli.log('Running "serverless" installed locally (in service node_modules)');
     // TODO: Replace below fallback logic with more straightforward one at top of the CLI
     // when we willl drop support for the "disableLocalInstallationFallback" setting
diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index dc9aebe3231..075e21fe87e 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -10,6 +10,7 @@ const sfeVersion = require('@serverless/dashboard-plugin/package.json').version;
 const { platformClientVersion } = require('@serverless/dashboard-plugin');
 const ServerlessError = require('../serverless-error');
 const tokenizeException = require('../utils/tokenize-exception');
+const logDeprecation = require('../utils/logDeprecation');
 const resolveIsLocallyInstalled = require('../utils/is-locally-installed');
 const isTelemetryDisabled = require('../utils/telemetry/areDisabled');
 const { storeLocally: storeTelemetryLocally, send: sendTelemetry } = require('../utils/telemetry');
@@ -153,6 +154,8 @@ module.exports = async (exception, options = {}) => {
   consoleLog(chalk.yellow(`     Components Version:        ${componentsVersion}`));
   consoleLog(' ');
 
+  logDeprecation.printSummary();
+
   if (
     !isTelemetryDisabled &&
     hasTelemetryBeenReported === false &&
diff --git a/lib/configSchema.js b/lib/configSchema.js
index e69b4b2a351..457caaf1ce4 100644
--- a/lib/configSchema.js
+++ b/lib/configSchema.js
@@ -21,7 +21,7 @@ const schema = {
       // User is free to add any properties for its own purpose
     },
     deprecationsNotificationMode: {
-      enum: ['error', 'warn'],
+      enum: ['error', 'warn', 'warn:summary'],
     },
     disabledDeprecations: {
       anyOf: [
diff --git a/lib/utils/logDeprecation.js b/lib/utils/logDeprecation.js
index a8ce16398fc..66e5bdb55d3 100644
--- a/lib/utils/logDeprecation.js
+++ b/lib/utils/logDeprecation.js
@@ -10,6 +10,7 @@ const disabledDeprecationCodesByEnv = extractCodes(process.env.SLS_DEPRECATION_D
 const notificationModeByEnv = process.env.SLS_DEPRECATION_NOTIFICATION_MODE;
 
 const triggeredDeprecations = new Set();
+const bufferedDeprecations = [];
 
 function extractCodes(codesStr) {
   if (!codesStr) {
@@ -82,18 +83,56 @@ module.exports = (code, message, { serviceConfig } = {}) => {
       }
     }
 
-    if (resolveMode(serviceConfig) === 'error') {
-      throw new ServerlessError(
-        `${message}\n  More Info: https://www.serverless.com/framework/docs/deprecations/#${code}`,
-        `REJECTED_DEPRECATION_${code}`
-      );
+    switch (resolveMode(serviceConfig)) {
+      case 'error':
+        throw new ServerlessError(
+          `${message}\n  More Info: https://www.serverless.com/framework/docs/deprecations/#${code}`,
+          `REJECTED_DEPRECATION_${code}`
+        );
+      case 'warn':
+        writeDeprecation(code, message);
+        return;
+      default:
+        bufferedDeprecations.push({ message, code });
     }
-
-    writeDeprecation(code, message);
   } finally {
     triggeredDeprecations.add(code);
   }
 };
 
 module.exports.triggeredDeprecations = triggeredDeprecations;
-module.exports.defaultMode = 'warn';
+module.exports.defaultMode = 'warn:summary';
+
+module.exports.flushBuffered = () => {
+  try {
+    for (const { code, message } of bufferedDeprecations) writeDeprecation(code, message);
+  } finally {
+    bufferedDeprecations.length = 0;
+  }
+};
+
+module.exports.printSummary = () => {
+  if (!bufferedDeprecations.length) return;
+  try {
+    if (bufferedDeprecations.length === 1) {
+      const { code, message } = bufferedDeprecations[0];
+      writeDeprecation(code, message);
+      return;
+    }
+
+    const prefix = 'Serverless: ';
+    process.stdout.write(`${prefix}${chalk.bold.keyword('orange')('Deprecation warnings:')}\n\n`);
+    for (const { code, message } of bufferedDeprecations) {
+      const messageLines = chalk.bold(message).split('\n');
+      if (!code.startsWith('EXT_')) {
+        messageLines.push(
+          `More Info: https://www.serverless.com/framework/docs/deprecations/#${code}`
+        );
+      }
+
+      process.stdout.write(chalk.keyword('orange')(`${messageLines.join('\n')}\n\n`));
+    }
+  } finally {
+    bufferedDeprecations.length = 0;
+  }
+};
diff --git a/scripts/serverless.js b/scripts/serverless.js
index c8296fcac33..f531b61db46 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -23,6 +23,7 @@ const {
 const generateTelemetryPayload = require('../lib/utils/telemetry/generatePayload');
 const processBackendNotificationRequest = require('../lib/utils/processBackendNotificationRequest');
 const isTelemetryDisabled = require('../lib/utils/telemetry/areDisabled');
+const logDeprecation = require('../lib/utils/logDeprecation');
 
 let command;
 let options;
@@ -65,6 +66,7 @@ const processSpanPromise = (async () => {
     // If version number request, show it and abort
     if (options.version) {
       await require('../lib/cli/render-version')();
+      logDeprecation.printSummary();
       return;
     }
 
@@ -86,7 +88,6 @@ const processSpanPromise = (async () => {
     const isPropertyResolved = require('../lib/configuration/variables/is-property-resolved');
     const eventuallyReportVariableResolutionErrors = require('../lib/configuration/variables/eventually-report-resolution-errors');
     const filterSupportedOptions = require('../lib/cli/filter-supported-options');
-    const logDeprecation = require('../lib/utils/logDeprecation');
 
     let configurationPath = null;
     let providerName;
@@ -413,6 +414,9 @@ const processSpanPromise = (async () => {
           options,
           commandUsage,
         });
+
+      logDeprecation.printSummary();
+
       hasTelemetryBeenReported = true;
       if (!isTelemetryDisabled) {
         await storeTelemetryLocally(
@@ -694,6 +698,8 @@ const processSpanPromise = (async () => {
         await serverless.run();
       }
 
+      logDeprecation.printSummary();
+
       hasTelemetryBeenReported = true;
       if (!isTelemetryDisabled && !isHelpRequest && serverless.isTelemetryReportedExternally) {
         await storeTelemetryLocally({
diff --git a/test/unit/lib/utils/logDeprecation.test.js b/test/unit/lib/utils/logDeprecation.test.js
index 554544debda..4fabf61f850 100644
--- a/test/unit/lib/utils/logDeprecation.test.js
+++ b/test/unit/lib/utils/logDeprecation.test.js
@@ -23,6 +23,7 @@ describe('test/unit/lib/utils/logDeprecation.test.js', () => {
 
   it('should log deprecation message if not disabled and first time', () => {
     const logDeprecation = require('../../../../lib/utils/logDeprecation');
+    logDeprecation.defaultMode = 'warn';
     let stdoutData = '';
     overrideStdoutWrite(
       (data) => (stdoutData += data),
@@ -119,6 +120,7 @@ describe('test/unit/lib/utils/logDeprecation.test.js', () => {
       (data) => (stdoutData += data),
       () => {
         const logDeprecation = require('../../../../lib/utils/logDeprecation');
+        logDeprecation.defaultMode = 'warn';
         logDeprecation('CODE1', 'Start using deprecation log');
         expect(stdoutData).to.include('Start using deprecation log');
         stdoutData = '';
@@ -127,4 +129,38 @@ describe('test/unit/lib/utils/logDeprecation.test.js', () => {
     );
     expect(stdoutData).to.equal('');
   });
+
+  it('should expose working `flushBuffered` method', () => {
+    let stdoutData = '';
+    overrideStdoutWrite(
+      (data) => (stdoutData += data),
+      () => {
+        const logDeprecation = require('../../../../lib/utils/logDeprecation');
+        logDeprecation('CODE1', 'First deprecation');
+        expect(stdoutData).to.not.include('First deprecation');
+        logDeprecation('CODE2', 'Second deprecation');
+        expect(stdoutData).to.not.include('Second deprecation');
+        logDeprecation.flushBuffered();
+      }
+    );
+    expect(stdoutData).to.include('First deprecation');
+    expect(stdoutData).to.include('Second deprecation');
+  });
+
+  it('should expose working `printSummary` method', () => {
+    let stdoutData = '';
+    overrideStdoutWrite(
+      (data) => (stdoutData += data),
+      () => {
+        const logDeprecation = require('../../../../lib/utils/logDeprecation');
+        logDeprecation('CODE1', 'First deprecation');
+        expect(stdoutData).to.not.include('First deprecation');
+        logDeprecation('CODE2', 'Second deprecation');
+        expect(stdoutData).to.not.include('Second deprecation');
+        logDeprecation.printSummary();
+      }
+    );
+    expect(stdoutData).to.include('First deprecation');
+    expect(stdoutData).to.include('Second deprecation');
+  });
 });

From e65199c05213e1bac17acedc84cdd6dfd26ff00a Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 5 Jul 2021 17:42:23 +0200
Subject: [PATCH 0298/1101] refactor(Telemetry): Ensure generation and related
 utils are sync

---
 lib/Serverless.js                             |  2 +-
 lib/classes/PluginManager.js                  |  4 +-
 lib/cli/handle-error.js                       | 10 +--
 lib/cli/render-version.js                     |  2 +-
 lib/cli/resolve-local-serverless-path.js      | 25 ++++---
 lib/plugins/config.js                         |  2 +-
 lib/utils/eventuallyUpdate.js                 |  2 +-
 lib/utils/is-locally-installed.js             |  7 +-
 lib/utils/npmPackage/isGlobal.js              | 30 ++++-----
 lib/utils/telemetry/generatePayload.js        | 44 ++++++-------
 lib/utils/telemetry/index.js                  | 10 +--
 scripts/postinstall.js                        | 62 +++++++++--------
 scripts/serverless.js                         | 10 +--
 test/unit/lib/cli/handle-error.test.js        |  2 +-
 .../cli/resolve-local-serverless-path.test.js |  7 +-
 test/unit/lib/plugins/aws/provider.test.js    |  2 +-
 .../utils/telemetry/generatePayload.test.js   | 66 +++++++++----------
 test/unit/lib/utils/telemetry/index.test.js   |  2 +-
 18 files changed, 145 insertions(+), 144 deletions(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index 536c9c9c61e..e52085ec609 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -226,7 +226,7 @@ class Serverless {
       );
     }
     if (this.isLocallyInstalled) return;
-    const localServerlessPath = await resolveLocalServerlessPath();
+    const localServerlessPath = resolveLocalServerlessPath();
     if (!localServerlessPath) return;
     if (localServerlessPath === serverlessPath) {
       this.isLocallyInstalled = true;
diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index b933caeb889..d4409e80d7e 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -615,8 +615,8 @@ class PluginManager {
     // TODO: Remove this logic with `v3.0.0` along with removal of `isTelemetryReportedExternally`
     // After we are ensured that local fallback from `v3` will always fall back to `v3` local installation
     if (!this.serverless.isTelemetryReportedExternally && !isTelemetryDisabled) {
-      await storeTelemetryLocally(
-        await generateTelemetryPayload({
+      storeTelemetryLocally(
+        generateTelemetryPayload({
           ...resolveCliInput(),
           serviceDir: this.serverless.serviceDir,
           configuration: this.serverless.configurationInput,
diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 075e21fe87e..bae21224d60 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -61,8 +61,8 @@ module.exports = async (exception, options = {}) => {
 
   // If provided serverless instance is a local fallback, and we're not in context of it
   // Pass error handling to this local fallback implementation
-  if (isInvokedByGlobalInstallation && !(await resolveIsLocallyInstalled())) {
-    const localServerlessPath = await resolveLocalServerlessPath();
+  if (isInvokedByGlobalInstallation && !resolveIsLocallyInstalled()) {
+    const localServerlessPath = resolveLocalServerlessPath();
 
     try {
       // Attempt to use error handler from local version
@@ -136,7 +136,7 @@ module.exports = async (exception, options = {}) => {
   const installationModePostfix = await (async () => {
     if (isStandaloneExecutable) return ' (standalone)';
     if (isLocallyInstalled != null) return isLocallyInstalled ? ' (local)' : '';
-    return (await resolveIsLocallyInstalled()) ? ' (local)' : '';
+    return resolveIsLocallyInstalled() ? ' (local)' : '';
   })();
   consoleLog(
     chalk.yellow(`     Framework Version:         ${slsVersion}${installationModePostfix}`)
@@ -178,7 +178,7 @@ module.exports = async (exception, options = {}) => {
 
     if (commandSchema) {
       // Report only for recognized commands
-      const telemetryPayload = await generateTelemetryPayload({
+      const telemetryPayload = generateTelemetryPayload({
         command,
         options: cliOptions,
         commandSchema,
@@ -195,7 +195,7 @@ module.exports = async (exception, options = {}) => {
       if (!isUserError || !exception.code || !isErrorCodeNormative(exception.code)) {
         failureReason.location = resolveErrorLocation(exceptionTokens);
       }
-      await storeTelemetryLocally({ ...telemetryPayload, failureReason, outcome: 'failure' });
+      storeTelemetryLocally({ ...telemetryPayload, failureReason, outcome: 'failure' });
       await sendTelemetry();
     }
   }
diff --git a/lib/cli/render-version.js b/lib/cli/render-version.js
index f77b245619f..87b8501eb03 100644
--- a/lib/cli/render-version.js
+++ b/lib/cli/render-version.js
@@ -13,7 +13,7 @@ const ServerlessError = require('../serverless-error');
 const serverlessPath = path.resolve(__dirname, '../..');
 
 module.exports = async () => {
-  const localServerlessPath = await resolveLocalServerlessPath();
+  const localServerlessPath = resolveLocalServerlessPath();
 
   if (localServerlessPath) {
     // If the version is already local, do not try to fallback for version resolution to avoid falling into the loop
diff --git a/lib/cli/resolve-local-serverless-path.js b/lib/cli/resolve-local-serverless-path.js
index 5224962a9b8..b9562f658e3 100644
--- a/lib/cli/resolve-local-serverless-path.js
+++ b/lib/cli/resolve-local-serverless-path.js
@@ -2,18 +2,15 @@
 
 const path = require('path');
 const memoizee = require('memoizee');
-const resolve = require('ncjsm/resolve');
+const resolveSync = require('ncjsm/resolve/sync');
 
-module.exports = memoizee(
-  async () => {
-    try {
-      return path.resolve(
-        path.dirname((await resolve(process.cwd(), 'serverless')).realPath),
-        '..'
-      );
-    } catch {
-      return null;
-    }
-  },
-  { promise: true }
-);
+// This method should be kept as sync. The reason for it is the fact that
+// telemetry generation and persistence needs to be run in sync manner
+// and it depends on this function, either directly or indirectly.
+module.exports = memoizee(() => {
+  try {
+    return path.resolve(path.dirname(resolveSync(process.cwd(), 'serverless').realPath), '..');
+  } catch {
+    return null;
+  }
+});
diff --git a/lib/plugins/config.js b/lib/plugins/config.js
index ae295c04e7e..74c74c7f1e0 100644
--- a/lib/plugins/config.js
+++ b/lib/plugins/config.js
@@ -91,7 +91,7 @@ class Config {
           throw new ServerlessError(noSupportErrorMessage, 'AUTO_UPDATE_NOT_SUPPORTED');
         }
       } else {
-        if (!(await isNpmGlobalPackage())) {
+        if (!isNpmGlobalPackage()) {
           throw new ServerlessError(noSupportErrorMessage, 'AUTO_UPDATE_NOT_SUPPORTED');
         }
         if (!(await isNpmPackageWritable())) {
diff --git a/lib/utils/eventuallyUpdate.js b/lib/utils/eventuallyUpdate.js
index becfab529f6..9b11eb8121a 100644
--- a/lib/utils/eventuallyUpdate.js
+++ b/lib/utils/eventuallyUpdate.js
@@ -90,7 +90,7 @@ module.exports = async (serverless) => {
   if (serverless.isLocallyInstalled) return;
   if (serverless.isStandaloneExecutable) {
     if (process.platform === 'win32') return;
-  } else if (!(await isNpmGlobalPackage())) {
+  } else if (!isNpmGlobalPackage()) {
     return;
   }
   const currentVersionData = semver.parse(currentVersion);
diff --git a/lib/utils/is-locally-installed.js b/lib/utils/is-locally-installed.js
index e65f8b8cb55..83689ee5cd6 100644
--- a/lib/utils/is-locally-installed.js
+++ b/lib/utils/is-locally-installed.js
@@ -5,7 +5,10 @@ const resolveLocalServerlessPath = require('../cli/resolve-local-serverless-path
 
 const serverlessPath = path.resolve(__dirname, '../..');
 
-module.exports = async () => {
-  const localServerlessPath = await resolveLocalServerlessPath();
+// This method should be kept as sync. The reason for it is the fact that
+// telemetry generation and persistence needs to be run in sync manner
+// and it depends on this function, either directly or indirectly.
+module.exports = () => {
+  const localServerlessPath = resolveLocalServerlessPath();
   return serverlessPath === localServerlessPath;
 };
diff --git a/lib/utils/npmPackage/isGlobal.js b/lib/utils/npmPackage/isGlobal.js
index a1373ba29fc..54f04806f76 100644
--- a/lib/utils/npmPackage/isGlobal.js
+++ b/lib/utils/npmPackage/isGlobal.js
@@ -2,21 +2,21 @@
 
 const memoizee = require('memoizee');
 const path = require('path');
-const spawn = require('child-process-ext/spawn');
+const { spawnSync } = require('child_process');
 
 const serverlessPackageRoot = path.resolve(__dirname, '../../../');
 
-module.exports = memoizee(
-  async () => {
-    const npmPackagesRoot = await (async () => {
-      try {
-        return String((await spawn('npm', ['root', '-g'])).stdoutBuffer).trim();
-      } catch {
-        return null;
-      }
-    })();
-    if (!npmPackagesRoot) return false;
-    return path.resolve(npmPackagesRoot, 'serverless') === serverlessPackageRoot;
-  },
-  { type: 'promise' }
-);
+// This method should be kept as sync. The reason for it is the fact that
+// telemetry generation and persistence needs to be run in sync manner
+// and it depends on this function, either directly or indirectly.
+module.exports = memoizee(() => {
+  const npmPackagesRoot = (() => {
+    try {
+      return String(spawnSync('npm', ['root', '-g']).stdout).trim();
+    } catch {
+      return null;
+    }
+  })();
+  if (!npmPackagesRoot) return false;
+  return path.resolve(npmPackagesRoot, 'serverless') === serverlessPackageRoot;
+});
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index 3678d8f50f3..a01988fbb27 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -2,8 +2,8 @@
 
 const path = require('path');
 const os = require('os');
-const fs = require('fs').promises;
-const resolve = require('ncjsm/resolve');
+const fs = require('fs');
+const resolveSync = require('ncjsm/resolve/sync');
 const _ = require('lodash');
 const isPlainObject = require('type/plain-object/is');
 const isObject = require('type/object/is');
@@ -19,11 +19,11 @@ const AWS = require('aws-sdk');
 
 const configValidationModeValues = new Set(['off', 'warn', 'error']);
 
-const checkIsTabAutocompletionInstalled = async () => {
+const checkIsTabAutocompletionInstalled = () => {
   try {
-    return (await fs.readdir(path.resolve(os.homedir(), '.config/tabtab'))).some((filename) =>
-      filename.startsWith('serverless.')
-    );
+    return fs
+      .readdirSync(path.resolve(os.homedir(), '.config/tabtab'))
+      .some((filename) => filename.startsWith('serverless.'));
   } catch {
     return false;
   }
@@ -124,7 +124,9 @@ const getServiceConfig = ({ configuration, options }) => {
   return result;
 };
 
-module.exports = async ({
+// This method is explicitly kept as synchronous. The reason for it being the fact that it needs to
+// be executed in such manner due to its use in `process.on('SIGINT')` handler.
+module.exports = ({
   command,
   options,
   commandSchema,
@@ -176,7 +178,7 @@ module.exports = async ({
     return userConfig.get('userId');
   })();
 
-  const isLocallyInstalled = await (async () => {
+  const isLocallyInstalled = (() => {
     if (serverless) {
       return serverless.isLocallyInstalled;
     }
@@ -184,31 +186,29 @@ module.exports = async ({
     return resolveIsLocallyInstalled();
   })();
 
-  const usedVersions = await (async () => {
-    if (!isLocallyInstalled || (await resolveIsLocallyInstalled())) {
+  const usedVersions = (() => {
+    if (!isLocallyInstalled || resolveIsLocallyInstalled()) {
       return {
         'serverless': require('../../../package').version,
         '@serverless/dashboard-plugin': require('@serverless/dashboard-plugin/package').version,
       };
     }
-    const localServerlessPath = await resolveLocalServerlessPath();
+    const localServerlessPath = resolveLocalServerlessPath();
     return {
       'serverless': require(path.resolve(localServerlessPath, 'package.json')).version,
       // Since v2.42.0 it's "@serverless/dashboard-plugin"
-      '@serverless/dashboard-plugin': await (async () => {
+      '@serverless/dashboard-plugin': (() => {
         try {
-          return require((
-            await resolve(localServerlessPath, '@serverless/dashboard-plugin/package')
-          ).realPath).version;
+          return require(resolveSync(localServerlessPath, '@serverless/dashboard-plugin/package')
+            .realPath).version;
         } catch {
           return undefined;
         }
       })(),
-      '@serverless/enterprise-plugin': await (async () => {
+      '@serverless/enterprise-plugin': (() => {
         try {
-          return require((
-            await resolve(localServerlessPath, '@serverless/enterprise-plugin/package')
-          ).realPath).version;
+          return require(resolveSync(localServerlessPath, '@serverless/enterprise-plugin/package')
+            .realPath).version;
         } catch {
           return undefined;
         }
@@ -230,19 +230,19 @@ module.exports = async ({
     },
     firstLocalInstallationTimestamp: userConfig.get('meta.created_at'),
     frameworkLocalUserId: userConfig.get('frameworkId'),
-    installationType: await (async () => {
+    installationType: (() => {
       if (isStandalone) {
         if (process.platform === 'win32') return 'global:standalone:windows';
         return 'global:standalone:other';
       }
       if (!isLocallyInstalled) {
-        return (await isNpmGlobal()) ? 'global:npm' : 'global:other';
+        return isNpmGlobal() ? 'global:npm' : 'global:other';
       }
       if (serverless && serverless.isInvokedByGlobalInstallation) return 'local:fallback';
       return 'local:direct';
     })(),
     isAutoUpdateEnabled: Boolean(userConfig.get('autoUpdate.enabled')),
-    isTabAutocompletionInstalled: await checkIsTabAutocompletionInstalled(),
+    isTabAutocompletionInstalled: checkIsTabAutocompletionInstalled(),
     timestamp: Date.now(),
     timezone,
     triggeredDeprecations: Array.from(triggeredDeprecations),
diff --git a/lib/utils/telemetry/index.js b/lib/utils/telemetry/index.js
index da6cea7362a..fecf62ed3a9 100644
--- a/lib/utils/telemetry/index.js
+++ b/lib/utils/telemetry/index.js
@@ -89,7 +89,9 @@ async function request(payload, { ids, timeout } = {}) {
   return processResponseBody(response, ids, startTime);
 }
 
-async function storeLocally(payload, options = {}) {
+// This method is explicitly kept as synchronous. The reason for it being the fact that it needs to
+// be executed in such manner due to its use in `process.on('SIGINT')` handler.
+function storeLocally(payload, options = {}) {
   ensurePlainObject(payload);
   if (!telemetryUrl) return null;
   const isForced = options && options.isForced;
@@ -97,13 +99,13 @@ async function storeLocally(payload, options = {}) {
   if (!cacheDirPath) return null;
   const id = uuid();
 
-  return (async function self() {
+  return (function self() {
     try {
-      return await fse.writeJson(join(cacheDirPath, id), { payload, timestamp: Date.now() });
+      return fse.writeJsonSync(join(cacheDirPath, id), { payload, timestamp: Date.now() });
     } catch (error) {
       if (error.code === 'ENOENT') {
         try {
-          await fse.ensureDir(cacheDirPath);
+          fse.ensureDirSync(cacheDirPath);
           return self();
         } catch (ensureDirError) {
           logError('Cache dir creation error:', ensureDirError);
diff --git a/scripts/postinstall.js b/scripts/postinstall.js
index 626af6045b2..2670cb819f5 100644
--- a/scripts/postinstall.js
+++ b/scripts/postinstall.js
@@ -10,37 +10,35 @@ const truthyStr = (val) => val && !['0', 'false', 'f', 'n', 'no'].includes(val.t
 const { CI, ADBLOCK, SILENT } = process.env;
 const isNpmGlobalPackage = require('../lib/utils/npmPackage/isGlobal');
 
-(async () => {
-  if (!truthyStr(CI) && !truthyStr(ADBLOCK) && !truthyStr(SILENT)) {
-    const messageTokens = ['Serverless Framework successfully installed!'];
-
-    if (isStandaloneExecutable && !isWindows) {
-      messageTokens.push(
-        'To start your first project, please open another terminal and run “serverless”.'
-      );
-    } else {
-      messageTokens.push('To start your first project run “serverless”.');
-    }
-
-    if ((isStandaloneExecutable && !isWindows) || (await isNpmGlobalPackage())) {
-      messageTokens.push('Turn on automatic updates by running “serverless config --autoupdate”.');
-    }
-
-    if (isStandaloneExecutable && !isWindows) {
-      messageTokens.push('Uninstall at any time by running “serverless uninstall”.');
-    }
-
-    const message = messageTokens.join('\n\n');
-    process.stdout.write(
-      `${
-        isStandaloneExecutable && isWindows
-          ? message
-          : boxen(chalk.yellow(message), {
-              padding: 1,
-              margin: 1,
-              borderColor: 'yellow',
-            })
-      }\n`
+if (!truthyStr(CI) && !truthyStr(ADBLOCK) && !truthyStr(SILENT)) {
+  const messageTokens = ['Serverless Framework successfully installed!'];
+
+  if (isStandaloneExecutable && !isWindows) {
+    messageTokens.push(
+      'To start your first project, please open another terminal and run “serverless”.'
     );
+  } else {
+    messageTokens.push('To start your first project run “serverless”.');
+  }
+
+  if ((isStandaloneExecutable && !isWindows) || isNpmGlobalPackage()) {
+    messageTokens.push('Turn on automatic updates by running “serverless config --autoupdate”.');
   }
-})();
+
+  if (isStandaloneExecutable && !isWindows) {
+    messageTokens.push('Uninstall at any time by running “serverless uninstall”.');
+  }
+
+  const message = messageTokens.join('\n\n');
+  process.stdout.write(
+    `${
+      isStandaloneExecutable && isWindows
+        ? message
+        : boxen(chalk.yellow(message), {
+            padding: 1,
+            margin: 1,
+            borderColor: 'yellow',
+          })
+    }\n`
+  );
+}
diff --git a/scripts/serverless.js b/scripts/serverless.js
index f531b61db46..415153230b9 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -419,8 +419,8 @@ const processSpanPromise = (async () => {
 
       hasTelemetryBeenReported = true;
       if (!isTelemetryDisabled) {
-        await storeTelemetryLocally(
-          await generateTelemetryPayload({
+        storeTelemetryLocally(
+          generateTelemetryPayload({
             command,
             options,
             commandSchema,
@@ -702,15 +702,15 @@ const processSpanPromise = (async () => {
 
       hasTelemetryBeenReported = true;
       if (!isTelemetryDisabled && !isHelpRequest && serverless.isTelemetryReportedExternally) {
-        await storeTelemetryLocally({
-          ...(await generateTelemetryPayload({
+        storeTelemetryLocally({
+          ...generateTelemetryPayload({
             command,
             options,
             commandSchema,
             serviceDir,
             configuration,
             serverless,
-          })),
+          }),
           outcome: 'success',
         });
         let backendNotificationRequest;
diff --git a/test/unit/lib/cli/handle-error.test.js b/test/unit/lib/cli/handle-error.test.js
index 160dde04980..bcab06b80eb 100644
--- a/test/unit/lib/cli/handle-error.test.js
+++ b/test/unit/lib/cli/handle-error.test.js
@@ -102,7 +102,7 @@ describe('test/unit/lib/cli/handle-error.test.js', () => {
   });
 
   describe('with mocked telemetry', () => {
-    const generateTelemetryPayloadStub = sinon.stub().resolves({});
+    const generateTelemetryPayloadStub = sinon.stub().returns({});
     const storeTelemetryLocallyStub = sinon.stub();
     const sendTelemetryStub = sinon.stub();
     const resolveInputStub = sinon.stub().returns({ commandSchema: {} });
diff --git a/test/unit/lib/cli/resolve-local-serverless-path.test.js b/test/unit/lib/cli/resolve-local-serverless-path.test.js
index 802466e799e..24dc62da481 100644
--- a/test/unit/lib/cli/resolve-local-serverless-path.test.js
+++ b/test/unit/lib/cli/resolve-local-serverless-path.test.js
@@ -8,9 +8,10 @@ const fse = require('fs-extra');
 const resolveLocalServerless = require('../../../../lib/cli/resolve-local-serverless-path');
 
 describe('test/unit/lib/cli/resolve-local-serverless.test.js', () => {
-  it('should resolve with `null` when no local installation is found', async () => {
-    expect(await resolveLocalServerless()).to.equal(null);
+  it('should resolve with `null` when no local installation is found', () => {
+    expect(resolveLocalServerless()).to.equal(null);
   });
+
   it('should resolve with `null` when no local installation is found', async () => {
     resolveLocalServerless.delete();
     const tmpServerlessPath = path.resolve(
@@ -25,6 +26,6 @@ describe('test/unit/lib/cli/resolve-local-serverless.test.js', () => {
         JSON.stringify({ main: 'lib/Serverless.js' })
       ),
     ]);
-    expect(await fsp.realpath(await resolveLocalServerless())).to.equal(tmpServerlessPath);
+    expect(await fsp.realpath(resolveLocalServerless())).to.equal(tmpServerlessPath);
   });
 });
diff --git a/test/unit/lib/plugins/aws/provider.test.js b/test/unit/lib/plugins/aws/provider.test.js
index db0fbce1cd3..75c96800b71 100644
--- a/test/unit/lib/plugins/aws/provider.test.js
+++ b/test/unit/lib/plugins/aws/provider.test.js
@@ -1151,7 +1151,7 @@ aws_secret_access_key = CUSTOMSECRET
       });
       const modulesCacheStub = {
         'child-process-ext/spawn': spawnExtStub,
-        './lib/utils/telemetry/generatePayload.js': async () => ({}),
+        './lib/utils/telemetry/generatePayload.js': () => ({}),
       };
 
       beforeEach(() => {
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index 411525068ca..ae7685f7a7e 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -93,7 +93,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       cwd: serviceDir,
       command: 'print',
     });
-    const payload = await generatePayload({
+    const payload = generatePayload({
       command: 'print',
       options: {},
       commandSchema: commandsSchema.get('print'),
@@ -155,7 +155,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       fixture: 'customProvider',
       command: 'print',
     });
-    const payload = await generatePayload({
+    const payload = generatePayload({
       command: 'print',
       options: {},
       commandSchema: commandsSchema.get('print'),
@@ -217,7 +217,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       command: 'print',
       modulesCacheStub: {},
     });
-    const payload = await overrideCwd(serviceDir, async () =>
+    const payload = overrideCwd(serviceDir, () =>
       generatePayload({
         command: 'print',
         options: {},
@@ -274,7 +274,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should resolve service-agnostic payload', async () => {
-    const payload = await generatePayload({
+    const payload = generatePayload({
       command: 'config',
       options: {},
       commandSchema: commandsSchema.get('config'),
@@ -308,8 +308,8 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     });
   });
 
-  it('Should resolve service-agnostic payload for command with `serviceDependencyMode: "optional"`', async () => {
-    const payload = await generatePayload({
+  it('Should resolve service-agnostic payload for command with `serviceDependencyMode: "optional"`', () => {
+    const payload = generatePayload({
       command: '',
       options: {},
       commandSchema: commandsSchema.get(''),
@@ -358,8 +358,8 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     });
   });
 
-  it('Should correctly resolve payload with missing service configuration', async () => {
-    const payload = await generatePayload({
+  it('Should correctly resolve payload with missing service configuration', () => {
+    const payload = generatePayload({
       command: 'plugin list',
       options: {},
       commandSchema: commandsSchema.get('plugin list'),
@@ -403,7 +403,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       })
     );
 
-    const payload = await generatePayload({
+    const payload = generatePayload({
       command: 'config',
       options: {},
       commandSchema: commandsSchema.get('config'),
@@ -426,8 +426,8 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
 
     let payload;
 
-    await overrideEnv({ variables: { SERVERLESS_ACCESS_KEY: 'some-key' } }, async () => {
-      payload = await generatePayload({
+    overrideEnv({ variables: { SERVERLESS_ACCESS_KEY: 'some-key' } }, () => {
+      payload = generatePayload({
         command: 'config',
         options: {},
         commandSchema: commandsSchema.get('config'),
@@ -439,11 +439,11 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     expect(payload.frameworkLocalUserId).to.equal('123');
   });
 
-  it('Should correctly detect Serverless CI/CD', async () => {
+  it('Should correctly detect Serverless CI/CD', () => {
     let payload;
 
-    await overrideEnv({ variables: { SERVERLESS_CI_CD: 'true' } }, async () => {
-      payload = await generatePayload({
+    overrideEnv({ variables: { SERVERLESS_CI_CD: 'true' } }, () => {
+      payload = generatePayload({
         command: 'config',
         options: {},
         commandSchema: commandsSchema.get('config'),
@@ -454,11 +454,11 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     expect(payload.ciName).to.equal('Serverless CI/CD');
   });
 
-  it('Should correctly detect Seed CI/CD', async () => {
+  it('Should correctly detect Seed CI/CD', () => {
     let payload;
 
-    await overrideEnv({ variables: { SEED_APP_NAME: 'some-app' } }, async () => {
-      payload = await generatePayload({
+    overrideEnv({ variables: { SEED_APP_NAME: 'some-app' } }, () => {
+      payload = generatePayload({
         command: 'config',
         options: {},
         commandSchema: commandsSchema.get('config'),
@@ -469,8 +469,8 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     expect(payload.ciName).to.equal('Seed');
   });
 
-  it('Should correctly resolve `commandOptionNames` property', async () => {
-    const payload = await generatePayload({
+  it('Should correctly resolve `commandOptionNames` property', () => {
+    const payload = generatePayload({
       command: 'print',
       options: {
         region: 'eu-west-1',
@@ -487,8 +487,8 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     );
   });
 
-  it('Should correctly resolve `constructs` property', async () => {
-    const payload = await generatePayload({
+  it('Should correctly resolve `constructs` property', () => {
+    const payload = generatePayload({
       command: 'print',
       commandSchema: commandsSchema.get('print'),
       options: {},
@@ -523,8 +523,8 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     ]);
   });
 
-  it('Should correctly resolve `configValidationMode` property', async () => {
-    const payload = await generatePayload({
+  it('Should correctly resolve `configValidationMode` property', () => {
+    const payload = generatePayload({
       command: 'print',
       commandSchema: commandsSchema.get('print'),
       options: {},
@@ -538,12 +538,12 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     expect(payload.config.configValidationMode).to.equal('off');
   });
 
-  it('Should correctly resolve `hasLocalCredentials` property for AWS provider', async () => {
+  it('Should correctly resolve `hasLocalCredentials` property for AWS provider', () => {
     let payload;
-    await overrideEnv(
+    overrideEnv(
       { variables: { AWS_ACCESS_KEY_ID: 'someaccesskey', AWS_SECRET_ACCESS_KEY: 'secretkey' } },
-      async () => {
-        payload = await generatePayload({
+      () => {
+        payload = generatePayload({
           command: 'print',
           options: {},
           commandSchema: commandsSchema.get('print'),
@@ -556,12 +556,12 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     expect(payload.hasLocalCredentials).to.equal(true);
   });
 
-  it('Should correctly resolve `hasLocalCredentials` property for non-AWS provider', async () => {
+  it('Should correctly resolve `hasLocalCredentials` property for non-AWS provider', () => {
     let payload;
-    await overrideEnv(
+    overrideEnv(
       { variables: { AWS_ACCESS_KEY_ID: 'someaccesskey', AWS_SECRET_ACCESS_KEY: 'secretkey' } },
-      async () => {
-        payload = await generatePayload({
+      () => {
+        payload = generatePayload({
           command: 'print',
           options: {},
           commandSchema: commandsSchema.get('print'),
@@ -574,8 +574,8 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     expect(payload.hasLocalCredentials).to.equal(false);
   });
 
-  it('Should correctly resolve `commandUsage` property', async () => {
-    const payload = await generatePayload({
+  it('Should correctly resolve `commandUsage` property', () => {
+    const payload = generatePayload({
       command: 'print',
       options: {},
       commandSchema: commandsSchema.get('print'),
diff --git a/test/unit/lib/utils/telemetry/index.test.js b/test/unit/lib/utils/telemetry/index.test.js
index 1a39460c89d..1bbfb9bea4f 100644
--- a/test/unit/lib/utils/telemetry/index.test.js
+++ b/test/unit/lib/utils/telemetry/index.test.js
@@ -62,7 +62,7 @@ describe('test/unit/lib/utils/telemetry/index.test.js', () => {
 
   it('`storeLocally` should persist an event in cacheDir', async () => {
     const payload = { test: 'payloadvalue' };
-    await storeLocally(payload);
+    storeLocally(payload);
     const dirFilenames = await fse.readdir(cacheDirPath);
     expect(dirFilenames.length).to.equal(1);
     const persistedEvent = await fse.readJson(path.join(cacheDirPath, dirFilenames[0]));

From 5b54ed2e2685c24439c0f835b50a024dbf9d39a9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 6 Jul 2021 10:30:36 +0200
Subject: [PATCH 0299/1101] refactor: Drop old variables engine related
 deprecation

Old variables engine will be removed with next major, so there's no point to communicate breaking changes that were supposed to introduced if it was to stay
---
 lib/classes/Variables.js                      |  7 ------
 .../eventually-report-resolution-errors.js    |  2 --
 scripts/serverless.js                         |  2 --
 test/unit/lib/classes/Variables.test.js       | 23 ++++++++-----------
 4 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/lib/classes/Variables.js b/lib/classes/Variables.js
index d68fb681bd8..c62a8fa18bb 100644
--- a/lib/classes/Variables.js
+++ b/lib/classes/Variables.js
@@ -992,13 +992,6 @@ class Variables {
       );
     }
 
-    if (!this.service.unresolvedVariablesNotificationMode) {
-      this.serverless._logDeprecation(
-        'VARIABLES_ERROR_ON_UNRESOLVED',
-        'Unresolved variable references will be communicated with a thrown error, starting from next major'
-      );
-    }
-
     logWarning(
       `A valid ${varType} to satisfy the declaration '${variableString}' could not be found.`
     );
diff --git a/lib/configuration/variables/eventually-report-resolution-errors.js b/lib/configuration/variables/eventually-report-resolution-errors.js
index 5a8838c8790..29819fac025 100644
--- a/lib/configuration/variables/eventually-report-resolution-errors.js
+++ b/lib/configuration/variables/eventually-report-resolution-errors.js
@@ -40,8 +40,6 @@ module.exports = (configurationPath, configuration, variablesMeta) => {
         'to adapt to new behavior now',
       { serviceConfig: configuration }
     );
-    // Hack to not duplicate the warning with similar deprecation
-    logDeprecation.triggeredDeprecations.add('VARIABLES_ERROR_ON_UNRESOLVED');
   }
 
   return true;
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 415153230b9..dc6292a3bc4 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -297,8 +297,6 @@ const processSpanPromise = (async () => {
             if (
               !ensureResolvedProperty('provider\0stage', { shouldSilentlyReturnIfLegacyMode: true })
             ) {
-              // Hack to not duplicate the warning with similar deprecation
-              logDeprecation.triggeredDeprecations.add('VARIABLES_ERROR_ON_UNRESOLVED');
               return;
             }
 
diff --git a/test/unit/lib/classes/Variables.test.js b/test/unit/lib/classes/Variables.test.js
index 3398e9725ad..2bf500195f4 100644
--- a/test/unit/lib/classes/Variables.test.js
+++ b/test/unit/lib/classes/Variables.test.js
@@ -1216,7 +1216,6 @@ module.exports = {
     it('should not allow partially double-quoted string', async () => {
       const property = '${opt:stage, prefix"prod"suffix}';
       serverless.variables.options = {};
-      serverless.configurationInput.disabledDeprecations = ['VARIABLES_ERROR_ON_UNRESOLVED'];
       const handleUnresolvedSpy = sinon.spy(serverless.variables, 'handleUnresolved');
       try {
         expect(await serverless.variables.populateProperty(property)).to.equal(undefined);
@@ -2866,8 +2865,8 @@ describe('test/unit/lib/classes/Variables.test.js', () => {
     });
 
     describe('when unresolvedVariablesNotificationMode is set to "warn"', () => {
-      it('prints warnings to the console but no deprecation message', async () => {
-        const { serverless, stdoutData } = await runServerless({
+      it('should warn', async () => {
+        const { stdoutData } = await runServerless({
           fixture: 'variables-legacy',
           command: 'print',
           configExt: {
@@ -2881,11 +2880,6 @@ describe('test/unit/lib/classes/Variables.test.js', () => {
           },
           shouldUseLegacyVariablesResolver: true,
         });
-
-        expect(Array.from(serverless.triggeredDeprecations)).not.to.contain(
-          'VARIABLES_ERROR_ON_UNRESOLVED'
-        );
-
         expect(stdoutData).to.include('Serverless Warning');
         expect(stdoutData).to.include('A valid environment variable to satisfy the declaration');
         expect(stdoutData).to.include('A valid option to satisfy the declaration');
@@ -2895,12 +2889,11 @@ describe('test/unit/lib/classes/Variables.test.js', () => {
     });
 
     describe('when unresolvedVariablesNotificationMode is not set', () => {
-      it('should warn and print a deprecation message', async () => {
-        const { serverless } = await runServerless({
+      it('should warn', async () => {
+        const { stdoutData } = await runServerless({
           fixture: 'variables-legacy',
           command: 'print',
           configExt: {
-            disabledDeprecations: ['VARIABLES_ERROR_ON_UNRESOLVED'],
             custom: {
               myVariable1: '${env:missingEnvVar}',
               myVariable2: '${opt:missingOpt}',
@@ -2911,9 +2904,11 @@ describe('test/unit/lib/classes/Variables.test.js', () => {
           shouldUseLegacyVariablesResolver: true,
         });
 
-        expect(Array.from(serverless.triggeredDeprecations)).to.contain(
-          'VARIABLES_ERROR_ON_UNRESOLVED'
-        );
+        expect(stdoutData).to.include('Serverless Warning');
+        expect(stdoutData).to.include('A valid environment variable to satisfy the declaration');
+        expect(stdoutData).to.include('A valid option to satisfy the declaration');
+        expect(stdoutData).to.include('A valid service attribute to satisfy the declaration');
+        expect(stdoutData).to.include('A valid file to satisfy the declaration');
       });
     });
   });

From b5d3167e9fdd5f08af1389b975322f2146b22507 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 6 Jul 2021 15:32:38 +0200
Subject: [PATCH 0300/1101] fix(Telemetry): Ensure to pass all steps with
 configured questions

---
 lib/cli/interactive-setup/index.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/cli/interactive-setup/index.js b/lib/cli/interactive-setup/index.js
index 5c29dfd6afe..8edfe731a92 100644
--- a/lib/cli/interactive-setup/index.js
+++ b/lib/cli/interactive-setup/index.js
@@ -12,7 +12,11 @@ const steps = {
 };
 
 module.exports = async (context) => {
-  const stepsDetails = new Map();
+  const stepsDetails = new Map(
+    Object.entries(steps).map(([stepName, step]) => {
+      return [stepName, { configuredQuestions: step.configuredQuestions }];
+    })
+  );
   const { commandUsage } = context;
   const history = new Map();
   context = { ...context, inquirer, history };
@@ -33,11 +37,10 @@ module.exports = async (context) => {
     delete context.stepHistory;
     delete context.inapplicabilityReasonCode;
     const stepData = await step.isApplicable(context);
-    stepsDetails.set(stepName, {
+    Object.assign(stepsDetails.get(stepName), {
       isApplicable: Boolean(stepData),
       inapplicabilityReasonCode: context.inapplicabilityReasonCode,
       timestamp: Date.now(),
-      configuredQuestions: step.configuredQuestions,
     });
     if (stepData) {
       process.stdout.write('\n');

From 502f7e711f0954c2960fb790b749002aeb1789fc Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 6 Jul 2021 11:52:06 +0200
Subject: [PATCH 0301/1101] feat(Telemetry): Handle interruptions and persist
 telemetry data

---
 scripts/serverless.js | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index dc6292a3bc4..ac958a4f42e 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -35,7 +35,13 @@ const commandUsage = {};
 
 let hasTelemetryBeenReported = false;
 
-process.once('uncaughtException', (error) =>
+// Inquirer async operations do not keep node process alive
+// We need to issue a keep alive timer so process does not die
+// to propery handle e.g. `SIGINT` interrupt
+const keepAliveTimer = setTimeout(() => {}, 60 * 60 * 1000);
+
+process.once('uncaughtException', (error) => {
+  clearTimeout(keepAliveTimer);
   handleError(error, {
     isUncaughtException: true,
     command,
@@ -46,8 +52,30 @@ process.once('uncaughtException', (error) =>
     serverless,
     hasTelemetryBeenReported,
     commandUsage,
-  })
-);
+  });
+});
+
+process.on('SIGINT', () => {
+  clearTimeout(keepAliveTimer);
+  if (
+    commandSchema &&
+    !hasTelemetryBeenReported &&
+    !isTelemetryDisabled &&
+    (serverless ? serverless.isTelemetryReportedExternally : true)
+  ) {
+    const telemetryPayload = generateTelemetryPayload({
+      command,
+      options,
+      commandSchema,
+      serviceDir,
+      configuration,
+      serverless,
+      commandUsage,
+    });
+    storeTelemetryLocally({ ...telemetryPayload, outcome: 'interrupted' });
+  }
+  process.exit(1);
+});
 
 const processSpanPromise = (async () => {
   try {
@@ -756,5 +784,7 @@ const processSpanPromise = (async () => {
       hasTelemetryBeenReported,
       commandUsage,
     });
+  } finally {
+    clearTimeout(keepAliveTimer);
   }
 })();

From 0c5b8dd831bcde80628c2ac548172ffaa9ce9ca6 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 6 Jul 2021 14:40:51 +0200
Subject: [PATCH 0302/1101] fix(Telemetry): Correctly report `outcome` for
 interactive setup

---
 scripts/serverless.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index ac958a4f42e..0a58281aa5f 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -72,7 +72,7 @@ process.on('SIGINT', () => {
       serverless,
       commandUsage,
     });
-    storeTelemetryLocally({ ...telemetryPayload, outcome: 'interrupted' });
+    storeTelemetryLocally({ ...telemetryPayload, outcome: 'interrupt' });
   }
   process.exit(1);
 });
@@ -445,16 +445,17 @@ const processSpanPromise = (async () => {
 
       hasTelemetryBeenReported = true;
       if (!isTelemetryDisabled) {
-        storeTelemetryLocally(
-          generateTelemetryPayload({
+        storeTelemetryLocally({
+          ...generateTelemetryPayload({
             command,
             options,
             commandSchema,
             serviceDir,
             configuration: configurationFromInteractive,
             commandUsage,
-          })
-        );
+          }),
+          outcome: 'success',
+        });
         await sendTelemetry({ serverlessExecutionSpan: processSpanPromise });
       }
       return;

From 840f99aa7453ed8232382e456b5cc11a0d89b510 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 6 Jul 2021 16:38:42 +0200
Subject: [PATCH 0303/1101] chore: Bump dependencies

---
 package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index db9bc94489a..38f0b03aa69 100644
--- a/package.json
+++ b/package.json
@@ -23,13 +23,13 @@
   },
   "dependencies": {
     "@serverless/cli": "^1.5.2",
-    "@serverless/components": "^3.13.1",
+    "@serverless/components": "^3.13.2",
     "@serverless/dashboard-plugin": "^5.4.3",
     "@serverless/utils": "^5.3.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.937.0",
+    "aws-sdk": "^2.939.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
@@ -38,7 +38,7 @@
     "ci-info": "^3.2.0",
     "cli-progress-footer": "^1.1.1",
     "d": "^1.0.1",
-    "dayjs": "^1.10.5",
+    "dayjs": "^1.10.6",
     "decompress": "^4.2.1",
     "dotenv": "^10.0.0",
     "essentials": "^1.1.1",
@@ -80,8 +80,8 @@
     "@serverless/test": "^8.2.0",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "cos-nodejs-sdk-v5": "^2.9.20",
-    "eslint": "^7.29.0",
+    "cos-nodejs-sdk-v5": "^2.9.21",
+    "eslint": "^7.30.0",
     "eslint-plugin-import": "^2.23.4",
     "git-list-updated": "^1.2.1",
     "github-release-from-cc-changelog": "^2.2.0",
@@ -101,7 +101,7 @@
     "sinon-chai": "^3.7.0",
     "standard-version": "^9.3.0",
     "strip-ansi": "^6.0.0",
-    "ws": "^7.5.1",
+    "ws": "^7.5.2",
     "xml2js": "^0.4.23"
   },
   "eslintConfig": {

From 334dbf8fb4610ab8e633de022cc06ddd07ed3efe Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 6 Jul 2021 17:52:36 +0200
Subject: [PATCH 0304/1101] chore: Add `AWS Kafka` to commitlint

---
 commitlint.config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/commitlint.config.js b/commitlint.config.js
index 6975195c9dd..be925eec393 100644
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -25,6 +25,7 @@ module.exports = {
         'AWS Info',
         'AWS Invocation',
         'AWS IOT',
+        'AWS Kafka',
         'AWS Kinesis',
         'AWS Lambda',
         'AWS Local Invocation',

From b86f8cd71571196fa6558d2d6f1c7602bd0a07c9 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 6 Jul 2021 17:53:06 +0200
Subject: [PATCH 0305/1101] chore: Release 2.51.0

---
 CHANGELOG.md | 26 ++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d60e50b5943..6471ba99869 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,32 @@
 
 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.
 
+## [2.51.0](https://github.com/serverless/serverless/compare/v2.50.0...v2.51.0) (2021-07-06)
+
+### Features
+
+- **AWS Kafka:** Add support for `SASL/PLAIN` auth to `kafka` event ([#9666](https://github.com/serverless/serverless/pull/9666)) ([3e14f06](https://github.com/serverless/serverless/commit/3e14f063052385026425021379bfc883dac5ff74)) ([Daniele Iasella](https://github.com/overbit))
+- **CLI:** New `warn:summary` (default) deprecations logging mode ([#9693](https://github.com/serverless/serverless/pull/9693)) ([9b624a5](https://github.com/serverless/serverless/commit/9b624a50677a0363c052b4ea567c050af7863073)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **CLI:** Recognize `--verbose` option in `info` command ([#9695](https://github.com/serverless/serverless/pull/9695)) ([b124152](https://github.com/serverless/serverless/commit/b1241522ec378f7b7b431050ddc861fef040efc4)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **CLI:** Fix typo in error message ([#9682](https://github.com/serverless/serverless/issues/9682)) ([f16c45f](https://github.com/serverless/serverless/commit/f16c45f84b8be1e469bfdd92191fc760b8f1631e)) ([KIDANI Akito](https://github.com/kdnakt))
+- **Telemetry:**
+  - Properly handle situation when not in service dir in credentials step ([#9678](https://github.com/serverless/serverless/pull/9678)) ([b21c1e4](https://github.com/serverless/serverless/commit/b21c1e415b67cdc8f1fb0ab14152eaf3c6550894))
+  - Ensure to pass all steps with configured questions ([#9701](https://github.com/serverless/serverless/pull/9701)) ([b5d3167](https://github.com/serverless/serverless/commit/b5d3167e9fdd5f08af1389b975322f2146b22507)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Correctly report `outcome` for interactive setup ([#9699](https://github.com/serverless/serverless/pull/9699)) ([0c5b8dd](https://github.com/serverless/serverless/commit/0c5b8dd831bcde80628c2ac548172ffaa9ce9ca6)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Ensure telemetry generation and related utils are sync ([#9692](https://github.com/serverless/serverless/pull/9692)) ([e65199c](https://github.com/serverless/serverless/commit/e65199c05213e1bac17acedc84cdd6dfd26ff00a)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Report `commandUsage` as object ([#9690](https://github.com/serverless/serverless/pull/9690)) ([cc24bc2](https://github.com/serverless/serverless/commit/cc24bc2ae280237b3d439e1934ab75710e0f259f)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Handle interruptions and persist telemetry data ([#9699](https://github.com/serverless/serverless/pull/9699)) ([502f7e7](https://github.com/serverless/serverless/commit/502f7e711f0954c2960fb790b749002aeb1789fc)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Drop old variables engine related deprecation ([#9698](https://github.com/serverless/serverless/pull/9698)) ([5b54ed2](https://github.com/serverless/serverless/commit/5b54ed2e2685c24439c0f835b50a024dbf9d39a9)) ([Mariusz Nowak](https://github.com/medikoo))
+- Make deprecations default mode internally modifyable ([#9693](https://github.com/serverless/serverless/pull/9693)) ([07a69a8](https://github.com/serverless/serverless/commit/07a69a836c506e3ab8ab976ef27d4f3b672722f7)) ([Mariusz Nowak](https://github.com/medikoo))
+- Replace `fse.createWriteStream` with `fs.createWriteStream` ([#9687](https://github.com/serverless/serverless/pull/9687)) ([3500f64](https://github.com/serverless/serverless/commit/3500f641f5212f196f75081e67d1d1518ac3bb6b)) ([Sudipto Das](https://github.com/sdas13))
+- Use `async` in `lib/plugins/package` ([#9644](https://github.com/serverless/serverless/issues/9644)) ([db67b35](https://github.com/serverless/serverless/commit/db67b353c9ed578d7dd334d162efa1ec11fbfa18)) ([Nyambayar Turbat](https://github.com/nyamba))
+
 ## [2.50.0](https://github.com/serverless/serverless/compare/v2.49.0...v2.50.0) (2021-07-01)
 
 ### Features
diff --git a/package.json b/package.json
index 38f0b03aa69..365b37be659 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.50.0",
+  "version": "2.51.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From c5a3f6907a115ea2d511b0aa9905a2e762514867 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 7 Jul 2021 15:33:17 +0200
Subject: [PATCH 0306/1101] fix(CLI): Fix `SIGINT` signal handling

---
 scripts/serverless.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index 0a58281aa5f..2a257035227 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -55,8 +55,11 @@ process.once('uncaughtException', (error) => {
   });
 });
 
-process.on('SIGINT', () => {
+process.once('SIGINT', () => {
   clearTimeout(keepAliveTimer);
+  // If there's another SIGINT listener (command that works as deamon or reads stdin input)
+  // then let the other listener decide how process will exit
+  const isOtherSigintListener = Boolean(process.listenerCount('SIGINT'));
   if (
     commandSchema &&
     !hasTelemetryBeenReported &&
@@ -74,7 +77,7 @@ process.on('SIGINT', () => {
     });
     storeTelemetryLocally({ ...telemetryPayload, outcome: 'interrupt' });
   }
-  process.exit(1);
+  if (!isOtherSigintListener) process.exit(130);
 });
 
 const processSpanPromise = (async () => {

From dff2799941a1da8c2d5fe76144393db241a7637c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 7 Jul 2021 15:35:17 +0200
Subject: [PATCH 0307/1101] refactor(CLI): Improve module imports order

---
 scripts/serverless.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index 2a257035227..0f7df3095ee 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -14,16 +14,12 @@ if (require('../lib/utils/tabCompletion/isSupported') && process.argv[2] === 'co
 }
 
 const handleError = require('../lib/cli/handle-error');
-const humanizePropertyPathKeys = require('../lib/configuration/variables/humanize-property-path-keys');
-
 const {
   storeLocally: storeTelemetryLocally,
   send: sendTelemetry,
 } = require('../lib/utils/telemetry');
 const generateTelemetryPayload = require('../lib/utils/telemetry/generatePayload');
-const processBackendNotificationRequest = require('../lib/utils/processBackendNotificationRequest');
 const isTelemetryDisabled = require('../lib/utils/telemetry/areDisabled');
-const logDeprecation = require('../lib/utils/logDeprecation');
 
 let command;
 let options;
@@ -80,6 +76,10 @@ process.once('SIGINT', () => {
   if (!isOtherSigintListener) process.exit(130);
 });
 
+const humanizePropertyPathKeys = require('../lib/configuration/variables/humanize-property-path-keys');
+const processBackendNotificationRequest = require('../lib/utils/processBackendNotificationRequest');
+const logDeprecation = require('../lib/utils/logDeprecation');
+
 const processSpanPromise = (async () => {
   try {
     const wait = require('timers-ext/promise/sleep');

From 7354c2000f25d526f8c3fd97c6d4d22054388755 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 7 Jul 2021 15:51:43 +0200
Subject: [PATCH 0308/1101] refactor(Telemetry): Report all interruption
 signals

---
 package.json          |  1 +
 scripts/serverless.js | 53 ++++++++++++++++++++++++-------------------
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index 365b37be659..848686c4dcf 100644
--- a/package.json
+++ b/package.json
@@ -66,6 +66,7 @@
     "promise-queue": "^2.2.5",
     "replaceall": "^0.1.6",
     "semver": "^7.3.5",
+    "signal-exit": "^3.0.3",
     "tabtab": "^3.0.2",
     "tar": "^6.1.0",
     "timers-ext": "^0.1.7",
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 0f7df3095ee..1d511f59493 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -51,29 +51,36 @@ process.once('uncaughtException', (error) => {
   });
 });
 
-process.once('SIGINT', () => {
-  clearTimeout(keepAliveTimer);
-  // If there's another SIGINT listener (command that works as deamon or reads stdin input)
-  // then let the other listener decide how process will exit
-  const isOtherSigintListener = Boolean(process.listenerCount('SIGINT'));
-  if (
-    commandSchema &&
-    !hasTelemetryBeenReported &&
-    !isTelemetryDisabled &&
-    (serverless ? serverless.isTelemetryReportedExternally : true)
-  ) {
-    const telemetryPayload = generateTelemetryPayload({
-      command,
-      options,
-      commandSchema,
-      serviceDir,
-      configuration,
-      serverless,
-      commandUsage,
-    });
-    storeTelemetryLocally({ ...telemetryPayload, outcome: 'interrupt' });
-  }
-  if (!isOtherSigintListener) process.exit(130);
+require('signal-exit/signals').forEach((signal) => {
+  process.once(signal, () => {
+    clearTimeout(keepAliveTimer);
+    // If there's another listener (e.g. we're in deamon context or reading stdin input)
+    // then let the other listener decide how process will exit
+    const isOtherSigintListener = Boolean(process.listenerCount(signal));
+    if (
+      commandSchema &&
+      !hasTelemetryBeenReported &&
+      !isTelemetryDisabled &&
+      (serverless ? serverless.isTelemetryReportedExternally : true)
+    ) {
+      const telemetryPayload = generateTelemetryPayload({
+        command,
+        options,
+        commandSchema,
+        serviceDir,
+        configuration,
+        serverless,
+        commandUsage,
+      });
+      storeTelemetryLocally({ ...telemetryPayload, outcome: 'interrupt', interruptSignal: signal });
+    }
+
+    if (isOtherSigintListener) return;
+    // Follow recommendation from signal-exit:
+    // https://github.com/tapjs/signal-exit/blob/654117d6c9035ff6a805db4d4acf1f0c820fcb21/index.js#L97-L98
+    if (process.platform === 'win32' && signal === 'SIGHUP') signal = 'SIGINT';
+    process.kill(process.pid, signal);
+  });
 });
 
 const humanizePropertyPathKeys = require('../lib/configuration/variables/humanize-property-path-keys');

From 9cea555e88bdaadf717def21b5298a64c7ce79b9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 7 Jul 2021 18:12:34 +0200
Subject: [PATCH 0309/1101] refactor(Telemetry): Report whether we're in
 context of TTY terminal

---
 lib/utils/telemetry/generatePayload.js              |  1 +
 .../lib/utils/telemetry/generatePayload.test.js     | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index a01988fbb27..3b3575d4c67 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -222,6 +222,7 @@ module.exports = ({
 
   const payload = {
     ciName,
+    isTtyTerminal: process.stdin.isTTY,
     cliName: 'serverless',
     command,
     commandOptionNames,
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index ae7685f7a7e..c7a883d8458 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -19,9 +19,16 @@ const versions = {
 };
 
 describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
+  let isTTYCache;
   before(() => {
     // In order for tests below to return `commandDurationMs`
     EvalError.$serverlessCommandStartTime = process.hrtime();
+    isTTYCache = process.stdin.isTTY;
+    process.stdin.isTTY = true;
+  });
+
+  after(() => {
+    process.stdin.isTTY = isTTYCache;
   });
 
   beforeEach(() => {
@@ -117,6 +124,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     delete payload.commandDurationMs;
     expect(payload).to.deep.equal({
       cliName: 'serverless',
+      isTtyTerminal: true,
       command: 'print',
       commandOptionNames: [],
       isConfigValid: true,
@@ -180,6 +188,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     delete payload.commandDurationMs;
     expect(payload).to.deep.equal({
       cliName: 'serverless',
+      isTtyTerminal: true,
       command: 'print',
       commandOptionNames: [],
       isConfigValid: false, // No schema for custom provider
@@ -244,6 +253,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     delete payload.commandDurationMs;
     expect(payload).to.deep.equal({
       cliName: 'serverless',
+      isTtyTerminal: true,
       command: 'print',
       commandOptionNames: [],
       isConfigValid: null,
@@ -298,6 +308,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     delete payload.commandDurationMs;
     expect(payload).to.deep.equal({
       cliName: 'serverless',
+      isTtyTerminal: true,
       command: 'config',
       commandOptionNames: [],
       isAutoUpdateEnabled: false,
@@ -335,6 +346,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       command: '',
       commandOptionNames: [],
       cliName: 'serverless',
+      isTtyTerminal: true,
       isConfigValid: null,
       config: {
         configValidationMode: 'warn',
@@ -381,6 +393,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     delete payload.commandDurationMs;
     expect(payload).to.deep.equal({
       cliName: 'serverless',
+      isTtyTerminal: true,
       command: 'plugin list',
       commandOptionNames: [],
       isAutoUpdateEnabled: false,

From 504b42ae0fefd04ccfa013746371c49a02d8a4d3 Mon Sep 17 00:00:00 2001
From: tlloyd-synalogik <85179420+tlloyd-synalogik@users.noreply.github.com>
Date: Wed, 7 Jul 2021 17:46:39 +0100
Subject: [PATCH 0310/1101] fix(AWS Local Invocation): Bump AWS Java pom
 version to pull in fix

(PR #9714)
---
 lib/plugins/aws/invokeLocal/runtimeWrappers/java/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/pom.xml b/lib/plugins/aws/invokeLocal/runtimeWrappers/java/pom.xml
index 23b45cf5a13..44327eba0e3 100644
--- a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/pom.xml
+++ b/lib/plugins/aws/invokeLocal/runtimeWrappers/java/pom.xml
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-lambda-java-events</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.1</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>

From fd5005e404debe103ca54974ca9aee431554ceb8 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 7 Jul 2021 19:09:33 +0200
Subject: [PATCH 0311/1101] fix(Telemetry): Ensure no doubled telemetry in edge
 cases

---
 scripts/serverless.js | 119 ++++++++++++++++++++++++------------------
 1 file changed, 67 insertions(+), 52 deletions(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index 1d511f59493..acb7fdee9e0 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -38,6 +38,8 @@ const keepAliveTimer = setTimeout(() => {}, 60 * 60 * 1000);
 
 process.once('uncaughtException', (error) => {
   clearTimeout(keepAliveTimer);
+  const cachedHasTelemetryBeenReported = hasTelemetryBeenReported;
+  hasTelemetryBeenReported = true;
   handleError(error, {
     isUncaughtException: true,
     command,
@@ -46,7 +48,7 @@ process.once('uncaughtException', (error) => {
     serviceDir,
     configuration,
     serverless,
-    hasTelemetryBeenReported,
+    hasTelemetryBeenReported: cachedHasTelemetryBeenReported,
     commandUsage,
   });
 });
@@ -57,22 +59,28 @@ require('signal-exit/signals').forEach((signal) => {
     // If there's another listener (e.g. we're in deamon context or reading stdin input)
     // then let the other listener decide how process will exit
     const isOtherSigintListener = Boolean(process.listenerCount(signal));
-    if (
-      commandSchema &&
-      !hasTelemetryBeenReported &&
-      !isTelemetryDisabled &&
-      (serverless ? serverless.isTelemetryReportedExternally : true)
-    ) {
-      const telemetryPayload = generateTelemetryPayload({
-        command,
-        options,
-        commandSchema,
-        serviceDir,
-        configuration,
-        serverless,
-        commandUsage,
-      });
-      storeTelemetryLocally({ ...telemetryPayload, outcome: 'interrupt', interruptSignal: signal });
+    if (!hasTelemetryBeenReported) {
+      hasTelemetryBeenReported = true;
+      if (
+        commandSchema &&
+        !isTelemetryDisabled &&
+        (serverless ? serverless.isTelemetryReportedExternally : true)
+      ) {
+        const telemetryPayload = generateTelemetryPayload({
+          command,
+          options,
+          commandSchema,
+          serviceDir,
+          configuration,
+          serverless,
+          commandUsage,
+        });
+        storeTelemetryLocally({
+          ...telemetryPayload,
+          outcome: 'interrupt',
+          interruptSignal: signal,
+        });
+      }
     }
 
     if (isOtherSigintListener) return;
@@ -453,20 +461,22 @@ const processSpanPromise = (async () => {
 
       logDeprecation.printSummary();
 
-      hasTelemetryBeenReported = true;
-      if (!isTelemetryDisabled) {
-        storeTelemetryLocally({
-          ...generateTelemetryPayload({
-            command,
-            options,
-            commandSchema,
-            serviceDir,
-            configuration: configurationFromInteractive,
-            commandUsage,
-          }),
-          outcome: 'success',
-        });
-        await sendTelemetry({ serverlessExecutionSpan: processSpanPromise });
+      if (!hasTelemetryBeenReported) {
+        hasTelemetryBeenReported = true;
+        if (!isTelemetryDisabled) {
+          storeTelemetryLocally({
+            ...generateTelemetryPayload({
+              command,
+              options,
+              commandSchema,
+              serviceDir,
+              configuration: configurationFromInteractive,
+              commandUsage,
+            }),
+            outcome: 'success',
+          });
+          await sendTelemetry({ serverlessExecutionSpan: processSpanPromise });
+        }
       }
       return;
     }
@@ -737,27 +747,30 @@ const processSpanPromise = (async () => {
 
       logDeprecation.printSummary();
 
-      hasTelemetryBeenReported = true;
-      if (!isTelemetryDisabled && !isHelpRequest && serverless.isTelemetryReportedExternally) {
-        storeTelemetryLocally({
-          ...generateTelemetryPayload({
-            command,
-            options,
-            commandSchema,
-            serviceDir,
-            configuration,
-            serverless,
-          }),
-          outcome: 'success',
-        });
-        let backendNotificationRequest;
-        if (commands.join(' ') === 'deploy') {
-          backendNotificationRequest = await sendTelemetry({
-            serverlessExecutionSpan: processSpanPromise,
+      if (!hasTelemetryBeenReported) {
+        hasTelemetryBeenReported = true;
+
+        if (!isTelemetryDisabled && !isHelpRequest && serverless.isTelemetryReportedExternally) {
+          storeTelemetryLocally({
+            ...generateTelemetryPayload({
+              command,
+              options,
+              commandSchema,
+              serviceDir,
+              configuration,
+              serverless,
+            }),
+            outcome: 'success',
           });
-        }
-        if (backendNotificationRequest) {
-          await processBackendNotificationRequest(backendNotificationRequest);
+          let backendNotificationRequest;
+          if (commands.join(' ') === 'deploy') {
+            backendNotificationRequest = await sendTelemetry({
+              serverlessExecutionSpan: processSpanPromise,
+            });
+          }
+          if (backendNotificationRequest) {
+            await processBackendNotificationRequest(backendNotificationRequest);
+          }
         }
       }
     } catch (error) {
@@ -785,6 +798,8 @@ const processSpanPromise = (async () => {
       throw error;
     }
   } catch (error) {
+    const cachedHasTelemetryBeenReported = hasTelemetryBeenReported;
+    hasTelemetryBeenReported = true;
     handleError(error, {
       command,
       options,
@@ -792,7 +807,7 @@ const processSpanPromise = (async () => {
       serviceDir,
       configuration,
       serverless,
-      hasTelemetryBeenReported,
+      hasTelemetryBeenReported: cachedHasTelemetryBeenReported,
       commandUsage,
     });
   } finally {

From aaa653ebec2458d32163398ed27c27bf8a9c8a31 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 7 Jul 2021 13:25:17 +0200
Subject: [PATCH 0312/1101] test(AWS SNS): Remove "bluebird" dependency

---
 test/integration/aws/sns.test.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/integration/aws/sns.test.js b/test/integration/aws/sns.test.js
index 533bbcb7841..3930ea54be6 100644
--- a/test/integration/aws/sns.test.js
+++ b/test/integration/aws/sns.test.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const BbPromise = require('bluebird');
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
 const fixtures = require('../../fixtures/programmatic');
@@ -75,7 +74,7 @@ describe('AWS - SNS Integration Test', function () {
       const middleAttributes = { side: { DataType: 'String', StringValue: 'middle' } };
       const rightAttributes = { side: { DataType: 'String', StringValue: 'right' } };
 
-      return BbPromise.all([
+      return Promise.all([
         confirmCloudWatchLogs(`/aws/lambda/${stackName}-${leftFunctionName}`, async () => {
           await publishSnsMessage(filteredTopicName, middleMessage, middleAttributes);
           await publishSnsMessage(filteredTopicName, leftMessage, leftAttributes);

From a648ad80748e150253f530c5b79bbe3fcc5fca00 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 7 Jul 2021 13:26:33 +0200
Subject: [PATCH 0313/1101] test(AWS SNS): Refactor to async/await

---
 test/integration/aws/sns.test.js | 33 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/test/integration/aws/sns.test.js b/test/integration/aws/sns.test.js
index 3930ea54be6..2c3ffad11f8 100644
--- a/test/integration/aws/sns.test.js
+++ b/test/integration/aws/sns.test.js
@@ -30,9 +30,8 @@ describe('AWS - SNS Integration Test', function () {
     // create "existing" SNS topics
     // NOTE: deployment can only be done once the SNS topics are created
     log.notice(`Creating SNS topic "${existingTopicName}"...`);
-    return createSnsTopic(existingTopicName).then(() => {
-      return deployService(serviceDir);
-    });
+    await createSnsTopic(existingTopicName);
+    return deployService(serviceDir);
   });
 
   after(async () => {
@@ -42,11 +41,11 @@ describe('AWS - SNS Integration Test', function () {
   });
 
   describe('Minimal Setup', () => {
-    it('should invoke on a topic message', () => {
+    it('should invoke on a topic message', async () => {
       const functionName = 'snsMinimal';
       const message = 'Hello from SNS!';
 
-      return confirmCloudWatchLogs(
+      const events = await confirmCloudWatchLogs(
         `/aws/lambda/${stackName}-${functionName}`,
         () => publishSnsMessage(minimalTopicName, message),
         {
@@ -55,15 +54,14 @@ describe('AWS - SNS Integration Test', function () {
             return logs.includes(message);
           },
         }
-      ).then((events) => {
-        const logs = events.reduce((data, event) => data + event.message, '');
-        expect(logs).to.include(functionName);
-        expect(logs).to.include(message);
-      });
+      );
+      const logs = events.reduce((data, event) => data + event.message, '');
+      expect(logs).to.include(functionName);
+      expect(logs).to.include(message);
     });
   });
 
-  describe('Multiple and Filtered Setup', () => {
+  describe('Multiple and Filtered Setup', async () => {
     it('should invoke on a topic message that matches filter', () => {
       const leftFunctionName = 'snsMultipleFilteredLeft';
       const rightFunctionName = 'snsMultipleFilteredRight';
@@ -100,17 +98,16 @@ describe('AWS - SNS Integration Test', function () {
   });
 
   describe('Existing Setup', () => {
-    it('should invoke on an existing topic message', () => {
+    it('should invoke on an existing topic message', async () => {
       const functionName = 'snsExisting';
       const message = 'Hello from an existing SNS!';
 
-      return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
+      const events = await confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
         publishSnsMessage(existingTopicName, message)
-      ).then((events) => {
-        const logs = events.reduce((data, event) => data + event.message, '');
-        expect(logs).to.include(functionName);
-        expect(logs).to.include(message);
-      });
+      );
+      const logs = events.reduce((data, event) => data + event.message, '');
+      expect(logs).to.include(functionName);
+      expect(logs).to.include(message);
     });
   });
 });

From 614f9191469402b9738447f1f09f195b89d0d523 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 7 Jul 2021 13:32:06 +0200
Subject: [PATCH 0314/1101] test(AWS SNS): Improve tests reliability

---
 test/integration/aws/sns.test.js | 39 ++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/test/integration/aws/sns.test.js b/test/integration/aws/sns.test.js
index 2c3ffad11f8..daaa5473acf 100644
--- a/test/integration/aws/sns.test.js
+++ b/test/integration/aws/sns.test.js
@@ -73,20 +73,34 @@ describe('AWS - SNS Integration Test', function () {
       const rightAttributes = { side: { DataType: 'String', StringValue: 'right' } };
 
       return Promise.all([
-        confirmCloudWatchLogs(`/aws/lambda/${stackName}-${leftFunctionName}`, async () => {
-          await publishSnsMessage(filteredTopicName, middleMessage, middleAttributes);
-          await publishSnsMessage(filteredTopicName, leftMessage, leftAttributes);
-        }).then((events) => {
+        confirmCloudWatchLogs(
+          `/aws/lambda/${stackName}-${leftFunctionName}`,
+          async () => {
+            await publishSnsMessage(filteredTopicName, middleMessage, middleAttributes);
+            await publishSnsMessage(filteredTopicName, leftMessage, leftAttributes);
+          },
+          {
+            checkIsComplete: (events) =>
+              events.reduce((data, event) => data + event.message, '').includes(leftMessage),
+          }
+        ).then((events) => {
           const logs = events.reduce((data, event) => data + event.message, '');
           expect(logs).to.include(leftFunctionName);
           expect(logs).to.include(leftMessage);
           expect(logs).not.to.include(middleMessage);
           expect(logs).not.to.include(rightMessage);
         }),
-        confirmCloudWatchLogs(`/aws/lambda/${stackName}-${rightFunctionName}`, async () => {
-          await publishSnsMessage(filteredTopicName, middleMessage, middleAttributes);
-          await publishSnsMessage(filteredTopicName, rightMessage, rightAttributes);
-        }).then((events) => {
+        confirmCloudWatchLogs(
+          `/aws/lambda/${stackName}-${rightFunctionName}`,
+          async () => {
+            await publishSnsMessage(filteredTopicName, middleMessage, middleAttributes);
+            await publishSnsMessage(filteredTopicName, rightMessage, rightAttributes);
+          },
+          {
+            checkIsComplete: (events) =>
+              events.reduce((data, event) => data + event.message, '').includes(rightMessage),
+          }
+        ).then((events) => {
           const logs = events.reduce((data, event) => data + event.message, '');
           expect(logs).to.include(rightFunctionName);
           expect(logs).not.to.include(leftMessage);
@@ -102,8 +116,13 @@ describe('AWS - SNS Integration Test', function () {
       const functionName = 'snsExisting';
       const message = 'Hello from an existing SNS!';
 
-      const events = await confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
-        publishSnsMessage(existingTopicName, message)
+      const events = await confirmCloudWatchLogs(
+        `/aws/lambda/${stackName}-${functionName}`,
+        () => publishSnsMessage(existingTopicName, message),
+        {
+          checkIsComplete: (soFarEvents) =>
+            soFarEvents.reduce((data, event) => data + event.message, '').includes(message),
+        }
       );
       const logs = events.reduce((data, event) => data + event.message, '');
       expect(logs).to.include(functionName);

From 884cdfff025f33b62155ab5ef1ef5da007feade8 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 7 Jul 2021 13:34:53 +0200
Subject: [PATCH 0315/1101] test(AWS MSK): Improve tests reliability

---
 test/integration/aws/infra-dependent/msk.test.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/integration/aws/infra-dependent/msk.test.js b/test/integration/aws/infra-dependent/msk.test.js
index 8d73b5d07c1..3f31b8ef26d 100644
--- a/test/integration/aws/infra-dependent/msk.test.js
+++ b/test/integration/aws/infra-dependent/msk.test.js
@@ -86,7 +86,10 @@ describe('AWS - MSK Integration Test', function () {
           FunctionName: `${stackName}-producer`,
           InvocationType: 'RequestResponse',
         }),
-      { timeout: 120 * 1000 }
+      {
+        checkIsComplete: (soFarEvents) =>
+          soFarEvents.reduce((data, event) => data + event.message, '').includes(message),
+      }
     );
 
     const logs = events.reduce((data, event) => data + event.message, '');

From 993591aa17672a4516779cbf815df8e61cd17d09 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 7 Jul 2021 13:37:25 +0200
Subject: [PATCH 0316/1101] ci: Increase allowed number of retries

---
 .github/workflows/integrate.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
index 8550e32d103..47ca553a92a 100644
--- a/.github/workflows/integrate.yml
+++ b/.github/workflows/integrate.yml
@@ -206,7 +206,7 @@ jobs:
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      SLS_AWS_REQUEST_MAX_RETRIES: 21 #Increase number of retries, do to observed "Rate exceeded" fails
+      SLS_AWS_REQUEST_MAX_RETRIES: 50 #Increase number of retries, due to observed "Rate exceeded" fails
       SERVERLESS_BINARY_PATH: ./dist/serverless-linux
     steps:
       - name: Checkout repository

From 21c0fedc507651bb98687acc4145ed667d853589 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 8 Jul 2021 13:43:27 +0200
Subject: [PATCH 0317/1101] fix(Packaging): Validate `package.artifact` paths

---
 lib/plugins/package/lib/packageService.js | 34 +++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/package/lib/packageService.js b/lib/plugins/package/lib/packageService.js
index 1b1304c272e..dd158638ab0 100644
--- a/lib/plugins/package/lib/packageService.js
+++ b/lib/plugins/package/lib/packageService.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const path = require('path');
+const fsp = require('fs').promises;
 const globby = require('globby');
 const _ = require('lodash');
 const micromatch = require('micromatch');
@@ -75,7 +76,20 @@ module.exports = {
         this.serverless.cli.log(`Packaging disabled for function: "${functionName}"`);
         return;
       }
-      if (functionObject.package.artifact) return;
+      if (functionObject.package.artifact) {
+        try {
+          await fsp.access(
+            path.resolve(this.serverless.serviceDir, functionObject.package.artifact)
+          );
+          return;
+        } catch (error) {
+          throw new ServerlessError(
+            'Cannot access package artifact at ' +
+              `"${functionObject.package.artifact}" (for "${functionName}"): ${error.message}`,
+            'INVALID_PACKAGE_ARTIFACT_PATH'
+          );
+        }
+      }
       if (functionObject.package.individually || this.serverless.service.package.individually) {
         await this.packageFunction(functionName);
         return;
@@ -93,7 +107,23 @@ module.exports = {
     );
 
     await Promise.all(packagePromises);
-    if (shouldPackageService && !this.serverless.service.package.artifact) await this.packageAll();
+    if (shouldPackageService) {
+      if (this.serverless.service.package.artifact) {
+        try {
+          await fsp.access(
+            path.resolve(this.serverless.serviceDir, this.serverless.service.package.artifact)
+          );
+          return;
+        } catch (error) {
+          throw new ServerlessError(
+            'Cannot access package artifact at ' +
+              `"${this.serverless.service.package.artifact}": ${error.message}`,
+            'INVALID_PACKAGE_ARTIFACT_PATH'
+          );
+        }
+      }
+      await this.packageAll();
+    }
   },
 
   async packageAll() {

From 6e6220cedd360bed6df66e173752b3edf0d46c7c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 8 Jul 2021 13:58:59 +0200
Subject: [PATCH 0318/1101] chore: Bump dependencies

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 848686c4dcf..009d0225bc6 100644
--- a/package.json
+++ b/package.json
@@ -23,13 +23,13 @@
   },
   "dependencies": {
     "@serverless/cli": "^1.5.2",
-    "@serverless/components": "^3.13.2",
+    "@serverless/components": "^3.13.3",
     "@serverless/dashboard-plugin": "^5.4.3",
     "@serverless/utils": "^5.3.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.939.0",
+    "aws-sdk": "^2.941.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
@@ -78,7 +78,7 @@
   "devDependencies": {
     "@commitlint/cli": "^12.1.4",
     "@serverless/eslint-config": "^3.0.0",
-    "@serverless/test": "^8.2.0",
+    "@serverless/test": "^8.3.0",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "cos-nodejs-sdk-v5": "^2.9.21",

From 780a67aae2cfc10e71de7acfd076f9ac2cd91099 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 8 Jul 2021 14:07:15 +0200
Subject: [PATCH 0319/1101] chore: Release v2.51.1

---
 CHANGELOG.md | 16 ++++++++++++++++
 package.json |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6471ba99869..f2165ddf47c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 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.
 
+### [2.51.1](https://github.com/serverless/serverless/compare/v2.51.0...v2.51.1) (2021-07-08)
+
+### Bug Fixes
+
+- **CLI:** Fix `SIGINT` signal handling ([#9712](https://github.com/serverless/serverless/issues/9712)) ([c5a3f69](https://github.com/serverless/serverless/commit/c5a3f6907a115ea2d511b0aa9905a2e762514867)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Packaging:** Validate `package.artifact` paths ([#9721](https://github.com/serverless/serverless/issues/9721)) ([21c0fed](https://github.com/serverless/serverless/commit/21c0fedc507651bb98687acc4145ed667d853589)) ([Mariusz Nowak](https://github.com/medikoo))
+- **AWS Local Invocation:** Bump AWS Java pom version to pull in fix ([#9714](https://github.com/serverless/serverless/issues/9714)) ([504b42a](https://github.com/serverless/serverless/commit/504b42ae0fefd04ccfa013746371c49a02d8a4d3)) ([tlloyd-synalogik](https://github.com/tlloyd-synalogik))
+
+### Maintenance Improvements
+
+- **Telemetry:**
+  - Report all interruption signals ([#9712](https://github.com/serverless/serverless/issues/9712)) ([7354c20](https://github.com/serverless/serverless/commit/7354c2000f25d526f8c3fd97c6d4d22054388755)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Report whether we're in context of TTY terminal ([#9712](https://github.com/serverless/serverless/issues/9712)) ([9cea555](https://github.com/serverless/serverless/commit/9cea555e88bdaadf717def21b5298a64c7ce79b9)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Ensure no doubled telemetry in edge cases ([#9716](https://github.com/serverless/serverless/issues/9716)) ([fd5005e](https://github.com/serverless/serverless/commit/fd5005e404debe103ca54974ca9aee431554ceb8)) ([Mariusz Nowak](https://github.com/medikoo))
+- **CLI:** Improve module imports order ([#9712](https://github.com/serverless/serverless/issues/9712)) ([dff2799](https://github.com/serverless/serverless/commit/dff2799941a1da8c2d5fe76144393db241a7637c)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ## [2.51.0](https://github.com/serverless/serverless/compare/v2.50.0...v2.51.0) (2021-07-06)
 
 ### Features
diff --git a/package.json b/package.json
index 009d0225bc6..9d7aba303c4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.51.0",
+  "version": "2.51.1",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From a2f7c00e2c0b4a87ef82b6516e0df568566bd1b9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 8 Jul 2021 14:23:31 +0200
Subject: [PATCH 0320/1101] test(AWS SQS): Improve test reliability

---
 test/integration/aws/sqs.test.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/integration/aws/sqs.test.js b/test/integration/aws/sqs.test.js
index b35783cdcde..0709bded92d 100644
--- a/test/integration/aws/sqs.test.js
+++ b/test/integration/aws/sqs.test.js
@@ -43,8 +43,13 @@ describe('AWS - SQS Integration Test', function () {
       const functionName = 'sqsBasic';
       const message = 'Hello from SQS!';
 
-      return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
-        sendSqsMessage(queueName, message)
+      return confirmCloudWatchLogs(
+        `/aws/lambda/${stackName}-${functionName}`,
+        () => sendSqsMessage(queueName, message),
+        {
+          checkIsComplete: (events) =>
+            events.reduce((data, event) => data + event.message, '').includes(message),
+        }
       ).then((events) => {
         const logs = events.reduce((data, event) => data + event.message, '');
         expect(logs).to.include(functionName);

From ab3c543089b0fde4107fc0e579c19f85e0a4ee79 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 8 Jul 2021 21:39:22 +0200
Subject: [PATCH 0321/1101] fix(Packaging): Fix `package.artifact` validation
 for S3 urls

---
 lib/plugins/package/lib/packageService.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/plugins/package/lib/packageService.js b/lib/plugins/package/lib/packageService.js
index dd158638ab0..e1bf490995f 100644
--- a/lib/plugins/package/lib/packageService.js
+++ b/lib/plugins/package/lib/packageService.js
@@ -6,6 +6,7 @@ const globby = require('globby');
 const _ = require('lodash');
 const micromatch = require('micromatch');
 const ServerlessError = require('../../../serverless-error');
+const parseS3URI = require('../../aws/utils/parse-s3-uri');
 
 module.exports = {
   defaultExcludes: [
@@ -77,6 +78,7 @@ module.exports = {
         return;
       }
       if (functionObject.package.artifact) {
+        if (parseS3URI(functionObject.package.artifact)) return;
         try {
           await fsp.access(
             path.resolve(this.serverless.serviceDir, functionObject.package.artifact)
@@ -109,6 +111,7 @@ module.exports = {
     await Promise.all(packagePromises);
     if (shouldPackageService) {
       if (this.serverless.service.package.artifact) {
+        if (parseS3URI(this.serverless.service.package.artifact)) return;
         try {
           await fsp.access(
             path.resolve(this.serverless.serviceDir, this.serverless.service.package.artifact)

From b2da950f1674abd620eaae805340cdcbe099c9d6 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 8 Jul 2021 21:53:32 +0200
Subject: [PATCH 0322/1101] chore: Bump dependencies

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9d7aba303c4..7e2a20d2d4c 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.941.0",
+    "aws-sdk": "^2.942.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",

From 6986a040e26eb903a3c723efd0c4adc17e29fe5a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 8 Jul 2021 21:54:36 +0200
Subject: [PATCH 0323/1101] chore: Release v2.51.2

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2165ddf47c..6238cdc8484 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 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.
 
+### [2.51.2](https://github.com/serverless/serverless/compare/v2.51.1...v2.51.2) (2021-07-08)
+
+### Bug Fixes
+
+- **Packaging:** Fix `package.artifact` validation for S3 urls ([#9725](https://github.com/serverless/serverless/issues/9725)) ([ab3c543](https://github.com/serverless/serverless/commit/ab3c543089b0fde4107fc0e579c19f85e0a4ee79)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ### [2.51.1](https://github.com/serverless/serverless/compare/v2.51.0...v2.51.1) (2021-07-08)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 7e2a20d2d4c..ebc6d968dae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.51.1",
+  "version": "2.51.2",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 4eb366b97eeaf3056d16afb6d49e5e9cc1a3ce8f Mon Sep 17 00:00:00 2001
From: devops hipster in training <elderama@gmail.com>
Date: Mon, 12 Jul 2021 18:49:26 +1000
Subject: [PATCH 0324/1101] docs: Adjust `${aws::accountId}` reference example

---
 docs/providers/aws/guide/variables.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/providers/aws/guide/variables.md b/docs/providers/aws/guide/variables.md
index b19f6433227..87b2b3b7056 100644
--- a/docs/providers/aws/guide/variables.md
+++ b/docs/providers/aws/guide/variables.md
@@ -317,7 +317,8 @@ Account ID of you AWS Account, based on the AWS Credentials that you have config
 
 ```yml
 service: new-service
-provider: aws
+provider:
+  name: aws
 
 functions:
   func1:

From a04a714685fb34a0d6176b081aa338400124dc01 Mon Sep 17 00:00:00 2001
From: Nicholas Eveland <55118955+nme077@users.noreply.github.com>
Date: Tue, 13 Jul 2021 14:41:18 -0600
Subject: [PATCH 0325/1101] docs: Add `s3` config options to
 `serverless.yml.md` (#9734)

---
 docs/providers/aws/guide/serverless.yml.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 60450f828e2..a8167bcae32 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -285,6 +285,12 @@ provider:
       format: '{ "requestId":"$context.requestId", "ip": "$context.identity.sourceIp", "requestTime":"$context.requestTime", "httpMethod":"$context.httpMethod","routeKey":"$context.routeKey", "status":"$context.status","protocol":"$context.protocol", "responseLength":"$context.responseLength" }'
 
     frameworkLambda: true # Optional, whether to write CloudWatch logs for custom resource lambdas as added by the framework
+  s3: # If you need to configure the bucket itself, you'll need to add s3 resources to the provider configuration
+    bucketOne: # Eventual additional properties in camel case
+    # Supported properties are the same ones as supported by CF resource for S3 bucket: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html
+      name: my-custom-bucket-name
+      versioningConfiguration:
+        Status: Enabled
 
 package: # Optional deployment packaging configuration
   patterns: # Specify the directories and files which should be included in the deployment package
@@ -573,6 +579,7 @@ functions:
             OriginPath: /framework
             CustomOriginConfig:
               OriginProtocolPolicy: match-viewer
+      - s3: bucketOne
 
 layers:
   hello: # A Lambda layer

From a0dc0740f2e70885491c98a8a4014fd36ff797cd Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Wed, 14 Jul 2021 12:23:35 +0200
Subject: [PATCH 0326/1101] docs(AWS IAM): Fix invalid example

---
 docs/providers/aws/guide/iam.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/providers/aws/guide/iam.md b/docs/providers/aws/guide/iam.md
index 846e99c2615..2a3d4bc6e3b 100644
--- a/docs/providers/aws/guide/iam.md
+++ b/docs/providers/aws/guide/iam.md
@@ -27,11 +27,11 @@ provider:
       name: custom-role-name
       path: /custom-role-path/
       statements:
-        - Effect: 'Allow',
-          Resource: '*',
-          NotAction: 'iam:DeleteUser',
+        - Effect: 'Allow'
+          Resource: '*'
+          Action: 'iam:DeleteUser'
       managedPolicies:
-        - 'arn:aws:iam::123456789012:user/*',
+        - 'arn:aws:iam::123456789012:user/*'
       permissionsBoundary: arn:aws:iam::123456789012:policy/boundaries
       tags:
         key: value

From 3e58d628e7b8f4dbc8e14adf94dd98546099f3be Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 13 Jul 2021 16:54:54 +0200
Subject: [PATCH 0327/1101] fix: Improve `functions` validation

---
 lib/classes/Service.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index 2f8b8fab24b..235fafeb306 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -201,6 +201,15 @@ class Service {
 
     // Ensure that function is an object and setup function.name property
     const stageNameForFunction = options.stage || this.provider.stage;
+
+    if (!_.isObject(this.functions)) {
+      throw new ServerlessError(
+        `Unexpected "functions" configuration: Expected object received: ${util.inspect(
+          this.functions
+        )}`,
+        'NON_OBJECT_FUNCTIONS_CONFIGURATION'
+      );
+    }
     Object.entries(this.functions).forEach(([functionName, functionObj]) => {
       if (!_.isObject(functionObj)) {
         throw new ServerlessError(

From be441ccd9157b351fffe6ea21664624aeeeb4b29 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 14 Jul 2021 10:47:50 +0200
Subject: [PATCH 0328/1101] refactor(CLI): Reuse already imported module

---
 lib/Serverless.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index e52085ec609..62e381b0287 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -287,9 +287,8 @@ class Serverless {
           configuration: this.configurationInput,
         }
       );
-      const resolveInput = require('./cli/resolve-input');
-      resolveInput.clear();
-      const { options, isHelpRequest } = resolveInput(commandsSchema);
+      resolveCliInput.clear();
+      const { options, isHelpRequest } = resolveCliInput(commandsSchema);
       if (options.version) {
         require('./cli/render-version')();
         return;
@@ -347,7 +346,7 @@ class Serverless {
               sls: require('./configuration/variables/sources/instance-dependent/get-sls')(this),
             },
             options: filterSupportedOptions(options, {
-              commandSchema: resolveInput.commandSchema,
+              commandSchema: resolveCliInput.commandSchema,
               providerName,
             }),
             propertyPathsToResolve: isHelpRequest ? new Set(['plugins']) : null,

From 040036d1869ceb207da6dad53f17e1ee1b6ee20a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 14 Jul 2021 10:56:03 +0200
Subject: [PATCH 0329/1101] fix(CLI): Do not validate configuration with
 `plugin ..` commands

---
 lib/Serverless.js            | 19 ++++++++++---------
 lib/classes/PluginManager.js |  8 +++++---
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index 62e381b0287..8c2a3620e89 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -425,17 +425,18 @@ class Serverless {
       }
     }
 
-    // merge arrays after variables have been populated
-    // (https://github.com/serverless/serverless/issues/3511)
-    this.service.mergeArrays();
+    if (resolveCliInput().commands[0] !== 'plugin') {
+      // merge arrays after variables have been populated
+      // (https://github.com/serverless/serverless/issues/3511)
+      this.service.mergeArrays();
 
-    // populate function names after variables are loaded in case functions were externalized
-    // (https://github.com/serverless/serverless/issues/2997)
-    this.service.setFunctionNames(this.processedInput.options);
-
-    // If in context of service, validate the service configuration
-    if (this.serviceDir) this.service.validate();
+      // populate function names after variables are loaded in case functions were externalized
+      // (https://github.com/serverless/serverless/issues/2997)
+      this.service.setFunctionNames(this.processedInput.options);
 
+      // If in context of service, validate the service configuration
+      if (this.serviceDir) this.service.validate();
+    }
     // trigger the plugin lifecycle when there's something which should be processed
     await this.pluginManager.run(this.processedInput.commands);
   }
diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index d4409e80d7e..86c929148ca 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -605,9 +605,11 @@ class PluginManager {
    * Called by the CLI to start a public command.
    */
   async run(commandsArray) {
-    // first initialize hooks
-    for (const { hook } of this.getHooks(['initialize'])) {
-      await hook();
+    if (resolveCliInput().commands[0] !== 'plugin') {
+      // first initialize hooks
+      for (const { hook } of this.getHooks(['initialize'])) {
+        await hook();
+      }
     }
 
     let deferredBackendNotificationRequest;

From 82a35b3903ad5d8f761612105036fc11a37e9e55 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 12 Jul 2021 18:06:14 +0200
Subject: [PATCH 0330/1101] feat: Add `has-local-credentials` util

---
 lib/aws/has-local-credentials.js              |  7 ++
 .../lib/aws/has-local-credentials.test.js     | 82 +++++++++++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 lib/aws/has-local-credentials.js
 create mode 100644 test/unit/lib/aws/has-local-credentials.test.js

diff --git a/lib/aws/has-local-credentials.js b/lib/aws/has-local-credentials.js
new file mode 100644
index 00000000000..94e23cb9a5e
--- /dev/null
+++ b/lib/aws/has-local-credentials.js
@@ -0,0 +1,7 @@
+'use strict';
+
+const AWS = require('aws-sdk');
+
+module.exports = () => {
+  return Boolean(new AWS.S3().config.credentials);
+};
diff --git a/test/unit/lib/aws/has-local-credentials.test.js b/test/unit/lib/aws/has-local-credentials.test.js
new file mode 100644
index 00000000000..644a24d1509
--- /dev/null
+++ b/test/unit/lib/aws/has-local-credentials.test.js
@@ -0,0 +1,82 @@
+'use strict';
+
+const chai = require('chai');
+const overrideEnv = require('process-utils/override-env');
+const requireUncached = require('ncjsm/require-uncached');
+const path = require('path');
+const fse = require('fs-extra');
+
+const { expect } = chai;
+
+describe('test/unit/lib/aws/has-local-credentials.test.js', () => {
+  const accessKeyId = 'AKIAIOSFODNN7EXAMPLE';
+  const secretAccessKey = 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY';
+
+  describe('In environment credentials', () => {
+    let restoreEnv;
+    let uncachedHasLocalCredentials;
+
+    before(() => {
+      ({ restoreEnv } = overrideEnv({ asCopy: true }));
+      process.env.AWS_ACCESS_KEY_ID = accessKeyId;
+      process.env.AWS_SECRET_ACCESS_KEY = secretAccessKey;
+      uncachedHasLocalCredentials = requireUncached(() =>
+        require('../../../../lib/aws/has-local-credentials')
+      );
+    });
+
+    after(() => restoreEnv);
+
+    it('Should properly detect credentials', () => {
+      expect(uncachedHasLocalCredentials()).to.equal(true);
+    });
+  });
+
+  describe('With profile in `.aws`', () => {
+    let credentialsDirPath;
+    let credentialsFilePath;
+    let uncachedHasLocalCredentials;
+
+    before(async () => {
+      credentialsDirPath = path.resolve('.aws');
+      credentialsFilePath = path.join(credentialsDirPath, 'credentials');
+      await fse.outputFile(
+        credentialsFilePath,
+        [
+          '[default]',
+          `aws_access_key_id = ${accessKeyId}`,
+          `aws_secret_access_key = ${secretAccessKey}`,
+        ].join('\n')
+      );
+      uncachedHasLocalCredentials = requireUncached(() =>
+        require('../../../../lib/aws/has-local-credentials')
+      );
+    });
+
+    after(async () => fse.remove(credentialsDirPath));
+
+    it('Should properly detect credentials', () => {
+      expect(uncachedHasLocalCredentials()).to.equal(true);
+    });
+  });
+
+  describe('Without credentials in `.aws` or in env', () => {
+    let restoreEnv;
+    let uncachedHasLocalCredentials;
+
+    before(() => {
+      ({ restoreEnv } = overrideEnv({ asCopy: true }));
+      delete process.env.AWS_ACCESS_KEY_ID;
+      delete process.env.AWS_SECRET_ACCESS_KEY;
+      uncachedHasLocalCredentials = requireUncached(() =>
+        require('../../../../lib/aws/has-local-credentials')
+      );
+    });
+
+    after(() => restoreEnv);
+
+    it('Should properly report lack of credentials', () => {
+      expect(uncachedHasLocalCredentials()).to.equal(false);
+    });
+  });
+});

From 560aee5feb9f143e93933f6536e76edc9a3e56bb Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 13 Jul 2021 11:50:50 +0200
Subject: [PATCH 0331/1101] feat(Telemetry): Record initial context for
 interactive setup

---
 lib/cli/interactive-setup/index.js            |  3 ++
 lib/cli/interactive-setup/utils.js            | 13 +++++-
 .../lib/cli/interactive-setup/utils.test.js   | 42 +++++++++++++++++++
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/lib/cli/interactive-setup/index.js b/lib/cli/interactive-setup/index.js
index 8edfe731a92..de44bd0c333 100644
--- a/lib/cli/interactive-setup/index.js
+++ b/lib/cli/interactive-setup/index.js
@@ -2,6 +2,7 @@
 
 const inquirer = require('@serverless/utils/inquirer');
 const { StepHistory } = require('@serverless/utils/telemetry');
+const { resolveInitialContext } = require('./utils');
 
 const steps = {
   service: require('./service'),
@@ -33,6 +34,8 @@ module.exports = async (context) => {
     });
   };
 
+  commandUsage.initialContext = resolveInitialContext(context);
+
   for (const [stepName, step] of Object.entries(steps)) {
     delete context.stepHistory;
     delete context.inapplicabilityReasonCode;
diff --git a/lib/cli/interactive-setup/utils.js b/lib/cli/interactive-setup/utils.js
index dfbc0060a27..8d392b02947 100644
--- a/lib/cli/interactive-setup/utils.js
+++ b/lib/cli/interactive-setup/utils.js
@@ -1,8 +1,11 @@
 'use strict';
 
 const inquirer = require('@serverless/utils/inquirer');
-const ServerlessError = require('../../serverless-error');
 const resolveProviderCredentials = require('@serverless/dashboard-plugin/lib/resolveProviderCredentials');
+const isAuthenticated = require('@serverless/dashboard-plugin/lib/isAuthenticated');
+const hasLocalCredentials = require('../../aws/has-local-credentials');
+
+const ServerlessError = require('../../serverless-error');
 const resolveStage = require('../../utils/resolve-stage');
 const resolveRegion = require('../../utils/resolve-region');
 
@@ -35,4 +38,12 @@ module.exports = {
 
     return Boolean(result);
   },
+  resolveInitialContext: ({ configuration, serviceDir }) => {
+    return {
+      isInServiceContext: Boolean(serviceDir),
+      isLoggedIntoDashboard: isAuthenticated(),
+      hasLocalAwsCredentials: hasLocalCredentials(),
+      isDashboardEnabled: Boolean(configuration && configuration.org && configuration.app),
+    };
+  },
 };
diff --git a/test/unit/lib/cli/interactive-setup/utils.test.js b/test/unit/lib/cli/interactive-setup/utils.test.js
index 3ff2f29679d..7c9a9657c49 100644
--- a/test/unit/lib/cli/interactive-setup/utils.test.js
+++ b/test/unit/lib/cli/interactive-setup/utils.test.js
@@ -61,4 +61,46 @@ describe('test/unit/lib/cli/interactive-setup/utils.test.js', () => {
       ).to.eventually.be.rejected.and.have.property('code', 'DASHBOARD_UNAVAILABLE');
     });
   });
+
+  describe('resolveInitialContext', () => {
+    it('correctly resolves for service context and dashboard enabled', async () => {
+      const configuration = {
+        app: 'someapp',
+        service: 'someservice',
+        org: 'someorg',
+      };
+      const serviceDir = '/path/to/service/dir';
+      const { resolveInitialContext } = proxyquire(
+        '../../../../../lib/cli/interactive-setup/utils',
+        {
+          '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
+          '../../aws/has-local-credentials': () => true,
+        }
+      );
+      expect(resolveInitialContext({ configuration, serviceDir })).to.deep.equal({
+        hasLocalAwsCredentials: true,
+        isLoggedIntoDashboard: true,
+        isDashboardEnabled: true,
+        isInServiceContext: true,
+      });
+    });
+
+    it('correctly resolves without service context', async () => {
+      const configuration = null;
+      const serviceDir = null;
+      const { resolveInitialContext } = proxyquire(
+        '../../../../../lib/cli/interactive-setup/utils',
+        {
+          '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
+          '../../aws/has-local-credentials': () => true,
+        }
+      );
+      expect(resolveInitialContext({ configuration, serviceDir })).to.deep.equal({
+        hasLocalAwsCredentials: true,
+        isLoggedIntoDashboard: true,
+        isDashboardEnabled: false,
+        isInServiceContext: false,
+      });
+    });
+  });
 });

From 7078449df523abad8e109db1bbf2e9e2cec17e09 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 14 Jul 2021 17:06:26 +0200
Subject: [PATCH 0332/1101] chore: Upgrade `filesize` to v7

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ebc6d968dae..1be4ebbd410 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "dotenv": "^10.0.0",
     "essentials": "^1.1.1",
     "fastest-levenshtein": "^1.0.12",
-    "filesize": "^6.4.0",
+    "filesize": "^7.0.0",
     "fs-extra": "^9.1.0",
     "get-stdin": "^8.0.0",
     "globby": "^11.0.4",

From 3e384e2c61ea38e8ff85985b2f154265b5c3f037 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 14 Jul 2021 17:37:50 +0200
Subject: [PATCH 0333/1101] test: Cover`serverless-dotenv-plugin` with
 integration tests

---
 test/fixtures/programmatic/curated-plugins/.env |  2 ++
 .../programmatic/curated-plugins/package.json   |  3 ++-
 .../programmatic/curated-plugins/serverless.yml |  1 +
 test/integration/curated-plugins.test.js        | 17 +++++++++++++++++
 4 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 test/fixtures/programmatic/curated-plugins/.env

diff --git a/test/fixtures/programmatic/curated-plugins/.env b/test/fixtures/programmatic/curated-plugins/.env
new file mode 100644
index 00000000000..1e307a9198c
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins/.env
@@ -0,0 +1,2 @@
+DOTENV_PLUGIN_TEST=passed
+
diff --git a/test/fixtures/programmatic/curated-plugins/package.json b/test/fixtures/programmatic/curated-plugins/package.json
index 38ff4c81695..75234064c37 100755
--- a/test/fixtures/programmatic/curated-plugins/package.json
+++ b/test/fixtures/programmatic/curated-plugins/package.json
@@ -4,6 +4,7 @@
     "webpack": "5.41.1",
     "serverless-webpack": "5.5.1",
     "serverless-domain-manager": "5.1.0",
-    "serverless-prune-plugin": "1.5.0"
+    "serverless-prune-plugin": "1.5.0",
+    "serverless-dotenv-plugin": "3.9.0"
   }
 }
diff --git a/test/fixtures/programmatic/curated-plugins/serverless.yml b/test/fixtures/programmatic/curated-plugins/serverless.yml
index 43df12fd258..4b659dd18dc 100644
--- a/test/fixtures/programmatic/curated-plugins/serverless.yml
+++ b/test/fixtures/programmatic/curated-plugins/serverless.yml
@@ -2,6 +2,7 @@ service: service
 
 configValidationMode: error
 frameworkVersion: '*'
+useDotenv: true
 
 custom:
   customDomain:
diff --git a/test/integration/curated-plugins.test.js b/test/integration/curated-plugins.test.js
index 3c08a3c2bd6..57ff7a412e1 100644
--- a/test/integration/curated-plugins.test.js
+++ b/test/integration/curated-plugins.test.js
@@ -79,4 +79,21 @@ describe('test/integration/curated-plugins.test.js', function () {
     });
     expect(String(stdoutBuffer)).to.include('Prune: Pruning complete.');
   });
+
+  it('should be extended by "serverless-dotenv-plugin"', async () => {
+    await updateConfig({ plugins: ['serverless-dotenv-plugin'] });
+    const { stdoutBuffer } = await spawn(serverlessExec, ['package'], {
+      cwd: serviceDir,
+    });
+    expect(String(stdoutBuffer)).to.include('DOTENV: Loading environment variables');
+    const cfTemplate = JSON.parse(
+      await fsp.readFile(
+        path.resolve(serviceDir, '.serverless/cloudformation-template-update-stack.json')
+      )
+    );
+    expect(
+      cfTemplate.Resources.FunctionLambdaFunction.Properties.Environment.Variables
+        .DOTENV_PLUGIN_TEST
+    ).to.equal('passed');
+  });
 });

From 4b25b92be49d3f2ba5b3597d1ce555ea5c401313 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 14 Jul 2021 17:46:47 +0200
Subject: [PATCH 0334/1101] test: Cover`serverless-iam-roles-per-function` with
 integration tests

---
 .../programmatic/curated-plugins/package.json |  3 +-
 test/integration/curated-plugins.test.js      | 35 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/test/fixtures/programmatic/curated-plugins/package.json b/test/fixtures/programmatic/curated-plugins/package.json
index 75234064c37..191ca6e5358 100755
--- a/test/fixtures/programmatic/curated-plugins/package.json
+++ b/test/fixtures/programmatic/curated-plugins/package.json
@@ -5,6 +5,7 @@
     "serverless-webpack": "5.5.1",
     "serverless-domain-manager": "5.1.0",
     "serverless-prune-plugin": "1.5.0",
-    "serverless-dotenv-plugin": "3.9.0"
+    "serverless-dotenv-plugin": "3.9.0",
+    "serverless-iam-roles-per-function": "3.2.0"
   }
 }
diff --git a/test/integration/curated-plugins.test.js b/test/integration/curated-plugins.test.js
index 57ff7a412e1..98b4eddbc2a 100644
--- a/test/integration/curated-plugins.test.js
+++ b/test/integration/curated-plugins.test.js
@@ -96,4 +96,39 @@ describe('test/integration/curated-plugins.test.js', function () {
         .DOTENV_PLUGIN_TEST
     ).to.equal('passed');
   });
+
+  it('should be extended by "serverless-iam-roles-per-function"', async () => {
+    await updateConfig({
+      plugins: ['serverless-iam-roles-per-function'],
+      functions: {
+        function: {
+          iamRoleStatementsName: 'fn-plugin-role-name',
+          iamRoleStatements: [
+            {
+              Effect: 'Allow',
+              Action: ['dynamodb:GetItem'],
+              Resource: 'arn:aws:dynamodb:${aws:region}:*:table/mytable',
+            },
+          ],
+        },
+      },
+    });
+    try {
+      await spawn(serverlessExec, ['package'], { cwd: serviceDir });
+      const cfTemplate = JSON.parse(
+        await fsp.readFile(
+          path.resolve(serviceDir, '.serverless/cloudformation-template-update-stack.json')
+        )
+      );
+      expect(cfTemplate.Resources.FunctionIamRoleLambdaExecution.Properties.RoleName).to.equal(
+        'fn-plugin-role-name'
+      );
+    } finally {
+      await updateConfig({
+        functions: {
+          function: { iamRoleStatementsName: null, iamRoleStatements: null },
+        },
+      });
+    }
+  });
 });

From 186496922a0c4d69f3101dde0a9f4a0d89995ad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Asensio=20Ca=C3=B1as?= <david.asensio@icloud.com>
Date: Thu, 15 Jul 2021 10:19:42 +0200
Subject: [PATCH 0335/1101] feat(CLI): Automatically expand loaded env
 variables (#9615)

---
 docs/environment-variables.md    | 13 +++++++++++++
 lib/cli/load-dotenv.js           | 11 +++++++++--
 package.json                     |  1 +
 test/unit/lib/Serverless.test.js |  9 ++++++++-
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/docs/environment-variables.md b/docs/environment-variables.md
index c390b68cd7e..f9afe496cfb 100644
--- a/docs/environment-variables.md
+++ b/docs/environment-variables.md
@@ -12,6 +12,19 @@ With `useDotenv: true` set in your `serverless.yml` file, framework automaticall
 
 The framework looks for `.env` and `.env.{stage}` files in service directory and then tries to load them using `dotenv`. If `.env.{stage}` is found, `.env` will not be loaded. If stage is not explicitly defined, it defaults to `dev`.
 
+### Variable expansion
+
+It is possible to define environment variables as a combination of existing ones:
+
+```env
+BASE_URL=my.api.com
+PROTOCOL=https
+
+URL=$PROTOCOL/$BASE_URL
+```
+
+> This is supported through [dotenv-expand](https://github.com/motdotla/dotenv-expand)
+
 ### Differences against `serverless-dotenv-plugin`
 
 There are a few differences between above functionality and [serverless-dotenv-plugin](https://github.com/colynb/serverless-dotenv-plugin):
diff --git a/lib/cli/load-dotenv.js b/lib/cli/load-dotenv.js
index 7067edb1dac..7c87f48eced 100644
--- a/lib/cli/load-dotenv.js
+++ b/lib/cli/load-dotenv.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const dotenv = require('dotenv');
+const dotenvExpand = require('dotenv-expand');
 const path = require('path');
 const ServerlessError = require('../serverless-error');
 
@@ -11,11 +12,16 @@ const throwDotenvError = (error, filePath) => {
   throw new ServerlessError(errorMessage, 'DOTENV_LOAD_ERROR');
 };
 
+const loadDotenvFrom = (envFilePath) => {
+  const config = dotenv.config({ path: envFilePath });
+  return dotenvExpand(config);
+};
+
 module.exports = (stage) => {
   const defaultEnvFilePath = path.join(process.cwd(), '.env');
   const stageEnvFilePath = path.join(process.cwd(), `.env.${stage}`);
 
-  const { error: stageEnvResultError } = dotenv.config({ path: stageEnvFilePath });
+  const { error: stageEnvResultError } = loadDotenvFrom(stageEnvFilePath);
 
   if (!stageEnvResultError) return;
 
@@ -23,7 +29,8 @@ module.exports = (stage) => {
     throwDotenvError(stageEnvResultError, stageEnvFilePath);
   }
 
-  const { error: defaultEnvResultError } = dotenv.config({ path: defaultEnvFilePath });
+  const { error: defaultEnvResultError } = loadDotenvFrom(defaultEnvFilePath);
+
   if (defaultEnvResultError && !isMissingFileError(defaultEnvResultError)) {
     throwDotenvError(defaultEnvResultError, defaultEnvFilePath);
   }
diff --git a/package.json b/package.json
index 1be4ebbd410..45d7cadf206 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
     "dayjs": "^1.10.6",
     "decompress": "^4.2.1",
     "dotenv": "^10.0.0",
+    "dotenv-expand": "^5.1.0",
     "essentials": "^1.1.1",
     "fastest-levenshtein": "^1.0.12",
     "filesize": "^7.0.0",
diff --git a/test/unit/lib/Serverless.test.js b/test/unit/lib/Serverless.test.js
index 9b9a388ef4d..853c8934415 100644
--- a/test/unit/lib/Serverless.test.js
+++ b/test/unit/lib/Serverless.test.js
@@ -329,12 +329,16 @@ describe('test/unit/lib/Serverless.test.js', () => {
             custom: {
               fromDefaultEnv: '${env:DEFAULT_ENV_VARIABLE}',
               fromStageEnv: "${env:STAGE_ENV_VARIABLE, 'not-found'}",
+              fromDefaultExpandedEnv: '${env:DEFAULT_ENV_VARIABLE_EXPANDED}',
             },
           },
         })
       ).servicePath;
 
-      const defaultFileContent = 'DEFAULT_ENV_VARIABLE=valuefromdefault';
+      const defaultFileContent = `
+        DEFAULT_ENV_VARIABLE=valuefromdefault
+        DEFAULT_ENV_VARIABLE_EXPANDED=$DEFAULT_ENV_VARIABLE/expanded
+      `;
       await fs.promises.writeFile(path.join(serviceDir, '.env'), defaultFileContent);
       conditionallyLoadDotenv.clear();
     });
@@ -347,6 +351,9 @@ describe('test/unit/lib/Serverless.test.js', () => {
       });
 
       expect(result.serverless.service.custom.fromDefaultEnv).to.equal('valuefromdefault');
+      expect(result.serverless.service.custom.fromDefaultExpandedEnv).to.equal(
+        'valuefromdefault/expanded'
+      );
       expect(result.serverless.service.custom.fromStageEnv).to.equal('not-found');
     });
   });

From 8c741d1d97f021995f37a61d7340ddfa749cdab9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 15 Jul 2021 09:34:59 +0200
Subject: [PATCH 0336/1101] fix(Variables): In `ssm` source auto parse only
 object JSON notation

---
 .../variables/sources/instance-dependent/get-ssm.js       | 4 +++-
 .../variables/sources/instance-dependent/get-ssm.test.js  | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/configuration/variables/sources/instance-dependent/get-ssm.js b/lib/configuration/variables/sources/instance-dependent/get-ssm.js
index b7c58148ff7..923eca7887b 100644
--- a/lib/configuration/variables/sources/instance-dependent/get-ssm.js
+++ b/lib/configuration/variables/sources/instance-dependent/get-ssm.js
@@ -116,7 +116,9 @@ module.exports = (serverlessInstance) => {
               );
             }
           }
-          if (shouldReturnRawValue) return { value: result.Parameter.Value };
+          if (shouldReturnRawValue || !result.Parameter.Value.startsWith('{')) {
+            return { value: result.Parameter.Value };
+          }
           try {
             return { value: JSON.parse(result.Parameter.Value) };
           } catch {
diff --git a/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js b/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js
index 9d13197af39..85c46ab618f 100644
--- a/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js
+++ b/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js
@@ -27,6 +27,7 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
           existingListRaw: '${ssm(raw):existingList}',
           secretManager: '${ssm:/aws/reference/secretsmanager/existing}',
           existingEncrypted: '${ssm:/secret/existing}',
+          existingEncryptedDirect: '${ssm:/secret/direct}',
           existingEncryptedRaw: '${ssm(raw):/aws/reference/secretsmanager/existing}',
           notExisting: '${ssm:notExisting, null}',
           missingAddress: '${ssm:}',
@@ -49,6 +50,9 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
             if (Name === '/secret/existing' || Name === '/aws/reference/secretsmanager/existing') {
               return { Parameter: { Type: 'SecureString', Value: '{"someSecret":"someValue"}' } };
             }
+            if (Name === '/secret/direct') {
+              return { Parameter: { Type: 'SecureString', Value: '12345678901234567890' } };
+            }
             if (Name === 'notExisting') {
               throw Object.assign(
                 new Error(
@@ -104,7 +108,11 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
       if (variablesMeta.get('custom\0existingEncrypted')) {
         throw variablesMeta.get('custom\0existingEncrypted').error;
       }
+      if (variablesMeta.get('custom\0existingDirect')) {
+        throw variablesMeta.get('custom\0existingDirect').error;
+      }
       expect(configuration.custom.existingEncrypted).to.deep.equal({ someSecret: 'someValue' });
+      expect(configuration.custom.existingEncryptedDirect).to.equal('12345678901234567890');
     });
 
     it('should support "raw" output for decrypted data', () => {

From 6f494888cc01853894ec33859edbd77a06dc9d76 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 15 Jul 2021 11:06:53 +0200
Subject: [PATCH 0337/1101] feat(AWS CloudFormation): Allow to disable default
 export names

---
 docs/deprecations.md                               |  8 ++++++++
 docs/providers/aws/guide/serverless.yml.md         |  1 +
 lib/plugins/aws/package/index.js                   | 11 ++++++++++-
 .../aws/package/lib/addExportNameForOutputs.js     | 14 ++++++++------
 lib/plugins/aws/provider.js                        |  1 +
 .../package/lib/addExportNameForOutputs.test.js    | 14 ++++++++++++++
 6 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index c26fedd804e..7944b063f3c 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -36,6 +36,14 @@ Note:
 - In service configuration setting is ineffective for deprecations reported before service configuration is read.
 - `SLS_DEPRECATION_DISABLE` env var and `disabledDeprecations` configuration setting remain respected, and no errors will be thrown for mentioned deprecation coodes.
 
+<a name="DISABLE_DEFAULT_OUTPUT_EXPORT_NAMES"><div>&nbsp;</div></a>
+
+## Disable default Output Export names
+
+Deprecation code: `DISABLE_DEFAULT_OUTPUT_EXPORT_NAMES`
+
+Starting with `v3.0.0`, it will not be possible to disable default export names for outputs. To hide this deprecation message and ensure seamless upgrade, please remove this flag.
+
 <a name="CLI_DEPLOY_FUNCTION_OPTION"><div>&nbsp;</div></a>
 
 ## CLI `--function`/`-f` option for `deploy` command
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index a8167bcae32..5e6cd79a0a1 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -63,6 +63,7 @@ provider:
       key1: value1
       key2: value2
   deploymentPrefix: serverless # The S3 prefix under which deployed artifacts should be stored. Default is serverless
+  disableDefaultOutputExportNames: false # optional, if set to 'true', disables default behavior of generating export names for CloudFormation outputs
   lambdaHashingVersion: 20201221 # optional, version of hashing algorithm that should be used by the framework
   ecr:
     scanOnPush: true
diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
index 29fc6fa333e..948a7ffd16c 100644
--- a/lib/plugins/aws/package/index.js
+++ b/lib/plugins/aws/package/index.js
@@ -64,7 +64,16 @@ class AwsPackage {
           .then(() => this.serverless.pluginManager.spawn('aws:common:validate'))
           .then(() => this.serverless.pluginManager.spawn('aws:common:cleanupTempDir')),
 
-      'package:initialize': async () => this.generateCoreTemplate(),
+      'package:initialize': async () => {
+        if (this.serverless.service.provider.disableDefaultOutputExportNames) {
+          this.serverless._logDeprecation(
+            'DISABLE_DEFAULT_OUTPUT_EXPORT_NAMES',
+            'Starting with `v3.0.0`, it will not be possible to disable default export names for outputs. To hide this deprecation message and ensure seamless upgrade, please remove this flag.'
+          );
+        }
+
+        return this.generateCoreTemplate();
+      },
 
       'package:setupProviderConfiguration': () => this.mergeIamTemplates(),
 
diff --git a/lib/plugins/aws/package/lib/addExportNameForOutputs.js b/lib/plugins/aws/package/lib/addExportNameForOutputs.js
index 01ce67f5712..efaf142ae26 100644
--- a/lib/plugins/aws/package/lib/addExportNameForOutputs.js
+++ b/lib/plugins/aws/package/lib/addExportNameForOutputs.js
@@ -2,12 +2,14 @@
 
 module.exports = {
   addExportNameForOutputs() {
-    const outputs = this.serverless.service.provider.compiledCloudFormationTemplate.Outputs;
-    for (const [key, data] of Object.entries(outputs)) {
-      if (!data.Export) {
-        data.Export = {
-          Name: `sls-${this.serverless.service.service}-${this.provider.getStage()}-${key}`,
-        };
+    if (!this.serverless.service.provider.disableDefaultOutputExportNames) {
+      const outputs = this.serverless.service.provider.compiledCloudFormationTemplate.Outputs;
+      for (const [key, data] of Object.entries(outputs)) {
+        if (!data.Export) {
+          data.Export = {
+            Name: `sls-${this.serverless.service.service}-${this.provider.getStage()}-${key}`,
+          };
+        }
       }
     }
   },
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 3306c74500b..ae012984aa0 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -832,6 +832,7 @@ class AwsProvider {
               ],
             },
             deploymentPrefix: { type: 'string' },
+            disableDefaultOutputExportNames: { const: true },
             endpointType: {
               anyOf: ['REGIONAL', 'EDGE', 'PRIVATE'].map(caseInsensitive),
             },
diff --git a/test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js b/test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js
index fa5e724a297..e348d454885 100644
--- a/test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js
@@ -47,4 +47,18 @@ describe('test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js'
   it('Should not override Export.Name for user configured Outputs', () => {
     expect(outputs.CustomOutput.Export.Name).to.equal('someExportName');
   });
+
+  it('Should not add Export.Name if `provider.disableDefaultOutputExportNames` set to `true`', async () => {
+    const { cfTemplate } = await runServerless({
+      fixture: 'apiGateway',
+      command: 'package',
+      configExt: {
+        disabledDeprecations: ['DISABLE_DEFAULT_OUTPUT_EXPORT_NAMES'],
+        provider: {
+          disableDefaultOutputExportNames: true,
+        },
+      },
+    });
+    expect(Object.values(cfTemplate.Outputs).some((value) => value.Export)).to.be.false;
+  });
 });

From dd1885f2de6347e46a868d4ec897cb75e446f35a Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 15 Jul 2021 12:13:04 +0200
Subject: [PATCH 0338/1101] chore: Bump dependencies

---
 package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 45d7cadf206..9b5f0baf260 100644
--- a/package.json
+++ b/package.json
@@ -23,13 +23,13 @@
   },
   "dependencies": {
     "@serverless/cli": "^1.5.2",
-    "@serverless/components": "^3.13.3",
+    "@serverless/components": "^3.13.4",
     "@serverless/dashboard-plugin": "^5.4.3",
     "@serverless/utils": "^5.3.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.942.0",
+    "aws-sdk": "^2.946.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
@@ -101,9 +101,9 @@
     "semver-regex": "^3.1.2",
     "sinon": "^11.1.1",
     "sinon-chai": "^3.7.0",
-    "standard-version": "^9.3.0",
+    "standard-version": "^9.3.1",
     "strip-ansi": "^6.0.0",
-    "ws": "^7.5.2",
+    "ws": "^7.5.3",
     "xml2js": "^0.4.23"
   },
   "eslintConfig": {

From 48bcf048d343229b51120d3e7ceb41488fbaf888 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 15 Jul 2021 12:30:41 +0200
Subject: [PATCH 0339/1101] chore: Release 2.52.0

---
 CHANGELOG.md | 19 +++++++++++++++++++
 package.json |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6238cdc8484..627d1aedf44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,25 @@
 
 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.
 
+## [2.52.0](https://github.com/serverless/serverless/compare/v2.51.2...v2.52.0) (2021-07-15)
+
+### Features
+
+- **AWS CloudFormation:** Allow to disable default export names ([#9748](https://github.com/serverless/serverless/pull/9748)) ([6f49488](https://github.com/serverless/serverless/commit/6f494888cc01853894ec33859edbd77a06dc9d76)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI:** Automatically expand loaded env variables from `.env` files ([#9615](https://github.com/serverless/serverless/issues/9615)) ([1864969](https://github.com/serverless/serverless/commit/186496922a0c4d69f3101dde0a9f4a0d89995ad0)) ([David Asensio Cañas](https://github.com/d-asensio))
+
+### Bug Fixes
+
+- **CLI:** Do not validate configuration with `plugin ..` commands ([#9741](https://github.com/serverless/serverless/pull/9741)) ([040036d](https://github.com/serverless/serverless/commit/040036d1869ceb207da6dad53f17e1ee1b6ee20a)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Variables:** In `ssm` source auto parse only object JSON notation ([#9747](https://github.com/serverless/serverless/pull/9747)) ([8c741d1](https://github.com/serverless/serverless/commit/8c741d1d97f021995f37a61d7340ddfa749cdab9)) ([Mariusz Nowak](https://github.com/medikoo))
+- Improve `functions` validation ([#9741](https://github.com/serverless/serverless/pull/9741)) ([3e58d62](https://github.com/serverless/serverless/commit/3e58d628e7b8f4dbc8e14adf94dd98546099f3be)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **Telemetry:** Record initial context for interactive setup ([#9736](https://github.com/serverless/serverless/pull/9736)) ([560aee5](https://github.com/serverless/serverless/commit/560aee5feb9f143e93933f6536e76edc9a3e56bb)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI:** Reuse already imported module ([#9741](https://github.com/serverless/serverless/pull/9741)) ([be441cc](https://github.com/serverless/serverless/commit/be441ccd9157b351fffe6ea21664624aeeeb4b29)) ([Mariusz Nowak](https://github.com/medikoo))
+- Add `has-local-credentials` util ([#9736](https://github.com/serverless/serverless/pull/9736)) ([82a35b3](https://github.com/serverless/serverless/commit/82a35b3903ad5d8f761612105036fc11a37e9e55)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
 ### [2.51.2](https://github.com/serverless/serverless/compare/v2.51.1...v2.51.2) (2021-07-08)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 9b5f0baf260..a221bd782fd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.51.2",
+  "version": "2.52.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 5ceca3c04a6023096263025f0ca5da3d0b7465cb Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 15 Jul 2021 15:14:57 +0200
Subject: [PATCH 0340/1101] test: Cover `serverless-plugin-typescript` plugin

---
 package.json                                  |  1 +
 .../programmatic/curated-plugins/index-ts.ts  | 13 ++++++++++
 .../programmatic/curated-plugins/package.json |  4 +++-
 test/integration/curated-plugins.test.js      | 24 +++++++++++++++++++
 4 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 test/fixtures/programmatic/curated-plugins/index-ts.ts

diff --git a/package.json b/package.json
index a221bd782fd..f9fb3a82257 100644
--- a/package.json
+++ b/package.json
@@ -80,6 +80,7 @@
     "@commitlint/cli": "^12.1.4",
     "@serverless/eslint-config": "^3.0.0",
     "@serverless/test": "^8.3.0",
+    "adm-zip": "^0.5.5",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "cos-nodejs-sdk-v5": "^2.9.21",
diff --git a/test/fixtures/programmatic/curated-plugins/index-ts.ts b/test/fixtures/programmatic/curated-plugins/index-ts.ts
new file mode 100644
index 00000000000..a0f5fd412ed
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins/index-ts.ts
@@ -0,0 +1,13 @@
+interface TestData {
+  value: string;
+}
+
+// Exported to confirm in tests we've received compiled module
+export const testData: TestData = { value: 'test-ts-compilation' };
+
+export const handler = (event, context, callback) => {
+  callback(null, {
+    statusCode: 200,
+    body: JSON.stringify({ message: 'Regular lambda test', input: event }, null, 2),
+  });
+};
diff --git a/test/fixtures/programmatic/curated-plugins/package.json b/test/fixtures/programmatic/curated-plugins/package.json
index 191ca6e5358..66a39b666bc 100755
--- a/test/fixtures/programmatic/curated-plugins/package.json
+++ b/test/fixtures/programmatic/curated-plugins/package.json
@@ -6,6 +6,8 @@
     "serverless-domain-manager": "5.1.0",
     "serverless-prune-plugin": "1.5.0",
     "serverless-dotenv-plugin": "3.9.0",
-    "serverless-iam-roles-per-function": "3.2.0"
+    "serverless-iam-roles-per-function": "3.2.0",
+    "serverless-plugin-typescript": "1.1.9",
+    "typescript": "4.3.5"
   }
 }
diff --git a/test/integration/curated-plugins.test.js b/test/integration/curated-plugins.test.js
index 98b4eddbc2a..92e13cf7b69 100644
--- a/test/integration/curated-plugins.test.js
+++ b/test/integration/curated-plugins.test.js
@@ -5,6 +5,7 @@ const path = require('path');
 const fsp = require('fs').promises;
 const spawn = require('child-process-ext/spawn');
 const got = require('got');
+const AdmZip = require('adm-zip');
 const { deployService, removeService } = require('../utils/integration');
 const fixturesEngine = require('../fixtures/programmatic');
 
@@ -131,4 +132,27 @@ describe('test/integration/curated-plugins.test.js', function () {
       });
     }
   });
+
+  it('should be extended by "serverless-plugin-typescript"', async () => {
+    await updateConfig({
+      plugins: ['serverless-plugin-typescript'],
+      functions: {
+        functionTs: {
+          handler: 'index-ts.handler',
+        },
+      },
+    });
+    try {
+      await spawn(serverlessExec, ['package'], { cwd: serviceDir });
+      const zip = new AdmZip(path.resolve(serviceDir, `.serverless/${serviceConfig.service}.zip`));
+      const zipEntry = zip.getEntries().find(({ entryName }) => entryName === 'index-ts.js');
+      const tmpModulePath = path.resolve(serviceDir, '.serverless/test-ts.js');
+      await fsp.writeFile(tmpModulePath, zipEntry.getData());
+      expect(require(tmpModulePath).testData).to.deep.equal({ value: 'test-ts-compilation' });
+    } finally {
+      await updateConfig({
+        functions: { functionTs: null },
+      });
+    }
+  });
 });

From d7c4c1efcbabbabe74441b64ee8476a42768f842 Mon Sep 17 00:00:00 2001
From: Ikko Ashimine <eltociear@gmail.com>
Date: Fri, 16 Jul 2021 00:15:53 +0900
Subject: [PATCH 0341/1101] test: Fix title typo (#9752)

---
 test/unit/lib/plugins/aws/lib/naming.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/lib/plugins/aws/lib/naming.test.js b/test/unit/lib/plugins/aws/lib/naming.test.js
index 9df0306593c..9b874e7170e 100644
--- a/test/unit/lib/plugins/aws/lib/naming.test.js
+++ b/test/unit/lib/plugins/aws/lib/naming.test.js
@@ -794,7 +794,7 @@ describe('#naming()', () => {
       );
     });
 
-    it('should return a prefixed unique identifer of not longer than 32 characters if alb.targetGroupPrefix is set', () => {
+    it('should return a prefixed unique identifier of not longer than 32 characters if alb.targetGroupPrefix is set', () => {
       serverless.service.service = 'myService';
       serverless.service.provider.alb = {};
       serverless.service.provider.alb.targetGroupPrefix = 'myPrefix-';

From daee1d5375efdb748b85b85a2a4675ac3277001f Mon Sep 17 00:00:00 2001
From: Sudipto Das <s.das001@yahoo.com>
Date: Fri, 16 Jul 2021 12:57:13 +0530
Subject: [PATCH 0342/1101] refactor: Replace `fse.unlink` with
 `fs.promises.unlink` (#9754)

---
 lib/utils/telemetry/index.js                  |  7 ++--
 .../cli/resolve-configuration-path.test.js    |  4 +--
 test/unit/lib/configuration/read.test.js      | 32 +++++++++----------
 test/unit/lib/utils/telemetry/index.test.js   |  3 +-
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/lib/utils/telemetry/index.js b/lib/utils/telemetry/index.js
index fecf62ed3a9..2b1ee8d49e3 100644
--- a/lib/utils/telemetry/index.js
+++ b/lib/utils/telemetry/index.js
@@ -6,6 +6,7 @@ const ensurePlainObject = require('type/plain-object/ensure');
 const { v1: uuid } = require('uuid');
 const fetch = require('node-fetch');
 const fse = require('fs-extra');
+const fsp = require('fs').promises;
 const telemetryUrl = require('@serverless/utils/analytics-and-notfications-url');
 const log = require('../log/serverlessLog');
 const isTelemetryDisabled = require('./areDisabled');
@@ -79,7 +80,7 @@ async function request(payload, { ids, timeout } = {}) {
     ids.map(async (id) => {
       const cachePath = join(cacheDirPath, id);
       try {
-        await fse.unlink(cachePath);
+        await fsp.unlink(cachePath);
       } catch (error) {
         logError(`Could not remove cache file ${id}`, error);
       }
@@ -146,7 +147,7 @@ async function send(options = {}) {
           logError(`Cannot read cache file: ${dirFilename}`, readJsonError);
           const cacheFile = join(cacheDirPath, dirFilename);
           try {
-            return await fse.unlink(cacheFile);
+            return await fsp.unlink(cacheFile);
           } catch (error) {
             logError(`Could not remove cache file ${dirFilename}`, error);
           }
@@ -166,7 +167,7 @@ async function send(options = {}) {
 
         const cacheFile = join(cacheDirPath, dirFilename);
         try {
-          return await fse.unlink(cacheFile);
+          return await fsp.unlink(cacheFile);
         } catch (error) {
           logError(`Could not remove cache file ${dirFilename}`, error);
         }
diff --git a/test/unit/lib/cli/resolve-configuration-path.test.js b/test/unit/lib/cli/resolve-configuration-path.test.js
index 8435c7f457e..82b770ac1a6 100644
--- a/test/unit/lib/cli/resolve-configuration-path.test.js
+++ b/test/unit/lib/cli/resolve-configuration-path.test.js
@@ -6,7 +6,7 @@ chai.use(require('chai-as-promised'));
 const { expect } = chai;
 
 const path = require('path');
-const fs = require('fs').promises;
+const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const overrideArgv = require('process-utils/override-argv');
 const overrideEnv = require('process-utils/override-env');
@@ -19,7 +19,7 @@ describe('test/unit/lib/cli/resolve-configuration-path.test.js', () => {
   afterEach(async () => {
     if (!configurationPath) return;
     try {
-      await fs.unlink(configurationPath);
+      await fsp.unlink(configurationPath);
     } catch {
       // Ignore any error
     }
diff --git a/test/unit/lib/configuration/read.test.js b/test/unit/lib/configuration/read.test.js
index 67bfe91d321..1a43b1c7849 100644
--- a/test/unit/lib/configuration/read.test.js
+++ b/test/unit/lib/configuration/read.test.js
@@ -5,7 +5,7 @@ chai.use(require('chai-as-promised'));
 
 const { expect } = chai;
 
-const fs = require('fs').promises;
+const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const proxyquire = require('proxyquire');
 const readConfiguration = require('../../../../lib/configuration/read');
@@ -14,13 +14,13 @@ describe('test/unit/lib/configuration/read.test.js', () => {
   let configurationPath;
 
   afterEach(async () => {
-    if (configurationPath) await fs.unlink(configurationPath);
+    if (configurationPath) await fsp.unlink(configurationPath);
     configurationPath = null;
   });
 
   it('should read "serverless.yml"', async () => {
     configurationPath = 'serverless.yml';
-    await fs.writeFile(configurationPath, 'service: test-yml\nprovider:\n  name: aws\n');
+    await fsp.writeFile(configurationPath, 'service: test-yml\nprovider:\n  name: aws\n');
     expect(await readConfiguration(configurationPath)).to.deep.equal({
       service: 'test-yml',
       provider: { name: 'aws' },
@@ -29,7 +29,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
 
   it('should read "serverless.yaml"', async () => {
     configurationPath = 'serverless.yaml';
-    await fs.writeFile(configurationPath, 'service: test-yaml\nprovider:\n  name: aws\n');
+    await fsp.writeFile(configurationPath, 'service: test-yaml\nprovider:\n  name: aws\n');
     expect(await readConfiguration(configurationPath)).to.deep.equal({
       service: 'test-yaml',
       provider: { name: 'aws' },
@@ -38,7 +38,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
 
   it('should support AWS CloudFormation shortcut syntax', async () => {
     configurationPath = 'serverless.yml';
-    await fs.writeFile(
+    await fsp.writeFile(
       configurationPath,
       'service: test-cf-shortcut\nprovider:\n  name: aws\n  cfProperty: !GetAtt MyResource.Arn'
     );
@@ -54,7 +54,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
       service: 'test-json',
       provider: { name: 'aws' },
     };
-    await fs.writeFile(configurationPath, JSON.stringify(configuration));
+    await fsp.writeFile(configurationPath, JSON.stringify(configuration));
     expect(await readConfiguration(configurationPath)).to.deep.equal(configuration);
   });
 
@@ -64,7 +64,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
       service: 'test-js',
       provider: { name: 'aws' },
     };
-    await fs.writeFile(configurationPath, `module.exports = ${JSON.stringify(configuration)}`);
+    await fsp.writeFile(configurationPath, `module.exports = ${JSON.stringify(configuration)}`);
     expect(await readConfiguration(configurationPath)).to.deep.equal(configuration);
   });
 
@@ -77,7 +77,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
         service: 'test-ts',
         provider: { name: 'aws' },
       };
-      await fs.writeFile(configurationPath, `module.exports = ${JSON.stringify(configuration)}`);
+      await fsp.writeFile(configurationPath, `module.exports = ${JSON.stringify(configuration)}`);
       expect(await readConfiguration(configurationPath)).to.deep.equal(configuration);
     } finally {
       await fse.remove('node_modules');
@@ -93,7 +93,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
         service: 'test-ts',
         provider: { name: 'aws' },
       };
-      await fs.writeFile(configurationPath, `module.exports = ${JSON.stringify(configuration)}`);
+      await fsp.writeFile(configurationPath, `module.exports = ${JSON.stringify(configuration)}`);
       expect(await readConfiguration(configurationPath)).to.deep.equal(configuration);
     } finally {
       delete process[Symbol.for('ts-node.register.instance')];
@@ -108,7 +108,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
       service: 'test-deferred',
       provider: { name: 'aws' },
     };
-    await fs.writeFile(
+    await fsp.writeFile(
       configurationPath,
       `module.exports = Promise.resolve(${JSON.stringify(configuration)})`
     );
@@ -134,7 +134,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
 
   it('should reject YAML syntax error', async () => {
     configurationPath = 'serverless.yaml';
-    await fs.writeFile(configurationPath, 'service: test-yaml\np [\nr\novider:\n  name: aws\n');
+    await fsp.writeFile(configurationPath, 'service: test-yaml\np [\nr\novider:\n  name: aws\n');
     await expect(readConfiguration(configurationPath)).to.eventually.be.rejected.and.have.property(
       'code',
       'CONFIGURATION_PARSE_ERROR'
@@ -143,7 +143,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
 
   it('should reject JSON syntax error', async () => {
     configurationPath = 'serverless.json';
-    await fs.writeFile(configurationPath, '{foom,sdfs}');
+    await fsp.writeFile(configurationPath, '{foom,sdfs}');
     await expect(readConfiguration(configurationPath)).to.eventually.be.rejected.and.have.property(
       'code',
       'CONFIGURATION_PARSE_ERROR'
@@ -152,7 +152,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
 
   it('should reject JS intialization error', async () => {
     configurationPath = 'serverless-errored.js';
-    await fs.writeFile(configurationPath, 'throw new Error("Stop!")');
+    await fsp.writeFile(configurationPath, 'throw new Error("Stop!")');
     await expect(readConfiguration(configurationPath)).to.eventually.be.rejected.and.have.property(
       'code',
       'CONFIGURATION_INITIALIZATION_ERROR'
@@ -165,7 +165,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
       service: 'test-ts',
       provider: { name: 'aws' },
     };
-    await fs.writeFile(configurationPath, `module.exports = ${JSON.stringify(configuration)}`);
+    await fsp.writeFile(configurationPath, `module.exports = ${JSON.stringify(configuration)}`);
     await expect(
       proxyquire('../../../../lib/configuration/read', {
         'child-process-ext/spawn': async () => {
@@ -177,7 +177,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
 
   it('should reject non object configuration', async () => {
     configurationPath = 'serverless.json';
-    await fs.writeFile(configurationPath, JSON.stringify([]));
+    await fsp.writeFile(configurationPath, JSON.stringify([]));
     await expect(readConfiguration(configurationPath)).to.eventually.be.rejected.and.have.property(
       'code',
       'INVALID_CONFIGURATION_EXPORT'
@@ -185,7 +185,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
   });
   it('should reject non JSON like structures', async () => {
     configurationPath = 'serverless-custom.js';
-    await fs.writeFile(configurationPath, 'exports.foo = exports');
+    await fsp.writeFile(configurationPath, 'exports.foo = exports');
     await expect(readConfiguration(configurationPath)).to.eventually.be.rejected.and.have.property(
       'code',
       'INVALID_CONFIGURATION_STRUCTURE'
diff --git a/test/unit/lib/utils/telemetry/index.test.js b/test/unit/lib/utils/telemetry/index.test.js
index 1bbfb9bea4f..449a504ea0f 100644
--- a/test/unit/lib/utils/telemetry/index.test.js
+++ b/test/unit/lib/utils/telemetry/index.test.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const path = require('path');
+const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const proxyquire = require('proxyquire');
 const { expect } = require('chai');
@@ -56,7 +57,7 @@ describe('test/unit/lib/utils/telemetry/index.test.js', () => {
     usedUrl = null;
     const dirFilenames = await fse.readdir(cacheDirPath);
     await Promise.all(
-      dirFilenames.map(async (filename) => fse.unlink(path.join(cacheDirPath, filename)))
+      dirFilenames.map(async (filename) => fsp.unlink(path.join(cacheDirPath, filename)))
     );
   });
 

From 922ec0093f0d4ab6f2b2055c6e6f2d5ec1f9d06e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 16 Jul 2021 10:18:21 +0200
Subject: [PATCH 0343/1101] fix: Fix `functions[]` validation (ignore `null`
 values)

---
 lib/classes/Service.js                | 4 ++++
 test/unit/lib/classes/Service.test.js | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index 235fafeb306..78a2a7cfb99 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -211,6 +211,10 @@ class Service {
       );
     }
     Object.entries(this.functions).forEach(([functionName, functionObj]) => {
+      if (functionObj == null) {
+        delete this.functions[functionName];
+        return;
+      }
       if (!_.isObject(functionObj)) {
         throw new ServerlessError(
           `Unexpected "${functionName}" function configuration: Expected object received ${util.inspect(
diff --git a/test/unit/lib/classes/Service.test.js b/test/unit/lib/classes/Service.test.js
index 9b48d323210..f90e16aa8a4 100644
--- a/test/unit/lib/classes/Service.test.js
+++ b/test/unit/lib/classes/Service.test.js
@@ -135,7 +135,7 @@ describe('Service', () => {
           command: 'package',
           configExt: {
             functions: {
-              bar: null,
+              bar: true,
             },
           },
         })

From 246817bbeb69f2d3e326f0df2bd5de704dee5a15 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 16 Jul 2021 12:38:33 +0200
Subject: [PATCH 0344/1101] docs(Telemetry): Update notifications code
 documentation

---
 docs/telemetry.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/telemetry.md b/docs/telemetry.md
index fbe7f330681..e81394476a6 100644
--- a/docs/telemetry.md
+++ b/docs/telemetry.md
@@ -38,16 +38,17 @@ In addition to telemetry, Serverless Framework occasionally informs you about ne
 
 ### Adjusting/disabling notifications
 
-Notifications can be configured by `SLS_NOTIFICATIONS_MODE` environment variable. If accepts three distinct values:
+Notifications can be configured by `SLS_NOTIFICATIONS_MODE` environment variable. If accepts following distinct values:
 
-- `0` - in this mode all notifications will be disabled
-- `1` - in this mode only notifications about minor and major version upgrades will be visible
-- `2` - in this mode all notifications will be visible
+- `off` (in older versions `0`) - No notifications will be shown
+- `upgrades-only` (in older versions `1`) - Only notifications about minor and major version upgrades will be visible
+- `on` (in older versions `2`) - All notifications will be visible
+- `force` (in older versions `3`) - All notifications will be visible and will be presented constantly ignoring the visibility threshold setting
 
-By default, the notifications are turned on (use mode `'2'`), with the exception of CI environments where the default mode is set to `'1'`.
+By default, the notifications are turned on (mode `'on'`), with the exception of CI environments where the default mode is set to `'upgrades-only'`.
 
 To adjust the notifications, set the `SLS_NOTIFICATIONS_MODE` to one of the values above, e.g.:
 
 ```
-SLS_NOTIFICATIONS_MODE=0 sls deploy
+SLS_NOTIFICATIONS_MODE=upgrades-only sls deploy
 ```

From 791f3acdc3a1fb02a11bf86660be8baf5f3c7cb3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 16 Jul 2021 17:19:22 +0200
Subject: [PATCH 0345/1101] test: Cover `serverless-step-functions` plugin

---
 .../programmatic/curated-plugins/package.json |  3 +-
 test/integration/curated-plugins.test.js      | 56 +++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/test/fixtures/programmatic/curated-plugins/package.json b/test/fixtures/programmatic/curated-plugins/package.json
index 66a39b666bc..1fc8395547f 100755
--- a/test/fixtures/programmatic/curated-plugins/package.json
+++ b/test/fixtures/programmatic/curated-plugins/package.json
@@ -8,6 +8,7 @@
     "serverless-dotenv-plugin": "3.9.0",
     "serverless-iam-roles-per-function": "3.2.0",
     "serverless-plugin-typescript": "1.1.9",
-    "typescript": "4.3.5"
+    "typescript": "4.3.5",
+    "serverless-step-functions": "2.32.0"
   }
 }
diff --git a/test/integration/curated-plugins.test.js b/test/integration/curated-plugins.test.js
index 92e13cf7b69..6dfc796d151 100644
--- a/test/integration/curated-plugins.test.js
+++ b/test/integration/curated-plugins.test.js
@@ -155,4 +155,60 @@ describe('test/integration/curated-plugins.test.js', function () {
       });
     }
   });
+
+  it('should be extended by "serverless-step-functions"', async () => {
+    await updateConfig({
+      plugins: ['serverless-step-functions'],
+      stepFunctions: {
+        stateMachines: {
+          testMachine: {
+            definition: {
+              StartAt: 'FirstState',
+              States: {
+                FirstState: {
+                  Type: 'Task',
+                  Resource: {
+                    'Fn::GetAtt': ['entry', 'Arn'],
+                  },
+                  Next: 'mapped_task',
+                },
+                mapped_task: {
+                  Type: 'Map',
+                  Iterator: {
+                    StartAt: 'FirstMapTask',
+                    States: {
+                      FirstMapTask: {
+                        Type: 'Task',
+                        Resource: {
+                          'Fn::GetAtt': ['mapTask', 'Arn'],
+                        },
+                        End: true,
+                      },
+                    },
+                  },
+                  End: true,
+                },
+              },
+            },
+          },
+        },
+        validate: true,
+      },
+    });
+    try {
+      await spawn(serverlessExec, ['package'], { cwd: serviceDir });
+      const cfTemplate = JSON.parse(
+        await fsp.readFile(
+          path.resolve(serviceDir, '.serverless/cloudformation-template-update-stack.json')
+        )
+      );
+      expect(cfTemplate.Resources.TestMachineStepFunctionsStateMachine.Type).to.equal(
+        'AWS::StepFunctions::StateMachine'
+      );
+    } finally {
+      await updateConfig({
+        stepFunctions: null,
+      });
+    }
+  });
 });

From 916c76f48ca86c3e31b719d2bb655c34d0287cec Mon Sep 17 00:00:00 2001
From: frozenbonito <t.aoki1130@gmail.com>
Date: Mon, 19 Jul 2021 23:28:31 +0900
Subject: [PATCH 0346/1101] fix(CLI): Fix validation of
 `deprecationNotificationMode` config option

(PR #9762)
---
 lib/configSchema.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/configSchema.js b/lib/configSchema.js
index 457caaf1ce4..6b45341a64b 100644
--- a/lib/configSchema.js
+++ b/lib/configSchema.js
@@ -20,7 +20,7 @@ const schema = {
       required: [],
       // User is free to add any properties for its own purpose
     },
-    deprecationsNotificationMode: {
+    deprecationNotificationMode: {
       enum: ['error', 'warn', 'warn:summary'],
     },
     disabledDeprecations: {

From b85f3934ed87e9c78494e9ad26163ee1d041599e Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 19 Jul 2021 14:44:24 +0200
Subject: [PATCH 0347/1101] fix(CLI Onboarding): Ensure credentials resolution
 before deploy

---
 lib/cli/interactive-setup/deploy.js                |  5 +----
 test/unit/lib/cli/interactive-setup/deploy.test.js | 10 ----------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/lib/cli/interactive-setup/deploy.js b/lib/cli/interactive-setup/deploy.js
index 72359130079..8b8d3516963 100644
--- a/lib/cli/interactive-setup/deploy.js
+++ b/lib/cli/interactive-setup/deploy.js
@@ -101,7 +101,7 @@ const configurePlugin = (serverless, originalStdWrite) => {
 
 module.exports = {
   async isApplicable(context) {
-    const { configuration, serviceDir, history, options } = context;
+    const { configuration, serviceDir, options } = context;
     if (!serviceDir) {
       context.inapplicabilityReasonCode = 'NOT_IN_SERVICE_DIRECTORY';
       return false;
@@ -115,9 +115,6 @@ module.exports = {
       return false;
     }
 
-    // If `awsCredentials` step was not executed, we should proceed as it means that user has available credentials
-    if (!history.has('awsCredentials')) return true;
-
     // We want to proceed if the service instance has a linked provider
     if (
       configuration.org &&
diff --git a/test/unit/lib/cli/interactive-setup/deploy.test.js b/test/unit/lib/cli/interactive-setup/deploy.test.js
index b0a38c8e4d5..cccce56261c 100644
--- a/test/unit/lib/cli/interactive-setup/deploy.test.js
+++ b/test/unit/lib/cli/interactive-setup/deploy.test.js
@@ -37,16 +37,6 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
     expect(context.inapplicabilityReasonCode).to.equal('NON_AWS_PROVIDER');
   });
 
-  it('Should be applied, if awsCredentials step was not executed which means user already had credentials', async () =>
-    expect(
-      await step.isApplicable({
-        configuration: { provider: { name: 'aws' } },
-        serviceDir: '/foo',
-        options: {},
-        history: new Map(),
-      })
-    ).to.equal(true));
-
   it('Should be applied if user configured local credentials', async () => {
     await overrideEnv(
       { variables: { AWS_ACCESS_KEY_ID: 'somekey', AWS_SECRET_ACCESS_KEY: 'somesecret' } },

From b19d11f29a119975db6189827d3c4dd5614265b7 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Tue, 20 Jul 2021 15:38:48 +0200
Subject: [PATCH 0348/1101] docs: Improve the Getting started guide (#9764)

---
 docs/getting-started.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/getting-started.md b/docs/getting-started.md
index 0b599e83d78..d18344f3f28 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -37,7 +37,7 @@ To install an specific version you may set a VERSION variable, for example:
 curl -o- -L https://slss.io/install | VERSION=2.21.1 bash
 ```
 
-Then open another terminal window to run `serverless` program.
+Then, open another terminal window to run the `serverless` program.
 
 ### Windows
 
@@ -59,13 +59,15 @@ npm install -g serverless
 
 ## Initial setup
 
-Run below command and follow the prompts
+Run the command below and follow the prompts:
 
 ```bash
 serverless
 ```
 
-_Note: Users in China are presented with setup centered around chinese [Tencent](https://intl.cloud.tencent.com/) provider. If you're based in China and prefer to be presented with steps as outside of China ensure `SERVERLESS_PLATFORM_VENDOR=aws` in your environment_
+The command will guide you to create a new serverless project.
+
+_Note: Users in China are presented with a setup centered around the chinese [Tencent](https://intl.cloud.tencent.com/) provider. If you're based in China and prefer to be presented with steps as outside of China, set the following environment variable: `SERVERLESS_PLATFORM_VENDOR=aws`_
 
 ## Upgrade
 

From adef7102df2958e976445f0c247895f82decebf9 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 20 Jul 2021 12:25:07 +0200
Subject: [PATCH 0349/1101] refactor(CLI Onboarding): Move `dashboard-login`
 step from plugin

---
 lib/cli/interactive-setup/dashboard-login.js  |  76 +++++++++
 lib/cli/interactive-setup/index.js            |   2 +-
 package.json                                  |   1 +
 .../aws-loggedin-service/.serverlessrc        |  31 ++++
 .../aws-loggedin-service/index.js             |   0
 .../aws-loggedin-service/serverless.yml       |  10 ++
 .../interactive-setup/dashboard-login.test.js | 152 ++++++++++++++++++
 7 files changed, 271 insertions(+), 1 deletion(-)
 create mode 100644 lib/cli/interactive-setup/dashboard-login.js
 create mode 100644 test/fixtures/programmatic/aws-loggedin-service/.serverlessrc
 create mode 100644 test/fixtures/programmatic/aws-loggedin-service/index.js
 create mode 100644 test/fixtures/programmatic/aws-loggedin-service/serverless.yml
 create mode 100644 test/unit/lib/cli/interactive-setup/dashboard-login.test.js

diff --git a/lib/cli/interactive-setup/dashboard-login.js b/lib/cli/interactive-setup/dashboard-login.js
new file mode 100644
index 00000000000..458922f04ff
--- /dev/null
+++ b/lib/cli/interactive-setup/dashboard-login.js
@@ -0,0 +1,76 @@
+'use strict';
+
+const _ = require('lodash');
+const { ServerlessSDK } = require('@serverless/platform-client');
+const login = require('@serverless/dashboard-plugin/lib/login');
+const configUtils = require('@serverless/utils/config');
+const { StepHistory } = require('@serverless/utils/telemetry');
+
+const loginOrRegisterQuestion = async (inquirer) =>
+  (
+    await inquirer.prompt({
+      message: 'Do you want to login/register to Serverless Dashboard?',
+      type: 'confirm',
+      name: 'shouldLoginOrRegister',
+    })
+  ).shouldLoginOrRegister;
+
+const steps = {
+  loginOrRegister: async (context) => {
+    const result = await loginOrRegisterQuestion(context.inquirer);
+    context.stepHistory.set('shouldLoginOrRegister', result);
+    if (result) {
+      await login({ isInteractive: true });
+    }
+  },
+};
+
+module.exports = {
+  async isApplicable(context) {
+    const { configuration, options, serviceDir } = context;
+
+    if (!serviceDir) {
+      context.inapplicabilityReasonCode = 'NOT_IN_SERVICE_DIRECTORY';
+      return false;
+    }
+
+    if (
+      _.get(configuration, 'provider') !== 'aws' &&
+      _.get(configuration, 'provider.name') !== 'aws'
+    ) {
+      context.inapplicabilityReasonCode = 'NON_AWS_PROVIDER';
+      return false;
+    }
+
+    if (process.env.SERVERLESS_ACCESS_KEY) {
+      context.inapplicabilityReasonCode = 'SERVERLESS_ACCESS_KEY_PROVIDED';
+      return false;
+    }
+
+    const sdk = new ServerlessSDK();
+    const { supportedRegions, supportedRuntimes } = await sdk.metadata.get();
+    if (!supportedRuntimes.includes(_.get(configuration.provider, 'runtime') || 'nodejs12.x')) {
+      context.inapplicabilityReasonCode = 'UNSUPPORTED_RUNTIME';
+      return false;
+    }
+    if (
+      !supportedRegions.includes(options.region || configuration.provider.region || 'us-east-1')
+    ) {
+      context.inapplicabilityReasonCode = 'UNSUPPORTED_REGION';
+      return false;
+    }
+    const isLoggedIn = Boolean(configUtils.getLoggedInUser());
+    if (isLoggedIn) {
+      context.inapplicabilityReasonCode = 'ALREADY_LOGGED_IN';
+    }
+    return !isLoggedIn;
+  },
+  async run(context) {
+    // TODO: Remove check for `StepHistory` after releasing new major version
+    if (!_.get(context.stepHistory, 'set')) context.stepHistory = new StepHistory();
+    process.stdout.write('You are not logged in or you do not have a Serverless account.\n\n');
+    return steps.loginOrRegister(context);
+  },
+  steps,
+  configuredQuestions: ['shouldLoginOrRegister'],
+};
diff --git a/lib/cli/interactive-setup/index.js b/lib/cli/interactive-setup/index.js
index de44bd0c333..70af04f815f 100644
--- a/lib/cli/interactive-setup/index.js
+++ b/lib/cli/interactive-setup/index.js
@@ -6,7 +6,7 @@ const { resolveInitialContext } = require('./utils');
 
 const steps = {
   service: require('./service'),
-  dashboardLogin: require('@serverless/dashboard-plugin/lib/cli/interactive-setup/dashboard-login'),
+  dashboardLogin: require('./dashboard-login'),
   dashboardSetOrg: require('@serverless/dashboard-plugin/lib/cli/interactive-setup/dashboard-set-org'),
   awsCredentials: require('./aws-credentials'),
   deploy: require('./deploy'),
diff --git a/package.json b/package.json
index f9fb3a82257..bf890bde01b 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
     "@serverless/cli": "^1.5.2",
     "@serverless/components": "^3.13.4",
     "@serverless/dashboard-plugin": "^5.4.3",
+    "@serverless/platform-client": "^4.2.5",
     "@serverless/utils": "^5.3.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
diff --git a/test/fixtures/programmatic/aws-loggedin-service/.serverlessrc b/test/fixtures/programmatic/aws-loggedin-service/.serverlessrc
new file mode 100644
index 00000000000..c28f097c827
--- /dev/null
+++ b/test/fixtures/programmatic/aws-loggedin-service/.serverlessrc
@@ -0,0 +1,31 @@
+{
+  "frameworkId": "00000000-0000-0000-0000-000000000000",
+  "meta": {
+    "created_at": 1560000000,
+    "updated_at": 1560000000
+  },
+  "userId": "testinteractivecli",
+  "users": {
+    "testinteractivecli": {
+      "userId": "testinteractivecli",
+      "name": "Testing Interactive Cli",
+      "email": "test-interactive-cli@interactive.cli",
+      "username": "testinteractivecli",
+      "dashboard": {
+        "refreshToken": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+        "accessToken": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+        "idToken": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6Ik56azVNREl5TVRnNFJqWTBORGswT0VJM1JrRXpORGN4UmtVMU1FWXdNemczT1VKQlFqRTBNZyJ9.eyJuaWNrbmFtZSI6InRlc3QtaW50ZXJhY3RpdmUtY2xpIiwibmFtZSI6IlRlc3RpbmcgSW50ZXJhY3RpdmUgQ2xpIiwicGljdHVyZSI6Imh0dHBzOi8vaW50ZXJhdGNpdmUuY2xpL3Rlc3RpbmcucG5nIiwidXBkYXRlZF9hdCI6IjIwMTktMDktMTZUMTU6MTg6NDMuOTk5WiIsImVtYWlsIjoidGVzdGluZ0BpbnRlcmFjdGl2ZS5jbGkiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6Ly9zZXJ2ZXJsZXNzaW5jLmF1dGgwLmNvbS8iLCJzdWIiOiJ0ZXN0LWludGVyYWN0aXZlLWNsaSIsImF1ZCI6IlhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYIiwiaWF0IjoxNTYwMDAwMDAwLCJleHAiOjMwMDAwMDAwMDB9.GcNQtWSxv9CHTABw-HIjYSvRxTEapDUDqIIWRGmz01XmShQxRGOHRuUg1NKU4w9MpOlB6txHKs8UWd2eZkzw_Z4QmIuLyAVhVklpWP2-xeysPLUyqVTgqAg8kgIUAwdKjmrdpQqHhGd-Q1BIX62-E-qKKx8prmADSw_hgmuvlMuSCa1ajCnfyUXycQxDmbFrvjd24lJER0FSpB2nWWW3KxZ_UBX-TuVmiEtRXg9GYeSv6oIU78PrIhYgJ0QjERRF1yAYamIXNRs-KZ7Z4YiFNC4uKzFH1524pZkS4Q0-pweIvBrrsjekz-vEYcbaVG1zAxDu_yNrYPk5phCy8MHTrQ",
+        "expiresAt": 3000000000000,
+        "username": "testinteractivecli",
+        "accessKeys": {
+          "testinteractivecli": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+        }
+      },
+      "enterprise": {
+        "versionSDK": "2.1.1",
+        "timeLastLogin": 1560000000,
+        "timeLastLogout": 1560000000
+      }
+    }
+  }
+}
diff --git a/test/fixtures/programmatic/aws-loggedin-service/index.js b/test/fixtures/programmatic/aws-loggedin-service/index.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/fixtures/programmatic/aws-loggedin-service/serverless.yml b/test/fixtures/programmatic/aws-loggedin-service/serverless.yml
new file mode 100644
index 00000000000..25542cc316b
--- /dev/null
+++ b/test/fixtures/programmatic/aws-loggedin-service/serverless.yml
@@ -0,0 +1,10 @@
+service: 'some-aws-service'
+provider: 'aws'
+
+functions:
+  app:
+    handler: index.handler
+    foo: bar
+  org:
+    handler: index.handler
+    foo: bar
diff --git a/test/unit/lib/cli/interactive-setup/dashboard-login.test.js b/test/unit/lib/cli/interactive-setup/dashboard-login.test.js
new file mode 100644
index 00000000000..08370618a62
--- /dev/null
+++ b/test/unit/lib/cli/interactive-setup/dashboard-login.test.js
@@ -0,0 +1,152 @@
+'use strict';
+
+const chai = require('chai');
+const sinon = require('sinon');
+const proxyquire = require('proxyquire');
+const overrideCwd = require('process-utils/override-cwd');
+const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
+const { StepHistory } = require('@serverless/utils/telemetry');
+const inquirer = require('@serverless/utils/inquirer');
+
+const { expect } = chai;
+
+chai.use(require('chai-as-promised'));
+
+const fixtures = require('../../../../fixtures/programmatic');
+
+const ServerlessSDKMock = class ServerlessSDK {
+  constructor() {
+    this.metadata = {
+      get: async () => {
+        return {
+          awsAccountId: '377024778620',
+          supportedRuntimes: ['nodejs10.x', 'nodejs12.x', 'python2.7', 'python3.6', 'python3.7'],
+          supportedRegions: [
+            'us-east-1',
+            'us-east-2',
+            'us-west-2',
+            'eu-central-1',
+            'eu-west-1',
+            'eu-west-2',
+            'ap-northeast-1',
+            'ap-southeast-1',
+            'ap-southeast-2',
+          ],
+        };
+      },
+    };
+  }
+};
+
+const step = proxyquire('../../../../../lib/cli/interactive-setup/dashboard-login', {
+  '@serverless/platform-client': {
+    ServerlessSDK: ServerlessSDKMock,
+  },
+});
+
+describe('test/unit/lib/cli/interactive-setup/dashboard-login.test.js', function () {
+  this.timeout(1000 * 60 * 3);
+
+  const loginStub = sinon.stub().resolves();
+
+  afterEach(() => {
+    loginStub.resetHistory();
+  });
+
+  it('Should be ineffective, when not at service path', async () => {
+    const context = {};
+    expect(await step.isApplicable(context)).to.be.false;
+    expect(context.inapplicabilityReasonCode).to.equal('NOT_IN_SERVICE_DIRECTORY');
+  });
+
+  it('Should be ineffective, when not at AWS service path', async () => {
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: {},
+      configurationFilename: 'serverless.yml',
+      options: {},
+      inquirer,
+    };
+    expect(await step.isApplicable(context)).to.equal(false);
+    expect(context.inapplicabilityReasonCode).to.equal('NON_AWS_PROVIDER');
+  });
+
+  it('Should be ineffective, when not at supported runtime service path', async () => {
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: { provider: { name: 'aws', runtime: 'java8' } },
+      configurationFilename: 'serverless.yml',
+      options: {},
+      inquirer,
+    };
+    expect(await step.isApplicable(context)).to.equal(false);
+    expect(context.inapplicabilityReasonCode).to.equal('UNSUPPORTED_RUNTIME');
+  });
+
+  it('Should be ineffective, when logged in', async () => {
+    const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+      'aws-loggedin-service'
+    );
+    const context = {
+      serviceDir,
+      configuration,
+      configurationFilename: 'serverless.yml',
+      options: {},
+      inquirer,
+    };
+    expect(await overrideCwd(serviceDir, async () => await step.isApplicable(context))).to.equal(
+      false
+    );
+    expect(context.inapplicabilityReasonCode).to.equal('ALREADY_LOGGED_IN');
+  });
+
+  it('Should login when user decides to login/register', async () => {
+    configureInquirerStub(inquirer, {
+      confirm: { shouldLoginOrRegister: true },
+    });
+    const loginStep = proxyquire('../../../../../lib/cli/interactive-setup/dashboard-login', {
+      '@serverless/dashboard-plugin/lib/login': loginStub,
+      '@serverless/platform-client': {
+        ServerlessSDK: ServerlessSDKMock,
+      },
+    });
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: { provider: { name: 'aws', runtime: 'nodejs12.x' } },
+      configurationFilename: 'serverless.yml',
+      options: {},
+      inquirer,
+      stepHistory: new StepHistory(),
+    };
+    await loginStep.run(context);
+    expect(loginStub.calledOnce).to.be.true;
+    expect(context.stepHistory.valuesMap()).to.deep.equal(
+      new Map([['shouldLoginOrRegister', true]])
+    );
+  });
+
+  it('Should not login when user decides not to login/register', async () => {
+    configureInquirerStub(inquirer, {
+      confirm: { shouldLoginOrRegister: false },
+    });
+    const loginStep = proxyquire('../../../../../lib/cli/interactive-setup/dashboard-login', {
+      '@serverless/dashboard-plugin/lib/login': loginStub,
+      '@serverless/platform-client': {
+        ServerlessSDK: ServerlessSDKMock,
+      },
+    });
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: { provider: { name: 'aws', runtime: 'nodejs12.x' } },
+      configurationFilename: 'serverless.yml',
+      options: {},
+      inquirer,
+      stepHistory: new StepHistory(),
+    };
+    await loginStep.run(context);
+    expect(loginStub.called).to.be.false;
+    expect(context.stepHistory.valuesMap()).to.deep.equal(
+      new Map([['shouldLoginOrRegister', false]])
+    );
+  });
+});

From afdf77c960c990f7daa445532789aebb9dc15a53 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 20 Jul 2021 14:32:14 +0200
Subject: [PATCH 0350/1101] refactor(CLI Onboarding): Move `dashboard-set-org`
 from plugin

---
 lib/cli/interactive-setup/dashboard-login.js  |    3 -
 .../interactive-setup/dashboard-set-org.js    |  383 +++++
 lib/cli/interactive-setup/index.js            |    2 +-
 lib/cli/interactive-setup/utils.js            |   48 +
 .../.serverlessrc                             |   31 +
 .../serverless.yml                            |    5 +
 .../aws-loggedin-noapp-service/.serverlessrc  |   31 +
 .../aws-loggedin-noapp-service/serverless.yml |    4 +
 .../.serverlessrc                             |   31 +
 .../serverless.yml                            |    5 +
 .../.serverlessrc                             |   31 +
 .../serverless.yml                            |    5 +
 .../dashboard-set-org.test.js                 | 1271 +++++++++++++++++
 13 files changed, 1846 insertions(+), 4 deletions(-)
 create mode 100644 lib/cli/interactive-setup/dashboard-set-org.js
 create mode 100644 test/fixtures/programmatic/aws-loggedin-monitored-service/.serverlessrc
 create mode 100644 test/fixtures/programmatic/aws-loggedin-monitored-service/serverless.yml
 create mode 100644 test/fixtures/programmatic/aws-loggedin-noapp-service/.serverlessrc
 create mode 100644 test/fixtures/programmatic/aws-loggedin-noapp-service/serverless.yml
 create mode 100644 test/fixtures/programmatic/aws-loggedin-wrongapp-service/.serverlessrc
 create mode 100644 test/fixtures/programmatic/aws-loggedin-wrongapp-service/serverless.yml
 create mode 100644 test/fixtures/programmatic/aws-loggedin-wrongorg-service/.serverlessrc
 create mode 100644 test/fixtures/programmatic/aws-loggedin-wrongorg-service/serverless.yml
 create mode 100644 test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js

diff --git a/lib/cli/interactive-setup/dashboard-login.js b/lib/cli/interactive-setup/dashboard-login.js
index 458922f04ff..68389644c1b 100644
--- a/lib/cli/interactive-setup/dashboard-login.js
+++ b/lib/cli/interactive-setup/dashboard-login.js
@@ -4,7 +4,6 @@ const _ = require('lodash');
 const { ServerlessSDK } = require('@serverless/platform-client');
 const login = require('@serverless/dashboard-plugin/lib/login');
 const configUtils = require('@serverless/utils/config');
-const { StepHistory } = require('@serverless/utils/telemetry');
 
 const loginOrRegisterQuestion = async (inquirer) =>
   (
@@ -66,8 +65,6 @@ module.exports = {
     return !isLoggedIn;
   },
   async run(context) {
-    // TODO: Remove check for `StepHistory` after releasing new major version
-    if (!_.get(context.stepHistory, 'set')) context.stepHistory = new StepHistory();
     process.stdout.write('You are not logged in or you do not have a Serverless account.\n\n');
     return steps.loginOrRegister(context);
   },
diff --git a/lib/cli/interactive-setup/dashboard-set-org.js b/lib/cli/interactive-setup/dashboard-set-org.js
new file mode 100644
index 00000000000..495b016792b
--- /dev/null
+++ b/lib/cli/interactive-setup/dashboard-set-org.js
@@ -0,0 +1,383 @@
+'use strict';
+
+const _ = require('lodash');
+const chalk = require('chalk');
+const accountUtils = require('@serverless/utils/account');
+const configUtils = require('@serverless/utils/config');
+const { ServerlessSDK } = require('@serverless/platform-client');
+const { writeOrgAndApp } = require('./utils');
+const {
+  getPlatformClientWithAccessKey,
+  getOrCreateAccessKeyForOrg,
+} = require('@serverless/dashboard-plugin/lib/clientUtils');
+
+const isValidAppName = RegExp.prototype.test.bind(/^[a-z0-9](?:[a-z0-9-]{0,126}[a-z0-9])?$/);
+
+const orgUpdateConfirm = async (inquirer, stepHistory) => {
+  process.stdout.write(
+    "Service has monitoring enabled, but it is configured with the 'org' to which you do not have access\n\n"
+  );
+  const shouldUpdateOrg = (
+    await inquirer.prompt({
+      message: 'Would you like to update it?',
+      type: 'confirm',
+      name: 'shouldUpdateOrg',
+    })
+  ).shouldUpdateOrg;
+  stepHistory.set('shouldUpdateOrg', shouldUpdateOrg);
+  return shouldUpdateOrg;
+};
+const appUpdateConfirm = async (inquirer, appName, orgName, stepHistory) => {
+  process.stdout.write(
+    "Service seems to have monitoring enabled, but configured app doesn't seem to exist in an organization.\n\n"
+  );
+
+  const appUpdateType = (
+    await inquirer.prompt({
+      message: 'What would you like to do?',
+      type: 'list',
+      name: 'appUpdateType',
+      choices: [
+        { name: `Create '${appName}' app in '${orgName}' org`, value: 'create' },
+        {
+          name: 'Switch to one of the existing apps (or create new one with different name)',
+          value: 'chooseExisting',
+        },
+        { name: "Skip, I'll sort this out manually", value: 'skip' },
+      ],
+    })
+  ).appUpdateType;
+  stepHistory.set('appUpdateType', appUpdateType);
+  return appUpdateType;
+};
+
+const orgsChoice = async (inquirer, orgNames, stepHistory) => {
+  const orgName = (
+    await inquirer.prompt({
+      message: 'What org do you want to add this to?',
+      type: 'list',
+      name: 'orgName',
+      choices: [...orgNames, { name: '[Skip]', value: '_skip_' }],
+    })
+  ).orgName;
+  stepHistory.set('orgName', orgName.startsWith('_') ? orgName : '_user_provided_');
+  return orgName;
+};
+
+const appNameChoice = async (inquirer, appNames, stepHistory) => {
+  const appName = (
+    await inquirer.prompt({
+      message: 'What application do you want to add this to?',
+      type: 'list',
+      name: 'appName',
+      choices: Array.from(appNames).concat({ name: '[create a new app]', value: '_create_' }),
+    })
+  ).appName;
+  stepHistory.set('appName', appName.startsWith('_') ? appName : '_user_provided_');
+  return appName;
+};
+
+const appNameInput = async (inquirer, appNames, stepHistory) => {
+  const appName = (
+    await inquirer.prompt({
+      message: 'What do you want to name this application?',
+      type: 'input',
+      name: 'newAppName',
+      validate: (input) => {
+        input = input.trim();
+        if (!isValidAppName(input)) {
+          return (
+            'App name is not valid.\n' +
+            '   - It should only contain lowercase alphanumeric and hyphens.\n' +
+            '   - It should start and end with an alphanumeric character.\n' +
+            "   - Shouldn't exceed 128 characters"
+          );
+        }
+        if (appNames.includes(input)) return 'App of this name already exists';
+        return true;
+      },
+    })
+  ).newAppName.trim();
+  stepHistory.set('newAppName', '_user_provided_');
+  return appName;
+};
+
+const steps = {
+  resolveOrgNames: async (user) => {
+    if (process.env.SERVERLESS_ACCESS_KEY) {
+      const sdk = new ServerlessSDK({ accessKey: process.env.SERVERLESS_ACCESS_KEY });
+      const { orgName } = await sdk.accessKeys.get();
+      return new Set([orgName]);
+    }
+
+    let orgs = new Set();
+    if (!user.idToken) {
+      // User registered over CLI hence idToken is not stored.
+      // Still to resolve organizations from platform idToken is needed.
+      // Handling it gently by assuming that orgs listed in config file
+      // make a valid representation
+      for (const org of Object.keys(user.accessKeys)) orgs.add(org);
+    } else {
+      const sdk = new ServerlessSDK();
+      await accountUtils.refreshToken(sdk);
+      user = configUtils.getLoggedInUser();
+      sdk.config({ accessKey: user.idToken });
+      orgs = new Set(
+        (await sdk.organizations.list({ username: user.username })).map((org) => org.tenantName)
+      );
+    }
+    return orgs;
+  },
+  setOrgAndApp: async (
+    context,
+    {
+      orgNames,
+      orgName,
+      apps,
+      appName,
+      newAppName,
+      isDashboardMonitoringOverridenByCli,
+      isDashboardAppPreconfigured,
+    }
+  ) => {
+    const { inquirer, history, stepHistory } = context;
+    if (!orgName) {
+      orgName = await (async () => {
+        // We only want to automatically select the single available org in situations where user explicitly
+        // logged in/registered during the process and created new service, for existing services we want to always ask
+        // that question. It will also be always asked if `SERVERLESS_ACCESS_KEY` was provided
+        if (
+          orgNames.size === 1 &&
+          history &&
+          history.has('dashboardLogin') &&
+          history.has('service')
+        ) {
+          return orgNames.values().next().value;
+        }
+        return orgsChoice(inquirer, orgNames, stepHistory);
+      })();
+    }
+
+    if (orgName === '_skip_') {
+      return;
+    }
+
+    const sdk = await getPlatformClientWithAccessKey(orgName);
+    if (!newAppName && !appName) {
+      if (!apps) apps = await sdk.apps.list({ orgName });
+
+      const appNames = apps.map((app) => app.appName);
+
+      if (!apps.length) {
+        newAppName = context.configuration.service;
+      } else {
+        appName = await appNameChoice(inquirer, appNames, stepHistory);
+        if (appName === '_create_') {
+          newAppName = await appNameInput(inquirer, appNames, stepHistory);
+        }
+      }
+    }
+    if (newAppName) {
+      ({ appName } = await sdk.apps.create({ orgName, app: { name: newAppName } }));
+    }
+    if (isDashboardMonitoringOverridenByCli && isDashboardAppPreconfigured) {
+      const { shouldOverrideDashboardConfig } = await inquirer.prompt({
+        message:
+          'Are you sure you want to update monitoring settings ' +
+          `to ${chalk.bold(`app: ${appName}, org: ${orgName}`)}`,
+        type: 'confirm',
+        name: 'shouldOverrideDashboardConfig',
+      });
+      stepHistory.set('shouldOverrideDashboardConfig', shouldOverrideDashboardConfig);
+      if (!shouldOverrideDashboardConfig) {
+        delete context.configuration.app;
+        delete context.configuration.org;
+        return;
+      }
+    }
+    process.stdout.write(
+      `\n${chalk.green('Your project has been setup with org ')}${chalk.white.bold(
+        orgName
+      )}${chalk.green(' and app ')}${chalk.white.bold(appName)}\n`
+    );
+    await writeOrgAndApp(orgName, appName, context);
+    return;
+  },
+};
+
+module.exports = {
+  async isApplicable(context) {
+    const { configuration, options, serviceDir } = context;
+    if (!serviceDir) {
+      context.inapplicabilityReasonCode = 'NOT_IN_SERVICE_DIRECTORY';
+      return false;
+    }
+
+    if (
+      _.get(configuration, 'provider') !== 'aws' &&
+      _.get(configuration, 'provider.name') !== 'aws'
+    ) {
+      context.inapplicabilityReasonCode = 'NON_AWS_PROVIDER';
+      return false;
+    }
+    const sdk = new ServerlessSDK();
+    const { supportedRegions, supportedRuntimes } = await sdk.metadata.get();
+    if (!supportedRuntimes.includes(_.get(configuration.provider, 'runtime') || 'nodejs12.x')) {
+      context.inapplicabilityReasonCode = 'UNSUPPORTED_RUNTIME';
+      return false;
+    }
+    if (
+      !supportedRegions.includes(options.region || configuration.provider.region || 'us-east-1')
+    ) {
+      context.inapplicabilityReasonCode = 'UNSUPPORTED_REGION';
+      return false;
+    }
+    const usesServerlessAccessKey = Boolean(process.env.SERVERLESS_ACCESS_KEY);
+
+    let user = configUtils.getLoggedInUser();
+    if (!user && !usesServerlessAccessKey) {
+      context.inapplicabilityReasonCode = 'NOT_LOGGED_IN';
+      return false;
+    }
+
+    const orgNames = await steps.resolveOrgNames(user);
+    if (!orgNames.size) {
+      context.inapplicabilityReasonCode = 'NO_ORGS_AVAILABLE';
+      return false;
+    }
+    if (!usesServerlessAccessKey) {
+      user = configUtils.getLoggedInUser(); // Refreshed, as new token might have been generated
+    }
+
+    const orgName = options.org || configuration.org;
+    const appName = options.app || configuration.app;
+
+    const isDashboardMonitoringPreconfigured = Boolean(configuration.org);
+    const isDashboardAppPreconfigured = Boolean(configuration.app);
+    const isDashboardMonitoringOverridenByCli =
+      isDashboardMonitoringPreconfigured &&
+      ((options.org && options.org !== configuration.org) ||
+        (options.app && options.app !== configuration.app));
+    if (orgName && orgNames.has(orgName)) {
+      if (!isValidAppName(appName)) {
+        return {
+          user,
+          orgName,
+          isDashboardMonitoringPreconfigured,
+          isDashboardAppPreconfigured,
+          isDashboardMonitoringOverridenByCli,
+        };
+      }
+
+      const accessKey = await getOrCreateAccessKeyForOrg(orgName);
+      sdk.config({ accessKey });
+      const apps = await sdk.apps.list({ orgName });
+
+      if (options.org || options.app) {
+        if (apps.some((app) => app.appName === appName)) {
+          if (
+            isDashboardMonitoringPreconfigured &&
+            isDashboardAppPreconfigured &&
+            !isDashboardMonitoringOverridenByCli
+          ) {
+            context.inapplicabilityReasonCode = 'MONITORING_NOT_OVERRIDEN_BY_CLI';
+            return false;
+          }
+          return {
+            user,
+            orgName,
+            appName,
+            isDashboardMonitoringPreconfigured,
+            isDashboardAppPreconfigured,
+            isDashboardMonitoringOverridenByCli,
+          };
+        }
+        if (options.app) {
+          process.stdout.write(
+            chalk.red(
+              "\nPassed value for `--app` doesn't seem to correspond to chosen organization.\n"
+            )
+          );
+        }
+        return {
+          user,
+          orgName,
+          isDashboardMonitoringPreconfigured,
+          isDashboardAppPreconfigured,
+          isDashboardMonitoringOverridenByCli,
+        };
+      } else if (apps.some((app) => app.appName === appName)) {
+        context.inapplicabilityReasonCode = 'HAS_MONITORING_SETUP';
+        return false;
+      }
+      return {
+        user,
+        orgName,
+        apps,
+        newAppName: appName,
+        isDashboardMonitoringPreconfigured,
+        isDashboardAppPreconfigured,
+        isDashboardMonitoringOverridenByCli,
+      };
+    } else if (orgName) {
+      if (options.org) {
+        process.stdout.write(
+          chalk.red(
+            "\nPassed value for `--org` doesn't seem to correspond to account with which you're logged in with.\n"
+          )
+        );
+      } else {
+        process.stdout.write(
+          chalk.red(`\nConfigured org '${orgName}' is not available in your account.\n`)
+        );
+      }
+    }
+    return {
+      user,
+      orgNames,
+      isDashboardMonitoringPreconfigured,
+      isDashboardAppPreconfigured,
+      isDashboardMonitoringOverridenByCli,
+    };
+  },
+  async run(context, stepData) {
+    const { inquirer, configuration, options, stepHistory } = context;
+    if (!stepData.orgName) delete configuration.org;
+    if (!stepData.appName && !stepData.newAppName) delete configuration.app;
+    if (!options.org && !options.app) {
+      if (stepData.isDashboardMonitoringPreconfigured) {
+        if (!stepData.orgName) {
+          if (!(await orgUpdateConfirm(inquirer, stepHistory))) return;
+        } else if (stepData.newAppName) {
+          const appUpdateTypeChoice = await appUpdateConfirm(
+            inquirer,
+            stepData.newAppName,
+            stepData.orgName,
+            stepHistory
+          );
+          switch (appUpdateTypeChoice) {
+            case 'create':
+              break;
+            case 'chooseExisting':
+              delete stepData.newAppName;
+              break;
+            case 'skip':
+              return;
+            default:
+              throw new Error('Unexpected app update type');
+          }
+        }
+      }
+    }
+    await steps.setOrgAndApp(context, stepData);
+  },
+  steps,
+  configuredQuestions: [
+    'orgName',
+    'appName',
+    'newAppName',
+    'shouldUpdateOrg',
+    'appUpdateType',
+    'shouldOverrideDashboardConfig',
+  ],
+};
diff --git a/lib/cli/interactive-setup/index.js b/lib/cli/interactive-setup/index.js
index 70af04f815f..f28c52283aa 100644
--- a/lib/cli/interactive-setup/index.js
+++ b/lib/cli/interactive-setup/index.js
@@ -7,7 +7,7 @@ const { resolveInitialContext } = require('./utils');
 const steps = {
   service: require('./service'),
   dashboardLogin: require('./dashboard-login'),
-  dashboardSetOrg: require('@serverless/dashboard-plugin/lib/cli/interactive-setup/dashboard-set-org'),
+  dashboardSetOrg: require('./dashboard-set-org'),
   awsCredentials: require('./aws-credentials'),
   deploy: require('./deploy'),
 };
diff --git a/lib/cli/interactive-setup/utils.js b/lib/cli/interactive-setup/utils.js
index 8d392b02947..df4b1c99bc1 100644
--- a/lib/cli/interactive-setup/utils.js
+++ b/lib/cli/interactive-setup/utils.js
@@ -1,10 +1,18 @@
 'use strict';
 
+const path = require('path');
 const inquirer = require('@serverless/utils/inquirer');
 const resolveProviderCredentials = require('@serverless/dashboard-plugin/lib/resolveProviderCredentials');
 const isAuthenticated = require('@serverless/dashboard-plugin/lib/isAuthenticated');
 const hasLocalCredentials = require('../../aws/has-local-credentials');
 
+const fsp = require('fs').promises;
+
+const yamlExtensions = new Set(['.yml', '.yaml']);
+
+const appPattern = /^(?:#\s*)?app\s*:.+/m;
+const orgPattern = /^(?:#\s*)?(?:tenant|org)\s*:.+/m;
+
 const ServerlessError = require('../../serverless-error');
 const resolveStage = require('../../utils/resolve-stage');
 const resolveRegion = require('../../utils/resolve-region');
@@ -46,4 +54,44 @@ module.exports = {
       isDashboardEnabled: Boolean(configuration && configuration.org && configuration.app),
     };
   },
+  writeOrgAndApp: async (
+    orgName,
+    appName,
+    { configurationFilename, serviceDir, configuration }
+  ) => {
+    const configurationFilePath = path.resolve(serviceDir, configurationFilename);
+    let ymlString = await (async () => {
+      if (!yamlExtensions.has(path.extname(configurationFilename))) return null; // Non YAML config
+      try {
+        return await fsp.readFile(configurationFilePath);
+      } catch (error) {
+        if (error.code === 'ENOENT') return null;
+        throw error;
+      }
+    })();
+
+    if (!ymlString) {
+      process.stdout.write(
+        'Add the following settings to your serverless configuration file:\n\n' +
+          `org: ${orgName}\napp: ${appName}\n`
+      );
+      return;
+    }
+    ymlString = ymlString.toString();
+    const appMatch = ymlString.match(appPattern);
+    if (appMatch) {
+      ymlString = ymlString.replace(appMatch[0], `app: ${appName}`);
+    } else {
+      ymlString = `app: ${appName}\n${ymlString}`;
+    }
+    const orgMatch = ymlString.match(orgPattern);
+    if (orgMatch) {
+      ymlString = ymlString.replace(orgMatch[0], `org: ${orgName}`);
+    } else {
+      ymlString = `org: ${orgName}\n${ymlString}`;
+    }
+    await fsp.writeFile(configurationFilePath, ymlString);
+    configuration.org = orgName;
+    configuration.app = appName;
+  },
 };
diff --git a/test/fixtures/programmatic/aws-loggedin-monitored-service/.serverlessrc b/test/fixtures/programmatic/aws-loggedin-monitored-service/.serverlessrc
new file mode 100644
index 00000000000..c28f097c827
--- /dev/null
+++ b/test/fixtures/programmatic/aws-loggedin-monitored-service/.serverlessrc
@@ -0,0 +1,31 @@
+{
+  "frameworkId": "00000000-0000-0000-0000-000000000000",
+  "meta": {
+    "created_at": 1560000000,
+    "updated_at": 1560000000
+  },
+  "userId": "testinteractivecli",
+  "users": {
+    "testinteractivecli": {
+      "userId": "testinteractivecli",
+      "name": "Testing Interactive Cli",
+      "email": "test-interactive-cli@interactive.cli",
+      "username": "testinteractivecli",
+      "dashboard": {
+        "refreshToken": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+        "accessToken": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+        "idToken": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6Ik56azVNREl5TVRnNFJqWTBORGswT0VJM1JrRXpORGN4UmtVMU1FWXdNemczT1VKQlFqRTBNZyJ9.eyJuaWNrbmFtZSI6InRlc3QtaW50ZXJhY3RpdmUtY2xpIiwibmFtZSI6IlRlc3RpbmcgSW50ZXJhY3RpdmUgQ2xpIiwicGljdHVyZSI6Imh0dHBzOi8vaW50ZXJhdGNpdmUuY2xpL3Rlc3RpbmcucG5nIiwidXBkYXRlZF9hdCI6IjIwMTktMDktMTZUMTU6MTg6NDMuOTk5WiIsImVtYWlsIjoidGVzdGluZ0BpbnRlcmFjdGl2ZS5jbGkiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6Ly9zZXJ2ZXJsZXNzaW5jLmF1dGgwLmNvbS8iLCJzdWIiOiJ0ZXN0LWludGVyYWN0aXZlLWNsaSIsImF1ZCI6IlhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYIiwiaWF0IjoxNTYwMDAwMDAwLCJleHAiOjMwMDAwMDAwMDB9.GcNQtWSxv9CHTABw-HIjYSvRxTEapDUDqIIWRGmz01XmShQxRGOHRuUg1NKU4w9MpOlB6txHKs8UWd2eZkzw_Z4QmIuLyAVhVklpWP2-xeysPLUyqVTgqAg8kgIUAwdKjmrdpQqHhGd-Q1BIX62-E-qKKx8prmADSw_hgmuvlMuSCa1ajCnfyUXycQxDmbFrvjd24lJER0FSpB2nWWW3KxZ_UBX-TuVmiEtRXg9GYeSv6oIU78PrIhYgJ0QjERRF1yAYamIXNRs-KZ7Z4YiFNC4uKzFH1524pZkS4Q0-pweIvBrrsjekz-vEYcbaVG1zAxDu_yNrYPk5phCy8MHTrQ",
+        "expiresAt": 3000000000000,
+        "username": "testinteractivecli",
+        "accessKeys": {
+          "testinteractivecli": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+        }
+      },
+      "enterprise": {
+        "versionSDK": "2.1.1",
+        "timeLastLogin": 1560000000,
+        "timeLastLogout": 1560000000
+      }
+    }
+  }
+}
diff --git a/test/fixtures/programmatic/aws-loggedin-monitored-service/serverless.yml b/test/fixtures/programmatic/aws-loggedin-monitored-service/serverless.yml
new file mode 100644
index 00000000000..9b6fa32d41f
--- /dev/null
+++ b/test/fixtures/programmatic/aws-loggedin-monitored-service/serverless.yml
@@ -0,0 +1,5 @@
+service: 'some-aws-service'
+provider: 'aws'
+
+org: 'testinteractivecli'
+app: 'some-aws-service-app'
diff --git a/test/fixtures/programmatic/aws-loggedin-noapp-service/.serverlessrc b/test/fixtures/programmatic/aws-loggedin-noapp-service/.serverlessrc
new file mode 100644
index 00000000000..c28f097c827
--- /dev/null
+++ b/test/fixtures/programmatic/aws-loggedin-noapp-service/.serverlessrc
@@ -0,0 +1,31 @@
+{
+  "frameworkId": "00000000-0000-0000-0000-000000000000",
+  "meta": {
+    "created_at": 1560000000,
+    "updated_at": 1560000000
+  },
+  "userId": "testinteractivecli",
+  "users": {
+    "testinteractivecli": {
+      "userId": "testinteractivecli",
+      "name": "Testing Interactive Cli",
+      "email": "test-interactive-cli@interactive.cli",
+      "username": "testinteractivecli",
+      "dashboard": {
+        "refreshToken": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+        "accessToken": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+        "idToken": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6Ik56azVNREl5TVRnNFJqWTBORGswT0VJM1JrRXpORGN4UmtVMU1FWXdNemczT1VKQlFqRTBNZyJ9.eyJuaWNrbmFtZSI6InRlc3QtaW50ZXJhY3RpdmUtY2xpIiwibmFtZSI6IlRlc3RpbmcgSW50ZXJhY3RpdmUgQ2xpIiwicGljdHVyZSI6Imh0dHBzOi8vaW50ZXJhdGNpdmUuY2xpL3Rlc3RpbmcucG5nIiwidXBkYXRlZF9hdCI6IjIwMTktMDktMTZUMTU6MTg6NDMuOTk5WiIsImVtYWlsIjoidGVzdGluZ0BpbnRlcmFjdGl2ZS5jbGkiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6Ly9zZXJ2ZXJsZXNzaW5jLmF1dGgwLmNvbS8iLCJzdWIiOiJ0ZXN0LWludGVyYWN0aXZlLWNsaSIsImF1ZCI6IlhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYIiwiaWF0IjoxNTYwMDAwMDAwLCJleHAiOjMwMDAwMDAwMDB9.GcNQtWSxv9CHTABw-HIjYSvRxTEapDUDqIIWRGmz01XmShQxRGOHRuUg1NKU4w9MpOlB6txHKs8UWd2eZkzw_Z4QmIuLyAVhVklpWP2-xeysPLUyqVTgqAg8kgIUAwdKjmrdpQqHhGd-Q1BIX62-E-qKKx8prmADSw_hgmuvlMuSCa1ajCnfyUXycQxDmbFrvjd24lJER0FSpB2nWWW3KxZ_UBX-TuVmiEtRXg9GYeSv6oIU78PrIhYgJ0QjERRF1yAYamIXNRs-KZ7Z4YiFNC4uKzFH1524pZkS4Q0-pweIvBrrsjekz-vEYcbaVG1zAxDu_yNrYPk5phCy8MHTrQ",
+        "expiresAt": 3000000000000,
+        "username": "testinteractivecli",
+        "accessKeys": {
+          "testinteractivecli": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+        }
+      },
+      "enterprise": {
+        "versionSDK": "2.1.1",
+        "timeLastLogin": 1560000000,
+        "timeLastLogout": 1560000000
+      }
+    }
+  }
+}
diff --git a/test/fixtures/programmatic/aws-loggedin-noapp-service/serverless.yml b/test/fixtures/programmatic/aws-loggedin-noapp-service/serverless.yml
new file mode 100644
index 00000000000..7600e51819d
--- /dev/null
+++ b/test/fixtures/programmatic/aws-loggedin-noapp-service/serverless.yml
@@ -0,0 +1,4 @@
+service: 'some-aws-service'
+provider: 'aws'
+
+org: 'testinteractivecli'
diff --git a/test/fixtures/programmatic/aws-loggedin-wrongapp-service/.serverlessrc b/test/fixtures/programmatic/aws-loggedin-wrongapp-service/.serverlessrc
new file mode 100644
index 00000000000..c28f097c827
--- /dev/null
+++ b/test/fixtures/programmatic/aws-loggedin-wrongapp-service/.serverlessrc
@@ -0,0 +1,31 @@
+{
+  "frameworkId": "00000000-0000-0000-0000-000000000000",
+  "meta": {
+    "created_at": 1560000000,
+    "updated_at": 1560000000
+  },
+  "userId": "testinteractivecli",
+  "users": {
+    "testinteractivecli": {
+      "userId": "testinteractivecli",
+      "name": "Testing Interactive Cli",
+      "email": "test-interactive-cli@interactive.cli",
+      "username": "testinteractivecli",
+      "dashboard": {
+        "refreshToken": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+        "accessToken": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+        "idToken": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6Ik56azVNREl5TVRnNFJqWTBORGswT0VJM1JrRXpORGN4UmtVMU1FWXdNemczT1VKQlFqRTBNZyJ9.eyJuaWNrbmFtZSI6InRlc3QtaW50ZXJhY3RpdmUtY2xpIiwibmFtZSI6IlRlc3RpbmcgSW50ZXJhY3RpdmUgQ2xpIiwicGljdHVyZSI6Imh0dHBzOi8vaW50ZXJhdGNpdmUuY2xpL3Rlc3RpbmcucG5nIiwidXBkYXRlZF9hdCI6IjIwMTktMDktMTZUMTU6MTg6NDMuOTk5WiIsImVtYWlsIjoidGVzdGluZ0BpbnRlcmFjdGl2ZS5jbGkiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6Ly9zZXJ2ZXJsZXNzaW5jLmF1dGgwLmNvbS8iLCJzdWIiOiJ0ZXN0LWludGVyYWN0aXZlLWNsaSIsImF1ZCI6IlhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYIiwiaWF0IjoxNTYwMDAwMDAwLCJleHAiOjMwMDAwMDAwMDB9.GcNQtWSxv9CHTABw-HIjYSvRxTEapDUDqIIWRGmz01XmShQxRGOHRuUg1NKU4w9MpOlB6txHKs8UWd2eZkzw_Z4QmIuLyAVhVklpWP2-xeysPLUyqVTgqAg8kgIUAwdKjmrdpQqHhGd-Q1BIX62-E-qKKx8prmADSw_hgmuvlMuSCa1ajCnfyUXycQxDmbFrvjd24lJER0FSpB2nWWW3KxZ_UBX-TuVmiEtRXg9GYeSv6oIU78PrIhYgJ0QjERRF1yAYamIXNRs-KZ7Z4YiFNC4uKzFH1524pZkS4Q0-pweIvBrrsjekz-vEYcbaVG1zAxDu_yNrYPk5phCy8MHTrQ",
+        "expiresAt": 3000000000000,
+        "username": "testinteractivecli",
+        "accessKeys": {
+          "testinteractivecli": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+        }
+      },
+      "enterprise": {
+        "versionSDK": "2.1.1",
+        "timeLastLogin": 1560000000,
+        "timeLastLogout": 1560000000
+      }
+    }
+  }
+}
diff --git a/test/fixtures/programmatic/aws-loggedin-wrongapp-service/serverless.yml b/test/fixtures/programmatic/aws-loggedin-wrongapp-service/serverless.yml
new file mode 100644
index 00000000000..560c7b02e7b
--- /dev/null
+++ b/test/fixtures/programmatic/aws-loggedin-wrongapp-service/serverless.yml
@@ -0,0 +1,5 @@
+service: 'some-aws-service'
+provider: 'aws'
+
+org: 'testinteractivecli'
+app: 'not-created-app'
diff --git a/test/fixtures/programmatic/aws-loggedin-wrongorg-service/.serverlessrc b/test/fixtures/programmatic/aws-loggedin-wrongorg-service/.serverlessrc
new file mode 100644
index 00000000000..c28f097c827
--- /dev/null
+++ b/test/fixtures/programmatic/aws-loggedin-wrongorg-service/.serverlessrc
@@ -0,0 +1,31 @@
+{
+  "frameworkId": "00000000-0000-0000-0000-000000000000",
+  "meta": {
+    "created_at": 1560000000,
+    "updated_at": 1560000000
+  },
+  "userId": "testinteractivecli",
+  "users": {
+    "testinteractivecli": {
+      "userId": "testinteractivecli",
+      "name": "Testing Interactive Cli",
+      "email": "test-interactive-cli@interactive.cli",
+      "username": "testinteractivecli",
+      "dashboard": {
+        "refreshToken": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+        "accessToken": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+        "idToken": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6Ik56azVNREl5TVRnNFJqWTBORGswT0VJM1JrRXpORGN4UmtVMU1FWXdNemczT1VKQlFqRTBNZyJ9.eyJuaWNrbmFtZSI6InRlc3QtaW50ZXJhY3RpdmUtY2xpIiwibmFtZSI6IlRlc3RpbmcgSW50ZXJhY3RpdmUgQ2xpIiwicGljdHVyZSI6Imh0dHBzOi8vaW50ZXJhdGNpdmUuY2xpL3Rlc3RpbmcucG5nIiwidXBkYXRlZF9hdCI6IjIwMTktMDktMTZUMTU6MTg6NDMuOTk5WiIsImVtYWlsIjoidGVzdGluZ0BpbnRlcmFjdGl2ZS5jbGkiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6Ly9zZXJ2ZXJsZXNzaW5jLmF1dGgwLmNvbS8iLCJzdWIiOiJ0ZXN0LWludGVyYWN0aXZlLWNsaSIsImF1ZCI6IlhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYIiwiaWF0IjoxNTYwMDAwMDAwLCJleHAiOjMwMDAwMDAwMDB9.GcNQtWSxv9CHTABw-HIjYSvRxTEapDUDqIIWRGmz01XmShQxRGOHRuUg1NKU4w9MpOlB6txHKs8UWd2eZkzw_Z4QmIuLyAVhVklpWP2-xeysPLUyqVTgqAg8kgIUAwdKjmrdpQqHhGd-Q1BIX62-E-qKKx8prmADSw_hgmuvlMuSCa1ajCnfyUXycQxDmbFrvjd24lJER0FSpB2nWWW3KxZ_UBX-TuVmiEtRXg9GYeSv6oIU78PrIhYgJ0QjERRF1yAYamIXNRs-KZ7Z4YiFNC4uKzFH1524pZkS4Q0-pweIvBrrsjekz-vEYcbaVG1zAxDu_yNrYPk5phCy8MHTrQ",
+        "expiresAt": 3000000000000,
+        "username": "testinteractivecli",
+        "accessKeys": {
+          "testinteractivecli": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+        }
+      },
+      "enterprise": {
+        "versionSDK": "2.1.1",
+        "timeLastLogin": 1560000000,
+        "timeLastLogout": 1560000000
+      }
+    }
+  }
+}
diff --git a/test/fixtures/programmatic/aws-loggedin-wrongorg-service/serverless.yml b/test/fixtures/programmatic/aws-loggedin-wrongorg-service/serverless.yml
new file mode 100644
index 00000000000..146e5545d06
--- /dev/null
+++ b/test/fixtures/programmatic/aws-loggedin-wrongorg-service/serverless.yml
@@ -0,0 +1,5 @@
+service: 'some-aws-service'
+provider: 'aws'
+
+org: 'some-other'
+app: 'some-aws-service-app'
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
new file mode 100644
index 00000000000..e50ce5b1335
--- /dev/null
+++ b/test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js
@@ -0,0 +1,1271 @@
+'use strict';
+
+const chai = require('chai');
+const { join } = require('path');
+const sinon = require('sinon');
+const proxyquire = require('proxyquire');
+const fsp = require('fs').promises;
+const yaml = require('js-yaml');
+const overrideCwd = require('process-utils/override-cwd');
+const overrideStdoutWrite = require('process-utils/override-stdout-write');
+const overrideEnv = require('process-utils/override-env');
+const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
+const stripAnsi = require('strip-ansi');
+const { StepHistory } = require('@serverless/utils/telemetry');
+const inquirer = require('@serverless/utils/inquirer');
+
+const fixtures = require('../../../../fixtures/programmatic');
+
+const { expect } = chai;
+
+chai.use(require('chai-as-promised'));
+
+describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', function () {
+  this.timeout(1000 * 60 * 3);
+
+  let step;
+  let mockOrganizationsList = [
+    { tenantName: 'testinteractivecli' },
+    { tenantName: 'otherorg' },
+    { tenantName: 'orgwithoutapps' },
+  ];
+
+  before(async () => {
+    const ServerlessSDKMock = class ServerlessSDK {
+      constructor() {
+        this.metadata = {
+          get: async () => {
+            return {
+              awsAccountId: '377024778620',
+              supportedRuntimes: [
+                'nodejs10.x',
+                'nodejs12.x',
+                'python2.7',
+                'python3.6',
+                'python3.7',
+              ],
+              supportedRegions: [
+                'us-east-1',
+                'us-east-2',
+                'us-west-2',
+                'eu-central-1',
+                'eu-west-1',
+                'eu-west-2',
+                'ap-northeast-1',
+                'ap-southeast-1',
+                'ap-southeast-2',
+              ],
+            };
+          },
+        };
+
+        this.apps = {
+          create: async ({ app: { name } }) => ({ appName: name }),
+          list: async ({ orgName }) => {
+            if (orgName === 'orgwithoutapps') {
+              return [];
+            }
+
+            return [
+              { appName: 'some-aws-service-app' },
+              { appName: 'other-app' },
+              { appName: 'app-from-flag' },
+            ];
+          },
+        };
+
+        this.organizations = {
+          list: async () => {
+            return mockOrganizationsList;
+          },
+        };
+
+        this.accessKeys = {
+          get: async () => {
+            return {
+              orgName: 'fromaccesskey',
+            };
+          },
+        };
+      }
+
+      async refreshToken() {
+        return {};
+      }
+
+      config() {}
+    };
+
+    step = proxyquire('../../../../../lib/cli/interactive-setup/dashboard-set-org', {
+      '@serverless/platform-client': {
+        ServerlessSDK: ServerlessSDKMock,
+      },
+      '@serverless/dashboard-plugin/lib/clientUtils': {
+        getPlatformClientWithAccessKey: async () => new ServerlessSDKMock(),
+        getOrCreateAccessKeyForOrg: async () => 'accessKey',
+      },
+    });
+  });
+
+  // TODO: VERIFY THESE CLEANUPS
+  after(() => {
+    sinon.restore();
+  });
+
+  afterEach(async () => {
+    sinon.reset();
+  });
+
+  it('Should be ineffective, when not at service path', async () => {
+    const context = {};
+    expect(await step.isApplicable(context)).to.be.false;
+    expect(context.inapplicabilityReasonCode).to.equal('NOT_IN_SERVICE_DIRECTORY');
+  });
+
+  it('Should be ineffective, when not at AWS service path', async () => {
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: {},
+      configurationFilename: 'serverless.yml',
+      options: {},
+      inquirer,
+    };
+    expect(await step.isApplicable(context)).to.equal(false);
+    expect(context.inapplicabilityReasonCode).to.equal('NON_AWS_PROVIDER');
+  });
+
+  it('Should be ineffective, when not at supported runtime service path', async () => {
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: { service: 'some-aws-service', provider: { name: 'aws', runtime: 'java8' } },
+      configurationFilename: 'serverless.yml',
+      options: {},
+      inquirer,
+    };
+    expect(await step.isApplicable(context)).to.equal(false);
+    expect(context.inapplicabilityReasonCode).to.equal('UNSUPPORTED_RUNTIME');
+  });
+
+  it('Should be ineffective, when not logged in', async () => {
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: {
+        service: 'some-aws-service',
+        provider: { name: 'aws', runtime: 'nodejs12.x' },
+      },
+      configurationFilename: 'serverless.yml',
+      options: {},
+      inquirer,
+    };
+    expect(await step.isApplicable(context)).to.equal(false);
+    expect(context.inapplicabilityReasonCode).to.equal('NOT_LOGGED_IN');
+  });
+
+  it('Should be ineffective, when no orgs are resolved', async () => {
+    const freshStep = proxyquire('../../../../../lib/cli/interactive-setup/dashboard-set-org', {
+      '@serverless/platform-client': {
+        ServerlessSDK: class ServerlessSDK {
+          constructor() {
+            this.metadata = {
+              get: async () => {
+                return {
+                  awsAccountId: '377024778620',
+                  supportedRuntimes: ['nodejs10.x', 'nodejs12.x'],
+                  supportedRegions: ['us-east-1'],
+                };
+              },
+            };
+            this.organizations = {
+              list: async () => [],
+            };
+          }
+
+          config() {}
+        },
+      },
+    });
+    const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+      'aws-loggedin-service'
+    );
+    const context = {
+      serviceDir,
+      configuration,
+      configurationFilename: 'serverless.yml',
+      options: {},
+      inquirer,
+    };
+    await overrideCwd(serviceDir, async () => {
+      expect(await freshStep.isApplicable(context)).to.be.false;
+    });
+    expect(context.inapplicabilityReasonCode).to.equal('NO_ORGS_AVAILABLE');
+  });
+
+  it('Should be ineffective, when project has monitoring setup with recognized org and app', async () => {
+    const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+      'aws-loggedin-monitored-service'
+    );
+    const context = {
+      serviceDir,
+      configuration,
+      configurationFilename: 'serverless.yml',
+      options: {},
+      inquirer,
+    };
+    await overrideCwd(serviceDir, async () => {
+      expect(await step.isApplicable(context)).to.be.false;
+    });
+    expect(await overrideCwd(serviceDir, async () => await step.isApplicable(context))).to.equal(
+      false
+    );
+    expect(context.inapplicabilityReasonCode).to.equal('HAS_MONITORING_SETUP');
+  });
+
+  it('Should reject an invalid app name', async () => {
+    configureInquirerStub(inquirer, {
+      input: { newAppName: 'invalid app name /* Ć */' },
+      list: { orgName: 'testinteractivecli', appName: '_create_' },
+    });
+    const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+      'aws-loggedin-service'
+    );
+    const context = {
+      serviceDir,
+      configuration,
+      configurationFilename: 'serverless.yml',
+      options: {},
+      inquirer,
+      stepHistory: new StepHistory(),
+    };
+    await expect(
+      overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      })
+    ).to.eventually.be.rejected.and.have.property('code', 'INVALID_ANSWER');
+    expect(context.stepHistory.valuesMap()).to.deep.equal(
+      new Map([
+        ['orgName', '_user_provided_'],
+        ['appName', '_create_'],
+      ])
+    );
+  });
+
+  it('Should recognize an invalid org and allow to opt out', async () => {
+    configureInquirerStub(inquirer, {
+      confirm: { shouldUpdateOrg: false },
+    });
+    const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+      'aws-loggedin-wrongorg-service'
+    );
+    const context = {
+      serviceDir,
+      configuration,
+      configurationFilename: 'serverless.yml',
+      options: {},
+      inquirer,
+      stepHistory: new StepHistory(),
+    };
+    await overrideCwd(serviceDir, async () => {
+      const stepData = await step.isApplicable(context);
+      if (!stepData) throw new Error('Step resolved as not applicable');
+      await step.run(context, stepData);
+    });
+    expect(context.configuration).to.not.have.property('org');
+    expect(context.configuration).to.not.have.property('app');
+    expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldUpdateOrg', false]]));
+  });
+
+  it('Should recognize an invalid app and allow to opt out', async () => {
+    configureInquirerStub(inquirer, {
+      list: { appUpdateType: 'skip' },
+    });
+    const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+      'aws-loggedin-wrongapp-service'
+    );
+    const context = {
+      serviceDir,
+      configuration,
+      configurationFilename: 'serverless.yml',
+      options: {},
+      inquirer,
+      stepHistory: new StepHistory(),
+    };
+    await overrideCwd(serviceDir, async () => {
+      const stepData = await step.isApplicable(context);
+      if (!stepData) throw new Error('Step resolved as not applicable');
+      await step.run(context, stepData);
+    });
+    expect(context.configuration.org).to.equal('testinteractivecli');
+    expect(context.configuration.app).to.equal('not-created-app');
+    expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['appUpdateType', 'skip']]));
+  });
+
+  describe('Monitoring setup', () => {
+    it('Should setup monitoring for chosen org and app', async () => {
+      configureInquirerStub(inquirer, {
+        list: { orgName: 'testinteractivecli', appName: 'other-app' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: {},
+        inquirer,
+        stepHistory: new StepHistory(),
+      };
+      let stdoutData = '';
+      await overrideCwd(serviceDir, async () => {
+        await overrideStdoutWrite(
+          (data) => (stdoutData += data),
+          async () => {
+            const stepData = await step.isApplicable(context);
+            if (!stepData) throw new Error('Step resolved as not applicable');
+            await step.run(context, stepData);
+          }
+        );
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('other-app');
+      expect(stripAnsi(stdoutData)).to.include(
+        'Your project has been setup with org testinteractivecli and app other-app'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['orgName', '_user_provided_'],
+          ['appName', '_user_provided_'],
+        ])
+      );
+    });
+
+    it('Should setup monitoring for chosen app and org based on access key', async () => {
+      configureInquirerStub(inquirer, {
+        list: { orgName: 'fromaccesskey', appName: 'other-app' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: {},
+        inquirer,
+        stepHistory: new StepHistory(),
+      };
+      let stdoutData = '';
+      await overrideEnv({ variables: { SERVERLESS_ACCESS_KEY: 'validkey' } }, async () => {
+        await overrideCwd(serviceDir, async () => {
+          await overrideStdoutWrite(
+            (data) => (stdoutData += data),
+            async () => {
+              const stepData = await step.isApplicable(context);
+              if (!stepData) throw new Error('Step resolved as not applicable');
+              await step.run(context, stepData);
+            }
+          );
+        });
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('fromaccesskey');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('fromaccesskey');
+      expect(context.configuration.app).to.equal('other-app');
+      expect(stripAnsi(stdoutData)).to.include(
+        'Your project has been setup with org fromaccesskey and app other-app'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['orgName', '_user_provided_'],
+          ['appName', '_user_provided_'],
+        ])
+      );
+    });
+
+    it('Should allow to skip monitoring when org is resolved from access key', async () => {
+      configureInquirerStub(inquirer, {
+        list: { orgName: '_skip_' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: {},
+        inquirer,
+        stepHistory: new StepHistory(),
+      };
+      let stdoutData = '';
+      await overrideEnv({ variables: { SERVERLESS_ACCESS_KEY: 'validkey' } }, async () => {
+        await overrideCwd(serviceDir, async () => {
+          await overrideStdoutWrite(
+            (data) => (stdoutData += data),
+            async () => {
+              const stepData = await step.isApplicable(context);
+              if (!stepData) throw new Error('Step resolved as not applicable');
+              await step.run(context, stepData);
+            }
+          );
+        });
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.be.undefined;
+      expect(serviceConfig.app).to.be.undefined;
+      expect(context.configuration.org).to.be.undefined;
+      expect(context.configuration.app).to.be.undefined;
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['orgName', '_skip_']]));
+    });
+
+    it('Should allow to skip setting monitoring when selecting org', async () => {
+      configureInquirerStub(inquirer, {
+        list: { orgName: '_skip_' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: {},
+        inquirer,
+        stepHistory: new StepHistory(),
+      };
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.be.undefined;
+      expect(serviceConfig.app).to.be.undefined;
+      expect(context.configuration.org).to.be.undefined;
+      expect(context.configuration.app).to.be.undefined;
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['orgName', '_skip_']]));
+    });
+  });
+
+  describe('Monitoring setup when only one org available', () => {
+    before(() => {
+      mockOrganizationsList = [{ tenantName: 'orgwithoutapps' }];
+    });
+
+    after(() => {
+      mockOrganizationsList = [
+        { tenantName: 'testinteractivecli' },
+        { tenantName: 'otherorg' },
+        { tenantName: 'orgwithoutapps' },
+      ];
+    });
+
+    it('Should not automatically pre choose single available org if login/register step was not presented', async () => {
+      configureInquirerStub(inquirer, {
+        list: { orgName: '_skip_' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: {},
+        inquirer,
+        stepHistory: new StepHistory(),
+      };
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.be.undefined;
+      expect(serviceConfig.app).to.be.undefined;
+      expect(context.configuration.org).to.be.undefined;
+      expect(context.configuration.app).to.be.undefined;
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['orgName', '_skip_']]));
+    });
+
+    it('Should not automatically pre choose single available org if context history is not available', async () => {
+      configureInquirerStub(inquirer, {
+        list: { orgName: '_skip_' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: {},
+        inquirer,
+        stepHistory: new StepHistory(),
+      };
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.be.undefined;
+      expect(serviceConfig.app).to.be.undefined;
+      expect(context.configuration.org).to.be.undefined;
+      expect(context.configuration.app).to.be.undefined;
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['orgName', '_skip_']]));
+    });
+
+    it('Should not automatically pre choose single available org if login/register step was presented but service step was not', async () => {
+      configureInquirerStub(inquirer, {
+        list: { orgName: '_skip_' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: {},
+        inquirer,
+        history: new Map([['dashboardLogin', []]]),
+        stepHistory: new StepHistory(),
+      };
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.be.undefined;
+      expect(serviceConfig.app).to.be.undefined;
+      expect(context.configuration.org).to.be.undefined;
+      expect(context.configuration.app).to.be.undefined;
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['orgName', '_skip_']]));
+    });
+
+    it('Should setup monitoring with the only available org if login/register and service steps were presented', async () => {
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: {},
+        inquirer,
+        history: new Map([
+          ['dashboardLogin', []],
+          ['service', []],
+        ]),
+        stepHistory: new StepHistory(),
+      };
+
+      let stdoutData = '';
+      await overrideCwd(serviceDir, async () => {
+        await overrideStdoutWrite(
+          (data) => (stdoutData += data),
+          async () => {
+            const stepData = await step.isApplicable(context);
+            if (!stepData) throw new Error('Step resolved as not applicable');
+            await step.run(context, stepData);
+          }
+        );
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('orgwithoutapps');
+      expect(serviceConfig.app).to.equal(configuration.service);
+      expect(context.configuration.org).to.equal('orgwithoutapps');
+      expect(context.configuration.app).to.equal(configuration.service);
+      expect(stripAnsi(stdoutData)).to.include(
+        `Your project has been setup with org orgwithoutapps and app ${configuration.service}`
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map());
+    });
+  });
+
+  describe('Monitoring setup from CLI flags', () => {
+    it('Should setup monitoring for chosen org and app', async () => {
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: { org: 'testinteractivecli', app: 'other-app' },
+        inquirer,
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      let stdoutData = '';
+      await overrideCwd(serviceDir, async () => {
+        await overrideStdoutWrite(
+          (data) => (stdoutData += data),
+          async () => {
+            const stepData = await step.isApplicable(context);
+            if (!stepData) throw new Error('Step resolved as not applicable');
+            await step.run(context, stepData);
+          }
+        );
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('other-app');
+      expect(stripAnsi(stdoutData)).to.include(
+        'Your project has been setup with org testinteractivecli and app other-app'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map());
+    });
+
+    it('Should setup monitoring for chosen org and app even if already configured', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldOverrideDashboardConfig: true },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-monitored-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: { org: 'otherorg', app: 'app-from-flag' },
+        inquirer,
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      let stdoutData = '';
+      await overrideCwd(serviceDir, async () => {
+        await overrideStdoutWrite(
+          (data) => (stdoutData += data),
+          async () => {
+            const stepData = await step.isApplicable(context);
+            if (!stepData) throw new Error('Step resolved as not applicable');
+            await step.run(context, stepData);
+          }
+        );
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('otherorg');
+      expect(serviceConfig.app).to.equal('app-from-flag');
+      expect(context.configuration.org).to.equal('otherorg');
+      expect(context.configuration.app).to.equal('app-from-flag');
+      expect(stripAnsi(stdoutData)).to.include(
+        'Your project has been setup with org otherorg and app app-from-flag'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['shouldOverrideDashboardConfig', true]])
+      );
+    });
+
+    it('Should not setup monitoring for chosen org and app even if already configured if rejected', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldOverrideDashboardConfig: false },
+      });
+
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-monitored-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: { org: 'otherorg', app: 'app-from-flag' },
+        inquirer,
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      expect(context.configuration).to.not.have.property('org');
+      expect(context.configuration).to.not.have.property('app');
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['shouldOverrideDashboardConfig', false]])
+      );
+    });
+
+    it('Should ask for org if passed in one is invalid', async () => {
+      configureInquirerStub(inquirer, {
+        list: { orgName: 'testinteractivecli', appName: 'other-app' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: { org: 'invalid-testinteractivecli', app: 'irrelevant' },
+        inquirer,
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      let stdoutData = '';
+      await overrideCwd(serviceDir, async () => {
+        await overrideStdoutWrite(
+          (data) => (stdoutData += data),
+          async () => {
+            const stepData = await step.isApplicable(context);
+            if (!stepData) throw new Error('Step resolved as not applicable');
+            await step.run(context, stepData);
+          }
+        );
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('other-app');
+      expect(stripAnsi(stdoutData)).to.include(
+        'Your project has been setup with org testinteractivecli and app other-app'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['orgName', '_user_provided_'],
+          ['appName', '_user_provided_'],
+        ])
+      );
+    });
+
+    it('Should ask for org if passed in one is invalid and there is a valid on in config', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldOverrideDashboardConfig: true },
+        list: { orgName: 'otherorg', appName: 'other-app' },
+      });
+
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-monitored-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: { org: 'invalid-testinteractivecli', app: 'irrelevant' },
+        inquirer,
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      let stdoutData = '';
+      await overrideCwd(serviceDir, async () => {
+        await overrideStdoutWrite(
+          (data) => (stdoutData += data),
+          async () => {
+            const stepData = await step.isApplicable(context);
+            if (!stepData) throw new Error('Step resolved as not applicable');
+            await step.run(context, stepData);
+          }
+        );
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('otherorg');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('otherorg');
+      expect(context.configuration.app).to.equal('other-app');
+      expect(stripAnsi(stdoutData)).to.include(
+        'Your project has been setup with org otherorg and app other-app'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['orgName', '_user_provided_'],
+          ['appName', '_user_provided_'],
+          ['shouldOverrideDashboardConfig', true],
+        ])
+      );
+    });
+
+    it('Should ask for app if passed in one is invalid and there is a valid on in config', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldOverrideDashboardConfig: true },
+        list: { orgName: 'testinteractivecli', appName: 'other-app' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-monitored-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: { org: 'invalid-testinteractivecli', app: 'irrelevant' },
+        inquirer,
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+      let stdoutData = '';
+      await overrideCwd(serviceDir, async () => {
+        await overrideStdoutWrite(
+          (data) => (stdoutData += data),
+          async () => {
+            const stepData = await step.isApplicable(context);
+            if (!stepData) throw new Error('Step resolved as not applicable');
+            await step.run(context, stepData);
+          }
+        );
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('other-app');
+      expect(stripAnsi(stdoutData)).to.include(
+        'Your project has been setup with org testinteractivecli and app other-app'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['orgName', '_user_provided_'],
+          ['appName', '_user_provided_'],
+          ['shouldOverrideDashboardConfig', true],
+        ])
+      );
+    });
+
+    it('Should ask for app if passed in one is invalid', async () => {
+      configureInquirerStub(inquirer, {
+        list: { orgName: 'testinteractivecli', appName: 'other-app' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: { org: 'testinteractivecli', app: 'invalid' },
+        inquirer,
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      let stdoutData = '';
+      await overrideCwd(serviceDir, async () => {
+        await overrideStdoutWrite(
+          (data) => (stdoutData += data),
+          async () => {
+            const stepData = await step.isApplicable(context);
+            if (!stepData) throw new Error('Step resolved as not applicable');
+            await step.run(context, stepData);
+          }
+        );
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('other-app');
+      expect(stripAnsi(stdoutData)).to.include(
+        'Your project has been setup with org testinteractivecli and app other-app'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['appName', '_user_provided_']])
+      );
+    });
+
+    it('Should create new app when requested, and setup monitoring with it', async () => {
+      configureInquirerStub(inquirer, {
+        input: { newAppName: 'frominput' },
+        list: { orgName: 'testinteractivecli', appName: '_create_' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        inquirer,
+        options: {},
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+      let stdoutData = '';
+      await overrideCwd(serviceDir, async () => {
+        await overrideStdoutWrite(
+          (data) => (stdoutData += data),
+          async () => {
+            const stepData = await step.isApplicable(context);
+            if (!stepData) throw new Error('Step resolved as not applicable');
+            await step.run(context, stepData);
+          }
+        );
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('frominput');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('frominput');
+      expect(stripAnsi(stdoutData)).to.include(
+        'Your project has been setup with org testinteractivecli and app frominput'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['orgName', '_user_provided_'],
+          ['appName', '_create_'],
+          ['newAppName', '_user_provided_'],
+        ])
+      );
+    });
+  });
+
+  describe('Monitoring setup when invalid org', () => {
+    it('Should provide a way to setup monitoring with an invalid org setting', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldUpdateOrg: true },
+        list: { orgName: 'testinteractivecli', appName: 'other-app' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-wrongorg-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        inquirer,
+        options: {},
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+      let stdoutData = '';
+      await overrideCwd(serviceDir, async () => {
+        await overrideStdoutWrite(
+          (data) => (stdoutData += data),
+          async () => {
+            const stepData = await step.isApplicable(context);
+            if (!stepData) throw new Error('Step resolved as not applicable');
+            await step.run(context, stepData);
+          }
+        );
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('other-app');
+      expect(stripAnsi(stdoutData)).to.include(
+        'Your project has been setup with org testinteractivecli and app other-app'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['shouldUpdateOrg', true],
+          ['orgName', '_user_provided_'],
+          ['appName', '_user_provided_'],
+        ])
+      );
+    });
+  });
+
+  describe('Monitoring setup when no app', () => {
+    it('Should allow to setup app', async () => {
+      configureInquirerStub(inquirer, {
+        list: { appName: 'other-app' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-noapp-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        inquirer,
+        options: {},
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      let stdoutData = '';
+      await overrideCwd(serviceDir, async () => {
+        await overrideStdoutWrite(
+          (data) => (stdoutData += data),
+          async () => {
+            const stepData = await step.isApplicable(context);
+            if (!stepData) throw new Error('Step resolved as not applicable');
+            await step.run(context, stepData);
+          }
+        );
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('other-app');
+      expect(stripAnsi(stdoutData)).to.include(
+        'Your project has been setup with org testinteractivecli and app other-app'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['appName', '_user_provided_']])
+      );
+    });
+  });
+
+  describe('Monitoring setup when no app with --app flag', () => {
+    it('Should allow to setup app', async () => {
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-noapp-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        inquirer,
+        options: { app: 'app-from-flag' },
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      let stdoutData = '';
+      await overrideCwd(serviceDir, async () => {
+        await overrideStdoutWrite(
+          (data) => (stdoutData += data),
+          async () => {
+            const stepData = await step.isApplicable(context);
+            if (!stepData) throw new Error('Step resolved as not applicable');
+            await step.run(context, stepData);
+          }
+        );
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('app-from-flag');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('app-from-flag');
+      expect(stripAnsi(stdoutData)).to.include(
+        'Your project has been setup with org testinteractivecli and app app-from-flag'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map());
+    });
+
+    it('Should create a default app if no apps exist', async () => {
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-noapp-service',
+        { configExt: { org: 'orgwithoutapps' } }
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        inquirer,
+        options: {},
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      let stdoutData = '';
+      await overrideCwd(serviceDir, async () => {
+        await overrideStdoutWrite(
+          (data) => (stdoutData += data),
+          async () => {
+            const stepData = await step.isApplicable(context);
+            if (!stepData) throw new Error('Step resolved as not applicable');
+            await step.run(context, stepData);
+          }
+        );
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('orgwithoutapps');
+      expect(serviceConfig.app).to.equal(configuration.service);
+      expect(context.configuration.org).to.equal('orgwithoutapps');
+      expect(context.configuration.app).to.equal(configuration.service);
+      expect(stripAnsi(stdoutData)).to.include(
+        `Your project has been setup with org orgwithoutapps and app ${configuration.service}`
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map());
+    });
+
+    it('Should allow to setup app when app is invalid', async () => {
+      configureInquirerStub(inquirer, {
+        list: { appName: 'other-app' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-noapp-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        inquirer,
+        options: { app: 'invalid-app-from-flag' },
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      let stdoutData = '';
+      await overrideCwd(serviceDir, async () => {
+        await overrideStdoutWrite(
+          (data) => (stdoutData += data),
+          async () => {
+            const stepData = await step.isApplicable(context);
+            if (!stepData) throw new Error('Step resolved as not applicable');
+            await step.run(context, stepData);
+          }
+        );
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('other-app');
+      expect(stripAnsi(stdoutData)).to.include(
+        'Your project has been setup with org testinteractivecli and app other-app'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['appName', '_user_provided_']])
+      );
+    });
+  });
+
+  describe('Monitoring setup when invalid app', () => {
+    it('Should recognize an invalid app and allow to create it', async () => {
+      configureInquirerStub(inquirer, {
+        list: { appUpdateType: 'create' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service',
+        {
+          configExt: {
+            org: 'testinteractivecli',
+            app: 'not-created-app',
+          },
+        }
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        inquirer,
+        options: {},
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      let stdoutData = '';
+      await overrideCwd(serviceDir, async () => {
+        await overrideStdoutWrite(
+          (data) => (stdoutData += data),
+          async () => {
+            const stepData = await step.isApplicable(context);
+            if (!stepData) throw new Error('Step resolved as not applicable');
+            await step.run(context, stepData);
+          }
+        );
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('not-created-app');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('not-created-app');
+      expect(stripAnsi(stdoutData)).to.include(
+        'Your project has been setup with org testinteractivecli and app not-created-app'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['appUpdateType', 'create']]));
+    });
+
+    it('Should recognize an invalid app and allow to replace it with existing one', async () => {
+      configureInquirerStub(inquirer, {
+        list: { appUpdateType: 'chooseExisting', appName: 'other-app' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service',
+        {
+          configExt: {
+            org: 'testinteractivecli',
+            app: 'not-created-app',
+          },
+        }
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        inquirer,
+        options: {},
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      let stdoutData = '';
+      await overrideCwd(serviceDir, async () => {
+        await overrideStdoutWrite(
+          (data) => (stdoutData += data),
+          async () => {
+            const stepData = await step.isApplicable(context);
+            if (!stepData) throw new Error('Step resolved as not applicable');
+            await step.run(context, stepData);
+          }
+        );
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('other-app');
+      expect(stripAnsi(stdoutData)).to.include(
+        'Your project has been setup with org testinteractivecli and app other-app'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['appUpdateType', 'chooseExisting'],
+          ['appName', '_user_provided_'],
+        ])
+      );
+    });
+  });
+});

From dc469ffe05979d03a8ef3d7c35d43a4e7072e9e5 Mon Sep 17 00:00:00 2001
From: Whit Rooke <79261809+Whitrooke@users.noreply.github.com>
Date: Wed, 21 Jul 2021 09:00:21 -0400
Subject: [PATCH 0351/1101] docs: Adjust spelling in Node SDK guide (#9767)

Just seemed a bit confusing to have an precede sync, made me look twice to see which case was truly sync versus async
---
 docs/guides/sdk/nodejs.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guides/sdk/nodejs.md b/docs/guides/sdk/nodejs.md
index 5e29d32d59d..94db2b2b50a 100644
--- a/docs/guides/sdk/nodejs.md
+++ b/docs/guides/sdk/nodejs.md
@@ -79,7 +79,7 @@ module.exports.handler = async (event, context) => {
 };
 ```
 
-Example from context with an sync function:
+Example from context with a sync function:
 
 ```javascript
 module.exports.handler = async (event, context) => {

From b775613d62ce3153084e3bff00a7db9420645be2 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Wed, 21 Jul 2021 15:15:11 +0200
Subject: [PATCH 0352/1101] docs: Cleanup broken links for `v0.5` documentation
 (#9765)

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 4b472cde0a4..c9f47bc8108 100644
--- a/README.md
+++ b/README.md
@@ -209,6 +209,4 @@ All files located in the node_modules and external directories are externally ma
 
 # <a name="v.5"></a>Previous Serverless Version 0.5.x
 
-You can find projects and plugins relating to version 0.5 [here](./0.5.x-RESOURCES.md). Note that these are not compatible with v1.0 but we are working diligently on updating them. [Guide on building v1.0 plugins](./docs/providers/aws/guide/plugins.md).
-
 You can read the v0.5.x documentation at [readme.io](https://serverless.readme.io/v0.5.0/docs).

From 4d56be562a4bdaf2588bdc42227a451d098d1420 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 21 Jul 2021 11:56:04 +0200
Subject: [PATCH 0353/1101] refactor(Telemetry): Use `prompt-with-history`

---
 lib/cli/interactive-setup/aws-credentials.js  |  85 +++++-----
 lib/cli/interactive-setup/dashboard-login.js  |  19 ++-
 .../interactive-setup/dashboard-set-org.js    | 151 ++++++++----------
 lib/cli/interactive-setup/deploy.js           |  10 +-
 lib/cli/interactive-setup/service.js          |  63 ++++----
 package.json                                  |   2 +-
 .../interactive-setup/aws-credentials.test.js |  26 +--
 .../dashboard-set-org.test.js                 |  53 +++---
 .../lib/cli/interactive-setup/service.test.js |  36 +++--
 9 files changed, 220 insertions(+), 225 deletions(-)

diff --git a/lib/cli/interactive-setup/aws-credentials.js b/lib/cli/interactive-setup/aws-credentials.js
index 0f70e5c6a45..4100f0a9ac2 100644
--- a/lib/cli/interactive-setup/aws-credentials.js
+++ b/lib/cli/interactive-setup/aws-credentials.js
@@ -3,6 +3,7 @@
 const chalk = require('chalk');
 const _ = require('lodash');
 const inquirer = require('@serverless/utils/inquirer');
+const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-history');
 const memoizee = require('memoizee');
 const AWS = require('aws-sdk');
 
@@ -78,37 +79,33 @@ const getProviders = memoizee(
 );
 
 const awsAccessKeyIdInput = async ({ stepHistory }) => {
-  const accessKeyId = (
-    await inquirer.prompt({
-      message: 'AWS Access Key Id:',
-      type: 'input',
-      name: 'accessKeyId',
-      validate: (input) => {
-        if (isValidAwsAccessKeyId(input.trim())) return true;
-        return 'AWS Access Key Id seems not valid.\n   Expected something like AKIAIOSFODNN7EXAMPLE';
-      },
-    })
-  ).accessKeyId.trim();
-  stepHistory.set('accessKeyId', '_user_provided_');
+  const accessKeyId = await promptWithHistory({
+    message: 'AWS Access Key Id:',
+    type: 'input',
+    name: 'accessKeyId',
+    stepHistory,
+    validate: (input) => {
+      if (isValidAwsAccessKeyId(input.trim())) return true;
+      return 'AWS Access Key Id seems not valid.\n   Expected something like AKIAIOSFODNN7EXAMPLE';
+    },
+  });
   return accessKeyId;
 };
 
 const awsSecretAccessKeyInput = async ({ stepHistory }) => {
-  const secretAccessKey = (
-    await inquirer.prompt({
-      message: 'AWS Secret Access Key:',
-      type: 'input',
-      name: 'secretAccessKey',
-      validate: (input) => {
-        if (isValidAwsSecretAccessKey(input.trim())) return true;
-        return (
-          'AWS Secret Access Key seems not valid.\n' +
-          '   Expected something like wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'
-        );
-      },
-    })
-  ).secretAccessKey.trim();
-  stepHistory.set('secretAccessKey', '_user_provided_');
+  const secretAccessKey = await promptWithHistory({
+    message: 'AWS Secret Access Key:',
+    type: 'input',
+    name: 'secretAccessKey',
+    stepHistory,
+    validate: (input) => {
+      if (isValidAwsSecretAccessKey(input.trim())) return true;
+      return (
+        'AWS Secret Access Key seems not valid.\n' +
+        '   Expected something like wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'
+      );
+    },
+  });
   return secretAccessKey;
 };
 
@@ -148,19 +145,13 @@ const credentialsSetupChoice = async (context, providers) => {
     { name: 'Skip', value: CREDENTIALS_SETUP_CHOICE.SKIP }
   );
 
-  const result = (
-    await inquirer.prompt({
-      message,
-      type: 'list',
-      name: 'credentialsSetupChoice',
-      choices: credentialsSetupChoices,
-    })
-  ).credentialsSetupChoice;
-
-  context.stepHistory.set(
-    'credentialsSetupChoice',
-    result.startsWith('_') ? result : '_user_provided_'
-  );
+  const result = await promptWithHistory({
+    message,
+    type: 'list',
+    name: 'credentialsSetupChoice',
+    choices: credentialsSetupChoices,
+    stepHistory: context.stepHistory,
+  });
   return result;
 };
 
@@ -173,22 +164,22 @@ const steps = {
   ensureAwsAccount: async ({ stepHistory }) => {
     if (await confirm('Do you have an AWS account?', { name: 'hasAwsAccount' })) return;
     openBrowser('https://portal.aws.amazon.com/billing/signup');
-    await inquirer.prompt({
+    await promptWithHistory({
       message: 'Press Enter to continue after creating an AWS account',
       name: 'createAwsAccountPrompt',
+      stepHistory,
     });
-    stepHistory.set('createAwsAccountPrompt', true);
   },
   ensureAwsCredentials: async ({ options, configuration, stepHistory }) => {
     const region = options.region || configuration.provider.region || 'us-east-1';
     openBrowser(
       `https://console.aws.amazon.com/iam/home?region=${region}#/users$new?step=final&accessKey&userNames=serverless&permissionType=policies&policies=arn:aws:iam::aws:policy%2FAdministratorAccess`
     );
-    await inquirer.prompt({
+    await promptWithHistory({
       message: 'Press Enter to continue after creating an AWS user with access keys',
       name: 'generateAwsCredsPrompt',
+      stepHistory,
     });
-    stepHistory.set('generateAwsCredsPrompt', true);
   },
   inputAwsCredentials: async (context) => {
     const accessKeyId = await awsAccessKeyIdInput(context);
@@ -218,14 +209,16 @@ const steps = {
 
       const timeoutDuration = 1000 * 30; // 30 seconds
       showSkipPromptTimeout = setTimeout(() => {
+        const promptName = 'skipProviderSetup';
+        stepHistory.start(promptName);
         inquirerPrompt = inquirer.prompt({
           message:
             '\n [If you approached an issue when setting up a provider, you may press Enter to skip this step]',
-          name: 'skipProviderSetup',
+          name: promptName,
         });
 
         inquirerPrompt.then(() => {
-          stepHistory.set('skipProviderSetup', true);
+          stepHistory.finalize(promptName, true);
           resolve(null);
         });
       }, timeoutDuration);
diff --git a/lib/cli/interactive-setup/dashboard-login.js b/lib/cli/interactive-setup/dashboard-login.js
index 68389644c1b..10203d0922c 100644
--- a/lib/cli/interactive-setup/dashboard-login.js
+++ b/lib/cli/interactive-setup/dashboard-login.js
@@ -4,20 +4,19 @@ const _ = require('lodash');
 const { ServerlessSDK } = require('@serverless/platform-client');
 const login = require('@serverless/dashboard-plugin/lib/login');
 const configUtils = require('@serverless/utils/config');
+const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-history');
 
-const loginOrRegisterQuestion = async (inquirer) =>
-  (
-    await inquirer.prompt({
-      message: 'Do you want to login/register to Serverless Dashboard?',
-      type: 'confirm',
-      name: 'shouldLoginOrRegister',
-    })
-  ).shouldLoginOrRegister;
+const loginOrRegisterQuestion = async (stepHistory) =>
+  promptWithHistory({
+    message: 'Do you want to login/register to Serverless Dashboard?',
+    type: 'confirm',
+    name: 'shouldLoginOrRegister',
+    stepHistory,
+  });
 
 const steps = {
   loginOrRegister: async (context) => {
-    const result = await loginOrRegisterQuestion(context.inquirer);
-    context.stepHistory.set('shouldLoginOrRegister', result);
+    const result = await loginOrRegisterQuestion(context.stepHistory);
     if (result) {
       await login({ isInteractive: true });
     }
diff --git a/lib/cli/interactive-setup/dashboard-set-org.js b/lib/cli/interactive-setup/dashboard-set-org.js
index 495b016792b..382adeb51f0 100644
--- a/lib/cli/interactive-setup/dashboard-set-org.js
+++ b/lib/cli/interactive-setup/dashboard-set-org.js
@@ -5,6 +5,7 @@ const chalk = require('chalk');
 const accountUtils = require('@serverless/utils/account');
 const configUtils = require('@serverless/utils/config');
 const { ServerlessSDK } = require('@serverless/platform-client');
+const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-history');
 const { writeOrgAndApp } = require('./utils');
 const {
   getPlatformClientWithAccessKey,
@@ -13,92 +14,83 @@ const {
 
 const isValidAppName = RegExp.prototype.test.bind(/^[a-z0-9](?:[a-z0-9-]{0,126}[a-z0-9])?$/);
 
-const orgUpdateConfirm = async (inquirer, stepHistory) => {
+const orgUpdateConfirm = async (stepHistory) => {
   process.stdout.write(
     "Service has monitoring enabled, but it is configured with the 'org' to which you do not have access\n\n"
   );
-  const shouldUpdateOrg = (
-    await inquirer.prompt({
-      message: 'Would you like to update it?',
-      type: 'confirm',
-      name: 'shouldUpdateOrg',
-    })
-  ).shouldUpdateOrg;
-  stepHistory.set('shouldUpdateOrg', shouldUpdateOrg);
+  const shouldUpdateOrg = await promptWithHistory({
+    message: 'Would you like to update it?',
+    type: 'confirm',
+    name: 'shouldUpdateOrg',
+    stepHistory,
+  });
   return shouldUpdateOrg;
 };
-const appUpdateConfirm = async (inquirer, appName, orgName, stepHistory) => {
+
+const appUpdateConfirm = async (appName, orgName, stepHistory) => {
   process.stdout.write(
     "Service seems to have monitoring enabled, but configured app doesn't seem to exist in an organization.\n\n"
   );
 
-  const appUpdateType = (
-    await inquirer.prompt({
-      message: 'What would you like to do?',
-      type: 'list',
-      name: 'appUpdateType',
-      choices: [
-        { name: `Create '${appName}' app in '${orgName}' org`, value: 'create' },
-        {
-          name: 'Switch to one of the existing apps (or create new one with different name)',
-          value: 'chooseExisting',
-        },
-        { name: "Skip, I'll sort this out manually", value: 'skip' },
-      ],
-    })
-  ).appUpdateType;
-  stepHistory.set('appUpdateType', appUpdateType);
+  const appUpdateType = await promptWithHistory({
+    message: 'What would you like to do?',
+    type: 'list',
+    name: 'appUpdateType',
+    stepHistory,
+    choices: [
+      { name: `Create '${appName}' app in '${orgName}' org`, value: '_create_' },
+      {
+        name: 'Switch to one of the existing apps (or create new one with different name)',
+        value: '_choose_existing_',
+      },
+      { name: "Skip, I'll sort this out manually", value: '_skip_' },
+    ],
+  });
   return appUpdateType;
 };
 
-const orgsChoice = async (inquirer, orgNames, stepHistory) => {
-  const orgName = (
-    await inquirer.prompt({
-      message: 'What org do you want to add this to?',
-      type: 'list',
-      name: 'orgName',
-      choices: [...orgNames, { name: '[Skip]', value: '_skip_' }],
-    })
-  ).orgName;
-  stepHistory.set('orgName', orgName.startsWith('_') ? orgName : '_user_provided_');
+const orgsChoice = async (orgNames, stepHistory) => {
+  const orgName = await promptWithHistory({
+    message: 'What org do you want to add this to?',
+    type: 'list',
+    name: 'orgName',
+    choices: [...orgNames, { name: '[Skip]', value: '_skip_' }],
+    stepHistory,
+  });
   return orgName;
 };
 
-const appNameChoice = async (inquirer, appNames, stepHistory) => {
-  const appName = (
-    await inquirer.prompt({
-      message: 'What application do you want to add this to?',
-      type: 'list',
-      name: 'appName',
-      choices: Array.from(appNames).concat({ name: '[create a new app]', value: '_create_' }),
-    })
-  ).appName;
-  stepHistory.set('appName', appName.startsWith('_') ? appName : '_user_provided_');
+const appNameChoice = async (appNames, stepHistory) => {
+  const appName = await promptWithHistory({
+    message: 'What application do you want to add this to?',
+    type: 'list',
+    name: 'appName',
+    choices: Array.from(appNames).concat({ name: '[create a new app]', value: '_create_' }),
+    stepHistory,
+  });
   return appName;
 };
 
-const appNameInput = async (inquirer, appNames, stepHistory) => {
-  const appName = (
-    await inquirer.prompt({
-      message: 'What do you want to name this application?',
-      type: 'input',
-      name: 'newAppName',
-      validate: (input) => {
-        input = input.trim();
-        if (!isValidAppName(input)) {
-          return (
-            'App name is not valid.\n' +
-            '   - It should only contain lowercase alphanumeric and hyphens.\n' +
-            '   - It should start and end with an alphanumeric character.\n' +
-            "   - Shouldn't exceed 128 characters"
-          );
-        }
-        if (appNames.includes(input)) return 'App of this name already exists';
-        return true;
-      },
-    })
-  ).newAppName.trim();
-  stepHistory.set('newAppName', '_user_provided_');
+const appNameInput = async (appNames, stepHistory) => {
+  const appName = await promptWithHistory({
+    message: 'What do you want to name this application?',
+    type: 'input',
+    name: 'newAppName',
+    stepHistory,
+    validate: (input) => {
+      input = input.trim();
+      if (!isValidAppName(input)) {
+        return (
+          'App name is not valid.\n' +
+          '   - It should only contain lowercase alphanumeric and hyphens.\n' +
+          '   - It should start and end with an alphanumeric character.\n' +
+          "   - Shouldn't exceed 128 characters"
+        );
+      }
+      if (appNames.includes(input)) return 'App of this name already exists';
+      return true;
+    },
+  });
   return appName;
 };
 
@@ -140,7 +132,7 @@ const steps = {
       isDashboardAppPreconfigured,
     }
   ) => {
-    const { inquirer, history, stepHistory } = context;
+    const { history, stepHistory } = context;
     if (!orgName) {
       orgName = await (async () => {
         // We only want to automatically select the single available org in situations where user explicitly
@@ -154,7 +146,7 @@ const steps = {
         ) {
           return orgNames.values().next().value;
         }
-        return orgsChoice(inquirer, orgNames, stepHistory);
+        return orgsChoice(orgNames, stepHistory);
       })();
     }
 
@@ -171,9 +163,9 @@ const steps = {
       if (!apps.length) {
         newAppName = context.configuration.service;
       } else {
-        appName = await appNameChoice(inquirer, appNames, stepHistory);
+        appName = await appNameChoice(appNames, stepHistory);
         if (appName === '_create_') {
-          newAppName = await appNameInput(inquirer, appNames, stepHistory);
+          newAppName = await appNameInput(appNames, stepHistory);
         }
       }
     }
@@ -181,14 +173,14 @@ const steps = {
       ({ appName } = await sdk.apps.create({ orgName, app: { name: newAppName } }));
     }
     if (isDashboardMonitoringOverridenByCli && isDashboardAppPreconfigured) {
-      const { shouldOverrideDashboardConfig } = await inquirer.prompt({
+      const shouldOverrideDashboardConfig = await promptWithHistory({
         message:
           'Are you sure you want to update monitoring settings ' +
           `to ${chalk.bold(`app: ${appName}, org: ${orgName}`)}`,
         type: 'confirm',
         name: 'shouldOverrideDashboardConfig',
+        stepHistory,
       });
-      stepHistory.set('shouldOverrideDashboardConfig', shouldOverrideDashboardConfig);
       if (!shouldOverrideDashboardConfig) {
         delete context.configuration.app;
         delete context.configuration.org;
@@ -341,27 +333,26 @@ module.exports = {
     };
   },
   async run(context, stepData) {
-    const { inquirer, configuration, options, stepHistory } = context;
+    const { configuration, options, stepHistory } = context;
     if (!stepData.orgName) delete configuration.org;
     if (!stepData.appName && !stepData.newAppName) delete configuration.app;
     if (!options.org && !options.app) {
       if (stepData.isDashboardMonitoringPreconfigured) {
         if (!stepData.orgName) {
-          if (!(await orgUpdateConfirm(inquirer, stepHistory))) return;
+          if (!(await orgUpdateConfirm(stepHistory))) return;
         } else if (stepData.newAppName) {
           const appUpdateTypeChoice = await appUpdateConfirm(
-            inquirer,
             stepData.newAppName,
             stepData.orgName,
             stepHistory
           );
           switch (appUpdateTypeChoice) {
-            case 'create':
+            case '_create_':
               break;
-            case 'chooseExisting':
+            case '_choose_existing_':
               delete stepData.newAppName;
               break;
-            case 'skip':
+            case '_skip_':
               return;
             default:
               throw new Error('Unexpected app update type');
diff --git a/lib/cli/interactive-setup/deploy.js b/lib/cli/interactive-setup/deploy.js
index 8b8d3516963..281bc2dc396 100644
--- a/lib/cli/interactive-setup/deploy.js
+++ b/lib/cli/interactive-setup/deploy.js
@@ -2,7 +2,8 @@
 
 const Serverless = require('../../Serverless');
 const chalk = require('chalk');
-const { confirm, doesServiceInstanceHaveLinkedProvider } = require('./utils');
+const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-history');
+const { doesServiceInstanceHaveLinkedProvider } = require('./utils');
 const _ = require('lodash');
 const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const { getDashboardInteractUrl } = require('@serverless/dashboard-plugin/lib/dashboard');
@@ -132,11 +133,12 @@ module.exports = {
   },
   async run({ configuration, configurationFilename, serviceDir, stepHistory }) {
     const serviceName = configuration.service;
-    const shouldDeploy = await confirm('Do you want to deploy your project?', {
+    const shouldDeploy = await promptWithHistory({
       name: 'shouldDeploy',
+      message: 'Do you want to deploy your project?',
+      stepHistory,
+      type: 'confirm',
     });
-    stepHistory.set('shouldDeploy', shouldDeploy);
-
     if (!shouldDeploy) {
       printMessage({
         serviceName,
diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index db4c25c5f50..29003e768bb 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -4,7 +4,7 @@ const { join } = require('path');
 const chalk = require('chalk');
 const fsp = require('fs').promises;
 const spawn = require('child-process-ext/spawn');
-const inquirer = require('@serverless/utils/inquirer');
+const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-history');
 const resolveConfigurationPath = require('../resolve-configuration-path');
 const readConfiguration = require('../../configuration/read');
 const resolveVariables = require('../../configuration/variables');
@@ -33,17 +33,15 @@ const initializeProjectChoices = [
 ];
 
 const projectTypeChoice = async (stepHistory) => {
-  const projectType = (
-    await inquirer.prompt({
-      message: 'What do you want to make?',
-      type: 'list',
-      name: 'projectType',
-      choices: initializeProjectChoices,
-      pageSize: 13,
-    })
-  ).projectType;
-
-  stepHistory.set('projectType', projectType);
+  const projectType = await promptWithHistory({
+    message: 'What do you want to make?',
+    type: 'list',
+    name: 'projectType',
+    choices: initializeProjectChoices,
+    pageSize: 13,
+    recordRawAnswerInHistory: true,
+    stepHistory,
+  });
   return projectType;
 };
 
@@ -54,29 +52,26 @@ const INVALID_PROJECT_NAME_MESSAGE =
   "   - Shouldn't exceed 128 characters";
 
 const projectNameInput = async (workingDir, projectType, stepHistory) => {
-  const projectName = (
-    await inquirer.prompt({
-      message: 'What do you want to call this project?',
-      type: 'input',
-      name: 'projectName',
-      default: projectType ? `${projectType}-project` : null,
-      validate: async (input) => {
-        input = input.trim();
-        if (!isValidServiceName(input)) {
-          return INVALID_PROJECT_NAME_MESSAGE;
-        }
-
-        try {
-          await fsp.access(join(workingDir, input));
-          return `Path ${input} is already taken`;
-        } catch {
-          return true;
-        }
-      },
-    })
-  ).projectName.trim();
+  const projectName = await promptWithHistory({
+    message: 'What do you want to call this project?',
+    type: 'input',
+    name: 'projectName',
+    stepHistory,
+    default: projectType ? `${projectType}-project` : null,
+    validate: async (input) => {
+      input = input.trim();
+      if (!isValidServiceName(input)) {
+        return INVALID_PROJECT_NAME_MESSAGE;
+      }
 
-  stepHistory.set('projectName', '_user_provided_');
+      try {
+        await fsp.access(join(workingDir, input));
+        return `Path ${input} is already taken`;
+      } catch {
+        return true;
+      }
+    },
+  });
   return projectName;
 };
 
diff --git a/package.json b/package.json
index bf890bde01b..11de2a22b69 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@serverless/components": "^3.13.4",
     "@serverless/dashboard-plugin": "^5.4.3",
     "@serverless/platform-client": "^4.2.5",
-    "@serverless/utils": "^5.3.0",
+    "@serverless/utils": "^5.6.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
diff --git a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
index c813658d569..d1718376eac 100644
--- a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
+++ b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
@@ -348,10 +348,10 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
           ['credentialsSetupChoice', '_local_'],
-          ['createAwsAccountPrompt', true],
-          ['generateAwsCredsPrompt', true],
-          ['accessKeyId', '_user_provided_'],
-          ['secretAccessKey', '_user_provided_'],
+          ['createAwsAccountPrompt', '_continuation_'],
+          ['generateAwsCredsPrompt', '_continuation_'],
+          ['accessKeyId', '_user_input_'],
+          ['secretAccessKey', '_user_input_'],
         ])
       );
     });
@@ -373,9 +373,9 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
           ['credentialsSetupChoice', '_local_'],
-          ['generateAwsCredsPrompt', true],
-          ['accessKeyId', '_user_provided_'],
-          ['secretAccessKey', '_user_provided_'],
+          ['generateAwsCredsPrompt', '_continuation_'],
+          ['accessKeyId', '_user_input_'],
+          ['secretAccessKey', '_user_input_'],
         ])
       );
       return resolveFileProfiles().then((profiles) => {
@@ -401,7 +401,8 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
           ['credentialsSetupChoice', '_local_'],
-          ['generateAwsCredsPrompt', true],
+          ['generateAwsCredsPrompt', '_continuation_'],
+          ['accessKeyId', undefined],
         ])
       );
     });
@@ -424,8 +425,9 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
           ['credentialsSetupChoice', '_local_'],
-          ['generateAwsCredsPrompt', true],
-          ['accessKeyId', '_user_provided_'],
+          ['generateAwsCredsPrompt', '_continuation_'],
+          ['accessKeyId', '_user_input_'],
+          ['secretAccessKey', undefined],
         ])
       );
     });
@@ -683,7 +685,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       );
       expect(stdoutData).to.include('Selected provider was successfully linked');
       expect(context.stepHistory.valuesMap()).to.deep.equal(
-        new Map([['credentialsSetupChoice', '_user_provided_']])
+        new Map([['credentialsSetupChoice', '_user_choice_']])
       );
     });
 
@@ -753,7 +755,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       );
 
       expect(context.stepHistory.valuesMap()).to.deep.equal(
-        new Map([['credentialsSetupChoice', '_user_provided_']])
+        new Map([['credentialsSetupChoice', '_user_choice_']])
       );
     });
 
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
index e50ce5b1335..45c33170768 100644
--- a/test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js
+++ b/test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js
@@ -245,8 +245,9 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
     ).to.eventually.be.rejected.and.have.property('code', 'INVALID_ANSWER');
     expect(context.stepHistory.valuesMap()).to.deep.equal(
       new Map([
-        ['orgName', '_user_provided_'],
+        ['orgName', '_user_choice_'],
         ['appName', '_create_'],
+        ['newAppName', undefined],
       ])
     );
   });
@@ -278,7 +279,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
 
   it('Should recognize an invalid app and allow to opt out', async () => {
     configureInquirerStub(inquirer, {
-      list: { appUpdateType: 'skip' },
+      list: { appUpdateType: '_skip_' },
     });
     const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
       'aws-loggedin-wrongapp-service'
@@ -298,7 +299,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
     });
     expect(context.configuration.org).to.equal('testinteractivecli');
     expect(context.configuration.app).to.equal('not-created-app');
-    expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['appUpdateType', 'skip']]));
+    expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['appUpdateType', '_skip_']]));
   });
 
   describe('Monitoring setup', () => {
@@ -340,8 +341,8 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
-          ['orgName', '_user_provided_'],
-          ['appName', '_user_provided_'],
+          ['orgName', '_user_choice_'],
+          ['appName', '_user_choice_'],
         ])
       );
     });
@@ -386,8 +387,8 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
-          ['orgName', '_user_provided_'],
-          ['appName', '_user_provided_'],
+          ['orgName', '_user_choice_'],
+          ['appName', '_user_choice_'],
         ])
       );
     });
@@ -759,8 +760,8 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
-          ['orgName', '_user_provided_'],
-          ['appName', '_user_provided_'],
+          ['orgName', '_user_choice_'],
+          ['appName', '_user_choice_'],
         ])
       );
     });
@@ -807,8 +808,8 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
-          ['orgName', '_user_provided_'],
-          ['appName', '_user_provided_'],
+          ['orgName', '_user_choice_'],
+          ['appName', '_user_choice_'],
           ['shouldOverrideDashboardConfig', true],
         ])
       );
@@ -854,8 +855,8 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
-          ['orgName', '_user_provided_'],
-          ['appName', '_user_provided_'],
+          ['orgName', '_user_choice_'],
+          ['appName', '_user_choice_'],
           ['shouldOverrideDashboardConfig', true],
         ])
       );
@@ -900,7 +901,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         'Your project has been setup with org testinteractivecli and app other-app'
       );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
-        new Map([['appName', '_user_provided_']])
+        new Map([['appName', '_user_choice_']])
       );
     });
 
@@ -944,9 +945,9 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
-          ['orgName', '_user_provided_'],
+          ['orgName', '_user_choice_'],
           ['appName', '_create_'],
-          ['newAppName', '_user_provided_'],
+          ['newAppName', '_user_input_'],
         ])
       );
     });
@@ -994,8 +995,8 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
           ['shouldUpdateOrg', true],
-          ['orgName', '_user_provided_'],
-          ['appName', '_user_provided_'],
+          ['orgName', '_user_choice_'],
+          ['appName', '_user_choice_'],
         ])
       );
     });
@@ -1041,7 +1042,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         'Your project has been setup with org testinteractivecli and app other-app'
       );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
-        new Map([['appName', '_user_provided_']])
+        new Map([['appName', '_user_choice_']])
       );
     });
   });
@@ -1163,7 +1164,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         'Your project has been setup with org testinteractivecli and app other-app'
       );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
-        new Map([['appName', '_user_provided_']])
+        new Map([['appName', '_user_choice_']])
       );
     });
   });
@@ -1171,7 +1172,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
   describe('Monitoring setup when invalid app', () => {
     it('Should recognize an invalid app and allow to create it', async () => {
       configureInquirerStub(inquirer, {
-        list: { appUpdateType: 'create' },
+        list: { appUpdateType: '_create_' },
       });
       const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
         'aws-loggedin-service',
@@ -1213,12 +1214,14 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       expect(stripAnsi(stdoutData)).to.include(
         'Your project has been setup with org testinteractivecli and app not-created-app'
       );
-      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['appUpdateType', 'create']]));
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['appUpdateType', '_create_']])
+      );
     });
 
     it('Should recognize an invalid app and allow to replace it with existing one', async () => {
       configureInquirerStub(inquirer, {
-        list: { appUpdateType: 'chooseExisting', appName: 'other-app' },
+        list: { appUpdateType: '_choose_existing_', appName: 'other-app' },
       });
       const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
         'aws-loggedin-service',
@@ -1262,8 +1265,8 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
-          ['appUpdateType', 'chooseExisting'],
-          ['appName', '_user_provided_'],
+          ['appUpdateType', '_choose_existing_'],
+          ['appName', '_user_choice_'],
         ])
       );
     });
diff --git a/test/unit/lib/cli/interactive-setup/service.test.js b/test/unit/lib/cli/interactive-setup/service.test.js
index 2dfda841e7f..0947ab5db20 100644
--- a/test/unit/lib/cli/interactive-setup/service.test.js
+++ b/test/unit/lib/cli/interactive-setup/service.test.js
@@ -111,7 +111,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
           ['projectType', 'aws-nodejs'],
-          ['projectName', '_user_provided_'],
+          ['projectName', '_user_input_'],
         ])
       );
     });
@@ -156,7 +156,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
           ['projectType', 'aws-nodejs'],
-          ['projectName', '_user_provided_'],
+          ['projectName', '_user_input_'],
         ])
       );
     });
@@ -203,7 +203,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
           ['projectType', 'aws-nodejs'],
-          ['projectName', '_user_provided_'],
+          ['projectName', '_user_input_'],
         ])
       );
     });
@@ -248,7 +248,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
           ['projectType', 'aws-nodejs'],
-          ['projectName', '_user_provided_'],
+          ['projectName', '_user_input_'],
         ])
       );
     });
@@ -288,7 +288,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
           ['projectType', 'aws-nodejs'],
-          ['projectName', '_user_provided_'],
+          ['projectName', '_user_input_'],
         ])
       );
     });
@@ -306,7 +306,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       expect(stats.isFile()).to.be.true;
 
       expect(context.stepHistory.valuesMap()).to.deep.equal(
-        new Map([['projectName', '_user_provided_']])
+        new Map([['projectName', '_user_input_']])
       );
     });
 
@@ -374,7 +374,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       );
 
       expect(context.stepHistory.valuesMap()).to.deep.equal(
-        new Map([['projectName', '_user_provided_']])
+        new Map([['projectName', '_user_input_']])
       );
     });
 
@@ -415,7 +415,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       );
 
       expect(context.stepHistory.valuesMap()).to.deep.equal(
-        new Map([['projectName', '_user_provided_']])
+        new Map([['projectName', '_user_input_']])
       );
     });
 
@@ -440,7 +440,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
           ['projectType', 'aws-nodejs'],
-          ['projectName', '_user_provided_'],
+          ['projectName', '_user_input_'],
         ])
       );
     });
@@ -460,7 +460,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
         'INVALID_TEMPLATE'
       );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
-        new Map([['projectName', '_user_provided_']])
+        new Map([['projectName', '_user_input_']])
       );
     });
 
@@ -485,7 +485,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       );
 
       expect(context.stepHistory.valuesMap()).to.deep.equal(
-        new Map([['projectName', '_user_provided_']])
+        new Map([['projectName', '_user_input_']])
       );
     });
   });
@@ -504,7 +504,12 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       'INVALID_ANSWER'
     );
 
-    expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['projectType', 'aws-nodejs']]));
+    expect(context.stepHistory.valuesMap()).to.deep.equal(
+      new Map([
+        ['projectType', 'aws-nodejs'],
+        ['projectName', undefined],
+      ])
+    );
   });
 
   it('Should not allow project creation in a directory in which already service is configured when `name` flag provided', async () => {
@@ -534,7 +539,12 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       'INVALID_ANSWER'
     );
 
-    expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['projectType', 'aws-nodejs']]));
+    expect(context.stepHistory.valuesMap()).to.deep.equal(
+      new Map([
+        ['projectType', 'aws-nodejs'],
+        ['projectName', undefined],
+      ])
+    );
   });
 
   it('Should not allow project creation using an invalid project name when `name` flag provided', async () => {

From 32de9bffed11c95a51a9a2c08f959d60b630bd86 Mon Sep 17 00:00:00 2001
From: dnx-seek <70872473+dnx-seek@users.noreply.github.com>
Date: Thu, 22 Jul 2021 17:21:54 +1000
Subject: [PATCH 0354/1101] docs: Suggest `python3` template over `python2`
 (#9773)

python2 is [no longer a supported runtime](https://aws.amazon.com/blogs/compute/announcing-end-of-support-for-python-2-7-in-aws-lambda/) for AWS.

When I ran this example as it currently is in the docs it created a python2 project. Interestingly selecting `AWS - Python - Starter` from the CLI did create a python3 project, although the code seems to suggest this should be calling the `aws-python` template, but I probably missed a link there.
---
 docs/providers/aws/examples/hello-world/python/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/providers/aws/examples/hello-world/python/README.md b/docs/providers/aws/examples/hello-world/python/README.md
index 89d61fcc3f2..e614bd509df 100644
--- a/docs/providers/aws/examples/hello-world/python/README.md
+++ b/docs/providers/aws/examples/hello-world/python/README.md
@@ -30,7 +30,7 @@ Commands
 ## 1. Create a service
 
 ```
-sls create --template aws-python --path myService
+sls create --template aws-python3 --path myService
 ```
 
 Using the `create` command we can specify one of the available [templates](https://serverless.com/framework/docs/providers/aws/cli-reference/create#available-templates). For this example use aws-python with the `--template` or shorthand `-t` flag.

From 464467e2bece1bf3f35fe60041fa170f412087d3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 21 Jul 2021 13:38:41 +0200
Subject: [PATCH 0355/1101] fix(CLI): Ensure `processedInput` is properly
 resolved in local fallback

---
 lib/Serverless.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index 8c2a3620e89..4930aa5cbe5 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -288,7 +288,9 @@ class Serverless {
         }
       );
       resolveCliInput.clear();
-      const { options, isHelpRequest } = resolveCliInput(commandsSchema);
+      const { commands, options, isHelpRequest } = resolveCliInput(commandsSchema);
+      this.processedInput.commands = this.pluginManager.cliCommands = commands;
+      this.processedInput.options = this.pluginManager.cliOptions = options;
       if (options.version) {
         require('./cli/render-version')();
         return;

From 9844f4477d13fe4279812a73bbfae9d67737c6d6 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 21 Jul 2021 17:57:16 +0200
Subject: [PATCH 0356/1101] test: Ensure input is properly resolved in local
 fallback

---
 .../node_modules/serverless/lib/Serverless.js          | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/Serverless.js b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/Serverless.js
index c27790f0783..71f0a4ae1e6 100644
--- a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/Serverless.js
+++ b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/Serverless.js
@@ -14,6 +14,16 @@ class LocalServerless extends Serverless {
     this.isLocallyInstalled = true;
     return Promise.resolve();
   }
+  // TODO: Can be removed with next major
+  async run() {
+    const cachedValue = this._isInvokedByGlobalInstallation;
+    // Temporary patch as local fallback triggers re-resolution of CLI input
+    // which originally is pre-generated by `runServerless`, therefore breaking test setup
+    this._isInvokedByGlobalInstallation = false;
+    const promise = super.run();
+    this._isInvokedByGlobalInstallation = cachedValue;
+    return promise;
+  }
 };
 
 LocalServerless.SERVERLESS_PATH = SERVERLESS_PATH;

From 4766c24adf48bae74696c5549eef255daeebd110 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 22 Jul 2021 09:39:24 +0200
Subject: [PATCH 0357/1101] chore: Update `@serverless/test`

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 11de2a22b69..3a3425ff4dc 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
   "devDependencies": {
     "@commitlint/cli": "^12.1.4",
     "@serverless/eslint-config": "^3.0.0",
-    "@serverless/test": "^8.3.0",
+    "@serverless/test": "^8.3.1",
     "adm-zip": "^0.5.5",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",

From 3402ed3ddef006b634b3df299909b7de929411ec Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 22 Jul 2021 10:13:07 +0200
Subject: [PATCH 0358/1101] chore: Bump dependencies

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 3a3425ff4dc..aa0c1e3c5e2 100644
--- a/package.json
+++ b/package.json
@@ -23,14 +23,14 @@
   },
   "dependencies": {
     "@serverless/cli": "^1.5.2",
-    "@serverless/components": "^3.13.4",
+    "@serverless/components": "^3.14.0",
     "@serverless/dashboard-plugin": "^5.4.3",
     "@serverless/platform-client": "^4.2.5",
     "@serverless/utils": "^5.6.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.946.0",
+    "aws-sdk": "^2.951.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
@@ -85,7 +85,7 @@
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "cos-nodejs-sdk-v5": "^2.9.21",
-    "eslint": "^7.30.0",
+    "eslint": "^7.31.0",
     "eslint-plugin-import": "^2.23.4",
     "git-list-updated": "^1.2.1",
     "github-release-from-cc-changelog": "^2.2.0",

From fb46396f5245153f7739dd42e248a152f1fb9b60 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 22 Jul 2021 10:22:01 +0200
Subject: [PATCH 0359/1101] chore: Release v2.52.1

---
 CHANGELOG.md | 18 ++++++++++++++++++
 package.json |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 627d1aedf44..1aa9ea12be2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 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.
 
+### [2.52.1](https://github.com/serverless/serverless/compare/v2.52.0...v2.52.1) (2021-07-22)
+
+### Bug Fixes
+
+- **CLI Onboarding:** Ensure credentials resolution is always performed before deploy step ([#9761](https://github.com/serverless/serverless/pull/9761)) ([b85f393](https://github.com/serverless/serverless/commit/b85f3934ed87e9c78494e9ad26163ee1d041599e)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI:**
+  - Ensure `processedInput` is properly resolved in local fallback ([#9769](https://github.com/serverless/serverless/pull/9769)) ([464467e](https://github.com/serverless/serverless/commit/464467e2bece1bf3f35fe60041fa170f412087d3)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Fix validation of `deprecationNotificationMode` config option ([#9762](https://github.com/serverless/serverless/issues/9762)) ([916c76f](https://github.com/serverless/serverless/commit/916c76f48ca86c3e31b719d2bb655c34d0287cec)) ([frozenbonito](https://github.com/frozenbonito))
+- Fix `functions[]` validation (ignore `null` values) ([#9756](https://github.com/serverless/serverless/pull/9756)) ([922ec00](https://github.com/serverless/serverless/commit/922ec0093f0d4ab6f2b2055c6e6f2d5ec1f9d06e)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **CLI Onboarding:**
+  - Move `dashboard-login` step from `@serverless/dashboard-plugin` ([#9766](https://github.com/serverless/serverless/pull/9766)) ([adef710](https://github.com/serverless/serverless/commit/adef7102df2958e976445f0c247895f82decebf9)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Move `dashboard-set-org` from `@serverless/dashboard-plugin` ([#9766](https://github.com/serverless/serverless/pull/9766)) ([afdf77c](https://github.com/serverless/serverless/commit/afdf77c960c990f7daa445532789aebb9dc15a53)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **Telemetry:** Use `prompt-with-history` for onboarding telemetry ([#9768](https://github.com/serverless/serverless/pull/9768)) ([4d56be5](https://github.com/serverless/serverless/commit/4d56be562a4bdaf2588bdc42227a451d098d1420)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Replace `fse.unlink` with `fs.promises.unlink` ([#9754](https://github.com/serverless/serverless/issues/9754)) ([daee1d5](https://github.com/serverless/serverless/commit/daee1d5375efdb748b85b85a2a4675ac3277001f)) ([Sudipto Das](https://github.com/sdas13))
+
 ## [2.52.0](https://github.com/serverless/serverless/compare/v2.51.2...v2.52.0) (2021-07-15)
 
 ### Features
diff --git a/package.json b/package.json
index aa0c1e3c5e2..03290a64607 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.52.0",
+  "version": "2.52.1",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 1e00f9edfb5f7618759f9f03d0dad58701a5a27a Mon Sep 17 00:00:00 2001
From: Sudipto Das <s.das001@yahoo.com>
Date: Mon, 26 Jul 2021 18:06:44 +0530
Subject: [PATCH 0360/1101] refactor: Replace `fse.readdir` with
 `fs.promises.readdir` (#9780)

---
 lib/utils/telemetry/index.js                |  2 +-
 scripts/pkg/upload/world.js                 |  3 ++-
 test/unit/lib/utils/telemetry/index.test.js | 14 +++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/utils/telemetry/index.js b/lib/utils/telemetry/index.js
index 2b1ee8d49e3..58c0732adeb 100644
--- a/lib/utils/telemetry/index.js
+++ b/lib/utils/telemetry/index.js
@@ -129,7 +129,7 @@ async function send(options = {}) {
   if (!telemetryUrl) return null;
   let dirFilenames;
   try {
-    dirFilenames = await fse.readdir(cacheDirPath);
+    dirFilenames = await fsp.readdir(cacheDirPath);
   } catch (readdirError) {
     if (readdirError.code !== 'ENOENT') logError('Cannot access cache dir', readdirError);
     return null;
diff --git a/scripts/pkg/upload/world.js b/scripts/pkg/upload/world.js
index bd58eb47f36..7b1a302fcfa 100755
--- a/scripts/pkg/upload/world.js
+++ b/scripts/pkg/upload/world.js
@@ -2,6 +2,7 @@
 
 const path = require('path');
 const fs = require('fs');
+const fsp = require('fs').promises;
 const fetch = require('node-fetch');
 const chalk = require('chalk');
 
@@ -37,7 +38,7 @@ module.exports = async (versionTag, { isLegacyVersion }) => {
     request(`${API_URL}${releaseId}/assets`, requestOptions)
   );
 
-  const distFileBasenames = await fs.promises.readdir(distPath);
+  const distFileBasenames = await fsp.readdir(distPath);
   await Promise.all(
     distFileBasenames
       .map(async (distFileBasename) => {
diff --git a/test/unit/lib/utils/telemetry/index.test.js b/test/unit/lib/utils/telemetry/index.test.js
index 449a504ea0f..f715455ef53 100644
--- a/test/unit/lib/utils/telemetry/index.test.js
+++ b/test/unit/lib/utils/telemetry/index.test.js
@@ -55,7 +55,7 @@ describe('test/unit/lib/utils/telemetry/index.test.js', () => {
   afterEach(async () => {
     usedOptions = null;
     usedUrl = null;
-    const dirFilenames = await fse.readdir(cacheDirPath);
+    const dirFilenames = await fsp.readdir(cacheDirPath);
     await Promise.all(
       dirFilenames.map(async (filename) => fsp.unlink(path.join(cacheDirPath, filename)))
     );
@@ -64,7 +64,7 @@ describe('test/unit/lib/utils/telemetry/index.test.js', () => {
   it('`storeLocally` should persist an event in cacheDir', async () => {
     const payload = { test: 'payloadvalue' };
     storeLocally(payload);
-    const dirFilenames = await fse.readdir(cacheDirPath);
+    const dirFilenames = await fsp.readdir(cacheDirPath);
     expect(dirFilenames.length).to.equal(1);
     const persistedEvent = await fse.readJson(path.join(cacheDirPath, dirFilenames[0]));
     expect(persistedEvent.payload).to.deep.equal(payload);
@@ -76,12 +76,12 @@ describe('test/unit/lib/utils/telemetry/index.test.js', () => {
     await cacheEvent();
     await send();
     expect(usedUrl).to.equal(telemetryUrl);
-    const dirFilenames = await fse.readdir(cacheDirPath);
+    const dirFilenames = await fsp.readdir(cacheDirPath);
     expect(dirFilenames.filter(isFilename).length).to.equal(1);
 
     expectedState = 'success';
     await send();
-    const dirFilenamesAfterSend = await fse.readdir(cacheDirPath);
+    const dirFilenamesAfterSend = await fsp.readdir(cacheDirPath);
     expect(dirFilenamesAfterSend.filter(isFilename).length).to.equal(0);
 
     // Check that one event was send with request
@@ -91,10 +91,10 @@ describe('test/unit/lib/utils/telemetry/index.test.js', () => {
   it('Should ditch stale events at `send`', async () => {
     await Promise.all([cacheEvent(0), cacheEvent(0), cacheEvent(), cacheEvent(), cacheEvent(0)]);
     expectedState = 'success';
-    const dirFilenames = await fse.readdir(cacheDirPath);
+    const dirFilenames = await fsp.readdir(cacheDirPath);
     expect(dirFilenames.filter(isFilename).length).to.equal(5);
     await send();
-    const dirFilenamesAfterSend = await fse.readdir(cacheDirPath);
+    const dirFilenamesAfterSend = await fsp.readdir(cacheDirPath);
     expect(dirFilenamesAfterSend.filter(isFilename).length).to.equal(0);
     // Check if only two events were send with request
     expect(JSON.parse(usedOptions.body)).to.have.lengthOf(2);
@@ -104,7 +104,7 @@ describe('test/unit/lib/utils/telemetry/index.test.js', () => {
     expectedState = 'responseBodyError';
     await cacheEvent();
     await send();
-    const dirFilenames = await fse.readdir(cacheDirPath);
+    const dirFilenames = await fsp.readdir(cacheDirPath);
     expect(dirFilenames.filter(isFilename).length).to.equal(0);
   });
 

From 699c03aea40f08b947e02763b3fe5ff9586ebfc1 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 26 Jul 2021 15:12:18 +0200
Subject: [PATCH 0361/1101] docs: Add note about config validation to
 contributors docs

---
 CONTRIBUTING.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index dcbefafe5e2..1822deff405 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -99,6 +99,10 @@ Log should be written only if deprecated functionality is used. If applicable (t
 
 2. Document introduced deprecation at `docs/deprecations.md` (new deprecation should be listed as **first** and follow the format of other documented deprecations)
 
+### Service configuration validation
+
+All newly introduced configuration properties should be covered by proper changes to configuration schema. For more details about configuration validation, please see [docs/configuration-validation](./configuration-validation.md).
+
 # Testing
 
 See [test/README](test/README.md)

From 377da097c564778c8d2c42ffe49e38000c520106 Mon Sep 17 00:00:00 2001
From: Nyambayar Turbat <t.nyambayar@gmail.com>
Date: Tue, 27 Jul 2021 19:51:43 +0800
Subject: [PATCH 0362/1101] refactor: Use `async` in `lib/plugins/plugin`
 (#9680)

* configure async in lib/plugins/plugin

* using runserverless to check function validate()

* removing unnecessary test
---
 lib/plugins/plugin/install.js                  | 10 +++++-----
 lib/plugins/plugin/lib/utils.js                |  7 ++++---
 lib/plugins/plugin/list.js                     |  4 ++--
 lib/plugins/plugin/search.js                   |  4 ++--
 lib/plugins/plugin/uninstall.js                | 10 +++++-----
 test/unit/lib/plugins/plugin/lib/utils.test.js | 16 ----------------
 6 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/lib/plugins/plugin/install.js b/lib/plugins/plugin/install.js
index 243fb20daba..3a5813c2333 100644
--- a/lib/plugins/plugin/install.js
+++ b/lib/plugins/plugin/install.js
@@ -40,11 +40,11 @@ class PluginInstall {
       },
     };
     this.hooks = {
-      'plugin:install:install': () => BbPromise.bind(this).then(this.install),
+      'plugin:install:install': async () => BbPromise.bind(this).then(this.install),
     };
   }
 
-  install() {
+  async install() {
     const pluginInfo = pluginUtils.getPluginInfo(this.options.name);
     this.options.pluginName = pluginInfo[0];
     this.options.pluginVersion = pluginInfo[1] || 'latest';
@@ -71,7 +71,7 @@ class PluginInstall {
       });
   }
 
-  pluginInstall() {
+  async pluginInstall() {
     const serviceDir = this.serverless.serviceDir;
     const packageJsonFilePath = path.join(serviceDir, 'package.json');
 
@@ -170,7 +170,7 @@ class PluginInstall {
     );
   }
 
-  installPeerDependencies() {
+  async installPeerDependencies() {
     const pluginPackageJsonFilePath = path.join(
       this.serverless.serviceDir,
       'node_modules',
@@ -189,7 +189,7 @@ class PluginInstall {
     });
   }
 
-  npmInstall(name) {
+  async npmInstall(name) {
     return npmCommandDeferred.then((npmCommand) =>
       childProcess.execAsync(`${npmCommand} install --save-dev ${name}`, {
         stdio: 'ignore',
diff --git a/lib/plugins/plugin/lib/utils.js b/lib/plugins/plugin/lib/utils.js
index da2ff6f772e..92220c1dc45 100644
--- a/lib/plugins/plugin/lib/utils.js
+++ b/lib/plugins/plugin/lib/utils.js
@@ -10,7 +10,7 @@ const _ = require('lodash');
 const ServerlessError = require('../../../serverless-error');
 
 module.exports = {
-  validate() {
+  async validate() {
     if (!this.serverless.serviceDir) {
       throw new ServerlessError(
         'This command can only be run inside a service directory',
@@ -31,7 +31,7 @@ module.exports = {
     );
   },
 
-  getPlugins() {
+  async getPlugins() {
     const endpoint = 'https://raw.githubusercontent.com/serverless/plugins/master/plugins.json';
 
     // Use HTTPS Proxy (Optional)
@@ -66,7 +66,7 @@ module.exports = {
     return pluginInfo;
   },
 
-  display(plugins) {
+  async display(plugins) {
     let message = '';
     if (plugins && plugins.length) {
       // order plugins by name
@@ -86,6 +86,7 @@ It will be automatically downloaded and added to your package.json and serverles
       message = 'There are no plugins available to display';
       this.serverless.cli.consoleLog(message);
     }
+
     return BbPromise.resolve(message);
   },
 };
diff --git a/lib/plugins/plugin/list.js b/lib/plugins/plugin/list.js
index a311aa9a2d7..6a342b98490 100644
--- a/lib/plugins/plugin/list.js
+++ b/lib/plugins/plugin/list.js
@@ -22,11 +22,11 @@ class PluginList {
     };
 
     this.hooks = {
-      'plugin:list:list': () => BbPromise.bind(this).then(this.list),
+      'plugin:list:list': async () => BbPromise.bind(this).then(this.list),
     };
   }
 
-  list() {
+  async list() {
     return BbPromise.bind(this)
       .then(this.getPlugins)
       .then((plugins) => this.display(plugins));
diff --git a/lib/plugins/plugin/search.js b/lib/plugins/plugin/search.js
index d69b2f466f9..d5d9b1fe27b 100644
--- a/lib/plugins/plugin/search.js
+++ b/lib/plugins/plugin/search.js
@@ -23,11 +23,11 @@ class PluginSearch {
     };
 
     this.hooks = {
-      'plugin:search:search': () => BbPromise.bind(this).then(this.search),
+      'plugin:search:search': async () => BbPromise.bind(this).then(this.search),
     };
   }
 
-  search() {
+  async search() {
     return BbPromise.bind(this)
       .then(this.getPlugins)
       .then((plugins) => {
diff --git a/lib/plugins/plugin/uninstall.js b/lib/plugins/plugin/uninstall.js
index 4a891c07245..e37f0d3e18a 100644
--- a/lib/plugins/plugin/uninstall.js
+++ b/lib/plugins/plugin/uninstall.js
@@ -38,11 +38,11 @@ class PluginUninstall {
     };
 
     this.hooks = {
-      'plugin:uninstall:uninstall': () => BbPromise.bind(this).then(this.uninstall),
+      'plugin:uninstall:uninstall': async () => BbPromise.bind(this).then(this.uninstall),
     };
   }
 
-  uninstall() {
+  async uninstall() {
     const pluginInfo = pluginUtils.getPluginInfo(this.options.name);
     this.options.pluginName = pluginInfo[0];
 
@@ -67,7 +67,7 @@ class PluginUninstall {
       });
   }
 
-  pluginUninstall() {
+  async pluginUninstall() {
     this.serverless.cli.log(
       `Uninstalling plugin "${this.options.pluginName}" (this might take a few seconds...)`
     );
@@ -129,7 +129,7 @@ class PluginUninstall {
     );
   }
 
-  uninstallPeerDependencies() {
+  async uninstallPeerDependencies() {
     const pluginPackageJsonFilePath = path.join(
       this.serverless.serviceDir,
       'node_modules',
@@ -151,7 +151,7 @@ class PluginUninstall {
       .catch(() => BbPromise.resolve());
   }
 
-  npmUninstall(name) {
+  async npmUninstall(name) {
     return childProcess.execAsync(`npm uninstall --save-dev ${name}`, {
       stdio: 'ignore',
     });
diff --git a/test/unit/lib/plugins/plugin/lib/utils.test.js b/test/unit/lib/plugins/plugin/lib/utils.test.js
index c70c64f8474..4aad4710f9f 100644
--- a/test/unit/lib/plugins/plugin/lib/utils.test.js
+++ b/test/unit/lib/plugins/plugin/lib/utils.test.js
@@ -46,22 +46,6 @@ describe('PluginUtils', () => {
     serverless.cli.consoleLog.restore();
   });
 
-  describe('#validate()', () => {
-    it('should throw an error if the the cwd is not a Serverless service', () => {
-      pluginUtils.serverless.serviceDir = false;
-
-      expect(() => {
-        pluginUtils.validate();
-      }).to.throw(Error);
-    });
-
-    it('should resolve if the cwd is a Serverless service', (done) => {
-      pluginUtils.serverless.serviceDir = true;
-
-      pluginUtils.validate().then(() => done());
-    });
-  });
-
   describe('#getServerlessFilePath()', () => {
     it('should reject if no configuration file exists', () =>
       expect(pluginUtils.getServerlessFilePath.bind(pluginUtils)).to.throw(

From 612f668c931013bea21b91f47d9cbfd1c7dbb888 Mon Sep 17 00:00:00 2001
From: "Shane R. Spencer" <305301+whardier@users.noreply.github.com>
Date: Tue, 27 Jul 2021 03:53:58 -0800
Subject: [PATCH 0363/1101] feat(Variables): Accept case-insensitive strings in
 `strToBool` (#9770)

* Lowercase stringValue to allow for wider range of inputs.

This change simply adds toLowerCase() when assigning stringValue to allow enable a case-insensitive input (True, TRUE, False, False)

* Update variables.md

Added documentation showing lowercase change to strToBool

* Update str-to-bool.test.js

Added uppercase/mixedcase test

* Update str-to-bool.test.js

fixed test description for str-to-bool case checks

* fix linting/prettier issues with strToBool test/func patch
---
 docs/providers/aws/guide/variables.md                       | 6 +++++-
 lib/configuration/variables/sources/str-to-bool.js          | 4 +++-
 .../lib/configuration/variables/sources/str-to-bool.test.js | 6 ++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/docs/providers/aws/guide/variables.md b/docs/providers/aws/guide/variables.md
index 87b2b3b7056..57a725209b3 100644
--- a/docs/providers/aws/guide/variables.md
+++ b/docs/providers/aws/guide/variables.md
@@ -726,11 +726,15 @@ provider:
     apiGateway: ${strToBool(${ssm:API_GW_DEBUG_ENABLED})}
 ```
 
-These are examples that explain how the conversion works:
+These are examples that explain how the conversion works after first lowercasing the passed string value:
 
 ```plaintext
 ${strToBool(true)} => true
 ${strToBool(false)} => false
+${strToBool(True)} => true
+${strToBool(False)} => false
+${strToBool(TRUE)} => true
+${strToBool(FALSE)} => false
 ${strToBool(0)} => false
 ${strToBool(1)} => true
 ${strToBool(2)} => Error
diff --git a/lib/configuration/variables/sources/str-to-bool.js b/lib/configuration/variables/sources/str-to-bool.js
index 9935ad785fb..70afa78ae3e 100644
--- a/lib/configuration/variables/sources/str-to-bool.js
+++ b/lib/configuration/variables/sources/str-to-bool.js
@@ -16,7 +16,9 @@ module.exports = {
       Error: ServerlessError,
       errorMessage: 'Non-string "strToBool" input:. Received: %v',
       errorCode: 'INVALID_STR_TO_BOOL_SOURCE_VALUE',
-    }).trim();
+    })
+      .trim()
+      .toLowerCase();
 
     if (trueStrings.has(stringValue)) return { value: true };
     if (falseStrings.has(stringValue)) return { value: false };
diff --git a/test/unit/lib/configuration/variables/sources/str-to-bool.test.js b/test/unit/lib/configuration/variables/sources/str-to-bool.test.js
index 1417ff444bc..4a5925ca8a9 100644
--- a/test/unit/lib/configuration/variables/sources/str-to-bool.test.js
+++ b/test/unit/lib/configuration/variables/sources/str-to-bool.test.js
@@ -13,6 +13,8 @@ describe('test/unit/lib/configuration/variables/sources/str-to-bool.test.js', ()
     configuration = {
       truthy: "${strToBool('true')}",
       falsy: "${strToBool('false')}",
+      truthyUppercase: "${strToBool('TRUE')}",
+      falsyMixedCase: "${strToBool('False')}",
       noParam: '${strToBool:}',
       invalid: '${strToBool(foo)}',
     };
@@ -29,6 +31,10 @@ describe('test/unit/lib/configuration/variables/sources/str-to-bool.test.js', ()
 
   it('should resolve truthy input', () => expect(configuration.truthy).to.equal(true));
   it('should resolve falsy input', () => expect(configuration.falsy).to.equal(false));
+  it('should resolve uppercase truthy input', () =>
+    expect(configuration.truthyUppercase).to.equal(true));
+  it('should resolve mixed case falsy input', () =>
+    expect(configuration.falsyMixedCase).to.equal(false));
 
   it('should report with an error missing input', () =>
     expect(variablesMeta.get('noParam').error.code).to.equal('VARIABLE_RESOLUTION_ERROR'));

From 60d729b5d42ae32cc418b9578582da3dc8492754 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 28 Jul 2021 12:32:34 +0200
Subject: [PATCH 0364/1101] feat(Telemetry): Detect used variable sources

---
 lib/cli/handle-error.js                       |  3 +++
 lib/configuration/variables/resolve.js        |  8 ++++++
 lib/utils/telemetry/generatePayload.js        |  6 +++--
 scripts/serverless.js                         |  7 ++++++
 .../configuration/variables/resolve.test.js   | 25 +++++++++++++++++++
 .../utils/telemetry/generatePayload.test.js   | 18 +++++++++++++
 6 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index bae21224d60..c5ff7681690 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -51,6 +51,7 @@ module.exports = async (exception, options = {}) => {
     serverless,
     hasTelemetryBeenReported,
     commandUsage,
+    variableSourcesInConfig,
   } = options;
   let { command, options: cliOptions, commandSchema, serviceDir, configuration } = options;
 
@@ -79,6 +80,7 @@ module.exports = async (exception, options = {}) => {
           configuration,
           hasTelemetryBeenReported,
           commandUsage,
+          variableSourcesInConfig,
         });
         return;
       } catch (error) {
@@ -186,6 +188,7 @@ module.exports = async (exception, options = {}) => {
         configuration,
         serverless,
         commandUsage,
+        variableSources: variableSourcesInConfig,
       });
       const failureReason = {
         kind: isUserError ? 'user' : 'programmer',
diff --git a/lib/configuration/variables/resolve.js b/lib/configuration/variables/resolve.js
index c7c7804df15..f253c48883d 100644
--- a/lib/configuration/variables/resolve.js
+++ b/lib/configuration/variables/resolve.js
@@ -36,6 +36,7 @@ class VariablesResolver {
     options,
     fulfilledSources,
     propertyPathsToResolve,
+    variableSourcesInConfig,
   }) {
     this.serviceDir = serviceDir;
     this.configuration = configuration;
@@ -45,6 +46,8 @@ class VariablesResolver {
     this.fulfilledSources = fulfilledSources;
     this.propertyDependenciesMap = new Map();
     this.propertyResolutionNestDepthMap = new Map();
+    // It is used to record all encountered variable sources in configuration for telemetry purposes
+    this.variableSourcesInConfig = variableSourcesInConfig || new Set();
 
     // Resolve all variables simultaneously
     // Resolution batches are identified to ensure source resolution cache is not shared among them.
@@ -145,6 +148,11 @@ class VariablesResolver {
   async resolveVariable(resolutionBatchId, propertyPath, variableMeta) {
     // Resolve a single variable, which could be configured with multiple
     // (first-choice, and fallback) sources
+    for (const source of variableMeta.sources) {
+      if (source.type) {
+        this.variableSourcesInConfig.add(source.type);
+      }
+    }
     let sourceData = variableMeta.sources[0];
     do {
       const sourceMeta = this.sources[sourceData.type];
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index 3b3575d4c67..9228e13d020 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -29,7 +29,7 @@ const checkIsTabAutocompletionInstalled = () => {
   }
 };
 
-const getServiceConfig = ({ configuration, options }) => {
+const getServiceConfig = ({ configuration, options, variableSources }) => {
   const providerName = isObject(configuration.provider)
     ? configuration.provider.name
     : configuration.provider;
@@ -88,6 +88,7 @@ const getServiceConfig = ({ configuration, options }) => {
         ? options.region || configuration.provider.region || 'us-east-1'
         : _.get(configuration, 'provider.region'),
     },
+    variableSources: variableSources ? Array.from(variableSources) : [],
     plugins,
     functions: Object.values(functions)
       .map((functionConfig) => {
@@ -134,6 +135,7 @@ module.exports = ({
   configuration,
   serverless,
   commandUsage,
+  variableSources,
 }) => {
   let commandDurationMs;
 
@@ -280,7 +282,7 @@ module.exports = ({
 
     payload.hasLocalCredentials = isAwsProvider && Boolean(new AWS.Config().credentials);
     payload.npmDependencies = npmDependencies;
-    payload.config = getServiceConfig({ configuration, options });
+    payload.config = getServiceConfig({ configuration, options, variableSources });
     payload.isConfigValid = getConfigurationValidationResult(configuration);
     payload.dashboard.orgUid = serverless && serverless.service.orgUid;
   }
diff --git a/scripts/serverless.js b/scripts/serverless.js
index acb7fdee9e0..e451ca2de23 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -28,6 +28,7 @@ let serviceDir = null;
 let configuration = null;
 let serverless;
 const commandUsage = {};
+const variableSourcesInConfig = new Set();
 
 let hasTelemetryBeenReported = false;
 
@@ -50,6 +51,7 @@ process.once('uncaughtException', (error) => {
     serverless,
     hasTelemetryBeenReported: cachedHasTelemetryBeenReported,
     commandUsage,
+    variableSourcesInConfig,
   });
 });
 
@@ -74,6 +76,7 @@ require('signal-exit/signals').forEach((signal) => {
           configuration,
           serverless,
           commandUsage,
+          variableSources: variableSourcesInConfig,
         });
         storeTelemetryLocally({
           ...telemetryPayload,
@@ -289,6 +292,7 @@ const processSpanPromise = (async () => {
               options: filterSupportedOptions(options, { commandSchema, providerName }),
               fulfilledSources: new Set(['file', 'self', 'strToBool']),
               propertyPathsToResolve: new Set(['provider\0name', 'provider\0stage', 'useDotenv']),
+              variableSourcesInConfig,
             };
             if (isInteractiveSetup) resolverConfiguration.fulfilledSources.add('opt');
             await resolveVariables(resolverConfiguration);
@@ -472,6 +476,7 @@ const processSpanPromise = (async () => {
               serviceDir,
               configuration: configurationFromInteractive,
               commandUsage,
+              variableSources: variableSourcesInConfig,
             }),
             outcome: 'success',
           });
@@ -759,6 +764,7 @@ const processSpanPromise = (async () => {
               serviceDir,
               configuration,
               serverless,
+              variableSources: variableSourcesInConfig,
             }),
             outcome: 'success',
           });
@@ -809,6 +815,7 @@ const processSpanPromise = (async () => {
       serverless,
       hasTelemetryBeenReported: cachedHasTelemetryBeenReported,
       commandUsage,
+      variableSources: variableSourcesInConfig,
     });
   } finally {
     clearTimeout(keepAliveTimer);
diff --git a/test/unit/lib/configuration/variables/resolve.test.js b/test/unit/lib/configuration/variables/resolve.test.js
index f2aef59d658..1b516f283b5 100644
--- a/test/unit/lib/configuration/variables/resolve.test.js
+++ b/test/unit/lib/configuration/variables/resolve.test.js
@@ -171,6 +171,9 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
         }),
       },
     };
+
+    const variableSourcesInConfig = new Set();
+
     before(async () => {
       variablesMeta = resolveMeta(configuration);
       await resolve({
@@ -180,6 +183,7 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
         sources,
         options: {},
         fulfilledSources: new Set(),
+        variableSourcesInConfig,
       });
     });
 
@@ -422,6 +426,27 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
       ]);
     });
 
+    it('should correctly record encountered variable sources', () => {
+      expect(variableSourcesInConfig).to.deep.equal(
+        new Set([
+          'sourceParam',
+          'sourceDirect',
+          'sourceAddress',
+          'sourceProperty',
+          'sourceResultVariables',
+          'sourceResolveVariablesInString',
+          'sourceResolveVariable',
+          'sourceIncomplete',
+          'sourceMissing',
+          'sourceUnrecognized',
+          'sourceError',
+          'sourceInfinite',
+          'sourceShared',
+          'sourceSharedProperty',
+        ])
+      );
+    });
+
     describe('"resolveVariable" source util', () => {
       it('should resolve variable', () => {
         expect(configuration.resolvesVariables).to.equal('234');
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index c7a883d8458..ecbe2345b75 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -147,6 +147,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
         resources: {
           general: ['AWS::Logs::LogGroup', 'AWS::S3::Bucket', 'Custom'],
         },
+        variableSources: [],
       },
       isAutoUpdateEnabled: false,
       isTabAutocompletionInstalled: false,
@@ -206,6 +207,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
           { runtime: 'bar', events: [] },
         ],
         resources: undefined,
+        variableSources: [],
       },
       isAutoUpdateEnabled: false,
       isTabAutocompletionInstalled: false,
@@ -268,6 +270,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
         plugins: [],
         functions: [],
         resources: { general: [] },
+        variableSources: [],
       },
       isAutoUpdateEnabled: false,
       isTabAutocompletionInstalled: false,
@@ -350,6 +353,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       isConfigValid: null,
       config: {
         configValidationMode: 'warn',
+        variableSources: [],
         provider: {
           name: 'aws',
           runtime: 'nodejs12.x',
@@ -631,4 +635,18 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       },
     ]);
   });
+
+  it('Should correctly resolve `variableSources` property', () => {
+    const payload = generatePayload({
+      command: 'print',
+      options: {},
+      commandSchema: commandsSchema.get('print'),
+      serviceDir: process.cwd(),
+      configuration: { service: 'foo', provider: 'aws' },
+      commandUsage: [],
+      variableSources: new Set(['ssm', 'opt']),
+    });
+
+    expect(payload.config.variableSources).to.deep.equal(['ssm', 'opt']);
+  });
 });

From 4b87497875a19348e444763eea85671ed2c4f0b7 Mon Sep 17 00:00:00 2001
From: Nyambayar Turbat <t.nyambayar@gmail.com>
Date: Mon, 2 Aug 2021 22:50:54 +0800
Subject: [PATCH 0365/1101] refactor: Use `async` in `lib/plugins/create`
 (#9683)

---
 lib/plugins/create/create.js                | 6 +++---
 test/unit/lib/plugins/create/create.test.js | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/plugins/create/create.js b/lib/plugins/create/create.js
index 099cad8dbfe..d25978d8b41 100644
--- a/lib/plugins/create/create.js
+++ b/lib/plugins/create/create.js
@@ -37,11 +37,11 @@ class Create {
     };
 
     this.hooks = {
-      'create:create': () => BbPromise.bind(this).then(this.create),
+      'create:create': async () => BbPromise.bind(this).then(this.create),
     };
   }
 
-  create() {
+  async create() {
     this.serverless.cli.log('Generating boilerplate...');
 
     if ('template' in this.options) {
@@ -93,7 +93,7 @@ class Create {
     return BbPromise.resolve();
   }
 
-  createFromTemplate() {
+  async createFromTemplate() {
     const notPlugin = this.options.template !== 'plugin';
 
     if (!recommendedTemplatesList.includes(this.options.template)) {
diff --git a/test/unit/lib/plugins/create/create.test.js b/test/unit/lib/plugins/create/create.test.js
index 303855c563e..8f78865bb03 100644
--- a/test/unit/lib/plugins/create/create.test.js
+++ b/test/unit/lib/plugins/create/create.test.js
@@ -11,6 +11,7 @@ const walkDirSync = require('../../../../../lib/utils/fs/walkDirSync');
 const download = require('../../../../../lib/utils/downloadTemplateFromRepo');
 const { getTmpDirPath } = require('../../../../utils/fs');
 
+chai.use(require('chai-as-promised'));
 chai.use(require('sinon-chai'));
 const { expect } = require('chai');
 
@@ -112,7 +113,7 @@ describe('Create', () => {
 
     it('should throw error if user passed unsupported template', () => {
       create.options.template = 'invalid-template';
-      expect(() => create.create()).to.throw(Error);
+      return expect(create.create()).to.be.eventually.rejectedWith(Error);
     });
 
     it('should overwrite the name for the service if user passed name', () => {
@@ -1081,7 +1082,7 @@ describe('Create', () => {
       const dirContent = fs.readdirSync(tmpDir);
 
       expect(dirContent).to.include('serverless.yml');
-      expect(() => create.create()).to.throw(Error);
+      return expect(create.create()).to.eventually.be.rejectedWith(Error);
     });
 
     it('should throw error if the directory for the service already exists in cwd', () => {
@@ -1092,7 +1093,7 @@ describe('Create', () => {
       fse.mkdirsSync(path.join(tmpDir, create.options.path));
       process.chdir(tmpDir);
 
-      expect(() => create.create()).to.throw(Error);
+      return expect(create.create()).to.eventually.be.rejectedWith(Error);
     });
 
     it('should copy "aws-nodejs" template from local path', () => {

From 5c9df56f1bc89af1fd929519f3cf8dac967e514d Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Tue, 3 Aug 2021 20:54:51 +0200
Subject: [PATCH 0366/1101] fix(Plugins): Improve error message when a plugin
 is missing (#9798)

---
 lib/classes/PluginManager.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 86c929148ca..f1f3e78e776 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -187,11 +187,14 @@ class PluginManager {
               return null;
             }
 
+            const isLocalPlugin = name.startsWith('./');
+
             throw new ServerlessError(
               [
                 `Serverless plugin "${name}" not found.`,
                 ' Make sure it\'s installed and listed in the "plugins" section',
                 ' of your serverless config file.',
+                isLocalPlugin ? '' : ` Run "serverless plugin install -n ${name}" to install it.`,
               ].join(''),
               'PLUGIN_NOT_FOUND'
             );

From d2754594c462afd39e1576312e361ca57d4f13f2 Mon Sep 17 00:00:00 2001
From: Karim Kanso <kaz.kanso@gmail.com>
Date: Wed, 4 Aug 2021 11:49:22 +0100
Subject: [PATCH 0367/1101] fix(AWS API Gateway): Ensure to attach validator
 when required (#9793)

---
 .../events/apiGateway/lib/requestValidator.js | 26 ++++---
 .../requestParameters/serverless.yml          | 75 +++++++++++++++++++
 .../programmatic/requestParameters/target.js  |  8 ++
 .../compile/events/apiGateway/index.test.js   |  8 +-
 .../apiGateway/lib/requestValidator.test.js   | 61 ++++++++++++++-
 5 files changed, 167 insertions(+), 11 deletions(-)
 create mode 100644 test/fixtures/programmatic/requestParameters/serverless.yml
 create mode 100644 test/fixtures/programmatic/requestParameters/target.js

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
index 0fd2b0c2441..05edee18b9b 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
@@ -12,15 +12,27 @@ module.exports = {
         resourceName,
         event.http.method
       );
-
+      const template =
+        this.serverless.service.provider.compiledCloudFormationTemplate.Resources[methodLogicalId];
       let validatorLogicalId;
       let validatorName;
 
+      if (
+        event.http.request &&
+        event.http.request.parameters &&
+        // check if any parameters are marked as required
+        Object.values(event.http.request.parameters || {}).some((x) => x)
+      ) {
+        if (!validatorLogicalId) {
+          const requestValidator = this.createRequestValidator();
+          validatorLogicalId = requestValidator.validatorLogicalId;
+          validatorName = requestValidator.validatorName;
+        }
+
+        template.Properties.RequestValidatorId = { Ref: validatorLogicalId };
+      }
+
       if (event.http.request && event.http.request.schemas) {
-        const template =
-          this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
-            methodLogicalId
-          ];
         for (const [contentType, schemaConfig] of _.entries(event.http.request.schemas)) {
           let modelLogicalId;
 
@@ -90,10 +102,6 @@ module.exports = {
         }
       } else if (event.http.request && event.http.request.schema) {
         // Old functionality
-        const template =
-          this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
-            methodLogicalId
-          ];
         for (const [contentType, schema] of _.entries(event.http.request.schema)) {
           const modelLogicalId = this.provider.naming.getEndpointModelLogicalId(
             resourceName,
diff --git a/test/fixtures/programmatic/requestParameters/serverless.yml b/test/fixtures/programmatic/requestParameters/serverless.yml
new file mode 100644
index 00000000000..658673deebd
--- /dev/null
+++ b/test/fixtures/programmatic/requestParameters/serverless.yml
@@ -0,0 +1,75 @@
+service: service
+
+provider:
+  name: aws
+  runtime: nodejs12.x
+  lambdaHashingVersion: 20201221
+
+functions:
+  target:
+    handler: target.handler
+    events:
+      - http:
+          path: no-params
+          method: get
+      - http:
+          path: querystrings-not-required
+          method: get
+          request:
+            parameters:
+              querystrings:
+                url: false
+      - http:
+          path: querystrings-required
+          method: get
+          request:
+            parameters:
+              querystrings:
+                url: true
+      - http:
+          path: headers-not-required
+          method: get
+          request:
+            parameters:
+              headers:
+                foo: false
+      - http:
+          path: headers-required
+          method: get
+          request:
+            parameters:
+              headers:
+                foo: true
+      - http:
+          path: paths-not-required
+          method: get
+          request:
+            parameters:
+              paths:
+                bar: false
+      - http:
+          path: paths-required
+          method: get
+          request:
+            parameters:
+              paths:
+                bar: true
+      - http:
+          path: no-params-with-schema
+          method: get
+          request:
+            schemas:
+              application/json:
+                schema:
+                  $schema: http://json-schema.org/schema#
+      - http:
+          path: params-with-schema
+          method: get
+          request:
+            schemas:
+              application/json:
+                schema:
+                  $schema: http://json-schema.org/schema#
+            parameters:
+              querystrings:
+                url: true
diff --git a/test/fixtures/programmatic/requestParameters/target.js b/test/fixtures/programmatic/requestParameters/target.js
new file mode 100644
index 00000000000..bf64b17e8de
--- /dev/null
+++ b/test/fixtures/programmatic/requestParameters/target.js
@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports.handler = () => {
+  return {
+    statusCode: 200,
+    body: 'OK',
+  };
+};
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js
index 72460c4631d..79b9d43c2ee 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js
@@ -40,6 +40,7 @@ describe('AwsCompileApigEvents', () => {
     let compileRestApiStub;
     let compileResourcesStub;
     let compileMethodsStub;
+    let compileRequestValidatorsStub;
     let compileDeploymentStub;
     let compileUsagePlanStub;
     let compilePermissionsStub;
@@ -51,6 +52,9 @@ describe('AwsCompileApigEvents', () => {
       compileRestApiStub = sinon.stub(awsCompileApigEvents, 'compileRestApi').resolves();
       compileResourcesStub = sinon.stub(awsCompileApigEvents, 'compileResources').resolves();
       compileMethodsStub = sinon.stub(awsCompileApigEvents, 'compileMethods').resolves();
+      compileRequestValidatorsStub = sinon
+        .stub(awsCompileApigEvents, 'compileRequestValidators')
+        .resolves();
       compileDeploymentStub = sinon.stub(awsCompileApigEvents, 'compileDeployment').resolves();
       compileUsagePlanStub = sinon.stub(awsCompileApigEvents, 'compileUsagePlan').resolves();
       compilePermissionsStub = sinon.stub(awsCompileApigEvents, 'compilePermissions').resolves();
@@ -65,6 +69,7 @@ describe('AwsCompileApigEvents', () => {
       awsCompileApigEvents.compileRestApi.restore();
       awsCompileApigEvents.compileResources.restore();
       awsCompileApigEvents.compileMethods.restore();
+      awsCompileApigEvents.compileRequestValidators.restore();
       awsCompileApigEvents.compileDeployment.restore();
       awsCompileApigEvents.compileUsagePlan.restore();
       awsCompileApigEvents.compilePermissions.restore();
@@ -99,7 +104,8 @@ describe('AwsCompileApigEvents', () => {
         expect(compileRestApiStub.calledAfter(validateStub)).to.be.equal(true);
         expect(compileResourcesStub.calledAfter(compileRestApiStub)).to.be.equal(true);
         expect(compileMethodsStub.calledAfter(compileResourcesStub)).to.be.equal(true);
-        expect(compileDeploymentStub.calledAfter(compileMethodsStub)).to.be.equal(true);
+        expect(compileRequestValidatorsStub.calledAfter(compileMethodsStub)).to.be.equal(true);
+        expect(compileDeploymentStub.calledAfter(compileRequestValidatorsStub)).to.be.equal(true);
         expect(compileUsagePlanStub.calledAfter(compileDeploymentStub)).to.be.equal(true);
         expect(compilePermissionsStub.calledAfter(compileUsagePlanStub)).to.be.equal(true);
         expect(compileStageStub.calledAfter(compilePermissionsStub)).to.be.equal(true);
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
index d9e7f439ea5..5ce34f136d9 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
@@ -6,7 +6,7 @@ const runServerless = require('../../../../../../../../../utils/run-serverless')
 const expect = chai.expect;
 chai.use(require('chai-as-promised'));
 
-describe('#compileRequestValidators()', () => {
+describe('#compileRequestValidators() - schemas', () => {
   let cfResources;
   let naming;
   let serviceName;
@@ -414,3 +414,62 @@ describe('#compileRequestValidators()', () => {
     });
   });
 });
+
+describe('#compileRequestValidators() - parameters', () => {
+  let cfResources;
+  let naming;
+  let validatorLogicalId;
+
+  before(async () => {
+    const { cfTemplate, awsNaming } = await runServerless({
+      fixture: 'requestParameters',
+      command: 'package',
+    });
+    cfResources = cfTemplate.Resources;
+    naming = awsNaming;
+    validatorLogicalId = naming.getValidatorLogicalId();
+  });
+
+  const noValidator = [
+    'no-params',
+    'querystrings-not-required',
+    'headers-not-required',
+    'paths-not-required',
+  ];
+
+  const withValidator = [
+    'querystrings-required',
+    'headers-required',
+    'paths-required',
+    'no-params-with-schema',
+    'params-with-schema',
+  ];
+
+  noValidator.forEach((name) => {
+    it(`no validator: ${name}`, () => {
+      const methodLogicalId = naming.getMethodLogicalId(
+        naming.getNormalizedResourceName(name),
+        'get'
+      );
+      const methodResource = cfResources[methodLogicalId];
+
+      expect(methodResource).to.exist;
+      expect(methodResource.Properties).to.not.have.property('RequestValidatorId');
+    });
+  });
+
+  withValidator.forEach((name) => {
+    it(`with validator: ${name}`, () => {
+      const methodLogicalId = naming.getMethodLogicalId(
+        naming.getNormalizedResourceName(name),
+        'get'
+      );
+      const methodResource = cfResources[methodLogicalId];
+
+      expect(methodResource).to.exist;
+      expect(methodResource.Properties).to.have.deep.property('RequestValidatorId', {
+        Ref: validatorLogicalId,
+      });
+    });
+  });
+});

From de768bcf1671717414cb4eed904fe093b047a179 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 4 Aug 2021 15:26:26 +0200
Subject: [PATCH 0368/1101] chore: Bump dependencies

---
 package.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 03290a64607..347e10fcdbc 100644
--- a/package.json
+++ b/package.json
@@ -23,18 +23,18 @@
   },
   "dependencies": {
     "@serverless/cli": "^1.5.2",
-    "@serverless/components": "^3.14.0",
+    "@serverless/components": "^3.14.2",
     "@serverless/dashboard-plugin": "^5.4.3",
-    "@serverless/platform-client": "^4.2.5",
+    "@serverless/platform-client": "^4.2.6",
     "@serverless/utils": "^5.6.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.951.0",
+    "aws-sdk": "^2.960.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
-    "chalk": "^4.1.1",
+    "chalk": "^4.1.2",
     "child-process-ext": "^2.1.1",
     "ci-info": "^3.2.0",
     "cli-progress-footer": "^1.1.1",
@@ -70,7 +70,7 @@
     "semver": "^7.3.5",
     "signal-exit": "^3.0.3",
     "tabtab": "^3.0.2",
-    "tar": "^6.1.0",
+    "tar": "^6.1.6",
     "timers-ext": "^0.1.7",
     "type": "^2.5.0",
     "untildify": "^4.0.0",
@@ -85,12 +85,12 @@
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "cos-nodejs-sdk-v5": "^2.9.21",
-    "eslint": "^7.31.0",
+    "eslint": "^7.32.0",
     "eslint-plugin-import": "^2.23.4",
     "git-list-updated": "^1.2.1",
     "github-release-from-cc-changelog": "^2.2.0",
     "husky": "^4.3.8",
-    "jszip": "^3.6.0",
+    "jszip": "^3.7.0",
     "lint-staged": "^10.5.4",
     "log": "^6.0.0",
     "log-node": "^7.0.0",
@@ -101,7 +101,7 @@
     "prettier": "^2.3.2",
     "proxyquire": "^2.1.3",
     "semver-regex": "^3.1.2",
-    "sinon": "^11.1.1",
+    "sinon": "^11.1.2",
     "sinon-chai": "^3.7.0",
     "standard-version": "^9.3.1",
     "strip-ansi": "^6.0.0",

From 6b857c347fcb37695b8f1a3ba9f9aa224dc565cd Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 4 Aug 2021 15:39:26 +0200
Subject: [PATCH 0369/1101] chore: Release 2.53.0

---
 CHANGELOG.md | 18 ++++++++++++++++++
 package.json |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1aa9ea12be2..3b46cd21e23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 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.
 
+## [2.53.0](https://github.com/serverless/serverless/compare/v2.52.1...v2.53.0) (2021-08-04)
+
+### Features
+
+- **Variables:** Accept case-insensitive strings in `strToBool` ([#9770](https://github.com/serverless/serverless/issues/9770)) ([612f668](https://github.com/serverless/serverless/commit/612f668c931013bea21b91f47d9cbfd1c7dbb888)) ([Shane R. Spencer](https://github.com/whardier))
+
+### Bug Fixes
+
+- **AWS API Gateway:** Ensure to attach validator when required parameters are defined ([#9793](https://github.com/serverless/serverless/issues/9793)) ([d275459](https://github.com/serverless/serverless/commit/d2754594c462afd39e1576312e361ca57d4f13f2)) ([Karim Kanso](https://github.com/kazkansouh))
+- **Plugins:** Improve error message when a plugin is missing ([#9798](https://github.com/serverless/serverless/issues/9798)) ([5c9df56](https://github.com/serverless/serverless/commit/5c9df56f1bc89af1fd929519f3cf8dac967e514d)) ([Matthieu Napoli](https://github.com/mnapoli))
+
+### Maintenance Improvements
+
+- **Telemetry:** Recognize used variable sources ([#9790](https://github.com/serverless/serverless/pull/9790)) ([60d729b](https://github.com/serverless/serverless/commit/60d729b5d42ae32cc418b9578582da3dc8492754)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Replace `fse.readdir` with `fs.promises.readdir` ([#9780](https://github.com/serverless/serverless/issues/9780)) ([1e00f9e](https://github.com/serverless/serverless/commit/1e00f9edfb5f7618759f9f03d0dad58701a5a27a)) ([Sudipto Das](https://github.com/sdas13))
+- Use `async` in `lib/plugins/create` ([#9683](https://github.com/serverless/serverless/issues/9683)) ([4b87497](https://github.com/serverless/serverless/commit/4b87497875a19348e444763eea85671ed2c4f0b7)) ([Nyambayar Turbat](https://github.com/nyamba))
+- Use `async` in `lib/plugins/plugin` ([#9680](https://github.com/serverless/serverless/issues/9680)) ([377da09](https://github.com/serverless/serverless/commit/377da097c564778c8d2c42ffe49e38000c520106)) ([Nyambayar Turbat](https://github.com/nyamba))
+
 ### [2.52.1](https://github.com/serverless/serverless/compare/v2.52.0...v2.52.1) (2021-07-22)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 347e10fcdbc..838a0adf411 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.52.1",
+  "version": "2.53.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From f0ae032252f88d4d864c2bfe526d70064168231a Mon Sep 17 00:00:00 2001
From: Lewis Putz <Putzy@users.noreply.github.com>
Date: Fri, 6 Aug 2021 09:13:22 +0100
Subject: [PATCH 0370/1101] fix(AWS API Gateway): Ensure
 `MinimumCompressionSize` can be 0 (#9806)

---
 .../compile/events/apiGateway/lib/restApi.js    |  2 +-
 .../events/apiGateway/lib/restApi.test.js       | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js
index 483feb3e282..3f27d318f40 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js
@@ -97,7 +97,7 @@ module.exports = {
       );
     }
 
-    if (apiGateway.minimumCompressionSize) {
+    if (apiGateway.minimumCompressionSize != null) {
       const minimumCompressionSize = apiGateway.minimumCompressionSize;
 
       _.merge(
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
index 6ad0bd7f2ed..e1a507fe1ec 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
@@ -221,4 +221,21 @@ describe('lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js'
       'Fn::If': ['Condition', 'FirstVal', 'SecondVal'],
     });
   });
+
+  it('should support `provider.apiGateway.minimumCompressionSize to be set to 0`', async () => {
+    const { cfTemplate } = await runServerless({
+      fixture: 'apiGateway',
+      command: 'package',
+      configExt: {
+        provider: {
+          apiGateway: {
+            minimumCompressionSize: 0,
+          },
+        },
+      },
+    });
+    const resource = cfTemplate.Resources.ApiGatewayRestApi;
+
+    expect(resource.Properties.MinimumCompressionSize).to.equal(0);
+  });
 });

From 006dc01862a94d5c59d6772550b65049a67ea0f4 Mon Sep 17 00:00:00 2001
From: acvi <aleksacvijic@gmail.com>
Date: Fri, 6 Aug 2021 12:31:41 +0200
Subject: [PATCH 0371/1101] docs: Fix typo in `event-bridge.md` docs (#9808)

---
 docs/providers/aws/events/event-bridge.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/providers/aws/events/event-bridge.md b/docs/providers/aws/events/event-bridge.md
index ff58f085740..0819f344c1f 100644
--- a/docs/providers/aws/events/event-bridge.md
+++ b/docs/providers/aws/events/event-bridge.md
@@ -71,7 +71,7 @@ functions:
 
 ### Re-using an existing event bus
 
-If you want to reuse an existing event bus, you can define it with literal `arn` or with a reference to an existing event bus name via CF intrinsic functions. Referencing via intrinsic functions in available only if you use native CloudFormation support with `provider.eventBridge.useCloudFormation: true` setting:
+If you want to reuse an existing event bus, you can define it with literal `arn` or with a reference to an existing event bus name via CF intrinsic functions. Referencing via intrinsic functions is available only if you use native CloudFormation support with `provider.eventBridge.useCloudFormation: true` setting:
 
 ```yml
 provider:

From 48c3d990beccef7dc3f4b5d29ec5bc4238fd9cf6 Mon Sep 17 00:00:00 2001
From: Nyambayar Turbat <t.nyambayar@gmail.com>
Date: Fri, 6 Aug 2021 18:40:23 +0800
Subject: [PATCH 0372/1101] refactor: Use `async` in `lib/utils` (#9809)

---
 lib/utils/createFromTemplate.js       | 2 +-
 lib/utils/downloadTemplateFromRepo.js | 6 +++---
 lib/utils/fs/createZipFile.js         | 2 +-
 lib/utils/fs/dirExists.js             | 2 +-
 lib/utils/fs/fileExists.js            | 2 +-
 lib/utils/fs/readFile.js              | 2 +-
 lib/utils/fs/writeFile.js             | 2 +-
 lib/utils/getCacheFile.js             | 2 +-
 lib/utils/log/muteConsoleLog.js       | 2 +-
 lib/utils/open.js                     | 2 +-
 lib/utils/yamlAstParser.js            | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/utils/createFromTemplate.js b/lib/utils/createFromTemplate.js
index b4e1a4d16fb..ddc8d28b9ca 100644
--- a/lib/utils/createFromTemplate.js
+++ b/lib/utils/createFromTemplate.js
@@ -15,7 +15,7 @@ const resolveServiceName = (path) => {
   return serviceName;
 };
 
-module.exports = (templateName, destPath, options = {}) =>
+module.exports = async (templateName, destPath, options = {}) =>
   new BbPromise((resolve, reject) => {
     if (!options) options = {};
     const templateSrcDir = join(serverlessPath, 'lib/plugins/create/templates', templateName);
diff --git a/lib/utils/downloadTemplateFromRepo.js b/lib/utils/downloadTemplateFromRepo.js
index c174aef3af7..416e4b1d849 100644
--- a/lib/utils/downloadTemplateFromRepo.js
+++ b/lib/utils/downloadTemplateFromRepo.js
@@ -146,7 +146,7 @@ function parseBitbucketServerURL(url) {
  * @param {Object} url
  * @returns {Boolean}
  */
-function retrieveBitbucketServerInfo(url) {
+async function retrieveBitbucketServerInfo(url) {
   const versionInfoPath = `${url.protocol}//${url.hostname}/rest/api/1.0/application-properties`;
 
   return fetch(versionInfoPath)
@@ -213,7 +213,7 @@ function parsePlainGitURL(url) {
  * @throws {ServerlessError}
  * @returns {Promise}
  */
-function parseRepoURL(inputUrl) {
+async function parseRepoURL(inputUrl) {
   return new BbPromise((resolve, reject) => {
     if (!inputUrl) {
       return reject(new ServerlessError('URL is required', 'MISSING_TEMPLATE_URL'));
@@ -264,7 +264,7 @@ function parseRepoURL(inputUrl) {
  * @param {string} [path]
  * @returns {Promise}
  */
-function downloadTemplateFromRepo(inputUrl, templateName, downloadPath, options = {}) {
+async function downloadTemplateFromRepo(inputUrl, templateName, downloadPath, options = {}) {
   return parseRepoURL(inputUrl).then((repoInformation) => {
     let serviceName;
     let dirName;
diff --git a/lib/utils/fs/createZipFile.js b/lib/utils/fs/createZipFile.js
index 73e48939837..8630a00474f 100644
--- a/lib/utils/fs/createZipFile.js
+++ b/lib/utils/fs/createZipFile.js
@@ -6,7 +6,7 @@ const archiver = require('archiver');
 const BbPromise = require('bluebird');
 const walkDirSync = require('../fs/walkDirSync');
 
-function createZipFile(srcDirPath, outputFilePath) {
+async function createZipFile(srcDirPath, outputFilePath) {
   const files = walkDirSync(srcDirPath).map((file) => ({
     input: file,
     output: file.replace(path.join(srcDirPath, path.sep), ''),
diff --git a/lib/utils/fs/dirExists.js b/lib/utils/fs/dirExists.js
index 38902056059..d354b0875bd 100644
--- a/lib/utils/fs/dirExists.js
+++ b/lib/utils/fs/dirExists.js
@@ -2,7 +2,7 @@
 
 const fse = require('fs-extra');
 
-function dirExists(path) {
+async function dirExists(path) {
   return fse.lstat(path).then(
     (stats) => stats.isDirectory(),
     (error) => {
diff --git a/lib/utils/fs/fileExists.js b/lib/utils/fs/fileExists.js
index 9de09bf01aa..7c3b6c9d1a7 100644
--- a/lib/utils/fs/fileExists.js
+++ b/lib/utils/fs/fileExists.js
@@ -2,7 +2,7 @@
 
 const fse = require('fs-extra');
 
-function fileExists(filePath) {
+async function fileExists(filePath) {
   return fse
     .lstat(filePath)
     .then((stats) => stats.isFile())
diff --git a/lib/utils/fs/readFile.js b/lib/utils/fs/readFile.js
index 3276a9afeb6..d88808950da 100644
--- a/lib/utils/fs/readFile.js
+++ b/lib/utils/fs/readFile.js
@@ -3,7 +3,7 @@
 const fse = require('fs-extra');
 const parse = require('./parse');
 
-function readFile(filePath) {
+async function readFile(filePath) {
   return fse.readFile(filePath, 'utf8').then((contents) => parse(filePath, contents));
 }
 
diff --git a/lib/utils/fs/writeFile.js b/lib/utils/fs/writeFile.js
index f13129d4784..2fff2287ea7 100644
--- a/lib/utils/fs/writeFile.js
+++ b/lib/utils/fs/writeFile.js
@@ -5,7 +5,7 @@ const path = require('path');
 const jc = require('json-cycle');
 const yaml = require('js-yaml');
 
-function writeFile(filePath, conts, cycles) {
+async function writeFile(filePath, conts, cycles) {
   let contents = conts || '';
 
   return fse.mkdirs(path.dirname(filePath)).then(() => {
diff --git a/lib/utils/getCacheFile.js b/lib/utils/getCacheFile.js
index 214386f85dd..3be6cd7d417 100644
--- a/lib/utils/getCacheFile.js
+++ b/lib/utils/getCacheFile.js
@@ -4,7 +4,7 @@ const fileExists = require('./fs/fileExists');
 const readFile = require('./fs/readFile');
 const getCacheFilePath = require('./getCacheFilePath');
 
-const getCacheFile = function (serviceDir) {
+const getCacheFile = async function (serviceDir) {
   const cacheFilePath = getCacheFilePath(serviceDir);
   return fileExists(cacheFilePath).then((exists) => {
     if (!exists) {
diff --git a/lib/utils/log/muteConsoleLog.js b/lib/utils/log/muteConsoleLog.js
index a076b1a7dd9..ab3e8e1f63f 100644
--- a/lib/utils/log/muteConsoleLog.js
+++ b/lib/utils/log/muteConsoleLog.js
@@ -5,7 +5,7 @@
 
 'use strict';
 
-module.exports = (callback) => {
+module.exports = async (callback) => {
   const original = console.log;
   console.log = () => {};
   const restore = () => (console.log = original);
diff --git a/lib/utils/open.js b/lib/utils/open.js
index e6ad9468c56..0793d67880d 100644
--- a/lib/utils/open.js
+++ b/lib/utils/open.js
@@ -26,7 +26,7 @@ const localXdgOpenPath = path.join(__dirname, 'xdg-open');
 const wslToWindowsPath = (filePath) =>
   pExecFile('wslpath', ['-w', filePath]).then(({ stdout }) => stdout.trim());
 
-module.exports = (target, options) => {
+module.exports = async (target, options) => {
   if (typeof target !== 'string') {
     throw new TypeError('Expected a `target`');
   }
diff --git a/lib/utils/yamlAstParser.js b/lib/utils/yamlAstParser.js
index 1d35a209e5e..0e2a3a5adba 100644
--- a/lib/utils/yamlAstParser.js
+++ b/lib/utils/yamlAstParser.js
@@ -125,7 +125,7 @@ const addNewArrayItem = (ymlFile, pathInYml, newValue) =>
     return fs.writeFileAsync(ymlFile, `${yamlContent}${os.EOL}${newText}`);
   });
 
-const removeExistingArrayItem = (ymlFile, pathInYml, removeValue) =>
+const removeExistingArrayItem = async (ymlFile, pathInYml, removeValue) =>
   fs.readFileAsync(ymlFile, 'utf8').then((yamlContent) => {
     const rawAstObject = yaml.load(yamlContent);
     const astObject = parseAST(rawAstObject);

From 7c51f55f5b8af6f853560ba5d757c65b1068a7ab Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 6 Aug 2021 12:47:09 +0200
Subject: [PATCH 0373/1101] refactor(CLI): Change formatting of notifications
 (#9807)

---
 lib/utils/processBackendNotificationRequest.js | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/lib/utils/processBackendNotificationRequest.js b/lib/utils/processBackendNotificationRequest.js
index 681589abc7e..a8c2dc5c17a 100644
--- a/lib/utils/processBackendNotificationRequest.js
+++ b/lib/utils/processBackendNotificationRequest.js
@@ -8,21 +8,5 @@ module.exports = (notifications) => {
   const notification = processBackendNotificationRequest(notifications);
   if (!notification) return;
 
-  const messageLines = notification.message.split('\n');
-
-  const prefix = 'Serverless: ';
-  const borderLength =
-    Math.min(
-      prefix.length + messageLines.reduce((maxLength, line) => Math.max(maxLength, line.length), 0),
-      process.stdout.columns
-    ) || 10;
-  const followingLinesPrefix = ' '.repeat(prefix.length);
-  for (let i = 1; i < messageLines.length; ++i) {
-    messageLines[i] = followingLinesPrefix + messageLines[i];
-  }
-  process.stdout.write(
-    `\n${'*'.repeat(borderLength)}\n${prefix}${chalk.yellow(messageLines.join('\n'))}\n${'*'.repeat(
-      borderLength
-    )}\n\n`
-  );
+  process.stdout.write(`\n${chalk.gray(notification.message)}\n`);
 };

From 54ce40a64d66c368d160ff427f78c1ff4154a068 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 6 Aug 2021 12:52:07 +0200
Subject: [PATCH 0374/1101] chore: Bump dependencies

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 838a0adf411..c8e9868c426 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.960.0",
+    "aws-sdk": "^2.962.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
@@ -50,7 +50,7 @@
     "get-stdin": "^8.0.0",
     "globby": "^11.0.4",
     "got": "^11.8.2",
-    "graceful-fs": "^4.2.6",
+    "graceful-fs": "^4.2.8",
     "https-proxy-agent": "^5.0.0",
     "is-docker": "^2.2.1",
     "is-wsl": "^2.2.0",
@@ -90,7 +90,7 @@
     "git-list-updated": "^1.2.1",
     "github-release-from-cc-changelog": "^2.2.0",
     "husky": "^4.3.8",
-    "jszip": "^3.7.0",
+    "jszip": "^3.7.1",
     "lint-staged": "^10.5.4",
     "log": "^6.0.0",
     "log-node": "^7.0.0",

From 3ccc8cf91c7e11aba1a4fb0852412579b38588ac Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 6 Aug 2021 12:57:52 +0200
Subject: [PATCH 0375/1101] chore: Release 2.53.1

---
 CHANGELOG.md | 11 +++++++++++
 package.json |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b46cd21e23..1081a5842da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 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.
 
+### [2.53.1](https://github.com/serverless/serverless/compare/v2.53.0...v2.53.1) (2021-08-06)
+
+### Bug Fixes
+
+- **AWS API Gateway:** Ensure `MinimumCompressionSize` can be set to 0 ([#9806](https://github.com/serverless/serverless/issues/9806)) ([f0ae032](https://github.com/serverless/serverless/commit/f0ae032252f88d4d864c2bfe526d70064168231a)) ([Lewis Putz](https://github.com/Putzy))
+
+### Maintenance Improvements
+
+- **CLI:** Change formatting of notifications ([#9807](https://github.com/serverless/serverless/issues/9807)) ([7c51f55](https://github.com/serverless/serverless/commit/7c51f55f5b8af6f853560ba5d757c65b1068a7ab)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Use `async` in `lib/utils` ([#9809](https://github.com/serverless/serverless/issues/9809)) ([48c3d99](https://github.com/serverless/serverless/commit/48c3d990beccef7dc3f4b5d29ec5bc4238fd9cf6)) ([Nyambayar Turbat](https://github.com/nyamba))
+
 ## [2.53.0](https://github.com/serverless/serverless/compare/v2.52.1...v2.53.0) (2021-08-04)
 
 ### Features
diff --git a/package.json b/package.json
index c8e9868c426..64b75cbfb79 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.53.0",
+  "version": "2.53.1",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 847dd8f47503ddf03971122e5700110aa3ff77d1 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 23 Jul 2021 17:04:54 +0200
Subject: [PATCH 0376/1101] feat(AWS IAM):  Resign from deprecating old format
 of IAM settings

---
 docs/deprecations.md                          |  7 +-
 lib/plugins/aws/provider.js                   | 14 ----
 lib/utils/report-deprecated-properties.js     | 30 -------
 .../report-deprecated-properties.test.js      | 80 -------------------
 4 files changed, 4 insertions(+), 127 deletions(-)
 delete mode 100644 lib/utils/report-deprecated-properties.js
 delete mode 100644 test/unit/lib/utils/report-deprecated-properties.test.js

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 7944b063f3c..8f80e101577 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -246,7 +246,9 @@ Adapt to this behaviour now by adding `unresolvedVariablesNotificationMode: erro
 
 Deprecation code: `PROVIDER_IAM_SETTINGS`
 
-Staring with v3.0.0, all IAM-related settings of _provider_ including `iamRoleStatements`, `iamManagedPolicies`, `role` and `cfnRole` will be grouped under `iam` property. Refer to the[IAM Guide](/framework/docs/providers/aws/guide/iam.md).
+_Note: Originally support for old IAM settings was scheduled to be dropped with new major release. It's no longer the case. If you see this deprecation notice please upgrade to latest version of Serverless Framework_
+
+All IAM-related settings of _provider_ including `iamRoleStatements`, `iamManagedPolicies`, `role` and `cfnRole` are also now supported at `iam` property. Refer to the [IAM Guide](/framework/docs/providers/aws/guide/iam.md).
 
 - `provider.role` -> `provider.iam.role`
 - `provider.rolePermissionsBoundary` -> `provider.iam.role.permissionsBoundary`
@@ -254,8 +256,7 @@ Staring with v3.0.0, all IAM-related settings of _provider_ including `iamRoleSt
 - `provider.iamManagedPolicies` -> `provider.iam.role.managedPolicies`
 - `provider.cfnRole` -> `provider.iam.deploymentRole`
 
-In addition, a prior update had documented the new Permissions Boundary property as `iam.role.permissionBoundary`. This
-has now been deprecated in favor of `iam.role.permissionsBoundary` to match the CloudFormation property.
+In addition `iam.role.permissionBoundary` can also be set at `iam.role.permissionsBoundary` (which matches CloudFormation property name).
 
 <a name="AWS_API_GATEWAY_SPECIFIC_KEYS"><div>&nbsp;</div></a>
 
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index ae012984aa0..d560348f1b5 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -8,7 +8,6 @@ const fs = require('fs');
 const getS3EndpointForRegion = require('./utils/getS3EndpointForRegion');
 const memoizeeMethods = require('memoizee/methods');
 const readline = require('readline');
-const reportDeprecatedProperties = require('../../utils/report-deprecated-properties');
 const { ALB_LISTENER_REGEXP } = require('./package/compile/events/alb/lib/validate');
 const d = require('d');
 const path = require('path');
@@ -229,19 +228,6 @@ class AwsProvider {
             }
           }
         }
-
-        reportDeprecatedProperties(
-          'PROVIDER_IAM_SETTINGS',
-          {
-            'provider.role': 'provider.iam.role',
-            'provider.rolePermissionsBoundary': 'provider.iam.role.permissionsBoundary',
-            'provider.iam.role.permissionBoundary': 'provider.iam.role.permissionsBoundary',
-            'provider.iamManagedPolicies': 'provider.iam.role.managedPolicies',
-            'provider.iamRoleStatements': 'provider.iam.role.statements',
-            'provider.cfnRole': 'provider.iam.deploymentRole',
-          },
-          { serviceConfig: this.serverless.service }
-        );
       },
     };
 
diff --git a/lib/utils/report-deprecated-properties.js b/lib/utils/report-deprecated-properties.js
deleted file mode 100644
index bcba8ba1fd2..00000000000
--- a/lib/utils/report-deprecated-properties.js
+++ /dev/null
@@ -1,30 +0,0 @@
-'use strict';
-
-const _ = require('lodash');
-const logDeprecation = require('./logDeprecation');
-
-const getMessage = (props, serviceConfig) => {
-  const warnings = [];
-
-  for (const [oldProp, newProp] of Object.entries(props)) {
-    if (_.get(serviceConfig, oldProp) != null) {
-      warnings.push([oldProp, newProp]);
-    }
-  }
-
-  if (warnings.length) {
-    const what = warnings.length > 1 ? 'properties' : 'property';
-    const details = warnings
-      .map(([oldProp, newProp]) => `  "${oldProp}" -> "${newProp}"`)
-      .join('\n');
-    return `Starting with version 3.0.0, following ${what} will be replaced:\n${details}`;
-  }
-  return null;
-};
-
-module.exports = (code, props, { serviceConfig } = {}) => {
-  const msg = getMessage(props, serviceConfig);
-  if (msg) {
-    logDeprecation(code, msg, { serviceConfig });
-  }
-};
diff --git a/test/unit/lib/utils/report-deprecated-properties.test.js b/test/unit/lib/utils/report-deprecated-properties.test.js
deleted file mode 100644
index e7c27300d41..00000000000
--- a/test/unit/lib/utils/report-deprecated-properties.test.js
+++ /dev/null
@@ -1,80 +0,0 @@
-'use strict';
-
-const expect = require('chai').expect;
-const requireUncached = require('ncjsm/require-uncached');
-
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
-
-describe('report-deprecated-properties', () => {
-  let stdoutData = '';
-  let report;
-  let triggeredDeprecations;
-
-  before(() => {
-    process.env.SLS_DEPRECATION_NOTIFICATION_MODE = 'warn';
-    requireUncached(() => {
-      report = require('../../../../lib/utils/report-deprecated-properties');
-      ({ triggeredDeprecations } = require('../../../../lib/utils/logDeprecation'));
-    });
-  });
-
-  afterEach(() => {
-    stdoutData = '';
-    triggeredDeprecations.clear();
-  });
-
-  const serviceConfig = {
-    provider: {
-      role: 'role-a',
-      iamRoleStatements: ['something'],
-      apiGateway: {
-        isDodgy: true,
-      },
-    },
-  };
-
-  it('should warn about deprecated usage', () => {
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () =>
-        report(
-          'MY_CODE',
-          {
-            'provider.role': 'provider.iam.role',
-            'provider.cfnRole': 'provider.iam.deploymentRole',
-            'provider.iamRoleStatements': 'provider.iam.role.statements',
-            'provider.apiGateway.isDodgy': 'provider.apiGateway.legitOption',
-          },
-          { serviceConfig }
-        )
-    );
-    expect(triggeredDeprecations).to.include('MY_CODE');
-    expect(stdoutData).to.include(
-      'Starting with version 3.0.0, following properties will be replaced'
-    );
-    expect(stdoutData).to.include('"provider.role" -> "provider.iam.role"');
-    expect(stdoutData).to.include('"provider.iamRoleStatements" -> "provider.iam.role.statements"');
-    expect(stdoutData).to.include(
-      '"provider.apiGateway.isDodgy" -> "provider.apiGateway.legitOption"'
-    );
-    expect(stdoutData).not.to.include('"provider.cfnRole" -> "provider.iam.role.deploymentRole"');
-  });
-
-  it('no deprecated usage', () => {
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () =>
-        report(
-          'MY_CODE',
-          {
-            'provider.bad': 'provider.good',
-            'provider.veryBad': 'provider.veryGood',
-          },
-          { serviceConfig }
-        )
-    );
-
-    expect(triggeredDeprecations).not.to.include('MY_CODE');
-    expect(stdoutData).to.be.equal('');
-  });
-});

From 83af78ceb5b71885d2d2f349240e9154dac0f09d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 23 Jul 2021 17:11:22 +0200
Subject: [PATCH 0377/1101] docs: Improve documentation on deprecation
 addressing old vars resolver

---
 docs/deprecations.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 8f80e101577..250d36c4180 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -236,9 +236,9 @@ Starting from v3.0.0 configuration data will not be resolved internally, and if
 
 Deprecation code: `VARIABLES_ERROR_ON_UNRESOLVED`
 
-Starting with v3.0.0, references to variables that cannot be resolved will result in an error being thrown.
+_Note: Starting with v3.0.0, Serverless Framework will switch exclusively to a new variables resolver. If you see this deprecation please upgrade to latest v2 release of Serverless Framework, as that will provide a more accurate insight on planned changes._
 
-Adapt to this behaviour now by adding `unresolvedVariablesNotificationMode: error` to service configuration.
+In context of v2 you may adapt old variables resolver so errors on unresolved variables are thrown by adding `unresolvedVariablesNotificationMode: error` to service configuration.
 
 <a name="PROVIDER_IAM_SETTINGS"><div>&nbsp;</div></a>
 

From 378a8f426de1b47a6810d21b90bf4c121d233c9c Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 9 Aug 2021 13:28:54 +0200
Subject: [PATCH 0378/1101] refactor(AWS API Gateway): Deprecate default
 `identitySource`

---
 docs/deprecations.md                          |  8 ++++++
 .../compile/events/apiGateway/index.js        | 27 +++++++++++++++++++
 .../events/apiGateway/lib/authorizers.test.js | 13 ++++++++-
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 250d36c4180..64934b463bc 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -36,6 +36,14 @@ Note:
 - In service configuration setting is ineffective for deprecations reported before service configuration is read.
 - `SLS_DEPRECATION_DISABLE` env var and `disabledDeprecations` configuration setting remain respected, and no errors will be thrown for mentioned deprecation coodes.
 
+<a name="AWS_API_GATEWAY_DEFAULT_IDENTITY_SOURCE"><div>&nbsp;</div></a>
+
+## Default `identitySource` for `http.authorizer`
+
+Deprecation code: `AWS_API_GATEWAY_DEFAULT_IDENTITY_SOURCE`
+
+Starting with `v3.0.0`, `functions[].events[].http.authorizer.identitySource` will no longer be set to "method.request.header.Authorization" by default. If you want to keep this setting, please set it explicitly in your configuration. If you do not want this to be set, please set it explicitly to `null`.
+
 <a name="DISABLE_DEFAULT_OUTPUT_EXPORT_NAMES"><div>&nbsp;</div></a>
 
 ## Disable default Output Export names
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/index.js b/lib/plugins/aws/package/compile/events/apiGateway/index.js
index 96320d6f3f4..07d2358f632 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/index.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/index.js
@@ -264,6 +264,33 @@ class AwsCompileApigEvents {
           );
         }
 
+        if (
+          this.serverless.service.provider.name === 'aws' &&
+          Object.values(this.serverless.service.functions).some(({ events }) =>
+            events.some(({ http }) => {
+              if (http && http.authorizer) {
+                if (_.isObject(http.authorizer)) {
+                  // Deprecation should not apply to already existing, external authorizers
+                  if (http.authorizer.authorizerId) return false;
+                  // Deprecation should not apply to `aws_iam` authorization type
+                  if (http.authorizer.type && http.authorizer.type.toUpperCase() === 'AWS_IAM') {
+                    return false;
+                  }
+                  return http.authorizer.identitySource === undefined;
+                }
+                // Authorizer is defined as a string and we want to check if its `aws_iam` - in such case the deprecation will not apply
+                return !(http.authorizer.toUpperCase() === 'AWS_IAM');
+              }
+              return false;
+            })
+          )
+        ) {
+          this.serverless._logDeprecation(
+            'AWS_API_GATEWAY_DEFAULT_IDENTITY_SOURCE',
+            'Starting with v3.0.0, "functions[].events[].http.authorizer.identitySource" will no longer be set to "method.request.header.Authorization" by default.\nIf you want to keep this setting, please set it explicitly in your configuration. If you do not want this to be set, please set it explicitly to "null".'
+          );
+        }
+
         if (
           this.serverless.service.provider.name === 'aws' &&
           this.serverless.service.provider.apiGateway &&
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js
index 0ea4d9cfb90..2208b8fe75e 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js
@@ -231,7 +231,18 @@ describe('#compileAuthorizers() #2', () => {
           },
           authorized: {
             handler: 'index.handler',
-            events: [{ http: { method: 'get', path: '/authorized', authorizer: 'foo' } }],
+            events: [
+              {
+                http: {
+                  method: 'get',
+                  path: '/authorized',
+                  authorizer: {
+                    name: 'foo',
+                    identitySource: 'method.request.header.Authorization',
+                  },
+                },
+              },
+            ],
           },
         },
       },

From 53b41eb53aeefe22dc29b785a428f3b184906d2c Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 6 Aug 2021 14:35:42 +0200
Subject: [PATCH 0379/1101] refactor(CLI): Deprecate `-v` as alias for
 `--verbose`

---
 docs/deprecations.md  | 10 +++++++++-
 lib/Serverless.js     | 11 ++++++++++-
 scripts/serverless.js |  1 +
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 64934b463bc..e3c492be09d 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -36,6 +36,14 @@ Note:
 - In service configuration setting is ineffective for deprecations reported before service configuration is read.
 - `SLS_DEPRECATION_DISABLE` env var and `disabledDeprecations` configuration setting remain respected, and no errors will be thrown for mentioned deprecation coodes.
 
+<a name="CLI_VERBOSE_OPTION_ALIAS"><div>&nbsp;</div></a>
+
+## CLI `-v` alias for `--verbose` option
+
+Deprecation code: `CLI_VERBOSE_OPTION_ALIAS`
+
+Starting with `v3.0.0`, `-v` will no longer be supported as alias for `--verbose` option. Please use `--verbose` flag instead.
+
 <a name="AWS_API_GATEWAY_DEFAULT_IDENTITY_SOURCE"><div>&nbsp;</div></a>
 
 ## Default `identitySource` for `http.authorizer`
@@ -58,7 +66,7 @@ Starting with `v3.0.0`, it will not be possible to disable default export names
 
 Deprecation code: `CLI_DEPLOY_FUNCTION_OPTION'`
 
-Starting with v3.0.0, `--function` or `-f` option for `deploy` command will be removed. In order to deploy a single function, please use `deploy function` command instead.
+Starting with `v3.0.0`, `--function` or `-f` option for `deploy` command will be removed. In order to deploy a single function, please use `deploy function` command instead.
 
 <a name="CHANGE_OF_DEFAULT_RUNTIME_TO_NODEJS14X"><div>&nbsp;</div></a>
 
diff --git a/lib/Serverless.js b/lib/Serverless.js
index 4930aa5cbe5..bc6d29fdc4e 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -404,7 +404,6 @@ class Serverless {
       return;
     }
     this.cli.suppressLogIfPrintCommand(this.processedInput);
-
     // make sure the command exists before doing anything else
     this.pluginManager.validateCommand(this.processedInput.commands);
 
@@ -427,6 +426,16 @@ class Serverless {
       }
     }
 
+    if (
+      process.argv.slice(2).includes('-v') &&
+      _.get(resolveCliInput().commandSchema, 'options.verbose.shortcut') === 'v'
+    ) {
+      this._logDeprecation(
+        'CLI_VERBOSE_OPTION_ALIAS',
+        'Starting with v3.0.0, "-v" will no longer be supported as alias for "--verbose" option. Please use "--verbose" flag instead.'
+      );
+    }
+
     if (resolveCliInput().commands[0] !== 'plugin') {
       // merge arrays after variables have been populated
       // (https://github.com/serverless/serverless/issues/3511)
diff --git a/scripts/serverless.js b/scripts/serverless.js
index e451ca2de23..714a587563b 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -268,6 +268,7 @@ const processSpanPromise = (async () => {
             // If command was not recognized in previous resolution phases
             // parse args again also against schemas commands which require AWS service context
             resolveInput.clear();
+
             ({ command, commands, options, isHelpRequest, commandSchema } = resolveInput(
               require('../lib/cli/commands-schema/aws-service')
             ));

From d53c80d4564ef19ea182d1cf5553c1906f08497a Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 10 Aug 2021 20:15:03 +0200
Subject: [PATCH 0380/1101] test(AWS API Gateway): Fix integration test for API
 Gateway

---
 test/fixtures/programmatic/apiGatewayExtended/serverless.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/fixtures/programmatic/apiGatewayExtended/serverless.yml b/test/fixtures/programmatic/apiGatewayExtended/serverless.yml
index 644130f89c1..11638aefa42 100644
--- a/test/fixtures/programmatic/apiGatewayExtended/serverless.yml
+++ b/test/fixtures/programmatic/apiGatewayExtended/serverless.yml
@@ -54,7 +54,9 @@ functions:
       - http:
           path: custom-auth
           method: GET
-          authorizer: authorizer
+          authorizer:
+            name: authorizer
+            identitySource: null
   apiKeys:
     handler: core.apiKeys
     events:

From 0e01d9e337860b9d1136586fbfaf0c43ac21cde0 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 11 Aug 2021 10:03:23 +0200
Subject: [PATCH 0381/1101] refactor(AWS API Gateway): Adjust deprecation for
 `identitySource`

---
 docs/deprecations.md                          |  2 +-
 .../compile/events/apiGateway/index.js        | 24 +++++++------------
 .../apiGatewayExtended/serverless.yml         |  1 -
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index e3c492be09d..f821e2df7db 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -50,7 +50,7 @@ Starting with `v3.0.0`, `-v` will no longer be supported as alias for `--verbose
 
 Deprecation code: `AWS_API_GATEWAY_DEFAULT_IDENTITY_SOURCE`
 
-Starting with `v3.0.0`, `functions[].events[].http.authorizer.identitySource` will no longer be set to "method.request.header.Authorization" by default. If you want to keep this setting, please set it explicitly in your configuration. If you do not want this to be set, please set it explicitly to `null`.
+Starting with v3.0.0, `functions[].events[].http.authorizer.identitySource` will no longer be set to "method.request.header.Authorization" by default for authorizers of "request" type with caching disabled ("resultTtlInSeconds" set to "0"). If you want to keep this setting, please set it explicitly in your configuration. If you do not want this to be set, please set it explicitly to "null".
 
 <a name="DISABLE_DEFAULT_OUTPUT_EXPORT_NAMES"><div>&nbsp;</div></a>
 
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/index.js b/lib/plugins/aws/package/compile/events/apiGateway/index.js
index 07d2358f632..4fee67a0d33 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/index.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/index.js
@@ -268,26 +268,20 @@ class AwsCompileApigEvents {
           this.serverless.service.provider.name === 'aws' &&
           Object.values(this.serverless.service.functions).some(({ events }) =>
             events.some(({ http }) => {
-              if (http && http.authorizer) {
-                if (_.isObject(http.authorizer)) {
-                  // Deprecation should not apply to already existing, external authorizers
-                  if (http.authorizer.authorizerId) return false;
-                  // Deprecation should not apply to `aws_iam` authorization type
-                  if (http.authorizer.type && http.authorizer.type.toUpperCase() === 'AWS_IAM') {
-                    return false;
-                  }
-                  return http.authorizer.identitySource === undefined;
-                }
-                // Authorizer is defined as a string and we want to check if its `aws_iam` - in such case the deprecation will not apply
-                return !(http.authorizer.toUpperCase() === 'AWS_IAM');
-              }
-              return false;
+              return (
+                http &&
+                _.isObject(http.authorizer) &&
+                http.authorizer.type &&
+                http.authorizer.type.toUpperCase() === 'REQUEST' &&
+                http.authorizer.identitySource === undefined &&
+                http.authorizer.resultTtlInSeconds === 0
+              );
             })
           )
         ) {
           this.serverless._logDeprecation(
             'AWS_API_GATEWAY_DEFAULT_IDENTITY_SOURCE',
-            'Starting with v3.0.0, "functions[].events[].http.authorizer.identitySource" will no longer be set to "method.request.header.Authorization" by default.\nIf you want to keep this setting, please set it explicitly in your configuration. If you do not want this to be set, please set it explicitly to "null".'
+            'Starting with v3.0.0, "functions[].events[].http.authorizer.identitySource" will no longer be set to "method.request.header.Authorization" by default for authorizers of "request" type with caching disabled ("resultTtlInSeconds" set to "0").\nIf you want to keep this setting, please set it explicitly in your configuration. If you do not want this to be set, please set it explicitly to "null".'
           );
         }
 
diff --git a/test/fixtures/programmatic/apiGatewayExtended/serverless.yml b/test/fixtures/programmatic/apiGatewayExtended/serverless.yml
index 11638aefa42..2e88bea09ec 100644
--- a/test/fixtures/programmatic/apiGatewayExtended/serverless.yml
+++ b/test/fixtures/programmatic/apiGatewayExtended/serverless.yml
@@ -56,7 +56,6 @@ functions:
           method: GET
           authorizer:
             name: authorizer
-            identitySource: null
   apiKeys:
     handler: core.apiKeys
     events:

From dc74f41470447c1fab0a646c15284a4eb212ecb6 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 11 Aug 2021 14:02:36 +0200
Subject: [PATCH 0382/1101] fix(AWS Layers): Support references to external
 layers

---
 commitlint.config.js                          |  1 +
 lib/plugins/aws/package/compile/functions.js  | 10 +++--
 .../aws/package/compile/functions.test.js     | 40 +++++++++++++------
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/commitlint.config.js b/commitlint.config.js
index be925eec393..d96c5df1575 100644
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -28,6 +28,7 @@ module.exports = {
         'AWS Kafka',
         'AWS Kinesis',
         'AWS Lambda',
+        'AWS Layers',
         'AWS Local Invocation',
         'AWS MSK',
         'AWS S3',
diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index 0521ee39abe..960ba46d085 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -6,6 +6,7 @@ const crypto = require('crypto');
 const fs = require('fs');
 const _ = require('lodash');
 const path = require('path');
+const log = require('@serverless/utils/log');
 const ServerlessError = require('../../../../serverless-error');
 const deepSortObjectByKey = require('../../../../utils/deepSortObjectByKey');
 const getHashForFilePath = require('../lib/getHashForFilePath');
@@ -735,11 +736,12 @@ function extractLayerConfigurationsFromFunction(functionProperties, cfTemplate)
   functionProperties.Layers.forEach((potentialLocalLayerObject) => {
     if (potentialLocalLayerObject.Ref) {
       const configuration = cfTemplate.Resources[potentialLocalLayerObject.Ref];
+
       if (!configuration) {
-        throw new ServerlessError(
-          `Could not find reference to layer: ${potentialLocalLayerObject.Ref}. Ensure that you are referencing layer defined in your service.`,
-          'LAMBDA_LAYER_REFERENCE_NOT_FOUND'
-        );
+        if (process.env.SLS_DEBUG) {
+          log(`Could not find reference to layer: ${potentialLocalLayerObject.Ref}.`);
+        }
+        return;
       }
 
       layerConfigurations.push({
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index 6422c416b38..81b6db91e97 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -2134,21 +2134,37 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L2325-L2362
     });
 
-    it('should throw an error when nonexistent layer is referenced', async () => {
-      await expect(
-        runServerless({
-          fixture: 'functionDestinations',
-          command: 'package',
-          configExt: {
-            functions: {
-              fnInvalidLayer: {
-                handler: 'target.handler',
-                layers: [{ Ref: 'NonexistentLambdaLayer' }],
+    it('should support `Ref` references to external layers (not defined as a part of `layers` top-level property in configuration)', async () => {
+      const { cfTemplate, awsNaming } = await runServerless({
+        fixture: 'functionDestinations',
+        command: 'package',
+        configExt: {
+          functions: {
+            fnExternalLayer: {
+              handler: 'target.handler',
+              layers: [{ Ref: 'ExternalLambdaLayer' }],
+            },
+          },
+          resources: {
+            Resources: {
+              ExternalLambdaLayer: {
+                Type: 'AWS::Lambda::LayerVersion',
+                Properties: {
+                  CompatibleRuntimes: ['nodejs12.x'],
+                  Content: {
+                    S3Bucket: 'bucket',
+                    S3Key: 'key',
+                  },
+                  LayerName: 'externalLayer',
+                },
               },
             },
           },
-        })
-      ).to.be.eventually.rejected.and.have.property('code', 'LAMBDA_LAYER_REFERENCE_NOT_FOUND');
+        },
+      });
+      expect(
+        cfTemplate.Resources[awsNaming.getLambdaLogicalId('fnExternalLayer')].Properties.Layers
+      ).to.deep.equal([{ Ref: 'ExternalLambdaLayer' }]);
     });
 
     it.skip('TODO: should support `functions[].conditions`', () => {

From b7f4e08661cd149a29ae7107241a16928dc606eb Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 11 Aug 2021 15:07:42 +0200
Subject: [PATCH 0383/1101] fix(Variables): Unconditionally deprecate old vars
 engine extensions

---
 .../variables/sources/resolve-external-plugin-sources.js     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/configuration/variables/sources/resolve-external-plugin-sources.js b/lib/configuration/variables/sources/resolve-external-plugin-sources.js
index 39bbc818ac9..c6b08f5d80c 100644
--- a/lib/configuration/variables/sources/resolve-external-plugin-sources.js
+++ b/lib/configuration/variables/sources/resolve-external-plugin-sources.js
@@ -48,10 +48,7 @@ module.exports = (configuration, resolverConfiguration, externalPlugins) => {
         resolverConfiguration.sources[sourceName] = sourceConfig;
         resolverConfiguration.fulfilledSources.add(sourceName);
       }
-    } else if (
-      externalPlugin.variableResolvers &&
-      configuration.variablesResolutionMode < 20210326
-    ) {
+    } else if (externalPlugin.variableResolvers) {
       logDeprecation(
         'NEW_VARIABLES_RESOLVER',
         `Plugin "${pluginName}" attempts to extend old variables resolver. ` +

From 5c9ca56d14a90dfd9aa5c064bd15137504336ed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Han=20Sang=20Hoon=20=28=ED=95=9C=EC=83=81=ED=9B=88=29?=
 <s2peters2@naver.com>
Date: Thu, 12 Aug 2021 18:04:26 +0900
Subject: [PATCH 0384/1101] feat(AWS Lambda): Add support for multiple
 subscription filters (#9760)

---
 lib/plugins/aws/deploy/lib/checkForChanges.js | 201 ++++++++++--------
 .../package/compile/events/cloudWatchLog.js   |  21 +-
 .../aws/deploy/lib/checkForChanges.test.js    | 154 +++++++++++++-
 .../compile/events/cloudWatchLog.test.js      |  81 ++++++-
 4 files changed, 350 insertions(+), 107 deletions(-)

diff --git a/lib/plugins/aws/deploy/lib/checkForChanges.js b/lib/plugins/aws/deploy/lib/checkForChanges.js
index 3e651ca9556..22f1cd2be2f 100644
--- a/lib/plugins/aws/deploy/lib/checkForChanges.js
+++ b/lib/plugins/aws/deploy/lib/checkForChanges.js
@@ -195,9 +195,9 @@ module.exports = {
   },
 
   /**
-   * @description Cloudwatch imposes a hard limit of 1 subscription filter per log group.
+   * @description Cloudwatch imposes a hard limit of 2 subscription filter per log group.
    * If we change a cloudwatchLog event entry to add a subscription filter to a log group
-   * that already had one before, it will throw an error because CloudFormation firstly
+   * that already had two before, it will throw an error because CloudFormation firstly
    * tries to create and replace the new subscription filter (therefore hitting the limit)
    * before deleting the old one. This precompile process aims to delete existent
    * subscription filters of functions that a new filter was provided, by checking the
@@ -207,54 +207,41 @@ module.exports = {
   async checkLogGroupSubscriptionFilterResourceLimitExceeded() {
     const region = this.provider.getRegion();
 
-    return this.provider.getAccountInfo().then((account) =>
-      Promise.all(
-        this.serverless.service.getAllFunctions().map((functionName) => {
-          const functionObj = this.serverless.service.getFunction(functionName);
-
-          if (!functionObj.events) {
-            return BbPromise.resolve();
-          }
-
-          let logSubscriptionSerialNumber = 0;
-          const promises = functionObj.events.map((event) => {
-            if (!event.cloudwatchLog) {
-              return BbPromise.resolve();
-            }
-
-            let logGroupName;
-
-            /*
-              it isn't necessary to run sanity checks here as they already happened during the
-              compile step
-            */
-            if (typeof event.cloudwatchLog === 'object') {
-              logGroupName = event.cloudwatchLog.logGroup.replace(/\r?\n/g, '');
-            } else {
-              logGroupName = event.cloudwatchLog.replace(/\r?\n/g, '');
-            }
-
-            const accountId = account.accountId;
-            const partition = account.partition;
+    const account = await this.provider.getAccountInfo();
+    const accountId = account.accountId;
+    const partition = account.partition;
+
+    const functionNames = await this.serverless.service.getAllFunctions();
+    const cloudwatchLogEvents = _.flatten(
+      functionNames.map((functionName) => {
+        const functionObj = this.serverless.service.getFunction(functionName);
+        const FunctionName = functionObj.name;
+        const events = functionObj.events;
+        let logSubscriptionSerialNumber = 0;
+        return events
+          .filter((event) => !!event.cloudwatchLog)
+          .map((event) => {
+            const rawLogGroupName = event.cloudwatchLog.logGroup || event.cloudwatchLog;
+            const logGroupName = rawLogGroupName.replace(/\r?\n/g, '');
 
             logSubscriptionSerialNumber++;
 
-            /*
-              return a new promise that will check the resource limit exceeded and will fix it if
-              the option is enabled
-            */
-            return this.fixLogGroupSubscriptionFilters({
-              accountId,
-              logGroupName,
-              functionName,
-              functionObj,
-              region,
-              partition,
-              logSubscriptionSerialNumber,
-            });
+            return { FunctionName, functionName, logGroupName, logSubscriptionSerialNumber };
           });
+      })
+    );
 
-          return Promise.all(promises);
+    const cloudwatchLogEventsMap = _.groupBy(cloudwatchLogEvents, 'logGroupName');
+    const logGroupNames = Object.keys(cloudwatchLogEventsMap);
+
+    return Promise.all(
+      logGroupNames.map((logGroupName) =>
+        this.fixLogGroupSubscriptionFilters({
+          accountId,
+          region,
+          partition,
+          logGroupName,
+          cloudwatchLogEvents: cloudwatchLogEventsMap[logGroupName],
         })
       )
     );
@@ -262,58 +249,94 @@ module.exports = {
 
   async fixLogGroupSubscriptionFilters(params) {
     const accountId = params.accountId;
-    const logGroupName = params.logGroupName;
-    const functionName = params.functionName;
-    const functionObj = params.functionObj;
     const region = params.region;
     const partition = params.partition;
-    const logSubscriptionSerialNumber = params.logSubscriptionSerialNumber;
-
-    return (
-      this.provider
-        .request(
-          'CloudWatchLogs',
-          'describeSubscriptionFilters',
-          { logGroupName },
-          { useCache: true }
-        )
-        .then((response) => {
-          const subscriptionFilter = response.subscriptionFilters[0];
+    const logGroupName = params.logGroupName;
+    const cloudwatchLogEvents = params.cloudwatchLogEvents;
+    const CLOUDWATCHLOG_LOG_GROUP_EVENT_PER_FUNCTION_LIMIT = 2;
+
+    const response = await this.provider
+      .request(
+        'CloudWatchLogs',
+        'describeSubscriptionFilters',
+        { logGroupName },
+        { useCache: true }
+      )
+      .catch(() => ({ subscriptionFilters: [] }));
+    if (response.subscriptionFilters.length === 0) {
+      return false;
+    }
 
-          // log group doesn't have any subscription filters currently
-          if (!subscriptionFilter) {
-            return false;
-          }
+    const oldSubscriptionFilters = response.subscriptionFilters.map((subscriptionFilter) => ({
+      ...subscriptionFilter,
+      logicalId: this.getLogicalIdFromFilterName(subscriptionFilter.filterName),
+    }));
 
-          const filterName = subscriptionFilter.filterName;
+    const newSubscriptionFilters = cloudwatchLogEvents.map((cloudwatchLogEvent) => {
+      const destinationArn = `arn:${partition}:lambda:${region}:${accountId}:function:${cloudwatchLogEvent.FunctionName}`;
+      const logicalId = this.provider.naming.getCloudWatchLogLogicalId(
+        cloudwatchLogEvent.functionName,
+        cloudwatchLogEvent.logSubscriptionSerialNumber
+      );
 
-          const oldDestinationArn = subscriptionFilter.destinationArn;
-          const newDestinationArn = `arn:${partition}:lambda:${region}:${accountId}:function:${functionObj.name}`;
-          const oldLogicalId = this.getLogicalIdFromFilterName(filterName);
-          const newLogicalId = this.provider.naming.getCloudWatchLogLogicalId(
-            functionName,
-            logSubscriptionSerialNumber
-          );
+      return {
+        destinationArn,
+        logicalId,
+      };
+    });
 
-          // everything is fine, just return
-          if (oldDestinationArn === newDestinationArn && oldLogicalId === newLogicalId) {
-            return false;
-          }
+    const sameDestinationArn = (sf1, sf2) => sf1.destinationArn === sf2.destinationArn;
+    const sameLogicalId = (sf1, sf2) => sf1.logicalId === sf2.logicalId;
+
+    // Old subscription filters which don't have the same destination as any of the new subscription filters.
+    // Currently, these kinds of subscription filters are deleted.
+    // In the future, the behavior will change to not delete filters that were set up externally.
+    const notMatchedOldSubscriptionFilters = oldSubscriptionFilters.filter(
+      (oldSubscriptionFilter) => {
+        const destinationMatchNewSubscriptionFilter = newSubscriptionFilters.find(
+          (newSubscriptionFilter) =>
+            sameDestinationArn(newSubscriptionFilter, oldSubscriptionFilter)
+        );
+        return !destinationMatchNewSubscriptionFilter;
+      }
+    );
 
-          /*
-            If the destinations functions' ARNs doesn't match, we need to delete the current
-            subscription filter to prevent the resource limit exceeded error to happen
-          */
-          return this.provider.request('CloudWatchLogs', 'deleteSubscriptionFilter', {
-            logGroupName,
-            filterName,
-          });
+    const numOfSubscriptionFiltersToDelete =
+      notMatchedOldSubscriptionFilters.length +
+      newSubscriptionFilters.length -
+      CLOUDWATCHLOG_LOG_GROUP_EVENT_PER_FUNCTION_LIMIT;
+    if (numOfSubscriptionFiltersToDelete > 0) {
+      await Promise.all(
+        notMatchedOldSubscriptionFilters
+          .slice(0, numOfSubscriptionFiltersToDelete)
+          .map((oldSubscriptionFilter) =>
+            this.provider.request('CloudWatchLogs', 'deleteSubscriptionFilter', {
+              logGroupName,
+              filterName: oldSubscriptionFilter.filterName,
+            })
+          )
+      );
+    }
+
+    // Old subscription filters which have same destination with one of the new subscription filter, but index of log event in function has been changed.
+    // If log event order changed, we should delete old subscription filters before creation.
+    const logEventOrderChangedOldSubscriptionFilters = oldSubscriptionFilters.filter(
+      (oldSubscriptionFilter) => {
+        const logEventOrderChangedNewSubscriptionFilter = newSubscriptionFilters.find(
+          (newSubscriptionFilter) =>
+            sameDestinationArn(newSubscriptionFilter, oldSubscriptionFilter) &&
+            !sameLogicalId(newSubscriptionFilter, oldSubscriptionFilter)
+        );
+        return logEventOrderChangedNewSubscriptionFilter;
+      }
+    );
+    return Promise.all(
+      logEventOrderChangedOldSubscriptionFilters.map((oldSubscriptionFilter) =>
+        this.provider.request('CloudWatchLogs', 'deleteSubscriptionFilter', {
+          logGroupName,
+          filterName: oldSubscriptionFilter.filterName,
         })
-        /*
-        it will throw when trying to get subscription filters of a log group that was just added
-        to the serverless.yml (therefore not created in AWS yet), we can safely ignore this error
-      */
-        .catch(() => undefined)
+      )
     );
   },
 
diff --git a/lib/plugins/aws/package/compile/events/cloudWatchLog.js b/lib/plugins/aws/package/compile/events/cloudWatchLog.js
index f792178e988..c0a185347be 100644
--- a/lib/plugins/aws/package/compile/events/cloudWatchLog.js
+++ b/lib/plugins/aws/package/compile/events/cloudWatchLog.js
@@ -29,7 +29,8 @@ class AwsCompileCloudWatchLogEvents {
   }
 
   compileCloudWatchLogEvents() {
-    const logGroupNames = [];
+    const cloudWatchLogEventNumberMap = {};
+    const CLOUDWATCHLOG_LOG_GROUP_EVENT_PER_FUNCTION_LIMIT = 2;
 
     this.serverless.service.getAllFunctions().forEach((functionName) => {
       const functionObj = this.serverless.service.getFunction(functionName);
@@ -54,14 +55,22 @@ class AwsCompileCloudWatchLogEvents {
               FilterPattern = '';
             }
 
-            if (logGroupNames.includes(LogGroupName)) {
+            cloudWatchLogEventNumberMap[LogGroupName] =
+              cloudWatchLogEventNumberMap[LogGroupName] || 0;
+            cloudWatchLogEventNumberMap[LogGroupName]++;
+            if (
+              cloudWatchLogEventNumberMap[LogGroupName] >
+              CLOUDWATCHLOG_LOG_GROUP_EVENT_PER_FUNCTION_LIMIT
+            ) {
               const errorMessage = [
-                `"${LogGroupName}" logGroup for cloudwatchLog event is duplicated.`,
-                ' This property can only be set once per CloudFormation stack.',
+                `Only ${CLOUDWATCHLOG_LOG_GROUP_EVENT_PER_FUNCTION_LIMIT} subscription filters can be configured per log group.`,
+                ` You're attempting to configure more subscription filters than allowed for "${LogGroupName}".`,
               ].join('');
-              throw new ServerlessError(errorMessage, 'CLOUDWATCHLOG_DUPLICATED_LOG_GROUP_EVENT');
+              throw new ServerlessError(
+                errorMessage,
+                'CLOUDWATCHLOG_LOG_GROUP_EVENT_PER_FUNCTION_LIMIT_EXCEEDED'
+              );
             }
-            logGroupNames.push(LogGroupName);
             logGroupNamesThisFunction.push(LogGroupName);
 
             const lambdaLogicalId = this.provider.naming.getLambdaLogicalId(functionName);
diff --git a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
index c4a8cc1d1ea..c90aefc2f13 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
@@ -1192,6 +1192,14 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
                     )}-xxxxx`,
                     destinationArn: `arn:aws:lambda:us-east-1:999999999999:function:${functionName}`,
                   },
+                  {
+                    filterName: `${naming.getStackName()}-${naming.getCloudWatchLogLogicalId(
+                      'Fn2',
+                      1
+                    )}-xxxxx`,
+                    destinationArn:
+                      'arn:aws:lambda:us-east-1:999999999999:function:test-checkForChanges-cdr3ogg-dev-fn1',
+                  },
                 ],
               };
             },
@@ -1201,7 +1209,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
       expect(deleteStub).to.not.have.been.called;
     });
 
-    it('should attempt to delete filter for old destination', async () => {
+    it('should not attempt to delete filter by 2 subscription filter per log group', async () => {
       const deleteStub = sandbox.stub();
       let serverless;
       await runServerless({
@@ -1246,7 +1254,70 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
           },
         },
       });
-      expect(deleteStub).to.have.been.calledOnce;
+      expect(deleteStub).to.not.have.been.called;
+    });
+
+    it('should attempt to delete filter over 2 subscription filter per log group', async () => {
+      const deleteStub = sandbox.stub();
+      let serverless;
+      const { awsNaming } = await runServerless({
+        fixture: 'checkForChanges',
+        command: 'deploy',
+        configExt: {
+          functions: { fn1: { events: [{ cloudwatchLog: 'someLogGroupName' }] } },
+        },
+        lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
+        env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
+        hooks: {
+          beforeInstanceInit: (serverlessInstance) => (serverless = serverlessInstance),
+        },
+        awsRequestStubMap: {
+          ...commonAwsSdkMock,
+          Lambda: {
+            getFunction: { Configuration: { LastModified: '2021-05-20T15:34:16.494+0000' } },
+          },
+          S3: {
+            listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
+            headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
+          },
+          CloudWatchLogs: {
+            deleteSubscriptionFilter: deleteStub,
+            describeSubscriptionFilters: async () => {
+              const naming = serverless.getProvider('aws').naming;
+              return {
+                subscriptionFilters: [
+                  {
+                    // destinationArn `arn:{partition}:lambda:{region}:{accountId}:function:{functionName}`
+                    // filterName {stack name}-{logical id}-{random alphanumeric characters}
+                    filterName: `${naming.getStackName()}-${naming.getCloudWatchLogLogicalId(
+                      'Fn2',
+                      1
+                    )}-xxxxx`,
+                    destinationArn:
+                      'arn:aws:lambda:us-east-1:999999999999:function:test-checkForChanges-cdr3ogg-dev-fn1',
+                  },
+                  {
+                    filterName: `${naming.getStackName()}-${naming.getCloudWatchLogLogicalId(
+                      'Fn2',
+                      2
+                    )}-xxxxx`,
+                    destinationArn: `arn:aws:lambda:us-east-1:999999999999:function:${
+                      serverless.service.getFunction('fn1').name
+                    }`,
+                  },
+                ],
+              };
+            },
+          },
+        },
+      });
+      expect(deleteStub).to.have.been.calledOnceWith({
+        logGroupName: 'someLogGroupName',
+        filterName: `${awsNaming.getStackName()}-${awsNaming.getCloudWatchLogLogicalId(
+          'Fn2',
+          2
+        )}-xxxxx`,
+      });
     });
 
     it('should attempt to delete filter if order of cloudwatch events changed', async () => {
@@ -1330,6 +1401,85 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
       });
     });
 
+    it('should attempt to delete multiple filters', async () => {
+      const deleteStub = sandbox.stub();
+      let serverless;
+      const { awsNaming } = await runServerless({
+        fixture: 'checkForChanges',
+        command: 'deploy',
+        configExt: {
+          functions: {
+            fn1: {
+              events: [
+                { cloudwatchLog: 'someLogGroupName' },
+                { cloudwatchLog: 'someLogGroupName' },
+              ],
+            },
+          },
+        },
+        lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
+        env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
+        hooks: {
+          beforeInstanceInit: (serverlessInstance) => (serverless = serverlessInstance),
+        },
+        awsRequestStubMap: {
+          ...commonAwsSdkMock,
+          Lambda: {
+            getFunction: { Configuration: { LastModified: '2021-05-20T15:34:16.494+0000' } },
+          },
+          S3: {
+            listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
+            headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
+          },
+          CloudWatchLogs: {
+            deleteSubscriptionFilter: deleteStub,
+            describeSubscriptionFilters: sandbox
+              .stub()
+              .onFirstCall()
+              .callsFake(async () => {
+                const naming = serverless.getProvider('aws').naming;
+                return {
+                  subscriptionFilters: [
+                    {
+                      filterName: `${naming.getStackName()}-${naming.getCloudWatchLogLogicalId(
+                        'Fn1',
+                        1
+                      )}-xxxxx`,
+                      destinationArn:
+                        'arn:aws:lambda:us-east-1:999999999999:function:test-checkForChanges-cdr3ogg-dev-fn1',
+                    },
+                    {
+                      filterName: `${naming.getStackName()}-${naming.getCloudWatchLogLogicalId(
+                        'Fn1',
+                        2
+                      )}-xxxxx`,
+                      destinationArn:
+                        'arn:aws:lambda:us-east-1:999999999999:function:test-checkForChanges-cdr3ogg-dev-fn1',
+                    },
+                  ],
+                };
+              }),
+          },
+        },
+      });
+
+      expect(deleteStub).to.have.been.calledTwice;
+      expect(deleteStub).to.have.been.calledWith({
+        logGroupName: 'someLogGroupName',
+        filterName: `${awsNaming.getStackName()}-${awsNaming.getCloudWatchLogLogicalId(
+          'Fn1',
+          1
+        )}-xxxxx`,
+      });
+      expect(deleteStub).to.have.been.calledWith({
+        logGroupName: 'someLogGroupName',
+        filterName: `${awsNaming.getStackName()}-${awsNaming.getCloudWatchLogLogicalId(
+          'Fn1',
+          2
+        )}-xxxxx`,
+      });
+    });
+
     it('should recognize custom partition', async () => {
       const deleteStub = sandbox.stub();
       let serverless;
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudWatchLog.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloudWatchLog.test.js
index 3e4c4d956d5..aa5ef1d307d 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudWatchLog.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloudWatchLog.test.js
@@ -72,6 +72,63 @@ describe('AwsCompileCloudWatchLogEvents', () => {
       ).to.equal('AWS::Lambda::Permission');
     });
 
+    it('should respect 2 cloudwatchLog events for log group', () => {
+      awsCompileCloudWatchLogEvents.serverless.service.functions = {
+        first: {
+          events: [
+            {
+              cloudwatchLog: {
+                logGroup: '/aws/lambda/hello1',
+              },
+            },
+          ],
+        },
+        second: {
+          events: [
+            {
+              cloudwatchLog: {
+                logGroup: '/aws/lambda/hello1',
+              },
+            },
+          ],
+        },
+      };
+
+      awsCompileCloudWatchLogEvents.compileCloudWatchLogEvents();
+      expect(
+        awsCompileCloudWatchLogEvents.serverless.service.provider.compiledCloudFormationTemplate
+          .Resources.FirstLogsSubscriptionFilterCloudWatchLog1.Type
+      ).to.equal('AWS::Logs::SubscriptionFilter');
+      expect(
+        awsCompileCloudWatchLogEvents.serverless.service.provider.compiledCloudFormationTemplate
+          .Resources.FirstLogsSubscriptionFilterCloudWatchLog1.Properties.LogGroupName
+      ).to.equal('/aws/lambda/hello1');
+      expect(
+        awsCompileCloudWatchLogEvents.serverless.service.provider.compiledCloudFormationTemplate
+          .Resources.FirstLogsSubscriptionFilterCloudWatchLog1.Properties.FilterPattern
+      ).to.equal('');
+      expect(
+        awsCompileCloudWatchLogEvents.serverless.service.provider.compiledCloudFormationTemplate
+          .Resources.FirstLambdaPermissionLogsSubscriptionFilterCloudWatchLog.Type
+      ).to.equal('AWS::Lambda::Permission');
+      expect(
+        awsCompileCloudWatchLogEvents.serverless.service.provider.compiledCloudFormationTemplate
+          .Resources.SecondLogsSubscriptionFilterCloudWatchLog1.Type
+      ).to.equal('AWS::Logs::SubscriptionFilter');
+      expect(
+        awsCompileCloudWatchLogEvents.serverless.service.provider.compiledCloudFormationTemplate
+          .Resources.SecondLogsSubscriptionFilterCloudWatchLog1.Properties.LogGroupName
+      ).to.equal('/aws/lambda/hello1');
+      expect(
+        awsCompileCloudWatchLogEvents.serverless.service.provider.compiledCloudFormationTemplate
+          .Resources.SecondLogsSubscriptionFilterCloudWatchLog1.Properties.FilterPattern
+      ).to.equal('');
+      expect(
+        awsCompileCloudWatchLogEvents.serverless.service.provider.compiledCloudFormationTemplate
+          .Resources.SecondLambdaPermissionLogsSubscriptionFilterCloudWatchLog.Type
+      ).to.equal('AWS::Lambda::Permission');
+    });
+
     it('should respect "filter" variable', () => {
       awsCompileCloudWatchLogEvents.serverless.service.functions = {
         first: {
@@ -250,7 +307,7 @@ describe('AwsCompileCloudWatchLogEvents', () => {
       ).to.equal('/aws/lambda/yada-dev-dummy*');
     });
 
-    it('should throw an error if "logGroup" is duplicated in one CloudFormation stack', () => {
+    it('should throw an error if "logGroup" is configured more than twice in one CloudFormation stack', () => {
       awsCompileCloudWatchLogEvents.serverless.service.functions = {
         first: {
           events: [
@@ -263,6 +320,9 @@ describe('AwsCompileCloudWatchLogEvents', () => {
             {
               cloudwatchLog: '/aws/lambda/hello1',
             },
+            {
+              cloudwatchLog: '/aws/lambda/hello1',
+            },
           ],
         },
       };
@@ -273,19 +333,20 @@ describe('AwsCompileCloudWatchLogEvents', () => {
         first: {
           events: [
             {
-              cloudwatchLog: {
-                logGroup: '/aws/lambda/hello1',
-              },
+              cloudwatchLog: '/aws/lambda/hello1',
             },
             {
-              cloudwatchLog: {
-                logGroup: '/aws/lambda/hello2',
-              },
+              cloudwatchLog: '/aws/lambda/hello2',
             },
             {
-              cloudwatchLog: {
-                logGroup: '/aws/lambda/hello1',
-              },
+              cloudwatchLog: '/aws/lambda/hello1',
+            },
+          ],
+        },
+        second: {
+          events: [
+            {
+              cloudwatchLog: '/aws/lambda/hello1',
             },
           ],
         },

From 90877d575ec9436db30a3a16fc90e5190ea30018 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 12 Aug 2021 11:15:50 +0200
Subject: [PATCH 0385/1101] fix(AWS Deploy): Ensure right code for `deploy -f`
 deprecation

---
 lib/plugins/deploy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/deploy.js b/lib/plugins/deploy.js
index a808e5b7a79..297ad8057b7 100644
--- a/lib/plugins/deploy.js
+++ b/lib/plugins/deploy.js
@@ -34,7 +34,7 @@ class Deploy {
           this.serverless.processedInput.commands.length === 1 &&
           this.serverless.processedInput.commands[0] === 'deploy';
         if (isDeployCommand && this.options.function) {
-          this.serverless.logDeprecation(
+          this.serverless._logDeprecation(
             'CLI_DEPLOY_FUNCTION_OPTION',
             'Starting with v3.0.0, `--function` or `-f` option for `deploy` command will be removed. In order to deploy a single function, please use `deploy function` command instead.'
           );

From 5564537abf2c0673b2c0dda946a52636397d21ce Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 12 Aug 2021 12:42:00 +0200
Subject: [PATCH 0386/1101] chore: Bump dependencies

---
 package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 64b75cbfb79..91f6ff7e8da 100644
--- a/package.json
+++ b/package.json
@@ -23,14 +23,14 @@
   },
   "dependencies": {
     "@serverless/cli": "^1.5.2",
-    "@serverless/components": "^3.14.2",
+    "@serverless/components": "^3.15.0",
     "@serverless/dashboard-plugin": "^5.4.3",
     "@serverless/platform-client": "^4.2.6",
     "@serverless/utils": "^5.6.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.962.0",
+    "aws-sdk": "^2.966.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
@@ -70,7 +70,7 @@
     "semver": "^7.3.5",
     "signal-exit": "^3.0.3",
     "tabtab": "^3.0.2",
-    "tar": "^6.1.6",
+    "tar": "^6.1.8",
     "timers-ext": "^0.1.7",
     "type": "^2.5.0",
     "untildify": "^4.0.0",
@@ -84,9 +84,9 @@
     "adm-zip": "^0.5.5",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "cos-nodejs-sdk-v5": "^2.9.21",
+    "cos-nodejs-sdk-v5": "^2.10.0",
     "eslint": "^7.32.0",
-    "eslint-plugin-import": "^2.23.4",
+    "eslint-plugin-import": "^2.24.0",
     "git-list-updated": "^1.2.1",
     "github-release-from-cc-changelog": "^2.2.0",
     "husky": "^4.3.8",

From 21aeda4482b4128c0e8df9bf7b35315964c99751 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 12 Aug 2021 12:48:53 +0200
Subject: [PATCH 0387/1101] chore: Release 2.54.0

---
 CHANGELOG.md | 15 +++++++++++++++
 package.json |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1081a5842da..5004d556599 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
 
 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.
 
+## [2.54.0](https://github.com/serverless/serverless/compare/v2.53.1...v2.54.0) (2021-08-12)
+
+### Features
+
+- **AWS IAM:** Resign from deprecating old format of IAM settings ([#9778](https://github.com/serverless/serverless/pull/9778)) ([847dd8f](https://github.com/serverless/serverless/commit/847dd8f47503ddf03971122e5700110aa3ff77d1)) ([Mariusz Nowak](https://github.com/medikoo))
+- **AWS Lambda:** Add support for multiple subscription filters ([#9760](https://github.com/serverless/serverless/issues/9760)) ([5c9ca56](https://github.com/serverless/serverless/commit/5c9ca56d14a90dfd9aa5c064bd15137504336ed7)) ([Han Sang Hoon (한상훈)](https://github.com/poerty))
+- **AWS API Gateway:** Deprecate default for `identitySource` for `request` authorizers with disabled caching ([#9825](https://github.com/serverless/serverless/pull/9825)) ([0e01d9e](https://github.com/serverless/serverless/commit/0e01d9e337860b9d1136586fbfaf0c43ac21cde0)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI:** Deprecate `-v` as alias for `--verbose` ([#9811](https://github.com/serverless/serverless/commit/53b41eb53aeefe22dc29b785a428f3b184906d2c)) ([53b41eb](https://github.com/serverless/serverless/commit/53b41eb53aeefe22dc29b785a428f3b184906d2c)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **AWS Deploy:** Ensure right code for `deploy -f` deprecation ([#9833](https://github.com/serverless/serverless/pull/9833)) ([90877d5](https://github.com/serverless/serverless/commit/90877d575ec9436db30a3a16fc90e5190ea30018)) ([Mariusz Nowak](https://github.com/medikoo))
+- **AWS Layers:** Support references to external layers ([#9826](https://github.com/serverless/serverless/pull/9826)) ([dc74f41](https://github.com/serverless/serverless/commit/dc74f41470447c1fab0a646c15284a4eb212ecb6)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **Variables:** Unconditionally deprecate old vars engine extensions ([#9827](https://github.com/serverless/serverless/pull/9827)) ([b7f4e08](https://github.com/serverless/serverless/commit/b7f4e08661cd149a29ae7107241a16928dc606eb)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ### [2.53.1](https://github.com/serverless/serverless/compare/v2.53.0...v2.53.1) (2021-08-06)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 91f6ff7e8da..c4d5eb3ede7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.53.1",
+  "version": "2.54.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 4925fe971b8267237d5ca8be67ee69cfff07659c Mon Sep 17 00:00:00 2001
From: Maciej Radzikowski <maciej@radzikowski.com.pl>
Date: Fri, 13 Aug 2021 12:03:47 +0200
Subject: [PATCH 0388/1101] docs: Add `generate-event` CLI command description
 (#9838)

---
 .../aws/cli-reference/generate-event.md       | 56 +++++++++++++++++++
 docs/providers/aws/cli-reference/print.md     |  2 +-
 docs/providers/aws/cli-reference/slstats.md   |  2 +-
 3 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 docs/providers/aws/cli-reference/generate-event.md

diff --git a/docs/providers/aws/cli-reference/generate-event.md b/docs/providers/aws/cli-reference/generate-event.md
new file mode 100644
index 00000000000..b94be8e3e47
--- /dev/null
+++ b/docs/providers/aws/cli-reference/generate-event.md
@@ -0,0 +1,56 @@
+<!--
+title: Serverless Framework Commands - AWS Lambda - Generate Event
+menuText: generate event
+menuOrder: 21
+description: Generate sample Lambda function event payload
+layout: Doc
+-->
+
+# AWS - Generate Event
+
+Creates sample Lambda function payloads for different types of events.
+
+```bash
+serverless generate-event --type eventType
+```
+
+## Options
+
+- `--type` or `-t` The type of the event to generate payload for. **Required**.
+- `--body` or `-b` The body for the message, request, or stream event.
+
+## Available event types
+
+- aws:alexaSkill
+- aws:alexaSmartHome
+- aws:apiGateway
+- aws:cloudWatch
+- aws:cloudWatchLog
+- aws:cognitoUserPool
+- aws:dynamo
+- aws:iot
+- aws:kinesis
+- aws:s3
+- aws:sns
+- aws:sqs
+- aws:websocket
+
+## Examples
+
+### Generate SQS event payload
+
+```bash
+serverless generate-event -t aws:sqs
+```
+
+### Generate Kinesis event payload with body
+
+```bash
+serverless generate-event -t aws:kinesis -b '{"foo": "bar"}'
+```
+
+### Generate SQS event and save it to a file
+
+```bash
+serverless generate-event -t aws:sqs > event.json
+```
diff --git a/docs/providers/aws/cli-reference/print.md b/docs/providers/aws/cli-reference/print.md
index 135db376ff7..c679cdcd412 100644
--- a/docs/providers/aws/cli-reference/print.md
+++ b/docs/providers/aws/cli-reference/print.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework Commands - AWS Lambda - Print
 menuText: print
-menuOrder: 21
+menuOrder: 22
 description: Print your config with all variables resolved for debugging
 layout: Doc
 -->
diff --git a/docs/providers/aws/cli-reference/slstats.md b/docs/providers/aws/cli-reference/slstats.md
index f30177402a4..597fd824a98 100644
--- a/docs/providers/aws/cli-reference/slstats.md
+++ b/docs/providers/aws/cli-reference/slstats.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework Commands - AWS Lambda - Serverless Stats
 menuText: serverless stats
-menuOrder: 22
+menuOrder: 23
 description: Enables or disables Serverless Statistic logging within the Serverless Framework.
 layout: Doc
 -->

From b751c505c8050e229edb77d44016925c4e52a05e Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 12 Aug 2021 15:22:56 +0200
Subject: [PATCH 0389/1101] refactor(CLI Onboarding): Adjust summary messages
 in deploy step

---
 lib/cli/interactive-setup/deploy.js           |  25 +-
 lib/cli/interactive-setup/index.js            |   4 +-
 .../lib/cli/interactive-setup/deploy.test.js  | 219 ++++++++++++++++--
 3 files changed, 220 insertions(+), 28 deletions(-)

diff --git a/lib/cli/interactive-setup/deploy.js b/lib/cli/interactive-setup/deploy.js
index 281bc2dc396..b73392af619 100644
--- a/lib/cli/interactive-setup/deploy.js
+++ b/lib/cli/interactive-setup/deploy.js
@@ -15,14 +15,17 @@ const printMessage = ({
   hasBeenDeployed,
   dashboardPlugin,
   isConfiguredWithDashboard,
+  initialContext,
 }) => {
+  const projectInformationSuffix = initialContext.isInServiceContext
+    ? ''
+    : `${chalk.green(' and available in ')}${chalk.white.bold(`./${serviceName}`)}`;
+
   if (isConfiguredWithDashboard) {
     if (hasBeenDeployed) {
       process.stdout.write(
         [
-          `\n${chalk.green('Your project is live and available in ')}${chalk.white.bold(
-            `./${serviceName}`
-          )}`,
+          `\n${chalk.green('Your project is live')}${projectInformationSuffix}`,
           `\n  Run ${chalk.bold('serverless info')} in the project directory`,
           '    View your endpoints and services',
           `\n  Open ${chalk.bold(getDashboardInteractUrl(dashboardPlugin))}`,
@@ -37,9 +40,7 @@ const printMessage = ({
 
     process.stdout.write(
       [
-        `\n${chalk.green(
-          'Your project is ready for deployment and available in '
-        )}${chalk.white.bold(`./${serviceName}`)}`,
+        `\n${chalk.green('Your project is ready for deployment')}${projectInformationSuffix}`,
         `\n  Run ${chalk.bold('serverless deploy')} in the project directory`,
         '    Deploy your newly created service',
         `\n  Run ${chalk.bold('serverless info')} in the project directory after deployment`,
@@ -54,9 +55,7 @@ const printMessage = ({
   if (hasBeenDeployed) {
     process.stdout.write(
       [
-        `\n${chalk.green('Your project is live and available in ')}${chalk.white.bold(
-          `./${serviceName}`
-        )}`,
+        `\n${chalk.green('Your project is live')}${projectInformationSuffix}`,
         `\n  Run ${chalk.bold('serverless info')} in the project directory`,
         '    View your endpoints and services',
         `\n  Run ${chalk.bold('serverless deploy')} in the directory`,
@@ -74,9 +73,7 @@ const printMessage = ({
 
   process.stdout.write(
     [
-      `\n${chalk.green('Your project is ready for deployment and available in ')}${chalk.white.bold(
-        `./${serviceName}`
-      )}`,
+      `\n${chalk.green('Your project is ready for deployment')}${projectInformationSuffix}`,
       `\n  Run ${chalk.bold('serverless deploy')} in the project directory`,
       '    Deploy your newly created service',
       `\n  Run ${chalk.bold('serverless info')} in the project directory after deployment`,
@@ -131,7 +128,7 @@ module.exports = {
     context.inapplicabilityReasonCode = 'NO_CREDENTIALS_CONFIGURED';
     return false;
   },
-  async run({ configuration, configurationFilename, serviceDir, stepHistory }) {
+  async run({ initial, configuration, configurationFilename, serviceDir, stepHistory }) {
     const serviceName = configuration.service;
     const shouldDeploy = await promptWithHistory({
       name: 'shouldDeploy',
@@ -141,6 +138,7 @@ module.exports = {
     });
     if (!shouldDeploy) {
       printMessage({
+        initialContext: initial,
         serviceName,
         hasBeenDeployed: false,
         isConfiguredWithDashboard: Boolean(configuration.org),
@@ -184,6 +182,7 @@ module.exports = {
     }
 
     printMessage({
+      initialContext: initial,
       serviceName,
       hasBeenDeployed: true,
       isConfiguredWithDashboard: Boolean(configuration.org),
diff --git a/lib/cli/interactive-setup/index.js b/lib/cli/interactive-setup/index.js
index f28c52283aa..bd360394dc9 100644
--- a/lib/cli/interactive-setup/index.js
+++ b/lib/cli/interactive-setup/index.js
@@ -34,7 +34,9 @@ module.exports = async (context) => {
     });
   };
 
-  commandUsage.initialContext = resolveInitialContext(context);
+  const initialContext = resolveInitialContext(context);
+  commandUsage.initialContext = initialContext;
+  context.initial = initialContext;
 
   for (const [stepName, step] of Object.entries(steps)) {
     delete context.stepHistory;
diff --git a/test/unit/lib/cli/interactive-setup/deploy.test.js b/test/unit/lib/cli/interactive-setup/deploy.test.js
index cccce56261c..271ea53d1ed 100644
--- a/test/unit/lib/cli/interactive-setup/deploy.test.js
+++ b/test/unit/lib/cli/interactive-setup/deploy.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
+const stripAnsi = require('strip-ansi');
 const chai = require('chai');
-const chalk = require('chalk');
 const sinon = require('sinon');
 const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
 const overrideEnv = require('process-utils/override-env');
@@ -72,7 +72,7 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
   });
 
   describe('run', () => {
-    it('should correctly handle skipping deployment for service configured with dashboard', async () => {
+    it('should correctly handle skipping deployment for new service not configured with dashboard', async () => {
       configureInquirerStub(inquirer, {
         confirm: { shouldDeploy: false },
       });
@@ -85,6 +85,39 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
         },
         configurationFilename: 'serverless.yml',
         stepHistory: new StepHistory(),
+        initial: {
+          isInServiceContext: false,
+        },
+      };
+      let stdoutData = '';
+      await overrideStdoutWrite(
+        (data) => (stdoutData += data),
+        async () => await step.run(context)
+      );
+
+      expect(stripAnsi(stdoutData)).to.include(
+        'Your project is ready for deployment and available in'
+      );
+      expect(stripAnsi(stdoutData)).to.include('Run serverless in the project directory');
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', false]]));
+    });
+
+    it('should correctly handle skipping deployment for existing service not configured with dashboard', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldDeploy: false },
+      });
+
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+        },
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+        initial: {
+          isInServiceContext: true,
+        },
       };
       let stdoutData = '';
       await overrideStdoutWrite(
@@ -92,12 +125,12 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
         async () => await step.run(context)
       );
 
-      expect(stdoutData).to.include('Your project is ready for deployment');
-      expect(stdoutData).to.include(`Run ${chalk.bold('serverless')} in the project directory`);
+      expect(stripAnsi(stdoutData)).to.include('Your project is ready for deployment\n');
+      expect(stripAnsi(stdoutData)).to.include('Run serverless in the project directory');
       expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', false]]));
     });
 
-    it('should correctly handle skipping deployment for service not configured with dashboard', async () => {
+    it('should correctly handle skipping deployment for new service configured with dashboard', async () => {
       configureInquirerStub(inquirer, {
         confirm: { shouldDeploy: false },
       });
@@ -112,6 +145,9 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
         },
         configurationFilename: 'serverless.yml',
         stepHistory: new StepHistory(),
+        initial: {
+          isInServiceContext: false,
+        },
       };
       let stdoutData = '';
       await overrideStdoutWrite(
@@ -119,12 +155,109 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
         async () => await step.run(context)
       );
 
-      expect(stdoutData).to.include('Your project is ready for deployment');
-      expect(stdoutData).to.include('Invoke your functions and view logs in the dashboard');
+      expect(stripAnsi(stdoutData)).to.include(
+        'Your project is ready for deployment and available in'
+      );
+      expect(stripAnsi(stdoutData)).to.include(
+        'Invoke your functions and view logs in the dashboard'
+      );
       expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', false]]));
     });
 
-    it('should correctly handle deployment for service configured with dashboard', async () => {
+    it('should correctly handle skipping deployment for existing service configured with dashboard', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldDeploy: false },
+      });
+
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+        },
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+        initial: {
+          isInServiceContext: true,
+        },
+      };
+      let stdoutData = '';
+      await overrideStdoutWrite(
+        (data) => (stdoutData += data),
+        async () => await step.run(context)
+      );
+
+      expect(stripAnsi(stdoutData)).to.include('Your project is ready for deployment\n');
+      expect(stripAnsi(stdoutData)).to.include(
+        'Invoke your functions and view logs in the dashboard'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', false]]));
+    });
+
+    it('should correctly handle deployment for new service configured with dashboard', async () => {
+      const mockedInit = sinon.stub().resolves();
+      const mockedRun = sinon.stub().resolves();
+      class MockedServerless {
+        constructor() {
+          this.init = mockedInit;
+          this.run = mockedRun;
+          this.pluginManager = {
+            addPlugin: () => ({}),
+            plugins: [
+              {
+                constructor: {
+                  name: 'InteractiveDeployProgress',
+                },
+                progress: {},
+              },
+            ],
+            dashboardPlugin: {},
+          };
+        }
+      }
+
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/deploy', {
+        '../../Serverless': MockedServerless,
+        '@serverless/dashboard-plugin/lib/dashboard': {
+          getDashboardInteractUrl: () => 'https://app.serverless-dev.com/path/to/dashboard',
+        },
+      });
+
+      configureInquirerStub(inquirer, {
+        confirm: { shouldDeploy: true },
+      });
+
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+        },
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+        initial: {
+          isInServiceContext: false,
+        },
+      };
+      let stdoutData = '';
+      await overrideStdoutWrite(
+        (data) => (stdoutData += data),
+        async () => await mockedStep.run(context)
+      );
+
+      expect(stripAnsi(stdoutData)).to.include('Your project is live and available');
+      expect(stripAnsi(stdoutData)).to.include(
+        'Open https://app.serverless-dev.com/path/to/dashboard'
+      );
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', true]]));
+    });
+
+    it('should correctly handle deployment for existing service configured with dashboard', async () => {
       const mockedInit = sinon.stub().resolves();
       const mockedRun = sinon.stub().resolves();
       class MockedServerless {
@@ -167,6 +300,9 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
         },
         configurationFilename: 'serverless.yml',
         stepHistory: new StepHistory(),
+        initial: {
+          isInServiceContext: true,
+        },
       };
       let stdoutData = '';
       await overrideStdoutWrite(
@@ -174,15 +310,15 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
         async () => await mockedStep.run(context)
       );
 
-      expect(stdoutData).to.include('Your project is live and available');
-      expect(stdoutData).to.include(
-        `Open ${chalk.bold('https://app.serverless-dev.com/path/to/dashboard')}`
+      expect(stripAnsi(stdoutData)).to.include('Your project is live\n');
+      expect(stripAnsi(stdoutData)).to.include(
+        'Open https://app.serverless-dev.com/path/to/dashboard'
       );
 
       expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', true]]));
     });
 
-    it('should correctly handle deployment for service not configured with dashboard', async () => {
+    it('should correctly handle deployment for new service not configured with dashboard', async () => {
       const mockedInit = sinon.stub().resolves();
       const mockedRun = sinon.stub().resolves();
       class MockedServerless {
@@ -219,6 +355,61 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
         },
         configurationFilename: 'serverless.yml',
         stepHistory: new StepHistory(),
+        initial: {
+          isInServiceContext: false,
+        },
+      };
+      let stdoutData = '';
+      await overrideStdoutWrite(
+        (data) => (stdoutData += data),
+        async () => await mockedStep.run(context)
+      );
+
+      expect(stripAnsi(stdoutData)).to.include('Your project is live and available');
+      expect(stripAnsi(stdoutData)).to.include('Run serverless');
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', true]]));
+    });
+
+    it('should correctly handle deployment for existing service not configured with dashboard', async () => {
+      const mockedInit = sinon.stub().resolves();
+      const mockedRun = sinon.stub().resolves();
+      class MockedServerless {
+        constructor() {
+          this.init = mockedInit;
+          this.run = mockedRun;
+          this.pluginManager = {
+            addPlugin: () => ({}),
+            plugins: [
+              {
+                constructor: {
+                  name: 'InteractiveDeployProgress',
+                },
+                progress: {},
+              },
+            ],
+          };
+        }
+      }
+
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/deploy', {
+        '../../Serverless': MockedServerless,
+      });
+
+      configureInquirerStub(inquirer, {
+        confirm: { shouldDeploy: true },
+      });
+
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+        },
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+        initial: {
+          isInServiceContext: true,
+        },
       };
       let stdoutData = '';
       await overrideStdoutWrite(
@@ -226,8 +417,8 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
         async () => await mockedStep.run(context)
       );
 
-      expect(stdoutData).to.include('Your project is live and available');
-      expect(stdoutData).to.include(`Run ${chalk.bold('serverless')}`);
+      expect(stripAnsi(stdoutData)).to.include('Your project is live\n');
+      expect(stripAnsi(stdoutData)).to.include('Run serverless');
       expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', true]]));
     });
   });

From 7ae52aa2d9819186f4b1a9cfa564f755e4f07232 Mon Sep 17 00:00:00 2001
From: Gareth McCumskey <gareth@mccumskey.com>
Date: Mon, 16 Aug 2021 09:45:22 +0200
Subject: [PATCH 0390/1101] docs(Dashboard): Update free tier invocations value
 (#9849)

---
 docs/guides/dashboard.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guides/dashboard.md b/docs/guides/dashboard.md
index 2a208201cba..13a824ac3e2 100644
--- a/docs/guides/dashboard.md
+++ b/docs/guides/dashboard.md
@@ -15,7 +15,7 @@ layout: Doc
 
 The [Serverless Framework Dashboard](https://app.serverless.com/) is a SaaS solution that augments the Serverless Framework open source CLI to provide a powerful, unified experience to develop, deploy, test, secure and monitor your serverless applications.
 
-The Serverless Framework free tier gives developers full access to all features included in the Serverless Framework Dashboard, but is limited to 1,000,000 function invocations per month. If you are interested in expanding your usage of the Serverless Framework beyond the free tier [contact us](https://serverless.com/enterprise/contact/) for details re available plans and pricing.
+The Serverless Framework free tier gives developers full access to all features included in the Serverless Framework Dashboard, but is limited to 100,000 function invocations per month. If you are interested in expanding your usage of the Serverless Framework beyond the free tier [contact us](https://serverless.com/enterprise/contact/) for details re available plans and pricing.
 
 ## Minimum Version Requirements
 

From bb0484e6b54a3cc6aed46ff23100e08c90c995ce Mon Sep 17 00:00:00 2001
From: Sudipto Das <s.das001@yahoo.com>
Date: Mon, 16 Aug 2021 19:09:01 +0530
Subject: [PATCH 0391/1101] refactor: Replace `fse.stat` with
 `fs.promises.stat` (#9845)

---
 lib/cli/resolve-configuration-path.js               | 4 ++--
 lib/plugins/aws/invokeLocal/index.js                | 5 +++--
 lib/plugins/aws/provider.js                         | 4 ++--
 lib/utils/create-from-local-template.js             | 3 ++-
 lib/utils/ensureExists.js                           | 4 ++--
 lib/utils/fs/dirExists.js                           | 4 ++--
 lib/utils/fs/fileExists.js                          | 4 ++--
 lib/utils/npm-command-deferred.js                   | 4 ++--
 lib/utils/npmPackage/isWritable.js                  | 6 +++---
 scripts/pkg/upload/world.js                         | 2 +-
 test/unit/lib/plugins/aws/configCredentials.test.js | 3 ++-
 11 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/lib/cli/resolve-configuration-path.js b/lib/cli/resolve-configuration-path.js
index 7d4767d6fe4..8c535450715 100644
--- a/lib/cli/resolve-configuration-path.js
+++ b/lib/cli/resolve-configuration-path.js
@@ -3,7 +3,7 @@
 const ensurePlainObject = require('type/plain-object/ensure');
 const ensureString = require('type/string/ensure');
 const path = require('path');
-const fs = require('fs').promises;
+const fsp = require('fs').promises;
 const ServerlessError = require('../serverless-error');
 const fileExists = require('../utils/fs/fileExists');
 const logDeprecation = require('../utils/logDeprecation');
@@ -29,7 +29,7 @@ module.exports = async (options = {}) => {
     }
     const stats = await (async () => {
       try {
-        return await fs.stat(customConfigPath);
+        return await fsp.stat(customConfigPath);
       } catch (error) {
         if (error.code === 'ENOENT') {
           throw new ServerlessError(
diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invokeLocal/index.js
index 2970e7e6660..dda1ea3d6b8 100644
--- a/lib/plugins/aws/invokeLocal/index.js
+++ b/lib/plugins/aws/invokeLocal/index.js
@@ -2,6 +2,7 @@
 
 const _ = require('lodash');
 const os = require('os');
+const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const path = require('path');
 const validate = require('../lib/validate');
@@ -644,7 +645,7 @@ class AwsInvokeLocal {
 
   async invokeLocalJava(runtime, className, handlerName, artifactPath, event, customContext) {
     try {
-      await fse.stat(artifactPath);
+      await fsp.stat(artifactPath);
     } catch {
       throw new ServerlessError(
         `Artifact ${artifactPath} doesn't exists, please compile it first.`,
@@ -669,7 +670,7 @@ class AwsInvokeLocal {
     const executablePath = path.join(javaBridgePath, 'target');
 
     try {
-      await fse.stat(executablePath);
+      await fsp.stat(executablePath);
     } catch (err) {
       return new Promise((resolve, reject) => {
         const mvn = spawn('mvn', ['package', '-f', path.join(javaBridgePath, 'pom.xml')], {
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index d560348f1b5..98e6a6a3b3e 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -4,7 +4,7 @@ const AWS = require('aws-sdk');
 const BbPromise = require('bluebird');
 const _ = require('lodash');
 const naming = require('./lib/naming.js');
-const fs = require('fs');
+const fsp = require('fs').promises;
 const getS3EndpointForRegion = require('./utils/getS3EndpointForRegion');
 const memoizeeMethods = require('memoizee/methods');
 const readline = require('readline');
@@ -1916,7 +1916,7 @@ Object.defineProperties(
         const pathToDockerfile = path.resolve(this.serverless.serviceDir, imagePath, imageFilename);
 
         try {
-          const stats = await fs.promises.stat(pathToDockerfile);
+          const stats = await fsp.stat(pathToDockerfile);
           isDockerfileAvailable = stats.isFile();
         } catch {
           // pass and handle after catch block
diff --git a/lib/utils/create-from-local-template.js b/lib/utils/create-from-local-template.js
index 473661f9cc4..d0b8e0a2374 100644
--- a/lib/utils/create-from-local-template.js
+++ b/lib/utils/create-from-local-template.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const untildify = require('untildify');
+const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const { renameService } = require('./renameService');
 
@@ -13,7 +14,7 @@ module.exports = async ({ templatePath, projectDir, projectName }) => {
     await fse.copy(sourcePath, projectDir, {
       dereference: true,
       filter: async (src) => {
-        const stats = await fse.lstat(src);
+        const stats = await fsp.lstat(src);
         return !stats.isSymbolicLink();
       },
     });
diff --git a/lib/utils/ensureExists.js b/lib/utils/ensureExists.js
index 6da1522b8a2..b724b8aa95e 100644
--- a/lib/utils/ensureExists.js
+++ b/lib/utils/ensureExists.js
@@ -1,13 +1,13 @@
 'use strict';
 
 const fse = require('fs-extra');
-const fs = require('fs');
+const fsp = require('fs').promises;
 const path = require('path');
 
 module.exports = async (filename, generate) => {
   const cacheDir = path.dirname(filename);
   try {
-    const stats = await fs.promises.lstat(filename);
+    const stats = await fsp.lstat(filename);
     if (stats.isFile()) {
       return;
     }
diff --git a/lib/utils/fs/dirExists.js b/lib/utils/fs/dirExists.js
index d354b0875bd..0df0ed777a7 100644
--- a/lib/utils/fs/dirExists.js
+++ b/lib/utils/fs/dirExists.js
@@ -1,9 +1,9 @@
 'use strict';
 
-const fse = require('fs-extra');
+const fsp = require('fs').promises;
 
 async function dirExists(path) {
-  return fse.lstat(path).then(
+  return fsp.lstat(path).then(
     (stats) => stats.isDirectory(),
     (error) => {
       if (error.code === 'ENOENT') {
diff --git a/lib/utils/fs/fileExists.js b/lib/utils/fs/fileExists.js
index 7c3b6c9d1a7..ed849f66e5a 100644
--- a/lib/utils/fs/fileExists.js
+++ b/lib/utils/fs/fileExists.js
@@ -1,9 +1,9 @@
 'use strict';
 
-const fse = require('fs-extra');
+const fsp = require('fs').promises;
 
 async function fileExists(filePath) {
-  return fse
+  return fsp
     .lstat(filePath)
     .then((stats) => stats.isFile())
     .catch(() => false);
diff --git a/lib/utils/npm-command-deferred.js b/lib/utils/npm-command-deferred.js
index baea3a106a7..ab882c2ee49 100644
--- a/lib/utils/npm-command-deferred.js
+++ b/lib/utils/npm-command-deferred.js
@@ -1,11 +1,11 @@
 'use strict';
 
 const path = require('path');
-const fse = require('fs-extra');
+const fsp = require('fs').promises;
 
 const localNpmBinPath = path.join(__dirname, '../../node_modules/npm/bin/npm-cli.js');
 
-module.exports = fse
+module.exports = fsp
   .stat(localNpmBinPath)
   .then(
     (stats) => stats.isFile(),
diff --git a/lib/utils/npmPackage/isWritable.js b/lib/utils/npmPackage/isWritable.js
index 75a273dcdff..b8333b3456b 100644
--- a/lib/utils/npmPackage/isWritable.js
+++ b/lib/utils/npmPackage/isWritable.js
@@ -2,15 +2,15 @@
 
 const { format } = require('util');
 const path = require('path');
-const fs = require('fs').promises;
+const fsp = require('fs').promises;
 const log = require('@serverless/utils/log');
 
 const npmPackageRoot = path.resolve(__dirname, '../../../');
 
 module.exports = async () => {
-  const stats = await fs.stat(npmPackageRoot);
+  const stats = await fsp.stat(npmPackageRoot);
   try {
-    await fs.utimes(npmPackageRoot, String(stats.atimeMs / 1000), String(stats.mtimeMs / 1000));
+    await fsp.utimes(npmPackageRoot, String(stats.atimeMs / 1000), String(stats.mtimeMs / 1000));
     return true;
   } catch (error) {
     if (process.env.SLS_DEBUG) log(format('Auto update: file access error: %O', error));
diff --git a/scripts/pkg/upload/world.js b/scripts/pkg/upload/world.js
index 7b1a302fcfa..9520500f076 100755
--- a/scripts/pkg/upload/world.js
+++ b/scripts/pkg/upload/world.js
@@ -64,7 +64,7 @@ module.exports = async (versionTag, { isLegacyVersion }) => {
             body: fs.createReadStream(filePath),
             headers: {
               ...requestOptions.headers,
-              'content-length': (await fs.promises.stat(filePath)).size,
+              'content-length': (await fsp.stat(filePath)).size,
               'content-type': 'application/octet-stream',
             },
           }
diff --git a/test/unit/lib/plugins/aws/configCredentials.test.js b/test/unit/lib/plugins/aws/configCredentials.test.js
index 00874dffd43..330dd4d04b9 100644
--- a/test/unit/lib/plugins/aws/configCredentials.test.js
+++ b/test/unit/lib/plugins/aws/configCredentials.test.js
@@ -4,6 +4,7 @@ const expect = require('chai').expect;
 const sandbox = require('sinon');
 const { constants } = require('fs');
 const fs = require('fs');
+const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const os = require('os');
 const path = require('path');
@@ -25,7 +26,7 @@ describe('AwsConfigCredentials', () => {
   before(() => {
     // Abort if credentials are found in home directory
     // (it should not be the case, as home directory is mocked to point temp dir)
-    return fse.lstat(awsDirectoryPath).then(
+    return fsp.lstat(awsDirectoryPath).then(
       () => {
         throw new Error('Unexpected ~/.aws directory, related tests aborted');
       },

From 0ca6aaae526b16df2039edff5db166a39bb1de10 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 16 Aug 2021 13:11:57 +0200
Subject: [PATCH 0392/1101] fix(AWS HTTP API): Properly handle authorizer
 function with alias

---
 .../aws/package/compile/events/httpApi.js     |  3 +-
 .../package/compile/events/httpApi.test.js    | 76 +++++++++++++++++++
 2 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/httpApi.js b/lib/plugins/aws/package/compile/events/httpApi.js
index 3d51932718d..8f579f6cd44 100644
--- a/lib/plugins/aws/package/compile/events/httpApi.js
+++ b/lib/plugins/aws/package/compile/events/httpApi.js
@@ -294,8 +294,7 @@ class HttpApiEvents {
     };
 
     if (functionObject && functionObject.targetAlias) {
-      permissionResource.Properties.DependsOn =
-        this.provider.naming.getLambdaLogicalId(functionName);
+      permissionResource.DependsOn = functionObject.targetAlias.logicalId;
     }
     this.cfTemplate.Resources[authorizerPermissionLogicalId] = permissionResource;
   }
diff --git a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
index 4a632cf69f8..4b0bf70b4d3 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
@@ -550,6 +550,82 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       expect(cfResources[authorizerPermissionLogicalId]).to.be.undefined;
     });
 
+    it('should correctly set `DependsOn` property on permission resource for functions with provisioned concurrency', async () => {
+      const { awsNaming, cfTemplate } = await runServerless({
+        fixture: 'httpApi',
+        configExt: {
+          provider: {
+            httpApi: {
+              authorizers: {
+                someAuthorizer: {
+                  type: 'request',
+                  identitySource: '$request.header.Authorization',
+                  functionName: 'other',
+                  resultTtlInSeconds: 300,
+                  enableSimpleResponses: true,
+                  payloadVersion: '2.0',
+                },
+              },
+            },
+          },
+          functions: {
+            other: {
+              provisionedConcurrency: 1,
+            },
+            foo: {
+              events: [
+                {
+                  httpApi: {
+                    authorizer: {
+                      name: 'someAuthorizer',
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        },
+        command: 'package',
+      });
+      const authorizerPermissionLogicalId =
+        awsNaming.getLambdaAuthorizerHttpApiPermissionLogicalId('someAuthorizer');
+      expect(cfTemplate.Resources[authorizerPermissionLogicalId]).to.deep.equal({
+        Type: 'AWS::Lambda::Permission',
+        Properties: {
+          FunctionName: {
+            'Fn::Join': [
+              ':',
+              [
+                {
+                  'Fn::GetAtt': ['OtherLambdaFunction', 'Arn'],
+                },
+                'provisioned',
+              ],
+            ],
+          },
+          Action: 'lambda:InvokeFunction',
+          Principal: 'apigateway.amazonaws.com',
+          SourceArn: {
+            'Fn::Join': [
+              '',
+              [
+                'arn:',
+                { Ref: 'AWS::Partition' },
+                ':execute-api:',
+                { Ref: 'AWS::Region' },
+                ':',
+                { Ref: 'AWS::AccountId' },
+                ':',
+                { Ref: naming.getHttpApiLogicalId() },
+                '/*',
+              ],
+            ],
+          },
+        },
+        DependsOn: 'OtherProvConcLambdaAlias',
+      });
+    });
+
     it('should throw when request authorizer does not have "functionName" and "functionArn" defined', async () => {
       await expect(
         runServerless({

From 1aa24b8991032ba3fe6f2c4b65bf0e70bc4171dd Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 17 Aug 2021 09:37:02 +0200
Subject: [PATCH 0393/1101] feat(AWS Lambda): Recognize `python3.9` as valid
 runtime

---
 lib/plugins/aws/provider.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 98e6a6a3b3e..884596ba425 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -530,6 +530,7 @@ class AwsProvider {
               'python3.6',
               'python3.7',
               'python3.8',
+              'python3.9',
               'ruby2.5',
               'ruby2.7',
             ],

From 00fdba154655b15b5b2de4b9ceca08f8bfce599e Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 16 Aug 2021 17:11:24 +0200
Subject: [PATCH 0394/1101] refactor(Telemetry): Recognize `notificationsMode`

---
 lib/utils/telemetry/generatePayload.js               |  2 ++
 package.json                                         |  2 +-
 .../unit/lib/utils/telemetry/generatePayload.test.js | 12 +++++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index 9228e13d020..dcc87ec0fb9 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -8,6 +8,7 @@ const _ = require('lodash');
 const isPlainObject = require('type/plain-object/is');
 const isObject = require('type/object/is');
 const userConfig = require('@serverless/utils/config');
+const getNotificationsMode = require('@serverless/utils/get-notifications-mode');
 const isStandalone = require('../isStandaloneExecutable');
 const { getConfigurationValidationResult } = require('../../classes/ConfigSchemaHandler');
 const { triggeredDeprecations } = require('../logDeprecation');
@@ -246,6 +247,7 @@ module.exports = ({
     })(),
     isAutoUpdateEnabled: Boolean(userConfig.get('autoUpdate.enabled')),
     isTabAutocompletionInstalled: checkIsTabAutocompletionInstalled(),
+    notificationsMode: getNotificationsMode(),
     timestamp: Date.now(),
     timezone,
     triggeredDeprecations: Array.from(triggeredDeprecations),
diff --git a/package.json b/package.json
index c4d5eb3ede7..d8619f45d26 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@serverless/components": "^3.15.0",
     "@serverless/dashboard-plugin": "^5.4.3",
     "@serverless/platform-client": "^4.2.6",
-    "@serverless/utils": "^5.6.0",
+    "@serverless/utils": "^5.7.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index ecbe2345b75..bb978cb83b3 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -6,10 +6,10 @@ const fs = require('fs');
 const os = require('os');
 const overrideEnv = require('process-utils/override-env');
 const overrideCwd = require('process-utils/override-cwd');
+const proxyquire = require('proxyquire');
 
 const resolveLocalServerless = require('../../../../../lib/cli/resolve-local-serverless-path');
 const commandsSchema = require('../../../../../lib/cli/commands-schema');
-const generatePayload = require('../../../../../lib/utils/telemetry/generatePayload');
 const runServerless = require('../../../../utils/run-serverless');
 const fixtures = require('../../../../fixtures/programmatic');
 
@@ -18,6 +18,10 @@ const versions = {
   '@serverless/dashboard-plugin': require('@serverless/dashboard-plugin/package').version,
 };
 
+const generatePayload = proxyquire('../../../../../lib/utils/telemetry/generatePayload', {
+  '@serverless/utils/get-notifications-mode': () => 'on',
+});
+
 describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   let isTTYCache;
   before(() => {
@@ -151,6 +155,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       },
       isAutoUpdateEnabled: false,
       isTabAutocompletionInstalled: false,
+      notificationsMode: 'on',
       npmDependencies: ['fooDep', 'barDep', 'fooOpt', 'someDev', 'otherDev'],
       triggeredDeprecations: [],
       installationType: 'global:other',
@@ -211,6 +216,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       },
       isAutoUpdateEnabled: false,
       isTabAutocompletionInstalled: false,
+      notificationsMode: 'on',
       npmDependencies: [],
       triggeredDeprecations: [],
       hasLocalCredentials: false,
@@ -274,6 +280,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       },
       isAutoUpdateEnabled: false,
       isTabAutocompletionInstalled: false,
+      notificationsMode: 'on',
       npmDependencies: [],
       triggeredDeprecations: [],
       installationType: 'local:fallback',
@@ -316,6 +323,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       commandOptionNames: [],
       isAutoUpdateEnabled: false,
       isTabAutocompletionInstalled: false,
+      notificationsMode: 'on',
       triggeredDeprecations: [],
       installationType: 'global:other',
       versions,
@@ -368,6 +376,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       isTabAutocompletionInstalled: false,
       triggeredDeprecations: [],
       installationType: 'global:other',
+      notificationsMode: 'on',
       npmDependencies: [],
       hasLocalCredentials: false,
       versions,
@@ -402,6 +411,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       commandOptionNames: [],
       isAutoUpdateEnabled: false,
       isTabAutocompletionInstalled: false,
+      notificationsMode: 'on',
       triggeredDeprecations: [],
       installationType: 'global:other',
       versions,

From 7b64abb538aa8b81a4bd8935567ea667a99273a9 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 18 Aug 2021 10:32:15 +0200
Subject: [PATCH 0395/1101] chore: Bump dependencies

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d8619f45d26..570a174f207 100644
--- a/package.json
+++ b/package.json
@@ -23,14 +23,14 @@
   },
   "dependencies": {
     "@serverless/cli": "^1.5.2",
-    "@serverless/components": "^3.15.0",
+    "@serverless/components": "^3.15.1",
     "@serverless/dashboard-plugin": "^5.4.3",
     "@serverless/platform-client": "^4.2.6",
     "@serverless/utils": "^5.7.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.966.0",
+    "aws-sdk": "^2.970.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",

From c9e851ea605478c692eddf2dde2d20489cf9ccbe Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 18 Aug 2021 10:41:54 +0200
Subject: [PATCH 0396/1101] chore: Release 2.55.0

---
 CHANGELOG.md | 16 ++++++++++++++++
 package.json |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5004d556599..19f5514e9c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 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.
 
+## [2.55.0](https://github.com/serverless/serverless/compare/v2.54.0...v2.55.0) (2021-08-18)
+
+### Features
+
+- **AWS Lambda:** Recognize `python3.9` as valid runtime ([#9854](https://github.com/serverless/serverless/pull/9854)) ([1aa24b8](https://github.com/serverless/serverless/commit/1aa24b8991032ba3fe6f2c4b65bf0e70bc4171dd)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **AWS HTTP API:** Properly handle authorizer function with alias (e.g. with `provisionedConcurrency`) ([#9850](https://github.com/serverless/serverless/pull/9850)) ([0ca6aaa](https://github.com/serverless/serverless/commit/0ca6aaae526b16df2039edff5db166a39bb1de10)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Maintenance Improvements
+
+- **CLI Onboarding:** Adjust summary messages in deploy step ([#9835](https://github.com/serverless/serverless/pull/9835)) ([b751c50](https://github.com/serverless/serverless/commit/b751c505c8050e229edb77d44016925c4e52a05e)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Replace `fse.stat` with `fs.promises.stat` ([#9845](https://github.com/serverless/serverless/issues/9845)) ([bb0484e](https://github.com/serverless/serverless/commit/bb0484e6b54a3cc6aed46ff23100e08c90c995ce)) ([Sudipto Das](https://github.com/sdas13))
+- **Telemetry:** Recognize `notificationsMode` ([#9851](https://github.com/serverless/serverless/pull/9851)) ([00fdba1](https://github.com/serverless/serverless/commit/00fdba154655b15b5b2de4b9ceca08f8bfce599e)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
 ## [2.54.0](https://github.com/serverless/serverless/compare/v2.53.1...v2.54.0) (2021-08-12)
 
 ### Features
diff --git a/package.json b/package.json
index 570a174f207..d1cfb63ffba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.54.0",
+  "version": "2.55.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From ef5a8faf13a8fbf8564e7c0621e88d1ea5357ea5 Mon Sep 17 00:00:00 2001
From: Thiago Moraes <thiagodmor@gmail.com>
Date: Wed, 18 Aug 2021 17:36:00 -0300
Subject: [PATCH 0397/1101] feat(AWS HTTP API): Support
 `shouldStartNameWithService` option (#9758)

---
 docs/providers/aws/events/http-api.md        | 10 ++++++++
 lib/plugins/aws/lib/naming.js                |  5 +++-
 lib/plugins/aws/provider.js                  |  1 +
 test/unit/lib/plugins/aws/lib/naming.test.js | 24 ++++++++++++++++++++
 4 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/docs/providers/aws/events/http-api.md b/docs/providers/aws/events/http-api.md
index 0d24ccae307..7d52ae3521f 100644
--- a/docs/providers/aws/events/http-api.md
+++ b/docs/providers/aws/events/http-api.md
@@ -443,3 +443,13 @@ provider:
   httpApi:
     disableDefaultEndpoint: true
 ```
+
+### Service Naming
+
+You can use the `shouldStartNameWithService` option to change the naming scheme for HTTP API from the default `${stage}-${service}` to `${service}-${stage}`.
+
+```yml
+provider:
+  httpApi:
+    shouldStartNameWithService: true
+```
diff --git a/lib/plugins/aws/lib/naming.js b/lib/plugins/aws/lib/naming.js
index 0df5f9dec96..f820de996b6 100644
--- a/lib/plugins/aws/lib/naming.js
+++ b/lib/plugins/aws/lib/naming.js
@@ -652,7 +652,10 @@ module.exports = {
     ) {
       return `${String(this.provider.serverless.service.provider.httpApi.name)}`;
     }
-    return `${this.provider.getStage()}-${this.provider.serverless.service.service}`;
+
+    return _.get(this.provider.serverless.service.provider.httpApi, 'shouldStartNameWithService')
+      ? `${this.provider.serverless.service.service}-${this.provider.getStage()}`
+      : `${this.provider.getStage()}-${this.provider.serverless.service.service}`;
   },
   getHttpApiLogicalId() {
     return 'HttpApi';
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 884596ba425..72b40823883 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -912,6 +912,7 @@ class AwsProvider {
                 metrics: { type: 'boolean' },
                 useProviderTags: { const: true },
                 disableDefaultEndpoint: { type: 'boolean' },
+                shouldStartNameWithService: { const: true },
               },
               additionalProperties: false,
             },
diff --git a/test/unit/lib/plugins/aws/lib/naming.test.js b/test/unit/lib/plugins/aws/lib/naming.test.js
index 9b874e7170e..7fa3f1f65f9 100644
--- a/test/unit/lib/plugins/aws/lib/naming.test.js
+++ b/test/unit/lib/plugins/aws/lib/naming.test.js
@@ -1025,4 +1025,28 @@ describe('#naming()', () => {
       );
     });
   });
+
+  describe('#getHttpApiName()', () => {
+    it('should return the composition of service & stage name if custom name not provided and shouldStartNameWithService is true', () => {
+      serverless.service.service = 'myService';
+      serverless.service.provider.httpApi = { shouldStartNameWithService: true };
+      expect(sdk.naming.getHttpApiName()).to.equal(
+        `${serverless.service.service}-${sdk.naming.provider.getStage()}`
+      );
+    });
+
+    it('should return the composition of stage & service name if custom name not provided', () => {
+      serverless.service.service = 'myService';
+      expect(sdk.naming.getHttpApiName()).to.equal(
+        `${sdk.naming.provider.getStage()}-${serverless.service.service}`
+      );
+    });
+
+    it('should return the custom api name if provided', () => {
+      serverless.service.provider.httpApi = { name: 'app-dev-testApi' };
+      serverless.service.service = 'myService';
+      serverless.service.provider.stage = sdk.naming.provider.getStage();
+      expect(sdk.naming.getHttpApiName()).to.equal('app-dev-testApi');
+    });
+  });
 });

From a20ed5d235981943c842cd9babbbe551896a84fc Mon Sep 17 00:00:00 2001
From: SaintMalik <37118134+saintmalik@users.noreply.github.com>
Date: Thu, 19 Aug 2021 17:15:47 +0100
Subject: [PATCH 0398/1101] docs: Fix typos in docs (#9859)

---
 docs/cn/providers/tencent/components/README.md                  | 2 +-
 .../tencent/components/high-level-components/README.md          | 2 +-
 .../components/high-level-components/custom-domain-HTTPS.md     | 2 +-
 docs/deprecations.md                                            | 2 +-
 docs/guides/profiles.md                                         | 2 +-
 docs/providers/spotinst/guide/intro.md                          | 2 +-
 docs/providers/tencent/events/COS.md                            | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/cn/providers/tencent/components/README.md b/docs/cn/providers/tencent/components/README.md
index 2cdd4617789..66aa1d17690 100644
--- a/docs/cn/providers/tencent/components/README.md
+++ b/docs/cn/providers/tencent/components/README.md
@@ -43,7 +43,7 @@ $ npm i -g serverless
 
 **确保你使用的是 Serverless Framework 1.49 及以上的版本**。更早的版本无法支持 Serverless Components Beta。
 
-之后，通过 `create --template-url` 命令安装一个 [Serverless Components 模板](./templates)，模板中会包含了 Componenets 及示例代码，可以让你更快的了解 Component。
+之后，通过 `create --template-url` 命令安装一个 [Serverless Components 模板](./templates)，模板中会包含了 Components 及示例代码，可以让你更快的了解 Component。
 
 以下是一些常用的用例模板：
 
diff --git a/docs/cn/providers/tencent/components/high-level-components/README.md b/docs/cn/providers/tencent/components/high-level-components/README.md
index 75dd317b29c..40bf3dca409 100644
--- a/docs/cn/providers/tencent/components/high-level-components/README.md
+++ b/docs/cn/providers/tencent/components/high-level-components/README.md
@@ -23,7 +23,7 @@ $ npm i -g serverless
 
 **确保你使用的是 Serverless Framework 1.49 及以上的版本**。更早的版本无法支持 Serverless Components Beta。
 
-之后，通过 `create --template-url` 命令安装一个 [Serverless Components 模板](./templates)，模板中会包含了 Componenets 及示例代码，可以让你更快的了解 Component。
+之后，通过 `create --template-url` 命令安装一个 [Serverless Components 模板](./templates)，模板中会包含了 Components 及示例代码，可以让你更快的了解 Component。
 
 以下是一些常用的用例模板：
 
diff --git a/docs/cn/providers/tencent/components/high-level-components/custom-domain-HTTPS.md b/docs/cn/providers/tencent/components/high-level-components/custom-domain-HTTPS.md
index 6228dd13609..4f7a1342162 100644
--- a/docs/cn/providers/tencent/components/high-level-components/custom-domain-HTTPS.md
+++ b/docs/cn/providers/tencent/components/high-level-components/custom-domain-HTTPS.md
@@ -158,7 +158,7 @@ $ sls --debug
   DEBUG ─ Deployment successful for the api named restApi in the ap-shanghai region.
   DEBUG ─ Start unbind all exist domain for service service-lqhc88sr
   DEBUG ─ Start bind custom domain for service service-lqhc88sr
-  DEBUG ─ Custom domain for service service-lqhc88sr created successfullly.
+  DEBUG ─ Custom domain for service service-lqhc88sr created successfully.
   DEBUG ─ Please add CNAME record service-lqhc88sr-1250000000.sh.apigw.tencentcs.com for www.example.com.
 
   restApi:
diff --git a/docs/deprecations.md b/docs/deprecations.md
index f821e2df7db..42c6079b894 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -116,7 +116,7 @@ Deprecation code: `UNSUPPORTED_CLI_OPTIONS`
 
 Framework was upgraded with extensive CLI options validation and that required dropping support for _free form_ CLI options (keeping that in will make not possible to reliably detect accidental typos in option names).
 
-For _free form_ process configuration options it is adviced to rely on environment variables instead, as e.g.:
+For _free form_ process configuration options it is advised to rely on environment variables instead, as e.g.:
 
 ```yaml
 provider:
diff --git a/docs/guides/profiles.md b/docs/guides/profiles.md
index 87415feff1e..e379acc9a4d 100644
--- a/docs/guides/profiles.md
+++ b/docs/guides/profiles.md
@@ -11,7 +11,7 @@ layout: Doc
 
 <!-- DOCS-SITE-LINK:END -->
 
-> This is a deprecated feature of the dashboard. Please look at our documentaion for [Providers](https://www.serverless.com/framework/docs/guides/providers/) and
+> This is a deprecated feature of the dashboard. Please look at our documentation for [Providers](https://www.serverless.com/framework/docs/guides/providers/) and
 > [Parameters](https://www.serverless.com/framework/docs/guides/parameters/) which replaces the use of deployment profiles for setting up AWS connections and parameters.
 
 # Deployment Profiles
diff --git a/docs/providers/spotinst/guide/intro.md b/docs/providers/spotinst/guide/intro.md
index 3eac3d1b0fc..4d8921e91dd 100644
--- a/docs/providers/spotinst/guide/intro.md
+++ b/docs/providers/spotinst/guide/intro.md
@@ -14,7 +14,7 @@ layout: Doc
 
 # Spotinst - Introduction
 
-Spotinst Functions is a Multi-Cloud Functions as a Service (FaaS) platform that utilizes affordable compute and network infrastracture.
+Spotinst Functions is a Multi-Cloud Functions as a Service (FaaS) platform that utilizes affordable compute and network infrastructure.
 Spotinst will take care of everything required to run and scale your code with high availability, advanced analytics and monitoring, and in low execution prices by finding the best available compute possible based on **Spot Pricing** across all cloud providers (Amazon Web Services, Microsoft Azure, Google Cloud, IBM Cloud, Oracle and even Bare-metal servers on Equinix).
 
 When creating a `Function`, you can specify your desired `Cloud providers`, as well as the `geographical location` (for example `US East` or `Europe`). In addition you can defines triggers to execute the functions.
diff --git a/docs/providers/tencent/events/COS.md b/docs/providers/tencent/events/COS.md
index 932b08aab4a..8158c70e71c 100644
--- a/docs/providers/tencent/events/COS.md
+++ b/docs/providers/tencent/events/COS.md
@@ -69,7 +69,7 @@ When an object creation or deletion event occurs in the specified COS bucket, ev
           "name": "testpic",
           "appid": "1253970026"
         },
-        "cosNotificationId": "unkown"
+        "cosNotificationId": "unknown"
       },
       "event": {
         "eventName": "cos:ObjectCreated:*",

From 7e9bfd63fce56f880a3ad0379fd97fdfce89d91b Mon Sep 17 00:00:00 2001
From: Karim Kanso <kaz.kanso@gmail.com>
Date: Fri, 20 Aug 2021 09:27:48 +0100
Subject: [PATCH 0399/1101] fix(AWS HTTP API): Always allow to define catch-all
 route (#9840)

---
 .../aws/package/compile/events/httpApi.js     | 33 +++++--------------
 .../package/compile/events/httpApi.test.js    | 20 ++++++++++-
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/httpApi.js b/lib/plugins/aws/package/compile/events/httpApi.js
index 8f579f6cd44..e087694d7e3 100644
--- a/lib/plugins/aws/package/compile/events/httpApi.js
+++ b/lib/plugins/aws/package/compile/events/httpApi.js
@@ -8,7 +8,7 @@ const ServerlessError = require('../../../../../serverless-error');
 const { logWarning } = require('../../../../../classes/Error');
 const resolveLambdaTarget = require('../../../utils/resolveLambdaTarget');
 
-const allowedMethods = new Set(['GET', 'POST', 'PUT', 'PATCH', 'OPTIONS', 'HEAD', 'DELETE']);
+const allowedMethods = new Set(['ANY', 'GET', 'POST', 'PUT', 'PATCH', 'OPTIONS', 'HEAD', 'DELETE']);
 const methodPattern = new RegExp(`^(?:\\*|${Array.from(allowedMethods).join('|')})$`, 'i');
 const methodPathPattern = new RegExp(
   `^(?:\\*|(${Array.from(allowedMethods).join('|')}) (\\/\\S*))$`,
@@ -532,29 +532,11 @@ Object.defineProperties(
             method = String(method).toUpperCase();
             if (method === '*') {
               method = 'ANY';
-              if (
-                Array.from(allowedMethods, (allowedMethod) => `${allowedMethod} ${path}`).some(
-                  (duplicateRouteKey) => routes.has(duplicateRouteKey)
-                )
-              ) {
-                throw new ServerlessError(
-                  `Duplicate method for "${path}" path in function ${functionName} for httpApi event in serverless.yml`,
-                  'DUPLICATE_HTTP_API_METHOD'
-                );
-              }
-            } else {
-              if (!allowedMethods.has(method)) {
-                throw new ServerlessError(
-                  `Invalid "method" property in function ${functionName} for httpApi event in serverless.yml`,
-                  'INVALID_HTTP_API_METHOD'
-                );
-              }
-              if (routes.has(`ANY ${path}`)) {
-                throw new ServerlessError(
-                  `Duplicate method for "${path}" path in function ${functionName} for httpApi event in serverless.yml`,
-                  'DUPLICATE_HTTP_API_METHOD'
-                );
-              }
+            } else if (!allowedMethods.has(method)) {
+              throw new ServerlessError(
+                `Invalid "method" property in function ${functionName} for httpApi event in serverless.yml`,
+                'INVALID_HTTP_API_METHOD'
+              );
             }
             event.resolvedMethod = method;
             event.resolvedPath = path;
@@ -614,6 +596,9 @@ Object.defineProperties(
           if (shouldFillCorsMethods) {
             if (event.resolvedMethod === 'ANY') {
               for (const allowedMethod of allowedMethods) {
+                if (allowedMethod === 'ANY') {
+                  continue;
+                }
                 cors.allowedMethods.add(allowedMethod);
               }
             } else {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
index 4b0bf70b4d3..ced9d074cd3 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
@@ -39,7 +39,11 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
             payload: {
               handler: 'index.handler',
               httpApi: { payload: '1.0' },
-              events: [{ httpApi: { method: 'get', path: '/payload' } }],
+              events: [{ httpApi: { method: 'options', path: '/payload' } }],
+            },
+            payloadCatchAll: {
+              handler: 'index.handler',
+              events: [{ httpApi: 'ANY /payload' }],
             },
           },
         },
@@ -101,6 +105,20 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       expect(resource.Properties.RouteKey).to.equal(routeKey);
     });
 
+    it('should configure endpoint with specific method and path', () => {
+      const routeKey = 'OPTIONS /payload';
+      const resource = cfResources[naming.getHttpApiRouteLogicalId(routeKey)];
+      expect(resource.Type).to.equal('AWS::ApiGatewayV2::Route');
+      expect(resource.Properties.RouteKey).to.equal(routeKey);
+    });
+
+    it('should configure method catch all endpoint with same path as a specific method endpoint', () => {
+      const routeKey = 'ANY /payload';
+      const resource = cfResources[naming.getHttpApiRouteLogicalId(routeKey)];
+      expect(resource.Type).to.equal('AWS::ApiGatewayV2::Route');
+      expect(resource.Properties.RouteKey).to.equal(routeKey);
+    });
+
     it('should ensure higher timeout than function', () => {
       const resource = cfResources[naming.getHttpApiIntegrationLogicalId('foo')];
       expect(resource.Properties.TimeoutInMillis).to.equal(6500);

From 6193d3867ec826898d4effbd641e49a35d9efbbc Mon Sep 17 00:00:00 2001
From: Jake Scott <jake.net@gmail.com>
Date: Sun, 22 Aug 2021 09:16:48 +1200
Subject: [PATCH 0400/1101] feat(AWS EventBridge): Support disabling a rule
 (#9865)

* Support being able to disable an eventbridge rule

* Pass state to custom resource handler

* Add docs

* Add unit tests for enabling or disabling an eventBridge rule
---
 docs/providers/aws/events/event-bridge.md     | 16 ++++
 .../resources/eventBridge/handler.js          |  2 +
 .../resources/eventBridge/lib/eventBridge.js  |  4 +-
 .../compile/events/eventBridge/index.js       | 13 ++-
 .../compile/events/eventBridge/index.test.js  | 79 +++++++++++++++++++
 5 files changed, 111 insertions(+), 3 deletions(-)

diff --git a/docs/providers/aws/events/event-bridge.md b/docs/providers/aws/events/event-bridge.md
index 0819f344c1f..904beb208d1 100644
--- a/docs/providers/aws/events/event-bridge.md
+++ b/docs/providers/aws/events/event-bridge.md
@@ -31,6 +31,22 @@ functions:
             key1: value1
 ```
 
+## Enabling / Disabling
+
+**Note:** `eventBridge` events are enabled by default. Use `enabled: false` to disable the rule.
+
+```yml
+functions:
+  myFunction:
+    handler: index.handler
+    events:
+      - eventBridge:
+          enabled: false
+          schedule: rate(10 minutes)
+          input:
+            key1: value1
+```
+
 ## Setting up event pattern matching
 
 ```yml
diff --git a/lib/plugins/aws/customResources/resources/eventBridge/handler.js b/lib/plugins/aws/customResources/resources/eventBridge/handler.js
index 5c0ad4f85a5..abdb2f10612 100644
--- a/lib/plugins/aws/customResources/resources/eventBridge/handler.js
+++ b/lib/plugins/aws/customResources/resources/eventBridge/handler.js
@@ -49,6 +49,7 @@ async function create(event, context) {
         eventBus: EventBridgeConfig.EventBus,
         pattern: EventBridgeConfig.Pattern,
         schedule: EventBridgeConfig.Schedule,
+        state: EventBridgeConfig.State,
       })
     )
     .then(() =>
@@ -76,6 +77,7 @@ async function update(event, context) {
     eventBus: EventBridgeConfig.EventBus,
     pattern: EventBridgeConfig.Pattern,
     schedule: EventBridgeConfig.Schedule,
+    state: EventBridgeConfig.State,
   }).then(() =>
     updateTargetConfiguration({
       lambdaArn,
diff --git a/lib/plugins/aws/customResources/resources/eventBridge/lib/eventBridge.js b/lib/plugins/aws/customResources/resources/eventBridge/lib/eventBridge.js
index 4f0acd5c90b..a8879b246fe 100644
--- a/lib/plugins/aws/customResources/resources/eventBridge/lib/eventBridge.js
+++ b/lib/plugins/aws/customResources/resources/eventBridge/lib/eventBridge.js
@@ -33,7 +33,7 @@ async function deleteEventBus(config) {
 }
 
 async function updateRuleConfiguration(config) {
-  const { ruleName, eventBus, pattern, schedule, region } = config;
+  const { ruleName, eventBus, pattern, schedule, region, state } = config;
 
   const EventBusName = getEventBusName(eventBus);
 
@@ -42,7 +42,7 @@ async function updateRuleConfiguration(config) {
     EventBusName,
     EventPattern: JSON.stringify(pattern),
     ScheduleExpression: schedule,
-    State: 'ENABLED',
+    State: state,
   });
 }
 
diff --git a/lib/plugins/aws/package/compile/events/eventBridge/index.js b/lib/plugins/aws/package/compile/events/eventBridge/index.js
index 482d749755d..6aa6de9543d 100644
--- a/lib/plugins/aws/package/compile/events/eventBridge/index.js
+++ b/lib/plugins/aws/package/compile/events/eventBridge/index.js
@@ -57,6 +57,7 @@ class AwsCompileEventBridgeEvents {
           ],
         },
         schedule: { pattern: '^(?:cron|rate)\\(.+\\)$' },
+        enabled: { type: 'boolean' },
         pattern: {
           type: 'object',
           properties: {
@@ -121,6 +122,11 @@ class AwsCompileEventBridgeEvents {
               index: idx,
             });
 
+            let State = 'ENABLED';
+            if (event.eventBridge.enabled === false) {
+              State = 'DISABLED';
+            }
+
             if ([Input, InputPath, InputTransformer].filter(Boolean).length > 1) {
               throw new ServerlessError(
                 [
@@ -147,6 +153,7 @@ class AwsCompileEventBridgeEvents {
                 compiledCloudFormationTemplate,
                 functionName,
                 RuleName,
+                State,
                 Input,
                 InputPath,
                 InputTransformer,
@@ -167,6 +174,7 @@ class AwsCompileEventBridgeEvents {
                 compiledCloudFormationTemplate,
                 functionName,
                 RuleName,
+                State,
                 Input,
                 InputPath,
                 InputTransformer,
@@ -196,6 +204,7 @@ class AwsCompileEventBridgeEvents {
     compiledCloudFormationTemplate,
     functionName,
     RuleName,
+    State,
     Input,
     InputPath,
     InputTransformer,
@@ -235,6 +244,7 @@ class AwsCompileEventBridgeEvents {
         FunctionName,
         EventBridgeConfig: {
           RuleName,
+          State,
           EventBus,
           Schedule,
           Pattern,
@@ -280,6 +290,7 @@ class AwsCompileEventBridgeEvents {
     compiledCloudFormationTemplate,
     functionName,
     RuleName,
+    State,
     Input,
     InputPath,
     InputTransformer,
@@ -341,7 +352,7 @@ class AwsCompileEventBridgeEvents {
         EventPattern: JSON.stringify(Pattern),
         Name: RuleName,
         ScheduleExpression: Schedule,
-        State: 'ENABLED',
+        State,
         Targets: [target],
       },
     };
diff --git a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
index b1097d44048..7f355f9c988 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
@@ -127,6 +127,30 @@ const serverlessConfigurationExtension = {
         },
       ],
     },
+    disabled: {
+      handler: 'index.handler',
+      events: [
+        {
+          eventBridge: {
+            eventBus: 'arn:aws:events:us-east-1:12345:event-bus/default',
+            schedule: 'rate(10 minutes)',
+            enabled: false,
+          },
+        },
+      ],
+    },
+    enabled: {
+      handler: 'index.handler',
+      events: [
+        {
+          eventBridge: {
+            eventBus: 'arn:aws:events:us-east-1:12345:event-bus/default',
+            schedule: 'rate(10 minutes)',
+            enabled: true,
+          },
+        },
+      ],
+    },
   },
 };
 
@@ -193,6 +217,21 @@ describe('EventBridgeEvents', () => {
       expect(eventBridgeConfig.RuleName).to.include('dev-default-rule-1');
     });
 
+    it('should ensure state is enabled by default', () => {
+      const eventBridgeConfig = getEventBridgeConfigById('default');
+      expect(eventBridgeConfig.State).to.be.eq('ENABLED');
+    });
+
+    it('should ensure state is enabled when explicity set', () => {
+      const eventBridgeConfig = getEventBridgeConfigById('enabled');
+      expect(eventBridgeConfig.State).to.be.eq('ENABLED');
+    });
+
+    it('should ensure state is disabled when explicity set', () => {
+      const eventBridgeConfig = getEventBridgeConfigById('disabled');
+      expect(eventBridgeConfig.State).to.be.eq('DISABLED');
+    });
+
     it("should ensure rule name doesn't exceed 64 chars", () => {
       const eventBridgeConfig = getEventBridgeConfigById(NAME_OVER_64_CHARS);
       expect(eventBridgeConfig.RuleName.endsWith('rule-1')).to.be.true;
@@ -273,6 +312,8 @@ describe('EventBridgeEvents', () => {
       let ruleTarget;
       let inputPathRuleTarget;
       let inputTransformerRuleTarget;
+      let disabledRuleResource;
+      let enabledRuleResource;
       const schedule = 'rate(10 minutes)';
       const eventBusName = 'nondefault';
       const pattern = {
@@ -328,6 +369,22 @@ describe('EventBridgeEvents', () => {
                       inputTransformer,
                     },
                   },
+                  {
+                    eventBridge: {
+                      eventBus: eventBusName,
+                      schedule,
+                      enabled: false,
+                      pattern,
+                    },
+                  },
+                  {
+                    eventBridge: {
+                      eventBus: eventBusName,
+                      schedule,
+                      enabled: true,
+                      pattern,
+                    },
+                  },
                 ],
               },
             },
@@ -352,6 +409,16 @@ describe('EventBridgeEvents', () => {
             resource.Type === 'AWS::Events::Rule' && resource.Properties.Name.endsWith('3')
         );
         inputTransformerRuleTarget = inputTransformerRuleResource.Properties.Targets[0];
+
+        disabledRuleResource = Object.values(cfResources).find(
+          (resource) =>
+            resource.Type === 'AWS::Events::Rule' && resource.Properties.Name.endsWith('4')
+        );
+
+        enabledRuleResource = Object.values(cfResources).find(
+          (resource) =>
+            resource.Type === 'AWS::Events::Rule' && resource.Properties.Name.endsWith('5')
+        );
       });
 
       it('should create an EventBus resource', () => {
@@ -362,6 +429,18 @@ describe('EventBridgeEvents', () => {
         expect(ruleResource.Properties.ScheduleExpression).to.equal('rate(10 minutes)');
       });
 
+      it('should correctly set State by default on a created rule', () => {
+        expect(ruleResource.Properties.State).to.equal('ENABLED');
+      });
+
+      it('should correctly set State when disabled on a created rule', () => {
+        expect(disabledRuleResource.Properties.State).to.equal('DISABLED');
+      });
+
+      it('should correctly set State when enabled on a created rule', () => {
+        expect(enabledRuleResource.Properties.State).to.equal('ENABLED');
+      });
+
       it('should correctly set EventPattern on a created rule', () => {
         expect(ruleResource.Properties.EventPattern).to.deep.equal(JSON.stringify(pattern));
       });

From db98eb3266e69942e4a3d095e7b026679e3d1d4b Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 23 Aug 2021 11:22:20 +0200
Subject: [PATCH 0401/1101] test: Ensure proper `aws-sdk` patch in `provider`
 tests

---
 test/unit/lib/plugins/aws/provider.test.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/unit/lib/plugins/aws/provider.test.js b/test/unit/lib/plugins/aws/provider.test.js
index 75c96800b71..976123b9a55 100644
--- a/test/unit/lib/plugins/aws/provider.test.js
+++ b/test/unit/lib/plugins/aws/provider.test.js
@@ -359,12 +359,15 @@ describe('test/unit/lib/plugins/aws/provider.test.js', () => {
           this.secretAccessKey = 'secret';
         }
       }
+      class FakeMetadataService {}
+
       const modulesCacheStub = {
         'aws-sdk': {
           SharedIniFileCredentials,
           EnvironmentCredentials,
           CloudFormation: FakeCloudFormation,
         },
+        'aws-sdk/lib/metadata_service': FakeMetadataService,
       };
       const { serverless } = await runServerless({
         fixture: 'aws',

From 9a8e7e44b44fdcf4c43d6e11c5eefa5051782506 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 23 Aug 2021 16:39:32 +0200
Subject: [PATCH 0402/1101] fix(CLI): Mark `dashboard` command with optional
 service dependency

---
 lib/cli/commands-schema/no-service.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/cli/commands-schema/no-service.js b/lib/cli/commands-schema/no-service.js
index cfc0c732960..3f3f27b224e 100644
--- a/lib/cli/commands-schema/no-service.js
+++ b/lib/cli/commands-schema/no-service.js
@@ -132,6 +132,7 @@ commands.set('create', {
 commands.set('dashboard', {
   usage: 'Open the Serverless dashboard',
   lifecycleEvents: ['dashboard'],
+  serviceDependencyMode: 'optional',
 });
 
 commands.set('generate-event', {

From 0682ba8b6a70d27e74c478d6e5fa5de71b9e0070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remigiusz=20Or=C5=82owski?=
 <remi00@users.noreply.github.com>
Date: Tue, 24 Aug 2021 11:11:59 +0200
Subject: [PATCH 0403/1101] refactor: Convert to async/await upload and
 rollback functions (#9866)

---
 lib/plugins/aws/deploy/index.js               | 88 ++++++++-----------
 lib/plugins/aws/deploy/lib/cleanupS3Bucket.js | 43 ++++-----
 lib/plugins/aws/deploy/lib/uploadArtifacts.js | 53 +++++------
 lib/plugins/aws/package/index.js              | 22 ++---
 lib/plugins/aws/rollback.js                   | 79 ++++++++---------
 package.json                                  |  1 +
 test/unit/lib/plugins/aws/rollback.test.js    |  8 +-
 7 files changed, 124 insertions(+), 170 deletions(-)

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index e2cd8a8e4f6..045748dfed9 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const BbPromise = require('bluebird');
 const extendedValidate = require('./lib/extendedValidate');
 const setBucketName = require('../lib/setBucketName');
 const checkForChanges = require('./lib/checkForChanges');
@@ -64,63 +63,48 @@ class AwsDeploy {
     };
 
     this.hooks = {
-      'before:deploy:deploy': async () =>
-        BbPromise.bind(this)
-          .then(() => this.serverless.pluginManager.spawn('aws:common:validate'))
-          .then(() => {
-            const bucketName = this.serverless.service.provider.deploymentBucket;
-            if (bucketName) {
-              return this.existsDeploymentBucket(bucketName);
-            }
-
-            return BbPromise.resolve();
-          })
-          .then(() => {
-            if (!this.options.package && !this.serverless.service.package.path) {
-              return this.extendedValidate();
-            }
-            return BbPromise.bind(this)
-              .then(() => this.serverless.pluginManager.spawn('aws:common:moveArtifactsToTemp'))
-              .then(this.extendedValidate);
-          }),
+      'before:deploy:deploy': async () => {
+        await this.serverless.pluginManager.spawn('aws:common:validate');
+
+        const bucketName = this.serverless.service.provider.deploymentBucket;
+        if (bucketName) {
+          await this.existsDeploymentBucket(bucketName);
+        }
+
+        if (!this.options.package && !this.serverless.service.package.path) {
+          return this.extendedValidate();
+        }
+        await this.serverless.pluginManager.spawn('aws:common:moveArtifactsToTemp');
+        return this.extendedValidate();
+      },
 
       // Deploy outer lifecycle
-      'deploy:deploy': async () =>
-        BbPromise.bind(this).then(() => {
-          return this.serverless.pluginManager.spawn('aws:deploy:deploy');
-        }),
+      'deploy:deploy': async () => this.serverless.pluginManager.spawn('aws:deploy:deploy'),
 
       'deploy:finalize': async () => this.serverless.pluginManager.spawn('aws:deploy:finalize'),
 
       // Deploy deploy inner lifecycle
-      'aws:deploy:deploy:createStack': async () => BbPromise.bind(this).then(this.createStack),
-
-      'aws:deploy:deploy:checkForChanges': async () =>
-        BbPromise.bind(this).then(this.setBucketName).then(this.checkForChanges),
-
-      'aws:deploy:deploy:uploadArtifacts': async () =>
-        BbPromise.bind(this).then(() => {
-          if (this.serverless.service.provider.shouldNotDeploy) {
-            return BbPromise.resolve();
-          }
-          return BbPromise.bind(this).then(this.uploadArtifacts);
-        }),
-
-      'aws:deploy:deploy:validateTemplate': async () =>
-        BbPromise.bind(this).then(() => {
-          if (this.serverless.service.provider.shouldNotDeploy) {
-            return BbPromise.resolve();
-          }
-          return BbPromise.bind(this).then(this.validateTemplate);
-        }),
-
-      'aws:deploy:deploy:updateStack': async () =>
-        BbPromise.bind(this).then(() => {
-          if (this.serverless.service.provider.shouldNotDeploy) {
-            return BbPromise.resolve();
-          }
-          return BbPromise.bind(this).then(this.updateStack);
-        }),
+      'aws:deploy:deploy:createStack': async () => this.createStack(),
+
+      'aws:deploy:deploy:checkForChanges': async () => {
+        await this.setBucketName();
+        await this.checkForChanges();
+      },
+
+      'aws:deploy:deploy:uploadArtifacts': async () => {
+        if (this.serverless.service.provider.shouldNotDeploy) return;
+        await this.uploadArtifacts();
+      },
+
+      'aws:deploy:deploy:validateTemplate': async () => {
+        if (this.serverless.service.provider.shouldNotDeploy) return;
+        await this.validateTemplate();
+      },
+
+      'aws:deploy:deploy:updateStack': async () => {
+        if (this.serverless.service.provider.shouldNotDeploy) return;
+        await this.updateStack();
+      },
 
       // Deploy finalize inner lifecycle
       'aws:deploy:finalize:cleanup': async () => {
diff --git a/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js b/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
index 7716799c981..46359a37594 100644
--- a/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
+++ b/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const BbPromise = require('bluebird');
 const _ = require('lodash');
 const findAndGroupDeployments = require('../../utils/findAndGroupDeployments');
 const getS3ObjectsFromStacks = require('../../utils/getS3ObjectsFromStacks');
@@ -17,39 +16,27 @@ module.exports = {
     const stage = this.provider.getStage();
     const prefix = this.provider.getDeploymentPrefix();
 
-    return this.provider
-      .request('S3', 'listObjectsV2', {
-        Bucket: this.bucketName,
-        Prefix: `${prefix}/${service}/${stage}`,
-      })
-      .then((response) => {
-        const stacks = findAndGroupDeployments(response, prefix, service, stage);
-        const stacksToRemove = stacks.slice(0, -stacksToKeepCount || Infinity);
+    const response = await this.provider.request('S3', 'listObjectsV2', {
+      Bucket: this.bucketName,
+      Prefix: `${prefix}/${service}/${stage}`,
+    });
+    const stacks = findAndGroupDeployments(response, prefix, service, stage);
+    const stacksToRemove = stacks.slice(0, -stacksToKeepCount || Infinity);
 
-        const objectsToRemove = getS3ObjectsFromStacks(stacksToRemove, prefix, service, stage);
-
-        if (objectsToRemove.length) {
-          return BbPromise.resolve(objectsToRemove);
-        }
-
-        return BbPromise.resolve([]);
-      });
+    return getS3ObjectsFromStacks(stacksToRemove, prefix, service, stage);
   },
 
   async removeObjects(objectsToRemove) {
-    if (objectsToRemove && objectsToRemove.length) {
-      this.serverless.cli.log('Removing old service artifacts from S3...');
-
-      return this.provider.request('S3', 'deleteObjects', {
-        Bucket: this.bucketName,
-        Delete: { Objects: objectsToRemove },
-      });
-    }
-
-    return BbPromise.resolve();
+    if (!objectsToRemove || !objectsToRemove.length) return;
+    this.serverless.cli.log('Removing old service artifacts from S3...');
+    await this.provider.request('S3', 'deleteObjects', {
+      Bucket: this.bucketName,
+      Delete: { Objects: objectsToRemove },
+    });
   },
 
   async cleanupS3Bucket() {
-    return BbPromise.bind(this).then(this.getObjectsToRemove).then(this.removeObjects);
+    const objectsToRemove = await this.getObjectsToRemove();
+    await this.removeObjects(objectsToRemove);
   },
 };
diff --git a/lib/plugins/aws/deploy/lib/uploadArtifacts.js b/lib/plugins/aws/deploy/lib/uploadArtifacts.js
index 0763a440b64..3431e3589cc 100644
--- a/lib/plugins/aws/deploy/lib/uploadArtifacts.js
+++ b/lib/plugins/aws/deploy/lib/uploadArtifacts.js
@@ -4,7 +4,7 @@ const _ = require('lodash');
 const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
-const BbPromise = require('bluebird');
+const limit = require('ext/promise/limit').bind(Promise);
 const filesize = require('filesize');
 const normalizeFiles = require('../../lib/normalizeFiles');
 const getLambdaLayerArtifactPath = require('../../utils/getLambdaLayerArtifactPath');
@@ -15,10 +15,9 @@ const MAX_CONCURRENT_ARTIFACTS_UPLOADS =
 
 module.exports = {
   async uploadArtifacts() {
-    return BbPromise.bind(this)
-      .then(this.uploadCloudFormationFile)
-      .then(this.uploadFunctionsAndLayers)
-      .then(this.uploadCustomResources);
+    await this.uploadCloudFormationFile();
+    await this.uploadFunctionsAndLayers();
+    await this.uploadCustomResources();
   },
 
   async uploadCloudFormationFile() {
@@ -140,28 +139,24 @@ module.exports = {
         .filter(Boolean)
     );
 
-    return BbPromise.map(
-      artifactFilePaths,
-      (artifactFilePath) => {
-        const stats = (() => {
-          try {
-            return fs.statSync(artifactFilePath);
-          } catch (error) {
-            throw new ServerlessError(
-              `Cannot read file artifact "${artifactFilePath}": ${error.message}`,
-              'INACCESSIBLE_FILE_ARTIFACT'
-            );
-          }
-        })();
-
-        const fileName = path.basename(artifactFilePath);
-        this.serverless.cli.log(
-          `Uploading service ${fileName} file to S3 (${filesize(stats.size)})...`
-        );
-        return this.uploadZipFile(artifactFilePath);
-      },
-      { concurrency: MAX_CONCURRENT_ARTIFACTS_UPLOADS }
-    );
+    const limitedUpload = limit(MAX_CONCURRENT_ARTIFACTS_UPLOADS, async (artifactFilePath) => {
+      const stats = (() => {
+        try {
+          return fs.statSync(artifactFilePath);
+        } catch (error) {
+          throw new ServerlessError(
+            `Cannot read file artifact "${artifactFilePath}": ${error.message}`,
+            'INACCESSIBLE_FILE_ARTIFACT'
+          );
+        }
+      })();
+      const fileName = path.basename(artifactFilePath);
+      this.serverless.cli.log(
+        `Uploading service ${fileName} file to S3 (${filesize(stats.size)})...`
+      );
+      return this.uploadZipFile(artifactFilePath);
+    });
+    await Promise.all(artifactFilePaths.map((file) => limitedUpload(file)));
   },
 
   async uploadCustomResources() {
@@ -173,10 +168,8 @@ module.exports = {
 
     if (this.serverless.utils.fileExistsSync(artifactFilePath)) {
       this.serverless.cli.log('Uploading custom CloudFormation resources...');
-      return this.uploadZipFile(artifactFilePath);
+      await this.uploadZipFile(artifactFilePath);
     }
-
-    return BbPromise.resolve();
   },
 };
 
diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
index 948a7ffd16c..d06bf400efb 100644
--- a/lib/plugins/aws/package/index.js
+++ b/lib/plugins/aws/package/index.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const BbPromise = require('bluebird');
 const path = require('path');
 const mergeCustomProviderResources = require('./lib/mergeCustomProviderResources');
 const stripNullPropsFromTemplateResources = require('./lib/stripNullPropsFromTemplateResources');
@@ -59,10 +58,10 @@ class AwsPackage {
       /**
        * Outer lifecycle hooks
        */
-      'package:cleanup': async () =>
-        BbPromise.bind(this)
-          .then(() => this.serverless.pluginManager.spawn('aws:common:validate'))
-          .then(() => this.serverless.pluginManager.spawn('aws:common:cleanupTempDir')),
+      'package:cleanup': async () => {
+        await this.serverless.pluginManager.spawn('aws:common:validate');
+        await this.serverless.pluginManager.spawn('aws:common:cleanupTempDir');
+      },
 
       'package:initialize': async () => {
         if (this.serverless.service.provider.disableDefaultOutputExportNames) {
@@ -77,16 +76,11 @@ class AwsPackage {
 
       'package:setupProviderConfiguration': () => this.mergeIamTemplates(),
 
-      'before:package:compileFunctions': async () =>
-        BbPromise.bind(this).then(this.generateArtifactDirectoryName),
+      'before:package:compileFunctions': async () => this.generateArtifactDirectoryName(),
 
-      'before:package:compileLayers': async () =>
-        BbPromise.bind(this).then(this.generateArtifactDirectoryName),
+      'before:package:compileLayers': async () => this.generateArtifactDirectoryName(),
 
-      'package:finalize': async () =>
-        BbPromise.bind(this).then(() =>
-          this.serverless.pluginManager.spawn('aws:package:finalize')
-        ),
+      'package:finalize': async () => this.serverless.pluginManager.spawn('aws:package:finalize'),
 
       /**
        * Inner lifecycle hooks
@@ -98,7 +92,7 @@ class AwsPackage {
       },
 
       'aws:package:finalize:mergeCustomProviderResources': async () =>
-        BbPromise.bind(this).then(this.mergeCustomProviderResources),
+        this.mergeCustomProviderResources(),
 
       'aws:package:finalize:stripNullPropsFromTemplateResources': () =>
         this.stripNullPropsFromTemplateResources(),
diff --git a/lib/plugins/aws/rollback.js b/lib/plugins/aws/rollback.js
index 0ad026b3f08..1e8be2e9c86 100644
--- a/lib/plugins/aws/rollback.js
+++ b/lib/plugins/aws/rollback.js
@@ -1,11 +1,10 @@
 'use strict';
-
-const BbPromise = require('bluebird');
 const validate = require('./lib/validate');
 const setBucketName = require('./lib/setBucketName');
 const updateStack = require('./lib/updateStack');
 const monitorStack = require('./lib/monitorStack');
 const findAndGroupDeployments = require('./utils/findAndGroupDeployments');
+const ServerlessError = require('../../serverless-error');
 
 class AwsRollback {
   constructor(serverless, options) {
@@ -16,23 +15,23 @@ class AwsRollback {
     Object.assign(this, validate, setBucketName, updateStack, monitorStack);
 
     this.hooks = {
-      'before:rollback:initialize': async () => BbPromise.bind(this).then(this.validate),
+      'before:rollback:initialize': async () => this.validate(),
+
       'rollback:rollback': async () => {
         if (!this.options.timestamp) {
-          const command = this.serverless.pluginManager.spawn('deploy:list');
           this.serverless.cli.log(
             [
               'Use a timestamp from the deploy list below to rollback to a specific version.',
               'Run `sls rollback -t YourTimeStampHere`',
             ].join('\n')
           );
-          return command;
+          await this.serverless.pluginManager.spawn('deploy:list');
+          return;
         }
 
-        return BbPromise.bind(this)
-          .then(this.setBucketName)
-          .then(this.setStackToUpdate)
-          .then(this.updateStack);
+        await this.setBucketName();
+        await this.setStackToUpdate();
+        await this.updateStack();
       },
     };
   }
@@ -44,45 +43,41 @@ class AwsRollback {
     const deploymentPrefix = this.provider.getDeploymentPrefix();
     const prefix = `${deploymentPrefix}/${serviceName}/${stage}`;
 
-    return this.provider
-      .request('S3', 'listObjectsV2', {
-        Bucket: this.bucketName,
-        Prefix: prefix,
-      })
-      .then((response) => {
-        const deployments = findAndGroupDeployments(response, deploymentPrefix, serviceName, stage);
+    const response = await this.provider.request('S3', 'listObjectsV2', {
+      Bucket: this.bucketName,
+      Prefix: prefix,
+    });
+    const deployments = findAndGroupDeployments(response, deploymentPrefix, serviceName, stage);
 
-        if (deployments.length === 0) {
-          const msg = "Couldn't find any existing deployments.";
-          const hint = 'Please verify that stage and region are correct.';
-          return BbPromise.reject(`${msg} ${hint}`);
-        }
+    if (deployments.length === 0) {
+      const msg = "Couldn't find any existing deployments.";
+      const hint = 'Please verify that stage and region are correct.';
+      throw new ServerlessError(`${msg} ${hint}`, 'ROLLBACK_DEPLOYMENTS_NOT_FOUND');
+    }
 
-        let date = new Date(this.options.timestamp);
+    let date = new Date(this.options.timestamp);
 
-        // The if below is added due issues#5664 - Check it for more details
-        if (date instanceof Date === false || isNaN(date.valueOf())) {
-          date = new Date(Number(this.options.timestamp));
-        }
+    // The if below is added due issues#5664 - Check it for more details
+    if (date instanceof Date === false || isNaN(date.valueOf())) {
+      date = new Date(Number(this.options.timestamp));
+    }
 
-        const dateString = `${date.getTime().toString()}-${date.toISOString()}`;
-        const exists = deployments.some((deployment) =>
-          deployment.some(
-            (item) =>
-              item.directory === dateString &&
-              item.file === this.provider.naming.getCompiledTemplateS3Suffix()
-          )
-        );
+    const dateString = `${date.getTime().toString()}-${date.toISOString()}`;
+    const exists = deployments.some((deployment) =>
+      deployment.some(
+        (item) =>
+          item.directory === dateString &&
+          item.file === this.provider.naming.getCompiledTemplateS3Suffix()
+      )
+    );
 
-        if (!exists) {
-          const msg = `Couldn't find a deployment for the timestamp: ${this.options.timestamp}.`;
-          const hint = 'Please verify that the timestamp, stage and region are correct.';
-          return BbPromise.reject(`${msg} ${hint}`);
-        }
+    if (!exists) {
+      const msg = `Couldn't find a deployment for the timestamp: ${this.options.timestamp}.`;
+      const hint = 'Please verify that the timestamp, stage and region are correct.';
+      throw new ServerlessError(`${msg} ${hint}`, 'ROLLBACK_DEPLOYMENT_NOT_FOUND');
+    }
 
-        service.package.artifactDirectoryName = `${prefix}/${dateString}`;
-        return BbPromise.resolve();
-      });
+    service.package.artifactDirectoryName = `${prefix}/${dateString}`;
   }
 }
 
diff --git a/package.json b/package.json
index d1cfb63ffba..0cca1486150 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "dotenv": "^10.0.0",
     "dotenv-expand": "^5.1.0",
     "essentials": "^1.1.1",
+    "ext": "^1.5.0",
     "fastest-levenshtein": "^1.0.12",
     "filesize": "^7.0.0",
     "fs-extra": "^9.1.0",
diff --git a/test/unit/lib/plugins/aws/rollback.test.js b/test/unit/lib/plugins/aws/rollback.test.js
index 0abdc97f6b1..b0f0d27c289 100644
--- a/test/unit/lib/plugins/aws/rollback.test.js
+++ b/test/unit/lib/plugins/aws/rollback.test.js
@@ -123,8 +123,8 @@ describe('AwsRollback', () => {
         .then(() => {
           assert.isNotOk(true, 'setStackToUpdate should not resolve');
         })
-        .catch((errorMessage) => {
-          expect(errorMessage).to.include("Couldn't find any existing deployments");
+        .catch((error) => {
+          expect(error.code).to.equal('ROLLBACK_DEPLOYMENTS_NOT_FOUND');
           expect(listObjectsStub.calledOnce).to.be.equal(true);
           expect(
             listObjectsStub.calledWithExactly('S3', 'listObjectsV2', {
@@ -157,8 +157,8 @@ describe('AwsRollback', () => {
         .then(() => {
           assert.isNotOk(true, 'setStackToUpdate should not resolve');
         })
-        .catch((errorMessage) => {
-          expect(errorMessage).to.include("Couldn't find a deployment for the timestamp");
+        .catch((error) => {
+          expect(error.code).to.equal('ROLLBACK_DEPLOYMENT_NOT_FOUND');
           expect(listObjectsStub.calledOnce).to.be.equal(true);
           expect(
             listObjectsStub.calledWithExactly('S3', 'listObjectsV2', {

From afc9a13386479f79b4c9ef64b65af5bbcdfaa68b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Han=20Sang=20Hoon=20=28=ED=95=9C=EC=83=81=ED=9B=88=29?=
 <s2peters2@naver.com>
Date: Tue, 24 Aug 2021 20:41:08 +0900
Subject: [PATCH 0404/1101] feat(AWS Lambda): Prevent external subscription
 filter removal (#9839)

---
 lib/plugins/aws/deploy/lib/checkForChanges.js | 110 +++++----
 .../aws/deploy/lib/checkForChanges.test.js    | 220 +++++++++++++++---
 2 files changed, 252 insertions(+), 78 deletions(-)

diff --git a/lib/plugins/aws/deploy/lib/checkForChanges.js b/lib/plugins/aws/deploy/lib/checkForChanges.js
index 22f1cd2be2f..03e6c3f40e7 100644
--- a/lib/plugins/aws/deploy/lib/checkForChanges.js
+++ b/lib/plugins/aws/deploy/lib/checkForChanges.js
@@ -267,10 +267,20 @@ module.exports = {
       return false;
     }
 
-    const oldSubscriptionFilters = response.subscriptionFilters.map((subscriptionFilter) => ({
-      ...subscriptionFilter,
-      logicalId: this.getLogicalIdFromFilterName(subscriptionFilter.filterName),
-    }));
+    const stackName = this.provider.naming.getStackName();
+    const oldSubscriptionFilters = await Promise.all(
+      response.subscriptionFilters.map(async (subscriptionFilter) => {
+        const { destinationArn, filterName } = subscriptionFilter;
+        const logicalId = this.getLogicalIdFromFilterName(filterName);
+        const isInternal = await this.isInternalSubscriptionFilter(
+          stackName,
+          logicalId,
+          filterName
+        );
+
+        return { destinationArn, logicalId, filterName, isInternal };
+      })
+    );
 
     const newSubscriptionFilters = cloudwatchLogEvents.map((cloudwatchLogEvent) => {
       const destinationArn = `arn:${partition}:lambda:${region}:${accountId}:function:${cloudwatchLogEvent.FunctionName}`;
@@ -279,59 +289,48 @@ module.exports = {
         cloudwatchLogEvent.logSubscriptionSerialNumber
       );
 
-      return {
-        destinationArn,
-        logicalId,
-      };
+      return { destinationArn, logicalId };
     });
 
-    const sameDestinationArn = (sf1, sf2) => sf1.destinationArn === sf2.destinationArn;
-    const sameLogicalId = (sf1, sf2) => sf1.logicalId === sf2.logicalId;
-
-    // Old subscription filters which don't have the same destination as any of the new subscription filters.
-    // Currently, these kinds of subscription filters are deleted.
-    // In the future, the behavior will change to not delete filters that were set up externally.
-    const notMatchedOldSubscriptionFilters = oldSubscriptionFilters.filter(
-      (oldSubscriptionFilter) => {
-        const destinationMatchNewSubscriptionFilter = newSubscriptionFilters.find(
-          (newSubscriptionFilter) =>
-            sameDestinationArn(newSubscriptionFilter, oldSubscriptionFilter)
-        );
-        return !destinationMatchNewSubscriptionFilter;
-      }
+    // If subscription filters defined externally cause a situation where we cannot create all
+    // subscription filters defined as a part of current service, we want to throw an error
+    // instead of silently removing external filters.
+    const externalOldSubscriptionFilters = oldSubscriptionFilters.filter(
+      (oldSubscriptionFilter) => !oldSubscriptionFilter.isInternal
     );
-
-    const numOfSubscriptionFiltersToDelete =
-      notMatchedOldSubscriptionFilters.length +
-      newSubscriptionFilters.length -
-      CLOUDWATCHLOG_LOG_GROUP_EVENT_PER_FUNCTION_LIMIT;
-    if (numOfSubscriptionFiltersToDelete > 0) {
-      await Promise.all(
-        notMatchedOldSubscriptionFilters
-          .slice(0, numOfSubscriptionFiltersToDelete)
-          .map((oldSubscriptionFilter) =>
-            this.provider.request('CloudWatchLogs', 'deleteSubscriptionFilter', {
-              logGroupName,
-              filterName: oldSubscriptionFilter.filterName,
-            })
-          )
+    if (
+      externalOldSubscriptionFilters.length + newSubscriptionFilters.length >
+      CLOUDWATCHLOG_LOG_GROUP_EVENT_PER_FUNCTION_LIMIT
+    ) {
+      const errorMessage = [
+        `Only ${CLOUDWATCHLOG_LOG_GROUP_EVENT_PER_FUNCTION_LIMIT} subscription filters can be configured per log group.`,
+        ` There are subscription filters defined outside of the service definition for "${logGroupName}" that have to be deleted manually.`,
+      ].join('');
+      throw new ServerlessError(
+        errorMessage,
+        'CLOUDWATCHLOG_LOG_GROUP_EVENT_PER_FUNCTION_LIMIT_EXCEEDED'
       );
     }
 
-    // Old subscription filters which have same destination with one of the new subscription filter, but index of log event in function has been changed.
-    // If log event order changed, we should delete old subscription filters before creation.
-    const logEventOrderChangedOldSubscriptionFilters = oldSubscriptionFilters.filter(
-      (oldSubscriptionFilter) => {
-        const logEventOrderChangedNewSubscriptionFilter = newSubscriptionFilters.find(
-          (newSubscriptionFilter) =>
-            sameDestinationArn(newSubscriptionFilter, oldSubscriptionFilter) &&
-            !sameLogicalId(newSubscriptionFilter, oldSubscriptionFilter)
+    const sameDestinationArn = (sf1, sf2) => sf1.destinationArn === sf2.destinationArn;
+    const sameLogicalId = (sf1, sf2) => sf1.logicalId === sf2.logicalId;
+    const subscriptionFilterComparator = (sf1, sf2) =>
+      sameDestinationArn(sf1, sf2) && sameLogicalId(sf1, sf2);
+
+    const internalOldSubscriptionFilters = oldSubscriptionFilters.filter(
+      (oldSubscriptionFilter) => oldSubscriptionFilter.isInternal
+    );
+    const notMatchedInternalOldSubscriptionFilters = internalOldSubscriptionFilters.filter(
+      (internalOldSubscriptionFilter) => {
+        const matchNewSubscriptionFilter = newSubscriptionFilters.find((newSubscriptionFilter) =>
+          subscriptionFilterComparator(newSubscriptionFilter, internalOldSubscriptionFilter)
         );
-        return logEventOrderChangedNewSubscriptionFilter;
+        return !matchNewSubscriptionFilter;
       }
     );
+
     return Promise.all(
-      logEventOrderChangedOldSubscriptionFilters.map((oldSubscriptionFilter) =>
+      notMatchedInternalOldSubscriptionFilters.map((oldSubscriptionFilter) =>
         this.provider.request('CloudWatchLogs', 'deleteSubscriptionFilter', {
           logGroupName,
           filterName: oldSubscriptionFilter.filterName,
@@ -347,4 +346,21 @@ module.exports = {
     const split = filterName.split('-');
     return split[split.length - 2];
   },
+
+  async isInternalSubscriptionFilter(stackName, logicalResourceId, physicalResourceId) {
+    try {
+      const { StackResourceDetail } = await this.provider.request(
+        'CloudFormation',
+        'describeStackResource',
+        {
+          StackName: stackName,
+          LogicalResourceId: logicalResourceId,
+        }
+      );
+
+      return physicalResourceId === StackResourceDetail.PhysicalResourceId;
+    } catch {
+      return false;
+    }
+  },
 };
diff --git a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
index c90aefc2f13..de6acb0832f 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
@@ -1176,6 +1176,27 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
             listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
             headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
           },
+          CloudFormation: {
+            ...commonAwsSdkMock.CloudFormation,
+            describeStackResource: sandbox
+              .stub()
+              .onFirstCall()
+              .resolves({
+                StackResourceDetail: { PhysicalResourceId: 'deployment-bucket' },
+              })
+              .callsFake(async (params) => {
+                const naming = serverless.getProvider('aws').naming;
+                return {
+                  StackResourceDetail: {
+                    StackName: naming.getStackName(),
+                    LogicalResourceId: params.LogicalResourceId,
+                    PhysicalResourceId: `${naming.getStackName()}-${
+                      params.LogicalResourceId
+                    }-xxxxx`,
+                  },
+                };
+              }),
+          },
           CloudWatchLogs: {
             deleteSubscriptionFilter: deleteStub,
             describeSubscriptionFilters: async () => {
@@ -1192,9 +1213,66 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
                     )}-xxxxx`,
                     destinationArn: `arn:aws:lambda:us-east-1:999999999999:function:${functionName}`,
                   },
+                ],
+              };
+            },
+          },
+        },
+      });
+      expect(deleteStub).to.not.have.been.called;
+    });
+
+    it('should not attempt to delete filter for 2 subscription filter per log group include externals', async () => {
+      const deleteStub = sandbox.stub();
+      let serverless;
+      await runServerless({
+        fixture: 'checkForChanges',
+        command: 'deploy',
+        configExt: {
+          functions: { fn1: { events: [{ cloudwatchLog: 'someLogGroupName' }] } },
+        },
+        lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
+        env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
+        hooks: {
+          beforeInstanceInit: (serverlessInstance) => (serverless = serverlessInstance),
+        },
+        awsRequestStubMap: {
+          ...commonAwsSdkMock,
+          Lambda: {
+            getFunction: { Configuration: { LastModified: '2021-05-20T15:34:16.494+0000' } },
+          },
+          S3: {
+            listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
+            headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
+          },
+          CloudFormation: {
+            ...commonAwsSdkMock.CloudFormation,
+            describeStackResource: sandbox
+              .stub()
+              .onFirstCall()
+              .resolves({
+                StackResourceDetail: { PhysicalResourceId: 'deployment-bucket' },
+              })
+              .callsFake(async (params) => {
+                const naming = serverless.getProvider('aws').naming;
+                throw new Error(
+                  `Resource ${
+                    params.LogicalResourceId
+                  } does not exist for stack ${naming.getStackName()}`
+                );
+              }),
+          },
+          CloudWatchLogs: {
+            deleteSubscriptionFilter: deleteStub,
+            describeSubscriptionFilters: async () => {
+              const naming = serverless.getProvider('aws').naming;
+              return {
+                subscriptionFilters: [
                   {
-                    filterName: `${naming.getStackName()}-${naming.getCloudWatchLogLogicalId(
-                      'Fn2',
+                    // destinationArn `arn:{partition}:lambda:{region}:{accountId}:function:{functionName}`
+                    // filterName {stack name}-{logical id}-{random alphanumeric characters}
+                    filterName: `external-stack-dev-${naming.getCloudWatchLogLogicalId(
+                      'Fn1',
                       1
                     )}-xxxxx`,
                     destinationArn:
@@ -1209,14 +1287,21 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
       expect(deleteStub).to.not.have.been.called;
     });
 
-    it('should not attempt to delete filter by 2 subscription filter per log group', async () => {
+    it('should throw an error if external defined subscription filter cause over 2 subscription filter per log group.', async () => {
       const deleteStub = sandbox.stub();
       let serverless;
-      await runServerless({
+      const promise = runServerless({
         fixture: 'checkForChanges',
         command: 'deploy',
         configExt: {
-          functions: { fn1: { events: [{ cloudwatchLog: 'someLogGroupName' }] } },
+          functions: {
+            fn1: {
+              events: [
+                { cloudwatchLog: 'someLogGroupName' },
+                { cloudwatchLog: 'someLogGroupName' },
+              ],
+            },
+          },
         },
         lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
         env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
@@ -1232,6 +1317,23 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
             listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
             headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
           },
+          CloudFormation: {
+            ...commonAwsSdkMock.CloudFormation,
+            describeStackResource: sandbox
+              .stub()
+              .onFirstCall()
+              .resolves({
+                StackResourceDetail: { PhysicalResourceId: 'deployment-bucket' },
+              })
+              .callsFake(async (params) => {
+                const naming = serverless.getProvider('aws').naming;
+                throw new Error(
+                  `Resource ${
+                    params.LogicalResourceId
+                  } does not exist for stack ${naming.getStackName()}`
+                );
+              }),
+          },
           CloudWatchLogs: {
             deleteSubscriptionFilter: deleteStub,
             describeSubscriptionFilters: async () => {
@@ -1241,7 +1343,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
                   {
                     // destinationArn `arn:{partition}:lambda:{region}:{accountId}:function:{functionName}`
                     // filterName {stack name}-{logical id}-{random alphanumeric characters}
-                    filterName: `${naming.getStackName()}-${naming.getCloudWatchLogLogicalId(
+                    filterName: `external-stack-dev-${naming.getCloudWatchLogLogicalId(
                       'Fn1',
                       1
                     )}-xxxxx`,
@@ -1254,10 +1356,14 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
           },
         },
       });
-      expect(deleteStub).to.not.have.been.called;
+
+      await expect(promise).to.eventually.be.rejected.and.have.property(
+        'code',
+        'CLOUDWATCHLOG_LOG_GROUP_EVENT_PER_FUNCTION_LIMIT_EXCEEDED'
+      );
     });
 
-    it('should attempt to delete filter over 2 subscription filter per log group', async () => {
+    it('should attempt to delete subscription filter not match as any of new subscription filter', async () => {
       const deleteStub = sandbox.stub();
       let serverless;
       const { awsNaming } = await runServerless({
@@ -1280,6 +1386,27 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
             listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
             headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
           },
+          CloudFormation: {
+            ...commonAwsSdkMock.CloudFormation,
+            describeStackResource: sandbox
+              .stub()
+              .onFirstCall()
+              .resolves({
+                StackResourceDetail: { PhysicalResourceId: 'deployment-bucket' },
+              })
+              .callsFake(async (params) => {
+                const naming = serverless.getProvider('aws').naming;
+                return {
+                  StackResourceDetail: {
+                    StackName: naming.getStackName(),
+                    LogicalResourceId: params.LogicalResourceId,
+                    PhysicalResourceId: `${naming.getStackName()}-${
+                      params.LogicalResourceId
+                    }-xxxxx`,
+                  },
+                };
+              }),
+          },
           CloudWatchLogs: {
             deleteSubscriptionFilter: deleteStub,
             describeSubscriptionFilters: async () => {
@@ -1296,15 +1423,6 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
                     destinationArn:
                       'arn:aws:lambda:us-east-1:999999999999:function:test-checkForChanges-cdr3ogg-dev-fn1',
                   },
-                  {
-                    filterName: `${naming.getStackName()}-${naming.getCloudWatchLogLogicalId(
-                      'Fn2',
-                      2
-                    )}-xxxxx`,
-                    destinationArn: `arn:aws:lambda:us-east-1:999999999999:function:${
-                      serverless.service.getFunction('fn1').name
-                    }`,
-                  },
                 ],
               };
             },
@@ -1315,7 +1433,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
         logGroupName: 'someLogGroupName',
         filterName: `${awsNaming.getStackName()}-${awsNaming.getCloudWatchLogLogicalId(
           'Fn2',
-          2
+          1
         )}-xxxxx`,
       });
     });
@@ -1350,12 +1468,34 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
             listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
             headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
           },
+          CloudFormation: {
+            ...commonAwsSdkMock.CloudFormation,
+            describeStackResource: sandbox
+              .stub()
+              .onFirstCall()
+              .resolves({
+                StackResourceDetail: { PhysicalResourceId: 'deployment-bucket' },
+              })
+              .callsFake(async (params) => {
+                const naming = serverless.getProvider('aws').naming;
+                return {
+                  StackResourceDetail: {
+                    StackName: naming.getStackName(),
+                    LogicalResourceId: params.LogicalResourceId,
+                    PhysicalResourceId: `${naming.getStackName()}-${
+                      params.LogicalResourceId
+                    }-xxxxx`,
+                  },
+                };
+              }),
+          },
           CloudWatchLogs: {
             deleteSubscriptionFilter: deleteStub,
             describeSubscriptionFilters: sandbox
               .stub()
               .onFirstCall()
               .callsFake(async () => {
+                const functionName = serverless.service.getFunction('fn1').name;
                 const naming = serverless.getProvider('aws').naming;
                 return {
                   subscriptionFilters: [
@@ -1364,27 +1504,24 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
                         'Fn1',
                         1
                       )}-xxxxx`,
-                      destinationArn: `arn:aws:lambda:us-east-1:999999999999:function:${
-                        serverless.service.getFunction('fn1').name
-                      }`,
+                      destinationArn: `arn:aws:lambda:us-east-1:999999999999:function:${functionName}`,
                     },
                   ],
                 };
               })
               .onSecondCall()
               .callsFake(async () => {
+                const functionName = serverless.service.getFunction('fn1').name;
                 const naming = serverless.getProvider('aws').naming;
                 return {
                   subscriptionFilters: [
                     {
-                      // someLogGroupeName2 was previously the third event
+                      // someLogGroupeName2 was previously the first event
                       filterName: `${naming.getStackName()}-${naming.getCloudWatchLogLogicalId(
                         'Fn1',
                         1
                       )}-xxxxx`,
-                      destinationArn: `arn:aws:lambda:us-east-1:999999999999:function:${
-                        serverless.service.getFunction('fn1').name
-                      }`,
+                      destinationArn: `arn:aws:lambda:us-east-1:999999999999:function:${functionName}`,
                     },
                   ],
                 };
@@ -1431,6 +1568,27 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
             listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
             headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
           },
+          CloudFormation: {
+            ...commonAwsSdkMock.CloudFormation,
+            describeStackResource: sandbox
+              .stub()
+              .onFirstCall()
+              .resolves({
+                StackResourceDetail: { PhysicalResourceId: 'deployment-bucket' },
+              })
+              .callsFake(async (params) => {
+                const naming = serverless.getProvider('aws').naming;
+                return {
+                  StackResourceDetail: {
+                    StackName: naming.getStackName(),
+                    LogicalResourceId: params.LogicalResourceId,
+                    PhysicalResourceId: `${naming.getStackName()}-${
+                      params.LogicalResourceId
+                    }-xxxxx`,
+                  },
+                };
+              }),
+          },
           CloudWatchLogs: {
             deleteSubscriptionFilter: deleteStub,
             describeSubscriptionFilters: sandbox
@@ -1442,19 +1600,19 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
                   subscriptionFilters: [
                     {
                       filterName: `${naming.getStackName()}-${naming.getCloudWatchLogLogicalId(
-                        'Fn1',
+                        'Fn2',
                         1
                       )}-xxxxx`,
                       destinationArn:
-                        'arn:aws:lambda:us-east-1:999999999999:function:test-checkForChanges-cdr3ogg-dev-fn1',
+                        'arn:aws:lambda:us-east-1:999999999999:function:test-checkForChanges-cdr3ogg-dev-fn2',
                     },
                     {
                       filterName: `${naming.getStackName()}-${naming.getCloudWatchLogLogicalId(
-                        'Fn1',
+                        'Fn2',
                         2
                       )}-xxxxx`,
                       destinationArn:
-                        'arn:aws:lambda:us-east-1:999999999999:function:test-checkForChanges-cdr3ogg-dev-fn1',
+                        'arn:aws:lambda:us-east-1:999999999999:function:test-checkForChanges-cdr3ogg-dev-fn2',
                     },
                   ],
                 };
@@ -1467,14 +1625,14 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
       expect(deleteStub).to.have.been.calledWith({
         logGroupName: 'someLogGroupName',
         filterName: `${awsNaming.getStackName()}-${awsNaming.getCloudWatchLogLogicalId(
-          'Fn1',
+          'Fn2',
           1
         )}-xxxxx`,
       });
       expect(deleteStub).to.have.been.calledWith({
         logGroupName: 'someLogGroupName',
         filterName: `${awsNaming.getStackName()}-${awsNaming.getCloudWatchLogLogicalId(
-          'Fn1',
+          'Fn2',
           2
         )}-xxxxx`,
       });

From f69a19c6804366a34324e7cfcbbdb3f247a12b85 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 24 Aug 2021 13:50:00 +0200
Subject: [PATCH 0405/1101] feat(CLI Onboarding): Improve onboarding messaging

---
 lib/cli/interactive-setup/dashboard-login.js  |  4 +++-
 .../interactive-setup/dashboard-set-org.js    |  2 +-
 .../interactive-setup/dashboard-login.test.js | 23 +++++++++++++++++--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/lib/cli/interactive-setup/dashboard-login.js b/lib/cli/interactive-setup/dashboard-login.js
index 10203d0922c..c9c94d5bf43 100644
--- a/lib/cli/interactive-setup/dashboard-login.js
+++ b/lib/cli/interactive-setup/dashboard-login.js
@@ -64,7 +64,9 @@ module.exports = {
     return !isLoggedIn;
   },
   async run(context) {
-    process.stdout.write('You are not logged in or you do not have a Serverless account.\n\n');
+    process.stdout.write(
+      'Enable Serverless Dashboard to get enhanced monitoring, logs and secrets management: https://serverless.com/monitoring\n\n'
+    );
     return steps.loginOrRegister(context);
   },
   steps,
diff --git a/lib/cli/interactive-setup/dashboard-set-org.js b/lib/cli/interactive-setup/dashboard-set-org.js
index 382adeb51f0..20b641d208a 100644
--- a/lib/cli/interactive-setup/dashboard-set-org.js
+++ b/lib/cli/interactive-setup/dashboard-set-org.js
@@ -51,7 +51,7 @@ const appUpdateConfirm = async (appName, orgName, stepHistory) => {
 
 const orgsChoice = async (orgNames, stepHistory) => {
   const orgName = await promptWithHistory({
-    message: 'What org do you want to add this to?',
+    message: 'What org do you want to add this service to?',
     type: 'list',
     name: 'orgName',
     choices: [...orgNames, { name: '[Skip]', value: '_skip_' }],
diff --git a/test/unit/lib/cli/interactive-setup/dashboard-login.test.js b/test/unit/lib/cli/interactive-setup/dashboard-login.test.js
index 08370618a62..3b4b27edd89 100644
--- a/test/unit/lib/cli/interactive-setup/dashboard-login.test.js
+++ b/test/unit/lib/cli/interactive-setup/dashboard-login.test.js
@@ -5,6 +5,7 @@ const sinon = require('sinon');
 const proxyquire = require('proxyquire');
 const overrideCwd = require('process-utils/override-cwd');
 const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
+const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const { StepHistory } = require('@serverless/utils/telemetry');
 const inquirer = require('@serverless/utils/inquirer');
 
@@ -118,11 +119,20 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-login.test.js', function
       inquirer,
       stepHistory: new StepHistory(),
     };
-    await loginStep.run(context);
+    let stdoutData = '';
+    await overrideStdoutWrite(
+      (data) => (stdoutData += data),
+      async () => {
+        await loginStep.run(context);
+      }
+    );
     expect(loginStub.calledOnce).to.be.true;
     expect(context.stepHistory.valuesMap()).to.deep.equal(
       new Map([['shouldLoginOrRegister', true]])
     );
+    expect(stdoutData).to.include(
+      'Enable Serverless Dashboard to get enhanced monitoring, logs and secrets management: https://serverless.com/monitoring'
+    );
   });
 
   it('Should not login when user decides not to login/register', async () => {
@@ -143,10 +153,19 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-login.test.js', function
       inquirer,
       stepHistory: new StepHistory(),
     };
-    await loginStep.run(context);
+    let stdoutData = '';
+    await overrideStdoutWrite(
+      (data) => (stdoutData += data),
+      async () => {
+        await loginStep.run(context);
+      }
+    );
     expect(loginStub.called).to.be.false;
     expect(context.stepHistory.valuesMap()).to.deep.equal(
       new Map([['shouldLoginOrRegister', false]])
     );
+    expect(stdoutData).to.include(
+      'Enable Serverless Dashboard to get enhanced monitoring, logs and secrets management: https://serverless.com/monitoring'
+    );
   });
 });

From cc1693ce7bdefd4db57a6f346fb5f80cbd2abc0b Mon Sep 17 00:00:00 2001
From: Joseph Cha <josephcha4@gmail.com>
Date: Tue, 24 Aug 2021 23:27:27 +1000
Subject: [PATCH 0406/1101] chore: Refactor `provider.role` tests (#9869)

---
 .../aws/package/compile/functions.test.js     | 167 ++++--------------
 1 file changed, 37 insertions(+), 130 deletions(-)

diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index 81b6db91e97..1c9d1a078b9 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -163,54 +163,6 @@ describe('AwsCompileFunctions', () => {
       });
     });
 
-    it('should add a logical role name provider role', () => {
-      awsCompileFunctions.serverless.service.provider.name = 'aws';
-      awsCompileFunctions.serverless.service.provider.role = 'LogicalNameRole';
-      awsCompileFunctions.serverless.service.functions = {
-        func: {
-          handler: 'func.function.handler',
-          name: 'new-service-dev-func',
-        },
-      };
-
-      return expect(awsCompileFunctions.compileFunctions()).to.be.fulfilled.then(() => {
-        expect(
-          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FuncLambdaFunction.DependsOn
-        ).to.deep.equal(['FuncLogGroup', 'LogicalNameRole']);
-        expect(
-          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FuncLambdaFunction.Properties.Role
-        ).to.deep.equal({
-          'Fn::GetAtt': [awsCompileFunctions.serverless.service.provider.role, 'Arn'],
-        });
-      });
-    });
-
-    it('should add a "Fn::GetAtt" Object provider role', () => {
-      awsCompileFunctions.serverless.service.provider.name = 'aws';
-      awsCompileFunctions.serverless.service.provider.role = {
-        'Fn::GetAtt': ['LogicalRoleName', 'Arn'],
-      };
-      awsCompileFunctions.serverless.service.functions = {
-        func: {
-          handler: 'func.function.handler',
-          name: 'new-service-dev-func',
-        },
-      };
-
-      return expect(awsCompileFunctions.compileFunctions()).to.be.fulfilled.then(() => {
-        expect(
-          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FuncLambdaFunction.DependsOn
-        ).to.deep.equal(['FuncLogGroup', 'LogicalRoleName']);
-        expect(
-          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FuncLambdaFunction.Properties.Role
-        ).to.deep.equal(awsCompileFunctions.serverless.service.provider.role);
-      });
-    });
-
     it('should add an ARN function role', () => {
       awsCompileFunctions.serverless.service.provider.name = 'aws';
       awsCompileFunctions.serverless.service.functions = {
@@ -1283,72 +1235,6 @@ describe('AwsCompileFunctions', () => {
   });
 
   describe('#compileRole()', () => {
-    it('adds the default role without DependsOn values', () => {
-      const role = 'IamRoleLambdaExecution';
-      const resource = { Properties: {} };
-      awsCompileFunctions.compileRole(resource, role);
-
-      expect(resource).to.deep.equal({
-        Properties: {
-          Role: {
-            'Fn::GetAtt': [role, 'Arn'],
-          },
-        },
-      });
-    });
-
-    it('adds a role based on a logical name with DependsOn values', () => {
-      const role = 'LogicalRoleName';
-      const resource = { Properties: {} };
-      awsCompileFunctions.compileRole(resource, role);
-
-      expect(resource).to.deep.equal({
-        DependsOn: [role],
-        Properties: {
-          Role: {
-            'Fn::GetAtt': [role, 'Arn'],
-          },
-        },
-      });
-    });
-
-    it('adds a role based on a Fn::GetAtt with DependsOn values', () => {
-      const role = { 'Fn::GetAtt': ['Foo', 'Arn'] };
-      const resource = { Properties: {} };
-      awsCompileFunctions.compileRole(resource, role);
-
-      expect(resource).to.deep.equal({
-        DependsOn: ['Foo'],
-        Properties: {
-          Role: role,
-        },
-      });
-    });
-
-    it('adds a role based on a Fn::ImportValue', () => {
-      const role = { 'Fn::ImportValue': 'Foo' };
-      const resource = { Properties: {} };
-      awsCompileFunctions.compileRole(resource, role);
-
-      expect(resource).to.deep.equal({
-        Properties: {
-          Role: role,
-        },
-      });
-    });
-
-    it('adds a role based on a predefined arn string', () => {
-      const role = 'arn:aws:xxx:*:*';
-      const resource = { Properties: {} };
-      awsCompileFunctions.compileRole(resource, role);
-
-      expect(resource).to.deep.equal({
-        Properties: {
-          Role: role,
-        },
-      });
-    });
-
     it('should not set unset properties when not specified in yml (layers, vpc, etc)', () => {
       const s3Folder = awsCompileFunctions.serverless.service.package.artifactDirectoryName;
       const s3FileName = awsCompileFunctions.serverless.service.package.artifact
@@ -1830,26 +1716,47 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
     });
   });
 
-  describe.skip('TODO: `provider.role` variants', () => {
-    // After addressing remove also:
-    // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L2222-L2286
-
+  describe('`provider.role` variants', () => {
     it('should support resource name', async () => {
-      await runServerless({ fixture: 'function', configExt: {}, command: 'package' });
-      // Replacement for
-      // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L235-L257
-      //
-      // Confirm that provider.role is refereenced at Function.Properties.Role
-      // and that it's added to function DependsOn
+      const { awsNaming, cfTemplate, fixtureData } = await runServerless({
+        fixture: 'function',
+        configExt: {
+          provider: {
+            iam: {
+              role: 'LogicalNameRole',
+            },
+          },
+        },
+        command: 'package',
+      });
+
+      const funcResource = cfTemplate.Resources[awsNaming.getLambdaLogicalId('foo')];
+      expect(funcResource.DependsOn).to.deep.equal(['FooLogGroup', 'LogicalNameRole']);
+      expect(funcResource.Properties.Role).to.deep.equal({
+        'Fn::GetAtt': [fixtureData.serviceConfig.provider.iam.role, 'Arn'],
+      });
     });
 
     it('should support Fn::GetAtt function', async () => {
-      await runServerless({ fixture: 'function', configExt: {}, command: 'package' });
-      // Replacement for
-      // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L259-L281
-      //
-      // Confirm that provider.role is refereenced at Function.Properties.Role
-      // and that it's added to function DependsOn
+      const { awsNaming, cfTemplate, fixtureData } = await runServerless({
+        fixture: 'function',
+        configExt: {
+          provider: {
+            iam: {
+              role: {
+                'Fn::GetAtt': ['LogicalNameRole', 'Arn'],
+              },
+            },
+          },
+        },
+        command: 'package',
+      });
+
+      const funcResource = cfTemplate.Resources[awsNaming.getLambdaLogicalId('foo')];
+      expect(funcResource.DependsOn).to.deep.equal(['FooLogGroup', 'LogicalNameRole']);
+      expect(funcResource.Properties.Role).to.deep.equal(
+        fixtureData.serviceConfig.provider.iam.role
+      );
     });
   });
 

From c6b5a5f4c6f206c2015267fd7c6b2ef9780c7dfd Mon Sep 17 00:00:00 2001
From: Jeong-Hee Kang <github@keizie.net>
Date: Tue, 24 Aug 2021 22:44:02 +0900
Subject: [PATCH 0407/1101] docs: Update `cloudfront.md` (#9878)

https://aws.amazon.com/about-aws/whats-new/2021/04/lambda-edge-support-node14/
---
 docs/providers/aws/events/cloudfront.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/providers/aws/events/cloudfront.md b/docs/providers/aws/events/cloudfront.md
index 29e1fe521bb..c5a6df39074 100644
--- a/docs/providers/aws/events/cloudfront.md
+++ b/docs/providers/aws/events/cloudfront.md
@@ -35,7 +35,7 @@ Lambda@Edge has four options when the Lambda function is triggered
 
 **MEMORY AND TIMEOUT LIMITS:** According to [AWS Limits on Lambda@Edge](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/cloudfront-limits.html#limits-lambda-at-edge) the limits for viewer-request and viewer-response are 128MB memory and 5 seconds timeout and for origin-request and origin-response are 3008MB memory and 30 seconds timeout.
 
-**RUNTIME LIMITS:** According to [AWS Requirements on Lambda@Edge](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/lambda-requirements-limits.html) the runtimes supported by Lambda@Edge functions are: `Python 3.8`, `Python 3.7`, `Node.js 12.x`, `Node.js 10.x`.
+**RUNTIME LIMITS:** According to [AWS Requirements on Lambda@Edge](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/lambda-requirements-limits.html) the runtimes supported by Lambda@Edge functions are: `Python 3.8`, `Python 3.7`, `Node.js 14.x`, `Node.js 12.x`, `Node.js 10.x`.
 
 ## Simple event definition
 

From ee17ee5aca25af152c2720a55199d92dfab3216d Mon Sep 17 00:00:00 2001
From: "Shane R. Spencer" <305301+whardier@users.noreply.github.com>
Date: Wed, 25 Aug 2021 00:59:28 -0800
Subject: [PATCH 0408/1101] feat(AWS Local Invocation): Support `python3.9`
 runtime (#9879)

---
 lib/plugins/aws/invokeLocal/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invokeLocal/index.js
index dda1ea3d6b8..cb079ecc3cc 100644
--- a/lib/plugins/aws/invokeLocal/index.js
+++ b/lib/plugins/aws/invokeLocal/index.js
@@ -245,7 +245,7 @@ class AwsInvokeLocal {
       );
     }
 
-    if (['python2.7', 'python3.6', 'python3.7', 'python3.8'].includes(runtime)) {
+    if (['python2.7', 'python3.6', 'python3.7', 'python3.8', 'python3.9'].includes(runtime)) {
       const handlerComponents = handler.split(/\./);
       const handlerPath = handlerComponents.slice(0, -1).join('.');
       const handlerName = handlerComponents.pop();

From 80e4624fb470330ee366a2ef55b4b984d4de64b2 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 25 Aug 2021 11:03:50 +0200
Subject: [PATCH 0409/1101] chore: Bump dependencies

---
 package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 0cca1486150..5e936424e5d 100644
--- a/package.json
+++ b/package.json
@@ -23,14 +23,14 @@
   },
   "dependencies": {
     "@serverless/cli": "^1.5.2",
-    "@serverless/components": "^3.15.1",
-    "@serverless/dashboard-plugin": "^5.4.3",
-    "@serverless/platform-client": "^4.2.6",
+    "@serverless/components": "^3.16.0",
+    "@serverless/dashboard-plugin": "^5.4.4",
+    "@serverless/platform-client": "^4.3.0",
     "@serverless/utils": "^5.7.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.970.0",
+    "aws-sdk": "^2.975.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
@@ -71,7 +71,7 @@
     "semver": "^7.3.5",
     "signal-exit": "^3.0.3",
     "tabtab": "^3.0.2",
-    "tar": "^6.1.8",
+    "tar": "^6.1.10",
     "timers-ext": "^0.1.7",
     "type": "^2.5.0",
     "untildify": "^4.0.0",
@@ -87,7 +87,7 @@
     "chai-as-promised": "^7.1.1",
     "cos-nodejs-sdk-v5": "^2.10.0",
     "eslint": "^7.32.0",
-    "eslint-plugin-import": "^2.24.0",
+    "eslint-plugin-import": "^2.24.2",
     "git-list-updated": "^1.2.1",
     "github-release-from-cc-changelog": "^2.2.0",
     "husky": "^4.3.8",

From 680b9d2479fef92ffdff4088cae529f8574017d9 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 25 Aug 2021 11:23:38 +0200
Subject: [PATCH 0410/1101] chore: Release 2.56.0

---
 CHANGELOG.md | 19 +++++++++++++++++++
 package.json |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19f5514e9c4..4eb7e5b9b68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,25 @@
 
 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.
 
+## [2.56.0](https://github.com/serverless/serverless/compare/v2.55.0...v2.56.0) (2021-08-25)
+
+### Features
+
+- **AWS EventBridge:** Support disabling a rule ([#9865](https://github.com/serverless/serverless/issues/9865)) ([6193d38](https://github.com/serverless/serverless/commit/6193d3867ec826898d4effbd641e49a35d9efbbc)) ([Jake Scott](https://github.com/jakejscott))
+- **AWS HTTP API:** Support `shouldStartNameWithService` option ([#9758](https://github.com/serverless/serverless/issues/9758)) ([ef5a8fa](https://github.com/serverless/serverless/commit/ef5a8faf13a8fbf8564e7c0621e88d1ea5357ea5)) ([Thiago Moraes](https://github.com/thiagomr))
+- **CLI Onboarding:** Improve onboarding messaging ([#9877](https://github.com/serverless/serverless/pull/9877)) ([f69a19c](https://github.com/serverless/serverless/commit/f69a19c6804366a34324e7cfcbbdb3f247a12b85)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **AWS HTTP API:** Always allow to define catch-all route ([#9840](https://github.com/serverless/serverless/issues/9840)) ([7e9bfd6](https://github.com/serverless/serverless/commit/7e9bfd63fce56f880a3ad0379fd97fdfce89d91b)) ([Karim Kanso](https://github.com/kazkansouh))
+- **CLI:** Mark `dashboard` command with optional service dependency ([#9874](https://github.com/serverless/serverless/pull/9874)) ([9a8e7e4](https://github.com/serverless/serverless/commit/9a8e7e44b44fdcf4c43d6e11c5eefa5051782506)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS Local Invocation:** Support `python3.9` runtime ([#9879](https://github.com/serverless/serverless/issues/9879)) ([ee17ee5](https://github.com/serverless/serverless/commit/ee17ee5aca25af152c2720a55199d92dfab3216d)) ([Shane R. Spencer](https://github.com/whardier))
+- **AWS Lambda:** Prevent external subscription filter removal for CloudWatch ([#9839](https://github.com/serverless/serverless/issues/9839)) ([afc9a13](https://github.com/serverless/serverless/commit/afc9a13386479f79b4c9ef64b65af5bbcdfaa68b)) ([Han Sang Hoon (한상훈)](https://github.com/poerty))
+
+### Maintenance Improvements
+
+- Convert `upload` and `rollback` to `async/await` ([#9866](https://github.com/serverless/serverless/issues/9866)) ([0682ba8](https://github.com/serverless/serverless/commit/0682ba8b6a70d27e74c478d6e5fa5de71b9e0070)) ([Remigiusz Orłowski](https://github.com/remi00))
+
 ## [2.55.0](https://github.com/serverless/serverless/compare/v2.54.0...v2.55.0) (2021-08-18)
 
 ### Features
diff --git a/package.json b/package.json
index 5e936424e5d..87fcbcfe90d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.55.0",
+  "version": "2.56.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 9a3f1e69979e5322772efb6bbc4f57c187537fcd Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <mariusz@medikoo.com>
Date: Wed, 25 Aug 2021 13:57:10 +0200
Subject: [PATCH 0411/1101] docs: Ensure to represent default as assigned value

Default is set to `5` -> https://github.com/serverless/serverless/blob/680b9d2479fef92ffdff4088cae529f8574017d9/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js#L12
---
 docs/providers/aws/guide/serverless.yml.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 5e6cd79a0a1..6d18e17f14d 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -53,7 +53,7 @@ provider:
     blockPublicAccess: true # Prevents public access via ACLs or bucket policies. Default is false
     skipPolicySetup: false # Prevents creation of default bucket policy when framework creates the deployment bucket. Default is false
     name: com.serverless.${self:provider.region}.deploys # Deployment bucket name. Default is generated by the framework
-    maxPreviousDeploymentArtifacts: 10 # On every deployment the framework prunes the bucket to remove artifacts older than this limit. The default is 5
+    maxPreviousDeploymentArtifacts: 5 # On every deployment the framework prunes the bucket to remove artifacts older than this limit. The default is 5
     serverSideEncryption: AES256 # server-side encryption method
     sseKMSKeyId: arn:aws:kms:us-east-1:xxxxxxxxxxxx:key/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa # when using server-side encryption
     sseCustomerAlgorithim: AES256 # when using server-side encryption and custom keys

From cb109dd835ec358bfb1af10fe8f82aa283ffbafe Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 27 Aug 2021 10:44:12 +0200
Subject: [PATCH 0412/1101] fix(AWS API Gateway): Fix request validator triage

---
 .../compile/events/apiGateway/lib/requestValidator.js     | 5 ++++-
 .../programmatic/requestParameters/serverless.yml         | 8 ++++++++
 .../events/apiGateway/lib/requestValidator.test.js        | 1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
index 05edee18b9b..e9497ec8c0b 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
@@ -21,7 +21,10 @@ module.exports = {
         event.http.request &&
         event.http.request.parameters &&
         // check if any parameters are marked as required
-        Object.values(event.http.request.parameters || {}).some((x) => x)
+        Object.values(event.http.request.parameters || {}).some((x) => {
+          if (!_.isObject(x)) return x;
+          return x.required != null ? x.required : true;
+        })
       ) {
         if (!validatorLogicalId) {
           const requestValidator = this.createRequestValidator();
diff --git a/test/fixtures/programmatic/requestParameters/serverless.yml b/test/fixtures/programmatic/requestParameters/serverless.yml
index 658673deebd..642dec642cb 100644
--- a/test/fixtures/programmatic/requestParameters/serverless.yml
+++ b/test/fixtures/programmatic/requestParameters/serverless.yml
@@ -47,6 +47,14 @@ functions:
             parameters:
               paths:
                 bar: false
+      - http:
+          path: paths-not-required-object
+          method: get
+          request:
+            parameters:
+              paths:
+                bar:
+                  required: false
       - http:
           path: paths-required
           method: get
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
index 5ce34f136d9..97924dcc01a 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
@@ -435,6 +435,7 @@ describe('#compileRequestValidators() - parameters', () => {
     'querystrings-not-required',
     'headers-not-required',
     'paths-not-required',
+    'paths-not-required-object',
   ];
 
   const withValidator = [

From 479569a1853cd2a0618ac391c1f6897094144d99 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 27 Aug 2021 14:02:19 +0200
Subject: [PATCH 0413/1101] test(Variables): Refactor util signature

---
 .../sources/instance-dependent/get-sls.test.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js b/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js
index f4f0b07e272..503189f4438 100644
--- a/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js
+++ b/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js
@@ -14,7 +14,7 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
   let variablesMeta;
   let serverlessInstance;
 
-  const initializeServerless = async (configExt, options) => {
+  const initializeServerless = async ({ configExt, options } = {}) => {
     configuration = {
       service: 'foo',
       provider: {
@@ -66,22 +66,24 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
     expect(configuration.custom.stage).to.equal('dev');
     // Resolves to provider.stage if it exists
     await initializeServerless({
-      provider: {
-        stage: 'prod',
+      configExt: {
+        provider: {
+          stage: 'prod',
+        },
       },
     });
     expect(configuration.custom.stage).to.equal('prod');
     // Resolves to `--stage=` if the option is set
-    await initializeServerless(
-      {
+    await initializeServerless({
+      configExt: {
         provider: {
           stage: 'prod',
         },
       },
-      {
+      options: {
         stage: 'staging',
-      }
-    );
+      },
+    });
     expect(configuration.custom.stage).to.equal('staging');
   });
 

From 56e9423cd74dc05cc85b176bb1f0502f7ce05139 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 27 Aug 2021 14:08:56 +0200
Subject: [PATCH 0414/1101] refactor(Variables): Enable early `sls:stage`
 resolution

---
 .../sources/instance-dependent/get-sls.js     |  1 +
 scripts/serverless.js                         |  1 +
 .../instance-dependent/get-sls.test.js        | 43 ++++++++++++++++++-
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/lib/configuration/variables/sources/instance-dependent/get-sls.js b/lib/configuration/variables/sources/instance-dependent/get-sls.js
index 4b7a6780363..b2c4832cf78 100644
--- a/lib/configuration/variables/sources/instance-dependent/get-sls.js
+++ b/lib/configuration/variables/sources/instance-dependent/get-sls.js
@@ -20,6 +20,7 @@ module.exports = (serverlessInstance) => {
 
       switch (address) {
         case 'instanceId':
+          if (!serverlessInstance) return { value: null, isPending: true };
           return { value: serverlessInstance.instanceId };
         case 'stage': {
           let stage = options.stage;
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 714a587563b..be61e508deb 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -289,6 +289,7 @@ const processSpanPromise = (async () => {
                 opt: require('../lib/configuration/variables/sources/opt'),
                 self: require('../lib/configuration/variables/sources/self'),
                 strToBool: require('../lib/configuration/variables/sources/str-to-bool'),
+                sls: require('../lib/configuration/variables/sources/instance-dependent/get-sls')(),
               },
               options: filterSupportedOptions(options, { commandSchema, providerName }),
               fulfilledSources: new Set(['file', 'self', 'strToBool']),
diff --git a/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js b/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js
index 503189f4438..4be233a7e0e 100644
--- a/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js
+++ b/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js
@@ -14,7 +14,7 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
   let variablesMeta;
   let serverlessInstance;
 
-  const initializeServerless = async ({ configExt, options } = {}) => {
+  const initializeServerless = async ({ configExt, options, setupOptions = {} } = {}) => {
     configuration = {
       service: 'foo',
       provider: {
@@ -47,7 +47,10 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
       serviceDir: process.cwd(),
       configuration,
       variablesMeta,
-      sources: { self: selfSource, sls: getSlsSource(serverlessInstance) },
+      sources: {
+        self: selfSource,
+        sls: getSlsSource(setupOptions.withoutInstance ? null : serverlessInstance),
+      },
       options: options || {},
       fulfilledSources: new Set(['self', 'sls']),
     });
@@ -60,6 +63,13 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
     expect(configuration.custom.sls).to.equal(serverlessInstance.instanceId);
   });
 
+  it('should keep  ${sls:instanceId} pending when no serverless instance available', async () => {
+    // Dev by default
+    await initializeServerless({ setupOptions: { withoutInstance: true } });
+    expect(variablesMeta.get('custom\0sls')).to.have.property('variables');
+    expect(variablesMeta.get('custom\0sls')).to.not.have.property('error');
+  });
+
   it('should resolve ${sls:stage}', async () => {
     // Dev by default
     await initializeServerless();
@@ -87,6 +97,35 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
     expect(configuration.custom.stage).to.equal('staging');
   });
 
+  it('should resolve ${sls:stage} when no serverless instance available', async () => {
+    // Dev by default
+    await initializeServerless({ setupOptions: { withoutInstance: true } });
+    expect(configuration.custom.stage).to.equal('dev');
+    // Resolves to provider.stage if it exists
+    await initializeServerless({
+      setupOptions: { withoutInstance: true },
+      configExt: {
+        provider: {
+          stage: 'prod',
+        },
+      },
+    });
+    expect(configuration.custom.stage).to.equal('prod');
+    // Resolves to `--stage=` if the option is set
+    await initializeServerless({
+      setupOptions: { withoutInstance: true },
+      configExt: {
+        provider: {
+          stage: 'prod',
+        },
+      },
+      options: {
+        stage: 'staging',
+      },
+    });
+    expect(configuration.custom.stage).to.equal('staging');
+  });
+
   it('should report with an error missing address', async () => {
     await initializeServerless();
     return expect(variablesMeta.get('custom\0missingAddress').error.code).to.equal(

From 8dece7f6c6544f91366a2c8f70389be8b4b659c8 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 27 Aug 2021 13:55:32 +0200
Subject: [PATCH 0415/1101] fix(Variables): Fix new sources resolution error
 message at old resolver

---
 lib/classes/Variables.js | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/classes/Variables.js b/lib/classes/Variables.js
index c62a8fa18bb..34d3778e993 100644
--- a/lib/classes/Variables.js
+++ b/lib/classes/Variables.js
@@ -566,11 +566,23 @@ class Variables {
         }
       }
       if (!ret) {
-        const errorMessage = [
-          `Invalid variable reference syntax for variable ${variableString}.`,
-          ' You can only reference env vars, options, & files.',
-          ' You can check our docs for more info.',
-        ].join('');
+        const errorMessage = (() => {
+          if (variableString.startsWith('aws:') || variableString.startsWith('sls:')) {
+            return [
+              `Cannot resolve "${variableString.slice(
+                0,
+                variableString.indexOf(':') + 1
+              )}*" variable sources with old variables resolver.`,
+              'Set "variablesResolutionMode: 20210326" in your service config to ' +
+                'unconditionally switch to the new resolver',
+            ].join('\n');
+          }
+          return [
+            `Invalid variable reference syntax for variable ${variableString}.`,
+            ' You can only reference env vars, options, & files.',
+            ' You can check our docs for more info.',
+          ].join('');
+        })();
         ret = BbPromise.reject(
           new ServerlessError(errorMessage, 'INVALID_VARIABLE_REFERENCE_SYNTAX')
         );

From 19dbe8a4441f610eb3544d82abfb7e593fd6b822 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Fri, 27 Aug 2021 15:56:10 +0200
Subject: [PATCH 0416/1101] docs(AWS SQS): Describe `serverless-lift` plugin
 usage (#9889)

---
 docs/providers/aws/events/sqs.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/docs/providers/aws/events/sqs.md b/docs/providers/aws/events/sqs.md
index 669097b09ae..3a98e6d5e8b 100644
--- a/docs/providers/aws/events/sqs.md
+++ b/docs/providers/aws/events/sqs.md
@@ -67,3 +67,34 @@ functions:
 ## IAM Permissions
 
 The Serverless Framework will automatically configure the most minimal set of IAM permissions for you. However you can still add additional permissions if you need to. Read the official [AWS documentation](https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-configure-lambda-function-trigger.html) for more information about IAM Permissions for SQS events.
+
+## Lift "Queue" construct
+
+The examples above show how to consume messages from an existing SQS queue. To create an SQS queue in `serverless.yml`, you can either write custom CloudFormation, or you can use Lift.
+
+[Lift](https://github.com/getlift/lift) is a Serverless Framework plugin that simplifies deploying pieces of applications via "[constructs](https://github.com/getlift/lift#constructs)". Lift can be installed via:
+
+```
+serverless plugin install -n serverless-lift
+```
+
+We can use the [`queue` construct](https://github.com/getlift/lift/blob/master/docs/queue.md) to deploy an SQS queue with its Lambda consumer:
+
+```yaml
+constructs:
+  my-queue:
+    type: queue
+    worker:
+      handler: handler.compute
+
+plugins:
+  - serverless-lift
+```
+
+The `queue` construct deploys:
+
+- An SQS queue
+- A `worker` Lambda function: this function processes messages sent to the queue.
+- An SQS "[dead letter queue](https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-dead-letter-queues.html)": this queue stores all the messages that failed to be processed.
+
+Read the [`queue` construct documentation](https://github.com/getlift/lift/blob/master/docs/queue.md) to find a complete example with code, and to learn how to configure the batch size, retries and other options.

From 8ab27ab948d9d3e43e11c987846b2dc9c133e5b7 Mon Sep 17 00:00:00 2001
From: Peter Reshetin <preshetin@gmail.com>
Date: Fri, 27 Aug 2021 18:29:26 +0300
Subject: [PATCH 0417/1101] docs: Fix link in CONTRIBUTING.md file (#9891)

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1822deff405..ba091cac71d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -101,7 +101,7 @@ Log should be written only if deprecated functionality is used. If applicable (t
 
 ### Service configuration validation
 
-All newly introduced configuration properties should be covered by proper changes to configuration schema. For more details about configuration validation, please see [docs/configuration-validation](./configuration-validation.md).
+All newly introduced configuration properties should be covered by proper changes to configuration schema. For more details about configuration validation, please see [docs/configuration-validation](./docs/configuration-validation.md).
 
 # Testing
 

From 05fff98a0003b22a66e8932c622c0e10c57bf06b Mon Sep 17 00:00:00 2001
From: Sudipto Das <s.das001@yahoo.com>
Date: Mon, 30 Aug 2021 14:38:47 +0530
Subject: [PATCH 0418/1101] refactor: Replace `fse.writeFile` with
 `fs.promises.writeFile` (#9870)

---
 lib/plugins/aws/invokeLocal/index.js                      | 4 ++--
 lib/utils/fs/writeFile.js                                 | 3 ++-
 test/unit/lib/Serverless.test.js                          | 4 ++--
 test/unit/lib/cli/conditionally-load-dotenv.test.js       | 6 +++---
 test/unit/lib/cli/load-dotenv.test.js                     | 6 +++---
 test/unit/lib/configuration/read.test.js                  | 2 +-
 test/unit/lib/configuration/variables/index.test.js       | 4 ++--
 .../plugins/aws/package/lib/getHashForFilePath.test.js    | 4 ++--
 test/unit/lib/utils/ensureExists.test.js                  | 4 ++--
 test/unit/lib/utils/fs/safeMoveFile.test.js               | 2 +-
 test/unit/lib/utils/getEnsureArtifact.test.js             | 4 ++--
 test/unit/lib/utils/telemetry/generatePayload.test.js     | 8 ++++----
 test/unit/scripts/serverless.test.js                      | 4 ++--
 13 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invokeLocal/index.js
index cb079ecc3cc..6901554b4ce 100644
--- a/lib/plugins/aws/invokeLocal/index.js
+++ b/lib/plugins/aws/invokeLocal/index.js
@@ -407,8 +407,8 @@ class AwsInvokeLocal {
 
     this.serverless.cli.log('Writing Dockerfile...');
     await Promise.all([
-      fse.writeFile(dockerfilePath, dockerFileContent),
-      fse.writeFile(dockerfileCachePath, dockerFileContent),
+      fsp.writeFile(dockerfilePath, dockerFileContent),
+      fsp.writeFile(dockerfileCachePath, dockerFileContent),
     ]);
 
     this.serverless.cli.log('Building Docker image...');
diff --git a/lib/utils/fs/writeFile.js b/lib/utils/fs/writeFile.js
index 2fff2287ea7..00bc18f7b01 100644
--- a/lib/utils/fs/writeFile.js
+++ b/lib/utils/fs/writeFile.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const path = require('path');
 const jc = require('json-cycle');
@@ -24,7 +25,7 @@ async function writeFile(filePath, conts, cycles) {
       contents = yaml.dump(contents);
     }
 
-    return fse.writeFile(filePath, contents);
+    return fsp.writeFile(filePath, contents);
   });
 }
 
diff --git a/test/unit/lib/Serverless.test.js b/test/unit/lib/Serverless.test.js
index 853c8934415..a9a9fed1aa1 100644
--- a/test/unit/lib/Serverless.test.js
+++ b/test/unit/lib/Serverless.test.js
@@ -22,7 +22,7 @@ const ServerlessError = require('../../../lib/serverless-error');
 const conditionallyLoadDotenv = require('../../../lib/cli/conditionally-load-dotenv');
 const runServerless = require('../../utils/run-serverless');
 const fixtures = require('../../fixtures/programmatic');
-const fs = require('fs');
+const fsp = require('fs').promises;
 
 describe('Serverless', () => {
   let serverless;
@@ -339,7 +339,7 @@ describe('test/unit/lib/Serverless.test.js', () => {
         DEFAULT_ENV_VARIABLE=valuefromdefault
         DEFAULT_ENV_VARIABLE_EXPANDED=$DEFAULT_ENV_VARIABLE/expanded
       `;
-      await fs.promises.writeFile(path.join(serviceDir, '.env'), defaultFileContent);
+      await fsp.writeFile(path.join(serviceDir, '.env'), defaultFileContent);
       conditionallyLoadDotenv.clear();
     });
 
diff --git a/test/unit/lib/cli/conditionally-load-dotenv.test.js b/test/unit/lib/cli/conditionally-load-dotenv.test.js
index 3a46bbc051c..47c5cefd098 100644
--- a/test/unit/lib/cli/conditionally-load-dotenv.test.js
+++ b/test/unit/lib/cli/conditionally-load-dotenv.test.js
@@ -3,7 +3,7 @@
 const chai = require('chai');
 const path = require('path');
 const overrideEnv = require('process-utils/override-env');
-const fs = require('fs');
+const fsp = require('fs').promises;
 const conditionallyLoadDotenv = require('../../../../lib/cli/conditionally-load-dotenv');
 
 chai.use(require('chai-as-promised'));
@@ -14,11 +14,11 @@ describe('test/unit/lib/cli/conditionally-load-dotenv.test.js', () => {
 
   before(async () => {
     const defaultFileContent = 'DEFAULT_ENV_VARIABLE=valuefromdefault';
-    await fs.promises.writeFile(path.resolve('.env'), defaultFileContent);
+    await fsp.writeFile(path.resolve('.env'), defaultFileContent);
 
     const stage = 'testing';
     const stageFileContent = 'STAGE_ENV_VARIABLE=valuefromstage';
-    await fs.promises.writeFile(path.resolve(`.env.${stage}`), stageFileContent);
+    await fsp.writeFile(path.resolve(`.env.${stage}`), stageFileContent);
   });
 
   beforeEach(() => {
diff --git a/test/unit/lib/cli/load-dotenv.test.js b/test/unit/lib/cli/load-dotenv.test.js
index a2b48e38fa0..fe7fd6bf9c9 100644
--- a/test/unit/lib/cli/load-dotenv.test.js
+++ b/test/unit/lib/cli/load-dotenv.test.js
@@ -4,7 +4,7 @@ const chai = require('chai');
 const path = require('path');
 const sinon = require('sinon');
 const overrideEnv = require('process-utils/override-env');
-const fs = require('fs');
+const fsp = require('fs').promises;
 const loadEnv = require('../../../../lib/cli/load-dotenv');
 const dotenv = require('dotenv');
 const ServerlessError = require('../../../../lib/serverless-error');
@@ -18,10 +18,10 @@ describe('test/unit/lib/cli/load-dotenv.test.js', () => {
   before(async () => {
     const stage = 'testing';
     const stageFileContent = 'FROM_STAGE=valuefromstage';
-    await fs.promises.writeFile(path.join(process.cwd(), `.env.${stage}`), stageFileContent);
+    await fsp.writeFile(path.join(process.cwd(), `.env.${stage}`), stageFileContent);
 
     const defaultFileContent = 'FROM_DEFAULT=valuefromdefault';
-    await fs.promises.writeFile(path.join(process.cwd(), '.env'), defaultFileContent);
+    await fsp.writeFile(path.join(process.cwd(), '.env'), defaultFileContent);
   });
 
   beforeEach(() => {
diff --git a/test/unit/lib/configuration/read.test.js b/test/unit/lib/configuration/read.test.js
index 1a43b1c7849..337df002bea 100644
--- a/test/unit/lib/configuration/read.test.js
+++ b/test/unit/lib/configuration/read.test.js
@@ -71,7 +71,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
   it('should read "serverless.ts"', async () => {
     await fse.ensureDir('node_modules');
     try {
-      await fse.writeFile('node_modules/ts-node.js', 'module.exports.register = () => null;');
+      await fsp.writeFile('node_modules/ts-node.js', 'module.exports.register = () => null;');
       configurationPath = 'serverless.ts';
       const configuration = {
         service: 'test-ts',
diff --git a/test/unit/lib/configuration/variables/index.test.js b/test/unit/lib/configuration/variables/index.test.js
index 7a74e691864..1afa1ad1661 100644
--- a/test/unit/lib/configuration/variables/index.test.js
+++ b/test/unit/lib/configuration/variables/index.test.js
@@ -2,14 +2,14 @@
 
 const { expect } = require('chai');
 
-const fs = require('fs').promises;
+const fsp = require('fs').promises;
 const resolve = require('../../../../../lib/configuration/variables');
 
 describe('test/unit/lib/configuration/variables/index.test.js', () => {
   let configuration;
   before(async () => {
     process.env.ENV_SOURCE_TEST = 'foobar';
-    await fs.writeFile('foo.json', JSON.stringify({ json: 'content' }));
+    await fsp.writeFile('foo.json', JSON.stringify({ json: 'content' }));
     configuration = {
       env: '${env:ENV_SOURCE_TEST}',
       file: '${file(foo.json)}',
diff --git a/test/unit/lib/plugins/aws/package/lib/getHashForFilePath.test.js b/test/unit/lib/plugins/aws/package/lib/getHashForFilePath.test.js
index 2963352df45..cabb160c998 100644
--- a/test/unit/lib/plugins/aws/package/lib/getHashForFilePath.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/getHashForFilePath.test.js
@@ -2,7 +2,7 @@
 
 const chai = require('chai');
 const getHashForFilePath = require('../../../../../../../lib/plugins/aws/package/lib/getHashForFilePath');
-const fs = require('fs');
+const fsp = require('fs').promises;
 const path = require('path');
 
 chai.use(require('chai-as-promised'));
@@ -13,7 +13,7 @@ describe('getHashForFilePath', () => {
   let filePath;
   before(async () => {
     filePath = path.join(process.cwd(), 'file.txt');
-    await fs.promises.writeFile(filePath, 'content');
+    await fsp.writeFile(filePath, 'content');
   });
 
   it('correctly generates hash for existing file', async () => {
diff --git a/test/unit/lib/utils/ensureExists.test.js b/test/unit/lib/utils/ensureExists.test.js
index 9485f28feac..40bb57499c1 100644
--- a/test/unit/lib/utils/ensureExists.test.js
+++ b/test/unit/lib/utils/ensureExists.test.js
@@ -7,7 +7,7 @@ const ensureExists = require('../../../../lib/utils/ensureExists');
 const { getTmpDirPath } = require('../../../utils/fs');
 
 const path = require('path');
-const fs = require('fs');
+const fsp = require('fs').promises;
 const crypto = require('crypto');
 
 const expect = chai.expect;
@@ -26,7 +26,7 @@ describe('test/unit/lib/utils/ensureExists.test.js', () => {
 
   it('Should not call generate if file exists', async () => {
     const testFileName = `test-${crypto.randomBytes(2).toString('hex')}`;
-    await fs.promises.writeFile(path.resolve(testCacheDir, testFileName), '');
+    await fsp.writeFile(path.resolve(testCacheDir, testFileName), '');
     const generateStub = sinon.stub().resolves();
     await ensureExists(path.resolve(testCacheDir, testFileName), generateStub);
     expect(generateStub.calledOnce).to.be.false;
diff --git a/test/unit/lib/utils/fs/safeMoveFile.test.js b/test/unit/lib/utils/fs/safeMoveFile.test.js
index e7574a1d5d9..430a03fdd02 100644
--- a/test/unit/lib/utils/fs/safeMoveFile.test.js
+++ b/test/unit/lib/utils/fs/safeMoveFile.test.js
@@ -60,7 +60,7 @@ describe('test/unit/lib/utils/fs/safeMoveFile.test.js', () => {
     renameStub.callThrough();
 
     // Write a test file to rename
-    await fse.writeFile(sourceFile, 'source data');
+    await fsp.writeFile(sourceFile, 'source data');
   });
 
   afterEach(async () => {
diff --git a/test/unit/lib/utils/getEnsureArtifact.test.js b/test/unit/lib/utils/getEnsureArtifact.test.js
index 49b2011e8e6..5391cb02983 100644
--- a/test/unit/lib/utils/getEnsureArtifact.test.js
+++ b/test/unit/lib/utils/getEnsureArtifact.test.js
@@ -5,7 +5,7 @@ const { expect } = require('chai');
 const ensureArtifact = require('../../../../lib/utils/ensureArtifact');
 
 const path = require('path');
-const fs = require('fs');
+const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const crypto = require('crypto');
 
@@ -18,7 +18,7 @@ describe('#ensureArtifact', () => {
   const generateFunc = async (cachePath) => {
     testArtifactPath = path.resolve(cachePath, testArtifactName);
     ++invokedCount;
-    await fs.promises.writeFile(testArtifactPath, '');
+    await fsp.writeFile(testArtifactPath, '');
   };
 
   it('Should generate artifact if missing', async () => {
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index bb978cb83b3..740ac2a4fad 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -2,7 +2,7 @@
 
 const { expect } = require('chai');
 const path = require('path');
-const fs = require('fs');
+const fsp = require('fs').promises;
 const os = require('os');
 const overrideEnv = require('process-utils/override-env');
 const overrideCwd = require('process-utils/override-cwd');
@@ -82,7 +82,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
         },
       },
     });
-    await fs.promises.writeFile(
+    await fsp.writeFile(
       path.resolve(serviceDir, 'package.json'),
       JSON.stringify({
         dependencies: {
@@ -419,7 +419,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should resolve payload with predefined local config', async () => {
-    await fs.promises.writeFile(
+    await fsp.writeFile(
       path.resolve(os.homedir(), '.serverlessrc'),
       JSON.stringify({
         frameworkId: '123',
@@ -443,7 +443,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should not include userId from local config if SERVERLESS_ACCESS_KEY used', async () => {
-    await fs.promises.writeFile(
+    await fsp.writeFile(
       path.resolve(os.homedir(), '.serverlessrc'),
       JSON.stringify({
         frameworkId: '123',
diff --git a/test/unit/scripts/serverless.test.js b/test/unit/scripts/serverless.test.js
index e01e1d1ae82..3db0a7769eb 100644
--- a/test/unit/scripts/serverless.test.js
+++ b/test/unit/scripts/serverless.test.js
@@ -3,7 +3,7 @@
 const { expect } = require('chai');
 
 const path = require('path');
-const fs = require('fs').promises;
+const fsp = require('fs').promises;
 const spawn = require('child-process-ext/spawn');
 const stripAnsi = require('strip-ansi');
 const { version } = require('../../../package');
@@ -153,7 +153,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
         },
       },
     });
-    await fs.writeFile(path.resolve(serviceDir, '.env'), 'DEFAULT_ENV_VARIABLE=valuefromdefault');
+    await fsp.writeFile(path.resolve(serviceDir, '.env'), 'DEFAULT_ENV_VARIABLE=valuefromdefault');
     expect(
       String((await spawn('node', [serverlessPath, 'print'], { cwd: serviceDir })).stdoutBuffer)
     ).to.include('fromDefaultEnv: valuefromdefault');

From 3e8858b1a8cde32a3659498c6dbdc7d8637e86c6 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 30 Aug 2021 13:27:12 +0200
Subject: [PATCH 0419/1101] fix(AWS API Gateway): Recognize CF functions for
 `connectionId`

---
 lib/plugins/aws/package/compile/events/apiGateway/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/index.js b/lib/plugins/aws/package/compile/events/apiGateway/index.js
index 4fee67a0d33..c118f2dc0e1 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/index.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/index.js
@@ -183,7 +183,7 @@ class AwsCompileApigEvents {
           properties: {
             async: { type: 'boolean' },
             authorizer: authorizerSchema,
-            connectionId: { type: 'string' },
+            connectionId: { $ref: '#/definitions/awsCfInstruction' },
             connectionType: { anyOf: ['vpc-link', 'VPC_LINK'].map(caseInsensitive) },
             cors: corsSchema,
             integration: {

From 13ce56ae314dff1c157fc8351fc702bf15573fce Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 30 Aug 2021 13:30:06 +0200
Subject: [PATCH 0420/1101] fix(AWS API Gateway): Recognize CF functions for
 `request.uri`

---
 lib/plugins/aws/package/compile/events/apiGateway/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/index.js b/lib/plugins/aws/package/compile/events/apiGateway/index.js
index c118f2dc0e1..dcd0a0bc40d 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/index.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/index.js
@@ -124,7 +124,7 @@ const requestSchema = {
       type: 'object',
       additionalProperties: { type: 'string' },
     },
-    uri: { type: 'string' },
+    uri: { $ref: '#/definitions/awsCfInstruction' },
   },
   additionalProperties: false,
 };

From 868ac02fd4d41a893d23a3f29101e3a3b952597b Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 30 Aug 2021 13:40:47 +0200
Subject: [PATCH 0421/1101] fix(AWS API Gateway): Recognize CF functions for
 `mappedValue`

---
 lib/plugins/aws/package/compile/events/apiGateway/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/index.js b/lib/plugins/aws/package/compile/events/apiGateway/index.js
index dcd0a0bc40d..c2e5418f1d6 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/index.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/index.js
@@ -41,7 +41,7 @@ const requestParametersSchema = {
         type: 'object',
         properties: {
           required: { type: 'boolean' },
-          mappedValue: { type: 'string' },
+          mappedValue: { $ref: '#/definitions/awsCfInstruction' },
         },
         additionalProperties: false,
       },

From bbb6c6cd7dea9100af3ff84dd490b2cac1e2971e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 30 Aug 2021 18:03:06 +0200
Subject: [PATCH 0422/1101] feat(CLI): Enable `env` variables in
 `provider.stage` property

---
 lib/configuration/variables/sources/env.js |  6 +++
 scripts/serverless.js                      | 55 +++++++++++++++++++---
 test/unit/scripts/serverless.test.js       | 39 +++++++++++++++
 3 files changed, 94 insertions(+), 6 deletions(-)

diff --git a/lib/configuration/variables/sources/env.js b/lib/configuration/variables/sources/env.js
index 8856947ae9a..91fe1d737da 100644
--- a/lib/configuration/variables/sources/env.js
+++ b/lib/configuration/variables/sources/env.js
@@ -3,6 +3,10 @@
 const ensureString = require('type/string/ensure');
 const ServerlessError = require('../../../serverless-error');
 
+// Used to track env variable dependencies in specific resolution phases
+// This collection is cleared on demand externally
+const missingEnvVariables = new Set();
+
 module.exports = {
   resolve: ({ address, isSourceFulfilled }) => {
     if (!address) {
@@ -17,6 +21,8 @@ module.exports = {
       errorCode: 'INVALID_ENV_SOURCE_ADDRESS',
     });
 
+    if (!process.env[address]) missingEnvVariables.add(address);
     return { value: process.env[address] || null, isPending: !isSourceFulfilled };
   },
+  missingEnvVariables,
 };
diff --git a/scripts/serverless.js b/scripts/serverless.js
index be61e508deb..2f23525396c 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -274,6 +274,7 @@ const processSpanPromise = (async () => {
             ));
           }
 
+          let envVarNamesNeededForDotenvResolution;
           if (variablesMeta.size) {
             // Some properties are configured with variables
 
@@ -346,21 +347,63 @@ const processSpanPromise = (async () => {
               }
             }
 
+            resolverConfiguration.fulfilledSources.add('env');
             if (
-              !ensureResolvedProperty('provider\0stage', { shouldSilentlyReturnIfLegacyMode: true })
+              !isPropertyResolved(variablesMeta, 'provider\0stage') ||
+              !isPropertyResolved(variablesMeta, 'useDotenv')
             ) {
-              return;
-            }
+              // Assume "env" source fulfilled for `provider.stage` and `useDotenv` resolution.
+              // To pick eventual resolution conflict, track what env variables were reported
+              // misssing when applying this resolution
+              const envSource = require('../lib/configuration/variables/sources/env');
+              envSource.missingEnvVariables.clear();
+              await resolveVariables({
+                ...resolverConfiguration,
+                propertyPathsToResolve: new Set(['provider\0stage', 'useDotenv']),
+              });
+              if (
+                eventuallyReportVariableResolutionErrors(
+                  configurationPath,
+                  configuration,
+                  variablesMeta
+                )
+              ) {
+                // Unrecoverable resolution errors, abort
+                variablesMeta = null;
+                return;
+              }
+
+              if (
+                !ensureResolvedProperty('provider\0stage', {
+                  shouldSilentlyReturnIfLegacyMode: true,
+                })
+              ) {
+                return;
+              }
 
-            if (!ensureResolvedProperty('useDotenv')) return;
+              if (!ensureResolvedProperty('useDotenv')) return;
+
+              envVarNamesNeededForDotenvResolution = envSource.missingEnvVariables;
+            }
           }
 
           // Load eventual environment variables from .env files
           await require('../lib/cli/conditionally-load-dotenv')(options, configuration);
 
-          if (!variablesMeta.size) return; // No properties configured with variables
+          if (envVarNamesNeededForDotenvResolution) {
+            for (const envVarName of envVarNamesNeededForDotenvResolution) {
+              if (process.env[envVarName]) {
+                throw new ServerlessError(
+                  'Cannot reliably resolve "env" variables due to resolution conflict.\n' +
+                    `Environment variable "${envVarName}" which influences resolution of ` +
+                    '".env" file were found to be defined in resolved ".env" file.' +
+                    'DOTENV_ENV_VAR_RESOLUTION_CONFLICT'
+                );
+              }
+            }
+          }
 
-          resolverConfiguration.fulfilledSources.add('env');
+          if (!variablesMeta.size) return; // No properties configured with variables
 
           if (isHelpRequest || commands[0] === 'plugin') {
             // We do not need full config resolved, we just need to know what
diff --git a/test/unit/scripts/serverless.test.js b/test/unit/scripts/serverless.test.js
index 3db0a7769eb..f4011d7e2d6 100644
--- a/test/unit/scripts/serverless.test.js
+++ b/test/unit/scripts/serverless.test.js
@@ -159,6 +159,45 @@ describe('test/unit/scripts/serverless.test.js', () => {
     ).to.include('fromDefaultEnv: valuefromdefault');
   });
 
+  it('should allow not defined environment variables in provider.stage`', async () => {
+    const { servicePath: serviceDir } = await programmaticFixturesEngine.setup('aws', {
+      configExt: {
+        useDotenv: true,
+        provider: {
+          stage: "${env:FOO, 'dev'}",
+        },
+        custom: {
+          fromDefaultEnv: '${env:DEFAULT_ENV_VARIABLE}',
+        },
+      },
+    });
+    await fsp.writeFile(path.resolve(serviceDir, '.env'), 'DEFAULT_ENV_VARIABLE=valuefromdefault');
+    const printOut = String(
+      (await spawn('node', [serverlessPath, 'print'], { cwd: serviceDir })).stdoutBuffer
+    );
+    expect(printOut).to.include('fromDefaultEnv: valuefromdefault');
+    expect(printOut).to.include('stage: dev');
+  });
+
+  it('should report "env" variables resolution conflicts with exception', async () => {
+    const { servicePath: serviceDir } = await programmaticFixturesEngine.setup('aws', {
+      configExt: {
+        useDotenv: true,
+        provider: {
+          stage: "${env:FOO, 'dev'}",
+        },
+      },
+    });
+    await fsp.writeFile(path.resolve(serviceDir, '.env'), 'FOO=test');
+    try {
+      await spawn('node', [serverlessPath, 'print'], { cwd: serviceDir });
+      throw new Error('Unexpected');
+    } catch (error) {
+      expect(error.code).to.equal(1);
+      expect(String(error.stdoutBuffer)).to.include('Environment variable "FOO" which');
+    }
+  });
+
   it('should reject unresolved "plugins" property', async () => {
     try {
       await spawn('node', [serverlessPath, 'print'], {

From 9a2511cf90c60ba5b67ecea81121328c8dd93702 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 31 Aug 2021 10:46:18 +0200
Subject: [PATCH 0423/1101] refactor: Upgrade `filesize` to v8

---
 package.json                                                 | 2 +-
 test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js | 2 +-
 test/unit/lib/plugins/aws/deployFunction.test.js             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 87fcbcfe90d..c9806bcb6f5 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "essentials": "^1.1.1",
     "ext": "^1.5.0",
     "fastest-levenshtein": "^1.0.12",
-    "filesize": "^7.0.0",
+    "filesize": "^8.0.0",
     "fs-extra": "^9.1.0",
     "get-stdin": "^8.0.0",
     "globby": "^11.0.4",
diff --git a/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js b/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js
index 3a60a4a5b3f..3f750e9c9ea 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js
@@ -314,7 +314,7 @@ describe('uploadArtifacts', () => {
       sinon.spy(awsDeploy.serverless.cli, 'log');
 
       return awsDeploy.uploadFunctionsAndLayers().then(() => {
-        const expected = 'Uploading service new-service.zip file to S3 (1 KB)...';
+        const expected = 'Uploading service new-service.zip file to S3 (1.02 kB)...';
         expect(awsDeploy.serverless.cli.log.calledWithExactly(expected)).to.be.equal(true);
       });
     });
diff --git a/test/unit/lib/plugins/aws/deployFunction.test.js b/test/unit/lib/plugins/aws/deployFunction.test.js
index 25867a9620e..faa582549e3 100644
--- a/test/unit/lib/plugins/aws/deployFunction.test.js
+++ b/test/unit/lib/plugins/aws/deployFunction.test.js
@@ -266,7 +266,7 @@ describe('AwsDeployFunction', () => {
 
       await awsDeployFunction.deployFunction();
 
-      const expected = 'Uploading function: first (1 KB)...';
+      const expected = 'Uploading function: first (1.02 kB)...';
       expect(readFileSyncStub.calledOnce).to.equal(true);
       expect(statSyncStub.calledOnce).to.equal(true);
       expect(awsDeployFunction.serverless.cli.log.calledWithExactly(expected)).to.be.equal(true);

From 8f1c8ee738e0cd449fdc8c930d892bc32a073a01 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 31 Aug 2021 11:09:32 +0200
Subject: [PATCH 0424/1101] chore: Bump dependencies

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index c9806bcb6f5..e67b2554360 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.975.0",
+    "aws-sdk": "^2.979.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
@@ -71,7 +71,7 @@
     "semver": "^7.3.5",
     "signal-exit": "^3.0.3",
     "tabtab": "^3.0.2",
-    "tar": "^6.1.10",
+    "tar": "^6.1.11",
     "timers-ext": "^0.1.7",
     "type": "^2.5.0",
     "untildify": "^4.0.0",
@@ -106,7 +106,7 @@
     "sinon-chai": "^3.7.0",
     "standard-version": "^9.3.1",
     "strip-ansi": "^6.0.0",
-    "ws": "^7.5.3",
+    "ws": "^7.5.4",
     "xml2js": "^0.4.23"
   },
   "eslintConfig": {

From e23cef0910fed6dbe54b5fdff630dd8ade87f78b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 31 Aug 2021 11:20:24 +0200
Subject: [PATCH 0425/1101] chore: Release v2.57.0

---
 CHANGELOG.md | 21 +++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4eb7e5b9b68..c113dccc1b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,27 @@
 
 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.
 
+## [2.57.0](https://github.com/serverless/serverless/compare/v2.56.0...v2.57.0) (2021-08-31)
+
+### Features
+
+- **Variables:** Enable `env` variables in `provider.stage` property ([#9896](https://github.com/serverless/serverless/issues/9896)) ([bbb6c6c](https://github.com/serverless/serverless/commit/bbb6c6cd7dea9100af3ff84dd490b2cac1e2971e)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **AWS API Gateway:**
+  - Recognize CF functions at `functions[].events[].http.connectionId` ([#9894](https://github.com/serverless/serverless/issues/9894)) ([3e8858b](https://github.com/serverless/serverless/commit/3e8858b1a8cde32a3659498c6dbdc7d8637e86c6)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Recognize CF functions at `functions[].events[].http.request.headers[].mappedValue` ([#9894](https://github.com/serverless/serverless/issues/9894)) ([868ac02](https://github.com/serverless/serverless/commit/868ac02fd4d41a893d23a3f29101e3a3b952597b)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Recognize CF functions at `functions[].events[].http.request.uri` ([#9894](https://github.com/serverless/serverless/issues/9894)) ([13ce56a](https://github.com/serverless/serverless/commit/13ce56ae314dff1c157fc8351fc702bf15573fce)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Fix request validator triage ([#9887](https://github.com/serverless/serverless/issues/9887)) ([cb109dd](https://github.com/serverless/serverless/commit/cb109dd835ec358bfb1af10fe8f82aa283ffbafe)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Variables:** Fix new sources resolution error message at old resolver ([#9888](https://github.com/serverless/serverless/issues/9888)) ([8dece7f](https://github.com/serverless/serverless/commit/8dece7f6c6544f91366a2c8f70389be8b4b659c8)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **Variables:** Enable early `sls:stage` resolution ([#9890](https://github.com/serverless/serverless/issues/9890)) ([56e9423](https://github.com/serverless/serverless/commit/56e9423cd74dc05cc85b176bb1f0502f7ce05139)) ([Mariusz Nowak](https://github.com/medikoo))
+- Replace `fse.writeFile` with `fs.promises.writeFile` ([#9870](https://github.com/serverless/serverless/issues/9870)) ([05fff98](https://github.com/serverless/serverless/commit/05fff98a0003b22a66e8932c622c0e10c57bf06b)) ([Sudipto Das](https://github.com/sdas13))
+- Upgrade `filesize` to v8 ([#9901](https://github.com/serverless/serverless/issues/9901)) ([9a2511c](https://github.com/serverless/serverless/commit/9a2511cf90c60ba5b67ecea81121328c8dd93702)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ## [2.56.0](https://github.com/serverless/serverless/compare/v2.55.0...v2.56.0) (2021-08-25)
 
 ### Features
diff --git a/package.json b/package.json
index e67b2554360..af0b93a5811 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.56.0",
+  "version": "2.57.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From e798c269df6f456bccf6a1e755015ea1e7631117 Mon Sep 17 00:00:00 2001
From: kou <47014617+kou-pg-0131@users.noreply.github.com>
Date: Tue, 31 Aug 2021 23:07:27 +0900
Subject: [PATCH 0426/1101] refactor(Templates): Remove unnecessary
 `fmt.Sprintf` in `tencent-go`

---
 lib/plugins/create/templates/tencent-go/index.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/create/templates/tencent-go/index.go b/lib/plugins/create/templates/tencent-go/index.go
index 1a4c75207e6..b05db7d3f44 100644
--- a/lib/plugins/create/templates/tencent-go/index.go
+++ b/lib/plugins/create/templates/tencent-go/index.go
@@ -14,7 +14,7 @@ type DefineEvent struct {
 func hello(ctx context.Context, event DefineEvent) (string, error) {
 	fmt.Println("key1:", event.Key1)
 	fmt.Println("key2:", event.Key2)
-	return fmt.Sprintf("Hello World"), nil
+	return "Hello World", nil
 }
 
 func main() {

From 3abc2f06428b72d964aa8683c34cdcf1d761d140 Mon Sep 17 00:00:00 2001
From: Seung-Chan Ahn <dev.issea1015@gmail.com>
Date: Wed, 1 Sep 2021 17:39:55 +0900
Subject: [PATCH 0427/1101] feat(AWS CloudFront): Support
 `behavior.CachePolicyId` (#9895)

Co-authored-by: Seungchan Ahn <seungchan.ahn@tridge.com>
---
 docs/providers/aws/events/cloudfront.md       | 14 ++++
 .../aws/package/compile/events/cloudFront.js  | 37 +++++++---
 .../package/compile/events/cloudFront.test.js | 73 +++++++++++++++++++
 3 files changed, 113 insertions(+), 11 deletions(-)

diff --git a/docs/providers/aws/events/cloudfront.md b/docs/providers/aws/events/cloudfront.md
index c5a6df39074..125216aa4bb 100644
--- a/docs/providers/aws/events/cloudfront.md
+++ b/docs/providers/aws/events/cloudfront.md
@@ -238,6 +238,20 @@ functions:
             id: 658327ea-f89d-4fab-a63d-7e88639e58f6 # references AWS Managed Policy named Managed-CachingOptimized
 ```
 
+It is also possible to reference policies with `behavior.CachePolicyId` property. When both `cachePolicy.id` and `behavior.CachePolicyId` are specified, setting from `cachePolicy.id` will be used. Similarily, when `cachePolicy.name` and `behavior.CachePolicyId` are specified, setting from `cachePolicy.name` will be used.
+
+```yml
+functions:
+  myLambdaAtEdge:
+    handler: myLambdaAtEdge.handler
+    events:
+      - cloudFront:
+          eventType: viewer-response
+          origin: s3://bucketname.s3.amazonaws.com/files
+          behavior:
+            CachePolicyId: 658327ea-f89d-4fab-a63d-7e88639e58f6 # references AWS Managed Policy named Managed-CachingOptimized
+```
+
 ### CloudFront Distribution configurations
 
 Amazon CloudFront distribution configurations can be set in the resources block of the serverless.yml, by defining `CloudFrontDistribution`.
diff --git a/lib/plugins/aws/package/compile/events/cloudFront.js b/lib/plugins/aws/package/compile/events/cloudFront.js
index 4438917aad6..4b615be98d3 100644
--- a/lib/plugins/aws/package/compile/events/cloudFront.js
+++ b/lib/plugins/aws/package/compile/events/cloudFront.js
@@ -444,16 +444,28 @@ class AwsCompileCloudFrontEvents {
               Object.assign(behavior, event.cloudFront.behavior);
             }
 
+            if (
+              (event.cloudFront.cachePolicy ||
+                (event.cloudFront.behavior && event.cloudFront.behavior.CachePolicyId)) &&
+              !shouldAssignCachePolicy
+            ) {
+              throw new ServerlessError(
+                'Both cachePolicy and deprecated fields ForwardedValues, MinTTL, MaxTTL' +
+                  'and DefaultTTL found in function ${functionObj.name} configuration.' +
+                  'Specifying a cachePolicy override those deprecated parameters.' +
+                  'Please remove one of the cache behavior definition.',
+                'CACHE_POLICY_ID_AND_DEPRECATED_FIELDS_USED'
+              );
+            }
+
+            if (event.cloudFront.behavior && event.cloudFront.behavior.CachePolicyId) {
+              Object.assign(behavior, {
+                CachePolicyId: event.cloudFront.behavior.CachePolicyId,
+              });
+              shouldAssignCachePolicy = false;
+            }
+
             if (event.cloudFront.cachePolicy) {
-              if (!shouldAssignCachePolicy) {
-                throw new ServerlessError(
-                  'Both cachePolicy and deprecated fields ForwardedValues, MinTTL, MaxTTL' +
-                    'and DefaultTTL found in function ${functionObj.name} configuration.' +
-                    'Specifying a cachePolicy override those deprecated parameters.' +
-                    'Please remove one of the cache behavior definition.',
-                  'CACHE_POLICY_ID_AND_DEPRECATED_FIELDS_USED'
-                );
-              }
               const { id, name } = event.cloudFront.cachePolicy;
               if (name) {
                 if (!this.cachePolicies.has(name)) {
@@ -469,8 +481,11 @@ class AwsCompileCloudFrontEvents {
                   Ref: this.provider.naming.getCloudFrontCachePolicyLogicalId(name),
                 },
               });
-              // Backward compatibilty - Assinging default cache policy only if none of the ForwardedValues, MinTTL, MaxTTL and DefaultTTL deprecated fields are defined.
-            } else if (shouldAssignCachePolicy) {
+              shouldAssignCachePolicy = false;
+            }
+
+            // Assigning default cache policy only if neither cache policy reference nor any of the ForwardedValues, MinTTL, MaxTTL, and DefaultTTL deprecated fields is defined.
+            if (shouldAssignCachePolicy) {
               // Assigning default Managed-CachingOptimized Cache Policy.
               // See details at https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html#managed-cache-policies-list
               Object.assign(behavior, {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
index cdfe0ef7a46..faa8d46a4fa 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
@@ -1891,6 +1891,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js',
     const stage = 'custom-stage';
     const cachePolicyName = 'allInCache';
     const cachePolicyId = '08627262-05a9-4f76-9ded-b50ca2e3a84f';
+    const cachePolicyId2 = '4135ea2d-6df8-44a3-9df3-4b5a84be39ad';
     const cachePolicyConfig = {
       DefaultTTL: 60,
       MinTTL: 30,
@@ -1996,6 +1997,57 @@ describe('test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js',
                 },
               ],
             },
+            fnCachePolicyManagedSetViaBehavior: {
+              handler: 'myLambdaAtEdge.handler',
+              events: [
+                {
+                  cloudFront: {
+                    origin: 's3://bucketname.s3.amazonaws.com',
+                    eventType: 'viewer-response',
+                    pathPattern: 'managedPolicySetViaBehavior',
+                    behavior: {
+                      CachePolicyId: cachePolicyId,
+                    },
+                  },
+                },
+              ],
+            },
+            fnCachePolicySetViaCachePolicyIdAndBehavior: {
+              handler: 'myLambdaAtEdge.handler',
+              events: [
+                {
+                  cloudFront: {
+                    origin: 's3://bucketname.s3.amazonaws.com',
+                    eventType: 'viewer-response',
+                    pathPattern: 'policySetViaCachePolicyIdAndBehavior',
+                    cachePolicy: {
+                      id: cachePolicyId,
+                    },
+                    behavior: {
+                      CachePolicyId: cachePolicyId2,
+                    },
+                  },
+                },
+              ],
+            },
+            fnCachePolicySetViaCachePolicyNameAndBehavior: {
+              handler: 'myLambdaAtEdge.handler',
+              events: [
+                {
+                  cloudFront: {
+                    origin: 's3://bucketname.s3.amazonaws.com',
+                    eventType: 'viewer-response',
+                    pathPattern: 'policySetViaCachePolicyNameAndBehavior',
+                    cachePolicy: {
+                      name: cachePolicyName,
+                    },
+                    behavior: {
+                      CachePolicyId: cachePolicyId2,
+                    },
+                  },
+                },
+              ],
+            },
           },
         },
       });
@@ -2113,6 +2165,27 @@ describe('test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js',
       expect(getAssociatedCacheBehavior('managedPolicy').CachePolicyId).to.eq(cachePolicyId);
     });
 
+    it('Should attach a cache policy to a cloudfront behavior when specified by id via `behavior.CachePolicyId` in lambda config', () => {
+      expect(getAssociatedCacheBehavior('managedPolicySetViaBehavior').CachePolicyId).to.eq(
+        cachePolicyId
+      );
+    });
+
+    it('Should attach a cache policy specified via `cachePolicy.id` to a cloudfront behavior when specified via both of `cachePolicy.id` and `behavior.CachePolicyId` in lambda config', () => {
+      expect(
+        getAssociatedCacheBehavior('policySetViaCachePolicyIdAndBehavior').CachePolicyId
+      ).to.eq(cachePolicyId);
+    });
+
+    it('Should attach a cache policy specified via `cachePolicy.name` to a cloudfront behavior when specified via both of `cachePolicy.name` and `behavior.CachePolicyId` in lambda config', () => {
+      const cachePolicyLogicalId = naming.getCloudFrontCachePolicyLogicalId(cachePolicyName);
+      expect(
+        getAssociatedCacheBehavior('policySetViaCachePolicyNameAndBehavior').CachePolicyId
+      ).to.deep.eq({
+        Ref: cachePolicyLogicalId,
+      });
+    });
+
     it('Should attach a default cache policy when none are provided, and no deprecated behavior values are used', () => {
       // Default Managed-CachingOptimized Cache Policy id
       const defaultCachePolicyId = '658327ea-f89d-4fab-a63d-7e88639e58f6';

From 63743ade31207049eee1811203db5622bc510f1a Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 1 Sep 2021 17:53:34 +0200
Subject: [PATCH 0428/1101] fix(AWS Lambda): Recognize `Fn::If` function for
 `environment`

---
 lib/plugins/aws/provider.js                                 | 6 +++++-
 test/unit/lib/plugins/aws/package/compile/functions.test.js | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 72b40823883..ae86c405663 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -495,7 +495,11 @@ class AwsProvider {
             type: 'object',
             patternProperties: {
               '^[A-Za-z_][a-zA-Z0-9_]*$': {
-                anyOf: [{ const: '' }, { $ref: '#/definitions/awsCfInstruction' }],
+                anyOf: [
+                  { const: '' },
+                  { $ref: '#/definitions/awsCfInstruction' },
+                  { $ref: '#/definitions/awsCfIf' },
+                ],
               },
             },
             additionalProperties: false,
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index 1c9d1a078b9..3c289f73d47 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -1385,6 +1385,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
               providerEnvVarA: 'providerEnvVarAValue',
               providerEnvVarB: 'providerEnvVarBValue',
               sharedEnvVar: 'valueFromProvider',
+              providerCfIfEnvVar: { 'Fn::If': ['cond', 'first', 'second'] },
             },
             memorySize: 4096,
             runtime: 'nodejs10.x',

From 315525268d43a7708daeb85c42a30446f62cf441 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Thu, 2 Sep 2021 11:37:03 +0200
Subject: [PATCH 0429/1101] docs: Improve title in SQS docs

The previous title had confusing wording. Now it starts from the use case and should be much clearer to users not familiar with Lift.
---
 docs/providers/aws/events/sqs.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/providers/aws/events/sqs.md b/docs/providers/aws/events/sqs.md
index 3a98e6d5e8b..a4895a3866a 100644
--- a/docs/providers/aws/events/sqs.md
+++ b/docs/providers/aws/events/sqs.md
@@ -68,7 +68,7 @@ functions:
 
 The Serverless Framework will automatically configure the most minimal set of IAM permissions for you. However you can still add additional permissions if you need to. Read the official [AWS documentation](https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-configure-lambda-function-trigger.html) for more information about IAM Permissions for SQS events.
 
-## Lift "Queue" construct
+## Deploying SQS queues
 
 The examples above show how to consume messages from an existing SQS queue. To create an SQS queue in `serverless.yml`, you can either write custom CloudFormation, or you can use Lift.
 

From da71df603295397229589c88dd8366426e06e982 Mon Sep 17 00:00:00 2001
From: Peter Reshetin <preshetin@gmail.com>
Date: Fri, 3 Sep 2021 13:23:15 +0300
Subject: [PATCH 0430/1101] fix(AWS CloudFront): Recognize
 `behavior.TrustedKeyGroups` in schema

---
 lib/plugins/aws/package/compile/events/cloudFront.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/plugins/aws/package/compile/events/cloudFront.js b/lib/plugins/aws/package/compile/events/cloudFront.js
index 4b615be98d3..63a1fd05a15 100644
--- a/lib/plugins/aws/package/compile/events/cloudFront.js
+++ b/lib/plugins/aws/package/compile/events/cloudFront.js
@@ -163,6 +163,12 @@ class AwsCompileCloudFrontEvents {
         ViewerProtocolPolicy: {
           enum: ['allow-all', 'redirect-to-https', 'https-only'],
         },
+        TrustedKeyGroups: {
+          type: 'array',
+          items: {
+            anyOf: [{ type: 'string' }, { $ref: '#/definitions/awsCfRef' }],
+          },
+        },
       },
       additionalProperties: false,
     };

From cacb529925ed2b2c591984f48bc52cf31f88e698 Mon Sep 17 00:00:00 2001
From: lewgordon <50742795+lewgordon@users.noreply.github.com>
Date: Fri, 3 Sep 2021 06:24:47 -0400
Subject: [PATCH 0431/1101] feat(AWS Lambda): Add support for `activemq` event
 (#8840)

Co-authored-by: Lew Gordon <lew.gordon@genesys.com>
Co-authored-by: Piotr Grzesik <pj.grzesik@gmail.com>
---
 docs/providers/aws/events/activemq.md         |  75 +++++++
 lib/plugins/aws/lib/naming.js                 |   8 +
 .../aws/package/compile/events/activemq.js    | 142 +++++++++++++
 .../aws/package/compile/events/kafka.js       |  18 +-
 lib/plugins/aws/provider.js                   |   4 +
 lib/plugins/index.js                          |   1 +
 .../test/integration-setup/cloudformation.yml |  56 +++++
 scripts/test/integration-setup/index.js       |  67 +++++-
 .../programmatic/functionActivemq/core.js     |  53 +++++
 .../functionActivemq/package.json             |   5 +
 .../functionActivemq/serverless.yml           |  18 ++
 .../aws/infra-dependent/activemq.test.js      | 112 ++++++++++
 .../package/compile/events/activemq.test.js   | 198 ++++++++++++++++++
 test/utils/cloudformation.js                  |   3 +
 14 files changed, 742 insertions(+), 18 deletions(-)
 create mode 100644 docs/providers/aws/events/activemq.md
 create mode 100644 lib/plugins/aws/package/compile/events/activemq.js
 create mode 100644 test/fixtures/programmatic/functionActivemq/core.js
 create mode 100644 test/fixtures/programmatic/functionActivemq/package.json
 create mode 100644 test/fixtures/programmatic/functionActivemq/serverless.yml
 create mode 100644 test/integration/aws/infra-dependent/activemq.test.js
 create mode 100644 test/unit/lib/plugins/aws/package/compile/events/activemq.test.js

diff --git a/docs/providers/aws/events/activemq.md b/docs/providers/aws/events/activemq.md
new file mode 100644
index 00000000000..00fe421f880
--- /dev/null
+++ b/docs/providers/aws/events/activemq.md
@@ -0,0 +1,75 @@
+<!--
+title: Serverless Framework - AWS Lambda Events - MQ
+menuText: ActiveMQ
+description:  Setting up AWS Active MQ Events with AWS Lambda via the Serverless Framework
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/events/mq)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# MQ
+
+An Active MQ message broker can be used as an event source for AWS Lambda.
+
+## Simple event definition
+
+In the following example, we specify that the `compute` function should be triggered whenever there are new messages available to consume from defined ActiveMQ `queue`.
+
+In order to configure `activemq` event, you have to provide three required properties:
+
+- `basicAuthArn`, which is a [AWS Secrets Manager](https://aws.amazon.com/secrets-manager/) ARN for credentials required to do basic auth to allow Lambda to connect to your message broker
+- `queue` to consume messages from.
+- `arn` arn for your Amazon MQ message broker
+
+```yml
+functions:
+  compute:
+    handler: handler.compute
+    events:
+      - activemq:
+          arn: arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx
+          queue: queue-name
+          basicAuthArn: arn:aws:secretsmanager:us-east-1:01234567890:secret:MySecret
+```
+
+## Enabling and disabling ActiveMQ event
+
+The `activemq` event also supports `enabled` parameter, which is used to control if the event source mapping is active. Setting it to `false` will pause polling for and processing new messages.
+
+In the following example, we specify that the `compute` function's `activemq` event should be disabled.
+
+```yml
+functions:
+  compute:
+    handler: handler.compute
+    events:
+      - activemq:
+          arn: arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx
+          queue: queue-name
+          enabled: false
+          basicAuthArn: arn:aws:secretsmanager:us-east-1:01234567890:secret:MySecret
+```
+
+## Specifying batch size
+
+You can also specify `batchSize` of number of items to retrieve in a single batch. If not specified, this will default to `100`.
+
+```yml
+functions:
+  compute:
+    handler: handler.compute
+    events:
+      - activemq:
+          arn: arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx
+          queue: queue-name
+          batchSize: 5000
+          basicAuthArn: arn:aws:secretsmanager:us-east-1:01234567890:secret:MySecret
+```
+
+## IAM Permissions
+
+The Serverless Framework will automatically configure the most minimal set of IAM permissions for you. However you can still add additional permissions if you need to. Read the official [AWS documentation](https://docs.aws.amazon.com/lambda/latest/dg/with-mq.html#events-mq-permissions) for more information about IAM Permissions for Amazon MQ events.
diff --git a/lib/plugins/aws/lib/naming.js b/lib/plugins/aws/lib/naming.js
index f820de996b6..031e6b62ee1 100644
--- a/lib/plugins/aws/lib/naming.js
+++ b/lib/plugins/aws/lib/naming.js
@@ -440,6 +440,14 @@ module.exports = {
     return `${normalizedFunctionName}EventSourceMappingKafka${normalizedTopicName}`;
   },
 
+  // ActiveMQ
+  getActiveMQEventLogicalId(functionName, queueName) {
+    const normalizedFunctionName = this.getNormalizedFunctionName(functionName);
+    // QueueName is trimmed to 150 chars to avoid going over 255 character limit
+    const normalizedQueueName = this.normalizeNameToAlphaNumericOnly(queueName).slice(0, 150);
+    return `${normalizedFunctionName}EventSourceMappingActiveMQ${normalizedQueueName}`;
+  },
+
   // ALB
   getAlbTargetGroupLogicalId(functionName, albId, multiValueHeaders) {
     return `${this.getNormalizedFunctionName(functionName)}Alb${
diff --git a/lib/plugins/aws/package/compile/events/activemq.js b/lib/plugins/aws/package/compile/events/activemq.js
new file mode 100644
index 00000000000..bae4741ae24
--- /dev/null
+++ b/lib/plugins/aws/package/compile/events/activemq.js
@@ -0,0 +1,142 @@
+'use strict';
+
+class AwsCompileActiveMQEvents {
+  constructor(serverless) {
+    this.serverless = serverless;
+    this.provider = this.serverless.getProvider('aws');
+
+    this.hooks = {
+      'package:compileEvents': this.compileActiveMQEvents.bind(this),
+    };
+
+    this.serverless.configSchemaHandler.defineFunctionEvent('aws', 'activemq', {
+      type: 'object',
+      properties: {
+        arn: {
+          anyOf: [
+            {
+              type: 'string',
+              pattern: 'arn:[a-z-]+:mq:[a-z0-9-]+:\\d+:broker:[A-Za-z0-9/_+=.@-]+:b-[a-z0-9-]+',
+            },
+            { $ref: '#/definitions/awsCfImport' },
+            { $ref: '#/definitions/awsCfRef' },
+          ],
+        },
+        basicAuthArn: {
+          anyOf: [
+            { $ref: '#/definitions/awsSecretsManagerArnString' },
+            { $ref: '#/definitions/awsCfImport' },
+            { $ref: '#/definitions/awsCfRef' },
+          ],
+        },
+        batchSize: {
+          type: 'number',
+          minimum: 1,
+          maximum: 10000,
+        },
+        enabled: {
+          type: 'boolean',
+        },
+        queue: {
+          type: 'string',
+        },
+      },
+      additionalProperties: false,
+      required: ['basicAuthArn', 'arn', 'queue'],
+    });
+  }
+
+  compileActiveMQEvents() {
+    this.serverless.service.getAllFunctions().forEach((functionName) => {
+      const functionObj = this.serverless.service.getFunction(functionName);
+      const cfTemplate = this.serverless.service.provider.compiledCloudFormationTemplate;
+
+      // It is required to add the following statement in order to be able to connect to ActiveMQ cluster
+      const ec2Statement = {
+        Effect: 'Allow',
+        Action: [
+          'ec2:CreateNetworkInterface',
+          'ec2:DescribeNetworkInterfaces',
+          'ec2:DescribeVpcs',
+          'ec2:DeleteNetworkInterface',
+          'ec2:DescribeSubnets',
+          'ec2:DescribeSecurityGroups',
+        ],
+        Resource: '*',
+      };
+
+      // The omission of kms:Decrypt is intentional, since we won't know
+      // which resources should be valid to decrypt.  It's also probably
+      // not best practice to allow '*' for this.
+      const secretsManagerStatement = {
+        Effect: 'Allow',
+        Action: ['secretsmanager:GetSecretValue'],
+        Resource: [],
+      };
+
+      const brokerStatement = {
+        Effect: 'Allow',
+        Action: ['mq:DescribeBroker'],
+        Resource: [],
+      };
+
+      let hasMQEvent = false;
+
+      functionObj.events.forEach((event) => {
+        if (!event.activemq) return;
+
+        hasMQEvent = true;
+        const { basicAuthArn, arn, batchSize, enabled, queue } = event.activemq;
+
+        const mqEventLogicalId = this.provider.naming.getActiveMQEventLogicalId(
+          functionName,
+          queue
+        );
+        const lambdaLogicalId = this.provider.naming.getLambdaLogicalId(functionName);
+        const dependsOn = this.provider.resolveFunctionIamRoleResourceName(functionObj) || [];
+
+        const mqResource = {
+          Type: 'AWS::Lambda::EventSourceMapping',
+          DependsOn: dependsOn,
+          Properties: {
+            FunctionName: {
+              'Fn::GetAtt': [lambdaLogicalId, 'Arn'],
+            },
+            EventSourceArn: arn,
+            Queues: [queue],
+            SourceAccessConfigurations: [
+              {
+                Type: 'BASIC_AUTH',
+                URI: basicAuthArn,
+              },
+            ],
+          },
+        };
+
+        if (batchSize) {
+          mqResource.Properties.BatchSize = batchSize;
+        }
+
+        if (enabled != null) {
+          mqResource.Properties.Enabled = enabled;
+        }
+
+        brokerStatement.Resource.push(arn);
+        secretsManagerStatement.Resource.push(basicAuthArn);
+        cfTemplate.Resources[mqEventLogicalId] = mqResource;
+      });
+
+      // https://docs.aws.amazon.com/lambda/latest/dg/with-mq.html#events-mq-permissions
+      if (cfTemplate.Resources.IamRoleLambdaExecution && hasMQEvent) {
+        const statement =
+          cfTemplate.Resources.IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument
+            .Statement;
+        statement.push(secretsManagerStatement);
+        statement.push(brokerStatement);
+        statement.push(ec2Statement);
+      }
+    });
+  }
+}
+
+module.exports = AwsCompileActiveMQEvents;
diff --git a/lib/plugins/aws/package/compile/events/kafka.js b/lib/plugins/aws/package/compile/events/kafka.js
index e435ad1fc9d..2f1cff587a7 100644
--- a/lib/plugins/aws/package/compile/events/kafka.js
+++ b/lib/plugins/aws/package/compile/events/kafka.js
@@ -9,9 +9,6 @@ class AwsCompileKafkaEvents {
       'package:compileEvents': this.compileKafkaEvents.bind(this),
     };
 
-    const secretsManagerArnRegex =
-      'arn:[a-z-]+:secretsmanager:[a-z0-9-]+:\\d+:secret:[A-Za-z0-9/_+=.@-]+';
-
     this.serverless.configSchemaHandler.defineFunctionEvent('aws', 'kafka', {
       type: 'object',
       properties: {
@@ -38,26 +35,17 @@ class AwsCompileKafkaEvents {
             saslPlainAuth: {
               type: 'array',
               minItems: 1,
-              items: {
-                type: 'string',
-                pattern: secretsManagerArnRegex,
-              },
+              items: { $ref: '#/definitions/awsSecretsManagerArnString' },
             },
             saslScram256Auth: {
               type: 'array',
               minItems: 1,
-              items: {
-                type: 'string',
-                pattern: secretsManagerArnRegex,
-              },
+              items: { $ref: '#/definitions/awsSecretsManagerArnString' },
             },
             saslScram512Auth: {
               type: 'array',
               minItems: 1,
-              items: {
-                type: 'string',
-                pattern: secretsManagerArnRegex,
-              },
+              items: { $ref: '#/definitions/awsSecretsManagerArnString' },
             },
           },
           additionalProperties: false,
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index ae86c405663..a53338b14a7 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -313,6 +313,10 @@ class AwsProvider {
               { $ref: '#/definitions/awsCfSplit' },
             ],
           },
+          awsSecretsManagerArnString: {
+            type: 'string',
+            pattern: 'arn:[a-z-]+:secretsmanager:[a-z0-9-]+:\\d+:secret:[A-Za-z0-9/_+=.@-]+',
+          },
           awsCfFunction: {
             anyOf: [
               { $ref: '#/definitions/awsCfImport' },
diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index 244c1dc1e15..1232a41e407 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -41,6 +41,7 @@ module.exports = [
   require('./aws/package/compile/events/sns.js'),
   require('./aws/package/compile/events/stream.js'),
   require('./aws/package/compile/events/kafka.js'),
+  require('./aws/package/compile/events/activemq.js'),
   require('./aws/package/compile/events/msk/index.js'),
   require('./aws/package/compile/events/alb/index.js'),
   require('./aws/package/compile/events/alexaSkill.js'),
diff --git a/scripts/test/integration-setup/cloudformation.yml b/scripts/test/integration-setup/cloudformation.yml
index d2815e34141..16840a7be0e 100644
--- a/scripts/test/integration-setup/cloudformation.yml
+++ b/scripts/test/integration-setup/cloudformation.yml
@@ -4,6 +4,16 @@ Parameters:
   ClusterName:
     Type: String
     Description: Name of MSK Cluster
+  ActiveMQBrokerName:
+    Type: String
+    Description: Name of Active MQ Broker
+  ActiveMQUser:
+    Type: String
+    Description: Name of Active MQ User
+  ActiveMQPassword:
+    Type: String
+    Description: Password of Active MQ User
+    NoEcho: true
   ClusterConfigurationArn:
     Type: String
     Description: MSK Cluster Configuration ARN
@@ -119,6 +129,40 @@ Resources:
       SubnetId: !Ref PrivateSubnetB
       RouteTableId: !Ref PrivateRouteTable
 
+  ActiveMQSecurityGroup:
+    Type: AWS::EC2::SecurityGroup
+    Properties:
+      GroupDescription: Security Group for ApacheMQ
+      VpcId: !Ref VPC
+      SecurityGroupIngress:
+        - IpProtocol: tcp
+          FromPort: 61617
+          ToPort: 61617
+          CidrIp: 0.0.0.0/0
+        - IpProtocol: tcp
+          FromPort: 61614
+          ToPort: 61614
+          CidrIp: 0.0.0.0/0
+
+  ActiveMQBroker:
+    Type: 'AWS::AmazonMQ::Broker'
+    Properties:
+      AutoMinorVersionUpgrade: 'false'
+      BrokerName: !Ref ActiveMQBrokerName
+      DeploymentMode: SINGLE_INSTANCE
+      EngineType: ActiveMQ
+      EngineVersion: '5.15.0'
+      HostInstanceType: mq.t2.micro
+      PubliclyAccessible: 'false'
+      SecurityGroups:
+        - !Ref ActiveMQSecurityGroup
+      SubnetIds:
+        - !Ref PrivateSubnetA
+      Users:
+        - ConsoleAccess: 'true'
+          Password: !Ref ActiveMQPassword
+          Username: !Ref ActiveMQUser
+
   MSKCluster:
     Type: 'AWS::MSK::Cluster'
     Properties:
@@ -180,6 +224,18 @@ Outputs:
     Description: Default security for Lambda VPC
     Value: !GetAtt VPC.DefaultSecurityGroup
 
+  ActiveMQBrokerArn:
+    Description: Created Active MQ Broker ARN
+    Value: !GetAtt ActiveMQBroker.Arn
+
+  ActiveMQBrokerId:
+    Description: Created Active MQ Broker Id
+    Value: !Ref ActiveMQBroker
+
+  ActiveMQSecurityGroup:
+    Description: Security Group for Active MQ
+    Value: !Ref ActiveMQSecurityGroup
+
   MSKCluster:
     Description: Created MSK Cluster
     Value: !Ref MSKCluster
diff --git a/scripts/test/integration-setup/index.js b/scripts/test/integration-setup/index.js
index 989be0467d5..7d20774dafb 100755
--- a/scripts/test/integration-setup/index.js
+++ b/scripts/test/integration-setup/index.js
@@ -9,7 +9,30 @@ const log = require('log').get('serverless');
 const awsRequest = require('@serverless/test/aws-request');
 const fsPromises = require('fs').promises;
 const path = require('path');
-const { SHARED_INFRA_TESTS_CLOUDFORMATION_STACK } = require('../../../test/utils/cloudformation');
+const {
+  SHARED_INFRA_TESTS_CLOUDFORMATION_STACK,
+  SHARED_INFRA_TESTS_ACTIVE_MQ_CREDENTIALS_NAME,
+} = require('../../../test/utils/cloudformation');
+
+const ensureMQCredentialsSecret = async () => {
+  const ssmMqCredentials = {
+    username: process.env.SLS_INTEGRATION_TESTS_ACTIVE_MQ_USER,
+    password: process.env.SLS_INTEGRATION_TESTS_ACTIVE_MQ_PASSWORD,
+  };
+  log.notice('Creating SecretsManager Active MQ Credentials secret...');
+  try {
+    await awsRequest('SecretsManager', 'createSecret', {
+      Name: SHARED_INFRA_TESTS_ACTIVE_MQ_CREDENTIALS_NAME,
+      SecretString: JSON.stringify(ssmMqCredentials),
+    });
+  } catch (e) {
+    if (!e.code === 'ResourceExistsException') {
+      throw e;
+    }
+  }
+};
+
+const activeMqBrokerName = 'integration-tests-active-mq-broker';
 
 async function handleInfrastructureCreation() {
   const [cfnTemplate, kafkaServerProperties] = await Promise.all([
@@ -17,6 +40,8 @@ async function handleInfrastructureCreation() {
     fsPromises.readFile(path.join(__dirname, 'kafka.server.properties')),
   ]);
 
+  await ensureMQCredentialsSecret();
+
   const clusterName = 'integration-tests-msk-cluster';
   const clusterConfName = 'integration-tests-msk-cluster-configuration';
 
@@ -36,6 +61,15 @@ async function handleInfrastructureCreation() {
     TemplateBody: cfnTemplate,
     Parameters: [
       { ParameterKey: 'ClusterName', ParameterValue: clusterName },
+      { ParameterKey: 'ActiveMQBrokerName', ParameterValue: activeMqBrokerName },
+      {
+        ParameterKey: 'ActiveMQUser',
+        ParameterValue: process.env.SLS_INTEGRATION_TESTS_ACTIVE_MQ_USER,
+      },
+      {
+        ParameterKey: 'ActiveMQPassword',
+        ParameterValue: process.env.SLS_INTEGRATION_TESTS_ACTIVE_MQ_PASSWORD,
+      },
       { ParameterKey: 'ClusterConfigurationArn', ParameterValue: clusterConfigurationArn },
       {
         ParameterKey: 'ClusterConfigurationRevision',
@@ -53,6 +87,8 @@ async function handleInfrastructureCreation() {
 async function handleInfrastructureUpdate() {
   log.notice('Updating integration tests CloudFormation stack...');
 
+  await ensureMQCredentialsSecret();
+
   const cfnTemplate = await fsPromises.readFile(path.join(__dirname, 'cloudformation.yml'), 'utf8');
 
   try {
@@ -61,6 +97,15 @@ async function handleInfrastructureUpdate() {
       TemplateBody: cfnTemplate,
       Parameters: [
         { ParameterKey: 'ClusterName', UsePreviousValue: true },
+        { ParameterKey: 'ActiveMQBrokerName', ParameterValue: activeMqBrokerName },
+        {
+          ParameterKey: 'ActiveMQUser',
+          ParameterValue: process.env.SLS_INTEGRATION_TESTS_ACTIVE_MQ_USER,
+        },
+        {
+          ParameterKey: 'ActiveMQPassword',
+          ParameterValue: process.env.SLS_INTEGRATION_TESTS_ACTIVE_MQ_PASSWORD,
+        },
         { ParameterKey: 'ClusterConfigurationArn', UsePreviousValue: true },
         {
           ParameterKey: 'ClusterConfigurationRevision',
@@ -85,6 +130,22 @@ async function handleInfrastructureUpdate() {
 (async () => {
   log.notice('Starting setup of integration infrastructure...');
 
+  if (!process.env.SLS_INTEGRATION_TESTS_ACTIVE_MQ_USER) {
+    log.error(
+      '"SLS_INTEGRATION_TESTS_ACTIVE_MQ_USER" env variable has to be set when provisioning integration infrastructure'
+    );
+    process.exitCode = 1;
+    return;
+  }
+
+  if (!process.env.SLS_INTEGRATION_TESTS_ACTIVE_MQ_PASSWORD) {
+    log.error(
+      '"SLS_INTEGRATION_TESTS_ACTIVE_MQ_PASSWORD" env variable has to be set when provisioning integration infrastructure'
+    );
+    process.exitCode = 1;
+    return;
+  }
+
   let describeResponse;
 
   log.notice('Checking if integration tests CloudFormation stack already exists...');
@@ -103,10 +164,10 @@ async function handleInfrastructureUpdate() {
   if (describeResponse) {
     const stackStatus = describeResponse.Stacks[0].StackStatus;
 
-    if (['CREATE_COMPLETE', 'UPDATE_COMPLETE'].includes(stackStatus)) {
+    if (['CREATE_COMPLETE', 'UPDATE_COMPLETE', 'UPDATE_ROLLBACK_COMPLETE'].includes(stackStatus)) {
       await handleInfrastructureUpdate();
     } else {
-      log.error('Existing stack has status: {stackStatus} and it cannot be updated.');
+      log.error(`Existing stack has status: ${stackStatus} and it cannot be updated.`);
       process.exitCode = 1;
     }
   } else {
diff --git a/test/fixtures/programmatic/functionActivemq/core.js b/test/fixtures/programmatic/functionActivemq/core.js
new file mode 100644
index 00000000000..4ffe1870c7f
--- /dev/null
+++ b/test/fixtures/programmatic/functionActivemq/core.js
@@ -0,0 +1,53 @@
+'use strict';
+
+// NOTE: `stompit` is bundled into the deployment package
+// eslint-disable-next-line import/no-unresolved
+const stompit = require('stompit');
+
+function consumer(event, context, callback) {
+  const functionName = 'consumer';
+  const messages = event.messages.map((message) => Buffer.from(message.data, 'base64').toString());
+  // eslint-disable-next-line no-console
+  console.log(functionName, JSON.stringify(messages));
+  return callback(null, event);
+}
+
+async function producer() {
+  const connectOptions = {
+    host: process.env.MQ_HOST,
+    port: 61614,
+    ssl: true,
+    connectHeaders: {
+      login: process.env.MQ_USERNAME,
+      passcode: process.env.MQ_PASSWORD,
+    },
+  };
+  const queueName = process.env.QUEUE_NAME;
+
+  const sendPromise = new Promise((resolve, reject) => {
+    stompit.connect(connectOptions, (error, client) => {
+      if (error) {
+        console.log(`connect error ${error.message}`);
+        reject(error);
+      }
+
+      const frame = client.send({
+        'destination': queueName,
+        'content-type': 'text/plain',
+      });
+      frame.write('Hello from Apache MQ Integration test!');
+      frame.end();
+
+      client.disconnect();
+      resolve();
+    });
+  });
+
+  await sendPromise;
+
+  return {
+    statusCode: 200,
+  };
+}
+
+module.exports = { producer, consumer };
diff --git a/test/fixtures/programmatic/functionActivemq/package.json b/test/fixtures/programmatic/functionActivemq/package.json
new file mode 100644
index 00000000000..0400a991498
--- /dev/null
+++ b/test/fixtures/programmatic/functionActivemq/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "stompit": "^1.0.0"
+  }
+}
diff --git a/test/fixtures/programmatic/functionActivemq/serverless.yml b/test/fixtures/programmatic/functionActivemq/serverless.yml
new file mode 100644
index 00000000000..ce4f94dddd0
--- /dev/null
+++ b/test/fixtures/programmatic/functionActivemq/serverless.yml
@@ -0,0 +1,18 @@
+service: service
+
+configValidationMode: error
+frameworkVersion: '*'
+
+# VPC and Events configuration is added dynamically during test run
+# Because it has to be provisioned separately via CloudFormation stack
+
+provider:
+  name: aws
+  runtime: nodejs14.x
+  versionFunctions: false
+
+functions:
+  producer:
+    handler: core.producer
+  consumer:
+    handler: core.consumer
diff --git a/test/integration/aws/infra-dependent/activemq.test.js b/test/integration/aws/infra-dependent/activemq.test.js
new file mode 100644
index 00000000000..86507a3cc9c
--- /dev/null
+++ b/test/integration/aws/infra-dependent/activemq.test.js
@@ -0,0 +1,112 @@
+'use strict';
+
+const { expect } = require('chai');
+const log = require('log').get('serverless:test');
+const fixtures = require('../../../fixtures/programmatic');
+const { confirmCloudWatchLogs } = require('../../../utils/misc');
+const {
+  isDependencyStackAvailable,
+  getDependencyStackOutputMap,
+  SHARED_INFRA_TESTS_ACTIVE_MQ_CREDENTIALS_NAME,
+} = require('../../../utils/cloudformation');
+
+const awsRequest = require('@serverless/test/aws-request');
+const crypto = require('crypto');
+const { deployService, removeService } = require('../../../utils/integration');
+
+describe('AWS - Active MQ Integration Test', function () {
+  this.timeout(1000 * 60 * 100); // Involves time-taking deploys
+  let stackName;
+  let serviceDir;
+  const stage = 'dev';
+
+  const queueName = `testqueue${crypto.randomBytes(8).toString('hex')}`;
+
+  before(async () => {
+    const isDepsStackAvailable = await isDependencyStackAvailable();
+    if (!isDepsStackAvailable) {
+      throw new Error('CloudFormation stack with integration test dependencies not found.');
+    }
+
+    const outputMap = await getDependencyStackOutputMap();
+
+    log.notice('Getting Active MQ Credentials ARN');
+    const getSecretValueResponse = await awsRequest('SecretsManager', 'getSecretValue', {
+      SecretId: SHARED_INFRA_TESTS_ACTIVE_MQ_CREDENTIALS_NAME,
+    });
+    const { username: mqUsername, password: mqPassword } = JSON.parse(
+      getSecretValueResponse.SecretString
+    );
+
+    const describeBrokerResponse = await awsRequest('ActiveMQ', 'describeBroker', {
+      BrokerId: outputMap.get('ActiveMQBrokerId'),
+    });
+    const stompEndpoint = describeBrokerResponse.BrokerInstances[0].Endpoints.find((endpoint) =>
+      endpoint.startsWith('stomp')
+    );
+
+    const serviceData = await fixtures.setup('functionActivemq', {
+      configExt: {
+        functions: {
+          producer: {
+            vpc: {
+              subnetIds: [outputMap.get('PrivateSubnetA')],
+              securityGroupIds: [outputMap.get('ActiveMQSecurityGroup')],
+            },
+            environment: {
+              QUEUE_NAME: queueName,
+              MQ_PASSWORD: mqPassword,
+              MQ_USERNAME: mqUsername,
+              MQ_HOST: stompEndpoint.split(':')[1].slice(2),
+            },
+          },
+          consumer: {
+            events: [
+              {
+                activemq: {
+                  arn: outputMap.get('ActiveMQBrokerArn'),
+                  queue: queueName,
+                  basicAuthArn: getSecretValueResponse.ARN,
+                },
+              },
+            ],
+          },
+        },
+      },
+    });
+
+    ({ servicePath: serviceDir } = serviceData);
+
+    const serviceName = serviceData.serviceConfig.service;
+    stackName = `${serviceName}-${stage}`;
+    await deployService(serviceDir);
+  });
+
+  after(async () => {
+    if (serviceDir) {
+      await removeService(serviceDir);
+    }
+  });
+
+  it('correctly processes messages from Active MQ queue', async () => {
+    const functionName = 'consumer';
+    const message = 'Hello from Apache MQ Integration test!';
+
+    const events = await confirmCloudWatchLogs(
+      `/aws/lambda/${stackName}-${functionName}`,
+      async () =>
+        await awsRequest('Lambda', 'invoke', {
+          FunctionName: `${stackName}-producer`,
+          InvocationType: 'RequestResponse',
+        }),
+      {
+        checkIsComplete: (soFarEvents) =>
+          soFarEvents.reduce((data, event) => data + event.message, '').includes(message),
+      }
+    );
+
+    const logs = events.reduce((data, event) => data + event.message, '');
+    expect(logs).to.include(functionName);
+    expect(logs).to.include(message);
+  });
+});
diff --git a/test/unit/lib/plugins/aws/package/compile/events/activemq.test.js b/test/unit/lib/plugins/aws/package/compile/events/activemq.test.js
new file mode 100644
index 00000000000..16b942b773d
--- /dev/null
+++ b/test/unit/lib/plugins/aws/package/compile/events/activemq.test.js
@@ -0,0 +1,198 @@
+'use strict';
+
+const chai = require('chai');
+const runServerless = require('../../../../../../../utils/run-serverless');
+
+const { expect } = chai;
+
+chai.use(require('chai-as-promised'));
+
+describe('test/unit/lib/plugins/aws/package/compile/events/activemq.test.js', () => {
+  const brokerArn = 'arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx';
+  const basicAuthArn = 'arn:aws:secretsmanager:us-east-1:01234567890:secret:MyBrokerSecretName';
+  const queue = 'TestingQueue';
+  const enabled = false;
+  const batchSize = 5000;
+
+  describe('when there are activemq events defined', () => {
+    let minimalEventSourceMappingResource;
+    let allParamsEventSourceMappingResource;
+    let defaultIamRole;
+    let naming;
+
+    before(async () => {
+      const { awsNaming, cfTemplate } = await runServerless({
+        fixture: 'function',
+        configExt: {
+          functions: {
+            foo: {
+              events: [
+                {
+                  activemq: {
+                    queue,
+                    arn: brokerArn,
+                    basicAuthArn,
+                  },
+                },
+              ],
+            },
+            other: {
+              events: [
+                {
+                  activemq: {
+                    queue,
+                    arn: brokerArn,
+                    basicAuthArn,
+                    batchSize,
+                    enabled,
+                  },
+                },
+              ],
+            },
+          },
+        },
+        command: 'package',
+      });
+      naming = awsNaming;
+      minimalEventSourceMappingResource =
+        cfTemplate.Resources[naming.getActiveMQEventLogicalId('foo', queue)];
+      allParamsEventSourceMappingResource =
+        cfTemplate.Resources[naming.getActiveMQEventLogicalId('other', queue)];
+      defaultIamRole = cfTemplate.Resources.IamRoleLambdaExecution;
+    });
+
+    it('should correctly compile EventSourceMapping resource properties with minimal configuration', () => {
+      expect(minimalEventSourceMappingResource.Properties).to.deep.equal({
+        EventSourceArn: brokerArn,
+        SourceAccessConfigurations: [
+          {
+            Type: 'BASIC_AUTH',
+            URI: basicAuthArn,
+          },
+        ],
+        Queues: [queue],
+        FunctionName: {
+          'Fn::GetAtt': [naming.getLambdaLogicalId('foo'), 'Arn'],
+        },
+      });
+    });
+
+    it('should update default IAM role with DescribeBroker statement', () => {
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).to.deep.include({
+        Effect: 'Allow',
+        Action: ['mq:DescribeBroker'],
+        Resource: [brokerArn],
+      });
+    });
+
+    it('should update default IAM role with SecretsManager statement', () => {
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).to.deep.include({
+        Effect: 'Allow',
+        Action: ['secretsmanager:GetSecretValue'],
+        Resource: [basicAuthArn],
+      });
+    });
+
+    it('should correctly compile EventSourceMapping resource DependsOn ', () => {
+      expect(minimalEventSourceMappingResource.DependsOn).to.equal('IamRoleLambdaExecution');
+      expect(allParamsEventSourceMappingResource.DependsOn).to.equal('IamRoleLambdaExecution');
+    });
+
+    it('should correctly compile EventSourceMapping resource with all parameters', () => {
+      expect(allParamsEventSourceMappingResource.Properties).to.deep.equal({
+        EventSourceArn: brokerArn,
+        BatchSize: batchSize,
+        Enabled: enabled,
+        SourceAccessConfigurations: [
+          {
+            Type: 'BASIC_AUTH',
+            URI: basicAuthArn,
+          },
+        ],
+        Queues: [queue],
+        FunctionName: {
+          'Fn::GetAtt': [naming.getLambdaLogicalId('other'), 'Arn'],
+        },
+      });
+    });
+
+    it('should update default IAM role with EC2 statement', async () => {
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).to.deep.include({
+        Effect: 'Allow',
+        Action: [
+          'ec2:CreateNetworkInterface',
+          'ec2:DescribeNetworkInterfaces',
+          'ec2:DescribeVpcs',
+          'ec2:DeleteNetworkInterface',
+          'ec2:DescribeSubnets',
+          'ec2:DescribeSecurityGroups',
+        ],
+        Resource: '*',
+      });
+    });
+  });
+
+  describe('configuring activemq events', () => {
+    it('should not add dependsOn for imported role', async () => {
+      const { awsNaming, cfTemplate } = await runServerless({
+        fixture: 'function',
+        configExt: {
+          functions: {
+            foo: {
+              role: { 'Fn::ImportValue': 'MyImportedRole' },
+              events: [
+                {
+                  activemq: {
+                    queue,
+                    arn: brokerArn,
+                    basicAuthArn,
+                  },
+                },
+              ],
+            },
+          },
+        },
+        command: 'package',
+      });
+
+      const eventSourceMappingResource =
+        cfTemplate.Resources[awsNaming.getActiveMQEventLogicalId('foo', queue)];
+      expect(eventSourceMappingResource.DependsOn).to.deep.equal([]);
+    });
+  });
+
+  describe('when no activemq events are defined', () => {
+    it('should not modify the default IAM role', async () => {
+      const { cfTemplate } = await runServerless({
+        fixture: 'function',
+        command: 'package',
+      });
+
+      const defaultIamRole = cfTemplate.Resources.IamRoleLambdaExecution;
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).not.to.deep.include({
+        Effect: 'Allow',
+        Action: ['mq:DescribeBroker'],
+        Resource: [brokerArn],
+      });
+
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).not.to.deep.include({
+        Effect: 'Allow',
+        Action: ['secretsmanager:GetSecretValue'],
+        Resource: [basicAuthArn],
+      });
+
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).not.to.deep.include({
+        Effect: 'Allow',
+        Action: [
+          'ec2:CreateNetworkInterface',
+          'ec2:DescribeNetworkInterfaces',
+          'ec2:DescribeVpcs',
+          'ec2:DeleteNetworkInterface',
+          'ec2:DescribeSubnets',
+          'ec2:DescribeSecurityGroups',
+        ],
+        Resource: '*',
+      });
+    });
+  });
+});
diff --git a/test/utils/cloudformation.js b/test/utils/cloudformation.js
index dc14d95c626..0d6bf23818d 100644
--- a/test/utils/cloudformation.js
+++ b/test/utils/cloudformation.js
@@ -3,6 +3,8 @@
 const awsRequest = require('@serverless/test/aws-request');
 
 const SHARED_INFRA_TESTS_CLOUDFORMATION_STACK = 'integration-tests-deps-stack';
+const SHARED_INFRA_TESTS_ACTIVE_MQ_CREDENTIALS_NAME =
+  'integration-tests-active-mq-broker-credentials';
 
 function findStacks(name, status) {
   const params = {};
@@ -101,6 +103,7 @@ module.exports = {
   listStacks,
   getStackOutputMap,
   SHARED_INFRA_TESTS_CLOUDFORMATION_STACK,
+  SHARED_INFRA_TESTS_ACTIVE_MQ_CREDENTIALS_NAME,
   isDependencyStackAvailable,
   getDependencyStackOutputMap,
 };

From f096440440dfb2339b4fd1ae1ecbca3b59fb4805 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 3 Sep 2021 12:55:11 +0200
Subject: [PATCH 0432/1101] test(AWS Lambda): Fix `activemq` integration test

---
 test/integration/aws/infra-dependent/activemq.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/aws/infra-dependent/activemq.test.js b/test/integration/aws/infra-dependent/activemq.test.js
index 86507a3cc9c..0f51558d67c 100644
--- a/test/integration/aws/infra-dependent/activemq.test.js
+++ b/test/integration/aws/infra-dependent/activemq.test.js
@@ -38,7 +38,7 @@ describe('AWS - Active MQ Integration Test', function () {
       getSecretValueResponse.SecretString
     );
 
-    const describeBrokerResponse = await awsRequest('ActiveMQ', 'describeBroker', {
+    const describeBrokerResponse = await awsRequest('MQ', 'describeBroker', {
       BrokerId: outputMap.get('ActiveMQBrokerId'),
     });
     const stompEndpoint = describeBrokerResponse.BrokerInstances[0].Endpoints.find((endpoint) =>

From 5155e0180e0cd5e3130bc74e308a97c0ea1a5c2b Mon Sep 17 00:00:00 2001
From: Sudipto Das <s.das001@yahoo.com>
Date: Mon, 6 Sep 2021 12:56:55 +0530
Subject: [PATCH 0433/1101] refactor: Replace `fse.access` with
 `fs.promises.access` (#9915)

---
 lib/plugins/aws/invokeLocal/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invokeLocal/index.js
index 6901554b4ce..4a03625cc11 100644
--- a/lib/plugins/aws/invokeLocal/index.js
+++ b/lib/plugins/aws/invokeLocal/index.js
@@ -470,7 +470,7 @@ class AwsInvokeLocal {
   async ensurePackage() {
     if (this.options['skip-package']) {
       try {
-        await fse.access(
+        await fsp.access(
           path.join(this.serverless.serviceDir, '.serverless', 'serverless-state.json')
         );
         return;

From 510b1d165924d000aa8e81e74e27c69ac1a2e0b6 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 3 Sep 2021 18:23:13 +0200
Subject: [PATCH 0434/1101] fix(AWS API Gateway): Ensure proper
 `RequestValidator` name

---
 .../aws/package/compile/events/apiGateway/index.js |  3 +++
 .../events/apiGateway/lib/requestValidator.js      | 14 ++------------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/index.js b/lib/plugins/aws/package/compile/events/apiGateway/index.js
index c2e5418f1d6..53a72c7e173 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/index.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/index.js
@@ -4,6 +4,7 @@
 
 const BbPromise = require('bluebird');
 const _ = require('lodash');
+const memoize = require('memoizee');
 
 const validate = require('./lib/validate');
 const compileRestApi = require('./lib/restApi');
@@ -236,6 +237,8 @@ class AwsCompileApigEvents {
       getMethodResponses
     );
 
+    this.createRequestValidator = memoize(this.createRequestValidator.bind(this));
+
     this.hooks = {
       'initialize': () => {
         if (
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
index e9497ec8c0b..04414d1c7f8 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
@@ -15,7 +15,6 @@ module.exports = {
       const template =
         this.serverless.service.provider.compiledCloudFormationTemplate.Resources[methodLogicalId];
       let validatorLogicalId;
-      let validatorName;
 
       if (
         event.http.request &&
@@ -29,7 +28,6 @@ module.exports = {
         if (!validatorLogicalId) {
           const requestValidator = this.createRequestValidator();
           validatorLogicalId = requestValidator.validatorLogicalId;
-          validatorName = requestValidator.validatorName;
         }
 
         template.Properties.RequestValidatorId = { Ref: validatorLogicalId };
@@ -45,15 +43,12 @@ module.exports = {
           if (!validatorLogicalId) {
             const requestValidator = this.createRequestValidator();
             validatorLogicalId = requestValidator.validatorLogicalId;
-            validatorName = requestValidator.validatorName;
           }
 
           if (referencedDefinitionFromProvider) {
             modelLogicalId = this.createProviderModel(
               schemaConfig,
-              apiGatewayConfig.request.schemas[schemaConfig],
-              validatorLogicalId,
-              validatorName
+              apiGatewayConfig.request.schemas[schemaConfig]
             );
           } else {
             // In this situation, we have two options - schema is defined as string that does not reference model from provider or as an object
@@ -115,7 +110,6 @@ module.exports = {
           if (!validatorLogicalId) {
             const requestValidator = this.createRequestValidator();
             validatorLogicalId = requestValidator.validatorLogicalId;
-            validatorName = requestValidator.validatorName;
           }
 
           template.Properties.RequestValidatorId = { Ref: validatorLogicalId };
@@ -137,7 +131,7 @@ module.exports = {
     });
   },
 
-  createProviderModel(schemaId, schemaConfig, validatorLogicalId, validatorName) {
+  createProviderModel(schemaId, schemaConfig) {
     let modelName;
     let description;
     let definition;
@@ -153,7 +147,6 @@ module.exports = {
 
     if (schemaConfig.name) {
       modelName = schemaConfig.name;
-      validatorName = `${modelName}Validator`;
     }
 
     if (schemaConfig.description) {
@@ -175,9 +168,6 @@ module.exports = {
       this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
         modelLogicalId
       ].Properties.Name = modelName;
-      this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
-        validatorLogicalId
-      ].Properties.Name = validatorName;
     }
 
     if (description) {

From ff45a42def95dc6d113238b426b2a444dc388175 Mon Sep 17 00:00:00 2001
From: Corentin Doue <31917261+CorentinDoue@users.noreply.github.com>
Date: Mon, 6 Sep 2021 13:56:19 +0200
Subject: [PATCH 0435/1101] docs: Add `invoke local` doc for `google` provider
 (#9603)

---
 .../google/cli-reference/invoke-local.md      | 121 ++++++++++++++++++
 docs/providers/google/cli-reference/login.md  |   2 +-
 docs/providers/google/cli-reference/logs.md   |   2 +-
 .../google/cli-reference/plugin-install.md    |   2 +-
 .../google/cli-reference/plugin-list.md       |   2 +-
 .../google/cli-reference/plugin-search.md     |   2 +-
 .../google/cli-reference/plugin-uninstall.md  |   2 +-
 docs/providers/google/cli-reference/print.md  |   2 +-
 8 files changed, 128 insertions(+), 7 deletions(-)
 create mode 100644 docs/providers/google/cli-reference/invoke-local.md

diff --git a/docs/providers/google/cli-reference/invoke-local.md b/docs/providers/google/cli-reference/invoke-local.md
new file mode 100644
index 00000000000..8c53345670b
--- /dev/null
+++ b/docs/providers/google/cli-reference/invoke-local.md
@@ -0,0 +1,121 @@
+<!--
+title: Serverless Framework Commands - Google Cloud Functions - Invoke Local
+menuText: invoke local
+menuOrder: 7
+description: Emulate an invocation of your Google Cloud function locally using the Serverless Framework
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/google/cli-reference/invoke-local)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# Google - Invoke Local
+
+Invokes deployed function locally. It allows to send event data to the function, read logs and display other important information of the function invocation.
+
+```bash
+serverless invoke local -f functionName
+```
+
+## Options
+
+- `--function` or `-f` The name of the function in your service that you want to invoke. **Required**.
+- `--data` or `-d` Data you want to pass into the function
+- `--path` or `-p` Path to JSON or YAML file holding input data. This path is relative to the root directory of the service.
+- `--raw` Pass data as a raw string even if it is JSON. If not set, JSON data are parsed and passed as an object.
+- `--contextPath` or `-x`, The path to a json file holding input context to be passed to the invoked function. This path is relative to the root directory of the service.
+- `--context` or `-c`, String data to be passed as a context to your function. Same like with `--data`, context included in `--contextPath` will overwrite the context you passed with `--context` flag.
+- `--env` or `-e` String representing an environment variable to set when invoking your function, in the form `<name>=<value>`. Can be repeated for more than one environment variable.
+
+> Keep in mind that if you pass both `--path` and `--data`, the data included in the `--path` file will overwrite the data you passed with the `--data` flag.
+
+## Examples
+
+### Local function invocation
+
+```bash
+serverless invoke local -f functionName
+```
+
+### Local function invocation with data
+
+```bash
+serverless invoke local -f functionName -d '{ "data": "hello world" }'
+```
+
+### Local function invocation with data passing
+
+```bash
+serverless invoke local -f functionName -p path/to/file.json
+# OR
+serverless invoke local -f functionName -p path/to/file.yaml
+```
+
+### Local function invocation, setting environment variables
+
+````bash
+serverless invoke local -f functionName -e VAR1=value1
+# Or more than one variable
+serverless invoke local -f functionName -e VAR1=value1 -e VAR2=value2
+
+## Event vs Http
+
+Cloud functions can be triggered by events or http. Those two types of functions have different signatures.
+The data you can provide to a local invocation of a function are also different according to their types.
+
+### Event
+
+The signature of the function is
+```js
+function eventHandler (event, context, callback) {}
+```
+
+The data provided through `data` or loaded through `path` will be in `event`.
+
+The data provided through `context` or loaded through `contextPath` will be in `context`.
+
+### Http
+
+The function use express, its signature is
+
+```js
+function httpHandler(req, res) {}
+```
+
+The data provided through `data` or loaded through `path` will be merged in `req`.
+
+The data provided through `context` or loaded through `contextPath` will be ignored.
+
+Example:
+
+```json
+# mocks/postHelloWorld.json
+{
+  "method": "POST",
+  "headers": {
+    "content-type": "application/json"
+  },
+  "body": {
+    "message": "Hello World"
+  }
+}
+```
+
+```bash
+serverless invoke local -f httpHandler -p mocks/postHelloWorld.json
+```
+will invoke `httpHandler` with an express request with the provided headers and body
+
+## Resource permissions
+
+When a cloud function is executed in the cloud, the Google SDK will implicitly resolve its [runtime service account](https://cloud.google.com/functions/docs/concepts/iam#runtime_service_accounts).
+which will be used to interact with the other GCP services.
+
+When you locally invoke a cloud function, the Google SDK will also implicitly resolve a service account or a user.
+Make sure you are authenticated with your user or a service account following the [authentication procedure](https://www.serverless.com/framework/docs/providers/google/guide/credentials/)
+and that the authenticated account have the necessary rights to access to all services you want your function to access
+
+````
diff --git a/docs/providers/google/cli-reference/login.md b/docs/providers/google/cli-reference/login.md
index a0977cebc9b..f47d956f35e 100644
--- a/docs/providers/google/cli-reference/login.md
+++ b/docs/providers/google/cli-reference/login.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework Commands - Login
 menuText: login
-menuOrder: 7
+menuOrder: 8
 description: Login to the serverless platform
 layout: Doc
 -->
diff --git a/docs/providers/google/cli-reference/logs.md b/docs/providers/google/cli-reference/logs.md
index 7afb0e7a626..87a7e2a8447 100644
--- a/docs/providers/google/cli-reference/logs.md
+++ b/docs/providers/google/cli-reference/logs.md
@@ -1,7 +1,7 @@
 <!--
 title: Google Cloud Functions Serverless logs command
 menuText: logs
-menuOrder: 8
+menuOrder: 9
 description: View logs of your Google Cloud Functions Function within your terminal using the Serverless Framework
 layout: Doc
 -->
diff --git a/docs/providers/google/cli-reference/plugin-install.md b/docs/providers/google/cli-reference/plugin-install.md
index 5270a9346d4..2d297737866 100644
--- a/docs/providers/google/cli-reference/plugin-install.md
+++ b/docs/providers/google/cli-reference/plugin-install.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework Commands - Google Cloud Functions - Plugin Install
 menuText: Plugin Install
-menuOrder: 12
+menuOrder: 13
 description: Install a Serverless plugin
 layout: Doc
 -->
diff --git a/docs/providers/google/cli-reference/plugin-list.md b/docs/providers/google/cli-reference/plugin-list.md
index 67cdf426caf..cd16e451ece 100644
--- a/docs/providers/google/cli-reference/plugin-list.md
+++ b/docs/providers/google/cli-reference/plugin-list.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework Commands - Google Cloud Functions - Plugin List
 menuText: Plugin List
-menuOrder: 10
+menuOrder: 11
 description: List all available Serverless plugins
 layout: Doc
 -->
diff --git a/docs/providers/google/cli-reference/plugin-search.md b/docs/providers/google/cli-reference/plugin-search.md
index c1c13282bdb..90d968b0542 100644
--- a/docs/providers/google/cli-reference/plugin-search.md
+++ b/docs/providers/google/cli-reference/plugin-search.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework Commands - Google Cloud Functions - Plugin Search
 menuText: Plugin Search
-menuOrder: 11
+menuOrder: 12
 description: Search through all available Serverless plugins
 layout: Doc
 -->
diff --git a/docs/providers/google/cli-reference/plugin-uninstall.md b/docs/providers/google/cli-reference/plugin-uninstall.md
index 81d5e86bcc0..140c28a9b04 100644
--- a/docs/providers/google/cli-reference/plugin-uninstall.md
+++ b/docs/providers/google/cli-reference/plugin-uninstall.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework Commands - Google Cloud Functions - Plugin Uninstall
 menuText: Plugin Uninstall
-menuOrder: 12
+menuOrder: 14
 description: Uninstall a Serverless plugin
 layout: Doc
 -->
diff --git a/docs/providers/google/cli-reference/print.md b/docs/providers/google/cli-reference/print.md
index d47f768c189..3a599e34db1 100644
--- a/docs/providers/google/cli-reference/print.md
+++ b/docs/providers/google/cli-reference/print.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework Commands - Google Cloud Functions - Print
 menuText: Print
-menuOrder: 13
+menuOrder: 15
 description: Print your config with all variables resolved for debugging
 layout: Doc
 -->

From b0ca2376bbfb543d98db1585c3a20a391e1791c6 Mon Sep 17 00:00:00 2001
From: Mars Lan <mars.th.lan@gmail.com>
Date: Mon, 6 Sep 2021 07:16:39 -0700
Subject: [PATCH 0436/1101] feat: Do not retry AWS requests if the token has
 expired (#9914)

---
 .gitignore                        |  1 +
 lib/aws/request.js                |  3 ++-
 test/unit/lib/aws/request.test.js | 28 +++++++++++++++++++++++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3e71f2a2d15..3f2216472d0 100755
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /node_modules
 npm-debug.log
 /package-lock.json
+/yarn.lock
diff --git a/lib/aws/request.js b/lib/aws/request.js
index ac454184bbb..587d77ee9f9 100644
--- a/lib/aws/request.js
+++ b/lib/aws/request.js
@@ -150,7 +150,8 @@ async function awsRequest(service, method, ...args) {
         providerError &&
         ((providerError.retryable &&
           providerError.statusCode !== 403 &&
-          providerError.code !== 'CredentialsError') ||
+          providerError.code !== 'CredentialsError' &&
+          providerError.code !== 'ExpiredTokenException') ||
           providerError.statusCode === 429)
       ) {
         const nextTryNum = numTry + 1;
diff --git a/test/unit/lib/aws/request.test.js b/test/unit/lib/aws/request.test.js
index 0c2ac1e7c4a..944e8143028 100644
--- a/test/unit/lib/aws/request.test.js
+++ b/test/unit/lib/aws/request.test.js
@@ -203,7 +203,7 @@ describe('#request', () => {
       expect(sendFake.promise).to.have.been.calledTwice;
     });
 
-    it('should not retry if error code is 403 and retryable is set to true', async () => {
+    it('should not retry if status code is 403 and retryable is set to true', async () => {
       const error = {
         providerError: {
           statusCode: 403,
@@ -229,6 +229,32 @@ describe('#request', () => {
       return expect(sendFake.promise).to.have.been.calledOnce;
     });
 
+    it('should not retry if error code is ExpiredTokenException and retryable is set to true', async () => {
+      const error = {
+        providerError: {
+          statusCode: 400,
+          retryable: true,
+          code: 'ExpiredTokenException',
+          message: 'Testing retry',
+        },
+      };
+      const sendFake = {
+        promise: sinon.stub(),
+      };
+      sendFake.promise.onFirstCall().rejects(error);
+      sendFake.promise.onSecondCall().resolves({});
+      class FakeS3 {
+        error() {
+          return sendFake;
+        }
+      }
+      const awsRequest = proxyquire('../../../../lib/aws/request', {
+        'aws-sdk': { S3: FakeS3 },
+      });
+      expect(awsRequest({ name: 'S3' }, 'error')).to.be.rejected;
+      return expect(sendFake.promise).to.have.been.calledOnce;
+    });
+
     it('should expose non-retryable errors', async () => {
       const error = {
         statusCode: 500,

From e46ce80d99414ff730355efd1636bab71bb1771c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 7 Sep 2021 09:38:09 +0200
Subject: [PATCH 0437/1101] refactor(CLI): Ensure no monkey patching by
 progress override

---
 lib/cli/interactive-setup/deploy-progress-plugin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli/interactive-setup/deploy-progress-plugin.js b/lib/cli/interactive-setup/deploy-progress-plugin.js
index 05ae2bbf488..c058c45f9fe 100644
--- a/lib/cli/interactive-setup/deploy-progress-plugin.js
+++ b/lib/cli/interactive-setup/deploy-progress-plugin.js
@@ -6,7 +6,7 @@ const chalk = require('chalk');
 class InteractiveDeployProgress {
   constructor(serverless) {
     this.serverless = serverless;
-    this.progress = cliProgressFooter({ overrideStdout: false });
+    this.progress = cliProgressFooter({ overrideStdout: false, redirectStderr: false });
     this.progress.shouldAddProgressAnimationPrefix = true;
 
     this.hooks = {

From 34d7f1d32ec55937dc3c6608f8ec00e7fc2fac59 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 7 Sep 2021 09:43:35 +0200
Subject: [PATCH 0438/1101] chore: Upgrade `cli-progress-footer` to v2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index af0b93a5811..043b09712d3 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "chalk": "^4.1.2",
     "child-process-ext": "^2.1.1",
     "ci-info": "^3.2.0",
-    "cli-progress-footer": "^1.1.1",
+    "cli-progress-footer": "^2.0.0",
     "d": "^1.0.1",
     "dayjs": "^1.10.6",
     "decompress": "^4.2.1",

From c172430a6ea235f66b85b297398d2f60f484ecd3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 7 Sep 2021 09:43:47 +0200
Subject: [PATCH 0439/1101] chore: Upgrade `log-node` to v8

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 043b09712d3..24d29ad633b 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
     "jszip": "^3.7.1",
     "lint-staged": "^10.5.4",
     "log": "^6.0.0",
-    "log-node": "^7.0.0",
+    "log-node": "^8.0.0",
     "mocha": "^8.4.0",
     "mock-require": "^3.0.3",
     "nyc": "^15.1.0",

From ec93174b8ccfe1715ce3615dcb2223b145ad0f31 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 7 Sep 2021 11:20:47 +0200
Subject: [PATCH 0440/1101] feat(CLI): Configure log writing with new
 (experimental) log engine

---
 package.json          | 2 +-
 scripts/serverless.js | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 24d29ad633b..cf82fb8e726 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@serverless/components": "^3.16.0",
     "@serverless/dashboard-plugin": "^5.4.4",
     "@serverless/platform-client": "^4.3.0",
-    "@serverless/utils": "^5.7.0",
+    "@serverless/utils": "^5.8.1",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 2f23525396c..5375c3f78dd 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -13,6 +13,9 @@ if (require('../lib/utils/tabCompletion/isSupported') && process.argv[2] === 'co
   return;
 }
 
+// Setup log writing
+require('@serverless/utils/log-reporters/node');
+
 const handleError = require('../lib/cli/handle-error');
 const {
   storeLocally: storeTelemetryLocally,

From 29aec529b53d7dd10f4ec61db7c0dc3859995d27 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 8 Sep 2021 14:49:01 +0200
Subject: [PATCH 0441/1101] feat(CLI): Ensure to clear progress in expected
 time points

---
 package.json          | 2 +-
 scripts/serverless.js | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cf82fb8e726..00eb874f6b2 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@serverless/components": "^3.16.0",
     "@serverless/dashboard-plugin": "^5.4.4",
     "@serverless/platform-client": "^4.3.0",
-    "@serverless/utils": "^5.8.1",
+    "@serverless/utils": "^5.9.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 5375c3f78dd..a09c6cf59e4 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -15,6 +15,7 @@ if (require('../lib/utils/tabCompletion/isSupported') && process.argv[2] === 'co
 
 // Setup log writing
 require('@serverless/utils/log-reporters/node');
+const { progress } = require('@serverless/utils/log');
 
 const handleError = require('../lib/cli/handle-error');
 const {
@@ -42,6 +43,7 @@ const keepAliveTimer = setTimeout(() => {}, 60 * 60 * 1000);
 
 process.once('uncaughtException', (error) => {
   clearTimeout(keepAliveTimer);
+  progress.clear();
   const cachedHasTelemetryBeenReported = hasTelemetryBeenReported;
   hasTelemetryBeenReported = true;
   handleError(error, {
@@ -61,6 +63,7 @@ process.once('uncaughtException', (error) => {
 require('signal-exit/signals').forEach((signal) => {
   process.once(signal, () => {
     clearTimeout(keepAliveTimer);
+    progress.clear();
     // If there's another listener (e.g. we're in deamon context or reading stdin input)
     // then let the other listener decide how process will exit
     const isOtherSigintListener = Boolean(process.listenerCount(signal));
@@ -511,6 +514,8 @@ const processSpanPromise = (async () => {
           commandUsage,
         });
 
+      progress.clear();
+
       logDeprecation.printSummary();
 
       if (!hasTelemetryBeenReported) {
@@ -797,6 +802,7 @@ const processSpanPromise = (async () => {
         // Run command
         await serverless.run();
       }
+      progress.clear();
 
       logDeprecation.printSummary();
 
@@ -852,6 +858,7 @@ const processSpanPromise = (async () => {
       throw error;
     }
   } catch (error) {
+    progress.clear();
     const cachedHasTelemetryBeenReported = hasTelemetryBeenReported;
     hasTelemetryBeenReported = true;
     handleError(error, {

From df5f96952fad4f0593cb8b57b6a3ced2da7939e9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 8 Sep 2021 15:56:03 +0200
Subject: [PATCH 0442/1101] docs: Improve `dotenv` setup instructions

---
 docs/environment-variables.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/environment-variables.md b/docs/environment-variables.md
index f9afe496cfb..1f3ded726dc 100644
--- a/docs/environment-variables.md
+++ b/docs/environment-variables.md
@@ -6,7 +6,13 @@ layout: Doc
 
 # Resolution of environment variables
 
-With `useDotenv: true` set in your `serverless.yml` file, framework automatically loads environment variables from `.env` files with the help of [dotenv](https://www.npmjs.com/package/dotenv). In addition, `.env` files are excluded from the package when `useDotenv` is set in order to avoid uploading sensitive data as a part of package by mistake. Starting with next major version, `.env` files will be loaded by default and `useDotenv` setting will be ignored.
+To automatically load environment variables from `.env` files (with the help of [dotenv](https://www.npmjs.com/package/dotenv) package) please set `useDotenv` property in `serverless.yml` as below:
+
+```yaml
+useDotenv: true
+```
+
+Having that `.env` files will also be excluded from the package in order to avoid uploading sensitive data as a part of a package by mistake. Starting with the next major version, `.env` files will be loaded by default and `useDotenv` setting will be ignored.
 
 ## Support for `.env` files
 

From 9f0bc689cc2ac3e53b4db665b899e1446ac37456 Mon Sep 17 00:00:00 2001
From: Federico Jasson <federicojasson@gmail.com>
Date: Wed, 8 Sep 2021 17:19:12 -0300
Subject: [PATCH 0443/1101] feat(AWS Schedule): Allow multiple rate expressions
 in single event

* Allow multiple cron/rate expressions in AWS schedule event

* Update schedule.test.js to use runServerless

* schedule.test.js: minimize calls to runServerless
---
 docs/providers/aws/events/schedule.md         |  21 +
 docs/providers/aws/guide/serverless.yml.md    |   2 +-
 .../aws/package/compile/events/schedule.js    |  70 ++-
 test/fixtures/programmatic/schedule/core.js   |   8 +-
 .../programmatic/schedule/serverless.yml      |  10 +
 test/integration/aws/schedule.test.js         |  17 +
 .../package/compile/events/schedule.test.js   | 473 ++++++++----------
 7 files changed, 303 insertions(+), 298 deletions(-)

diff --git a/docs/providers/aws/events/schedule.md b/docs/providers/aws/events/schedule.md
index 1e46a5e79c2..1840dc938bb 100644
--- a/docs/providers/aws/events/schedule.md
+++ b/docs/providers/aws/events/schedule.md
@@ -69,3 +69,24 @@ events:
       description: 'your scheduled rate event description'
       rate: rate(2 hours)
 ```
+
+## Specify multiple schedule expressions
+
+An array of schedule expressions (i.e. using either `rate` or `cron` syntax) can be specified, in order to avoid repeating other configuration variables.
+This is specially useful in situations in which there's no other way than using multiple cron expressions to schedule a function.
+
+This will trigger the function at certain times on weekdays and on different times on weekends, using the same input:
+
+```yaml
+functions:
+  foo:
+    handler: foo.handler
+    events:
+      - schedule:
+          rate:
+            - cron(0 0/4 ? * MON-FRI *)
+            - cron(0 2 ? * SAT-SUN *)
+          input:
+            key1: value1
+            key2: value2
+```
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 6d18e17f14d..2400cbe6d34 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -412,7 +412,7 @@ functions:
       - schedule:
           name: my scheduled event
           description: a description of my scheduled event's purpose
-          rate: rate(10 minutes)
+          rate: rate(10 minutes) # Can also be an array of rate/cron expressions
           enabled: false
           # Note, you can use only one of input, inputPath, or inputTransformer
           input:
diff --git a/lib/plugins/aws/package/compile/events/schedule.js b/lib/plugins/aws/package/compile/events/schedule.js
index 8d28861bd28..e060590692d 100644
--- a/lib/plugins/aws/package/compile/events/schedule.js
+++ b/lib/plugins/aws/package/compile/events/schedule.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
+const ServerlessError = require('../../../../../serverless-error');
 
 const rateSyntax = '^rate\\((?:1 (?:minute|hour|day)|(?:1\\d+|[2-9]\\d*) (?:minute|hour|day)s)\\)$';
 const cronSyntax = '^cron\\(\\S+ \\S+ \\S+ \\S+ \\S+ \\S+\\)$';
@@ -21,7 +22,14 @@ class AwsCompileScheduledEvents {
         {
           type: 'object',
           properties: {
-            rate: { type: 'string', pattern: scheduleSyntax },
+            rate: {
+              type: 'array',
+              minItems: 1,
+              items: {
+                type: 'string',
+                pattern: scheduleSyntax,
+              },
+            },
             enabled: { type: 'boolean' },
             name: { type: 'string', minLength: 1, maxLength: 64, pattern: '[\\.\\-_A-Za-z0-9]+' },
             description: { type: 'string', maxLength: 512 },
@@ -77,8 +85,7 @@ class AwsCompileScheduledEvents {
       if (functionObj.events) {
         functionObj.events.forEach((event) => {
           if (event.schedule) {
-            scheduleNumberInFunction++;
-            let ScheduleExpression;
+            let ScheduleExpressions;
             let State;
             let Input;
             let InputPath;
@@ -87,7 +94,8 @@ class AwsCompileScheduledEvents {
             let Description;
 
             if (typeof event.schedule === 'object') {
-              ScheduleExpression = event.schedule.rate;
+              ScheduleExpressions = event.schedule.rate;
+
               State = 'ENABLED';
               if (event.schedule.enabled === false) {
                 State = 'DISABLED';
@@ -98,6 +106,13 @@ class AwsCompileScheduledEvents {
               Name = event.schedule.name;
               Description = event.schedule.description;
 
+              if (ScheduleExpressions.length > 1 && Name) {
+                throw new ServerlessError(
+                  'You cannot specify a name when defining more than one rate expression',
+                  'SCHEDULE_NAME_NOT_ALLOWED_MULTIPLE_RATES'
+                );
+              }
+
               if (Input && typeof Input === 'object') {
                 if (typeof Input.body === 'string') {
                   Input.body = JSON.parse(Input.body);
@@ -112,23 +127,27 @@ class AwsCompileScheduledEvents {
                 InputTransformer = this.formatInputTransformer(InputTransformer);
               }
             } else {
-              ScheduleExpression = event.schedule;
+              ScheduleExpressions = [event.schedule];
               State = 'ENABLED';
             }
 
             const lambdaLogicalId = this.provider.naming.getLambdaLogicalId(functionName);
-            const scheduleLogicalId = this.provider.naming.getScheduleLogicalId(
-              functionName,
-              scheduleNumberInFunction
-            );
-            const lambdaPermissionLogicalId =
-              this.provider.naming.getLambdaSchedulePermissionLogicalId(
+            const scheduleId = this.provider.naming.getScheduleId(functionName);
+
+            for (const ScheduleExpression of ScheduleExpressions) {
+              scheduleNumberInFunction++;
+
+              const scheduleLogicalId = this.provider.naming.getScheduleLogicalId(
                 functionName,
                 scheduleNumberInFunction
               );
-            const scheduleId = this.provider.naming.getScheduleId(functionName);
+              const lambdaPermissionLogicalId =
+                this.provider.naming.getLambdaSchedulePermissionLogicalId(
+                  functionName,
+                  scheduleNumberInFunction
+                );
 
-            const scheduleTemplate = `
+              const scheduleTemplate = `
               {
                 "Type": "AWS::Events::Rule",
                 "Properties": {
@@ -147,7 +166,7 @@ class AwsCompileScheduledEvents {
               }
             `;
 
-            const permissionTemplate = `
+              const permissionTemplate = `
               {
                 "Type": "AWS::Lambda::Permission",
                 "Properties": {
@@ -159,19 +178,20 @@ class AwsCompileScheduledEvents {
               }
             `;
 
-            const newScheduleObject = {
-              [scheduleLogicalId]: JSON.parse(scheduleTemplate),
-            };
+              const newScheduleObject = {
+                [scheduleLogicalId]: JSON.parse(scheduleTemplate),
+              };
 
-            const newPermissionObject = {
-              [lambdaPermissionLogicalId]: JSON.parse(permissionTemplate),
-            };
+              const newPermissionObject = {
+                [lambdaPermissionLogicalId]: JSON.parse(permissionTemplate),
+              };
 
-            _.merge(
-              this.serverless.service.provider.compiledCloudFormationTemplate.Resources,
-              newScheduleObject,
-              newPermissionObject
-            );
+              _.merge(
+                this.serverless.service.provider.compiledCloudFormationTemplate.Resources,
+                newScheduleObject,
+                newPermissionObject
+              );
+            }
           }
         });
       }
diff --git a/test/fixtures/programmatic/schedule/core.js b/test/fixtures/programmatic/schedule/core.js
index fa3f5a33e9e..1c58c5eab22 100644
--- a/test/fixtures/programmatic/schedule/core.js
+++ b/test/fixtures/programmatic/schedule/core.js
@@ -16,4 +16,10 @@ function scheduleExtended(event, context, callback) {
   return callback(null, event);
 }
 
-module.exports = { scheduleMinimal, scheduleExtended };
+function scheduleExtendedArray(event, context, callback) {
+  const functionName = 'scheduleExtendedArray';
+  log(functionName, JSON.stringify(event));
+  return callback(null, event);
+}
+
+module.exports = { scheduleMinimal, scheduleExtended, scheduleExtendedArray };
diff --git a/test/fixtures/programmatic/schedule/serverless.yml b/test/fixtures/programmatic/schedule/serverless.yml
index d405b9f7d11..9f8ce98fbd8 100644
--- a/test/fixtures/programmatic/schedule/serverless.yml
+++ b/test/fixtures/programmatic/schedule/serverless.yml
@@ -21,3 +21,13 @@ functions:
             inputPathsMap:
               eventTime: '$.time'
             inputTemplate: '{"time": <eventTime>, "name": "transformedInput"}'
+  scheduleExtendedArray:
+    handler: core.scheduleExtendedArray
+    events:
+      - schedule:
+          rate:
+            - cron(* * * * ? *)
+          inputTransformer:
+            inputPathsMap:
+              eventTime: '$.time'
+            inputTemplate: '{"time": <eventTime>, "name": "transformedInput"}'
diff --git a/test/integration/aws/schedule.test.js b/test/integration/aws/schedule.test.js
index 345568d0f36..dc361bd4fa5 100644
--- a/test/integration/aws/schedule.test.js
+++ b/test/integration/aws/schedule.test.js
@@ -54,4 +54,21 @@ describe('AWS - Schedule Integration Test', function () {
       });
     });
   });
+
+  describe('Extended Setup (array)', () => {
+    it('should invoke every minute with transformed input', () => {
+      const functionName = 'scheduleExtendedArray';
+
+      return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, async () => {}, {
+        checkIsComplete: (soFarEvents) => {
+          const logs = soFarEvents.reduce((data, event) => data + event.message, '');
+          return logs.includes('transformedInput');
+        },
+      }).then((events) => {
+        const logs = events.reduce((data, event) => data + event.message, '');
+        expect(logs).to.include(functionName);
+        expect(logs).to.include('transformedInput');
+      });
+    });
+  });
 });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/schedule.test.js b/test/unit/lib/plugins/aws/package/compile/events/schedule.test.js
index 7b9a9ab949f..13590d3946c 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/schedule.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/schedule.test.js
@@ -1,295 +1,226 @@
 'use strict';
 
-const expect = require('chai').expect;
-const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
-const AwsCompileScheduledEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/schedule');
-const Serverless = require('../../../../../../../../lib/Serverless');
-
-describe('AwsCompileScheduledEvents', () => {
-  let serverless;
-  let awsCompileScheduledEvents;
-
-  beforeEach(() => {
-    serverless = new Serverless();
-    serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
-    serverless.setProvider('aws', new AwsProvider(serverless));
-    awsCompileScheduledEvents = new AwsCompileScheduledEvents(serverless);
-    awsCompileScheduledEvents.serverless.service.service = 'new-service';
-  });
-
-  describe('#constructor()', () => {
-    it('should set the provider variable to an instance of AwsProvider', () =>
-      expect(awsCompileScheduledEvents.provider).to.be.instanceof(AwsProvider));
-  });
-
-  describe('#compileScheduledEvents()', () => {
-    it('should create corresponding resources when schedule events are given', () => {
-      awsCompileScheduledEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-                enabled: false,
-              },
-            },
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-                enabled: true,
-              },
-            },
-            {
-              schedule: 'rate(10 minutes)',
-            },
-            {
-              schedule: 'cron(5,35 12 ? * 6l 2002-2005)',
-            },
-          ],
+const runServerless = require('../../../../../../../utils/run-serverless');
+const ServerlessError = require('../../../../../../../../lib/serverless-error');
+const { use: chaiUse, expect } = require('chai');
+const chaiAsPromised = require('chai-as-promised');
+
+chaiUse(chaiAsPromised);
+
+async function run(events) {
+  const params = {
+    fixture: 'function',
+    command: 'package',
+    configExt: {
+      functions: {
+        test: {
+          handler: 'index.handler',
+          events,
         },
-      };
-
-      awsCompileScheduledEvents.compileScheduledEvents();
-
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule1.Type
-      ).to.equal('AWS::Events::Rule');
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule2.Type
-      ).to.equal('AWS::Events::Rule');
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule3.Type
-      ).to.equal('AWS::Events::Rule');
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstLambdaPermissionEventsRuleSchedule1.Type
-      ).to.equal('AWS::Lambda::Permission');
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstLambdaPermissionEventsRuleSchedule2.Type
-      ).to.equal('AWS::Lambda::Permission');
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstLambdaPermissionEventsRuleSchedule3.Type
-      ).to.equal('AWS::Lambda::Permission');
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstLambdaPermissionEventsRuleSchedule4.Type
-      ).to.equal('AWS::Lambda::Permission');
-    });
-
-    it('should respect enabled variable, defaulting to true', () => {
-      awsCompileScheduledEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-                enabled: false,
-              },
-            },
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-                enabled: true,
-              },
-            },
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-              },
-            },
-            {
-              schedule: 'rate(10 minutes)',
-            },
-          ],
+      },
+    },
+  };
+  const { awsNaming, cfTemplate } = await runServerless(params);
+  const cfResources = cfTemplate.Resources;
+
+  const scheduleCfResources = [];
+
+  for (const event of events) {
+    const schedule = event.schedule;
+    let scheduleEvents;
+
+    if (typeof schedule === 'string') {
+      scheduleEvents = [schedule];
+    } else {
+      scheduleEvents = Array.isArray(schedule.rate) ? schedule.rate : [schedule.rate];
+    }
+
+    for (let i = 0; i < scheduleEvents.length; i++) {
+      const index = scheduleCfResources.length + 1;
+
+      const scheduleLogicalId = awsNaming.getScheduleLogicalId('test', index);
+      const scheduleCfResource = cfResources[scheduleLogicalId];
+
+      scheduleCfResources.push(scheduleCfResource);
+    }
+  }
+
+  return scheduleCfResources;
+}
+
+describe('test/unit/lib/plugins/aws/package/compile/events/schedule.test.js', () => {
+  let scheduleCfResources;
+
+  before(async () => {
+    const events = [
+      {
+        schedule: {
+          rate: 'rate(10 minutes)',
+          enabled: false,
+          name: 'your-scheduled-event-name',
+          description: 'your scheduled event description',
         },
-      };
-
-      awsCompileScheduledEvents.compileScheduledEvents();
-
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule1.Properties.State
-      ).to.equal('DISABLED');
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule2.Properties.State
-      ).to.equal('ENABLED');
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule3.Properties.State
-      ).to.equal('ENABLED');
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule4.Properties.State
-      ).to.equal('ENABLED');
-    });
-
-    it('should respect name variable', () => {
-      awsCompileScheduledEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-                enabled: false,
-                name: 'your-scheduled-event-name',
-              },
-            },
-          ],
+      },
+      {
+        schedule: {
+          rate: ['rate(1 hour)'],
+          name: 'your-scheduled-event-name-array',
+          inputPath: '$.stageVariables',
         },
-      };
-
-      awsCompileScheduledEvents.compileScheduledEvents();
-
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule1.Properties.Name
-      ).to.equal('your-scheduled-event-name');
-    });
-
-    it('should respect description variable', () => {
-      awsCompileScheduledEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-                enabled: false,
-                description: 'your scheduled event description',
-              },
-            },
-          ],
+      },
+      {
+        schedule: {
+          rate: 'rate(10 minutes)',
+          enabled: true,
+          input: '{"key":"array"}',
         },
-      };
-
-      awsCompileScheduledEvents.compileScheduledEvents();
-
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule1.Properties.Description
-      ).to.equal('your scheduled event description');
-    });
-
-    it('should respect inputPath variable', () => {
-      awsCompileScheduledEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-                enabled: false,
-                inputPath: '$.stageVariables',
-              },
-            },
-          ],
+      },
+      {
+        schedule: 'rate(10 minutes)',
+      },
+      {
+        schedule: 'cron(5,35 12 ? * 6l 2002-2005)',
+      },
+      {
+        schedule: {
+          rate: ['cron(0 0/4 ? * MON-FRI *)', 'rate(1 hour)'],
+          enabled: false,
+          description: 'your scheduled event description (array)',
+          input: {
+            key: 'array',
+          },
         },
-      };
-
-      awsCompileScheduledEvents.compileScheduledEvents();
-
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule1.Properties.Targets[0].InputPath
-      ).to.equal('$.stageVariables');
-    });
-
-    it('should respect input variable', () => {
-      awsCompileScheduledEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-                enabled: false,
-                input: '{"key":"value"}',
-              },
+      },
+      {
+        schedule: {
+          rate: 'rate(1 hour)',
+          inputTransformer: {
+            inputPathsMap: {
+              eventTime: '$.time',
             },
-          ],
+            inputTemplate: '{"time": <eventTime>, "key": "value"}',
+          },
         },
-      };
+      },
+    ];
 
-      awsCompileScheduledEvents.compileScheduledEvents();
+    scheduleCfResources = await run(events);
+  });
 
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule1.Properties.Targets[0].Input
-      ).to.equal('{"key":"value"}');
-    });
+  it('should create the corresponding schedule resources when schedule events are given', () => {
+    for (const scheduleCfResource of scheduleCfResources) {
+      expect(scheduleCfResource.Type).to.equal('AWS::Events::Rule');
+    }
+  });
 
-    it('should respect input variable as an object', () => {
-      awsCompileScheduledEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-                enabled: false,
-                input: {
-                  key: 'value',
-                },
-              },
-            },
-          ],
-        },
-      };
+  it('should respect the given rate expressions', () => {
+    expect(scheduleCfResources[0].Properties.ScheduleExpression).to.equal('rate(10 minutes)');
+    expect(scheduleCfResources[1].Properties.ScheduleExpression).to.equal('rate(1 hour)');
+    expect(scheduleCfResources[2].Properties.ScheduleExpression).to.equal('rate(10 minutes)');
+    expect(scheduleCfResources[3].Properties.ScheduleExpression).to.equal('rate(10 minutes)');
+    expect(scheduleCfResources[4].Properties.ScheduleExpression).to.equal(
+      'cron(5,35 12 ? * 6l 2002-2005)'
+    );
+    expect(scheduleCfResources[5].Properties.ScheduleExpression).to.equal(
+      'cron(0 0/4 ? * MON-FRI *)'
+    );
+    expect(scheduleCfResources[6].Properties.ScheduleExpression).to.equal('rate(1 hour)');
+    expect(scheduleCfResources[7].Properties.ScheduleExpression).to.equal('rate(1 hour)');
+  });
 
-      awsCompileScheduledEvents.compileScheduledEvents();
+  it('should respect the "enabled" variable, defaulting to true', () => {
+    expect(scheduleCfResources[0].Properties.State).to.equal('DISABLED');
+    expect(scheduleCfResources[1].Properties.State).to.equal('ENABLED');
+    expect(scheduleCfResources[2].Properties.State).to.equal('ENABLED');
+    expect(scheduleCfResources[3].Properties.State).to.equal('ENABLED');
+    expect(scheduleCfResources[4].Properties.State).to.equal('ENABLED');
+    expect(scheduleCfResources[5].Properties.State).to.equal('DISABLED');
+    expect(scheduleCfResources[6].Properties.State).to.equal('DISABLED');
+    expect(scheduleCfResources[7].Properties.State).to.equal('ENABLED');
+  });
 
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule1.Properties.Targets[0].Input
-      ).to.equal('{"key":"value"}');
-    });
+  it('should respect the "name" variable', () => {
+    expect(scheduleCfResources[0].Properties.Name).to.equal('your-scheduled-event-name');
+    expect(scheduleCfResources[1].Properties.Name).to.equal('your-scheduled-event-name-array');
+    expect(scheduleCfResources[2].Properties.Name).to.be.undefined;
+    expect(scheduleCfResources[3].Properties.Name).to.be.undefined;
+    expect(scheduleCfResources[4].Properties.Name).to.be.undefined;
+    expect(scheduleCfResources[5].Properties.Name).to.be.undefined;
+    expect(scheduleCfResources[6].Properties.Name).to.be.undefined;
+    expect(scheduleCfResources[7].Properties.Name).to.be.undefined;
+  });
 
-    it('should respect inputTransformer variable', () => {
-      awsCompileScheduledEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-                enabled: false,
-                inputTransformer: {
-                  inputPathsMap: {
-                    eventTime: '$.time',
-                  },
-                  inputTemplate: '{"time": <eventTime>, "key1": "value1"}',
-                },
-              },
-            },
-          ],
+  it('should throw an error if a "name" variable is specified when defining more than one rate expression', async () => {
+    const events = [
+      {
+        schedule: {
+          rate: ['cron(0 0/4 ? * MON-FRI *)', 'rate(1 hour)'],
+          enabled: false,
+          name: 'your-scheduled-event-name',
         },
-      };
+      },
+    ];
 
-      awsCompileScheduledEvents.compileScheduledEvents();
+    await expect(run(events)).to.be.eventually.rejectedWith(
+      ServerlessError,
+      'You cannot specify a name when defining more than one rate expression'
+    );
+  });
 
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule1.Properties.Targets[0].InputTransformer
-      ).to.eql({
-        InputTemplate: '{"time": <eventTime>, "key1": "value1"}',
-        InputPathsMap: { eventTime: '$.time' },
-      });
-    });
+  it('should respect the "description" variable', () => {
+    expect(scheduleCfResources[0].Properties.Description).to.equal(
+      'your scheduled event description'
+    );
+    expect(scheduleCfResources[1].Properties.Description).to.be.undefined;
+    expect(scheduleCfResources[2].Properties.Description).to.be.undefined;
+    expect(scheduleCfResources[3].Properties.Description).to.be.undefined;
+    expect(scheduleCfResources[4].Properties.Description).to.be.undefined;
+    expect(scheduleCfResources[5].Properties.Description).to.equal(
+      'your scheduled event description (array)'
+    );
+    expect(scheduleCfResources[6].Properties.Description).to.equal(
+      'your scheduled event description (array)'
+    );
+    expect(scheduleCfResources[7].Properties.Description).to.be.undefined;
+  });
 
-    it('should not create corresponding resources when scheduled events are not given', () => {
-      awsCompileScheduledEvents.serverless.service.functions = {
-        first: {
-          events: [],
-        },
-      };
+  it('should respect the "inputPath" variable', () => {
+    expect(scheduleCfResources[0].Properties.Targets[0].InputPath).to.be.undefined;
+    expect(scheduleCfResources[1].Properties.Targets[0].InputPath).to.equal('$.stageVariables');
+    expect(scheduleCfResources[2].Properties.Targets[0].InputPath).to.be.undefined;
+    expect(scheduleCfResources[3].Properties.Targets[0].InputPath).to.be.undefined;
+    expect(scheduleCfResources[4].Properties.Targets[0].InputPath).to.be.undefined;
+    expect(scheduleCfResources[5].Properties.Targets[0].InputPath).to.be.undefined;
+    expect(scheduleCfResources[6].Properties.Targets[0].InputPath).to.be.undefined;
+    expect(scheduleCfResources[7].Properties.Targets[0].InputPath).to.be.undefined;
+  });
 
-      awsCompileScheduledEvents.compileScheduledEvents();
+  it('should respect the "input" variable', () => {
+    expect(scheduleCfResources[0].Properties.Targets[0].Input).to.be.undefined;
+    expect(scheduleCfResources[1].Properties.Targets[0].Input).to.be.undefined;
+    expect(scheduleCfResources[2].Properties.Targets[0].Input).to.equal('{"key":"array"}');
+    expect(scheduleCfResources[3].Properties.Targets[0].Input).to.be.undefined;
+    expect(scheduleCfResources[4].Properties.Targets[0].Input).to.be.undefined;
+    expect(scheduleCfResources[5].Properties.Targets[0].Input).to.equal('{"key":"array"}');
+    expect(scheduleCfResources[6].Properties.Targets[0].Input).to.equal('{"key":"array"}');
+    expect(scheduleCfResources[7].Properties.Targets[0].Input).to.be.undefined;
+  });
 
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources
-      ).to.deep.equal({});
+  it('should respect the "inputTransformer" variable', () => {
+    expect(scheduleCfResources[0].Properties.Targets[0].InputTransformer).to.be.undefined;
+    expect(scheduleCfResources[1].Properties.Targets[0].InputTransformer).to.be.undefined;
+    expect(scheduleCfResources[2].Properties.Targets[0].InputTransformer).to.be.undefined;
+    expect(scheduleCfResources[3].Properties.Targets[0].InputTransformer).to.be.undefined;
+    expect(scheduleCfResources[4].Properties.Targets[0].InputTransformer).to.be.undefined;
+    expect(scheduleCfResources[5].Properties.Targets[0].InputTransformer).to.be.undefined;
+    expect(scheduleCfResources[6].Properties.Targets[0].InputTransformer).to.be.undefined;
+    expect(scheduleCfResources[7].Properties.Targets[0].InputTransformer).to.deep.equal({
+      InputTemplate: '{"time": <eventTime>, "key": "value"}',
+      InputPathsMap: { eventTime: '$.time' },
     });
   });
+
+  it('should not create schedule resources when no scheduled event is given', async () => {
+    expect(run([])).to.be.eventually.empty;
+  });
 });

From b425cf1582623c1e796ae9f3d33dc060a9492cb5 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 9 Sep 2021 10:04:20 +0200
Subject: [PATCH 0444/1101] feat: Internal API to register service outputs

---
 lib/Serverless.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index bc6d29fdc4e..c9fcae82516 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -3,7 +3,9 @@
 const path = require('path');
 const os = require('os');
 const ensureString = require('type/string/ensure');
+const ensureValue = require('type/value/ensure');
 const ensureArray = require('type/array/ensure');
+const ensureIterable = require('type/iterable/ensure');
 const ensurePlainObject = require('type/plain-object/ensure');
 const _ = require('lodash');
 const CLI = require('./classes/CLI');
@@ -448,10 +450,30 @@ class Serverless {
       // If in context of service, validate the service configuration
       if (this.serviceDir) this.service.validate();
     }
+
+    this.serviceOutputs = new Map();
+
     // trigger the plugin lifecycle when there's something which should be processed
     await this.pluginManager.run(this.processedInput.commands);
   }
 
+  addServiceOutputSection(sectionName, content) {
+    sectionName = ensureString(sectionName, { name: 'sectionName' });
+    if (typeof ensureValue(content, { name: 'content' }) !== 'string') {
+      content = ensureIterable(content, {
+        name: 'content',
+        denyEmpty: true,
+        ensureItem: ensureString,
+      });
+    } else if (!content) {
+      throw new TypeError('Section content cannot be empty string');
+    }
+    if (this.serviceOutputs.has(sectionName)) {
+      throw new TypeError(`Section content for "${sectionName}" was already set`);
+    }
+    this.serviceOutputs.set(sectionName, content);
+  }
+
   setProvider(name, provider) {
     this.providers[name] = provider;
   }

From 312266e90819866199354183641954636bd5a076 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 9 Sep 2021 12:26:21 +0200
Subject: [PATCH 0445/1101] feat: Register service outputs

---
 lib/plugins/aws/info/display.js               |  21 ++++
 .../unit/lib/plugins/aws/info/display.test.js | 105 ++++++++++++++++++
 2 files changed, 126 insertions(+)

diff --git a/lib/plugins/aws/info/display.js b/lib/plugins/aws/info/display.js
index 6c08a61121b..abc401ba8f8 100644
--- a/lib/plugins/aws/info/display.js
+++ b/lib/plugins/aws/info/display.js
@@ -31,6 +31,7 @@ module.exports = {
     let apiKeysMessage = `${chalk.yellow('api keys:')}`;
 
     if (info.apiKeys && info.apiKeys.length > 0) {
+      const outputSectionItems = [];
       info.apiKeys.forEach((apiKeyInfo) => {
         const description = apiKeyInfo.description ? ` - ${apiKeyInfo.description}` : '';
         if (conceal) {
@@ -38,7 +39,9 @@ module.exports = {
         } else {
           apiKeysMessage += `\n  ${apiKeyInfo.name}: ${apiKeyInfo.value}${description}`;
         }
+        outputSectionItems.push(`${apiKeyInfo.name}: ${apiKeyInfo.value}${description}`);
       });
+      this.serverless.addServiceOutputSection('api keys', outputSectionItems);
     } else {
       apiKeysMessage += '\n  None';
     }
@@ -51,6 +54,7 @@ module.exports = {
     const info = this.gatheredData.info;
     let endpointsMessage = `${chalk.yellow('endpoints:')}`;
 
+    const outputSectionItems = [];
     if (info.endpoints && info.endpoints.length) {
       info.endpoints.forEach((endpoint) => {
         // if the endpoint is of type http(s)
@@ -76,6 +80,7 @@ module.exports = {
                         .join('/')}`
                     : '';
                 endpointsMessage += `\n  ${method} - ${endpoint}${path}`;
+                outputSectionItems.push(`${method} - ${endpoint}${path}`);
               }
             });
           });
@@ -90,23 +95,33 @@ module.exports = {
               endpointsMessage += `\n  ${event.resolvedMethod} - ${endpoint}${
                 event.resolvedPath || ''
               }`;
+              outputSectionItems.push(
+                `${event.resolvedMethod} - ${endpoint}${event.resolvedPath || ''}`
+              );
             }
           }
         } else {
           // if the endpoint is not of type http(s) (e.g. wss) we just display
           endpointsMessage += `\n  ${endpoint}`;
+          outputSectionItems.push(endpoint);
         }
       });
     }
 
     if (info.cloudFront) {
       endpointsMessage += `\n  CloudFront - ${info.cloudFront}`;
+      outputSectionItems.push(`CloudFront - ${info.cloudFront}`);
     }
 
     if (!info.endpoints.length && !info.cloudFront) {
       endpointsMessage += '\n  None';
     }
 
+    if (outputSectionItems.length > 1) {
+      this.serverless.addServiceOutputSection('endpoints', outputSectionItems);
+    } else if (outputSectionItems.length) {
+      this.serverless.addServiceOutputSection('endpoint', outputSectionItems[0]);
+    }
     this.serverless.cli.consoleLog(endpointsMessage);
     return endpointsMessage;
   },
@@ -116,9 +131,12 @@ module.exports = {
     let functionsMessage = `${chalk.yellow('functions:')}`;
 
     if (info.functions && info.functions.length > 0) {
+      const outputSectionItems = [];
       info.functions.forEach((f) => {
         functionsMessage += `\n  ${f.name}: ${f.deployedName}`;
+        outputSectionItems.push(`${f.name}: ${f.deployedName}`);
       });
+      this.serverless.addServiceOutputSection('functions', outputSectionItems);
     } else {
       functionsMessage += '\n  None';
     }
@@ -132,9 +150,12 @@ module.exports = {
     let layersMessage = `${chalk.yellow('layers:')}`;
 
     if (info.layers && info.layers.length > 0) {
+      const outputSectionItems = [];
       info.layers.forEach((l) => {
         layersMessage += `\n  ${l.name}: ${l.arn}`;
+        outputSectionItems.push(`${l.name}: ${l.arn}`);
       });
+      this.serverless.addServiceOutputSection('layers', outputSectionItems);
     } else {
       layersMessage += '\n  None';
     }
diff --git a/test/unit/lib/plugins/aws/info/display.test.js b/test/unit/lib/plugins/aws/info/display.test.js
index 1a94739dab8..5ea639f4487 100644
--- a/test/unit/lib/plugins/aws/info/display.test.js
+++ b/test/unit/lib/plugins/aws/info/display.test.js
@@ -7,6 +7,7 @@ const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
 const Serverless = require('../../../../../../lib/Serverless');
 const CLI = require('../../../../../../lib/classes/CLI');
 const chalk = require('chalk');
+const runServerless = require('../../../../../utils/run-serverless');
 
 describe('#display()', () => {
   let serverless;
@@ -19,6 +20,7 @@ describe('#display()', () => {
       region: 'us-east-1',
     };
     serverless = new Serverless();
+    serverless.serviceOutputs = new Map();
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.cli = new CLI(serverless);
     serverless.service.service = 'my-service';
@@ -353,3 +355,106 @@ describe('#display()', () => {
     expect(nonVerboseMessage).to.equal('');
   });
 });
+
+describe('test/unit/lib/plugins/aws/info/display.test.js', () => {
+  let serverless;
+  let serviceName;
+
+  before(async () => {
+    ({
+      serverless,
+      fixtureData: {
+        serviceConfig: { service: serviceName },
+      },
+    } = await runServerless({
+      fixture: 'apiGateway',
+      command: 'info',
+      awsRequestStubMap: {
+        APIGateway: {
+          getApiKey: {
+            value: 'test-key-value',
+            name: 'test-key-name',
+          },
+        },
+        CloudFormation: {
+          describeStacks: {
+            Stacks: [
+              {
+                Outputs: [
+                  {
+                    OutputKey: 'ServiceEndpoint',
+                    OutputValue: 'https://xxxxx.execute-api.us-east-1.amazonaws.com/dev',
+                    Description: 'URL of the service endpoint',
+                    ExportName: 'sls-test-api-gw',
+                  },
+                  {
+                    OutputKey: 'ServerlessDeploymentBucketName',
+                    OutputValue: 'test-api-gw-dev-serverlessdeploymentbucket-xxxxx',
+                    ExportName: 'sls-test-api-gw-ServerlessDeploymentBucketName',
+                  },
+                  {
+                    OutputKey: 'LayerLambdaLayerQualifiedArn',
+                    OutputValue: 'arn:aws:lambda:us-east-1:00000000:layer:layer:1',
+                  },
+                ],
+              },
+            ],
+          },
+          describeStackResources: {
+            StackResources: [
+              {
+                PhysicalResourceId: 'test',
+                ResourceType: 'AWS::ApiGateway::ApiKey',
+              },
+            ],
+          },
+          listStackResources: {},
+        },
+      },
+      configExt: {
+        provider: {
+          apiGateway: {
+            apiKeys: [
+              { name: 'full-key', value: 'full-key-asdf-asdf-asdf-adfafdadfadfadfadfafafdafadf' },
+              'no-value-key',
+              { value: 'no-name-key-asdf-asdf-asdf-adfafdadfadfadfadfafafdafadf' },
+            ],
+          },
+        },
+        layers: {
+          layer: {
+            path: 'layer',
+          },
+        },
+      },
+    }));
+  });
+
+  it('should register api gateway api keys section', () => {
+    expect(serverless.serviceOutputs.get('api keys')).to.deep.equal([
+      'test-key-name: test-key-value',
+    ]);
+  });
+
+  it('should register endpoints section', () => {
+    expect(serverless.serviceOutputs.get('endpoints')).to.deep.equal([
+      'GET - https://xxxxx.execute-api.us-east-1.amazonaws.com/dev',
+      'POST - https://xxxxx.execute-api.us-east-1.amazonaws.com/dev/minimal-1',
+      'GET - https://xxxxx.execute-api.us-east-1.amazonaws.com/dev/foo',
+      'POST - https://xxxxx.execute-api.us-east-1.amazonaws.com/dev/some-post',
+      'GET - https://xxxxx.execute-api.us-east-1.amazonaws.com/dev/bar/{marko}',
+    ]);
+  });
+  it('should register functions section', () => {
+    expect(serverless.serviceOutputs.get('functions')).to.deep.equal([
+      `minimal: ${serviceName}-dev-minimal`,
+      `foo: ${serviceName}-dev-foo`,
+      `other: ${serviceName}-dev-other`,
+    ]);
+  });
+  it('should register layers section', () => {
+    expect(serverless.serviceOutputs.get('layers')).to.deep.equal([
+      'layer: arn:aws:lambda:us-east-1:00000000:layer:layer:1',
+    ]);
+  });
+});

From 1107763df8fb07a40ec45529f77d99e5a0f6d4d6 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 6 Sep 2021 15:34:32 +0200
Subject: [PATCH 0446/1101] feat(AWS API Gateway): Support `enabled` for
 `apiKeys` config

---
 docs/providers/aws/events/apigateway.md       |  2 +-
 docs/providers/aws/guide/serverless.yml.md    |  1 +
 .../compile/events/apiGateway/lib/apiKeys.js  |  4 +-
 lib/plugins/aws/provider.js                   |  1 +
 .../events/apiGateway/lib/apiKeys.test.js     | 63 ++++++++++++-------
 5 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/docs/providers/aws/events/apigateway.md b/docs/providers/aws/events/apigateway.md
index 9b5fb3d7a69..7bab4c4142f 100644
--- a/docs/providers/aws/events/apigateway.md
+++ b/docs/providers/aws/events/apigateway.md
@@ -608,7 +608,7 @@ In case an exception is thrown in your lambda function AWS will send an error me
 
 ### Setting API keys for your Rest API
 
-You can specify a list of API keys to be used by your service Rest API by adding an `apiKeys` array property to the `provider.apiGateway` object in `serverless.yml`. You'll also need to explicitly specify which endpoints are `private` and require one of the api keys to be included in the request by adding a `private` boolean property to the `http` event object you want to set as private. API Keys are created globally, so if you want to deploy your service to different stages make sure your API key contains a stage variable as defined below. When using API keys, you can optionally define usage plan quota and throttle, using `usagePlan` object.
+You can specify a list of API keys to be used by your service Rest API by adding an `apiKeys` array property to the `provider.apiGateway` object in `serverless.yml`. You'll also need to explicitly specify which endpoints are `private` and require one of the api keys to be included in the request by adding a `private` boolean property to the `http` event object you want to set as private. API Keys are created globally, so if you want to deploy your service to different stages make sure your API key contains a stage variable as defined below. When using API keys, you can optionally define usage plan quota and throttle, using `usagePlan` object. Additionally, you can also disable selected API keys by setting `enabled` property to `false`.
 
 When setting the value, you need to be aware that changing value will require replacement and CloudFormation doesn't allow
 two API keys with the same name. It means that you need to change the name also when changing the value. If you don't care
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 2400cbe6d34..c60e01b75ce 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -117,6 +117,7 @@ provider:
         value: myFirstKeyValue
         description: myFirstKeyDescription
         customerId: myFirstKeyCustomerId
+        enabled: true # Optional, true by default, can be used to disable API key without deleting the resource
       - ${opt:stage}-myFirstKey
       - ${env:MY_API_KEY} # you can hide it in a serverless variable
     minimumCompressionSize: 1024 # Compress response when larger than specified size in bytes (must be between 0 and 10485760)
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.js
index b8709f9f060..533bcc87f2f 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.js
@@ -7,10 +7,12 @@ function createApiKeyResource(that, apiKey) {
   const value = _.isObject(apiKey) && apiKey.value ? apiKey.value : undefined;
   const description = _.isObject(apiKey) ? apiKey.description : undefined;
   const customerId = _.isObject(apiKey) ? apiKey.customerId : undefined;
+  const enabled = _.isObject(apiKey) && apiKey.enabled != null ? apiKey.enabled : true;
+
   const resourceTemplate = {
     Type: 'AWS::ApiGateway::ApiKey',
     Properties: {
-      Enabled: true,
+      Enabled: enabled,
       Name: name,
       Value: value,
       Description: description,
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index a53338b14a7..4bf1f15446e 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -287,6 +287,7 @@ class AwsProvider {
               value: { type: 'string' },
               description: { type: 'string' },
               customerId: { type: 'string' },
+              enabled: { type: 'boolean' },
             },
             additionalProperties: false,
           },
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js
index 70c8d5d2b56..35bc5d93150 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js
@@ -139,25 +139,32 @@ describe('#compileApiKeys()', () => {
 });
 
 describe('lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js', () => {
-  it('should support usage plan notation', async () => {
-    const apiGatewayExt = {
-      apiKeys: [
-        {
-          free: [
-            '1234567890',
-            { name: '2345678901' },
-            {
-              value: 'valueForKeyWithoutName',
-              description: 'Api key description',
-            },
-            { name: '3456789012', value: 'valueForKey3456789012' },
-            { description: 'descriptionForKeyWithoutNameOrValue' },
-          ],
-        },
-        { paid: ['0987654321', 'jihgfedcba'] },
-      ],
-      usagePlan: [{ free: {} }, { paid: {} }],
-    };
+  let cfResources;
+  let naming;
+  let serverlessInstance;
+  const apiGatewayExt = {
+    apiKeys: [
+      {
+        free: [
+          '1234567890',
+          { name: '2345678901' },
+          {
+            value: 'valueForKeyWithoutName',
+            description: 'Api key description',
+          },
+          { name: '3456789012', value: 'valueForKey3456789012' },
+          { description: 'descriptionForKeyWithoutNameOrValue' },
+        ],
+      },
+      { paid: ['0987654321', 'jihgfedcba'] },
+      {
+        disabled: [{ name: '1111111111', enabled: false }],
+      },
+    ],
+    usagePlan: [{ free: {} }, { paid: {} }, { disabled: {} }],
+  };
+
+  before(async () => {
     const { awsNaming, cfTemplate, serverless } = await runServerless({
       fixture: 'apiGateway',
       command: 'package',
@@ -167,8 +174,17 @@ describe('lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js'
         },
       },
     });
-    const resources = cfTemplate.Resources;
+    naming = awsNaming;
+    cfResources = cfTemplate.Resources;
+    serverlessInstance = serverless;
+  });
 
+  it('should disable keys when enabled: false', () => {
+    const resource = cfResources[naming.getApiKeyLogicalId(1, 'disabled')];
+    expect(resource.Properties.Enabled).to.be.false;
+  });
+
+  it('should support usage plan notation', () => {
     const expectedApiKeys = {
       free: [
         { name: '1234567890', value: undefined, description: undefined },
@@ -194,11 +210,12 @@ describe('lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js'
         { name: 'jihgfedcba', value: undefined, description: undefined },
       ],
     };
-    apiGatewayExt.apiKeys.forEach((plan) => {
+
+    apiGatewayExt.apiKeys.slice(0, 2).forEach((plan) => {
       const planName = Object.keys(plan)[0]; // free || paid
       const apiKeys = expectedApiKeys[planName];
       apiKeys.forEach((apiKey, index) => {
-        const resource = resources[awsNaming.getApiKeyLogicalId(index + 1, planName)];
+        const resource = cfResources[naming.getApiKeyLogicalId(index + 1, planName)];
         expect(resource.Type).to.equal('AWS::ApiGateway::ApiKey');
         expect(resource.Properties.Enabled).to.equal(true);
         expect(resource.Properties.Name).to.equal(apiKey.name);
@@ -207,7 +224,7 @@ describe('lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js'
         expect(resource.Properties.StageKeys[0].RestApiId.Ref).to.equal('ApiGatewayRestApi');
         expect(resource.Properties.StageKeys[0].StageName).to.equal('dev');
         expect(resource.DependsOn).to.equal(
-          awsNaming.generateApiGatewayDeploymentLogicalId(serverless.instanceId)
+          naming.generateApiGatewayDeploymentLogicalId(serverlessInstance.instanceId)
         );
       });
     });

From 5c9766c085531b04e169aa36a552159755029cca Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 9 Sep 2021 16:58:50 +0200
Subject: [PATCH 0447/1101] feat: Support `error` hook to be triggered on
 command error

---
 lib/classes/PluginManager.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index f1f3e78e776..0af2efdaf97 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -16,6 +16,7 @@ const { storeLocally: storeTelemetryLocally, send: sendTelemetry } = require('..
 const generateTelemetryPayload = require('../utils/telemetry/generatePayload');
 const processBackendNotificationRequest = require('../utils/processBackendNotificationRequest');
 const isTelemetryDisabled = require('../utils/telemetry/areDisabled');
+const tokenizeException = require('../utils/tokenize-exception');
 
 const requireServicePlugin = (serviceDir, pluginPath, localPluginsPath) => {
   if (localPluginsPath && !pluginPath.startsWith('./')) {
@@ -637,6 +638,17 @@ class PluginManager {
 
     try {
       await this.invoke(commandsArray);
+    } catch (error) {
+      try {
+        for (const { hook } of this.getHooks(['error'])) await hook(error);
+      } catch (subError) {
+        const subErrorMeta = tokenizeException(subError);
+        this.serverless.cli.log(
+          `Warning: "error" hook crashed with: ${subErrorMeta.stack || subErrorMeta.message}`
+        );
+      } finally {
+        throw error; // eslint-disable-line no-unsafe-finally
+      }
     } finally {
       if (deferredBackendNotificationRequest) {
         await processBackendNotificationRequest(await deferredBackendNotificationRequest);

From f431218790ae31efdc4e0a65a5b17a32605ede3e Mon Sep 17 00:00:00 2001
From: Sudipto Das <s.das001@yahoo.com>
Date: Fri, 10 Sep 2021 15:30:44 +0530
Subject: [PATCH 0448/1101] refactor: Replace `fse.readFile` with
 `fs.promises.readFile` (#9935)

---
 lib/configuration/read.js                                | 4 ++--
 lib/configuration/variables/sources/file.js              | 4 ++--
 lib/plugins/aws/invokeLocal/index.js                     | 2 +-
 lib/utils/fs/readFile.js                                 | 4 ++--
 scripts/test/integration-setup/index.js                  | 8 ++++----
 test/unit/lib/plugins/package/lib/packageService.test.js | 6 +++---
 test/unit/lib/utils/fs/writeFile.test.js                 | 4 ++--
 test/unit/lib/utils/fs/writeFileSync.test.js             | 4 ++--
 test/utils/integration.js                                | 4 ++--
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/configuration/read.js b/lib/configuration/read.js
index b13c3cb85a2..77e040da922 100644
--- a/lib/configuration/read.js
+++ b/lib/configuration/read.js
@@ -3,7 +3,7 @@
 const ensureString = require('type/string/ensure');
 const isPlainObject = require('type/plain-object/is');
 const path = require('path');
-const fs = require('fs').promises;
+const fsp = require('fs').promises;
 const yaml = require('js-yaml');
 const resolveModulePath = require('ncjsm/resolve');
 const isModuleNotFoundError = require('ncjsm/is-module-not-found-error');
@@ -65,7 +65,7 @@ const resolveTsNode = async (serviceDir) => {
 
 const readConfigurationFile = async (configurationPath) => {
   try {
-    return await fs.readFile(configurationPath, 'utf8');
+    return await fsp.readFile(configurationPath, 'utf8');
   } catch (error) {
     if (error.code === 'ENOENT') {
       throw new ServerlessError(
diff --git a/lib/configuration/variables/sources/file.js b/lib/configuration/variables/sources/file.js
index b37abf5546c..acadebcb0d8 100644
--- a/lib/configuration/variables/sources/file.js
+++ b/lib/configuration/variables/sources/file.js
@@ -3,14 +3,14 @@
 const ensureString = require('type/string/ensure');
 const isPlainFunction = require('type/plain-function/is');
 const path = require('path');
-const fs = require('fs').promises;
+const fsp = require('fs').promises;
 const yaml = require('js-yaml');
 const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
 const ServerlessError = require('../../../serverless-error');
 
 const readFile = async (filePath, serviceDir) => {
   try {
-    return await fs.readFile(filePath, 'utf8');
+    return await fsp.readFile(filePath, 'utf8');
   } catch (error) {
     if (error.code === 'ENOENT') return null;
     throw new ServerlessError(
diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invokeLocal/index.js
index 4a03625cc11..7936e767304 100644
--- a/lib/plugins/aws/invokeLocal/index.js
+++ b/lib/plugins/aws/invokeLocal/index.js
@@ -393,7 +393,7 @@ class AwsInvokeLocal {
     const dockerfileCachePath = path.join(cachePath, 'dockerfiles', runtime, 'Dockerfile');
 
     if (await fileExists(dockerfileCachePath)) {
-      const contents = await fse.readFile(dockerfileCachePath);
+      const contents = await fsp.readFile(dockerfileCachePath);
 
       if (contents.toString() === dockerFileContent) {
         if (await this.checkDockerImage(imageName)) return imageName;
diff --git a/lib/utils/fs/readFile.js b/lib/utils/fs/readFile.js
index d88808950da..b690b0643d4 100644
--- a/lib/utils/fs/readFile.js
+++ b/lib/utils/fs/readFile.js
@@ -1,10 +1,10 @@
 'use strict';
 
-const fse = require('fs-extra');
+const fsp = require('fs').promises;
 const parse = require('./parse');
 
 async function readFile(filePath) {
-  return fse.readFile(filePath, 'utf8').then((contents) => parse(filePath, contents));
+  return fsp.readFile(filePath, 'utf8').then((contents) => parse(filePath, contents));
 }
 
 module.exports = readFile;
diff --git a/scripts/test/integration-setup/index.js b/scripts/test/integration-setup/index.js
index 7d20774dafb..0d0fbf2c7be 100755
--- a/scripts/test/integration-setup/index.js
+++ b/scripts/test/integration-setup/index.js
@@ -7,7 +7,7 @@ require('log-node')();
 
 const log = require('log').get('serverless');
 const awsRequest = require('@serverless/test/aws-request');
-const fsPromises = require('fs').promises;
+const fsp = require('fs').promises;
 const path = require('path');
 const {
   SHARED_INFRA_TESTS_CLOUDFORMATION_STACK,
@@ -36,8 +36,8 @@ const activeMqBrokerName = 'integration-tests-active-mq-broker';
 
 async function handleInfrastructureCreation() {
   const [cfnTemplate, kafkaServerProperties] = await Promise.all([
-    fsPromises.readFile(path.join(__dirname, 'cloudformation.yml'), 'utf8'),
-    fsPromises.readFile(path.join(__dirname, 'kafka.server.properties')),
+    fsp.readFile(path.join(__dirname, 'cloudformation.yml'), 'utf8'),
+    fsp.readFile(path.join(__dirname, 'kafka.server.properties')),
   ]);
 
   await ensureMQCredentialsSecret();
@@ -89,7 +89,7 @@ async function handleInfrastructureUpdate() {
 
   await ensureMQCredentialsSecret();
 
-  const cfnTemplate = await fsPromises.readFile(path.join(__dirname, 'cloudformation.yml'), 'utf8');
+  const cfnTemplate = await fsp.readFile(path.join(__dirname, 'cloudformation.yml'), 'utf8');
 
   try {
     await awsRequest('CloudFormation', 'updateStack', {
diff --git a/test/unit/lib/plugins/package/lib/packageService.test.js b/test/unit/lib/plugins/package/lib/packageService.test.js
index 1f5108c9325..bf43454c4ca 100644
--- a/test/unit/lib/plugins/package/lib/packageService.test.js
+++ b/test/unit/lib/plugins/package/lib/packageService.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const fs = require('fs');
+const fsp = require('fs').promises;
 const chai = require('chai');
 const sinon = require('sinon');
 const { listFileProperties, listZipFiles } = require('../../../../../utils/fs');
@@ -373,7 +373,7 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
       it('for function', async () => {
         const { servicePath: serviceDir, updateConfig } = await fixtures.setup('packageArtifact');
         const absoluteArtifactFilePath = path.join(serviceDir, 'absoluteArtifact.zip');
-        const zipContent = await fs.promises.readFile(absoluteArtifactFilePath);
+        const zipContent = await fsp.readFile(absoluteArtifactFilePath);
 
         await updateConfig({
           functions: {
@@ -397,7 +397,7 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
       it('service-wide', async () => {
         const { servicePath: serviceDir, updateConfig } = await fixtures.setup('packageArtifact');
         const absoluteArtifactFilePath = path.join(serviceDir, 'absoluteArtifact.zip');
-        const zipContent = await fs.promises.readFile(absoluteArtifactFilePath);
+        const zipContent = await fsp.readFile(absoluteArtifactFilePath);
 
         await updateConfig({
           package: {
diff --git a/test/unit/lib/utils/fs/writeFile.test.js b/test/unit/lib/utils/fs/writeFile.test.js
index 433e0a1abd8..d070e67482f 100644
--- a/test/unit/lib/utils/fs/writeFile.test.js
+++ b/test/unit/lib/utils/fs/writeFile.test.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const fse = require('fs-extra');
+const fsp = require('fs').promises;
 const Serverless = require('../../../../../lib/Serverless');
 const chai = require('chai');
 const writeFile = require('../../../../../lib/utils/fs/writeFile');
@@ -50,7 +50,7 @@ describe('#writeFile()', function () {
     const expected = '{\n  "foo": {\n    "$ref": "$"\n  }\n}';
 
     return writeFile(tmpFilePath, bar, true).then(() =>
-      expect(fse.readFile(tmpFilePath, 'utf8')).to.eventually.equal(expected)
+      expect(fsp.readFile(tmpFilePath, 'utf8')).to.eventually.equal(expected)
     );
   });
 });
diff --git a/test/unit/lib/utils/fs/writeFileSync.test.js b/test/unit/lib/utils/fs/writeFileSync.test.js
index 65ba0e0a05b..f9bd8e42ece 100644
--- a/test/unit/lib/utils/fs/writeFileSync.test.js
+++ b/test/unit/lib/utils/fs/writeFileSync.test.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const fse = require('fs-extra');
+const fsp = require('fs').promises;
 const Serverless = require('../../../../../lib/Serverless');
 const writeFileSync = require('../../../../../lib/utils/fs/writeFileSync');
 const readFileSync = require('../../../../../lib/utils/fs/readFileSync');
@@ -57,7 +57,7 @@ describe('#writeFileSync()', () => {
 
     writeFileSync(tmpFilePath, bar, true);
 
-    return fse.readFile(tmpFilePath, 'utf8').then((contents) => {
+    return fsp.readFile(tmpFilePath, 'utf8').then((contents) => {
       expect(contents).to.equal(expected);
     });
   });
diff --git a/test/utils/integration.js b/test/utils/integration.js
index 5744df926a1..7b4cb308dc7 100644
--- a/test/utils/integration.js
+++ b/test/utils/integration.js
@@ -3,7 +3,7 @@
 'use strict';
 
 const path = require('path');
-const fse = require('fs-extra');
+const fsp = require('fs').promises;
 const spawn = require('child-process-ext/spawn');
 const nodeFetch = require('node-fetch');
 const log = require('log').get('serverless:test');
@@ -19,7 +19,7 @@ env.SLS_DEBUG = '1';
 async function resolveServiceName(cwd) {
   const configContent = await (async () => {
     try {
-      return await fse.readFile(path.join(cwd, 'serverless.yml'));
+      return await fsp.readFile(path.join(cwd, 'serverless.yml'));
     } catch (error) {
       if (error.code === 'ENOENT') return null;
       throw error;

From 95d3024ef55ce80edf20fe27d9c72ffd15bba2bb Mon Sep 17 00:00:00 2001
From: Andreas Kohn <andreas.kohn@gmail.com>
Date: Fri, 10 Sep 2021 12:03:07 +0200
Subject: [PATCH 0449/1101] refactor: Use `getCompiledTemplateS3Suffix` from
 `provider.naming`

This makes sure that the specific `naming` instance really is the "source of truth".
---
 lib/plugins/aws/deploy/lib/validateTemplate.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/plugins/aws/deploy/lib/validateTemplate.js b/lib/plugins/aws/deploy/lib/validateTemplate.js
index 29dc2728d55..d668359ef1a 100644
--- a/lib/plugins/aws/deploy/lib/validateTemplate.js
+++ b/lib/plugins/aws/deploy/lib/validateTemplate.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const getCompiledTemplateS3Suffix = require('../../lib/naming').getCompiledTemplateS3Suffix;
 const getS3EndpointForRegion = require('../../utils/getS3EndpointForRegion');
 const ServerlessError = require('../../../../serverless-error');
 
@@ -8,7 +7,7 @@ module.exports = {
   async validateTemplate() {
     const bucketName = this.bucketName;
     const artifactDirectoryName = this.serverless.service.package.artifactDirectoryName;
-    const compiledTemplateFileName = getCompiledTemplateS3Suffix();
+    const compiledTemplateFileName = this.provider.naming.getCompiledTemplateS3Suffix();
     const s3Endpoint = getS3EndpointForRegion(this.provider.getRegion());
     this.serverless.cli.log('Validating template...');
     const params = {

From 130fb3838fd3ea382caabffad74fde8a4041d4fc Mon Sep 17 00:00:00 2001
From: Eve <87330794+evemontalvao@users.noreply.github.com>
Date: Fri, 10 Sep 2021 09:55:37 -0300
Subject: [PATCH 0450/1101] feat(AWS EventBridge): Support `deadLetterQueue`
 and `retryPolicy`

Co-authored-by: JP Bochi <jpbochi@pm.me>
---
 docs/providers/aws/events/event-bridge.md     |  44 ++++++
 .../compile/events/eventBridge/index.js       |  78 +++++++++-
 .../compile/events/eventBridge/index.test.js  | 147 ++++++++++++++----
 3 files changed, 239 insertions(+), 30 deletions(-)

diff --git a/docs/providers/aws/events/event-bridge.md b/docs/providers/aws/events/event-bridge.md
index 904beb208d1..39c7c4b6043 100644
--- a/docs/providers/aws/events/event-bridge.md
+++ b/docs/providers/aws/events/event-bridge.md
@@ -186,3 +186,47 @@ functions:
               eventTime: '$.time'
             inputTemplate: '{"time": <eventTime>, "key1": "value1"}'
 ```
+
+## Adding a DLQ to an event rule
+
+DeadLetterConfig is not available for custom resources, only for native CloudFormation.
+
+```yml
+functions:
+  myFunction:
+    handler: index.handler
+    events:
+      - eventBridge:
+          eventBus: custom-saas-events
+          pattern:
+            source:
+              - saas.external
+          deadLetterConfig:
+            targetArn:
+              Fn::GetAtt:
+                - QueueName
+                - Arn
+```
+
+## Adding a retry policy to an event rule
+
+RetryPolicy is not available for custom resources, only for native CloudFormation.
+
+```yml
+functions:
+  myFunction:
+    handler: index.handler
+    events:
+      - eventBridge:
+          eventBus: custom-saas-events
+          pattern:
+            source:
+              - saas.external
+          deadLetterConfig:
+            Fn::GetAtt:
+              - QueueName
+              - Arn
+          retryPolicy:
+            maximumEventAge: 3600
+            maximumRetryAttempts: 3
+```
diff --git a/lib/plugins/aws/package/compile/events/eventBridge/index.js b/lib/plugins/aws/package/compile/events/eventBridge/index.js
index 6aa6de9543d..eabd940700a 100644
--- a/lib/plugins/aws/package/compile/events/eventBridge/index.js
+++ b/lib/plugins/aws/package/compile/events/eventBridge/index.js
@@ -87,6 +87,30 @@ class AwsCompileEventBridgeEvents {
           required: ['inputTemplate'],
           additionalProperties: false,
         },
+        retryPolicy: {
+          type: 'object',
+          properties: {
+            maximumEventAge: {
+              type: 'integer',
+              minimum: 60,
+              maximum: 86400,
+            },
+            maximumRetryAttempts: {
+              type: 'integer',
+              minimum: 0,
+              maximum: 185,
+            },
+          },
+        },
+        deadLetterConfig: {
+          type: 'object',
+          properties: {
+            targetArn: {
+              $ref: '#/definitions/awsArn',
+            },
+          },
+          additionalProperties: false,
+        },
       },
       anyOf: [{ required: ['pattern'] }, { required: ['schedule'] }],
     });
@@ -117,6 +141,9 @@ class AwsCompileEventBridgeEvents {
             const Input = event.eventBridge.input;
             const InputPath = event.eventBridge.inputPath;
             let InputTransformer = event.eventBridge.inputTransformer;
+            let RetryPolicy = event.eventBridge.retryPolicy;
+            let DeadLetterConfig = event.eventBridge.deadLetterConfig;
+
             const RuleName = makeAndHashRuleName({
               functionName: FunctionName,
               index: idx,
@@ -144,6 +171,32 @@ class AwsCompileEventBridgeEvents {
               );
             }
 
+            if (RetryPolicy) {
+              if (!shouldUseCloudFormation) {
+                throw new ServerlessError(
+                  'Configuring RetryPolicy is not supported for EventBrigde integration backed by Custom Resources. Please use "provider.eventBridge.useCloudFormation" setting to use native CloudFormation support for EventBridge.',
+                  'ERROR_INVALID_RETRY_POLICY_TO_EVENT_BUS_CUSTOM_RESOURCE'
+                );
+              }
+
+              RetryPolicy = {
+                MaximumEventAge: RetryPolicy.maximumEventAge,
+                MaximumRetryAttempts: RetryPolicy.maximumRetryAttempts,
+              };
+            }
+
+            if (DeadLetterConfig) {
+              if (!shouldUseCloudFormation) {
+                throw new ServerlessError(
+                  'Configuring DeadLetterConfig is not supported for EventBrigde integration backed by Custom Resources. Please use "provider.eventBridge.useCloudFormation" setting to use native CloudFormation support for EventBridge.',
+                  'ERROR_INVALID_DEAD_LETTER_CONFIG_TO_EVENT_BUS_CUSTOM_RESOURCE'
+                );
+              }
+              DeadLetterConfig = {
+                TargetArn: DeadLetterConfig.targetArn,
+              };
+            }
+
             const eventBusName = EventBus;
             // Custom resources will be deprecated in next major release
             if (!shouldUseCloudFormation) {
@@ -184,6 +237,8 @@ class AwsCompileEventBridgeEvents {
                 idx,
                 hasEventBusesIamRoleStatement,
                 iamRoleStatements,
+                RetryPolicy,
+                DeadLetterConfig,
               });
             }
           }
@@ -297,6 +352,8 @@ class AwsCompileEventBridgeEvents {
     Pattern,
     Schedule,
     FunctionName,
+    RetryPolicy,
+    DeadLetterConfig,
     idx,
   }) {
     let eventBusResource;
@@ -336,11 +393,13 @@ class AwsCompileEventBridgeEvents {
       Id: makeEventBusTargetId(RuleName),
     };
 
-    const target = this.addInputConfigToTarget({
+    const target = this.configureTarget({
       target: targetBase,
       Input,
       InputPath,
       InputTransformer,
+      RetryPolicy,
+      DeadLetterConfig,
     });
 
     // Create a rule
@@ -449,7 +508,7 @@ class AwsCompileEventBridgeEvents {
     return null;
   }
 
-  addInputConfigToTarget({ target, Input, InputPath, InputTransformer }) {
+  configureTarget({ target, Input, InputPath, InputTransformer, RetryPolicy, DeadLetterConfig }) {
     if (Input) {
       target = Object.assign(target, {
         Input: JSON.stringify(Input),
@@ -468,6 +527,21 @@ class AwsCompileEventBridgeEvents {
       });
       return target;
     }
+
+    if (RetryPolicy) {
+      target = Object.assign(target, {
+        RetryPolicy,
+      });
+      return target;
+    }
+
+    if (DeadLetterConfig) {
+      target = Object.assign(target, {
+        DeadLetterConfig,
+      });
+      return target;
+    }
+
     return target;
   }
 }
diff --git a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
index 7f355f9c988..18e347ff3ff 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
@@ -275,6 +275,71 @@ describe('EventBridgeEvents', () => {
       expect(firstStatement.Effect).to.be.eq('Allow');
     });
 
+    it('should fail when trying to set RetryPolicy', async () => {
+      await expect(
+        runServerless({
+          fixture: 'function',
+          configExt: {
+            disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE'],
+            functions: {
+              foo: {
+                events: [
+                  {
+                    eventBridge: {
+                      retryPolicy: {
+                        maximumEventAge: 4200,
+                        maximumRetryAttempts: 180,
+                      },
+                      pattern: {
+                        source: ['aws.something'],
+                      },
+                    },
+                  },
+                ],
+              },
+            },
+          },
+          command: 'package',
+        })
+      ).to.be.eventually.rejected.and.have.property(
+        'code',
+        'ERROR_INVALID_RETRY_POLICY_TO_EVENT_BUS_CUSTOM_RESOURCE'
+      );
+    });
+
+    it('should fail when trying to set DeadLetterConfig', async () => {
+      await expect(
+        runServerless({
+          fixture: 'function',
+          configExt: {
+            disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE'],
+            functions: {
+              foo: {
+                events: [
+                  {
+                    eventBridge: {
+                      deadLetterConfig: {
+                        targetArn: {
+                          'Fn::GetAtt': ['not-supported', 'Arn'],
+                        },
+                      },
+                      pattern: {
+                        source: ['aws.something'],
+                      },
+                    },
+                  },
+                ],
+              },
+            },
+          },
+          command: 'package',
+        })
+      ).to.be.eventually.rejected.and.have.property(
+        'code',
+        'ERROR_INVALID_DEAD_LETTER_CONFIG_TO_EVENT_BUS_CUSTOM_RESOURCE'
+      );
+    });
+
     it('should fail when trying to reference event bus via CF intrinsic function', async () => {
       await expect(
         runServerless({
@@ -310,10 +375,6 @@ describe('EventBridgeEvents', () => {
       let eventBusLogicalId;
       let ruleResource;
       let ruleTarget;
-      let inputPathRuleTarget;
-      let inputTransformerRuleTarget;
-      let disabledRuleResource;
-      let enabledRuleResource;
       const schedule = 'rate(10 minutes)';
       const eventBusName = 'nondefault';
       const pattern = {
@@ -332,6 +393,22 @@ describe('EventBridgeEvents', () => {
           eventTime: '$.time',
         },
       };
+      const retryPolicy = {
+        maximumEventAge: 7200,
+        maximumRetryAttempts: 9,
+      };
+
+      const deadLetterConfig = {
+        targetArn: {
+          'Fn::GetAtt': ['test', 'Arn'],
+        },
+      };
+
+      const getRuleResourceEndingWith = (resources, ending) =>
+        Object.values(resources).find(
+          (resource) =>
+            resource.Type === 'AWS::Events::Rule' && resource.Properties.Name.endsWith(ending)
+        );
 
       before(async () => {
         const { cfTemplate, awsNaming } = await runServerless({
@@ -385,6 +462,22 @@ describe('EventBridgeEvents', () => {
                       pattern,
                     },
                   },
+                  {
+                    eventBridge: {
+                      eventBus: eventBusName,
+                      schedule,
+                      pattern,
+                      retryPolicy,
+                    },
+                  },
+                  {
+                    eventBridge: {
+                      eventBus: eventBusName,
+                      schedule,
+                      pattern,
+                      deadLetterConfig,
+                    },
+                  },
                 ],
               },
             },
@@ -394,31 +487,8 @@ describe('EventBridgeEvents', () => {
         cfResources = cfTemplate.Resources;
         naming = awsNaming;
         eventBusLogicalId = naming.getEventBridgeEventBusLogicalId(eventBusName);
-        ruleResource = Object.values(cfResources).find(
-          (resource) =>
-            resource.Type === 'AWS::Events::Rule' && resource.Properties.Name.endsWith('1')
-        );
+        ruleResource = getRuleResourceEndingWith(cfResources, '1');
         ruleTarget = ruleResource.Properties.Targets[0];
-        const inputPathRuleResource = Object.values(cfResources).find(
-          (resource) =>
-            resource.Type === 'AWS::Events::Rule' && resource.Properties.Name.endsWith('2')
-        );
-        inputPathRuleTarget = inputPathRuleResource.Properties.Targets[0];
-        const inputTransformerRuleResource = Object.values(cfResources).find(
-          (resource) =>
-            resource.Type === 'AWS::Events::Rule' && resource.Properties.Name.endsWith('3')
-        );
-        inputTransformerRuleTarget = inputTransformerRuleResource.Properties.Targets[0];
-
-        disabledRuleResource = Object.values(cfResources).find(
-          (resource) =>
-            resource.Type === 'AWS::Events::Rule' && resource.Properties.Name.endsWith('4')
-        );
-
-        enabledRuleResource = Object.values(cfResources).find(
-          (resource) =>
-            resource.Type === 'AWS::Events::Rule' && resource.Properties.Name.endsWith('5')
-        );
       });
 
       it('should create an EventBus resource', () => {
@@ -434,10 +504,12 @@ describe('EventBridgeEvents', () => {
       });
 
       it('should correctly set State when disabled on a created rule', () => {
+        const disabledRuleResource = getRuleResourceEndingWith(cfResources, '4');
         expect(disabledRuleResource.Properties.State).to.equal('DISABLED');
       });
 
       it('should correctly set State when enabled on a created rule', () => {
+        const enabledRuleResource = getRuleResourceEndingWith(cfResources, '5');
         expect(enabledRuleResource.Properties.State).to.equal('ENABLED');
       });
 
@@ -450,10 +522,14 @@ describe('EventBridgeEvents', () => {
       });
 
       it('should correctly set InputPath on the target for the created rule', () => {
+        const inputPathRuleResource = getRuleResourceEndingWith(cfResources, '2');
+        const inputPathRuleTarget = inputPathRuleResource.Properties.Targets[0];
         expect(inputPathRuleTarget.InputPath).to.deep.equal(inputPath);
       });
 
       it('should correctly set InputTransformer on the target for the created rule', () => {
+        const inputTransformerRuleResource = getRuleResourceEndingWith(cfResources, '3');
+        const inputTransformerRuleTarget = inputTransformerRuleResource.Properties.Targets[0];
         expect(inputTransformerRuleTarget.InputTransformer.InputPathsMap).to.deep.equal(
           inputTransformer.inputPathsMap
         );
@@ -462,6 +538,21 @@ describe('EventBridgeEvents', () => {
         );
       });
 
+      it('should support retryPolicy configuration', () => {
+        const retryPolicyRuleTarget = getRuleResourceEndingWith(cfResources, '6').Properties
+          .Targets[0];
+        expect(retryPolicyRuleTarget.RetryPolicy).to.deep.equal({
+          MaximumEventAge: 7200,
+          MaximumRetryAttempts: 9,
+        });
+      });
+
+      it('should support deadLetterConfig configuration', () => {
+        const deadLetterConfigRuleTarget = getRuleResourceEndingWith(cfResources, '7').Properties
+          .Targets[0];
+        expect(deadLetterConfigRuleTarget.DeadLetterConfig).to.have.property('TargetArn');
+      });
+
       it('should create a rule that depends on created EventBus', () => {
         expect(ruleResource.DependsOn).to.equal(eventBusLogicalId);
       });

From 171897d60e5adaa590be1f08c99ab2cc76e89ee4 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 10 Sep 2021 15:17:45 +0200
Subject: [PATCH 0451/1101] feat(CLI): Introduce first iteration of modern logs
 for `deploy` (#9934)

---
 lib/cli/handle-error.js                       |  71 ++--
 lib/plugins/aws/deploy/index.js               |  35 ++
 lib/plugins/aws/deploy/lib/checkForChanges.js |   4 +-
 lib/plugins/aws/deploy/lib/cleanupS3Bucket.js |   3 +-
 lib/plugins/aws/deploy/lib/createStack.js     |   4 +-
 .../aws/deploy/lib/extendedValidate.js        |   3 +-
 lib/plugins/aws/deploy/lib/uploadArtifacts.js | 110 ++++--
 .../aws/deploy/lib/validateTemplate.js        |   3 +-
 lib/plugins/aws/info/display.js               |  31 +-
 lib/plugins/aws/info/index.js                 |   3 +
 lib/plugins/aws/lib/monitorStack.js           |  58 ++-
 lib/plugins/aws/lib/updateStack.js            |   4 +-
 lib/plugins/deploy.js                         |   1 +
 lib/plugins/package/lib/packageService.js     |   4 +-
 lib/plugins/package/lib/zipService.js         |   3 +-
 package.json                                  |   2 +-
 .../aws/deploy/lib/checkForChanges.test.js    |   3 -
 .../aws/deploy/lib/extendedValidate.test.js   |  26 --
 .../aws/deploy/lib/uploadArtifacts.test.js    |  38 +-
 .../aws/deploy/lib/validateTemplate.test.js   |   5 -
 .../unit/lib/plugins/aws/info/display.test.js | 353 ------------------
 21 files changed, 246 insertions(+), 518 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index c5ff7681690..1d6a0e35660 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -17,8 +17,7 @@ const { storeLocally: storeTelemetryLocally, send: sendTelemetry } = require('..
 const generateTelemetryPayload = require('../utils/telemetry/generatePayload');
 const resolveErrorLocation = require('../utils/telemetry/resolve-error-location');
 const resolveInput = require('./resolve-input');
-
-const consoleLog = (message) => process.stdout.write(`${message}\n`);
+const { style, writeText, legacy } = require('@serverless/utils/log');
 
 const writeMessage = (title, message) => {
   let line = '';
@@ -27,14 +26,14 @@ const writeMessage = (title, message) => {
   }
 
   process.stdout.write(' \n');
-  consoleLog(chalk.yellow(` ${title} ${line}`));
-  consoleLog(' ');
+  legacy.consoleLog(chalk.yellow(` ${title} ${line}`));
+  legacy.consoleLog(' ');
 
   if (message) {
-    consoleLog(`  ${message.split('\n').join('\n  ')}`);
+    legacy.consoleLog(`  ${message.split('\n').join('\n  ')}`);
   }
 
-  consoleLog(' ');
+  legacy.consoleLog(' ');
 };
 
 const isErrorCodeNormative = RegExp.prototype.test.bind(/^[A-Z][A-Z0-9]*(?:_[A-Z0-9]+)*$/);
@@ -118,34 +117,17 @@ module.exports = async (exception, options = {}) => {
       ' For debugging logs, run again after setting the',
       ' "SLS_DEBUG=*" environment variable.',
     ].join('');
-    consoleLog(chalk.red(debugInfo));
-    consoleLog(' ');
+    legacy.consoleLog(chalk.red(debugInfo));
+    legacy.consoleLog(' ');
   }
 
   const platform = process.platform;
   const nodeVersion = process.version.replace(/^[v|V]/, '');
-
-  consoleLog(chalk.yellow('  Get Support --------------------------------------------'));
-  consoleLog(`${chalk.yellow('     Docs:          ')}docs.serverless.com`);
-  consoleLog(`${chalk.yellow('     Bugs:          ')}github.com/serverless/serverless/issues`);
-  consoleLog(`${chalk.yellow('     Issues:        ')}forum.serverless.com`);
-
-  consoleLog(' ');
-  consoleLog(chalk.yellow('  Your Environment Information ---------------------------'));
-  consoleLog(chalk.yellow(`     Operating System:          ${platform}`));
-  consoleLog(chalk.yellow(`     Node Version:              ${nodeVersion}`));
-
   const installationModePostfix = await (async () => {
     if (isStandaloneExecutable) return ' (standalone)';
     if (isLocallyInstalled != null) return isLocallyInstalled ? ' (local)' : '';
     return resolveIsLocallyInstalled() ? ' (local)' : '';
   })();
-  consoleLog(
-    chalk.yellow(`     Framework Version:         ${slsVersion}${installationModePostfix}`)
-  );
-  consoleLog(chalk.yellow(`     Plugin Version:            ${sfeVersion}`));
-  consoleLog(chalk.yellow(`     SDK Version:               ${platformClientVersion}`));
-
   const componentsVersion = (() => {
     try {
       return require('@serverless/components/package').version;
@@ -153,8 +135,43 @@ module.exports = async (exception, options = {}) => {
       return 'Unavailable';
     }
   })();
-  consoleLog(chalk.yellow(`     Components Version:        ${componentsVersion}`));
-  consoleLog(' ');
+
+  writeText(
+    style.aside(
+      `Environment: ${platform}, node ${nodeVersion}, framework ${slsVersion}${installationModePostfix}, plugin ${sfeVersion}, SDK ${platformClientVersion}`,
+      'Docs:        docs.serverless.com',
+      'Support:     forum.serverless.com',
+      'Bugs:        github.com/serverless/serverless/issues'
+    )
+  );
+
+  const errorMsg =
+    exceptionTokens.stack && !isUserError ? exceptionTokens.stack : exceptionTokens.message;
+  writeText(style.error('\nError:'));
+  if (errorMsg) {
+    writeText(`  ${errorMsg.split('\n').join('\n  ')}`);
+  }
+
+  legacy.consoleLog(chalk.yellow('  Get Support --------------------------------------------'));
+  legacy.consoleLog(`${chalk.yellow('     Docs:          ')}docs.serverless.com`);
+  legacy.consoleLog(
+    `${chalk.yellow('     Bugs:          ')}github.com/serverless/serverless/issues`
+  );
+  legacy.consoleLog(`${chalk.yellow('     Issues:        ')}forum.serverless.com`);
+
+  legacy.consoleLog(' ');
+  legacy.consoleLog(chalk.yellow('  Your Environment Information ---------------------------'));
+  legacy.consoleLog(chalk.yellow(`     Operating System:          ${platform}`));
+  legacy.consoleLog(chalk.yellow(`     Node Version:              ${nodeVersion}`));
+
+  legacy.consoleLog(
+    chalk.yellow(`     Framework Version:         ${slsVersion}${installationModePostfix}`)
+  );
+  legacy.consoleLog(chalk.yellow(`     Plugin Version:            ${sfeVersion}`));
+  legacy.consoleLog(chalk.yellow(`     SDK Version:               ${platformClientVersion}`));
+
+  legacy.consoleLog(chalk.yellow(`     Components Version:        ${componentsVersion}`));
+  legacy.consoleLog(' ');
 
   logDeprecation.printSummary();
 
diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index 045748dfed9..2449739b552 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -11,6 +11,8 @@ const validateTemplate = require('./lib/validateTemplate');
 const updateStack = require('../lib/updateStack');
 const existsDeploymentBucket = require('./lib/existsDeploymentBucket');
 const path = require('path');
+const { style, log, progress } = require('@serverless/utils/log');
+const memoize = require('memoizee');
 
 class AwsDeploy {
   constructor(serverless, options) {
@@ -37,6 +39,8 @@ class AwsDeploy {
       monitorStack
     );
 
+    this.getFileStats = memoize(this.getFileStats.bind(this), { promise: true });
+
     // Define the internal lifecycle model
     this.commands = {
       aws: {
@@ -63,6 +67,19 @@ class AwsDeploy {
     };
 
     this.hooks = {
+      'initialize': () => {
+        const isDeployCommand =
+          this.serverless.processedInput.commands.length === 1 &&
+          this.serverless.processedInput.commands[0] === 'deploy';
+        if (isDeployCommand && !this.options.function) {
+          log.notice(
+            `\nDeploying ${this.serverless.service.service} to stage ${this.serverless
+              .getProvider('aws')
+              .getStage()} ${style.aside(`(${this.serverless.getProvider('aws').getRegion()})`)}`
+          );
+        }
+      },
+
       'before:deploy:deploy': async () => {
         await this.serverless.pluginManager.spawn('aws:common:validate');
 
@@ -104,16 +121,34 @@ class AwsDeploy {
       'aws:deploy:deploy:updateStack': async () => {
         if (this.serverless.service.provider.shouldNotDeploy) return;
         await this.updateStack();
+        log.notice(
+          `\n${style.noticeSymbol('✔')} Service deployed to stack ${this.serverless
+            .getProvider('aws')
+            .naming.getStackName()}\n`
+        );
       },
 
       // Deploy finalize inner lifecycle
       'aws:deploy:finalize:cleanup': async () => {
         if (this.serverless.service.provider.shouldNotDeploy) return;
+        progress.get('main').notice('Updating');
         await this.cleanupS3Bucket();
         if (this.options.package || this.serverless.service.package.path) {
           await this.serverless.pluginManager.spawn('aws:common:cleanupTempDir');
         }
       },
+
+      'error': () => {
+        const isDeployCommand =
+          this.serverless.processedInput.commands.length === 1 &&
+          this.serverless.processedInput.commands[0] === 'deploy';
+        if (isDeployCommand && !this.options.function) {
+          log.error(); // In order to ensure extra new line before the error message
+          log.error(
+            `Stack ${serverless.getProvider('aws').naming.getStackName()} failed to deploy`
+          );
+        }
+      },
     };
   }
 }
diff --git a/lib/plugins/aws/deploy/lib/checkForChanges.js b/lib/plugins/aws/deploy/lib/checkForChanges.js
index 03e6c3f40e7..e69aeebd7ad 100644
--- a/lib/plugins/aws/deploy/lib/checkForChanges.js
+++ b/lib/plugins/aws/deploy/lib/checkForChanges.js
@@ -8,6 +8,7 @@ const BbPromise = require('bluebird');
 const _ = require('lodash');
 const normalizeFiles = require('../../lib/normalizeFiles');
 const ServerlessError = require('../../../../serverless-error');
+const { style, legacy, log } = require('@serverless/utils/log');
 
 module.exports = {
   async checkForChanges() {
@@ -186,7 +187,8 @@ module.exports = {
           this.serverless.service.provider.shouldNotDeploy = true;
 
           const message = ['Service files not changed. Skipping deployment...'].join('');
-          this.serverless.cli.log(message, 'Serverless', { color: 'orange' });
+          legacy.log(message, 'Serverless', { color: 'orange' });
+          log.notice(`\n${style.noticeSymbol('∅')} No changes to deploy. Deployment skipped.`);
         }
       });
     }
diff --git a/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js b/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
index 46359a37594..8256c7f0bf3 100644
--- a/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
+++ b/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
@@ -3,6 +3,7 @@
 const _ = require('lodash');
 const findAndGroupDeployments = require('../../utils/findAndGroupDeployments');
 const getS3ObjectsFromStacks = require('../../utils/getS3ObjectsFromStacks');
+const { legacy } = require('@serverless/utils/log');
 
 module.exports = {
   async getObjectsToRemove() {
@@ -28,7 +29,7 @@ module.exports = {
 
   async removeObjects(objectsToRemove) {
     if (!objectsToRemove || !objectsToRemove.length) return;
-    this.serverless.cli.log('Removing old service artifacts from S3...');
+    legacy.log('Removing old service artifacts from S3...');
     await this.provider.request('S3', 'deleteObjects', {
       Bucket: this.bucketName,
       Delete: { Objects: objectsToRemove },
diff --git a/lib/plugins/aws/deploy/lib/createStack.js b/lib/plugins/aws/deploy/lib/createStack.js
index d39e407813a..8cbbc267184 100644
--- a/lib/plugins/aws/deploy/lib/createStack.js
+++ b/lib/plugins/aws/deploy/lib/createStack.js
@@ -2,11 +2,13 @@
 
 const BbPromise = require('bluebird');
 const ServerlessError = require('../../../../serverless-error');
+const { legacy, progress } = require('@serverless/utils/log');
 
 module.exports = {
   async create() {
     // Note: using three dots instead of ellipsis to support non uni-code consoles.
-    this.serverless.cli.log('Creating Stack...');
+    legacy.log('Creating Stack...');
+    progress.get('main').notice('Creating CloudFormation stack');
     const stackName = this.provider.naming.getStackName();
 
     let stackTags = { STAGE: this.provider.getStage() };
diff --git a/lib/plugins/aws/deploy/lib/extendedValidate.js b/lib/plugins/aws/deploy/lib/extendedValidate.js
index 928e0585127..8a37be45d82 100644
--- a/lib/plugins/aws/deploy/lib/extendedValidate.js
+++ b/lib/plugins/aws/deploy/lib/extendedValidate.js
@@ -4,6 +4,7 @@ const path = require('path');
 const _ = require('lodash');
 const findReferences = require('../../utils/findReferences');
 const ServerlessError = require('../../../../serverless-error');
+const { legacy } = require('@serverless/utils/log');
 
 module.exports = {
   extendedValidate() {
@@ -51,7 +52,7 @@ module.exports = {
                 'limited to 30 seconds.',
               ].join('');
 
-              this.serverless.cli.log(warnMessage);
+              legacy.log(warnMessage);
             }
           });
         }
diff --git a/lib/plugins/aws/deploy/lib/uploadArtifacts.js b/lib/plugins/aws/deploy/lib/uploadArtifacts.js
index 3431e3589cc..64f1430d5dc 100644
--- a/lib/plugins/aws/deploy/lib/uploadArtifacts.js
+++ b/lib/plugins/aws/deploy/lib/uploadArtifacts.js
@@ -2,6 +2,7 @@
 
 const _ = require('lodash');
 const fs = require('fs');
+const fsp = require('fs').promises;
 const path = require('path');
 const crypto = require('crypto');
 const limit = require('ext/promise/limit').bind(Promise);
@@ -9,19 +10,42 @@ const filesize = require('filesize');
 const normalizeFiles = require('../../lib/normalizeFiles');
 const getLambdaLayerArtifactPath = require('../../utils/getLambdaLayerArtifactPath');
 const ServerlessError = require('../../../../serverless-error');
+const { legacy, progress } = require('@serverless/utils/log');
 
 const MAX_CONCURRENT_ARTIFACTS_UPLOADS =
   Number(process.env.SLS_MAX_CONCURRENT_ARTIFACTS_UPLOADS) || 3;
 
 module.exports = {
+  async getFileStats(filepath) {
+    try {
+      return await fsp.stat(filepath);
+    } catch (error) {
+      throw new ServerlessError(
+        `Cannot read file artifact "${filepath}": ${error.message}`,
+        'INACCESSIBLE_FILE_ARTIFACT'
+      );
+    }
+  },
+
   async uploadArtifacts() {
+    const artifactFilePaths = [
+      ...this.getFunctionArtifactFilePaths(),
+      ...this.getLayerArtifactFilePaths(),
+    ];
+    if (artifactFilePaths.length === 1) {
+      const stats = await this.getFileStats(artifactFilePaths[0]);
+      progress.get('main').notice(`Uploading (${filesize(stats.size)})`);
+    } else {
+      progress.get('main').notice(`Uploading (0/${artifactFilePaths.length})`);
+    }
+
     await this.uploadCloudFormationFile();
     await this.uploadFunctionsAndLayers();
     await this.uploadCustomResources();
   },
 
   async uploadCloudFormationFile() {
-    this.serverless.cli.log('Uploading CloudFormation file to S3...');
+    legacy.log('Uploading CloudFormation file to S3...');
 
     const compiledTemplateFileName = this.provider.naming.getCompiledTemplateS3Suffix();
 
@@ -87,11 +111,9 @@ module.exports = {
     return response;
   },
 
-  async uploadFunctionsAndLayers() {
-    this.serverless.cli.log('Uploading artifacts...');
-
+  getFunctionArtifactFilePaths() {
     const functionNames = this.serverless.service.getAllFunctions();
-    let artifactFilePaths = _.uniq(
+    return _.uniq(
       functionNames
         .map((name) => {
           const functionObject = this.serverless.service.getFunction(name);
@@ -119,42 +141,56 @@ module.exports = {
         })
         .filter(Boolean)
     );
+  },
 
+  getLayerArtifactFilePaths() {
     const layerNames = this.serverless.service.getAllLayers();
-    artifactFilePaths = artifactFilePaths.concat(
-      layerNames
-        .map((name) => {
-          const layerObject = this.serverless.service.getLayer(name);
-          if (layerObject.artifactAlreadyUploaded) {
-            this.serverless.cli.log(`Skip uploading ${name}`);
-            return null;
-          }
-          return getLambdaLayerArtifactPath(
-            this.packagePath,
-            name,
-            this.provider.serverless.service,
-            this.provider.naming
-          );
-        })
-        .filter(Boolean)
-    );
+    return layerNames
+      .map((name) => {
+        const layerObject = this.serverless.service.getLayer(name);
+        if (layerObject.artifactAlreadyUploaded) {
+          this.serverless.cli.log(`Skip uploading ${name}`);
+          return null;
+        }
+        return getLambdaLayerArtifactPath(
+          this.packagePath,
+          name,
+          this.provider.serverless.service,
+          this.provider.naming
+        );
+      })
+      .filter(Boolean);
+  },
+
+  async uploadFunctionsAndLayers() {
+    legacy.log('Uploading artifacts...');
+
+    const artifactFilePaths = [
+      ...this.getFunctionArtifactFilePaths(),
+      ...this.getLayerArtifactFilePaths(),
+    ];
+
+    const shouldReportDetailedProgress = artifactFilePaths.length > 1;
+    let alreadyUploadedCount = 0;
 
     const limitedUpload = limit(MAX_CONCURRENT_ARTIFACTS_UPLOADS, async (artifactFilePath) => {
-      const stats = (() => {
-        try {
-          return fs.statSync(artifactFilePath);
-        } catch (error) {
-          throw new ServerlessError(
-            `Cannot read file artifact "${artifactFilePath}": ${error.message}`,
-            'INACCESSIBLE_FILE_ARTIFACT'
-          );
-        }
-      })();
+      const stats = await this.getFileStats(artifactFilePath);
       const fileName = path.basename(artifactFilePath);
-      this.serverless.cli.log(
-        `Uploading service ${fileName} file to S3 (${filesize(stats.size)})...`
-      );
-      return this.uploadZipFile(artifactFilePath);
+      legacy.log(`Uploading service ${fileName} file to S3 (${filesize(stats.size)})...`);
+      if (shouldReportDetailedProgress) {
+        progress
+          .get(`upload:${fileName}`)
+          .notice(`Uploading service ${fileName} file to S3 (${filesize(stats.size)})`);
+      }
+      const result = await this.uploadZipFile(artifactFilePath);
+      alreadyUploadedCount += 1;
+      if (shouldReportDetailedProgress) {
+        progress
+          .get('main')
+          .notice(`Uploading (${alreadyUploadedCount}/${artifactFilePaths.length})`);
+        progress.get(`upload:${fileName}`).remove();
+      }
+      return result;
     });
     await Promise.all(artifactFilePaths.map((file) => limitedUpload(file)));
   },
@@ -167,7 +203,7 @@ module.exports = {
     );
 
     if (this.serverless.utils.fileExistsSync(artifactFilePath)) {
-      this.serverless.cli.log('Uploading custom CloudFormation resources...');
+      legacy.log('Uploading custom CloudFormation resources...');
       await this.uploadZipFile(artifactFilePath);
     }
   },
diff --git a/lib/plugins/aws/deploy/lib/validateTemplate.js b/lib/plugins/aws/deploy/lib/validateTemplate.js
index d668359ef1a..9731adfd5af 100644
--- a/lib/plugins/aws/deploy/lib/validateTemplate.js
+++ b/lib/plugins/aws/deploy/lib/validateTemplate.js
@@ -2,6 +2,7 @@
 
 const getS3EndpointForRegion = require('../../utils/getS3EndpointForRegion');
 const ServerlessError = require('../../../../serverless-error');
+const { legacy } = require('@serverless/utils/log');
 
 module.exports = {
   async validateTemplate() {
@@ -9,7 +10,7 @@ module.exports = {
     const artifactDirectoryName = this.serverless.service.package.artifactDirectoryName;
     const compiledTemplateFileName = this.provider.naming.getCompiledTemplateS3Suffix();
     const s3Endpoint = getS3EndpointForRegion(this.provider.getRegion());
-    this.serverless.cli.log('Validating template...');
+    legacy.log('Validating template...');
     const params = {
       TemplateURL: `https://${s3Endpoint}/${bucketName}/${artifactDirectoryName}/${compiledTemplateFileName}`,
     };
diff --git a/lib/plugins/aws/info/display.js b/lib/plugins/aws/info/display.js
index abc401ba8f8..4b00c4e6779 100644
--- a/lib/plugins/aws/info/display.js
+++ b/lib/plugins/aws/info/display.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const chalk = require('chalk');
+const { style, legacy, writeText } = require('@serverless/utils/log');
 
 module.exports = {
   displayServiceInfo() {
@@ -21,7 +22,7 @@ module.exports = {
       message += '  For advice on avoiding this limit, check out this link: http://bit.ly/2IiYB38.';
     }
 
-    this.serverless.cli.consoleLog(message);
+    legacy.consoleLog(message);
     return message;
   },
 
@@ -46,15 +47,15 @@ module.exports = {
       apiKeysMessage += '\n  None';
     }
 
-    this.serverless.cli.consoleLog(apiKeysMessage);
+    legacy.consoleLog(apiKeysMessage);
     return apiKeysMessage;
   },
 
   displayEndpoints() {
     const info = this.gatheredData.info;
     let endpointsMessage = `${chalk.yellow('endpoints:')}`;
-
     const outputSectionItems = [];
+
     if (info.endpoints && info.endpoints.length) {
       info.endpoints.forEach((endpoint) => {
         // if the endpoint is of type http(s)
@@ -113,16 +114,12 @@ module.exports = {
       outputSectionItems.push(`CloudFront - ${info.cloudFront}`);
     }
 
-    if (!info.endpoints.length && !info.cloudFront) {
-      endpointsMessage += '\n  None';
-    }
-
     if (outputSectionItems.length > 1) {
       this.serverless.addServiceOutputSection('endpoints', outputSectionItems);
     } else if (outputSectionItems.length) {
       this.serverless.addServiceOutputSection('endpoint', outputSectionItems[0]);
     }
-    this.serverless.cli.consoleLog(endpointsMessage);
+    legacy.consoleLog(endpointsMessage);
     return endpointsMessage;
   },
 
@@ -141,7 +138,7 @@ module.exports = {
       functionsMessage += '\n  None';
     }
 
-    this.serverless.cli.consoleLog(functionsMessage);
+    legacy.consoleLog(functionsMessage);
     return functionsMessage;
   },
 
@@ -160,7 +157,7 @@ module.exports = {
       layersMessage += '\n  None';
     }
 
-    this.serverless.cli.consoleLog(layersMessage);
+    legacy.consoleLog(layersMessage);
     return layersMessage;
   },
 
@@ -172,9 +169,21 @@ module.exports = {
         message += `${chalk.yellow(output.OutputKey)}: ${output.OutputValue}\n`;
       });
 
-      this.serverless.cli.consoleLog(message);
+      legacy.consoleLog(message);
     }
 
     return message;
   },
+
+  displayServiceOutputs() {
+    if (this.serverless.serviceOutputs && !this.serverless.service.provider.shouldNotDeploy) {
+      for (const [section, entries] of this.serverless.serviceOutputs) {
+        if (typeof entries === 'string') {
+          writeText(`${style.aside(`${section}:`)} ${entries}`);
+        } else {
+          writeText(`${style.aside(`${section}:\n`)}  ${entries.join('\n  ')}`);
+        }
+      }
+    }
+  },
 };
diff --git a/lib/plugins/aws/info/index.js b/lib/plugins/aws/info/index.js
index 6cf512f4c06..eb06abbeda3 100644
--- a/lib/plugins/aws/info/index.js
+++ b/lib/plugins/aws/info/index.js
@@ -28,6 +28,7 @@ class AwsInfo {
               'displayFunctions',
               'displayLayers',
               'displayStackOutputs',
+              'displayServiceOutputs',
             ],
           },
         },
@@ -62,6 +63,8 @@ class AwsInfo {
 
       'aws:info:displayStackOutputs': async () =>
         BbPromise.bind(this).then(this.displayStackOutputs),
+
+      'aws:info:displayServiceOutputs': async () => await this.displayServiceOutputs(),
     };
   }
 }
diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js
index 6d500c993ca..2a8319dcc93 100644
--- a/lib/plugins/aws/lib/monitorStack.js
+++ b/lib/plugins/aws/lib/monitorStack.js
@@ -4,6 +4,7 @@ const BbPromise = require('bluebird');
 const chalk = require('chalk');
 const wait = require('timers-ext/promise/sleep');
 const ServerlessError = require('../../../serverless-error');
+const { legacy, progress } = require('@serverless/utils/log');
 
 const validStatuses = new Set(['CREATE_COMPLETE', 'UPDATE_COMPLETE', 'DELETE_COMPLETE']);
 
@@ -24,7 +25,14 @@ module.exports = {
     cfData,
     stackUrl,
     options,
-    { loggedEventIds = new Set(), stackStatus = null, stackLatestError = null, firstEventId = null }
+    {
+      loggedEventIds = new Set(),
+      stackStatus = null,
+      stackLatestError = null,
+      firstEventId = null,
+      inProgressResources = new Set(),
+      completedResources = new Set(),
+    }
   ) {
     return wait(options.frequency || process.env.SLS_AWS_MONITORING_FREQUENCY || 5000)
       .then(() =>
@@ -80,9 +88,35 @@ module.exports = {
                   let eventLog = `CloudFormation - ${eventStatus} - `;
                   eventLog += `${event.ResourceType} - `;
                   eventLog += `${event.LogicalResourceId}`;
-                  this.serverless.cli.consoleLog(eventLog);
+                  legacy.consoleLog(eventLog);
                 } else {
-                  this.serverless.cli.printDot();
+                  legacy.write(chalk.yellow('.'));
+                }
+
+                if (event.ResourceType !== 'AWS::CloudFormation::Stack') {
+                  if (eventStatus && eventStatus.endsWith('PROGRESS')) {
+                    inProgressResources.add(event.LogicalResourceId);
+                  } else if (eventStatus && eventStatus.endsWith('COMPLETE')) {
+                    completedResources.add(event.LogicalResourceId);
+                    inProgressResources.delete(event.LogicalResourceId);
+                  }
+                }
+
+                const operationPhrase = (() => {
+                  if (action === 'create') return 'Creating';
+                  if (action === 'update') return 'Updating';
+                  if (action === 'delete') return 'Deleting';
+                  return '';
+                })();
+
+                if (operationPhrase && (completedResources.size || inProgressResources.size)) {
+                  progress
+                    .get('main')
+                    .notice(
+                      `${operationPhrase} CloudFormation stack (${completedResources.size}/${
+                        completedResources.size + inProgressResources.size
+                      })`
+                    );
                 }
                 // Prepare for next monitoring action
                 loggedEventIds.add(event.EventId);
@@ -96,9 +130,9 @@ module.exports = {
                       ['DELETE_FAILED', 'DELETE_COMPLETE'].includes(stackStatus))))
               ) {
                 // empty console.log for a prettier output
-                if (!this.options.verbose) this.serverless.cli.consoleLog('');
-                this.serverless.cli.log('Operation failed!');
-                this.serverless.cli.log(`View the full error output: ${stackUrl}`);
+                if (!this.options.verbose) legacy.consoleLog('');
+                legacy.log('Operation failed!');
+                legacy.log(`View the full error output: ${stackUrl}`);
                 let errorMessage = 'An error occurred: ';
                 errorMessage += `${stackLatestError.LogicalResourceId} - `;
                 errorMessage += `${
@@ -132,8 +166,8 @@ module.exports = {
             (e) => {
               if (action === 'delete' && e.message.includes('does not exist')) {
                 // empty console.log for a prettier output
-                if (!this.options.verbose) this.serverless.cli.consoleLog('');
-                this.serverless.cli.log(`Stack ${action} finished...`);
+                if (!this.options.verbose) legacy.consoleLog('');
+                legacy.log(`Stack ${action} finished...`);
                 stackStatus = 'DELETE_COMPLETE';
                 return;
               }
@@ -148,6 +182,8 @@ module.exports = {
           stackStatus,
           stackLatestError,
           firstEventId,
+          inProgressResources,
+          completedResources,
         });
       });
   },
@@ -163,12 +199,12 @@ module.exports = {
 
     // Monitor stack creation/update/removal
 
-    this.serverless.cli.log(`Checking Stack ${action} progress...`);
+    legacy.log(`Checking Stack ${action} progress...`);
 
     return this.checkStackProgress(action, cfData, stackUrl, options, {}).then((stackStatus) => {
       // empty console.log for a prettier output
-      if (!this.options.verbose) this.serverless.cli.consoleLog('');
-      this.serverless.cli.log(`Stack ${action} finished...`);
+      if (!this.options.verbose) legacy.consoleLog('');
+      legacy.log(`Stack ${action} finished...`);
       return stackStatus;
     });
   },
diff --git a/lib/plugins/aws/lib/updateStack.js b/lib/plugins/aws/lib/updateStack.js
index 054bde3be4e..4a02e8b83b0 100644
--- a/lib/plugins/aws/lib/updateStack.js
+++ b/lib/plugins/aws/lib/updateStack.js
@@ -2,6 +2,7 @@
 
 const BbPromise = require('bluebird');
 const getS3EndpointForRegion = require('../utils/getS3EndpointForRegion');
+const { legacy, progress } = require('@serverless/utils/log');
 
 const NO_UPDATE_MESSAGE = 'No updates are to be performed.';
 
@@ -70,7 +71,8 @@ module.exports = {
     const s3Endpoint = getS3EndpointForRegion(this.provider.getRegion());
     const templateUrl = `https://${s3Endpoint}/${this.bucketName}/${this.serverless.service.package.artifactDirectoryName}/${compiledTemplateFileName}`;
 
-    this.serverless.cli.log('Updating Stack...');
+    legacy.log('Updating Stack...');
+    progress.get('main').notice('Updating CloudFormation stack');
     const stackName = this.provider.naming.getStackName();
     let stackTags = { STAGE: this.provider.getStage() };
 
diff --git a/lib/plugins/deploy.js b/lib/plugins/deploy.js
index 297ad8057b7..401fbaddef2 100644
--- a/lib/plugins/deploy.js
+++ b/lib/plugins/deploy.js
@@ -46,6 +46,7 @@ class Deploy {
           const errorMessage = `The specified provider "${provider}" does not exist.`;
           throw new ServerlessError(errorMessage, 'INVALID_PROVIDER');
         }
+
         if (this.options.function) {
           // If the user has given a function parameter, spawn a function deploy
           // and terminate execution right afterwards. We did not enter the
diff --git a/lib/plugins/package/lib/packageService.js b/lib/plugins/package/lib/packageService.js
index e1bf490995f..f7a8f14636e 100644
--- a/lib/plugins/package/lib/packageService.js
+++ b/lib/plugins/package/lib/packageService.js
@@ -7,6 +7,7 @@ const _ = require('lodash');
 const micromatch = require('micromatch');
 const ServerlessError = require('../../../serverless-error');
 const parseS3URI = require('../../aws/utils/parse-s3-uri');
+const { legacy, progress } = require('@serverless/utils/log');
 
 module.exports = {
   defaultExcludes: [
@@ -66,7 +67,8 @@ module.exports = {
   },
 
   async packageService() {
-    this.serverless.cli.log('Packaging service...');
+    legacy.log('Packaging service...');
+    progress.get('main').notice('Packaging');
     let shouldPackageService = false;
     const allFunctions = this.serverless.service.getAllFunctions();
     let packagePromises = allFunctions.map(async (functionName) => {
diff --git a/lib/plugins/package/lib/zipService.js b/lib/plugins/package/lib/zipService.js
index 9fbc13931cc..c5d3afe55f8 100644
--- a/lib/plugins/package/lib/zipService.js
+++ b/lib/plugins/package/lib/zipService.js
@@ -10,6 +10,7 @@ const childProcess = BbPromise.promisifyAll(require('child_process'));
 const globby = require('globby');
 const _ = require('lodash');
 const ServerlessError = require('../../../serverless-error');
+const { legacy } = require('@serverless/utils/log');
 
 const excludeNodeDevDependenciesMemoized = _.memoize(excludeNodeDevDependencies);
 
@@ -32,7 +33,7 @@ module.exports = {
     }
 
     if (excludeDevDependencies) {
-      this.serverless.cli.log('Excluding development dependencies...');
+      legacy.log('Excluding development dependencies...');
 
       const exAndInNode = await excludeNodeDevDependenciesMemoized(serviceDir);
       params.exclude = _.union(params.exclude, exAndInNode.exclude);
diff --git a/package.json b/package.json
index 00eb874f6b2..fb6ff2fa5da 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@serverless/components": "^3.16.0",
     "@serverless/dashboard-plugin": "^5.4.4",
     "@serverless/platform-client": "^4.3.0",
-    "@serverless/utils": "^5.9.0",
+    "@serverless/utils": "^5.11.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
diff --git a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
index de6acb0832f..91a9880a860 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
@@ -450,7 +450,6 @@ describe('checkForChanges', () => {
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledOnce;
         expect(globbySyncStub).to.have.been.calledOnce;
         expect(readFileStub).to.have.been.calledOnce;
-        expect(awsDeploy.serverless.cli.log).to.have.been.calledOnce;
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledWithExactly(
           awsDeploy.serverless.service.provider.compiledCloudFormationTemplate
         );
@@ -484,7 +483,6 @@ describe('checkForChanges', () => {
           expect(normalizeCloudFormationTemplateStub).to.have.been.calledOnce;
           expect(globbySyncStub).to.have.been.calledOnce;
           expect(readFileStub).to.have.been.calledOnce;
-          expect(awsDeploy.serverless.cli.log).to.have.been.calledOnce;
           expect(normalizeCloudFormationTemplateStub).to.have.been.calledWithExactly(
             awsDeploy.serverless.service.provider.compiledCloudFormationTemplate
           );
@@ -518,7 +516,6 @@ describe('checkForChanges', () => {
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledOnce;
         expect(globbySyncStub).to.have.been.calledOnce;
         expect(readFileStub).to.have.been.calledTwice;
-        expect(awsDeploy.serverless.cli.log).to.have.been.calledOnce;
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledWithExactly(
           awsDeploy.serverless.service.provider.compiledCloudFormationTemplate
         );
diff --git a/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js b/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
index 9707ae28611..a240bde06ad 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
@@ -163,32 +163,6 @@ describe('extendedValidate', () => {
       awsDeploy.extendedValidate();
       delete awsDeploy.serverless.service.package.artifact;
     });
-
-    it("should warn if function's timeout is greater than 30 and it's attached to APIGW", () => {
-      stateFileMock.service.functions = {
-        first: {
-          timeout: 31,
-          package: {
-            artifact: 'artifact.zip',
-          },
-          events: [
-            {
-              http: {},
-            },
-          ],
-        },
-      };
-      awsDeploy.serverless.service.package.individually = true;
-      fileExistsSyncStub.returns(true);
-      readFileSyncStub.returns(stateFileMock);
-
-      awsDeploy.extendedValidate();
-      const msg = [
-        "WARNING: Function first has timeout of 31 seconds, however, it's ",
-        "attached to API Gateway so it's automatically limited to 30 seconds.",
-      ].join('');
-      expect(awsDeploy.serverless.cli.log.firstCall.calledWithExactly(msg)).to.be.equal(true);
-    });
   });
 });
 
diff --git a/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js b/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js
index 3f750e9c9ea..c8b64667748 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js
@@ -62,28 +62,6 @@ describe('uploadArtifacts', () => {
     Object.assign(awsDeploy, uploadArtifacts);
   });
 
-  describe('#uploadArtifacts()', () => {
-    it('should run promise chain in order', () => {
-      const uploadCloudFormationFileStub = sinon
-        .stub(awsDeploy, 'uploadCloudFormationFile')
-        .resolves();
-      const uploadFunctionsAndLayersStub = sinon
-        .stub(awsDeploy, 'uploadFunctionsAndLayers')
-        .resolves();
-
-      return awsDeploy.uploadArtifacts().then(() => {
-        expect(uploadCloudFormationFileStub.calledOnce).to.be.equal(true);
-
-        expect(uploadFunctionsAndLayersStub.calledAfter(uploadCloudFormationFileStub)).to.be.equal(
-          true
-        );
-
-        awsDeploy.uploadCloudFormationFile.restore();
-        awsDeploy.uploadFunctionsAndLayers.restore();
-      });
-    });
-  });
-
   describe('#uploadCloudFormationFile()', () => {
     let normalizeCloudFormationTemplateStub;
     let uploadStub;
@@ -215,12 +193,12 @@ describe('uploadArtifacts', () => {
     let uploadZipFileStub;
 
     beforeEach(() => {
-      sinon.stub(fs, 'statSync').returns({ size: 1024 });
+      sinon.stub(fs.promises, 'stat').resolves({ size: 1024 });
       uploadZipFileStub = sinon.stub(awsDeploy, 'uploadZipFile').resolves();
     });
 
     afterEach(() => {
-      fs.statSync.restore();
+      fs.promises.stat.restore();
       uploadZipFileStub.restore();
     });
 
@@ -306,18 +284,6 @@ describe('uploadArtifacts', () => {
         );
       });
     });
-
-    it('should log artifact size', () => {
-      awsDeploy.serverless.serviceDir = 'some/path';
-      awsDeploy.serverless.service.service = 'new-service';
-
-      sinon.spy(awsDeploy.serverless.cli, 'log');
-
-      return awsDeploy.uploadFunctionsAndLayers().then(() => {
-        const expected = 'Uploading service new-service.zip file to S3 (1.02 kB)...';
-        expect(awsDeploy.serverless.cli.log.calledWithExactly(expected)).to.be.equal(true);
-      });
-    });
   });
 
   describe('#uploadCustomResources()', () => {
diff --git a/test/unit/lib/plugins/aws/deploy/lib/validateTemplate.test.js b/test/unit/lib/plugins/aws/deploy/lib/validateTemplate.test.js
index fe12beaee28..cbcd2038672 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/validateTemplate.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/validateTemplate.test.js
@@ -35,9 +35,6 @@ describe('validateTemplate', () => {
       },
     };
     validateTemplateStub = sinon.stub(awsDeploy.provider, 'request');
-    awsDeploy.serverless.cli = {
-      log: sinon.spy(),
-    };
   });
 
   afterEach(() => {
@@ -49,7 +46,6 @@ describe('validateTemplate', () => {
       validateTemplateStub.resolves();
 
       await awsDeploy.validateTemplate();
-      expect(awsDeploy.serverless.cli.log).to.have.been.called;
       expect(validateTemplateStub).to.have.been.calledOnce;
       expect(validateTemplateStub).to.have.been.calledWithExactly(
         'CloudFormation',
@@ -65,7 +61,6 @@ describe('validateTemplate', () => {
       validateTemplateStub.rejects({ message: 'Some error while validating' });
 
       return expect(awsDeploy.validateTemplate()).to.be.rejected.then((error) => {
-        expect(awsDeploy.serverless.cli.log).to.have.been.called;
         expect(validateTemplateStub).to.have.been.calledOnce;
         expect(validateTemplateStub).to.have.been.calledWithExactly(
           'CloudFormation',
diff --git a/test/unit/lib/plugins/aws/info/display.test.js b/test/unit/lib/plugins/aws/info/display.test.js
index 5ea639f4487..b5212a0bb56 100644
--- a/test/unit/lib/plugins/aws/info/display.test.js
+++ b/test/unit/lib/plugins/aws/info/display.test.js
@@ -1,361 +1,8 @@
 'use strict';
 
 const expect = require('chai').expect;
-const sinon = require('sinon');
-const AwsInfo = require('../../../../../../lib/plugins/aws/info/index');
-const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../lib/Serverless');
-const CLI = require('../../../../../../lib/classes/CLI');
-const chalk = require('chalk');
 const runServerless = require('../../../../../utils/run-serverless');
 
-describe('#display()', () => {
-  let serverless;
-  let awsInfo;
-  let consoleLogStub;
-
-  beforeEach(() => {
-    const options = {
-      stage: 'dev',
-      region: 'us-east-1',
-    };
-    serverless = new Serverless();
-    serverless.serviceOutputs = new Map();
-    serverless.setProvider('aws', new AwsProvider(serverless, options));
-    serverless.cli = new CLI(serverless);
-    serverless.service.service = 'my-service';
-    awsInfo = new AwsInfo(serverless, options);
-    awsInfo.gatheredData = {
-      info: {
-        service: 'my-first',
-        stage: 'dev',
-        region: 'eu-west-1',
-        stack: 'my-first-dev',
-        endpoints: [],
-        functions: [],
-        apiKeys: [],
-        resourceCount: 10,
-      },
-    };
-    consoleLogStub = sinon.stub(serverless.cli, 'consoleLog').returns();
-  });
-
-  afterEach(() => {
-    serverless.cli.consoleLog.restore();
-  });
-
-  it('should display general service info', () => {
-    let expectedMessage = '';
-
-    expectedMessage += `${chalk.yellow.underline('Service Information')}\n`;
-    expectedMessage += `${chalk.yellow('service:')} my-first\n`;
-    expectedMessage += `${chalk.yellow('stage:')} dev\n`;
-    expectedMessage += `${chalk.yellow('region:')} eu-west-1\n`;
-    expectedMessage += `${chalk.yellow('stack:')} my-first-dev\n`;
-    expectedMessage += `${chalk.yellow('resources:')} 10`;
-
-    const message = awsInfo.displayServiceInfo();
-    expect(consoleLogStub.calledOnce).to.equal(true);
-    expect(message).to.equal(expectedMessage);
-  });
-
-  it('should display a warning if 450+ resources', () => {
-    let expectedMessage = '';
-
-    expectedMessage += `${chalk.yellow.underline('Service Information')}\n`;
-    expectedMessage += `${chalk.yellow('service:')} my-first\n`;
-    expectedMessage += `${chalk.yellow('stage:')} dev\n`;
-    expectedMessage += `${chalk.yellow('region:')} eu-west-1\n`;
-    expectedMessage += `${chalk.yellow('stack:')} my-first-dev\n`;
-    expectedMessage += `${chalk.yellow('resources:')} 450`;
-    expectedMessage += `\n${chalk.red('WARNING:')}\n`;
-    expectedMessage += '  You have 450 resources in your service.\n';
-    expectedMessage += '  CloudFormation has a hard limit of 500 resources in a service.\n';
-    expectedMessage +=
-      '  For advice on avoiding this limit, check out this link: http://bit.ly/2IiYB38.';
-
-    awsInfo.gatheredData.info.resourceCount = 450;
-
-    const message = awsInfo.displayServiceInfo();
-    expect(consoleLogStub.calledOnce).to.equal(true);
-    expect(message).to.equal(expectedMessage);
-  });
-
-  it('should display API keys if given', () => {
-    awsInfo.gatheredData.info.apiKeys = [
-      {
-        name: 'keyOne',
-        value: '1234',
-        description: 'keyOne description',
-      },
-    ];
-
-    let expectedMessage = '';
-
-    expectedMessage += `${chalk.yellow('api keys:')}`;
-    expectedMessage += '\n  keyOne: 1234 - keyOne description';
-
-    const message = awsInfo.displayApiKeys();
-    expect(consoleLogStub.calledOnce).to.equal(true);
-    expect(message).to.equal(expectedMessage);
-
-    delete awsInfo.gatheredData.info.apiKeys;
-    const missingMessage = awsInfo.displayApiKeys();
-    expectedMessage = `${chalk.yellow('api keys:')}`;
-    expectedMessage += '\n  None';
-    expect(missingMessage).to.equal(expectedMessage);
-  });
-
-  it('should hide API keys values when `--conceal` is given', () => {
-    awsInfo.options.conceal = true;
-    awsInfo.gatheredData.info.apiKeys = [
-      {
-        name: 'keyOne',
-        value: '1234',
-        description: 'keyOne description',
-      },
-    ];
-
-    let expectedMessage = '';
-
-    expectedMessage += `${chalk.yellow('api keys:')}`;
-    expectedMessage += '\n  keyOne - keyOne description';
-
-    const message = awsInfo.displayApiKeys();
-    expect(consoleLogStub.calledOnce).to.equal(true);
-    expect(message).to.equal(expectedMessage);
-  });
-
-  it('should display https endpoints if given', () => {
-    awsInfo.serverless.service.functions = {
-      function1: {
-        events: [
-          {
-            http: {
-              path: '/',
-              method: 'POST',
-            },
-          },
-          {
-            http: {
-              path: '/both/',
-              method: 'POST',
-            },
-          },
-          {
-            http: {
-              path: '/both/add/',
-              method: 'POST',
-            },
-          },
-          {
-            http: {
-              path: 'e',
-              method: 'POST',
-            },
-          },
-        ],
-      },
-      function2: {
-        events: [
-          {
-            http: 'GET function1',
-          },
-        ],
-      },
-      function3: {
-        events: [
-          {
-            s3: 'used-to-trigger-if',
-          },
-        ],
-      },
-    };
-
-    awsInfo.gatheredData.info.endpoints = [
-      'https://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev',
-    ];
-
-    let expectedMessage = '';
-
-    expectedMessage += `${chalk.yellow('endpoints:')}`;
-    expectedMessage += '\n  POST - https://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev';
-    expectedMessage += '\n  POST - https://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev/both';
-    expectedMessage +=
-      '\n  POST - https://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev/both/add';
-    expectedMessage += '\n  POST - https://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev/e';
-    expectedMessage +=
-      '\n  GET - https://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev/function1';
-
-    const message = awsInfo.displayEndpoints();
-    expect(consoleLogStub.calledOnce).to.equal(true);
-    expect(message).to.equal(expectedMessage);
-  });
-
-  it('should display wss endpoint if given', () => {
-    awsInfo.gatheredData.info.endpoints = [
-      'wss://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev',
-    ];
-
-    let expectedMessage = '';
-
-    expectedMessage += `${chalk.yellow('endpoints:')}`;
-    expectedMessage += '\n  wss://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev';
-
-    const message = awsInfo.displayEndpoints();
-    expect(consoleLogStub.calledOnce).to.equal(true);
-    expect(message).to.equal(expectedMessage);
-  });
-
-  it('should support a mix of https and wss endpoints', () => {
-    awsInfo.serverless.service.functions = {
-      function1: {
-        events: [
-          {
-            http: {
-              path: '/',
-              method: 'POST',
-            },
-          },
-          {
-            http: {
-              path: '/both/',
-              method: 'POST',
-            },
-          },
-        ],
-      },
-      function2: {
-        events: [
-          {
-            websocket: '$connect',
-          },
-        ],
-      },
-    };
-
-    awsInfo.gatheredData.info.endpoints = [
-      'https://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev',
-      'wss://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev',
-    ];
-
-    let expectedMessage = '';
-
-    expectedMessage += `${chalk.yellow('endpoints:')}`;
-    expectedMessage += '\n  POST - https://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev';
-    expectedMessage += '\n  POST - https://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev/both';
-    expectedMessage += '\n  wss://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev';
-
-    const message = awsInfo.displayEndpoints();
-    expect(consoleLogStub.calledOnce).to.equal(true);
-    expect(message).to.equal(expectedMessage);
-  });
-
-  it('should not display any endpoint info if none is given', () => {
-    const missingMessage = awsInfo.displayEndpoints();
-
-    let expectedMessage = '';
-
-    expectedMessage = `${chalk.yellow('endpoints:')}`;
-    expectedMessage += '\n  None';
-    expect(missingMessage).to.equal(expectedMessage);
-  });
-
-  it('should display cloudfront endpoint if given', () => {
-    awsInfo.serverless.service.functions = {
-      function1: {
-        events: [
-          {
-            cloudfront: {},
-          },
-        ],
-      },
-    };
-
-    awsInfo.gatheredData.info.cloudFront = 'a12bcdef3g45hi.cloudfront.net';
-
-    let expectedMessage = '';
-
-    expectedMessage += `${chalk.yellow('endpoints:')}`;
-    expectedMessage += '\n  CloudFront - a12bcdef3g45hi.cloudfront.net';
-
-    const message = awsInfo.displayEndpoints();
-    expect(consoleLogStub.calledOnce).to.equal(true);
-    expect(message).to.equal(expectedMessage);
-
-    delete awsInfo.gatheredData.info.cloudFront;
-    const missingMessage = awsInfo.displayEndpoints();
-    expectedMessage = `${chalk.yellow('endpoints:')}`;
-    expectedMessage += '\n  None';
-    expect(missingMessage).to.equal(expectedMessage);
-  });
-
-  it('should display functions if given', () => {
-    awsInfo.gatheredData.info.functions = [
-      {
-        name: 'function1',
-        deployedName: 'my-first-dev-function1',
-      },
-      {
-        name: 'function2',
-        deployedName: 'my-first-dev-function2',
-      },
-      {
-        name: 'function3',
-        deployedName: 'my-first-dev-function3',
-      },
-    ];
-
-    let expectedMessage = '';
-
-    expectedMessage += `${chalk.yellow('functions:')}`;
-    expectedMessage += '\n  function1: my-first-dev-function1';
-    expectedMessage += '\n  function2: my-first-dev-function2';
-    expectedMessage += '\n  function3: my-first-dev-function3';
-
-    const message = awsInfo.displayFunctions();
-    expect(consoleLogStub.calledOnce).to.equal(true);
-    expect(message).to.equal(expectedMessage);
-
-    delete awsInfo.gatheredData.info.functions;
-    const missingMessage = awsInfo.displayFunctions();
-    expectedMessage = `${chalk.yellow('functions:')}`;
-    expectedMessage += '\n  None';
-    expect(missingMessage).to.equal(expectedMessage);
-  });
-
-  it('should display CloudFormation outputs when verbose output is requested', () => {
-    awsInfo.options.verbose = true;
-
-    awsInfo.gatheredData.outputs = [
-      {
-        Description: 'Lambda function info',
-        OutputKey: 'Function1FunctionArn',
-        OutputValue: 'arn:function1',
-      },
-      {
-        Description: 'Lambda function info',
-        OutputKey: 'Function2FunctionArn',
-        OutputValue: 'arn:function2',
-      },
-    ];
-
-    let expectedMessage = '';
-
-    expectedMessage += `${chalk.yellow.underline('\nStack Outputs\n')}`;
-    expectedMessage += `${chalk.yellow('Function1FunctionArn')}: ${'arn:function1'}\n`;
-    expectedMessage += `${chalk.yellow('Function2FunctionArn')}: ${'arn:function2'}\n`;
-
-    const message = awsInfo.displayStackOutputs();
-    expect(consoleLogStub.calledOnce).to.equal(true);
-    expect(message).to.equal(expectedMessage);
-
-    awsInfo.options.verbose = false;
-    const nonVerboseMessage = awsInfo.displayStackOutputs();
-    expect(nonVerboseMessage).to.equal('');
-  });
-});
-
 describe('test/unit/lib/plugins/aws/info/display.test.js', () => {
   let serverless;
   let serviceName;

From 1dfad8f13ca73ee088b88a2c2c955b23af640f64 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Fri, 10 Sep 2021 17:17:22 +0200
Subject: [PATCH 0452/1101] docs: Clarify the differences between API Gateway
 versions

API Gateway's REST APIs and HTTP APIs are confusing.

As we move towards HTTP APIs by default, we want to clarify the differences between the two.
---
 docs/providers/aws/events/apigateway.md | 102 +++++++++++++-----------
 docs/providers/aws/events/http-api.md   |  13 ++-
 2 files changed, 67 insertions(+), 48 deletions(-)

diff --git a/docs/providers/aws/events/apigateway.md b/docs/providers/aws/events/apigateway.md
index 7bab4c4142f..1e01101a271 100644
--- a/docs/providers/aws/events/apigateway.md
+++ b/docs/providers/aws/events/apigateway.md
@@ -12,51 +12,63 @@ layout: Doc
 
 <!-- DOCS-SITE-LINK:END -->
 
-# API Gateway
-
-- [API Gateway](#api-gateway)
-  - [Lambda Proxy Integration](#lambda-proxy-integration)
-    - [Simple HTTP Endpoint](#simple-http-endpoint)
-    - [Example "LAMBDA-PROXY" event (default)](#example-lambda-proxy-event-default)
-    - [HTTP Endpoint with Extended Options](#http-endpoint-with-extended-options)
-    - [Enabling CORS](#enabling-cors)
-    - [HTTP Endpoints with `AWS_IAM` Authorizers](#http-endpoints-with-aws_iam-authorizers)
-    - [HTTP Endpoints with Custom Authorizers](#http-endpoints-with-custom-authorizers)
-    - [HTTP Endpoints with `operationId`](#http-endpoints-with-operationId)
-    - [Catching Exceptions In Your Lambda Function](#catching-exceptions-in-your-lambda-function)
-    - [Setting API keys for your Rest API](#setting-api-keys-for-your-rest-api)
-    - [Configuring endpoint types](#configuring-endpoint-types)
-    - [Request Parameters](#request-parameters)
-    - [Request Schema Validators](#request-schema-validators)
-    - [Setting source of API key for metering requests](#setting-source-of-api-key-for-metering-requests)
-  - [Lambda Integration](#lambda-integration)
-    - [Example "LAMBDA" event (before customization)](#example-lambda-event-before-customization)
-    - [Request templates](#request-templates)
-      - [Default Request Templates](#default-request-templates)
-      - [Custom Request Templates](#custom-request-templates)
-      - [Pass Through Behavior](#pass-through-behavior)
-    - [Responses](#responses)
-      - [Custom Response Headers](#custom-response-headers)
-      - [Custom Response Templates](#custom-response-templates)
-    - [Status Codes](#status-codes)
-      - [Available Status Codes](#available-status-codes)
-      - [Using Status Codes](#using-status-codes)
-      - [Custom Status Codes](#custom-status-codes)
-  - [Setting an HTTP Proxy on API Gateway](#setting-an-http-proxy-on-api-gateway)
-  - [Accessing private resources using VPC Link](#accessing-private-resources-using-vpc-link)
-  - [Mock Integration](#mock-integration)
-  - [Share API Gateway and API Resources](#share-api-gateway-and-api-resources)
-    - [Easiest and CI/CD friendly example of using shared API Gateway and API Resources.](#easiest-and-cicd-friendly-example-of-using-shared-api-gateway-and-api-resources)
-    - [Manually Configuring shared API Gateway](#manually-configuring-shared-api-gateway)
-      - [Note while using authorizers with shared API Gateway](#note-while-using-authorizers-with-shared-api-gateway)
-  - [Share Authorizer](#share-authorizer)
-  - [Resource Policy](#resource-policy)
-  - [Compression](#compression)
-  - [Binary Media Types](#binary-media-types)
-  - [Detailed CloudWatch Metrics](#detailed-cloudwatch-metrics)
-  - [AWS X-Ray Tracing](#aws-x-ray-tracing)
-  - [Tags / Stack Tags](#tags--stack-tags)
-  - [Logs](#logs)
+# API Gateway REST API
+
+API Gateway lets you deploy HTTP APIs. It comes [in two versions](https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-vs-rest.html):
+
+- v1, also called **REST API**
+- v2, also called **HTTP API**, which is faster and cheaper than v1
+
+Despite their confusing name, both versions allow deploying any HTTP API (like REST, GraphQL, etc.). Read the full comparison [in the AWS documentation](https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-vs-rest.html).
+
+This guide documents using API Gateway **v1 REST API** via the `http` event.
+
+To use API Gateway **v2 HTTP API** instead, follow the [HTTP API guide](http-api.md).
+
+Summary:
+
+- [Lambda Proxy Integration](#lambda-proxy-integration)
+  - [Simple HTTP Endpoint](#simple-http-endpoint)
+  - [Example "LAMBDA-PROXY" event (default)](#example-lambda-proxy-event-default)
+  - [HTTP Endpoint with Extended Options](#http-endpoint-with-extended-options)
+  - [Enabling CORS](#enabling-cors)
+  - [HTTP Endpoints with `AWS_IAM` Authorizers](#http-endpoints-with-aws_iam-authorizers)
+  - [HTTP Endpoints with Custom Authorizers](#http-endpoints-with-custom-authorizers)
+  - [HTTP Endpoints with `operationId`](#http-endpoints-with-operationId)
+  - [Catching Exceptions In Your Lambda Function](#catching-exceptions-in-your-lambda-function)
+  - [Setting API keys for your Rest API](#setting-api-keys-for-your-rest-api)
+  - [Configuring endpoint types](#configuring-endpoint-types)
+  - [Request Parameters](#request-parameters)
+  - [Request Schema Validators](#request-schema-validators)
+  - [Setting source of API key for metering requests](#setting-source-of-api-key-for-metering-requests)
+- [Lambda Integration](#lambda-integration)
+  - [Example "LAMBDA" event (before customization)](#example-lambda-event-before-customization)
+  - [Request templates](#request-templates)
+    - [Default Request Templates](#default-request-templates)
+    - [Custom Request Templates](#custom-request-templates)
+    - [Pass Through Behavior](#pass-through-behavior)
+  - [Responses](#responses)
+    - [Custom Response Headers](#custom-response-headers)
+    - [Custom Response Templates](#custom-response-templates)
+  - [Status Codes](#status-codes)
+    - [Available Status Codes](#available-status-codes)
+    - [Using Status Codes](#using-status-codes)
+    - [Custom Status Codes](#custom-status-codes)
+- [Setting an HTTP Proxy on API Gateway](#setting-an-http-proxy-on-api-gateway)
+- [Accessing private resources using VPC Link](#accessing-private-resources-using-vpc-link)
+- [Mock Integration](#mock-integration)
+- [Share API Gateway and API Resources](#share-api-gateway-and-api-resources)
+  - [Easiest and CI/CD friendly example of using shared API Gateway and API Resources.](#easiest-and-cicd-friendly-example-of-using-shared-api-gateway-and-api-resources)
+  - [Manually Configuring shared API Gateway](#manually-configuring-shared-api-gateway)
+    - [Note while using authorizers with shared API Gateway](#note-while-using-authorizers-with-shared-api-gateway)
+- [Share Authorizer](#share-authorizer)
+- [Resource Policy](#resource-policy)
+- [Compression](#compression)
+- [Binary Media Types](#binary-media-types)
+- [Detailed CloudWatch Metrics](#detailed-cloudwatch-metrics)
+- [AWS X-Ray Tracing](#aws-x-ray-tracing)
+- [Tags / Stack Tags](#tags--stack-tags)
+- [Logs](#logs)
 
 _Are you looking for tutorials on using API Gateway? Check out the following resources:_
 
diff --git a/docs/providers/aws/events/http-api.md b/docs/providers/aws/events/http-api.md
index 7d52ae3521f..3433d04d245 100644
--- a/docs/providers/aws/events/http-api.md
+++ b/docs/providers/aws/events/http-api.md
@@ -12,11 +12,18 @@ layout: Doc
 
 <!-- DOCS-SITE-LINK:END -->
 
-# HTTP API
+# API Gateway HTTP API
 
-HTTP APIs are a special flavored [API Gateway](https://aws.amazon.com/api-gateway/) implementation which offer more features and improved performance. They have some benefits and drawbacks compared to the traditional API Gateway REST APIs. Read the differences in the [AWS Documentation](https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-vs-rest.html).
+API Gateway lets you deploy HTTP APIs. It comes [in two versions](https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-vs-rest.html):
 
-The Serverless Framework makes it possible to setup [API Gateway](https://aws.amazon.com/api-gateway/) HTTP APIs via the `httpApi` event.
+- v1, also called **REST API**
+- v2, also called **HTTP API**, which is faster and cheaper than v1
+
+Despite their confusing name, both versions allow deploying any HTTP API (like REST, GraphQL, etc.). Read the full comparison [in the AWS documentation](https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-vs-rest.html).
+
+This guide documents using API Gateway **v2 HTTP API** via the `httpApi` event.
+
+To use API Gateway **v1 REST API** instead, follow the [API Gateway REST API guide](apigateway.md).
 
 ## Event Definition
 

From 392911006632974ae9eb5b15bc4b131089eabd22 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 13 Sep 2021 14:49:06 +0200
Subject: [PATCH 0453/1101] chore: Bump dependencies

---
 package.json | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index fb6ff2fa5da..4e9cab3d193 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.57.0",
+  "version": "2.58.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",
@@ -23,30 +23,30 @@
   },
   "dependencies": {
     "@serverless/cli": "^1.5.2",
-    "@serverless/components": "^3.16.0",
+    "@serverless/components": "^3.17.0",
     "@serverless/dashboard-plugin": "^5.4.4",
     "@serverless/platform-client": "^4.3.0",
     "@serverless/utils": "^5.11.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.979.0",
+    "aws-sdk": "^2.987.0",
     "bluebird": "^3.7.2",
-    "boxen": "^5.0.1",
+    "boxen": "^5.1.1",
     "cachedir": "^2.3.0",
     "chalk": "^4.1.2",
     "child-process-ext": "^2.1.1",
     "ci-info": "^3.2.0",
-    "cli-progress-footer": "^2.0.0",
+    "cli-progress-footer": "^2.0.1",
     "d": "^1.0.1",
-    "dayjs": "^1.10.6",
+    "dayjs": "^1.10.7",
     "decompress": "^4.2.1",
     "dotenv": "^10.0.0",
     "dotenv-expand": "^5.1.0",
     "essentials": "^1.1.1",
     "ext": "^1.5.0",
     "fastest-levenshtein": "^1.0.12",
-    "filesize": "^8.0.0",
+    "filesize": "^8.0.2",
     "fs-extra": "^9.1.0",
     "get-stdin": "^8.0.0",
     "globby": "^11.0.4",
@@ -62,7 +62,7 @@
     "memoizee": "^0.4.15",
     "micromatch": "^4.0.4",
     "ncjsm": "^4.2.0",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "^2.6.2",
     "object-hash": "^2.2.0",
     "path2": "^0.1.0",
     "process-utils": "^4.0.0",
@@ -82,10 +82,10 @@
     "@commitlint/cli": "^12.1.4",
     "@serverless/eslint-config": "^3.0.0",
     "@serverless/test": "^8.3.1",
-    "adm-zip": "^0.5.5",
+    "adm-zip": "^0.5.6",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "cos-nodejs-sdk-v5": "^2.10.0",
+    "cos-nodejs-sdk-v5": "^2.10.2",
     "eslint": "^7.32.0",
     "eslint-plugin-import": "^2.24.2",
     "git-list-updated": "^1.2.1",
@@ -93,20 +93,20 @@
     "husky": "^4.3.8",
     "jszip": "^3.7.1",
     "lint-staged": "^10.5.4",
-    "log": "^6.0.0",
-    "log-node": "^8.0.0",
+    "log": "^6.2.0",
+    "log-node": "^8.0.1",
     "mocha": "^8.4.0",
     "mock-require": "^3.0.3",
     "nyc": "^15.1.0",
     "pkg": "^4.5.1",
-    "prettier": "^2.3.2",
+    "prettier": "^2.4.0",
     "proxyquire": "^2.1.3",
-    "semver-regex": "^3.1.2",
+    "semver-regex": "^3.1.3",
     "sinon": "^11.1.2",
     "sinon-chai": "^3.7.0",
     "standard-version": "^9.3.1",
     "strip-ansi": "^6.0.0",
-    "ws": "^7.5.4",
+    "ws": "^7.5.5",
     "xml2js": "^0.4.23"
   },
   "eslintConfig": {

From 0702a968b530e9bd4175345ebda992613db754a8 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 13 Sep 2021 15:43:48 +0200
Subject: [PATCH 0454/1101] chore: Release v2.58.0

---
 CHANGELOG.md         | 36 ++++++++++++++++++++++++++++++++++++
 commitlint.config.js |  1 +
 2 files changed, 37 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c113dccc1b2..4079d656f46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,42 @@
 
 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.
 
+## [2.58.0](https://github.com/serverless/serverless/compare/v2.57.0...v2.58.0) (2021-09-13)
+
+### Features
+
+- **AWS API Gateway:** Support `enabled` for `apiKeys` config ([#9918](https://github.com/serverless/serverless/pull/9918)) ([1107763](https://github.com/serverless/serverless/commit/1107763df8fb07a40ec45529f77d99e5a0f6d4d6)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS CloudFront:** Support `behavior.CachePolicyId` ([#9895](https://github.com/serverless/serverless/issues/9895)) ([3abc2f0](https://github.com/serverless/serverless/commit/3abc2f06428b72d964aa8683c34cdcf1d761d140)) ([Seungchan Ahn](https://github.com/issea1015))
+- **AWS EventBridge:** Support `deadLetterQueue` and `retryPolicy` ([#9903](https://github.com/serverless/serverless/pull/9903)) ([130fb38](https://github.com/serverless/serverless/commit/130fb3838fd3ea382caabffad74fde8a4041d4fc)) ([Eve](https://github.com/evemontalvao) & [JP Bochi](https://github.com/jpbochi))
+- **AWS ActiveMQ:** Add support for `activemq` event ([#8840](https://github.com/serverless/serverless/issues/8840)) ([cacb529](https://github.com/serverless/serverless/commit/cacb529925ed2b2c591984f48bc52cf31f88e698)) ([lewgordon](https://github.com/lewgordon) & [Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS Schedule:** Allow multiple `rate` expressions in single event ([#9892](https://github.com/serverless/serverless/pull/9892)) ([9f0bc68](https://github.com/serverless/serverless/commit/9f0bc689cc2ac3e53b4db665b899e1446ac37456)) ([Federico Jasson](https://github.com/federicojasson))
+- **CLI:**
+  - Configure log writing with new (experimental) log engine ([#9923](https://github.com/serverless/serverless/pull/9923)) ([ec93174](https://github.com/serverless/serverless/commit/ec93174b8ccfe1715ce3615dcb2223b145ad0f31)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Introduce first iteration of modern logs for `deploy` ([#9934](https://github.com/serverless/serverless/issues/9934)) ([171897d](https://github.com/serverless/serverless/commit/171897d60e5adaa590be1f08c99ab2cc76e89ee4)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Do not retry AWS requests if the token has expired ([#9914](https://github.com/serverless/serverless/issues/9914)) ([b0ca237](https://github.com/serverless/serverless/commit/b0ca2376bbfb543d98db1585c3a20a391e1791c6)) ([Mars Lan](https://github.com/mars-lan))
+- Support `error` hook to be triggered on command error ([#9936](https://github.com/serverless/serverless/pull/9936)) ([5c9766c](https://github.com/serverless/serverless/commit/5c9766c085531b04e169aa36a552159755029cca)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **AWS API Gateway:** Ensure proper `RequestValidator` name ([#9910](https://github.com/serverless/serverless/pull/9910)) ([510b1d1](https://github.com/serverless/serverless/commit/510b1d165924d000aa8e81e74e27c69ac1a2e0b6)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS CloudFront:** Recognize `behavior.TrustedKeyGroups` in schema ([#9884](https://github.com/serverless/serverless/pull/9884)) ([da71df6](https://github.com/serverless/serverless/commit/da71df603295397229589c88dd8366426e06e982)) ([Petr Reshetin](https://github.com/preshetin))
+- **AWS Lambda:** Recognize `Fn::If` function for `environment` ([#9905](https://github.com/serverless/serverless/pull/9905)) ([63743ad](https://github.com/serverless/serverless/commit/63743ade31207049eee1811203db5622bc510f1a)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Maintenance Improvements
+
+- **CLI:**
+  - Ensure no monkey patching by progress override ([#9923](https://github.com/serverless/serverless/pull/9923)) ([e46ce80](https://github.com/serverless/serverless/commit/e46ce80d99414ff730355efd1636bab71bb1771c)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Ensure to clear progress in expected time points ([#9928](https://github.com/serverless/serverless/pull/9928)) ([29aec52](https://github.com/serverless/serverless/commit/29aec529b53d7dd10f4ec61db7c0dc3859995d27)) ([Mariusz Nowak](https://github.com/medikoo))
+- Replace `fse.access` with `fs.promises.access` ([#9915](https://github.com/serverless/serverless/issues/9915)) ([5155e01](https://github.com/serverless/serverless/commit/5155e0180e0cd5e3130bc74e308a97c0ea1a5c2b)) ([Sudipto Das](https://github.com/sdas13))
+- Replace `fse.readFile` with `fs.promises.readFile` ([#9935](https://github.com/serverless/serverless/issues/9935)) ([f431218](https://github.com/serverless/serverless/commit/f431218790ae31efdc4e0a65a5b17a32605ede3e)) ([Sudipto Das](https://github.com/sdas13))
+- Use `getCompiledTemplateS3Suffix` from `provider.naming` ([#9926](https://github.com/serverless/serverless/pull/9926)) ([95d3024](https://github.com/serverless/serverless/commit/95d3024ef55ce80edf20fe27d9c72ffd15bba2bb)) ([Andreas Kohn](https://github.com/ankon))
+- Internal API to register service outputs ([#9933](https://github.com/serverless/serverless/pull/9933)) ([b425cf1](https://github.com/serverless/serverless/commit/b425cf1582623c1e796ae9f3d33dc060a9492cb5)) ([Mariusz Nowak](https://github.com/medikoo))
+- Register service outputs ([#9933](https://github.com/serverless/serverless/pull/9933)) ([312266e](https://github.com/serverless/serverless/commit/312266e90819866199354183641954636bd5a076)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Templates
+
+- Remove unnecessary `fmt.Sprintf` in `tencent-go` ([#9847](https://github.com/serverless/serverless/pull/9847)) ([e798c26](https://github.com/serverless/serverless/commit/e798c269df6f456bccf6a1e755015ea1e7631117)) ([kou](https://github.com/kou-pg-0131))
+
 ## [2.57.0](https://github.com/serverless/serverless/compare/v2.56.0...v2.57.0) (2021-08-31)
 
 ### Features
diff --git a/commitlint.config.js b/commitlint.config.js
index d96c5df1575..e7ec04f620e 100644
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -11,6 +11,7 @@ module.exports = {
       [
         '',
         'API',
+        'AWS ActiveMQ',
         'AWS ALB',
         'AWS Alexa',
         'AWS API Gateway',

From 7cd3966897fa4432caf3f2bda0037df0c76e382b Mon Sep 17 00:00:00 2001
From: Seungchan Ahn <dev.issea1015@gmail.com>
Date: Tue, 14 Sep 2021 00:16:27 +0900
Subject: [PATCH 0455/1101] fix(AWS API Gateway): Ensure consistent default for
 `cors` conf (#9909)

---
 .../compile/events/apiGateway/index.js        |   1 -
 .../compile/events/apiGateway/lib/validate.js |  10 +-
 .../events/apiGateway/lib/validate.test.js    | 100 ++++++++++++------
 3 files changed, 73 insertions(+), 38 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/index.js b/lib/plugins/aws/package/compile/events/apiGateway/index.js
index 53a72c7e173..1757943f502 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/index.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/index.js
@@ -92,7 +92,6 @@ const corsSchema = {
           items: { type: 'string' },
         },
       },
-      oneOf: [{ required: ['origin'] }, { required: ['origins'] }],
       additionalProperties: false,
     },
   ],
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
index 6695ed7ac9e..a2c5ad8895a 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
@@ -61,7 +61,7 @@ module.exports = {
             cors.headers = _.union(http.cors.headers, cors.headers);
             cors.methods = _.union(http.cors.methods, cors.methods);
             cors.origins = _.union(http.cors.origins, cors.origins);
-            cors.origin = http.cors.origin || '*';
+            cors.origin = http.cors.origin;
             cors.allowCredentials = cors.allowCredentials || http.cors.allowCredentials;
 
             // when merging, last one defined wins
@@ -322,8 +322,7 @@ module.exports = {
       'X-Amz-User-Agent',
     ];
 
-    let cors = {
-      origins: ['*'],
+    const cors = {
       origin: '*',
       methods: ['OPTIONS'],
       headers,
@@ -331,7 +330,10 @@ module.exports = {
     };
 
     if (typeof http.cors === 'object') {
-      cors = http.cors;
+      if (http.cors.origins) {
+        delete cors.origin;
+      }
+      Object.assign(cors, http.cors);
       cors.methods = cors.methods || [];
       cors.allowCredentials = Boolean(cors.allowCredentials);
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
index 6229ad10b5f..46c67f46cc5 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
@@ -2,6 +2,7 @@
 
 const expect = require('chai').expect;
 const sinon = require('sinon');
+const runServerless = require('../../../../../../../../../utils/run-serverless');
 const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
 const Serverless = require('../../../../../../../../../../lib/Serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
@@ -412,39 +413,6 @@ describe('#validate()', () => {
     expect(authorizer.identityValidationExpression).to.equal('foo');
   });
 
-  it('should process cors defaults', () => {
-    awsCompileApigEvents.serverless.service.functions = {
-      first: {
-        events: [
-          {
-            http: {
-              method: 'POST',
-              path: '/foo/bar',
-              cors: true,
-            },
-          },
-        ],
-      },
-    };
-
-    const validated = awsCompileApigEvents.validate();
-    expect(validated.events).to.be.an('Array').with.length(1);
-    expect(validated.events[0].http.cors).to.deep.equal({
-      headers: [
-        'Content-Type',
-        'X-Amz-Date',
-        'Authorization',
-        'X-Api-Key',
-        'X-Amz-Security-Token',
-        'X-Amz-User-Agent',
-      ],
-      methods: ['OPTIONS', 'POST'],
-      origin: '*',
-      origins: ['*'],
-      allowCredentials: false,
-    });
-  });
-
   it('should accept cors headers as a single string value', () => {
     awsCompileApigEvents.serverless.service.functions = {
       first: {
@@ -1589,3 +1557,69 @@ describe('#validate()', () => {
     });
   });
 });
+
+describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js', () => {
+  let cfTemplate;
+  let cfResources;
+  let naming;
+
+  const getApiGatewayMethod = (path, method) =>
+    cfResources[naming.getMethodLogicalId(naming.normalizePath(path), method)];
+
+  before(async () => {
+    const result = await runServerless({
+      fixture: 'function',
+      command: 'package',
+      configExt: {
+        functions: {
+          corsDefault: {
+            handler: 'index.handler',
+            events: [
+              {
+                http: {
+                  method: 'POST',
+                  path: '/cors-default-set-by-boolean',
+                  cors: true,
+                },
+              },
+              {
+                http: {
+                  method: 'POST',
+                  path: '/cors-default-set-by-object',
+                  cors: {},
+                },
+              },
+            ],
+          },
+        },
+      },
+    });
+    cfTemplate = result.cfTemplate;
+    cfResources = cfTemplate.Resources;
+    naming = result.awsNaming;
+  });
+
+  it('should process cors defaults', async () => {
+    const expected = {
+      'method.response.header.Access-Control-Allow-Headers': `'${[
+        'Content-Type',
+        'X-Amz-Date',
+        'Authorization',
+        'X-Api-Key',
+        'X-Amz-Security-Token',
+        'X-Amz-User-Agent',
+      ].join(',')}'`,
+      'method.response.header.Access-Control-Allow-Methods': `'${['OPTIONS', 'POST'].join(',')}'`,
+      'method.response.header.Access-Control-Allow-Origin': "'*'",
+    };
+
+    expect(
+      getApiGatewayMethod('/cors-default-set-by-boolean', 'OPTIONS').Properties.Integration
+        .IntegrationResponses[0].ResponseParameters
+    ).to.deep.eq(expected);
+    expect(
+      getApiGatewayMethod('/cors-default-set-by-object', 'OPTIONS').Properties.Integration
+        .IntegrationResponses[0].ResponseParameters
+    ).to.deep.eq(expected);
+  });
+});

From 6087fa3400b508092a5113d40e4b2c4fd8ec22a7 Mon Sep 17 00:00:00 2001
From: Jonas Matos <30418115+JonasMatos0@users.noreply.github.com>
Date: Mon, 13 Sep 2021 12:43:00 -0300
Subject: [PATCH 0456/1101] refactor: Replace `_.pick` with native property
 assignment (#9937)

Co-authored-by: Jonas Matos <js.matos@sidi.org.br>
---
 lib/plugins/aws/info/getApiKeyValues.js                | 9 ++++++---
 test/unit/lib/plugins/aws/info/getApiKeyValues.test.js | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/plugins/aws/info/getApiKeyValues.js b/lib/plugins/aws/info/getApiKeyValues.js
index eaed6657706..6b7ac5daf60 100644
--- a/lib/plugins/aws/info/getApiKeyValues.js
+++ b/lib/plugins/aws/info/getApiKeyValues.js
@@ -51,9 +51,12 @@ module.exports = {
         })
         .then((apiKeys) => {
           if (apiKeys && apiKeys.length) {
-            info.apiKeys = apiKeys.map((apiKey) =>
-              _.pick(apiKey, ['name', 'value', 'description', 'customerId'])
-            );
+            info.apiKeys = apiKeys.map((apiKey) => ({
+              name: apiKey.name,
+              value: apiKey.value,
+              description: apiKey.description,
+              customerId: apiKey.customerId,
+            }));
           }
           return BbPromise.resolve();
         });
diff --git a/test/unit/lib/plugins/aws/info/getApiKeyValues.test.js b/test/unit/lib/plugins/aws/info/getApiKeyValues.test.js
index 9417eb58b88..82825130cfc 100644
--- a/test/unit/lib/plugins/aws/info/getApiKeyValues.test.js
+++ b/test/unit/lib/plugins/aws/info/getApiKeyValues.test.js
@@ -68,6 +68,8 @@ describe('#getApiKeyValues()', () => {
       info: {
         apiKeys: [
           {
+            customerId: undefined,
+            description: undefined,
             name: 'foo',
             value: 'valueForKeyFoo',
           },

From 572ba7dcfa70f9eb748c17c7053e9d2f16cb9385 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 14 Sep 2021 10:19:39 +0200
Subject: [PATCH 0457/1101] chore: Switch to repo discussion as main forum for
 questions

---
 .github/ISSUE_TEMPLATE/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 33cdd346c64..764ab7fadf8 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Question
-    url: https://forum.serverless.com/
+    url: https://github.com/serverless/serverless/discussions
     about: Please ask and answer questions here

From 5a303bf35c14b76fb48c46a7deaa40a2063e16aa Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 14 Sep 2021 10:20:00 +0200
Subject: [PATCH 0458/1101] chore: Upgrade issue templates into GitHub forms

Co-authored-by: Matthieu Napoli <matthieu@mnapoli.fr>
---
 .github/ISSUE_TEMPLATE/bug-report.yml      | 75 ++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/bug_report.md       | 61 ------------------
 .github/ISSUE_TEMPLATE/feature-request.yml | 21 ++++++
 .github/ISSUE_TEMPLATE/feature_request.md  | 30 ---------
 4 files changed, 96 insertions(+), 91 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/bug-report.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature-request.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 00000000000..49217c4ff9a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,75 @@
+name: 🐛 Bug report
+description: Create a bug report
+body:
+  - type: checkboxes
+    attributes:
+      label: Are you certain it's a bug?
+      description: If you're uncertain, please report at https://github.com/serverless/serverless/discussions instead
+      options:
+        - label: Yes, it looks like a bug
+          required: true
+  - type: checkboxes
+    attributes:
+      label: Is the issue caused by a plugin?
+      description: If it comes from an external plugin, please report in the plugin issue tracker
+      options:
+        - label: It is not a plugin issue
+          required: true
+  - type: checkboxes
+    attributes:
+      label: Are you using the latest version?
+      description: Latest version can be checked at https://github.com/serverless/serverless/releases/latest
+      options:
+        - label: Yes, I'm using the latest version
+          required: true
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists
+      options:
+        - label: I have searched existing issues, it hasn't been reported yet
+          required: true
+  - type: textarea
+    attributes:
+      label: Issue description
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Service configuration (serverless.yml) content
+      description: |
+        Provide  COMPLETE content of serverless.yml, ensuring that:
+        • It consistently reproduces described issue
+        • It's as minimal as possible
+        • Ideally with no plugins involved (plugin related issues need to be reported at plugin repositories)
+        • Has sensitive parts masked out
+
+        If not applicable, fill with "N/A"
+      render: yaml
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Command name and used flags
+      description: |
+        Full command name with used flags (If not applicable, fill with "N/A")
+      placeholder: serverless <command name> [...flags]
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Command output
+      description: |
+        COMPLETE command output. Ensure SLS_DEBUG=* env var for verbose debug output
+
+        If not applicable, fill with "N/A"
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Environment information
+      description: '"serverless --version" output'
+      render: shell
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 0f2a901c510..00000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,61 +0,0 @@
----
-name: '🐛 Bug report'
-about: Create a bug report
----
-
-<!-- ⚠️⚠️ Acknowledge ALL below remarks -->
-<!-- ⚠️⚠️ Request may not be processed if it doesn't meet outlined criteria -->
-
-<!-- ⚠️⚠️ Ensure you're using *latest* version of a Framework -->
-<!-- ⚠️⚠️ If you're uncertain you deal with a bug, ask first at https://forum.serverless.com -->
-<!-- ⚠️⚠️ If your issue is influenced by a plugin, report at plugin repository, not here -->
-<!-- ⚠️⚠️ Search existing issues to avoid creating duplicates  -->
-
-<!-- ⚠️⚠️ Answer ALL the questions below -->
-
-<!--
-Q1: Describe the issue
--->
-
-⚠️⚠️ REPLACE WITH DESCRIPTION
-
-<!--
-Q2: Provide (in below placeholder) FULL content of serverless.yml, ensuring that:
-• It consistently reproduces described issue
-• It's as minimal as possible
-• There's no plugins involved (plugin related issues need to be reported at plugin repositories)
-• Has sensitive parts masked out
--->
-
-<details>
-<summary><code>serverless.yml</code></summary>
-
-```yaml
-# ⚠️⚠️ REPLACE THIS COMMENT WITH FULL serverless.yml CONTENT
-```
-
-</details>
-
-<!--
-Q3: Provide (in below placeholder) FULL name and output of the command that exposes the problem.
-       Note: Ensure SLS_DEBUG=* env var for verbose debug output
--->
-
-<details>
-<summary><b><code>⚠️⚠️ REPLACE WITH FULL COMMAND NAME</code> output</b></summary>
-
-```
-⚠️⚠️ REPLACE WITH FULL COMMAND OUTPUT
-```
-
-</details>
-
-<!--
-Q4: Provide (in below placeholder) output of serverless --version
--->
-
-<b>Installed version</b>
-
-```
-⚠️⚠️ REPLACE WITH `serverless --version` OUTPUT
-```
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 00000000000..b2e7548b143
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,21 @@
+name: 🎉 Feature request
+description: Suggest an idea
+body:
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists
+      options:
+        - label: I have searched existing issues, it hasn't been reported yet
+          required: true
+  - type: textarea
+    attributes:
+      label: Use case description
+      description: Describe the problem (use case) that needs to be solved
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Proposed solution (optional)
+      description: |
+        e.g. propose how the configuration of the new feature could look
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 668060785ee..00000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-name: '🎉 Feature request'
-about: Suggest an idea
----
-
-<!-- ⚠️⚠️ Acknowledge ALL below remarks -->
-<!-- ⚠️⚠️ Request may not be processed if it doesn't meet outlined criteria -->
-
-<!-- ⚠️⚠️ Search existing issues to avoid creating duplicates  -->
-<!-- ⚠️⚠️ Plugin enhancements should be proposed at plugin repository, not here -->
-
-<!-- ⚠️⚠️ Answer ALL required questions below -->
-
-<!--
-Q1: Describe the problem (use case) that needs to be solved
--->
-
-### Use case description
-
-⚠️⚠️ REPLACE WITH DESCRIPTION
-
-<!--
-Q2: Propose a solution (e.g. provide configuration example)
-
-Note: This is optional, remove this section if you do not wish to propose anything at this point
--->
-
-### Proposed solution
-
-⚠️⚠️ REPLACE WITH PROPOSAL

From fbdd124029d10ef029ee5446777db44f907e026c Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 14 Sep 2021 10:38:01 +0200
Subject: [PATCH 0459/1101] feat(CLI): First iteration of support for `verbose`
 mode in `deploy`

---
 lib/plugins/aws/deploy/index.js               |  1 +
 lib/plugins/aws/deploy/lib/cleanupS3Bucket.js |  3 ++-
 lib/plugins/aws/deploy/lib/createStack.js     |  6 ++++--
 lib/plugins/aws/deploy/lib/uploadArtifacts.js |  9 +++++++--
 lib/plugins/aws/info/display.js               | 11 ++++++++++-
 lib/plugins/aws/lib/monitorStack.js           |  7 ++++++-
 lib/plugins/aws/lib/updateStack.js            |  7 +++++--
 lib/plugins/package/lib/packageService.js     | 10 ++++++++--
 lib/plugins/package/lib/zipService.js         |  7 ++++++-
 9 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index 2449739b552..ab6c71acbe4 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -132,6 +132,7 @@ class AwsDeploy {
       'aws:deploy:finalize:cleanup': async () => {
         if (this.serverless.service.provider.shouldNotDeploy) return;
         progress.get('main').notice('Updating');
+        log.info('Updating');
         await this.cleanupS3Bucket();
         if (this.options.package || this.serverless.service.package.path) {
           await this.serverless.pluginManager.spawn('aws:common:cleanupTempDir');
diff --git a/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js b/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
index 8256c7f0bf3..319bd143998 100644
--- a/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
+++ b/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
@@ -3,7 +3,7 @@
 const _ = require('lodash');
 const findAndGroupDeployments = require('../../utils/findAndGroupDeployments');
 const getS3ObjectsFromStacks = require('../../utils/getS3ObjectsFromStacks');
-const { legacy } = require('@serverless/utils/log');
+const { legacy, log } = require('@serverless/utils/log');
 
 module.exports = {
   async getObjectsToRemove() {
@@ -30,6 +30,7 @@ module.exports = {
   async removeObjects(objectsToRemove) {
     if (!objectsToRemove || !objectsToRemove.length) return;
     legacy.log('Removing old service artifacts from S3...');
+    log.info('Removing old service artifacts from S3');
     await this.provider.request('S3', 'deleteObjects', {
       Bucket: this.bucketName,
       Delete: { Objects: objectsToRemove },
diff --git a/lib/plugins/aws/deploy/lib/createStack.js b/lib/plugins/aws/deploy/lib/createStack.js
index 8cbbc267184..5abdc66fefc 100644
--- a/lib/plugins/aws/deploy/lib/createStack.js
+++ b/lib/plugins/aws/deploy/lib/createStack.js
@@ -2,13 +2,14 @@
 
 const BbPromise = require('bluebird');
 const ServerlessError = require('../../../../serverless-error');
-const { legacy, progress } = require('@serverless/utils/log');
+const { legacy, progress, log } = require('@serverless/utils/log');
 
 module.exports = {
   async create() {
     // Note: using three dots instead of ellipsis to support non uni-code consoles.
     legacy.log('Creating Stack...');
     progress.get('main').notice('Creating CloudFormation stack');
+    log.info('Creating CloudFormation stack');
     const stackName = this.provider.naming.getStackName();
 
     let stackTags = { STAGE: this.provider.getStage() };
@@ -87,7 +88,8 @@ module.exports = {
               );
 
               if (!isAlreadyAccelerated) {
-                this.serverless.cli.log('Not using S3 Transfer Acceleration (1st deploy)');
+                legacy.log('Not using S3 Transfer Acceleration (1st deploy)');
+                log.info('Not using S3 Transfer Acceleration (1st deploy)');
                 this.provider.disableTransferAccelerationForCurrentDeploy();
               }
             }
diff --git a/lib/plugins/aws/deploy/lib/uploadArtifacts.js b/lib/plugins/aws/deploy/lib/uploadArtifacts.js
index 64f1430d5dc..8e0850f6194 100644
--- a/lib/plugins/aws/deploy/lib/uploadArtifacts.js
+++ b/lib/plugins/aws/deploy/lib/uploadArtifacts.js
@@ -10,7 +10,7 @@ const filesize = require('filesize');
 const normalizeFiles = require('../../lib/normalizeFiles');
 const getLambdaLayerArtifactPath = require('../../utils/getLambdaLayerArtifactPath');
 const ServerlessError = require('../../../../serverless-error');
-const { legacy, progress } = require('@serverless/utils/log');
+const { legacy, progress, log } = require('@serverless/utils/log');
 
 const MAX_CONCURRENT_ARTIFACTS_UPLOADS =
   Number(process.env.SLS_MAX_CONCURRENT_ARTIFACTS_UPLOADS) || 3;
@@ -38,6 +38,7 @@ module.exports = {
     } else {
       progress.get('main').notice(`Uploading (0/${artifactFilePaths.length})`);
     }
+    log.info('Uploading');
 
     await this.uploadCloudFormationFile();
     await this.uploadFunctionsAndLayers();
@@ -46,6 +47,7 @@ module.exports = {
 
   async uploadCloudFormationFile() {
     legacy.log('Uploading CloudFormation file to S3...');
+    log.info('Uploading CloudFormation file to S3');
 
     const compiledTemplateFileName = this.provider.naming.getCompiledTemplateS3Suffix();
 
@@ -149,7 +151,8 @@ module.exports = {
       .map((name) => {
         const layerObject = this.serverless.service.getLayer(name);
         if (layerObject.artifactAlreadyUploaded) {
-          this.serverless.cli.log(`Skip uploading ${name}`);
+          legacy.log(`Skip uploading ${name}`);
+          log.info(`Skipped uploading ${name}`);
           return null;
         }
         return getLambdaLayerArtifactPath(
@@ -177,6 +180,7 @@ module.exports = {
       const stats = await this.getFileStats(artifactFilePath);
       const fileName = path.basename(artifactFilePath);
       legacy.log(`Uploading service ${fileName} file to S3 (${filesize(stats.size)})...`);
+      log.info(`Uploading service ${fileName} file to S3 (${filesize(stats.size)})`);
       if (shouldReportDetailedProgress) {
         progress
           .get(`upload:${fileName}`)
@@ -204,6 +208,7 @@ module.exports = {
 
     if (this.serverless.utils.fileExistsSync(artifactFilePath)) {
       legacy.log('Uploading custom CloudFormation resources...');
+      log.info('Uploading custom CloudFormation resources');
       await this.uploadZipFile(artifactFilePath);
     }
   },
diff --git a/lib/plugins/aws/info/display.js b/lib/plugins/aws/info/display.js
index 4b00c4e6779..57e956a2726 100644
--- a/lib/plugins/aws/info/display.js
+++ b/lib/plugins/aws/info/display.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const chalk = require('chalk');
-const { style, legacy, writeText } = require('@serverless/utils/log');
+const { style, legacy, writeText, isVerboseMode } = require('@serverless/utils/log');
 
 module.exports = {
   displayServiceInfo() {
@@ -172,6 +172,15 @@ module.exports = {
       legacy.consoleLog(message);
     }
 
+    if (isVerboseMode && this.gatheredData.outputs.length) {
+      const outputSectionItems = [];
+      this.gatheredData.outputs.forEach((output) => {
+        outputSectionItems.push(`${output.OutputKey}: ${output.OutputValue}`);
+      });
+
+      this.serverless.addServiceOutputSection('\nStack Outputs', outputSectionItems);
+    }
+
     return message;
   },
 
diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js
index 2a8319dcc93..8a3224a3dee 100644
--- a/lib/plugins/aws/lib/monitorStack.js
+++ b/lib/plugins/aws/lib/monitorStack.js
@@ -4,7 +4,7 @@ const BbPromise = require('bluebird');
 const chalk = require('chalk');
 const wait = require('timers-ext/promise/sleep');
 const ServerlessError = require('../../../serverless-error');
-const { legacy, progress } = require('@serverless/utils/log');
+const { log, legacy, progress, style } = require('@serverless/utils/log');
 
 const validStatuses = new Set(['CREATE_COMPLETE', 'UPDATE_COMPLETE', 'DELETE_COMPLETE']);
 
@@ -77,6 +77,11 @@ module.exports = {
                   stackLatestError = event;
                 }
                 // Log stack events
+                log.info(
+                  style.aside(
+                    `  ${eventStatus} - ${event.ResourceType} - ${event.LogicalResourceId}`
+                  )
+                );
                 if (this.options.verbose) {
                   if (eventStatus && eventStatus.endsWith('FAILED')) {
                     eventStatus = chalk.red(eventStatus);
diff --git a/lib/plugins/aws/lib/updateStack.js b/lib/plugins/aws/lib/updateStack.js
index 4a02e8b83b0..a61489d4cda 100644
--- a/lib/plugins/aws/lib/updateStack.js
+++ b/lib/plugins/aws/lib/updateStack.js
@@ -2,14 +2,16 @@
 
 const BbPromise = require('bluebird');
 const getS3EndpointForRegion = require('../utils/getS3EndpointForRegion');
-const { legacy, progress } = require('@serverless/utils/log');
+const { legacy, progress, log } = require('@serverless/utils/log');
 
 const NO_UPDATE_MESSAGE = 'No updates are to be performed.';
 
 module.exports = {
   async createFallback() {
     this.createLater = false;
-    this.serverless.cli.log('Creating Stack...');
+    legacy.log('Creating Stack...');
+    progress.get('main').notice('Creating CloudFormation stack');
+    log.info('Creating CloudFormation stack');
 
     const stackName = this.provider.naming.getStackName();
     let stackTags = { STAGE: this.provider.getStage() };
@@ -73,6 +75,7 @@ module.exports = {
 
     legacy.log('Updating Stack...');
     progress.get('main').notice('Updating CloudFormation stack');
+    log.info('Updating CloudFormation stack');
     const stackName = this.provider.naming.getStackName();
     let stackTags = { STAGE: this.provider.getStage() };
 
diff --git a/lib/plugins/package/lib/packageService.js b/lib/plugins/package/lib/packageService.js
index f7a8f14636e..bca584da047 100644
--- a/lib/plugins/package/lib/packageService.js
+++ b/lib/plugins/package/lib/packageService.js
@@ -7,7 +7,7 @@ const _ = require('lodash');
 const micromatch = require('micromatch');
 const ServerlessError = require('../../../serverless-error');
 const parseS3URI = require('../../aws/utils/parse-s3-uri');
-const { legacy, progress } = require('@serverless/utils/log');
+const { legacy, progress, log } = require('@serverless/utils/log');
 
 module.exports = {
   defaultExcludes: [
@@ -69,6 +69,8 @@ module.exports = {
   async packageService() {
     legacy.log('Packaging service...');
     progress.get('main').notice('Packaging');
+    log.info();
+    log.info('Packaging');
     let shouldPackageService = false;
     const allFunctions = this.serverless.service.getAllFunctions();
     let packagePromises = allFunctions.map(async (functionName) => {
@@ -76,7 +78,8 @@ module.exports = {
       if (functionObject.image) return;
       functionObject.package = functionObject.package || {};
       if (functionObject.package.disable) {
-        this.serverless.cli.log(`Packaging disabled for function: "${functionName}"`);
+        legacy.log(`Packaging disabled for function: "${functionName}"`);
+        log.info(`Packaging disabled for function: "${functionName}"`);
         return;
       }
       if (functionObject.package.artifact) {
@@ -204,6 +207,7 @@ module.exports = {
       await this.excludeDevDependencies({
         exclude: this.getExcludes([], true),
         include: this.getIncludes(),
+        contextName: 'service package',
       })
     );
   },
@@ -219,6 +223,7 @@ module.exports = {
           ...(funcPackageConfig.include || []),
           ...(funcPackageConfig.patterns || []),
         ]),
+        contextName: `function "${functionName}"`,
       })
     );
   },
@@ -234,6 +239,7 @@ module.exports = {
           ...(layerPackageConfig.include || []),
           ...(layerPackageConfig.patterns || []),
         ]),
+        contextName: `layer "${layerName}"`,
       }),
       layerObject.path
     );
diff --git a/lib/plugins/package/lib/zipService.js b/lib/plugins/package/lib/zipService.js
index c5d3afe55f8..967ca9252a1 100644
--- a/lib/plugins/package/lib/zipService.js
+++ b/lib/plugins/package/lib/zipService.js
@@ -10,7 +10,7 @@ const childProcess = BbPromise.promisifyAll(require('child_process'));
 const globby = require('globby');
 const _ = require('lodash');
 const ServerlessError = require('../../../serverless-error');
-const { legacy } = require('@serverless/utils/log');
+const { legacy, log } = require('@serverless/utils/log');
 
 const excludeNodeDevDependenciesMemoized = _.memoize(excludeNodeDevDependencies);
 
@@ -34,6 +34,11 @@ module.exports = {
 
     if (excludeDevDependencies) {
       legacy.log('Excluding development dependencies...');
+      if (params.contextName) {
+        log.info(`Excluding development dependencies for ${params.contextName}`);
+      } else {
+        log.info('Excluding development dependencies');
+      }
 
       const exAndInNode = await excludeNodeDevDependenciesMemoized(serviceDir);
       params.exclude = _.union(params.exclude, exAndInNode.exclude);

From 12216db579f7f2d055410f1ea9449825628631b7 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 14 Sep 2021 14:49:13 +0200
Subject: [PATCH 0460/1101] feat(CLI Onboarding): Switch to `httpApi`-based
 templates

---
 lib/cli/interactive-setup/service.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index 29003e768bb..d4d221cd5bd 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -17,14 +17,14 @@ const isValidServiceName = RegExp.prototype.test.bind(/^[a-zA-Z][a-zA-Z0-9-]{0,1
 
 const initializeProjectChoices = [
   { name: 'AWS - Node.js - Starter', value: 'aws-node' },
-  { name: 'AWS - Node.js - REST API', value: 'aws-node-rest-api' },
+  { name: 'AWS - Node.js - HTTP API', value: 'aws-node-http-api' },
   { name: 'AWS - Node.js - Scheduled Task', value: 'aws-node-scheduled-cron' },
   { name: 'AWS - Node.js - SQS Worker', value: 'aws-node-sqs-worker' },
   { name: 'AWS - Node.js - Express API', value: 'aws-node-express-api' },
   { name: 'AWS - Node.js - Express API with DynamoDB', value: 'aws-node-express-dynamodb-api' },
 
   { name: 'AWS - Python - Starter', value: 'aws-python' },
-  { name: 'AWS - Python - REST API', value: 'aws-python-rest-api' },
+  { name: 'AWS - Python - HTTP API', value: 'aws-python-http-api' },
   { name: 'AWS - Python - Scheduled Task', value: 'aws-python-scheduled-cron' },
   { name: 'AWS - Python - SQS Worker', value: 'aws-python-sqs-worker' },
   { name: 'AWS - Python - Flask API', value: 'aws-python-flask-api' },

From 9bc8e8b0b919ae85350672a936b943688795acbf Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 14 Sep 2021 16:47:40 +0200
Subject: [PATCH 0461/1101] chore: Bump dependencies

---
 package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 4e9cab3d193..ef371da004f 100644
--- a/package.json
+++ b/package.json
@@ -26,18 +26,18 @@
     "@serverless/components": "^3.17.0",
     "@serverless/dashboard-plugin": "^5.4.4",
     "@serverless/platform-client": "^4.3.0",
-    "@serverless/utils": "^5.11.0",
+    "@serverless/utils": "^5.12.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.987.0",
+    "aws-sdk": "^2.988.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.1.1",
     "cachedir": "^2.3.0",
     "chalk": "^4.1.2",
     "child-process-ext": "^2.1.1",
     "ci-info": "^3.2.0",
-    "cli-progress-footer": "^2.0.1",
+    "cli-progress-footer": "^2.0.2",
     "d": "^1.0.1",
     "dayjs": "^1.10.7",
     "decompress": "^4.2.1",
@@ -46,7 +46,7 @@
     "essentials": "^1.1.1",
     "ext": "^1.5.0",
     "fastest-levenshtein": "^1.0.12",
-    "filesize": "^8.0.2",
+    "filesize": "^8.0.3",
     "fs-extra": "^9.1.0",
     "get-stdin": "^8.0.0",
     "globby": "^11.0.4",

From 5c0b270e42f1b483419f36652aa324d3f95209da Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 14 Sep 2021 17:27:30 +0200
Subject: [PATCH 0462/1101] chore: Release v2.59.0

---
 CHANGELOG.md | 15 +++++++++++++++
 package.json |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4079d656f46..98ccfc4d986 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
 
 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.
 
+## [2.59.0](https://github.com/serverless/serverless/compare/v2.58.0...v2.59.0) (2021-09-14)
+
+### Features
+
+- **CLI Onboarding:** Switch to `httpApi`-based templates ([#9954](https://github.com/serverless/serverless/pull/9954)) ([12216db](https://github.com/serverless/serverless/commit/12216db579f7f2d055410f1ea9449825628631b7)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI:** First iteration of support for `verbose` mode in `deploy` with modern logs ([#9952](https://github.com/serverless/serverless/pull/9952)) ([fbdd124](https://github.com/serverless/serverless/commit/fbdd124029d10ef029ee5446777db44f907e026c)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **AWS API Gateway:** Ensure consistent default for `cors` conf ([#9909](https://github.com/serverless/serverless/issues/9909)) ([7cd3966](https://github.com/serverless/serverless/commit/7cd3966897fa4432caf3f2bda0037df0c76e382b)) ([Seungchan Ahn](https://github.com/issea1015))
+
+### Maintenance Improvements
+
+- Replace `_.pick` with native property assignment ([#9937](https://github.com/serverless/serverless/issues/9937)) ([6087fa3](https://github.com/serverless/serverless/commit/6087fa3400b508092a5113d40e4b2c4fd8ec22a7)) ([Jonas Matos](https://github.com/JonasMatos0))
+
 ## [2.58.0](https://github.com/serverless/serverless/compare/v2.57.0...v2.58.0) (2021-09-13)
 
 ### Features
diff --git a/package.json b/package.json
index ef371da004f..85877b5cb48 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.58.0",
+  "version": "2.59.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 26b8bd5c5fd2154f47fa12804f1aee140000155f Mon Sep 17 00:00:00 2001
From: Jonas Matos <30418115+JonasMatos0@users.noreply.github.com>
Date: Wed, 15 Sep 2021 05:57:01 -0300
Subject: [PATCH 0463/1101] refactor: Replace `_.flatMap` usage (#9948)

Co-authored-by: Jonas Matos <js.matos@sidi.org.br>
---
 lib/classes/PluginManager.js         | 19 +++++++++++++------
 lib/plugins/aws/invokeLocal/index.js | 13 ++++++++-----
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 0af2efdaf97..b9b4e858c93 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -537,11 +537,17 @@ class PluginManager {
   }
 
   getEvents(command) {
-    return _.flatMap(command.lifecycleEvents, (event) => [
-      `before:${command.key}:${event}`,
-      `${command.key}:${event}`,
-      `after:${command.key}:${event}`,
-    ]);
+    return command.lifecycleEvents
+      ? command.lifecycleEvents.reduce(
+          (acc, event) =>
+            acc.concat([
+              `before:${command.key}:${event}`,
+              `${command.key}:${event}`,
+              `after:${command.key}:${event}`,
+            ]),
+          []
+        )
+      : [];
   }
 
   getPlugins() {
@@ -549,7 +555,8 @@ class PluginManager {
   }
 
   getHooks(events) {
-    return _.flatMap([].concat(events), (event) => this.hooks[event] || []);
+    const eventsArray = [].concat(events);
+    return eventsArray.reduce((acc, event) => acc.concat(this.hooks[event] || []), []);
   }
 
   async invoke(commandsArray, allowEntryPoints) {
diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invokeLocal/index.js
index 7936e767304..0249f491847 100644
--- a/lib/plugins/aws/invokeLocal/index.js
+++ b/lib/plugins/aws/invokeLocal/index.js
@@ -518,7 +518,10 @@ class AwsInvokeLocal {
       configuredEnvVars,
       envVarsFromOptions
     );
-    const envVarsDockerArgs = _.flatMap(envVars, (value, key) => ['--env', `${key}=${value}`]);
+    const envVarsDockerArgs = Object.keys(envVars).reduce(
+      (acc, key) => acc.concat(['--env', `${key}=${envVars[key]}`]),
+      []
+    );
 
     const dockerArgsFromOptions = this.getDockerArgsFromOptions();
     const dockerArgs = ['run', '--rm', '-v', `${artifactPath}:/var/task:ro,delegated`].concat(
@@ -545,11 +548,11 @@ class AwsInvokeLocal {
   }
 
   getDockerArgsFromOptions() {
-    const dockerArgOptions = this.options['docker-arg'];
-    return _.flatMap([].concat(dockerArgOptions || []), (dockerArgOption) => {
+    const dockerArgOptions = [].concat(this.options['docker-arg'] || []);
+    return dockerArgOptions.reduce((acc, dockerArgOption) => {
       const splitItems = dockerArgOption.split(' ');
-      return [splitItems[0], splitItems.slice(1).join(' ')];
-    });
+      return acc.concat(splitItems[0], splitItems.slice(1).join(' ') || []);
+    }, []);
   }
 
   async invokeLocalPython(runtime, handlerPath, handlerName, event, context) {

From 7828cc77f1fcea8f901887c12b07f5e18b34dcc8 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 15 Sep 2021 12:43:10 +0200
Subject: [PATCH 0464/1101] feat(CLI): Add timer to final message in modern
 logs

---
 lib/classes/PluginManager.js                  |  1 +
 lib/plugins/aws/deploy/index.js               | 14 ++++++++++++--
 lib/plugins/aws/deploy/lib/checkForChanges.js |  8 +++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index b9b4e858c93..49cbd436cf1 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -616,6 +616,7 @@ class PluginManager {
    * Called by the CLI to start a public command.
    */
   async run(commandsArray) {
+    this.commandRunStartTime = Date.now();
     if (resolveCliInput().commands[0] !== 'plugin') {
       // first initialize hooks
       for (const { hook } of this.getHooks(['initialize'])) {
diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index ab6c71acbe4..e3dec2c5fb4 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -124,7 +124,11 @@ class AwsDeploy {
         log.notice(
           `\n${style.noticeSymbol('✔')} Service deployed to stack ${this.serverless
             .getProvider('aws')
-            .naming.getStackName()}\n`
+            .naming.getStackName()} ${style.aside(
+            `(${Math.floor(
+              (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+            )}s)`
+          )}\n`
         );
       },
 
@@ -146,7 +150,13 @@ class AwsDeploy {
         if (isDeployCommand && !this.options.function) {
           log.error(); // In order to ensure extra new line before the error message
           log.error(
-            `Stack ${serverless.getProvider('aws').naming.getStackName()} failed to deploy`
+            `Stack ${serverless
+              .getProvider('aws')
+              .naming.getStackName()} failed to deploy ${style.aside(
+              `(${Math.floor(
+                (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+              )}s)`
+            )}`
           );
         }
       },
diff --git a/lib/plugins/aws/deploy/lib/checkForChanges.js b/lib/plugins/aws/deploy/lib/checkForChanges.js
index e69aeebd7ad..a1df2e7b6fb 100644
--- a/lib/plugins/aws/deploy/lib/checkForChanges.js
+++ b/lib/plugins/aws/deploy/lib/checkForChanges.js
@@ -188,7 +188,13 @@ module.exports = {
 
           const message = ['Service files not changed. Skipping deployment...'].join('');
           legacy.log(message, 'Serverless', { color: 'orange' });
-          log.notice(`\n${style.noticeSymbol('∅')} No changes to deploy. Deployment skipped.`);
+          log.notice(
+            `\n${style.noticeSymbol('∅')} No changes to deploy. Deployment skipped. ${style.aside(
+              `(${Math.floor(
+                (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+              )}s)`
+            )}`
+          );
         }
       });
     }

From 7eba95fcb7f9b09a8a2aebd50c433f92e15cac97 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 15 Sep 2021 13:18:56 +0200
Subject: [PATCH 0465/1101] feat(CLI): Add deprecation summary for modern logs

---
 lib/utils/logDeprecation.js | 25 +++++++++++++++++++------
 package.json                |  2 +-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/lib/utils/logDeprecation.js b/lib/utils/logDeprecation.js
index 66e5bdb55d3..77444e2f1a2 100644
--- a/lib/utils/logDeprecation.js
+++ b/lib/utils/logDeprecation.js
@@ -4,6 +4,7 @@ const chalk = require('chalk');
 const weakMemoizee = require('memoizee/weak');
 const _ = require('lodash');
 const ServerlessError = require('../serverless-error');
+const { style, legacy, log } = require('@serverless/utils/log');
 
 const disabledDeprecationCodesByEnv = extractCodes(process.env.SLS_DEPRECATION_DISABLE);
 
@@ -12,6 +13,8 @@ const notificationModeByEnv = process.env.SLS_DEPRECATION_NOTIFICATION_MODE;
 const triggeredDeprecations = new Set();
 const bufferedDeprecations = [];
 
+const deprecationLogger = log.get('deprecation');
+
 function extractCodes(codesStr) {
   if (!codesStr) {
     return new Set();
@@ -54,11 +57,9 @@ function writeDeprecation(code, message) {
     messageLines[i] = followingLinesPrefix + messageLines[i];
   }
   message = messageLines.join('\n');
-  process.stdout.write(
-    `Serverless: ${chalk.keyword('orange')(`Deprecation warning: ${message}`)}\n`
-  );
+  legacy.write(`Serverless: ${chalk.keyword('orange')(`Deprecation warning: ${message}`)}\n`);
   if (!code.startsWith('EXT_')) {
-    process.stdout.write(
+    legacy.write(
       `            ${chalk.keyword('orange')(
         `More Info: https://www.serverless.com/framework/docs/deprecations/#${code}`
       )}\n`
@@ -113,15 +114,27 @@ module.exports.flushBuffered = () => {
 
 module.exports.printSummary = () => {
   if (!bufferedDeprecations.length) return;
+
+  deprecationLogger.warning();
+
   try {
     if (bufferedDeprecations.length === 1) {
+      deprecationLogger.warning(
+        style.aside("1 deprecation found: run 'serverless doctor' for more details")
+      );
       const { code, message } = bufferedDeprecations[0];
       writeDeprecation(code, message);
       return;
     }
 
+    deprecationLogger.warning(
+      style.aside(
+        `${bufferedDeprecations.length} deprecations found: run 'serverless doctor' for more details`
+      )
+    );
+
     const prefix = 'Serverless: ';
-    process.stdout.write(`${prefix}${chalk.bold.keyword('orange')('Deprecation warnings:')}\n\n`);
+    legacy.write(`${prefix}${chalk.bold.keyword('orange')('Deprecation warnings:')}\n\n`);
     for (const { code, message } of bufferedDeprecations) {
       const messageLines = chalk.bold(message).split('\n');
       if (!code.startsWith('EXT_')) {
@@ -130,7 +143,7 @@ module.exports.printSummary = () => {
         );
       }
 
-      process.stdout.write(chalk.keyword('orange')(`${messageLines.join('\n')}\n\n`));
+      legacy.write(chalk.keyword('orange')(`${messageLines.join('\n')}\n\n`));
     }
   } finally {
     bufferedDeprecations.length = 0;
diff --git a/package.json b/package.json
index 85877b5cb48..48e2d9e2a2e 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@serverless/components": "^3.17.0",
     "@serverless/dashboard-plugin": "^5.4.4",
     "@serverless/platform-client": "^4.3.0",
-    "@serverless/utils": "^5.12.0",
+    "@serverless/utils": "^5.13.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",

From 28d230f946df6cbcc8173822494b50cd056ef63c Mon Sep 17 00:00:00 2001
From: Adrien Cacciaguerra <adrien.caccia@gmail.com>
Date: Thu, 16 Sep 2021 08:51:03 +0200
Subject: [PATCH 0466/1101] feat(Templates): Improve source maps handling in
 `aws-nodejs-typescript`

(PR #9961)
---
 .../create/templates/aws-nodejs-typescript/package.json        | 3 +--
 .../create/templates/aws-nodejs-typescript/serverless.ts       | 1 +
 .../aws-nodejs-typescript/src/functions/hello/handler.ts       | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/package.json b/lib/plugins/create/templates/aws-nodejs-typescript/package.json
index 04a59b673ef..ae346d2d487 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/package.json
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/package.json
@@ -11,8 +11,7 @@
   },
   "dependencies": {
     "@middy/core": "^1.5.2",
-    "@middy/http-json-body-parser": "^1.5.2",
-    "source-map-support": "^0.5.19"
+    "@middy/http-json-body-parser": "^1.5.2"
   },
   "devDependencies": {
     "@serverless/typescript": "^2.23.0",
diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts
index 74a2a88a337..2b7ac634492 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts
@@ -21,6 +21,7 @@ const serverlessConfiguration: AWS = {
     },
     environment: {
       AWS_NODEJS_CONNECTION_REUSE_ENABLED: '1',
+      NODE_OPTIONS: '--enable-source-maps --stack-trace-limit=1000',
     },
     lambdaHashingVersion: '20201221',
   },
diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/handler.ts b/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/handler.ts
index 3b2c81cda68..2879ed490a1 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/handler.ts
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/handler.ts
@@ -1,5 +1,3 @@
-import 'source-map-support/register';
-
 import type { ValidatedEventAPIGatewayProxyEvent } from '@libs/apiGateway';
 import { formatJSONResponse } from '@libs/apiGateway';
 import { middyfy } from '@libs/lambda';

From aaabb50f1beb12683506ca7ab9e93ded75294694 Mon Sep 17 00:00:00 2001
From: Adrien Cacciaguerra <adrien.caccia@gmail.com>
Date: Thu, 16 Sep 2021 09:36:07 +0200
Subject: [PATCH 0467/1101] feat(Templates): Switch to esbuild in
 `aws-nodejs-typescript` (#9962)

---
 .../aws-nodejs-typescript/package.json        |  8 +--
 .../aws-nodejs-typescript/serverless.ts       | 13 +++--
 .../aws-nodejs-typescript/webpack.config.js   | 57 -------------------
 test/unit/lib/plugins/create/create.test.js   |  1 -
 4 files changed, 11 insertions(+), 68 deletions(-)
 delete mode 100644 lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js

diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/package.json b/lib/plugins/create/templates/aws-nodejs-typescript/package.json
index ae346d2d487..6b74b626c98 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/package.json
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/package.json
@@ -19,14 +19,10 @@
     "@types/node": "^14.14.25",
     "json-schema-to-ts": "^1.5.0",
     "serverless": "^2.23.0",
-    "serverless-webpack": "^5.3.5",
-    "ts-loader": "^8.0.15",
+    "serverless-esbuild": "^1.17.1",
     "ts-node": "^9.1.1",
     "tsconfig-paths": "^3.9.0",
-    "tsconfig-paths-webpack-plugin": "^3.3.0",
-    "typescript": "^4.1.3",
-    "webpack": "^5.20.2",
-    "webpack-node-externals": "^2.5.2"
+    "typescript": "^4.1.3"
   },
   "author": "The serverless webpack authors (https://github.com/elastic-coders/serverless-webpack)",
   "license": "MIT"
diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts
index 2b7ac634492..2d35545646e 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts
@@ -6,12 +6,17 @@ const serverlessConfiguration: AWS = {
   service: 'aws-nodejs-typescript',
   frameworkVersion: '2',
   custom: {
-    webpack: {
-      webpackConfig: './webpack.config.js',
-      includeModules: true,
+    esbuild: {
+      bundle: true,
+      minify: false,
+      sourcemap: true,
+      exclude: ['aws-sdk'],
+      target: 'node14',
+      define: { 'require.resolve': undefined },
+      platform: 'node',
     },
   },
-  plugins: ['serverless-webpack'],
+  plugins: ['serverless-esbuild'],
   provider: {
     name: 'aws',
     runtime: 'nodejs14.x',
diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js b/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js
deleted file mode 100644
index 0c9129252a2..00000000000
--- a/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js
+++ /dev/null
@@ -1,57 +0,0 @@
-const path = require('path');
-const slsw = require('serverless-webpack');
-const nodeExternals = require('webpack-node-externals');
-const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
-
-/*
-This line is only required if you are specifying `TS_NODE_PROJECT` for whatever reason.
- */
-// delete process.env.TS_NODE_PROJECT;
-
-module.exports = {
-  context: __dirname,
-  mode: slsw.lib.webpack.isLocal ? 'development' : 'production',
-  entry: slsw.lib.entries,
-  devtool: slsw.lib.webpack.isLocal ? 'eval-cheap-module-source-map' : 'source-map',
-  resolve: {
-    extensions: ['.mjs', '.json', '.ts'],
-    symlinks: false,
-    cacheWithContext: false,
-    plugins: [
-      new TsconfigPathsPlugin({
-        configFile: './tsconfig.paths.json',
-      }),
-    ],
-  },
-  output: {
-    libraryTarget: 'commonjs',
-    path: path.join(__dirname, '.webpack'),
-    filename: '[name].js',
-  },
-  optimization: {
-    concatenateModules: false,
-  },
-  target: 'node',
-  externals: [nodeExternals()],
-  module: {
-    rules: [
-      // all files with a `.ts` or `.tsx` extension will be handled by `ts-loader`
-      {
-        test: /\.(tsx?)$/,
-        loader: 'ts-loader',
-        exclude: [
-          [
-            path.resolve(__dirname, 'node_modules'),
-            path.resolve(__dirname, '.serverless'),
-            path.resolve(__dirname, '.webpack'),
-          ],
-        ],
-        options: {
-          transpileOnly: true,
-          experimentalWatchApi: true,
-        },
-      },
-    ],
-  },
-  plugins: [],
-};
diff --git a/test/unit/lib/plugins/create/create.test.js b/test/unit/lib/plugins/create/create.test.js
index 8f78865bb03..9a7c53388a5 100644
--- a/test/unit/lib/plugins/create/create.test.js
+++ b/test/unit/lib/plugins/create/create.test.js
@@ -223,7 +223,6 @@ describe('Create', () => {
         expect(dirContent).to.include(path.join('src', 'libs', 'lambda.ts'));
         expect(dirContent).to.include('tsconfig.json');
         expect(dirContent).to.include('tsconfig.paths.json');
-        expect(dirContent).to.include('webpack.config.js');
       });
     });
 

From 46c58bfdd2f753265d683b234e15913b61c0e646 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 16 Sep 2021 11:50:51 +0200
Subject: [PATCH 0468/1101] refactor: Improve var naming

---
 lib/classes/PluginManager.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 49cbd436cf1..7819a5f8e5c 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -646,16 +646,18 @@ class PluginManager {
 
     try {
       await this.invoke(commandsArray);
-    } catch (error) {
+    } catch (commandException) {
       try {
-        for (const { hook } of this.getHooks(['error'])) await hook(error);
-      } catch (subError) {
-        const subErrorMeta = tokenizeException(subError);
+        for (const { hook } of this.getHooks(['error'])) await hook(commandException);
+      } catch (errorHookException) {
+        const errorHookExceptionMeta = tokenizeException(errorHookException);
         this.serverless.cli.log(
-          `Warning: "error" hook crashed with: ${subErrorMeta.stack || subErrorMeta.message}`
+          `Warning: "error" hook crashed with: ${
+            errorHookExceptionMeta.stack || errorHookExceptionMeta.message
+          }`
         );
       } finally {
-        throw error; // eslint-disable-line no-unsafe-finally
+        throw commandException; // eslint-disable-line no-unsafe-finally
       }
     } finally {
       if (deferredBackendNotificationRequest) {

From dce0ff1a892959b12414f1bff3915fe50b900ba2 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 16 Sep 2021 11:54:28 +0200
Subject: [PATCH 0469/1101] fix(Telemetry): Ensure to not show backed
 notification on error

---
 lib/classes/PluginManager.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 7819a5f8e5c..574aaa61d7d 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -657,12 +657,13 @@ class PluginManager {
           }`
         );
       } finally {
+        await deferredBackendNotificationRequest;
         throw commandException; // eslint-disable-line no-unsafe-finally
       }
-    } finally {
-      if (deferredBackendNotificationRequest) {
-        await processBackendNotificationRequest(await deferredBackendNotificationRequest);
-      }
+    }
+
+    if (deferredBackendNotificationRequest) {
+      await processBackendNotificationRequest(await deferredBackendNotificationRequest);
     }
   }
 

From 7663b198792b082ce8a4367b09115fff894f8d5e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 16 Sep 2021 11:55:50 +0200
Subject: [PATCH 0470/1101] style: Simplify

---
 lib/classes/PluginManager.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 574aaa61d7d..a0c8a93f951 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -619,9 +619,7 @@ class PluginManager {
     this.commandRunStartTime = Date.now();
     if (resolveCliInput().commands[0] !== 'plugin') {
       // first initialize hooks
-      for (const { hook } of this.getHooks(['initialize'])) {
-        await hook();
-      }
+      for (const { hook } of this.getHooks(['initialize'])) await hook();
     }
 
     let deferredBackendNotificationRequest;

From cb4f08ad7dd8eed3da69d61d51c6d5379a486bd0 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 16 Sep 2021 11:57:59 +0200
Subject: [PATCH 0471/1101] feat: Support `finalize` hook, triggered on command
 finalization

---
 lib/classes/PluginManager.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index a0c8a93f951..8c296726c46 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -660,6 +660,13 @@ class PluginManager {
       }
     }
 
+    try {
+      for (const { hook } of this.getHooks(['finalize'])) await hook();
+    } catch (finalizeHookException) {
+      await deferredBackendNotificationRequest;
+      throw finalizeHookException;
+    }
+
     if (deferredBackendNotificationRequest) {
       await processBackendNotificationRequest(await deferredBackendNotificationRequest);
     }

From fa2507dad06b037aa5a24b3392432cefc810a972 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 15 Sep 2021 12:30:21 +0200
Subject: [PATCH 0472/1101] feat(CLI): Modern logs for `package` command

---
 lib/plugins/aws/package/index.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
index d06bf400efb..033a7a45a3f 100644
--- a/lib/plugins/aws/package/index.js
+++ b/lib/plugins/aws/package/index.js
@@ -9,6 +9,7 @@ const saveServiceState = require('./lib/saveServiceState');
 const saveCompiledTemplate = require('./lib/saveCompiledTemplate');
 const mergeIamTemplates = require('./lib/mergeIamTemplates');
 const addExportNameForOutputs = require('./lib/addExportNameForOutputs');
+const { log, style } = require('@serverless/utils/log');
 
 class AwsPackage {
   constructor(serverless, options) {
@@ -55,6 +56,17 @@ class AwsPackage {
     };
 
     this.hooks = {
+      'initialize': () => {
+        if (this.serverless.processedInput.commands.join(' ') === 'package') {
+          log.notice();
+          log.notice(
+            `Packaging ${this.serverless.service.service} for stage ${this.serverless
+              .getProvider('aws')
+              .getStage()} ${style.aside(`(${this.serverless.getProvider('aws').getRegion()})`)}`
+          );
+        }
+      },
+
       /**
        * Outer lifecycle hooks
        */
@@ -102,6 +114,17 @@ class AwsPackage {
         await this.saveServiceState();
         return this.serverless.pluginManager.spawn('aws:common:moveArtifactsToPackage');
       },
+
+      'finalize': () => {
+        log.notice();
+        log.notice(
+          `${style.noticeSymbol('✔')} Service packaged ${style.aside(
+            `(${Math.floor(
+              (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+            )}s)`
+          )}`
+        );
+      },
     };
   }
 }

From 5950fc5781dfa591549287d15efc9e61a8568adb Mon Sep 17 00:00:00 2001
From: Stafford Williams <staff0rd@users.noreply.github.com>
Date: Thu, 16 Sep 2021 23:37:07 +1000
Subject: [PATCH 0473/1101] docs: Improve grammar in serverless invoke docs
 (#9966)

---
 docs/providers/aliyun/cli-reference/invoke.md    | 2 +-
 docs/providers/aws/cli-reference/invoke.md       | 2 +-
 docs/providers/fn/cli-reference/invoke.md        | 2 +-
 docs/providers/google/cli-reference/invoke.md    | 2 +-
 docs/providers/kubeless/cli-reference/invoke.md  | 2 +-
 docs/providers/openwhisk/cli-reference/invoke.md | 2 +-
 docs/providers/spotinst/cli-reference/invoke.md  | 2 +-
 docs/providers/tencent/cli-reference/invoke.md   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/providers/aliyun/cli-reference/invoke.md b/docs/providers/aliyun/cli-reference/invoke.md
index 74a1e517c89..6a0086b6725 100644
--- a/docs/providers/aliyun/cli-reference/invoke.md
+++ b/docs/providers/aliyun/cli-reference/invoke.md
@@ -14,7 +14,7 @@ layout: Doc
 
 # Alibaba Cloud - Invoke
 
-Invokes deployed function. It allows to send event data to the function, read logs and display other important information of the function invocation.
+Invokes a deployed function. You can send event data, read logs and display other important information of the function invocation.
 
 ```bash
 serverless invoke --function functionName
diff --git a/docs/providers/aws/cli-reference/invoke.md b/docs/providers/aws/cli-reference/invoke.md
index d04ee3962cf..85bad82a2fc 100644
--- a/docs/providers/aws/cli-reference/invoke.md
+++ b/docs/providers/aws/cli-reference/invoke.md
@@ -14,7 +14,7 @@ layout: Doc
 
 # AWS - Invoke
 
-Invokes deployed function. It allows to send event data to the function, read logs and display other important information of the function invocation.
+Invokes a deployed function. You can send event data, read logs and display other important information of the function invocation.
 
 ```bash
 serverless invoke [local] --function functionName
diff --git a/docs/providers/fn/cli-reference/invoke.md b/docs/providers/fn/cli-reference/invoke.md
index 89fdf3d6100..086bcaf4d20 100644
--- a/docs/providers/fn/cli-reference/invoke.md
+++ b/docs/providers/fn/cli-reference/invoke.md
@@ -14,7 +14,7 @@ layout: Doc
 
 # Fn - Invoke
 
-Invokes deployed function. It allows to send event data to the function, read logs and display other important information of the function invocation.
+Invokes a deployed function. You can send event data, read logs and display other important information of the function invocation.
 
 ```bash
 serverless invoke --function functionName
diff --git a/docs/providers/google/cli-reference/invoke.md b/docs/providers/google/cli-reference/invoke.md
index ec17e40fcd4..706f46d188e 100644
--- a/docs/providers/google/cli-reference/invoke.md
+++ b/docs/providers/google/cli-reference/invoke.md
@@ -14,7 +14,7 @@ layout: Doc
 
 # Google - Invoke
 
-Invokes deployed function. It allows to send event data to the function, read logs and display other important information of the function invocation.
+Invokes a deployed function. You can send event data, read logs and display other important information of the function invocation.
 
 ```bash
 serverless invoke --function functionName
diff --git a/docs/providers/kubeless/cli-reference/invoke.md b/docs/providers/kubeless/cli-reference/invoke.md
index 792cf6e00ba..34892401707 100644
--- a/docs/providers/kubeless/cli-reference/invoke.md
+++ b/docs/providers/kubeless/cli-reference/invoke.md
@@ -14,7 +14,7 @@ layout: Doc
 
 # Kubeless - Invoke
 
-Invokes deployed function. It allows to send event data to the function, read logs and display other important information of the function invocation.
+Invokes a deployed function. You can send event data, read logs and display other important information of the function invocation.
 
 ```bash
 serverless invoke --function functionName
diff --git a/docs/providers/openwhisk/cli-reference/invoke.md b/docs/providers/openwhisk/cli-reference/invoke.md
index 8435db20ac3..a85837cf638 100644
--- a/docs/providers/openwhisk/cli-reference/invoke.md
+++ b/docs/providers/openwhisk/cli-reference/invoke.md
@@ -14,7 +14,7 @@ layout: Doc
 
 # OpenWhisk - Invoke
 
-Invokes deployed function. It allows to send event data to the function, read logs and display other important information of the function invocation.
+Invokes a deployed function. You can send event data, read logs and display other important information of the function invocation.
 
 ```bash
 serverless invoke [local] --function functionName
diff --git a/docs/providers/spotinst/cli-reference/invoke.md b/docs/providers/spotinst/cli-reference/invoke.md
index 67cbaf2462c..72fae2abb22 100755
--- a/docs/providers/spotinst/cli-reference/invoke.md
+++ b/docs/providers/spotinst/cli-reference/invoke.md
@@ -14,7 +14,7 @@ layout: Doc
 
 # Spotinst Functions - Invoke
 
-Invokes deployed function. It allows to send event data to the function, read logs and display other important information of the function invocation.
+Invokes a deployed function. You can send event data, read logs and display other important information of the function invocation.
 
 ```bash
 serverless invoke -f functionName
diff --git a/docs/providers/tencent/cli-reference/invoke.md b/docs/providers/tencent/cli-reference/invoke.md
index c1105b34128..75855d89678 100644
--- a/docs/providers/tencent/cli-reference/invoke.md
+++ b/docs/providers/tencent/cli-reference/invoke.md
@@ -14,7 +14,7 @@ layout: Doc
 
 # Tencent-SCF - Invoke
 
-Invokes deployed function. It allows to send event data to the function, read logs and display other important information of the function invocation.
+Invokes a deployed function. You can send event data, read logs and display other important information of the function invocation.
 
 ```bash
 serverless invoke --function functionName

From e057bfd75780dcd7658f5f7c76da1688e5b42698 Mon Sep 17 00:00:00 2001
From: Maciej Skierkowski <maciej@skierkowski.com>
Date: Thu, 16 Sep 2021 15:15:52 -0700
Subject: [PATCH 0474/1101] docs: Remove Pro and Enterprise references

---
 docs/getting-started.md                 |  6 +++---
 docs/guides/cicd/best-practices.md      |  2 +-
 docs/guides/cicd/custom-scripts.md      |  2 +-
 docs/guides/cicd/faq.md                 |  4 ----
 docs/guides/cicd/notifications.md       |  2 +-
 docs/guides/cicd/preview-deployments.md |  2 +-
 docs/guides/monitoring/README.md        | 18 +++++++++---------
 docs/guides/safeguards.md               |  4 +---
 8 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/docs/getting-started.md b/docs/getting-started.md
index d18344f3f28..dfb6485096b 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -89,11 +89,11 @@ choco upgrade serverless
 npm update -g serverless
 ```
 
-## Set up your free Pro account
+## Set up your free Dashboard account
 
-Learn more about [Serverless Framework Pro](https://serverless.com/pro/) and [sign up for free](https://app.serverless.com).
+Learn more about the [Serverless Framework Dashboard](https://serverless.com/framework/) and [sign up for free](https://app.serverless.com).
 
-Once you’ve signed up for Pro, login to your Pro dashboard from the CLI:
+Once you’ve signed up, login to your dashboard from the CLI:
 
 ```bash
 serverless login
diff --git a/docs/guides/cicd/best-practices.md b/docs/guides/cicd/best-practices.md
index ced610f3ed7..440ded90ca9 100644
--- a/docs/guides/cicd/best-practices.md
+++ b/docs/guides/cicd/best-practices.md
@@ -13,7 +13,7 @@ layout: Doc
 
 # Serverless CI/CD Best Practices
 
-Serverless Framework Pro provides a lot of capabilities out of the box to help you manage and deploy
+Serverless Framework provides a lot of capabilities out of the box to help you manage and deploy
 your services. As your teams grow and the number of services grow, it can be difficult to know
 the best way to organize your services for scale.
 
diff --git a/docs/guides/cicd/custom-scripts.md b/docs/guides/cicd/custom-scripts.md
index 9a4f6b52e0a..d0ceaf7e577 100644
--- a/docs/guides/cicd/custom-scripts.md
+++ b/docs/guides/cicd/custom-scripts.md
@@ -13,7 +13,7 @@ layout: Doc
 
 # Custom scripts
 
-Serverless Framework Pro runs three primary operations on your repository when you have CI/CD configured: (1) install NPM packages via `npm install`, (2) run tests, if present, with `npm test`, and (3) deploy your service using `sls deploy`. You can run custom scripts before or after each of these steps if you need to customize the pipeline further.
+Serverless Framework runs three primary operations on your repository when you have CI/CD configured: (1) install NPM packages via `npm install`, (2) run tests, if present, with `npm test`, and (3) deploy your service using `sls deploy`. You can run custom scripts before or after each of these steps if you need to customize the pipeline further.
 
 To run custom scripts before & after NPM install and running tests, use the lifecycle hooks built into `scripts` of your `package.json` file. The `preinstall`, `postinstall`, `pretest`, and `posttest`, scripts are run automatically at each of these steps.
 
diff --git a/docs/guides/cicd/faq.md b/docs/guides/cicd/faq.md
index f9903827997..e49ac4a448c 100644
--- a/docs/guides/cicd/faq.md
+++ b/docs/guides/cicd/faq.md
@@ -45,10 +45,6 @@ Yes! Serverless CI/CD is designed around the Serverless Framework to provide a s
 Anything you can deploy with the Serverless Framework you can deploy with Serverless CI/CD. The Serverless Framework is
 extensible with Plugins , so it works with a broad range of services.
 
-## Is Serverless CI/CD also available for Serverless Framework Pro Enterprise tier?
-
-Yes, Serverless CI/CD works with the Serverless Framework Pro Enterprise tier and it is available for self-hosting.
-
 ## Are all runtimes supported?
 
 Only the most popular runtimes, Node and Python, are currently supported. These two runtimes account for about 90% of
diff --git a/docs/guides/cicd/notifications.md b/docs/guides/cicd/notifications.md
index 7e6e1c75174..4c36a72569b 100644
--- a/docs/guides/cicd/notifications.md
+++ b/docs/guides/cicd/notifications.md
@@ -13,7 +13,7 @@ layout: Doc
 
 # Notifications
 
-Serverless Framework Pro has integrated Slack, email, SNS and webhook notifications for CI/CD status updates.
+Serverless Framework has integrated Slack, email, SNS and webhook notifications for CI/CD status updates.
 
 Notifications for CI/CD events are not setup by default, so you will not get notified of deployments starting,
 completing of failing. These notifications must be added manually.
diff --git a/docs/guides/cicd/preview-deployments.md b/docs/guides/cicd/preview-deployments.md
index aa7898a2278..e63f37e8885 100644
--- a/docs/guides/cicd/preview-deployments.md
+++ b/docs/guides/cicd/preview-deployments.md
@@ -37,7 +37,7 @@ Branch names may also include characters such as `/` which are invalid character
 
 ## Automatically deleting preview deployments (recommended)
 
-The recommended method for deleting preview service instances is to select "Destroy stage and resources when branch is deleted". If the changes in the PR are accepted then they will be merged and then the branch is deleted. If the changes are rejected the branch is also deleted. Whenever the branch is deleted, Serverless Framework Pro will automatically run `sls remove` on this service instance.
+The recommended method for deleting preview service instances is to select "Destroy stage and resources when branch is deleted". If the changes in the PR are accepted then they will be merged and then the branch is deleted. If the changes are rejected the branch is also deleted. Whenever the branch is deleted, Serverless Framework will automatically run `sls remove` on this service instance.
 
 ## Manually deleting preview deployments
 
diff --git a/docs/guides/monitoring/README.md b/docs/guides/monitoring/README.md
index 031f150a553..5d2bce393cb 100644
--- a/docs/guides/monitoring/README.md
+++ b/docs/guides/monitoring/README.md
@@ -21,7 +21,7 @@ Monitoring is enabled by default when you deploy a Service using the Serverless
 
 ### Configuration
 
-Serverless Framework, when configured to connect to the Serverless Framework Pro Dashboard, will automatically collect three pieces of diagnostics:
+Serverless Framework, when configured to connect to the dashboard, will automatically collect three pieces of diagnostics:
 
 - Lambda Log Collection
 - AWS Spans
@@ -29,7 +29,7 @@ Serverless Framework, when configured to connect to the Serverless Framework Pro
 
 **Lambda Log Collection**
 
-Serverless Framework Pro will enable log collection by adding a CloudWatch Logs Subscription to send logs that match a particular pattern to our infrastructure for processing. This is used for generating metrics and alerts.
+Serverless Framework will enable log collection by adding a CloudWatch Logs Subscription to send logs that match a particular pattern to our infrastructure for processing. This is used for generating metrics and alerts.grep
 
 When deploying, Serverless Framework will also create an IAM role in your account that allows the Serverless Framework backend to call FilterLogEvents on the CloudWatch Log Groups that are created in the Service being deployed. This is used to display the CloudWatch logs error details views alongside the stack trace.
 
@@ -49,7 +49,7 @@ custom:
 
 **AWS Spans**
 
-Serverless Framework Pro will instrument the use of the AWS SDK to show use of AWS services by your Lambda function. This information provides
+Serverless Framework will instrument the use of the AWS SDK to show use of AWS services by your Lambda function. This information provides
 a valuable visualization of what is happening inside your lambda function, including how long calls to services like DynamoDB, S3 and others are taking.
 
 If you wish to disable AWS Span collection, set fhe following option:
@@ -64,7 +64,7 @@ custom:
 
 **HTTP(s) Spans**
 
-Serverless Framework Pro will instrument the use of HTTP(s) by your Lambda function. Much like the AWS Spans, HTTP(s) spans will provide a
+Serverless Framework will instrument the use of HTTP(s) by your Lambda function. Much like the AWS Spans, HTTP(s) spans will provide a
 visualization of the external communication that your function is invoking, including the duration of those sessions.
 
 If you wish to disable Http Span collection, set fhe following option:
@@ -172,11 +172,11 @@ module.exports.handler = async (event, context) => {
 
 ## Pull-based log ingestion
 
-The default monitoring path for the Serverless Framework Pro involves setting up a Subscription Filter on your CloudWatch Log Group to send selected logs to the Serverless Framework Pro ingestion system.
+The default monitoring path for the Serverless Framework involves setting up a Subscription Filter on your CloudWatch Log Group to send selected logs to the Serverless Framework ingestion system.
 
-AWS currently has a hard limit of one Subscription Filter per Log Group. If you try to deploy with the Serverless Framework Pro plugin, you'll get an error saying the resource limit was exceeded.
+AWS currently has a hard limit of one Subscription Filter per Log Group. If you try to deploy with the Serverless Framework plugin, you'll get an error saying the resource limit was exceeded.
 
-If you want to keep your existing Subscription while still adding Serverless Framework Pro support, you can enable pull-based log ingestion using the following syntax in your `serverless.yml`:
+If you want to keep your existing Subscription while still adding Serverless Framework support, you can enable pull-based log ingestion using the following syntax in your `serverless.yml`:
 
 ```yaml
 custom:
@@ -184,6 +184,6 @@ custom:
     logIngestMode: pull
 ```
 
-With pull-based ingestion, the Serverless Framework Pro infrastructure will periodically request logs from your CloudWatch Log Group and send them into our system.
+With pull-based ingestion, the Serverless Framework infrastructure will periodically request logs from your CloudWatch Log Group and send them into our system.
 
-Please note that using the pull-based log ingestion method will result in delays in ingesting your logs. This delay is usually between 30 and 120 seconds. As such, we recommend only using the pull-based log ingestion method in a development environment or when testing the features of Serverless Framework Pro.
+Please note that using the pull-based log ingestion method will result in delays in ingesting your logs. This delay is usually between 30 and 120 seconds. As such, we recommend only using the pull-based log ingestion method in a development environment or when testing the features of Serverless Framework.
diff --git a/docs/guides/safeguards.md b/docs/guides/safeguards.md
index d0a733e657a..e3e7c77103f 100644
--- a/docs/guides/safeguards.md
+++ b/docs/guides/safeguards.md
@@ -15,8 +15,6 @@ layout: Doc
 
 **Safeguards** is a policy-as-code framework for Serverless Framework which enables you to inspect your serverless.yml file, and the generated Cloud Formation templates, for compliance with security, operational, and organizational, best practices.
 
-Safeguards was a feature of the Serverless Framework Pro dashboard and available under the legacy team tier. On August 1st, 2020, it was open sourced and made available free-of-charge as a stand-alone Serverless Framework Plugin free of charge.
+Safeguards was a feature of the Serverless Framework dashboard and available under the legacy team tier. On August 1st, 2020, it was open sourced and made available free-of-charge as a stand-alone Serverless Framework Plugin free of charge.
 
 You can find the new plugin at [serverless/safeguards-plugin](https://github.com/serverless/safeguards-plugin/).
-
-You can easily migrate your safeguard policies from the SF Pro dashboard to the `@serverless/safegurds-plugin` by following the [Migration from Serverless Framework Pro guide](https://github.com/serverless/safeguards-plugin/#migrating-from-serverless-framework-pro).

From 9fcb28350e529c220fcbd3cdd602998e1b3adefc Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 16 Sep 2021 12:23:27 +0200
Subject: [PATCH 0475/1101] fix(CLI): Display final packaging log only with
 `package` command

---
 lib/plugins/aws/package/index.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
index 033a7a45a3f..8327f9bb0b3 100644
--- a/lib/plugins/aws/package/index.js
+++ b/lib/plugins/aws/package/index.js
@@ -116,14 +116,16 @@ class AwsPackage {
       },
 
       'finalize': () => {
-        log.notice();
-        log.notice(
-          `${style.noticeSymbol('✔')} Service packaged ${style.aside(
-            `(${Math.floor(
-              (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
-            )}s)`
-          )}`
-        );
+        if (this.serverless.processedInput.commands.join(' ') === 'package') {
+          log.notice();
+          log.notice(
+            `${style.noticeSymbol('✔')} Service packaged ${style.aside(
+              `(${Math.floor(
+                (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+              )}s)`
+            )}`
+          );
+        }
       },
     };
   }

From 7eeaa10f3af510b3d5a95a8db4f0478609181e78 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 16 Sep 2021 12:24:20 +0200
Subject: [PATCH 0476/1101] refactor: Simplify condition

---
 lib/plugins/aws/deploy/index.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index e3dec2c5fb4..cddfb5127d3 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -68,9 +68,7 @@ class AwsDeploy {
 
     this.hooks = {
       'initialize': () => {
-        const isDeployCommand =
-          this.serverless.processedInput.commands.length === 1 &&
-          this.serverless.processedInput.commands[0] === 'deploy';
+        const isDeployCommand = this.serverless.processedInput.commands.join(' ') === 'deploy';
         if (isDeployCommand && !this.options.function) {
           log.notice(
             `\nDeploying ${this.serverless.service.service} to stage ${this.serverless

From 084a9955f440ee18847df8a3087aba38405883b7 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 16 Sep 2021 12:32:24 +0200
Subject: [PATCH 0477/1101] fix(CLI): Fix log messages timing

---
 lib/plugins/aws/deploy/index.js               | 44 ++++++++++++++-----
 lib/plugins/aws/deploy/lib/checkForChanges.js |  9 +---
 lib/plugins/aws/info/display.js               | 14 +-----
 lib/plugins/aws/info/index.js                 |  3 --
 4 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index cddfb5127d3..da0e95da2fe 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -11,7 +11,7 @@ const validateTemplate = require('./lib/validateTemplate');
 const updateStack = require('../lib/updateStack');
 const existsDeploymentBucket = require('./lib/existsDeploymentBucket');
 const path = require('path');
-const { style, log, progress } = require('@serverless/utils/log');
+const { style, log, progress, writeText } = require('@serverless/utils/log');
 const memoize = require('memoizee');
 
 class AwsDeploy {
@@ -119,15 +119,6 @@ class AwsDeploy {
       'aws:deploy:deploy:updateStack': async () => {
         if (this.serverless.service.provider.shouldNotDeploy) return;
         await this.updateStack();
-        log.notice(
-          `\n${style.noticeSymbol('✔')} Service deployed to stack ${this.serverless
-            .getProvider('aws')
-            .naming.getStackName()} ${style.aside(
-            `(${Math.floor(
-              (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
-            )}s)`
-          )}\n`
-        );
       },
 
       // Deploy finalize inner lifecycle
@@ -158,6 +149,39 @@ class AwsDeploy {
           );
         }
       },
+
+      'finalize': () => {
+        if (this.serverless.processedInput.commands.join(' ') !== 'deploy') return;
+        if (this.options.function) return;
+        if (this.serverless.service.provider.shouldNotDeploy) {
+          log.notice(
+            `\n${style.noticeSymbol('∅')} No changes to deploy. Deployment skipped. ${style.aside(
+              `(${Math.floor(
+                (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+              )}s)`
+            )}`
+          );
+          return;
+        }
+        log.notice(
+          `\n${style.noticeSymbol('✔')} Service deployed to stack ${this.serverless
+            .getProvider('aws')
+            .naming.getStackName()} ${style.aside(
+            `(${Math.floor(
+              (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+            )}s)`
+          )}\n`
+        );
+        if (this.serverless.serviceOutputs) {
+          for (const [section, entries] of this.serverless.serviceOutputs) {
+            if (typeof entries === 'string') {
+              writeText(`${style.aside(`${section}:`)} ${entries}`);
+            } else {
+              writeText(`${style.aside(`${section}:\n`)}  ${entries.join('\n  ')}`);
+            }
+          }
+        }
+      },
     };
   }
 }
diff --git a/lib/plugins/aws/deploy/lib/checkForChanges.js b/lib/plugins/aws/deploy/lib/checkForChanges.js
index a1df2e7b6fb..ff61ac3ff29 100644
--- a/lib/plugins/aws/deploy/lib/checkForChanges.js
+++ b/lib/plugins/aws/deploy/lib/checkForChanges.js
@@ -8,7 +8,7 @@ const BbPromise = require('bluebird');
 const _ = require('lodash');
 const normalizeFiles = require('../../lib/normalizeFiles');
 const ServerlessError = require('../../../../serverless-error');
-const { style, legacy, log } = require('@serverless/utils/log');
+const { legacy } = require('@serverless/utils/log');
 
 module.exports = {
   async checkForChanges() {
@@ -188,13 +188,6 @@ module.exports = {
 
           const message = ['Service files not changed. Skipping deployment...'].join('');
           legacy.log(message, 'Serverless', { color: 'orange' });
-          log.notice(
-            `\n${style.noticeSymbol('∅')} No changes to deploy. Deployment skipped. ${style.aside(
-              `(${Math.floor(
-                (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
-              )}s)`
-            )}`
-          );
         }
       });
     }
diff --git a/lib/plugins/aws/info/display.js b/lib/plugins/aws/info/display.js
index 57e956a2726..dc370b44be9 100644
--- a/lib/plugins/aws/info/display.js
+++ b/lib/plugins/aws/info/display.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const chalk = require('chalk');
-const { style, legacy, writeText, isVerboseMode } = require('@serverless/utils/log');
+const { legacy, isVerboseMode } = require('@serverless/utils/log');
 
 module.exports = {
   displayServiceInfo() {
@@ -183,16 +183,4 @@ module.exports = {
 
     return message;
   },
-
-  displayServiceOutputs() {
-    if (this.serverless.serviceOutputs && !this.serverless.service.provider.shouldNotDeploy) {
-      for (const [section, entries] of this.serverless.serviceOutputs) {
-        if (typeof entries === 'string') {
-          writeText(`${style.aside(`${section}:`)} ${entries}`);
-        } else {
-          writeText(`${style.aside(`${section}:\n`)}  ${entries.join('\n  ')}`);
-        }
-      }
-    }
-  },
 };
diff --git a/lib/plugins/aws/info/index.js b/lib/plugins/aws/info/index.js
index eb06abbeda3..6cf512f4c06 100644
--- a/lib/plugins/aws/info/index.js
+++ b/lib/plugins/aws/info/index.js
@@ -28,7 +28,6 @@ class AwsInfo {
               'displayFunctions',
               'displayLayers',
               'displayStackOutputs',
-              'displayServiceOutputs',
             ],
           },
         },
@@ -63,8 +62,6 @@ class AwsInfo {
 
       'aws:info:displayStackOutputs': async () =>
         BbPromise.bind(this).then(this.displayStackOutputs),
-
-      'aws:info:displayServiceOutputs': async () => await this.displayServiceOutputs(),
     };
   }
 }

From bcd8a022a1e2e50a5d2708c374f4d5bcc30c80b5 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 16 Sep 2021 12:50:53 +0200
Subject: [PATCH 0478/1101] fix(CLI): Fix resources status log in verbose mode

---
 lib/plugins/aws/lib/monitorStack.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js
index 8a3224a3dee..1a479862aad 100644
--- a/lib/plugins/aws/lib/monitorStack.js
+++ b/lib/plugins/aws/lib/monitorStack.js
@@ -3,6 +3,7 @@
 const BbPromise = require('bluebird');
 const chalk = require('chalk');
 const wait = require('timers-ext/promise/sleep');
+const identity = require('ext/function/identity');
 const ServerlessError = require('../../../serverless-error');
 const { log, legacy, progress, style } = require('@serverless/utils/log');
 
@@ -59,7 +60,7 @@ module.exports = {
               // Loop through stack events
               stackEvents.forEach((event) => {
                 if (loggedEventIds.has(event.EventId)) return;
-                let eventStatus = event.ResourceStatus || null;
+                const eventStatus = event.ResourceStatus || null;
                 // Keep track of stack status
                 if (
                   event.ResourceType === 'AWS::CloudFormation::Stack' &&
@@ -83,14 +84,13 @@ module.exports = {
                   )
                 );
                 if (this.options.verbose) {
-                  if (eventStatus && eventStatus.endsWith('FAILED')) {
-                    eventStatus = chalk.red(eventStatus);
-                  } else if (eventStatus && eventStatus.endsWith('PROGRESS')) {
-                    eventStatus = chalk.yellow(eventStatus);
-                  } else if (eventStatus && eventStatus.endsWith('COMPLETE')) {
-                    eventStatus = chalk.green(eventStatus);
-                  }
-                  let eventLog = `CloudFormation - ${eventStatus} - `;
+                  const decorator = (() => {
+                    if (eventStatus && eventStatus.endsWith('FAILED')) return chalk.red;
+                    if (eventStatus && eventStatus.endsWith('PROGRESS')) return chalk.yellow;
+                    if (eventStatus && eventStatus.endsWith('COMPLETE')) return chalk.green;
+                    return identity;
+                  })();
+                  let eventLog = `CloudFormation - ${decorator(eventStatus)} - `;
                   eventLog += `${event.ResourceType} - `;
                   eventLog += `${event.LogicalResourceId}`;
                   legacy.consoleLog(eventLog);

From e423404290a757a8adfc97d45e9aef7aa93f1404 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 16 Sep 2021 15:04:55 +0200
Subject: [PATCH 0479/1101] feat(CLI): Modern verbose logs related to deploy
 operation

---
 lib/Serverless.js      |  7 ++++++-
 lib/aws/request.js     | 14 +++++++++++---
 lib/classes/Service.js | 12 ++++++++++--
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index c9fcae82516..7c48049140b 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -7,6 +7,7 @@ const ensureValue = require('type/value/ensure');
 const ensureArray = require('type/array/ensure');
 const ensureIterable = require('type/iterable/ensure');
 const ensurePlainObject = require('type/plain-object/ensure');
+const { legacy, log } = require('@serverless/utils/log');
 const _ = require('lodash');
 const CLI = require('./classes/CLI');
 const Config = require('./classes/Config');
@@ -420,8 +421,12 @@ class Serverless {
       // `variables.populateService`. Below lines ensure they're set
       this.variables.loadVariableSyntax();
       this.variables.options = this.pluginManager.cliOptions;
+      log.info(
+        'Skipping variables resolution with old resolver ' +
+          '(new resolver reported no more variables to resolve)'
+      );
       if (process.env.SLS_DEBUG) {
-        this.cli.log(
+        legacy.log(
           'Skipping variables resolution with old resolver ' +
             '(new resolver reported no more variables to resolve)'
         );
diff --git a/lib/aws/request.js b/lib/aws/request.js
index 587d77ee9f9..fb40e9428bc 100644
--- a/lib/aws/request.js
+++ b/lib/aws/request.js
@@ -5,7 +5,7 @@ const memoize = require('memoizee');
 const PromiseQueue = require('promise-queue');
 const sdk = require('aws-sdk');
 const ServerlessError = require('../../lib/serverless-error');
-const log = require('@serverless/utils/log');
+const { legacy, log } = require('@serverless/utils/log');
 const HttpsProxyAgent = require('https-proxy-agent');
 const url = require('url');
 const https = require('https');
@@ -18,7 +18,7 @@ const chalk = require('chalk');
 
 // Activate AWS SDK logging
 if (process.env.SLS_DEBUG) {
-  sdk.config.logger = log;
+  sdk.config.logger = require('@serverless/utils/log');
 }
 
 // Use HTTPS Proxy (Optional)
@@ -158,7 +158,15 @@ async function awsRequest(service, method, ...args) {
         const jitter = Math.random() * 3000 - 1000;
         // backoff is between 4 and 7 seconds
         const backOff = BASE_BACKOFF + jitter;
-        log(
+        log.info(
+          [
+            `Recoverable error occurred (${e.message}), sleeping for ~${Math.round(
+              backOff / 1000
+            )} seconds.`,
+            `Try ${nextTryNum} of ${MAX_RETRIES}`,
+          ].join(' ')
+        );
+        legacy.log(
           [
             `Recoverable error occurred (${e.message}), sleeping for ~${Math.round(
               backOff / 1000
diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index 78a2a7cfb99..a8117975d6c 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -4,6 +4,7 @@ const { ServerlessError, logWarning } = require('./Error');
 const util = require('util');
 const _ = require('lodash');
 const semver = require('semver');
+const { legacy, log } = require('@serverless/utils/log');
 const resolveCliInput = require('../cli/resolve-input');
 const currentVersion = require('../../package').version;
 
@@ -71,12 +72,19 @@ class Service {
       );
       ymlVersion = null;
     }
-    if (!this.isLocallyInstalled && !ymlVersion && process.env.SLS_DEBUG) {
-      this.serverless.cli.log(
+    if (!this.isLocallyInstalled && !ymlVersion) {
+      log.info(
         'To ensure safe major version upgrades ensure "frameworkVersion" setting in ' +
           'service configuration ' +
           `(recommended setup: "frameworkVersion: ^${currentVersion}")\n`
       );
+      if (process.env.SLS_DEBUG) {
+        legacy.log(
+          'To ensure safe major version upgrades ensure "frameworkVersion" setting in ' +
+            'service configuration ' +
+            `(recommended setup: "frameworkVersion: ^${currentVersion}")\n`
+        );
+      }
     }
     if (
       ymlVersion &&

From 655140b764c8f2998188c3d47110494cbd742688 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 16 Sep 2021 15:05:46 +0200
Subject: [PATCH 0480/1101] feat(CLI): Modern debug (previously verbose) logs
 related to deploy

---
 lib/aws/request.js                          | 10 +++--
 lib/classes/PluginManager.js                | 17 +++++---
 test/unit/lib/aws/request.test.js           |  2 +-
 test/unit/lib/classes/PluginManager.test.js | 44 ---------------------
 test/unit/lib/plugins/aws/provider.test.js  |  1 +
 5 files changed, 21 insertions(+), 53 deletions(-)

diff --git a/lib/aws/request.js b/lib/aws/request.js
index fb40e9428bc..6a68d08e92f 100644
--- a/lib/aws/request.js
+++ b/lib/aws/request.js
@@ -17,9 +17,13 @@ const wait = require('timers-ext/promise/sleep');
 const chalk = require('chalk');
 
 // Activate AWS SDK logging
-if (process.env.SLS_DEBUG) {
-  sdk.config.logger = require('@serverless/utils/log');
-}
+const awsLog = log.get('aws');
+sdk.config.logger = {
+  log: (...args) => {
+    if (process.env.SLS_DEBUG) legacy.log(...args);
+    awsLog.debug(...args);
+  },
+};
 
 // Use HTTPS Proxy (Optional)
 const proxy =
diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 8c296726c46..e9d09ae96a9 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -17,6 +17,7 @@ const generateTelemetryPayload = require('../utils/telemetry/generatePayload');
 const processBackendNotificationRequest = require('../utils/processBackendNotificationRequest');
 const isTelemetryDisabled = require('../utils/telemetry/areDisabled');
 const tokenizeException = require('../utils/tokenize-exception');
+const { legacy, log } = require('@serverless/utils/log');
 
 const requireServicePlugin = (serviceDir, pluginPath, localPluginsPath) => {
   if (localPluginsPath && !pluginPath.startsWith('./')) {
@@ -282,9 +283,8 @@ class PluginManager {
 
   loadCommand(pluginName, details, key, isEntryPoint) {
     const commandIsEntryPoint = details.type === 'entrypoint' || isEntryPoint;
-    if (process.env.SLS_DEBUG && !commandIsEntryPoint) {
-      this.serverless.cli.log(`Load command ${key}`);
-    }
+    if (process.env.SLS_DEBUG && !commandIsEntryPoint) legacy.log(`Load command ${key}`);
+    log.get('lifecycle:command:register').debug(key);
     // Check if there is already an alias for the same path as the command
     const aliasCommand = this.getAliasCommandTarget(key.split(':'));
     if (aliasCommand) {
@@ -574,11 +574,18 @@ class PluginManager {
     const events = this.getEvents(command);
     const hooks = this.getHooks(events);
 
+    log
+      .get('lifecycle:command:invoke')
+      .debug(
+        `Invoke ${commandsArray.join(':')}${
+          !hooks.length ? ' (noop due to no registered hooks)' : ''
+        }`
+      );
     if (process.env.SLS_DEBUG) {
-      this.serverless.cli.log(`Invoke ${commandsArray.join(':')}`);
+      legacy.log(`Invoke ${commandsArray.join(':')}`);
       if (hooks.length === 0) {
         const warningMessage = 'Warning: The command you entered did not catch on any hooks';
-        this.serverless.cli.log(warningMessage);
+        legacy.log(warningMessage);
       }
     }
 
diff --git a/test/unit/lib/aws/request.test.js b/test/unit/lib/aws/request.test.js
index 944e8143028..35d851c6ed1 100644
--- a/test/unit/lib/aws/request.test.js
+++ b/test/unit/lib/aws/request.test.js
@@ -18,7 +18,7 @@ describe('#request', () => {
       proxyquire('../../../../lib/aws/request', {
         'aws-sdk': { config: configStub },
       });
-      expect(typeof configStub.logger).to.equal('function');
+      expect(typeof configStub.logger.log).to.equal('function');
     });
   });
 
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
index 22f894ff900..93ff1ca6d44 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/PluginManager.test.js
@@ -1520,27 +1520,6 @@ describe('PluginManager', () => {
       return expect(pluginManager.run(commandsArray)).to.be.rejectedWith(Error);
     });
 
-    it('should show warning if in debug mode and the given command has no hooks', () => {
-      const consoleLogStub = sinon.stub(pluginManager.serverless.cli, 'log').returns();
-      process.env.SLS_DEBUG = '*';
-      class HooklessPlugin {
-        constructor() {
-          this.commands = {
-            foo: {},
-          };
-        }
-      }
-
-      pluginManager.addPlugin(HooklessPlugin);
-
-      const commandsArray = ['foo'];
-
-      return pluginManager.run(commandsArray).then(() => {
-        expect(consoleLogStub.called).is.equal(true);
-        pluginManager.serverless.cli.log.restore();
-      });
-    });
-
     it('should run the hooks in the correct order', () => {
       class CorrectHookOrderPluginMock {
         constructor() {
@@ -1798,29 +1777,6 @@ describe('PluginManager', () => {
       return expect(pluginManager.spawn(commandsArray)).to.eventually.be.rejectedWith(Error);
     });
 
-    it('should show warning in debug mode and when the given command has no hooks', () => {
-      const consoleLogStub = sinon.stub(pluginManager.serverless.cli, 'log').returns();
-
-      process.env.SLS_DEBUG = '*';
-
-      class HooklessPlugin {
-        constructor() {
-          this.commands = {
-            foo: {},
-          };
-        }
-      }
-
-      pluginManager.addPlugin(HooklessPlugin);
-
-      const commandsArray = ['foo'];
-
-      return pluginManager.run(commandsArray).then(() => {
-        expect(consoleLogStub.called).is.equal(true);
-        pluginManager.serverless.cli.log.restore();
-      });
-    });
-
     describe('when invoking a command', () => {
       it('should succeed', () => {
         pluginManager.addPlugin(EntrypointPluginMock);
diff --git a/test/unit/lib/plugins/aws/provider.test.js b/test/unit/lib/plugins/aws/provider.test.js
index 976123b9a55..77fa349175a 100644
--- a/test/unit/lib/plugins/aws/provider.test.js
+++ b/test/unit/lib/plugins/aws/provider.test.js
@@ -366,6 +366,7 @@ describe('test/unit/lib/plugins/aws/provider.test.js', () => {
           SharedIniFileCredentials,
           EnvironmentCredentials,
           CloudFormation: FakeCloudFormation,
+          config: {},
         },
         'aws-sdk/lib/metadata_service': FakeMetadataService,
       };

From 80005aaf6b57aa8d013fe4cda0be52d494cd4d78 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 16 Sep 2021 15:21:42 +0200
Subject: [PATCH 0481/1101] fix(CLI): Ensure to strip error messages from
 colors in modern logs

---
 lib/cli/handle-error.js | 8 ++++++--
 package.json            | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 1d6a0e35660..c55a1653f89 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -3,6 +3,7 @@
 const path = require('path');
 const isObject = require('type/object/is');
 const chalk = require('chalk');
+const stripAnsi = require('strip-ansi');
 const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
 const resolveLocalServerlessPath = require('./resolve-local-serverless-path');
 const slsVersion = require('./../../package').version;
@@ -145,8 +146,11 @@ module.exports = async (exception, options = {}) => {
     )
   );
 
-  const errorMsg =
-    exceptionTokens.stack && !isUserError ? exceptionTokens.stack : exceptionTokens.message;
+  // TODO: Ideally after migrating to new logger complete this strip should not be needed
+  //       (it can be removed after we clear all chalk error message decorations from internals)
+  const errorMsg = stripAnsi(
+    exceptionTokens.stack && !isUserError ? exceptionTokens.stack : exceptionTokens.message
+  );
   writeText(style.error('\nError:'));
   if (errorMsg) {
     writeText(`  ${errorMsg.split('\n').join('\n  ')}`);
diff --git a/package.json b/package.json
index 48e2d9e2a2e..ef5aa1d9931 100644
--- a/package.json
+++ b/package.json
@@ -70,6 +70,7 @@
     "replaceall": "^0.1.6",
     "semver": "^7.3.5",
     "signal-exit": "^3.0.3",
+    "strip-ansi": "^6.0.0",
     "tabtab": "^3.0.2",
     "tar": "^6.1.11",
     "timers-ext": "^0.1.7",
@@ -105,7 +106,6 @@
     "sinon": "^11.1.2",
     "sinon-chai": "^3.7.0",
     "standard-version": "^9.3.1",
-    "strip-ansi": "^6.0.0",
     "ws": "^7.5.5",
     "xml2js": "^0.4.23"
   },

From c3f535d877df0982e5706c27a071558fafb6eaa8 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 16 Sep 2021 16:42:29 +0200
Subject: [PATCH 0482/1101] test: Ensure tests do not depend on ANSI color
 output mode

---
 test/unit/lib/aws/request.test.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/unit/lib/aws/request.test.js b/test/unit/lib/aws/request.test.js
index 35d851c6ed1..39e381e8660 100644
--- a/test/unit/lib/aws/request.test.js
+++ b/test/unit/lib/aws/request.test.js
@@ -70,9 +70,7 @@ describe('#request', () => {
             Key: 'test-key',
           }
         )
-      ).to.be.rejectedWith(
-        'AWS provider credentials not found. Learn how to set up AWS provider credentials in our docs here: <\u001b[32mhttp://slss.io/aws-creds-setup\u001b[39m>.'
-      );
+      ).to.be.rejectedWith('AWS provider credentials not found.');
     });
   });
 

From a8d17136b3e10c65b7082ee8e237678133c24b2e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 17 Sep 2021 11:34:12 +0200
Subject: [PATCH 0483/1101] test(AWS Schedule): Fix promises handling

---
 .../lib/plugins/aws/package/compile/events/schedule.test.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/lib/plugins/aws/package/compile/events/schedule.test.js b/test/unit/lib/plugins/aws/package/compile/events/schedule.test.js
index 13590d3946c..a15fe1aab6b 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/schedule.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/schedule.test.js
@@ -221,6 +221,6 @@ describe('test/unit/lib/plugins/aws/package/compile/events/schedule.test.js', ()
   });
 
   it('should not create schedule resources when no scheduled event is given', async () => {
-    expect(run([])).to.be.eventually.empty;
+    expect(await run([])).to.be.empty;
   });
 });

From be16ed57b1bd95c56b65ea45553113360cfbbc70 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 17 Sep 2021 11:53:44 +0200
Subject: [PATCH 0484/1101] refactor: Mark deprected lifecycle events for
 removal

---
 lib/cli/commands-schema/aws-service.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/cli/commands-schema/aws-service.js b/lib/cli/commands-schema/aws-service.js
index 5fa78f66526..2cabb27b5a7 100644
--- a/lib/cli/commands-schema/aws-service.js
+++ b/lib/cli/commands-schema/aws-service.js
@@ -34,6 +34,7 @@ commands.set('deploy', {
       type: 'boolean',
     },
   },
+  // TODO: Remove deprecated events with v3
   lifecycleEvents: [
     'deprecated#cleanup->package:cleanup',
     'deprecated#initialize->package:initialize',

From 8b4498c911e24ef7a46daf66380f1c122f988af3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 17 Sep 2021 12:21:13 +0200
Subject: [PATCH 0485/1101] refactor: Simplify lifecycle event hooks resolution

---
 lib/classes/PluginManager.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index e9d09ae96a9..ceb7ed91c1f 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -554,9 +554,11 @@ class PluginManager {
     return this.plugins;
   }
 
-  getHooks(events) {
-    const eventsArray = [].concat(events);
-    return eventsArray.reduce((acc, event) => acc.concat(this.hooks[event] || []), []);
+  getHooks(lifecycleEventNames) {
+    if (!Array.isArray(lifecycleEventNames)) lifecycleEventNames = [lifecycleEventNames];
+    return _.flatten(
+      lifecycleEventNames.map((lifecycleEventName) => this.hooks[lifecycleEventName] || [])
+    );
   }
 
   async invoke(commandsArray, allowEntryPoints) {

From 76006ec1e80f51e194b51d4c0f2a11c64434158e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 17 Sep 2021 17:20:40 +0200
Subject: [PATCH 0486/1101] refactor: Reorganize hooks resolution

Its to have access to meta that describes hook origin when processing the hook
---
 lib/classes/PluginManager.js                | 75 +++++++++++----------
 package.json                                |  2 +-
 test/unit/lib/classes/PluginManager.test.js | 58 ----------------
 3 files changed, 40 insertions(+), 95 deletions(-)

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index ceb7ed91c1f..1155b60c0cd 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -536,29 +536,29 @@ class PluginManager {
     );
   }
 
-  getEvents(command) {
-    return command.lifecycleEvents
-      ? command.lifecycleEvents.reduce(
-          (acc, event) =>
-            acc.concat([
-              `before:${command.key}:${event}`,
-              `${command.key}:${event}`,
-              `after:${command.key}:${event}`,
-            ]),
-          []
-        )
-      : [];
-  }
-
   getPlugins() {
     return this.plugins;
   }
 
-  getHooks(lifecycleEventNames) {
-    if (!Array.isArray(lifecycleEventNames)) lifecycleEventNames = [lifecycleEventNames];
-    return _.flatten(
-      lifecycleEventNames.map((lifecycleEventName) => this.hooks[lifecycleEventName] || [])
-    );
+  getLifecycleEventsData(command) {
+    const lifecycleEventsData = [];
+    let hooksLength = 0;
+    for (const lifecycleEventSubName of command.lifecycleEvents || []) {
+      const lifecycleEventName = `${command.key}:${lifecycleEventSubName}`;
+      const hooksData = {
+        before: this.hooks[`before:${lifecycleEventName}`] || [],
+        at: this.hooks[lifecycleEventName] || [],
+        after: this.hooks[`after:${lifecycleEventName}`] || [],
+      };
+      hooksLength += hooksData.before.length + hooksData.at.length + hooksData.after.length;
+      lifecycleEventsData.push({
+        command,
+        lifecycleEventSubName,
+        lifecycleEventName,
+        hooksData,
+      });
+    }
+    return { lifecycleEventsData, hooksLength };
   }
 
   async invoke(commandsArray, allowEntryPoints) {
@@ -573,36 +573,39 @@ class PluginManager {
     this.assignDefaultOptions(command);
     this.validateOptions(command);
 
-    const events = this.getEvents(command);
-    const hooks = this.getHooks(events);
+    const { lifecycleEventsData, hooksLength } = this.getLifecycleEventsData(command);
 
     log
       .get('lifecycle:command:invoke')
       .debug(
         `Invoke ${commandsArray.join(':')}${
-          !hooks.length ? ' (noop due to no registered hooks)' : ''
+          !hooksLength ? ' (noop due to no registered hooks)' : ''
         }`
       );
     if (process.env.SLS_DEBUG) {
       legacy.log(`Invoke ${commandsArray.join(':')}`);
-      if (hooks.length === 0) {
+      if (hooksLength === 0) {
         const warningMessage = 'Warning: The command you entered did not catch on any hooks';
         legacy.log(warningMessage);
       }
     }
 
-    for (const hook of hooks) {
-      try {
-        await hook.hook();
-      } catch (error) {
-        if (error instanceof TerminateHookChain) {
-          if (process.env.SLS_DEBUG) {
-            this.serverless.cli.log(`Terminate ${commandsArray.join(':')}`);
-          }
-          return;
+    try {
+      for (const {
+        hooksData: { before, at, after },
+      } of lifecycleEventsData) {
+        for (const { hook } of before) await hook();
+        for (const { hook } of at) await hook();
+        for (const { hook } of after) await hook();
+      }
+    } catch (error) {
+      if (error instanceof TerminateHookChain) {
+        if (process.env.SLS_DEBUG) {
+          this.serverless.cli.log(`Terminate ${commandsArray.join(':')}`);
         }
-        throw error;
+        return;
       }
+      throw error;
     }
   }
 
@@ -628,7 +631,7 @@ class PluginManager {
     this.commandRunStartTime = Date.now();
     if (resolveCliInput().commands[0] !== 'plugin') {
       // first initialize hooks
-      for (const { hook } of this.getHooks(['initialize'])) await hook();
+      for (const { hook } of this.hooks.initialize || []) await hook();
     }
 
     let deferredBackendNotificationRequest;
@@ -655,7 +658,7 @@ class PluginManager {
       await this.invoke(commandsArray);
     } catch (commandException) {
       try {
-        for (const { hook } of this.getHooks(['error'])) await hook(commandException);
+        for (const { hook } of this.hooks.error || []) await hook(commandException);
       } catch (errorHookException) {
         const errorHookExceptionMeta = tokenizeException(errorHookException);
         this.serverless.cli.log(
@@ -670,7 +673,7 @@ class PluginManager {
     }
 
     try {
-      for (const { hook } of this.getHooks(['finalize'])) await hook();
+      for (const { hook } of this.hooks.finalize || []) await hook();
     } catch (finalizeHookException) {
       await deferredBackendNotificationRequest;
       throw finalizeHookException;
diff --git a/package.json b/package.json
index ef5aa1d9931..84ac0823e56 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
   "devDependencies": {
     "@commitlint/cli": "^12.1.4",
     "@serverless/eslint-config": "^3.0.0",
-    "@serverless/test": "^8.3.1",
+    "@serverless/test": "^8.4.0",
     "adm-zip": "^0.5.6",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
index 93ff1ca6d44..bd7827bed60 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/PluginManager.test.js
@@ -1168,64 +1168,6 @@ describe('PluginManager', () => {
     });
   });
 
-  describe('#getEvents()', () => {
-    beforeEach(() => {
-      pluginManager.addPlugin(SynchronousPluginMock);
-    });
-
-    it('should get all the matching events for a root level command in the correct order', () => {
-      const command = pluginManager.getCommand(['deploy']);
-      const events = pluginManager.getEvents(command);
-
-      expect(events[0]).to.equal('before:deploy:resources');
-      expect(events[1]).to.equal('deploy:resources');
-      expect(events[2]).to.equal('after:deploy:resources');
-      expect(events[3]).to.equal('before:deploy:functions');
-      expect(events[4]).to.equal('deploy:functions');
-      expect(events[5]).to.equal('after:deploy:functions');
-    });
-
-    it('should get all the matching events for a nested level command in the correct order', () => {
-      const command = pluginManager.getCommand(['deploy', 'onpremises']);
-      const events = pluginManager.getEvents(command);
-
-      expect(events[0]).to.equal('before:deploy:onpremises:resources');
-      expect(events[1]).to.equal('deploy:onpremises:resources');
-      expect(events[2]).to.equal('after:deploy:onpremises:resources');
-      expect(events[3]).to.equal('before:deploy:onpremises:functions');
-      expect(events[4]).to.equal('deploy:onpremises:functions');
-      expect(events[5]).to.equal('after:deploy:onpremises:functions');
-    });
-  });
-
-  describe('#getHooks()', () => {
-    beforeEach(() => {
-      pluginManager.addPlugin(SynchronousPluginMock);
-    });
-
-    it('should get hooks for an event with some registered', () => {
-      expect(pluginManager.getHooks(['deploy:functions']))
-        .to.be.an('Array')
-        .with.length(1);
-    });
-
-    it('should have the plugin name and function on the hook', () => {
-      const hooks = pluginManager.getHooks(['deploy:functions']);
-      expect(hooks[0].pluginName).to.equal('SynchronousPluginMock');
-      expect(hooks[0].hook).to.be.a('Function');
-    });
-
-    it('should not get hooks for an event that does not have any', () => {
-      expect(pluginManager.getHooks(['deploy:resources']))
-        .to.be.an('Array')
-        .with.length(0);
-    });
-
-    it('should accept a single event in place of an array', () => {
-      expect(pluginManager.getHooks('deploy:functions')).to.be.an('Array').with.length(1);
-    });
-  });
-
   describe('#getPlugins()', () => {
     beforeEach(() => {
       mockRequire('ServicePluginMock1', ServicePluginMock1);

From fd68f9e8038a9ac253bdf47816703edefe0de28e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 20 Sep 2021 14:51:27 +0200
Subject: [PATCH 0487/1101] feat: Support `mainProgressTitles` config on
 commands schema

---
 lib/classes/PluginManager.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 1155b60c0cd..b9ab6d1912c 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -17,7 +17,9 @@ const generateTelemetryPayload = require('../utils/telemetry/generatePayload');
 const processBackendNotificationRequest = require('../utils/processBackendNotificationRequest');
 const isTelemetryDisabled = require('../utils/telemetry/areDisabled');
 const tokenizeException = require('../utils/tokenize-exception');
-const { legacy, log } = require('@serverless/utils/log');
+const { legacy, log, progress } = require('@serverless/utils/log');
+
+const mainProgress = progress.get('main');
 
 const requireServicePlugin = (serviceDir, pluginPath, localPluginsPath) => {
   if (localPluginsPath && !pluginPath.startsWith('./')) {
@@ -561,6 +563,15 @@ class PluginManager {
     return { lifecycleEventsData, hooksLength };
   }
 
+  async runHooks(hookName, hooks) {
+    const mainProgressTitles = _.get(resolveCliInput().commandSchema, 'mainProgressTitles');
+    if (mainProgressTitles) {
+      const mainProgressTitle = mainProgressTitles.get(hookName);
+      if (mainProgressTitle) mainProgress.notice(mainProgressTitle);
+    }
+    for (const { hook } of hooks) await hook();
+  }
+
   async invoke(commandsArray, allowEntryPoints) {
     const command = this.getCommand(commandsArray, allowEntryPoints);
     if (command.type === 'container') {
@@ -592,11 +603,12 @@ class PluginManager {
 
     try {
       for (const {
+        lifecycleEventName,
         hooksData: { before, at, after },
       } of lifecycleEventsData) {
-        for (const { hook } of before) await hook();
-        for (const { hook } of at) await hook();
-        for (const { hook } of after) await hook();
+        await this.runHooks(`before:${lifecycleEventName}`, before);
+        await this.runHooks(lifecycleEventName, at);
+        await this.runHooks(`after:${lifecycleEventName}`, after);
       }
     } catch (error) {
       if (error instanceof TerminateHookChain) {

From 9e308bdf041c73eb2d27408ae4e03bc10fe9bf8a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 20 Sep 2021 14:55:27 +0200
Subject: [PATCH 0488/1101] refactor: Configure main progress titles through
 command schema

---
 lib/cli/commands-schema/aws-service.js    | 9 +++++++++
 lib/cli/commands-schema/service.js        | 1 +
 lib/plugins/aws/deploy/index.js           | 3 +--
 lib/plugins/aws/lib/updateStack.js        | 1 -
 lib/plugins/package/lib/packageService.js | 3 +--
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/cli/commands-schema/aws-service.js b/lib/cli/commands-schema/aws-service.js
index 2cabb27b5a7..b68e796ed9b 100644
--- a/lib/cli/commands-schema/aws-service.js
+++ b/lib/cli/commands-schema/aws-service.js
@@ -45,6 +45,15 @@ commands.set('deploy', {
     'deploy',
     'finalize',
   ],
+  mainProgressTitles: new Map([
+    ['before:package:cleanup', 'Packaging'],
+    ['before:aws:deploy:deploy:createStack', 'Retrieving CloudFormation stack info'],
+    ['before:aws:deploy:deploy:checkForChanges', 'Retrieving CloudFormation stack info'],
+    ['before:aws:deploy:deploy:uploadArtifacts', 'Uploading'],
+    ['before:aws:deploy:deploy:validateTemplate', 'Updating CloudFormation stack'],
+    ['before:aws:info:validate', 'Retrieving CloudFormation stack info'],
+    ['after:deploy:deploy', 'Updating'],
+  ]),
 });
 
 commands.set('deploy function', {
diff --git a/lib/cli/commands-schema/service.js b/lib/cli/commands-schema/service.js
index c1018cd584d..fefd67cd5f3 100644
--- a/lib/cli/commands-schema/service.js
+++ b/lib/cli/commands-schema/service.js
@@ -25,6 +25,7 @@ commands.set('package', {
     'compileEvents',
     'finalize',
   ],
+  mainProgressTitles: new Map([['before:package:cleanup', 'Packaging']]),
 });
 
 commands.set('plugin install', {
diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index da0e95da2fe..6fc609801d7 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -11,7 +11,7 @@ const validateTemplate = require('./lib/validateTemplate');
 const updateStack = require('../lib/updateStack');
 const existsDeploymentBucket = require('./lib/existsDeploymentBucket');
 const path = require('path');
-const { style, log, progress, writeText } = require('@serverless/utils/log');
+const { style, log, writeText } = require('@serverless/utils/log');
 const memoize = require('memoizee');
 
 class AwsDeploy {
@@ -124,7 +124,6 @@ class AwsDeploy {
       // Deploy finalize inner lifecycle
       'aws:deploy:finalize:cleanup': async () => {
         if (this.serverless.service.provider.shouldNotDeploy) return;
-        progress.get('main').notice('Updating');
         log.info('Updating');
         await this.cleanupS3Bucket();
         if (this.options.package || this.serverless.service.package.path) {
diff --git a/lib/plugins/aws/lib/updateStack.js b/lib/plugins/aws/lib/updateStack.js
index a61489d4cda..8b348c23aad 100644
--- a/lib/plugins/aws/lib/updateStack.js
+++ b/lib/plugins/aws/lib/updateStack.js
@@ -74,7 +74,6 @@ module.exports = {
     const templateUrl = `https://${s3Endpoint}/${this.bucketName}/${this.serverless.service.package.artifactDirectoryName}/${compiledTemplateFileName}`;
 
     legacy.log('Updating Stack...');
-    progress.get('main').notice('Updating CloudFormation stack');
     log.info('Updating CloudFormation stack');
     const stackName = this.provider.naming.getStackName();
     let stackTags = { STAGE: this.provider.getStage() };
diff --git a/lib/plugins/package/lib/packageService.js b/lib/plugins/package/lib/packageService.js
index bca584da047..2415a6479ec 100644
--- a/lib/plugins/package/lib/packageService.js
+++ b/lib/plugins/package/lib/packageService.js
@@ -7,7 +7,7 @@ const _ = require('lodash');
 const micromatch = require('micromatch');
 const ServerlessError = require('../../../serverless-error');
 const parseS3URI = require('../../aws/utils/parse-s3-uri');
-const { legacy, progress, log } = require('@serverless/utils/log');
+const { legacy, log } = require('@serverless/utils/log');
 
 module.exports = {
   defaultExcludes: [
@@ -68,7 +68,6 @@ module.exports = {
 
   async packageService() {
     legacy.log('Packaging service...');
-    progress.get('main').notice('Packaging');
     log.info();
     log.info('Packaging');
     let shouldPackageService = false;

From 634b59e396004992c9460ad2c3cfaa779efa4fbe Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 21 Sep 2021 16:24:10 +0200
Subject: [PATCH 0489/1101] refactor: Revert from `mainProgressTitles` handling

It appeared as not reliable, due to lack of means for any conditional handling of progress events
---
 lib/classes/PluginManager.js           |  9 +--------
 lib/cli/commands-schema/aws-service.js |  9 ---------
 lib/cli/commands-schema/service.js     |  1 -
 lib/plugins/aws/deploy/index.js        | 16 +++++++++++++++-
 lib/plugins/aws/info/index.js          |  6 ++++++
 lib/plugins/aws/package/index.js       |  6 ++++--
 6 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index b9ab6d1912c..39d5187b8be 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -17,9 +17,7 @@ const generateTelemetryPayload = require('../utils/telemetry/generatePayload');
 const processBackendNotificationRequest = require('../utils/processBackendNotificationRequest');
 const isTelemetryDisabled = require('../utils/telemetry/areDisabled');
 const tokenizeException = require('../utils/tokenize-exception');
-const { legacy, log, progress } = require('@serverless/utils/log');
-
-const mainProgress = progress.get('main');
+const { legacy, log } = require('@serverless/utils/log');
 
 const requireServicePlugin = (serviceDir, pluginPath, localPluginsPath) => {
   if (localPluginsPath && !pluginPath.startsWith('./')) {
@@ -564,11 +562,6 @@ class PluginManager {
   }
 
   async runHooks(hookName, hooks) {
-    const mainProgressTitles = _.get(resolveCliInput().commandSchema, 'mainProgressTitles');
-    if (mainProgressTitles) {
-      const mainProgressTitle = mainProgressTitles.get(hookName);
-      if (mainProgressTitle) mainProgress.notice(mainProgressTitle);
-    }
     for (const { hook } of hooks) await hook();
   }
 
diff --git a/lib/cli/commands-schema/aws-service.js b/lib/cli/commands-schema/aws-service.js
index b68e796ed9b..2cabb27b5a7 100644
--- a/lib/cli/commands-schema/aws-service.js
+++ b/lib/cli/commands-schema/aws-service.js
@@ -45,15 +45,6 @@ commands.set('deploy', {
     'deploy',
     'finalize',
   ],
-  mainProgressTitles: new Map([
-    ['before:package:cleanup', 'Packaging'],
-    ['before:aws:deploy:deploy:createStack', 'Retrieving CloudFormation stack info'],
-    ['before:aws:deploy:deploy:checkForChanges', 'Retrieving CloudFormation stack info'],
-    ['before:aws:deploy:deploy:uploadArtifacts', 'Uploading'],
-    ['before:aws:deploy:deploy:validateTemplate', 'Updating CloudFormation stack'],
-    ['before:aws:info:validate', 'Retrieving CloudFormation stack info'],
-    ['after:deploy:deploy', 'Updating'],
-  ]),
 });
 
 commands.set('deploy function', {
diff --git a/lib/cli/commands-schema/service.js b/lib/cli/commands-schema/service.js
index fefd67cd5f3..c1018cd584d 100644
--- a/lib/cli/commands-schema/service.js
+++ b/lib/cli/commands-schema/service.js
@@ -25,7 +25,6 @@ commands.set('package', {
     'compileEvents',
     'finalize',
   ],
-  mainProgressTitles: new Map([['before:package:cleanup', 'Packaging']]),
 });
 
 commands.set('plugin install', {
diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index 6fc609801d7..893e36b6974 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -11,9 +11,11 @@ const validateTemplate = require('./lib/validateTemplate');
 const updateStack = require('../lib/updateStack');
 const existsDeploymentBucket = require('./lib/existsDeploymentBucket');
 const path = require('path');
-const { style, log, writeText } = require('@serverless/utils/log');
+const { style, log, writeText, progress } = require('@serverless/utils/log');
 const memoize = require('memoizee');
 
+const mainProgress = progress.get('main');
+
 class AwsDeploy {
   constructor(serverless, options) {
     this.serverless = serverless;
@@ -99,6 +101,8 @@ class AwsDeploy {
       'deploy:finalize': async () => this.serverless.pluginManager.spawn('aws:deploy:finalize'),
 
       // Deploy deploy inner lifecycle
+      'before:aws:deploy:deploy:createStack': () =>
+        mainProgress.notice('Retrieving CloudFormation stack info'),
       'aws:deploy:deploy:createStack': async () => this.createStack(),
 
       'aws:deploy:deploy:checkForChanges': async () => {
@@ -106,6 +110,10 @@ class AwsDeploy {
         await this.checkForChanges();
       },
 
+      'before:aws:deploy:deploy:uploadArtifacts': () => {
+        if (this.serverless.service.provider.shouldNotDeploy) return;
+        mainProgress.notice('Uploading');
+      },
       'aws:deploy:deploy:uploadArtifacts': async () => {
         if (this.serverless.service.provider.shouldNotDeploy) return;
         await this.uploadArtifacts();
@@ -116,11 +124,17 @@ class AwsDeploy {
         await this.validateTemplate();
       },
 
+      'before:aws:deploy:deploy:updateStack': () => {
+        if (this.serverless.service.provider.shouldNotDeploy) return;
+        mainProgress.notice('Updating CloudFormation stack');
+      },
       'aws:deploy:deploy:updateStack': async () => {
         if (this.serverless.service.provider.shouldNotDeploy) return;
         await this.updateStack();
       },
 
+      'after:deploy:deploy': () => mainProgress.notice('Updating'),
+
       // Deploy finalize inner lifecycle
       'aws:deploy:finalize:cleanup': async () => {
         if (this.serverless.service.provider.shouldNotDeploy) return;
diff --git a/lib/plugins/aws/info/index.js b/lib/plugins/aws/info/index.js
index 6cf512f4c06..a2a5449d67d 100644
--- a/lib/plugins/aws/info/index.js
+++ b/lib/plugins/aws/info/index.js
@@ -1,12 +1,15 @@
 'use strict';
 
 const BbPromise = require('bluebird');
+const { progress } = require('@serverless/utils/log');
 const validate = require('../lib/validate');
 const getStackInfo = require('./getStackInfo');
 const getResourceCount = require('./getResourceCount');
 const getApiKeyValues = require('./getApiKeyValues');
 const display = require('./display');
 
+const mainProgress = progress.get('main');
+
 class AwsInfo {
   constructor(serverless, options) {
     this.serverless = serverless;
@@ -42,6 +45,9 @@ class AwsInfo {
           return this.serverless.pluginManager.spawn('aws:info');
         }),
 
+      'before:aws:info:validate': () => {
+        mainProgress.notice('Retrieving CloudFormation stack info');
+      },
       'aws:info:validate': async () => BbPromise.bind(this).then(this.validate),
 
       'aws:info:gatherData': async () =>
diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
index 8327f9bb0b3..dcc7b701612 100644
--- a/lib/plugins/aws/package/index.js
+++ b/lib/plugins/aws/package/index.js
@@ -9,7 +9,9 @@ const saveServiceState = require('./lib/saveServiceState');
 const saveCompiledTemplate = require('./lib/saveCompiledTemplate');
 const mergeIamTemplates = require('./lib/mergeIamTemplates');
 const addExportNameForOutputs = require('./lib/addExportNameForOutputs');
-const { log, style } = require('@serverless/utils/log');
+const { log, style, progress } = require('@serverless/utils/log');
+
+const mainProgress = progress.get('main');
 
 class AwsPackage {
   constructor(serverless, options) {
@@ -66,7 +68,7 @@ class AwsPackage {
           );
         }
       },
-
+      'before:package:cleanup': () => mainProgress.notice('Packaging'),
       /**
        * Outer lifecycle hooks
        */

From a6553f8668b66e2281626e7e79a3a2042279f92d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 21 Sep 2021 17:30:56 +0200
Subject: [PATCH 0490/1101] refactor(CLI): Refactor main progress event with
 `isMainEvent` option

---
 lib/plugins/aws/deploy/index.js               | 11 ++++++-----
 lib/plugins/aws/deploy/lib/createStack.js     |  3 +--
 lib/plugins/aws/deploy/lib/uploadArtifacts.js |  1 -
 lib/plugins/aws/info/index.js                 |  2 +-
 lib/plugins/aws/lib/updateStack.js            |  6 ++----
 lib/plugins/aws/package/index.js              |  3 ++-
 lib/plugins/package/lib/packageService.js     |  2 --
 package.json                                  |  2 +-
 8 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index 893e36b6974..6a2a4b342a0 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -72,11 +72,13 @@ class AwsDeploy {
       'initialize': () => {
         const isDeployCommand = this.serverless.processedInput.commands.join(' ') === 'deploy';
         if (isDeployCommand && !this.options.function) {
+          log.notice();
           log.notice(
-            `\nDeploying ${this.serverless.service.service} to stage ${this.serverless
+            `Deploying ${this.serverless.service.service} to stage ${this.serverless
               .getProvider('aws')
               .getStage()} ${style.aside(`(${this.serverless.getProvider('aws').getRegion()})`)}`
           );
+          log.notice();
         }
       },
 
@@ -102,7 +104,7 @@ class AwsDeploy {
 
       // Deploy deploy inner lifecycle
       'before:aws:deploy:deploy:createStack': () =>
-        mainProgress.notice('Retrieving CloudFormation stack info'),
+        mainProgress.notice('Retrieving CloudFormation stack info', { isMainEvent: true }),
       'aws:deploy:deploy:createStack': async () => this.createStack(),
 
       'aws:deploy:deploy:checkForChanges': async () => {
@@ -112,7 +114,7 @@ class AwsDeploy {
 
       'before:aws:deploy:deploy:uploadArtifacts': () => {
         if (this.serverless.service.provider.shouldNotDeploy) return;
-        mainProgress.notice('Uploading');
+        mainProgress.notice('Uploading', { isMainEvent: true });
       },
       'aws:deploy:deploy:uploadArtifacts': async () => {
         if (this.serverless.service.provider.shouldNotDeploy) return;
@@ -126,7 +128,7 @@ class AwsDeploy {
 
       'before:aws:deploy:deploy:updateStack': () => {
         if (this.serverless.service.provider.shouldNotDeploy) return;
-        mainProgress.notice('Updating CloudFormation stack');
+        mainProgress.notice('Updating CloudFormation stack', { isMainEvent: true });
       },
       'aws:deploy:deploy:updateStack': async () => {
         if (this.serverless.service.provider.shouldNotDeploy) return;
@@ -138,7 +140,6 @@ class AwsDeploy {
       // Deploy finalize inner lifecycle
       'aws:deploy:finalize:cleanup': async () => {
         if (this.serverless.service.provider.shouldNotDeploy) return;
-        log.info('Updating');
         await this.cleanupS3Bucket();
         if (this.options.package || this.serverless.service.package.path) {
           await this.serverless.pluginManager.spawn('aws:common:cleanupTempDir');
diff --git a/lib/plugins/aws/deploy/lib/createStack.js b/lib/plugins/aws/deploy/lib/createStack.js
index 5abdc66fefc..4b00aff3dc0 100644
--- a/lib/plugins/aws/deploy/lib/createStack.js
+++ b/lib/plugins/aws/deploy/lib/createStack.js
@@ -8,8 +8,7 @@ module.exports = {
   async create() {
     // Note: using three dots instead of ellipsis to support non uni-code consoles.
     legacy.log('Creating Stack...');
-    progress.get('main').notice('Creating CloudFormation stack');
-    log.info('Creating CloudFormation stack');
+    progress.get('main').notice('Creating CloudFormation stack', { isMainEvent: true });
     const stackName = this.provider.naming.getStackName();
 
     let stackTags = { STAGE: this.provider.getStage() };
diff --git a/lib/plugins/aws/deploy/lib/uploadArtifacts.js b/lib/plugins/aws/deploy/lib/uploadArtifacts.js
index 8e0850f6194..05763ec8eef 100644
--- a/lib/plugins/aws/deploy/lib/uploadArtifacts.js
+++ b/lib/plugins/aws/deploy/lib/uploadArtifacts.js
@@ -38,7 +38,6 @@ module.exports = {
     } else {
       progress.get('main').notice(`Uploading (0/${artifactFilePaths.length})`);
     }
-    log.info('Uploading');
 
     await this.uploadCloudFormationFile();
     await this.uploadFunctionsAndLayers();
diff --git a/lib/plugins/aws/info/index.js b/lib/plugins/aws/info/index.js
index a2a5449d67d..a518961c0a2 100644
--- a/lib/plugins/aws/info/index.js
+++ b/lib/plugins/aws/info/index.js
@@ -46,7 +46,7 @@ class AwsInfo {
         }),
 
       'before:aws:info:validate': () => {
-        mainProgress.notice('Retrieving CloudFormation stack info');
+        mainProgress.notice('Retrieving CloudFormation stack info', { isMainEvent: true });
       },
       'aws:info:validate': async () => BbPromise.bind(this).then(this.validate),
 
diff --git a/lib/plugins/aws/lib/updateStack.js b/lib/plugins/aws/lib/updateStack.js
index 8b348c23aad..44e02721d58 100644
--- a/lib/plugins/aws/lib/updateStack.js
+++ b/lib/plugins/aws/lib/updateStack.js
@@ -2,7 +2,7 @@
 
 const BbPromise = require('bluebird');
 const getS3EndpointForRegion = require('../utils/getS3EndpointForRegion');
-const { legacy, progress, log } = require('@serverless/utils/log');
+const { legacy, progress } = require('@serverless/utils/log');
 
 const NO_UPDATE_MESSAGE = 'No updates are to be performed.';
 
@@ -10,8 +10,7 @@ module.exports = {
   async createFallback() {
     this.createLater = false;
     legacy.log('Creating Stack...');
-    progress.get('main').notice('Creating CloudFormation stack');
-    log.info('Creating CloudFormation stack');
+    progress.get('main').notice('Creating CloudFormation stack', { isMainEvent: true });
 
     const stackName = this.provider.naming.getStackName();
     let stackTags = { STAGE: this.provider.getStage() };
@@ -74,7 +73,6 @@ module.exports = {
     const templateUrl = `https://${s3Endpoint}/${this.bucketName}/${this.serverless.service.package.artifactDirectoryName}/${compiledTemplateFileName}`;
 
     legacy.log('Updating Stack...');
-    log.info('Updating CloudFormation stack');
     const stackName = this.provider.naming.getStackName();
     let stackTags = { STAGE: this.provider.getStage() };
 
diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
index dcc7b701612..8ca4c2bdffe 100644
--- a/lib/plugins/aws/package/index.js
+++ b/lib/plugins/aws/package/index.js
@@ -66,9 +66,10 @@ class AwsPackage {
               .getProvider('aws')
               .getStage()} ${style.aside(`(${this.serverless.getProvider('aws').getRegion()})`)}`
           );
+          log.notice();
         }
       },
-      'before:package:cleanup': () => mainProgress.notice('Packaging'),
+      'before:package:cleanup': () => mainProgress.notice('Packaging', { isMainEvent: true }),
       /**
        * Outer lifecycle hooks
        */
diff --git a/lib/plugins/package/lib/packageService.js b/lib/plugins/package/lib/packageService.js
index 2415a6479ec..765166f12a2 100644
--- a/lib/plugins/package/lib/packageService.js
+++ b/lib/plugins/package/lib/packageService.js
@@ -68,8 +68,6 @@ module.exports = {
 
   async packageService() {
     legacy.log('Packaging service...');
-    log.info();
-    log.info('Packaging');
     let shouldPackageService = false;
     const allFunctions = this.serverless.service.getAllFunctions();
     let packagePromises = allFunctions.map(async (functionName) => {
diff --git a/package.json b/package.json
index 84ac0823e56..e7e1d72a76c 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@serverless/components": "^3.17.0",
     "@serverless/dashboard-plugin": "^5.4.4",
     "@serverless/platform-client": "^4.3.0",
-    "@serverless/utils": "^5.13.0",
+    "@serverless/utils": "^5.14.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",

From b30c95ca694c5700db2c90caeb342b3fe5e3336c Mon Sep 17 00:00:00 2001
From: Maciej Skierkowski <maciej@skierkowski.com>
Date: Tue, 21 Sep 2021 08:08:33 -0700
Subject: [PATCH 0491/1101] docs: Move section on profiles/providers migration

---
 docs/guides/profiles.md  | 23 -----------------------
 docs/guides/providers.md | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/docs/guides/profiles.md b/docs/guides/profiles.md
index e379acc9a4d..f6a804223ad 100644
--- a/docs/guides/profiles.md
+++ b/docs/guides/profiles.md
@@ -18,29 +18,6 @@ layout: Doc
 
 Deployment Profiles enable each stage of your Serverless application to use a unique set of [Safeguards](./safeguards.md), [Parameters](./parameters.md) and [Access Roles](./access-roles.md).
 
-## Deprecation and Migration from Deployment Profile
-
-Prior to the January 11th, 2021 release, deployment profiles supported setting AWS Access Role ARNs and managing parameters. Support for using AWS Access Roles for deployments has moved from deployment profiles to Providers. Support for managing Parameters has moved from deployment profiles to services and instances.
-
-**Deployment profiles will be deprecated on February 28th, 2021**. Migration from deployment profiles to providers and parameters will be automatic; however, there are two required action items to use the new features.
-
-### Action Items
-
-- You **MUST** upgrade to use the Enterprise Plugin version 4.4.1 or higher.
-- You **MUST** relink your AWS Account via the providers UI by no later than February 28th, 2021.
-
-### Automatic Migration
-
-Parameters and Providers were migrated automatically from deployment profiles on January 31st, 2021.
-
-The automatic migration replaced deployment profiles with providers by performing the following:
-
-- **A new provider will be created for each deployment profile using the same AWS Access Role ARN**. If the deployment profile doesn’t contain an AWS Access Role ARN, it will be skipped.
-- **A provider will be added to each service for the corresponding default stage in the app**. The provider will be the provider corresponding to the deployment profile which was associated with the default stage of the parent app. For example, if `app1` has `service1` and the _`default`_ stage of `app1` links to the `dev` deployment profile, then the `dev` provider will be added to `service1`. This is repeated for all services in all apps.
-- **A provider will be added to each instance for the corresponding stage in the app**. The provider will be the provider corresponding to the deployment profile which was associated with the stage of the instance. For example, if `app1` has `service1` and `app1` has a stage `prod` linked to the `prod` deployment profile, then the `prod` provider will be added to the `service1` instances deployed to the `prod` stage.
-- **Parameters from the deployment profile associated with the default stage in the app will be copied to the service**.
-- **Parameters from the deployment profile associated with a stage in an app will be copied to the instance**.
-
 ## Use Deployment Profiles
 
 Deployment profiles are managed in the [Serverless Framework Dashboard](https://app.serverless.com). When you run `serverless deploy`, the CLI obtains the Safeguard policies, Parameters, and the generated AWS Credentials.
diff --git a/docs/guides/providers.md b/docs/guides/providers.md
index a54c36d19d2..f92b03fcce3 100644
--- a/docs/guides/providers.md
+++ b/docs/guides/providers.md
@@ -182,3 +182,26 @@ If you are create a custom IAM Role with this policy, you will need to add a Tru
     ]
 }
 ```
+
+## Migration from Deployment Profile
+
+Prior to the January 11th, 2021 release, deployment profiles supported setting AWS Access Role ARNs and managing parameters. Support for using AWS Access Roles for deployments has moved from deployment profiles to Providers. Support for managing Parameters has moved from deployment profiles to services and instances.
+
+**Deployment profiles will be deprecated on February 28th, 2021**. Migration from deployment profiles to providers and parameters will be automatic; however, there are two required action items to use the new features.
+
+### Action Items
+
+- You **MUST** upgrade to use the Enterprise Plugin version 4.4.1 or higher.
+- You **MUST** relink your AWS Account via the providers UI by no later than February 28th, 2021.
+
+### Automatic Migration
+
+Parameters and Providers were migrated automatically from deployment profiles on January 31st, 2021.
+
+The automatic migration replaced deployment profiles with providers by performing the following:
+
+- **A new provider will be created for each deployment profile using the same AWS Access Role ARN**. If the deployment profile doesn’t contain an AWS Access Role ARN, it will be skipped.
+- **A provider will be added to each service for the corresponding default stage in the app**. The provider will be the provider corresponding to the deployment profile which was associated with the default stage of the parent app. For example, if `app1` has `service1` and the _`default`_ stage of `app1` links to the `dev` deployment profile, then the `dev` provider will be added to `service1`. This is repeated for all services in all apps.
+- **A provider will be added to each instance for the corresponding stage in the app**. The provider will be the provider corresponding to the deployment profile which was associated with the stage of the instance. For example, if `app1` has `service1` and `app1` has a stage `prod` linked to the `prod` deployment profile, then the `prod` provider will be added to the `service1` instances deployed to the `prod` stage.
+- **Parameters from the deployment profile associated with the default stage in the app will be copied to the service**.
+- **Parameters from the deployment profile associated with a stage in an app will be copied to the instance**.

From 87f211d0bb29ca53ffad01524499325a5cdb7662 Mon Sep 17 00:00:00 2001
From: Maciej Skierkowski <maciej@skierkowski.com>
Date: Tue, 21 Sep 2021 08:24:52 -0700
Subject: [PATCH 0492/1101] docs: Removing pages on deprecated features

---
 docs/guides/access-roles.md | 45 ----------------------------
 docs/guides/profiles.md     | 59 -------------------------------------
 docs/guides/safeguards.md   | 20 -------------
 3 files changed, 124 deletions(-)
 delete mode 100644 docs/guides/access-roles.md
 delete mode 100644 docs/guides/profiles.md
 delete mode 100644 docs/guides/safeguards.md

diff --git a/docs/guides/access-roles.md b/docs/guides/access-roles.md
deleted file mode 100644
index 8cf986404da..00000000000
--- a/docs/guides/access-roles.md
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-title: Serverless Dashboard - Access Roles
-menuText: Access Roles
-menuOrder: 2
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/guides/access-roles/)
-
-<!-- DOCS-SITE-LINK:END -->
-
-> This document page is related to the deprecated dashboard. We advise using the updated dashboard at app.serverless.com and using the new [Providers feature to manage AWS connections](https://www.serverless.com/framework/docs/guides/providers/) for any new orgs created.
-
-# Access Roles
-
-You can use the Serverless Framework Dashboard to set up an AWS Access Role to help you secure your service deployments on AWS by enabling the Serverless Framework to issue temporary AWS Access Keys to deploy your services to AWS.
-
-If an Access Role is not configured, the Serverless Framework service will use AWS Access Keys stored in [environment variables](https://serverless.com/framework/docs/providers/aws/guide/credentials/) or [AWS Profiles](https://serverless.com/framework/docs/providers/aws/guide/credentials/) to deploy your service.
-
-With AWS Access Roles the AWS Access Keys are generated by Serverless Framework on every command and the credentials expire after one hour. The Serverless Framework leverages AWS Security Token Service and the AssumeRole API to automate creating and usage of temporary credentials, so your developers can stay productive and work securely without doing this manually.
-
-If you do not use the Serverless Framework Dashboard to set up an AWS Access Role, then you will need to configure your Serverless Framework open source CLI to use the AWS Access Keys stored in [environment variables](https://serverless.com/framework/docs/providers/aws/guide/credentials/) or [AWS Profiles](https://serverless.com/framework/docs/providers/aws/guide/credentials/).
-
-## Link your AWS Account
-
-1. Open the [Dashboard](https://app.serverless.com/)
-2. Once logged in, click "**profiles**" near the top of the page.
-3. Navigate to the profile you would like to configure with the AWS Access Role.
-4. In the **AWS account** tab, click **connect aws** button.
-5. Follow the instructions on AWS which will take you through creating an IAM Role for the Serverless Framework.
-6. Once the IAM Role is created, your profile will be automatically updated.
-
-## Use the generated AWS Access Keys in your service
-
-You don't have to do anything in your `serverless.yml` file. When you run `sls deploy` the Serverless Framework will identify the deployment profile associated with the application or stage and it will generate the AWS Access Keys using the associated AWS Access Role automatically.
-
-## Deploy using AWS Access Roles
-
-That’s it! You are now ready to deploy using your AWS Access Roles.
-
-```
-serverless deploy
-```
diff --git a/docs/guides/profiles.md b/docs/guides/profiles.md
deleted file mode 100644
index f6a804223ad..00000000000
--- a/docs/guides/profiles.md
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--
-title: Serverless Dashboard - Profiles
-menuText: Profiles
-menuOrder: 7
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/guides/profiles/)
-
-<!-- DOCS-SITE-LINK:END -->
-
-> This is a deprecated feature of the dashboard. Please look at our documentation for [Providers](https://www.serverless.com/framework/docs/guides/providers/) and
-> [Parameters](https://www.serverless.com/framework/docs/guides/parameters/) which replaces the use of deployment profiles for setting up AWS connections and parameters.
-
-# Deployment Profiles
-
-Deployment Profiles enable each stage of your Serverless application to use a unique set of [Safeguards](./safeguards.md), [Parameters](./parameters.md) and [Access Roles](./access-roles.md).
-
-## Use Deployment Profiles
-
-Deployment profiles are managed in the [Serverless Framework Dashboard](https://app.serverless.com). When you run `serverless deploy`, the CLI obtains the Safeguard policies, Parameters, and the generated AWS Credentials.
-
-### Creating a new Deployment Profile
-
-Create a new deployment profile by navigating to **profiles** in the [Serverless Framework Dashboard](https://app.serverless.com) and click **add**.
-
-#### name
-
-This is a user-readable name for the deployment profile. Most often it has a name that maps to a stage (e.g. “dev”, “prod”), or in larger organizations the line of business or environment (e.g. “apac-banking-prod”). This name will uniquely identify the deployment profile when associating it with a stage in an application.
-
-#### description
-
-The description helps provide additional context when listing the deployment profiles.
-
-#### access roles, parameters and safeguards
-
-Access Roles, Parameters and Safeguards have individual configuration guides:
-
-- [access roles](./access-roles.md#link-your-aws-account)
-- [safeguard policies](./safeguards.md#configuring-policies)
-- [parameters](./parameters.md)
-
-### Add a deployment profile to your application and stage
-
-Create a new stage by navigating to **applications** in the [Serverless Framework Dashboard](https://app.serverless.com).
-
-1. Expand the application and click into the **stages** tab.
-2. Click **add stage** in the tab
-3. Provide the **name** and select the **deployment profile**.
-
-You can also set the **default deployment profile** field in the application. You can use this to set the deployment profile on all services in that application. When deploying to a stage which hasn't be defined in the dashboard, then the default deployment profile will be used.
-
-### Using a Deployment Profile to deploy
-
-When you run `serverless deploy` Serverless Framework will obtain the AWS Access Key, Parameter and Safeguards associated with the deployment profile configured for that application and stage based on the values for `app` and `stage` in your `serverless.yml` file.
-
-The Serverless Framework will first try to match the current stage from `serverless.yml` with a stage configured on that application in the dashboard. If they match, it will use the deployment profile associated with that stage. If the stages do not match, then the default deployment profile from that application will be used.
diff --git a/docs/guides/safeguards.md b/docs/guides/safeguards.md
deleted file mode 100644
index e3e7c77103f..00000000000
--- a/docs/guides/safeguards.md
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-title: Serverless Dashboard - Safeguards
-menuText: Safeguards
-menuOrder: 9
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/guides/safeguards/)
-
-<!-- DOCS-SITE-LINK:END -->
-
-# Safeguards
-
-**Safeguards** is a policy-as-code framework for Serverless Framework which enables you to inspect your serverless.yml file, and the generated Cloud Formation templates, for compliance with security, operational, and organizational, best practices.
-
-Safeguards was a feature of the Serverless Framework dashboard and available under the legacy team tier. On August 1st, 2020, it was open sourced and made available free-of-charge as a stand-alone Serverless Framework Plugin free of charge.
-
-You can find the new plugin at [serverless/safeguards-plugin](https://github.com/serverless/safeguards-plugin/).

From 0e8346204b5d11b7ba8028dab5c49392675fa1df Mon Sep 17 00:00:00 2001
From: Maciej Skierkowski <maciej@skierkowski.com>
Date: Tue, 21 Sep 2021 08:33:30 -0700
Subject: [PATCH 0493/1101] docs: Update format of the param commands

---
 docs/guides/output-variables.md | 19 +++++++++++++++++--
 docs/guides/parameters.md       | 19 +++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/docs/guides/output-variables.md b/docs/guides/output-variables.md
index 5bdd7c9132c..debf1bce168 100644
--- a/docs/guides/output-variables.md
+++ b/docs/guides/output-variables.md
@@ -67,7 +67,14 @@ Outputs can also be accessed on the CLI. You can use this at development time to
 
 ### List outputs
 
-`sls output list [--org <org>] [--app <app>] [--service <service>] [--stage <stage>] [--region <region>]`
+```
+sls output list
+  [--org <org>]
+  [--app <app>]
+  [--service <service>]
+  [--stage <stage>]
+  [--region <region>]
+```
 
 If you are in a working directory with a `serverless.yml` then the outputs will be listed for the org, app, and service specified in the serverless.yml file.
 
@@ -75,7 +82,15 @@ If you are not in a working directory, without a `serverless.yml`, or if you wan
 
 ### Get an output
 
-`sls output get --name <name> [--org <org>] [--app <app>] [--service <service>] [--stage <stage>] [--region region]`
+```
+sls output get
+  --name <name>
+  [--org <org>]
+  [--app <app>]
+  [--service <service>]
+  [--stage <stage>]
+  [--region region]
+```
 
 Individual outputs can also be accessed from the CLI using the `output get` sub-command. This command requires the `--name <name>` flag to identify the output name.
 
diff --git a/docs/guides/parameters.md b/docs/guides/parameters.md
index cf6226a68ba..b9e240736e6 100644
--- a/docs/guides/parameters.md
+++ b/docs/guides/parameters.md
@@ -43,7 +43,14 @@ Parameters can also be accessed on the CLI. You can use this at development time
 
 ### List parameters
 
-`sls param list [--org <org>] [--app <app>] [--service <service>] [--stage <stage>] [--region <region>]`
+```
+sls param list
+  [--org <org>]
+  [--app <app>]
+  [--service <service>]
+  [--stage <stage>]
+  [--region <region>]
+```
 
 If you are in a working directory with a `serverless.yml` then the parameters will be listed for the org, app, and service specified in the `serverless.yml` file.
 
@@ -51,6 +58,14 @@ If you are not in a working directory, without a `serverless.yml`, or if you wan
 
 ### Get a parameter
 
-`sls param get --name <name> [--org <org>] [--app <app>] [--service <service>] [--stage <stage>] [--region <region>]`
+```
+sls param get
+  --name <name>
+  [--org <org>]
+  [--app <app>]
+  [--service <service>]
+  [--stage <stage>]
+  [--region <region>]
+```
 
 Individual parameters can also be accessed from the CLI using the `param get` sub-command. This command requires the `--name <name>` flag to identify the parameter name. Like the `sls param list`, you can optionally specify a different org, app, service, stage, ore region using flags.

From af39fc016bd6386ea7d5d1ff71a26553a25b7ec5 Mon Sep 17 00:00:00 2001
From: Guilherme Martins Crocetti <gmcrocetti@gmail.com>
Date: Wed, 22 Sep 2021 05:38:23 -0300
Subject: [PATCH 0494/1101] feat(AWS Stream): Support `tumblingWindowInSeconds`
 (#9979)

---
 docs/providers/aws/events/streams.md          | 23 ++++++++
 .../aws/package/compile/events/stream.js      | 10 +++-
 .../aws/package/compile/events/stream.test.js | 59 +++++++++++++++++++
 3 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/docs/providers/aws/events/streams.md b/docs/providers/aws/events/streams.md
index 12fed255ccb..6dca19d65ba 100644
--- a/docs/providers/aws/events/streams.md
+++ b/docs/providers/aws/events/streams.md
@@ -320,3 +320,26 @@ functions:
 ```
 
 For more information, read this [AWS blog post](https://aws.amazon.com/blogs/compute/increasing-real-time-stream-processing-performance-with-amazon-kinesis-data-streams-enhanced-fan-out-and-aws-lambda/) or this [AWS documentation](https://docs.aws.amazon.com/streams/latest/dev/introduction-to-enhanced-consumers.html).
+
+## Setting TumblingWindowInSeconds
+
+This configuration allows customers to aggregate values in near-realtime, allowing state to by passed forward by Lambda invocations. A event source created with this property adds several new attributes to the events delivered to the Lambda function.
+
+- **window**: beginning and ending timestamps of the tumbling window;
+- **state**: an object containing state of a previous execution. Initially empty can contain up to **1mb** of data;
+- **isFinalInvokeForWindow**: indicates if this is the last execution for the tumbling window;
+- **isWindowTerminatedEarly**: happens only when the state object exceeds maximum allowed size of 1mb.
+
+For more information and examples, read the [AWS release announcement](https://aws.amazon.com/blogs/compute/using-aws-lambda-for-streaming-analytics/)
+
+Note: Serverless only sets this property if you explicitly add it to the stream configuration (see example below).
+
+```yml
+functions:
+  preprocess:
+    handler: handler.preprocess
+    events:
+      - stream:
+          arn: arn:aws:dynamodb:region:XXXXXX:table/foo/stream/1970-01-01T00:00:00.000
+          tumblingWindowInSeconds: 30
+```
diff --git a/lib/plugins/aws/package/compile/events/stream.js b/lib/plugins/aws/package/compile/events/stream.js
index 622206a5945..03264140bcb 100644
--- a/lib/plugins/aws/package/compile/events/stream.js
+++ b/lib/plugins/aws/package/compile/events/stream.js
@@ -68,6 +68,7 @@ class AwsCompileStreamEvents {
               additionalProperties: false,
               required: ['onFailure'],
             },
+            tumblingWindowInSeconds: { type: 'integer', minimum: 0, maximum: 900 },
           },
           additionalProperties: false,
           anyOf: [
@@ -203,11 +204,11 @@ class AwsCompileStreamEvents {
               DependsOn: dependsOn,
               Properties: {
                 BatchSize,
-                ParallelizationFactor,
+                Enabled,
                 EventSourceArn,
                 FunctionName: resolveLambdaTarget(functionName, functionObj),
+                ParallelizationFactor,
                 StartingPosition,
-                Enabled,
               },
             };
 
@@ -242,6 +243,11 @@ class AwsCompileStreamEvents {
                 event.stream.maximumRecordAgeInSeconds;
             }
 
+            if (event.stream.tumblingWindowInSeconds != null) {
+              streamResource.Properties.TumblingWindowInSeconds =
+                event.stream.tumblingWindowInSeconds;
+            }
+
             if (event.stream.destinations) {
               let OnFailureDestinationArn;
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/stream.test.js b/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
index 910e424d64c..4966c3fda9b 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
@@ -1665,4 +1665,63 @@ describe('AwsCompileStreamEvents #2', () => {
       ]);
     });
   });
+  describe('with TumblingWindowInSeconds enabled', () => {
+    let eventSourceMappingKinesisResource;
+    let eventSourceMappingDynamoDBResource;
+    let eventSourceMappingNoTumblingResource;
+
+    before(async () => {
+      const { awsNaming, cfTemplate } = await runServerless({
+        fixture: 'function',
+        configExt: {
+          functions: {
+            foo: {
+              events: [
+                {
+                  stream: {
+                    arn: 'arn:aws:kinesis:us-east-1:123456789012:stream/myKinesisStream',
+                    tumblingWindowInSeconds: 30,
+                  },
+                },
+                {
+                  stream: {
+                    arn: 'arn:aws:dynamodb:region:account:table/myDDBstream/stream/1',
+                    tumblingWindowInSeconds: 50,
+                  },
+                },
+                {
+                  stream: {
+                    arn: 'arn:aws:dynamodb:region:account:table/noTumblingStream/stream/1',
+                  },
+                },
+              ],
+            },
+          },
+        },
+        command: 'package',
+      });
+      const kinesisLogicalId = awsNaming.getStreamLogicalId('foo', 'kinesis', 'myKinesisStream');
+      const dynamoLogicalId = awsNaming.getStreamLogicalId('foo', 'dynamodb', 'myDDBstream');
+      const noTumblingLogicalId = awsNaming.getStreamLogicalId(
+        'foo',
+        'dynamodb',
+        'noTumblingStream'
+      );
+
+      eventSourceMappingKinesisResource = cfTemplate.Resources[kinesisLogicalId];
+      eventSourceMappingDynamoDBResource = cfTemplate.Resources[dynamoLogicalId];
+      eventSourceMappingNoTumblingResource = cfTemplate.Resources[noTumblingLogicalId];
+    });
+
+    it('should have TumblingWindowInSeconds property', () => {
+      expect(eventSourceMappingKinesisResource.Properties.TumblingWindowInSeconds).to.equal(30);
+      expect(eventSourceMappingDynamoDBResource.Properties.TumblingWindowInSeconds).to.equal(50);
+    });
+
+    it('should not have TumblingWindowInSeconds property', () => {
+      expect(eventSourceMappingNoTumblingResource.Properties).to.not.have.property(
+        'TumblingWindowInSeconds'
+      );
+    });
+  });
 });

From 54bb13b6a6d3fd41548615fc23f4ae4d6d663dcc Mon Sep 17 00:00:00 2001
From: John Armstrong <jlarmst@g.clemson.edu>
Date: Wed, 22 Sep 2021 06:15:21 -0400
Subject: [PATCH 0495/1101] fix(AWS S3): Recognize `BucketKeyEnabled` setting
 (#9985)

---
 lib/plugins/aws/package/compile/events/s3/configSchema.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/plugins/aws/package/compile/events/s3/configSchema.js b/lib/plugins/aws/package/compile/events/s3/configSchema.js
index ef31596f6b1..655ab5053f4 100644
--- a/lib/plugins/aws/package/compile/events/s3/configSchema.js
+++ b/lib/plugins/aws/package/compile/events/s3/configSchema.js
@@ -168,6 +168,9 @@ module.exports = {
                 required: ['SSEAlgorithm'],
                 additionalProperties: false,
               },
+              BucketKeyEnabled: {
+                type: 'boolean',
+              },
             },
             additionalProperties: false,
           },

From e0befa48bb47a1cb04f2d293e607a064f66da2db Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 22 Sep 2021 14:21:18 +0200
Subject: [PATCH 0496/1101] refactor(CLI): Improve log spacing

---
 lib/plugins/aws/deploy/index.js  | 11 +++++++----
 lib/plugins/aws/package/index.js |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index 6a2a4b342a0..e40dce8e30d 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -78,7 +78,7 @@ class AwsDeploy {
               .getProvider('aws')
               .getStage()} ${style.aside(`(${this.serverless.getProvider('aws').getRegion()})`)}`
           );
-          log.notice();
+          log.info(); // Ensure gap between verbose logging
         }
       },
 
@@ -168,8 +168,9 @@ class AwsDeploy {
         if (this.serverless.processedInput.commands.join(' ') !== 'deploy') return;
         if (this.options.function) return;
         if (this.serverless.service.provider.shouldNotDeploy) {
+          log.notice();
           log.notice(
-            `\n${style.noticeSymbol('∅')} No changes to deploy. Deployment skipped. ${style.aside(
+            `${style.noticeSymbol('∅')} No changes to deploy. Deployment skipped. ${style.aside(
               `(${Math.floor(
                 (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
               )}s)`
@@ -177,16 +178,18 @@ class AwsDeploy {
           );
           return;
         }
+        log.notice();
         log.notice(
-          `\n${style.noticeSymbol('✔')} Service deployed to stack ${this.serverless
+          `${style.noticeSymbol('✔')} Service deployed to stack ${this.serverless
             .getProvider('aws')
             .naming.getStackName()} ${style.aside(
             `(${Math.floor(
               (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
             )}s)`
-          )}\n`
+          )}`
         );
         if (this.serverless.serviceOutputs) {
+          writeText();
           for (const [section, entries] of this.serverless.serviceOutputs) {
             if (typeof entries === 'string') {
               writeText(`${style.aside(`${section}:`)} ${entries}`);
diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
index 8ca4c2bdffe..5f8c9a9ebee 100644
--- a/lib/plugins/aws/package/index.js
+++ b/lib/plugins/aws/package/index.js
@@ -66,7 +66,7 @@ class AwsPackage {
               .getProvider('aws')
               .getStage()} ${style.aside(`(${this.serverless.getProvider('aws').getRegion()})`)}`
           );
-          log.notice();
+          log.info(); // Ensure gap between verbose logging
         }
       },
       'before:package:cleanup': () => mainProgress.notice('Packaging', { isMainEvent: true }),

From 0f0b85a6373dfcd9d21f1668e7fb3e0d20a3b393 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 22 Sep 2021 14:36:51 +0200
Subject: [PATCH 0497/1101] refactor(CLI): Convert custom resoource related log

---
 lib/plugins/aws/customResources/index.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/plugins/aws/customResources/index.js b/lib/plugins/aws/customResources/index.js
index fe8d78695bd..872c33e3a7d 100644
--- a/lib/plugins/aws/customResources/index.js
+++ b/lib/plugins/aws/customResources/index.js
@@ -5,14 +5,18 @@ const path = require('path');
 const crypto = require('crypto');
 const BbPromise = require('bluebird');
 const fse = require('fs-extra');
+const { log, legacy } = require('@serverless/utils/log');
 const generateZip = require('./generateZip');
 const ServerlessError = require('../../../serverless-error');
 
-const prepareCustomResourcePackage = _.memoize(async (zipFilePath) =>
-  BbPromise.all([generateZip(), fse.mkdirs(path.dirname(zipFilePath))])
+const prepareCustomResourcePackage = _.memoize(async (zipFilePath) => {
+  // TODO: check every once in a while if external packages are still necessary
+  legacy.log('Installing dependencies for custom CloudFormation resources...');
+  log.info('Installing dependencies for custom CloudFormation resources');
+  return BbPromise.all([generateZip(), fse.mkdirs(path.dirname(zipFilePath))])
     .then(([cachedZipFilePath]) => fse.copy(cachedZipFilePath, zipFilePath))
-    .then(() => path.basename(zipFilePath))
-);
+    .then(() => path.basename(zipFilePath));
+});
 
 async function addCustomResourceToService(awsProvider, resourceName, iamRoleStatements) {
   let functionName;
@@ -71,9 +75,6 @@ async function addCustomResourceToService(awsProvider, resourceName, iamRoleStat
       .digest('hex')}`;
   }
 
-  // TODO: check every once in a while if external packages are still necessary
-  serverless.cli.log('Installing dependencies for custom CloudFormation resources...');
-
   const zipFileBasename = await prepareCustomResourcePackage(zipFilePath);
   let S3Bucket = {
     Ref: awsProvider.naming.getDeploymentBucketLogicalId(),

From 43d17debee20bfc7ee535fd643df0538f8bee9f8 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 22 Sep 2021 15:29:21 +0200
Subject: [PATCH 0498/1101] fix(CLI): Ensure to write outputs with modern logs
 on `sls info`

---
 lib/cli/write-service-outputs.js | 14 ++++++++++++++
 lib/plugins/aws/deploy/index.js  | 14 +++-----------
 lib/plugins/aws/info/index.js    |  7 +++++++
 3 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 lib/cli/write-service-outputs.js

diff --git a/lib/cli/write-service-outputs.js b/lib/cli/write-service-outputs.js
new file mode 100644
index 00000000000..56b98868399
--- /dev/null
+++ b/lib/cli/write-service-outputs.js
@@ -0,0 +1,14 @@
+'use strict';
+
+const { writeText, style } = require('@serverless/utils/log');
+
+module.exports = (serviceOutputs) => {
+  writeText();
+  for (const [section, entries] of serviceOutputs) {
+    if (typeof entries === 'string') {
+      writeText(`${style.aside(`${section}:`)} ${entries}`);
+    } else {
+      writeText(`${style.aside(`${section}:\n`)}  ${entries.join('\n  ')}`);
+    }
+  }
+};
diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index e40dce8e30d..ff45fa16f95 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const writeServiceOutputs = require('../../../cli/write-service-outputs');
 const extendedValidate = require('./lib/extendedValidate');
 const setBucketName = require('../lib/setBucketName');
 const checkForChanges = require('./lib/checkForChanges');
@@ -11,7 +12,7 @@ const validateTemplate = require('./lib/validateTemplate');
 const updateStack = require('../lib/updateStack');
 const existsDeploymentBucket = require('./lib/existsDeploymentBucket');
 const path = require('path');
-const { style, log, writeText, progress } = require('@serverless/utils/log');
+const { style, log, progress } = require('@serverless/utils/log');
 const memoize = require('memoizee');
 
 const mainProgress = progress.get('main');
@@ -188,16 +189,7 @@ class AwsDeploy {
             )}s)`
           )}`
         );
-        if (this.serverless.serviceOutputs) {
-          writeText();
-          for (const [section, entries] of this.serverless.serviceOutputs) {
-            if (typeof entries === 'string') {
-              writeText(`${style.aside(`${section}:`)} ${entries}`);
-            } else {
-              writeText(`${style.aside(`${section}:\n`)}  ${entries.join('\n  ')}`);
-            }
-          }
-        }
+        if (this.serverless.serviceOutputs) writeServiceOutputs(this.serverless.serviceOutputs);
       },
     };
   }
diff --git a/lib/plugins/aws/info/index.js b/lib/plugins/aws/info/index.js
index a518961c0a2..eac8ba9e236 100644
--- a/lib/plugins/aws/info/index.js
+++ b/lib/plugins/aws/info/index.js
@@ -2,6 +2,7 @@
 
 const BbPromise = require('bluebird');
 const { progress } = require('@serverless/utils/log');
+const writeServiceOutputs = require('../../../cli/write-service-outputs');
 const validate = require('../lib/validate');
 const getStackInfo = require('./getStackInfo');
 const getResourceCount = require('./getResourceCount');
@@ -68,6 +69,12 @@ class AwsInfo {
 
       'aws:info:displayStackOutputs': async () =>
         BbPromise.bind(this).then(this.displayStackOutputs),
+
+      'finalize': () => {
+        if (this.serverless.processedInput.commands.join(' ') !== 'info') return;
+
+        if (this.serverless.serviceOutputs) writeServiceOutputs(this.serverless.serviceOutputs);
+      },
     };
   }
 }

From 8a75984809569f28e8a70b6b9529a5e2d8314de4 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 22 Sep 2021 15:51:53 +0200
Subject: [PATCH 0499/1101] chore: Bump log related dependencies

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e7e1d72a76c..e487b071368 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@serverless/components": "^3.17.0",
     "@serverless/dashboard-plugin": "^5.4.4",
     "@serverless/platform-client": "^4.3.0",
-    "@serverless/utils": "^5.14.0",
+    "@serverless/utils": "^5.15.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
@@ -37,7 +37,7 @@
     "chalk": "^4.1.2",
     "child-process-ext": "^2.1.1",
     "ci-info": "^3.2.0",
-    "cli-progress-footer": "^2.0.2",
+    "cli-progress-footer": "^2.1.1",
     "d": "^1.0.1",
     "dayjs": "^1.10.7",
     "decompress": "^4.2.1",

From 4d42ce3fa4f44f63d68a3841752746021500fe4f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 22 Sep 2021 16:14:42 +0200
Subject: [PATCH 0500/1101] feat(CLI): Modern logs for `deploy function`
 command

---
 lib/plugins/aws/deployFunction.js             | 83 +++++++++++++++++--
 lib/plugins/package/package.js                |  3 +-
 .../lib/plugins/aws/deployFunction.test.js    |  6 --
 3 files changed, 76 insertions(+), 16 deletions(-)

diff --git a/lib/plugins/aws/deployFunction.js b/lib/plugins/aws/deployFunction.js
index fb30c7c7f26..6537cc6637e 100644
--- a/lib/plugins/aws/deployFunction.js
+++ b/lib/plugins/aws/deployFunction.js
@@ -8,6 +8,9 @@ const wait = require('timers-ext/promise/sleep');
 const validate = require('./lib/validate');
 const filesize = require('filesize');
 const ServerlessError = require('../../serverless-error');
+const { log, style, legacy, progress } = require('@serverless/utils/log');
+
+const mainProgress = progress.get('main');
 
 class AwsDeployFunction {
   constructor(serverless, options) {
@@ -22,6 +25,21 @@ class AwsDeployFunction {
     Object.assign(this, validate);
 
     this.hooks = {
+      'initialize': () => {
+        const commandName = this.serverless.processedInput.commands.join(' ');
+        // TODO: Remove second part of condition with v3
+        if (commandName !== 'deploy function' && !(commandName === 'deploy' && options.function)) {
+          return;
+        }
+        log.notice();
+        log.notice(
+          `Deploying function ${this.options.function} to stage ${this.serverless
+            .getProvider('aws')
+            .getStage()} ${style.aside(`(${this.serverless.getProvider('aws').getRegion()})`)}`
+        );
+      },
+      'before:deploy:function:initialize': () =>
+        mainProgress.notice('Validating', { isMainEvent: true }),
       'deploy:function:initialize': async () => {
         await this.validate();
         await this.checkIfFunctionExists();
@@ -45,9 +63,13 @@ class AwsDeployFunction {
         }
       },
 
+      'before:deploy:function:packageFunction': () =>
+        mainProgress.notice('Retrieving function info', { isMainEvent: true }),
       'deploy:function:packageFunction': async () =>
         this.serverless.pluginManager.spawn('package:function'),
 
+      'before:deploy:function:deploy': () =>
+        mainProgress.notice('Packaging', { isMainEvent: true }),
       'deploy:function:deploy': async () => {
         if (!this.options['update-config']) {
           await this.deployFunction();
@@ -167,7 +189,7 @@ class AwsDeployFunction {
       }
     };
     await callWithRetry();
-    this.serverless.cli.log(`Successfully updated function: ${this.options.function}`);
+    legacy.log(`Successfully updated function: ${this.options.function}`);
   }
 
   async updateFunctionConfiguration() {
@@ -349,13 +371,28 @@ class AwsDeployFunction {
     }
 
     if (!Object.keys(_.omit(params, 'FunctionName')).length) {
-      this.serverless.cli.log(
-        'Configuration did not change. Skipping function configuration update.'
+      legacy.log('Configuration did not change. Skipping function configuration update.');
+      if (this.options['update-config']) log.notice();
+      log.notice(
+        `${style.noticeSymbol(
+          '∅'
+        )} Configuration did not change. Configuration update skipped. ${style.aside(
+          `(${Math.floor(
+            (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+          )}s)`
+        )}`
       );
       return;
     }
 
+    mainProgress.notice('Updating function configuration', { isMainEvent: true });
     await this.callUpdateFunctionConfiguration(params);
+    if (this.options['update-config']) log.notice();
+    log.notice(
+      `${style.noticeSymbol('✔')} Function configuration updated ${style.aside(
+        `(${Math.floor((Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000)}s)`
+      )}\n`
+    );
   }
 
   async deployFunction() {
@@ -371,7 +408,17 @@ class AwsDeployFunction {
       const remoteImageSha =
         this.serverless.service.provider.remoteFunctionData.Configuration.CodeSha256;
       if (remoteImageSha === functionImageSha && !this.options.force) {
-        this.serverless.cli.log('Image did not change. Skipping function deployment.');
+        log.notice();
+        log.notice(
+          `${style.noticeSymbol(
+            '∅'
+          )} Image did not change. Function deployment skipped. ${style.aside(
+            `(${Math.floor(
+              (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+            )}s)`
+          )}`
+        );
+        legacy.log('Image did not change. Skipping function deployment.');
         return;
       }
       params.ImageUri = functionImageUri;
@@ -391,20 +438,38 @@ class AwsDeployFunction {
       const localHash = crypto.createHash('sha256').update(data).digest('base64');
 
       if (remoteHash === localHash && !this.options.force) {
-        this.serverless.cli.log('Code not changed. Skipping function deployment.');
+        legacy.log('Code not changed. Skipping function deployment.');
+        log.notice();
+        log.notice(
+          `${style.noticeSymbol(
+            '∅'
+          )} Code did not change. Function deployment skipped. ${style.aside(
+            `(${Math.floor(
+              (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+            )}s)`
+          )}`
+        );
         return;
       }
 
       params.ZipFile = data;
 
       const stats = fs.statSync(artifactFilePath);
-      this.serverless.cli.log(
-        `Uploading function: ${this.options.function} (${filesize(stats.size)})...`
-      );
+      legacy.log(`Uploading function: ${this.options.function} (${filesize(stats.size)})...`);
+      mainProgress.notice(`Uploading ${style.aside(`(${filesize(stats.size)})`)}`, {
+        isMainEvent: true,
+      });
     }
 
+    mainProgress.notice('Deploying', { isMainEvent: true });
     await this.provider.request('Lambda', 'updateFunctionCode', params);
-    this.serverless.cli.log(`Successfully deployed function: ${this.options.function}`);
+    legacy.log(`Successfully deployed function: ${this.options.function}`);
+    log.notice();
+    log.notice(
+      `${style.noticeSymbol('✔')} Function code deployed ${style.aside(
+        `(${Math.floor((Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000)}s)`
+      )}`
+    );
   }
 }
 
diff --git a/lib/plugins/package/package.js b/lib/plugins/package/package.js
index 33094f0ea96..5a432ef1dfe 100644
--- a/lib/plugins/package/package.js
+++ b/lib/plugins/package/package.js
@@ -6,6 +6,7 @@ const ServerlessError = require('../../serverless-error');
 const cliCommandsSchema = require('../../cli/commands-schema');
 const zipService = require('./lib/zipService');
 const packageService = require('./lib/packageService');
+const { legacy } = require('@serverless/utils/log');
 
 class Package {
   constructor(serverless, options) {
@@ -56,7 +57,7 @@ class Package {
 
       'package:function:package': async () => {
         if (this.options.function) {
-          this.serverless.cli.log(`Packaging function: ${this.options.function}...`);
+          legacy.log(`Packaging function: ${this.options.function}...`);
           return BbPromise.resolve(this.packageFunction(this.options.function));
         }
         return BbPromise.reject(
diff --git a/test/unit/lib/plugins/aws/deployFunction.test.js b/test/unit/lib/plugins/aws/deployFunction.test.js
index faa582549e3..ec55037521d 100644
--- a/test/unit/lib/plugins/aws/deployFunction.test.js
+++ b/test/unit/lib/plugins/aws/deployFunction.test.js
@@ -197,7 +197,6 @@ describe('AwsDeployFunction', () => {
       serverless.utils.writeFileSync(artifactFilePath, 'first.zip file content');
       updateFunctionCodeStub = sinon.stub(awsDeployFunction.provider, 'request').resolves();
       statSyncStub = sinon.stub(fs, 'statSync').returns({ size: 1024 });
-      sinon.spy(awsDeployFunction.serverless.cli, 'log');
       readFileSyncStub = sinon.stub(fs, 'readFileSync').returns();
       awsDeployFunction.serverless.service.provider.remoteFunctionData = {
         Configuration: {
@@ -252,11 +251,8 @@ describe('AwsDeployFunction', () => {
 
       await awsDeployFunction.deployFunction();
 
-      const expected = 'Code not changed. Skipping function deployment.';
-
       expect(updateFunctionCodeStub.calledOnce).to.be.equal(false);
       expect(readFileSyncStub.calledOnce).to.equal(true);
-      expect(awsDeployFunction.serverless.cli.log.calledWithExactly(expected)).to.equal(true);
       expect(readFileSyncStub.calledWithExactly(artifactFilePath)).to.equal(true);
     });
 
@@ -266,10 +262,8 @@ describe('AwsDeployFunction', () => {
 
       await awsDeployFunction.deployFunction();
 
-      const expected = 'Uploading function: first (1.02 kB)...';
       expect(readFileSyncStub.calledOnce).to.equal(true);
       expect(statSyncStub.calledOnce).to.equal(true);
-      expect(awsDeployFunction.serverless.cli.log.calledWithExactly(expected)).to.be.equal(true);
       expect(readFileSyncStub.calledWithExactly(artifactFilePath)).to.equal(true);
     });
 

From 10df2e5300e04ec9d00ebd343d9d8fe30c96afa7 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 22 Sep 2021 16:16:39 +0200
Subject: [PATCH 0501/1101] feat(CLI): Modern verbose logs for `deploy
 function` command

---
 lib/plugins/aws/deployFunction.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/plugins/aws/deployFunction.js b/lib/plugins/aws/deployFunction.js
index 6537cc6637e..3ecd0e2f091 100644
--- a/lib/plugins/aws/deployFunction.js
+++ b/lib/plugins/aws/deployFunction.js
@@ -37,6 +37,7 @@ class AwsDeployFunction {
             .getProvider('aws')
             .getStage()} ${style.aside(`(${this.serverless.getProvider('aws').getRegion()})`)}`
         );
+        log.info();
       },
       'before:deploy:function:initialize': () =>
         mainProgress.notice('Validating', { isMainEvent: true }),

From 6e5c39ee4c758b239884885ac0267d45f2de1201 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 22 Sep 2021 17:04:56 +0200
Subject: [PATCH 0502/1101] refactor(CLI): Do not show progress bar in `info`
 command

---
 lib/plugins/aws/info/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/plugins/aws/info/index.js b/lib/plugins/aws/info/index.js
index eac8ba9e236..4e6528788f3 100644
--- a/lib/plugins/aws/info/index.js
+++ b/lib/plugins/aws/info/index.js
@@ -47,6 +47,8 @@ class AwsInfo {
         }),
 
       'before:aws:info:validate': () => {
+        const isDeployCommand = this.serverless.processedInput.commands.join(' ') === 'deploy';
+        if (!isDeployCommand) return;
         mainProgress.notice('Retrieving CloudFormation stack info', { isMainEvent: true });
       },
       'aws:info:validate': async () => BbPromise.bind(this).then(this.validate),

From cbd2e64f705e54e37dd9116d0931a3a96bceaa88 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 22 Sep 2021 18:06:49 +0200
Subject: [PATCH 0503/1101] refactor(CLI): Moder logs for `logs` command

---
 lib/plugins/aws/logs.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/aws/logs.js b/lib/plugins/aws/logs.js
index 2dfbea9a5a9..05948da4880 100644
--- a/lib/plugins/aws/logs.js
+++ b/lib/plugins/aws/logs.js
@@ -4,6 +4,8 @@ const _ = require('lodash');
 const dayjs = require('dayjs');
 const utc = require('dayjs/plugin/utc');
 const wait = require('timers-ext/promise/sleep');
+const stripAnsi = require('strip-ansi');
+const { legacy, writeText, style } = require('@serverless/utils/log');
 const validate = require('./lib/validate');
 const formatLambdaLogEvent = require('./utils/formatLambdaLogEvent');
 const ServerlessError = require('../../serverless-error');
@@ -94,7 +96,9 @@ class AwsLogs {
     const results = await this.provider.request('CloudWatchLogs', 'filterLogEvents', params);
     if (results.events) {
       results.events.forEach((e) => {
-        process.stdout.write(formatLambdaLogEvent(e.message));
+        const text = formatLambdaLogEvent(e.message);
+        legacy.write(text);
+        writeText(style.aside(stripAnsi(text).trimRight()));
       });
     }
 

From 0833fd03d17d292bd4393ecec9569328daae68d2 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 23 Sep 2021 13:11:24 +0200
Subject: [PATCH 0504/1101] fix(CLI): Fix general help output when in context
 of AWS service

No AWS specific commands were listed
---
 scripts/serverless.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index a09c6cf59e4..e0873c58ec9 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -184,6 +184,7 @@ const processSpanPromise = (async () => {
 
       const resolveConfigurationPath = require('../lib/cli/resolve-configuration-path');
       const readConfiguration = require('../lib/configuration/read');
+      const resolveProviderName = require('../lib/configuration/resolve-provider-name');
 
       // Resolve eventual service configuration path
       configurationPath = await resolveConfigurationPath();
@@ -241,7 +242,6 @@ const processSpanPromise = (async () => {
           }
 
           const resolveVariablesMeta = require('../lib/configuration/variables/resolve-meta');
-          const resolveProviderName = require('../lib/configuration/resolve-provider-name');
 
           variablesMeta = resolveVariablesMeta(configuration);
 
@@ -481,6 +481,15 @@ const processSpanPromise = (async () => {
             ensureResolvedProperty('provider\0region', { shouldSilentlyReturnIfLegacyMode: true });
           }
         })();
+
+        // Ensure to have full AWS commands schema loaded if we're in context of AWS provider
+        // It's not the case if not AWS service specific command was resolved
+        if (configuration && resolveProviderName(configuration) === 'aws') {
+          resolveInput.clear();
+          ({ command, commands, options, isHelpRequest, commandSchema } = resolveInput(
+            require('../lib/cli/commands-schema/aws-service')
+          ));
+        }
       } else {
         // In non-service context we recognize all AWS service commands
         resolveInput.clear();

From ac5dc604feb18deef4360a1c420c9867e5662c08 Mon Sep 17 00:00:00 2001
From: Adam Hevenor <adam.hevenor@anchore.com>
Date: Thu, 23 Sep 2021 07:44:30 -0600
Subject: [PATCH 0505/1101] docs: Clear leftover use of "pro dashboard" (#9996)

---
 docs/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/README.md b/docs/README.md
index 730af3fd5dc..d601b824710 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -47,7 +47,7 @@ If you prefer to start on the CLI, use our [get started](https://serverless.com/
 
 **If you are an experienced user of the Serverless Framework**
 
-Our [Pro dashboard](https://serverless.com/pro/) allows you to import existing projects. Track performance, troubleshoot, configure CI/CD and deployment policies, and get end-to-end serverless application lifecycle management.
+Our [hosted dashboard](https://app.serverless.com/) allows you to import existing projects. Track performance, troubleshoot, configure CI/CD and deployment policies, and get end-to-end serverless application lifecycle management.
 [Get started](https://app.serverless.com) for free.
 
 Have questions? Visit our [Forum](https://forum.serverless.com/).

From 9a21532528b8bcf2b8ce87967f672bfe2b440f2a Mon Sep 17 00:00:00 2001
From: Stafford Williams <staff0rd@users.noreply.github.com>
Date: Fri, 24 Sep 2021 00:23:32 +1000
Subject: [PATCH 0506/1101] docs: Improve Alibaba provider documentation
 (#9997)

---
 docs/providers/aliyun/guide/events.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/providers/aliyun/guide/events.md b/docs/providers/aliyun/guide/events.md
index a0d30a987e5..21c486b43dd 100644
--- a/docs/providers/aliyun/guide/events.md
+++ b/docs/providers/aliyun/guide/events.md
@@ -16,7 +16,7 @@ layout: Doc
 
 Simply put, events are the things that trigger your functions to run.
 
-If you are using Alibaba Cloud as your provider, all `events` in the service are anything in Alibaba Cloud that can trigger your Functions, like HTTP endpoints, OSS events, etc..
+If you are using Alibaba Cloud as your provider, `events` in the service are limited to the Alibaba Cloud triggers HTTP and OSS.
 
 [View the Alibaba Cloud Function Compute events section for a list of supported events](../events)
 
@@ -40,7 +40,7 @@ functions:
 
 ## Types
 
-The Serverless Framework supports all of Alibaba Cloud Function Compute events. Instead of listing them here, we've put them in a separate section. [Check out the events section for more information.](../events)
+The Serverless Framework supports the Alibaba Cloud Function Compute events `oss` and `http`. Instead of listing them here, we've put them in a separate section. [Check out the events section for more information.](../events)
 
 ## Deploying
 

From 8c9bd4a6eda58d2ed6da08cc3bb806d970df4d17 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 23 Sep 2021 15:47:11 +0200
Subject: [PATCH 0507/1101] refactor(CLI): Adapt pre-created log style
 generators

---
 lib/plugins/aws/deploy/index.js   |  8 ++++----
 lib/plugins/aws/deployFunction.js | 26 ++++++++++----------------
 lib/plugins/aws/package/index.js  |  4 ++--
 package.json                      |  2 +-
 4 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index ff45fa16f95..7979a9651e5 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -170,8 +170,8 @@ class AwsDeploy {
         if (this.options.function) return;
         if (this.serverless.service.provider.shouldNotDeploy) {
           log.notice();
-          log.notice(
-            `${style.noticeSymbol('∅')} No changes to deploy. Deployment skipped. ${style.aside(
+          log.notice.skip(
+            `No changes to deploy. Deployment skipped. ${style.aside(
               `(${Math.floor(
                 (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
               )}s)`
@@ -180,8 +180,8 @@ class AwsDeploy {
           return;
         }
         log.notice();
-        log.notice(
-          `${style.noticeSymbol('✔')} Service deployed to stack ${this.serverless
+        log.notice.success(
+          `Service deployed to stack ${this.serverless
             .getProvider('aws')
             .naming.getStackName()} ${style.aside(
             `(${Math.floor(
diff --git a/lib/plugins/aws/deployFunction.js b/lib/plugins/aws/deployFunction.js
index 3ecd0e2f091..680b673dcc5 100644
--- a/lib/plugins/aws/deployFunction.js
+++ b/lib/plugins/aws/deployFunction.js
@@ -374,10 +374,8 @@ class AwsDeployFunction {
     if (!Object.keys(_.omit(params, 'FunctionName')).length) {
       legacy.log('Configuration did not change. Skipping function configuration update.');
       if (this.options['update-config']) log.notice();
-      log.notice(
-        `${style.noticeSymbol(
-          '∅'
-        )} Configuration did not change. Configuration update skipped. ${style.aside(
+      log.notice.skip(
+        `Configuration did not change. Configuration update skipped. ${style.aside(
           `(${Math.floor(
             (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
           )}s)`
@@ -389,8 +387,8 @@ class AwsDeployFunction {
     mainProgress.notice('Updating function configuration', { isMainEvent: true });
     await this.callUpdateFunctionConfiguration(params);
     if (this.options['update-config']) log.notice();
-    log.notice(
-      `${style.noticeSymbol('✔')} Function configuration updated ${style.aside(
+    log.notice.success(
+      `Function configuration updated ${style.aside(
         `(${Math.floor((Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000)}s)`
       )}\n`
     );
@@ -410,10 +408,8 @@ class AwsDeployFunction {
         this.serverless.service.provider.remoteFunctionData.Configuration.CodeSha256;
       if (remoteImageSha === functionImageSha && !this.options.force) {
         log.notice();
-        log.notice(
-          `${style.noticeSymbol(
-            '∅'
-          )} Image did not change. Function deployment skipped. ${style.aside(
+        log.notice.skip(
+          `Image did not change. Function deployment skipped. ${style.aside(
             `(${Math.floor(
               (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
             )}s)`
@@ -441,10 +437,8 @@ class AwsDeployFunction {
       if (remoteHash === localHash && !this.options.force) {
         legacy.log('Code not changed. Skipping function deployment.');
         log.notice();
-        log.notice(
-          `${style.noticeSymbol(
-            '∅'
-          )} Code did not change. Function deployment skipped. ${style.aside(
+        log.notice.skip(
+          `Code did not change. Function deployment skipped. ${style.aside(
             `(${Math.floor(
               (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
             )}s)`
@@ -466,8 +460,8 @@ class AwsDeployFunction {
     await this.provider.request('Lambda', 'updateFunctionCode', params);
     legacy.log(`Successfully deployed function: ${this.options.function}`);
     log.notice();
-    log.notice(
-      `${style.noticeSymbol('✔')} Function code deployed ${style.aside(
+    log.notice.success(
+      `Function code deployed ${style.aside(
         `(${Math.floor((Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000)}s)`
       )}`
     );
diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
index 5f8c9a9ebee..91c6e7235c2 100644
--- a/lib/plugins/aws/package/index.js
+++ b/lib/plugins/aws/package/index.js
@@ -121,8 +121,8 @@ class AwsPackage {
       'finalize': () => {
         if (this.serverless.processedInput.commands.join(' ') === 'package') {
           log.notice();
-          log.notice(
-            `${style.noticeSymbol('✔')} Service packaged ${style.aside(
+          log.notice.success(
+            `Service packaged ${style.aside(
               `(${Math.floor(
                 (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
               )}s)`
diff --git a/package.json b/package.json
index e487b071368..0345a5f69d5 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@serverless/components": "^3.17.0",
     "@serverless/dashboard-plugin": "^5.4.4",
     "@serverless/platform-client": "^4.3.0",
-    "@serverless/utils": "^5.15.0",
+    "@serverless/utils": "^5.16.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",

From b2df3cc0c8cba17c1995d3038e4a2caaca2f47f5 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 23 Sep 2021 16:24:04 +0200
Subject: [PATCH 0508/1101] feat(CLI): Modern help output

---
 lib/cli/commands-schema/aws-service.js        |  6 ++
 lib/cli/render-help/command.js                |  9 +-
 lib/cli/render-help/general.js                | 91 ++++++++++++++++---
 lib/cli/render-help/generate-command-usage.js | 12 ++-
 lib/cli/render-help/interactive-setup.js      | 12 ++-
 lib/cli/render-help/options.js                | 41 +++++++--
 6 files changed, 140 insertions(+), 31 deletions(-)

diff --git a/lib/cli/commands-schema/aws-service.js b/lib/cli/commands-schema/aws-service.js
index 2cabb27b5a7..520452ad3ef 100644
--- a/lib/cli/commands-schema/aws-service.js
+++ b/lib/cli/commands-schema/aws-service.js
@@ -6,6 +6,7 @@ const serviceCommands = require('./service');
 const commands = (module.exports = new Map());
 
 commands.set('deploy', {
+  groupName: 'main',
   usage: 'Deploy a Serverless service',
   options: {
     'conceal': {
@@ -48,6 +49,7 @@ commands.set('deploy', {
 });
 
 commands.set('deploy function', {
+  groupName: 'main',
   usage: 'Deploy a single function from the service',
   options: {
     'function': {
@@ -78,6 +80,7 @@ commands.set('deploy list functions', {
 });
 
 commands.set('info', {
+  groupName: 'main',
   usage: 'Display information about the service',
   options: {
     conceal: {
@@ -94,6 +97,7 @@ commands.set('info', {
 });
 
 commands.set('invoke', {
+  groupName: 'main',
   usage: 'Invoke a deployed function',
   options: {
     function: {
@@ -137,6 +141,7 @@ commands.set('invoke', {
 });
 
 commands.set('invoke local', {
+  groupName: 'main',
   usage: 'Invoke function locally',
   options: {
     'function': {
@@ -177,6 +182,7 @@ commands.set('invoke local', {
 });
 
 commands.set('logs', {
+  groupName: 'main',
   usage: 'Output the logs of a deployed function',
   options: {
     function: {
diff --git a/lib/cli/render-help/command.js b/lib/cli/render-help/command.js
index 7c92ccdde55..50e5cc31e91 100644
--- a/lib/cli/render-help/command.js
+++ b/lib/cli/render-help/command.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const { legacy, writeText } = require('@serverless/utils/log');
 const resolveInput = require('../resolve-input');
 const renderOptionsHelp = require('./options');
 
@@ -9,10 +10,14 @@ module.exports = (commandName) => {
   const { commandsSchema } = resolveInput();
   const commandSchema = commandsSchema.get(commandName);
 
-  if (commandSchema) process.stdout.write(`${generateCommandUsage(commandName, commandSchema)}\n`);
+  if (commandSchema) {
+    legacy.write(`${generateCommandUsage(commandName, commandSchema)}\n`);
+    writeText(generateCommandUsage(commandName, commandSchema, { isModern: true }));
+  }
   for (const [subCommandName, subCommandSchema] of commandsSchema) {
     if (!subCommandName.startsWith(`${commandName} `)) continue;
-    process.stdout.write(`${generateCommandUsage(subCommandName, subCommandSchema)}\n`);
+    legacy.write(`${generateCommandUsage(subCommandName, subCommandSchema)}\n`);
+    writeText(generateCommandUsage(subCommandName, subCommandSchema, { isModern: true }));
   }
   if (commandSchema) renderOptionsHelp(Object.assign({}, commandSchema.options));
 
diff --git a/lib/cli/render-help/general.js b/lib/cli/render-help/general.js
index c86c2acbf6e..74e5b34c56a 100644
--- a/lib/cli/render-help/general.js
+++ b/lib/cli/render-help/general.js
@@ -1,12 +1,86 @@
 'use strict';
 
 const chalk = require('chalk');
+const { legacy, writeText, style } = require('@serverless/utils/log');
+const { version } = require('../../../package');
+const globalOptions = require('../commands-schema/common-options/global');
 const resolveInput = require('../resolve-input');
 const generateCommandUsage = require('./generate-command-usage');
+const renderOptions = require('./options');
 
 module.exports = (loadedPlugins) => {
   const { commandsSchema } = resolveInput();
 
+  writeText(
+    `Serverless Framework v${version}`,
+    null,
+    style.aside('Usage'),
+    'serverless <command> <options>',
+    'sls <command> <options>',
+    null,
+    style.aside('Get started'),
+    `Run ${style.error('serverless')} to interactively setup a project.`,
+    'Use --help-interactive to display the interactive setup help.',
+    null,
+    style.aside('Monitoring'),
+    'Enable performance and error monitoring with the Serverless Dashboard.',
+    `Learn more: ${style.link('https://serverless.com/monitoring')}`,
+    null,
+    style.aside('Plugins'),
+    'Extend the Serverless Framework with plugins.',
+    `Explore plugins: ${style.link('https://serverless.com/plugins')}`,
+    null,
+    style.aside('Options')
+  );
+
+  renderOptions(globalOptions, { shouldWriteModernOnly: true });
+
+  const allCommands = new Map(
+    Array.from(commandsSchema).filter(
+      ([commandName, { isHidden, lifecycleEvents }]) => commandName && !isHidden && lifecycleEvents
+    )
+  );
+  const mainCommands = new Map(
+    Array.from(allCommands).filter(([, { groupName }]) => groupName === 'main')
+  );
+
+  if (mainCommands.size) {
+    writeText(null, style.aside('Main commands'));
+    for (const [commandName, commandSchema] of mainCommands) {
+      writeText(generateCommandUsage(commandName, commandSchema, { isModern: true }));
+    }
+    writeText(null, style.aside('Other commands'));
+  } else {
+    writeText(null, style.aside('All commands'));
+  }
+
+  const extensionCommandsSchema = new Map();
+
+  for (const [commandName, commandSchema] of allCommands) {
+    if (commandSchema.isExtension) {
+      if (!extensionCommandsSchema.has(commandSchema.sourcePlugin)) {
+        extensionCommandsSchema.set(commandSchema.sourcePlugin, new Map());
+      }
+      extensionCommandsSchema.get(commandSchema.sourcePlugin).set(commandName, commandSchema);
+      continue;
+    }
+    if (commandSchema.groupName === 'main') continue;
+
+    writeText(generateCommandUsage(commandName, commandSchema, { isModern: true }));
+  }
+
+  if (loadedPlugins.size) {
+    if (extensionCommandsSchema.size) {
+      for (const [plugin, pluginCommandsSchema] of extensionCommandsSchema) {
+        writeText(null, style.aside(plugin.constructor.name));
+        for (const [commandName, commandSchema] of pluginCommandsSchema) {
+          writeText(generateCommandUsage(commandName, commandSchema, { isModern: true }));
+        }
+      }
+    }
+  }
+  writeText();
+
   const lines = [
     '',
     chalk.yellow.underline('Commands'),
@@ -42,19 +116,8 @@ module.exports = (loadedPlugins) => {
     '',
   ];
 
-  const extensionCommandsSchema = new Map();
-
-  for (const [commandName, commandSchema] of commandsSchema) {
-    if (!commandName) continue;
-    if (commandSchema.isHidden) continue;
-    if (!commandSchema.lifecycleEvents) continue;
-    if (commandSchema.isExtension) {
-      if (!extensionCommandsSchema.has(commandSchema.sourcePlugin)) {
-        extensionCommandsSchema.set(commandSchema.sourcePlugin, new Map());
-      }
-      extensionCommandsSchema.get(commandSchema.sourcePlugin).set(commandName, commandSchema);
-      continue;
-    }
+  for (const [commandName, commandSchema] of allCommands) {
+    if (commandSchema.isExtension) continue;
     lines.push(generateCommandUsage(commandName, commandSchema));
   }
 
@@ -80,5 +143,5 @@ module.exports = (loadedPlugins) => {
     }
   }
 
-  process.stdout.write(`${lines.join('\n')}\n`);
+  legacy.write(`${lines.join('\n')}\n`);
 };
diff --git a/lib/cli/render-help/generate-command-usage.js b/lib/cli/render-help/generate-command-usage.js
index 252e6306667..abc568ec76b 100644
--- a/lib/cli/render-help/generate-command-usage.js
+++ b/lib/cli/render-help/generate-command-usage.js
@@ -1,11 +1,17 @@
 'use strict';
 
 const chalk = require('chalk');
+const { style } = require('@serverless/utils/log');
 
-module.exports = (commandName, commandSchema) => {
-  const dotsLength = 30;
+module.exports = (commandName, commandSchema, options = {}) => {
+  const indentFillLength = 30;
 
   const usage = commandSchema.usage;
-  const dots = '.'.repeat(Math.max(dotsLength - commandName.length, 0));
+  if (options.isModern) {
+    return `${commandName} ${' '.repeat(
+      Math.max(indentFillLength - commandName.length, 0)
+    )} ${style.aside(usage)}`;
+  }
+  const dots = '.'.repeat(Math.max(indentFillLength - commandName.length, 0));
   return `${chalk.yellow(commandName)} ${chalk.dim(dots)} ${usage}`;
 };
diff --git a/lib/cli/render-help/interactive-setup.js b/lib/cli/render-help/interactive-setup.js
index 528de1d1273..d828e283232 100644
--- a/lib/cli/render-help/interactive-setup.js
+++ b/lib/cli/render-help/interactive-setup.js
@@ -1,12 +1,20 @@
 'use strict';
 
 const chalk = require('chalk');
+const { legacy, writeText, style } = require('@serverless/utils/log');
 const commmandSchema = require('../commands-schema/no-service').get('');
 const renderOptions = require('./options');
 
 module.exports = () => {
-  process.stdout.write(`${chalk.yellow.underline('Interactive CLI')}\n`);
-  process.stdout.write(
+  writeText(
+    style.aside('Interactive CLI'),
+    `Run ${style.error('serverless')} to interactively setup a project.`,
+    null,
+    style.aside('Options')
+  );
+
+  legacy.write(`${chalk.yellow.underline('Interactive CLI')}\n`);
+  legacy.write(
     `${chalk.yellow(
       `Run serverless (or shortcut sls) a subcommand to initialize an interactive setup of
 functionalities related to given service or current environment`
diff --git a/lib/cli/render-help/options.js b/lib/cli/render-help/options.js
index 35c38da04ec..2aef8873346 100644
--- a/lib/cli/render-help/options.js
+++ b/lib/cli/render-help/options.js
@@ -1,32 +1,53 @@
 'use strict';
 
 const chalk = require('chalk');
+const { legacy, writeText, style } = require('@serverless/utils/log');
 
-module.exports = (commandOptions) => {
-  const dotsLength = 40;
+module.exports = (commandOptions, options = {}) => {
+  const indentFillLength = 40;
 
   for (const [option, optionsObject] of Object.entries(commandOptions)) {
-    let optionsDots = '.'.repeat(Math.max(dotsLength - option.length, 0));
+    let legacyOptionsIndentFill = '.'.repeat(Math.max(indentFillLength - option.length, 0));
+    let optionsIndentFill = ' '.repeat(Math.max(indentFillLength - option.length - 4, 0));
 
     if (optionsObject.required) {
-      optionsDots = optionsDots.slice(0, optionsDots.length - 18);
+      legacyOptionsIndentFill = legacyOptionsIndentFill.slice(
+        0,
+        legacyOptionsIndentFill.length - 18
+      );
+      optionsIndentFill = optionsIndentFill.slice(0, optionsIndentFill.length - 18);
     } else {
-      optionsDots = optionsDots.slice(0, optionsDots.length - 7);
+      legacyOptionsIndentFill = legacyOptionsIndentFill.slice(
+        0,
+        legacyOptionsIndentFill.length - 7
+      );
+      optionsIndentFill = optionsIndentFill.slice(0, optionsIndentFill.length - 7);
     }
     if (optionsObject.shortcut) {
-      optionsDots = optionsDots.slice(0, optionsDots.length - 5);
+      legacyOptionsIndentFill = legacyOptionsIndentFill.slice(
+        0,
+        legacyOptionsIndentFill.length - 5
+      );
+      optionsIndentFill = optionsIndentFill.slice(0, optionsIndentFill.length - 5);
     }
 
-    const optionInfo = `    --${option}`;
     let shortcutInfo = '';
     let requiredInfo = '';
     if (optionsObject.shortcut) shortcutInfo = ` / -${optionsObject.shortcut}`;
 
     if (optionsObject.required) requiredInfo = ' (required)';
 
-    const optionsUsage = optionsObject.usage ? chalk.dim(optionsDots) + optionsObject.usage : '';
-    const output = `${optionInfo}${shortcutInfo}${requiredInfo} ${optionsUsage}`;
+    if (!options.shouldWriteModernOnly) {
+      const legacyOptionsUsage = optionsObject.usage
+        ? chalk.dim(legacyOptionsIndentFill) + optionsObject.usage
+        : '';
+      const legacyOutput = `    --${option}${shortcutInfo}${requiredInfo} ${legacyOptionsUsage}`;
+      legacy.write(`${chalk.yellow(legacyOutput)}\n`);
+    }
 
-    process.stdout.write(`${chalk.yellow(output)}\n`);
+    const optionsUsage = optionsObject.usage
+      ? optionsIndentFill + style.aside(optionsObject.usage)
+      : '';
+    writeText(`--${option}${shortcutInfo}${requiredInfo} ${optionsUsage}`);
   }
 };

From e3af1f3a94253a7900de104afaa1c49aa436965c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 24 Sep 2021 11:59:09 +0200
Subject: [PATCH 0509/1101] fix(Plugins): Ensure to keep `options` as passed to
 plugins up to date

---
 lib/Serverless.js     | 4 +++-
 package.json          | 2 +-
 scripts/serverless.js | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index 7c48049140b..5942d7a1665 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -7,6 +7,7 @@ const ensureValue = require('type/value/ensure');
 const ensureArray = require('type/array/ensure');
 const ensureIterable = require('type/iterable/ensure');
 const ensurePlainObject = require('type/plain-object/ensure');
+const clear = require('ext/object/clear');
 const { legacy, log } = require('@serverless/utils/log');
 const _ = require('lodash');
 const CLI = require('./classes/CLI');
@@ -293,7 +294,8 @@ class Serverless {
       resolveCliInput.clear();
       const { commands, options, isHelpRequest } = resolveCliInput(commandsSchema);
       this.processedInput.commands = this.pluginManager.cliCommands = commands;
-      this.processedInput.options = this.pluginManager.cliOptions = options;
+      this.processedInput.options = options;
+      Object.assign(clear(this.pluginManager.cliOptions), options);
       if (options.version) {
         require('./cli/render-version')();
         return;
diff --git a/package.json b/package.json
index 0345a5f69d5..9f380b465cb 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "dotenv": "^10.0.0",
     "dotenv-expand": "^5.1.0",
     "essentials": "^1.1.1",
-    "ext": "^1.5.0",
+    "ext": "^1.6.0",
     "fastest-levenshtein": "^1.0.12",
     "filesize": "^8.0.3",
     "fs-extra": "^9.1.0",
diff --git a/scripts/serverless.js b/scripts/serverless.js
index e0873c58ec9..013c7dcf97c 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -138,6 +138,7 @@ const processSpanPromise = (async () => {
     const path = require('path');
     const uuid = require('uuid');
     const _ = require('lodash');
+    const clear = require('ext/object/clear');
     const Serverless = require('../lib/Serverless');
     const resolveVariables = require('../lib/configuration/variables/resolve');
     const isPropertyResolved = require('../lib/configuration/variables/is-property-resolved');
@@ -590,7 +591,8 @@ const processSpanPromise = (async () => {
               ({ command, commands, options, isHelpRequest, commandSchema } =
                 resolveInput(commandsSchema));
               serverless.processedInput.commands = serverless.pluginManager.cliCommands = commands;
-              serverless.processedInput.options = serverless.pluginManager.cliOptions = options;
+              serverless.processedInput.options = options;
+              Object.assign(clear(serverless.pluginManager.cliOptions), options);
               hasFinalCommandSchema = true;
             }
           } else {

From 2ef5b3906f1b9d08318351bafc27222e2534a29b Mon Sep 17 00:00:00 2001
From: "Brian G. Shacklett" <brian@digital-traffic.net>
Date: Fri, 24 Sep 2021 09:35:29 -0400
Subject: [PATCH 0510/1101] docs(AWS Lambda): Improve overview of events
 (#9968)

---
 docs/providers/aws/events/README.md | 4 +++-
 docs/providers/aws/guide/events.md  | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/providers/aws/events/README.md b/docs/providers/aws/events/README.md
index f84270e0356..6b76c265844 100644
--- a/docs/providers/aws/events/README.md
+++ b/docs/providers/aws/events/README.md
@@ -14,6 +14,8 @@ layout: Doc
 
 Welcome to the AWS Serverless Events Glossary.
 
-Please select a section on the left to get started.
+Please select a section on the left to get started, or see the [user
+guide](../guide/events.md) for general information regarding Lambda Events in
+Serverless.
 
 If you have questions, join the [chat in gitter](https://gitter.im/serverless/serverless) or [post over on the forums](https://forum.serverless.com/)
diff --git a/docs/providers/aws/guide/events.md b/docs/providers/aws/guide/events.md
index d0cb9b1c17e..13f40e83db7 100644
--- a/docs/providers/aws/guide/events.md
+++ b/docs/providers/aws/guide/events.md
@@ -22,6 +22,13 @@ If you are using AWS as your provider, all `events` in the service are anything
 
 Upon deployment, the framework will deploy any infrastructure required for an event (e.g., an API Gateway endpoint) and configure your `function` to listen to it.
 
+Infrastructure which is created to support events in the `events` list may be
+referenced using CloudFormation intrinsic functions like `Fn::GetAtt` or
+`Fn::Ref` (or their shorthand counterparts). For details on referencing created
+resources in AWS, see the [AWS CloudFormation Resource
+Reference](./resources.md#aws-cloudformation-resource-reference) section on the
+[AWS - Resources](./resources.md) page.
+
 ## Configuration
 
 Events belong to each Function and can be found in the `events` property in `serverless.yml`.

From 9d6482c6710cb2d05c8c03a29e207881efcc0138 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 24 Sep 2021 14:47:12 +0200
Subject: [PATCH 0511/1101] feat(CLI): Modern logs for `deploy list` command

---
 lib/plugins/aws/deployList.js                | 35 +++++++++++++++-----
 test/unit/lib/plugins/aws/deployList.test.js | 14 --------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/lib/plugins/aws/deployList.js b/lib/plugins/aws/deployList.js
index 8c02da65559..e14c83afe56 100644
--- a/lib/plugins/aws/deployList.js
+++ b/lib/plugins/aws/deployList.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const { legacy, log, writeText, style } = require('@serverless/utils/log');
 const validate = require('./lib/validate');
 const findAndGroupDeployments = require('./utils/findAndGroupDeployments');
 const setBucketName = require('./lib/setBucketName');
@@ -38,20 +39,38 @@ class AwsDeployList {
     const deployments = findAndGroupDeployments(response, prefix, service, stage);
 
     if (deployments.length === 0) {
-      this.serverless.cli.log("Couldn't find any existing deployments.");
-      this.serverless.cli.log('Please verify that stage and region are correct.');
+      legacy.log("Couldn't find any existing deployments.");
+      legacy.log('Please verify that stage and region are correct.');
+
+      log.notice();
+      log.notice.skip(
+        "No deployments found, if that's unexpected ensure that stage and region are correct"
+      );
       return;
     }
 
-    this.serverless.cli.log('Listing deployments:');
+    legacy.log('Listing deployments:');
     deployments.forEach((deployment) => {
-      this.serverless.cli.log('-------------');
+      legacy.log('-------------');
       const match = deployment[0].directory.match(directoryRegex);
-      this.serverless.cli.log(`Timestamp: ${match[1]}`);
-      this.serverless.cli.log(`Datetime: ${match[2]}`);
-      this.serverless.cli.log('Files:');
+      const date = new Date(Date.parse(match[2]));
+      writeText(
+        `${date.getUTCFullYear()}-${String(date.getUTCMonth() + 1).padStart(2, 0)}-${String(
+          date.getUTCDate()
+        ).padStart(2, 0)} ` +
+          `${String(date.getUTCHours()).padStart(2, 0)}:${String(date.getUTCMinutes()).padStart(
+            2,
+            0
+          )}:${String(date.getUTCSeconds()).padStart(2, 0)} UTC ` +
+          `${style.aside(`(${match[1]})`)}`,
+        'Files:'
+      );
+      legacy.log(`Timestamp: ${match[1]}`);
+      legacy.log(`Datetime: ${match[2]}`);
+      legacy.log('Files:');
       deployment.forEach((entry) => {
-        this.serverless.cli.log(`- ${entry.file}`);
+        writeText(`  - ${entry.file}`);
+        legacy.log(`- ${entry.file}`);
       });
     });
   }
diff --git a/test/unit/lib/plugins/aws/deployList.test.js b/test/unit/lib/plugins/aws/deployList.test.js
index 22b522c1e42..6ebbd515502 100644
--- a/test/unit/lib/plugins/aws/deployList.test.js
+++ b/test/unit/lib/plugins/aws/deployList.test.js
@@ -45,10 +45,6 @@ describe('AwsDeployList', () => {
           Prefix: `${s3Key}`,
         })
       ).to.be.equal(true);
-      const infoText = "Couldn't find any existing deployments.";
-      expect(awsDeployList.serverless.cli.log.calledWithExactly(infoText)).to.be.equal(true);
-      const verifyText = 'Please verify that stage and region are correct.';
-      expect(awsDeployList.serverless.cli.log.calledWithExactly(verifyText)).to.be.equal(true);
       awsDeployList.provider.request.restore();
     });
 
@@ -72,16 +68,6 @@ describe('AwsDeployList', () => {
           Prefix: `${s3Key}`,
         })
       ).to.be.equal(true);
-      const infoText = 'Listing deployments:';
-      expect(awsDeployList.serverless.cli.log.calledWithExactly(infoText)).to.be.equal(true);
-      const timestampOne = 'Timestamp: 113304333331';
-      const datetimeOne = 'Datetime: 2016-08-18T13:40:06';
-      expect(awsDeployList.serverless.cli.log.calledWithExactly(timestampOne)).to.be.equal(true);
-      expect(awsDeployList.serverless.cli.log.calledWithExactly(datetimeOne)).to.be.equal(true);
-      const timestampTow = 'Timestamp: 903940390431';
-      const datetimeTwo = 'Datetime: 2016-08-18T23:42:08';
-      expect(awsDeployList.serverless.cli.log.calledWithExactly(timestampTow)).to.be.equal(true);
-      expect(awsDeployList.serverless.cli.log.calledWithExactly(datetimeTwo)).to.be.equal(true);
       awsDeployList.provider.request.restore();
     });
   });

From ffbdfed292fdc379040052e6ec73107e5fdae5a8 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 24 Sep 2021 15:33:44 +0200
Subject: [PATCH 0512/1101] feat(CLI): Modern logs for `deploy list functions`
 command

---
 lib/plugins/aws/deployList.js                | 10 ++++--
 test/unit/lib/plugins/aws/deployList.test.js | 34 --------------------
 2 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/lib/plugins/aws/deployList.js b/lib/plugins/aws/deployList.js
index e14c83afe56..f696a97185a 100644
--- a/lib/plugins/aws/deployList.js
+++ b/lib/plugins/aws/deployList.js
@@ -125,8 +125,8 @@ class AwsDeployList {
   }
 
   displayFunctions(funcs) {
-    this.serverless.cli.log('Listing functions and their last 5 versions:');
-    this.serverless.cli.log('-------------');
+    legacy.log('Listing functions and their last 5 versions:');
+    legacy.log('-------------');
 
     funcs.forEach((func) => {
       let message = '';
@@ -135,13 +135,17 @@ class AwsDeployList {
       name = name.replace(`${this.serverless.service.service}-`, '');
       name = name.replace(`${this.provider.getStage()}-`, '');
 
+      writeText(name);
       message += `${name}: `;
+      const versionsLength = func.Versions.length;
       const versions = func.Versions.map((funcEntry) => funcEntry.Version).slice(
         Math.max(0, func.Versions.length - 5)
       );
+      if (versionsLength < 6) writeText(`  All versions: ${versions.join(', ')}`);
+      else writeText(`  Last 5 versions: ${versions.join(', ')}`);
 
       message += versions.join(', ');
-      this.serverless.cli.log(message);
+      legacy.log(message);
     });
   }
 }
diff --git a/test/unit/lib/plugins/aws/deployList.test.js b/test/unit/lib/plugins/aws/deployList.test.js
index 6ebbd515502..4ced21b4467 100644
--- a/test/unit/lib/plugins/aws/deployList.test.js
+++ b/test/unit/lib/plugins/aws/deployList.test.js
@@ -25,9 +25,6 @@ describe('AwsDeployList', () => {
     s3Key = `${prefix}/${serverless.service.service}/${provider.getStage()}`;
     awsDeployList = new AwsDeployList(serverless, options);
     awsDeployList.bucketName = 'deployment-bucket';
-    awsDeployList.serverless.cli = {
-      log: sinon.spy(),
-    };
   });
 
   describe('#listDeployments()', () => {
@@ -209,35 +206,4 @@ describe('AwsDeployList', () => {
       expect(result).to.deep.equal(expectedResult);
     });
   });
-
-  describe('#displayFunctions()', () => {
-    const funcs = [
-      {
-        Versions: [{ FunctionName: 'listDeployments-dev-func-1', Version: '1337' }],
-      },
-      {
-        Versions: [
-          { FunctionName: 'listDeployments-dev-func-2', Version: '2' },
-          { FunctionName: 'listDeployments-dev-func-2', Version: '3' },
-          { FunctionName: 'listDeployments-dev-func-2', Version: '4' },
-          { FunctionName: 'listDeployments-dev-func-2', Version: '5' },
-          { FunctionName: 'listDeployments-dev-func-2', Version: '6' },
-          { FunctionName: 'listDeployments-dev-func-2', Version: '7' },
-        ],
-      },
-    ];
-
-    it('should display all the functions in the service together with their versions', () => {
-      const log = awsDeployList.serverless.cli.log;
-
-      awsDeployList.displayFunctions(funcs);
-      expect(log.calledWithExactly('Listing functions and their last 5 versions:')).to.be.equal(
-        true
-      );
-      expect(log.calledWithExactly('-------------')).to.be.equal(true);
-
-      expect(log.calledWithExactly('func-1: 1337')).to.be.equal(true);
-      expect(log.calledWithExactly('func-2: 3, 4, 5, 6, 7')).to.be.equal(true);
-    });
-  });
 });

From 5b38232e631e1fb6d944d5f323f533d7dd7b701f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 24 Sep 2021 15:45:20 +0200
Subject: [PATCH 0513/1101] feat(CLI): Remove missing CLI options schema
 deprecation

Instead signal inconsistency with a warning
---
 lib/cli/commands-schema/resolve-final.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/cli/commands-schema/resolve-final.js b/lib/cli/commands-schema/resolve-final.js
index 025a8063b26..05996ea9d0a 100644
--- a/lib/cli/commands-schema/resolve-final.js
+++ b/lib/cli/commands-schema/resolve-final.js
@@ -8,11 +8,11 @@ const serviceCommands = require('./service');
 const awsServiceCommands = require('./aws-service');
 const serviceOptions = require('./common-options/service');
 const awsServiceOptions = require('./common-options/aws-service');
-const logDeprecation = require('../../utils/logDeprecation');
+const { logWarning } = require('../../classes/Error');
 
 const deprecatedEventPattern = /^deprecated#(.*?)(?:->(.*?))?$/;
 
-module.exports = (loadedPlugins, { providerName, configuration }) => {
+module.exports = (loadedPlugins, { providerName }) => {
   const commands = new Map(providerName === 'aws' ? awsServiceCommands : serviceCommands);
 
   if (providerName !== 'aws') {
@@ -112,18 +112,15 @@ module.exports = (loadedPlugins, { providerName, configuration }) => {
   for (const loadedPlugin of loadedPlugins) resolveCommands(loadedPlugin, loadedPlugin);
 
   if (missingOptionTypes.size) {
-    logDeprecation(
-      'CLI_OPTIONS_SCHEMA',
+    logWarning(
       'CLI options definitions were upgraded with "type" property (which could be one of "string", "boolean", "multiple"). ' +
         'Below listed plugins do not predefine type for introduced options:\n' +
         ` - ${Array.from(
           missingOptionTypes,
           ([plugin, optionNames]) =>
             `${plugin.constructor.name} for "${Array.from(optionNames).join('", "')}"`
-        ).join('\n - ')}\n` +
-        'Please report this issue in plugin issue tracker.\n' +
-        'Starting with next major release, this will be communicated with a thrown error.',
-      { serviceConfig: configuration }
+        ).join('\n - ')}\n\n` +
+        'Please report this issue in plugin issue tracker.'
     );
   }
 

From 40cdb4f1a191d330e31ddadc4caaa4b314229e3d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 24 Sep 2021 15:52:01 +0200
Subject: [PATCH 0514/1101] feat(CLI): Revert from unconditional `.env` support

---
 lib/cli/conditionally-load-dotenv.js | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/lib/cli/conditionally-load-dotenv.js b/lib/cli/conditionally-load-dotenv.js
index f5e8adde625..3f596bc977a 100644
--- a/lib/cli/conditionally-load-dotenv.js
+++ b/lib/cli/conditionally-load-dotenv.js
@@ -2,11 +2,8 @@
 
 'use strict';
 
-const path = require('path');
 const _ = require('lodash');
 const memoizee = require('memoizee');
-const fileExists = require('../utils/fs/fileExists');
-const logDeprecation = require('../utils/logDeprecation');
 
 module.exports = memoizee(
   async (options, configuration) => {
@@ -15,24 +12,6 @@ module.exports = memoizee(
       require('./load-dotenv')(stage);
       return;
     }
-
-    const defaultEnvFilePath = path.resolve('.env');
-    const stageEnvFilePath = path.resolve(`.env.${stage}`);
-
-    const [doesStageEnvFileExists, doesDefaultEnvFileExists] = await Promise.all([
-      fileExists(stageEnvFilePath),
-      fileExists(defaultEnvFilePath),
-    ]);
-
-    if (doesDefaultEnvFileExists || doesStageEnvFileExists) {
-      logDeprecation(
-        'LOAD_VARIABLES_FROM_ENV_FILES',
-        'Detected ".env" files. In the next major release variables from ".env" ' +
-          'files will be automatically loaded into the serverless build process. ' +
-          'Set "useDotenv: true" to adopt that behavior now.',
-        { serviceConfig: configuration }
-      );
-    }
   },
   {
     length: 0 /* Intentionally no "promise: true" as rejection means critical non-retryable error */,

From 0199b0fe8c87d8e72e85ab2490fcfb0bf17af376 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 24 Sep 2021 17:16:25 +0200
Subject: [PATCH 0515/1101] refactor: Bring back `_.flatMap` usage

Reverts #9948
---
 lib/plugins/aws/invokeLocal/index.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invokeLocal/index.js
index 0249f491847..7936e767304 100644
--- a/lib/plugins/aws/invokeLocal/index.js
+++ b/lib/plugins/aws/invokeLocal/index.js
@@ -518,10 +518,7 @@ class AwsInvokeLocal {
       configuredEnvVars,
       envVarsFromOptions
     );
-    const envVarsDockerArgs = Object.keys(envVars).reduce(
-      (acc, key) => acc.concat(['--env', `${key}=${envVars[key]}`]),
-      []
-    );
+    const envVarsDockerArgs = _.flatMap(envVars, (value, key) => ['--env', `${key}=${value}`]);
 
     const dockerArgsFromOptions = this.getDockerArgsFromOptions();
     const dockerArgs = ['run', '--rm', '-v', `${artifactPath}:/var/task:ro,delegated`].concat(
@@ -548,11 +545,11 @@ class AwsInvokeLocal {
   }
 
   getDockerArgsFromOptions() {
-    const dockerArgOptions = [].concat(this.options['docker-arg'] || []);
-    return dockerArgOptions.reduce((acc, dockerArgOption) => {
+    const dockerArgOptions = this.options['docker-arg'];
+    return _.flatMap([].concat(dockerArgOptions || []), (dockerArgOption) => {
       const splitItems = dockerArgOption.split(' ');
-      return acc.concat(splitItems[0], splitItems.slice(1).join(' ') || []);
-    }, []);
+      return [splitItems[0], splitItems.slice(1).join(' ')];
+    });
   }
 
   async invokeLocalPython(runtime, handlerPath, handlerName, event, context) {

From 305d2eae9002b1c10d45ec11ca02022f20a22f6f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 24 Sep 2021 16:26:59 +0200
Subject: [PATCH 0516/1101] chore: Bump dependencies

---
 package.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 9f380b465cb..a629e1676e7 100644
--- a/package.json
+++ b/package.json
@@ -30,9 +30,9 @@
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.988.0",
+    "aws-sdk": "^2.994.0",
     "bluebird": "^3.7.2",
-    "boxen": "^5.1.1",
+    "boxen": "^5.1.2",
     "cachedir": "^2.3.0",
     "chalk": "^4.1.2",
     "child-process-ext": "^2.1.1",
@@ -62,15 +62,15 @@
     "memoizee": "^0.4.15",
     "micromatch": "^4.0.4",
     "ncjsm": "^4.2.0",
-    "node-fetch": "^2.6.2",
+    "node-fetch": "^2.6.5",
     "object-hash": "^2.2.0",
     "path2": "^0.1.0",
     "process-utils": "^4.0.0",
     "promise-queue": "^2.2.5",
     "replaceall": "^0.1.6",
     "semver": "^7.3.5",
-    "signal-exit": "^3.0.3",
-    "strip-ansi": "^6.0.0",
+    "signal-exit": "^3.0.4",
+    "strip-ansi": "^6.0.1",
     "tabtab": "^3.0.2",
     "tar": "^6.1.11",
     "timers-ext": "^0.1.7",
@@ -86,7 +86,7 @@
     "adm-zip": "^0.5.6",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "cos-nodejs-sdk-v5": "^2.10.2",
+    "cos-nodejs-sdk-v5": "^2.10.3",
     "eslint": "^7.32.0",
     "eslint-plugin-import": "^2.24.2",
     "git-list-updated": "^1.2.1",
@@ -100,7 +100,7 @@
     "mock-require": "^3.0.3",
     "nyc": "^15.1.0",
     "pkg": "^4.5.1",
-    "prettier": "^2.4.0",
+    "prettier": "^2.4.1",
     "proxyquire": "^2.1.3",
     "semver-regex": "^3.1.3",
     "sinon": "^11.1.2",

From cc2b302694e801cc8f0f6751955f38c51735fec3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 24 Sep 2021 17:33:18 +0200
Subject: [PATCH 0517/1101] chore: Release v2.60.0

---
 CHANGELOG.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98ccfc4d986..c7d8f5444a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,53 @@
 
 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.
 
+## [2.60.0](https://github.com/serverless/serverless/compare/v2.59.0...v2.60.0) (2021-09-24)
+
+### Features
+
+- **CLI:**
+  - Remove missing CLI options schema deprecation ([#10001](https://github.com/serverless/serverless/issues/10001)) ([5b38232](https://github.com/serverless/serverless/commit/5b38232e631e1fb6d944d5f323f533d7dd7b701f)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Revert from unconditional `.env` support announcement ([#10003](https://github.com/serverless/serverless/issues/10003)) ([40cdb4f](https://github.com/serverless/serverless/commit/40cdb4f1a191d330e31ddadc4caaa4b314229e3d)) ([Mariusz Nowak](https://github.com/medikoo))
+- **AWS Stream:** Support `tumblingWindowInSeconds` ([#9979](https://github.com/serverless/serverless/issues/9979)) ([af39fc0](https://github.com/serverless/serverless/commit/af39fc016bd6386ea7d5d1ff71a26553a25b7ec5)) ([Guilherme Martins Crocetti](https://github.com/gmcrocetti))
+- Support `finalize` hook, triggered on command finalization ([#9956](https://github.com/serverless/serverless/issues/9956)) ([cb4f08a](https://github.com/serverless/serverless/commit/cb4f08ad7dd8eed3da69d61d51c6d5379a486bd0)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **AWS S3:** Recognize `BucketKeyEnabled` setting ([#9985](https://github.com/serverless/serverless/issues/9985)) ([54bb13b](https://github.com/serverless/serverless/commit/54bb13b6a6d3fd41548615fc23f4ae4d6d663dcc)) ([John Armstrong](https://github.com/jlarmstrongiv))
+- **CLI:** Fix general help output when in context of AWS service ([#9994](https://github.com/serverless/serverless/issues/9994)) ([0833fd0](https://github.com/serverless/serverless/commit/0833fd03d17d292bd4393ecec9569328daae68d2)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Plugins:** Ensure to keep `options` as passed to plugins up to date ([#9999](https://github.com/serverless/serverless/issues/9999)) ([e3af1f3](https://github.com/serverless/serverless/commit/e3af1f3a94253a7900de104afaa1c49aa436965c)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Telemetry:** Ensure to not show backend notification on error ([#9999](https://github.com/serverless/serverless/issues/9999)) ([dce0ff1](https://github.com/serverless/serverless/commit/dce0ff1a892959b12414f1bff3915fe50b900ba2)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Templates
+
+- Improve source maps handling in `aws-nodejs-typescript` ([#9961](https://github.com/serverless/serverless/issues/9961)) ([28d230f](https://github.com/serverless/serverless/commit/28d230f946df6cbcc8173822494b50cd056ef63c)) ([Adrien Cacciaguerra](https://github.com/adriencaccia))
+- Switch to esbuild in `aws-nodejs-typescript` ([#9962](https://github.com/serverless/serverless/issues/9962)) ([aaabb50](https://github.com/serverless/serverless/commit/aaabb50f1beb12683506ca7ab9e93ded75294694)) ([Adrien Cacciaguerra](https://github.com/adriencaccia))
+
+### Maintenance Improvements
+
+- Reorganize hooks resolution ([#9976](https://github.com/serverless/serverless/issues/9976)) ([76006ec](https://github.com/serverless/serverless/commit/76006ec1e80f51e194b51d4c0f2a11c64434158e)) ([Mariusz Nowak](https://github.com/medikoo))
+- Simplify lifecycle event hooks resolution ([#9976](https://github.com/serverless/serverless/issues/9976)) ([8b4498c](https://github.com/serverless/serverless/commit/8b4498c911e24ef7a46daf66380f1c122f988af3)) ([Mariusz Nowak](https://github.com/medikoo))
+- Replace `_.flatMap` usage ([#9948](https://github.com/serverless/serverless/issues/9948)) ([26b8bd5](https://github.com/serverless/serverless/commit/26b8bd5c5fd2154f47fa12804f1aee140000155f)) ([Jonas Matos](https://github.com/JonasMatos0))
+- **CLI: New logs (experimental):**
+  - Fix final `deploy` statuses timing ([#9967](https://github.com/serverless/serverless/issues/9967)) ([084a995](https://github.com/serverless/serverless/commit/084a9955f440ee18847df8a3087aba38405883b7)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Fix CloudFormation update resources status log in _verbose_ mode ([#9967](https://github.com/serverless/serverless/issues/9967)) ([bcd8a02](https://github.com/serverless/serverless/commit/bcd8a022a1e2e50a5d2708c374f4d5bcc30c80b5)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Ensure to strip colors from error messages ([#9967](https://github.com/serverless/serverless/issues/9967)) ([80005aa](https://github.com/serverless/serverless/commit/80005aaf6b57aa8d013fe4cda0be52d494cd4d78)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Ensure to write outputs on `info` ([#9991](https://github.com/serverless/serverless/issues/9991)) ([43d17de](https://github.com/serverless/serverless/commit/43d17debee20bfc7ee535fd643df0538f8bee9f8)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Present deprecations with single summary log ([#9960](https://github.com/serverless/serverless/issues/9960)) ([7eba95f](https://github.com/serverless/serverless/commit/7eba95fcb7f9b09a8a2aebd50c433f92e15cac97)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Add timer to final `deploy` statuses ([#9959](https://github.com/serverless/serverless/issues/9959)) ([7828cc7](https://github.com/serverless/serverless/commit/7828cc77f1fcea8f901887c12b07f5e18b34dcc8)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - _debug_ (previously _verbose_) `deploy` logs ([#9967](https://github.com/serverless/serverless/issues/9967)) ([655140b](https://github.com/serverless/serverless/commit/655140b764c8f2998188c3d47110494cbd742688)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Help output ([#9998](https://github.com/serverless/serverless/issues/9998)) ([b2df3cc](https://github.com/serverless/serverless/commit/b2df3cc0c8cba17c1995d3038e4a2caaca2f47f5)) ([Mariusz Nowak](https://github.com/medikoo))
+  - `deploy function` command ([#9990](https://github.com/serverless/serverless/issues/9990)) ([4d42ce3](https://github.com/serverless/serverless/commit/4d42ce3fa4f44f63d68a3841752746021500fe4f)) ([Mariusz Nowak](https://github.com/medikoo))
+  - `deploy list functions` command ([#10000](https://github.com/serverless/serverless/issues/10000)) ([ffbdfed](https://github.com/serverless/serverless/commit/ffbdfed292fdc379040052e6ec73107e5fdae5a8)) ([Mariusz Nowak](https://github.com/medikoo))
+  - `deploy list` command ([#10000](https://github.com/serverless/serverless/issues/10000)) ([9d6482c](https://github.com/serverless/serverless/commit/9d6482c6710cb2d05c8c03a29e207881efcc0138)) ([Mariusz Nowak](https://github.com/medikoo))
+  - `package` command ([#9956](https://github.com/serverless/serverless/issues/9956)) ([fa2507d](https://github.com/serverless/serverless/commit/fa2507dad06b037aa5a24b3392432cefc810a972)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `deploy function` command ([#9990](https://github.com/serverless/serverless/issues/9990)) ([10df2e5](https://github.com/serverless/serverless/commit/10df2e5300e04ec9d00ebd343d9d8fe30c96afa7)) ([Mariusz Nowak](https://github.com/medikoo))
+  - _verbose_ logs for `deploy` operation ([#9967](https://github.com/serverless/serverless/issues/9967)) ([e423404](https://github.com/serverless/serverless/commit/e423404290a757a8adfc97d45e9aef7aa93f1404)) ([Mariusz Nowak](https://github.com/medikoo))
+  - dapt pre-created log style generators ([#9998](https://github.com/serverless/serverless/issues/9998)) ([8c9bd4a](https://github.com/serverless/serverless/commit/8c9bd4a6eda58d2ed6da08cc3bb806d970df4d17)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Convert custom resource packaging related log ([#9989](https://github.com/serverless/serverless/issues/9989)) ([0f0b85a](https://github.com/serverless/serverless/commit/0f0b85a6373dfcd9d21f1668e7fb3e0d20a3b393)) ([Mariusz Nowak](https://github.com/medikoo))
+  - `logs` command ([#9991](https://github.com/serverless/serverless/issues/9991)) ([cbd2e64](https://github.com/serverless/serverless/commit/cbd2e64f705e54e37dd9116d0931a3a96bceaa88)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Refactor main progress event with `isMainEvent` option ([#9981](https://github.com/serverless/serverless/issues/9981)) ([a6553f8](https://github.com/serverless/serverless/commit/a6553f8668b66e2281626e7e79a3a2042279f92d)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ## [2.59.0](https://github.com/serverless/serverless/compare/v2.58.0...v2.59.0) (2021-09-14)
 
 ### Features
diff --git a/package.json b/package.json
index a629e1676e7..00ed48f8121 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.59.0",
+  "version": "2.60.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From bfbed72387853936a8b8a7eb13df234eee004877 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Sat, 25 Sep 2021 20:02:39 +0200
Subject: [PATCH 0518/1101] docs: Removed duplicated paragraph

The following paragraph was duplicated in many sections of the page:

> **Note:** The `stream` event will hook up your existing streams to a Lambda function. Serverless won't create a new stream for you.

I think this was because of contributors copy/pasting that along the way. When reading the page it felt really weird reading that over and over.

If there was a reason this paragraph was there in every section feel free to close.
---
 docs/providers/aws/events/streams.md | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/docs/providers/aws/events/streams.md b/docs/providers/aws/events/streams.md
index 6dca19d65ba..e4dada34fa6 100644
--- a/docs/providers/aws/events/streams.md
+++ b/docs/providers/aws/events/streams.md
@@ -77,8 +77,6 @@ functions:
 This configuration sets up a disabled Kinesis stream event for the `preprocess` function which has a batch size of `100`. The starting position is
 `LATEST`.
 
-**Note:** The `stream` event will hook up your existing streams to a Lambda function. Serverless won't create a new stream for you.
-
 ```yml
 functions:
   preprocess:
@@ -106,8 +104,6 @@ The `batchWindow` property specifies a maximum amount of time to wait before tri
 
 For more information, read the [AWS release announcement](https://aws.amazon.com/about-aws/whats-new/2019/09/aws-lambda-now-supports-custom-batch-window-for-kinesis-and-dynamodb-event-sources/) for this property.
 
-**Note:** The `stream` event will hook up your existing streams to a Lambda function. Serverless won't create a new stream for you.
-
 ```yml
 functions:
   preprocess:
@@ -126,8 +122,6 @@ This configuration provides the ability to recursively split a failed batch and
 
 [Related AWS documentation](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-bisectbatchonfunctionerror)
 
-**Note:** The `stream` event will hook up your existing streams to a Lambda function. Serverless won't create a new stream for you.
-
 ```yml
 functions:
   preprocess:
@@ -146,8 +140,6 @@ This configuration sets up the maximum number of times to retry when the functio
 
 [Related AWS documentation](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-maximumretryattempts)
 
-**Note:** The `stream` event will hook up your existing streams to a Lambda function. Serverless won't create a new stream for you.
-
 ```yml
 functions:
   preprocess:
@@ -169,8 +161,6 @@ This configuration sets up the maximum age of a record that Lambda sends to a fu
 
 [Related AWS documentation](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-maximumrecordageinseconds)
 
-**Note:** The `stream` event will hook up your existing streams to a Lambda function. Serverless won't create a new stream for you.
-
 ```yml
 functions:
   preprocess:
@@ -255,8 +245,6 @@ The `parallelizationFactor` property specifies the number of concurrent Lambda i
 
 For more information, read the [AWS release announcement](https://aws.amazon.com/blogs/compute/new-aws-lambda-scaling-controls-for-kinesis-and-dynamodb-event-sources/) for this property.
 
-**Note:** The `stream` event will hook up your existing streams to a Lambda function. Serverless won't create a new stream for you.
-
 ```yml
 functions:
   preprocess:
@@ -273,8 +261,6 @@ This configuration allows customers to automatically checkpoint records that hav
 
 For more information, read the [AWS release announcement](https://aws.amazon.com/about-aws/whats-new/2020/12/aws-lambda-launches-checkpointing-for-amazon-kinesis-and-amazon-dynamodb-streams/)
 
-Note: Serverless only sets this property if you explicitly add it to the stream configuration (see example below).
-
 ```yml
 functions:
   preprocess:

From 713ac1e2a111426fb501b5fa29588a53efcba9bc Mon Sep 17 00:00:00 2001
From: Seungchan Ahn <dev.issea1015@gmail.com>
Date: Mon, 27 Sep 2021 23:37:22 +0900
Subject: [PATCH 0519/1101] refactor(Plugins): Seclude `plugin install`
 standalone command (#9942)

---
 commands/plugin-install.js                | 127 ++++++++++++++++++++++
 lib/commands/plugin-management.js         |  37 +++++++
 lib/plugins/plugin/install.js             |   2 +
 scripts/serverless.js                     |  40 +++++--
 test/README.md                            |   6 +-
 test/unit/commands/plugin-install.test.js |  62 +++++++++++
 6 files changed, 259 insertions(+), 15 deletions(-)
 create mode 100644 commands/plugin-install.js
 create mode 100644 lib/commands/plugin-management.js
 create mode 100644 test/unit/commands/plugin-install.test.js

diff --git a/commands/plugin-install.js b/commands/plugin-install.js
new file mode 100644
index 00000000000..8ac92515790
--- /dev/null
+++ b/commands/plugin-install.js
@@ -0,0 +1,127 @@
+'use strict';
+
+const spawn = require('child-process-ext/spawn');
+const fsp = require('fs').promises;
+const fse = require('fs-extra');
+const path = require('path');
+const _ = require('lodash');
+const isPlainObject = require('type/plain-object/is');
+const yaml = require('js-yaml');
+const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
+const log = require('@serverless/utils/log');
+const ServerlessError = require('../lib/serverless-error');
+const yamlAstParser = require('../lib/utils/yamlAstParser');
+const npmCommandDeferred = require('../lib/utils/npm-command-deferred');
+const {
+  getPluginInfo,
+  getServerlessFilePath,
+  validate,
+} = require('../lib/commands/plugin-management');
+
+module.exports = async ({ configuration, serviceDir, configurationFilename, options }) => {
+  validate({ serviceDir });
+
+  const pluginInfo = getPluginInfo(options.name);
+  const pluginName = pluginInfo.name;
+  const pluginVersion = pluginInfo.version || 'latest';
+  const configurationFilePath = getServerlessFilePath({ serviceDir, configurationFilename });
+
+  const context = { configuration, serviceDir, configurationFilePath, pluginName, pluginVersion };
+  await installPlugin(context);
+  await addPluginToServerlessFile(context);
+
+  const message = ['Successfully installed', ` "${pluginName}@${pluginVersion}"`].join('');
+  log(message);
+};
+
+const installPlugin = async ({ serviceDir, pluginName, pluginVersion }) => {
+  const pluginFullName = `${pluginName}@${pluginVersion}`;
+  const message = [
+    `Installing plugin "${pluginFullName}"`,
+    ' (this might take a few seconds...)',
+  ].join('');
+  log(message);
+  await npmInstall(pluginFullName, { serviceDir });
+};
+
+const addPluginToServerlessFile = async ({ configurationFilePath, pluginName }) => {
+  const fileExtension = path.extname(configurationFilePath);
+  if (fileExtension === '.js' || fileExtension === '.ts') {
+    requestManualUpdate(configurationFilePath);
+    return;
+  }
+
+  const checkIsArrayPluginsObject = (pluginsObject) =>
+    pluginsObject == null || Array.isArray(pluginsObject);
+  // pluginsObject type determined based on the value loaded during the serverless init.
+  if (_.last(configurationFilePath.split('.')) === 'json') {
+    const serverlessFileObj = await fse.readJson(configurationFilePath);
+    const newServerlessFileObj = serverlessFileObj;
+    const isArrayPluginsObject = checkIsArrayPluginsObject(newServerlessFileObj.plugins);
+    // null modules property is not supported
+    let plugins = isArrayPluginsObject
+      ? newServerlessFileObj.plugins || []
+      : newServerlessFileObj.plugins.modules;
+
+    if (plugins == null) {
+      throw new ServerlessError(
+        'plugins modules property must be present',
+        'PLUGINS_MODULES_MISSING'
+      );
+    }
+
+    plugins.push(pluginName);
+    plugins = _.sortedUniq(plugins);
+
+    if (isArrayPluginsObject) {
+      newServerlessFileObj.plugins = plugins;
+    } else {
+      newServerlessFileObj.plugins.modules = plugins;
+    }
+
+    await fse.writeJson(configurationFilePath, newServerlessFileObj);
+    return;
+  }
+
+  const serverlessFileObj = yaml.load(await fsp.readFile(configurationFilePath, 'utf8'), {
+    filename: configurationFilePath,
+    schema: cloudformationSchema,
+  });
+  if (serverlessFileObj.plugins != null) {
+    // Plugins section can be behind veriables, opt-out in such case
+    if (isPlainObject(serverlessFileObj.plugins)) {
+      if (
+        serverlessFileObj.plugins.modules != null &&
+        !Array.isArray(serverlessFileObj.plugins.modules)
+      ) {
+        requestManualUpdate(configurationFilePath);
+        return;
+      }
+    } else if (!Array.isArray(serverlessFileObj.plugins)) {
+      requestManualUpdate(configurationFilePath);
+      return;
+    }
+  }
+  await yamlAstParser.addNewArrayItem(
+    configurationFilePath,
+    checkIsArrayPluginsObject(serverlessFileObj.plugins) ? 'plugins' : 'plugins.modules',
+    pluginName
+  );
+};
+
+const npmInstall = async (name, { serviceDir }) => {
+  const npmCommand = await npmCommandDeferred;
+  await spawn(npmCommand, ['install', '--save-dev', name], {
+    cwd: serviceDir,
+    stdio: 'ignore',
+    // To parse quotes used in module versions. E.g. 'serverless@"^1.60.0 || 2"'
+    // https://stackoverflow.com/a/48015470
+    shell: true,
+  });
+};
+
+const requestManualUpdate = (configurationFilePath) =>
+  log(`
+  Can't automatically add plugin into "${path.basename(configurationFilePath)}" file.
+  Please make it manually.
+`);
diff --git a/lib/commands/plugin-management.js b/lib/commands/plugin-management.js
new file mode 100644
index 00000000000..6efa1cc0f32
--- /dev/null
+++ b/lib/commands/plugin-management.js
@@ -0,0 +1,37 @@
+'use strict';
+
+const path = require('path');
+const ServerlessError = require('../../lib/serverless-error');
+
+module.exports = {
+  validate({ serviceDir }) {
+    if (!serviceDir) {
+      throw new ServerlessError(
+        'This command can only be run inside a service directory',
+        'MISSING_SERVICE_DIRECTORY'
+      );
+    }
+  },
+
+  getServerlessFilePath({ serviceDir, configurationFilename }) {
+    if (configurationFilename) {
+      return path.resolve(serviceDir, configurationFilename);
+    }
+    throw new ServerlessError(
+      'Could not find any serverless service definition file.',
+      'MISSING_SERVICE_CONFIGURATION_FILE'
+    );
+  },
+
+  getPluginInfo(name_) {
+    let name;
+    let version;
+    if (name_.startsWith('@')) {
+      [, name, version] = name_.split('@', 3);
+      name = `@${name}`;
+    } else {
+      [name, version] = name_.split('@', 2);
+    }
+    return { name, version };
+  },
+};
diff --git a/lib/plugins/plugin/install.js b/lib/plugins/plugin/install.js
index 3a5813c2333..65af0000944 100644
--- a/lib/plugins/plugin/install.js
+++ b/lib/plugins/plugin/install.js
@@ -1,3 +1,5 @@
+// TODO: Remove in v3
+
 'use strict';
 
 const BbPromise = require('bluebird');
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 013c7dcf97c..46095e6f07c 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -41,6 +41,8 @@ let hasTelemetryBeenReported = false;
 // to propery handle e.g. `SIGINT` interrupt
 const keepAliveTimer = setTimeout(() => {}, 60 * 60 * 1000);
 
+const standaloneCommands = ['plugin install'];
+
 process.once('uncaughtException', (error) => {
   clearTimeout(keepAliveTimer);
   progress.clear();
@@ -505,24 +507,38 @@ const processSpanPromise = (async () => {
 
     const configurationFilename = configuration && configurationPath.slice(serviceDir.length + 1);
 
-    if (isInteractiveSetup) {
-      require('../lib/cli/ensure-supported-command')(configuration);
+    const isStandaloneCommand = standaloneCommands.includes(command);
 
-      if (!process.stdin.isTTY && !process.env.SLS_INTERACTIVE_SETUP_ENABLE) {
-        throw new ServerlessError(
-          'Attempted to run an interactive setup in non TTY environment.\n' +
-            "If that's intentended enforce with SLS_INTERACTIVE_SETUP_ENABLE=1 environment variable",
-          'INTERACTIVE_SETUP_IN_NON_TTY'
-        );
-      }
-      const { configuration: configurationFromInteractive } =
-        await require('../lib/cli/interactive-setup')({
+    if (isInteractiveSetup || isStandaloneCommand) {
+      if (isInteractiveSetup) {
+        require('../lib/cli/ensure-supported-command')(configuration);
+
+        if (!process.stdin.isTTY && !process.env.SLS_INTERACTIVE_SETUP_ENABLE) {
+          throw new ServerlessError(
+            'Attempted to run an interactive setup in non TTY environment.\n' +
+              "If that's intentended enforce with SLS_INTERACTIVE_SETUP_ENABLE=1 environment variable",
+            'INTERACTIVE_SETUP_IN_NON_TTY'
+          );
+        }
+        const result = await require('../lib/cli/interactive-setup')({
           configuration,
           serviceDir,
           configurationFilename,
           options,
           commandUsage,
         });
+        if (result.configuration) {
+          configuration = result.configuration;
+        }
+      } else {
+        require('../lib/cli/ensure-supported-command')(configuration);
+        await require(`../commands/${commands.join('-')}`)({
+          configuration,
+          serviceDir,
+          configurationFilename,
+          options,
+        });
+      }
 
       progress.clear();
 
@@ -537,7 +553,7 @@ const processSpanPromise = (async () => {
               options,
               commandSchema,
               serviceDir,
-              configuration: configurationFromInteractive,
+              configuration,
               commandUsage,
               variableSources: variableSourcesInConfig,
             }),
diff --git a/test/README.md b/test/README.md
index 0d124be37ca..ef0ee90fb77 100644
--- a/test/README.md
+++ b/test/README.md
@@ -61,7 +61,7 @@ Check existing set of AWS integration tests at [test/integration](./integration)
 Pass test file to Mocha directly as follows
 
 ```
-AWS_ACCESS_KEY_ID=XXX AWS_SECRET_ACCESS_KEY=xxx npx mocha tests/integration/{chosen}.test.js
+AWS_ACCESS_KEY_ID=XXX AWS_SECRET_ACCESS_KEY=xxx npx mocha test/integration/{chosen}.test.js
 ```
 
 ### Tests that depend on shared infrastructure stack
@@ -90,13 +90,13 @@ To run all integration tests run:
 To run only a specific integration test run:
 
 ```
-tests/templates/integration-test-template TEMPLATE_NAME BUILD_COMMAND
+test/templates/integration-test-template TEMPLATE_NAME BUILD_COMMAND
 ```
 
 so for example:
 
 ```
-tests/templates/integration-test-template aws-java-maven mvn package
+test/templates/integration-test-template aws-java-maven mvn package
 ```
 
 If you add a new template make sure to add it to the `test-all-templates` file and configure the `docker-compose.yml` file for your template.
diff --git a/test/unit/commands/plugin-install.test.js b/test/unit/commands/plugin-install.test.js
new file mode 100644
index 00000000000..d84adb871b2
--- /dev/null
+++ b/test/unit/commands/plugin-install.test.js
@@ -0,0 +1,62 @@
+'use strict';
+
+const chai = require('chai');
+const sinon = require('sinon');
+const yaml = require('js-yaml');
+const fse = require('fs-extra');
+const proxyquire = require('proxyquire');
+const fixturesEngine = require('../../fixtures/programmatic');
+const resolveConfigurationPath = require('../../../lib/cli/resolve-configuration-path');
+const { expect } = require('chai');
+
+chai.use(require('chai-as-promised'));
+
+const npmCommand = 'npm';
+
+describe('test/unit/commands/plugin-install.test.js', async () => {
+  let spawnFake;
+  let serviceDir;
+  let configurationFilePath;
+
+  const pluginName = 'serverless-plugin-1';
+
+  before(async () => {
+    spawnFake = sinon.fake();
+    const installPlugin = proxyquire('../../../commands/plugin-install', {
+      'child-process-ext/spawn': spawnFake,
+    });
+
+    const fixture = await fixturesEngine.setup('function');
+
+    const configuration = fixture.serviceConfig;
+    serviceDir = fixture.servicePath;
+    configurationFilePath = await resolveConfigurationPath({
+      cwd: serviceDir,
+    });
+    const configurationFilename = configurationFilePath.slice(serviceDir.length + 1);
+    const options = {
+      name: pluginName,
+    };
+
+    await installPlugin({
+      configuration,
+      serviceDir,
+      configurationFilename,
+      options,
+    });
+  });
+
+  it('should install plugin', () => {
+    const firstCall = spawnFake.firstCall;
+    const command = [firstCall.args[0], ...firstCall.args[1]].join(' ');
+    const expectedCommand = `${npmCommand} install --save-dev ${pluginName}`;
+    expect(command).to.have.string(expectedCommand);
+  });
+
+  it('should add plugin to serverless file', async () => {
+    const serverlessFileObj = yaml.load(await fse.readFile(configurationFilePath, 'utf8'), {
+      filename: configurationFilePath,
+    });
+    expect(serverlessFileObj.plugins).to.include(pluginName);
+  });
+});

From 4733b81d2dd6bec90132707e8a5fdd09431e2ef6 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 27 Sep 2021 17:37:32 +0200
Subject: [PATCH 0520/1101] chore: Fix standalone configuration to inclue
 standalone commands

---
 scripts/pkg/config.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/pkg/config.js b/scripts/pkg/config.js
index 62ce9536a13..8109e4bf875 100644
--- a/scripts/pkg/config.js
+++ b/scripts/pkg/config.js
@@ -5,6 +5,8 @@ module.exports = {
   // which is important for local templates installation
   license: 'MIT',
   files: [
+    // Standalone commands
+    '../../commands',
     // Custom resources
     '../../lib/plugins/aws/customResources/resources',
     // Basic CF templates

From b4e4fdac71bedbc99a19a37b265ea1d8b17dd1c9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 27 Sep 2021 17:38:07 +0200
Subject: [PATCH 0521/1101] refactor: Use set instead of array

---
 scripts/serverless.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index 46095e6f07c..c3f12a89162 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -41,7 +41,7 @@ let hasTelemetryBeenReported = false;
 // to propery handle e.g. `SIGINT` interrupt
 const keepAliveTimer = setTimeout(() => {}, 60 * 60 * 1000);
 
-const standaloneCommands = ['plugin install'];
+const standaloneCommands = new Set(['plugin install']);
 
 process.once('uncaughtException', (error) => {
   clearTimeout(keepAliveTimer);
@@ -507,7 +507,7 @@ const processSpanPromise = (async () => {
 
     const configurationFilename = configuration && configurationPath.slice(serviceDir.length + 1);
 
-    const isStandaloneCommand = standaloneCommands.includes(command);
+    const isStandaloneCommand = standaloneCommands.has(command);
 
     if (isInteractiveSetup || isStandaloneCommand) {
       if (isInteractiveSetup) {

From 8d45f9f878f2376fcbd3ec0a3681bae78870a991 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 27 Sep 2021 17:46:49 +0200
Subject: [PATCH 0522/1101] test(AWS Stream): Improve test reliability

---
 test/integration/aws/stream.test.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/integration/aws/stream.test.js b/test/integration/aws/stream.test.js
index 32a884f4f9e..9bc5e9c999d 100644
--- a/test/integration/aws/stream.test.js
+++ b/test/integration/aws/stream.test.js
@@ -68,9 +68,7 @@ describe('AWS - Stream Integration Test', function () {
   describe('DynamoDB Streams', () => {
     it('should invoke on dynamodb messages from the latest position', () => {
       const functionName = 'streamDynamoDb';
-      const item = {
-        id: 'message',
-      };
+      const item = { id: String(Date.now()) };
       return confirmCloudWatchLogs(
         `/aws/lambda/${stackName}-${functionName}`,
         () => {

From cd9b8233f9b484060083d79f216d6c51d1cc2907 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 28 Sep 2021 09:07:37 +0200
Subject: [PATCH 0523/1101] refactor(Plugins): Expose eventual npm install
 error

---
 commands/plugin-install.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/commands/plugin-install.js b/commands/plugin-install.js
index 8ac92515790..6160317e42b 100644
--- a/commands/plugin-install.js
+++ b/commands/plugin-install.js
@@ -111,13 +111,18 @@ const addPluginToServerlessFile = async ({ configurationFilePath, pluginName })
 
 const npmInstall = async (name, { serviceDir }) => {
   const npmCommand = await npmCommandDeferred;
-  await spawn(npmCommand, ['install', '--save-dev', name], {
-    cwd: serviceDir,
-    stdio: 'ignore',
-    // To parse quotes used in module versions. E.g. 'serverless@"^1.60.0 || 2"'
-    // https://stackoverflow.com/a/48015470
-    shell: true,
-  });
+  try {
+    await spawn(npmCommand, ['install', '--save-dev', name], {
+      cwd: serviceDir,
+      stdio: 'pipe',
+      // To parse quotes used in module versions. E.g. 'serverless@"^1.60.0 || 2"'
+      // https://stackoverflow.com/a/48015470
+      shell: true,
+    });
+  } catch (error) {
+    process.stdout.write(error.stdBuffer);
+    throw error;
+  }
 };
 
 const requestManualUpdate = (configurationFilePath) =>

From 5a583a97980117209a614bfd40630b1bb714b744 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 28 Sep 2021 09:38:00 +0200
Subject: [PATCH 0524/1101] fix(Standalone): Fix internal npm installation
 handling

---
 commands/plugin-install.js                   |  4 ++--
 lib/cli/interactive-setup/service.js         |  4 ++--
 lib/plugins/plugin/install.js                |  4 ++--
 lib/utils/npm-command-deferred.js            |  4 +++-
 test/unit/lib/plugins/plugin/install.test.js | 10 +++++-----
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/commands/plugin-install.js b/commands/plugin-install.js
index 6160317e42b..9ac187c76b4 100644
--- a/commands/plugin-install.js
+++ b/commands/plugin-install.js
@@ -110,9 +110,9 @@ const addPluginToServerlessFile = async ({ configurationFilePath, pluginName })
 };
 
 const npmInstall = async (name, { serviceDir }) => {
-  const npmCommand = await npmCommandDeferred;
+  const { command, args } = await npmCommandDeferred;
   try {
-    await spawn(npmCommand, ['install', '--save-dev', name], {
+    await spawn(command, [...args, 'install', '--save-dev', name], {
       cwd: serviceDir,
       stdio: 'pipe',
       // To parse quotes used in module versions. E.g. 'serverless@"^1.60.0 || 2"'
diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index d4d221cd5bd..0442b1ac8f1 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -222,9 +222,9 @@ module.exports = {
 
     if (hasPackageJson) {
       process.stdout.write(`\nInstalling dependencies with "npm" in "${projectName}" folder\n`);
-      const npmCommand = await npmCommandDeferred;
+      const { command, args } = await npmCommandDeferred;
       try {
-        await spawn(npmCommand, ['install'], { cwd: projectDir });
+        await spawn(command, [...args, 'install'], { cwd: projectDir });
       } catch (err) {
         if (err.code === 'ENOENT') {
           process.stdout.write(
diff --git a/lib/plugins/plugin/install.js b/lib/plugins/plugin/install.js
index 65af0000944..937ba54f57c 100644
--- a/lib/plugins/plugin/install.js
+++ b/lib/plugins/plugin/install.js
@@ -192,8 +192,8 @@ class PluginInstall {
   }
 
   async npmInstall(name) {
-    return npmCommandDeferred.then((npmCommand) =>
-      childProcess.execAsync(`${npmCommand} install --save-dev ${name}`, {
+    return npmCommandDeferred.then(({ command, args }) =>
+      childProcess.execAsync(`${command} ${args.join(' ')} install --save-dev ${name}`, {
         stdio: 'ignore',
       })
     );
diff --git a/lib/utils/npm-command-deferred.js b/lib/utils/npm-command-deferred.js
index ab882c2ee49..adde91550d1 100644
--- a/lib/utils/npm-command-deferred.js
+++ b/lib/utils/npm-command-deferred.js
@@ -15,5 +15,7 @@ module.exports = fsp
     }
   )
   .then((isNpmInstalledLocaly) => {
-    return isNpmInstalledLocaly ? `node ${localNpmBinPath}` : 'npm';
+    return isNpmInstalledLocaly
+      ? { command: 'node', args: [localNpmBinPath] }
+      : { command: 'npm', args: [] };
   });
diff --git a/test/unit/lib/plugins/plugin/install.test.js b/test/unit/lib/plugins/plugin/install.test.js
index c8124ecf641..88038d868a1 100644
--- a/test/unit/lib/plugins/plugin/install.test.js
+++ b/test/unit/lib/plugins/plugin/install.test.js
@@ -264,7 +264,7 @@ describe('PluginInstall', () => {
       process.chdir(savedCwd);
     });
 
-    it('should install the plugin if it has not been installed yet', () => {
+    it('npmI', () => {
       const packageJson = {
         name: 'test-service',
         description: '',
@@ -278,7 +278,7 @@ describe('PluginInstall', () => {
       return expect(pluginInstall.pluginInstall()).to.be.fulfilled.then(() =>
         Promise.all([
           expect(
-            npmInstallStub.calledWithExactly('npm install --save-dev serverless-plugin-1@latest', {
+            npmInstallStub.calledWithExactly('npm  install --save-dev serverless-plugin-1@latest', {
               stdio: 'ignore',
             })
           ).to.equal(true),
@@ -290,7 +290,7 @@ describe('PluginInstall', () => {
     it('should generate a package.json file in the service directory if not present', () =>
       expect(pluginInstall.pluginInstall()).to.be.fulfilled.then(() => {
         expect(
-          npmInstallStub.calledWithExactly('npm install --save-dev serverless-plugin-1@latest', {
+          npmInstallStub.calledWithExactly('npm  install --save-dev serverless-plugin-1@latest', {
             stdio: 'ignore',
           })
         ).to.equal(true);
@@ -539,7 +539,7 @@ describe('PluginInstall', () => {
       });
       return expect(pluginInstall.installPeerDependencies()).to.be.fulfilled.then(() => {
         expect(
-          npmInstallStub.calledWithExactly('npm install --save-dev some-package@"*"', {
+          npmInstallStub.calledWithExactly('npm  install --save-dev some-package@"*"', {
             stdio: 'ignore',
           })
         ).to.equal(true);
@@ -552,7 +552,7 @@ describe('PluginInstall', () => {
         expect(fse.readJsonSync(servicePackageJsonFilePath)).to.be.deep.equal({
           devDependencies: {},
         });
-        expect(npmInstallStub.calledWithExactly('npm install', { stdio: 'ignore' })).to.equal(
+        expect(npmInstallStub.calledWithExactly('npm  install', { stdio: 'ignore' })).to.equal(
           false
         );
       });

From 62d697c8615e8103aa07401eef2ebae559cc4a17 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 28 Sep 2021 09:47:00 +0200
Subject: [PATCH 0525/1101] fix(Standalone): Upgrade npm version to one that
 supports Node.js v14

---
 scripts/pkg/build.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pkg/build.js b/scripts/pkg/build.js
index bb71518becd..707f32fe26f 100755
--- a/scripts/pkg/build.js
+++ b/scripts/pkg/build.js
@@ -20,7 +20,7 @@ const spawnOptions = { cwd: serverlessPath, stdio: 'inherit' };
   // It's due to fact that npm tends to issue buggy releases
   // Node.js confirms on given version before including it within its bundle
   // Version mappings reference: https://nodejs.org/en/download/releases/
-  await spawn('npm', ['install', '--no-save', 'npm@6.13.4'], spawnOptions);
+  await spawn('npm', ['install', '--no-save', 'npm@6.14.15'], spawnOptions);
 
   try {
     process.stdout.write('Build binaries\n');

From 6f88c11312c67b628c398105af0ea466642731e7 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 28 Sep 2021 09:53:18 +0200
Subject: [PATCH 0526/1101] refactor(Plugins): Improve error messaging on
 failed npm install

---
 commands/plugin-install.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commands/plugin-install.js b/commands/plugin-install.js
index 9ac187c76b4..d083a632bc2 100644
--- a/commands/plugin-install.js
+++ b/commands/plugin-install.js
@@ -120,7 +120,7 @@ const npmInstall = async (name, { serviceDir }) => {
       shell: true,
     });
   } catch (error) {
-    process.stdout.write(error.stdBuffer);
+    process.stdout.write(error.stderrBuffer);
     throw error;
   }
 };

From 26ce1c636be7754584cf47a87f1b92d3b7d98122 Mon Sep 17 00:00:00 2001
From: Seungchan Ahn <dev.issea1015@gmail.com>
Date: Wed, 29 Sep 2021 00:03:41 +0900
Subject: [PATCH 0527/1101] refactor(Plugins): Seclude `plugin uninstall`
 standalone command

(PR #10015)
---
 commands/plugin-install.js                  |  11 +-
 commands/plugin-uninstall.js                | 110 ++++++++++++++++++++
 lib/plugins/plugin/uninstall.js             |   2 +
 scripts/serverless.js                       |   2 +-
 test/unit/commands/plugin-uninstall.test.js |  66 ++++++++++++
 5 files changed, 182 insertions(+), 9 deletions(-)
 create mode 100644 commands/plugin-uninstall.js
 create mode 100644 test/unit/commands/plugin-uninstall.test.js

diff --git a/commands/plugin-install.js b/commands/plugin-install.js
index d083a632bc2..b7eda76fb85 100644
--- a/commands/plugin-install.js
+++ b/commands/plugin-install.js
@@ -30,17 +30,12 @@ module.exports = async ({ configuration, serviceDir, configurationFilename, opti
   await installPlugin(context);
   await addPluginToServerlessFile(context);
 
-  const message = ['Successfully installed', ` "${pluginName}@${pluginVersion}"`].join('');
-  log(message);
+  log(`Successfully installed "${pluginName}@${pluginVersion}"`);
 };
 
 const installPlugin = async ({ serviceDir, pluginName, pluginVersion }) => {
   const pluginFullName = `${pluginName}@${pluginVersion}`;
-  const message = [
-    `Installing plugin "${pluginFullName}"`,
-    ' (this might take a few seconds...)',
-  ].join('');
-  log(message);
+  log(`Installing plugin "${pluginFullName}" (this might take a few seconds...)`);
   await npmInstall(pluginFullName, { serviceDir });
 };
 
@@ -54,7 +49,7 @@ const addPluginToServerlessFile = async ({ configurationFilePath, pluginName })
   const checkIsArrayPluginsObject = (pluginsObject) =>
     pluginsObject == null || Array.isArray(pluginsObject);
   // pluginsObject type determined based on the value loaded during the serverless init.
-  if (_.last(configurationFilePath.split('.')) === 'json') {
+  if (fileExtension === '.json') {
     const serverlessFileObj = await fse.readJson(configurationFilePath);
     const newServerlessFileObj = serverlessFileObj;
     const isArrayPluginsObject = checkIsArrayPluginsObject(newServerlessFileObj.plugins);
diff --git a/commands/plugin-uninstall.js b/commands/plugin-uninstall.js
new file mode 100644
index 00000000000..95c4afb9fa5
--- /dev/null
+++ b/commands/plugin-uninstall.js
@@ -0,0 +1,110 @@
+'use strict';
+
+const spawn = require('child-process-ext/spawn');
+const fsp = require('fs').promises;
+const fse = require('fs-extra');
+const path = require('path');
+const _ = require('lodash');
+const isPlainObject = require('type/plain-object/is');
+const yaml = require('js-yaml');
+const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
+const log = require('@serverless/utils/log');
+const yamlAstParser = require('../lib/utils/yamlAstParser');
+const npmCommandDeferred = require('../lib/utils/npm-command-deferred');
+const {
+  getPluginInfo,
+  getServerlessFilePath,
+  validate,
+} = require('../lib/commands/plugin-management');
+
+module.exports = async ({ configuration, serviceDir, configurationFilename, options }) => {
+  validate({ serviceDir });
+
+  const pluginInfo = getPluginInfo(options.name);
+  const pluginName = pluginInfo.name;
+  const configurationFilePath = getServerlessFilePath({ serviceDir, configurationFilename });
+
+  const context = { configuration, serviceDir, configurationFilePath, pluginName };
+  await uninstallPlugin(context);
+  await removePluginFromServerlessFile(context);
+
+  log(`Successfully uninstalled "${pluginName}"`);
+};
+
+const uninstallPlugin = async ({ serviceDir, pluginName }) => {
+  log(`Uninstalling plugin "${pluginName}" (this might take a few seconds...)`);
+  await npmUninstall(pluginName, { serviceDir });
+};
+
+const removePluginFromServerlessFile = async ({ configurationFilePath, pluginName }) => {
+  const fileExtension = path.extname(configurationFilePath);
+  if (fileExtension === '.js' || fileExtension === '.ts') {
+    requestManualUpdate(configurationFilePath);
+    return;
+  }
+
+  if (fileExtension === '.json') {
+    const serverlessFileObj = await fse.readJson(configurationFilePath);
+    const isArrayPluginsObject = Array.isArray(serverlessFileObj.plugins);
+    const plugins = isArrayPluginsObject
+      ? serverlessFileObj.plugins
+      : serverlessFileObj.plugins && serverlessFileObj.plugins.modules;
+
+    if (plugins) {
+      _.pull(plugins, pluginName);
+      if (!plugins.length) {
+        if (isArrayPluginsObject) {
+          delete serverlessFileObj.plugins;
+        } else {
+          delete serverlessFileObj.plugins.modules;
+        }
+      }
+      await fse.writeJson(configurationFilePath, serverlessFileObj);
+    }
+    return;
+  }
+
+  const serverlessFileObj = yaml.load(await fsp.readFile(configurationFilePath, 'utf8'), {
+    filename: configurationFilePath,
+    schema: cloudformationSchema,
+  });
+  if (serverlessFileObj.plugins != null) {
+    // Plugins section can be behind veriables, opt-out in such case
+    if (isPlainObject(serverlessFileObj.plugins)) {
+      if (
+        serverlessFileObj.plugins.modules != null &&
+        !Array.isArray(serverlessFileObj.plugins.modules)
+      ) {
+        requestManualUpdate(configurationFilePath);
+        return;
+      }
+    } else if (!Array.isArray(serverlessFileObj.plugins)) {
+      requestManualUpdate(configurationFilePath);
+      return;
+    }
+  }
+  await yamlAstParser.removeExistingArrayItem(
+    configurationFilePath,
+    Array.isArray(serverlessFileObj.plugins) ? 'plugins' : 'plugins.modules',
+    pluginName
+  );
+};
+
+const npmUninstall = async (name, { serviceDir }) => {
+  const { command, args } = await npmCommandDeferred;
+  try {
+    await spawn(command, [...args, 'uninstall', '--save-dev', name], {
+      cwd: serviceDir,
+      stdio: 'pipe',
+    });
+  } catch (error) {
+    process.stdout.write(error.stderrBuffer);
+    throw error;
+  }
+};
+
+const requestManualUpdate = (configurationFilePath) =>
+  log(`
+  Can't automatically remove plugin from "${path.basename(configurationFilePath)}" file.
+  Please do it manually.
+`);
diff --git a/lib/plugins/plugin/uninstall.js b/lib/plugins/plugin/uninstall.js
index e37f0d3e18a..8b1fda712da 100644
--- a/lib/plugins/plugin/uninstall.js
+++ b/lib/plugins/plugin/uninstall.js
@@ -1,3 +1,5 @@
+// TODO: Remove in v3
+
 'use strict';
 
 const BbPromise = require('bluebird');
diff --git a/scripts/serverless.js b/scripts/serverless.js
index c3f12a89162..583e847b112 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -41,7 +41,7 @@ let hasTelemetryBeenReported = false;
 // to propery handle e.g. `SIGINT` interrupt
 const keepAliveTimer = setTimeout(() => {}, 60 * 60 * 1000);
 
-const standaloneCommands = new Set(['plugin install']);
+const standaloneCommands = new Set(['plugin install', 'plugin uninstall']);
 
 process.once('uncaughtException', (error) => {
   clearTimeout(keepAliveTimer);
diff --git a/test/unit/commands/plugin-uninstall.test.js b/test/unit/commands/plugin-uninstall.test.js
new file mode 100644
index 00000000000..8024d210d23
--- /dev/null
+++ b/test/unit/commands/plugin-uninstall.test.js
@@ -0,0 +1,66 @@
+'use strict';
+
+const chai = require('chai');
+const sinon = require('sinon');
+const yaml = require('js-yaml');
+const fse = require('fs-extra');
+const proxyquire = require('proxyquire');
+const fixturesEngine = require('../../fixtures/programmatic');
+const resolveConfigurationPath = require('../../../lib/cli/resolve-configuration-path');
+const { expect } = require('chai');
+
+chai.use(require('chai-as-promised'));
+
+const npmCommand = 'npm';
+
+describe('test/unit/commands/plugin-uninstall.test.js', async () => {
+  let spawnFake;
+  let serviceDir;
+  let configurationFilePath;
+
+  const pluginName = 'serverless-plugin-1';
+
+  before(async () => {
+    spawnFake = sinon.fake();
+    const uninstallPlugin = proxyquire('../../../commands/plugin-uninstall', {
+      'child-process-ext/spawn': spawnFake,
+    });
+
+    const fixture = await fixturesEngine.setup('function', {
+      configExt: {
+        plugins: [pluginName],
+      },
+    });
+
+    const configuration = fixture.serviceConfig;
+    serviceDir = fixture.servicePath;
+    configurationFilePath = await resolveConfigurationPath({
+      cwd: serviceDir,
+    });
+    const configurationFilename = configurationFilePath.slice(serviceDir.length + 1);
+    const options = {
+      name: pluginName,
+    };
+
+    await uninstallPlugin({
+      configuration,
+      serviceDir,
+      configurationFilename,
+      options,
+    });
+  });
+
+  it('should uninstall plugin', () => {
+    const firstCall = spawnFake.firstCall;
+    const command = [firstCall.args[0], ...firstCall.args[1]].join(' ');
+    const expectedCommand = `${npmCommand} uninstall --save-dev ${pluginName}`;
+    expect(command).to.have.string(expectedCommand);
+  });
+
+  it('should remove plugin from serverless file', async () => {
+    const serverlessFileObj = yaml.load(await fse.readFile(configurationFilePath, 'utf8'), {
+      filename: configurationFilePath,
+    });
+    expect(serverlessFileObj.plugins).to.be.undefined;
+  });
+});

From b0d854af20d46ef9e07e5d4bce26b88e84f4c4f1 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 28 Sep 2021 09:10:29 +0200
Subject: [PATCH 0528/1101] refactor: Move variables resolution log to debug
 level

---
 lib/Serverless.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index 5942d7a1665..4dcca78b1e5 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -423,10 +423,12 @@ class Serverless {
       // `variables.populateService`. Below lines ensure they're set
       this.variables.loadVariableSyntax();
       this.variables.options = this.pluginManager.cliOptions;
-      log.info(
-        'Skipping variables resolution with old resolver ' +
-          '(new resolver reported no more variables to resolve)'
-      );
+      log
+        .get('variables')
+        .debug(
+          'Skipping variables resolution with old resolver ' +
+            '(new resolver reported no more variables to resolve)'
+        );
       if (process.env.SLS_DEBUG) {
         legacy.log(
           'Skipping variables resolution with old resolver ' +

From 8c5f22ceb67c3a2f4ace3adf8e19cf5e69d4c7b3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 28 Sep 2021 13:28:58 +0200
Subject: [PATCH 0529/1101] refactor(CLI): Modern logs for `plugin install`
 command

---
 commands/plugin-install.js    | 31 ++++++++++++++++++++++------
 lib/plugins/plugin/install.js | 38 ++++++++++++++++++++++++++++-------
 2 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/commands/plugin-install.js b/commands/plugin-install.js
index b7eda76fb85..ab46066a09f 100644
--- a/commands/plugin-install.js
+++ b/commands/plugin-install.js
@@ -8,7 +8,7 @@ const _ = require('lodash');
 const isPlainObject = require('type/plain-object/is');
 const yaml = require('js-yaml');
 const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
-const log = require('@serverless/utils/log');
+const { legacy, log, progress, style } = require('@serverless/utils/log');
 const ServerlessError = require('../lib/serverless-error');
 const yamlAstParser = require('../lib/utils/yamlAstParser');
 const npmCommandDeferred = require('../lib/utils/npm-command-deferred');
@@ -18,7 +18,10 @@ const {
   validate,
 } = require('../lib/commands/plugin-management');
 
+const mainProgress = progress.get('main');
+
 module.exports = async ({ configuration, serviceDir, configurationFilename, options }) => {
+  const commandRunStartTime = Date.now();
   validate({ serviceDir });
 
   const pluginInfo = getPluginInfo(options.name);
@@ -27,15 +30,24 @@ module.exports = async ({ configuration, serviceDir, configurationFilename, opti
   const configurationFilePath = getServerlessFilePath({ serviceDir, configurationFilename });
 
   const context = { configuration, serviceDir, configurationFilePath, pluginName, pluginVersion };
+  mainProgress.notice(
+    `Installing plugin "${pluginName}${pluginVersion === 'latest' ? '' : `@${pluginVersion}`}"`,
+    { isMainEvent: true }
+  );
   await installPlugin(context);
   await addPluginToServerlessFile(context);
 
-  log(`Successfully installed "${pluginName}@${pluginVersion}"`);
+  legacy.log(`Successfully installed "${pluginName}@${pluginVersion}"`);
+  log.notice.success(
+    `Plugin "${pluginName}${
+      pluginVersion === 'latest' ? '' : `@${pluginVersion}`
+    }" installed  ${style.aside(`(${Math.floor((Date.now() - commandRunStartTime) / 1000)}s)`)}`
+  );
 };
 
 const installPlugin = async ({ serviceDir, pluginName, pluginVersion }) => {
   const pluginFullName = `${pluginName}@${pluginVersion}`;
-  log(`Installing plugin "${pluginFullName}" (this might take a few seconds...)`);
+  legacy.log(`Installing plugin "${pluginFullName}" (this might take a few seconds...)`);
   await npmInstall(pluginFullName, { serviceDir });
 };
 
@@ -115,13 +127,20 @@ const npmInstall = async (name, { serviceDir }) => {
       shell: true,
     });
   } catch (error) {
-    process.stdout.write(error.stderrBuffer);
+    legacy.write(error.stderrBuffer);
+    log.error(String(error.stderrBuffer));
     throw error;
   }
 };
 
-const requestManualUpdate = (configurationFilePath) =>
-  log(`
+const requestManualUpdate = (configurationFilePath) => {
+  legacy.log(`
   Can't automatically add plugin into "${path.basename(configurationFilePath)}" file.
   Please make it manually.
 `);
+  log.notice.skip(
+    `Can't automatically add plugin into "${path.basename(
+      configurationFilePath
+    )}" file. Please add it manually.`
+  );
+};
diff --git a/lib/plugins/plugin/install.js b/lib/plugins/plugin/install.js
index 937ba54f57c..7656f576a65 100644
--- a/lib/plugins/plugin/install.js
+++ b/lib/plugins/plugin/install.js
@@ -11,7 +11,7 @@ const _ = require('lodash');
 const isPlainObject = require('type/plain-object/is');
 const yaml = require('js-yaml');
 const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
-const log = require('@serverless/utils/log');
+const { legacy, log, progress, style } = require('@serverless/utils/log');
 const ServerlessError = require('../../serverless-error');
 const cliCommandsSchema = require('../../cli/commands-schema');
 const yamlAstParser = require('../../utils/yamlAstParser');
@@ -19,11 +19,19 @@ const fileExists = require('../../utils/fs/fileExists');
 const pluginUtils = require('./lib/utils');
 const npmCommandDeferred = require('../../utils/npm-command-deferred');
 
-const requestManualUpdate = (serverlessFilePath) =>
-  log(`
+const mainProgress = progress.get('main');
+
+const requestManualUpdate = (serverlessFilePath) => {
+  legacy.log(`
   Can't automatically add plugin into "${path.basename(serverlessFilePath)}" file.
   Please make it manually.
 `);
+  log.notice.skip(
+    `Can't automatically add plugin into "${path.basename(
+      serverlessFilePath
+    )}" file. Please add it manually.`
+  );
+};
 
 class PluginInstall {
   constructor(serverless, options) {
@@ -57,7 +65,7 @@ class PluginInstall {
       .then((plugins) => {
         const plugin = plugins.find((item) => item.name === this.options.pluginName);
         if (!plugin) {
-          this.serverless.cli.log('Plugin not found in serverless registry, continuing to install');
+          legacy.log('Plugin not found in serverless registry, continuing to install');
         }
         return BbPromise.bind(this)
           .then(this.pluginInstall)
@@ -68,7 +76,16 @@ class PluginInstall {
               'Successfully installed',
               ` "${this.options.pluginName}@${this.options.pluginVersion}"`,
             ].join('');
-            this.serverless.cli.log(message);
+            legacy.log(message);
+            log.notice.success(
+              `Plugin "${this.options.pluginName}${
+                this.options.pluginVersion === 'latest' ? '' : `@${this.options.pluginVersion}`
+              }" installed  ${style.aside(
+                `(${Math.floor(
+                  (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+                )}s)`
+              )}`
+            );
           });
       });
   }
@@ -81,7 +98,8 @@ class PluginInstall {
       .then((exists) => {
         // check if package.json is already present. Otherwise create one
         if (!exists) {
-          this.serverless.cli.log('Creating an empty package.json file in your service directory');
+          mainProgress.notice('Creating an empty package.json file', { isMainEvent: true });
+          legacy.log('Creating an empty package.json file in your service directory');
 
           const packageJsonFileContent = {
             name: this.serverless.service.service,
@@ -101,7 +119,13 @@ class PluginInstall {
           `Installing plugin "${pluginFullName}"`,
           ' (this might take a few seconds...)',
         ].join('');
-        this.serverless.cli.log(message);
+        legacy.log(message);
+        mainProgress.notice(
+          `Installing plugin "${this.options.pluginName}${
+            this.options.pluginVersion === 'latest' ? '' : `@${this.options.pluginVersion}`
+          }"`,
+          { isMainEvent: true }
+        );
         return this.npmInstall(pluginFullName);
       });
   }

From 0d5884ebbf015332c08cedea7a4359d66c3a2761 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 28 Sep 2021 13:31:06 +0200
Subject: [PATCH 0530/1101] refactor(Plugins): Fix manual update notice

---
 lib/plugins/plugin/uninstall.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/plugin/uninstall.js b/lib/plugins/plugin/uninstall.js
index 8b1fda712da..ec314ccd054 100644
--- a/lib/plugins/plugin/uninstall.js
+++ b/lib/plugins/plugin/uninstall.js
@@ -18,7 +18,7 @@ const pluginUtils = require('./lib/utils');
 
 const requestManualUpdate = (serverlessFilePath) =>
   log(`
-  Can't automatically add plugin into "${path.basename(serverlessFilePath)}" file.
+  Can't automatically remove plugin from "${path.basename(serverlessFilePath)}" file.
   Please make it manually.
 `);
 

From 54af90884cca7cee74b7768ba216ae19e851e591 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 28 Sep 2021 13:42:14 +0200
Subject: [PATCH 0531/1101] refactor: Cleanup requires order

---
 lib/cli/handle-error.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index c55a1653f89..021bfeb6e0d 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -4,11 +4,11 @@ const path = require('path');
 const isObject = require('type/object/is');
 const chalk = require('chalk');
 const stripAnsi = require('strip-ansi');
-const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
-const resolveLocalServerlessPath = require('./resolve-local-serverless-path');
-const slsVersion = require('./../../package').version;
 const sfeVersion = require('@serverless/dashboard-plugin/package.json').version;
 const { platformClientVersion } = require('@serverless/dashboard-plugin');
+const { style, writeText, legacy } = require('@serverless/utils/log');
+const slsVersion = require('./../../package').version;
+const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
 const ServerlessError = require('../serverless-error');
 const tokenizeException = require('../utils/tokenize-exception');
 const logDeprecation = require('../utils/logDeprecation');
@@ -18,7 +18,7 @@ const { storeLocally: storeTelemetryLocally, send: sendTelemetry } = require('..
 const generateTelemetryPayload = require('../utils/telemetry/generatePayload');
 const resolveErrorLocation = require('../utils/telemetry/resolve-error-location');
 const resolveInput = require('./resolve-input');
-const { style, writeText, legacy } = require('@serverless/utils/log');
+const resolveLocalServerlessPath = require('./resolve-local-serverless-path');
 
 const writeMessage = (title, message) => {
   let line = '';

From 1a3ccdbef8cd9c41b87f7fe440ca300970f3e138 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 28 Sep 2021 14:02:26 +0200
Subject: [PATCH 0532/1101] fix(CLI): Fix handling when local `serverless` is
 removed in command run

---
 lib/cli/handle-error.js                | 74 ++++++++++++++------------
 lib/utils/telemetry/generatePayload.js | 11 ++++
 2 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 021bfeb6e0d..03e2c91c411 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -8,8 +8,8 @@ const sfeVersion = require('@serverless/dashboard-plugin/package.json').version;
 const { platformClientVersion } = require('@serverless/dashboard-plugin');
 const { style, writeText, legacy } = require('@serverless/utils/log');
 const slsVersion = require('./../../package').version;
+const { logWarning } = require('../classes/Error');
 const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
-const ServerlessError = require('../serverless-error');
 const tokenizeException = require('../utils/tokenize-exception');
 const logDeprecation = require('../utils/logDeprecation');
 const resolveIsLocallyInstalled = require('../utils/is-locally-installed');
@@ -65,40 +65,48 @@ module.exports = async (exception, options = {}) => {
   if (isInvokedByGlobalInstallation && !resolveIsLocallyInstalled()) {
     const localServerlessPath = resolveLocalServerlessPath();
 
-    try {
-      // Attempt to use error handler from local version
-      // TODO: Remove local version fallback with next major (when its moved to the top of the process)
+    const localErrorHandlerData = (() => {
       try {
-        require(path.resolve(localServerlessPath, 'lib/cli/handle-error'))(exception, {
-          serverless,
-          isLocallyInstalled,
-          isUncaughtException,
-          command,
-          options: cliOptions,
-          commandSchema,
-          serviceDir,
-          configuration,
-          hasTelemetryBeenReported,
-          commandUsage,
-          variableSourcesInConfig,
-        });
-        return;
-      } catch (error) {
-        // Pass and attempt to use old-style error handler from local version
-
-        // Ugly mock of serverless below is used to ensure that Framework version will be logged with `(local)` suffix
-        require(path.resolve(localServerlessPath, 'lib/classes/Error')).logError(exception, {
-          serverless: serverless || { isLocallyInstalled },
-          forceExit: isUncaughtException,
-        });
-        return;
+        return {
+          handle: require.resolve(path.resolve(localServerlessPath, 'lib/cli/handle-error')),
+          options: {
+            serverless,
+            isLocallyInstalled,
+            isUncaughtException,
+            command,
+            options: cliOptions,
+            commandSchema,
+            serviceDir,
+            configuration,
+            hasTelemetryBeenReported,
+            commandUsage,
+            variableSourcesInConfig,
+          },
+        };
+      } catch {
+        try {
+          // Ugly mock of serverless below is used to ensure that Framework version will be logged with `(local)` suffix
+          return {
+            handle: require.resolve(path.resolve(localServerlessPath, 'lib/classes/Error'))
+              .logError,
+            options: {
+              serverless: serverless || { isLocallyInstalled },
+              forceExit: isUncaughtException,
+            },
+          };
+        } catch {
+          // Corner case of local installation being removed during command processing.
+          // It can happen e.g. during "plugin uninstall" command, where "serverless" originally
+          // installed a as peer dependency was removed
+          logWarning('Could not resolve path to locally installed error handler');
+          return null;
+        }
       }
-    } catch (err) {
-      // This is just a fallback as for most (all?) versions it shouldn't happen
-      throw new ServerlessError(
-        'Could not resolve path to locally installed error handler.',
-        'INVALID_LOCAL_SERVERLESS_ERROR_HANDLER'
-      );
+    })();
+
+    if (localErrorHandlerData) {
+      localErrorHandlerData.handle(exception, localErrorHandlerData.options);
+      return;
     }
   }
 
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index dcc87ec0fb9..b124ac8f644 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -197,6 +197,17 @@ module.exports = ({
       };
     }
     const localServerlessPath = resolveLocalServerlessPath();
+    try {
+      require.resolve(path.resolve(localServerlessPath, 'package.json'));
+    } catch {
+      // Corner case of local installation being removed during command processing.
+      // It can happen e.g. during "plugin uninstall" command, where "serverless" originally
+      // installed a as peer dependency was removed
+      return {
+        'serverless': require('../../../package').version,
+        '@serverless/dashboard-plugin': require('@serverless/dashboard-plugin/package').version,
+      };
+    }
     return {
       'serverless': require(path.resolve(localServerlessPath, 'package.json')).version,
       // Since v2.42.0 it's "@serverless/dashboard-plugin"

From 3094be0cf06f916d8cf180036433677ecd73e013 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 28 Sep 2021 14:04:40 +0200
Subject: [PATCH 0533/1101] refactor(CLI): Modern logs for `plugin uninstall`
 command

---
 commands/plugin-uninstall.js    | 28 ++++++++++++++++++++++------
 lib/plugins/plugin/uninstall.js | 30 ++++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/commands/plugin-uninstall.js b/commands/plugin-uninstall.js
index 95c4afb9fa5..6bd8fbf858b 100644
--- a/commands/plugin-uninstall.js
+++ b/commands/plugin-uninstall.js
@@ -8,7 +8,7 @@ const _ = require('lodash');
 const isPlainObject = require('type/plain-object/is');
 const yaml = require('js-yaml');
 const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
-const log = require('@serverless/utils/log');
+const { legacy, log, progress, style } = require('@serverless/utils/log');
 const yamlAstParser = require('../lib/utils/yamlAstParser');
 const npmCommandDeferred = require('../lib/utils/npm-command-deferred');
 const {
@@ -17,7 +17,10 @@ const {
   validate,
 } = require('../lib/commands/plugin-management');
 
+const mainProgress = progress.get('main');
+
 module.exports = async ({ configuration, serviceDir, configurationFilename, options }) => {
+  const commandRunStartTime = Date.now();
   validate({ serviceDir });
 
   const pluginInfo = getPluginInfo(options.name);
@@ -25,14 +28,20 @@ module.exports = async ({ configuration, serviceDir, configurationFilename, opti
   const configurationFilePath = getServerlessFilePath({ serviceDir, configurationFilename });
 
   const context = { configuration, serviceDir, configurationFilePath, pluginName };
+  mainProgress.notice(`Uninstalling plugin "${pluginName}"`, { isMainEvent: true });
   await uninstallPlugin(context);
   await removePluginFromServerlessFile(context);
 
-  log(`Successfully uninstalled "${pluginName}"`);
+  legacy.log(`Successfully uninstalled "${pluginName}"`);
+  log.notice.success(
+    `Plugin "${pluginName}" uninstalled ${style.aside(
+      `(${Math.floor((Date.now() - commandRunStartTime) / 1000)}s)`
+    )}`
+  );
 };
 
 const uninstallPlugin = async ({ serviceDir, pluginName }) => {
-  log(`Uninstalling plugin "${pluginName}" (this might take a few seconds...)`);
+  legacy.log(`Uninstalling plugin "${pluginName}" (this might take a few seconds...)`);
   await npmUninstall(pluginName, { serviceDir });
 };
 
@@ -98,13 +107,20 @@ const npmUninstall = async (name, { serviceDir }) => {
       stdio: 'pipe',
     });
   } catch (error) {
-    process.stdout.write(error.stderrBuffer);
+    legacy.write(error.stderrBuffer);
+    log.error(String(error.stderrBuffer));
     throw error;
   }
 };
 
-const requestManualUpdate = (configurationFilePath) =>
-  log(`
+const requestManualUpdate = (configurationFilePath) => {
+  legacy.log(`
   Can't automatically remove plugin from "${path.basename(configurationFilePath)}" file.
   Please do it manually.
 `);
+  log.notice.skip(
+    `Can't automatically remove plugin from "${path.basename(
+      configurationFilePath
+    )}" file. Please make it manually.`
+  );
+};
diff --git a/lib/plugins/plugin/uninstall.js b/lib/plugins/plugin/uninstall.js
index ec314ccd054..2622718ed62 100644
--- a/lib/plugins/plugin/uninstall.js
+++ b/lib/plugins/plugin/uninstall.js
@@ -11,16 +11,24 @@ const _ = require('lodash');
 const isPlainObject = require('type/plain-object/is');
 const yaml = require('js-yaml');
 const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
-const log = require('@serverless/utils/log');
+const { legacy, log, progress, style } = require('@serverless/utils/log');
 const cliCommandsSchema = require('../../cli/commands-schema');
 const yamlAstParser = require('../../utils/yamlAstParser');
 const pluginUtils = require('./lib/utils');
 
-const requestManualUpdate = (serverlessFilePath) =>
-  log(`
+const mainProgress = progress.get('main');
+
+const requestManualUpdate = (serverlessFilePath) => {
+  legacy.log(`
   Can't automatically remove plugin from "${path.basename(serverlessFilePath)}" file.
   Please make it manually.
 `);
+  log.notice.skip(
+    `Can't automatically remove plugin from "${path.basename(
+      serverlessFilePath
+    )}" file. Please make it manually.`
+  );
+};
 
 class PluginUninstall {
   constructor(serverless, options) {
@@ -54,25 +62,31 @@ class PluginUninstall {
       .then((plugins) => {
         const plugin = plugins.find((item) => item.name === this.options.pluginName);
         if (!plugin) {
-          this.serverless.cli.log(
-            'Plugin not found in serverless registry, continuing to uninstall'
-          );
+          legacy.log('Plugin not found in serverless registry, continuing to uninstall');
         }
         return BbPromise.bind(this)
           .then(this.uninstallPeerDependencies)
           .then(this.pluginUninstall)
           .then(this.removePluginFromServerlessFile)
           .then(() => {
-            this.serverless.cli.log(`Successfully uninstalled "${this.options.pluginName}"`);
+            legacy.log(`Successfully uninstalled "${this.options.pluginName}"`);
+            log.notice.success(
+              `Plugin "${this.options.pluginName}" uninstalled ${style.aside(
+                `(${Math.floor(
+                  (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+                )}s)`
+              )}`
+            );
             return BbPromise.resolve();
           });
       });
   }
 
   async pluginUninstall() {
-    this.serverless.cli.log(
+    legacy.log(
       `Uninstalling plugin "${this.options.pluginName}" (this might take a few seconds...)`
     );
+    mainProgress.notice(`Uninstalling plugin "${this.options.pluginName}"`, { isMainEvent: true });
     return this.npmUninstall(this.options.pluginName);
   }
 

From 00e016c4bba86095744129d24683343f0cc5129f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 28 Sep 2021 14:31:13 +0200
Subject: [PATCH 0534/1101] refactor(CLI): Modern logs for `plugin list`
 command

---
 lib/plugins/plugin/lib/utils.js                | 16 +++++++++++++---
 test/unit/lib/plugins/plugin/lib/utils.test.js |  8 --------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/plugins/plugin/lib/utils.js b/lib/plugins/plugin/lib/utils.js
index 92220c1dc45..3ccc9752cd8 100644
--- a/lib/plugins/plugin/lib/utils.js
+++ b/lib/plugins/plugin/lib/utils.js
@@ -7,6 +7,7 @@ const HttpsProxyAgent = require('https-proxy-agent');
 const url = require('url');
 const chalk = require('chalk');
 const _ = require('lodash');
+const { legacy, log, writeText, style } = require('@serverless/utils/log');
 const ServerlessError = require('../../../serverless-error');
 
 module.exports = {
@@ -73,18 +74,27 @@ module.exports = {
       const orderedPlugins = _.orderBy(plugins, ['name'], ['asc']);
       orderedPlugins.forEach((plugin) => {
         message += `${chalk.yellow.underline(plugin.name)} - ${plugin.description}\n`;
+        writeText(`${style.link(plugin.name)} ${style.aside(plugin.description)}`);
       });
       // remove last two newlines for a prettier output
       message = message.slice(0, -2);
-      this.serverless.cli.consoleLog(message);
-      this.serverless.cli.consoleLog(`
+      legacy.consoleLog(message);
+      legacy.consoleLog(`
 To install a plugin run 'serverless plugin install --name plugin-name-here'
 
 It will be automatically downloaded and added to your package.json and serverless.yml file
       `);
+      writeText(
+        null,
+        'Install a plugin by running:',
+        '  serverless plugin install --name ...',
+        null,
+        'It will be automatically downloaded and added to package.json and serverless.yml'
+      );
     } else {
       message = 'There are no plugins available to display';
-      this.serverless.cli.consoleLog(message);
+      legacy.consoleLog(message);
+      log.notice.skip('There are no plugins available to display');
     }
 
     return BbPromise.resolve(message);
diff --git a/test/unit/lib/plugins/plugin/lib/utils.test.js b/test/unit/lib/plugins/plugin/lib/utils.test.js
index 4aad4710f9f..cc46c1f65bd 100644
--- a/test/unit/lib/plugins/plugin/lib/utils.test.js
+++ b/test/unit/lib/plugins/plugin/lib/utils.test.js
@@ -15,7 +15,6 @@ chai.use(require('chai-as-promised'));
 describe('PluginUtils', () => {
   let pluginUtils;
   let serverless;
-  let consoleLogStub;
   const plugins = [
     {
       name: 'serverless-plugin-1',
@@ -39,11 +38,6 @@ describe('PluginUtils', () => {
     serverless.cli = new CLI(serverless);
     const options = {};
     pluginUtils = new PluginInstall(serverless, options);
-    consoleLogStub = sinon.stub(serverless.cli, 'consoleLog').returns();
-  });
-
-  afterEach(() => {
-    serverless.cli.consoleLog.restore();
   });
 
   describe('#getServerlessFilePath()', () => {
@@ -107,7 +101,6 @@ describe('PluginUtils', () => {
       expectedMessage += ' - Serverless Plugin 2\n';
       expectedMessage = expectedMessage.slice(0, -2);
       return expect(pluginUtils.display(plugins)).to.be.fulfilled.then((message) => {
-        expect(consoleLogStub.calledTwice).to.equal(true);
         expect(message).to.equal(expectedMessage);
       });
     });
@@ -116,7 +109,6 @@ describe('PluginUtils', () => {
       const expectedMessage = 'There are no plugins available to display';
 
       return pluginUtils.display([]).then((message) => {
-        expect(consoleLogStub.calledOnce).to.equal(true);
         expect(message).to.equal(expectedMessage);
       });
     });

From 1463171cae93e9e050350f6eb272e35cfade0204 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 28 Sep 2021 16:26:26 +0200
Subject: [PATCH 0535/1101] refactor(CLI): Modern logs for `plugin search`
 command

---
 lib/plugins/plugin/search.js                | 5 ++++-
 test/unit/lib/plugins/plugin/search.test.js | 7 -------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/plugins/plugin/search.js b/lib/plugins/plugin/search.js
index d5d9b1fe27b..3dd1fa616f2 100644
--- a/lib/plugins/plugin/search.js
+++ b/lib/plugins/plugin/search.js
@@ -2,6 +2,7 @@
 
 const BbPromise = require('bluebird');
 const chalk = require('chalk');
+const { legacy, log } = require('@serverless/utils/log');
 const cliCommandsSchema = require('../../cli/commands-schema');
 const pluginUtils = require('./lib/utils');
 
@@ -42,7 +43,9 @@ class PluginSearch {
         const pluginCount = filteredPlugins.length;
         const query = this.options.query;
         const message = `${pluginCount} plugin(s) found for your search query "${query}"\n`;
-        this.serverless.cli.consoleLog(chalk.yellow(message));
+        legacy.consoleLog(chalk.yellow(message));
+        log.notice(`${pluginCount} plugin(s) found matching "${query}":`);
+        log.notice();
 
         return filteredPlugins;
       })
diff --git a/test/unit/lib/plugins/plugin/search.test.js b/test/unit/lib/plugins/plugin/search.test.js
index 99e12c8abb0..f7bd123b8bd 100644
--- a/test/unit/lib/plugins/plugin/search.test.js
+++ b/test/unit/lib/plugins/plugin/search.test.js
@@ -12,7 +12,6 @@ const expect = require('chai').expect;
 describe('PluginSearch', () => {
   let pluginSearch;
   let serverless;
-  let consoleLogStub;
 
   const plugins = [
     {
@@ -37,11 +36,6 @@ describe('PluginSearch', () => {
     serverless.cli = new CLI(serverless);
     const options = {};
     pluginSearch = new PluginSearch(serverless, options);
-    consoleLogStub = sinon.stub(serverless.cli, 'consoleLog').returns();
-  });
-
-  afterEach(() => {
-    serverless.cli.consoleLog.restore();
   });
 
   describe('#constructor()', () => {
@@ -98,7 +92,6 @@ describe('PluginSearch', () => {
       pluginSearch.options.query = 'serverless-plugin-1';
 
       return expect(pluginSearch.search()).to.be.fulfilled.then(() => {
-        expect(consoleLogStub.calledOnce).to.equal(true);
         expect(getPluginsStub.calledOnce).to.equal(true);
         expect(displayStub.calledOnce).to.equal(true);
       });

From ad315b1d129e346612eddc05b08b055f1e57a8d6 Mon Sep 17 00:00:00 2001
From: Travis Haby <travis@guildeducation.com>
Date: Tue, 28 Sep 2021 12:49:49 -0600
Subject: [PATCH 0536/1101] docs: Fix typo (#10019)

---
 docs/providers/aws/guide/plugins.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/providers/aws/guide/plugins.md b/docs/providers/aws/guide/plugins.md
index a1c1dfe3b65..9fd435b62c1 100644
--- a/docs/providers/aws/guide/plugins.md
+++ b/docs/providers/aws/guide/plugins.md
@@ -171,7 +171,7 @@ A Hook binds code to any lifecycle event from any command.
 ```javascript
 'use strict';
 
-class MyPugin {
+class MyPlugin {
   constructor() {
     this.commands = {
       foo: {

From cd03f550ae5307ca44e1e27d4d0822bef6cc9dcf Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 29 Sep 2021 21:29:47 +0200
Subject: [PATCH 0537/1101] fix(AWS EventBridge): Fix `MaximumEventAgeInSecond`
 template reference

---
 lib/plugins/aws/package/compile/events/eventBridge/index.js     | 2 +-
 .../aws/package/compile/events/eventBridge/index.test.js        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/eventBridge/index.js b/lib/plugins/aws/package/compile/events/eventBridge/index.js
index eabd940700a..82c146efe47 100644
--- a/lib/plugins/aws/package/compile/events/eventBridge/index.js
+++ b/lib/plugins/aws/package/compile/events/eventBridge/index.js
@@ -180,7 +180,7 @@ class AwsCompileEventBridgeEvents {
               }
 
               RetryPolicy = {
-                MaximumEventAge: RetryPolicy.maximumEventAge,
+                MaximumEventAgeInSeconds: RetryPolicy.maximumEventAge,
                 MaximumRetryAttempts: RetryPolicy.maximumRetryAttempts,
               };
             }
diff --git a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
index 18e347ff3ff..2a0178c8343 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
@@ -542,7 +542,7 @@ describe('EventBridgeEvents', () => {
         const retryPolicyRuleTarget = getRuleResourceEndingWith(cfResources, '6').Properties
           .Targets[0];
         expect(retryPolicyRuleTarget.RetryPolicy).to.deep.equal({
-          MaximumEventAge: 7200,
+          MaximumEventAgeInSeconds: 7200,
           MaximumRetryAttempts: 9,
         });
       });

From 07aed3429c63ed13ad9ca6262c641a907170f4f9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 29 Sep 2021 19:01:38 +0200
Subject: [PATCH 0538/1101] refactor(CLI): Modern logs for interactive setup

---
 lib/cli/interactive-setup/aws-credentials.js  | 70 ++++++++++++++-----
 lib/cli/interactive-setup/dashboard-login.js  |  8 ++-
 .../interactive-setup/dashboard-set-org.js    | 37 ++++++++--
 lib/cli/interactive-setup/deploy.js           | 70 +++++++++++++------
 lib/cli/interactive-setup/index.js            |  4 +-
 lib/cli/interactive-setup/service.js          | 36 ++++++++--
 lib/cli/interactive-setup/utils.js            | 15 +++-
 .../interactive-setup/dashboard-login.test.js |  5 ++
 .../dashboard-set-org.test.js                 | 35 +++++++++-
 9 files changed, 223 insertions(+), 57 deletions(-)

diff --git a/lib/cli/interactive-setup/aws-credentials.js b/lib/cli/interactive-setup/aws-credentials.js
index 4100f0a9ac2..50e30d4c680 100644
--- a/lib/cli/interactive-setup/aws-credentials.js
+++ b/lib/cli/interactive-setup/aws-credentials.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const chalk = require('chalk');
+const { legacy, log, style, progress } = require('@serverless/utils/log');
 const _ = require('lodash');
 const inquirer = require('@serverless/utils/inquirer');
 const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-history');
@@ -156,10 +157,18 @@ const credentialsSetupChoice = async (context, providers) => {
 };
 
 const steps = {
-  writeOnSetupSkip: () =>
-    process.stdout.write(`\nYou can setup your AWS account later. More details available here:
+  writeOnSetupSkip: () => {
+    legacy.write(`\nYou can setup your AWS account later. More details available here:
 
-  http://slss.io/aws-creds-setup\n`),
+  http://slss.io/aws-creds-setup\n`);
+
+    log.notice();
+    log.notice.skip(
+      `You can setup your AWS account later. More details available here: ${style.link(
+        'http://slss.io/aws-creds-setup'
+      )}`
+    );
+  },
 
   ensureAwsAccount: async ({ stepHistory }) => {
     if (await confirm('Do you have an AWS account?', { name: 'hasAwsAccount' })) return;
@@ -185,21 +194,29 @@ const steps = {
     const accessKeyId = await awsAccessKeyIdInput(context);
     const secretAccessKey = await awsSecretAccessKeyInput(context);
     await awsCredentials.saveFileProfiles(new Map([['default', { accessKeyId, secretAccessKey }]]));
-    process.stdout.write(
+    legacy.write(
       `\n${chalk.green(
         `AWS credentials saved on your machine at ${chalk.bold(
           process.platform === 'win32' ? '%userprofile%\\.aws\\credentials' : '~/.aws/credentials'
         )}. Go there to change them at any time.`
       )}\n`
     );
+    log.notice();
+    log.notice.success(
+      `AWS credentials saved on your machine at "${
+        process.platform === 'win32' ? '%userprofile%\\.aws\\credentials' : '~/.aws/credentials'
+      }". Go there to change them at any time.`
+    );
   },
   handleProviderCreation: async ({ configuration: { org: orgName }, stepHistory }) => {
     const providersUrl = `https://app.serverless.com/${orgName}/settings/providers?source=cli&providerId=new&provider=aws`;
     openBrowser(chalk.bold.white(providersUrl));
-    process.stdout.write(
-      'To learn more about providers, visit: http://slss.io/add-providers-dashboard\n'
-    );
-    process.stdout.write('\nWaiting for creation of AWS Access Role provider...\n');
+    legacy.write('To learn more about providers, visit: http://slss.io/add-providers-dashboard\n');
+    log.notice('To learn more about providers, visit: http://slss.io/add-providers-dashboard');
+    legacy.write('\nWaiting for creation of AWS Access Role provider...\n');
+
+    const providerProgress = progress.get('provider');
+    providerProgress.notice('Waiting for creation of AWS Access Role provider');
 
     let onEvent;
     let showSkipPromptTimeout;
@@ -264,16 +281,21 @@ const steps = {
       sdk.disconnect();
     }
 
+    providerProgress.remove();
+
+    log.notice();
     if (maybeEvent) {
-      process.stdout.write(
-        `\n${chalk.green('AWS Access Role provider was successfully created')}\n`
-      );
+      legacy.write(`\n${chalk.green('AWS Access Role provider was successfully created')}\n`);
+      log.notice.success('AWS Access Role provider was successfully created');
       return maybeEvent.data.object.provider_uid;
     }
 
-    process.stdout.write(
+    legacy.write(
       '\nSkipping credentials provider setup. You can still setup credentials provider later.\n'
     );
+    log.notice.skip(
+      'Skipping credentials provider setup. You can still setup credentials provider later.'
+    );
     return null;
   },
   linkProviderToServiceInstance: async ({ providerUid, configuration, options }) => {
@@ -288,7 +310,9 @@ const steps = {
       orgUid = await getOrgUidByName(org);
     } catch (err) {
       if (err.code === 'DASHBOARD_UNAVAILABLE') {
-        process.stdout.write(`\n${chalk.yellow(err.message)}\n`);
+        legacy.write(`\n${chalk.yellow(err.message)}\n`);
+        log.error();
+        log.error(err.message);
         return false;
       }
       throw err;
@@ -298,11 +322,13 @@ const steps = {
       return true;
     } catch (err) {
       if (err.statusCode && err.statusCode >= 500) {
-        process.stdout.write(
+        legacy.write(
           `\n${chalk.yellow(
             'Dashboard service is currently unavailable, please try again later'
           )}\n`
         );
+        log.error();
+        log.error('Dashboard service is currently unavailable, please try again later');
         return false;
       }
       throw err;
@@ -342,7 +368,9 @@ module.exports = {
         providers = await getProviders(orgName);
       } catch (err) {
         if (err.code === 'DASHBOARD_UNAVAILABLE') {
-          process.stdout.write(`\n${chalk.yellow(err.message)}\n`);
+          legacy.write(`\n${chalk.yellow(err.message)}\n`);
+          log.error();
+          log.error(err.message);
           return false;
         }
         throw err;
@@ -378,7 +406,9 @@ module.exports = {
         providers = await getProviders(context.configuration.org);
       } catch (err) {
         if (err.code === 'DASHBOARD_UNAVAILABLE') {
-          process.stdout.write(`\n${chalk.yellow(err.message)}\n`);
+          legacy.write(`\n${chalk.yellow(err.message)}\n`);
+          log.error();
+          log.error(err.message);
           return;
         }
         throw err;
@@ -404,7 +434,9 @@ module.exports = {
         return;
       } catch (err) {
         if (err.code === 'DASHBOARD_UNAVAILABLE') {
-          process.stdout.write(`\n${chalk.yellow(err.message)}\n`);
+          legacy.write(`\n${chalk.yellow(err.message)}\n`);
+          log.error();
+          log.error(err.message);
           return;
         }
         throw err;
@@ -427,9 +459,11 @@ module.exports = {
     });
 
     if (linked) {
-      process.stdout.write(
+      legacy.write(
         `\n${chalk.green('Selected provider was successfully linked to your service')}\n`
       );
+      log.notice();
+      log.notice.success('Selected provider was successfully linked to your service');
     }
   },
   steps,
diff --git a/lib/cli/interactive-setup/dashboard-login.js b/lib/cli/interactive-setup/dashboard-login.js
index c9c94d5bf43..43462cebf0c 100644
--- a/lib/cli/interactive-setup/dashboard-login.js
+++ b/lib/cli/interactive-setup/dashboard-login.js
@@ -1,10 +1,12 @@
 'use strict';
 
 const _ = require('lodash');
+const { legacy } = require('@serverless/utils/log');
 const { ServerlessSDK } = require('@serverless/platform-client');
 const login = require('@serverless/dashboard-plugin/lib/login');
 const configUtils = require('@serverless/utils/config');
 const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-history');
+const { showOnboardingWelcome } = require('./utils');
 
 const loginOrRegisterQuestion = async (stepHistory) =>
   promptWithHistory({
@@ -64,9 +66,13 @@ module.exports = {
     return !isLoggedIn;
   },
   async run(context) {
-    process.stdout.write(
+    legacy.write(
       'Enable Serverless Dashboard to get enhanced monitoring, logs and secrets management: https://serverless.com/monitoring\n\n'
     );
+    if (context.initial.isInServiceContext && !context.initial.isDashboardEnabled) {
+      showOnboardingWelcome(context);
+    }
+
     return steps.loginOrRegister(context);
   },
   steps,
diff --git a/lib/cli/interactive-setup/dashboard-set-org.js b/lib/cli/interactive-setup/dashboard-set-org.js
index 20b641d208a..da5a57bacdd 100644
--- a/lib/cli/interactive-setup/dashboard-set-org.js
+++ b/lib/cli/interactive-setup/dashboard-set-org.js
@@ -2,11 +2,12 @@
 
 const _ = require('lodash');
 const chalk = require('chalk');
+const { legacy, log } = require('@serverless/utils/log');
 const accountUtils = require('@serverless/utils/account');
 const configUtils = require('@serverless/utils/config');
 const { ServerlessSDK } = require('@serverless/platform-client');
 const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-history');
-const { writeOrgAndApp } = require('./utils');
+const { writeOrgAndApp, showOnboardingWelcome } = require('./utils');
 const {
   getPlatformClientWithAccessKey,
   getOrCreateAccessKeyForOrg,
@@ -15,9 +16,13 @@ const {
 const isValidAppName = RegExp.prototype.test.bind(/^[a-z0-9](?:[a-z0-9-]{0,126}[a-z0-9])?$/);
 
 const orgUpdateConfirm = async (stepHistory) => {
-  process.stdout.write(
+  legacy.write(
     "Service has monitoring enabled, but it is configured with the 'org' to which you do not have access\n\n"
   );
+  log.notice(
+    'Service has monitoring enabled, but it is configured with the "org" to which you do not have access'
+  );
+  log.notice();
   const shouldUpdateOrg = await promptWithHistory({
     message: 'Would you like to update it?',
     type: 'confirm',
@@ -28,9 +33,13 @@ const orgUpdateConfirm = async (stepHistory) => {
 };
 
 const appUpdateConfirm = async (appName, orgName, stepHistory) => {
-  process.stdout.write(
+  legacy.write(
     "Service seems to have monitoring enabled, but configured app doesn't seem to exist in an organization.\n\n"
   );
+  log.notice(
+    "Service seems to have monitoring enabled, but configured app doesn't seem to exist in an organization."
+  );
+  log.notice();
 
   const appUpdateType = await promptWithHistory({
     message: 'What would you like to do?',
@@ -187,11 +196,13 @@ const steps = {
         return;
       }
     }
-    process.stdout.write(
+    legacy.write(
       `\n${chalk.green('Your project has been setup with org ')}${chalk.white.bold(
         orgName
       )}${chalk.green(' and app ')}${chalk.white.bold(appName)}\n`
     );
+    log.notice();
+    log.notice.success(`Your project has been setup with org "${orgName}" and app "${appName}"`);
     await writeOrgAndApp(orgName, appName, context);
     return;
   },
@@ -285,11 +296,13 @@ module.exports = {
           };
         }
         if (options.app) {
-          process.stdout.write(
+          legacy.write(
             chalk.red(
               "\nPassed value for `--app` doesn't seem to correspond to chosen organization.\n"
             )
           );
+          log.error();
+          log.error('Passed value for "--app" doesn\'t seem to correspond to chosen organization.');
         }
         return {
           user,
@@ -313,15 +326,21 @@ module.exports = {
       };
     } else if (orgName) {
       if (options.org) {
-        process.stdout.write(
+        legacy.write(
           chalk.red(
             "\nPassed value for `--org` doesn't seem to correspond to account with which you're logged in with.\n"
           )
         );
+        log.error();
+        log.error(
+          'Passed value for "--org" doesn\'t seem to correspond to account with which you\'re logged in with.'
+        );
       } else {
-        process.stdout.write(
+        legacy.write(
           chalk.red(`\nConfigured org '${orgName}' is not available in your account.\n`)
         );
+        log.error();
+        log.error(`Configured org "${orgName}" is not available in your account.`);
       }
     }
     return {
@@ -334,6 +353,10 @@ module.exports = {
   },
   async run(context, stepData) {
     const { configuration, options, stepHistory } = context;
+    if (context.initial.isInServiceContext && !context.initial.isDashboardEnabled) {
+      showOnboardingWelcome(context);
+    }
+
     if (!stepData.orgName) delete configuration.org;
     if (!stepData.appName && !stepData.newAppName) delete configuration.app;
     if (!options.org && !options.app) {
diff --git a/lib/cli/interactive-setup/deploy.js b/lib/cli/interactive-setup/deploy.js
index b73392af619..5d55e162ec7 100644
--- a/lib/cli/interactive-setup/deploy.js
+++ b/lib/cli/interactive-setup/deploy.js
@@ -2,6 +2,7 @@
 
 const Serverless = require('../../Serverless');
 const chalk = require('chalk');
+const { legacy, writeText, style } = require('@serverless/utils/log');
 const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-history');
 const { doesServiceInstanceHaveLinkedProvider } = require('./utils');
 const _ = require('lodash');
@@ -10,6 +11,8 @@ const { getDashboardInteractUrl } = require('@serverless/dashboard-plugin/lib/da
 const AWS = require('aws-sdk');
 const isAuthenticated = require('@serverless/dashboard-plugin/lib/isAuthenticated');
 
+const isModernStyle = Number(process.env.SLS_DEV_LOG_MODE) & 1;
+
 const printMessage = ({
   serviceName,
   hasBeenDeployed,
@@ -17,13 +20,24 @@ const printMessage = ({
   isConfiguredWithDashboard,
   initialContext,
 }) => {
+  writeText(
+    null,
+    style.aside('What next?'),
+    'Run these commands in the project directory:',
+    null,
+    `serverless deploy    ${style.aside('Deploy changes')}`,
+    `serverless info      ${style.aside('View deployed endpoints and resources')}`,
+    `serverless invoke    ${style.aside('Invoke deployed functions')}`,
+    `serverless --help    ${style.aside('Discover more commands')}`
+  );
+
   const projectInformationSuffix = initialContext.isInServiceContext
     ? ''
     : `${chalk.green(' and available in ')}${chalk.white.bold(`./${serviceName}`)}`;
 
   if (isConfiguredWithDashboard) {
     if (hasBeenDeployed) {
-      process.stdout.write(
+      legacy.write(
         [
           `\n${chalk.green('Your project is live')}${projectInformationSuffix}`,
           `\n  Run ${chalk.bold('serverless info')} in the project directory`,
@@ -38,7 +52,7 @@ const printMessage = ({
       return;
     }
 
-    process.stdout.write(
+    legacy.write(
       [
         `\n${chalk.green('Your project is ready for deployment')}${projectInformationSuffix}`,
         `\n  Run ${chalk.bold('serverless deploy')} in the project directory`,
@@ -53,7 +67,7 @@ const printMessage = ({
   }
 
   if (hasBeenDeployed) {
-    process.stdout.write(
+    legacy.write(
       [
         `\n${chalk.green('Your project is live')}${projectInformationSuffix}`,
         `\n  Run ${chalk.bold('serverless info')} in the project directory`,
@@ -71,7 +85,7 @@ const printMessage = ({
     return;
   }
 
-  process.stdout.write(
+  legacy.write(
     [
       `\n${chalk.green('Your project is ready for deployment')}${projectInformationSuffix}`,
       `\n  Run ${chalk.bold('serverless deploy')} in the project directory`,
@@ -159,26 +173,38 @@ module.exports = {
 
     let interactiveOutputPlugin;
 
-    try {
-      await overrideStdoutWrite(
-        () => {},
-        async (originalStdWrite) => {
-          // This is a hack to disable local fallback for interactive setup
-          // After https://github.com/serverless/serverless/issues/1720 is addressed
-          // We can change the approach to deployment in interactive setup and remove this hack
-          serverless.isLocallyInstalled = true;
-          await serverless.init();
-          interactiveOutputPlugin = configurePlugin(serverless, originalStdWrite);
-          // Remove previously set `isLocallyInstalled` as it was only needed to avoid local fallback in `init()`
-          delete serverless.isLocallyInstalled;
-          await serverless.run();
+    if (isModernStyle) {
+      // With modern logs do not hijack Framework output
+      //
+      // This is a hack to disable local fallback for interactive setup
+      // After https://github.com/serverless/serverless/issues/1720 is addressed
+      // We can change the approach to deployment in interactive setup and remove this hack
+      serverless.isLocallyInstalled = true;
+      await serverless.init();
+      delete serverless.isLocallyInstalled;
+      await serverless.run();
+    } else {
+      try {
+        await overrideStdoutWrite(
+          () => {},
+          async (originalStdWrite) => {
+            // This is a hack to disable local fallback for interactive setup
+            // After https://github.com/serverless/serverless/issues/1720 is addressed
+            // We can change the approach to deployment in interactive setup and remove this hack
+            serverless.isLocallyInstalled = true;
+            await serverless.init();
+            interactiveOutputPlugin = configurePlugin(serverless, originalStdWrite);
+            // Remove previously set `isLocallyInstalled` as it was only needed to avoid local fallback in `init()`
+            delete serverless.isLocallyInstalled;
+            await serverless.run();
+          }
+        );
+      } catch (err) {
+        if (interactiveOutputPlugin) {
+          interactiveOutputPlugin.handleError();
         }
-      );
-    } catch (err) {
-      if (interactiveOutputPlugin) {
-        interactiveOutputPlugin.handleError();
+        throw err;
       }
-      throw err;
     }
 
     printMessage({
diff --git a/lib/cli/interactive-setup/index.js b/lib/cli/interactive-setup/index.js
index bd360394dc9..c3352b918e4 100644
--- a/lib/cli/interactive-setup/index.js
+++ b/lib/cli/interactive-setup/index.js
@@ -2,6 +2,7 @@
 
 const inquirer = require('@serverless/utils/inquirer');
 const { StepHistory } = require('@serverless/utils/telemetry');
+const { legacy, log } = require('@serverless/utils/log');
 const { resolveInitialContext } = require('./utils');
 
 const steps = {
@@ -48,7 +49,8 @@ module.exports = async (context) => {
       timestamp: Date.now(),
     });
     if (stepData) {
-      process.stdout.write('\n');
+      legacy.write('\n');
+      log.notice();
       context.stepHistory = new StepHistory();
       context.history.set(stepName, context.stepHistory);
       await step.run(context, stepData);
diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index 0442b1ac8f1..e8d0e234402 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -5,6 +5,7 @@ const chalk = require('chalk');
 const fsp = require('fs').promises;
 const spawn = require('child-process-ext/spawn');
 const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-history');
+const { legacy, log, progress } = require('@serverless/utils/log');
 const resolveConfigurationPath = require('../resolve-configuration-path');
 const readConfiguration = require('../../configuration/read');
 const resolveVariables = require('../../configuration/variables');
@@ -126,6 +127,9 @@ module.exports = {
   async run(context) {
     const workingDir = context.cwd || process.cwd();
 
+    log.notice('Creating a new serverless project');
+    log.notice();
+
     // Validate if user did not provide more than one of: `template', 'template-url` and `template-path` options
     const templateOptions = new Set(['template-path', 'template', 'template-url']);
     if (Object.keys(context.options).filter((key) => templateOptions.has(key)).length > 1) {
@@ -159,7 +163,9 @@ module.exports = {
       });
       projectDir = join(workingDir, projectName);
       const templateUrl = context.options['template-url'];
-      process.stdout.write(`\nDownloading template from provided url: ${templateUrl}...\n`);
+      legacy.write(`\nDownloading template from provided url: ${templateUrl}...\n`);
+      const downloadProgress = progress.get('template-download');
+      downloadProgress.notice(`Downloading template from provided url: ${templateUrl}`);
       try {
         await downloadTemplateFromRepo(templateUrl, null, projectName, { silent: true });
       } catch (err) {
@@ -170,6 +176,7 @@ module.exports = {
           'INVALID_TEMPLATE_URL'
         );
       }
+      downloadProgress.remove();
     } else {
       let projectType;
       if (context.options.template) {
@@ -177,10 +184,15 @@ module.exports = {
       } else {
         projectType = await projectTypeChoice(context.stepHistory);
         if (projectType === 'other') {
-          process.stdout.write(
+          legacy.write(
             '\nRun “serverless create --help” to view available templates and create a new project ' +
               'from one of those templates.\n'
           );
+          log.notice();
+          log.notice(
+            'Run "serverless create --help" to view available templates and create a new project ' +
+              'from one of those templates.'
+          );
           return;
         }
       }
@@ -192,7 +204,9 @@ module.exports = {
       });
       projectDir = join(workingDir, projectName);
       const templateUrl = `https://github.com/serverless/examples/tree/master/${projectType}`;
-      process.stdout.write(`\nDownloading "${projectType}" template...\n`);
+      legacy.write(`\nDownloading "${projectType}" template...\n`);
+      const downloadProgress = progress.get('template-download');
+      downloadProgress.notice(`Downloading "${projectType}" template`);
       try {
         await downloadTemplateFromRepo(templateUrl, projectType, projectName, { silent: true });
       } catch (err) {
@@ -210,6 +224,7 @@ module.exports = {
           'TEMPLATE_DOWNLOAD_FAILED'
         );
       }
+      downloadProgress.remove();
     }
 
     let hasPackageJson = false;
@@ -221,17 +236,23 @@ module.exports = {
     }
 
     if (hasPackageJson) {
-      process.stdout.write(`\nInstalling dependencies with "npm" in "${projectName}" folder\n`);
+      legacy.write(`\nInstalling dependencies with "npm" in "${projectName}" folder\n`);
+      const installProgress = progress.get('npm-install');
+      installProgress.notice(`Installing dependencies with "npm" in "${projectName}" folder`);
       const { command, args } = await npmCommandDeferred;
       try {
         await spawn(command, [...args, 'install'], { cwd: projectDir });
       } catch (err) {
         if (err.code === 'ENOENT') {
-          process.stdout.write(
+          legacy.write(
             `\n${chalk.yellow(
               'Cannot install dependencies as "npm" installation could not be found. Please install npm and run "npm install" in directory of created service.'
             )}\n`
           );
+          log.warning();
+          log.warning(
+            'Cannot install dependencies as "npm" installation could not be found. Please install npm and run "npm install" in directory of created service.'
+          );
         } else {
           throw new ServerlessError(
             `Cannot install dependencies: ${err.message}`,
@@ -239,6 +260,7 @@ module.exports = {
           );
         }
       }
+      installProgress.remove();
     }
 
     try {
@@ -248,11 +270,13 @@ module.exports = {
       // pass
     }
 
-    process.stdout.write(
+    legacy.write(
       `\n${chalk.green(
         `Project successfully created in ${chalk.white.bold(projectName)} folder`
       )}\n`
     );
+    log.notice();
+    log.notice.success(`Project successfully created in ${projectName} folder`);
     context.serviceDir = projectDir;
     const configurationPath = await resolveConfigurationPath({ cwd: projectDir, options: {} });
     context.configurationFilename = configurationPath.slice(projectDir.length + 1);
diff --git a/lib/cli/interactive-setup/utils.js b/lib/cli/interactive-setup/utils.js
index df4b1c99bc1..c6215a0e03a 100644
--- a/lib/cli/interactive-setup/utils.js
+++ b/lib/cli/interactive-setup/utils.js
@@ -1,7 +1,9 @@
 'use strict';
 
 const path = require('path');
+const memoizee = require('memoizee');
 const inquirer = require('@serverless/utils/inquirer');
+const { log, legacy } = require('@serverless/utils/log');
 const resolveProviderCredentials = require('@serverless/dashboard-plugin/lib/resolveProviderCredentials');
 const isAuthenticated = require('@serverless/dashboard-plugin/lib/isAuthenticated');
 const hasLocalCredentials = require('../../aws/has-local-credentials');
@@ -71,10 +73,14 @@ module.exports = {
     })();
 
     if (!ymlString) {
-      process.stdout.write(
+      legacy.write(
         'Add the following settings to your serverless configuration file:\n\n' +
           `org: ${orgName}\napp: ${appName}\n`
       );
+      log.notice(
+        'Add the following settings to your serverless configuration file:\n\n' +
+          `org: ${orgName}\napp: ${appName}`
+      );
       return;
     }
     ymlString = ymlString.toString();
@@ -94,4 +100,11 @@ module.exports = {
     configuration.org = orgName;
     configuration.app = appName;
   },
+  showOnboardingWelcome: memoizee(
+    (context) => {
+      log.notice(`Onboarding "${context.configuration.service}" to the Serverless Dashboard`);
+      log.notice();
+    },
+    { length: 0 }
+  ),
 };
diff --git a/test/unit/lib/cli/interactive-setup/dashboard-login.test.js b/test/unit/lib/cli/interactive-setup/dashboard-login.test.js
index 3b4b27edd89..4193953e9f0 100644
--- a/test/unit/lib/cli/interactive-setup/dashboard-login.test.js
+++ b/test/unit/lib/cli/interactive-setup/dashboard-login.test.js
@@ -66,6 +66,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-login.test.js', function
       configuration: {},
       configurationFilename: 'serverless.yml',
       options: {},
+      initial: {},
       inquirer,
     };
     expect(await step.isApplicable(context)).to.equal(false);
@@ -78,6 +79,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-login.test.js', function
       configuration: { provider: { name: 'aws', runtime: 'java8' } },
       configurationFilename: 'serverless.yml',
       options: {},
+      initial: {},
       inquirer,
     };
     expect(await step.isApplicable(context)).to.equal(false);
@@ -93,6 +95,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-login.test.js', function
       configuration,
       configurationFilename: 'serverless.yml',
       options: {},
+      initial: {},
       inquirer,
     };
     expect(await overrideCwd(serviceDir, async () => await step.isApplicable(context))).to.equal(
@@ -116,6 +119,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-login.test.js', function
       configuration: { provider: { name: 'aws', runtime: 'nodejs12.x' } },
       configurationFilename: 'serverless.yml',
       options: {},
+      initial: {},
       inquirer,
       stepHistory: new StepHistory(),
     };
@@ -150,6 +154,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-login.test.js', function
       configuration: { provider: { name: 'aws', runtime: 'nodejs12.x' } },
       configurationFilename: 'serverless.yml',
       options: {},
+      initial: {},
       inquirer,
       stepHistory: new StepHistory(),
     };
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
index 45c33170768..8c1f5c2b35d 100644
--- a/test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js
+++ b/test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js
@@ -117,7 +117,9 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
   });
 
   it('Should be ineffective, when not at service path', async () => {
-    const context = {};
+    const context = {
+      initial: {},
+    };
     expect(await step.isApplicable(context)).to.be.false;
     expect(context.inapplicabilityReasonCode).to.equal('NOT_IN_SERVICE_DIRECTORY');
   });
@@ -128,6 +130,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       configuration: {},
       configurationFilename: 'serverless.yml',
       options: {},
+      initial: {},
       inquirer,
     };
     expect(await step.isApplicable(context)).to.equal(false);
@@ -140,6 +143,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       configuration: { service: 'some-aws-service', provider: { name: 'aws', runtime: 'java8' } },
       configurationFilename: 'serverless.yml',
       options: {},
+      initial: {},
       inquirer,
     };
     expect(await step.isApplicable(context)).to.equal(false);
@@ -155,6 +159,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       },
       configurationFilename: 'serverless.yml',
       options: {},
+      initial: {},
       inquirer,
     };
     expect(await step.isApplicable(context)).to.equal(false);
@@ -192,6 +197,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       configuration,
       configurationFilename: 'serverless.yml',
       options: {},
+      initial: {},
       inquirer,
     };
     await overrideCwd(serviceDir, async () => {
@@ -209,6 +215,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       configuration,
       configurationFilename: 'serverless.yml',
       options: {},
+      initial: {},
       inquirer,
     };
     await overrideCwd(serviceDir, async () => {
@@ -233,6 +240,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       configuration,
       configurationFilename: 'serverless.yml',
       options: {},
+      initial: {},
       inquirer,
       stepHistory: new StepHistory(),
     };
@@ -264,6 +272,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       configuration,
       configurationFilename: 'serverless.yml',
       options: {},
+      initial: {},
       inquirer,
       stepHistory: new StepHistory(),
     };
@@ -289,6 +298,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       configuration,
       configurationFilename: 'serverless.yml',
       options: {},
+      initial: {},
       inquirer,
       stepHistory: new StepHistory(),
     };
@@ -315,6 +325,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configuration,
         configurationFilename: 'serverless.yml',
         options: {},
+        initial: {},
         inquirer,
         stepHistory: new StepHistory(),
       };
@@ -359,6 +370,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configuration,
         configurationFilename: 'serverless.yml',
         options: {},
+        initial: {},
         inquirer,
         stepHistory: new StepHistory(),
       };
@@ -405,6 +417,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configuration,
         configurationFilename: 'serverless.yml',
         options: {},
+        initial: {},
         inquirer,
         stepHistory: new StepHistory(),
       };
@@ -443,6 +456,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configuration,
         configurationFilename: 'serverless.yml',
         options: {},
+        initial: {},
         inquirer,
         stepHistory: new StepHistory(),
       };
@@ -487,6 +501,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configuration,
         configurationFilename: 'serverless.yml',
         options: {},
+        initial: {},
         inquirer,
         stepHistory: new StepHistory(),
       };
@@ -517,6 +532,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configuration,
         configurationFilename: 'serverless.yml',
         options: {},
+        initial: {},
         inquirer,
         stepHistory: new StepHistory(),
       };
@@ -547,6 +563,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configuration,
         configurationFilename: 'serverless.yml',
         options: {},
+        initial: {},
         inquirer,
         history: new Map([['dashboardLogin', []]]),
         stepHistory: new StepHistory(),
@@ -575,6 +592,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configuration,
         configurationFilename: 'serverless.yml',
         options: {},
+        initial: {},
         inquirer,
         history: new Map([
           ['dashboardLogin', []],
@@ -618,6 +636,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configuration,
         configurationFilename: 'serverless.yml',
         options: { org: 'testinteractivecli', app: 'other-app' },
+        initial: {},
         inquirer,
         history: new Map(),
         stepHistory: new StepHistory(),
@@ -659,6 +678,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configuration,
         configurationFilename: 'serverless.yml',
         options: { org: 'otherorg', app: 'app-from-flag' },
+        initial: {},
         inquirer,
         history: new Map(),
         stepHistory: new StepHistory(),
@@ -703,6 +723,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configuration,
         configurationFilename: 'serverless.yml',
         options: { org: 'otherorg', app: 'app-from-flag' },
+        initial: {},
         inquirer,
         history: new Map(),
         stepHistory: new StepHistory(),
@@ -732,6 +753,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configuration,
         configurationFilename: 'serverless.yml',
         options: { org: 'invalid-testinteractivecli', app: 'irrelevant' },
+        initial: {},
         inquirer,
         history: new Map(),
         stepHistory: new StepHistory(),
@@ -780,6 +802,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configuration,
         configurationFilename: 'serverless.yml',
         options: { org: 'invalid-testinteractivecli', app: 'irrelevant' },
+        initial: {},
         inquirer,
         history: new Map(),
         stepHistory: new StepHistory(),
@@ -828,6 +851,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configuration,
         configurationFilename: 'serverless.yml',
         options: { org: 'invalid-testinteractivecli', app: 'irrelevant' },
+        initial: {},
         inquirer,
         history: new Map(),
         stepHistory: new StepHistory(),
@@ -874,6 +898,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configuration,
         configurationFilename: 'serverless.yml',
         options: { org: 'testinteractivecli', app: 'invalid' },
+        initial: {},
         inquirer,
         history: new Map(),
         stepHistory: new StepHistory(),
@@ -919,6 +944,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configurationFilename: 'serverless.yml',
         inquirer,
         options: {},
+        initial: {},
         history: new Map(),
         stepHistory: new StepHistory(),
       };
@@ -968,6 +994,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configurationFilename: 'serverless.yml',
         inquirer,
         options: {},
+        initial: {},
         history: new Map(),
         stepHistory: new StepHistory(),
       };
@@ -1016,6 +1043,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configurationFilename: 'serverless.yml',
         inquirer,
         options: {},
+        initial: {},
         history: new Map(),
         stepHistory: new StepHistory(),
       };
@@ -1058,6 +1086,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configurationFilename: 'serverless.yml',
         inquirer,
         options: { app: 'app-from-flag' },
+        initial: {},
         history: new Map(),
         stepHistory: new StepHistory(),
       };
@@ -1097,6 +1126,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configurationFilename: 'serverless.yml',
         inquirer,
         options: {},
+        initial: {},
         history: new Map(),
         stepHistory: new StepHistory(),
       };
@@ -1138,6 +1168,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configurationFilename: 'serverless.yml',
         inquirer,
         options: { app: 'invalid-app-from-flag' },
+        initial: {},
         history: new Map(),
         stepHistory: new StepHistory(),
       };
@@ -1189,6 +1220,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configurationFilename: 'serverless.yml',
         inquirer,
         options: {},
+        initial: {},
         history: new Map(),
         stepHistory: new StepHistory(),
       };
@@ -1238,6 +1270,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         configurationFilename: 'serverless.yml',
         inquirer,
         options: {},
+        initial: {},
         history: new Map(),
         stepHistory: new StepHistory(),
       };

From e070110eee0e679694aefd4e6b5f25ecc90793d4 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 29 Sep 2021 21:03:35 +0200
Subject: [PATCH 0539/1101] refactor(CLI): Rely on newly introduced log style
 functions

---
 lib/cli/render-help/general.js           | 2 +-
 lib/cli/render-help/interactive-setup.js | 2 +-
 lib/plugins/plugin/lib/utils.js          | 2 +-
 package.json                             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/cli/render-help/general.js b/lib/cli/render-help/general.js
index 74e5b34c56a..30aff79b823 100644
--- a/lib/cli/render-help/general.js
+++ b/lib/cli/render-help/general.js
@@ -19,7 +19,7 @@ module.exports = (loadedPlugins) => {
     'sls <command> <options>',
     null,
     style.aside('Get started'),
-    `Run ${style.error('serverless')} to interactively setup a project.`,
+    `Run ${style.strong('serverless')} to interactively setup a project.`,
     'Use --help-interactive to display the interactive setup help.',
     null,
     style.aside('Monitoring'),
diff --git a/lib/cli/render-help/interactive-setup.js b/lib/cli/render-help/interactive-setup.js
index d828e283232..74cc290498a 100644
--- a/lib/cli/render-help/interactive-setup.js
+++ b/lib/cli/render-help/interactive-setup.js
@@ -8,7 +8,7 @@ const renderOptions = require('./options');
 module.exports = () => {
   writeText(
     style.aside('Interactive CLI'),
-    `Run ${style.error('serverless')} to interactively setup a project.`,
+    `Run ${style.strong('serverless')} to interactively setup a project.`,
     null,
     style.aside('Options')
   );
diff --git a/lib/plugins/plugin/lib/utils.js b/lib/plugins/plugin/lib/utils.js
index 3ccc9752cd8..5256cb2cc2c 100644
--- a/lib/plugins/plugin/lib/utils.js
+++ b/lib/plugins/plugin/lib/utils.js
@@ -74,7 +74,7 @@ module.exports = {
       const orderedPlugins = _.orderBy(plugins, ['name'], ['asc']);
       orderedPlugins.forEach((plugin) => {
         message += `${chalk.yellow.underline(plugin.name)} - ${plugin.description}\n`;
-        writeText(`${style.link(plugin.name)} ${style.aside(plugin.description)}`);
+        writeText(`${style.title(plugin.name)} ${style.aside(plugin.description)}`);
       });
       // remove last two newlines for a prettier output
       message = message.slice(0, -2);
diff --git a/package.json b/package.json
index 00ed48f8121..ceb9cf4c650 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@serverless/components": "^3.17.0",
     "@serverless/dashboard-plugin": "^5.4.4",
     "@serverless/platform-client": "^4.3.0",
-    "@serverless/utils": "^5.16.0",
+    "@serverless/utils": "^5.17.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",

From 231095d28d4e3f137ef0a456692dd5d6a770a5db Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 29 Sep 2021 21:07:33 +0200
Subject: [PATCH 0540/1101] refactor(CLI): Modern log for local version
 fallback

---
 lib/Serverless.js         | 3 ++-
 lib/cli/render-version.js | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index 4dcca78b1e5..494c6e48c35 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -245,7 +245,8 @@ class Serverless {
     }
     logDeprecation.defaultMode = 'warn';
     logDeprecation.flushBuffered();
-    this.cli.log('Running "serverless" installed locally (in service node_modules)');
+    legacy.log('Running "serverless" installed locally (in service node_modules)');
+    log.notice('Running "serverless" from node_modules');
     // TODO: Replace below fallback logic with more straightforward one at top of the CLI
     // when we willl drop support for the "disableLocalInstallationFallback" setting
     this.isOverridenByLocal = true;
diff --git a/lib/cli/render-version.js b/lib/cli/render-version.js
index 87b8501eb03..365b8abce68 100644
--- a/lib/cli/render-version.js
+++ b/lib/cli/render-version.js
@@ -5,6 +5,7 @@ const { version } = require('../../package');
 const { version: dashboardPluginVersion } = require('@serverless/dashboard-plugin/package');
 const { version: componentsVersion } = require('@serverless/components/package');
 const { platformClientVersion } = require('@serverless/dashboard-plugin');
+const { legacy, log } = require('@serverless/utils/log');
 const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
 const resolveLocalServerlessPath = require('./resolve-local-serverless-path');
 const chalk = require('chalk');
@@ -21,11 +22,13 @@ module.exports = async () => {
     const isLocal = serverlessPath === localServerlessPath;
     if (!isLocal) {
       // Attempt to resolve version with local Serverless instance
-      process.stdout.write(
+      legacy.write(
         `Serverless: ${chalk.yellow(
           'Running "serverless" installed locally (in service node_modules)'
         )}\n`
       );
+      log.notice('Running "serverless" from node_modules');
+      log.notice();
 
       try {
         try {

From 92f979294f377a794a05a0d52b50ae6fcb408e8e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 29 Sep 2021 21:55:27 +0200
Subject: [PATCH 0541/1101] chore: Bump dependencies

---
 package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index ceb9cf4c650..41d43fdfdd8 100644
--- a/package.json
+++ b/package.json
@@ -23,14 +23,14 @@
   },
   "dependencies": {
     "@serverless/cli": "^1.5.2",
-    "@serverless/components": "^3.17.0",
-    "@serverless/dashboard-plugin": "^5.4.4",
+    "@serverless/components": "^3.17.1",
+    "@serverless/dashboard-plugin": "^5.4.5",
     "@serverless/platform-client": "^4.3.0",
     "@serverless/utils": "^5.17.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.994.0",
+    "aws-sdk": "^2.997.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.1.2",
     "cachedir": "^2.3.0",
@@ -86,7 +86,7 @@
     "adm-zip": "^0.5.6",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "cos-nodejs-sdk-v5": "^2.10.3",
+    "cos-nodejs-sdk-v5": "^2.10.4",
     "eslint": "^7.32.0",
     "eslint-plugin-import": "^2.24.2",
     "git-list-updated": "^1.2.1",

From abbb18db8ed33ab5b186b0f92f3ed335d7397bc6 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 29 Sep 2021 22:06:00 +0200
Subject: [PATCH 0542/1101] chore: Release v2.60.1

---
 CHANGELOG.md | 26 ++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7d8f5444a8..2ebea6c4baf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,32 @@
 
 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.
 
+### [2.60.1](https://github.com/serverless/serverless/compare/v2.60.0...v2.60.1) (2021-09-29)
+
+### Bug Fixes
+
+- **AWS EventBridge:** Fix `MaximumEventAgeInSecond` template reference ([#10023](https://github.com/serverless/serverless/issues/10023)) ([cd03f55](https://github.com/serverless/serverless/commit/cd03f550ae5307ca44e1e27d4d0822bef6cc9dcf)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Standalone:**
+  - Fix internal npm installation handling ([#10014](https://github.com/serverless/serverless/issues/10014)) ([5a583a9](https://github.com/serverless/serverless/commit/5a583a97980117209a614bfd40630b1bb714b744)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Upgrade `npm` version to one that supports Node.js v14 ([#10014](https://github.com/serverless/serverless/issues/10014)) ([62d697c](https://github.com/serverless/serverless/commit/62d697c8615e8103aa07401eef2ebae559cc4a17)) ([Mariusz Nowak](https://github.com/medikoo))
+- **CLI:** Fix handling when local `serverless` is removed in command run ([#10016](https://github.com/serverless/serverless/issues/10016)) ([1a3ccdb](https://github.com/serverless/serverless/commit/1a3ccdbef8cd9c41b87f7fe440ca300970f3e138)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **Plugins:**
+  - Seclude `plugin install` standalone command ([#9942](https://github.com/serverless/serverless/issues/9942)) ([713ac1e](https://github.com/serverless/serverless/commit/713ac1e2a111426fb501b5fa29588a53efcba9bc)) ([Seungchan Ahn](https://github.com/issea1015))
+  - Seclude `plugin uninstall` standalone command ([#10015](https://github.com/serverless/serverless/issues/10015)) ([26ce1c6](https://github.com/serverless/serverless/commit/26ce1c636be7754584cf47a87f1b92d3b7d98122)) ([Seungchan Ahn](https://github.com/issea1015))
+  - Fix manual update notice ([#10016](https://github.com/serverless/serverless/issues/10016)) ([0d5884e](https://github.com/serverless/serverless/commit/0d5884ebbf015332c08cedea7a4359d66c3a2761)) ([Mariusz Nowak](https://github.com/medikoo))
+- **CLI: New logs (experimental):**
+  - `plugin install` command ([#10016](https://github.com/serverless/serverless/issues/10016)) ([8c5f22c](https://github.com/serverless/serverless/commit/8c5f22ceb67c3a2f4ace3adf8e19cf5e69d4c7b3)) ([Mariusz Nowak](https://github.com/medikoo))
+  - `plugin list` command ([#10016](https://github.com/serverless/serverless/issues/10016)) ([00e016c](https://github.com/serverless/serverless/commit/00e016c4bba86095744129d24683343f0cc5129f)) ([Mariusz Nowak](https://github.com/medikoo))
+  - `plugin search` command ([#10016](https://github.com/serverless/serverless/issues/10016)) ([1463171](https://github.com/serverless/serverless/commit/1463171cae93e9e050350f6eb272e35cfade0204)) ([Mariusz Nowak](https://github.com/medikoo))
+  - `plugin uninstall` command ([#10016](https://github.com/serverless/serverless/issues/10016)) ([3094be0](https://github.com/serverless/serverless/commit/3094be0cf06f916d8cf180036433677ecd73e013)) ([Mariusz Nowak](https://github.com/medikoo))
+  - interactive setup ([#10024](https://github.com/serverless/serverless/issues/10024)) ([07aed34](https://github.com/serverless/serverless/commit/07aed3429c63ed13ad9ca6262c641a907170f4f9)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Local version fallback ([#10024](https://github.com/serverless/serverless/issues/10024)) ([231095d](https://github.com/serverless/serverless/commit/231095d28d4e3f137ef0a456692dd5d6a770a5db)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Rely on newly introduced log style functions ([#10024](https://github.com/serverless/serverless/issues/10024)) ([e070110](https://github.com/serverless/serverless/commit/e070110eee0e679694aefd4e6b5f25ecc90793d4)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Move variables resolution log to debug level ([#10016](https://github.com/serverless/serverless/issues/10016)) ([b0d854a](https://github.com/serverless/serverless/commit/b0d854af20d46ef9e07e5d4bce26b88e84f4c4f1)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ## [2.60.0](https://github.com/serverless/serverless/compare/v2.59.0...v2.60.0) (2021-09-24)
 
 ### Features
diff --git a/package.json b/package.json
index 41d43fdfdd8..cb21eec53e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.60.0",
+  "version": "2.60.1",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 846cfa1bcf678a748678014c6359e5f0907d35ff Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 30 Sep 2021 14:16:49 +0200
Subject: [PATCH 0543/1101] fix(AWS EventBridge): Ensure proper support for
 `deadLetterQueueArn`

---
 docs/providers/aws/events/event-bridge.md     | 13 +++---
 docs/providers/aws/guide/serverless.yml.md    |  7 ++++
 .../compile/events/eventBridge/index.js       | 42 +++++++------------
 .../compile/events/eventBridge/index.test.js  | 20 ++++-----
 4 files changed, 37 insertions(+), 45 deletions(-)

diff --git a/docs/providers/aws/events/event-bridge.md b/docs/providers/aws/events/event-bridge.md
index 39c7c4b6043..8c9c2fb7feb 100644
--- a/docs/providers/aws/events/event-bridge.md
+++ b/docs/providers/aws/events/event-bridge.md
@@ -189,7 +189,7 @@ functions:
 
 ## Adding a DLQ to an event rule
 
-DeadLetterConfig is not available for custom resources, only for native CloudFormation.
+DeadLetterQueueArn is not available for custom resources, only for native CloudFormation.
 
 ```yml
 functions:
@@ -201,11 +201,10 @@ functions:
           pattern:
             source:
               - saas.external
-          deadLetterConfig:
-            targetArn:
-              Fn::GetAtt:
-                - QueueName
-                - Arn
+          deadLetterQueueArn:
+            Fn::GetAtt:
+              - QueueName
+              - Arn
 ```
 
 ## Adding a retry policy to an event rule
@@ -222,7 +221,7 @@ functions:
           pattern:
             source:
               - saas.external
-          deadLetterConfig:
+          deadLetterQueueArn:
             Fn::GetAtt:
               - QueueName
               - Arn
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index c60e01b75ce..09c50347543 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -568,6 +568,13 @@ functions:
             inputPathsMap:
               eventTime: '$.time'
             inputTemplate: '{"time": <eventTime>, "key1": "value1"}'
+          retryPolicy:
+            maximumEventAge: 3600
+            maximumRetryAttempts: 3
+          deadLetterQueueArn:
+            Fn::GetAtt:
+              - QueueName
+              - Arn
       - cloudFront:
           eventType: viewer-response
           includeBody: true
diff --git a/lib/plugins/aws/package/compile/events/eventBridge/index.js b/lib/plugins/aws/package/compile/events/eventBridge/index.js
index 82c146efe47..d5a6963fceb 100644
--- a/lib/plugins/aws/package/compile/events/eventBridge/index.js
+++ b/lib/plugins/aws/package/compile/events/eventBridge/index.js
@@ -102,15 +102,7 @@ class AwsCompileEventBridgeEvents {
             },
           },
         },
-        deadLetterConfig: {
-          type: 'object',
-          properties: {
-            targetArn: {
-              $ref: '#/definitions/awsArn',
-            },
-          },
-          additionalProperties: false,
-        },
+        deadLetterQueueArn: { $ref: '#/definitions/awsArn' },
       },
       anyOf: [{ required: ['pattern'] }, { required: ['schedule'] }],
     });
@@ -142,7 +134,7 @@ class AwsCompileEventBridgeEvents {
             const InputPath = event.eventBridge.inputPath;
             let InputTransformer = event.eventBridge.inputTransformer;
             let RetryPolicy = event.eventBridge.retryPolicy;
-            let DeadLetterConfig = event.eventBridge.deadLetterConfig;
+            let DeadLetterConfig;
 
             const RuleName = makeAndHashRuleName({
               functionName: FunctionName,
@@ -185,7 +177,7 @@ class AwsCompileEventBridgeEvents {
               };
             }
 
-            if (DeadLetterConfig) {
+            if (event.eventBridge.deadLetterQueueArn) {
               if (!shouldUseCloudFormation) {
                 throw new ServerlessError(
                   'Configuring DeadLetterConfig is not supported for EventBrigde integration backed by Custom Resources. Please use "provider.eventBridge.useCloudFormation" setting to use native CloudFormation support for EventBridge.',
@@ -193,7 +185,7 @@ class AwsCompileEventBridgeEvents {
                 );
               }
               DeadLetterConfig = {
-                TargetArn: DeadLetterConfig.targetArn,
+                Arn: event.eventBridge.deadLetterQueueArn,
               };
             }
 
@@ -509,35 +501,33 @@ class AwsCompileEventBridgeEvents {
   }
 
   configureTarget({ target, Input, InputPath, InputTransformer, RetryPolicy, DeadLetterConfig }) {
-    if (Input) {
+    if (RetryPolicy) {
       target = Object.assign(target, {
-        Input: JSON.stringify(Input),
+        RetryPolicy,
       });
-      return target;
     }
-    if (InputPath) {
+
+    if (DeadLetterConfig) {
       target = Object.assign(target, {
-        InputPath,
+        DeadLetterConfig,
       });
-      return target;
     }
-    if (InputTransformer) {
+
+    if (Input) {
       target = Object.assign(target, {
-        InputTransformer,
+        Input: JSON.stringify(Input),
       });
       return target;
     }
-
-    if (RetryPolicy) {
+    if (InputPath) {
       target = Object.assign(target, {
-        RetryPolicy,
+        InputPath,
       });
       return target;
     }
-
-    if (DeadLetterConfig) {
+    if (InputTransformer) {
       target = Object.assign(target, {
-        DeadLetterConfig,
+        InputTransformer,
       });
       return target;
     }
diff --git a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
index 2a0178c8343..9310f5e8bd5 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
@@ -307,7 +307,7 @@ describe('EventBridgeEvents', () => {
       );
     });
 
-    it('should fail when trying to set DeadLetterConfig', async () => {
+    it('should fail when trying to set DeadLetterQueueArn', async () => {
       await expect(
         runServerless({
           fixture: 'function',
@@ -318,10 +318,8 @@ describe('EventBridgeEvents', () => {
                 events: [
                   {
                     eventBridge: {
-                      deadLetterConfig: {
-                        targetArn: {
-                          'Fn::GetAtt': ['not-supported', 'Arn'],
-                        },
+                      deadLetterQueueArn: {
+                        'Fn::GetAtt': ['not-supported', 'Arn'],
                       },
                       pattern: {
                         source: ['aws.something'],
@@ -398,10 +396,8 @@ describe('EventBridgeEvents', () => {
         maximumRetryAttempts: 9,
       };
 
-      const deadLetterConfig = {
-        targetArn: {
-          'Fn::GetAtt': ['test', 'Arn'],
-        },
+      const deadLetterQueueArn = {
+        'Fn::GetAtt': ['test', 'Arn'],
       };
 
       const getRuleResourceEndingWith = (resources, ending) =>
@@ -475,7 +471,7 @@ describe('EventBridgeEvents', () => {
                       eventBus: eventBusName,
                       schedule,
                       pattern,
-                      deadLetterConfig,
+                      deadLetterQueueArn,
                     },
                   },
                 ],
@@ -547,10 +543,10 @@ describe('EventBridgeEvents', () => {
         });
       });
 
-      it('should support deadLetterConfig configuration', () => {
+      it('should support deadLetterQueueArn configuration', () => {
         const deadLetterConfigRuleTarget = getRuleResourceEndingWith(cfResources, '7').Properties
           .Targets[0];
-        expect(deadLetterConfigRuleTarget.DeadLetterConfig).to.have.property('TargetArn');
+        expect(deadLetterConfigRuleTarget.DeadLetterConfig).to.have.property('Arn');
       });
 
       it('should create a rule that depends on created EventBus', () => {

From 37f9199133d801049c43dca7231d0c211d635e44 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 30 Sep 2021 16:27:10 +0200
Subject: [PATCH 0544/1101] chore: Bump dependencies

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cb21eec53e4..dc3f301f794 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "promise-queue": "^2.2.5",
     "replaceall": "^0.1.6",
     "semver": "^7.3.5",
-    "signal-exit": "^3.0.4",
+    "signal-exit": "^3.0.5",
     "strip-ansi": "^6.0.1",
     "tabtab": "^3.0.2",
     "tar": "^6.1.11",

From f73062fa4065ff8b0b6978ec49608bce058df33d Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 30 Sep 2021 16:55:18 +0200
Subject: [PATCH 0545/1101] chore: Release v2.60.2

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ebea6c4baf..a58f43833f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 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.
 
+### [2.60.2](https://github.com/serverless/serverless/compare/v2.60.1...v2.60.2) (2021-09-30)
+
+### Bug Fixes
+
+- **AWS EventBridge:** Ensure proper support for `deadLetterQueueArn` (instead of `deadLetterConfig`) ([#10030](https://github.com/serverless/serverless/pull/10030)) ([846cfa1](https://github.com/serverless/serverless/commit/846cfa1bcf678a748678014c6359e5f0907d35ff)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
 ### [2.60.1](https://github.com/serverless/serverless/compare/v2.60.0...v2.60.1) (2021-09-29)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index dc3f301f794..2c8afc0e954 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.60.1",
+  "version": "2.60.2",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From d1701bf13a7155cce388424964e35ca536b2ce8a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 1 Oct 2021 12:38:11 +0200
Subject: [PATCH 0546/1101] refactor(CLI): Improve modern logs for `logs`
 command

---
 lib/plugins/aws/logs.js                       |  8 +++-----
 lib/plugins/aws/utils/formatLambdaLogEvent.js | 17 +++++++++++------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/plugins/aws/logs.js b/lib/plugins/aws/logs.js
index 05948da4880..e99899b9f22 100644
--- a/lib/plugins/aws/logs.js
+++ b/lib/plugins/aws/logs.js
@@ -4,8 +4,7 @@ const _ = require('lodash');
 const dayjs = require('dayjs');
 const utc = require('dayjs/plugin/utc');
 const wait = require('timers-ext/promise/sleep');
-const stripAnsi = require('strip-ansi');
-const { legacy, writeText, style } = require('@serverless/utils/log');
+const { legacy, writeText } = require('@serverless/utils/log');
 const validate = require('./lib/validate');
 const formatLambdaLogEvent = require('./utils/formatLambdaLogEvent');
 const ServerlessError = require('../../serverless-error');
@@ -96,9 +95,8 @@ class AwsLogs {
     const results = await this.provider.request('CloudWatchLogs', 'filterLogEvents', params);
     if (results.events) {
       results.events.forEach((e) => {
-        const text = formatLambdaLogEvent(e.message);
-        legacy.write(text);
-        writeText(style.aside(stripAnsi(text).trimRight()));
+        legacy.write(formatLambdaLogEvent(e.message));
+        writeText(formatLambdaLogEvent(e.message, { isModern: true }));
       });
     }
 
diff --git a/lib/plugins/aws/utils/formatLambdaLogEvent.js b/lib/plugins/aws/utils/formatLambdaLogEvent.js
index 05aa5183501..4b99a1d34d6 100644
--- a/lib/plugins/aws/utils/formatLambdaLogEvent.js
+++ b/lib/plugins/aws/utils/formatLambdaLogEvent.js
@@ -3,19 +3,23 @@
 const dayjs = require('dayjs');
 const chalk = require('chalk');
 const os = require('os');
+const { style } = require('@serverless/utils/log');
 
-module.exports = (msgParam) => {
+module.exports = (msgParam, options = {}) => {
+  const { isModern } = options;
   let msg = msgParam;
   const dateFormat = 'YYYY-MM-DD HH:mm:ss.SSS (Z)';
 
-  if (msg.startsWith('REPORT')) {
+  if (isModern) {
+    if (!msg.startsWith('REPORT')) msg = msg.trimRight();
+  } else if (msg.startsWith('REPORT')) {
     msg += os.EOL;
   }
 
   if (msg.startsWith('START') || msg.startsWith('END') || msg.startsWith('REPORT')) {
-    return chalk.gray(msg);
+    return isModern ? style.aside(msg) : chalk.gray(msg);
   } else if (msg.trim() === 'Process exited before completing request') {
-    return chalk.red(msg);
+    return isModern ? style.error(msg) : chalk.red(msg);
   }
 
   const splitted = msg.split('\t');
@@ -38,7 +42,8 @@ module.exports = (msgParam) => {
     return msg;
   }
   const text = msg.split(`${reqId}\t`)[1];
-  const time = chalk.green(dayjs(date).format(dateFormat));
+  const time = dayjs(date).format(dateFormat);
 
-  return `${time}\t${chalk.yellow(reqId)}\t${level}${text}`;
+  if (isModern) return `${style.aside(`${time}\t${reqId}`)}\t${level}${text}`;
+  return `${chalk.green(time)}\t${chalk.yellow(reqId)}\t${level}${text}`;
 };

From 85997e063a24dd36113ae6ad53d042585adb9c03 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 1 Oct 2021 12:41:10 +0200
Subject: [PATCH 0547/1101] refactor: Remove obsolete conditions

---
 lib/plugins/aws/deploy/index.js | 2 +-
 lib/plugins/aws/info/index.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index 7979a9651e5..77af5fcd362 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -189,7 +189,7 @@ class AwsDeploy {
             )}s)`
           )}`
         );
-        if (this.serverless.serviceOutputs) writeServiceOutputs(this.serverless.serviceOutputs);
+        writeServiceOutputs(this.serverless.serviceOutputs);
       },
     };
   }
diff --git a/lib/plugins/aws/info/index.js b/lib/plugins/aws/info/index.js
index 4e6528788f3..7562f248698 100644
--- a/lib/plugins/aws/info/index.js
+++ b/lib/plugins/aws/info/index.js
@@ -75,7 +75,7 @@ class AwsInfo {
       'finalize': () => {
         if (this.serverless.processedInput.commands.join(' ') !== 'info') return;
 
-        if (this.serverless.serviceOutputs) writeServiceOutputs(this.serverless.serviceOutputs);
+        writeServiceOutputs(this.serverless.serviceOutputs);
       },
     };
   }

From 8aa700dc7947d36aa46bba4b0e475f21fd19ac89 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 1 Oct 2021 12:43:16 +0200
Subject: [PATCH 0548/1101] refactor(CLI): Generalize `writeServiceOutputs`

---
 lib/cli/write-service-outputs.js | 1 -
 lib/plugins/aws/deploy/index.js  | 3 ++-
 lib/plugins/aws/info/index.js    | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/cli/write-service-outputs.js b/lib/cli/write-service-outputs.js
index 56b98868399..e9605939553 100644
--- a/lib/cli/write-service-outputs.js
+++ b/lib/cli/write-service-outputs.js
@@ -3,7 +3,6 @@
 const { writeText, style } = require('@serverless/utils/log');
 
 module.exports = (serviceOutputs) => {
-  writeText();
   for (const [section, entries] of serviceOutputs) {
     if (typeof entries === 'string') {
       writeText(`${style.aside(`${section}:`)} ${entries}`);
diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index 77af5fcd362..981fa55eb01 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -12,7 +12,7 @@ const validateTemplate = require('./lib/validateTemplate');
 const updateStack = require('../lib/updateStack');
 const existsDeploymentBucket = require('./lib/existsDeploymentBucket');
 const path = require('path');
-const { style, log, progress } = require('@serverless/utils/log');
+const { style, log, progress, writeText } = require('@serverless/utils/log');
 const memoize = require('memoizee');
 
 const mainProgress = progress.get('main');
@@ -189,6 +189,7 @@ class AwsDeploy {
             )}s)`
           )}`
         );
+        writeText();
         writeServiceOutputs(this.serverless.serviceOutputs);
       },
     };
diff --git a/lib/plugins/aws/info/index.js b/lib/plugins/aws/info/index.js
index 7562f248698..da952d43e28 100644
--- a/lib/plugins/aws/info/index.js
+++ b/lib/plugins/aws/info/index.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const BbPromise = require('bluebird');
-const { progress } = require('@serverless/utils/log');
+const { progress, writeText } = require('@serverless/utils/log');
 const writeServiceOutputs = require('../../../cli/write-service-outputs');
 const validate = require('../lib/validate');
 const getStackInfo = require('./getStackInfo');
@@ -75,6 +75,7 @@ class AwsInfo {
       'finalize': () => {
         if (this.serverless.processedInput.commands.join(' ') !== 'info') return;
 
+        writeText();
         writeServiceOutputs(this.serverless.serviceOutputs);
       },
     };

From 2828a2c44388d731d4396e0ea11ae48953f20b0a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 1 Oct 2021 12:47:40 +0200
Subject: [PATCH 0549/1101] refactor(CLI): Improve modern `info` output

---
 lib/plugins/aws/info/index.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/aws/info/index.js b/lib/plugins/aws/info/index.js
index da952d43e28..f997a67c3da 100644
--- a/lib/plugins/aws/info/index.js
+++ b/lib/plugins/aws/info/index.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const BbPromise = require('bluebird');
-const { progress, writeText } = require('@serverless/utils/log');
+const { progress, writeText, style } = require('@serverless/utils/log');
 const writeServiceOutputs = require('../../../cli/write-service-outputs');
 const validate = require('../lib/validate');
 const getStackInfo = require('./getStackInfo');
@@ -75,7 +75,13 @@ class AwsInfo {
       'finalize': () => {
         if (this.serverless.processedInput.commands.join(' ') !== 'info') return;
 
-        writeText();
+        writeText(
+          null,
+          `${style.aside('service:')} ${this.serverless.service.service}`,
+          `${style.aside('stage:')} ${this.provider.getStage()}`,
+          `${style.aside('region:')} ${this.provider.getRegion()}`,
+          `${style.aside('stack:')} ${this.provider.naming.getStackName()}`
+        );
         writeServiceOutputs(this.serverless.serviceOutputs);
       },
     };

From a205f88310653331c96f51402d148c576dd79db8 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 1 Oct 2021 15:15:52 +0200
Subject: [PATCH 0550/1101] refactor(CLI): Improve modern error reporting

---
 lib/cli/handle-error.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 03e2c91c411..5f50a479b20 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -159,10 +159,7 @@ module.exports = async (exception, options = {}) => {
   const errorMsg = stripAnsi(
     exceptionTokens.stack && !isUserError ? exceptionTokens.stack : exceptionTokens.message
   );
-  writeText(style.error('\nError:'));
-  if (errorMsg) {
-    writeText(`  ${errorMsg.split('\n').join('\n  ')}`);
-  }
+  writeText(null, style.error('Error:'), errorMsg);
 
   legacy.consoleLog(chalk.yellow('  Get Support --------------------------------------------'));
   legacy.consoleLog(`${chalk.yellow('     Docs:          ')}docs.serverless.com`);

From 4ed34c3e5e21903a3fe9e512621739ef5bf0bd84 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 1 Oct 2021 10:40:21 +0200
Subject: [PATCH 0551/1101] refactor(CLI): Modern logs for `print` command

---
 lib/plugins/print.js                |   4 +-
 test/unit/lib/plugins/print.test.js | 325 ----------------------------
 2 files changed, 3 insertions(+), 326 deletions(-)

diff --git a/lib/plugins/print.js b/lib/plugins/print.js
index 20aa3de82fd..fe27a09b0ce 100644
--- a/lib/plugins/print.js
+++ b/lib/plugins/print.js
@@ -6,6 +6,7 @@ const jc = require('json-cycle');
 const yaml = require('js-yaml');
 const ServerlessError = require('../serverless-error');
 const cliCommandsSchema = require('../cli/commands-schema');
+const { writeText, legacy } = require('@serverless/utils/log');
 
 class Print {
   constructor(serverless, options) {
@@ -126,7 +127,8 @@ class Print {
       throw new ServerlessError('Format must be "yaml", "json" or "text"', 'PRINT_INVALID_FORMAT');
     }
 
-    this.serverless.cli.consoleLog(out);
+    legacy.consoleLog(out);
+    writeText(out);
   }
 }
 
diff --git a/test/unit/lib/plugins/print.test.js b/test/unit/lib/plugins/print.test.js
index 5cfdca5bc43..d20a61e8634 100644
--- a/test/unit/lib/plugins/print.test.js
+++ b/test/unit/lib/plugins/print.test.js
@@ -1,12 +1,6 @@
 'use strict';
 
-const os = require('os');
 const chai = require('chai');
-const sinon = require('sinon');
-const Serverless = require('../../../../lib/Serverless');
-const CLI = require('../../../../lib/classes/CLI');
-const PrintPlugin = require('../../../../lib/plugins/print.js');
-const yaml = require('js-yaml');
 
 const runServerless = require('../../../utils/run-serverless');
 
@@ -14,325 +8,6 @@ chai.use(require('chai-as-promised'));
 
 const expect = chai.expect;
 
-describe('Print', () => {
-  let print;
-  let serverless;
-
-  beforeEach(() => {
-    serverless = new Serverless();
-    serverless.variables.options = {
-      stage: 'dev',
-      region: 'us-east-1',
-    };
-    serverless.cli = new CLI(serverless);
-    serverless.processedInput = { options: {} };
-    print = new PrintPlugin(serverless);
-    print.serverless.cli = {
-      consoleLog: sinon.spy(),
-    };
-  });
-
-  it('should print standard config', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-      },
-    };
-
-    return print.print().then(() => {
-      const message = print.serverless.cli.consoleLog.args.join();
-
-      expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-      expect(yaml.load(message)).to.eql(serverless.configurationInput);
-    });
-  });
-
-  it('should print standard config in JSON', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-      },
-    };
-
-    print.options = { format: 'json' };
-    return print.print().then(() => {
-      const message = print.serverless.cli.consoleLog.args.join();
-
-      expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-      expect(JSON.parse(message)).to.eql(serverless.configurationInput);
-    });
-  });
-
-  it('should apply paths to standard config in JSON', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-      },
-    };
-
-    print.options = { format: 'json', path: 'service' };
-    return print.print().then(() => {
-      const message = print.serverless.cli.consoleLog.args.join();
-
-      expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-      expect(JSON.parse(message)).to.eql(serverless.configurationInput.service);
-    });
-  });
-
-  it('should apply paths to standard config in text', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-      },
-    };
-
-    print.options = { path: 'provider.name', format: 'text' };
-    return print.print().then(() => {
-      const message = print.serverless.cli.consoleLog.args.join();
-
-      expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-      expect(message).to.eql(serverless.configurationInput.provider.name);
-    });
-  });
-
-  it('should print arrays in text', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-      },
-    };
-
-    print.options = { transform: 'keys', format: 'text' };
-    return print.print().then(() => {
-      const message = print.serverless.cli.consoleLog.args.join();
-
-      expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-      expect(message).to.eql(`service${os.EOL}provider`);
-    });
-  });
-
-  it('should apply a keys-transform to standard config in JSON', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-      },
-    };
-
-    print.options = { format: 'json', transform: 'keys' };
-    return print.print().then(() => {
-      const message = print.serverless.cli.consoleLog.args.join();
-
-      expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-      expect(JSON.parse(message)).to.eql(Object.keys(serverless.configurationInput));
-    });
-  });
-
-  it('should not allow a non-existing path', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-      },
-    };
-
-    print.options = { path: 'provider.foobar' };
-    return expect(print.print()).to.be.rejected;
-  });
-
-  it('should not allow an object as "text"', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-      },
-    };
-
-    print.options = { format: 'text' };
-    return expect(print.print()).to.be.rejected;
-  });
-
-  it('should not allow an unknown transform', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-      },
-    };
-
-    print.options = { transform: 'foobar' };
-    return expect(print.print()).to.be.rejected;
-  });
-
-  it('should not allow an unknown format', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-      },
-    };
-
-    print.options = { format: 'foobar' };
-    return expect(print.print()).to.be.rejected;
-  });
-
-  it('should print special service object and provider string configs', () => {
-    serverless.configurationInput = {
-      service: {
-        name: 'my-service',
-      },
-      provider: 'aws',
-    };
-
-    return print.print().then(() => {
-      const message = print.serverless.cli.consoleLog.args.join();
-
-      expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-      expect(yaml.load(message)).to.eql(serverless.configurationInput);
-    });
-  });
-
-  it('should resolve command line variables', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-        stage: '${opt:stage}',
-      },
-    };
-
-    serverless.processedInput = {
-      commands: ['print'],
-      options: { stage: 'dev', region: undefined },
-    };
-
-    const expected = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-        stage: 'dev',
-      },
-    };
-
-    return print.print().then(() => {
-      const message = print.serverless.cli.consoleLog.args.join();
-
-      expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-      expect(yaml.load(message)).to.eql(expected);
-    });
-  });
-
-  it('should resolve using custom variable syntax', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-        stage: '${{opt:stage}}',
-        variableSyntax: '\\${{([ ~:a-zA-Z0-9._@\\\'",\\-\\/\\(\\)*?]+?)}}',
-      },
-    };
-    serverless.service.provider.variableSyntax = '\\${{([ ~:a-zA-Z0-9._@\\\'",\\-\\/\\(\\)*?]+?)}}';
-
-    serverless.processedInput = {
-      commands: ['print'],
-      options: { stage: 'dev', region: undefined },
-    };
-
-    const expected = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-        stage: 'dev',
-        variableSyntax: '\\${{([ ~:a-zA-Z0-9._@\\\'",\\-\\/\\(\\)*?]+?)}}',
-      },
-    };
-
-    return print.print().then(() => {
-      const message = print.serverless.cli.consoleLog.args.join();
-
-      expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-      expect(yaml.load(message)).to.eql(expected);
-    });
-  });
-
-  it('should resolve custom variables', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      custom: { region: 'us-east-1' },
-      provider: {
-        name: 'aws',
-        stage: '${opt:stage}',
-        region: '${self:custom.region}',
-      },
-    };
-
-    serverless.processedInput = {
-      commands: ['print'],
-      options: { stage: 'dev', region: undefined },
-    };
-    serverless.service.custom = { region: 'us-east-1' };
-
-    const expected = {
-      service: 'my-service',
-      custom: {
-        region: 'us-east-1',
-      },
-      provider: {
-        name: 'aws',
-        stage: 'dev',
-        region: 'us-east-1',
-      },
-    };
-
-    return print.print().then(() => {
-      const message = print.serverless.cli.consoleLog.args.join();
-
-      expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-      expect(yaml.load(message)).to.eql(expected);
-    });
-  });
-
-  describe('should resolve fallback', () => {
-    [
-      { value: 'hello_123@~:/+', description: 'ascii chars' },
-      { value: '①⑴⒈⒜Ⓐⓐⓟ ..▉가Ὠ', description: 'unicode chars' },
-    ].forEach((testCase) => {
-      it(testCase.description, () => {
-        serverless.configurationInput = {
-          custom: {
-            me: `\${self:none, '${testCase.value}'}`,
-          },
-          provider: {},
-        };
-
-        serverless.processedInput = {
-          commands: ['print'],
-          options: {},
-        };
-
-        const expected = {
-          custom: {
-            me: testCase.value,
-          },
-          provider: {},
-        };
-
-        return print.print().then(() => {
-          const message = print.serverless.cli.consoleLog.args.join();
-
-          expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-          expect(yaml.load(message)).to.eql(expected);
-        });
-      });
-    });
-  });
-});
-
 describe('test/unit/lib/plugins/print.test.js', () => {
   it('correctly prints config', async () => {
     const { stdoutData } = await runServerless({

From 7d31410b74efb4c48c1c1b18ca33733a564268f2 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 1 Oct 2021 16:16:08 +0200
Subject: [PATCH 0552/1101] fix(CLI): Fix resolution of handler in case of
 local fallback

---
 lib/cli/handle-error.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 5f50a479b20..b44f87d647d 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -68,7 +68,7 @@ module.exports = async (exception, options = {}) => {
     const localErrorHandlerData = (() => {
       try {
         return {
-          handle: require.resolve(path.resolve(localServerlessPath, 'lib/cli/handle-error')),
+          handle: require(path.resolve(localServerlessPath, 'lib/cli/handle-error')),
           options: {
             serverless,
             isLocallyInstalled,
@@ -87,8 +87,7 @@ module.exports = async (exception, options = {}) => {
         try {
           // Ugly mock of serverless below is used to ensure that Framework version will be logged with `(local)` suffix
           return {
-            handle: require.resolve(path.resolve(localServerlessPath, 'lib/classes/Error'))
-              .logError,
+            handle: require(path.resolve(localServerlessPath, 'lib/classes/Error')).logError,
             options: {
               serverless: serverless || { isLocallyInstalled },
               forceExit: isUncaughtException,

From bd4d215266b16793c26d06a34af8482f00e47844 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 1 Oct 2021 15:49:38 +0200
Subject: [PATCH 0553/1101] refactor(CLI): Modern logs for `install` command

---
 lib/plugins/install.js                | 32 +++++++++++++++------------
 lib/utils/downloadTemplateFromRepo.js |  4 ++--
 test/unit/lib/plugins/install.test.js | 12 ----------
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/lib/plugins/install.js b/lib/plugins/install.js
index 394fcaa2c5e..e0b1026b914 100644
--- a/lib/plugins/install.js
+++ b/lib/plugins/install.js
@@ -4,6 +4,7 @@ const BbPromise = require('bluebird');
 
 const cliCommandsSchema = require('../cli/commands-schema');
 const download = require('../utils/downloadTemplateFromRepo');
+const { legacy, log, progress, style } = require('@serverless/utils/log');
 
 class Install {
   constructor(serverless, options) {
@@ -22,20 +23,23 @@ class Install {
   }
 
   async install() {
-    return download
-      .downloadTemplateFromRepo(this.options.url, this.options.name)
-      .then((serviceName) => {
-        const message = [
-          `Successfully installed "${serviceName}" `,
-          `${
-            this.options.name && this.options.name !== serviceName
-              ? `as "${this.options.name}"`
-              : ''
-          }`,
-        ].join('');
-
-        this.serverless.cli.log(message);
-      });
+    const commandRunStartTime = Date.now();
+    progress.get('main').notice(`Downloading service from provided url: ${this.options.url}`);
+    const serviceName = await download.downloadTemplateFromRepo(
+      this.options.url,
+      this.options.name
+    );
+    const message = [
+      `Successfully installed "${serviceName}" `,
+      `${
+        this.options.name && this.options.name !== serviceName ? `as "${this.options.name}"` : ''
+      }`,
+    ].join('');
+
+    legacy.log(message);
+    log.notice.success(
+      `${message} ${style.aside(`(${Math.floor((Date.now() - commandRunStartTime) / 1000)}s)`)}`
+    );
   }
 }
 
diff --git a/lib/utils/downloadTemplateFromRepo.js b/lib/utils/downloadTemplateFromRepo.js
index 416e4b1d849..e4f626786aa 100644
--- a/lib/utils/downloadTemplateFromRepo.js
+++ b/lib/utils/downloadTemplateFromRepo.js
@@ -13,7 +13,7 @@ const renameService = require('./renameService').renameService;
 const ServerlessError = require('../serverless-error');
 const copyDirContentsSync = require('./fs/copyDirContentsSync');
 const dirExistsSync = require('./fs/dirExistsSync');
-const log = require('./log/serverlessLog');
+const { legacy } = require('@serverless/utils/log');
 
 /**
  * Returns directory path
@@ -291,7 +291,7 @@ async function downloadTemplateFromRepo(inputUrl, templateName, downloadPath, op
     }
 
     if (!options.silent) {
-      log(`Downloading and installing "${serviceName}"...`);
+      legacy.log(`Downloading and installing "${serviceName}"...`);
     }
 
     if (isPlainGitURL(inputUrl)) {
diff --git a/test/unit/lib/plugins/install.test.js b/test/unit/lib/plugins/install.test.js
index 7e051307191..f5293f6510e 100644
--- a/test/unit/lib/plugins/install.test.js
+++ b/test/unit/lib/plugins/install.test.js
@@ -16,7 +16,6 @@ describe('Install', () => {
   let install;
   let serverless;
   let cwd;
-  let logSpy;
 
   let serviceDir;
 
@@ -33,7 +32,6 @@ describe('Install', () => {
     install = new Install(serverless);
     return serverless.init().then(() => {
       install.serverless.cli = new serverless.classes.CLI();
-      logSpy = sinon.spy(install.serverless.cli, 'log');
     });
   });
 
@@ -112,12 +110,7 @@ describe('Install', () => {
       downloadStub.resolves('remote-service');
 
       return install.install().then(() => {
-        const installationMessage = logSpy.args.filter((arg) =>
-          arg[0].includes('installed "remote-service"')
-        );
-
         expect(downloadStub).to.have.been.calledOnce;
-        expect(installationMessage[0]).to.have.lengthOf(1);
       });
     });
 
@@ -127,12 +120,7 @@ describe('Install', () => {
       downloadStub.resolves('remote-service');
 
       return install.install().then(() => {
-        const installationMessage = logSpy.args.filter((arg) =>
-          arg[0].includes('installed "remote-service" as "remote"')
-        );
-
         expect(downloadStub).to.have.been.calledOnce;
-        expect(installationMessage[0]).to.have.lengthOf(1);
       });
     });
   });

From ce1b208835e34291cc09fdabc8f950f4255a2ec6 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 1 Oct 2021 16:33:41 +0200
Subject: [PATCH 0554/1101] chore: Bump dependencies

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 2c8afc0e954..ac6946f6134 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.997.0",
+    "aws-sdk": "^2.998.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.1.2",
     "cachedir": "^2.3.0",
@@ -83,7 +83,7 @@
     "@commitlint/cli": "^12.1.4",
     "@serverless/eslint-config": "^3.0.0",
     "@serverless/test": "^8.4.0",
-    "adm-zip": "^0.5.6",
+    "adm-zip": "^0.5.7",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "cos-nodejs-sdk-v5": "^2.10.4",

From 2027f13fab44137611f74915f76670d94c4614ff Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 1 Oct 2021 16:40:14 +0200
Subject: [PATCH 0555/1101] chore: Release v2.60.3

---
 CHANGELOG.md | 16 ++++++++++++++++
 package.json |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a58f43833f9..cb920af9511 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 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.
 
+### [2.60.3](https://github.com/serverless/serverless/compare/v2.60.2...v2.60.3) (2021-10-01)
+
+### Bug Fixes
+
+- **CLI:** Fix resolution of handler in case of local fallback ([#10042](https://github.com/serverless/serverless/pull/10042)) ([7d31410](https://github.com/serverless/serverless/commit/7d31410b74efb4c48c1c1b18ca33733a564268f2)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **CLI:**
+  - Improve modern `info` output ([#10037](https://github.com/serverless/serverless/pull/10037)) ([2828a2c](https://github.com/serverless/serverless/commit/2828a2c44388d731d4396e0ea11ae48953f20b0a)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Improve modern error reporting ([#10037](https://github.com/serverless/serverless/pull/10037)) ([a205f88](https://github.com/serverless/serverless/commit/a205f88310653331c96f51402d148c576dd79db8)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Improve modern logs for `logs` command ([#10037](https://github.com/serverless/serverless/pull/10037)) ([d1701bf](https://github.com/serverless/serverless/commit/d1701bf13a7155cce388424964e35ca536b2ce8a)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Modern logs for `install` command ([#10040](https://github.com/serverless/serverless/pull/10040)) ([bd4d215](https://github.com/serverless/serverless/commit/bd4d215266b16793c26d06a34af8482f00e47844)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Modern logs for `print` command ([#10035](https://github.com/serverless/serverless/pull/10035)) ([4ed34c3](https://github.com/serverless/serverless/commit/4ed34c3e5e21903a3fe9e512621739ef5bf0bd84)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Generalize `writeServiceOutputs` ([#10037](https://github.com/serverless/serverless/pull/10037)) ([8aa700d](https://github.com/serverless/serverless/commit/8aa700dc7947d36aa46bba4b0e475f21fd19ac89)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ### [2.60.2](https://github.com/serverless/serverless/compare/v2.60.1...v2.60.2) (2021-09-30)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index ac6946f6134..00a72ff63db 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.60.2",
+  "version": "2.60.3",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 0c9dae1210b9456ec96bc38a717a901beaa45a7b Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 1 Oct 2021 12:25:07 +0200
Subject: [PATCH 0556/1101] refactor(CLI): Modern logs for `slstats` command

---
 lib/plugins/slstats.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/slstats.js b/lib/plugins/slstats.js
index fbe007debfb..22eea6c9508 100644
--- a/lib/plugins/slstats.js
+++ b/lib/plugins/slstats.js
@@ -2,6 +2,7 @@
 
 const config = require('@serverless/utils/config');
 const cliCommandsSchema = require('../cli/commands-schema');
+const { legacy, log } = require('@serverless/utils/log');
 
 class SlStats {
   constructor(serverless, options) {
@@ -25,11 +26,13 @@ class SlStats {
     if (enableStats) {
       // set .serverlessrc config
       config.set('trackingDisabled', false);
-      this.serverless.cli.log('Stats successfully enabled');
+      legacy.log('Stats successfully enabled');
+      log.notice.success('Stats successfully enabled');
     } else if (disabledStats) {
       // set .serverlessrc config
       config.set('trackingDisabled', true);
-      this.serverless.cli.log('Stats successfully disabled');
+      legacy.log('Stats successfully disabled');
+      log.notice.success('Stats successfully disabled');
     }
   }
 }

From 7926570557e5c0a4dd661c069eecc1d4a0cf9b5d Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 1 Oct 2021 13:33:02 +0200
Subject: [PATCH 0557/1101] refactor(CLI): Modern logs for `config` command

---
 lib/plugins/config.js | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/lib/plugins/config.js b/lib/plugins/config.js
index 74c74c7f1e0..366b03d4831 100644
--- a/lib/plugins/config.js
+++ b/lib/plugins/config.js
@@ -9,6 +9,7 @@ const tabtabOptions = require('../utils/tabCompletion/tabtabOptions');
 const isNpmPackageWritable = require('../utils/npmPackage/isWritable');
 const isNpmGlobalPackage = require('../utils/npmPackage/isGlobal');
 const renderCommandHelp = require('../cli/render-help/command');
+const { legacy, log } = require('@serverless/utils/log');
 
 // class wide constants
 const validProviders = new Set(['aws']);
@@ -80,7 +81,9 @@ class Config {
     }
     if (this.options.autoupdate) {
       if (config.get('autoUpdate.enabled')) {
-        this.serverless.cli.log('Auto update is already turned on');
+        const message = 'Auto update is already turned on';
+        legacy.log(message);
+        log.notice.skip(message);
         return;
       }
       if (this.serverless.isLocallyInstalled) {
@@ -103,18 +106,22 @@ class Config {
       }
       config.set('autoUpdate.enabled', true);
 
-      this.serverless.cli.log(
-        'Auto update successfully turned on (Turn off at any time with "serverless config --no-autoupdate")'
-      );
+      const message =
+        'Auto update successfully turned on (Turn off at any time with "serverless config --no-autoupdate")';
+      legacy.log(message);
+      log.notice.success(message);
     } else {
       if (!config.get('autoUpdate.enabled')) {
-        this.serverless.cli.log('Auto update is already turned off');
+        const message = 'Auto update is already turned off';
+        legacy.log(message);
+        log.notice.skip(message);
         return;
       }
       config.set('autoUpdate.enabled', false);
-      this.serverless.cli.log(
-        'Auto update successfully turned off (Turn on at any time with "serverless config --autoupdate")'
-      );
+      const message =
+        'Auto update successfully turned off (Turn on at any time with "serverless config --autoupdate")';
+      legacy.log(message);
+      log.notice.success(message);
     }
   }
 

From 16a7739411141487fa33f8a72f88d82db712bfc9 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 1 Oct 2021 13:38:03 +0200
Subject: [PATCH 0558/1101] refactor(CLI): Modern logs for `config
 tabcompletion install` command

---
 lib/plugins/config.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/plugins/config.js b/lib/plugins/config.js
index 366b03d4831..2b5018dbc70 100644
--- a/lib/plugins/config.js
+++ b/lib/plugins/config.js
@@ -158,11 +158,11 @@ class Config {
             previousOperation.then(() => install(Object.assign({ location }, options))),
           BbPromise.resolve()
         )
-      ).then(() =>
-        this.serverless.cli.log(
-          `Tab autocompletion setup for ${shell}. Make sure to reload your SHELL.`
-        )
-      );
+      ).then(() => {
+        const message = `Tab autocompletion setup for ${shell}. Make sure to reload your SHELL.`;
+        legacy.log(message);
+        log.notice.success(message);
+      });
     });
   }
 

From 02eebb4643435341235340f5da8c7db903cb12e6 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 1 Oct 2021 13:41:17 +0200
Subject: [PATCH 0559/1101] refactor(CLI): Modern logs for `config
 tabcompletion uninstall` command

---
 lib/plugins/config.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/plugins/config.js b/lib/plugins/config.js
index 2b5018dbc70..52e2413b852 100644
--- a/lib/plugins/config.js
+++ b/lib/plugins/config.js
@@ -174,9 +174,11 @@ class Config {
           (previousOperation, options) => previousOperation.then(() => uninstall(options)),
           BbPromise.resolve()
         )
-      ).then(() =>
-        this.serverless.cli.log('Tab autocompletion uninstalled (for all configured shells).')
-      );
+      ).then(() => {
+        const message = 'Tab autocompletion uninstalled (for all configured shells).';
+        legacy.log(message);
+        log.notice.success(message);
+      });
     });
   }
 }

From bcb240893d89127cc1eada7255864b7bfeb88a61 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 1 Oct 2021 14:38:51 +0200
Subject: [PATCH 0560/1101] refactor(CLI): Modern logs for `config credentials`
 command

---
 lib/plugins/aws/configCredentials.js | 18 +++++++-----
 lib/plugins/config.js                | 42 +++++++++++++++-------------
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/lib/plugins/aws/configCredentials.js b/lib/plugins/aws/configCredentials.js
index 45489c3dbf1..3add340e8fe 100644
--- a/lib/plugins/aws/configCredentials.js
+++ b/lib/plugins/aws/configCredentials.js
@@ -4,6 +4,7 @@ const os = require('os');
 const credentials = require('./utils/credentials');
 const ServerlessError = require('../../serverless-error');
 const cliCommandsSchema = require('../../cli/commands-schema');
+const { legacy, log } = require('@serverless/utils/log');
 
 class AwsConfigCredentials {
   constructor(serverless, options) {
@@ -51,17 +52,18 @@ class AwsConfigCredentials {
       );
     }
 
-    this.serverless.cli.log('Setting up AWS...');
+    legacy.log('Setting up AWS...');
 
     const profiles = await credentials.resolveFileProfiles();
     if (profiles.has(this.options.profile)) {
       // Only update the profile if the overwrite flag was set
       if (!this.options.overwrite) {
-        const message = [
-          `Failed! ~/.aws/credentials already has a "${this.options.profile}" profile.`,
-          ' Use the overwrite flag ("-o" or "--overwrite") to force the update',
-        ].join('');
-        this.serverless.cli.log(message);
+        legacy.log(
+          `Failed! ~/.aws/credentials already has a "${this.options.profile}" profile. Use the overwrite flag ("-o" or "--overwrite") to force the update`
+        );
+        log.notice.skip(
+          `Profile "${this.options.profile}" is already configured in ~/.aws/credentials. Use the overwrite flag ("-o" or "--overwrite") to force the update.`
+        );
         return null;
       }
     }
@@ -70,7 +72,9 @@ class AwsConfigCredentials {
       secretAccessKey: this.options.secret,
     });
 
-    return credentials.saveFileProfiles(profiles);
+    const result = await credentials.saveFileProfiles(profiles);
+    log.notice.success(`Profile "${this.options.profile}" has been configured`);
+    return result;
   }
 }
 
diff --git a/lib/plugins/config.js b/lib/plugins/config.js
index 52e2413b852..2edc7507b1d 100644
--- a/lib/plugins/config.js
+++ b/lib/plugins/config.js
@@ -81,9 +81,8 @@ class Config {
     }
     if (this.options.autoupdate) {
       if (config.get('autoUpdate.enabled')) {
-        const message = 'Auto update is already turned on';
-        legacy.log(message);
-        log.notice.skip(message);
+        legacy.log('Auto update is already turned on');
+        log.notice.skip('Auto update is already turned on');
         return;
       }
       if (this.serverless.isLocallyInstalled) {
@@ -106,22 +105,25 @@ class Config {
       }
       config.set('autoUpdate.enabled', true);
 
-      const message =
-        'Auto update successfully turned on (Turn off at any time with "serverless config --no-autoupdate")';
-      legacy.log(message);
-      log.notice.success(message);
+      legacy.log(
+        'Auto update successfully turned on (Turn off at any time with "serverless config --no-autoupdate")'
+      );
+      log.notice.success(
+        'Auto update successfully turned on (Turn off at any time with "serverless config --no-autoupdate")'
+      );
     } else {
       if (!config.get('autoUpdate.enabled')) {
-        const message = 'Auto update is already turned off';
-        legacy.log(message);
-        log.notice.skip(message);
+        legacy.log('Auto update is already turned off');
+        log.notice.skip('Auto update is already turned off');
         return;
       }
       config.set('autoUpdate.enabled', false);
-      const message =
-        'Auto update successfully turned off (Turn on at any time with "serverless config --autoupdate")';
-      legacy.log(message);
-      log.notice.success(message);
+      legacy.log(
+        'Auto update successfully turned off (Turn on at any time with "serverless config --autoupdate")'
+      );
+      log.notice.success(
+        'Auto update successfully turned off (Turn on at any time with "serverless config --autoupdate")'
+      );
     }
   }
 
@@ -159,9 +161,10 @@ class Config {
           BbPromise.resolve()
         )
       ).then(() => {
-        const message = `Tab autocompletion setup for ${shell}. Make sure to reload your SHELL.`;
-        legacy.log(message);
-        log.notice.success(message);
+        legacy.log(`Tab autocompletion setup for ${shell}. Make sure to reload your SHELL.`);
+        log.notice.success(
+          `Tab autocompletion setup for ${shell}. Make sure to reload your SHELL.`
+        );
       });
     });
   }
@@ -175,9 +178,8 @@ class Config {
           BbPromise.resolve()
         )
       ).then(() => {
-        const message = 'Tab autocompletion uninstalled (for all configured shells).';
-        legacy.log(message);
-        log.notice.success(message);
+        legacy.log('Tab autocompletion uninstalled (for all configured shells).');
+        log.notice.success('Tab autocompletion uninstalled (for all configured shells).');
       });
     });
   }

From f8ad7bca6a26e39864d139fec4aadddd24b34a5b Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 4 Oct 2021 11:08:32 +0200
Subject: [PATCH 0561/1101] fix(AWS Credentials): Fail when profile is already
 configured

---
 lib/plugins/aws/configCredentials.js          |  9 ++---
 .../lib/plugins/aws/configCredentials.test.js | 37 +++++++++++++------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/lib/plugins/aws/configCredentials.js b/lib/plugins/aws/configCredentials.js
index 3add340e8fe..600a53a3ae1 100644
--- a/lib/plugins/aws/configCredentials.js
+++ b/lib/plugins/aws/configCredentials.js
@@ -58,13 +58,10 @@ class AwsConfigCredentials {
     if (profiles.has(this.options.profile)) {
       // Only update the profile if the overwrite flag was set
       if (!this.options.overwrite) {
-        legacy.log(
-          `Failed! ~/.aws/credentials already has a "${this.options.profile}" profile. Use the overwrite flag ("-o" or "--overwrite") to force the update`
+        throw new ServerlessError(
+          `Profile "${this.options.profile}" is already configured in ~/.aws/credentials. Use the overwrite flag ("-o" or "--overwrite") to force the update.`,
+          'CREDENTIALS_PROFILE_ALREADY_CONFIGURED'
         );
-        log.notice.skip(
-          `Profile "${this.options.profile}" is already configured in ~/.aws/credentials. Use the overwrite flag ("-o" or "--overwrite") to force the update.`
-        );
-        return null;
       }
     }
     profiles.set(this.options.profile, {
diff --git a/test/unit/lib/plugins/aws/configCredentials.test.js b/test/unit/lib/plugins/aws/configCredentials.test.js
index 330dd4d04b9..ac63dd23c1f 100644
--- a/test/unit/lib/plugins/aws/configCredentials.test.js
+++ b/test/unit/lib/plugins/aws/configCredentials.test.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const expect = require('chai').expect;
+const chai = require('chai');
 const sandbox = require('sinon');
 const { constants } = require('fs');
 const fs = require('fs');
@@ -10,6 +10,10 @@ const os = require('os');
 const path = require('path');
 const AwsConfigCredentials = require('../../../../../lib/plugins/aws/configCredentials');
 const Serverless = require('../../../../../lib/Serverless');
+const runServerless = require('../../../../utils/run-serverless');
+
+const { expect } = chai;
+chai.use(require('chai-as-promised'));
 
 describe('AwsConfigCredentials', () => {
   let awsConfigCredentials;
@@ -137,16 +141,6 @@ describe('AwsConfigCredentials', () => {
       );
     });
 
-    it('should not update the profile if the overwrite flag is not set', () => {
-      awsConfigCredentials.options.profile = 'my-profile';
-      awsConfigCredentials.options.key = 'my-new-profile-key';
-      awsConfigCredentials.options.secret = 'my-new-profile-secret';
-
-      fse.outputFileSync(credentialsFilePath, credentialsFileContent);
-
-      return awsConfigCredentials.configureCredentials();
-    });
-
     it('should update the profile', () => {
       awsConfigCredentials.options.profile = 'my-profile';
       awsConfigCredentials.options.key = 'my-new-profile-key';
@@ -245,3 +239,24 @@ describe('AwsConfigCredentials', () => {
     }
   });
 });
+
+describe('test/unit/lib/plugins/aws/configCredentials.test.js', () => {
+  it('should fail if profile is already set and overwrite is not set', async () => {
+    const credentialsFilePath = path.join(os.homedir(), '.aws', 'credentials');
+    const credentialsFileContent = [
+      '[default]',
+      'aws_access_key_id = my-old-profile-key',
+      'aws_secret_access_key = my-old-profile-secret',
+    ].join('\n');
+
+    await fse.outputFile(credentialsFilePath, credentialsFileContent);
+
+    await expect(
+      runServerless({
+        noService: true,
+        command: 'config credentials',
+        options: { provider: 'aws', key: 'key', secret: 'secret' },
+      })
+    ).to.be.eventually.rejected.and.have.property('code', 'CREDENTIALS_PROFILE_ALREADY_CONFIGURED');
+  });
+});

From c95b8d3594d38932bb9d2b02f7cb6d4f74b57d4a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 4 Oct 2021 12:32:08 +0200
Subject: [PATCH 0562/1101] refactor: Ensure alphabetical order

---
 lib/plugins/aws/provider.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 4bf1f15446e..7546fe5485b 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -650,6 +650,19 @@ class AwsProvider {
         },
         provider: {
           properties: {
+            alb: {
+              type: 'object',
+              properties: {
+                targetGroupPrefix: { type: 'string', maxLength: 16 },
+                authorizers: {
+                  type: 'object',
+                  additionalProperties: {
+                    anyOf: [oidcAlbAuthorizer, cognitoAlbAuthorizer],
+                  },
+                },
+              },
+              additionalProperties: false,
+            },
             apiGateway: {
               type: 'object',
               properties: {
@@ -724,19 +737,6 @@ class AwsProvider {
             },
             apiKeys: { $ref: '#/definitions/awsApiGatewayApiKeys' },
             apiName: { type: 'string' },
-            alb: {
-              type: 'object',
-              properties: {
-                targetGroupPrefix: { type: 'string', maxLength: 16 },
-                authorizers: {
-                  type: 'object',
-                  additionalProperties: {
-                    anyOf: [oidcAlbAuthorizer, cognitoAlbAuthorizer],
-                  },
-                },
-              },
-              additionalProperties: false,
-            },
             cfnRole: { $ref: '#/definitions/awsArn' },
             cloudFront: {
               type: 'object',

From ed372a21dcd32ec027dae02cf5515c2b1ad6670d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 4 Oct 2021 14:12:33 +0200
Subject: [PATCH 0563/1101] test: Generalize `function` fixture

---
 .../function/{index.js => basic.js}           |  2 +-
 test/fixtures/programmatic/function/other.js  |  7 +++
 .../programmatic/function/serverless.yml      |  6 +-
 test/unit/lib/classes/Service.test.js         |  4 +-
 .../aws/deploy/lib/extendedValidate.test.js   |  2 +-
 .../lib/plugins/aws/deployFunction.test.js    | 58 +++++++++----------
 .../package/compile/events/activemq.test.js   | 10 ++--
 .../events/apiGateway/lib/authorizers.test.js | 11 ++--
 .../apiGateway/lib/method/index.test.js       |  2 +-
 .../package/compile/events/cloudFront.test.js |  8 +--
 .../compile/events/eventBridge/index.test.js  | 22 +++----
 .../aws/package/compile/events/kafka.test.js  | 30 +++++-----
 .../package/compile/events/msk/index.test.js  |  6 +-
 .../package/compile/events/s3/index.test.js   |  6 +-
 .../aws/package/compile/events/sqs.test.js    | 10 ++--
 .../aws/package/compile/events/stream.test.js | 20 +++----
 .../aws/package/compile/functions.test.js     | 42 +++++++-------
 .../aws/package/lib/mergeIamTemplates.test.js |  6 +-
 18 files changed, 131 insertions(+), 121 deletions(-)
 rename test/fixtures/programmatic/function/{index.js => basic.js} (65%)
 create mode 100644 test/fixtures/programmatic/function/other.js

diff --git a/test/fixtures/programmatic/function/index.js b/test/fixtures/programmatic/function/basic.js
similarity index 65%
rename from test/fixtures/programmatic/function/index.js
rename to test/fixtures/programmatic/function/basic.js
index 11bceba2d4e..0d9a6df74e8 100644
--- a/test/fixtures/programmatic/function/index.js
+++ b/test/fixtures/programmatic/function/basic.js
@@ -3,5 +3,5 @@
 module.exports.handler = (event, context, callback) =>
   callback(null, {
     statusCode: 200,
-    body: JSON.stringify({}),
+    body: JSON.stringify({ message: 'Basic', input: event }),
   });
diff --git a/test/fixtures/programmatic/function/other.js b/test/fixtures/programmatic/function/other.js
new file mode 100644
index 00000000000..a6ae9a6c1c2
--- /dev/null
+++ b/test/fixtures/programmatic/function/other.js
@@ -0,0 +1,7 @@
+'use strict';
+
+module.exports.handler = (event, context, callback) =>
+  callback(null, {
+    statusCode: 200,
+    body: JSON.stringify({ message: 'Other', input: event }),
+  });
diff --git a/test/fixtures/programmatic/function/serverless.yml b/test/fixtures/programmatic/function/serverless.yml
index 9ddb22850ac..33d10a05a01 100644
--- a/test/fixtures/programmatic/function/serverless.yml
+++ b/test/fixtures/programmatic/function/serverless.yml
@@ -9,7 +9,7 @@ provider:
   lambdaHashingVersion: 20201221
 
 functions:
-  foo:
-    handler: index.handler
+  basic:
+    handler: basic.handler
   other:
-    handler: index.handler
+    handler: other.handler
diff --git a/test/unit/lib/classes/Service.test.js b/test/unit/lib/classes/Service.test.js
index f90e16aa8a4..1d12776ec4b 100644
--- a/test/unit/lib/classes/Service.test.js
+++ b/test/unit/lib/classes/Service.test.js
@@ -124,8 +124,8 @@ describe('Service', () => {
         command: 'package',
       });
       expect(
-        cfTemplate.Resources[awsNaming.getLambdaLogicalId('foo')].Properties.FunctionName
-      ).to.include('dev-foo');
+        cfTemplate.Resources[awsNaming.getLambdaLogicalId('basic')].Properties.FunctionName
+      ).to.include('dev-basic');
     });
 
     it('should throw when receives function with non-object configuration', async () => {
diff --git a/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js b/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
index a240bde06ad..746d3478ae3 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
@@ -177,7 +177,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js', () =>
       fixture: 'function',
       configExt: {
         functions: {
-          foo: {
+          basic: {
             timeout: 31,
             events: [
               {
diff --git a/test/unit/lib/plugins/aws/deployFunction.test.js b/test/unit/lib/plugins/aws/deployFunction.test.js
index ec55037521d..46280c76b56 100644
--- a/test/unit/lib/plugins/aws/deployFunction.test.js
+++ b/test/unit/lib/plugins/aws/deployFunction.test.js
@@ -397,7 +397,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
     const { stdoutData } = await runServerless({
       fixture: 'function',
       command: 'deploy function',
-      options: { function: 'foo' },
+      options: { function: 'basic' },
       awsRequestStubMap: {
         ...awsRequestStubMap,
         Lambda: {
@@ -419,7 +419,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       },
       configExt: {
         functions: {
-          foo: {
+          basic: {
             handler: null,
             image: {
               uri: imageWithSha,
@@ -441,7 +441,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
     const { stdoutData } = await runServerless({
       fixture: 'function',
       command: 'deploy function',
-      options: { function: 'foo' },
+      options: { function: 'basic' },
       awsRequestStubMap: {
         ...awsRequestStubMap,
         Lambda: {
@@ -456,7 +456,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       },
       configExt: {
         functions: {
-          foo: {
+          basic: {
             image: imageWithSha,
           },
         },
@@ -471,7 +471,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       runServerless({
         fixture: 'function',
         command: 'deploy function',
-        options: { function: 'foo' },
+        options: { function: 'basic' },
         awsRequestStubMap: {
           ...awsRequestStubMap,
           Lambda: {
@@ -486,7 +486,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
         },
         configExt: {
           functions: {
-            foo: {
+            basic: {
               image: imageWithSha,
             },
           },
@@ -503,7 +503,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       runServerless({
         fixture: 'function',
         command: 'deploy function',
-        options: { function: 'foo' },
+        options: { function: 'basic' },
         awsRequestStubMap: {
           ...awsRequestStubMap,
           Lambda: {
@@ -533,7 +533,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
     const { stdoutData } = await runServerless({
       fixture: 'function',
       command: 'deploy function',
-      options: { function: 'foo' },
+      options: { function: 'basic' },
       awsRequestStubMap: {
         ...awsRequestStubMap,
         Lambda: {
@@ -546,7 +546,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       },
       configExt: {
         functions: {
-          foo: {
+          basic: {
             timeout: 50,
           },
         },
@@ -561,7 +561,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
     const { stdoutData } = await runServerless({
       fixture: 'function',
       command: 'deploy function',
-      options: { function: 'foo' },
+      options: { function: 'basic' },
       awsRequestStubMap: {
         ...awsRequestStubMap,
         Lambda: {
@@ -581,7 +581,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
           },
         },
         functions: {
-          foo: {
+          basic: {
             kmsKeyArn,
             description,
             handler,
@@ -633,7 +633,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
     const { stdoutData } = await runServerless({
       fixture: 'function',
       command: 'deploy function',
-      options: { function: 'foo' },
+      options: { function: 'basic' },
       awsRequestStubMap: {
         ...awsRequestStubMap,
         Lambda: {
@@ -648,7 +648,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       },
       configExt: {
         functions: {
-          foo: {
+          basic: {
             name: functionName,
             role,
             timeout,
@@ -668,7 +668,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
 
     expect(updateFunctionConfigurationStub).to.be.calledWithExactly({
       FunctionName: functionName,
-      Handler: 'index.handler',
+      Handler: 'basic.handler',
       Timeout: timeout,
       VpcConfig: {
         SubnetIds: ['subnet-111', 'subnet-222'],
@@ -682,7 +682,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
     const { stdoutData } = await runServerless({
       fixture: 'function',
       command: 'deploy function',
-      options: { function: 'foo' },
+      options: { function: 'basic' },
       awsRequestStubMap: {
         ...awsRequestStubMap,
         Lambda: {
@@ -710,7 +710,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
           },
         },
         functions: {
-          foo: {
+          basic: {
             name: functionName,
           },
         },
@@ -719,7 +719,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
 
     expect(updateFunctionConfigurationStub).to.be.calledWithExactly({
       FunctionName: functionName,
-      Handler: 'index.handler',
+      Handler: 'basic.handler',
       Environment: {
         Variables: {
           ANOTHERVAR: 'anothervalue',
@@ -741,7 +741,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
     const { stdoutData } = await runServerless({
       fixture: 'function',
       command: 'deploy function',
-      options: { function: 'foo' },
+      options: { function: 'basic' },
       awsRequestStubMap: {
         ...awsRequestStubMap,
         Lambda: {
@@ -783,7 +783,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
           },
         },
         functions: {
-          foo: {
+          basic: {
             kmsKeyArn,
             description,
             handler,
@@ -815,13 +815,13 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
     await runServerless({
       fixture: 'function',
       command: 'deploy function',
-      options: { function: 'foo' },
+      options: { function: 'basic' },
       lastLifecycleHookName: 'deploy:function:deploy',
       awsRequestStubMap,
       configExt: {
         disabledDeprecations: ['AWS_KMS_KEY_ARN'],
         functions: {
-          foo: {
+          basic: {
             handler: 'index.handler',
             name: 'foobar',
             awsKmsKeyArn: 'arn:aws:kms:us-east-1:oldKey',
@@ -844,13 +844,13 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
     await runServerless({
       fixture: 'function',
       command: 'deploy function',
-      options: { function: 'foo' },
+      options: { function: 'basic' },
       lastLifecycleHookName: 'deploy:function:deploy',
       awsRequestStubMap,
       configExt: {
         disabledDeprecations: ['AWS_KMS_KEY_ARN', 'SERVICE_OBJECT_NOTATION'],
         functions: {
-          foo: {
+          basic: {
             handler: 'index.handler',
             name: 'foobar',
             kmsKeyArn: 'arn:aws:kms:us-east-1:newKey',
@@ -874,13 +874,13 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
     await runServerless({
       fixture: 'function',
       command: 'deploy function',
-      options: { function: 'foo' },
+      options: { function: 'basic' },
       lastLifecycleHookName: 'deploy:function:deploy',
       awsRequestStubMap,
       configExt: {
         disabledDeprecations: ['AWS_KMS_KEY_ARN', 'SERVICE_OBJECT_NOTATION'],
         functions: {
-          foo: {
+          basic: {
             handler: 'index.handler',
             name: 'foobar',
           },
@@ -903,13 +903,13 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
     await runServerless({
       fixture: 'function',
       command: 'deploy function',
-      options: { function: 'foo' },
+      options: { function: 'basic' },
       lastLifecycleHookName: 'deploy:function:deploy',
       awsRequestStubMap,
       configExt: {
         disabledDeprecations: ['AWS_KMS_KEY_ARN'],
         functions: {
-          foo: {
+          basic: {
             handler: 'index.handler',
             name: 'foobar',
             awsKmsKeyArn: 'arn:aws:kms:us-east-1:oldKey',
@@ -930,7 +930,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       runServerless({
         fixture: 'function',
         command: 'deploy function',
-        options: { function: 'foo' },
+        options: { function: 'basic' },
         lastLifecycleHookName: 'deploy:function:deploy',
         awsRequestStubMap: {
           ...awsRequestStubMap,
@@ -950,7 +950,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       runServerless({
         fixture: 'function',
         command: 'deploy function',
-        options: { function: 'foo' },
+        options: { function: 'basic' },
         lastLifecycleHookName: 'deploy:function:deploy',
         awsRequestStubMap: {
           ...awsRequestStubMap,
diff --git a/test/unit/lib/plugins/aws/package/compile/events/activemq.test.js b/test/unit/lib/plugins/aws/package/compile/events/activemq.test.js
index 16b942b773d..f3dd58d97b5 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/activemq.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/activemq.test.js
@@ -25,7 +25,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/activemq.test.js', ()
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               events: [
                 {
                   activemq: {
@@ -55,7 +55,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/activemq.test.js', ()
       });
       naming = awsNaming;
       minimalEventSourceMappingResource =
-        cfTemplate.Resources[naming.getActiveMQEventLogicalId('foo', queue)];
+        cfTemplate.Resources[naming.getActiveMQEventLogicalId('basic', queue)];
       allParamsEventSourceMappingResource =
         cfTemplate.Resources[naming.getActiveMQEventLogicalId('other', queue)];
       defaultIamRole = cfTemplate.Resources.IamRoleLambdaExecution;
@@ -72,7 +72,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/activemq.test.js', ()
         ],
         Queues: [queue],
         FunctionName: {
-          'Fn::GetAtt': [naming.getLambdaLogicalId('foo'), 'Arn'],
+          'Fn::GetAtt': [naming.getLambdaLogicalId('basic'), 'Arn'],
         },
       });
     });
@@ -138,7 +138,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/activemq.test.js', ()
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               role: { 'Fn::ImportValue': 'MyImportedRole' },
               events: [
                 {
@@ -156,7 +156,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/activemq.test.js', ()
       });
 
       const eventSourceMappingResource =
-        cfTemplate.Resources[awsNaming.getActiveMQEventLogicalId('foo', queue)];
+        cfTemplate.Resources[awsNaming.getActiveMQEventLogicalId('basic', queue)];
       expect(eventSourceMappingResource.DependsOn).to.deep.equal([]);
     });
   });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js
index 2208b8fe75e..6b153ce392b 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js
@@ -226,7 +226,7 @@ describe('#compileAuthorizers() #2', () => {
       fixture: 'function',
       configExt: {
         functions: {
-          foo: {
+          basic: {
             provisionedConcurrency: 1,
           },
           authorized: {
@@ -237,7 +237,7 @@ describe('#compileAuthorizers() #2', () => {
                   method: 'get',
                   path: '/authorized',
                   authorizer: {
-                    name: 'foo',
+                    name: 'basic',
                     identitySource: 'method.request.header.Authorization',
                   },
                 },
@@ -249,13 +249,14 @@ describe('#compileAuthorizers() #2', () => {
       command: 'package',
     }).then(({ awsNaming, cfTemplate }) => {
       // console.log(cfTemplate.Resources);
-      const authorizerLogicalId = awsNaming.getAuthorizerLogicalId('foo');
-      const authorizerPermissionLogicalId = awsNaming.getLambdaApiGatewayPermissionLogicalId('foo');
+      const authorizerLogicalId = awsNaming.getAuthorizerLogicalId('basic');
+      const authorizerPermissionLogicalId =
+        awsNaming.getLambdaApiGatewayPermissionLogicalId('basic');
       expect(
         JSON.stringify(cfTemplate.Resources[authorizerLogicalId].Properties.AuthorizerUri)
       ).to.include('provisioned');
       expect(
         cfTemplate.Resources[authorizerPermissionLogicalId].Properties.FunctionName
-      ).to.deep.equal({ Ref: awsNaming.getLambdaProvisionedConcurrencyAliasLogicalId('foo') });
+      ).to.deep.equal({ Ref: awsNaming.getLambdaProvisionedConcurrencyAliasLogicalId('basic') });
     }));
 });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js
index 285fa7c7cb8..ea2330abe72 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js
@@ -501,7 +501,7 @@ describe('#compileMethods()', () => {
       fixture: 'function',
       configExt: {
         functions: {
-          foo: {
+          basic: {
             events: [
               {
                 http: {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
index faa8d46a4fa..808f2f3e42e 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
@@ -1765,7 +1765,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js',
           command: 'package',
           configExt: {
             functions: {
-              foo: {
+              basic: {
                 handler: 'myLambdaAtEdge.handler',
                 events: [
                   {
@@ -1794,7 +1794,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js',
           configExt: {
             disabledDeprecations: ['CLOUDFRONT_CACHE_BEHAVIOR_FORWARDED_VALUES_AND_TTL'],
             functions: {
-              foo: {
+              basic: {
                 handler: 'myLambdaAtEdge.handler',
                 events: [
                   {
@@ -1829,7 +1829,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js',
         command: 'package',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               handler: 'myLambdaAtEdge.handler',
               events: [
                 {
@@ -2139,7 +2139,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js',
     });
     it('should ignore provider VPC config', () => {
       const edgeResolvedName = naming.getLambdaLogicalId('fnOriginResponse');
-      const otherResolvedName = naming.getLambdaLogicalId('foo');
+      const otherResolvedName = naming.getLambdaLogicalId('basic');
       expect(cfResources[edgeResolvedName].Properties).not.to.contain.keys('VpcConfig');
       expect(cfResources[otherResolvedName].Properties).to.contain.keys('VpcConfig');
     });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
index 9310f5e8bd5..4557c072e60 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
@@ -282,7 +282,7 @@ describe('EventBridgeEvents', () => {
           configExt: {
             disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE'],
             functions: {
-              foo: {
+              basic: {
                 events: [
                   {
                     eventBridge: {
@@ -314,7 +314,7 @@ describe('EventBridgeEvents', () => {
           configExt: {
             disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE'],
             functions: {
-              foo: {
+              basic: {
                 events: [
                   {
                     eventBridge: {
@@ -345,7 +345,7 @@ describe('EventBridgeEvents', () => {
           configExt: {
             disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE'],
             functions: {
-              foo: {
+              basic: {
                 events: [
                   {
                     eventBridge: {
@@ -416,7 +416,7 @@ describe('EventBridgeEvents', () => {
               },
             },
             functions: {
-              foo: {
+              basic: {
                 events: [
                   {
                     eventBridge: {
@@ -554,12 +554,12 @@ describe('EventBridgeEvents', () => {
       });
 
       it('should create a rule that references correct function in target', () => {
-        expect(ruleTarget.Arn['Fn::GetAtt'][0]).to.equal(naming.getLambdaLogicalId('foo'));
+        expect(ruleTarget.Arn['Fn::GetAtt'][0]).to.equal(naming.getLambdaLogicalId('basic'));
       });
 
       it('should create a lambda permission resource that correctly references event bus in SourceArn', () => {
         const lambdaPermissionResource =
-          cfResources[naming.getEventBridgeLambdaPermissionLogicalId('foo', 1)];
+          cfResources[naming.getEventBridgeLambdaPermissionLogicalId('basic', 1)];
 
         expect(
           lambdaPermissionResource.Properties.SourceArn['Fn::Join'][1][5]['Fn::Join'][1][1]
@@ -582,7 +582,7 @@ describe('EventBridgeEvents', () => {
               },
             },
             functions: {
-              foo: {
+              basic: {
                 events: [
                   {
                     eventBridge: {
@@ -623,7 +623,7 @@ describe('EventBridgeEvents', () => {
 
       it('should create a lambda permission resource that correctly references arn event bus in SourceArn', () => {
         const lambdaPermissionResource =
-          cfResources[naming.getEventBridgeLambdaPermissionLogicalId('foo', 1)];
+          cfResources[naming.getEventBridgeLambdaPermissionLogicalId('basic', 1)];
 
         expect(
           lambdaPermissionResource.Properties.SourceArn['Fn::Join'][1][5]['Fn::Join'][1][1]
@@ -632,7 +632,7 @@ describe('EventBridgeEvents', () => {
 
       it('should create a lambda permission resource that correctly references CF event bus in SourceArn', () => {
         const lambdaPermissionResource =
-          cfResources[naming.getEventBridgeLambdaPermissionLogicalId('foo', 2)];
+          cfResources[naming.getEventBridgeLambdaPermissionLogicalId('basic', 2)];
 
         expect(
           lambdaPermissionResource.Properties.SourceArn['Fn::Join'][1][5]['Fn::Join'][1][1]
@@ -641,7 +641,7 @@ describe('EventBridgeEvents', () => {
 
       it('should create a lambda permission resource that correctly references explicit default event bus in SourceArn', () => {
         const lambdaPermissionResource =
-          cfResources[naming.getEventBridgeLambdaPermissionLogicalId('foo', 3)];
+          cfResources[naming.getEventBridgeLambdaPermissionLogicalId('basic', 3)];
 
         expect(
           lambdaPermissionResource.Properties.SourceArn['Fn::Join'][1][5]['Fn::Join'][1][1]
@@ -650,7 +650,7 @@ describe('EventBridgeEvents', () => {
 
       it('should create a lambda permission resource that correctly references implicit default event bus in SourceArn', () => {
         const lambdaPermissionResource =
-          cfResources[naming.getEventBridgeLambdaPermissionLogicalId('foo', 4)];
+          cfResources[naming.getEventBridgeLambdaPermissionLogicalId('basic', 4)];
 
         expect(
           lambdaPermissionResource.Properties.SourceArn['Fn::Join'][1][5]['Fn::Join'][1]
diff --git a/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js b/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js
index d541e3c4293..6f91cf9024b 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js
@@ -26,7 +26,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               events: [
                 {
                   kafka: {
@@ -57,7 +57,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
       });
       naming = awsNaming;
       minimalEventSourceMappingResource =
-        cfTemplate.Resources[naming.getKafkaEventLogicalId('foo', 'TestingTopic')];
+        cfTemplate.Resources[naming.getKafkaEventLogicalId('basic', 'TestingTopic')];
       allParamsEventSourceMappingResource =
         cfTemplate.Resources[naming.getKafkaEventLogicalId('other', 'TestingTopic')];
       defaultIamRole = cfTemplate.Resources.IamRoleLambdaExecution;
@@ -79,7 +79,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
         StartingPosition: 'TRIM_HORIZON',
         Topics: [topic],
         FunctionName: {
-          'Fn::GetAtt': [naming.getLambdaLogicalId('foo'), 'Arn'],
+          'Fn::GetAtt': [naming.getLambdaLogicalId('basic'), 'Arn'],
         },
       });
     });
@@ -127,7 +127,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               events: [
                 {
                   kafka: eventConfig.event,
@@ -140,7 +140,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
       });
 
       const eventSourceMappingResource =
-        cfTemplate.Resources[awsNaming.getKafkaEventLogicalId('foo', 'TestingTopic')];
+        cfTemplate.Resources[awsNaming.getKafkaEventLogicalId('basic', 'TestingTopic')];
       expect(eventSourceMappingResource.Properties).to.deep.equal(eventConfig.resource(awsNaming));
     };
 
@@ -167,7 +167,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
             StartingPosition: 'TRIM_HORIZON',
             Topics: [topic],
             FunctionName: {
-              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('foo'), 'Arn'],
+              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
             },
           };
         },
@@ -198,7 +198,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
             StartingPosition: 'TRIM_HORIZON',
             Topics: [topic],
             FunctionName: {
-              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('foo'), 'Arn'],
+              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
             },
           };
         },
@@ -233,7 +233,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
             StartingPosition: 'TRIM_HORIZON',
             Topics: [topic],
             FunctionName: {
-              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('foo'), 'Arn'],
+              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
             },
           };
         },
@@ -267,7 +267,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
             StartingPosition: 'TRIM_HORIZON',
             Topics: [topic],
             FunctionName: {
-              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('foo'), 'Arn'],
+              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
             },
           };
         },
@@ -298,7 +298,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
             StartingPosition: 'TRIM_HORIZON',
             Topics: [topic],
             FunctionName: {
-              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('foo'), 'Arn'],
+              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
             },
           };
         },
@@ -332,7 +332,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
             StartingPosition: 'TRIM_HORIZON',
             Topics: [topic],
             FunctionName: {
-              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('foo'), 'Arn'],
+              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
             },
           };
         },
@@ -366,7 +366,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
             StartingPosition: 'TRIM_HORIZON',
             Topics: [topic],
             FunctionName: {
-              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('foo'), 'Arn'],
+              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
             },
           };
         },
@@ -379,7 +379,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               events: [
                 {
                   kafka: {
@@ -414,7 +414,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               role: { 'Fn::ImportValue': 'MyImportedRole' },
               events: [
                 {
@@ -432,7 +432,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
       });
 
       const eventSourceMappingResource =
-        cfTemplate.Resources[awsNaming.getKafkaEventLogicalId('foo', 'TestingTopic')];
+        cfTemplate.Resources[awsNaming.getKafkaEventLogicalId('basic', 'TestingTopic')];
       expect(eventSourceMappingResource.DependsOn).to.deep.equal([]);
     });
   });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/msk/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/msk/index.test.js
index e95b9307466..2ec0e6ca35a 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/msk/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/msk/index.test.js
@@ -25,7 +25,7 @@ describe('AwsCompileMSKEvents', () => {
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               events: [
                 {
                   msk: {
@@ -54,7 +54,7 @@ describe('AwsCompileMSKEvents', () => {
       });
       naming = awsNaming;
       minimalEventSourceMappingResource =
-        cfTemplate.Resources[naming.getMSKEventLogicalId('foo', 'ClusterName', 'TestingTopic')];
+        cfTemplate.Resources[naming.getMSKEventLogicalId('basic', 'ClusterName', 'TestingTopic')];
       allParamsEventSourceMappingResource =
         cfTemplate.Resources[naming.getMSKEventLogicalId('other', 'ClusterName', 'TestingTopic')];
       defaultIamRole = cfTemplate.Resources.IamRoleLambdaExecution;
@@ -66,7 +66,7 @@ describe('AwsCompileMSKEvents', () => {
         StartingPosition: 'TRIM_HORIZON',
         Topics: [topic],
         FunctionName: {
-          'Fn::GetAtt': [naming.getLambdaLogicalId('foo'), 'Arn'],
+          'Fn::GetAtt': [naming.getLambdaLogicalId('basic'), 'Arn'],
         },
       });
     });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
index 9df17153f75..f0b49c9bbb1 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
@@ -843,7 +843,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js', ()
       fixture: 'function',
       configExt: {
         functions: {
-          foo: {
+          basic: {
             events: [
               {
                 s3: {
@@ -925,7 +925,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js', ()
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               events: [
                 {
                   s3: {
@@ -956,7 +956,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js', ()
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               events: [
                 {
                   s3: {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js b/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
index ba35dbe4303..81c1a81521a 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
@@ -603,7 +603,7 @@ describe('AwsCompileSQSEvents #2', () => {
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               provisionedConcurrency: 1,
               events: [
                 {
@@ -620,7 +620,7 @@ describe('AwsCompileSQSEvents #2', () => {
         command: 'package',
       });
       naming = awsNaming;
-      const queueLogicalId = awsNaming.getQueueLogicalId('foo', 'MyQueue');
+      const queueLogicalId = awsNaming.getQueueLogicalId('basic', 'MyQueue');
       eventSourceMappingResource = cfTemplate.Resources[queueLogicalId];
     });
 
@@ -631,7 +631,7 @@ describe('AwsCompileSQSEvents #2', () => {
     });
 
     it('should depend on provisioned alias', () => {
-      const aliasLogicalId = naming.getLambdaProvisionedConcurrencyAliasLogicalId('foo');
+      const aliasLogicalId = naming.getLambdaProvisionedConcurrencyAliasLogicalId('basic');
       expect(eventSourceMappingResource.DependsOn).to.include(aliasLogicalId);
     });
 
@@ -656,7 +656,7 @@ describe('AwsCompileSQSEvents #2', () => {
           },
         },
         functions: {
-          foo: {
+          basic: {
             events: [
               {
                 sqs: {
@@ -670,7 +670,7 @@ describe('AwsCompileSQSEvents #2', () => {
       command: 'package',
     });
 
-    const queueLogicalId = awsNaming.getQueueLogicalId('foo', 'MyQueue');
+    const queueLogicalId = awsNaming.getQueueLogicalId('basic', 'MyQueue');
     const eventSourceMappingResource = cfTemplate.Resources[queueLogicalId];
 
     expect(eventSourceMappingResource.DependsOn).to.deep.equal([]);
diff --git a/test/unit/lib/plugins/aws/package/compile/events/stream.test.js b/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
index 4966c3fda9b..cc894e2df08 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
@@ -1601,7 +1601,7 @@ describe('AwsCompileStreamEvents #2', () => {
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               provisionedConcurrency: 1,
               events: [{ stream: 'arn:aws:kinesis:us-east-1:123456789012:stream/myStream' }],
             },
@@ -1610,7 +1610,7 @@ describe('AwsCompileStreamEvents #2', () => {
         command: 'package',
       });
       naming = awsNaming;
-      const streamLogicalId = awsNaming.getStreamLogicalId('foo', 'kinesis', 'myStream');
+      const streamLogicalId = awsNaming.getStreamLogicalId('basic', 'kinesis', 'myStream');
       eventSourceMappingResource = cfTemplate.Resources[streamLogicalId];
     });
 
@@ -1620,7 +1620,7 @@ describe('AwsCompileStreamEvents #2', () => {
           ':',
           [
             {
-              'Fn::GetAtt': ['FooLambdaFunction', 'Arn'],
+              'Fn::GetAtt': ['BasicLambdaFunction', 'Arn'],
             },
             'provisioned',
           ],
@@ -1629,7 +1629,7 @@ describe('AwsCompileStreamEvents #2', () => {
     });
 
     it('should depend on provisioned alias', () => {
-      const aliasLogicalId = naming.getLambdaProvisionedConcurrencyAliasLogicalId('foo');
+      const aliasLogicalId = naming.getLambdaProvisionedConcurrencyAliasLogicalId('basic');
       expect(eventSourceMappingResource.DependsOn).to.include(aliasLogicalId);
     });
   });
@@ -1641,7 +1641,7 @@ describe('AwsCompileStreamEvents #2', () => {
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               events: [
                 {
                   stream: {
@@ -1655,7 +1655,7 @@ describe('AwsCompileStreamEvents #2', () => {
         },
         command: 'package',
       });
-      const streamLogicalId = awsNaming.getStreamLogicalId('foo', 'kinesis', 'myStream');
+      const streamLogicalId = awsNaming.getStreamLogicalId('basic', 'kinesis', 'myStream');
       eventSourceMappingResource = cfTemplate.Resources[streamLogicalId];
     });
 
@@ -1675,7 +1675,7 @@ describe('AwsCompileStreamEvents #2', () => {
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               events: [
                 {
                   stream: {
@@ -1700,10 +1700,10 @@ describe('AwsCompileStreamEvents #2', () => {
         },
         command: 'package',
       });
-      const kinesisLogicalId = awsNaming.getStreamLogicalId('foo', 'kinesis', 'myKinesisStream');
-      const dynamoLogicalId = awsNaming.getStreamLogicalId('foo', 'dynamodb', 'myDDBstream');
+      const kinesisLogicalId = awsNaming.getStreamLogicalId('basic', 'kinesis', 'myKinesisStream');
+      const dynamoLogicalId = awsNaming.getStreamLogicalId('basic', 'dynamodb', 'myDDBstream');
       const noTumblingLogicalId = awsNaming.getStreamLogicalId(
-        'foo',
+        'basic',
         'dynamodb',
         'noTumblingStream'
       );
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index 3c289f73d47..1d268eacb10 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -198,7 +198,7 @@ describe('AwsCompileFunctions', () => {
         command: 'package',
       });
 
-      expect(cfTemplate.Resources.FooLambdaFunction.Properties.Role).to.eql({
+      expect(cfTemplate.Resources.BasicLambdaFunction.Properties.Role).to.eql({
         'Fn::GetAtt': ['role-b', 'Arn'],
       });
     });
@@ -1649,7 +1649,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
 
       const providerConfig = fixtureData.serviceConfig.provider;
 
-      const { VpcConfig } = cfTemplate.Resources[awsNaming.getLambdaLogicalId('foo')].Properties;
+      const { VpcConfig } = cfTemplate.Resources[awsNaming.getLambdaLogicalId('basic')].Properties;
 
       expect(VpcConfig.SecurityGroupIds).to.deep.equal(providerConfig.vpc.securityGroupIds);
       expect(VpcConfig.SubnetIds).to.deep.equal(providerConfig.vpc.subnetIds);
@@ -1657,7 +1657,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
 
     describe('when custom IAM role is used', () => {
       let customRoleServiceConfig;
-      let fooFunctionRole;
+      let basicFunctionRole;
       let otherFunctionRole;
 
       before(async () => {
@@ -1671,13 +1671,14 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
               },
             },
             functions: {
-              foo: {
+              basic: {
                 role: 'arn:aws:iam::123456789012:role/fromFunction',
               },
             },
           },
         });
-        fooFunctionRole = cfTemplate.Resources[awsNaming.getLambdaLogicalId('foo')].Properties.Role;
+        basicFunctionRole =
+          cfTemplate.Resources[awsNaming.getLambdaLogicalId('basic')].Properties.Role;
         otherFunctionRole =
           cfTemplate.Resources[awsNaming.getLambdaLogicalId('other')].Properties.Role;
         customRoleServiceConfig = fixtureData.serviceConfig;
@@ -1690,9 +1691,9 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       });
 
       it('should prefer `functions[].role` over `provider.iam.role`', () => {
-        const fooFunctionConfig = customRoleServiceConfig.functions.foo;
+        const basicFunctionConfig = customRoleServiceConfig.functions.basic;
 
-        expect(fooFunctionRole).to.equal(fooFunctionConfig.role);
+        expect(basicFunctionRole).to.equal(basicFunctionConfig.role);
       });
 
       it('should support `provider.iam.role` defined as CF function', async () => {
@@ -1711,7 +1712,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
         });
 
         const functionRole =
-          cfTemplate.Resources[awsNaming.getLambdaLogicalId('foo')].Properties.Role;
+          cfTemplate.Resources[awsNaming.getLambdaLogicalId('basic')].Properties.Role;
         expect(functionRole).to.deep.equal(fixtureData.serviceConfig.provider.iam.role);
       });
     });
@@ -1731,8 +1732,8 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
         command: 'package',
       });
 
-      const funcResource = cfTemplate.Resources[awsNaming.getLambdaLogicalId('foo')];
-      expect(funcResource.DependsOn).to.deep.equal(['FooLogGroup', 'LogicalNameRole']);
+      const funcResource = cfTemplate.Resources[awsNaming.getLambdaLogicalId('basic')];
+      expect(funcResource.DependsOn).to.deep.equal(['BasicLogGroup', 'LogicalNameRole']);
       expect(funcResource.Properties.Role).to.deep.equal({
         'Fn::GetAtt': [fixtureData.serviceConfig.provider.iam.role, 'Arn'],
       });
@@ -1753,8 +1754,8 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
         command: 'package',
       });
 
-      const funcResource = cfTemplate.Resources[awsNaming.getLambdaLogicalId('foo')];
-      expect(funcResource.DependsOn).to.deep.equal(['FooLogGroup', 'LogicalNameRole']);
+      const funcResource = cfTemplate.Resources[awsNaming.getLambdaLogicalId('basic')];
+      expect(funcResource.DependsOn).to.deep.equal(['BasicLogGroup', 'LogicalNameRole']);
       expect(funcResource.Properties.Role).to.deep.equal(
         fixtureData.serviceConfig.provider.iam.role
       );
@@ -1776,7 +1777,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
         command: 'package',
       });
 
-      const functionCfLogicalId = awsNaming.getLambdaLogicalId('foo');
+      const functionCfLogicalId = awsNaming.getLambdaLogicalId('basic');
 
       const originalVersionCfConfig = Object.values(originalTemplate.Resources).find(
         (resource) =>
@@ -2234,7 +2235,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               fileSystemConfig: {
                 localMountPath: '/mnt/path',
                 arn: 'arn:aws:elasticfilesystem:us-east-1:111111111111:access-point/fsap-a1a1a1a1a1a1a1a1a',
@@ -2269,13 +2270,14 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
           cwd: serviceDir,
           command: 'package',
         });
-        const originalVersionArn = originalTemplate.Outputs.FooLambdaFunctionQualifiedArn.Value.Ref;
+        const originalVersionArn =
+          originalTemplate.Outputs.BasicLambdaFunctionQualifiedArn.Value.Ref;
 
         await updateConfig({
           functions: {
-            foo: {
+            basic: {
               tags: {
-                foo: 'bar',
+                basic: 'bar',
               },
               reservedConcurrency: 1,
             },
@@ -2285,10 +2287,10 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
           cwd: serviceDir,
           command: 'package',
         });
-        const updatedVersionArn = updatedTemplate.Outputs.FooLambdaFunctionQualifiedArn.Value.Ref;
+        const updatedVersionArn = updatedTemplate.Outputs.BasicLambdaFunctionQualifiedArn.Value.Ref;
 
         expect(
-          updatedTemplate.Resources.FooLambdaFunction.Properties.ReservedConcurrentExecutions
+          updatedTemplate.Resources.BasicLambdaFunction.Properties.ReservedConcurrentExecutions
         ).to.equal(1);
 
         expect(originalVersionArn).to.equal(updatedVersionArn);
@@ -2496,7 +2498,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
         command: 'deploy',
         configExt: {
           package: { artifact: 'some s3 url' },
-          functions: { foo: { package: { individually: true, artifact: 'other s3 url' } } },
+          functions: { basic: { package: { individually: true, artifact: 'other s3 url' } } },
         },
       });
     });
diff --git a/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js b/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
index 808c9f83dfb..c13a96260a2 100644
--- a/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
@@ -59,7 +59,7 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
         command: 'package',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               role: 'some:aws:arn:xx1:*:*',
             },
             other: {
@@ -422,11 +422,11 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
       });
 
       it('should support `provider.logRetentionInDays`', () => {
-        const normalizedName = naming.getLogGroupLogicalId('foo');
+        const normalizedName = naming.getLogGroupLogicalId('basic');
         const iamResource = cfResources[normalizedName];
         expect(iamResource.Type).to.be.equal('AWS::Logs::LogGroup');
         expect(iamResource.Properties.RetentionInDays).to.be.equal(5);
-        expect(iamResource.Properties.LogGroupName).to.be.equal(`/aws/lambda/${service}-dev-foo`);
+        expect(iamResource.Properties.LogGroupName).to.be.equal(`/aws/lambda/${service}-dev-basic`);
       });
 
       it('should support `provider.iam.role.tags`', () => {

From cbe7573e022a4ab2e80f230318e9be6ef1473532 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 4 Oct 2021 14:20:38 +0200
Subject: [PATCH 0564/1101] test(AWS Lambda): Unify lambda destination tests
 into general tests

---
 .../target.js                                 |  0
 .../trigger.js                                |  0
 .../functionDestinations/serverless.yml       | 17 ------
 ...nDestinations.test.js => function.test.js} | 16 +++++-
 .../aws/package/compile/functions.test.js     | 57 +++++++++----------
 5 files changed, 42 insertions(+), 48 deletions(-)
 rename test/fixtures/programmatic/{functionDestinations => function}/target.js (100%)
 rename test/fixtures/programmatic/{functionDestinations => function}/trigger.js (100%)
 delete mode 100644 test/fixtures/programmatic/functionDestinations/serverless.yml
 rename test/integration/aws/{functionDestinations.test.js => function.test.js} (75%)

diff --git a/test/fixtures/programmatic/functionDestinations/target.js b/test/fixtures/programmatic/function/target.js
similarity index 100%
rename from test/fixtures/programmatic/functionDestinations/target.js
rename to test/fixtures/programmatic/function/target.js
diff --git a/test/fixtures/programmatic/functionDestinations/trigger.js b/test/fixtures/programmatic/function/trigger.js
similarity index 100%
rename from test/fixtures/programmatic/functionDestinations/trigger.js
rename to test/fixtures/programmatic/function/trigger.js
diff --git a/test/fixtures/programmatic/functionDestinations/serverless.yml b/test/fixtures/programmatic/functionDestinations/serverless.yml
deleted file mode 100644
index 9c08b34dfe9..00000000000
--- a/test/fixtures/programmatic/functionDestinations/serverless.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-service: service
-
-configValidationMode: error
-frameworkVersion: '*'
-
-provider:
-  name: aws
-  runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
-
-functions:
-  target:
-    handler: target.handler
-  trigger:
-    handler: trigger.handler
-    destinations:
-      onSuccess: target
diff --git a/test/integration/aws/functionDestinations.test.js b/test/integration/aws/function.test.js
similarity index 75%
rename from test/integration/aws/functionDestinations.test.js
rename to test/integration/aws/function.test.js
index 81f320cb429..cd1670d8c66 100644
--- a/test/integration/aws/functionDestinations.test.js
+++ b/test/integration/aws/function.test.js
@@ -7,14 +7,26 @@ const { confirmCloudWatchLogs } = require('../../utils/misc');
 
 const { deployService, removeService } = require('../../utils/integration');
 
-describe('Function destinations Integration Test', function () {
+describe('test/integration/aws/function.test.js', function () {
   this.timeout(1000 * 60 * 20); // Involves time-taking deploys
   let stackName;
   let serviceDir;
   const stage = 'dev';
 
   before(async () => {
-    const serviceData = await fixtures.setup('functionDestinations');
+    const serviceData = await fixtures.setup('function', {
+      configExt: {
+        functions: {
+          target: {
+            handler: 'target.handler',
+          },
+          trigger: {
+            handler: 'trigger.handler',
+            destinations: { onSuccess: 'target' },
+          },
+        },
+      },
+    });
     ({ servicePath: serviceDir } = serviceData);
     const serviceName = serviceData.serviceConfig.service;
     stackName = `${serviceName}-${stage}`;
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index 1d268eacb10..a804082080f 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -1820,10 +1820,17 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
         serverless: serverlessInstance,
         fixtureData,
       } = await runServerless({
-        fixture: 'functionDestinations',
+        fixture: 'function',
         command: 'package',
         configExt: {
           functions: {
+            target: {
+              handler: 'target.handler',
+            },
+            trigger: {
+              handler: 'trigger.handler',
+              destinations: { onSuccess: 'target' },
+            },
             fnTargetFailure: {
               handler: 'target.handler',
             },
@@ -1860,6 +1867,25 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
                 command: ['anotherexecutable'],
               },
             },
+            fnExternalLayer: {
+              handler: 'target.handler',
+              layers: [{ Ref: 'ExternalLambdaLayer' }],
+            },
+          },
+          resources: {
+            Resources: {
+              ExternalLambdaLayer: {
+                Type: 'AWS::Lambda::LayerVersion',
+                Properties: {
+                  CompatibleRuntimes: ['nodejs12.x'],
+                  Content: {
+                    S3Bucket: 'bucket',
+                    S3Key: 'key',
+                  },
+                  LayerName: 'externalLayer',
+                },
+              },
+            },
           },
         },
       });
@@ -2044,35 +2070,8 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
     });
 
     it('should support `Ref` references to external layers (not defined as a part of `layers` top-level property in configuration)', async () => {
-      const { cfTemplate, awsNaming } = await runServerless({
-        fixture: 'functionDestinations',
-        command: 'package',
-        configExt: {
-          functions: {
-            fnExternalLayer: {
-              handler: 'target.handler',
-              layers: [{ Ref: 'ExternalLambdaLayer' }],
-            },
-          },
-          resources: {
-            Resources: {
-              ExternalLambdaLayer: {
-                Type: 'AWS::Lambda::LayerVersion',
-                Properties: {
-                  CompatibleRuntimes: ['nodejs12.x'],
-                  Content: {
-                    S3Bucket: 'bucket',
-                    S3Key: 'key',
-                  },
-                  LayerName: 'externalLayer',
-                },
-              },
-            },
-          },
-        },
-      });
       expect(
-        cfTemplate.Resources[awsNaming.getLambdaLogicalId('fnExternalLayer')].Properties.Layers
+        cfResources[naming.getLambdaLogicalId('fnExternalLayer')].Properties.Layers
       ).to.deep.equal([{ Ref: 'ExternalLambdaLayer' }]);
     });
 

From 02f4e0148ce5cfe753e0f7f3a58df06ae4f99bfe Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 4 Oct 2021 14:42:19 +0200
Subject: [PATCH 0565/1101] test(AWS Lambda): Refactor to async/await

---
 test/integration/aws/function.test.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/integration/aws/function.test.js b/test/integration/aws/function.test.js
index cd1670d8c66..0f815a28457 100644
--- a/test/integration/aws/function.test.js
+++ b/test/integration/aws/function.test.js
@@ -38,8 +38,8 @@ describe('test/integration/aws/function.test.js', function () {
     await removeService(serviceDir);
   });
 
-  it('on async invoke should invoke destination target', async () =>
-    confirmCloudWatchLogs(
+  it('on async invoke should invoke destination target', async () => {
+    const events = await confirmCloudWatchLogs(
       `/aws/lambda/${stackName}-target`,
       async () => {
         await awsRequest('Lambda', 'invoke', {
@@ -47,8 +47,8 @@ describe('test/integration/aws/function.test.js', function () {
           InvocationType: 'Event',
         });
       },
-      { checkIsComplete: (events) => events.length }
-    ).then((events) => {
-      expect(events.length > 0).to.equal(true);
-    }));
+      { checkIsComplete: (soFarEvents) => soFarEvents.length }
+    );
+    expect(events.length > 0).to.equal(true);
+  });
 });

From 42f1c5f47b5b7f880e0fac8164191852f2763ccd Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 4 Oct 2021 14:42:52 +0200
Subject: [PATCH 0566/1101] test(AWS Lambda): Improve test title

---
 test/integration/aws/function.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/aws/function.test.js b/test/integration/aws/function.test.js
index 0f815a28457..bbe94e71164 100644
--- a/test/integration/aws/function.test.js
+++ b/test/integration/aws/function.test.js
@@ -38,7 +38,7 @@ describe('test/integration/aws/function.test.js', function () {
     await removeService(serviceDir);
   });
 
-  it('on async invoke should invoke destination target', async () => {
+  it('should invoke destination target on async invocation', async () => {
     const events = await confirmCloudWatchLogs(
       `/aws/lambda/${stackName}-target`,
       async () => {

From abc1de0df2d76dfc3998a8282929523ba7ee9a60 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 4 Oct 2021 15:37:48 +0200
Subject: [PATCH 0567/1101] test: Fix test title

---
 test/integration/aws/iotFleetProvisioning.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/aws/iotFleetProvisioning.test.js b/test/integration/aws/iotFleetProvisioning.test.js
index abd3dc229fb..3b572e5765c 100644
--- a/test/integration/aws/iotFleetProvisioning.test.js
+++ b/test/integration/aws/iotFleetProvisioning.test.js
@@ -6,7 +6,7 @@ const fixtures = require('../../fixtures/programmatic');
 const { deployService, removeService } = require('../../utils/integration');
 const { resolveIotEndpoint } = require('../../utils/iot');
 
-describe('test/integration/iotFleetProvisioning.test.js', function () {
+describe('test/integration/aws/iotFleetProvisioning.test.js', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
   const thingName = 'IotDevice';
   const stage = 'dev';

From e577157a6df442c14f0310062cae09661d01c156 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 4 Oct 2021 15:40:28 +0200
Subject: [PATCH 0568/1101] test(AWS IOT): Increase test timeout

---
 test/fixtures/programmatic/iotFleetProvisioning/serverless.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/fixtures/programmatic/iotFleetProvisioning/serverless.yml b/test/fixtures/programmatic/iotFleetProvisioning/serverless.yml
index eada68f71cd..13579392b0a 100644
--- a/test/fixtures/programmatic/iotFleetProvisioning/serverless.yml
+++ b/test/fixtures/programmatic/iotFleetProvisioning/serverless.yml
@@ -11,6 +11,7 @@ provider:
 functions:
   registerDevice:
     handler: registerDevice.main
+    timeout: 30
     environment:
       TEMPLATE_NAME:
         Ref: IotFleetProvisioningBasicIotProvisioningTemplate

From 01c4ae33b4a41af41b3c142ad561567e8aa4763d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 4 Oct 2021 15:50:57 +0200
Subject: [PATCH 0569/1101] test(AWS IOT): Improve error handling

---
 .../aws/iotFleetProvisioning.test.js          | 73 ++++++++++---------
 1 file changed, 39 insertions(+), 34 deletions(-)

diff --git a/test/integration/aws/iotFleetProvisioning.test.js b/test/integration/aws/iotFleetProvisioning.test.js
index 3b572e5765c..93b492e53c3 100644
--- a/test/integration/aws/iotFleetProvisioning.test.js
+++ b/test/integration/aws/iotFleetProvisioning.test.js
@@ -38,44 +38,45 @@ describe('test/integration/aws/iotFleetProvisioning.test.js', function () {
 
   after(async () => {
     if (!isDeployed) return;
-    const [
-      {
-        certificateDescription: { certificateArn },
-      },
-      policyName,
-    ] = await Promise.all([
-      awsRequest('Iot', 'describeCertificate', {
-        certificateId,
-      }),
-      resolveIoTPolicyName(),
-    ]);
-    await Promise.all([
-      awsRequest('Iot', 'detachThingPrincipal', {
-        thingName,
-        principal: certificateArn,
-      }),
-      awsRequest('Iot', 'detachPolicy', {
+    if (certificateId) {
+      const [
+        {
+          certificateDescription: { certificateArn },
+        },
         policyName,
-        target: certificateArn,
-      }),
-      awsRequest('Iot', 'updateCertificate', {
-        certificateId,
-        newStatus: 'INACTIVE',
-      }),
-    ]);
-    await Promise.all([
-      awsRequest('Iot', 'deleteThing', {
-        thingName,
-      }),
-      awsRequest('Iot', 'deleteCertificate', {
-        certificateId,
-      }),
-    ]);
+      ] = await Promise.all([
+        awsRequest('Iot', 'describeCertificate', {
+          certificateId,
+        }),
+        resolveIoTPolicyName(),
+      ]);
+      await Promise.all([
+        awsRequest('Iot', 'detachThingPrincipal', {
+          thingName,
+          principal: certificateArn,
+        }),
+        awsRequest('Iot', 'detachPolicy', {
+          policyName,
+          target: certificateArn,
+        }),
+        awsRequest('Iot', 'updateCertificate', {
+          certificateId,
+          newStatus: 'INACTIVE',
+        }),
+      ]);
+      await Promise.all([
+        awsRequest('Iot', 'deleteThing', {
+          thingName,
+        }),
+        awsRequest('Iot', 'deleteCertificate', {
+          certificateId,
+        }),
+      ]);
+    }
     await removeService(serviceDir);
   });
 
   it('setup a new IoT Thing with the provisioning template', async () => {
-    let provisionnedThingName;
     const [{ certificatePem, keyPair }, iotEndpoint] = await Promise.all([
       awsRequest('Iot', 'createProvisioningClaim', {
         templateName: await resolveTemplateName(),
@@ -92,7 +93,11 @@ describe('test/integration/aws/iotFleetProvisioning.test.js', function () {
         privateKey: keyPair.PrivateKey,
       }),
     });
-    ({ thingName: provisionnedThingName, certificateId } = JSON.parse(Payload));
+
+    const payload = JSON.parse(Payload);
+    ({ certificateId } = payload);
+    const { thingName: provisionnedThingName, errorMessage } = payload;
+    if (errorMessage) throw new Error(`Invocation errored with: ${errorMessage}`);
 
     expect(provisionnedThingName).to.equal(thingName);
   });

From fe655d4f15ca789a1e3a46ce49dc7d23ca806c00 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 4 Oct 2021 17:00:43 +0200
Subject: [PATCH 0570/1101] feat(AWS Lambda): Support 64-bit ARM architecture

---
 docs/providers/aws/guide/functions.md         | 21 +++++++
 docs/providers/aws/guide/layers.md            |  3 +
 docs/providers/aws/guide/serverless.yml.md    |  5 ++
 lib/plugins/aws/package/compile/functions.js  |  4 ++
 lib/plugins/aws/package/compile/layers.js     |  3 +
 lib/plugins/aws/provider.js                   |  8 +++
 test/integration/aws/function.test.js         | 18 ++++++
 .../aws/package/compile/functions.test.js     | 55 +++++++++++++++++++
 .../aws/package/compile/layers.test.js        |  8 +++
 9 files changed, 125 insertions(+)

diff --git a/docs/providers/aws/guide/functions.md b/docs/providers/aws/guide/functions.md
index 554c1f6682e..d7c4fc3dd8f 100644
--- a/docs/providers/aws/guide/functions.md
+++ b/docs/providers/aws/guide/functions.md
@@ -284,6 +284,27 @@ functions:
 
 During the first deployment when locally built images are used, Framework will automatically create a dedicated ECR repository to store these images, with name `serverless-<service>-<stage>`. Currently, the Framework will not remove older versions of images uploaded to ECR as they still might be in use by versioned functions. During `sls remove`, the created ECR repository will be removed. During deployment, Framework will attempt to `docker login` to ECR if needed. Depending on your local configuration, docker authorization token might be stored unencrypted. Please refer to documentation for more details: https://docs.docker.com/engine/reference/commandline/login/#credentials-store
 
+## Instruction set architecture
+
+By default, Lambda functions are run by 64-bit x86 architecture CPUs. However, [using arm64 architecture](https://docs.aws.amazon.com/lambda/latest/dg/foundation-arch.html) (AWS Graviton2 processor) may result in better pricing and performance.
+
+To switch all functions to AWS Graviton2 processor, configure `architecture` at `provider` level as follows:
+
+```yml
+provider:
+  ...
+  architecture: arm64
+```
+
+To toggle instruction set architecture per function individually, set it directly at `functions[]` context:
+
+```yaml
+functions:
+  hello:
+    ...
+    architecture: arm64
+```
+
 ## VPC Configuration
 
 You can add VPC configuration to a specific function in `serverless.yml` by adding a `vpc` object property in the function configuration. This object should contain the `securityGroupIds` and `subnetIds` array properties needed to construct VPC for this function. Here's an example configuration:
diff --git a/docs/providers/aws/guide/layers.md b/docs/providers/aws/guide/layers.md
index 9ad2c3fb58d..7bd10e6d4ee 100644
--- a/docs/providers/aws/guide/layers.md
+++ b/docs/providers/aws/guide/layers.md
@@ -35,6 +35,9 @@ layers:
     description: Description of what the lambda layer does # optional, Description to publish to AWS
     compatibleRuntimes: # optional, a list of runtimes this layer is compatible with
       - python3.8
+    compatibleArchitectures: # optional, a list of architectures this layer is compatible with
+      - x86_64
+      - arm64
     licenseInfo: GPLv3 # optional, a string specifying license information
     # allowedAccounts: # optional, a list of AWS account IDs allowed to access this layer.
     #   - '*'
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 09c50347543..a8f1018dc19 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -101,6 +101,7 @@ provider:
             QueryStrings:
               - not-cached-query-string
   versionFunctions: false # Optional function versioning
+  architecture: x86_64 # Default instruction set architecture for Lambda functions (for ARM, AWS Graviton2 processor based, set it to 'arm64')
   environment: # Service wide environment variables
     serviceEnvVar: 123456789
   endpointType: regional # Optional endpoint configuration for API Gateway REST API. Default is Edge.
@@ -308,6 +309,7 @@ functions:
   usersCreate: # A Function
     handler: users.create # The file and module for this specific function. Cannot be used when `image` is defined.
     image: baseimage # Image to be used by function, cannot be used when `handler` is defined. It can be configured as concrete uri of Docker image in ECR or as a reference to image defined in `provider.ecr.images`
+    architecture: x86_64 # Instruction set architecture of a Lambda function (for ARM, AWS Graviton2 processor based, set it to 'arm64')
     name: ${sls:stage}-lambdaName # optional, Deployed Lambda name
     description: My function # The description of your function.
     memorySize: 512 # memorySize for this specific function.
@@ -597,6 +599,9 @@ layers:
     description: Description of what the lambda layer does # optional, Description to publish to AWS
     compatibleRuntimes: # optional, a list of runtimes this layer is compatible with
       - python3.8
+    compatibleArchitectures: # optional, a list of architectures this layer is compatible with
+      - x86_64
+      - arm64
     licenseInfo: GPLv3 # optional, a string specifying license information
     allowedAccounts: # optional, a list of AWS account IDs allowed to access this layer.
       - '*'
diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index 960ba46d085..c84c796534d 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -245,6 +245,10 @@ class AwsCompileFunctions {
     functionResource.Properties.MemorySize = functionObject.memory;
     functionResource.Properties.Timeout = functionObject.timeout;
 
+    const functionArchitecture =
+      functionObject.architecture || this.serverless.service.provider.architecture;
+    if (functionArchitecture) functionResource.Properties.Architectures = [functionArchitecture];
+
     if (functionObject.description) {
       functionResource.Properties.Description = functionObject.description;
     }
diff --git a/lib/plugins/aws/package/compile/layers.js b/lib/plugins/aws/package/compile/layers.js
index 10a3d4d0416..766c3adf940 100644
--- a/lib/plugins/aws/package/compile/layers.js
+++ b/lib/plugins/aws/package/compile/layers.js
@@ -48,6 +48,9 @@ class AwsCompileLayers {
     if (layerObject.compatibleRuntimes) {
       newLayer.Properties.CompatibleRuntimes = layerObject.compatibleRuntimes;
     }
+    if (layerObject.compatibleArchitectures) {
+      newLayer.Properties.CompatibleArchitectures = layerObject.compatibleArchitectures;
+    }
 
     let layerLogicalId = this.provider.naming.getLambdaLayerLogicalId(layerName);
     const layerArtifactPath = getLambdaLayerArtifactPath(
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 7546fe5485b..dff500afaa8 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -496,6 +496,7 @@ class AwsProvider {
               ],
             },
           },
+          awsLambdaArchitecture: { enum: ['arm64', 'x86_64'] },
           awsLambdaEnvironment: {
             type: 'object',
             patternProperties: {
@@ -737,6 +738,7 @@ class AwsProvider {
             },
             apiKeys: { $ref: '#/definitions/awsApiGatewayApiKeys' },
             apiName: { type: 'string' },
+            architecture: { $ref: '#/definitions/awsLambdaArchitecture' },
             cfnRole: { $ref: '#/definitions/awsArn' },
             cloudFront: {
               type: 'object',
@@ -1162,6 +1164,7 @@ class AwsProvider {
         },
         function: {
           properties: {
+            architecture: { $ref: '#/definitions/awsLambdaArchitecture' },
             awsKmsKeyArn: { $ref: '#/definitions/awsKmsArn' },
             condition: { $ref: '#/definitions/awsResourceCondition' },
             dependsOn: { $ref: '#/definitions/awsResourceDependsOn' },
@@ -1285,6 +1288,11 @@ class AwsProvider {
                   pattern: '^(\\d{12}|\\*|arn:(aws[a-zA-Z-]*):iam::\\d{12}:root)$',
                 },
               },
+              compatibleArchitectures: {
+                type: 'array',
+                items: { $ref: '#/definitions/awsLambdaArchitecture' },
+                maxItems: 2,
+              },
               compatibleRuntimes: {
                 type: 'array',
                 items: { $ref: '#/definitions/awsLambdaRuntime' },
diff --git a/test/integration/aws/function.test.js b/test/integration/aws/function.test.js
index bbe94e71164..f3c10989789 100644
--- a/test/integration/aws/function.test.js
+++ b/test/integration/aws/function.test.js
@@ -17,6 +17,10 @@ describe('test/integration/aws/function.test.js', function () {
     const serviceData = await fixtures.setup('function', {
       configExt: {
         functions: {
+          arch: {
+            handler: 'basic.handler',
+            architecture: 'arm64',
+          },
           target: {
             handler: 'target.handler',
           },
@@ -51,4 +55,18 @@ describe('test/integration/aws/function.test.js', function () {
     );
     expect(events.length > 0).to.equal(true);
   });
+
+  it('should run lambda in `arm64` architecture', async () => {
+    const events = await confirmCloudWatchLogs(
+      `/aws/lambda/${stackName}-arch`,
+      async () => {
+        await awsRequest('Lambda', 'invoke', {
+          FunctionName: `${stackName}-arch`,
+          InvocationType: 'Event',
+        });
+      },
+      { checkIsComplete: (soFarEvents) => soFarEvents.length }
+    );
+    expect(events.length > 0).to.equal(true);
+  });
 });
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index a804082080f..dc5ee8dbafd 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -1356,6 +1356,8 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
     let iamRolePolicyStatements;
 
     before(async () => {
+      const imageSha = '6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38';
+      const imageWithSha = `000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:${imageSha}`;
       const { awsNaming, cfTemplate, fixtureData } = await runServerless({
         fixture: 'packageArtifact',
         command: 'package',
@@ -1393,6 +1395,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
             versionFunctions: false,
           },
           functions: {
+            fnImage: { image: imageWithSha },
             foo: {
               vpc: {
                 subnetIds: ['subnet-02020202'],
@@ -1629,6 +1632,35 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       });
     });
 
+    it('should support `provider.architecture`', async () => {
+      const imageSha = '6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38';
+      const imageWithSha = `000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:${imageSha}`;
+      const {
+        awsNaming: localNaming,
+        cfTemplate: { Resources: localResources },
+      } = await runServerless({
+        fixture: 'function',
+        command: 'package',
+        configExt: {
+          functions: { fnImage: { image: imageWithSha } },
+          provider: { architecture: 'arm64' },
+        },
+      });
+
+      expect(
+        localResources[localNaming.getLambdaLogicalId('basic')].Properties.Architectures
+      ).to.deep.equal(['arm64']);
+      expect(
+        localResources[localNaming.getLambdaLogicalId('fnImage')].Properties.Architectures
+      ).to.deep.equal(['arm64']);
+      expect(cfResources[naming.getLambdaLogicalId('fnImage')].Properties).to.not.have.property(
+        'Architectures'
+      );
+      expect(cfResources[naming.getLambdaLogicalId('foo')].Properties).to.not.have.property(
+        'Architectures'
+      );
+    });
+
     it('should support `vpc` defined with `Fn::Split`', async () => {
       const { awsNaming, cfTemplate, fixtureData } = await runServerless({
         fixture: 'function',
@@ -1831,6 +1863,10 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
               handler: 'trigger.handler',
               destinations: { onSuccess: 'target' },
             },
+            fnArch: {
+              handler: 'target.handler',
+              architecture: 'arm64',
+            },
             fnTargetFailure: {
               handler: 'target.handler',
             },
@@ -1859,6 +1895,10 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
             fnImage: {
               image: imageWithSha,
             },
+            fnImageArch: {
+              image: imageWithSha,
+              architecture: 'arm64',
+            },
             fnImageWithConfig: {
               image: {
                 uri: imageWithSha,
@@ -2085,6 +2125,21 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L2381-L2397
     });
 
+    it('should support `functions[].architecture`', () => {
+      expect(
+        cfResources[naming.getLambdaLogicalId('fnArch')].Properties.Architectures
+      ).to.deep.equal(['arm64']);
+      expect(
+        cfResources[naming.getLambdaLogicalId('fnImageArch')].Properties.Architectures
+      ).to.deep.equal(['arm64']);
+      expect(cfResources[naming.getLambdaLogicalId('fnImage')].Properties).to.not.have.property(
+        'Architectures'
+      );
+      expect(cfResources[naming.getLambdaLogicalId('target')].Properties).to.not.have.property(
+        'Architectures'
+      );
+    });
+
     it('should support `functions[].destinations.onSuccess` referencing function in same stack', () => {
       const destinationConfig =
         cfResources[naming.getLambdaEventConfigLogicalId('trigger')].Properties.DestinationConfig;
diff --git a/test/unit/lib/plugins/aws/package/compile/layers.test.js b/test/unit/lib/plugins/aws/package/compile/layers.test.js
index 0c9091eeba6..909439ac355 100644
--- a/test/unit/lib/plugins/aws/package/compile/layers.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/layers.test.js
@@ -49,6 +49,7 @@ describe('lib/plugins/aws/package/compile/layers/index.test.js', () => {
             description: 'Layer two example',
             path: 'layer',
             compatibleRuntimes: ['nodejs12.x'],
+            compatibleArchitectures: ['arm64'],
             licenseInfo: 'GPL',
             allowedAccounts: ['123456789012', '123456789013'],
           },
@@ -188,6 +189,13 @@ describe('lib/plugins/aws/package/compile/layers/index.test.js', () => {
     expect(layerOne.Properties.CompatibleRuntimes).to.deep.equals(['nodejs12.x']);
   });
 
+  it('should support `layers[].compatibleArchitectures`', () => {
+    const layerResourceName = naming.getLambdaLayerLogicalId('LayerTwo');
+    const layerOne = cfResources[layerResourceName];
+
+    expect(layerOne.Properties.CompatibleArchitectures).to.deep.equals(['arm64']);
+  });
+
   it('should support `layers[].licenseInfo`', () => {
     const layerResourceName = naming.getLambdaLayerLogicalId('LayerTwo');
     const layerOne = cfResources[layerResourceName];

From ee47213242f0a2faf59c0ce33b64e9add111e6b7 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 4 Oct 2021 17:32:25 +0200
Subject: [PATCH 0571/1101] chore: Bump dependencies

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 00a72ff63db..3dd1abb09f8 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.998.0",
+    "aws-sdk": "^2.999.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.1.2",
     "cachedir": "^2.3.0",

From 3127ee63a3b5c799ca55caa9048787e2d8dac2c1 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 4 Oct 2021 17:36:14 +0200
Subject: [PATCH 0572/1101] chore: Release v2.61.0

---
 CHANGELOG.md | 19 +++++++++++++++++++
 package.json |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb920af9511..8cf428ba88f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,25 @@
 
 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.
 
+## [2.61.0](https://github.com/serverless/serverless/compare/v2.60.3...v2.61.0) (2021-10-04)
+
+### Features
+
+- **AWS Lambda:** Support 64-bit ARM architecture ([#10049](https://github.com/serverless/serverless/pull/10049)) ([fe655d4](https://github.com/serverless/serverless/commit/fe655d4f15ca789a1e3a46ce49dc7d23ca806c00)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **AWS Credentials:** Fail when profile is already configured ([#10038](https://github.com/serverless/serverless/pull/10038)) ([f8ad7bc](https://github.com/serverless/serverless/commit/f8ad7bca6a26e39864d139fec4aadddd24b34a5b)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Maintenance Improvements
+
+- **CLI: New logs (experimental):**
+  - `config credentials` command ([#10038](https://github.com/serverless/serverless/pull/10038)) ([bcb2408](https://github.com/serverless/serverless/commit/bcb240893d89127cc1eada7255864b7bfeb88a61)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `config tabcompletion install` command ([#10038](https://github.com/serverless/serverless/pull/10038)) ([16a7739](https://github.com/serverless/serverless/commit/16a7739411141487fa33f8a72f88d82db712bfc9)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `config tabcompletion uninstall` command ([#10038](https://github.com/serverless/serverless/pull/10038)) ([02eebb4](https://github.com/serverless/serverless/commit/02eebb4643435341235340f5da8c7db903cb12e6)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `config` command ([#10038](https://github.com/serverless/serverless/pull/10038)) ([7926570](https://github.com/serverless/serverless/commit/7926570557e5c0a4dd661c069eecc1d4a0cf9b5d)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `slstats` command ([#10036](https://github.com/serverless/serverless/pull/10036)) ([0c9dae1](https://github.com/serverless/serverless/commit/0c9dae1210b9456ec96bc38a717a901beaa45a7b)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
 ### [2.60.3](https://github.com/serverless/serverless/compare/v2.60.2...v2.60.3) (2021-10-01)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 3dd1abb09f8..60e08f219cf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.60.3",
+  "version": "2.61.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 5c5eec9e5ecf26e0d5e9e0347e4b32198d3cfe60 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 4 Oct 2021 17:37:39 +0200
Subject: [PATCH 0573/1101] test(AWS IOT): Temporarily skip IOT integration
 test

---
 test/integration/aws/iotFleetProvisioning.test.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/integration/aws/iotFleetProvisioning.test.js b/test/integration/aws/iotFleetProvisioning.test.js
index 93b492e53c3..ac126ba67e3 100644
--- a/test/integration/aws/iotFleetProvisioning.test.js
+++ b/test/integration/aws/iotFleetProvisioning.test.js
@@ -6,7 +6,8 @@ const fixtures = require('../../fixtures/programmatic');
 const { deployService, removeService } = require('../../utils/integration');
 const { resolveIotEndpoint } = require('../../utils/iot');
 
-describe('test/integration/aws/iotFleetProvisioning.test.js', function () {
+// Temporary skip, until reason for its fails is clarified
+describe.skip('test/integration/aws/iotFleetProvisioning.test.js', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
   const thingName = 'IotDevice';
   const stage = 'dev';

From 2af95c03865b5b59bacba9e080348dddf11d0bb5 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 4 Oct 2021 14:02:07 +0200
Subject: [PATCH 0574/1101] refactor(CLI): Modern logs for `invoke` command

---
 lib/plugins/aws/invoke.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/plugins/aws/invoke.js b/lib/plugins/aws/invoke.js
index 1da7d65c5a6..0f5eebb0b3f 100644
--- a/lib/plugins/aws/invoke.js
+++ b/lib/plugins/aws/invoke.js
@@ -6,6 +6,7 @@ const validate = require('./lib/validate');
 const stdin = require('get-stdin');
 const formatLambdaLogEvent = require('./utils/formatLambdaLogEvent');
 const ServerlessError = require('../../serverless-error');
+const { legacy, writeText, style } = require('@serverless/utils/log');
 
 class AwsInvoke {
   constructor(serverless, options) {
@@ -106,25 +107,28 @@ class AwsInvoke {
     if (invocationReply.Payload) {
       const response = JSON.parse(invocationReply.Payload);
 
-      this.consoleLog(color(JSON.stringify(response, null, 4)));
+      legacy.consoleLog(color(JSON.stringify(response, null, 4)));
+      writeText(JSON.stringify(response, null, 4));
     }
 
     if (invocationReply.LogResult) {
-      this.consoleLog(
+      legacy.consoleLog(
         chalk.gray('--------------------------------------------------------------------')
       );
+      writeText(
+        style.aside('--------------------------------------------------------------------')
+      );
       const logResult = Buffer.from(invocationReply.LogResult, 'base64').toString();
-      logResult.split('\n').forEach((line) => this.consoleLog(formatLambdaLogEvent(line)));
+      logResult.split('\n').forEach((line) => {
+        legacy.consoleLog(formatLambdaLogEvent(line));
+        writeText(formatLambdaLogEvent(line, { isModern: true }));
+      });
     }
 
     if (invocationReply.FunctionError) {
       throw new ServerlessError('Invoked function failed', 'AWS_LAMBDA_INVOCATION_FAILED');
     }
   }
-
-  consoleLog(msg) {
-    process.stdout.write(`${msg}\n`);
-  }
 }
 
 module.exports = AwsInvoke;

From 3934cadce052b50d76c1dcd49da588cd9f079175 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 4 Oct 2021 17:09:51 +0200
Subject: [PATCH 0575/1101] refactor(CLI): Modern logs for `remove` command

---
 lib/plugins/aws/lib/monitorStack.js  |  2 +-
 lib/plugins/aws/remove/index.js      | 27 +++++++++++++++++++++++++++
 lib/plugins/aws/remove/lib/bucket.js |  5 +++--
 lib/plugins/aws/remove/lib/ecr.js    |  4 +++-
 lib/plugins/aws/remove/lib/stack.js  |  3 ++-
 5 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js
index 1a479862aad..bdf304ebf93 100644
--- a/lib/plugins/aws/lib/monitorStack.js
+++ b/lib/plugins/aws/lib/monitorStack.js
@@ -110,7 +110,7 @@ module.exports = {
                 const operationPhrase = (() => {
                   if (action === 'create') return 'Creating';
                   if (action === 'update') return 'Updating';
-                  if (action === 'delete') return 'Deleting';
+                  if (action === 'delete') return 'Removing';
                   return '';
                 })();
 
diff --git a/lib/plugins/aws/remove/index.js b/lib/plugins/aws/remove/index.js
index 3aee2304fcd..2a30d17858d 100644
--- a/lib/plugins/aws/remove/index.js
+++ b/lib/plugins/aws/remove/index.js
@@ -6,6 +6,9 @@ const emptyS3Bucket = require('./lib/bucket');
 const removeStack = require('./lib/stack');
 const removeEcrRepository = require('./lib/ecr');
 const checkIfEcrRepositoryExists = require('../lib/checkIfEcrRepositoryExists');
+const { log, style, progress } = require('@serverless/utils/log');
+
+const mainProgress = progress.get('main');
 
 class AwsRemove {
   constructor(serverless, options) {
@@ -24,16 +27,40 @@ class AwsRemove {
     );
 
     this.hooks = {
+      'initialize': async () => {
+        if (this.serverless.processedInput.commands.join(' ') === 'remove') {
+          log.notice(
+            `Removing ${this.serverless.service.service} from stage ${this.serverless
+              .getProvider('aws')
+              .getStage()} ${style.aside(`(${this.serverless.getProvider('aws').getRegion()})`)}`
+          );
+        }
+        log.info(); // Ensure gap between verbose logging
+      },
       'remove:remove': async () => {
         const doesEcrRepositoryExistPromise = this.checkIfEcrRepositoryExists();
         await this.validate();
+        mainProgress.notice('Removing objects from S3 bucket', { isMainEvent: true });
         await this.emptyS3Bucket();
+        mainProgress.notice('Removing CloudFormation stack', { isMainEvent: true });
         const cfData = await this.removeStack();
         await this.monitorStack('delete', cfData);
         if (await doesEcrRepositoryExistPromise) {
+          mainProgress.notice('Removing ECR repository', { isMainEvent: true });
           await this.removeEcrRepository();
         }
       },
+      'finalize': () => {
+        if (this.serverless.processedInput.commands.join(' ') !== 'remove') return;
+        log.notice();
+        log.notice.success(
+          `Service ${this.serverless.service.service} has been successfully removed ${style.aside(
+            `(${Math.floor(
+              (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+            )}s)`
+          )}`
+        );
+      },
     };
   }
 }
diff --git a/lib/plugins/aws/remove/lib/bucket.js b/lib/plugins/aws/remove/lib/bucket.js
index e755460f6ff..18bf952567f 100644
--- a/lib/plugins/aws/remove/lib/bucket.js
+++ b/lib/plugins/aws/remove/lib/bucket.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const BbPromise = require('bluebird');
+const { legacy } = require('@serverless/utils/log');
 
 module.exports = {
   async setServerlessDeploymentBucketName() {
@@ -12,7 +13,7 @@ module.exports = {
   async listObjects() {
     this.objectsInBucket = [];
 
-    this.serverless.cli.log('Getting all objects in S3 bucket...');
+    legacy.log('Getting all objects in S3 bucket...');
     const serviceStage = `${this.serverless.service.service}/${this.provider.getStage()}`;
 
     return this.provider
@@ -33,7 +34,7 @@ module.exports = {
   },
 
   async deleteObjects() {
-    this.serverless.cli.log('Removing objects in S3 bucket...');
+    legacy.log('Removing objects in S3 bucket...');
     if (this.objectsInBucket.length) {
       return this.provider.request('S3', 'deleteObjects', {
         Bucket: this.bucketName,
diff --git a/lib/plugins/aws/remove/lib/ecr.js b/lib/plugins/aws/remove/lib/ecr.js
index 03345132f63..a0fe71bbc97 100644
--- a/lib/plugins/aws/remove/lib/ecr.js
+++ b/lib/plugins/aws/remove/lib/ecr.js
@@ -1,8 +1,10 @@
 'use strict';
 
+const { legacy } = require('@serverless/utils/log');
+
 module.exports = {
   async removeEcrRepository() {
-    this.serverless.cli.log('Removing ECR repository...');
+    legacy.log('Removing ECR repository...');
     const registryId = await this.provider.getAccountId();
     const repositoryName = this.provider.naming.getEcrRepositoryName();
     const params = {
diff --git a/lib/plugins/aws/remove/lib/stack.js b/lib/plugins/aws/remove/lib/stack.js
index 32b69e1c8df..6722aeac264 100644
--- a/lib/plugins/aws/remove/lib/stack.js
+++ b/lib/plugins/aws/remove/lib/stack.js
@@ -1,10 +1,11 @@
 'use strict';
 
 const BbPromise = require('bluebird');
+const { legacy } = require('@serverless/utils/log');
 
 module.exports = {
   async remove() {
-    this.serverless.cli.log('Removing Stack...');
+    legacy.log('Removing Stack...');
     const stackName = this.provider.naming.getStackName();
     const params = {
       StackName: stackName,

From 592596c73bfe0a9b6ef6bdff5d898ae9ef5e2788 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 4 Oct 2021 16:30:27 +0200
Subject: [PATCH 0576/1101] refactor(CLI): Modern logs for `metrics` command

---
 lib/plugins/aws/metrics.js                |  15 +-
 test/unit/lib/plugins/aws/metrics.test.js | 194 ----------------------
 2 files changed, 14 insertions(+), 195 deletions(-)

diff --git a/lib/plugins/aws/metrics.js b/lib/plugins/aws/metrics.js
index cd68973ca3d..bf402b4b433 100644
--- a/lib/plugins/aws/metrics.js
+++ b/lib/plugins/aws/metrics.js
@@ -5,6 +5,7 @@ const chalk = require('chalk');
 const _ = require('lodash');
 const dayjs = require('dayjs');
 const validate = require('./lib/validate');
+const { legacy, writeText, style } = require('@serverless/utils/log');
 
 const LocalizedFormat = require('dayjs/plugin/localizedFormat');
 
@@ -100,16 +101,20 @@ class AwsMetrics {
 
   showMetrics(metrics) {
     let message = '';
+    const modernMessageTokens = [];
 
     if (this.options.function) {
       message += `${chalk.yellow.underline(this.options.function)}\n`;
+      modernMessageTokens.push(this.options.function);
     } else {
       message += `${chalk.yellow.underline('Service wide metrics')}\n`;
+      modernMessageTokens.push('Service wide metrics');
     }
 
     const formattedStartTime = dayjs(this.options.startTime).format('LLL');
     const formattedEndTime = dayjs(this.options.endTime).format('LLL');
     message += `${formattedStartTime} - ${formattedEndTime}\n\n`;
+    modernMessageTokens.push(`${formattedStartTime} - ${formattedEndTime}\n`);
 
     if (metrics && metrics.length > 0) {
       const getDatapointsByLabel = (Label) =>
@@ -129,11 +134,19 @@ class AwsMetrics {
       message += `${chalk.yellow('Throttles:', throttlesCount, '\n')}`;
       message += `${chalk.yellow('Errors:', errorsCount, '\n')}`;
       message += `${chalk.yellow('Duration (avg.):', `${Number(durationAverage.toFixed(2))}ms`)}`;
+      modernMessageTokens.push(
+        `${style.aside('invocations')}: ${invocationsCount}`,
+        `${style.aside('throttles')}: ${throttlesCount}`,
+        `${style.aside('errors')}: ${errorsCount}`,
+        `${style.aside('duration (avg.)')}: ${Number(durationAverage.toFixed(2))}ms`
+      );
     } else {
       message += `${chalk.yellow('There are no metrics to show for these options')}`;
+      modernMessageTokens.push('There are no metrics to show for these options');
     }
 
-    this.serverless.cli.consoleLog(message);
+    legacy.consoleLog(message);
+    writeText(modernMessageTokens);
   }
 }
 
diff --git a/test/unit/lib/plugins/aws/metrics.test.js b/test/unit/lib/plugins/aws/metrics.test.js
index 19d0beece82..43466946e27 100644
--- a/test/unit/lib/plugins/aws/metrics.test.js
+++ b/test/unit/lib/plugins/aws/metrics.test.js
@@ -6,7 +6,6 @@ const AwsProvider = require('../../../../../lib/plugins/aws/provider');
 const AwsMetrics = require('../../../../../lib/plugins/aws/metrics');
 const Serverless = require('../../../../../lib/Serverless');
 const CLI = require('../../../../../lib/classes/CLI');
-const chalk = require('chalk');
 const dayjs = require('dayjs');
 
 const LocalizedFormat = require('dayjs/plugin/localizedFormat');
@@ -371,197 +370,4 @@ describe('AwsMetrics', () => {
       ).to.equal(true);
     });
   });
-
-  describe('#showMetrics()', () => {
-    let consoleLogStub;
-
-    beforeEach(() => {
-      awsMetrics.serverless.service.functions = {
-        function1: {
-          name: 'func1',
-        },
-        function2: {
-          name: 'func2',
-        },
-      };
-      awsMetrics.options.startTime = '1970-01-01';
-      awsMetrics.options.endTime = '1970-01-02';
-      consoleLogStub = sinon.stub(serverless.cli, 'consoleLog').returns();
-    });
-
-    afterEach(() => {
-      serverless.cli.consoleLog.restore();
-    });
-
-    it('should display service wide metrics if no function option is specified', () => {
-      const metrics = [
-        [
-          {
-            ResponseMetadata: {
-              RequestId: '1f50045b-b569-11e6-86c6-eb54d1aaa755-func1',
-            },
-            Label: 'Invocations',
-            Datapoints: [{ Sum: 12 }, { Sum: 8 }],
-          },
-          {
-            ResponseMetadata: {
-              RequestId: '1f59059b-b569-11e6-aa18-c7bab68810d2-func1',
-            },
-            Label: 'Throttles',
-            Datapoints: [{ Sum: 15 }, { Sum: 15 }],
-          },
-          {
-            ResponseMetadata: {
-              RequestId: '1f50c7b1-b569-11e6-b1b6-ab86694b617b-func1',
-            },
-            Label: 'Errors',
-            Datapoints: [{ Sum: 0 }],
-          },
-          {
-            ResponseMetadata: {
-              RequestId: '1f63db14-b569-11e6-8501-d98a275ce164-func1',
-            },
-            Label: 'Duration',
-            Datapoints: [{ Average: 1000 }],
-          },
-        ],
-        [
-          {
-            ResponseMetadata: {
-              RequestId: '1f50045b-b569-11e6-86c6-eb54d1aaa755-func2',
-            },
-            Label: 'Invocations',
-            Datapoints: [{ Sum: 12 }, { Sum: 8 }],
-          },
-          {
-            ResponseMetadata: {
-              RequestId: '1f59059b-b569-11e6-aa18-c7bab68810d2-func2',
-            },
-            Label: 'Throttles',
-            Datapoints: [{ Sum: 15 }, { Sum: 15 }],
-          },
-          {
-            ResponseMetadata: {
-              RequestId: '1f50c7b1-b569-11e6-b1b6-ab86694b617b-func2',
-            },
-            Label: 'Errors',
-            Datapoints: [{ Sum: 0 }],
-          },
-          {
-            ResponseMetadata: {
-              RequestId: '1f63db14-b569-11e6-8501-d98a275ce164-func2',
-            },
-            Label: 'Duration',
-            Datapoints: [{ Average: 1000 }],
-          },
-        ],
-      ];
-
-      let expectedMessage = '';
-      expectedMessage += `${chalk.yellow.underline('Service wide metrics')}\n`;
-      expectedMessage += 'January 1, 1970 12:00 AM - January 2, 1970 12:00 AM\n\n';
-      expectedMessage += `${chalk.yellow('Invocations: 40 \n')}`;
-      expectedMessage += `${chalk.yellow('Throttles: 60 \n')}`;
-      expectedMessage += `${chalk.yellow('Errors: 0 \n')}`;
-      expectedMessage += `${chalk.yellow('Duration (avg.): 1000ms')}`;
-
-      awsMetrics.showMetrics(metrics);
-
-      expect(consoleLogStub.calledOnce).to.equal(true);
-      expect(consoleLogStub.getCall(0).args[0]).to.equal(expectedMessage);
-    });
-
-    it('should display correct average of service wide average function duration', () => {
-      const metrics = [
-        [
-          {
-            Label: 'Duration',
-            Datapoints: [{ Average: 100 }, { Average: 200 }, { Average: 300 }],
-          },
-        ],
-        [
-          {
-            Label: 'Duration',
-            Datapoints: [{ Average: 400 }, { Average: 500 }],
-          },
-        ],
-      ];
-
-      awsMetrics.showMetrics(metrics);
-
-      expect(consoleLogStub.getCall(0).args[0]).to.include('Duration (avg.): 300ms');
-    });
-
-    it('should display 0 as average function duration if no data by given period', () => {
-      const metrics = [[], []];
-
-      awsMetrics.showMetrics(metrics);
-
-      expect(consoleLogStub.getCall(0).args[0]).to.include('Duration (avg.): 0ms');
-    });
-
-    it('should display function metrics if function option is specified', () => {
-      awsMetrics.options.function = 'function1';
-
-      const metrics = [
-        [
-          {
-            ResponseMetadata: {
-              RequestId: '1f50045b-b569-11e6-86c6-eb54d1aaa755-func1',
-            },
-            Label: 'Invocations',
-            Datapoints: [{ Sum: 12 }, { Sum: 8 }],
-          },
-          {
-            ResponseMetadata: {
-              RequestId: '1f59059b-b569-11e6-aa18-c7bab68810d2-func1',
-            },
-            Label: 'Throttles',
-            Datapoints: [{ Sum: 15 }, { Sum: 15 }],
-          },
-          {
-            ResponseMetadata: {
-              RequestId: '1f50c7b1-b569-11e6-b1b6-ab86694b617b-func1',
-            },
-            Label: 'Errors',
-            Datapoints: [{ Sum: 0 }],
-          },
-          {
-            ResponseMetadata: {
-              RequestId: '1f63db14-b569-11e6-8501-d98a275ce164-func1',
-            },
-            Label: 'Duration',
-            Datapoints: [{ Average: 1000 }],
-          },
-        ],
-      ];
-
-      let expectedMessage = '';
-      expectedMessage += `${chalk.yellow.underline(awsMetrics.options.function)}\n`;
-      expectedMessage += 'January 1, 1970 12:00 AM - January 2, 1970 12:00 AM\n\n';
-      expectedMessage += `${chalk.yellow('Invocations: 20 \n')}`;
-      expectedMessage += `${chalk.yellow('Throttles: 30 \n')}`;
-      expectedMessage += `${chalk.yellow('Errors: 0 \n')}`;
-      expectedMessage += `${chalk.yellow('Duration (avg.): 1000ms')}`;
-
-      awsMetrics.showMetrics(metrics);
-
-      expect(consoleLogStub.calledOnce).to.equal(true);
-      expect(consoleLogStub.getCall(0).args[0]).to.equal(expectedMessage);
-    });
-
-    it('should resolve with an error message if no metrics are available', () => {
-      awsMetrics.options.function = 'function1';
-
-      let expectedMessage = '';
-      expectedMessage += `${chalk.yellow.underline(awsMetrics.options.function)}\n`;
-      expectedMessage += 'January 1, 1970 12:00 AM - January 2, 1970 12:00 AM\n\n';
-      expectedMessage += `${chalk.yellow('There are no metrics to show for these options')}`;
-
-      awsMetrics.showMetrics();
-
-      expect(consoleLogStub.calledOnce).to.equal(true);
-      expect(consoleLogStub.getCall(0).args[0]).to.equal(expectedMessage);
-    });
-  });
 });

From 2787ea07a9a183695e6f7a58bcc0171e086d456b Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 1 Oct 2021 11:18:26 +0200
Subject: [PATCH 0577/1101] refactor(CLI): Modern logs for `uninstall` command

---
 lib/plugins/standalone.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/standalone.js b/lib/plugins/standalone.js
index 066e19c934d..6b64c58de57 100644
--- a/lib/plugins/standalone.js
+++ b/lib/plugins/standalone.js
@@ -8,6 +8,7 @@ const stream = require('stream');
 const { promisify } = require('util');
 const fse = require('fs-extra');
 const fetch = require('node-fetch');
+const { legacy, log, progress, style } = require('@serverless/utils/log');
 const currentVersion = require('../../package').version;
 const ServerlessError = require('../serverless-error');
 const standaloneUtils = require('../utils/standalone');
@@ -18,6 +19,7 @@ const pipeline = promisify(stream.pipeline);
 const BINARY_TMP_PATH = path.resolve(os.tmpdir(), 'serverless-binary-tmp');
 
 const BINARY_PATH = standaloneUtils.path;
+const mainProgress = progress.get('main');
 
 module.exports = class Standalone {
   constructor(serverless, cliOptions) {
@@ -80,7 +82,14 @@ module.exports = class Standalone {
   }
 
   async uninstall() {
+    const commandRunStartTime = Date.now();
+    mainProgress.notice('Uninstalling standalone binary', { isMainEvent: true });
     await fse.remove(path.dirname(BINARY_PATH));
-    this.serverless.cli.log('Uninstalled');
+    legacy.log('Uninstalled');
+    log.notice.success(
+      `Standalone binary uninstalled ${style.aside(
+        `(${Math.floor((Date.now() - commandRunStartTime) / 1000)}s)`
+      )}`
+    );
   }
 };

From 9b5e6b12371317356d9cb4600a4a574df305f63f Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 1 Oct 2021 11:50:18 +0200
Subject: [PATCH 0578/1101] refactor(CLI): Modern logs for `upgrade` command

---
 lib/plugins/standalone.js | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/lib/plugins/standalone.js b/lib/plugins/standalone.js
index 6b64c58de57..91e5a58191e 100644
--- a/lib/plugins/standalone.js
+++ b/lib/plugins/standalone.js
@@ -42,10 +42,18 @@ module.exports = class Standalone {
   }
 
   async upgrade() {
+    mainProgress.notice('Resolving latest standalone version', { isMainEvent: true });
     const tagName = await standaloneUtils.resolveLatestTag();
     const latestVersion = tagName.slice(1);
     if (latestVersion === currentVersion) {
-      this.serverless.cli.log('Already at latest version');
+      legacy.log('Already at latest version');
+      log.notice.skip(
+        `Already at latest version ${style.aside(
+          `(${Math.floor(
+            (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+          )}s)`
+        )}`
+      );
       return;
     }
     const currentMajor = Number(currentVersion.split('.')[0]);
@@ -64,7 +72,8 @@ module.exports = class Standalone {
         'CANNOT_UPGRADE_MAJOR'
       );
     }
-    this.serverless.cli.log('Downloading new version...');
+    legacy.log('Downloading new version...');
+    mainProgress.notice('Downloading latest standalone version', { isMainEvent: true });
     const executableUrl = standaloneUtils.resolveUrl(tagName);
     const standaloneResponse = await fetch(executableUrl);
     if (!standaloneResponse.ok) {
@@ -78,17 +87,21 @@ module.exports = class Standalone {
     await pipeline(standaloneResponse.body, fs.createWriteStream(BINARY_TMP_PATH));
     await fsp.rename(BINARY_TMP_PATH, BINARY_PATH);
     await fsp.chmod(BINARY_PATH, 0o755);
-    this.serverless.cli.log(`Successfully upgraded to ${tagName}`);
+    legacy.log(`Successfully upgraded to ${tagName}`);
+    log.notice.success(
+      `Successfully upgraded to ${tagName} ${style.aside(
+        `(${Math.floor((Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000)}s)`
+      )}`
+    );
   }
 
   async uninstall() {
-    const commandRunStartTime = Date.now();
     mainProgress.notice('Uninstalling standalone binary', { isMainEvent: true });
     await fse.remove(path.dirname(BINARY_PATH));
     legacy.log('Uninstalled');
     log.notice.success(
       `Standalone binary uninstalled ${style.aside(
-        `(${Math.floor((Date.now() - commandRunStartTime) / 1000)}s)`
+        `(${Math.floor((Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000)}s)`
       )}`
     );
   }

From e8fd2bee45b35d9cbd49b4e049769f03c4e42671 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 4 Oct 2021 17:08:44 +0200
Subject: [PATCH 0579/1101] refactor(AWS Deploy): Handle main progress directly

---
 lib/plugins/aws/lib/monitorStack.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js
index bdf304ebf93..e2f4aba9f28 100644
--- a/lib/plugins/aws/lib/monitorStack.js
+++ b/lib/plugins/aws/lib/monitorStack.js
@@ -7,6 +7,7 @@ const identity = require('ext/function/identity');
 const ServerlessError = require('../../../serverless-error');
 const { log, legacy, progress, style } = require('@serverless/utils/log');
 
+const mainProgress = progress.get('main');
 const validStatuses = new Set(['CREATE_COMPLETE', 'UPDATE_COMPLETE', 'DELETE_COMPLETE']);
 
 const normalizerPattern = /(?<!^)([A-Z])/g;
@@ -115,13 +116,11 @@ module.exports = {
                 })();
 
                 if (operationPhrase && (completedResources.size || inProgressResources.size)) {
-                  progress
-                    .get('main')
-                    .notice(
-                      `${operationPhrase} CloudFormation stack (${completedResources.size}/${
-                        completedResources.size + inProgressResources.size
-                      })`
-                    );
+                  mainProgress.notice(
+                    `${operationPhrase} CloudFormation stack (${completedResources.size}/${
+                      completedResources.size + inProgressResources.size
+                    })`
+                  );
                 }
                 // Prepare for next monitoring action
                 loggedEventIds.add(event.EventId);

From 1d21f0bab824266e4628fa7874a7911aa77d2d3d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 4 Oct 2021 17:12:02 +0200
Subject: [PATCH 0580/1101] refactor(AWS Deploy): Improve handling of progress
 message prefix

---
 lib/plugins/aws/lib/monitorStack.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js
index e2f4aba9f28..b0aa58626f7 100644
--- a/lib/plugins/aws/lib/monitorStack.js
+++ b/lib/plugins/aws/lib/monitorStack.js
@@ -108,16 +108,15 @@ module.exports = {
                   }
                 }
 
-                const operationPhrase = (() => {
-                  if (action === 'create') return 'Creating';
-                  if (action === 'update') return 'Updating';
-                  if (action === 'delete') return 'Removing';
-                  return '';
-                })();
-
-                if (operationPhrase && (completedResources.size || inProgressResources.size)) {
+                if (completedResources.size || inProgressResources.size) {
+                  const progressMessagePrefix = (() => {
+                    if (action === 'create') return 'Creating';
+                    if (action === 'update') return 'Updating';
+                    if (action === 'delete') return 'Removing';
+                    throw new Error(`Unrecgonized action: ${action}`);
+                  })();
                   mainProgress.notice(
-                    `${operationPhrase} CloudFormation stack (${completedResources.size}/${
+                    `${progressMessagePrefix} CloudFormation stack (${completedResources.size}/${
                       completedResources.size + inProgressResources.size
                     })`
                   );

From 8dd32e5542ca8d4dcbbbfa3b38c6158a34a87651 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 4 Oct 2021 17:12:46 +0200
Subject: [PATCH 0581/1101] refactor(CLI): Do not show resource progress on
 stack creation

---
 lib/plugins/aws/lib/monitorStack.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js
index b0aa58626f7..e028cff6898 100644
--- a/lib/plugins/aws/lib/monitorStack.js
+++ b/lib/plugins/aws/lib/monitorStack.js
@@ -108,9 +108,8 @@ module.exports = {
                   }
                 }
 
-                if (completedResources.size || inProgressResources.size) {
+                if ((completedResources.size || inProgressResources.size) && action !== 'create') {
                   const progressMessagePrefix = (() => {
-                    if (action === 'create') return 'Creating';
                     if (action === 'update') return 'Updating';
                     if (action === 'delete') return 'Removing';
                     throw new Error(`Unrecgonized action: ${action}`);

From 5f1a916d4d9c8833755833bc064f51e4f89e50e0 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 5 Oct 2021 11:09:40 +0200
Subject: [PATCH 0582/1101] refactor: Remove _async_ handling from _sync_
 function

---
 lib/cli/handle-error.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index b44f87d647d..920853e039c 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -131,7 +131,7 @@ module.exports = async (exception, options = {}) => {
 
   const platform = process.platform;
   const nodeVersion = process.version.replace(/^[v|V]/, '');
-  const installationModePostfix = await (async () => {
+  const installationModePostfix = (() => {
     if (isStandaloneExecutable) return ' (standalone)';
     if (isLocallyInstalled != null) return isLocallyInstalled ? ' (local)' : '';
     return resolveIsLocallyInstalled() ? ' (local)' : '';

From 7c91cde7ac5c8bbe983b213de090bde4326af85a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 5 Oct 2021 11:17:01 +0200
Subject: [PATCH 0583/1101] refactor(CLI): Reconfigure dashboard related
 warning to modern logs

---
 scripts/serverless.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index 583e847b112..e4d5f681d62 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -15,7 +15,7 @@ if (require('../lib/utils/tabCompletion/isSupported') && process.argv[2] === 'co
 
 // Setup log writing
 require('@serverless/utils/log-reporters/node');
-const { progress } = require('@serverless/utils/log');
+const { legacy, log, progress } = require('@serverless/utils/log');
 
 const handleError = require('../lib/cli/handle-error');
 const {
@@ -870,10 +870,9 @@ const processSpanPromise = (async () => {
       try {
         await dashboardErrorHandler(error, serverless.invocationId);
       } catch (dashboardErrorHandlerError) {
-        const log = require('@serverless/utils/log');
         const tokenizeException = require('../lib/utils/tokenize-exception');
         const exceptionTokens = tokenizeException(dashboardErrorHandlerError);
-        log(
+        legacy.log(
           `Publication to Serverless Dashboard errored with:\n${' '.repeat('Serverless: '.length)}${
             exceptionTokens.isUserError || !exceptionTokens.stack
               ? exceptionTokens.message
@@ -881,6 +880,13 @@ const processSpanPromise = (async () => {
           }`,
           { color: 'orange' }
         );
+        log.warning(
+          `Publication to Serverless Dashboard errored with:\n${' '.repeat('Serverless: '.length)}${
+            exceptionTokens.isUserError || !exceptionTokens.stack
+              ? exceptionTokens.message
+              : exceptionTokens.stack
+          }`
+        );
       }
       throw error;
     }

From 8184c01c7c519e05ab9f7a1ab0e0484bfce2aafd Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 7 Oct 2021 10:20:44 +0200
Subject: [PATCH 0584/1101] refactor(CLI): Change stack update progress logging
 method

---
 lib/plugins/aws/lib/monitorStack.js | 37 ++++++++---------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js
index e028cff6898..ad0dedcf623 100644
--- a/lib/plugins/aws/lib/monitorStack.js
+++ b/lib/plugins/aws/lib/monitorStack.js
@@ -7,7 +7,6 @@ const identity = require('ext/function/identity');
 const ServerlessError = require('../../../serverless-error');
 const { log, legacy, progress, style } = require('@serverless/utils/log');
 
-const mainProgress = progress.get('main');
 const validStatuses = new Set(['CREATE_COMPLETE', 'UPDATE_COMPLETE', 'DELETE_COMPLETE']);
 
 const normalizerPattern = /(?<!^)([A-Z])/g;
@@ -27,14 +26,7 @@ module.exports = {
     cfData,
     stackUrl,
     options,
-    {
-      loggedEventIds = new Set(),
-      stackStatus = null,
-      stackLatestError = null,
-      firstEventId = null,
-      inProgressResources = new Set(),
-      completedResources = new Set(),
-    }
+    { loggedEventIds = new Set(), stackStatus = null, stackLatestError = null, firstEventId = null }
   ) {
     return wait(options.frequency || process.env.SLS_AWS_MONITORING_FREQUENCY || 5000)
       .then(() =>
@@ -99,27 +91,20 @@ module.exports = {
                   legacy.write(chalk.yellow('.'));
                 }
 
-                if (event.ResourceType !== 'AWS::CloudFormation::Stack') {
+                if (action !== 'create' && event.ResourceType !== 'AWS::CloudFormation::Stack') {
                   if (eventStatus && eventStatus.endsWith('PROGRESS')) {
-                    inProgressResources.add(event.LogicalResourceId);
+                    progress
+                      .get(`cf-deploy-${event.LogicalResourceId}`)
+                      .notice(
+                        style.aside(
+                          `  ${eventStatus} - ${event.ResourceType} - ${event.LogicalResourceId}`
+                        )
+                      );
                   } else if (eventStatus && eventStatus.endsWith('COMPLETE')) {
-                    completedResources.add(event.LogicalResourceId);
-                    inProgressResources.delete(event.LogicalResourceId);
+                    progress.get(`cf-deploy-${event.LogicalResourceId}`).remove();
                   }
                 }
 
-                if ((completedResources.size || inProgressResources.size) && action !== 'create') {
-                  const progressMessagePrefix = (() => {
-                    if (action === 'update') return 'Updating';
-                    if (action === 'delete') return 'Removing';
-                    throw new Error(`Unrecgonized action: ${action}`);
-                  })();
-                  mainProgress.notice(
-                    `${progressMessagePrefix} CloudFormation stack (${completedResources.size}/${
-                      completedResources.size + inProgressResources.size
-                    })`
-                  );
-                }
                 // Prepare for next monitoring action
                 loggedEventIds.add(event.EventId);
               });
@@ -184,8 +169,6 @@ module.exports = {
           stackStatus,
           stackLatestError,
           firstEventId,
-          inProgressResources,
-          completedResources,
         });
       });
   },

From c9f22278b3a8c5fd4d1400ef948ae6b72f333223 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 7 Oct 2021 11:20:44 +0200
Subject: [PATCH 0585/1101] refactor(CLI): Ensure empty line prior final status
  with progress

---
 commands/plugin-install.js      | 2 ++
 commands/plugin-uninstall.js    | 2 ++
 lib/plugins/install.js          | 1 +
 lib/plugins/plugin/install.js   | 2 ++
 lib/plugins/plugin/uninstall.js | 2 ++
 lib/plugins/standalone.js       | 3 +++
 6 files changed, 12 insertions(+)

diff --git a/commands/plugin-install.js b/commands/plugin-install.js
index ab46066a09f..be1eb3756c2 100644
--- a/commands/plugin-install.js
+++ b/commands/plugin-install.js
@@ -38,6 +38,7 @@ module.exports = async ({ configuration, serviceDir, configurationFilename, opti
   await addPluginToServerlessFile(context);
 
   legacy.log(`Successfully installed "${pluginName}@${pluginVersion}"`);
+  log.notice();
   log.notice.success(
     `Plugin "${pluginName}${
       pluginVersion === 'latest' ? '' : `@${pluginVersion}`
@@ -138,6 +139,7 @@ const requestManualUpdate = (configurationFilePath) => {
   Can't automatically add plugin into "${path.basename(configurationFilePath)}" file.
   Please make it manually.
 `);
+  log.notice();
   log.notice.skip(
     `Can't automatically add plugin into "${path.basename(
       configurationFilePath
diff --git a/commands/plugin-uninstall.js b/commands/plugin-uninstall.js
index 6bd8fbf858b..a56e422bcd0 100644
--- a/commands/plugin-uninstall.js
+++ b/commands/plugin-uninstall.js
@@ -33,6 +33,7 @@ module.exports = async ({ configuration, serviceDir, configurationFilename, opti
   await removePluginFromServerlessFile(context);
 
   legacy.log(`Successfully uninstalled "${pluginName}"`);
+  log.notice();
   log.notice.success(
     `Plugin "${pluginName}" uninstalled ${style.aside(
       `(${Math.floor((Date.now() - commandRunStartTime) / 1000)}s)`
@@ -118,6 +119,7 @@ const requestManualUpdate = (configurationFilePath) => {
   Can't automatically remove plugin from "${path.basename(configurationFilePath)}" file.
   Please do it manually.
 `);
+  log.notice();
   log.notice.skip(
     `Can't automatically remove plugin from "${path.basename(
       configurationFilePath
diff --git a/lib/plugins/install.js b/lib/plugins/install.js
index e0b1026b914..1a7da4b2df7 100644
--- a/lib/plugins/install.js
+++ b/lib/plugins/install.js
@@ -37,6 +37,7 @@ class Install {
     ].join('');
 
     legacy.log(message);
+    log.notice();
     log.notice.success(
       `${message} ${style.aside(`(${Math.floor((Date.now() - commandRunStartTime) / 1000)}s)`)}`
     );
diff --git a/lib/plugins/plugin/install.js b/lib/plugins/plugin/install.js
index 7656f576a65..0942184bc7c 100644
--- a/lib/plugins/plugin/install.js
+++ b/lib/plugins/plugin/install.js
@@ -26,6 +26,7 @@ const requestManualUpdate = (serverlessFilePath) => {
   Can't automatically add plugin into "${path.basename(serverlessFilePath)}" file.
   Please make it manually.
 `);
+  log.notice();
   log.notice.skip(
     `Can't automatically add plugin into "${path.basename(
       serverlessFilePath
@@ -77,6 +78,7 @@ class PluginInstall {
               ` "${this.options.pluginName}@${this.options.pluginVersion}"`,
             ].join('');
             legacy.log(message);
+            log.notice();
             log.notice.success(
               `Plugin "${this.options.pluginName}${
                 this.options.pluginVersion === 'latest' ? '' : `@${this.options.pluginVersion}`
diff --git a/lib/plugins/plugin/uninstall.js b/lib/plugins/plugin/uninstall.js
index 2622718ed62..8c4193d69ef 100644
--- a/lib/plugins/plugin/uninstall.js
+++ b/lib/plugins/plugin/uninstall.js
@@ -23,6 +23,7 @@ const requestManualUpdate = (serverlessFilePath) => {
   Can't automatically remove plugin from "${path.basename(serverlessFilePath)}" file.
   Please make it manually.
 `);
+  log.notice();
   log.notice.skip(
     `Can't automatically remove plugin from "${path.basename(
       serverlessFilePath
@@ -70,6 +71,7 @@ class PluginUninstall {
           .then(this.removePluginFromServerlessFile)
           .then(() => {
             legacy.log(`Successfully uninstalled "${this.options.pluginName}"`);
+            log.notice();
             log.notice.success(
               `Plugin "${this.options.pluginName}" uninstalled ${style.aside(
                 `(${Math.floor(
diff --git a/lib/plugins/standalone.js b/lib/plugins/standalone.js
index 91e5a58191e..6aed4fbdca5 100644
--- a/lib/plugins/standalone.js
+++ b/lib/plugins/standalone.js
@@ -47,6 +47,7 @@ module.exports = class Standalone {
     const latestVersion = tagName.slice(1);
     if (latestVersion === currentVersion) {
       legacy.log('Already at latest version');
+      log.notice();
       log.notice.skip(
         `Already at latest version ${style.aside(
           `(${Math.floor(
@@ -88,6 +89,7 @@ module.exports = class Standalone {
     await fsp.rename(BINARY_TMP_PATH, BINARY_PATH);
     await fsp.chmod(BINARY_PATH, 0o755);
     legacy.log(`Successfully upgraded to ${tagName}`);
+    log.notice();
     log.notice.success(
       `Successfully upgraded to ${tagName} ${style.aside(
         `(${Math.floor((Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000)}s)`
@@ -99,6 +101,7 @@ module.exports = class Standalone {
     mainProgress.notice('Uninstalling standalone binary', { isMainEvent: true });
     await fse.remove(path.dirname(BINARY_PATH));
     legacy.log('Uninstalled');
+    log.notice();
     log.notice.success(
       `Standalone binary uninstalled ${style.aside(
         `(${Math.floor((Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000)}s)`

From 87461007f809c67a78b7dd722847efef2e4f72b3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 7 Oct 2021 11:53:04 +0200
Subject: [PATCH 0586/1101] refactor(CLI): Expose function artifact size in
 deploy summary

---
 lib/plugins/aws/deploy/lib/uploadArtifacts.js | 58 ++++++++++---------
 lib/plugins/aws/info/display.js               |  9 ++-
 lib/plugins/aws/info/getStackInfo.js          |  4 +-
 .../lib/plugins/aws/info/getStackInfo.test.js |  2 +
 4 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/lib/plugins/aws/deploy/lib/uploadArtifacts.js b/lib/plugins/aws/deploy/lib/uploadArtifacts.js
index 05763ec8eef..ec02a2b7836 100644
--- a/lib/plugins/aws/deploy/lib/uploadArtifacts.js
+++ b/lib/plugins/aws/deploy/lib/uploadArtifacts.js
@@ -29,7 +29,7 @@ module.exports = {
 
   async uploadArtifacts() {
     const artifactFilePaths = [
-      ...this.getFunctionArtifactFilePaths(),
+      ...(await this.getFunctionArtifactFilePaths()),
       ...this.getLayerArtifactFilePaths(),
     ];
     if (artifactFilePaths.length === 1) {
@@ -112,35 +112,41 @@ module.exports = {
     return response;
   },
 
-  getFunctionArtifactFilePaths() {
+  async getFunctionArtifactFilePaths() {
     const functionNames = this.serverless.service.getAllFunctions();
     return _.uniq(
-      functionNames
-        .map((name) => {
-          const functionObject = this.serverless.service.getFunction(name);
-          if (functionObject.image) return null;
-          const functionArtifactFileName = this.provider.naming.getFunctionArtifactName(name);
-          functionObject.package = functionObject.package || {};
-          const artifactFilePath =
-            functionObject.package.artifact || this.serverless.service.package.artifact;
-
-          if (
-            !artifactFilePath ||
-            (this.serverless.service.artifact && !functionObject.package.artifact)
-          ) {
+      (
+        await Promise.all(
+          functionNames.map(async (name) => {
+            const functionObject = this.serverless.service.getFunction(name);
+            if (functionObject.image) return null;
+            const functionArtifactFileName = this.provider.naming.getFunctionArtifactName(name);
+            functionObject.package = functionObject.package || {};
+            let artifactFilePath =
+              functionObject.package.artifact || this.serverless.service.package.artifact;
+
             if (
-              this.serverless.service.package.individually ||
-              functionObject.package.individually
+              !artifactFilePath ||
+              (this.serverless.service.artifact && !functionObject.package.artifact)
             ) {
-              const artifactFileName = functionArtifactFileName;
-              return path.join(this.packagePath, artifactFileName);
+              if (
+                this.serverless.service.package.individually ||
+                functionObject.package.individually
+              ) {
+                const artifactFileName = functionArtifactFileName;
+                artifactFilePath = path.join(this.packagePath, artifactFileName);
+              } else {
+                artifactFilePath = path.join(
+                  this.packagePath,
+                  this.provider.naming.getServiceArtifactName()
+                );
+              }
             }
-            return path.join(this.packagePath, this.provider.naming.getServiceArtifactName());
-          }
-
-          return artifactFilePath;
-        })
-        .filter(Boolean)
+            functionObject.artifactSize = (await this.getFileStats(artifactFilePath)).size;
+            return artifactFilePath;
+          })
+        )
+      ).filter(Boolean)
     );
   },
 
@@ -168,7 +174,7 @@ module.exports = {
     legacy.log('Uploading artifacts...');
 
     const artifactFilePaths = [
-      ...this.getFunctionArtifactFilePaths(),
+      ...(await this.getFunctionArtifactFilePaths()),
       ...this.getLayerArtifactFilePaths(),
     ];
 
diff --git a/lib/plugins/aws/info/display.js b/lib/plugins/aws/info/display.js
index dc370b44be9..f6bbfccda95 100644
--- a/lib/plugins/aws/info/display.js
+++ b/lib/plugins/aws/info/display.js
@@ -1,7 +1,8 @@
 'use strict';
 
 const chalk = require('chalk');
-const { legacy, isVerboseMode } = require('@serverless/utils/log');
+const filesize = require('filesize');
+const { legacy, isVerboseMode, style } = require('@serverless/utils/log');
 
 module.exports = {
   displayServiceInfo() {
@@ -131,7 +132,11 @@ module.exports = {
       const outputSectionItems = [];
       info.functions.forEach((f) => {
         functionsMessage += `\n  ${f.name}: ${f.deployedName}`;
-        outputSectionItems.push(`${f.name}: ${f.deployedName}`);
+        outputSectionItems.push(
+          `${f.name}: ${f.deployedName}${
+            f.artifactSize ? style.aside(` (${filesize(f.artifactSize)})`) : ''
+          }`
+        );
       });
       this.serverless.addServiceOutputSection('functions', outputSectionItems);
     } else {
diff --git a/lib/plugins/aws/info/getStackInfo.js b/lib/plugins/aws/info/getStackInfo.js
index bd208a55661..8cdf9e57337 100644
--- a/lib/plugins/aws/info/getStackInfo.js
+++ b/lib/plugins/aws/info/getStackInfo.js
@@ -69,9 +69,11 @@ module.exports = {
 
         // Functions
         this.serverless.service.getAllFunctions().forEach((func) => {
+          const functionObj = this.serverless.service.getFunction(func);
           const functionInfo = {};
           functionInfo.name = func;
-          functionInfo.deployedName = this.serverless.service.getFunction(func).name;
+          functionInfo.deployedName = functionObj.name;
+          functionInfo.artifactSize = functionObj.artifactSize;
           this.gatheredData.info.functions.push(functionInfo);
         });
 
diff --git a/test/unit/lib/plugins/aws/info/getStackInfo.test.js b/test/unit/lib/plugins/aws/info/getStackInfo.test.js
index b370a369b70..cbea5ab2958 100644
--- a/test/unit/lib/plugins/aws/info/getStackInfo.test.js
+++ b/test/unit/lib/plugins/aws/info/getStackInfo.test.js
@@ -94,10 +94,12 @@ describe('#getStackInfo()', () => {
           {
             name: 'hello',
             deployedName: 'my-service-dev-hello',
+            artifactSize: undefined,
           },
           {
             name: 'world',
             deployedName: 'customized',
+            artifactSize: undefined,
           },
         ],
         layers: [

From 70e27362260f97b68bb1dfaf52fa3fe7877a2adc Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 7 Oct 2021 11:58:52 +0200
Subject: [PATCH 0587/1101] feat(Packaging): Remove `package[include|exclude]`
 deprecation

It'll be re-added in context of v3
---
 docs/deprecations.md           |  2 ++
 lib/plugins/package/package.js | 19 -------------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 42c6079b894..5b4c43b9661 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -104,6 +104,8 @@ Starting with v3.0.0 any option extensions which does not have `type` defined wi
 
 Deprecation code: `NEW_PACKAGE_PATTERNS`
 
+_Note: We've resigned from this deprecation in the context of v2 (it'll be re-added in the context of v3). We continue to advise upgrade of services, so they do not rely on `package.include` and `package.exclude` settings._
+
 Support for `package.include` and `package.exclude` will be removed with v3.0.0. Instead please use `package.patterns` with which both _include_ and _exclude_ (prefixed with `!`) rules can be configured.
 
 Check [Packaging Patterns](/framework/docs/providers/aws/guide/packaging/#patterns) documentation for more info.
diff --git a/lib/plugins/package/package.js b/lib/plugins/package/package.js
index 5a432ef1dfe..20ad625d1a9 100644
--- a/lib/plugins/package/package.js
+++ b/lib/plugins/package/package.js
@@ -33,25 +33,6 @@ class Package {
     };
 
     this.hooks = {
-      'initialize': () => {
-        const useIncludeExclude = (packageConfig = {}) =>
-          packageConfig.include || packageConfig.exclude;
-        const servicePackage = this.serverless.service.package || {};
-        if (
-          useIncludeExclude(servicePackage) ||
-          Object.values(this.serverless.service.functions).some((func) =>
-            useIncludeExclude(func.package)
-          ) ||
-          Object.values(this.serverless.service.layers || {}).some((func) =>
-            useIncludeExclude(func.package)
-          )
-        ) {
-          this.serverless._logDeprecation(
-            'NEW_PACKAGE_PATTERNS',
-            'Support for "package.include" and "package.exclude" will be removed with next major release. Please use "package.patterns" instead'
-          );
-        }
-      },
       'package:createDeploymentArtifacts': async () =>
         BbPromise.bind(this).then(this.packageService),
 

From a9bf916fbb15140373a54d22c624296b8a1dbe03 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 7 Oct 2021 12:00:13 +0200
Subject: [PATCH 0588/1101] feat(Config Schema): Remove validation mode related
 deprecation

It'll be re-added in context of v3
---
 docs/deprecations.md                     | 2 ++
 lib/classes/ConfigSchemaHandler/index.js | 7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 5b4c43b9661..1523fadaf8f 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -150,6 +150,8 @@ Ensure to always format CLI command as `sls [command..] [options...]`
 
 Deprecation code: `CONFIG_VALIDATION_MODE_DEFAULT`
 
+_Note: We've resigned from this deprecation in the context of v2 (it'll be re-added in the context of v3). We continue to advise configuring services with `configValidationMode: error` setting._
+
 Starting with v3.0.0, Serverless will throw on configuration errors by default. This is changing from the previous default, `configValidationMode: warn`
 
 Learn more about configuration validation here: http://slss.io/configuration-validation
diff --git a/lib/classes/ConfigSchemaHandler/index.js b/lib/classes/ConfigSchemaHandler/index.js
index b1c8ac40dfd..58d0620def9 100644
--- a/lib/classes/ConfigSchemaHandler/index.js
+++ b/lib/classes/ConfigSchemaHandler/index.js
@@ -157,13 +157,6 @@ class ConfigSchemaHandler {
           { color: 'orange' }
         );
         this.serverless.cli.log(' ');
-        if (!this.serverless.configurationInput.configValidationMode) {
-          this.serverless._logDeprecation(
-            'CONFIG_VALIDATION_MODE_DEFAULT',
-            'Starting with next major, Serverless will throw on configuration errors by default. ' +
-              'Adapt to this behavior now by adding "configValidationMode: error" to service configuration'
-          );
-        }
       }
     }
   }

From 10842513f0c5422f8627b652b6483523e0351a3c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 7 Oct 2021 12:01:33 +0200
Subject: [PATCH 0589/1101] feat(AWS Deploy): Remove `deploy -f` deprecation

It'll be re-added in context of v3, with more hacky approach to `deploy -f` support
---
 docs/deprecations.md  |  2 ++
 lib/plugins/deploy.js | 11 -----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 1523fadaf8f..9c3d8714ab3 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -66,6 +66,8 @@ Starting with `v3.0.0`, it will not be possible to disable default export names
 
 Deprecation code: `CLI_DEPLOY_FUNCTION_OPTION'`
 
+_Note: We've resigned from this deprecation in the context of v2 (it'll be re-added in the context of v3). We continue to advise using `deploy function -f` command instead of `deploy -f`._
+
 Starting with `v3.0.0`, `--function` or `-f` option for `deploy` command will be removed. In order to deploy a single function, please use `deploy function` command instead.
 
 <a name="CHANGE_OF_DEFAULT_RUNTIME_TO_NODEJS14X"><div>&nbsp;</div></a>
diff --git a/lib/plugins/deploy.js b/lib/plugins/deploy.js
index 401fbaddef2..e69fa124f4f 100644
--- a/lib/plugins/deploy.js
+++ b/lib/plugins/deploy.js
@@ -29,17 +29,6 @@ class Deploy {
     };
 
     this.hooks = {
-      'initialize': () => {
-        const isDeployCommand =
-          this.serverless.processedInput.commands.length === 1 &&
-          this.serverless.processedInput.commands[0] === 'deploy';
-        if (isDeployCommand && this.options.function) {
-          this.serverless._logDeprecation(
-            'CLI_DEPLOY_FUNCTION_OPTION',
-            'Starting with v3.0.0, `--function` or `-f` option for `deploy` command will be removed. In order to deploy a single function, please use `deploy function` command instead.'
-          );
-        }
-      },
       'before:deploy:deploy': async () => {
         const provider = this.serverless.service.provider.name;
         if (!this.serverless.getProvider(provider)) {

From 02be86ca4954553388ac70845d8ff3aca205abcd Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 7 Oct 2021 12:04:19 +0200
Subject: [PATCH 0590/1101] fix(AWS Deploy): Throw on attempt of extending not
 existing resource

---
 docs/deprecations.md                                       | 2 ++
 .../aws/package/lib/mergeCustomProviderResources.js        | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 9c3d8714ab3..4bdfc1b191c 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -382,6 +382,8 @@ Please use `provider.kmsKeyArn` and `functions[].kmsKeyArn`. `service.awsKmsKeyA
 
 Deprecation code: `RESOURCES_EXTENSIONS_REFERENCE_TO_NONEXISTENT_RESOURCE`
 
+_Note: This deprecation was replaced with a thrown error (adding a deprecation here, was a logical error). Please upgrade to latest version of the Framework_
+
 Starting with v3.0.0, extensions to nonexistent resources in `resources.extensions` will throw an error instead of passing silently.
 
 <a name="DISABLE_LOCAL_INSTALLATION_FALLBACK_SETTING"><div>&nbsp;</div></a>
diff --git a/lib/plugins/aws/package/lib/mergeCustomProviderResources.js b/lib/plugins/aws/package/lib/mergeCustomProviderResources.js
index 85a99005a35..314d5aa41e6 100644
--- a/lib/plugins/aws/package/lib/mergeCustomProviderResources.js
+++ b/lib/plugins/aws/package/lib/mergeCustomProviderResources.js
@@ -30,10 +30,9 @@ module.exports = {
       for (const [resourceName, resourceDefinition] of Object.entries(extensions)) {
         for (const [extensionAttributeName, value] of Object.entries(resourceDefinition)) {
           if (!template.Resources[resourceName]) {
-            template.Resources[resourceName] = {};
-            this.serverless._logDeprecation(
-              'RESOURCES_EXTENSIONS_REFERENCE_TO_NONEXISTENT_RESOURCE',
-              'Starting with next major version, extensions to nonexistent resources will throw an error instead of passing silently.'
+            throw new ServerlessError(
+              `Cannot extend "${resourceName}" resource, as it's not found in generated stack`,
+              'RESOURCE_EXTENSION_NOT_EXISTING'
             );
           }
 

From d071c5f74d2d1deca71edebc53d072a1c90d8bad Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 7 Oct 2021 12:11:59 +0200
Subject: [PATCH 0591/1101] refactor(AWS Deploy): Improve error message

---
 .../aws/package/lib/mergeCustomProviderResources.js        | 3 ++-
 .../aws/package/lib/mergeCustomProviderResources.test.js   | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/plugins/aws/package/lib/mergeCustomProviderResources.js b/lib/plugins/aws/package/lib/mergeCustomProviderResources.js
index 314d5aa41e6..664e3683541 100644
--- a/lib/plugins/aws/package/lib/mergeCustomProviderResources.js
+++ b/lib/plugins/aws/package/lib/mergeCustomProviderResources.js
@@ -72,7 +72,8 @@ module.exports = {
             // default includes any future attributes we don't know about yet.
             default:
               throw new ServerlessError(
-                `${resourceName}: Sorry, extending the ${extensionAttributeName} resource ` +
+                `Cannot extend "${resourceName}" resource, as extending ` +
+                  `the "${extensionAttributeName}" ` +
                   'attribute at this point is not supported. Feel free to propose support ' +
                   'for it in the Framework issue tracker: ' +
                   'https://github.com/serverless/serverless/issues',
diff --git a/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js b/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
index 75b868dfc6f..be0036bc0e8 100644
--- a/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
@@ -4,6 +4,7 @@ const path = require('path');
 const expect = require('chai').expect;
 const AwsPackage = require('../../../../../../../lib/plugins/aws/package/index');
 const Serverless = require('../../../../../../../lib/Serverless');
+const ServerlessError = require('../../../../../../../lib/serverless-error');
 
 describe('mergeCustomProviderResources', () => {
   let serverless;
@@ -299,9 +300,9 @@ describe('mergeCustomProviderResources', () => {
         },
       };
 
-      expect(() => awsPackage.mergeCustomProviderResources()).to.throw(
-        /SampleResource: Sorry, extending the unsupported resource attribute at this point is not supported/
-      );
+      expect(() => awsPackage.mergeCustomProviderResources())
+        .to.throw(ServerlessError)
+        .with.property('code', 'RESOURCE_EXTENSION_UNSUPPORTED_ATTRIBUTE');
     });
   });
 });

From f0970e04fa31774aa7400b4c620920dadcb3cfa2 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 7 Oct 2021 12:20:14 +0200
Subject: [PATCH 0592/1101] refactor(CLI): Modern logs for `rollback` command

---
 lib/plugins/aws/lib/updateStack.js |  3 ++-
 lib/plugins/aws/rollback.js        | 37 ++++++++++++++++++++++++++++--
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/lib/plugins/aws/lib/updateStack.js b/lib/plugins/aws/lib/updateStack.js
index 44e02721d58..adb97b92d40 100644
--- a/lib/plugins/aws/lib/updateStack.js
+++ b/lib/plugins/aws/lib/updateStack.js
@@ -138,12 +138,13 @@ module.exports = {
       cfData = await this.provider.request('CloudFormation', 'updateStack', params);
     } catch (e) {
       if (e.message.includes(NO_UPDATE_MESSAGE)) {
-        return;
+        return false;
       }
       throw e;
     }
 
     await this.monitorStack('update', cfData);
+    return true;
   },
 
   async updateStack() {
diff --git a/lib/plugins/aws/rollback.js b/lib/plugins/aws/rollback.js
index 1e8be2e9c86..e9c12eae9ce 100644
--- a/lib/plugins/aws/rollback.js
+++ b/lib/plugins/aws/rollback.js
@@ -5,6 +5,9 @@ const updateStack = require('./lib/updateStack');
 const monitorStack = require('./lib/monitorStack');
 const findAndGroupDeployments = require('./utils/findAndGroupDeployments');
 const ServerlessError = require('../../serverless-error');
+const { style, log, progress, legacy } = require('@serverless/utils/log');
+
+const mainProgress = progress.get('main');
 
 class AwsRollback {
   constructor(serverless, options) {
@@ -19,19 +22,49 @@ class AwsRollback {
 
       'rollback:rollback': async () => {
         if (!this.options.timestamp) {
-          this.serverless.cli.log(
+          legacy.log(
             [
               'Use a timestamp from the deploy list below to rollback to a specific version.',
               'Run `sls rollback -t YourTimeStampHere`',
             ].join('\n')
           );
+          log.notice(
+            'Select a timestamp from the deploy list below and run "sls rollback -t <timestamp>" to rollback your service to a specific version.'
+          );
+          log.notice();
           await this.serverless.pluginManager.spawn('deploy:list');
           return;
         }
 
+        log.notice();
+        log.notice(
+          `Rolling back ${this.serverless.service.service} to timestamp "${this.options.timestamp}"`
+        );
+        log.info(); // Ensure gap between verbose logging
+
         await this.setBucketName();
         await this.setStackToUpdate();
-        await this.updateStack();
+        mainProgress.notice('Validating', { isMainEvent: true });
+        const result = await this.updateStack();
+
+        log.notice();
+        if (result) {
+          log.notice.success(
+            `Service rolled back to timestamp "${this.options.timestamp}" ${style.aside(
+              `(${Math.floor(
+                (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+              )}s)`
+            )}`
+          );
+        } else {
+          log.notice.skip(
+            `No updates to be performed. Rollback skipped. ${style.aside(
+              `(${Math.floor(
+                (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+              )}s)`
+            )}`
+          );
+        }
       },
     };
   }

From 4cbc3424dabebb3b533d463b3ead523f2daf4a77 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 7 Oct 2021 12:37:17 +0200
Subject: [PATCH 0593/1101] refactor(CLI): Modern logs for `rollback function`
 command

---
 lib/plugins/aws/rollbackFunction.js | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/lib/plugins/aws/rollbackFunction.js b/lib/plugins/aws/rollbackFunction.js
index cb22afe44d3..a6fe8072214 100644
--- a/lib/plugins/aws/rollbackFunction.js
+++ b/lib/plugins/aws/rollbackFunction.js
@@ -4,6 +4,9 @@ const BbPromise = require('bluebird');
 const ServerlessError = require('../../serverless-error');
 const validate = require('./lib/validate');
 const fetch = require('node-fetch');
+const { style, log, progress, legacy } = require('@serverless/utils/log');
+
+const mainProgress = progress.get('main');
 
 class AwsRollbackFunction {
   constructor(serverless, options) {
@@ -30,7 +33,12 @@ class AwsRollbackFunction {
     // versions need to be string so that AWS understands it
     funcVersion = String(this.options['function-version']);
 
-    this.serverless.cli.log(`Rolling back function "${funcName}" to version "${funcVersion}"...`);
+    legacy.log(`Rolling back function "${funcName}" to version "${funcVersion}"...`);
+    log.notice();
+    log.notice(`Rolling back function ${funcName} to version "${funcVersion}"`);
+    log.info(); // Ensure gap between verbose logging
+
+    mainProgress.notice('Updating', { isMainEvent: true });
 
     const funcObj = this.serverless.service.getFunction(funcName);
 
@@ -68,7 +76,7 @@ class AwsRollbackFunction {
   async restoreFunction(zipBuffer) {
     const funcName = this.options.function;
 
-    this.serverless.cli.log('Restoring function...');
+    legacy.log('Restoring function...');
 
     const funcObj = this.serverless.service.getFunction(funcName);
 
@@ -78,7 +86,17 @@ class AwsRollbackFunction {
     };
 
     return this.provider.request('Lambda', 'updateFunctionCode', params).then(() => {
-      this.serverless.cli.log(`Successfully rolled back function "${this.options.function}"`);
+      log.notice();
+      log.notice.success(
+        `Successfully rolled back function ${funcName} to version "${
+          this.options['function-version']
+        }" ${style.aside(
+          `(${Math.floor(
+            (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+          )}s)`
+        )}`
+      );
+      legacy.log(`Successfully rolled back function "${this.options.function}"`);
     });
   }
 }

From 0c9941f45066c616352170e60db46a9c61b9bebe Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 6 Oct 2021 16:43:27 +0200
Subject: [PATCH 0594/1101] test: Partial refactoring of `invoke local` tests

---
 .../fixtures/programmatic/invocation/class.rb |   7 +
 .../programmatic/invocation/deadline_ms.rb    |   4 +
 .../programmatic/invocation/handler.py        |  12 +
 .../programmatic/invocation/handler.rb        |   6 +
 .../programmatic/invocation/remaining-time.js |   8 +-
 .../programmatic/invocation/remaining_time.py |  12 +
 .../programmatic/invocation/remaining_time.rb |   8 +
 .../programmatic/invocation/serverless.yml    |  20 +
 .../lib/plugins/aws/invokeLocal/index.test.js | 711 +++---------------
 9 files changed, 186 insertions(+), 602 deletions(-)
 create mode 100644 test/fixtures/programmatic/invocation/class.rb
 create mode 100644 test/fixtures/programmatic/invocation/deadline_ms.rb
 create mode 100644 test/fixtures/programmatic/invocation/handler.py
 create mode 100644 test/fixtures/programmatic/invocation/handler.rb
 create mode 100644 test/fixtures/programmatic/invocation/remaining_time.py
 create mode 100644 test/fixtures/programmatic/invocation/remaining_time.rb

diff --git a/test/fixtures/programmatic/invocation/class.rb b/test/fixtures/programmatic/invocation/class.rb
new file mode 100644
index 00000000000..a21ce74f05e
--- /dev/null
+++ b/test/fixtures/programmatic/invocation/class.rb
@@ -0,0 +1,7 @@
+module MyModule
+  class MyClass
+    def self.my_class_method(event:, context:)
+      {"source" => "rubyclass"}
+    end
+  end
+end
diff --git a/test/fixtures/programmatic/invocation/deadline_ms.rb b/test/fixtures/programmatic/invocation/deadline_ms.rb
new file mode 100644
index 00000000000..2f9b3556e81
--- /dev/null
+++ b/test/fixtures/programmatic/invocation/deadline_ms.rb
@@ -0,0 +1,4 @@
+def handler(event:, context:)
+  {"deadlineMs" => context.deadline_ms}
+end
+
diff --git a/test/fixtures/programmatic/invocation/handler.py b/test/fixtures/programmatic/invocation/handler.py
new file mode 100644
index 00000000000..96767b26d6f
--- /dev/null
+++ b/test/fixtures/programmatic/invocation/handler.py
@@ -0,0 +1,12 @@
+import json
+import os
+
+
+def handler(event, context):
+    return {
+        "statusCode": 200,
+        "body": json.dumps({
+            "message": "Invoked",
+            "env": dict(os.environ)
+        })
+    }
diff --git a/test/fixtures/programmatic/invocation/handler.rb b/test/fixtures/programmatic/invocation/handler.rb
new file mode 100644
index 00000000000..fb6b78590e8
--- /dev/null
+++ b/test/fixtures/programmatic/invocation/handler.rb
@@ -0,0 +1,6 @@
+require 'json'
+
+def handler(event:, context:)
+  {"statusCode" => 200, "body" => {"message" => "Invoked", "env" => ENV.to_hash}.to_json }
+end
+
diff --git a/test/fixtures/programmatic/invocation/remaining-time.js b/test/fixtures/programmatic/invocation/remaining-time.js
index 6e6352d6320..2028d1ff421 100644
--- a/test/fixtures/programmatic/invocation/remaining-time.js
+++ b/test/fixtures/programmatic/invocation/remaining-time.js
@@ -1,15 +1,15 @@
 'use strict';
 
 module.exports.handler = (event, context, callback) => {
-  const data = [context.remainingTimeInMillis()];
+  const data = [context.getRemainingTimeInMillis()];
   setTimeout(() => {
-    data.push(context.remainingTimeInMillis());
+    data.push(context.getRemainingTimeInMillis());
     setTimeout(() => {
-      data.push(context.remainingTimeInMillis());
+      data.push(context.getRemainingTimeInMillis());
       callback(null, {
         statusCode: 200,
         body: JSON.stringify({ data }),
       });
     });
-  }, 1000);
+  }, 100);
 };
diff --git a/test/fixtures/programmatic/invocation/remaining_time.py b/test/fixtures/programmatic/invocation/remaining_time.py
new file mode 100644
index 00000000000..25fffc7ed4d
--- /dev/null
+++ b/test/fixtures/programmatic/invocation/remaining_time.py
@@ -0,0 +1,12 @@
+from time import sleep
+
+
+def handler(event, context):
+    start = context.get_remaining_time_in_millis()
+    sleep(0.1)
+    stop = context.get_remaining_time_in_millis()
+
+    return {
+        "start": start,
+        "stop": stop
+    }
diff --git a/test/fixtures/programmatic/invocation/remaining_time.rb b/test/fixtures/programmatic/invocation/remaining_time.rb
new file mode 100644
index 00000000000..1ed784a06ec
--- /dev/null
+++ b/test/fixtures/programmatic/invocation/remaining_time.rb
@@ -0,0 +1,8 @@
+def handler(event:, context:)
+  start = context.get_remaining_time_in_millis()
+  sleep(0.1)
+  stop = context.get_remaining_time_in_millis()
+
+  {"start" => start, "stop" => stop}
+end
+
diff --git a/test/fixtures/programmatic/invocation/serverless.yml b/test/fixtures/programmatic/invocation/serverless.yml
index cbdef151e5a..b1a342fdbe6 100644
--- a/test/fixtures/programmatic/invocation/serverless.yml
+++ b/test/fixtures/programmatic/invocation/serverless.yml
@@ -28,3 +28,23 @@ functions:
   remainingTime:
     handler: remaining-time.handler
     timeout: 3
+  python:
+    runtime: python3.8
+    handler: handler.handler
+  pythonRemainingTime:
+    runtime: python3.8
+    handler: remaining_time.handler
+    timeout: 3
+  ruby:
+    runtime: ruby2.7
+    handler: handler.handler
+  rubyRemainingTime:
+    runtime: ruby2.7
+    handler: remaining_time.handler
+    timeout: 3
+  rubyDeadline:
+    runtime: ruby2.7
+    handler: deadline_ms.handler
+  rubyClass:
+    runtime: ruby2.7
+    handler: class.MyModule::MyClass.my_class_method
diff --git a/test/unit/lib/plugins/aws/invokeLocal/index.test.js b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
index e0985ebb4fd..10a7b5fc16e 100644
--- a/test/unit/lib/plugins/aws/invokeLocal/index.test.js
+++ b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
@@ -6,15 +6,14 @@ const path = require('path');
 const EventEmitter = require('events');
 const fse = require('fs-extra');
 const proxyquire = require('proxyquire');
-const stripAnsi = require('strip-ansi');
 const overrideEnv = require('process-utils/override-env');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
 const Serverless = require('../../../../../../lib/Serverless');
 const CLI = require('../../../../../../lib/classes/CLI');
 const { getTmpDirPath } = require('../../../../../utils/fs');
 const skipWithNotice = require('@serverless/test/skip-with-notice');
-const log = require('log').get('serverless:test');
 const runServerless = require('../../../../../utils/run-serverless');
+const spawnExt = require('child-process-ext/spawn');
 
 const tmpServicePath = __dirname;
 
@@ -478,24 +477,6 @@ describe('AwsInvokeLocal', () => {
       ).to.be.equal(true);
     });
 
-    it('should call invokeLocalRuby with class/module info when used', async () => {
-      awsInvokeLocal.options.functionObj.runtime = 'ruby2.5';
-      awsInvokeLocal.options.functionObj.handler = 'handler.MyModule::MyClass.hello';
-      await awsInvokeLocal.invokeLocal();
-      // NOTE: this is important so that tests on Windows won't fail
-      const runtime = process.platform === 'win32' ? 'ruby.exe' : 'ruby';
-      expect(invokeLocalRubyStub.calledOnce).to.be.equal(true);
-      expect(
-        invokeLocalRubyStub.calledWithExactly(
-          runtime,
-          'handler',
-          'MyModule::MyClass.hello',
-          {},
-          undefined
-        )
-      ).to.be.equal(true);
-    });
-
     it('should call invokeLocalDocker if using runtime provided', async () => {
       awsInvokeLocal.options.functionObj.runtime = 'provided';
       awsInvokeLocal.options.functionObj.handler = 'handler.foobar';
@@ -514,466 +495,6 @@ describe('AwsInvokeLocal', () => {
     });
   });
 
-  describe('#invokeLocalNodeJs', () => {
-    beforeEach(() => {
-      awsInvokeLocal.options = {
-        functionObj: {
-          name: '',
-        },
-      };
-
-      sinon.stub(serverless.cli, 'consoleLog');
-    });
-
-    afterEach(() => {
-      serverless.cli.consoleLog.restore();
-    });
-
-    describe('with done method', () => {
-      it('should exit with error exit code', () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        awsInvokeLocal.invokeLocalNodeJs('fixture/handlerWithSuccess', 'withErrorByDone');
-
-        expect(process.exitCode).to.be.equal(1);
-      });
-
-      it('should succeed if succeed', () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        awsInvokeLocal.invokeLocalNodeJs('fixture/handlerWithSuccess', 'withMessageByDone');
-
-        expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"Succeed"');
-      });
-    });
-
-    describe('with Lambda Proxy with application/json response', () => {
-      it('should succeed if succeed', () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        awsInvokeLocal.invokeLocalNodeJs('fixture/handlerWithSuccess', 'withMessageByLambdaProxy');
-
-        expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain(
-          '{\n    "statusCode": 200,\n    "headers": {\n        "Content-Type": "application/json"\n    },\n    "body": {\n        "result": true,\n        "message": "Whatever"\n    }\n}'
-        );
-      });
-    });
-
-    describe('context.remainingTimeInMillis', () => {
-      it('should become lower over time', () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        awsInvokeLocal.invokeLocalNodeJs('fixture/handlerWithSuccess', 'withRemainingTime');
-
-        const remainingTimes = JSON.parse(serverless.cli.consoleLog.lastCall.args[0]);
-        expect(remainingTimes.start).to.be.above(remainingTimes.stop);
-      });
-
-      it('should start with the timeout value', () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-        awsInvokeLocal.serverless.service.provider.timeout = 5;
-
-        awsInvokeLocal.invokeLocalNodeJs('fixture/handlerWithSuccess', 'withRemainingTime');
-
-        const remainingTimes = JSON.parse(serverless.cli.consoleLog.lastCall.args[0]);
-        expect(remainingTimes.start).to.match(/\d+/);
-      });
-
-      it('should never become negative', () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-        awsInvokeLocal.serverless.service.provider.timeout = 0.00001;
-
-        awsInvokeLocal.invokeLocalNodeJs('fixture/handlerWithSuccess', 'withRemainingTime');
-
-        const remainingTimes = JSON.parse(serverless.cli.consoleLog.lastCall.args[0]);
-        expect(remainingTimes.stop).to.eql(0);
-      });
-    });
-
-    describe('with extraServicePath', () => {
-      it('should succeed if succeed', () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-        awsInvokeLocal.options.extraServicePath = 'fixture';
-
-        awsInvokeLocal.invokeLocalNodeJs('handlerWithSuccess', 'withMessageByLambdaProxy');
-
-        expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain(
-          '{\n    "statusCode": 200,\n    "headers": {\n        "Content-Type": "application/json"\n    },\n    "body": {\n        "result": true,\n        "message": "Whatever"\n    }\n}'
-        );
-      });
-    });
-
-    it('should exit with error exit code', () => {
-      awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-      awsInvokeLocal.invokeLocalNodeJs('fixture/handlerWithError', 'withError');
-
-      expect(process.exitCode).to.be.equal(1);
-    });
-
-    it('should log Error instance when called back', () => {
-      awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-      awsInvokeLocal.invokeLocalNodeJs('fixture/handlerWithError', 'withError');
-      const logMessageContent = JSON.parse(stripAnsi(serverless.cli.consoleLog.lastCall.args[0]));
-
-      expect(logMessageContent.errorMessage).to.equal('failed');
-      expect(logMessageContent.errorType).to.equal('Error');
-      expect(logMessageContent.stackTrace[0]).to.equal('Error: failed');
-    });
-
-    it('should log Error object if handler crashes at initialization', async () => {
-      awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-      try {
-        await awsInvokeLocal.invokeLocalNodeJs(
-          'fixture/handlerWithInitializationError',
-          'withError'
-        );
-      } catch (error) {
-        if (!error.message.startsWith('Exception encountered when loading')) {
-          throw error;
-        }
-      }
-
-      expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('Initialization failed');
-    });
-
-    it('should log error when called back', () => {
-      awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-      awsInvokeLocal.invokeLocalNodeJs('fixture/handlerWithError', 'withMessage');
-
-      expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"errorMessage": "failed"');
-    });
-
-    it('should throw when module loading error', async () => {
-      awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-      try {
-        await awsInvokeLocal.invokeLocalNodeJs('fixture/handlerWithLoadingError', 'anyMethod');
-      } catch (error) {
-        if (!error.message.startsWith('Exception encountered when loading')) {
-          throw error;
-        }
-      }
-    });
-  });
-
-  describe('#invokeLocalNodeJs promise', () => {
-    beforeEach(() => {
-      awsInvokeLocal.options = {
-        functionObj: {
-          name: '',
-        },
-      };
-
-      sinon.stub(serverless.cli, 'consoleLog');
-    });
-
-    afterEach(() => {
-      serverless.cli.consoleLog.restore();
-    });
-
-    describe('with return', () => {
-      it('should exit with error exit code', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-        await awsInvokeLocal.invokeLocalNodeJs('fixture/asyncHandlerWithSuccess', 'withError');
-        expect(process.exitCode).to.be.equal(1);
-      });
-
-      it('should succeed if succeed', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        await awsInvokeLocal.invokeLocalNodeJs('fixture/asyncHandlerWithSuccess', 'withMessage');
-        expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"Succeed"');
-      });
-    });
-
-    describe('by context.done', () => {
-      it('success should trigger one response', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        await awsInvokeLocal.invokeLocalNodeJs(
-          'fixture/asyncHandlerWithSuccess',
-          'withMessageByDone'
-        );
-        expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"Succeed"');
-        const calls = serverless.cli.consoleLog.getCalls().reduce((acc, call) => {
-          return call.args[0].includes('Succeed') ? [call].concat(acc) : acc;
-        }, []);
-        expect(calls.length).to.equal(1);
-      });
-
-      it('error should trigger one response', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        await awsInvokeLocal.invokeLocalNodeJs(
-          'fixture/asyncHandlerWithSuccess',
-          'withErrorByDone'
-        );
-        expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"failed"');
-        expect(process.exitCode).to.be.equal(1);
-      });
-    });
-
-    describe('by callback method', () => {
-      it('should succeed once if succeed if by callback', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        await awsInvokeLocal.invokeLocalNodeJs(
-          'fixture/asyncHandlerWithSuccess',
-          'withMessageByCallback'
-        );
-        expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"Succeed"');
-        const calls = serverless.cli.consoleLog.getCalls().reduce((acc, call) => {
-          return call.args[0].includes('Succeed') ? [call].concat(acc) : acc;
-        }, []);
-        expect(calls.length).to.equal(1);
-      });
-    });
-
-    describe("by callback method even if callback isn't called syncronously", () => {
-      it('should succeed once if succeed if by callback', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        await awsInvokeLocal.invokeLocalNodeJs(
-          'fixture/asyncHandlerWithSuccess',
-          'withMessageAndDelayByCallback'
-        );
-        expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"Succeed"');
-        const calls = serverless.cli.consoleLog.getCalls().reduce((acc, call) => {
-          return call.args[0].includes('Succeed') ? [call].concat(acc) : acc;
-        }, []);
-        expect(calls.length).to.equal(1);
-      });
-    });
-
-    describe('with Lambda Proxy with application/json response', () => {
-      it('should succeed if succeed', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        await awsInvokeLocal.invokeLocalNodeJs(
-          'fixture/asyncHandlerWithSuccess',
-          'withMessageByLambdaProxy'
-        );
-        expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain(
-          '{\n    "statusCode": 200,\n    "headers": {\n        "Content-Type": "application/json"\n    },\n    "body": {\n        "result": true,\n        "message": "Whatever"\n    }\n}'
-        );
-      });
-    });
-
-    describe('context.remainingTimeInMillis', () => {
-      it('should become lower over time', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        await awsInvokeLocal.invokeLocalNodeJs(
-          'fixture/asyncHandlerWithSuccess',
-          'withRemainingTime'
-        );
-        const remainingTimes = JSON.parse(serverless.cli.consoleLog.lastCall.args[0]);
-        expect(remainingTimes.start).to.be.above(remainingTimes.stop);
-      });
-
-      it('should start with the timeout value', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-        awsInvokeLocal.serverless.service.provider.timeout = 5;
-
-        await awsInvokeLocal.invokeLocalNodeJs(
-          'fixture/asyncHandlerWithSuccess',
-          'withRemainingTime'
-        );
-        const remainingTimes = JSON.parse(serverless.cli.consoleLog.lastCall.args[0]);
-        expect(remainingTimes.start).to.match(/\d+/);
-      });
-
-      it('should never become negative', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-        awsInvokeLocal.serverless.service.provider.timeout = 0.00001;
-
-        await awsInvokeLocal.invokeLocalNodeJs(
-          'fixture/asyncHandlerWithSuccess',
-          'withRemainingTime'
-        );
-        const remainingTimes = JSON.parse(serverless.cli.consoleLog.lastCall.args[0]);
-        expect(remainingTimes.stop).to.eql(0);
-      });
-    });
-
-    describe('with extraServicePath', () => {
-      it('should succeed if succeed', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-        awsInvokeLocal.options.extraServicePath = 'fixture';
-
-        await awsInvokeLocal.invokeLocalNodeJs(
-          'asyncHandlerWithSuccess',
-          'withMessageByLambdaProxy'
-        );
-        expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain(
-          '{\n    "statusCode": 200,\n    "headers": {\n        "Content-Type": "application/json"\n    },\n    "body": {\n        "result": true,\n        "message": "Whatever"\n    }\n}'
-        );
-      });
-    });
-
-    it('should exit with error exit code', async () => {
-      awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-      await awsInvokeLocal.invokeLocalNodeJs('fixture/asyncHandlerWithError', 'withError');
-      expect(process.exitCode).to.be.equal(1);
-    });
-
-    it('should log Error instance when called back', async () => {
-      awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-      await awsInvokeLocal.invokeLocalNodeJs('fixture/asyncHandlerWithError', 'withError');
-      expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"errorMessage": "failed"');
-      expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"errorType": "Error"');
-    });
-
-    it('should log error', async () => {
-      awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-      await awsInvokeLocal.invokeLocalNodeJs('fixture/asyncHandlerWithError', 'withMessage');
-      expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"errorMessage": "failed"');
-    });
-
-    it('should log error when error is returned', async () => {
-      awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-      await awsInvokeLocal.invokeLocalNodeJs('fixture/asyncHandlerWithError', 'returnsError');
-      expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"errorMessage": "failed"');
-    });
-  });
-
-  describe('#invokeLocalPython', () => {
-    beforeEach(() => {
-      awsInvokeLocal.options = {
-        functionObj: {
-          name: '',
-        },
-      };
-
-      sinon.stub(serverless.cli, 'consoleLog');
-    });
-
-    const afterEachCallback = () => {
-      serverless.cli.consoleLog.restore();
-    };
-    afterEach(afterEachCallback);
-
-    describe('context.remainingTimeInMillis', () => {
-      it('should become lower over time', async function () {
-        // skipping in CI for now due to handler loading issues
-        // in the Windows machine on Travis CI
-        if (process.env.CI) {
-          this.skip();
-        }
-
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-        process.chdir(tmpServicePath);
-
-        try {
-          await awsInvokeLocal.invokeLocalPython(
-            'python2.7',
-            'fixture/handler',
-            'withRemainingTime'
-          );
-
-          log.debug('test target %o', serverless.cli.consoleLog.lastCall.args);
-          const remainingTimes = JSON.parse(serverless.cli.consoleLog.lastCall.args[0]);
-          expect(remainingTimes.start).to.be.above(remainingTimes.stop);
-        } catch (error) {
-          if (error.code === 'ENOENT' && error.path === 'python2') {
-            skipWithNotice(this, 'Python runtime is not installed', afterEachCallback);
-          }
-          throw error;
-        }
-      });
-    });
-  });
-
-  describe('#invokeLocalRuby', () => {
-    let curdir;
-
-    beforeEach(() => {
-      curdir = process.cwd();
-      process.chdir(tmpServicePath);
-      awsInvokeLocal.options = {
-        functionObj: {
-          name: '',
-        },
-      };
-
-      sinon.stub(serverless.cli, 'consoleLog');
-    });
-
-    const afterEachCallback = () => {
-      serverless.cli.consoleLog.restore();
-      process.chdir(curdir);
-    };
-    afterEach(afterEachCallback);
-
-    describe('context.remainingTimeInMillis', () => {
-      it('should become lower over time', async function () {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        try {
-          await awsInvokeLocal.invokeLocalRuby('ruby', 'fixture/handler', 'withRemainingTime');
-
-          log.debug('test target %o', serverless.cli.consoleLog.lastCall.args);
-          const remainingTimes = JSON.parse(serverless.cli.consoleLog.lastCall.args[0]);
-          expect(remainingTimes.start).to.be.above(remainingTimes.stop);
-        } catch (error) {
-          if (error.code === 'ENOENT' && error.path === 'ruby') {
-            skipWithNotice(this, 'Ruby runtime is not installed', afterEachCallback);
-          }
-          throw error;
-        }
-      });
-    });
-
-    describe('calling a class method', () => {
-      it('should execute', async function () {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        try {
-          await awsInvokeLocal.invokeLocalRuby(
-            'ruby',
-            'fixture/handler',
-            'MyModule::MyClass.my_class_method'
-          );
-          log.debug('test target %o', serverless.cli.consoleLog.lastCall.args);
-          const result = JSON.parse(serverless.cli.consoleLog.lastCall.args[0]);
-          expect(result.foo).to.eq('bar');
-        } catch (error) {
-          if (error.code === 'ENOENT' && error.path === 'ruby') {
-            skipWithNotice(this, 'Ruby runtime is not installed', afterEachCallback);
-          }
-          throw error;
-        }
-      });
-    });
-
-    describe('context.deadlineMs', () => {
-      it('should return deadline', async function () {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        try {
-          await awsInvokeLocal.invokeLocalRuby('ruby', 'fixture/handler', 'withDeadlineMs');
-
-          log.debug('test target %o', serverless.cli.consoleLog.lastCall.args);
-          const result = JSON.parse(serverless.cli.consoleLog.lastCall.args[0]);
-          expect(result.deadlineMs).to.be.closeTo(Date.now() + 6000, 2000);
-        } catch (error) {
-          if (error.code === 'ENOENT' && error.path === 'ruby') {
-            skipWithNotice(this, 'Ruby runtime is not installed', afterEachCallback);
-          }
-          throw error;
-        }
-      });
-    });
-  });
-
   describe('#callJavaBridge()', () => {
     let invokeLocalSpawnStubbed;
     beforeEach(() => {
@@ -1529,203 +1050,197 @@ describe('test/unit/lib/plugins/aws/invokeLocal/index.test.js', () => {
   describe('Node.js', () => {
     testRuntime('callback');
 
-    // All tested with individual runServerless run
-    xit('TODO: should support success resolution via async function', async () => {
-      // Confirm outcome on { stdout }
-      await runServerless({
+    it('should support success resolution via async function', async () => {
+      const { stdoutData } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'async' },
       });
 
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L762-L767
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L830-L840
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L881-L892
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L917-L922
+      expect(stdoutData).to.include('Invoked');
     });
-    xit('TODO: should support success resolution via context.done', async () => {
-      // Confirm outcome on { stdout }
-      await runServerless({
+
+    it('should support success resolution via context.done', async () => {
+      const { stdoutData } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'contextDone' },
       });
 
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L609-L625
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L771-L783
+      expect(stdoutData).to.include('Invoked');
     });
-    xit('TODO: should support success resolution via context.succeed', async () => {
-      // Confirm outcome on { stdout }
-      await runServerless({
+
+    it('should support success resolution via context.succeed', async () => {
+      const { stdoutData } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'contextSucceed' },
       });
+
+      expect(stdoutData).to.include('Invoked');
     });
-    xit('TODO: should support immediate failure at initialization', async () => {
+
+    it('should support immediate failure at initialization', async () => {
       await expect(
         runServerless({
           fixture: 'invocation',
           command: 'invoke local',
           options: { function: 'initFail' },
         })
-      ).to.eventually.be.rejected.and.have.property('code', 'TODO');
-
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L702-L717
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L727-L737
+      ).to.eventually.be.rejected.and.have.property(
+        'code',
+        'INVOKE_LOCAL_LAMBDA_INITIALIZATION_FAILED'
+      );
     });
-    xit('TODO: should support immediate failure at invocation', async () => {
+
+    it('should support immediate failure at invocation', async () => {
       await expect(
         runServerless({
           fixture: 'invocation',
           command: 'invoke local',
           options: { function: 'invocationFail' },
         })
-      ).to.eventually.be.rejected.and.have.property('code', 'TODO');
+      ).to.eventually.be.rejectedWith('Invocation fail');
     });
-    xit('TODO: should support failure resolution via async function', async () => {
-      await expect(
-        runServerless({
-          fixture: 'invocation',
-          command: 'invoke local',
-          options: { function: 'async', data: '{"shouldFail":true}' },
-        })
-      ).to.eventually.be.rejected.and.have.property('code', 'TODO');
 
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L683-L689
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L719-L725
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L756-L760
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L895-L915
+    it('should support failure resolution via async function', async () => {
+      const { stdoutData } = await runServerless({
+        fixture: 'invocation',
+        command: 'invoke local',
+        options: { function: 'async', data: '{"shouldFail":true}' },
+      });
+
+      expect(stdoutData).to.include('Failed on request');
     });
-    xit('TODO: should support failure resolution via callback', async () => {
-      await expect(
-        runServerless({
-          fixture: 'invocation',
-          command: 'invoke local',
-          options: { function: 'callback', data: '{"shouldFail":true}' },
-        })
-      ).to.eventually.be.rejected.and.have.property('code', 'TODO');
 
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L691-L700
+    it('should support failure resolution via callback', async () => {
+      const { stdoutData } = await runServerless({
+        fixture: 'invocation',
+        command: 'invoke local',
+        options: { function: 'callback', data: '{"shouldFail":true}' },
+      });
+
+      expect(stdoutData).to.include('Failed on request');
     });
-    xit('TODO: should support failure resolution via context.done', async () => {
-      await expect(
-        runServerless({
-          fixture: 'invocation',
-          command: 'invoke local',
-          options: { function: 'contextDone', data: '{"shouldFail":true}' },
-        })
-      ).to.eventually.be.rejected.and.have.property('code', 'TODO');
 
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L785-L794
+    it('should support failure resolution via context.done', async () => {
+      const { stdoutData } = await runServerless({
+        fixture: 'invocation',
+        command: 'invoke local',
+        options: { function: 'contextDone', data: '{"shouldFail":true}' },
+      });
+
+      expect(stdoutData).to.include('Failed on request');
     });
-    xit('TODO: should support failure resolution via context.fail', async () => {
-      await expect(
-        runServerless({
-          fixture: 'invocation',
-          command: 'invoke local',
-          options: { function: 'contextSucceed', data: '{"shouldFail":true}' },
-        })
-      ).to.eventually.be.rejected.and.have.property('code', 'TODO');
+
+    it('should support failure resolution via context.fail', async () => {
+      const { stdoutData } = await runServerless({
+        fixture: 'invocation',
+        command: 'invoke local',
+        options: { function: 'contextSucceed', data: '{"shouldFail":true}' },
+      });
+
+      expect(stdoutData).to.include('Failed on request');
     });
-    xit('TODO: should recognize first resolution', async () => {
-      // Confirm outcome on { stdout }
-      await runServerless({
+
+    it('should recognize first resolution', async () => {
+      const { stdoutData: firstRunStdout } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'doubledResolutionCallbackFirst' },
       });
-      // Confirm outcome on { stdout }
-      await runServerless({
+      const { stdoutData: secondRunStdout } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'doubledResolutionPromiseFirst' },
       });
 
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L798-L810
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L814-L826
+      expect(firstRunStdout).to.include('callback');
+      expect(secondRunStdout).to.include('promise');
     });
-    xit('TODO: should support context.remainingTimeInMillis()', async () => {
-      // Confirm outcome on { stdout }
-      await runServerless({
+
+    it('should support context.remainingTimeInMillis()', async () => {
+      const { stdoutData } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'remainingTime' },
       });
 
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L639-L668
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L843-L878
+      const body = JSON.parse(stdoutData).body;
+      const [firstRemainingMs, secondRemainingMs, thirdRemainingMs] = JSON.parse(body).data;
+      expect(firstRemainingMs).to.be.lte(3000);
+      expect(secondRemainingMs).to.be.lte(2900);
+      expect(thirdRemainingMs).to.be.lt(secondRemainingMs);
     });
   });
 
-  describe.skip('Python', () => {
-    // If Python runtime is not installed, skip below tests by:
-    // - Invoke skip with notice as here;
-    // https://github.com/serverless/serverless/blob/2d6824cde531ba56758f441b39b5ab018702e866/lib/plugins/aws/invokeLocal/index.test.js#L1001-L1003
-    // - Ensure all other tests are skipped
-    testRuntime('python'); // TODO: Configure python handler
+  describe('Python', () => {
+    before(async function () {
+      const executable = process.platform === 'win32' ? 'python.exe' : 'python';
+      try {
+        await spawnExt(executable, ['--version']);
+      } catch (err) {
+        skipWithNotice(this, 'Python runtime is not installed');
+      }
+    });
+
+    testRuntime('python');
     describe('context.remainingTimeInMillis', () => {
-      it('TODO: should support context.get_remaining_time_in_millis()', async () => {
-        // Confirm outcome on { stdout }
-        await runServerless({
+      it('should support context.get_remaining_time_in_millis()', async () => {
+        const { stdoutData } = await runServerless({
           fixture: 'invocation',
           command: 'invoke local',
-          options: { function: 'pythonRemainingTime' }, // TODO: Configure python handler
+          options: { function: 'pythonRemainingTime' },
         });
 
-        // Replaces
-        // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L941-L969
+        const { start, stop } = JSON.parse(stdoutData);
+        expect(start).to.lte(3000);
+        expect(stop).to.lte(2900);
       });
     });
   });
 
-  describe.skip('Ruby', () => {
-    // If Ruby runtime is not installed, skip below tests by:
-    // - Invoke skip with notice as here;
-    // https://github.com/serverless/serverless/blob/2d6824cde531ba56758f441b39b5ab018702e866/lib/plugins/aws/invokeLocal/index.test.js#L1043-L1045
-    // - Ensure all other tests are skipped
-    testRuntime('ruby'); // TODO: Configure ruby handler
-    it('TODO: should suppurt class/module address in handler for "ruby*" runtime', async () => {
-      // Confirm outcome on { stdout }
-      await runServerless({
+  describe('Ruby', () => {
+    before(async function () {
+      const executable = process.platform === 'win32' ? 'ruby.exe' : 'ruby';
+      try {
+        await spawnExt(executable, ['--version']);
+      } catch (err) {
+        skipWithNotice(this, 'Ruby runtime is not installed');
+      }
+    });
+
+    testRuntime('ruby');
+
+    it('should support class/module address in handler for "ruby*" runtime', async () => {
+      const { stdoutData } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
-        options: { function: 'rubyClass' }, // TODO: Configure ruby handler
+        options: { function: 'rubyClass' },
       });
 
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L549-L565
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L1012-L1032
+      expect(stdoutData).to.include('rubyclass');
     });
-    it('TODO: should support context.get_remaining_time_in_millis()', async () => {
-      // Confirm outcome on { stdout }
-      await runServerless({
+    it('should support context.get_remaining_time_in_millis()', async () => {
+      const { stdoutData } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
-        options: { function: 'rubyRemainingTime' }, // TODO: Configure ruby handler
+        options: { function: 'rubyRemainingTime' },
       });
 
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L993-L1010
+      const { start, stop } = JSON.parse(stdoutData);
+      expect(start).to.lte(6000);
+      expect(stop).to.lte(5900);
     });
-    it('TODO: should support context.deadline_ms', async () => {
-      // Confirm outcome on { stdout }
-      await runServerless({
+    it('should support context.deadline_ms', async () => {
+      const { stdoutData } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
-        options: { function: 'rubyDeadline' }, // TODO: Configure ruby handler
+        options: { function: 'rubyDeadline' },
       });
 
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L1034-L1051
+      const { deadlineMs } = JSON.parse(stdoutData);
+      expect(deadlineMs).to.be.gt(Date.now());
     });
   });
 

From 82dd1e4c70d335cc10485b5ac20467447809941b Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 6 Oct 2021 16:45:42 +0200
Subject: [PATCH 0595/1101] refactor(CLI): Modern logs for `invoke local`
 command

---
 lib/plugins/aws/invokeLocal/index.js          | 99 ++++++++++++++-----
 lib/plugins/aws/package/compile/layers.js     |  4 +-
 .../lib/plugins/aws/invokeLocal/index.test.js |  2 +-
 3 files changed, 78 insertions(+), 27 deletions(-)

diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invokeLocal/index.js
index 7936e767304..cda97f72a29 100644
--- a/lib/plugins/aws/invokeLocal/index.js
+++ b/lib/plugins/aws/invokeLocal/index.js
@@ -5,6 +5,7 @@ const os = require('os');
 const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const path = require('path');
+const stripAnsi = require('strip-ansi');
 const validate = require('../lib/validate');
 const chalk = require('chalk');
 const stdin = require('get-stdin');
@@ -23,9 +24,13 @@ const isStandalone = require('../../../utils/isStandaloneExecutable');
 const ensureArtifact = require('../../../utils/ensureArtifact');
 const resolveCfImportValue = require('../utils/resolveCfImportValue');
 const resolveCfRefValue = require('../utils/resolveCfRefValue');
+const { legacy, writeText, progress, log } = require('@serverless/utils/log');
 
 const cachePath = path.join(cachedir('serverless'), 'invokeLocal');
 
+const mainProgress = progress.get('main');
+const dockerProgress = progress.get('invokeLocalDocker');
+
 const ensureRuntimeWrappers = isStandalone
   ? async () =>
       ensureArtifact('runtimeWrappers/validationFile', async (runtimeCachePath) => {
@@ -310,7 +315,8 @@ class AwsInvokeLocal {
   async pullDockerImage() {
     const runtime = this.getRuntime();
 
-    this.serverless.cli.log('Downloading base Docker image...');
+    legacy.log('Downloading base Docker image...');
+    dockerProgress.notice('Downloading base Docker image');
     return spawnExt('docker', [
       'pull',
       '--disable-content-trust=false',
@@ -326,6 +332,7 @@ class AwsInvokeLocal {
     return Promise.all(
       (this.options.functionObj.layers || this.serverless.service.provider.layers || []).map(
         async (layer) => {
+          const layerProgress = progress.get(`layer:${layer}`);
           if (layer.Ref) {
             const targetLayer = layers[layer.Ref];
 
@@ -338,7 +345,8 @@ class AwsInvokeLocal {
               if (exists) {
                 return layerArtifactContentPath;
               }
-              this.serverless.cli.log(`Unziping ${layer.Ref}...`);
+              legacy.log(`Unzipping ${layer.Ref}...`);
+              layerProgress.notice(`Unzipping ${layer.Ref}`);
               await decompress(targetLayer.package.artifact, layerArtifactContentPath);
               return layerArtifactContentPath;
             }
@@ -354,7 +362,8 @@ class AwsInvokeLocal {
           if (!exists) {
             const cacheExists = await dirExists(layerContentsCachePath);
             if (!cacheExists) {
-              this.serverless.cli.log(`Downloading layer ${layer}...`);
+              legacy.log(`Downloading layer ${layer}...`);
+              layerProgress.notice(`Downloading layer ${layer}`);
               await ensureDir(path.join(layerContentsCachePath));
 
               const layerInfo = await this.provider.request('Lambda', 'getLayerVersion', {
@@ -368,6 +377,7 @@ class AwsInvokeLocal {
             }
           }
           await fse.copy(layerContentsCachePath, layerContentsPath);
+          layerProgress.remove();
           return layerContentsPath;
         }
       )
@@ -405,13 +415,15 @@ class AwsInvokeLocal {
       ensureDir(path.join(cachePath, 'dockerfiles', runtime)),
     ]);
 
-    this.serverless.cli.log('Writing Dockerfile...');
+    dockerProgress.notice('Writing Dockerfile');
+    legacy.log('Writing Dockerfile...');
     await Promise.all([
       fsp.writeFile(dockerfilePath, dockerFileContent),
       fsp.writeFile(dockerfileCachePath, dockerFileContent),
     ]);
 
-    this.serverless.cli.log('Building Docker image...');
+    dockerProgress.notice('Building Docker image');
+    legacy.log('Building Docker image...');
     try {
       await spawnExt('docker', [
         'build',
@@ -424,12 +436,15 @@ class AwsInvokeLocal {
       return imageName;
     } catch (err) {
       if (err.stdBuffer) {
-        process.stdout.write(err.stdBuffer);
+        legacy.consoleLog(err.stdBuffer.toString().trimRight());
+        log.info(stripAnsi(err.stdBuffer.toString().trimRight()));
       }
       throw new ServerlessError(
         `Failed to build docker image (exit code ${err.code}})`,
         'DOCKER_IMAGE_BUILD_FAILED'
       );
+    } finally {
+      dockerProgress.remove();
     }
   }
 
@@ -486,6 +501,7 @@ class AwsInvokeLocal {
     const runtime = this.getRuntime();
 
     await this.ensurePackage();
+    mainProgress.notice('Invoking function locally', { isMainEvent: true });
     await this.checkDockerDaemonStatus();
     const results = await Promise.all([
       this.checkDockerImage(`lambci/lambda:${runtime}`).then((exists) => {
@@ -530,12 +546,14 @@ class AwsInvokeLocal {
     try {
       const { stdBuffer } = await spawnExt('docker', dockerArgs);
       if (stdBuffer) {
-        process.stdout.write(stdBuffer);
+        legacy.consoleLog(stdBuffer.toString().trimRight());
+        writeText(stripAnsi(stdBuffer.toString().trimRight()));
       }
       return imageName;
     } catch (err) {
       if (err.stdBuffer) {
-        process.stdout.write(err.stdBuffer);
+        legacy.consoleLog(err.stdBuffer.toString().trimRight());
+        writeText(stripAnsi(err.stdBuffer.toString().trimRight()));
       }
       throw new ServerlessError(
         `Failed to run docker for ${runtime} image (exit code ${err.code}})`,
@@ -587,8 +605,14 @@ class AwsInvokeLocal {
         { env: process.env },
         { shell: true }
       );
-      python.stdout.on('data', (buf) => this.serverless.cli.consoleLog(buf.toString()));
-      python.stderr.on('data', (buf) => this.serverless.cli.consoleLog(buf.toString()));
+      python.stdout.on('data', (buf) => {
+        legacy.consoleLog(buf.toString());
+        writeText(buf.toString());
+      });
+      python.stderr.on('data', (buf) => {
+        legacy.consoleLog(buf.toString());
+        writeText(buf.toString());
+      });
       python.on('close', () => resolve());
       let isRejected = false;
       python.on('error', (error) => {
@@ -619,6 +643,7 @@ class AwsInvokeLocal {
         { shell: true }
       );
 
+      // TODO: CONSIDER IT AS A WARNING
       this.serverless.cli.log(
         [
           'In order to get human-readable output,',
@@ -626,8 +651,14 @@ class AwsInvokeLocal {
         ].join('')
       );
 
-      java.stdout.on('data', (buf) => this.serverless.cli.consoleLog(buf.toString()));
-      java.stderr.on('data', (buf) => this.serverless.cli.consoleLog(buf.toString()));
+      java.stdout.on('data', (buf) => {
+        legacy.consoleLog(buf.toString());
+        writeText(buf.toString());
+      });
+      java.stderr.on('data', (buf) => {
+        legacy.consoleLog(buf.toString());
+        writeText(buf.toString());
+      });
       java.on('close', () => resolve());
       let isRejected = false;
       java.on('error', (error) => {
@@ -673,19 +704,20 @@ class AwsInvokeLocal {
       await fsp.stat(executablePath);
     } catch (err) {
       return new Promise((resolve, reject) => {
+        const javaBridgeProgress = progress.get('javaBridge');
+        javaBridgeProgress.notice('Building Java bridge', { isMainEvent: true });
         const mvn = spawn('mvn', ['package', '-f', path.join(javaBridgePath, 'pom.xml')], {
           shell: true,
         });
 
-        this.serverless.cli.log('Building Java bridge, first invocation might take a bit longer.');
+        legacy.log('Building Java bridge, first invocation might take a bit longer.');
 
-        mvn.stderr.on('data', (buf) =>
-          this.serverless.cli.consoleLog(`mvn(stderr) - ${buf.toString()}`)
-        );
+        mvn.stderr.on('data', (buf) => {
+          legacy.consoleLog(`mvn(stderr) - ${buf.toString()}`);
+          log.info(`mvn(stderr) - ${buf.toString()}`);
+        });
         const chunk = [];
-        if (process.env.SLS_DEBUG) {
-          mvn.stdout.on('data', (buf) => chunk.push(buf));
-        }
+        mvn.stdout.on('data', (buf) => chunk.push(buf));
 
         let isRejected = false;
         mvn.on('error', (error) => {
@@ -696,6 +728,7 @@ class AwsInvokeLocal {
         });
 
         mvn.on('exit', (code, signal) => {
+          javaBridgeProgress.remove();
           if (code === 0) {
             resolve(this.callJavaBridge(artifactPath, className, handlerName, input));
           } else if (!isRejected) {
@@ -705,9 +738,16 @@ class AwsInvokeLocal {
                 .join('')
                 .split(/\n/)
                 .forEach((line) => {
-                  this.serverless.cli.consoleLog(`mvn(stdout) - ${line}`);
+                  legacy.consoleLog(`mvn(stdout) - ${line}`);
                 });
             }
+            chunk
+              .map((elem) => elem.toString())
+              .join('')
+              .split(/\n/)
+              .forEach((line) => {
+                log.info(`mvn(stdout) - ${line}`);
+              });
             isRejected = true;
             reject(
               new ServerlessError(
@@ -739,8 +779,14 @@ class AwsInvokeLocal {
         env: process.env,
         shell: true,
       });
-      ruby.stdout.on('data', (buf) => this.serverless.cli.consoleLog(buf.toString()));
-      ruby.stderr.on('data', (buf) => this.serverless.cli.consoleLog(buf.toString()));
+      ruby.stdout.on('data', (buf) => {
+        legacy.consoleLog(buf.toString());
+        writeText(buf.toString());
+      });
+      ruby.stderr.on('data', (buf) => {
+        legacy.consoleLog(buf.toString());
+        writeText(buf.toString());
+      });
       ruby.on('close', () => resolve());
       let isRejected = false;
       ruby.on('error', (error) => {
@@ -773,7 +819,8 @@ class AwsInvokeLocal {
       const handlersContainer = require(pathToHandler);
       lambda = handlersContainer[handlerName];
     } catch (error) {
-      this.serverless.cli.consoleLog(chalk.red(inspect(error)));
+      legacy.consoleLog(chalk.red(inspect(error)));
+      log.error(inspect(error));
       throw new ServerlessError(
         `Exception encountered when loading ${pathToHandler}`,
         'INVOKE_LOCAL_LAMBDA_INITIALIZATION_FAILED'
@@ -801,7 +848,8 @@ class AwsInvokeLocal {
         };
       }
 
-      this.serverless.cli.consoleLog(chalk.red(JSON.stringify(errorResult, null, 4)));
+      legacy.consoleLog(chalk.red(JSON.stringify(errorResult, null, 4)));
+      writeText(JSON.stringify(errorResult, null, 4));
       process.exitCode = 1;
     }
 
@@ -834,7 +882,8 @@ class AwsInvokeLocal {
         }
       }
 
-      this.serverless.cli.consoleLog(JSON.stringify(result, null, 4));
+      legacy.consoleLog(JSON.stringify(result, null, 4));
+      writeText(JSON.stringify(result, null, 4));
     }
 
     return new Promise((resolve) => {
diff --git a/lib/plugins/aws/package/compile/layers.js b/lib/plugins/aws/package/compile/layers.js
index 766c3adf940..c96530051c5 100644
--- a/lib/plugins/aws/package/compile/layers.js
+++ b/lib/plugins/aws/package/compile/layers.js
@@ -6,6 +6,7 @@ const _ = require('lodash');
 const path = require('path');
 const fsAsync = BbPromise.promisifyAll(require('fs'));
 const getLambdaLayerArtifactPath = require('../../utils/getLambdaLayerArtifactPath');
+const { legacy, log } = require('@serverless/utils/log');
 
 class AwsCompileLayers {
   constructor(serverless, options) {
@@ -151,7 +152,8 @@ class AwsCompileLayers {
         layerResource.Properties.Content.S3Key = lastS3Key.OutputValue;
         const layerObject = this.serverless.service.getLayer(layerName);
         layerObject.artifactAlreadyUploaded = true;
-        this.serverless.cli.log(`Layer ${layerName} is already uploaded.`);
+        legacy.log(`Layer ${layerName} is already uploaded.`);
+        log.info(`Layer ${layerName} is already uploaded.`);
       },
       (e) => {
         if (e.message.includes('does not exist')) {
diff --git a/test/unit/lib/plugins/aws/invokeLocal/index.test.js b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
index 10a7b5fc16e..b325ff97d89 100644
--- a/test/unit/lib/plugins/aws/invokeLocal/index.test.js
+++ b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
@@ -1170,7 +1170,7 @@ describe('test/unit/lib/plugins/aws/invokeLocal/index.test.js', () => {
       const [firstRemainingMs, secondRemainingMs, thirdRemainingMs] = JSON.parse(body).data;
       expect(firstRemainingMs).to.be.lte(3000);
       expect(secondRemainingMs).to.be.lte(2900);
-      expect(thirdRemainingMs).to.be.lt(secondRemainingMs);
+      expect(thirdRemainingMs).to.be.lte(secondRemainingMs);
     });
   });
 

From 05f937f2e731e641e93e9db4af4acd58dc117422 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 7 Oct 2021 14:57:31 +0200
Subject: [PATCH 0596/1101] refactor(CLI): Modern logs for `create` command

---
 lib/plugins/create/create.js                | 43 +++++++++++++++++----
 test/unit/lib/plugins/create/create.test.js | 40 -------------------
 2 files changed, 36 insertions(+), 47 deletions(-)

diff --git a/lib/plugins/create/create.js b/lib/plugins/create/create.js
index d25978d8b41..507db09a5d1 100644
--- a/lib/plugins/create/create.js
+++ b/lib/plugins/create/create.js
@@ -14,6 +14,7 @@ const download = require('../../utils/downloadTemplateFromRepo');
 const renameService = require('../../utils/renameService').renameService;
 const copyDirContentsSync = require('../../utils/fs/copyDirContentsSync');
 const dirExistsSync = require('../../utils/fs/dirExistsSync');
+const { legacy, progress, log, style } = require('@serverless/utils/log');
 
 const handleServiceCreationError = (error) => {
   if (error.code !== 'EACCESS') throw error;
@@ -25,6 +26,8 @@ const handleServiceCreationError = (error) => {
   throw new ServerlessError(errorMessage, 'UNABLE_TO_CREATE_SERVICE');
 };
 
+const mainProgress = progress.get('main');
+
 class Create {
   constructor(serverless, options) {
     this.serverless = serverless;
@@ -42,11 +45,13 @@ class Create {
   }
 
   async create() {
-    this.serverless.cli.log('Generating boilerplate...');
+    legacy.log('Generating boilerplate...');
 
     if ('template' in this.options) {
       return this.createFromTemplate();
     } else if ('template-url' in this.options) {
+      // We only show progress in case of setup from `template-url` as setting up from local files is fast
+      mainProgress.notice('Setting up new project', { isMainEvent: true });
       return download
         .downloadTemplateFromRepo(
           this.options['template-url'],
@@ -63,7 +68,17 @@ class Create {
             }`,
           ].join('');
 
-          this.serverless.cli.log(message);
+          legacy.log(message);
+          log.notice();
+          log.notice.success(
+            `Project successfully created in "${
+              this.options.path || `./${serviceName}`
+            }" ${style.aside(
+              `(${Math.floor(
+                (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+              )}s)`
+            )}`
+          );
         })
         .catch((err) => {
           throw new ServerlessError(err, 'BOILERPLATE_GENERATION_ERROR');
@@ -83,6 +98,10 @@ class Create {
       if (this.options.name) {
         renameService(this.options.name, serviceDir);
       }
+      log.notice();
+      log.notice.success(
+        `Project sucessfully created in "${this.options.path || `./${this.options.name}`}"`
+      );
     } else {
       const errorMessage = [
         'You must either pass a template name (--template), ',
@@ -128,7 +147,7 @@ class Create {
         throw new ServerlessError(errorMessage, 'TARGET_FOLDER_ALREADY_EXISTS');
       }
 
-      this.serverless.cli.log(`Generating boilerplate in "${newPath}"`);
+      legacy.log(`Generating boilerplate in "${newPath}"`);
 
       fse.mkdirsSync(newPath);
       process.chdir(newPath);
@@ -166,15 +185,25 @@ class Create {
 
     return createFromTemplate(this.options.template, process.cwd(), { name: serviceName }).then(
       () => {
-        this.serverless.cli.asciiGreeting();
-        this.serverless.cli.log(
-          `Successfully generated boilerplate for template: "${this.options.template}"`
+        log.notice();
+        log.notice.success(
+          `Project sucessfully created in "${this.options.path || './'}" from "${
+            this.options.template
+          }" template`
         );
 
+        legacy.log(`Successfully generated boilerplate for template: "${this.options.template}"`);
+
         if (!(boilerplatePath || serviceName) && notPlugin) {
-          this.serverless.cli.log(
+          legacy.log(
             'NOTE: Please update the "service" property in serverless.yml with your service name'
           );
+          log.notice();
+          log.notice(
+            style.aside(
+              'Please update the "service" property in serverless.yml with your service name'
+            )
+          );
         }
       },
       handleServiceCreationError
diff --git a/test/unit/lib/plugins/create/create.test.js b/test/unit/lib/plugins/create/create.test.js
index 9a7c53388a5..d0924dfaa49 100644
--- a/test/unit/lib/plugins/create/create.test.js
+++ b/test/unit/lib/plugins/create/create.test.js
@@ -19,14 +19,12 @@ const templatesPath = path.resolve(__dirname, '../../../../../lib/plugins/create
 
 describe('Create', () => {
   let create;
-  let logSpy;
 
   before(() => {
     const serverless = new Serverless();
     const options = {};
     create = new Create(serverless, options);
     create.serverless.cli = new serverless.classes.CLI();
-    logSpy = sinon.spy(create.serverless.cli, 'log');
   });
 
   describe('#constructor()', () => {
@@ -80,35 +78,6 @@ describe('Create', () => {
           expect(downloadStub).to.have.been.calledOnce;
         });
       });
-
-      it('should resolve if download succeeds', () => {
-        downloadStub.resolves('serverless');
-        create.options['template-url'] = 'https://github.com/serverless/serverless';
-
-        return create.create().then(() => {
-          const installationMessage = logSpy.args.filter((arg) =>
-            arg[0].includes('installed "serverless"')
-          );
-
-          expect(downloadStub).to.have.been.calledOnce;
-          expect(installationMessage[0]).to.have.lengthOf(1);
-        });
-      });
-
-      it('should resolve if download succeeds and display the desired service name', () => {
-        downloadStub.resolves('serverless');
-        create.options['template-url'] = 'https://github.com/serverless/serverless';
-        create.options.name = 'sls';
-
-        return create.create().then(() => {
-          const installationMessage = logSpy.args.filter((arg) =>
-            arg[0].includes('installed "serverless" as "sls"')
-          );
-
-          expect(downloadStub).to.have.been.calledOnce;
-          expect(installationMessage[0]).to.have.lengthOf(1);
-        });
-      });
     });
 
     it('should throw error if user passed unsupported template', () => {
@@ -136,15 +105,6 @@ describe('Create', () => {
       });
     });
 
-    it('should display ascii greeting', () => {
-      process.chdir(tmpDir);
-
-      const greetingStub = sinon.stub(create.serverless.cli, 'asciiGreeting');
-      return create.create().then(() => {
-        expect(greetingStub.callCount).to.be.equal(1);
-      });
-    });
-
     it('should generate scaffolding for "aws-clojure-gradle" template', () => {
       process.chdir(tmpDir);
       create.options.template = 'aws-clojure-gradle';

From be60ed4cee15ec0a47be5c08da9e0ce4a3f54136 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 8 Oct 2021 13:26:15 +0200
Subject: [PATCH 0597/1101] refactor(CLI): Simplify CF deploy progress

---
 lib/plugins/aws/lib/monitorStack.js | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js
index ad0dedcf623..9127f7859cc 100644
--- a/lib/plugins/aws/lib/monitorStack.js
+++ b/lib/plugins/aws/lib/monitorStack.js
@@ -5,7 +5,7 @@ const chalk = require('chalk');
 const wait = require('timers-ext/promise/sleep');
 const identity = require('ext/function/identity');
 const ServerlessError = require('../../../serverless-error');
-const { log, legacy, progress, style } = require('@serverless/utils/log');
+const { log, legacy, style } = require('@serverless/utils/log');
 
 const validStatuses = new Set(['CREATE_COMPLETE', 'UPDATE_COMPLETE', 'DELETE_COMPLETE']);
 
@@ -91,20 +91,6 @@ module.exports = {
                   legacy.write(chalk.yellow('.'));
                 }
 
-                if (action !== 'create' && event.ResourceType !== 'AWS::CloudFormation::Stack') {
-                  if (eventStatus && eventStatus.endsWith('PROGRESS')) {
-                    progress
-                      .get(`cf-deploy-${event.LogicalResourceId}`)
-                      .notice(
-                        style.aside(
-                          `  ${eventStatus} - ${event.ResourceType} - ${event.LogicalResourceId}`
-                        )
-                      );
-                  } else if (eventStatus && eventStatus.endsWith('COMPLETE')) {
-                    progress.get(`cf-deploy-${event.LogicalResourceId}`).remove();
-                  }
-                }
-
                 // Prepare for next monitoring action
                 loggedEventIds.add(event.EventId);
               });

From a1087a26ddcbc2170253bb2933eb09f58e3ef6a0 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 8 Oct 2021 14:32:41 +0200
Subject: [PATCH 0598/1101] chore: Bump dependencies

---
 package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 60e08f219cf..93f2ed3535d 100644
--- a/package.json
+++ b/package.json
@@ -24,13 +24,13 @@
   "dependencies": {
     "@serverless/cli": "^1.5.2",
     "@serverless/components": "^3.17.1",
-    "@serverless/dashboard-plugin": "^5.4.5",
+    "@serverless/dashboard-plugin": "^5.4.6",
     "@serverless/platform-client": "^4.3.0",
-    "@serverless/utils": "^5.17.0",
+    "@serverless/utils": "^5.17.2",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.999.0",
+    "aws-sdk": "^2.1003.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.1.2",
     "cachedir": "^2.3.0",
@@ -83,7 +83,7 @@
     "@commitlint/cli": "^12.1.4",
     "@serverless/eslint-config": "^3.0.0",
     "@serverless/test": "^8.4.0",
-    "adm-zip": "^0.5.7",
+    "adm-zip": "^0.5.9",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "cos-nodejs-sdk-v5": "^2.10.4",
@@ -94,7 +94,7 @@
     "husky": "^4.3.8",
     "jszip": "^3.7.1",
     "lint-staged": "^10.5.4",
-    "log": "^6.2.0",
+    "log": "^6.3.1",
     "log-node": "^8.0.1",
     "mocha": "^8.4.0",
     "mock-require": "^3.0.3",

From 519d091b526a4fcdf32064dc21896c6d3d7c84bf Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 8 Oct 2021 15:29:07 +0200
Subject: [PATCH 0599/1101] chore: Release v2.62.0

---
 CHANGELOG.md | 31 +++++++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8cf428ba88f..2a12f85c5be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,37 @@
 
 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.
 
+## [2.62.0](https://github.com/serverless/serverless/compare/v2.61.0...v2.62.0) (2021-10-08)
+
+### Features
+
+- **AWS Deploy:** Remove `deploy -f` deprecation ([#10063](https://github.com/serverless/serverless/pull/10063)) ([1084251](https://github.com/serverless/serverless/commit/10842513f0c5422f8627b652b6483523e0351a3c)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Config Schema:** Remove validation mode related deprecation ([#10063](https://github.com/serverless/serverless/pull/10063)) ([a9bf916](https://github.com/serverless/serverless/commit/a9bf916fbb15140373a54d22c624296b8a1dbe03)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Packaging:** Remove `package[include|exclude]` deprecation ([#10063](https://github.com/serverless/serverless/pull/10063)) ([70e2736](https://github.com/serverless/serverless/commit/70e27362260f97b68bb1dfaf52fa3fe7877a2adc)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **AWS Deploy:** Throw on attempt of extending not existing resource ([#10063](https://github.com/serverless/serverless/pull/10063)) ([02be86c](https://github.com/serverless/serverless/commit/02be86ca4954553388ac70845d8ff3aca205abcd)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **CLI: New logs (experimental):**
+  - Simplify CF deploy progress ([#10068](https://github.com/serverless/serverless/pull/10068)) ([be60ed4](https://github.com/serverless/serverless/commit/be60ed4cee15ec0a47be5c08da9e0ce4a3f54136)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Expose function artifact size in deploy summary ([#10062](https://github.com/serverless/serverless/pull/10062)) ([8746100](https://github.com/serverless/serverless/commit/87461007f809c67a78b7dd722847efef2e4f72b3)) ([Mariusz Nowak](https://github.com/medikoo))
+  - `create` command ([#10066](https://github.com/serverless/serverless/pull/10066)) ([05f937f](https://github.com/serverless/serverless/commit/05f937f2e731e641e93e9db4af4acd58dc117422)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `invoke local` command ([#10065](https://github.com/serverless/serverless/pull/10065)) ([82dd1e4](https://github.com/serverless/serverless/commit/82dd1e4c70d335cc10485b5ac20467447809941b)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `invoke` command ([#10052](https://github.com/serverless/serverless/pull/10052)) ([2af95c0](https://github.com/serverless/serverless/commit/2af95c03865b5b59bacba9e080348dddf11d0bb5)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `metrics` command ([#10051](https://github.com/serverless/serverless/pull/10051)) ([592596c](https://github.com/serverless/serverless/commit/592596c73bfe0a9b6ef6bdff5d898ae9ef5e2788)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `remove` command ([#10050](https://github.com/serverless/serverless/pull/10050)) ([3934cad](https://github.com/serverless/serverless/commit/3934cadce052b50d76c1dcd49da588cd9f079175)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `rollback function` command ([#10064](https://github.com/serverless/serverless/pull/10064)) ([4cbc342](https://github.com/serverless/serverless/commit/4cbc3424dabebb3b533d463b3ead523f2daf4a77)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `rollback` command ([#10064](https://github.com/serverless/serverless/pull/10064)) ([f0970e0](https://github.com/serverless/serverless/commit/f0970e04fa31774aa7400b4c620920dadcb3cfa2)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `uninstall` command ([#10034](https://github.com/serverless/serverless/pull/10034)) ([2787ea0](https://github.com/serverless/serverless/commit/2787ea07a9a183695e6f7a58bcc0171e086d456b)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `upgrade` command ([#10034](https://github.com/serverless/serverless/pull/10034)) ([9b5e6b1](https://github.com/serverless/serverless/commit/9b5e6b12371317356d9cb4600a4a574df305f63f)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Ensure empty line prior final status with progress ([#10063](https://github.com/serverless/serverless/pull/10062)) ([#10062](https://github.com/serverless/serverless/pull/10062)) ([c9f2227](https://github.com/serverless/serverless/commit/c9f22278b3a8c5fd4d1400ef948ae6b72f333223)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Reconfigure dashboard related warning ([#10053](https://github.com/serverless/serverless/pull/10053)) ([7c91cde](https://github.com/serverless/serverless/commit/7c91cde7ac5c8bbe983b213de090bde4326af85a)) ([Mariusz Nowak](https://github.com/medikoo))
+- **AWS Deploy:** Improve error message ([#10063](https://github.com/serverless/serverless/pull/10063)) ([d071c5f](https://github.com/serverless/serverless/commit/d071c5f74d2d1deca71edebc53d072a1c90d8bad)) ([Mariusz Nowak](https://github.com/medikoo))
+- Remove _async_ handling from _sync_ function ([#10053](https://github.com/serverless/serverless/pull/10053)) ([5f1a916](https://github.com/serverless/serverless/commit/5f1a916d4d9c8833755833bc064f51e4f89e50e0)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ## [2.61.0](https://github.com/serverless/serverless/compare/v2.60.3...v2.61.0) (2021-10-04)
 
 ### Features
diff --git a/package.json b/package.json
index 93f2ed3535d..20ebe927eeb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.61.0",
+  "version": "2.62.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 39c09e44b6380ec1a13aa50aca9082cffb0aeca1 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 8 Oct 2021 15:26:51 +0200
Subject: [PATCH 0600/1101] refactor(CLI): Minor modern logs updates

---
 .../events/apiGateway/lib/hack/disassociateUsagePlan.js   | 4 +++-
 lib/plugins/aws/package/compile/functions.js              | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.js
index a6bdf65ace7..401bd886bbb 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.js
@@ -2,6 +2,7 @@
 
 const BbPromise = require('bluebird');
 const _ = require('lodash');
+const { legacy, log } = require('@serverless/utils/log');
 
 module.exports = {
   async disassociateUsagePlan() {
@@ -10,7 +11,8 @@ module.exports = {
       this.serverless.service.provider.apiKeys;
 
     if (apiKeys && apiKeys.length) {
-      this.serverless.cli.log('Removing usage plan association...');
+      legacy.log('Removing usage plan association...');
+      log.info('Removing usage plan association');
       const stackName = `${this.provider.naming.getStackName()}`;
       return BbPromise.all([
         this.provider.request('CloudFormation', 'describeStackResource', {
diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index c84c796534d..9c3d7460be4 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -6,11 +6,12 @@ const crypto = require('crypto');
 const fs = require('fs');
 const _ = require('lodash');
 const path = require('path');
-const log = require('@serverless/utils/log');
+const oldLog = require('@serverless/utils/log');
 const ServerlessError = require('../../../../serverless-error');
 const deepSortObjectByKey = require('../../../../utils/deepSortObjectByKey');
 const getHashForFilePath = require('../lib/getHashForFilePath');
 const parseS3URI = require('../../utils/parse-s3-uri');
+const { legacy, log } = require('@serverless/utils/log');
 
 class AwsCompileFunctions {
   constructor(serverless, options) {
@@ -120,8 +121,9 @@ class AwsCompileFunctions {
     const s3Object = parseS3URI(artifactFilePath);
     if (!s3Object) return;
     if (process.env.SLS_DEBUG) {
-      this.serverless.cli.log(`Downloading ${s3Object.Key} from bucket ${s3Object.Bucket}`);
+      legacy.log(`Downloading ${s3Object.Key} from bucket ${s3Object.Bucket}`);
     }
+    log.info(`Downloading ${s3Object.Key} from bucket ${s3Object.Bucket}`);
     await new Promise((resolve, reject) => {
       const tmpDir = this.serverless.utils.getTmpDirPath();
       const filePath = path.join(tmpDir, path.basename(s3Object.Key));
@@ -743,7 +745,7 @@ function extractLayerConfigurationsFromFunction(functionProperties, cfTemplate)
 
       if (!configuration) {
         if (process.env.SLS_DEBUG) {
-          log(`Could not find reference to layer: ${potentialLocalLayerObject.Ref}.`);
+          oldLog(`Could not find reference to layer: ${potentialLocalLayerObject.Ref}.`);
         }
         return;
       }

From 865f21f970340b45c6fb341d01647721f0fa5682 Mon Sep 17 00:00:00 2001
From: ssshun <shun20214@gmail.com>
Date: Mon, 11 Oct 2021 18:46:39 +0900
Subject: [PATCH 0601/1101] fix(Templates): Add `esbuild` to `gitignore` in 
 `aws-nodejs-typescript`

---
 lib/plugins/create/templates/aws-nodejs-typescript/.gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/.gitignore b/lib/plugins/create/templates/aws-nodejs-typescript/.gitignore
index 98374934311..167a9a7ec82 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/.gitignore
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/.gitignore
@@ -5,5 +5,5 @@ jspm_packages
 # Serverless directories
 .serverless
 
-# Webpack directories
-.webpack
\ No newline at end of file
+# esbuild directories
+.esbuild
\ No newline at end of file

From a2be3387b16fdb7324e1342a5f6ee3974e4e34f5 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 8 Oct 2021 15:12:36 +0200
Subject: [PATCH 0602/1101] refactor(CLI): Cover image building with modern
 logs

---
 lib/plugins/aws/provider.js     | 79 ++++++++++++++++++++-------------
 lib/plugins/aws/remove/index.js |  2 +-
 2 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index dff500afaa8..c81466908c7 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -14,8 +14,9 @@ const path = require('path');
 const spawnExt = require('child-process-ext/spawn');
 const ServerlessError = require('../../serverless-error');
 const awsRequest = require('../../aws/request');
-const log = require('@serverless/utils/log');
+const oldLog = require('@serverless/utils/log');
 const deepSortObjectByKey = require('../../utils/deepSortObjectByKey');
+const { progress, legacy, log } = require('@serverless/utils/log');
 
 const isLambdaArn = RegExp.prototype.test.bind(/^arn:[^:]+:lambda:/);
 const isEcrUri = RegExp.prototype.test.bind(
@@ -1444,7 +1445,7 @@ class AwsProvider {
     // Emit a warning for misuses of the old signature including stage and region
     // TODO: Determine calling module and log that
     if (process.env.SLS_DEBUG && options != null && !_.isObject(options)) {
-      log('WARNING: Inappropriate call of provider.request()');
+      oldLog('WARNING: Inappropriate call of provider.request()');
     }
     const requestOptions = _.isObject(options) ? options : {};
     const shouldCache = _.get(requestOptions, 'useCache', false);
@@ -1819,7 +1820,10 @@ class AwsProvider {
     const pushDockerArgs = ['push', remoteTag];
     try {
       const { stdBuffer: pushDockerStdBuffer } = await spawnExt('docker', pushDockerArgs);
-      process.stdout.write(pushDockerStdBuffer);
+      legacy.write(pushDockerStdBuffer);
+      if (pushDockerStdBuffer) {
+        log.info(pushDockerStdBuffer.toString().trimRight());
+      }
       return pushDockerStdBuffer.toString();
     } catch (err) {
       if (
@@ -1880,7 +1884,8 @@ Object.defineProperties(
         ];
         try {
           const { stdBuffer } = await spawnExt('docker', dockerArgs);
-          this.serverless.cli.log('Login to Docker succeeded!');
+          legacy.log('Login to Docker succeeded!');
+          log.info('Login to Docker succeeded!');
           if (stdBuffer.includes('password will be stored unencrypted')) {
             this.serverless.cli.log(
               'WARNING: Docker authentication token will be stored unencrypted in docker config. Configure Docker credential helper to remove this warning.',
@@ -1929,6 +1934,7 @@ Object.defineProperties(
     ),
     resolveImageUriAndShaFromPath: d(
       async function ({ imageName, imagePath, imageFilename, buildArgs, cacheFrom, scanOnPush }) {
+        const imageProgress = progress.get(`containerImage:${imageName}`);
         await this.ensureDockerIsAvailable();
 
         let isDockerfileAvailable = false;
@@ -1972,35 +1978,48 @@ Object.defineProperties(
           imagePath,
         ];
 
+        let imageSha;
         try {
-          const { stdBuffer: buildDockerStdBuffer } = await spawnExt('docker', buildDockerArgs);
-          process.stdout.write(buildDockerStdBuffer);
-        } catch (err) {
-          throw new ServerlessError(
-            `Encountered error during executing: docker ${buildDockerArgs.join(
-              ' '
-            )}\nOutput of the command:\n${err.stdBuffer}`,
-            'DOCKER_BUILD_ERROR'
-          );
-        }
-
-        const tagDockerArgs = ['tag', localTag, remoteTag];
-        try {
-          const { stdBuffer: tagDockerStdBuffer } = await spawnExt('docker', tagDockerArgs);
-          process.stdout.write(tagDockerStdBuffer);
-        } catch (err) {
-          throw new ServerlessError(
-            `Encountered error during executing: docker ${tagDockerArgs.join(
-              ' '
-            )}\nOutput of the command:\n${err.stdBuffer}`,
-            'DOCKER_TAG_ERROR'
-          );
-        }
+          imageProgress.notice(`Building image "${imageName}"`);
+          try {
+            const { stdBuffer: buildDockerStdBuffer } = await spawnExt('docker', buildDockerArgs);
+            legacy.write(buildDockerStdBuffer);
+            if (buildDockerStdBuffer) {
+              log.info(buildDockerStdBuffer.toString().trimRight());
+            }
+          } catch (err) {
+            throw new ServerlessError(
+              `Encountered error during executing: docker ${buildDockerArgs.join(
+                ' '
+              )}\nOutput of the command:\n${err.stdBuffer}`,
+              'DOCKER_BUILD_ERROR'
+            );
+          }
 
-        const dockerPushOutput = await this.dockerPushToEcr(remoteTag);
+          imageProgress.notice(`Tagging image "${imageName}"`);
+          const tagDockerArgs = ['tag', localTag, remoteTag];
+          try {
+            const { stdBuffer: tagDockerStdBuffer } = await spawnExt('docker', tagDockerArgs);
+            legacy.write(tagDockerStdBuffer);
+            if (tagDockerStdBuffer) {
+              log.info(tagDockerStdBuffer.toString().trimRight());
+            }
+          } catch (err) {
+            throw new ServerlessError(
+              `Encountered error during executing: docker ${tagDockerArgs.join(
+                ' '
+              )}\nOutput of the command:\n${err.stdBuffer}`,
+              'DOCKER_TAG_ERROR'
+            );
+          }
 
-        // Extract imageSha from `docker push` output
-        const imageSha = dockerPushOutput.match(/(sha256:[a-f0-9]{64})/)[0];
+          imageProgress.notice(`Uploading image "${imageName}"`);
+          const dockerPushOutput = await this.dockerPushToEcr(remoteTag);
+          // Extract imageSha from `docker push` output
+          imageSha = dockerPushOutput.match(/(sha256:[a-f0-9]{64})/)[0];
+        } finally {
+          imageProgress.remove();
+        }
 
         return {
           functionImageSha: imageSha.slice('sha256:'.length),
diff --git a/lib/plugins/aws/remove/index.js b/lib/plugins/aws/remove/index.js
index 2a30d17858d..3a654a1dfb6 100644
--- a/lib/plugins/aws/remove/index.js
+++ b/lib/plugins/aws/remove/index.js
@@ -34,8 +34,8 @@ class AwsRemove {
               .getProvider('aws')
               .getStage()} ${style.aside(`(${this.serverless.getProvider('aws').getRegion()})`)}`
           );
+          log.info(); // Ensure gap between verbose logging
         }
-        log.info(); // Ensure gap between verbose logging
       },
       'remove:remove': async () => {
         const doesEcrRepositoryExistPromise = this.checkIfEcrRepositoryExists();

From 43f9faeef140d817f7904aa1175caed6c3f59871 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Mon, 11 Oct 2021 15:23:09 +0200
Subject: [PATCH 0603/1101] docs(AWS HTTP API): How to set up custom domains
 (#10077)

---
 docs/providers/aws/events/http-api.md | 54 +++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/docs/providers/aws/events/http-api.md b/docs/providers/aws/events/http-api.md
index 3433d04d245..6ff6fa8e102 100644
--- a/docs/providers/aws/events/http-api.md
+++ b/docs/providers/aws/events/http-api.md
@@ -460,3 +460,57 @@ provider:
   httpApi:
     shouldStartNameWithService: true
 ```
+
+## Custom domains
+
+API Gateway generates URLs for HTTP APIs in the following format:
+
+```
+https://<random>.execute-api.<region>.amazonaws.com/
+```
+
+It is possible to replace those URLs by a custom domain.
+
+Step 1, create an HTTPS certificate in AWS ACM:
+
+- Open [AWS ACM](https://console.aws.amazon.com/acm/home) (AWS Certificate Manager)
+- Switch to the region of your application
+- Click "Request a certificate"
+- Select "Request a public certificate" and continue
+- Add your domain and continue
+- Choose the domain validation of your choice:
+  - Email validation will require you to click a link you will receive in an email sent to admin@your-domain.com
+  - Domain validation will require you to add CNAME entries to your DNS configuration
+- Validate the domain via the method chosen above
+
+Step 2, set up the custom domain in API Gateway:
+
+- Open [API Gateway's "Custom Domain" configuration](https://console.aws.amazon.com/apigateway/main/publish/domain-names)
+- Switch to the region of your application
+- Click "Create"
+- Enter your domain name, select the certificate you created above and validate the page
+- After the domain is created, click the "API mappings" tab
+- Click "Configure API mappings" and "Add new mapping"
+- Select your HTTP API and the `$default` stage
+- Click "Save"
+
+Step 3, configure the DNS of the domain:
+
+- If using Route53:
+  - Open the Hosted Zone in the [Route53 console](https://console.aws.amazon.com/route53/v2/hostedzones)
+  - Click "Create record"
+  - Select "Record type" of type "A"
+  - "Route traffic to": select "Alias", and then select your API Gateway
+  - Finish the record creation
+- If using any other domain registrar
+  - Open the "Configurations" tab on the custom domain name you just created
+  - Note the "API Gateway domain name" which should look like this: `d-1234567890.execute-api.us-east-1.amazonaws.com`
+  - Create a CNAME entry to point your domain name to the API Gateway domain
+
+Once a custom domain is set up, you can [disable the default API Gateway endpoint](#disable-default-endpoint):
+
+```yaml
+provider:
+  httpApi:
+    disableDefaultEndpoint: true
+```

From d43298d25bc9fcf5f5724a800b2693321e88e838 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 11 Oct 2021 14:08:04 +0200
Subject: [PATCH 0604/1101] refactor(CLI): Adapt `logWarning` to modern logs

---
 lib/classes/Error.js                              | 15 ++++++---------
 lib/classes/Service.js                            |  3 +++
 lib/classes/Variables.js                          |  7 +++++++
 lib/cli/commands-schema/resolve-final.js          | 11 +++++++++++
 lib/cli/handle-error.js                           |  3 ++-
 lib/plugins/aws/package/compile/events/httpApi.js | 13 +++++++++++++
 6 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/lib/classes/Error.js b/lib/classes/Error.js
index 6533823e0a0..a1785ae8e07 100644
--- a/lib/classes/Error.js
+++ b/lib/classes/Error.js
@@ -2,10 +2,7 @@
 
 const chalk = require('chalk');
 const ServerlessError = require('../serverless-error');
-
-const consoleLog = (message) => {
-  process.stdout.write(`${message}\n`);
-};
+const { legacy } = require('@serverless/utils/log');
 
 const writeMessage = (title, message) => {
   let line = '';
@@ -13,15 +10,15 @@ const writeMessage = (title, message) => {
     line = `${line}-`;
   }
 
-  consoleLog(' ');
-  consoleLog(chalk.yellow(` ${title} ${line}`));
-  consoleLog(' ');
+  legacy.consoleLog(' ');
+  legacy.consoleLog(chalk.yellow(` ${title} ${line}`));
+  legacy.consoleLog(' ');
 
   if (message) {
-    consoleLog(`  ${message.split('\n').join('\n  ')}`);
+    legacy.consoleLog(`  ${message.split('\n').join('\n  ')}`);
   }
 
-  consoleLog(' ');
+  legacy.consoleLog(' ');
 };
 
 module.exports.ServerlessError = ServerlessError;
diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index a8117975d6c..12241b4603b 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -70,6 +70,9 @@ class Service {
       logWarning(
         'Configured "frameworkVersion" does not represent a valid semver version range, version validation is skipped'
       );
+      log.warning(
+        'Configured "frameworkVersion" does not represent a valid semver version range, version validation is skipped'
+      );
       ymlVersion = null;
     }
     if (!this.isLocallyInstalled && !ymlVersion) {
diff --git a/lib/classes/Variables.js b/lib/classes/Variables.js
index 34d3778e993..91eec8b7fa0 100644
--- a/lib/classes/Variables.js
+++ b/lib/classes/Variables.js
@@ -10,6 +10,7 @@ const fse = require('fs-extra');
 const logWarning = require('./Error').logWarning;
 const PromiseTracker = require('./PromiseTracker');
 const ServerlessError = require('../serverless-error');
+const { log } = require('@serverless/utils/log');
 
 const resolvedValuesWeak = new WeakSet();
 
@@ -855,6 +856,9 @@ class Variables {
             logWarning(
               `Cannot split SSM parameter '${param}' of type '${type}'. Must be 'StringList'.`
             );
+            log.warning(
+              `Cannot split SSM parameter '${param}' of type '${type}'. Must be 'StringList'.`
+            );
           }
           return plainText;
         },
@@ -1007,6 +1011,9 @@ class Variables {
     logWarning(
       `A valid ${varType} to satisfy the declaration '${variableString}' could not be found.`
     );
+    log.warning(
+      `A valid ${varType} to satisfy the declaration '${variableString}' could not be found.`
+    );
   }
 }
 
diff --git a/lib/cli/commands-schema/resolve-final.js b/lib/cli/commands-schema/resolve-final.js
index 05996ea9d0a..98150a9902c 100644
--- a/lib/cli/commands-schema/resolve-final.js
+++ b/lib/cli/commands-schema/resolve-final.js
@@ -9,6 +9,7 @@ const awsServiceCommands = require('./aws-service');
 const serviceOptions = require('./common-options/service');
 const awsServiceOptions = require('./common-options/aws-service');
 const { logWarning } = require('../../classes/Error');
+const { log } = require('@serverless/utils/log');
 
 const deprecatedEventPattern = /^deprecated#(.*?)(?:->(.*?))?$/;
 
@@ -122,6 +123,16 @@ module.exports = (loadedPlugins, { providerName }) => {
         ).join('\n - ')}\n\n` +
         'Please report this issue in plugin issue tracker.'
     );
+    log.warning(
+      'CLI options definitions were upgraded with "type" property (which could be one of "string", "boolean", "multiple"). ' +
+        'Plugins listed below do not predefine type for introduced options:\n' +
+        ` - ${Array.from(
+          missingOptionTypes,
+          ([plugin, optionNames]) =>
+            `${plugin.constructor.name} for "${Array.from(optionNames).join('", "')}"`
+        ).join('\n - ')}\n\n` +
+        'Please report this issue in issue tracker of the corresponding plugin.'
+    );
   }
 
   return commands;
diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 920853e039c..9c817cb35ee 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -6,7 +6,7 @@ const chalk = require('chalk');
 const stripAnsi = require('strip-ansi');
 const sfeVersion = require('@serverless/dashboard-plugin/package.json').version;
 const { platformClientVersion } = require('@serverless/dashboard-plugin');
-const { style, writeText, legacy } = require('@serverless/utils/log');
+const { style, writeText, legacy, log } = require('@serverless/utils/log');
 const slsVersion = require('./../../package').version;
 const { logWarning } = require('../classes/Error');
 const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
@@ -98,6 +98,7 @@ module.exports = async (exception, options = {}) => {
           // It can happen e.g. during "plugin uninstall" command, where "serverless" originally
           // installed a as peer dependency was removed
           logWarning('Could not resolve path to locally installed error handler');
+          log.warning('Could not resolve path to locally installed error handler');
           return null;
         }
       }
diff --git a/lib/plugins/aws/package/compile/events/httpApi.js b/lib/plugins/aws/package/compile/events/httpApi.js
index e087694d7e3..10bc1f1eb0e 100644
--- a/lib/plugins/aws/package/compile/events/httpApi.js
+++ b/lib/plugins/aws/package/compile/events/httpApi.js
@@ -4,6 +4,7 @@ const _ = require('lodash');
 const d = require('d');
 const memoizee = require('memoizee');
 const memoizeeMethods = require('memoizee/methods');
+const { log } = require('@serverless/utils/log');
 const ServerlessError = require('../../../../../serverless-error');
 const { logWarning } = require('../../../../../classes/Error');
 const resolveLambdaTarget = require('../../../utils/resolveLambdaTarget');
@@ -617,6 +618,12 @@ Object.defineProperties(
               'This may introduce a situation where endpoint times out ' +
               'for a succesful lambda invocation.'
           );
+          log.warning(
+            `Function (${functionName}) timeout setting (${functionTimeout}) is greater than ` +
+              'maximum allowed timeout for HTTP API endpoint (29s). ' +
+              'This may introduce a situation where endpoint times out ' +
+              'for a succesful lambda invocation.'
+          );
         } else if (functionTimeout === 29) {
           logWarning(
             `Function (${functionName}) timeout setting (${functionTimeout}) may not provide ` +
@@ -624,6 +631,12 @@ Object.defineProperties(
               'This may introduce a situation where endpoint times out ' +
               'for a succesful lambda invocation.'
           );
+          log.warning(
+            `Function (${functionName}) timeout setting (${functionTimeout}) may not provide ` +
+              'enough room to process an HTTP API request (of which timeout is limited to 29s). ' +
+              'This may introduce a situation where endpoint times out ' +
+              'for a succesful lambda invocation.'
+          );
         }
         // Ensure endpoint has slightly larger timeout than a function,
         // It's a margin needed for some side processing time on AWS side.

From 771f99b18d76060f030d36b5fa619dd41a7000c8 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 11 Oct 2021 14:12:25 +0200
Subject: [PATCH 0605/1101] refactor(CLI): Adapt `logInfo` to modern logs

---
 lib/classes/PromiseTracker.js | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/lib/classes/PromiseTracker.js b/lib/classes/PromiseTracker.js
index 1e15942d7b3..e86537fe777 100644
--- a/lib/classes/PromiseTracker.js
+++ b/lib/classes/PromiseTracker.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const logInfo = require('./Error').logInfo;
+const { log } = require('@serverless/utils/log');
 
 const constants = {
   pending: 'pending',
@@ -38,6 +39,19 @@ class PromiseTracker {
         ])
         .join('\n  ')
     );
+    log.info(
+      [
+        '############################################################################################',
+        `# ${delta}: ${this.getSettled().length} of ${this.getAll().length} promises have settled`,
+        `# ${delta}: ${pending.length} are taking longer than expected:`,
+      ]
+        .concat(pending.map((promise) => `# ${delta}:   ${promise.waitList}`))
+        .concat([
+          '# This can result from latent connections but may represent a cyclic variable dependency',
+          '##########################################################################################',
+        ])
+        .join('\n  ')
+    );
     this.reported = true;
   }
   stop() {
@@ -54,6 +68,17 @@ class PromiseTracker {
           '##########################################################################################',
         ].join('\n  ')
       );
+      log.info(
+        [
+          '############################################################################################',
+          `# Completed after ${Date.now() - this.startTime}ms`,
+          `# ${this.getAll().length} promises are in the following states:`,
+          `#   ${constants.resolved}: ${this.getResolved().length}`,
+          `#   ${constants.rejected}: ${this.getRejected().length}`,
+          `#   ${constants.pending}:  ${this.getPending().length}`,
+          '##########################################################################################',
+        ].join('\n  ')
+      );
     }
     this.reset();
   }

From 40f574f946e2f40cba13e18b22ee82c7aaa31d3f Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 11 Oct 2021 14:23:23 +0200
Subject: [PATCH 0606/1101] feat(AWS Deploy): Introduce warning about `deploy
 -f` alias

---
 lib/cli/handle-error.js |  2 +-
 lib/plugins/deploy.js   | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 9c817cb35ee..16817880f47 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -98,7 +98,7 @@ module.exports = async (exception, options = {}) => {
           // It can happen e.g. during "plugin uninstall" command, where "serverless" originally
           // installed a as peer dependency was removed
           logWarning('Could not resolve path to locally installed error handler');
-          log.warning('Could not resolve path to locally installed error handler');
+          log.debug('Could not resolve path to locally installed error handler');
           return null;
         }
       }
diff --git a/lib/plugins/deploy.js b/lib/plugins/deploy.js
index e69fa124f4f..c151251e5a6 100644
--- a/lib/plugins/deploy.js
+++ b/lib/plugins/deploy.js
@@ -2,6 +2,8 @@
 
 const ServerlessError = require('../serverless-error');
 const cliCommandsSchema = require('../cli/commands-schema');
+const { logWarning } = require('../classes/Error');
+const { log } = require('@serverless/utils/log');
 
 class Deploy {
   constructor(serverless, options) {
@@ -29,6 +31,19 @@ class Deploy {
     };
 
     this.hooks = {
+      'initialize': () => {
+        if (
+          this.serverless.processedInput.commands.join(' ') === 'deploy' &&
+          this.options.function
+        ) {
+          logWarning(
+            'Please use "deploy function -f" command directly. Support for "deploy -f" alias is likely to be removed in the future.'
+          );
+          log.warning(
+            'Please use "deploy function -f" command directly. Support for "deploy -f" alias is likely to be removed in the future.'
+          );
+        }
+      },
       'before:deploy:deploy': async () => {
         const provider = this.serverless.service.provider.name;
         if (!this.serverless.getProvider(provider)) {

From 44a81fcc6a229ac6ff59b8c8e51742a9470eef15 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.robson.ecse@gmail.com>
Date: Tue, 12 Oct 2021 08:47:44 +1100
Subject: [PATCH 0607/1101] feat(AWS Lambda): Allow overriding provider VPC
 with no VPC on function

---
 docs/providers/aws/guide/functions.md         | 23 ++++++++++++++
 docs/providers/aws/guide/serverless.yml.md    |  2 +-
 lib/plugins/aws/package/compile/functions.js  | 31 ++++++++++---------
 .../aws/package/compile/functions.test.js     | 10 ++++++
 4 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/docs/providers/aws/guide/functions.md b/docs/providers/aws/guide/functions.md
index d7c4fc3dd8f..29321921bc6 100644
--- a/docs/providers/aws/guide/functions.md
+++ b/docs/providers/aws/guide/functions.md
@@ -357,6 +357,29 @@ functions:
 
 Then, when you run `serverless deploy`, VPC configuration will be deployed along with your lambda function.
 
+If you have a provider VPC set but wish to have specific functions with no VPC, you can set the `vpc` value for these functions to `~` (null). For example:
+
+```yml
+# serverless.yml
+service: service-name
+provider:
+  name: aws
+  vpc:
+    securityGroupIds:
+      - securityGroupId1
+      - securityGroupId2
+    subnetIds:
+      - subnetId1
+      - subnetId2
+
+functions:
+  hello: # this function will have no vpc configured
+    handler: handler.hello
+    vpc: ~
+  users: # this function will inherit the service level vpc config above
+    handler: handler.users
+```
+
 **VPC IAM permissions**
 
 The Lambda function execution role must have permissions to create, describe and delete [Elastic Network Interfaces](http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_ElasticNetworkInterfaces.html) (ENI). When VPC configuration is provided the default AWS `AWSLambdaVPCAccessExecutionRole` will be associated with your Lambda execution role. In case custom roles are provided be sure to include the proper [ManagedPolicyArns](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html#cfn-iam-role-managepolicyarns). For more information please check [configuring a Lambda Function for Amazon VPC Access](http://docs.aws.amazon.com/lambda/latest/dg/vpc.html)
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index a8f1018dc19..78ef418a45c 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -325,7 +325,7 @@ functions:
       functionEnvVar: 12345678
     tags: # Function specific tags
       foo: bar
-    vpc: # Optional VPC. But if you use VPC then both subproperties (securityGroupIds and subnetIds) are required
+    vpc: # Optional VPC. If you use VPC then both subproperties (securityGroupIds and subnetIds) are required. Can be set to ~ to specify no VPC.
       securityGroupIds:
         - securityGroupId1
         - securityGroupId2
diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index 9c3d7460be4..105fa0c8ebe 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -375,21 +375,24 @@ class AwsCompileFunctions {
     const role = this.provider.getCustomExecutionRole(functionObject);
     this.compileRole(functionResource, role || 'IamRoleLambdaExecution');
 
-    if (!functionObject.vpc) functionObject.vpc = {};
-    if (!this.serverless.service.provider.vpc) this.serverless.service.provider.vpc = {};
-
-    functionResource.Properties.VpcConfig = {
-      SecurityGroupIds:
-        functionObject.vpc.securityGroupIds ||
-        this.serverless.service.provider.vpc.securityGroupIds,
-      SubnetIds: functionObject.vpc.subnetIds || this.serverless.service.provider.vpc.subnetIds,
-    };
+    // ensure provider VPC is not used if function VPC explicitly unset
+    if (functionObject.vpc !== null && functionObject.vpc !== false) {
+      if (!functionObject.vpc) functionObject.vpc = {};
+      if (!this.serverless.service.provider.vpc) this.serverless.service.provider.vpc = {};
+
+      functionResource.Properties.VpcConfig = {
+        SecurityGroupIds:
+          functionObject.vpc.securityGroupIds ||
+          this.serverless.service.provider.vpc.securityGroupIds,
+        SubnetIds: functionObject.vpc.subnetIds || this.serverless.service.provider.vpc.subnetIds,
+      };
 
-    if (
-      !functionResource.Properties.VpcConfig.SecurityGroupIds ||
-      !functionResource.Properties.VpcConfig.SubnetIds
-    ) {
-      delete functionResource.Properties.VpcConfig;
+      if (
+        !functionResource.Properties.VpcConfig.SecurityGroupIds ||
+        !functionResource.Properties.VpcConfig.SubnetIds
+      ) {
+        delete functionResource.Properties.VpcConfig;
+      }
     }
 
     const fileSystemConfig = functionObject.fileSystemConfig;
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index dc5ee8dbafd..bdaaf195a0e 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -1419,6 +1419,10 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
                 arn: 'arn:aws:elasticfilesystem:us-east-1:111111111111:access-point/fsap-a1a1a1a1a1a1a1a1a',
               },
             },
+            vpcNullify: {
+              vpc: null,
+              handler: 'index.handler',
+            },
           },
         },
       });
@@ -1464,6 +1468,12 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       expect(VpcConfig.SubnetIds).to.deep.equal(fooFunctionConfig.vpc.subnetIds);
     });
 
+    it('should allow `functions[].vpc` to specify no vpc', () => {
+      const Properties = cfResources[naming.getLambdaLogicalId('vpcNullify')].Properties;
+
+      expect(Properties.VpcConfig).to.be.undefined;
+    });
+
     it('should support `provider.tags`', () => {
       const providerConfig = serviceConfig.provider;
 

From 1ee7ad77e0c8f355c117c88df8653a1fae3e6cf9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 11 Oct 2021 17:26:46 +0200
Subject: [PATCH 0608/1101] test: Turn on test back

---
 test/integration/aws/iotFleetProvisioning.test.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/integration/aws/iotFleetProvisioning.test.js b/test/integration/aws/iotFleetProvisioning.test.js
index ac126ba67e3..93b492e53c3 100644
--- a/test/integration/aws/iotFleetProvisioning.test.js
+++ b/test/integration/aws/iotFleetProvisioning.test.js
@@ -6,8 +6,7 @@ const fixtures = require('../../fixtures/programmatic');
 const { deployService, removeService } = require('../../utils/integration');
 const { resolveIotEndpoint } = require('../../utils/iot');
 
-// Temporary skip, until reason for its fails is clarified
-describe.skip('test/integration/aws/iotFleetProvisioning.test.js', function () {
+describe('test/integration/aws/iotFleetProvisioning.test.js', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
   const thingName = 'IotDevice';
   const stage = 'dev';

From d33ccc8d681b6bd981e07ca370a7bbf85e2c2aa9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 11 Oct 2021 17:27:05 +0200
Subject: [PATCH 0609/1101] test(AWS IOT): Do not clear stack on error

---
 test/integration/aws/iotFleetProvisioning.test.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/integration/aws/iotFleetProvisioning.test.js b/test/integration/aws/iotFleetProvisioning.test.js
index 93b492e53c3..437274f4b21 100644
--- a/test/integration/aws/iotFleetProvisioning.test.js
+++ b/test/integration/aws/iotFleetProvisioning.test.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const awsRequest = require('@serverless/test/aws-request');
+const hasFailed = require('@serverless/test/has-failed');
 const { expect } = require('chai');
 const fixtures = require('../../fixtures/programmatic');
 const { deployService, removeService } = require('../../utils/integration');
@@ -36,8 +37,9 @@ describe('test/integration/aws/iotFleetProvisioning.test.js', function () {
     isDeployed = true;
   });
 
-  after(async () => {
+  after(async function () {
     if (!isDeployed) return;
+    if (hasFailed(this.test.parent)) return;
     if (certificateId) {
       const [
         {

From 20ae790ad40f8118c780025c5ef4b76259770f3c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 11 Oct 2021 17:27:34 +0200
Subject: [PATCH 0610/1101] test(AWS IOT): Upgrade to use recommended endpoint

As suggested by AWS support
---
 test/utils/iot.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/utils/iot.js b/test/utils/iot.js
index d74db93b652..b968d0e9450 100644
--- a/test/utils/iot.js
+++ b/test/utils/iot.js
@@ -3,7 +3,7 @@
 const awsRequest = require('@serverless/test/aws-request');
 
 function resolveIotEndpoint() {
-  return awsRequest('Iot', 'describeEndpoint').then((data) => {
+  return awsRequest('Iot', 'describeEndpoint', { endpointType: 'iot:Data-ATS' }).then((data) => {
     return data.endpointAddress;
   });
 }

From db8560211c64cef0217d59662088f50145333195 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 11 Oct 2021 17:47:19 +0200
Subject: [PATCH 0611/1101] test(AWS Local Invocation): Relax timeout range

It's to prevent race condition CI test fails
---
 test/unit/lib/plugins/aws/invokeLocal/index.test.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/unit/lib/plugins/aws/invokeLocal/index.test.js b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
index b325ff97d89..0d0757b3529 100644
--- a/test/unit/lib/plugins/aws/invokeLocal/index.test.js
+++ b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
@@ -1169,7 +1169,7 @@ describe('test/unit/lib/plugins/aws/invokeLocal/index.test.js', () => {
       const body = JSON.parse(stdoutData).body;
       const [firstRemainingMs, secondRemainingMs, thirdRemainingMs] = JSON.parse(body).data;
       expect(firstRemainingMs).to.be.lte(3000);
-      expect(secondRemainingMs).to.be.lte(2900);
+      expect(secondRemainingMs).to.be.lte(2910);
       expect(thirdRemainingMs).to.be.lte(secondRemainingMs);
     });
   });
@@ -1195,7 +1195,7 @@ describe('test/unit/lib/plugins/aws/invokeLocal/index.test.js', () => {
 
         const { start, stop } = JSON.parse(stdoutData);
         expect(start).to.lte(3000);
-        expect(stop).to.lte(2900);
+        expect(stop).to.lte(2910);
       });
     });
   });
@@ -1230,7 +1230,7 @@ describe('test/unit/lib/plugins/aws/invokeLocal/index.test.js', () => {
 
       const { start, stop } = JSON.parse(stdoutData);
       expect(start).to.lte(6000);
-      expect(stop).to.lte(5900);
+      expect(stop).to.lte(5910);
     });
     it('should support context.deadline_ms', async () => {
       const { stdoutData } = await runServerless({

From c4cb0f30f5f565e2fd34877dfc383f6b81d135fd Mon Sep 17 00:00:00 2001
From: Mars Lan <mars.th.lan@gmail.com>
Date: Tue, 12 Oct 2021 11:49:08 -0700
Subject: [PATCH 0612/1101] feat: Opt-in support for deployment bucket
 versioning (#9912)

Configurable via `provider.deploymentBucket.versioning`
---
 docs/providers/aws/guide/deploying.md         |   2 +
 docs/providers/aws/guide/serverless.yml.md    |   1 +
 .../aws/package/lib/generateCoreTemplate.js   |  11 ++
 lib/plugins/aws/provider.js                   |   1 +
 lib/plugins/aws/remove/lib/bucket.js          |  41 +++++-
 .../package/lib/generateCoreTemplate.test.js  |  21 +++
 .../lib/plugins/aws/remove/lib/bucket.test.js | 139 +++++++++++++++++-
 7 files changed, 214 insertions(+), 2 deletions(-)

diff --git a/docs/providers/aws/guide/deploying.md b/docs/providers/aws/guide/deploying.md
index 9d38cb7dac2..fee64a62dea 100644
--- a/docs/providers/aws/guide/deploying.md
+++ b/docs/providers/aws/guide/deploying.md
@@ -83,6 +83,8 @@ The Serverless Framework translates all syntax in `serverless.yml` to a single A
 - You can disable creation of default S3 bucket policy by setting `skipPolicySetup` under `deploymentBucket` config. It only applies to deployment bucket that is automatically created
   by the Serverless Framework.
 
+- You can enable versioning for the deployment bucket by setting `versioning` under `deploymentBucket` config to `true`.
+
 Check out the [deploy command docs](../cli-reference/deploy.md) for all details and options.
 
 - For information on multi-region deployments, [checkout this article](https://serverless.com/blog/build-multiregion-multimaster-application-dynamodb-global-tables).
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 78ef418a45c..32faf8a156c 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -54,6 +54,7 @@ provider:
     skipPolicySetup: false # Prevents creation of default bucket policy when framework creates the deployment bucket. Default is false
     name: com.serverless.${self:provider.region}.deploys # Deployment bucket name. Default is generated by the framework
     maxPreviousDeploymentArtifacts: 5 # On every deployment the framework prunes the bucket to remove artifacts older than this limit. The default is 5
+    versioning: false # enable bucket versioning. Default is false
     serverSideEncryption: AES256 # server-side encryption method
     sseKMSKeyId: arn:aws:kms:us-east-1:xxxxxxxxxxxx:key/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa # when using server-side encryption
     sseCustomerAlgorithim: AES256 # when using server-side encryption and custom keys
diff --git a/lib/plugins/aws/package/lib/generateCoreTemplate.js b/lib/plugins/aws/package/lib/generateCoreTemplate.js
index 0b18c34b176..91eb7c9104f 100644
--- a/lib/plugins/aws/package/lib/generateCoreTemplate.js
+++ b/lib/plugins/aws/package/lib/generateCoreTemplate.js
@@ -60,6 +60,17 @@ module.exports = {
         );
       }
 
+      // enable S3 bucket versioning
+      if (deploymentBucketObject.versioning) {
+        this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
+          deploymentBucketLogicalId
+        ].Properties = {
+          VersioningConfiguration: {
+            Status: 'Enabled',
+          },
+        };
+      }
+
       if (deploymentBucketObject.skipPolicySetup) {
         const deploymentBucketPolicyLogicalId =
           this.provider.naming.getDeploymentBucketPolicyLogicalId();
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index c81466908c7..988b908b6f8 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -819,6 +819,7 @@ class AwsProvider {
                     skipPolicySetup: { type: 'boolean' },
                     maxPreviousDeploymentArtifacts: { type: 'integer', minimum: 0 },
                     name: { $ref: '#/definitions/awsS3BucketName' },
+                    versioning: { type: 'boolean' },
                     serverSideEncryption: { enum: ['AES256', 'aws:kms'] },
                     sseCustomerAlgorithim: { type: 'string' },
                     sseCustomerKey: { type: 'string' },
diff --git a/lib/plugins/aws/remove/lib/bucket.js b/lib/plugins/aws/remove/lib/bucket.js
index 18bf952567f..5573a6692e5 100644
--- a/lib/plugins/aws/remove/lib/bucket.js
+++ b/lib/plugins/aws/remove/lib/bucket.js
@@ -10,7 +10,7 @@ module.exports = {
     });
   },
 
-  async listObjects() {
+  async listObjectsV2() {
     this.objectsInBucket = [];
 
     legacy.log('Getting all objects in S3 bucket...');
@@ -33,6 +33,45 @@ module.exports = {
       });
   },
 
+  async listObjectVersions() {
+    this.objectsInBucket = [];
+
+    this.serverless.cli.log('Getting all objects in S3 bucket...');
+    const serviceStage = `${this.serverless.service.service}/${this.provider.getStage()}`;
+
+    const result = await this.provider.request('S3', 'listObjectVersions', {
+      Bucket: this.bucketName,
+      Prefix: `${this.provider.getDeploymentPrefix()}/${serviceStage}`,
+    });
+
+    if (result) {
+      if (result.Versions) {
+        result.Versions.forEach((object) => {
+          this.objectsInBucket.push({
+            Key: object.Key,
+            VersionId: object.VersionId,
+          });
+        });
+      }
+
+      if (result.DeleteMarkers) {
+        result.DeleteMarkers.forEach((object) => {
+          this.objectsInBucket.push({
+            Key: object.Key,
+            VersionId: object.VersionId,
+          });
+        });
+      }
+    }
+  },
+
+  async listObjects() {
+    const deploymentBucketObject = this.serverless.service.provider.deploymentBucketObject;
+    return deploymentBucketObject && deploymentBucketObject.versioning
+      ? this.listObjectVersions()
+      : this.listObjectsV2();
+  },
+
   async deleteObjects() {
     legacy.log('Removing objects in S3 bucket...');
     if (this.objectsInBucket.length) {
diff --git a/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js b/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js
index 5c228204ad9..aec5f83143e 100644
--- a/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js
@@ -95,6 +95,27 @@ describe('#generateCoreTemplate()', () => {
       });
     }));
 
+  it('should enable S3 bucket versioning if specified', async () => {
+    const { cfTemplate } = await runServerless({
+      config: {
+        service: 'irrelevant',
+        provider: {
+          name: 'aws',
+          deploymentBucket: {
+            versioning: true,
+          },
+        },
+      },
+      command: 'package',
+    });
+
+    expect(cfTemplate.Resources.ServerlessDeploymentBucket.Properties).to.deep.include({
+      VersioningConfiguration: {
+        Status: 'Enabled',
+      },
+    });
+  });
+
   it('should add resource tags to the bucket if present', () =>
     runServerless({
       config: {
diff --git a/test/unit/lib/plugins/aws/remove/lib/bucket.test.js b/test/unit/lib/plugins/aws/remove/lib/bucket.test.js
index 8ad896b7939..cb1ab6813ae 100644
--- a/test/unit/lib/plugins/aws/remove/lib/bucket.test.js
+++ b/test/unit/lib/plugins/aws/remove/lib/bucket.test.js
@@ -1,11 +1,14 @@
 'use strict';
 
 const expect = require('chai').expect;
+
 const sinon = require('sinon');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 const AwsRemove = require('../../../../../../../lib/plugins/aws/remove/index');
 const Serverless = require('../../../../../../../lib/Serverless');
 
+const runServerless = require('../../../../../../utils/run-serverless');
+
 describe('emptyS3Bucket', () => {
   const options = {
     stage: 'dev',
@@ -37,7 +40,7 @@ describe('emptyS3Bucket', () => {
     });
   });
 
-  describe('#listObjects()', () => {
+  describe('#listObjectsV2()', () => {
     it('should resolve if no objects are present', () => {
       const listObjectsStub = sinon.stub(awsRemove.provider, 'request').resolves();
 
@@ -80,6 +83,140 @@ describe('emptyS3Bucket', () => {
     });
   });
 
+  describe('#listObjectVersions()', () => {
+    const baseAwsRequestStubMap = {
+      STS: {
+        getCallerIdentity: {
+          ResponseMetadata: { RequestId: 'ffffffff-ffff-ffff-ffff-ffffffffffff' },
+          UserId: 'XXXXXXXXXXXXXXXXXXXXX',
+          Account: '999999999999',
+          Arn: 'arn:aws:iam::999999999999:user/test',
+        },
+      },
+      ECR: {
+        describeRepositories: sinon.stub().throws({
+          providerError: { code: 'RepositoryNotFoundException' },
+        }),
+      },
+      CloudFormation: {
+        describeStacks: {},
+        describeStackEvents: {
+          StackEvents: [
+            {
+              EventId: '1e2f3g4h',
+              StackName: 'new-service-dev',
+              LogicalResourceId: 'new-service-dev',
+              ResourceType: 'AWS::CloudFormation::Stack',
+              Timestamp: new Date(),
+              ResourceStatus: 'DELETE_COMPLETE',
+            },
+          ],
+        },
+        describeStackResource: {
+          StackResourceDetail: { PhysicalResourceId: 'deployment-bucket' },
+        },
+        deleteStack: {},
+      },
+    };
+
+    it('should resolve if no object versions are present', async () => {
+      const listObjectVersionsStub = sinon.stub().resolves();
+
+      await runServerless({
+        command: 'remove',
+        config: {
+          service: 'test-service',
+          provider: {
+            name: 'aws',
+            stage: 'dev',
+            region: 'us-east-1',
+            deploymentPrefix: 'serverless',
+            deploymentBucket: {
+              name: 'bucket',
+              versioning: true,
+            },
+          },
+        },
+        awsRequestStubMap: {
+          ...baseAwsRequestStubMap,
+          S3: {
+            listObjectVersions: listObjectVersionsStub,
+          },
+        },
+      });
+
+      expect(
+        listObjectVersionsStub.calledWithExactly({
+          Bucket: 'bucket',
+          Prefix: 'serverless/test-service/dev',
+        })
+      ).to.be.equal(true);
+    });
+
+    it('should push objects to the array if present', async () => {
+      const listObjectVersionsStub = sinon.stub().resolves({
+        Versions: [
+          { Key: 'object1', VersionId: null },
+          { Key: 'object2', VersionId: 'v1' },
+        ],
+        DeleteMarkers: [{ Key: 'object3', VersionId: 'v2' }],
+      });
+
+      const deleteObjectsStub = sinon.stub().resolves({
+        Deleted: [
+          { Key: 'object1', VersionId: null },
+          { Key: 'object2', VersionId: 'v1' },
+          { Key: 'object3', VersionId: 'v2' },
+        ],
+      });
+
+      await runServerless({
+        command: 'remove',
+        config: {
+          service: 'test-service',
+          provider: {
+            name: 'aws',
+            stage: 'dev',
+            region: 'us-east-1',
+            deploymentPrefix: 'serverless',
+            deploymentBucket: {
+              name: 'bucket',
+              versioning: true,
+            },
+          },
+        },
+        awsRequestStubMap: {
+          ...baseAwsRequestStubMap,
+          S3: {
+            listObjectVersions: listObjectVersionsStub,
+            deleteObjects: deleteObjectsStub,
+          },
+        },
+      });
+
+      expect(listObjectVersionsStub.calledOnce).to.be.equal(true);
+      expect(
+        listObjectVersionsStub.calledWithExactly({
+          Bucket: 'bucket',
+          Prefix: 'serverless/test-service/dev',
+        })
+      ).to.be.equal(true);
+
+      expect(
+        deleteObjectsStub.calledWithExactly({
+          Bucket: 'bucket',
+          Delete: {
+            Objects: [
+              { Key: 'object1', VersionId: null },
+              { Key: 'object2', VersionId: 'v1' },
+              { Key: 'object3', VersionId: 'v2' },
+            ],
+          },
+        })
+      ).to.be.equal(true);
+    });
+  });
+
   describe('#deleteObjects()', () => {
     it('should delete all objects in the S3 bucket', () => {
       awsRemove.objectsInBucket = [{ Key: 'foo' }];

From 8e6dcd1aaed50007b5b99e18f61dfa849b898cd9 Mon Sep 17 00:00:00 2001
From: ROSeaboyer <ryan.seaboyer@icloud.com>
Date: Wed, 13 Oct 2021 11:03:01 -0300
Subject: [PATCH 0613/1101] feat(AWS S3): Recognize `ExpirationInDays` property
 for `s3` events

---
 lib/plugins/aws/package/compile/events/s3/configSchema.js | 7 +++----
 lib/utils/aws-schema-get-cf-value.js                      | 7 +++++++
 2 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 lib/utils/aws-schema-get-cf-value.js

diff --git a/lib/plugins/aws/package/compile/events/s3/configSchema.js b/lib/plugins/aws/package/compile/events/s3/configSchema.js
index 655ab5053f4..38b9539f426 100644
--- a/lib/plugins/aws/package/compile/events/s3/configSchema.js
+++ b/lib/plugins/aws/package/compile/events/s3/configSchema.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const { cfValue } = require('../../../../../../utils/aws-schema-get-cf-value');
+
 const destination = {
   type: 'object',
   properties: {
@@ -275,10 +277,7 @@ module.exports = {
                 type: 'string',
                 format: 'date-time',
               },
-              ExpirationInDays: {
-                type: 'integer',
-                minimum: 0,
-              },
+              ExpirationInDays: cfValue({ type: 'integer', minimum: 0 }),
               Id: {
                 type: 'string',
                 maxLength: 255,
diff --git a/lib/utils/aws-schema-get-cf-value.js b/lib/utils/aws-schema-get-cf-value.js
new file mode 100644
index 00000000000..d66cdc2d3fb
--- /dev/null
+++ b/lib/utils/aws-schema-get-cf-value.js
@@ -0,0 +1,7 @@
+'use strict';
+
+module.exports.cfValue = (value) => {
+  return {
+    anyOf: [value, { $ref: '#/definitions/awsCfFunction' }, { $ref: '#/definitions/awsCfIf' }],
+  };
+};

From ca705b8cc2854c302158a56294c2507ba5f2038f Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 12 Oct 2021 15:28:27 +0200
Subject: [PATCH 0614/1101] refactor(CLI): Introduce modern warning about
 resource limit

---
 lib/plugins/aws/info/index.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lib/plugins/aws/info/index.js b/lib/plugins/aws/info/index.js
index f997a67c3da..69a2ef87359 100644
--- a/lib/plugins/aws/info/index.js
+++ b/lib/plugins/aws/info/index.js
@@ -8,6 +8,7 @@ const getStackInfo = require('./getStackInfo');
 const getResourceCount = require('./getResourceCount');
 const getApiKeyValues = require('./getApiKeyValues');
 const display = require('./display');
+const { log } = require('@serverless/utils/log');
 
 const mainProgress = progress.get('main');
 
@@ -72,6 +73,18 @@ class AwsInfo {
       'aws:info:displayStackOutputs': async () =>
         BbPromise.bind(this).then(this.displayStackOutputs),
 
+      'after:aws:info:gatherData': () => {
+        if (this.gatheredData.info.resourceCount >= 450) {
+          log.warning(
+            `You have ${
+              this.gatheredData.info.resourceCount
+            } resources in your service. CloudFormation has a hard limit of 500 resources in a service. For advice on avoiding this limit, check out this link: ${style.link(
+              'http://slss.io/2q2'
+            )}.`
+          );
+        }
+      },
+
       'finalize': () => {
         if (this.serverless.processedInput.commands.join(' ') !== 'info') return;
 

From 03b4b3d47c25b6f98a46699463288c94b051f42c Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 13 Oct 2021 11:26:22 +0200
Subject: [PATCH 0615/1101] refactor(CLI): Remove empty line in `info` command

---
 lib/plugins/aws/info/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/plugins/aws/info/index.js b/lib/plugins/aws/info/index.js
index 69a2ef87359..fd26795d5c9 100644
--- a/lib/plugins/aws/info/index.js
+++ b/lib/plugins/aws/info/index.js
@@ -74,7 +74,7 @@ class AwsInfo {
         BbPromise.bind(this).then(this.displayStackOutputs),
 
       'after:aws:info:gatherData': () => {
-        if (this.gatheredData.info.resourceCount >= 450) {
+        if (this.gatheredData && this.gatheredData.info.resourceCount >= 450) {
           log.warning(
             `You have ${
               this.gatheredData.info.resourceCount
@@ -89,7 +89,6 @@ class AwsInfo {
         if (this.serverless.processedInput.commands.join(' ') !== 'info') return;
 
         writeText(
-          null,
           `${style.aside('service:')} ${this.serverless.service.service}`,
           `${style.aside('stage:')} ${this.provider.getStage()}`,
           `${style.aside('region:')} ${this.provider.getRegion()}`,

From 49f0913466110ac32d89c7c044fc781e524b9ed9 Mon Sep 17 00:00:00 2001
From: Chris Poli <34699237+chris-poli@users.noreply.github.com>
Date: Thu, 14 Oct 2021 18:25:16 +1000
Subject: [PATCH 0616/1101] refactor: Fix typo in `lib/classes/Variables.js`
 (#10093)

---
 lib/classes/Variables.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/classes/Variables.js b/lib/classes/Variables.js
index 91eec8b7fa0..a23bc2c8bfa 100644
--- a/lib/classes/Variables.js
+++ b/lib/classes/Variables.js
@@ -122,7 +122,7 @@ class Variables {
   // #############
   // ## SERVICE ##
   // #############
-  disableDepedentServices(func) {
+  disableDependentServices(func) {
     const dependencyMessage = (configValue, serviceName) =>
       `Variable dependency failure: variable '${configValue}' references ${serviceName} but using that service requires a concrete value to be called.`;
     // replace and then restore the methods for obtaining values from dependent services.  the
@@ -159,7 +159,7 @@ class Variables {
           path: 'serverless.service.provider.profile',
         },
       ];
-      return this.disableDepedentServices(() => {
+      return this.disableDependentServices(() => {
         const prepopulations = requiredConfigs.map((config) =>
           this.populateValue(config.value, true) // populate
             .then((populated) => Object.assign(config, { populated }))

From be00a2672cbc90fb33dee5e4bd44a1f6a127eb7c Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 12 Oct 2021 15:44:02 +0200
Subject: [PATCH 0617/1101] refactor(CLI): Replace `process.stdout` use with
 modern logs

---
 lib/cli/handle-error.js                        |  2 +-
 lib/cli/render-help/command.js                 |  3 ++-
 lib/cli/render-version.js                      | 10 ++++++++--
 lib/utils/open.js                              |  4 +++-
 lib/utils/openBrowser.js                       | 11 ++++++++---
 lib/utils/processBackendNotificationRequest.js |  5 ++++-
 6 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 16817880f47..eaf421c1160 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -26,7 +26,7 @@ const writeMessage = (title, message) => {
     line = `${line}-`;
   }
 
-  process.stdout.write(' \n');
+  legacy.consoleLog(' ');
   legacy.consoleLog(chalk.yellow(` ${title} ${line}`));
   legacy.consoleLog(' ');
 
diff --git a/lib/cli/render-help/command.js b/lib/cli/render-help/command.js
index 50e5cc31e91..8d06e024c7e 100644
--- a/lib/cli/render-help/command.js
+++ b/lib/cli/render-help/command.js
@@ -21,5 +21,6 @@ module.exports = (commandName) => {
   }
   if (commandSchema) renderOptionsHelp(Object.assign({}, commandSchema.options));
 
-  process.stdout.write('\n');
+  legacy.consoleLog('');
+  writeText();
 };
diff --git a/lib/cli/render-version.js b/lib/cli/render-version.js
index 365b8abce68..e070e83a9d6 100644
--- a/lib/cli/render-version.js
+++ b/lib/cli/render-version.js
@@ -5,7 +5,7 @@ const { version } = require('../../package');
 const { version: dashboardPluginVersion } = require('@serverless/dashboard-plugin/package');
 const { version: componentsVersion } = require('@serverless/components/package');
 const { platformClientVersion } = require('@serverless/dashboard-plugin');
-const { legacy, log } = require('@serverless/utils/log');
+const { legacy, log, writeText } = require('@serverless/utils/log');
 const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
 const resolveLocalServerlessPath = require('./resolve-local-serverless-path');
 const chalk = require('chalk');
@@ -54,10 +54,16 @@ module.exports = async () => {
     return '';
   })();
 
-  process.stdout.write(
+  legacy.write(
     `Framework Core: ${version}${installationModePostfix}\n` +
       `Plugin: ${dashboardPluginVersion}\n` +
       `SDK: ${platformClientVersion}\n` +
       `Components: ${componentsVersion}\n`
   );
+  writeText(
+    `Framework Core: ${version}${installationModePostfix}`,
+    `Plugin: ${dashboardPluginVersion}`,
+    `SDK: ${platformClientVersion}`,
+    `Components: ${componentsVersion}`
+  );
 };
diff --git a/lib/utils/open.js b/lib/utils/open.js
index 0793d67880d..2fd3108357a 100644
--- a/lib/utils/open.js
+++ b/lib/utils/open.js
@@ -14,6 +14,7 @@ const path = require('path');
 const childProcess = require('child_process');
 const fs = require('fs');
 const isWsl = require('is-wsl');
+const { legacy, log } = require('@serverless/utils/log');
 
 const pAccess = promisify(fs.access);
 const pExecFile = promisify(childProcess.execFile);
@@ -158,10 +159,11 @@ module.exports = async (target, options) => {
       }
       subprocess.once('error', (error) => {
         if (process.env.SLS_DEBUG) {
-          process.stdout.write(
+          legacy.write(
             `Serverless: ${chalk.red(`Opening of browser window errored with ${error.stack}`)}\n`
           );
         }
+        log.info(`Opening of browser window errored with ${error.stack}`);
       });
 
       subprocess.unref();
diff --git a/lib/utils/openBrowser.js b/lib/utils/openBrowser.js
index 2bbf0e35673..6bc25e7ec3a 100644
--- a/lib/utils/openBrowser.js
+++ b/lib/utils/openBrowser.js
@@ -5,20 +5,25 @@
 const opn = require('./open');
 const chalk = require('chalk');
 const isDockerContainer = require('is-docker');
+const { legacy, log, style } = require('@serverless/utils/log');
 
 module.exports = function openBrowser(url) {
-  process.stdout.write(
-    `\nIf your browser does not open automatically, please open the URL: ${url}\n\n`
+  legacy.write(`\nIf your browser does not open automatically, please open the URL: ${url}\n\n`);
+  log.notice();
+  log.notice(
+    style.aside(`If your browser does not open automatically, please open this URL: ${url}`)
   );
+  log.notice();
   let browser = process.env.BROWSER;
   if (browser === 'none' || isDockerContainer()) return;
   if (process.platform === 'darwin' && browser === 'open') browser = undefined;
   const options = { wait: false, app: browser };
   opn(url, options).catch((err) => {
     if (process.env.SLS_DEBUG) {
-      process.stdout.write(
+      legacy.write(
         `Serverless: ${chalk.red(`Opening of browser window errored with ${err.stack}`)}\n`
       );
     }
+    log.info(`Opening of browser window errored with ${err.stack}`);
   });
 };
diff --git a/lib/utils/processBackendNotificationRequest.js b/lib/utils/processBackendNotificationRequest.js
index a8c2dc5c17a..1f68714d982 100644
--- a/lib/utils/processBackendNotificationRequest.js
+++ b/lib/utils/processBackendNotificationRequest.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const chalk = require('chalk');
+const { legacy, log, style } = require('@serverless/utils/log');
 
 const processBackendNotificationRequest = require('@serverless/utils/process-backend-notification-request');
 
@@ -8,5 +9,7 @@ module.exports = (notifications) => {
   const notification = processBackendNotificationRequest(notifications);
   if (!notification) return;
 
-  process.stdout.write(`\n${chalk.gray(notification.message)}\n`);
+  legacy.write(`\n${chalk.gray(notification.message)}\n`);
+  log.notice();
+  log.notice(style.aside(notification.message));
 };

From 62642964bc38eae77b009ea84d05ba741383570f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 14 Oct 2021 13:00:57 +0200
Subject: [PATCH 0618/1101] refactor(CLI): Update link style for modern logs

---
 lib/cli/render-help/general.js | 4 ++--
 package.json                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/cli/render-help/general.js b/lib/cli/render-help/general.js
index 30aff79b823..3b81abdc82d 100644
--- a/lib/cli/render-help/general.js
+++ b/lib/cli/render-help/general.js
@@ -24,11 +24,11 @@ module.exports = (loadedPlugins) => {
     null,
     style.aside('Monitoring'),
     'Enable performance and error monitoring with the Serverless Dashboard.',
-    `Learn more: ${style.link('https://serverless.com/monitoring')}`,
+    `Learn more: ${style.linkStrong('https://serverless.com/monitoring')}`,
     null,
     style.aside('Plugins'),
     'Extend the Serverless Framework with plugins.',
-    `Explore plugins: ${style.link('https://serverless.com/plugins')}`,
+    `Explore plugins: ${style.linkStrong('https://serverless.com/plugins')}`,
     null,
     style.aside('Options')
   );
diff --git a/package.json b/package.json
index 20ebe927eeb..508c1bc614b 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@serverless/components": "^3.17.1",
     "@serverless/dashboard-plugin": "^5.4.6",
     "@serverless/platform-client": "^4.3.0",
-    "@serverless/utils": "^5.17.2",
+    "@serverless/utils": "^5.18.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",

From ed9fc40ff3a08a587ef4c65144534453c53e68d9 Mon Sep 17 00:00:00 2001
From: Austen <austen@serverless.com>
Date: Thu, 14 Oct 2021 22:29:22 -0600
Subject: [PATCH 0619/1101] Update outdated info

---
 README.md | 101 +++++++++---------------------------------------------
 1 file changed, 16 insertions(+), 85 deletions(-)

diff --git a/README.md b/README.md
index c9f47bc8108..0a41ba8b510 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,4 @@
-⚡ **Serverless Inc. is hiring to build the next generation of serverless development tools, [join us!](https://www.serverless.com/company/jobs/)**
-
----
-
-[![Serverless Application Framework AWS Lambda API Gateway](https://s3.amazonaws.com/assets.github.serverless/readme-serverless-framework.gif)](http://serverless.com)
+[![Serverless Application Framework AWS Lambda API Gateway](https://s3.amazonaws.com/assets.github.serverless/readme-serverless-framework.gif)](https://serverless.com)
 
 [![serverless](http://public.serverless.com/badges/v3.svg)](http://www.serverless.com)
 [![Build Status](https://github.com/serverless/serverless/workflows/Integrate/badge.svg)](https://github.com/serverless/serverless/actions?query=workflow%3AIntegrate)
@@ -12,20 +8,13 @@
 [![Known Vulnerabilities](https://snyk.io/test/github/serverless/serverless/badge.svg)](https://snyk.io/test/github/serverless/serverless)
 [![license](https://img.shields.io/npm/l/serverless.svg)](https://www.npmjs.com/package/serverless)
 
-<p align="center">
-  <span>English</span> |
-  <a href="./README_CN.md">简体中文</a>
-</p>
-
-[Website](http://www.serverless.com) • [Docs](https://serverless.com/framework/docs/) • [Newsletter](https://serverless.com/subscribe/) • [Swag](https://teespring.com/stores/serverless) • [Gitter](https://gitter.im/serverless/serverless) • [Forum](http://forum.serverless.com) • [Meetups](https://www.meetup.com/pro/serverless/) • [Twitter](https://twitter.com/goserverless) • [We're Hiring](https://serverless.com/company/jobs/)
+[Website](http://www.serverless.com) • [Docs](https://serverless.com/framework/docs/) • [Community Slack](https://join.slack.com/t/serverless-contrib/shared_invite/zt-d5qzowja-pnOerTzAIZUrN18hWYUIHA) • [Forum](http://forum.serverless.com) • [Twitter](https://twitter.com/goserverless) • [Meetups](https://www.meetup.com/pro/serverless/) • [We're Hiring](https://serverless.com/company/jobs/) • [简体中文](./README_CN.md)
 
-**The Serverless Framework** – Build applications comprised of microservices that run in response to events, auto-scale for you, and only charge you when they run. This lowers the total cost of maintaining your apps, enabling you to build more logic, faster.
+**The Serverless Framework** – Build applications on AWS Lambda and other next-gen cloud services, that auto-scale and only charge you when they run. This lowers the total cost of running and operating your apps, enabling you to build more and manage less.
 
-The Framework uses new event-driven compute services, like AWS Lambda, Google Cloud Functions, and more. It's a command-line tool, providing scaffolding, workflow automation and best practices for developing and deploying your serverless architecture. It's also completely extensible via plugins.
+The Serverless Framework is a command-line tool that uses easy and approachable YAML syntax to deploy both your code and cloud infrastructure needed to make tons of serverless application use-cases.  It's a multi-language framework that supports Node.js, Typescript, Python, Go, Java, and more.  It's also completely extensible via over 1,000 plugins that can add more serverless use-cases and workflows to the Framework.
 
-Check out the [Serverless Framework Dashboard](https://app.serverless.com) for monitoring, troubleshooting, ci/cd and more features for serverless teams.
-
-Serverless is actively maintained by [Serverless Inc](https://www.serverless.com).
+Actively maintained by [Serverless Inc](https://www.serverless.com).
 
 ## Contents
 
@@ -33,7 +22,6 @@ Serverless is actively maintained by [Serverless Inc](https://www.serverless.com
 
 - [Quick Start](#quick-start)
 - [Examples](https://github.com/serverless/examples)
-- [Services](#services)
 - [Features](#features)
 - [Plugins](https://github.com/serverless/plugins)
 - [Contributing](#contributing)
@@ -54,13 +42,16 @@ npm install -g serverless
 
 3. **Create a Service:**
 
-You can create a new service or [install existing services](#how-to-install-a-service).
+A "Service" is the Framework's project or app concept.  You can create one from scratch or select an existing template by running...
 
 ```bash
-# Create a new Serverless Service/Project
-serverless create --template aws-nodejs --path my-service
-# Change into the newly created directory
-cd my-service
+serverless
+```
+
+Go through the onboarding flow and then navigate into the newly created directory
+
+```bash
+cd my-new-service
 ```
 
 4. **Deploy a Service:**
@@ -68,7 +59,7 @@ cd my-service
 Use this when you have made changes to your Functions, Events or Resources in `serverless.yml` or you simply want to deploy all changes within your Service at the same time.
 
 ```bash
-serverless deploy -v
+serverless deploy
 ```
 
 5. **Deploy the Function:**
@@ -111,46 +102,6 @@ Removes all Functions, Events and Resources from your AWS account.
 serverless remove
 ```
 
-### How to Install a Service:
-
-This is a convenience method to install a pre-made Serverless Service locally by downloading the Github repo and unzipping it. Services are listed below.
-
-```bash
-serverless install -u https://github.com/your-url-to-the-serverless-service
-```
-
-Check out the [Serverless Framework Guide](./docs/providers/aws/guide/README.md) for more information.
-
-## <a name="services"></a>Services (V1.0)
-
-The following are services you can instantly install and use by running `serverless install --url <service-github-url>`
-
-- [serverless-examples](https://github.com/serverless/examples)
-- [CRUD](https://github.com/pmuens/serverless-crud) - CRUD service, [Scala Port](https://github.com/jahangirmohammed/serverless-crud-scala)
-- [CRUD with FaunaDB](https://github.com/faunadb/serverless-crud) - CRUD service using FaunaDB
-- [CRUD with S3](https://github.com/tscanlin/serverless-s3-crud) - CRUD service using S3
-- [CRUD with Flask and SQLAlchemy](https://github.com/jetbridge/sls-flask) - Python [CRUD API service](https://blog.jetbridge.com/framework/) with Flask, SQLAlchemy and Swagger
-- [GraphQL Boilerplate](https://github.com/serverless/serverless-graphql) - GraphQL application Boilerplate service
-- [Authentication](https://github.com/laardee/serverless-authentication-boilerplate) - Authentication boilerplate service
-- [Mailer](https://github.com/eahefnawy/serverless-mailer) - Service for sending emails
-- [Kinesis streams](https://github.com/pmuens/serverless-kinesis-streams) - Service to showcase Kinesis stream support
-- [DynamoDB streams](https://github.com/pmuens/serverless-dynamodb-streams) - Service to showcase DynamoDB stream support
-- [Landingpage backend](https://github.com/pmuens/serverless-landingpage-backend) - Landingpage backend service to store E-Mail addresses
-- [Facebook Messenger Chatbot](https://github.com/pmuens/serverless-facebook-messenger-bot) - Chatbot for the Facebook Messenger platform
-- [Lambda chaining](https://github.com/pmuens/serverless-lambda-chaining) - Service which chains Lambdas through SNS
-- [Secured API](https://github.com/pmuens/serverless-secured-api) - Service which exposes an API key accessible API
-- [Authorizer](https://github.com/eahefnawy/serverless-authorizer) - Service that uses API Gateway custom authorizers
-- [Thumbnails](https://github.com/eahefnawy/serverless-thumbnails) - Service that takes an image url and returns a 100x100 thumbnail
-- [Boilerplate](https://github.com/eahefnawy/serverless-boilerplate) - Opinionated boilerplate
-- [ES6 + Jest](https://github.com/americansystems/serverless-es6-jest) - ES6 + Jest Boilerplate
-- [PHP](https://github.com/ZeroSharp/serverless-php) - Call a PHP function from your lambda
-- [Ruby](https://github.com/stewartlord/serverless-ruby) - Call a Ruby function from your lambda
-- [Slack App](https://github.com/johnagan/serverless-slack-app) - Slack App Boilerplate with OAuth and Bot actions
-- [Swift](https://github.com/choefele/swift-lambda-app) - Full-featured project template to develop Lambda functions in Swift
-- [Cloudwatch Alerts on Slack](https://github.com/dav009/serverless-aws-alarms-notifier) - Get AWS Cloudwatch alerts notifications on Slack
-
-**Note**: the `serverless install` command will only work on V1.0 or later.
-
 ## <a name="features"></a>Features
 
 - Supports Node.js, Python, Java, Go, C#, Ruby, Swift, Kotlin, PHP, Scala, & F#
@@ -173,34 +124,14 @@ Check out our [help wanted](https://github.com/serverless/serverless/labels/help
 
 ## <a name="community"></a>Community
 
-- [Email Updates](http://eepurl.com/b8dv4P)
-- [Serverless Forum](http://forum.serverless.com)
+- [Twitter](https://twitter.com/goserverless)
+- [Community Slack](https://join.slack.com/t/serverless-contrib/shared_invite/zt-d5qzowja-pnOerTzAIZUrN18hWYUIHA)
 - [Gitter Chatroom](https://gitter.im/serverless/serverless)
 - [Serverless Meetups](http://www.meetup.com/serverless/)
 - [Stackoverflow](http://stackoverflow.com/questions/tagged/serverless-framework)
 - [Facebook](https://www.facebook.com/serverless)
-- [Twitter](https://twitter.com/goserverless)
 - [Contact Us](mailto:hello@serverless.com)
 
-## <a name="consultants"></a>Consultants
-
-We recommend the following professional services organizations who are experts in serverless development:
-
-- [Serverless Guru](https://serverlessguru.com/)
-- [Antstack](https://www.antstack.io/)
-- [Theodo](https://www.theodo.co.uk) - full stack teams passionate about Serverless that also run the Serverless Transformation Newsletter & Blog.
-- [null](https://null.tc/) - maintains [Bref](https://bref.sh/) to create serverless PHP applications
-- [Nordcloud](https://nordcloud.com) - they created [several plugins](https://github.com/nordcloud?utf8=%E2%9C%93&q=serverless&type=&language=), sponsor [Serverless Days Helsinki](https://helsinki.serverlessdays.io/) and regularly host [Serverless Finland](https://www.meetup.com/Serverless-Finland/) Meetups.
-- [API talent](http://www.apitalent.co.nz) - who also run [Serverless-Auckland Meetup](http://www.meetup.com/Serverless-Auckland)
-- [EPX Labs](http://www.epxlabs.com/) - runs [Serverless NYC Meetup](https://www.meetup.com/Serverless-NYC/)
-- [Seraro](http://www.seraro.com/) - Who also runs Atlanta Serverless Meetup (https://www.meetup.com/Atlanta-CABI-Camp-Cloud-AI-Blockchain-IOT) and Delhi Serverless Meetup (https://www.meetup.com/Delhi-NCR-Serverless-Architecture-Meetup/)
-- [superluminar](https://superluminar.io) - runs serverlessdays Hamburg and Serverless Meetup Hamburg
-- [JetBridge](https://jetbridge.com) - cloud-native and serverless application development services.
-
-If you'd like to be featured here, [please contact us](mailto:hello@serverless.com).
-
----
-
 ## <a name="licensing"></a>Licensing
 
 Serverless is licensed under the [MIT License](./LICENSE.txt).

From f4163d25718816a6095d576d12fe090e3141c4f0 Mon Sep 17 00:00:00 2001
From: Austen <austen@serverless.com>
Date: Thu, 14 Oct 2021 22:38:28 -0600
Subject: [PATCH 0620/1101] Improve formatting

---
 README.md | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 0a41ba8b510..fd36e1a393d 100644
--- a/README.md
+++ b/README.md
@@ -18,29 +18,28 @@ Actively maintained by [Serverless Inc](https://www.serverless.com).
 
 ## Contents
 
-<img align="right" width="400" src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/email/sls-getting-started.gif" />
-
 - [Quick Start](#quick-start)
 - [Examples](https://github.com/serverless/examples)
 - [Features](#features)
 - [Plugins](https://github.com/serverless/plugins)
 - [Contributing](#contributing)
 - [Community](#community)
-- [Consultants](#consultants)
 - [Licensing](#licensing)
 - [Previous Version 0.5.x](#v.5)
 
 ## <a name="quick-start"></a>Quick Start
 
-1. **Install via npm:**
+### Install Via NPM:
 
 ```bash
 npm install -g serverless
 ```
 
-2. **Set-up your [Provider Credentials](./docs/providers/aws/guide/credentials.md)**. [Watch the video on setting up credentials](https://youtu.be/VUKDRoUdMek)
+### Set Up Your AWS Account Credentials.
+
+The Serverless Framework deploys to your own AWS account.  You'll need to enable Serverless Framework to deploy to your AWS account by giving it access. [Here is a guide to help you set up your credentials securely](https://www.serverless.com/framework/docs/providers/aws/guide/credentials)
 
-3. **Create a Service:**
+### Create A Service:
 
 A "Service" is the Framework's project or app concept.  You can create one from scratch or select an existing template by running...
 
@@ -54,7 +53,7 @@ Go through the onboarding flow and then navigate into the newly created director
 cd my-new-service
 ```
 
-4. **Deploy a Service:**
+### Deploy A Service:
 
 Use this when you have made changes to your Functions, Events or Resources in `serverless.yml` or you simply want to deploy all changes within your Service at the same time.
 
@@ -62,7 +61,7 @@ Use this when you have made changes to your Functions, Events or Resources in `s
 serverless deploy
 ```
 
-5. **Deploy the Function:**
+### Deploy A Function:
 
 Use this to quickly upload and overwrite your AWS Lambda code on AWS, allowing you to develop faster.
 
@@ -70,7 +69,7 @@ Use this to quickly upload and overwrite your AWS Lambda code on AWS, allowing y
 serverless deploy function -f hello
 ```
 
-6. **Invoke the Function on AWS:**
+### Invoke The Function On AWS:
 
 Invokes an AWS Lambda Function on AWS and returns logs.
 
@@ -78,7 +77,7 @@ Invokes an AWS Lambda Function on AWS and returns logs.
 serverless invoke -f hello -l
 ```
 
-7. **Invoke the Function on your machine:**
+### Invoke The Function Locally:
 
 Invokes an AWS Lambda Function on your local machine and returns logs.
 
@@ -86,7 +85,7 @@ Invokes an AWS Lambda Function on your local machine and returns logs.
 serverless invoke local -f hello -l
 ```
 
-8. **Fetch the Function Logs:**
+### Stream Function Logs:
 
 Open up a separate tab in your console and stream all logs for a specific Function using this command.
 
@@ -94,7 +93,7 @@ Open up a separate tab in your console and stream all logs for a specific Functi
 serverless logs -f hello -t
 ```
 
-9. **Remove the Service:**
+### Remove The Service:
 
 Removes all Functions, Events and Resources from your AWS account.
 

From 7d19ca857230a56bbe40bda4d6704edd34019e4e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 15 Oct 2021 10:24:09 +0200
Subject: [PATCH 0621/1101] refactor(CLI): Improve handling of service outputs
 in modern logs

---
 lib/plugins/aws/info/display.js | 7 +++++++
 lib/plugins/aws/info/index.js   | 9 +--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/plugins/aws/info/display.js b/lib/plugins/aws/info/display.js
index f6bbfccda95..190349bccb4 100644
--- a/lib/plugins/aws/info/display.js
+++ b/lib/plugins/aws/info/display.js
@@ -24,6 +24,13 @@ module.exports = {
     }
 
     legacy.consoleLog(message);
+    if (this.serverless.processedInput.commands.join(' ') === 'info') {
+      this.serverless.addServiceOutputSection('service', this.serverless.service.service);
+      this.serverless.addServiceOutputSection('stage', this.provider.getStage());
+      this.serverless.addServiceOutputSection('region', this.provider.getRegion());
+      this.serverless.addServiceOutputSection('stack', this.provider.naming.getStackName());
+    }
+
     return message;
   },
 
diff --git a/lib/plugins/aws/info/index.js b/lib/plugins/aws/info/index.js
index fd26795d5c9..4d57a7069e9 100644
--- a/lib/plugins/aws/info/index.js
+++ b/lib/plugins/aws/info/index.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const BbPromise = require('bluebird');
-const { progress, writeText, style } = require('@serverless/utils/log');
+const { progress, style } = require('@serverless/utils/log');
 const writeServiceOutputs = require('../../../cli/write-service-outputs');
 const validate = require('../lib/validate');
 const getStackInfo = require('./getStackInfo');
@@ -87,13 +87,6 @@ class AwsInfo {
 
       'finalize': () => {
         if (this.serverless.processedInput.commands.join(' ') !== 'info') return;
-
-        writeText(
-          `${style.aside('service:')} ${this.serverless.service.service}`,
-          `${style.aside('stage:')} ${this.provider.getStage()}`,
-          `${style.aside('region:')} ${this.provider.getRegion()}`,
-          `${style.aside('stack:')} ${this.provider.naming.getStackName()}`
-        );
         writeServiceOutputs(this.serverless.serviceOutputs);
       },
     };

From 4da08996736c9a8f2b0a0193f7cca4b24f3fc6f1 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 12 Oct 2021 10:16:55 +0200
Subject: [PATCH 0622/1101] refactor(CLI): Replace warnings with modern
 counterparts

---
 lib/classes/ConfigSchemaHandler/index.js      |  48 ++++--
 lib/classes/PluginManager.js                  |  26 ++-
 lib/cli/commands-schema/resolve-final.js      |   2 +-
 lib/plugins/aws/deploy/lib/checkForChanges.js |  12 +-
 .../aws/deploy/lib/extendedValidate.js        |  23 ++-
 lib/plugins/aws/deployFunction.js             |   5 +-
 lib/plugins/aws/invokeLocal/index.js          |  11 +-
 .../aws/lib/checkIfEcrRepositoryExists.js     |   9 +-
 .../compile/events/apiGateway/lib/validate.js |  26 ++-
 .../aws/package/compile/events/cloudFront.js  |  18 ++-
 .../aws/package/lib/generateCoreTemplate.js   |   6 +-
 lib/plugins/aws/provider.js                   |   8 +-
 lib/utils/eventuallyUpdate.js                 |  43 ++---
 test/unit/lib/classes/PluginManager.test.js   |  20 ---
 .../aws/deploy/lib/checkForChanges.test.js    |   2 +-
 .../events/apiGateway/lib/validate.test.js    | 151 ------------------
 .../package/compile/events/cloudFront.test.js |  36 -----
 test/unit/lib/plugins/aws/provider.test.js    |   9 +-
 18 files changed, 167 insertions(+), 288 deletions(-)

diff --git a/lib/classes/ConfigSchemaHandler/index.js b/lib/classes/ConfigSchemaHandler/index.js
index 58d0620def9..4ae40493560 100644
--- a/lib/classes/ConfigSchemaHandler/index.js
+++ b/lib/classes/ConfigSchemaHandler/index.js
@@ -6,6 +6,7 @@ const ensurePlainObject = require('type/plain-object/ensure');
 const schema = require('../../configSchema');
 const ServerlessError = require('../../serverless-error');
 const normalizeAjvErrors = require('./normalizeAjvErrors');
+const { legacy, log, style } = require('@serverless/utils/log');
 
 const FUNCTION_NAME_PATTERN = '^[a-zA-Z0-9-_]+$';
 const ERROR_PREFIX = 'Configuration error';
@@ -79,30 +80,41 @@ class ConfigSchemaHandler {
     if (!this.schema.properties.provider.properties.name) {
       configurationValidationResults.set(this.serverless.configurationInput, false);
       if (this.serverless.service.configValidationMode !== 'off') {
-        this.serverless.cli.log(
+        legacy.log(
           `${WARNING_PREFIX}: Unrecognized provider '${this.serverless.service.provider.name}'`,
           'Serverless',
           { color: 'orange' }
         );
-        this.serverless.cli.log(' ');
-        this.serverless.cli.log(
+        legacy.log(' ');
+        legacy.log(
           "You're relying on provider plugin which doesn't " +
             'provide a validation schema for its config.',
           'Serverless',
           { color: 'orange' }
         );
-        this.serverless.cli.log(
+        legacy.log(
           'Please report the issue at its bug tracker linking: ' +
             'https://www.serverless.com/framework/docs/providers/aws/guide/plugins#extending-validation-schema',
           'Serverless',
           { color: 'orange' }
         );
-        this.serverless.cli.log(
+        legacy.log(
           'You may turn off this message with "configValidationMode: off" setting',
           'Serverless',
           { color: 'orange' }
         );
-        this.serverless.cli.log(' ');
+        legacy.log(' ');
+
+        log.warning(
+          [
+            `You're relying on provider "${this.serverless.service.provider.name}" defined by a plugin which doesn't provide a validation schema for its config.`,
+            `Please report the issue at its bug tracker linking: ${style.link(
+              'https://www.serverless.com/framework/docs/providers/aws/guide/plugins#extending-validation-schema'
+            )}`,
+            'You may turn off this message with "configValidationMode: off" setting',
+            '',
+          ].join('\n')
+        );
       }
 
       this.relaxProviderSchema();
@@ -139,24 +151,36 @@ class ConfigSchemaHandler {
         );
       } else {
         if (messages.length === 1) {
-          this.serverless.cli.log(`${WARNING_PREFIX} ${messages[0]}`, 'Serverless', {
+          legacy.log(`${WARNING_PREFIX} ${messages[0]}`, 'Serverless', {
             color: 'orange',
           });
         } else {
-          this.serverless.cli.log(`${WARNING_PREFIX}:`, 'Serverless', {
+          legacy.log(`${WARNING_PREFIX}:`, 'Serverless', {
             color: 'orange',
           });
           for (const message of messages) {
-            this.serverless.cli.log(`  ${message}`, 'Serverless', { color: 'orange' });
+            legacy.log(`  ${message}`, 'Serverless', { color: 'orange' });
           }
         }
-        this.serverless.cli.log(' ');
-        this.serverless.cli.log(
+        legacy.log(' ');
+        legacy.log(
           'Learn more about configuration validation here: http://slss.io/configuration-validation',
           'Serverless',
           { color: 'orange' }
         );
-        this.serverless.cli.log(' ');
+        legacy.log(' ');
+
+        log.notice();
+        log.warning(
+          [
+            'Invalid configuration encountered',
+            ...messages.map((message) => `  ${message}`),
+            '',
+            `Learn more about configuration validation here: ${style.link(
+              'http://slss.io/configuration-validation'
+            )}`,
+          ].join('\n')
+        );
       }
     }
   }
diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 39d5187b8be..02588a5cba7 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -133,7 +133,10 @@ class PluginManager {
 
     // don't load plugins twice
     if (this.plugins.some((plugin) => plugin instanceof Plugin)) {
-      this.serverless.cli.log(`WARNING: duplicate plugin ${Plugin.name} was not loaded\n`);
+      legacy.log(`WARNING: duplicate plugin ${Plugin.name} was not loaded\n`);
+      log.warning(
+        `Duplicate plugin definition found in your configuration. Plugin "${Plugin.name}" will not be loaded more than once.`
+      );
       return null;
     }
 
@@ -300,8 +303,9 @@ class PluginManager {
     // Handle command aliases
     (details.aliases || []).forEach((alias) => {
       if (process.env.SLS_DEBUG) {
-        this.serverless.cli.log(`  -> @${alias}`);
+        legacy.log(`  -> @${alias}`);
       }
+      log.get('lifecycle:command:register').debug(`  -> @${alias}`);
       this.createCommandAlias(alias, key);
     });
     return Object.assign({}, details, { key, pluginName, commands });
@@ -342,9 +346,12 @@ class PluginManager {
         if (this.deprecatedEvents[baseEvent]) {
           const redirectedEvent = this.deprecatedEvents[baseEvent];
           if (process.env.SLS_DEBUG) {
-            this.serverless.cli.log(`WARNING: Plugin ${pluginName} uses deprecated hook ${event},
+            legacy.log(`WARNING: Plugin ${pluginName} uses deprecated hook ${event},
                      use ${redirectedEvent} hook instead`);
           }
+          log.info(
+            `Plugin "${pluginName}" uses deprecated hook "${event}". Use "${redirectedEvent}" hook instead.`
+          );
           if (redirectedEvent) {
             target = event.replace(baseEvent, redirectedEvent);
           }
@@ -365,9 +372,10 @@ class PluginManager {
     )) {
       let options = resolverOrOptions;
       if (!options) {
-        this.serverless.cli.log(
+        legacy.log(
           `Warning! Ignoring falsy variableResolver for ${variablePrefix} in ${pluginName}.`
         );
+        log.warning(`Ignoring falsy variableResolver for ${variablePrefix} in ${pluginName}.`);
         continue;
       }
       if (typeof resolverOrOptions === 'function') {
@@ -606,8 +614,9 @@ class PluginManager {
     } catch (error) {
       if (error instanceof TerminateHookChain) {
         if (process.env.SLS_DEBUG) {
-          this.serverless.cli.log(`Terminate ${commandsArray.join(':')}`);
+          legacy.log(`Terminate ${commandsArray.join(':')}`);
         }
+        log.debug(`Terminate ${commandsArray.join(':')}`);
         return;
       }
       throw error;
@@ -666,11 +675,16 @@ class PluginManager {
         for (const { hook } of this.hooks.error || []) await hook(commandException);
       } catch (errorHookException) {
         const errorHookExceptionMeta = tokenizeException(errorHookException);
-        this.serverless.cli.log(
+        legacy.log(
           `Warning: "error" hook crashed with: ${
             errorHookExceptionMeta.stack || errorHookExceptionMeta.message
           }`
         );
+        log.warning(
+          `The "error" hook crashed with:\n${
+            errorHookExceptionMeta.stack || errorHookExceptionMeta.message
+          }`
+        );
       } finally {
         await deferredBackendNotificationRequest;
         throw commandException; // eslint-disable-line no-unsafe-finally
diff --git a/lib/cli/commands-schema/resolve-final.js b/lib/cli/commands-schema/resolve-final.js
index 98150a9902c..4a5c2fe809c 100644
--- a/lib/cli/commands-schema/resolve-final.js
+++ b/lib/cli/commands-schema/resolve-final.js
@@ -131,7 +131,7 @@ module.exports = (loadedPlugins, { providerName }) => {
           ([plugin, optionNames]) =>
             `${plugin.constructor.name} for "${Array.from(optionNames).join('", "')}"`
         ).join('\n - ')}\n\n` +
-        'Please report this issue in issue tracker of the corresponding plugin.'
+        'Please report this issue in issue tracker of the corresponding plugin.\n'
     );
   }
 
diff --git a/lib/plugins/aws/deploy/lib/checkForChanges.js b/lib/plugins/aws/deploy/lib/checkForChanges.js
index ff61ac3ff29..ff18219863a 100644
--- a/lib/plugins/aws/deploy/lib/checkForChanges.js
+++ b/lib/plugins/aws/deploy/lib/checkForChanges.js
@@ -8,7 +8,7 @@ const BbPromise = require('bluebird');
 const _ = require('lodash');
 const normalizeFiles = require('../../lib/normalizeFiles');
 const ServerlessError = require('../../../../serverless-error');
-const { legacy } = require('@serverless/utils/log');
+const { legacy, log } = require('@serverless/utils/log');
 
 module.exports = {
   async checkForChanges() {
@@ -108,14 +108,14 @@ module.exports = {
 
     return BbPromise.all(getFunctionResults).then((results) => {
       if (couldNotAccessFunction) {
-        this.serverless.cli.log(
-          [
-            'WARNING: Not authorized to perform: lambda:GetFunction for at least one of the lambda functions.',
-            ' Deployment will not be skipped even if service files did not change. ',
-          ].join(''),
+        legacy.log(
+          'WARNING: Not authorized to perform: lambda:GetFunction for at least one of the lambda functions. Deployment will not be skipped even if service files did not change.',
           'Serverless',
           { color: 'orange' }
         );
+        log.warning(
+          'Not authorized to perform: lambda:GetFunction for at least one of the lambda functions. Deployment will not be skipped even if service files did not change.'
+        );
       }
 
       return results.reduce((currentMin, date) => {
diff --git a/lib/plugins/aws/deploy/lib/extendedValidate.js b/lib/plugins/aws/deploy/lib/extendedValidate.js
index 8a37be45d82..b601d066714 100644
--- a/lib/plugins/aws/deploy/lib/extendedValidate.js
+++ b/lib/plugins/aws/deploy/lib/extendedValidate.js
@@ -4,7 +4,7 @@ const path = require('path');
 const _ = require('lodash');
 const findReferences = require('../../utils/findReferences');
 const ServerlessError = require('../../../../serverless-error');
-const { legacy } = require('@serverless/utils/log');
+const { legacy, log } = require('@serverless/utils/log');
 
 module.exports = {
   extendedValidate() {
@@ -46,13 +46,20 @@ module.exports = {
         if (functionObject.timeout > 30 && functionObject.events) {
           functionObject.events.forEach((event) => {
             if (Object.keys(event)[0] === 'http' && !event.http.async) {
-              const warnMessage = [
-                `WARNING: Function ${functionName} has timeout of ${functionObject.timeout} `,
-                "seconds, however, it's attached to API Gateway so it's automatically ",
-                'limited to 30 seconds.',
-              ].join('');
-
-              legacy.log(warnMessage);
+              legacy.log(
+                [
+                  `WARNING: Function ${functionName} has timeout of ${functionObject.timeout} `,
+                  "seconds, however, it's attached to API Gateway so it's automatically ",
+                  'limited to 30 seconds.',
+                ].join('')
+              );
+              log.warning(
+                [
+                  `Function ${functionName} has timeout of ${functionObject.timeout} `,
+                  "seconds, however, it's attached to API Gateway so it's automatically ",
+                  'limited to 30 seconds.',
+                ].join('')
+              );
             }
           });
         }
diff --git a/lib/plugins/aws/deployFunction.js b/lib/plugins/aws/deployFunction.js
index 680b673dcc5..f778312a275 100644
--- a/lib/plugins/aws/deployFunction.js
+++ b/lib/plugins/aws/deployFunction.js
@@ -179,7 +179,10 @@ class AwsDeployFunction {
               'DEPLOY_FUNCTION_CONFIGURATION_UPDATE_TIMED_OUT'
             );
           }
-          this.serverless.cli.log(
+          legacy.log(
+            `Retrying configuration update for function: ${this.options.function}. Reason: ${err.message}`
+          );
+          log.info(
             `Retrying configuration update for function: ${this.options.function}. Reason: ${err.message}`
           );
           await wait(1000);
diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invokeLocal/index.js
index cda97f72a29..5dc93e04c7e 100644
--- a/lib/plugins/aws/invokeLocal/index.js
+++ b/lib/plugins/aws/invokeLocal/index.js
@@ -643,12 +643,11 @@ class AwsInvokeLocal {
         { shell: true }
       );
 
-      // TODO: CONSIDER IT AS A WARNING
-      this.serverless.cli.log(
-        [
-          'In order to get human-readable output,',
-          ' please implement "toString()" method of your "ApiGatewayResponse" object.',
-        ].join('')
+      legacy.log(
+        'In order to get human-readable output, please implement "toString()" method of your "ApiGatewayResponse" object.'
+      );
+      log.warning(
+        'In order to get human-readable output, please implement "toString()" method of your "ApiGatewayResponse" object.'
       );
 
       java.stdout.on('data', (buf) => {
diff --git a/lib/plugins/aws/lib/checkIfEcrRepositoryExists.js b/lib/plugins/aws/lib/checkIfEcrRepositoryExists.js
index 3b7f18944b3..bcbffb350d6 100644
--- a/lib/plugins/aws/lib/checkIfEcrRepositoryExists.js
+++ b/lib/plugins/aws/lib/checkIfEcrRepositoryExists.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const { legacy, log } = require('@serverless/utils/log');
+
 module.exports = {
   async checkIfEcrRepositoryExists() {
     const registryId = await this.provider.getAccountId();
@@ -16,11 +18,14 @@ module.exports = {
       }
       if (err.providerError && err.providerError.code === 'AccessDeniedException') {
         if (this.serverless.service.provider.ecr && this.serverless.service.provider.ecr.images) {
-          this.serverless.cli.log(
-            'WARNING: Could not access ECR repository due to denied access, but there are images defined in `provider.ecr`. ECR repository removal will be skipped.',
+          legacy.log(
+            'WARNING: Could not access ECR repository due to denied access, but there are images defined in "provider.ecr". ECR repository removal will be skipped.',
             'Serverless',
             { color: 'orange' }
           );
+          log.warning(
+            'Could not access ECR repository due to denied access, but there are images defined in "provider.ecr". ECR repository removal will be skipped.'
+          );
         }
         // Check if user has images defined and issue warning that we could not
         return false;
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
index a2c5ad8895a..5b99559e8d3 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
@@ -4,6 +4,7 @@ const _ = require('lodash');
 const awsArnRegExs = require('../../../../../utils/arnRegularExpressions');
 const resolveLambdaTarget = require('../../../../../utils/resolveLambdaTarget');
 const ServerlessError = require('../../../../../../../serverless-error');
+const { legacy, log } = require('@serverless/utils/log');
 
 const NOT_FOUND = -1;
 const DEFAULT_STATUS_CODES = {
@@ -116,14 +117,15 @@ module.exports = {
 
               if (_.difference(keys, allowedKeys).length) {
                 const requestWarningMessage = [
-                  `Warning! You're using the ${http.integration} in combination with a request`,
+                  `You're using the ${http.integration} in combination with a request`,
                   ` configuration in your function "${functionName}". Only the `,
                   allowedKeys.map((value) => `request.${value}`).join(', '),
                   ` configs are available in conjunction with ${http.integration}.`,
                   ' Serverless will remove this configuration automatically',
                   ' before deployment.',
                 ].join('');
-                this.serverless.cli.log(requestWarningMessage);
+                legacy.log(`Warning! ${requestWarningMessage}`);
+                log.warning(requestWarningMessage);
                 for (const key of keys) {
                   if (!allowedKeys.includes(key)) {
                     delete http.request[key];
@@ -138,12 +140,20 @@ module.exports = {
               }
             }
             if (http.response) {
-              const warningMessage = [
-                `Warning! You're using the ${http.integration} in combination with response`,
-                ` configuration in your function "${functionName}".`,
-                ' Serverless will remove this configuration automatically before deployment.',
-              ].join('');
-              this.serverless.cli.log(warningMessage);
+              legacy.log(
+                [
+                  `Warning! You're using the ${http.integration} in combination with response`,
+                  ` configuration in your function "${functionName}".`,
+                  ' Serverless will remove this configuration automatically before deployment.',
+                ].join('')
+              );
+              log.warning(
+                [
+                  `You're using the ${http.integration} in combination with response`,
+                  ` configuration in your function "${functionName}".`,
+                  ' Serverless will remove this configuration automatically before deployment.',
+                ].join('')
+              );
 
               delete http.response;
             }
diff --git a/lib/plugins/aws/package/compile/events/cloudFront.js b/lib/plugins/aws/package/compile/events/cloudFront.js
index 63a1fd05a15..be6e9129fa8 100644
--- a/lib/plugins/aws/package/compile/events/cloudFront.js
+++ b/lib/plugins/aws/package/compile/events/cloudFront.js
@@ -4,6 +4,7 @@ const _ = require('lodash');
 const url = require('url');
 const chalk = require('chalk');
 const ServerlessError = require('../../../../../serverless-error');
+const { legacy, log, style } = require('@serverless/utils/log');
 
 const originLimits = { maxTimeout: 30, maxMemorySize: 10240 };
 const viewerLimits = { maxTimeout: 5, maxMemorySize: 128 };
@@ -255,7 +256,8 @@ class AwsCompileCloudFrontEvents {
           "Don't forget to manually remove your Lambda@Edge functions ",
           'once the CloudFront distribution removal is successfully propagated!',
         ].join('');
-        this.serverless.cli.log(message, 'Serverless', { color: 'orange' });
+        legacy.log(message, 'Serverless', { color: 'orange' });
+        log.warning(message);
       }
     }
   }
@@ -540,10 +542,13 @@ class AwsCompileCloudFrontEvents {
     });
 
     unusedUserDefinedCachePolicies.forEach((unusedUserDefinedCachePolicy) => {
-      this.serverless.cli.log(
+      legacy.log(
         `WARNING: provider.cloudFront.cachePolicies.${unusedUserDefinedCachePolicy} ` +
           'not used by any cloudFront event configuration'
       );
+      log.warning(
+        `Setting "provider.cloudFront.cachePolicies.${unusedUserDefinedCachePolicy}" is not used by any cloudFront event configuration.`
+      );
     });
 
     // sort that first is without PathPattern if available
@@ -645,14 +650,19 @@ class AwsCompileCloudFrontEvents {
       Object.assign(Resources, lambdaInvokePermissions);
 
       if (!Resources.IamRoleLambdaExecution) {
-        this.serverless.cli.log(
+        legacy.log(
           chalk.magenta('Remember to add required lambda@edge permissions to your execution role.')
         );
-        this.serverless.cli.log(
+        legacy.log(
           chalk.magenta(
             'https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/lambda-edge-permissions.html'
           )
         );
+        log.notice(
+          `Remember to add required lambda@edge permissions to your execution role. Documentation: ${style.link(
+            'https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/lambda-edge-permissions.html'
+          )}`
+        );
       } else {
         const lambdaAssumeStatement =
           Resources.IamRoleLambdaExecution.Properties.AssumeRolePolicyDocument.Statement.find(
diff --git a/lib/plugins/aws/package/lib/generateCoreTemplate.js b/lib/plugins/aws/package/lib/generateCoreTemplate.js
index 91eb7c9104f..925d7729016 100644
--- a/lib/plugins/aws/package/lib/generateCoreTemplate.js
+++ b/lib/plugins/aws/package/lib/generateCoreTemplate.js
@@ -3,6 +3,7 @@
 const path = require('path');
 const _ = require('lodash');
 const ServerlessError = require('../../../../serverless-error');
+const { legacy, log } = require('@serverless/utils/log');
 
 module.exports = {
   generateCoreTemplate() {
@@ -93,9 +94,8 @@ module.exports = {
 
     if (bucketName) {
       if (isS3TransferAccelerationEnabled) {
-        const warningMessage =
-          'Warning: S3 Transfer Acceleration will not be enabled on deploymentBucket.';
-        this.serverless.cli.log(warningMessage);
+        legacy.log('Warning: S3 Transfer Acceleration will not be enabled on deploymentBucket.');
+        log.warning('S3 Transfer Acceleration cannot be enabled on user provided S3 bucket');
       }
       this.bucketName = bucketName;
       this.serverless.service.package.deploymentBucket = bucketName;
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 988b908b6f8..917a15822a0 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -14,7 +14,6 @@ const path = require('path');
 const spawnExt = require('child-process-ext/spawn');
 const ServerlessError = require('../../serverless-error');
 const awsRequest = require('../../aws/request');
-const oldLog = require('@serverless/utils/log');
 const deepSortObjectByKey = require('../../utils/deepSortObjectByKey');
 const { progress, legacy, log } = require('@serverless/utils/log');
 
@@ -1446,7 +1445,7 @@ class AwsProvider {
     // Emit a warning for misuses of the old signature including stage and region
     // TODO: Determine calling module and log that
     if (process.env.SLS_DEBUG && options != null && !_.isObject(options)) {
-      oldLog('WARNING: Inappropriate call of provider.request()');
+      legacy.log('WARNING: Inappropriate call of provider.request()');
     }
     const requestOptions = _.isObject(options) ? options : {};
     const shouldCache = _.get(requestOptions, 'useCache', false);
@@ -1888,11 +1887,14 @@ Object.defineProperties(
           legacy.log('Login to Docker succeeded!');
           log.info('Login to Docker succeeded!');
           if (stdBuffer.includes('password will be stored unencrypted')) {
-            this.serverless.cli.log(
+            legacy.log(
               'WARNING: Docker authentication token will be stored unencrypted in docker config. Configure Docker credential helper to remove this warning.',
               'Serverless',
               { color: 'orange' }
             );
+            log.warning(
+              'Docker authentication token will be stored unencrypted in docker config. Configure Docker credential helper to remove this warning.'
+            );
           }
         } catch (err) {
           throw new ServerlessError(
diff --git a/lib/utils/eventuallyUpdate.js b/lib/utils/eventuallyUpdate.js
index 9b11eb8121a..96986922690 100644
--- a/lib/utils/eventuallyUpdate.js
+++ b/lib/utils/eventuallyUpdate.js
@@ -23,6 +23,7 @@ const pipeline = promisify(stream.pipeline);
 
 const npmInstallationDir = path.resolve(__dirname, '../../');
 const serverlessTmpDir = path.resolve(os.tmpdir(), 'tmpdirs-serverless');
+const { legacy, log, style } = require('@serverless/utils/log');
 
 const CHECK_INTERVAL = 1000 * 60 * 30; // 30 minutes
 
@@ -30,13 +31,10 @@ const npmUpdate = async (serverless, { newVersion, tarballUrl, abortHandler }) =
   const npmPackageRoot = await isNpmPackageWritable();
 
   if (!npmPackageRoot) {
-    serverless.cli.log(
-      `Auto update error: No write access to ${npmInstallationDir}`,
-      'Serverless',
-      {
-        color: 'orange',
-      }
-    );
+    legacy.log(`Auto update error: No write access to ${npmInstallationDir}`, 'Serverless', {
+      color: 'orange',
+    });
+    log.warning(`Auto update error: No write access to ${npmInstallationDir}`);
     return null;
   }
   const tempInstallationDir = path.resolve(serverlessTmpDir, `npm-update-${newVersion}`);
@@ -60,8 +58,11 @@ const npmUpdate = async (serverless, { newVersion, tarballUrl, abortHandler }) =
       await fse.remove(tempOldInstallationDir);
     };
   } catch (error) {
-    if (!abortHandler.isAborted && process.env.SLS_DEBUG) {
-      serverless.cli.log(format('Auto update: Could not update npm installation: %O', error));
+    if (!abortHandler.isAborted) {
+      if (process.env.SLS_DEBUG) {
+        legacy.log(format('Auto update: Could not update npm installation: %O', error));
+      }
+      log.info('Auto update: Could not update npm installation: %O', error);
     }
     return null;
   }
@@ -78,8 +79,11 @@ const standaloneUpdate = async (serverless, { newVersion, abortHandler }) => {
     await fsp.chmod(tempStandalonePath, 0o755);
     return () => fsp.rename(tempStandalonePath, standaloneUtils.path);
   } catch (error) {
-    if (!abortHandler.isAborted && process.env.SLS_DEBUG) {
-      serverless.cli.log(format('Auto update: Could not update npm installation: %O', error));
+    if (!abortHandler.isAborted) {
+      if (process.env.SLS_DEBUG) {
+        legacy.log(format('Auto update: Could not update npm installation: %O', error));
+      }
+      log.info('Auto update: Could not update npm installation: %O', error);
     }
     return null;
   }
@@ -115,19 +119,19 @@ module.exports = async (serverless) => {
     try {
       versionRequest = await versionsRequest;
     } catch (error) {
-      if (!abortHandler.isAborted && process.env.SLS_DEBUG) {
-        serverless.cli.log(
-          format('Auto update: Could not resolve version info from npm: %O', error)
-        );
+      if (!abortHandler.isAborted) {
+        if (process.env.SLS_DEBUG) {
+          legacy.log(format('Auto update: Could not resolve version info from npm: %O', error));
+        }
+        log.debug('Auto update: Could not resolve version info from npm: %O', error);
       }
       return null;
     }
     try {
       return JSON.parse(versionRequest.body);
     } catch (error) {
-      serverless.cli.log(
-        format('Auto update: Unexpected response from npm: %s', versionRequest.body)
-      );
+      legacy.log(format('Auto update: Unexpected response from npm: %s', versionRequest.body));
+      log.debug('Auto update: Unexpected response from npm: %s', versionRequest.body);
       return null;
     }
   })();
@@ -162,7 +166,8 @@ module.exports = async (serverless) => {
     if (!updateTask) return;
     serverless.onExitPromise.then(async () => {
       await updateTask();
-      serverless.cli.log(`Sucessfully updated to v${latestVersion}`);
+      legacy.log(`Sucessfully updated to v${latestVersion}`);
+      log.notice(style.aside(`Successfully updated to v${latestVersion}`));
     });
   }
   autoUpdateConfig.lastChecked = Date.now();
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
index bd7827bed60..cc89f44eeeb 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/PluginManager.test.js
@@ -989,32 +989,20 @@ describe('PluginManager', () => {
         /Command "deploy" cannot override an existing alias/
       );
     });
-
-    it('should log the alias when SLS_DEBUG is set', () => {
-      const consoleLogStub = sinon.stub(pluginManager.serverless.cli, 'log').returns();
-      const synchronousPluginMockInstance = new SynchronousPluginMock();
-      synchronousPluginMockInstance.commands.deploy.aliases = ['info'];
-      process.env.SLS_DEBUG = '*';
-      pluginManager.loadCommands(synchronousPluginMockInstance);
-      expect(consoleLogStub).to.have.been.calledWith('  -> @info');
-    });
   });
 
   describe('#loadHooks()', () => {
     let deprecatedPluginInstance;
-    let consoleLogStub;
 
     beforeEach(() => {
       deprecatedPluginInstance = new DeprecatedLifecycleEventsPluginMock();
       pluginManager.deprecatedEvents = {
         'deprecated:deprecated': 'new:new',
       };
-      consoleLogStub = sinon.stub(pluginManager.serverless.cli, 'log').returns();
     });
 
     afterEach(() => {
       pluginManager.deprecatedEvents = {};
-      pluginManager.serverless.cli.log.restore();
     });
 
     it('should replace deprecated events with the new ones', () => {
@@ -1027,14 +1015,6 @@ describe('PluginManager', () => {
       expect(pluginManager.hooks['untouched:untouched'][0].pluginName).to.equal(
         'DeprecatedLifecycleEventsPluginMock'
       );
-      expect(consoleLogStub.calledOnce).to.equal(false);
-    });
-
-    it('should log a debug message about deprecated when using SLS_DEBUG', () => {
-      process.env.SLS_DEBUG = '1';
-      pluginManager.loadHooks(deprecatedPluginInstance);
-
-      expect(consoleLogStub.calledOnce).to.equal(true);
     });
   });
 
diff --git a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
index 91a9880a860..d75dbe81d07 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
@@ -1096,7 +1096,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
     expect(stdoutData).to.include(
       [
         'WARNING: Not authorized to perform: lambda:GetFunction for at least one of the lambda functions.',
-        ' Deployment will not be skipped even if service files did not change. ',
+        ' Deployment will not be skipped even if service files did not change.',
       ].join('')
     );
   });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
index 46c67f46cc5..8cb9534b1d5 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
@@ -1095,123 +1095,6 @@ describe('#validate()', () => {
     expect(() => awsCompileApigEvents.validate()).to.throw(Error);
   });
 
-  it('should show a warning message when using request / response config with HTTP-PROXY', () => {
-    awsCompileApigEvents.serverless.service.functions = {
-      first: {
-        events: [
-          {
-            http: {
-              method: 'GET',
-              path: 'users/list',
-              integration: 'http-proxy',
-              request: {
-                uri: 'http://www.example.com',
-                template: {
-                  'template/1': '{ "stage" : "$context.stage" }',
-                  'template/2': '{ "httpMethod" : "$context.httpMethod" }',
-                },
-              },
-              response: {
-                template: "$input.path('$.foo')",
-              },
-            },
-          },
-        ],
-      },
-    };
-    // initialize so we get the log method from the CLI in place
-    return serverless.init().then(() => {
-      const logStub = sinon.stub(serverless.cli, 'log');
-
-      awsCompileApigEvents.validate();
-
-      expect(logStub.calledTwice).to.be.equal(true);
-      expect(logStub.args[0][0].length).to.be.at.least(1);
-    });
-  });
-
-  it('should not show a warning message when using request.parameter with HTTP-PROXY', () => {
-    awsCompileApigEvents.serverless.service.functions = {
-      first: {
-        events: [
-          {
-            http: {
-              method: 'GET',
-              path: 'users/list',
-              integration: 'http-proxy',
-              request: {
-                uri: 'http://www.example.com',
-                parameters: {
-                  querystrings: {
-                    foo: true,
-                    bar: false,
-                  },
-                  paths: {
-                    foo: true,
-                    bar: false,
-                  },
-                  headers: {
-                    foo: true,
-                    bar: false,
-                  },
-                },
-              },
-            },
-          },
-        ],
-      },
-    };
-    // initialize so we get the log method from the CLI in place
-    return serverless.init().then(() => {
-      const logStub = sinon.stub(serverless.cli, 'log');
-
-      awsCompileApigEvents.validate();
-
-      expect(logStub.called).to.be.equal(false);
-    });
-  });
-
-  it('should remove non-parameter or uri request/response config with HTTP-PROXY', () => {
-    awsCompileApigEvents.serverless.service.functions = {
-      first: {
-        events: [
-          {
-            http: {
-              method: 'GET',
-              path: 'users/list',
-              integration: 'http-proxy',
-              request: {
-                uri: 'http://www.example.com',
-                template: {
-                  'template/1': '{ "stage" : "$context.stage" }',
-                },
-                parameters: {
-                  paths: {
-                    foo: true,
-                  },
-                },
-              },
-              response: {},
-            },
-          },
-        ],
-      },
-    };
-    // initialize so we get the log method from the CLI in place
-    return serverless.init().then(() => {
-      // don't want to print the logs in this test
-      sinon.stub(serverless.cli, 'log');
-
-      const validated = awsCompileApigEvents.validate();
-      expect(validated.events).to.be.an('Array').with.length(1);
-      expect(validated.events[0].http.response).to.equal(undefined);
-      expect(validated.events[0].http.request.uri).to.equal('http://www.example.com');
-      expect(validated.events[0].http.request.parameters).to.deep.equal({
-        'method.request.path.foo': true,
-      });
-    });
-  });
-
   it('should support MOCK integration', () => {
     awsCompileApigEvents.serverless.service.functions = {
       first: {
@@ -1253,40 +1136,6 @@ describe('#validate()', () => {
     expect(validated.events[0].http.async);
   });
 
-  it('should show a warning message when using request / response config with LAMBDA-PROXY', () => {
-    awsCompileApigEvents.serverless.service.functions = {
-      first: {
-        events: [
-          {
-            http: {
-              method: 'GET',
-              path: 'users/list',
-              integration: 'lambda-proxy',
-              request: {
-                template: {
-                  'template/1': '{ "stage" : "$context.stage" }',
-                  'template/2': '{ "httpMethod" : "$context.httpMethod" }',
-                },
-              },
-              response: {
-                template: "$input.path('$.foo')",
-              },
-            },
-          },
-        ],
-      },
-    };
-    // initialize so we get the log method from the CLI in place
-    return serverless.init().then(() => {
-      const logStub = sinon.stub(serverless.cli, 'log');
-
-      awsCompileApigEvents.validate();
-
-      expect(logStub.calledTwice).to.be.equal(true);
-      expect(logStub.args[0][0].length).to.be.at.least(1);
-    });
-  });
-
   it('should not show a warning message when using request.parameter with LAMBDA-PROXY', () => {
     awsCompileApigEvents.serverless.service.functions = {
       first: {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
index 808f2f3e42e..524c2a80456 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const chai = require('chai');
-const sandbox = require('sinon');
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
 const AwsCompileCloudFrontEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/cloudFront');
 const Serverless = require('../../../../../../../../lib/Serverless');
@@ -77,44 +76,9 @@ describe('AwsCompileCloudFrontEvents', () => {
       },
     };
     serverless.setProvider('aws', new AwsProvider(serverless, options));
-    serverless.cli = { log: sandbox.spy() };
     awsCompileCloudFrontEvents = new AwsCompileCloudFrontEvents(serverless, options);
   });
 
-  describe('#constructor()', () => {
-    it('should use "before:remove:remove" hook to log a message before removing the service', () => {
-      serverless.processedInput.commands = ['remove'];
-      serverless.service.functions = {
-        first: {
-          events: [
-            {
-              cloudFront: {
-                eventType: 'viewer-request',
-                origin: 's3://bucketname.s3.amazonaws.com/files',
-              },
-            },
-          ],
-        },
-      };
-      const awsCompileCloudFrontEventsRemoval = new AwsCompileCloudFrontEvents(serverless, options);
-
-      awsCompileCloudFrontEventsRemoval.hooks['before:remove:remove']();
-      expect(awsCompileCloudFrontEventsRemoval.serverless.cli.log).to.have.been.calledOnce;
-      expect(awsCompileCloudFrontEventsRemoval.serverless.cli.log.args[0][0]).to.include(
-        'remove your Lambda@Edge functions'
-      );
-    });
-  });
-
-  describe('#logRemoveReminder()', () => {
-    it('should not log an info message if the users wants to remove the stack without a cloudFront event', () => {
-      serverless.processedInput.commands = ['remove'];
-      const awsCompileCloudFrontEventsRemoval = new AwsCompileCloudFrontEvents(serverless, options);
-
-      expect(awsCompileCloudFrontEventsRemoval.serverless.cli.log).not.to.have.been.calledOnce;
-    });
-  });
-
   describe('#validate()', () => {
     it('should throw if memorySize is greater than 128 for viewer-request or viewer-response functions', () => {
       awsCompileCloudFrontEvents.serverless.service.functions = {
diff --git a/test/unit/lib/plugins/aws/provider.test.js b/test/unit/lib/plugins/aws/provider.test.js
index 77fa349175a..a0fd91f4914 100644
--- a/test/unit/lib/plugins/aws/provider.test.js
+++ b/test/unit/lib/plugins/aws/provider.test.js
@@ -174,7 +174,14 @@ describe('AwsProvider', () => {
         .noCallThru()
         .load('../../../../../lib/plugins/aws/provider.js', {
           '../../aws/request': awsRequestStub,
-          '@serverless/utils/log': logStub,
+          '@serverless/utils/log': {
+            legacy: {
+              log: logStub,
+            },
+            log: {
+              debug: sinon.stub(),
+            },
+          },
         });
       awsProviderProxied = new AwsProviderProxyquired(serverless, options);
     });

From d2a75ea95e814cd5aaba5eca4c5acebd2aad0bb8 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 15 Oct 2021 09:29:56 +0200
Subject: [PATCH 0623/1101] feat(CLI): Introduce deprecation for duplicate
 plugin definition

---
 docs/deprecations.md                        | 8 ++++++++
 lib/classes/PluginManager.js                | 6 +++---
 test/unit/lib/classes/PluginManager.test.js | 8 --------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 4bdfc1b191c..feebfd3f478 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -36,6 +36,14 @@ Note:
 - In service configuration setting is ineffective for deprecations reported before service configuration is read.
 - `SLS_DEPRECATION_DISABLE` env var and `disabledDeprecations` configuration setting remain respected, and no errors will be thrown for mentioned deprecation coodes.
 
+<a name="DUPLICATE_PLUGIN_DEFINITION"><div>&nbsp;</div></a>
+
+## Duplicate plugin definition in configuration
+
+Deprecation code: `DUPLICATE_PLUGIN_DEFINITION`
+
+Starting with "v3.0.0", duplicate plugin definition will result in an error instead of a warning. To ensure seamless upgrade, please remove duplicate plugins from your configuration.
+
 <a name="CLI_VERBOSE_OPTION_ALIAS"><div>&nbsp;</div></a>
 
 ## CLI `-v` alias for `--verbose` option
diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 02588a5cba7..38992dcd70a 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -133,9 +133,9 @@ class PluginManager {
 
     // don't load plugins twice
     if (this.plugins.some((plugin) => plugin instanceof Plugin)) {
-      legacy.log(`WARNING: duplicate plugin ${Plugin.name} was not loaded\n`);
-      log.warning(
-        `Duplicate plugin definition found in your configuration. Plugin "${Plugin.name}" will not be loaded more than once.`
+      this.serverless._logDeprecation(
+        'DUPLICATE_PLUGIN_DEFINITION',
+        'Starting with "v3.0.0", duplicate plugin definition will result in an error instead of a warning. To ensure seamless upgrade, please remove duplicate plugins from your configuration.'
       );
       return null;
     }
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
index cc89f44eeeb..a1c4b4d724a 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/PluginManager.test.js
@@ -568,14 +568,6 @@ describe('PluginManager', () => {
       expect(pluginManager.plugins[0]).to.be.instanceof(SynchronousPluginMock);
     });
 
-    it('should not load plugins twice', () => {
-      pluginManager.addPlugin(SynchronousPluginMock);
-      pluginManager.addPlugin(SynchronousPluginMock);
-
-      expect(pluginManager.plugins[0]).to.be.instanceof(SynchronousPluginMock);
-      expect(pluginManager.plugins.length).to.equal(1);
-    });
-
     it('should load two plugins that happen to have the same class name', () => {
       function getFirst() {
         return class PluginMock {};

From 04b921acdc5fd486ffd10fe81fcb2243f37329db Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 15 Oct 2021 10:38:38 +0200
Subject: [PATCH 0624/1101] feat(CLI): Introduce deprecation on S3 Accelerate
 for user bucket

---
 docs/deprecations.md                          |  8 ++++
 .../aws/package/lib/generateCoreTemplate.js   |  7 ++--
 .../package/lib/generateCoreTemplate.test.js  | 37 +++++++++----------
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index feebfd3f478..dfcad7dfeb1 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -36,6 +36,14 @@ Note:
 - In service configuration setting is ineffective for deprecations reported before service configuration is read.
 - `SLS_DEPRECATION_DISABLE` env var and `disabledDeprecations` configuration setting remain respected, and no errors will be thrown for mentioned deprecation coodes.
 
+<a name="S3_TRANSFER_ACCELERATION_ON_EXISTING_BUCKET"><div>&nbsp;</div></a>
+
+## Attempt to enable S3 Transfer Acceleration on provided S3 buckets
+
+Deprecation code: `S3_TRANSFER_ACCELERATION_ON_EXISTING_BUCKET`
+
+Starting with "v3.0.0", attempt to enable S3 Transfer Acceleration on user provided bucket will result in error instead of a warning. To ensure seamless upgrade, please stop using "--aws-s3-accelerate" flag.
+
 <a name="DUPLICATE_PLUGIN_DEFINITION"><div>&nbsp;</div></a>
 
 ## Duplicate plugin definition in configuration
diff --git a/lib/plugins/aws/package/lib/generateCoreTemplate.js b/lib/plugins/aws/package/lib/generateCoreTemplate.js
index 925d7729016..38744f3f8cb 100644
--- a/lib/plugins/aws/package/lib/generateCoreTemplate.js
+++ b/lib/plugins/aws/package/lib/generateCoreTemplate.js
@@ -3,7 +3,6 @@
 const path = require('path');
 const _ = require('lodash');
 const ServerlessError = require('../../../../serverless-error');
-const { legacy, log } = require('@serverless/utils/log');
 
 module.exports = {
   generateCoreTemplate() {
@@ -94,8 +93,10 @@ module.exports = {
 
     if (bucketName) {
       if (isS3TransferAccelerationEnabled) {
-        legacy.log('Warning: S3 Transfer Acceleration will not be enabled on deploymentBucket.');
-        log.warning('S3 Transfer Acceleration cannot be enabled on user provided S3 bucket');
+        this.serverless._logDeprecation(
+          'S3_TRANSFER_ACCELERATION_ON_EXISTING_BUCKET',
+          'Starting with "v3.0.0", attempt to enable S3 Transfer Acceleration on user provided bucket will result in error instead of a warning. To ensure seamless upgrade, please stop using "--aws-s3-accelerate" flag.'
+        );
       }
       this.bucketName = bucketName;
       this.serverless.service.package.deploymentBucket = bucketName;
diff --git a/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js b/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js
index aec5f83143e..8a1c9863d23 100644
--- a/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js
@@ -152,28 +152,27 @@ describe('#generateCoreTemplate()', () => {
       });
     }));
 
-  it('should use a custom bucket if specified, even with S3 transfer acceleration', () => {
+  it('should result in deprecation error for custom bucket and accelerate flag', async () => {
     const bucketName = 'com.serverless.deploys';
 
-    return runServerless({
-      config: {
-        service: 'irrelevant',
-        provider: {
-          name: 'aws',
-          deploymentBucket: bucketName,
+    await expect(
+      runServerless({
+        config: {
+          service: 'irrelevant',
+          provider: {
+            name: 'aws',
+            deploymentBucket: bucketName,
+          },
         },
-      },
-      command: 'deploy',
-      options: { 'aws-s3-accelerate': true },
-      lastLifecycleHookName: 'before:deploy:deploy',
-      awsRequestStubMap: { S3: { getBucketLocation: { LocationConstraint: '' } } },
-    }).then(({ cfTemplate: template }) => {
-      expect(template.Outputs.ServerlessDeploymentBucketName.Value).to.equal(bucketName);
-      // eslint-disable-next-line no-unused-expressions
-      expect(template.Resources.ServerlessDeploymentBucket).to.not.exist;
-      // eslint-disable-next-line no-unused-expressions
-      expect(template.Outputs.ServerlessDeploymentBucketAccelerated).to.not.exist;
-    });
+        command: 'deploy',
+        options: { 'aws-s3-accelerate': true },
+        lastLifecycleHookName: 'before:deploy:deploy',
+        awsRequestStubMap: { S3: { getBucketLocation: { LocationConstraint: '' } } },
+      })
+    ).to.eventually.be.rejected.and.have.property(
+      'code',
+      'REJECTED_DEPRECATION_S3_TRANSFER_ACCELERATION_ON_EXISTING_BUCKET'
+    );
   });
 
   it('should use a auto generated bucket if you does not specify deploymentBucket', () =>

From 23c79962ff3359b0e1450f82d27010d02d63d8ae Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 15 Oct 2021 11:49:16 +0200
Subject: [PATCH 0625/1101] chore: Bump dependencies

---
 package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 508c1bc614b..065051bcb65 100644
--- a/package.json
+++ b/package.json
@@ -24,13 +24,13 @@
   "dependencies": {
     "@serverless/cli": "^1.5.2",
     "@serverless/components": "^3.17.1",
-    "@serverless/dashboard-plugin": "^5.4.6",
+    "@serverless/dashboard-plugin": "^5.4.8",
     "@serverless/platform-client": "^4.3.0",
     "@serverless/utils": "^5.18.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.1003.0",
+    "aws-sdk": "^2.1008.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.1.2",
     "cachedir": "^2.3.0",
@@ -86,9 +86,9 @@
     "adm-zip": "^0.5.9",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "cos-nodejs-sdk-v5": "^2.10.4",
+    "cos-nodejs-sdk-v5": "^2.10.5",
     "eslint": "^7.32.0",
-    "eslint-plugin-import": "^2.24.2",
+    "eslint-plugin-import": "^2.25.2",
     "git-list-updated": "^1.2.1",
     "github-release-from-cc-changelog": "^2.2.0",
     "husky": "^4.3.8",

From 8401ff7378e565b40be757e6c6c644f90203cb03 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 15 Oct 2021 13:12:03 +0200
Subject: [PATCH 0626/1101] chore: Release v2.63.0

---
 CHANGELOG.md | 31 +++++++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a12f85c5be..76ee529f09b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,37 @@
 
 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.
 
+## [2.63.0](https://github.com/serverless/serverless/compare/v2.62.0...v2.63.0) (2021-10-15)
+
+### Features
+
+- **AWS Deploy:** Introduce warning about `deploy -f` alias ([#10078](https://github.com/serverless/serverless/pull/10078)) ([40f574f](https://github.com/serverless/serverless/commit/40f574f946e2f40cba13e18b22ee82c7aaa31d3f)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS Lambda:** Allow overriding provider VPC with no VPC on function level ([#10060](https://github.com/serverless/serverless/pull/10060)) ([44a81fc](https://github.com/serverless/serverless/commit/44a81fcc6a229ac6ff59b8c8e51742a9470eef15)) ([Oliver](https://github.com/HowManyOliversAreThere))
+- **AWS S3:** Recognize `ExpirationInDays` property for `s3` events ([#10083](https://github.com/serverless/serverless/pull/10083)) ([8e6dcd1](https://github.com/serverless/serverless/commit/8e6dcd1aaed50007b5b99e18f61dfa849b898cd9)) ([ROSeaboyer](https://github.com/ROSeaboyer))
+- **CLI:**
+  - Introduce deprecation for duplicate plugin definition ([#10080](https://github.com/serverless/serverless/pull/10080)) ([d2a75ea](https://github.com/serverless/serverless/commit/d2a75ea95e814cd5aaba5eca4c5acebd2aad0bb8)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Introduce deprecation instead of warning on S3 Accelerate for user provided bucket ([#10080](https://github.com/serverless/serverless/pull/10080)) ([04b921a](https://github.com/serverless/serverless/commit/04b921acdc5fd486ffd10fe81fcb2243f37329db)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Opt-in support for deployment bucket versioning ([#9912](https://github.com/serverless/serverless/issues/9912)) ([c4cb0f3](https://github.com/serverless/serverless/commit/c4cb0f30f5f565e2fd34877dfc383f6b81d135fd)) ([Mars Lan](https://github.com/mars-lan))
+
+### Maintenance Improvements
+
+- **CLI: New logs (experimental):**
+  - Adapt `logInfo` to modern logs ([#10078](https://github.com/serverless/serverless/pull/10078)) ([771f99b](https://github.com/serverless/serverless/commit/771f99b18d76060f030d36b5fa619dd41a7000c8)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Adapt `logWarning` to modern logs ([#10078](https://github.com/serverless/serverless/pull/10078)) ([d43298d](https://github.com/serverless/serverless/commit/d43298d25bc9fcf5f5724a800b2693321e88e838)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Cover image building with modern logs ([#10070](https://github.com/serverless/serverless/pull/10070)) ([a2be338](https://github.com/serverless/serverless/commit/a2be3387b16fdb7324e1342a5f6ee3974e4e34f5)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Improve handling of service outputs in modern logs ([#10100](https://github.com/serverless/serverless/pull/10100)) ([7d19ca8](https://github.com/serverless/serverless/commit/7d19ca857230a56bbe40bda4d6704edd34019e4e)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Introduce modern warning about resource limit ([#10086](https://github.com/serverless/serverless/pull/10086)) ([ca705b8](https://github.com/serverless/serverless/commit/ca705b8cc2854c302158a56294c2507ba5f2038f)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Minor modern logs updates ([#10071](https://github.com/serverless/serverless/pull/10071)) ([39c09e4](https://github.com/serverless/serverless/commit/39c09e44b6380ec1a13aa50aca9082cffb0aeca1)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Remove empty line in `info` command ([#10086](https://github.com/serverless/serverless/pull/10086)) ([03b4b3d](https://github.com/serverless/serverless/commit/03b4b3d47c25b6f98a46699463288c94b051f42c)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Replace `process.stdout` use with modern logs ([#10087](https://github.com/serverless/serverless/pull/10087)) ([be00a26](https://github.com/serverless/serverless/commit/be00a2672cbc90fb33dee5e4bd44a1f6a127eb7c)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Replace warnings with modern counterparts ([#10080](https://github.com/serverless/serverless/pull/10080)) ([4da0899](https://github.com/serverless/serverless/commit/4da08996736c9a8f2b0a0193f7cca4b24f3fc6f1)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Update link style for modern logs ([#10096](https://github.com/serverless/serverless/pull/10096)) ([6264296](https://github.com/serverless/serverless/commit/62642964bc38eae77b009ea84d05ba741383570f)) ([Mariusz Nowak](https://github.com/medikoo))
+- Fix typo in `lib/classes/Variables.js` ([#10093](https://github.com/serverless/serverless/issues/10093)) ([49f0913](https://github.com/serverless/serverless/commit/49f0913466110ac32d89c7c044fc781e524b9ed9)) ([Chris Poli](https://github.com/chris-poli))
+
+### Templates
+
+- Add `esbuild` to `gitignore` in `aws-nodejs-typescript` ([#10076](https://github.com/serverless/serverless/pull/10076)) ([865f21f](https://github.com/serverless/serverless/commit/865f21f970340b45c6fb341d01647721f0fa5682)) ([ssshun](https://github.com/ssshun))
+
 ## [2.62.0](https://github.com/serverless/serverless/compare/v2.61.0...v2.62.0) (2021-10-08)
 
 ### Features
diff --git a/package.json b/package.json
index 065051bcb65..d624c6a2539 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.62.0",
+  "version": "2.63.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 1a528c2cc0746bfe6a692183f96b0831e3dd92f4 Mon Sep 17 00:00:00 2001
From: Monsma <6428412+jmonsma@users.noreply.github.com>
Date: Fri, 15 Oct 2021 15:31:06 +0200
Subject: [PATCH 0627/1101] fix(AWS Deploy): Recognize `LogicalResourceId` in
 `stackPolicy`

---
 lib/plugins/aws/provider.js                      | 13 ++++++++++++-
 .../unit/lib/plugins/aws/lib/updateStack.test.js | 16 +++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 917a15822a0..1ef2bd533ef 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -466,9 +466,16 @@ class AwsProvider {
             anyOf: [
               { const: '*' },
               { $ref: '#/definitions/awsArn' },
+              { $ref: '#/definitions/awsLogicalResourceId' },
               {
                 type: 'array',
-                items: { anyOf: [{ const: '*' }, { $ref: '#/definitions/awsArn' }] },
+                items: {
+                  anyOf: [
+                    { const: '*' },
+                    { $ref: '#/definitions/awsArn' },
+                    { $ref: '#/definitions/awsLogicalResourceId' },
+                  ],
+                },
               },
             ],
           },
@@ -577,6 +584,10 @@ class AwsProvider {
             additionalProperties: false,
             required: ['securityGroupIds', 'subnetIds'],
           },
+          awsLogicalResourceId: {
+            type: 'string',
+            pattern: '^[#A-Za-z0-9-_./]+[*]?$',
+          },
           awsLogGroupName: {
             type: 'string',
             pattern: '^[/#A-Za-z0-9-_.]+$',
diff --git a/test/unit/lib/plugins/aws/lib/updateStack.test.js b/test/unit/lib/plugins/aws/lib/updateStack.test.js
index b19d148ac40..76e4276505d 100644
--- a/test/unit/lib/plugins/aws/lib/updateStack.test.js
+++ b/test/unit/lib/plugins/aws/lib/updateStack.test.js
@@ -162,6 +162,18 @@ describe('updateStack', () => {
           Action: 'Update:*',
           Resource: '*',
         },
+        {
+          Effect: 'Allow',
+          Principal: '*',
+          Action: 'Update:*',
+          Resource: 'LogicalResourceId/myEC2instance',
+        },
+        {
+          Effect: 'Deny',
+          Principal: '*',
+          Action: ['Update:Replace', 'Update:Delete'],
+          Resource: 'LogicalResourceId/CriticalResource*',
+        },
       ];
 
       return awsDeploy.update().then(() => {
@@ -170,7 +182,9 @@ describe('updateStack', () => {
           { Key: 'tag1', Value: 'value1' },
         ]);
         expect(updateStackStub.args[0][2].StackPolicyBody).to.equal(
-          '{"Statement":[{"Effect":"Allow","Principal":"*","Action":"Update:*","Resource":"*"}]}'
+          '{"Statement":[{"Effect":"Allow","Principal":"*","Action":"Update:*","Resource":"*"},' +
+            '{"Effect":"Allow","Principal":"*","Action":"Update:*","Resource":"LogicalResourceId/myEC2instance"},' +
+            '{"Effect":"Deny","Principal":"*","Action":["Update:Replace","Update:Delete"],"Resource":"LogicalResourceId/CriticalResource*"}]}'
         );
       });
     });

From 002d702df9ef26e6616f60544df5b9b1f46bbc81 Mon Sep 17 00:00:00 2001
From: Maciej Skierkowski <maciej@skierkowski.com>
Date: Fri, 15 Oct 2021 18:51:37 -0700
Subject: [PATCH 0628/1101] docs: Update header depth on dashboard docs
 (#10107)

* docs: Update header depth on dashboard docs

* docs: Removing file I added by mistake
---
 docs/guides/cicd/faq.md          |  2 +-
 docs/guides/dashboard.md         |  4 ++--
 docs/guides/monitoring/README.md | 14 +++++++-------
 docs/guides/providers.md         | 20 ++++++++++----------
 docs/guides/sdk/nodejs.md        | 12 +++++++-----
 docs/guides/sdk/python.md        | 12 +++++++-----
 6 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/docs/guides/cicd/faq.md b/docs/guides/cicd/faq.md
index e49ac4a448c..62cd5574048 100644
--- a/docs/guides/cicd/faq.md
+++ b/docs/guides/cicd/faq.md
@@ -13,7 +13,7 @@ layout: Doc
 
 # Frequently Asked Questions
 
-# Is there a free tier?
+## Is there a free tier?
 
 Yes, up to 1 concurrent build with the Free tier. No credit card required, just sign up.
 
diff --git a/docs/guides/dashboard.md b/docs/guides/dashboard.md
index 13a824ac3e2..d6c42fc2189 100644
--- a/docs/guides/dashboard.md
+++ b/docs/guides/dashboard.md
@@ -31,11 +31,11 @@ Currently, the Serverless Framework Dashboard supports the following providers,
 
 Need unsupported providers, runtimes or regions? [Let us know](https://serverless.com/enterprise/) what you need. We are working hard to quickly expand our supported runtimes and regions.
 
-# Installing
+## Installing
 
 To get started with the Serverless Framework Dashboard, follow the [Getting Started with the Serverless Framework and AWS](/framework/docs/getting-started/) guide. When you run the `serverless` command, you will be asked if you would like to enable dashboard features.
 
-# Enabling the Dashboard on existing Serverless Framework services
+## Enabling the Dashboard on existing Serverless Framework services
 
 If you have an existing Serverless Framework service, it is incredibly easy to enable the Serverless Framework Dashboard features. Just follow the [Getting Started with the Serverless Framework and AWS](/framework/docs/getting-started/) guide to install update the Serverless Framework to the latest release.
 
diff --git a/docs/guides/monitoring/README.md b/docs/guides/monitoring/README.md
index 5d2bce393cb..099eeb20e4d 100644
--- a/docs/guides/monitoring/README.md
+++ b/docs/guides/monitoring/README.md
@@ -19,7 +19,7 @@ Serverless Monitoring help you monitor, develop and optimize your serverless app
 
 Monitoring is enabled by default when you deploy a Service using the Serverless Framework CLI.
 
-### Configuration
+## Configuration
 
 Serverless Framework, when configured to connect to the dashboard, will automatically collect three pieces of diagnostics:
 
@@ -35,7 +35,7 @@ When deploying, Serverless Framework will also create an IAM role in your accoun
 
 If you have an existing CloudWatch Logs Subscription on your Log Group, please see the section on [pull-based log ingestion](#pull-based-log-ingestion).
 
-# If you wish to disable log collection, set the following options:
+## Disabling log collection
 
 If you wish to disable log collection, set the following option:
 
@@ -104,7 +104,7 @@ package:
     - dist/*.js.map
 ```
 
-## Capturing non-fatal errors
+### Capturing non-fatal errors
 
 Your lambda function may throw an exception, but your function handles it in order to respond to the requestor without throwing the error. One very common example is functions tied to HTTP endpoints. Those usually should still return JSON, even if there is an error since the API Gateway integration will fail rather than returning a meaningful error.
 
@@ -132,13 +132,13 @@ module.exports.hello = async (event, context) => {
 
 [Full Python Documentation](../sdk/python.md#capture_exception)
 
-## AWS SDK spans
+### AWS SDK spans
 
 Serverless automatically instruments `aws-sdk` and `boto3`(`botocore` specifically) in NodeJS and
 Python. Calls(service & operation. eg: S3 putItem) to the SDK are show in the invocation detail
 in the dashboard.
 
-## HTTP spans
+### HTTP spans
 
 Serverless also instruments your lambdas to report the spans for HTTP & HTTPS requests. In NodeJS
 the `http` and `https` modules are instrumented, so any library built upon those will be captured.
@@ -150,7 +150,7 @@ provides more insight into the request.
 
 [Configuration docs](../sdk/#advanced-span-configuration)
 
-## Custom function spans
+### Custom function spans
 
 You can also instrument your own spans for services not covered by AWS SDK & HTTP span
 instrumentation such as databases.
@@ -170,7 +170,7 @@ module.exports.handler = async (event, context) => {
 
 [Full Python Documentation](../sdk/python.md#span)
 
-## Pull-based log ingestion
+### Pull-based log ingestion
 
 The default monitoring path for the Serverless Framework involves setting up a Subscription Filter on your CloudWatch Log Group to send selected logs to the Serverless Framework ingestion system.
 
diff --git a/docs/guides/providers.md b/docs/guides/providers.md
index f92b03fcce3..ba4b3802f1d 100644
--- a/docs/guides/providers.md
+++ b/docs/guides/providers.md
@@ -27,11 +27,11 @@ There are many benefits to using providers over managing accounts manually:
 - No need to share credentials out of band (e.g. sending slack messages)
 - Some providers, like AWS Access Roles, provide an additional layer of security as credentials are generated per deployment and have a short TTL.
 
-# Adding providers in the dashboard
+## Adding providers in the dashboard
 
 To use providers you must add the providers to your organization and then link the provider to a service. Optionally you can link the provider to an instance instead if you need to use different providers for different stages or regions.
 
-## Adding providers to your organization
+### Adding providers to your organization
 
 To add a provider to your organization go the **org** section of the [dashboard](https://app.serverless.com). Under the **providers** tab, click **add** and follow the instructions.
 
@@ -39,25 +39,25 @@ You’ll be able to select the provider, like AWS, Stripe, and Twilio, name the
 
 It is recommended that you deploy your Serverless Framework apps to different accounts for each stage. To accomplish this we recommend adding a `dev` and `prod` provider to decouple the prod environment from all other environments.
 
-## Setting a default organization provider
+### Setting a default organization provider
 
 A Provider at the organization level can also be designated as the default provider for the organization. This provider will be used in any deployments where the service or instance do not have a provider set.
 
 To set the organizatwion default, go to the **orgs** section of the dashboard, and select the **providers** tab, under the **...** menu of the provider select **set as default**.
 
-## Adding a provider to a service
+### Adding a provider to a service
 
 Adding the providers to the organization alone will not be sufficient, you must also link that provider with the service.
 
 To add a provider to a service, go to the **apps** section of the dashboard, and select **settings** under the **...** menu of the service for which you would like to use providers. On the service settings page navigate to the **providers** tab. From there you can click **add provider** which will allow you to add the providers from the organization into your service.
 
-## Adding a provider to an instance
+### Adding a provider to an instance
 
 If your service is deployed to the same account for each stage and region, then you do not need to configure providers per instance. However, if you have multiple providers, like one for each stages or regions, then you can add a provider to each instance.
 
 To add a provider to an instance, navigate to the instance details page for that service instance, go to the **providers** tab, from the **add providers** dropdown you can add any provider from the organization into the instance.
 
-## Inheritance and overriding
+### Inheritance and overriding
 
 If you are deploying a traditional Serverless Framework app, an instance of the service is created for that stage and region. If you are using a Component-based service, then an instance is created for each stage of the service.
 
@@ -65,7 +65,7 @@ Serverless Framework, on deployment, will use the provider associate with the In
 
 The organization default provider enables you to deploy using that organization default provider without needing to set a provider at the service or instance level. Similarly, setting a provider at the service level enables you to create new instances and deploy right away without needing to set a provider on the instance.
 
-### Different accounts per stage
+#### Different accounts per stage
 
 This inheritance model is useful for deploying to different accounts for each stage. For example, if you have a `dev` and `prod` account, then you can setup providers to deploy to `dev` by default, and use the `prod` account for only the `prod` instances.
 
@@ -73,7 +73,7 @@ To accomplish this, you can add the `dev` provider to the service, and then add
 
 If you deploy to a new stage, like `int`, it will then use the `dev` provider from the service.
 
-### Preview account for CI/CD preview deployments
+#### Preview account for CI/CD preview deployments
 
 If you are using the Serverless CI/CD service or any 3rd party CI/CD service, you may be deploying to unique stages to isolate the preview deployments from PRs from all other deployments.
 
@@ -81,13 +81,13 @@ To accomplish this, you can create two providers, `preview`, and `prod`, for two
 
 Now if you deploy to a preview stage, like `feature-x` it will automatically use the provider from the service, `preview`. If you merge your changes and deploy them to the `prod` stage, it will automatically use the `prod` provider as it is associated with that stage.
 
-# Using providers in serverless.yml
+## Using providers in serverless.yml
 
 To use providers with serverless.yml you do not need to do anything. Upon deployment the Serverless Framework will retrieve the necessary credentials from the provider associate with the instance or service, and it will use those credentials to deploy.
 
 If the providers are not found, then the Serverless Framework will look for credentials locally.
 
-# Using a Custom IAM Role and Policy
+## Using a Custom IAM Role and Policy
 
 Creating a provider with an IAM Role and default policy using the provided Cloud Formation template is the easiest and most secure way to enable Serverless Framework to deploy from CI/CD, monitor your services, and deploy a range of resources to your AWS account using short-lived credentials. However, advanced IAM users may want to create a custom IAM Role and Policy with more restrictive permissions.
 
diff --git a/docs/guides/sdk/nodejs.md b/docs/guides/sdk/nodejs.md
index 94db2b2b50a..3996fe996a0 100644
--- a/docs/guides/sdk/nodejs.md
+++ b/docs/guides/sdk/nodejs.md
@@ -10,7 +10,9 @@ layout: Doc
 
 <!-- DOCS-SITE-LINK:END -->
 
-# `captureError`
+# Node.js SDK
+
+## `captureError`
 
 Your lambda function may throw an exception, but your function handles it in order to respond to
 the requester without throwing the error. One very common example is functions tied to HTTP
@@ -59,7 +61,7 @@ module.exports.hello = async (event) => {
 };
 ```
 
-# `span`
+## `span`
 
 While the `serverless_sdk` automatically instruments AWS SDK and HTTP spans, you may be interested
 in capturing span data for functions that do numerical computation or functions making database
@@ -102,7 +104,7 @@ module.exports.handler = async (event, context) => {
 };
 ```
 
-# `tagEvent`
+## `tagEvent`
 
 Busy applications can invoke hundreds of thousands of requests per minute! At these rates, finding specific invocations can be like
 searching for a needle in a haystack. We've felt this pain, which is why we've introduced tagged events.
@@ -129,7 +131,7 @@ module.exports.hello = async (event, context) => {
 };
 ```
 
-# Automatic route instrumentation with application middleware
+## Automatic route instrumentation with application middleware
 
 Faced with practical considerations (a big one being CloudFormation stack resource limit), developers often reach for a single function solution with routing being handled by the application layer. This is usually accomplished either by leveraging plugins that extend popular application frameworks to play nicely with the Lambda runtime (e.g. [serverless-express](https://serverless.com/plugins/serverless-express/)), using a purpose-built one (like [lambda-api](https://github.com/jeremydaly/lambda-api)), or even rolling their own (via [lambda-router](https://github.com/trek10inc/lambda-router)).
 
@@ -141,7 +143,7 @@ If your application is using a custom-built router, you can still work around th
 
 Once set, invocations can be explored and inspected by endpoint in the Dashboard.
 
-# `setEndpoint`
+## `setEndpoint`
 
 Allows the application to explicitly set the routed endpoint for an invocation. Like the other SDK methods, `setEndpoint` is available on either the context object: `context.serverlessSdk`, or can be imported manually from the base directory: `const { setEndpoint } = require('./serverless_sdk')`. Example usage:
 
diff --git a/docs/guides/sdk/python.md b/docs/guides/sdk/python.md
index 2915cdeaf1f..e070e230983 100644
--- a/docs/guides/sdk/python.md
+++ b/docs/guides/sdk/python.md
@@ -10,7 +10,9 @@ layout: Doc
 
 <!-- DOCS-SITE-LINK:END -->
 
-# `capture_exception`
+# Python SDK
+
+## `capture_exception`
 
 Your lambda function may throw an exception, but your function handles it in order to respond to
 the requester without throwing the error. One very common example is functions tied to HTTP
@@ -55,7 +57,7 @@ def hello(event, context):
     }
 ```
 
-# `span`
+## `span`
 
 While the `serverless_sdk` automatically instruments AWS SDK and HTTP spans, you may be interested
 in capturing span data for functions that do numerical computation or functions making database
@@ -80,7 +82,7 @@ def handler(event, context):
 
 It also works as an async context manager for use with `async with`.
 
-# `tag_event`
+## `tag_event`
 
 Busy applications can invoke hundreds of thousands of requests per minute! At these rates, finding specific invocations can be like
 searching for a needle in a haystack. We've felt this pain, which is why we've introduced tagged events.
@@ -107,7 +109,7 @@ def hello(event, context):
     }
 ```
 
-# Automatic route instrumentation with application middleware
+## Automatic route instrumentation with application middleware
 
 Faced with practical considerations (a big one being CloudFormation stack resource limit), developers often reach for a single function solution with routing being handled by the application layer. This is typically accomplished by leveraging the [serverless-wsgi](https://github.com/logandk/serverless-wsgi) plugin to deploy existing WSGI applications (Flask/Django/Pyramid etc). Rolling your own custom router is another option as well.
 
@@ -119,7 +121,7 @@ If your application is using a custom-built router, you can still work around th
 
 Once set, invocations can be explored and inspected by endpoint in the Dashboard.
 
-# `set_endpoint`
+## `set_endpoint`
 
 Allows the application to explicitly set the routed endpoint for an invocation. Like the other SDK methods, `setEndpoint` is available on either the context object: `context.serverless_sdk`.
 

From ff4072b518870a535eaf169933a9c95221b3032d Mon Sep 17 00:00:00 2001
From: Jeremy Daly <jeremydaly@users.noreply.github.com>
Date: Sat, 16 Oct 2021 07:59:38 -0400
Subject: [PATCH 0629/1101] Update getting-started.md

---
 docs/getting-started.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started.md b/docs/getting-started.md
index dfb6485096b..4096abf0227 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -19,7 +19,7 @@ menuItems:
 
 # Get started with Serverless Framework Open Source & AWS
 
-Getting started with Serverless Framework’s Open Source CLI and AWS takes only a few minutes. Install as a standalone binary, or with npm.
+Getting started with Serverless Framework’s Open Source CLI and AWS only takes a few minutes. Install as a standalone binary, or with npm.
 
 ## Install as a standalone binary
 

From 59f2d271666a0ba2c1fb641dfb1e17d5a36cc570 Mon Sep 17 00:00:00 2001
From: Ikko Ashimine <eltociear@gmail.com>
Date: Tue, 19 Oct 2021 00:21:34 +0900
Subject: [PATCH 0630/1101] chore: Fix typo in `serverless.js` (#9945)

---
 scripts/serverless.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index e4d5f681d62..68445387974 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -38,7 +38,7 @@ let hasTelemetryBeenReported = false;
 
 // Inquirer async operations do not keep node process alive
 // We need to issue a keep alive timer so process does not die
-// to propery handle e.g. `SIGINT` interrupt
+// to properly handle e.g. `SIGINT` interrupt
 const keepAliveTimer = setTimeout(() => {}, 60 * 60 * 1000);
 
 const standaloneCommands = new Set(['plugin install', 'plugin uninstall']);

From cc71fc99ffe2e1f2fcc764b29dafa197c665cef1 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 18 Oct 2021 13:46:36 +0200
Subject: [PATCH 0631/1101] fix(Packaging): Ensure to show deprecation in all
 cases

---
 lib/plugins/aws/package/index.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
index 91c6e7235c2..5548b37b01b 100644
--- a/lib/plugins/aws/package/index.js
+++ b/lib/plugins/aws/package/index.js
@@ -59,6 +59,13 @@ class AwsPackage {
 
     this.hooks = {
       'initialize': () => {
+        if (this.serverless.service.provider.disableDefaultOutputExportNames) {
+          this.serverless._logDeprecation(
+            'DISABLE_DEFAULT_OUTPUT_EXPORT_NAMES',
+            'Starting with `v3.0.0`, it will not be possible to disable default export names for outputs. To hide this deprecation message and ensure seamless upgrade, please remove this flag.'
+          );
+        }
+
         if (this.serverless.processedInput.commands.join(' ') === 'package') {
           log.notice();
           log.notice(
@@ -79,13 +86,6 @@ class AwsPackage {
       },
 
       'package:initialize': async () => {
-        if (this.serverless.service.provider.disableDefaultOutputExportNames) {
-          this.serverless._logDeprecation(
-            'DISABLE_DEFAULT_OUTPUT_EXPORT_NAMES',
-            'Starting with `v3.0.0`, it will not be possible to disable default export names for outputs. To hide this deprecation message and ensure seamless upgrade, please remove this flag.'
-          );
-        }
-
         return this.generateCoreTemplate();
       },
 

From 73c071b060216d330974a2f98917eba315eb634b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 18 Oct 2021 13:48:35 +0200
Subject: [PATCH 0632/1101] refactor(CLI): Improve style for local fallback
 modern notice

---
 lib/Serverless.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index 494c6e48c35..86004198ab6 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -8,7 +8,7 @@ const ensureArray = require('type/array/ensure');
 const ensureIterable = require('type/iterable/ensure');
 const ensurePlainObject = require('type/plain-object/ensure');
 const clear = require('ext/object/clear');
-const { legacy, log } = require('@serverless/utils/log');
+const { legacy, log, style } = require('@serverless/utils/log');
 const _ = require('lodash');
 const CLI = require('./classes/CLI');
 const Config = require('./classes/Config');
@@ -246,7 +246,7 @@ class Serverless {
     logDeprecation.defaultMode = 'warn';
     logDeprecation.flushBuffered();
     legacy.log('Running "serverless" installed locally (in service node_modules)');
-    log.notice('Running "serverless" from node_modules');
+    log.notice(style.aside('Running "serverless" from node_modules'));
     // TODO: Replace below fallback logic with more straightforward one at top of the CLI
     // when we willl drop support for the "disableLocalInstallationFallback" setting
     this.isOverridenByLocal = true;

From 2217158764dde8ceee472292b531836ada20d79a Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 18 Oct 2021 19:19:00 +0200
Subject: [PATCH 0633/1101] refactor(CLI): Support `decoratedMessage` on
 `ServerlessError`

---
 lib/cli/handle-error.js                        | 8 +++++---
 lib/serverless-error.js                        | 3 ++-
 lib/utils/tokenize-exception.js                | 1 +
 test/unit/lib/utils/tokenize-exception.test.js | 5 ++++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index eaf421c1160..7b846cccdea 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -156,9 +156,11 @@ module.exports = async (exception, options = {}) => {
 
   // TODO: Ideally after migrating to new logger complete this strip should not be needed
   //       (it can be removed after we clear all chalk error message decorations from internals)
-  const errorMsg = stripAnsi(
-    exceptionTokens.stack && !isUserError ? exceptionTokens.stack : exceptionTokens.message
-  );
+  const errorMsg =
+    exceptionTokens.decoratedMessage ||
+    stripAnsi(
+      exceptionTokens.stack && !isUserError ? exceptionTokens.stack : exceptionTokens.message
+    );
   writeText(null, style.error('Error:'), errorMsg);
 
   legacy.consoleLog(chalk.yellow('  Get Support --------------------------------------------'));
diff --git a/lib/serverless-error.js b/lib/serverless-error.js
index 4ec68c686e9..ec2db0f36d7 100644
--- a/lib/serverless-error.js
+++ b/lib/serverless-error.js
@@ -1,9 +1,10 @@
 'use strict';
 
 class ServerlessError extends Error {
-  constructor(message, code) {
+  constructor(message, code, options = {}) {
     super(message);
     this.code = code;
+    this.decoratedMessage = options.decoratedMessage;
   }
 }
 
diff --git a/lib/utils/tokenize-exception.js b/lib/utils/tokenize-exception.js
index 7b1266d80b4..f7dfbeeecf5 100644
--- a/lib/utils/tokenize-exception.js
+++ b/lib/utils/tokenize-exception.js
@@ -14,6 +14,7 @@ module.exports = (exception) => {
       message: exception.message,
       isUserError: userErrorNames.has(exception.name),
       code: exception.code,
+      decoratedMessage: exception.decoratedMessage,
     };
   }
   return {
diff --git a/test/unit/lib/utils/tokenize-exception.test.js b/test/unit/lib/utils/tokenize-exception.test.js
index 0e763f5da91..941d590c6e3 100644
--- a/test/unit/lib/utils/tokenize-exception.test.js
+++ b/test/unit/lib/utils/tokenize-exception.test.js
@@ -7,13 +7,16 @@ const tokenizeError = require('../../../../lib/utils/tokenize-exception');
 
 describe('test/unit/lib/utils/tokenize-exception.test.js', () => {
   it('Should tokenize user error', () => {
-    const errorTokens = tokenizeError(new ServerlessError('Some error', 'ERR_CODE'));
+    const errorTokens = tokenizeError(
+      new ServerlessError('Some error', 'ERR_CODE', { decoratedMessage: 'decorated' })
+    );
     expect(errorTokens.title).to.equal('Serverless Error');
     expect(errorTokens.name).to.equal('ServerlessError');
     expect(errorTokens.stack).to.include('tokenize-exception.test.js:');
     expect(errorTokens.message).to.equal('Some error');
     expect(errorTokens.isUserError).to.equal(true);
     expect(errorTokens.code).to.equal('ERR_CODE');
+    expect(errorTokens.decoratedMessage).to.equal('decorated');
   });
 
   it('Should tokenize programmer error', () => {

From cfd828ece872b572cbb46670437e8196f2200903 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 18 Oct 2021 19:22:06 +0200
Subject: [PATCH 0634/1101] refactor(CLI): Enhanced modern error reporting for
 CloudFormation

---
 lib/plugins/aws/lib/monitorStack.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js
index 9127f7859cc..087887a1328 100644
--- a/lib/plugins/aws/lib/monitorStack.js
+++ b/lib/plugins/aws/lib/monitorStack.js
@@ -106,6 +106,13 @@ module.exports = {
                 if (!this.options.verbose) legacy.consoleLog('');
                 legacy.log('Operation failed!');
                 legacy.log(`View the full error output: ${stackUrl}`);
+
+                const decoratedErrorMessage = `${stackLatestError.ResourceStatus}: ${
+                  stackLatestError.LogicalResourceId
+                } ${style.aside(`(${stackLatestError.ResourceType})`)}\n${
+                  stackLatestError.ResourceStatusReason
+                }\n\n${style.aside(`View the full error: ${style.link(stackUrl)}`)}`;
+
                 let errorMessage = 'An error occurred: ';
                 errorMessage += `${stackLatestError.LogicalResourceId} - `;
                 errorMessage += `${
@@ -133,7 +140,9 @@ module.exports = {
                     }`
                   );
                 })();
-                throw new ServerlessError(errorMessage, errorCode);
+                throw new ServerlessError(errorMessage, errorCode, {
+                  decoratedMessage: decoratedErrorMessage,
+                });
               }
             },
             (e) => {

From a3edecf0c6b4e066bde2de8095582432d9fdd635 Mon Sep 17 00:00:00 2001
From: Michael <liegeandlief@users.noreply.github.com>
Date: Tue, 19 Oct 2021 14:10:46 +0100
Subject: [PATCH 0635/1101] feat(AWS Lambda): Support for Amazon MQ RabbitMQ
 events (#9919)

Co-authored-by: Michael <michael@Michaels-MacBook-Pro.local>
Co-authored-by: Michael <michael@ip-192-168-158-61.eu-west-1.compute.internal>
---
 docs/providers/aws/events/activemq.md         |  10 +-
 docs/providers/aws/events/rabbitmq.md         |  75 +++++++
 lib/plugins/aws/lib/naming.js                 |   8 +
 .../aws/package/compile/events/rabbitmq.js    | 142 +++++++++++++
 lib/plugins/index.js                          |   1 +
 .../test/integration-setup/cloudformation.yml |  66 +++++-
 scripts/test/integration-setup/index.js       |  66 +++++-
 test/README.md                                |   4 +-
 .../programmatic/functionRabbitmq/core.js     |  43 ++++
 .../functionRabbitmq/package.json             |   5 +
 .../functionRabbitmq/serverless.yml           |  18 ++
 .../aws/infra-dependent/rabbitmq.test.js      | 116 ++++++++++
 .../package/compile/events/rabbitmq.test.js   | 198 ++++++++++++++++++
 test/utils/cloudformation.js                  |   3 +
 14 files changed, 736 insertions(+), 19 deletions(-)
 create mode 100644 docs/providers/aws/events/rabbitmq.md
 create mode 100644 lib/plugins/aws/package/compile/events/rabbitmq.js
 create mode 100644 test/fixtures/programmatic/functionRabbitmq/core.js
 create mode 100644 test/fixtures/programmatic/functionRabbitmq/package.json
 create mode 100644 test/fixtures/programmatic/functionRabbitmq/serverless.yml
 create mode 100644 test/integration/aws/infra-dependent/rabbitmq.test.js
 create mode 100644 test/unit/lib/plugins/aws/package/compile/events/rabbitmq.test.js

diff --git a/docs/providers/aws/events/activemq.md b/docs/providers/aws/events/activemq.md
index 00fe421f880..d6b108dfa79 100644
--- a/docs/providers/aws/events/activemq.md
+++ b/docs/providers/aws/events/activemq.md
@@ -1,19 +1,19 @@
 <!--
-title: Serverless Framework - AWS Lambda Events - MQ
+title: Serverless Framework - AWS Lambda Events - ActiveMQ
 menuText: ActiveMQ
-description:  Setting up AWS Active MQ Events with AWS Lambda via the Serverless Framework
+description:  Setting up AWS ActiveMQ Events with AWS Lambda via the Serverless Framework
 layout: Doc
 -->
 
 <!-- DOCS-SITE-LINK:START automatically generated  -->
 
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/events/mq)
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/events/activemq)
 
 <!-- DOCS-SITE-LINK:END -->
 
-# MQ
+# ActiveMQ
 
-An Active MQ message broker can be used as an event source for AWS Lambda.
+An ActiveMQ message broker can be used as an event source for AWS Lambda.
 
 ## Simple event definition
 
diff --git a/docs/providers/aws/events/rabbitmq.md b/docs/providers/aws/events/rabbitmq.md
new file mode 100644
index 00000000000..569d6d3a328
--- /dev/null
+++ b/docs/providers/aws/events/rabbitmq.md
@@ -0,0 +1,75 @@
+<!--
+title: Serverless Framework - AWS Lambda Events - RabbitMQ
+menuText: RabbitMQ
+description:  Setting up AWS RabbitMQ Events with AWS Lambda via the Serverless Framework
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/events/rabbitmq)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# RabbitMQ
+
+A RabbitMQ message broker can be used as an event source for AWS Lambda.
+
+## Simple event definition
+
+In the following example, we specify that the `compute` function should be triggered whenever there are new messages available to consume from defined RabbitMQ `queue`.
+
+In order to configure `rabbitmq` event, you have to provide three required properties:
+
+- `basicAuthArn`, which is a [AWS Secrets Manager](https://aws.amazon.com/secrets-manager/) ARN for credentials required to do basic auth to allow Lambda to connect to your message broker
+- `queue` to consume messages from.
+- `arn` arn for your Amazon MQ message broker
+
+```yml
+functions:
+  compute:
+    handler: handler.compute
+    events:
+      - rabbitmq:
+          arn: arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx
+          queue: queue-name
+          basicAuthArn: arn:aws:secretsmanager:us-east-1:01234567890:secret:MySecret
+```
+
+## Enabling and disabling RabbitMQ event
+
+The `rabbitmq` event also supports `enabled` parameter, which is used to control if the event source mapping is active. Setting it to `false` will pause polling for and processing new messages.
+
+In the following example, we specify that the `compute` function's `rabbitmq` event should be disabled.
+
+```yml
+functions:
+  compute:
+    handler: handler.compute
+    events:
+      - rabbitmq:
+          arn: arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx
+          queue: queue-name
+          enabled: false
+          basicAuthArn: arn:aws:secretsmanager:us-east-1:01234567890:secret:MySecret
+```
+
+## Specifying batch size
+
+You can also specify `batchSize` of number of items to retrieve in a single batch. If not specified, this will default to `100`.
+
+```yml
+functions:
+  compute:
+    handler: handler.compute
+    events:
+      - rabbitmq:
+          arn: arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx
+          queue: queue-name
+          batchSize: 5000
+          basicAuthArn: arn:aws:secretsmanager:us-east-1:01234567890:secret:MySecret
+```
+
+## IAM Permissions
+
+The Serverless Framework will automatically configure the most minimal set of IAM permissions for you. However you can still add additional permissions if you need to. Read the official [AWS documentation](https://docs.aws.amazon.com/lambda/latest/dg/with-mq.html#events-mq-permissions) for more information about IAM Permissions for Amazon MQ events.
diff --git a/lib/plugins/aws/lib/naming.js b/lib/plugins/aws/lib/naming.js
index 031e6b62ee1..c5d2d5e6a24 100644
--- a/lib/plugins/aws/lib/naming.js
+++ b/lib/plugins/aws/lib/naming.js
@@ -448,6 +448,14 @@ module.exports = {
     return `${normalizedFunctionName}EventSourceMappingActiveMQ${normalizedQueueName}`;
   },
 
+  // RabbitMQ
+  getRabbitMQEventLogicalId(functionName, queueName) {
+    const normalizedFunctionName = this.getNormalizedFunctionName(functionName);
+    // QueueName is trimmed to 150 chars to avoid going over 255 character limit
+    const normalizedQueueName = this.normalizeNameToAlphaNumericOnly(queueName).slice(0, 150);
+    return `${normalizedFunctionName}EventSourceMappingRabbitMQ${normalizedQueueName}`;
+  },
+
   // ALB
   getAlbTargetGroupLogicalId(functionName, albId, multiValueHeaders) {
     return `${this.getNormalizedFunctionName(functionName)}Alb${
diff --git a/lib/plugins/aws/package/compile/events/rabbitmq.js b/lib/plugins/aws/package/compile/events/rabbitmq.js
new file mode 100644
index 00000000000..a1ee60ff78a
--- /dev/null
+++ b/lib/plugins/aws/package/compile/events/rabbitmq.js
@@ -0,0 +1,142 @@
+'use strict';
+
+class AwsCompileRabbitMQEvents {
+  constructor(serverless) {
+    this.serverless = serverless;
+    this.provider = this.serverless.getProvider('aws');
+
+    this.hooks = {
+      'package:compileEvents': this.compileRabbitMQEvents.bind(this),
+    };
+
+    this.serverless.configSchemaHandler.defineFunctionEvent('aws', 'rabbitmq', {
+      type: 'object',
+      properties: {
+        arn: {
+          anyOf: [
+            {
+              type: 'string',
+              pattern: 'arn:[a-z-]+:mq:[a-z0-9-]+:\\d+:broker:[A-Za-z0-9/_+=.@-]+:b-[a-z0-9-]+',
+            },
+            { $ref: '#/definitions/awsCfImport' },
+            { $ref: '#/definitions/awsCfRef' },
+          ],
+        },
+        basicAuthArn: {
+          anyOf: [
+            { $ref: '#/definitions/awsSecretsManagerArnString' },
+            { $ref: '#/definitions/awsCfImport' },
+            { $ref: '#/definitions/awsCfRef' },
+          ],
+        },
+        batchSize: {
+          type: 'number',
+          minimum: 1,
+          maximum: 10000,
+        },
+        enabled: {
+          type: 'boolean',
+        },
+        queue: {
+          type: 'string',
+        },
+      },
+      additionalProperties: false,
+      required: ['basicAuthArn', 'arn', 'queue'],
+    });
+  }
+
+  compileRabbitMQEvents() {
+    this.serverless.service.getAllFunctions().forEach((functionName) => {
+      const functionObj = this.serverless.service.getFunction(functionName);
+      const cfTemplate = this.serverless.service.provider.compiledCloudFormationTemplate;
+
+      // It is required to add the following statement in order to be able to connect to RabbitMQ cluster
+      const ec2Statement = {
+        Effect: 'Allow',
+        Action: [
+          'ec2:CreateNetworkInterface',
+          'ec2:DescribeNetworkInterfaces',
+          'ec2:DescribeVpcs',
+          'ec2:DeleteNetworkInterface',
+          'ec2:DescribeSubnets',
+          'ec2:DescribeSecurityGroups',
+        ],
+        Resource: '*',
+      };
+
+      // The omission of kms:Decrypt is intentional, since we won't know
+      // which resources should be valid to decrypt.  It's also probably
+      // not best practice to allow '*' for this.
+      const secretsManagerStatement = {
+        Effect: 'Allow',
+        Action: ['secretsmanager:GetSecretValue'],
+        Resource: [],
+      };
+
+      const brokerStatement = {
+        Effect: 'Allow',
+        Action: ['mq:DescribeBroker'],
+        Resource: [],
+      };
+
+      let hasMQEvent = false;
+
+      functionObj.events.forEach((event) => {
+        if (!event.rabbitmq) return;
+
+        hasMQEvent = true;
+        const { basicAuthArn, arn, batchSize, enabled, queue } = event.rabbitmq;
+
+        const mqEventLogicalId = this.provider.naming.getRabbitMQEventLogicalId(
+          functionName,
+          queue
+        );
+        const lambdaLogicalId = this.provider.naming.getLambdaLogicalId(functionName);
+        const dependsOn = this.provider.resolveFunctionIamRoleResourceName(functionObj) || [];
+
+        const mqResource = {
+          Type: 'AWS::Lambda::EventSourceMapping',
+          DependsOn: dependsOn,
+          Properties: {
+            FunctionName: {
+              'Fn::GetAtt': [lambdaLogicalId, 'Arn'],
+            },
+            EventSourceArn: arn,
+            Queues: [queue],
+            SourceAccessConfigurations: [
+              {
+                Type: 'BASIC_AUTH',
+                URI: basicAuthArn,
+              },
+            ],
+          },
+        };
+
+        if (batchSize) {
+          mqResource.Properties.BatchSize = batchSize;
+        }
+
+        if (enabled != null) {
+          mqResource.Properties.Enabled = enabled;
+        }
+
+        brokerStatement.Resource.push(arn);
+        secretsManagerStatement.Resource.push(basicAuthArn);
+        cfTemplate.Resources[mqEventLogicalId] = mqResource;
+      });
+
+      // https://docs.aws.amazon.com/lambda/latest/dg/with-mq.html#events-mq-permissions
+      if (cfTemplate.Resources.IamRoleLambdaExecution && hasMQEvent) {
+        const statement =
+          cfTemplate.Resources.IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument
+            .Statement;
+        statement.push(secretsManagerStatement);
+        statement.push(brokerStatement);
+        statement.push(ec2Statement);
+      }
+    });
+  }
+}
+
+module.exports = AwsCompileRabbitMQEvents;
diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index 1232a41e407..397e7d0450e 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -42,6 +42,7 @@ module.exports = [
   require('./aws/package/compile/events/stream.js'),
   require('./aws/package/compile/events/kafka.js'),
   require('./aws/package/compile/events/activemq.js'),
+  require('./aws/package/compile/events/rabbitmq.js'),
   require('./aws/package/compile/events/msk/index.js'),
   require('./aws/package/compile/events/alb/index.js'),
   require('./aws/package/compile/events/alexaSkill.js'),
diff --git a/scripts/test/integration-setup/cloudformation.yml b/scripts/test/integration-setup/cloudformation.yml
index 16840a7be0e..e4f8aa3e206 100644
--- a/scripts/test/integration-setup/cloudformation.yml
+++ b/scripts/test/integration-setup/cloudformation.yml
@@ -6,13 +6,23 @@ Parameters:
     Description: Name of MSK Cluster
   ActiveMQBrokerName:
     Type: String
-    Description: Name of Active MQ Broker
+    Description: Name of ActiveMQ Broker
   ActiveMQUser:
     Type: String
-    Description: Name of Active MQ User
+    Description: Name of ActiveMQ User
   ActiveMQPassword:
     Type: String
-    Description: Password of Active MQ User
+    Description: Password of ActiveMQ User
+    NoEcho: true
+  RabbitMQBrokerName:
+    Type: String
+    Description: Name of RabbitMQ Broker
+  RabbitMQUser:
+    Type: String
+    Description: Name of RabbitMQ User
+  RabbitMQPassword:
+    Type: String
+    Description: Password of RabbitMQ User
     NoEcho: true
   ClusterConfigurationArn:
     Type: String
@@ -132,7 +142,7 @@ Resources:
   ActiveMQSecurityGroup:
     Type: AWS::EC2::SecurityGroup
     Properties:
-      GroupDescription: Security Group for ApacheMQ
+      GroupDescription: Security Group for ActiveMQ
       VpcId: !Ref VPC
       SecurityGroupIngress:
         - IpProtocol: tcp
@@ -163,6 +173,36 @@ Resources:
           Password: !Ref ActiveMQPassword
           Username: !Ref ActiveMQUser
 
+  RabbitMQSecurityGroup:
+    Type: AWS::EC2::SecurityGroup
+    Properties:
+      GroupDescription: Security Group for RabbitMQ
+      VpcId: !Ref VPC
+      SecurityGroupIngress:
+        - IpProtocol: tcp
+          FromPort: 5671
+          ToPort: 5671
+          CidrIp: 0.0.0.0/0
+
+  RabbitMQBroker:
+    Type: 'AWS::AmazonMQ::Broker'
+    Properties:
+      AutoMinorVersionUpgrade: 'false'
+      BrokerName: !Ref RabbitMQBrokerName
+      DeploymentMode: SINGLE_INSTANCE
+      EngineType: RABBITMQ
+      EngineVersion: '3.8.11'
+      HostInstanceType: mq.t3.micro
+      PubliclyAccessible: 'false'
+      SecurityGroups:
+        - !Ref RabbitMQSecurityGroup
+      SubnetIds:
+        - !Ref PrivateSubnetA
+      Users:
+        - ConsoleAccess: 'true'
+          Password: !Ref RabbitMQPassword
+          Username: !Ref RabbitMQUser
+
   MSKCluster:
     Type: 'AWS::MSK::Cluster'
     Properties:
@@ -225,17 +265,29 @@ Outputs:
     Value: !GetAtt VPC.DefaultSecurityGroup
 
   ActiveMQBrokerArn:
-    Description: Created Active MQ Broker ARN
+    Description: Created ActiveMQ Broker ARN
     Value: !GetAtt ActiveMQBroker.Arn
 
   ActiveMQBrokerId:
-    Description: Created Active MQ Broker Id
+    Description: Created ActiveMQ Broker Id
     Value: !Ref ActiveMQBroker
 
   ActiveMQSecurityGroup:
-    Description: Security Group for Active MQ
+    Description: Security Group for ActiveMQ
     Value: !Ref ActiveMQSecurityGroup
 
+  RabbitMQBrokerArn:
+    Description: Created RabbitMQ Broker ARN
+    Value: !GetAtt RabbitMQBroker.Arn
+
+  RabbitMQBrokerId:
+    Description: Created RabbitMQ Broker Id
+    Value: !Ref RabbitMQBroker
+
+  RabbitMQSecurityGroup:
+    Description: Security Group for RabbitMQ
+    Value: !Ref RabbitMQSecurityGroup
+
   MSKCluster:
     Description: Created MSK Cluster
     Value: !Ref MSKCluster
diff --git a/scripts/test/integration-setup/index.js b/scripts/test/integration-setup/index.js
index 0d0fbf2c7be..2a2266c6477 100755
--- a/scripts/test/integration-setup/index.js
+++ b/scripts/test/integration-setup/index.js
@@ -12,14 +12,15 @@ const path = require('path');
 const {
   SHARED_INFRA_TESTS_CLOUDFORMATION_STACK,
   SHARED_INFRA_TESTS_ACTIVE_MQ_CREDENTIALS_NAME,
+  SHARED_INFRA_TESTS_RABBITMQ_CREDENTIALS_NAME,
 } = require('../../../test/utils/cloudformation');
 
-const ensureMQCredentialsSecret = async () => {
+const ensureActiveMQCredentialsSecret = async () => {
   const ssmMqCredentials = {
     username: process.env.SLS_INTEGRATION_TESTS_ACTIVE_MQ_USER,
     password: process.env.SLS_INTEGRATION_TESTS_ACTIVE_MQ_PASSWORD,
   };
-  log.notice('Creating SecretsManager Active MQ Credentials secret...');
+  log.notice('Creating SecretsManager ActiveMQ Credentials secret...');
   try {
     await awsRequest('SecretsManager', 'createSecret', {
       Name: SHARED_INFRA_TESTS_ACTIVE_MQ_CREDENTIALS_NAME,
@@ -32,7 +33,26 @@ const ensureMQCredentialsSecret = async () => {
   }
 };
 
-const activeMqBrokerName = 'integration-tests-active-mq-broker';
+const ensureRabbitMQCredentialsSecret = async () => {
+  const ssmMqCredentials = {
+    username: process.env.SLS_INTEGRATION_TESTS_RABBITMQ_USER,
+    password: process.env.SLS_INTEGRATION_TESTS_RABBITMQ_PASSWORD,
+  };
+  log.notice('Creating SecretsManager RabbitMQ Credentials secret...');
+  try {
+    await awsRequest('SecretsManager', 'createSecret', {
+      Name: SHARED_INFRA_TESTS_RABBITMQ_CREDENTIALS_NAME,
+      SecretString: JSON.stringify(ssmMqCredentials),
+    });
+  } catch (e) {
+    if (!e.code === 'ResourceExistsException') {
+      throw e;
+    }
+  }
+};
+
+const activeMqBrokerName = 'integration-tests-activemq-broker';
+const rabbitMqBrokerName = 'integration-tests-rabbitmq-broker';
 
 async function handleInfrastructureCreation() {
   const [cfnTemplate, kafkaServerProperties] = await Promise.all([
@@ -40,7 +60,8 @@ async function handleInfrastructureCreation() {
     fsp.readFile(path.join(__dirname, 'kafka.server.properties')),
   ]);
 
-  await ensureMQCredentialsSecret();
+  await ensureActiveMQCredentialsSecret();
+  await ensureRabbitMQCredentialsSecret();
 
   const clusterName = 'integration-tests-msk-cluster';
   const clusterConfName = 'integration-tests-msk-cluster-configuration';
@@ -70,6 +91,15 @@ async function handleInfrastructureCreation() {
         ParameterKey: 'ActiveMQPassword',
         ParameterValue: process.env.SLS_INTEGRATION_TESTS_ACTIVE_MQ_PASSWORD,
       },
+      { ParameterKey: 'RabbitMQBrokerName', ParameterValue: rabbitMqBrokerName },
+      {
+        ParameterKey: 'RabbitMQUser',
+        ParameterValue: process.env.SLS_INTEGRATION_TESTS_RABBITMQ_USER,
+      },
+      {
+        ParameterKey: 'RabbitMQPassword',
+        ParameterValue: process.env.SLS_INTEGRATION_TESTS_RABBITMQ_PASSWORD,
+      },
       { ParameterKey: 'ClusterConfigurationArn', ParameterValue: clusterConfigurationArn },
       {
         ParameterKey: 'ClusterConfigurationRevision',
@@ -87,7 +117,8 @@ async function handleInfrastructureCreation() {
 async function handleInfrastructureUpdate() {
   log.notice('Updating integration tests CloudFormation stack...');
 
-  await ensureMQCredentialsSecret();
+  await ensureActiveMQCredentialsSecret();
+  await ensureRabbitMQCredentialsSecret();
 
   const cfnTemplate = await fsp.readFile(path.join(__dirname, 'cloudformation.yml'), 'utf8');
 
@@ -106,6 +137,15 @@ async function handleInfrastructureUpdate() {
           ParameterKey: 'ActiveMQPassword',
           ParameterValue: process.env.SLS_INTEGRATION_TESTS_ACTIVE_MQ_PASSWORD,
         },
+        { ParameterKey: 'RabbitMQBrokerName', ParameterValue: rabbitMqBrokerName },
+        {
+          ParameterKey: 'RabbitMQUser',
+          ParameterValue: process.env.SLS_INTEGRATION_TESTS_RABBITMQ_USER,
+        },
+        {
+          ParameterKey: 'RabbitMQPassword',
+          ParameterValue: process.env.SLS_INTEGRATION_TESTS_RABBITMQ_PASSWORD,
+        },
         { ParameterKey: 'ClusterConfigurationArn', UsePreviousValue: true },
         {
           ParameterKey: 'ClusterConfigurationRevision',
@@ -146,6 +186,22 @@ async function handleInfrastructureUpdate() {
     return;
   }
 
+  if (!process.env.SLS_INTEGRATION_TESTS_RABBITMQ_USER) {
+    log.error(
+      '"SLS_INTEGRATION_TESTS_RABBITMQ_USER" env variable has to be set when provisioning integration infrastructure'
+    );
+    process.exitCode = 1;
+    return;
+  }
+
+  if (!process.env.SLS_INTEGRATION_TESTS_RABBITMQ_PASSWORD) {
+    log.error(
+      '"SLS_INTEGRATION_TESTS_RABBITMQ_PASSWORD" env variable has to be set when provisioning integration infrastructure'
+    );
+    process.exitCode = 1;
+    return;
+  }
+
   let describeResponse;
 
   log.notice('Checking if integration tests CloudFormation stack already exists...');
diff --git a/test/README.md b/test/README.md
index ef0ee90fb77..dfa6118f5bf 100644
--- a/test/README.md
+++ b/test/README.md
@@ -68,8 +68,8 @@ AWS_ACCESS_KEY_ID=XXX AWS_SECRET_ACCESS_KEY=xxx npx mocha test/integration/{chos
 
 Due to the fact that some of the tests require a bit more complex infrastructure setup which might be lengthy, two additional commands has been made available:
 
-- `integration-test-setup-infrastructure` - used for setting up all needed intrastructure dependencies
-- `integration-test-teardown-infrastructure` - used for tearing down the infrastructure setup by the above command
+- `integration-test-setup` - used for setting up all needed intrastructure dependencies
+- `integration-test-teardown` - used for tearing down the infrastructure setup by the above command
 
 Such tests take advantage of `isDependencyStackAvailable` util to check if all needed dependencies are ready. If not, it skips the given test suite.
 
diff --git a/test/fixtures/programmatic/functionRabbitmq/core.js b/test/fixtures/programmatic/functionRabbitmq/core.js
new file mode 100644
index 00000000000..4c823006610
--- /dev/null
+++ b/test/fixtures/programmatic/functionRabbitmq/core.js
@@ -0,0 +1,43 @@
+'use strict';
+
+// NOTE: `amqplib` is bundled into the deployment package
+// eslint-disable-next-line import/no-unresolved
+const amqp = require('amqplib');
+
+function consumer(event, context, callback) {
+  const functionName = 'consumer';
+  const messages = [];
+
+  Object.keys(event.rmqMessagesByQueue).forEach((queueKey) => {
+    const queue = event.rmqMessagesByQueue[queueKey];
+    queue.forEach((message) => {
+      messages.push(Buffer.from(message.data, 'base64').toString());
+    });
+  });
+  // eslint-disable-next-line no-console
+  console.log(functionName, JSON.stringify(messages));
+
+  return callback(null, event);
+}
+
+async function producer() {
+  const connectOptions = {
+    protocol: 'amqps',
+    hostname: process.env.RABBITMQ_HOST,
+    port: 5671,
+    username: process.env.RABBITMQ_USERNAME,
+    password: process.env.RABBITMQ_PASSWORD,
+  };
+
+  const connection = await amqp.connect(connectOptions);
+  const channel = await connection.createChannel();
+  const queueName = process.env.QUEUE_NAME;
+  await channel.assertQueue(queueName);
+  await channel.sendToQueue(queueName, Buffer.from('Hello from RabbitMQ Integration test!'));
+
+  return {
+    statusCode: 200,
+  };
+}
+
+module.exports = { producer, consumer };
diff --git a/test/fixtures/programmatic/functionRabbitmq/package.json b/test/fixtures/programmatic/functionRabbitmq/package.json
new file mode 100644
index 00000000000..0a22a3db431
--- /dev/null
+++ b/test/fixtures/programmatic/functionRabbitmq/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "amqplib": "^0.8.0"
+  }
+}
diff --git a/test/fixtures/programmatic/functionRabbitmq/serverless.yml b/test/fixtures/programmatic/functionRabbitmq/serverless.yml
new file mode 100644
index 00000000000..ce4f94dddd0
--- /dev/null
+++ b/test/fixtures/programmatic/functionRabbitmq/serverless.yml
@@ -0,0 +1,18 @@
+service: service
+
+configValidationMode: error
+frameworkVersion: '*'
+
+# VPC and Events configuration is added dynamically during test run
+# Because it has to be provisioned separately via CloudFormation stack
+
+provider:
+  name: aws
+  runtime: nodejs14.x
+  versionFunctions: false
+
+functions:
+  producer:
+    handler: core.producer
+  consumer:
+    handler: core.consumer
diff --git a/test/integration/aws/infra-dependent/rabbitmq.test.js b/test/integration/aws/infra-dependent/rabbitmq.test.js
new file mode 100644
index 00000000000..2c5c7a30c33
--- /dev/null
+++ b/test/integration/aws/infra-dependent/rabbitmq.test.js
@@ -0,0 +1,116 @@
+'use strict';
+
+const { expect } = require('chai');
+const log = require('log').get('serverless:test');
+const fixtures = require('../../../fixtures/programmatic');
+const { confirmCloudWatchLogs } = require('../../../utils/misc');
+const {
+  isDependencyStackAvailable,
+  getDependencyStackOutputMap,
+  SHARED_INFRA_TESTS_RABBITMQ_CREDENTIALS_NAME,
+} = require('../../../utils/cloudformation');
+
+const awsRequest = require('@serverless/test/aws-request');
+const crypto = require('crypto');
+const { deployService, removeService } = require('../../../utils/integration');
+
+describe('AWS - RabbitMQ Integration Test', function () {
+  this.timeout(1000 * 60 * 100); // Involves time-taking deploys
+  let stackName;
+  let serviceDir;
+  const stage = 'dev';
+
+  const queueName = `testqueue${crypto.randomBytes(8).toString('hex')}`;
+
+  before(async () => {
+    const isDepsStackAvailable = await isDependencyStackAvailable();
+    if (!isDepsStackAvailable) {
+      throw new Error('CloudFormation stack with integration test dependencies not found.');
+    }
+
+    const outputMap = await getDependencyStackOutputMap();
+
+    log.notice('Getting RabbitMQ Credentials ARN');
+    const getSecretValueResponse = await awsRequest('SecretsManager', 'getSecretValue', {
+      SecretId: SHARED_INFRA_TESTS_RABBITMQ_CREDENTIALS_NAME,
+    });
+    const { username: mqUsername, password: mqPassword } = JSON.parse(
+      getSecretValueResponse.SecretString
+    );
+
+    const describeBrokerResponse = await awsRequest('MQ', 'describeBroker', {
+      BrokerId: outputMap.get('RabbitMQBrokerId'),
+    });
+    const amqpEndpoint = describeBrokerResponse.BrokerInstances[0].Endpoints.find((endpoint) =>
+      endpoint.startsWith('amqp')
+    );
+
+    const serviceData = await fixtures.setup('functionRabbitmq', {
+      configExt: {
+        functions: {
+          producer: {
+            vpc: {
+              subnetIds: [outputMap.get('PrivateSubnetA')],
+              securityGroupIds: [outputMap.get('RabbitMQSecurityGroup')],
+            },
+            environment: {
+              QUEUE_NAME: queueName,
+              RABBITMQ_PASSWORD: mqPassword,
+              RABBITMQ_USERNAME: mqUsername,
+              RABBITMQ_HOST: amqpEndpoint.split(':')[1].slice(2),
+            },
+          },
+          consumer: {
+            vpc: {
+              subnetIds: [outputMap.get('PrivateSubnetA')],
+              securityGroupIds: [outputMap.get('RabbitMQSecurityGroup')],
+            },
+            events: [
+              {
+                rabbitmq: {
+                  arn: outputMap.get('RabbitMQBrokerArn'),
+                  queue: queueName,
+                  basicAuthArn: getSecretValueResponse.ARN,
+                },
+              },
+            ],
+          },
+        },
+      },
+    });
+
+    ({ servicePath: serviceDir } = serviceData);
+
+    const serviceName = serviceData.serviceConfig.service;
+    stackName = `${serviceName}-${stage}`;
+    await deployService(serviceDir);
+  });
+
+  after(async () => {
+    if (serviceDir) {
+      await removeService(serviceDir);
+    }
+  });
+
+  it('correctly processes messages from RabbitMQ queue', async () => {
+    const functionName = 'consumer';
+    const message = 'Hello from RabbitMQ Integration test!';
+
+    const events = await confirmCloudWatchLogs(
+      `/aws/lambda/${stackName}-${functionName}`,
+      async () =>
+        await awsRequest('Lambda', 'invoke', {
+          FunctionName: `${stackName}-producer`,
+          InvocationType: 'RequestResponse',
+        }),
+      {
+        checkIsComplete: (soFarEvents) =>
+          soFarEvents.reduce((data, event) => data + event.message, '').includes(message),
+      }
+    );
+
+    const logs = events.reduce((data, event) => data + event.message, '');
+    expect(logs).to.include(functionName);
+    expect(logs).to.include(message);
+  });
+});
diff --git a/test/unit/lib/plugins/aws/package/compile/events/rabbitmq.test.js b/test/unit/lib/plugins/aws/package/compile/events/rabbitmq.test.js
new file mode 100644
index 00000000000..fb061de6d40
--- /dev/null
+++ b/test/unit/lib/plugins/aws/package/compile/events/rabbitmq.test.js
@@ -0,0 +1,198 @@
+'use strict';
+
+const chai = require('chai');
+const runServerless = require('../../../../../../../utils/run-serverless');
+
+const { expect } = chai;
+
+chai.use(require('chai-as-promised'));
+
+describe('test/unit/lib/plugins/aws/package/compile/events/rabbitmq.test.js', () => {
+  const brokerArn = 'arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx';
+  const basicAuthArn = 'arn:aws:secretsmanager:us-east-1:01234567890:secret:MyBrokerSecretName';
+  const queue = 'TestingQueue';
+  const enabled = false;
+  const batchSize = 5000;
+
+  describe('when there are rabbitmq events defined', () => {
+    let minimalEventSourceMappingResource;
+    let allParamsEventSourceMappingResource;
+    let defaultIamRole;
+    let naming;
+
+    before(async () => {
+      const { awsNaming, cfTemplate } = await runServerless({
+        fixture: 'function',
+        configExt: {
+          functions: {
+            basic: {
+              events: [
+                {
+                  rabbitmq: {
+                    queue,
+                    arn: brokerArn,
+                    basicAuthArn,
+                  },
+                },
+              ],
+            },
+            other: {
+              events: [
+                {
+                  rabbitmq: {
+                    queue,
+                    arn: brokerArn,
+                    basicAuthArn,
+                    batchSize,
+                    enabled,
+                  },
+                },
+              ],
+            },
+          },
+        },
+        command: 'package',
+      });
+      naming = awsNaming;
+      minimalEventSourceMappingResource =
+        cfTemplate.Resources[naming.getRabbitMQEventLogicalId('basic', queue)];
+      allParamsEventSourceMappingResource =
+        cfTemplate.Resources[naming.getRabbitMQEventLogicalId('other', queue)];
+      defaultIamRole = cfTemplate.Resources.IamRoleLambdaExecution;
+    });
+
+    it('should correctly compile EventSourceMapping resource properties with minimal configuration', () => {
+      expect(minimalEventSourceMappingResource.Properties).to.deep.equal({
+        EventSourceArn: brokerArn,
+        SourceAccessConfigurations: [
+          {
+            Type: 'BASIC_AUTH',
+            URI: basicAuthArn,
+          },
+        ],
+        Queues: [queue],
+        FunctionName: {
+          'Fn::GetAtt': [naming.getLambdaLogicalId('basic'), 'Arn'],
+        },
+      });
+    });
+
+    it('should update default IAM role with DescribeBroker statement', () => {
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).to.deep.include({
+        Effect: 'Allow',
+        Action: ['mq:DescribeBroker'],
+        Resource: [brokerArn],
+      });
+    });
+
+    it('should update default IAM role with SecretsManager statement', () => {
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).to.deep.include({
+        Effect: 'Allow',
+        Action: ['secretsmanager:GetSecretValue'],
+        Resource: [basicAuthArn],
+      });
+    });
+
+    it('should correctly compile EventSourceMapping resource DependsOn ', () => {
+      expect(minimalEventSourceMappingResource.DependsOn).to.equal('IamRoleLambdaExecution');
+      expect(allParamsEventSourceMappingResource.DependsOn).to.equal('IamRoleLambdaExecution');
+    });
+
+    it('should correctly compile EventSourceMapping resource with all parameters', () => {
+      expect(allParamsEventSourceMappingResource.Properties).to.deep.equal({
+        EventSourceArn: brokerArn,
+        BatchSize: batchSize,
+        Enabled: enabled,
+        SourceAccessConfigurations: [
+          {
+            Type: 'BASIC_AUTH',
+            URI: basicAuthArn,
+          },
+        ],
+        Queues: [queue],
+        FunctionName: {
+          'Fn::GetAtt': [naming.getLambdaLogicalId('other'), 'Arn'],
+        },
+      });
+    });
+
+    it('should update default IAM role with EC2 statement', async () => {
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).to.deep.include({
+        Effect: 'Allow',
+        Action: [
+          'ec2:CreateNetworkInterface',
+          'ec2:DescribeNetworkInterfaces',
+          'ec2:DescribeVpcs',
+          'ec2:DeleteNetworkInterface',
+          'ec2:DescribeSubnets',
+          'ec2:DescribeSecurityGroups',
+        ],
+        Resource: '*',
+      });
+    });
+  });
+
+  describe('configuring rabbitmq events', () => {
+    it('should not add dependsOn for imported role', async () => {
+      const { awsNaming, cfTemplate } = await runServerless({
+        fixture: 'function',
+        configExt: {
+          functions: {
+            basic: {
+              role: { 'Fn::ImportValue': 'MyImportedRole' },
+              events: [
+                {
+                  rabbitmq: {
+                    queue,
+                    arn: brokerArn,
+                    basicAuthArn,
+                  },
+                },
+              ],
+            },
+          },
+        },
+        command: 'package',
+      });
+
+      const eventSourceMappingResource =
+        cfTemplate.Resources[awsNaming.getRabbitMQEventLogicalId('basic', queue)];
+      expect(eventSourceMappingResource.DependsOn).to.deep.equal([]);
+    });
+  });
+
+  describe('when no rabbitmq events are defined', () => {
+    it('should not modify the default IAM role', async () => {
+      const { cfTemplate } = await runServerless({
+        fixture: 'function',
+        command: 'package',
+      });
+
+      const defaultIamRole = cfTemplate.Resources.IamRoleLambdaExecution;
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).not.to.deep.include({
+        Effect: 'Allow',
+        Action: ['mq:DescribeBroker'],
+        Resource: [brokerArn],
+      });
+
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).not.to.deep.include({
+        Effect: 'Allow',
+        Action: ['secretsmanager:GetSecretValue'],
+        Resource: [basicAuthArn],
+      });
+
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).not.to.deep.include({
+        Effect: 'Allow',
+        Action: [
+          'ec2:CreateNetworkInterface',
+          'ec2:DescribeNetworkInterfaces',
+          'ec2:DescribeVpcs',
+          'ec2:DeleteNetworkInterface',
+          'ec2:DescribeSubnets',
+          'ec2:DescribeSecurityGroups',
+        ],
+        Resource: '*',
+      });
+    });
+  });
+});
diff --git a/test/utils/cloudformation.js b/test/utils/cloudformation.js
index 0d6bf23818d..a3ca7fad0d3 100644
--- a/test/utils/cloudformation.js
+++ b/test/utils/cloudformation.js
@@ -5,6 +5,8 @@ const awsRequest = require('@serverless/test/aws-request');
 const SHARED_INFRA_TESTS_CLOUDFORMATION_STACK = 'integration-tests-deps-stack';
 const SHARED_INFRA_TESTS_ACTIVE_MQ_CREDENTIALS_NAME =
   'integration-tests-active-mq-broker-credentials';
+const SHARED_INFRA_TESTS_RABBITMQ_CREDENTIALS_NAME =
+  'integration-tests-rabbitmq-broker-credentials';
 
 function findStacks(name, status) {
   const params = {};
@@ -104,6 +106,7 @@ module.exports = {
   getStackOutputMap,
   SHARED_INFRA_TESTS_CLOUDFORMATION_STACK,
   SHARED_INFRA_TESTS_ACTIVE_MQ_CREDENTIALS_NAME,
+  SHARED_INFRA_TESTS_RABBITMQ_CREDENTIALS_NAME,
   isDependencyStackAvailable,
   getDependencyStackOutputMap,
 };

From b4ff87dc81286b8123830f20bccfb3aa320e4ccd Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 19 Oct 2021 15:09:22 +0200
Subject: [PATCH 0636/1101] refactor(CLI): Report `credentials` source in
 modern error output

---
 lib/cli/handle-error.js | 40 +++++++++++++++++++++++++++++++++-------
 package.json            |  2 +-
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 7b846cccdea..24b334fddea 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -6,6 +6,7 @@ const chalk = require('chalk');
 const stripAnsi = require('strip-ansi');
 const sfeVersion = require('@serverless/dashboard-plugin/package.json').version;
 const { platformClientVersion } = require('@serverless/dashboard-plugin');
+const { getDashboardProvidersUrl } = require('@serverless/dashboard-plugin/lib/dashboard');
 const { style, writeText, legacy, log } = require('@serverless/utils/log');
 const slsVersion = require('./../../package').version;
 const { logWarning } = require('../classes/Error');
@@ -145,15 +146,40 @@ module.exports = async (exception, options = {}) => {
     }
   })();
 
-  writeText(
-    style.aside(
-      `Environment: ${platform}, node ${nodeVersion}, framework ${slsVersion}${installationModePostfix}, plugin ${sfeVersion}, SDK ${platformClientVersion}`,
-      'Docs:        docs.serverless.com',
-      'Support:     forum.serverless.com',
-      'Bugs:        github.com/serverless/serverless/issues'
-    )
+  const detailsTextTokens = [
+    `Environment: ${platform}, node ${nodeVersion}, framework ${slsVersion}${installationModePostfix}, plugin ${sfeVersion}, SDK ${platformClientVersion}`,
+  ];
+
+  if (serverless && serverless.service.provider.name === 'aws') {
+    const credentials = serverless.getProvider('aws').cachedCredentials;
+    if (credentials) {
+      if (credentials.dashboardProviderAlias) {
+        detailsTextTokens.push(
+          `Credentials: Serverless Dashboard, "${
+            credentials.dashboardProviderAlias
+          }" provider (${getDashboardProvidersUrl(serverless.pluginManager.dashboardPlugin)})`
+        );
+      } else if (credentials.credentials) {
+        if (credentials.credentials.profile) {
+          detailsTextTokens.push(
+            `Credentials: Local, "${credentials.credentials.profile}" profile`
+          );
+        } else {
+          // The only alternative here are credentials from environment variables
+          detailsTextTokens.push('Credentials: Local, environment variables');
+        }
+      }
+    }
+  }
+
+  detailsTextTokens.push(
+    'Docs:        docs.serverless.com',
+    'Support:     forum.serverless.com',
+    'Bugs:        github.com/serverless/serverless/issues'
   );
 
+  writeText(style.aside(...detailsTextTokens));
+
   // TODO: Ideally after migrating to new logger complete this strip should not be needed
   //       (it can be removed after we clear all chalk error message decorations from internals)
   const errorMsg =
diff --git a/package.json b/package.json
index d624c6a2539..b079c3f13a2 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "@serverless/cli": "^1.5.2",
     "@serverless/components": "^3.17.1",
-    "@serverless/dashboard-plugin": "^5.4.8",
+    "@serverless/dashboard-plugin": "^5.5.0",
     "@serverless/platform-client": "^4.3.0",
     "@serverless/utils": "^5.18.0",
     "ajv": "^6.12.6",

From 006cec5f2c62c322491e854084fd27438d1e87fc Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 19 Oct 2021 15:16:08 +0200
Subject: [PATCH 0637/1101] refactor(CLI): Improve logic

---
 lib/utils/logDeprecation.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/utils/logDeprecation.js b/lib/utils/logDeprecation.js
index 77444e2f1a2..b64aa0a666d 100644
--- a/lib/utils/logDeprecation.js
+++ b/lib/utils/logDeprecation.js
@@ -115,9 +115,9 @@ module.exports.flushBuffered = () => {
 module.exports.printSummary = () => {
   if (!bufferedDeprecations.length) return;
 
-  deprecationLogger.warning();
-
   try {
+    deprecationLogger.warning();
+
     if (bufferedDeprecations.length === 1) {
       deprecationLogger.warning(
         style.aside("1 deprecation found: run 'serverless doctor' for more details")

From 6022fb98331e8f7d8893a28d3dcb20d91d0a1e20 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 19 Oct 2021 16:38:46 +0200
Subject: [PATCH 0638/1101] fix(CLI): Ensure command validation for service
 independent commands

---
 scripts/serverless.js                | 6 +++---
 test/unit/scripts/serverless.test.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index 68445387974..f9e2a2c6984 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -503,6 +503,8 @@ const processSpanPromise = (async () => {
         // Validate result command and options
         require('../lib/cli/ensure-supported-command')();
       }
+    } else {
+      require('../lib/cli/ensure-supported-command')();
     }
 
     const configurationFilename = configuration && configurationPath.slice(serviceDir.length + 1);
@@ -510,9 +512,8 @@ const processSpanPromise = (async () => {
     const isStandaloneCommand = standaloneCommands.has(command);
 
     if (isInteractiveSetup || isStandaloneCommand) {
+      if (configuration) require('../lib/cli/ensure-supported-command')(configuration);
       if (isInteractiveSetup) {
-        require('../lib/cli/ensure-supported-command')(configuration);
-
         if (!process.stdin.isTTY && !process.env.SLS_INTERACTIVE_SETUP_ENABLE) {
           throw new ServerlessError(
             'Attempted to run an interactive setup in non TTY environment.\n' +
@@ -531,7 +532,6 @@ const processSpanPromise = (async () => {
           configuration = result.configuration;
         }
       } else {
-        require('../lib/cli/ensure-supported-command')(configuration);
         await require(`../commands/${commands.join('-')}`)({
           configuration,
           serviceDir,
diff --git a/test/unit/scripts/serverless.test.js b/test/unit/scripts/serverless.test.js
index f4011d7e2d6..89e711a0b73 100644
--- a/test/unit/scripts/serverless.test.js
+++ b/test/unit/scripts/serverless.test.js
@@ -258,7 +258,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
       throw new Error('Unexpected');
     } catch (error) {
       expect(error.code).to.equal(1);
-      expect(String(error.stdoutBuffer)).to.include('command requires the');
+      expect(String(error.stdoutBuffer)).to.include('command "config credentials" requires');
     }
   });
 });

From 6991d66987d6276665bff07259bf1ca464ffeab7 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 19 Oct 2021 18:13:59 +0200
Subject: [PATCH 0639/1101] refactor(CLI): Do not filter commands by
 `lifecycleEvents` for help

Not clear at this point why such filter was added.
It's harmful for commands configured externally of `Serverless` class
---
 lib/cli/render-help/general.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/cli/render-help/general.js b/lib/cli/render-help/general.js
index 3b81abdc82d..2ff73499084 100644
--- a/lib/cli/render-help/general.js
+++ b/lib/cli/render-help/general.js
@@ -36,9 +36,7 @@ module.exports = (loadedPlugins) => {
   renderOptions(globalOptions, { shouldWriteModernOnly: true });
 
   const allCommands = new Map(
-    Array.from(commandsSchema).filter(
-      ([commandName, { isHidden, lifecycleEvents }]) => commandName && !isHidden && lifecycleEvents
-    )
+    Array.from(commandsSchema).filter(([commandName, { isHidden }]) => commandName && !isHidden)
   );
   const mainCommands = new Map(
     Array.from(allCommands).filter(([, { groupName }]) => groupName === 'main')

From 452e234306a3703e95ad349305e1e211c165bf22 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 19 Oct 2021 18:21:42 +0200
Subject: [PATCH 0640/1101] refactor(CLI): `doctor` command for modern handling
 of deprecations

---
 commands/doctor.js                         | 19 ++++++++
 lib/cli/commands-schema/no-service.js      |  6 +++
 lib/cli/handle-error.js                    |  2 +-
 lib/utils/health-status-filename.js        |  6 +++
 lib/utils/logDeprecation.js                | 54 ++++++++++++++++++----
 scripts/serverless.js                      |  8 ++--
 test/unit/commands/doctor.test.js          | 35 ++++++++++++++
 test/unit/lib/utils/logDeprecation.test.js | 12 +++--
 8 files changed, 123 insertions(+), 19 deletions(-)
 create mode 100644 commands/doctor.js
 create mode 100644 lib/utils/health-status-filename.js
 create mode 100644 test/unit/commands/doctor.test.js

diff --git a/commands/doctor.js b/commands/doctor.js
new file mode 100644
index 00000000000..94c57bfc1fe
--- /dev/null
+++ b/commands/doctor.js
@@ -0,0 +1,19 @@
+'use strict';
+
+const fsp = require('fs').promises;
+const { writeText, log } = require('@serverless/utils/log');
+const healthStatusFilename = require('../lib/utils/health-status-filename');
+
+module.exports = async () => {
+  const healthStatus = await (async () => {
+    try {
+      return await fsp.readFile(healthStatusFilename);
+    } catch (error) {
+      if (error.code === 'ENOENT') return null;
+      throw error;
+    }
+  })();
+
+  if (healthStatus) writeText(healthStatus);
+  else log.notice('No deprecations were reported in the last command');
+};
diff --git a/lib/cli/commands-schema/no-service.js b/lib/cli/commands-schema/no-service.js
index 3f3f27b224e..24fd3105113 100644
--- a/lib/cli/commands-schema/no-service.js
+++ b/lib/cli/commands-schema/no-service.js
@@ -135,6 +135,12 @@ commands.set('dashboard', {
   serviceDependencyMode: 'optional',
 });
 
+commands.set('doctor', {
+  usage: 'Print status on reported deprecations triggered in the last command run',
+  // TODO: Expose in v3
+  isHidden: true,
+});
+
 commands.set('generate-event', {
   usage: 'Generate event',
   lifecycleEvents: ['generate-event'],
diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 24b334fddea..902a4fb6c6a 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -210,7 +210,7 @@ module.exports = async (exception, options = {}) => {
   legacy.consoleLog(chalk.yellow(`     Components Version:        ${componentsVersion}`));
   legacy.consoleLog(' ');
 
-  logDeprecation.printSummary();
+  await logDeprecation.printSummary();
 
   if (
     !isTelemetryDisabled &&
diff --git a/lib/utils/health-status-filename.js b/lib/utils/health-status-filename.js
new file mode 100644
index 00000000000..d3491cb80e8
--- /dev/null
+++ b/lib/utils/health-status-filename.js
@@ -0,0 +1,6 @@
+'use strict';
+
+const path = require('path');
+const os = require('os');
+
+module.exports = path.resolve(os.homedir(), '.serverless/last-command-health-status');
diff --git a/lib/utils/logDeprecation.js b/lib/utils/logDeprecation.js
index b64aa0a666d..143ccc0cb84 100644
--- a/lib/utils/logDeprecation.js
+++ b/lib/utils/logDeprecation.js
@@ -1,10 +1,15 @@
 'use strict';
 
+const path = require('path');
+const fse = require('fs-extra');
+const fsp = require('fs').promises;
 const chalk = require('chalk');
 const weakMemoizee = require('memoizee/weak');
 const _ = require('lodash');
+const resolveTmpdir = require('process-utils/tmpdir');
 const ServerlessError = require('../serverless-error');
 const { style, legacy, log } = require('@serverless/utils/log');
+const healthStatusFilename = require('./health-status-filename');
 
 const disabledDeprecationCodesByEnv = extractCodes(process.env.SLS_DEPRECATION_DISABLE);
 
@@ -112,27 +117,58 @@ module.exports.flushBuffered = () => {
   }
 };
 
-module.exports.printSummary = () => {
-  if (!bufferedDeprecations.length) return;
+module.exports.printSummary = async () => {
+  if (!bufferedDeprecations.length) {
+    try {
+      await fsp.unlink(healthStatusFilename);
+    } catch {
+      // ignore
+    }
+    return;
+  }
 
   try {
+    const healthStatus = [];
+
     deprecationLogger.warning();
 
     if (bufferedDeprecations.length === 1) {
+      healthStatus.push('1 deprecation triggered in the last command:', '');
       deprecationLogger.warning(
         style.aside("1 deprecation found: run 'serverless doctor' for more details")
       );
+    } else {
+      healthStatus.push(
+        `${bufferedDeprecations.length} deprecations triggered in the last command:`,
+        ''
+      );
+      deprecationLogger.warning(
+        style.aside(
+          `${bufferedDeprecations.length} deprecations found: run 'serverless doctor' for more details`
+        )
+      );
+    }
+    for (const { code, message } of bufferedDeprecations) {
+      healthStatus.push(message);
+      if (!code.startsWith('EXT_')) {
+        healthStatus.push(
+          style.aside(`More info: https://serverless.com/framework/docs/deprecations/#${code}`)
+        );
+      }
+    }
+
+    const tmpHealthStatusFilename = path.resolve(await resolveTmpdir(), 'health-status');
+    await Promise.all([
+      fse.ensureDir(path.dirname(healthStatusFilename)),
+      fsp.writeFile(tmpHealthStatusFilename, healthStatus.join('\n')),
+    ]);
+    await fsp.rename(tmpHealthStatusFilename, healthStatusFilename);
+
+    if (bufferedDeprecations.length === 1) {
       const { code, message } = bufferedDeprecations[0];
       writeDeprecation(code, message);
       return;
     }
-
-    deprecationLogger.warning(
-      style.aside(
-        `${bufferedDeprecations.length} deprecations found: run 'serverless doctor' for more details`
-      )
-    );
-
     const prefix = 'Serverless: ';
     legacy.write(`${prefix}${chalk.bold.keyword('orange')('Deprecation warnings:')}\n\n`);
     for (const { code, message } of bufferedDeprecations) {
diff --git a/scripts/serverless.js b/scripts/serverless.js
index f9e2a2c6984..2f1b865ca33 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -41,7 +41,7 @@ let hasTelemetryBeenReported = false;
 // to properly handle e.g. `SIGINT` interrupt
 const keepAliveTimer = setTimeout(() => {}, 60 * 60 * 1000);
 
-const standaloneCommands = new Set(['plugin install', 'plugin uninstall']);
+const standaloneCommands = new Set(['doctor', 'plugin install', 'plugin uninstall']);
 
 process.once('uncaughtException', (error) => {
   clearTimeout(keepAliveTimer);
@@ -123,7 +123,7 @@ const processSpanPromise = (async () => {
     // If version number request, show it and abort
     if (options.version) {
       await require('../lib/cli/render-version')();
-      logDeprecation.printSummary();
+      await logDeprecation.printSummary();
       return;
     }
 
@@ -542,7 +542,7 @@ const processSpanPromise = (async () => {
 
       progress.clear();
 
-      logDeprecation.printSummary();
+      await logDeprecation.printSummary();
 
       if (!hasTelemetryBeenReported) {
         hasTelemetryBeenReported = true;
@@ -831,7 +831,7 @@ const processSpanPromise = (async () => {
       }
       progress.clear();
 
-      logDeprecation.printSummary();
+      await logDeprecation.printSummary();
 
       if (!hasTelemetryBeenReported) {
         hasTelemetryBeenReported = true;
diff --git a/test/unit/commands/doctor.test.js b/test/unit/commands/doctor.test.js
new file mode 100644
index 00000000000..c351569d9a7
--- /dev/null
+++ b/test/unit/commands/doctor.test.js
@@ -0,0 +1,35 @@
+'use strict';
+
+const chai = require('chai');
+const path = require('path');
+const spawn = require('child-process-ext/spawn');
+const { expect } = require('chai');
+
+chai.use(require('chai-as-promised'));
+
+const serverlessPath = path.resolve(__dirname, '../../../scripts/serverless.js');
+
+describe('test/unit/commands/doctor.test.js', async () => {
+  before(() => {
+    process.env.SLS_DEPRECATION_NOTIFICATION_MODE = 'warn:summary';
+    process.env.SLS_DEV_LOG_MODE = '3';
+  });
+
+  it('should print health status after command which triggered deprecation', async () => {
+    // Trigger deprecation
+    await spawn('node', [serverlessPath, 'config', '--foo']);
+
+    // Gather Health status
+    expect(String((await spawn('node', [serverlessPath, 'doctor'])).stdoutBuffer)).to.include(
+      'deprecation triggered in the last command'
+    );
+  });
+
+  it('should inform of no issues when no health status found', async () => {
+    // Trigger command that reports no issues
+    await spawn('node', [serverlessPath, 'config', '--help']);
+
+    // Gather Health status
+    expect(String((await spawn('node', [serverlessPath, 'doctor'])).stdoutBuffer)).to.be.empty;
+  });
+});
diff --git a/test/unit/lib/utils/logDeprecation.test.js b/test/unit/lib/utils/logDeprecation.test.js
index 4fabf61f850..013607d4746 100644
--- a/test/unit/lib/utils/logDeprecation.test.js
+++ b/test/unit/lib/utils/logDeprecation.test.js
@@ -13,7 +13,9 @@ describe('test/unit/lib/utils/logDeprecation.test.js', () => {
 
   beforeEach(() => {
     delete require.cache[require.resolve('../../../../lib/utils/logDeprecation')];
-    ({ originalEnv, restoreEnv } = overrideEnv());
+    ({ originalEnv, restoreEnv } = overrideEnv({
+      whitelist: ['APPDATA', 'HOME', 'PATH', 'TEMP', 'TMP', 'TMPDIR', 'USERPROFILE'],
+    }));
   });
 
   afterEach(() => {
@@ -147,17 +149,17 @@ describe('test/unit/lib/utils/logDeprecation.test.js', () => {
     expect(stdoutData).to.include('Second deprecation');
   });
 
-  it('should expose working `printSummary` method', () => {
+  it('should expose working `printSummary` method', async () => {
     let stdoutData = '';
-    overrideStdoutWrite(
+    await overrideStdoutWrite(
       (data) => (stdoutData += data),
-      () => {
+      async () => {
         const logDeprecation = require('../../../../lib/utils/logDeprecation');
         logDeprecation('CODE1', 'First deprecation');
         expect(stdoutData).to.not.include('First deprecation');
         logDeprecation('CODE2', 'Second deprecation');
         expect(stdoutData).to.not.include('Second deprecation');
-        logDeprecation.printSummary();
+        await logDeprecation.printSummary();
       }
     );
     expect(stdoutData).to.include('First deprecation');

From 2f7e698e4d312704041c764a4a4ed01caf3dae40 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 19 Oct 2021 18:26:07 +0200
Subject: [PATCH 0641/1101] refactor: Improve var naming

---
 scripts/serverless.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index 2f1b865ca33..7d52890a45e 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -41,7 +41,9 @@ let hasTelemetryBeenReported = false;
 // to properly handle e.g. `SIGINT` interrupt
 const keepAliveTimer = setTimeout(() => {}, 60 * 60 * 1000);
 
-const standaloneCommands = new Set(['doctor', 'plugin install', 'plugin uninstall']);
+// Names of the commands which are configured independently in root `commands` folder
+// and not in Serverless class internals
+const notIntegratedCommands = new Set(['doctor', 'plugin install', 'plugin uninstall']);
 
 process.once('uncaughtException', (error) => {
   clearTimeout(keepAliveTimer);
@@ -509,7 +511,7 @@ const processSpanPromise = (async () => {
 
     const configurationFilename = configuration && configurationPath.slice(serviceDir.length + 1);
 
-    const isStandaloneCommand = standaloneCommands.has(command);
+    const isStandaloneCommand = notIntegratedCommands.has(command);
 
     if (isInteractiveSetup || isStandaloneCommand) {
       if (configuration) require('../lib/cli/ensure-supported-command')(configuration);

From a7c8d7b7e0e2d06332b39bee288a864410ce7f68 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 20 Oct 2021 10:12:04 +0200
Subject: [PATCH 0642/1101] test: Order alphabetically

---
 test/mochaPatch.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/mochaPatch.js b/test/mochaPatch.js
index cc877850ec8..6455fddabb9 100644
--- a/test/mochaPatch.js
+++ b/test/mochaPatch.js
@@ -37,10 +37,10 @@ const patchCallback = (name) => {
     }
   );
 };
-patchPromised('readFile');
 patchPromised('open');
-patchCallback('readFile');
+patchPromised('readFile');
 patchCallback('open');
+patchCallback('readFile');
 
 const ensureArtifact = require('../lib/utils/ensureArtifact');
 const resolveLocalServerless = require('../lib/cli/resolve-local-serverless-path');

From f8f3bcfe73b1427533e2509ba16038dbaf49d7ea Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 20 Oct 2021 10:12:34 +0200
Subject: [PATCH 0643/1101] test: Ensure complete stack traces for `fs.mkdir`

---
 test/mochaPatch.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/mochaPatch.js b/test/mochaPatch.js
index 6455fddabb9..5507a5d438d 100644
--- a/test/mochaPatch.js
+++ b/test/mochaPatch.js
@@ -37,8 +37,10 @@ const patchCallback = (name) => {
     }
   );
 };
+patchPromised('mkdir');
 patchPromised('open');
 patchPromised('readFile');
+patchCallback('mkdir');
 patchCallback('open');
 patchCallback('readFile');
 

From 1c105a4c16e8bdca9fc66c5eddf12153ebc9a1fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Bour=C3=A9?= <benoit.boure@gmail.com>
Date: Wed, 20 Oct 2021 10:47:33 +0200
Subject: [PATCH 0644/1101] fix(AWS EventBridge): Allow intrinsic functions in
 `pattern` (#10120)

---
 lib/plugins/aws/package/compile/events/eventBridge/index.js     | 2 +-
 .../aws/package/compile/events/eventBridge/index.test.js        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/eventBridge/index.js b/lib/plugins/aws/package/compile/events/eventBridge/index.js
index d5a6963fceb..ba84218faf1 100644
--- a/lib/plugins/aws/package/compile/events/eventBridge/index.js
+++ b/lib/plugins/aws/package/compile/events/eventBridge/index.js
@@ -400,7 +400,7 @@ class AwsCompileEventBridgeEvents {
       Properties: {
         // default event bus is used when EventBusName is not set
         EventBusName: eventBusName === 'default' ? undefined : eventBusName,
-        EventPattern: JSON.stringify(Pattern),
+        EventPattern: Pattern,
         Name: RuleName,
         ScheduleExpression: Schedule,
         State,
diff --git a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
index 4557c072e60..08f7bbc49ee 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
@@ -510,7 +510,7 @@ describe('EventBridgeEvents', () => {
       });
 
       it('should correctly set EventPattern on a created rule', () => {
-        expect(ruleResource.Properties.EventPattern).to.deep.equal(JSON.stringify(pattern));
+        expect(ruleResource.Properties.EventPattern).to.deep.equal(pattern);
       });
 
       it('should correctly set Input on the target for the created rule', () => {

From 6d54e4976a2b22783bb3bd7132c0326901ce622b Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 20 Oct 2021 10:44:54 +0200
Subject: [PATCH 0645/1101] test(AWS RabbitMQ): Temporarily skip integration
 test

---
 commitlint.config.js                                  | 1 +
 test/integration/aws/infra-dependent/rabbitmq.test.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/commitlint.config.js b/commitlint.config.js
index e7ec04f620e..59fb85a7521 100644
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -32,6 +32,7 @@ module.exports = {
         'AWS Layers',
         'AWS Local Invocation',
         'AWS MSK',
+        'AWS RabbitMQ',
         'AWS S3',
         'AWS Schedule',
         'AWS SNS',
diff --git a/test/integration/aws/infra-dependent/rabbitmq.test.js b/test/integration/aws/infra-dependent/rabbitmq.test.js
index 2c5c7a30c33..c482e1fd86d 100644
--- a/test/integration/aws/infra-dependent/rabbitmq.test.js
+++ b/test/integration/aws/infra-dependent/rabbitmq.test.js
@@ -14,7 +14,7 @@ const awsRequest = require('@serverless/test/aws-request');
 const crypto = require('crypto');
 const { deployService, removeService } = require('../../../utils/integration');
 
-describe('AWS - RabbitMQ Integration Test', function () {
+describe.skip('AWS - RabbitMQ Integration Test', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
   let stackName;
   let serviceDir;

From a86dd885d4036784235e27b7bb54423952356e05 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 20 Oct 2021 10:45:23 +0200
Subject: [PATCH 0646/1101] test(AWS ActiveMQ): Temporarily skip integration
 test

---
 test/integration/aws/infra-dependent/activemq.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/aws/infra-dependent/activemq.test.js b/test/integration/aws/infra-dependent/activemq.test.js
index 0f51558d67c..22e8568a2a7 100644
--- a/test/integration/aws/infra-dependent/activemq.test.js
+++ b/test/integration/aws/infra-dependent/activemq.test.js
@@ -14,7 +14,7 @@ const awsRequest = require('@serverless/test/aws-request');
 const crypto = require('crypto');
 const { deployService, removeService } = require('../../../utils/integration');
 
-describe('AWS - Active MQ Integration Test', function () {
+describe.skip('AWS - Active MQ Integration Test', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
   let stackName;
   let serviceDir;

From 8799b97ec31acb6e7ee1e7b8a41e14366517d6a1 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 20 Oct 2021 12:20:20 +0200
Subject: [PATCH 0647/1101] chore: Bump dependencies

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index b079c3f13a2..be936338506 100644
--- a/package.json
+++ b/package.json
@@ -26,11 +26,11 @@
     "@serverless/components": "^3.17.1",
     "@serverless/dashboard-plugin": "^5.5.0",
     "@serverless/platform-client": "^4.3.0",
-    "@serverless/utils": "^5.18.0",
+    "@serverless/utils": "^5.19.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.1008.0",
+    "aws-sdk": "^2.1011.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.1.2",
     "cachedir": "^2.3.0",
@@ -105,7 +105,7 @@
     "semver-regex": "^3.1.3",
     "sinon": "^11.1.2",
     "sinon-chai": "^3.7.0",
-    "standard-version": "^9.3.1",
+    "standard-version": "^9.3.2",
     "ws": "^7.5.5",
     "xml2js": "^0.4.23"
   },

From 3e19547608bfbee6af50b5cee1f3af15eabc3650 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 20 Oct 2021 12:31:25 +0200
Subject: [PATCH 0648/1101] chore: Release v2.64.0

---
 CHANGELOG.md | 23 +++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76ee529f09b..738ed45a575 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,29 @@
 
 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.
 
+## [2.64.0](https://github.com/serverless/serverless/compare/v2.63.0...v2.64.0) (2021-10-20)
+
+### Features
+
+- **AWS RabbitMQ:** Support for Amazon MQ RabbitMQ events ([#9919](https://github.com/serverless/serverless/issues/9919)) ([a3edecf](https://github.com/serverless/serverless/commit/a3edecf0c6b4e066bde2de8095582432d9fdd635)) ([Michael](https://github.com/liegeandlief))
+
+### Bug Fixes
+
+- **AWS Deploy:** Recognize `LogicalResourceId` in `stackPolicy` ([#10097](https://github.com/serverless/serverless/pull/10097)) ([1a528c2](https://github.com/serverless/serverless/commit/1a528c2cc0746bfe6a692183f96b0831e3dd92f4)) ([Monsma](https://github.com/jmonsma))
+- **AWS EventBridge:** Allow intrinsic functions in `pattern` ([#10120](https://github.com/serverless/serverless/issues/10120)) ([1c105a4](https://github.com/serverless/serverless/commit/1c105a4c16e8bdca9fc66c5eddf12153ebc9a1fb)) ([Benoît Bouré](https://github.com/bboure))
+- **CLI:** Ensure command validation for service independent commands ([#10115](https://github.com/serverless/serverless/pull/10115)) ([6022fb9](https://github.com/serverless/serverless/commit/6022fb98331e8f7d8893a28d3dcb20d91d0a1e20)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Packaging:** Ensure to show deprecation in all cases ([#10111](https://github.com/serverless/serverless/pull/10111)) ([cc71fc9](https://github.com/serverless/serverless/commit/cc71fc99ffe2e1f2fcc764b29dafa197c665cef1)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **CLI:**
+  - Support `decoratedMessage` on `ServerlessError` ([#10112](https://github.com/serverless/serverless/pull/10112)) ([2217158](https://github.com/serverless/serverless/commit/2217158764dde8ceee472292b531836ada20d79a)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Enhanced modern error reporting for CloudFormation ([#10112](https://github.com/serverless/serverless/pull/10112)) ([cfd828e](https://github.com/serverless/serverless/commit/cfd828ece872b572cbb46670437e8196f2200903)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Report `credentials` source in modern error output ([#10114](https://github.com/serverless/serverless/pull/10114)) ([b4ff87d](https://github.com/serverless/serverless/commit/b4ff87dc81286b8123830f20bccfb3aa320e4ccd)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Improve style for local fallback modern notice ([#10111](https://github.com/serverless/serverless/pull/10111)) ([73c071b](https://github.com/serverless/serverless/commit/73c071b060216d330974a2f98917eba315eb634b)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Introduce `doctor` command for modern handling of deprecations ([#10115](https://github.com/serverless/serverless/pull/10115)) ([452e234](https://github.com/serverless/serverless/commit/452e234306a3703e95ad349305e1e211c165bf22)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Do not filter commands by `lifecycleEvents` for help ([#10115](https://github.com/serverless/serverless/pull/10115)) ([6991d66](https://github.com/serverless/serverless/commit/6991d66987d6276665bff07259bf1ca464ffeab7)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ## [2.63.0](https://github.com/serverless/serverless/compare/v2.62.0...v2.63.0) (2021-10-15)
 
 ### Features
diff --git a/package.json b/package.json
index be936338506..65d3971a826 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.63.0",
+  "version": "2.64.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From a0306365fc2c18c04698640723db2f4efeb34e2f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 20 Oct 2021 15:53:21 +0200
Subject: [PATCH 0649/1101] fix(CLI): Handle gently case where temp folder is
 on other device

---
 lib/utils/logDeprecation.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/utils/logDeprecation.js b/lib/utils/logDeprecation.js
index 143ccc0cb84..f9d84c492e1 100644
--- a/lib/utils/logDeprecation.js
+++ b/lib/utils/logDeprecation.js
@@ -8,6 +8,7 @@ const weakMemoizee = require('memoizee/weak');
 const _ = require('lodash');
 const resolveTmpdir = require('process-utils/tmpdir');
 const ServerlessError = require('../serverless-error');
+const safeMoveFile = require('./fs/safeMoveFile');
 const { style, legacy, log } = require('@serverless/utils/log');
 const healthStatusFilename = require('./health-status-filename');
 
@@ -162,7 +163,7 @@ module.exports.printSummary = async () => {
       fse.ensureDir(path.dirname(healthStatusFilename)),
       fsp.writeFile(tmpHealthStatusFilename, healthStatus.join('\n')),
     ]);
-    await fsp.rename(tmpHealthStatusFilename, healthStatusFilename);
+    await safeMoveFile(tmpHealthStatusFilename, healthStatusFilename);
 
     if (bufferedDeprecations.length === 1) {
       const { code, message } = bufferedDeprecations[0];

From 2d6740e71c4be39b8670d936ecc27e03e6bf1eac Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 20 Oct 2021 16:20:08 +0200
Subject: [PATCH 0650/1101] chore: Release v2.64.1

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 738ed45a575..1806b58bccb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 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.
 
+### [2.64.1](https://github.com/serverless/serverless/compare/v2.64.0...v2.64.1) (2021-10-20)
+
+### Bug Fixes
+
+- **CLI:** Handle gently case where temp folder is on other device ([#10124](https://github.com/serverless/serverless/issues/10124)) ([a030636](https://github.com/serverless/serverless/commit/a0306365fc2c18c04698640723db2f4efeb34e2f)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ## [2.64.0](https://github.com/serverless/serverless/compare/v2.63.0...v2.64.0) (2021-10-20)
 
 ### Features
diff --git a/package.json b/package.json
index 65d3971a826..65abb08711c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.64.0",
+  "version": "2.64.1",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 204f2051f6a5ca5f046eb905292dfae0c597e33f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 21 Oct 2021 11:59:51 +0200
Subject: [PATCH 0651/1101] fix(CLI): Fix resolution of help for not integrated
 commands

---
 scripts/serverless.js                | 2 +-
 test/unit/scripts/serverless.test.js | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index 7d52890a45e..ff89beab7b1 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -513,7 +513,7 @@ const processSpanPromise = (async () => {
 
     const isStandaloneCommand = notIntegratedCommands.has(command);
 
-    if (isInteractiveSetup || isStandaloneCommand) {
+    if (!isHelpRequest && (isInteractiveSetup || isStandaloneCommand)) {
       if (configuration) require('../lib/cli/ensure-supported-command')(configuration);
       if (isInteractiveSetup) {
         if (!process.stdin.isTTY && !process.env.SLS_INTERACTIVE_SETUP_ENABLE) {
diff --git a/test/unit/scripts/serverless.test.js b/test/unit/scripts/serverless.test.js
index 89e711a0b73..064afd69de7 100644
--- a/test/unit/scripts/serverless.test.js
+++ b/test/unit/scripts/serverless.test.js
@@ -236,6 +236,14 @@ describe('test/unit/scripts/serverless.test.js', () => {
     expect(output).to.include('stage');
   });
 
+  it('should print not integrated command --help to stdout', async () => {
+    const output = String(
+      (await spawn('node', [serverlessPath, 'plugin', 'install', '--help'])).stdoutBuffer
+    );
+    expect(output).to.include('plugin install');
+    expect(output).to.include('stage');
+  });
+
   it('should print interactive setup help to stdout', async () => {
     const output = String(
       (await spawn('node', [serverlessPath, '--help-interactive'])).stdoutBuffer

From 7cfddff31433582ac031be0a168eba2d356d7ee9 Mon Sep 17 00:00:00 2001
From: ROSeaboyer <ryan.seaboyer@icloud.com>
Date: Thu, 21 Oct 2021 09:06:54 -0300
Subject: [PATCH 0652/1101] feat(AWS Lambda): Support CF funcs at
 `functions[].reservedConcurrency`

(PR #10129)
---
 lib/plugins/aws/provider.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 1ef2bd533ef..f8a92026919 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -14,6 +14,7 @@ const path = require('path');
 const spawnExt = require('child-process-ext/spawn');
 const ServerlessError = require('../../serverless-error');
 const awsRequest = require('../../aws/request');
+const { cfValue } = require('../../utils/aws-schema-get-cf-value');
 const deepSortObjectByKey = require('../../utils/deepSortObjectByKey');
 const { progress, legacy, log } = require('@serverless/utils/log');
 
@@ -1270,7 +1271,7 @@ class AwsProvider {
               additionalProperties: false,
             },
             provisionedConcurrency: { type: 'integer', minimum: 1 },
-            reservedConcurrency: { type: 'integer', minimum: 0 },
+            reservedConcurrency: cfValue({ type: 'integer', minimum: 0 }),
             role: { $ref: '#/definitions/awsLambdaRole' },
             runtime: { $ref: '#/definitions/awsLambdaRuntime' },
             tags: { $ref: '#/definitions/awsResourceTags' },

From 889e1be58c396b7139498b6e10b561f10bb450b3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 22 Oct 2021 13:06:02 +0200
Subject: [PATCH 0653/1101] ci: Simplify commit range resolution

---
 .github/workflows/integrate.yml | 32 ++++----------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
index 47ca553a92a..d0ed62df4cf 100644
--- a/.github/workflows/integrate.yml
+++ b/.github/workflows/integrate.yml
@@ -15,20 +15,6 @@ jobs:
     name: '[Linux] Node.js 14: Publish canary, Unit & packaging tests '
     runs-on: ubuntu-latest
     steps:
-      - name: Resolve last validated commit hash (for `git diff` purposes)
-        env:
-          # See https://github.com/serverlessinc/setup-cicd-resources
-          GET_LAST_VALIDATED_COMMIT_HASH_URL: ${{ secrets.GET_LAST_VALIDATED_COMMIT_HASH_URL }}
-          PUT_LAST_VALIDATED_COMMIT_HASH_URL: ${{ secrets.PUT_LAST_VALIDATED_COMMIT_HASH_URL }}
-        run: |
-          curl -f "$GET_LAST_VALIDATED_COMMIT_HASH_URL" -o /home/runner/last-validated-commit-hash || :
-          curl -X PUT -H "User-Agent:" -H "Accept:" -H "Content-Type:" -d "$GITHUB_SHA" "$PUT_LAST_VALIDATED_COMMIT_HASH_URL"
-      - name: Store last validated commit hash (as it's to be used in other job)
-        uses: actions/upload-artifact@v2
-        with:
-          name: last-validated-commit-hash
-          path: /home/runner/last-validated-commit-hash
-
       - name: Checkout repository
         uses: actions/checkout@v2
 
@@ -249,21 +235,11 @@ jobs:
       - name: Full integration tests against standalone binary
         run: npm run integration-test-run-all
 
-      - name: Resolve last validated commit hash (for `git diff` purposes)
-        uses: actions/download-artifact@v2
-        continue-on-error: true
-        with:
-          name: last-validated-commit-hash
-          path: /home/runner
       - name: Tag if new version
         run: |
-          LAST_VALIDATED_COMMIT_HASH=`cat /home/runner/last-validated-commit-hash` || :
-          if [ -n "$LAST_VALIDATED_COMMIT_HASH" ];
+          NEW_VERSION=`git diff -U0 ${{ github.event.before }} package.json | grep '"version": "' | tail -n 1 | grep -oE "[0-9]+\.[0-9]+\.[0-9]+"` || :
+          if [ -n "$NEW_VERSION" ];
           then
-            NEW_VERSION=`git diff -U0 $LAST_VALIDATED_COMMIT_HASH package.json | grep '"version": "' | tail -n 1 | grep -oE "[0-9]+\.[0-9]+\.[0-9]+"` || :
-            if [ -n "$NEW_VERSION" ];
-            then
-              git tag v$NEW_VERSION
-              git push --tags
-            fi
+            git tag v$NEW_VERSION
+            git push --tags
           fi

From bf62b7c4dabbecc892fde4d0d988dc2dd2cb7461 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 22 Oct 2021 13:11:36 +0200
Subject: [PATCH 0654/1101] feat(AWS EventBridge): Adjust deprecation of
 deployment method

---
 docs/deprecations.md                          |  4 +++-
 .../compile/events/eventBridge/index.js       |  4 ++--
 lib/plugins/aws/provider.js                   |  2 +-
 .../compile/events/eventBridge/index.test.js  | 21 ++++++++++++++++++-
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index dfcad7dfeb1..8ceae7e5224 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -188,10 +188,12 @@ Starting with v3.0.0, `http.request.schema` property will be replaced by `http.r
 
 Deprecation code: `AWS_EVENT_BRIDGE_CUSTOM_RESOURCE`
 
-Starting with v3.0.0 AWS EventBridge lambda event triggers and all associated EventBridge resources will be deployed using native CloudFormation resources instead of a custom resource that used a lambda to deploy them via the AWS SDK/API.
+Starting with v3.0.0, AWS EventBridge lambda event triggers and all associated EventBridge resources will be, by default, deployed using native CloudFormation resources instead of a custom resource that used a lambda to deploy them via the AWS SDK/API.
 
 Adapt to this behavior now by setting `provider.eventBridge.useCloudFormation: true`.
 
+If you want to keep using the old deployment method for your AWS EventBridge resources, set `provider.eventBridge.useCloudFormation: false` instead.
+
 <a name="NEW_VARIABLES_RESOLVER"><div>&nbsp;</div></a>
 
 ## New variables resolver
diff --git a/lib/plugins/aws/package/compile/events/eventBridge/index.js b/lib/plugins/aws/package/compile/events/eventBridge/index.js
index ba84218faf1..5910bde37d3 100644
--- a/lib/plugins/aws/package/compile/events/eventBridge/index.js
+++ b/lib/plugins/aws/package/compile/events/eventBridge/index.js
@@ -13,14 +13,14 @@ class AwsCompileEventBridgeEvents {
 
     this.hooks = {
       'initialize': () => {
-        if (!_.get(this.serverless.service.provider, 'eventBridge.useCloudFormation')) {
+        if (_.get(this.serverless.service.provider, 'eventBridge.useCloudFormation') == null) {
           const hasFunctionsWithEventBridgeTrigger = Object.values(
             this.serverless.service.functions
           ).some(({ events }) => events.some(({ eventBridge }) => eventBridge));
           if (hasFunctionsWithEventBridgeTrigger) {
             this.serverless._logDeprecation(
               'AWS_EVENT_BRIDGE_CUSTOM_RESOURCE',
-              'AWS EventBridge resources are not being created using native CloudFormation, this is now possible and the use of custom resources is deprecated. Set `eventBridge.useCloudFormation: true` as a provider property to use this now.'
+              'Starting with "v3.0.0", AWS EventBridge resources will be created using native CloudFormation resources by default. It is possible to use that functionality now by setting "eventBridge.useCloudFormation: true" as provider property in your configuration. If you want to keep using the old creation method, set that property to "false" to hide this deprecation message.'
             );
           }
         }
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index f8a92026919..4703b9ded04 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -851,7 +851,7 @@ class AwsProvider {
             eventBridge: {
               type: 'object',
               properties: {
-                useCloudFormation: { const: true },
+                useCloudFormation: { type: 'boolean' },
               },
               additionalProperties: false,
             },
diff --git a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
index 08f7bbc49ee..cfd7d2bb0d8 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
@@ -163,8 +163,12 @@ describe('EventBridgeEvents', () => {
       const { cfTemplate, awsNaming } = await runServerless({
         fixture: 'function',
         configExt: {
-          disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE'],
           ...serverlessConfigurationExtension,
+          provider: {
+            eventBridge: {
+              useCloudFormation: false,
+            },
+          },
         },
         command: 'package',
       });
@@ -364,6 +368,21 @@ describe('EventBridgeEvents', () => {
         'ERROR_INVALID_REFERENCE_TO_EVENT_BUS_CUSTOM_RESOURCE'
       );
     });
+
+    it('should emit deprecation when `eventBridge.useCloudFormation` is not explicitly set', async () => {
+      await expect(
+        runServerless({
+          fixture: 'function',
+          configExt: {
+            ...serverlessConfigurationExtension,
+          },
+          command: 'package',
+        })
+      ).to.be.eventually.rejected.and.have.property(
+        'code',
+        'REJECTED_DEPRECATION_AWS_EVENT_BRIDGE_CUSTOM_RESOURCE'
+      );
+    });
   });
 
   describe('using native CloudFormation', () => {

From b7a634974dc2ee138d85ec58609bf2559c5de9f6 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 22 Oct 2021 14:44:52 +0200
Subject: [PATCH 0655/1101] fix: Recognize accessible configuration parts on
 validation errors

---
 lib/classes/Service.js | 126 ++++++++++++++++++++++-------------------
 1 file changed, 67 insertions(+), 59 deletions(-)

diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index 12241b4603b..c33025c8c16 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -57,61 +57,6 @@ class Service {
     this.serviceFilename = this.serverless.configurationFilename;
 
     const configurationInput = this.serverless.configurationInput;
-    // basic service level validation
-    const version = this.serverless.utils.getVersion();
-    let ymlVersion = configurationInput.frameworkVersion;
-    if (ymlVersion && !semver.validRange(ymlVersion)) {
-      if (configurationInput.configValidationMode === 'error') {
-        throw new ServerlessError(
-          'Configured "frameworkVersion" does not represent a valid semver version range.',
-          'INVALID_FRAMEWORK_VERSION'
-        );
-      }
-      logWarning(
-        'Configured "frameworkVersion" does not represent a valid semver version range, version validation is skipped'
-      );
-      log.warning(
-        'Configured "frameworkVersion" does not represent a valid semver version range, version validation is skipped'
-      );
-      ymlVersion = null;
-    }
-    if (!this.isLocallyInstalled && !ymlVersion) {
-      log.info(
-        'To ensure safe major version upgrades ensure "frameworkVersion" setting in ' +
-          'service configuration ' +
-          `(recommended setup: "frameworkVersion: ^${currentVersion}")\n`
-      );
-      if (process.env.SLS_DEBUG) {
-        legacy.log(
-          'To ensure safe major version upgrades ensure "frameworkVersion" setting in ' +
-            'service configuration ' +
-            `(recommended setup: "frameworkVersion: ^${currentVersion}")\n`
-        );
-      }
-    }
-    if (
-      ymlVersion &&
-      version !== ymlVersion &&
-      !semver.satisfies(semver.coerce(version).raw, ymlVersion)
-    ) {
-      const errorMessage = [
-        `The Serverless version (${version}) does not satisfy the`,
-        ` "frameworkVersion" (${ymlVersion}) in ${this.serverless.configurationFilename}`,
-      ].join('');
-      throw new ServerlessError(errorMessage, 'FRAMEWORK_VERSION_MISMATCH');
-    }
-    if (!configurationInput.service) {
-      throw new ServerlessError(
-        `"service" property is missing in ${this.serverless.configurationFilename}`,
-        'SERVICE_NAME_MISSING'
-      );
-    }
-    if (!configurationInput.provider) {
-      throw new ServerlessError(
-        `"provider" property is missing in ${this.serverless.configurationFilename}`,
-        'PROVIDER_NAME_MISSING'
-      );
-    }
 
     this.initialServerlessConfig = configurationInput;
 
@@ -134,14 +79,15 @@ class Service {
     //              `provider.stage` are read by dashboard plugin)
     if (!_.isObject(configurationInput.provider)) {
       const providerName = configurationInput.provider;
-      configurationInput.provider = {
+      this.provider = {
         name: providerName,
       };
+    } else {
+      this.provider = configurationInput.provider;
     }
-    if (configurationInput.provider.stage == null) {
-      configurationInput.provider.stage = 'dev';
+    if (this.provider.stage == null) {
+      this.provider.stage = 'dev';
     }
-    this.provider = configurationInput.provider;
 
     // `service` (read by dashboard plugin)
     if (_.isObject(configurationInput.service)) {
@@ -181,6 +127,68 @@ class Service {
     }
     this.outputs = configurationInput.outputs;
 
+    // basic service level validation
+    const version = this.serverless.utils.getVersion();
+    let ymlVersion = configurationInput.frameworkVersion;
+    if (ymlVersion && !semver.validRange(ymlVersion)) {
+      if (configurationInput.configValidationMode === 'error') {
+        throw new ServerlessError(
+          'Configured "frameworkVersion" does not represent a valid semver version range.',
+          'INVALID_FRAMEWORK_VERSION'
+        );
+      }
+      logWarning(
+        'Configured "frameworkVersion" does not represent a valid semver version range, version validation is skipped'
+      );
+      log.warning(
+        'Configured "frameworkVersion" does not represent a valid semver version range, version validation is skipped'
+      );
+      ymlVersion = null;
+    }
+    if (!this.isLocallyInstalled && !ymlVersion) {
+      log.info(
+        'To ensure safe major version upgrades ensure "frameworkVersion" setting in ' +
+          'service configuration ' +
+          `(recommended setup: "frameworkVersion: ^${currentVersion}")\n`
+      );
+      if (process.env.SLS_DEBUG) {
+        legacy.log(
+          'To ensure safe major version upgrades ensure "frameworkVersion" setting in ' +
+            'service configuration ' +
+            `(recommended setup: "frameworkVersion: ^${currentVersion}")\n`
+        );
+      }
+    }
+    if (
+      ymlVersion &&
+      version !== ymlVersion &&
+      !semver.satisfies(semver.coerce(version).raw, ymlVersion)
+    ) {
+      const errorMessage = [
+        `The Serverless version (${version}) does not satisfy the`,
+        ` "frameworkVersion" (${ymlVersion}) in ${this.serverless.configurationFilename}`,
+      ].join('');
+      throw new ServerlessError(errorMessage, 'FRAMEWORK_VERSION_MISMATCH');
+    }
+    if (!configurationInput.service) {
+      throw new ServerlessError(
+        `"service" property is missing in ${this.serverless.configurationFilename}`,
+        'SERVICE_NAME_MISSING'
+      );
+    }
+    if (!configurationInput.provider) {
+      throw new ServerlessError(
+        `"provider" property is missing in ${this.serverless.configurationFilename}`,
+        'PROVIDER_NAME_MISSING'
+      );
+    }
+    if (!_.isObject(configurationInput.provider)) {
+      // Schema uncoditionally expects `provider` to be an object.
+      // Ideally if it's fixed at some point, and either we do not support string notation for
+      // provider, or we support string by schema
+      configurationInput.provider = this.provider;
+    }
+
     return this;
   }
 

From 39bdea07500b8fb814a5cce83ec6f78a0c75006c Mon Sep 17 00:00:00 2001
From: Mars Lan <mars.th.lan@gmail.com>
Date: Mon, 25 Oct 2021 04:27:13 -0700
Subject: [PATCH 0656/1101] fix(AWS Deploy): Fix handling of deployment bucket
 extensions (#10137)

---
 README.md                                     |  6 ++---
 .../aws/package/lib/generateCoreTemplate.js   | 27 +++++++------------
 .../package/lib/generateCoreTemplate.test.js  | 27 ++++---------------
 3 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/README.md b/README.md
index fd36e1a393d..8d1a8279367 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
 
 **The Serverless Framework** – Build applications on AWS Lambda and other next-gen cloud services, that auto-scale and only charge you when they run. This lowers the total cost of running and operating your apps, enabling you to build more and manage less.
 
-The Serverless Framework is a command-line tool that uses easy and approachable YAML syntax to deploy both your code and cloud infrastructure needed to make tons of serverless application use-cases.  It's a multi-language framework that supports Node.js, Typescript, Python, Go, Java, and more.  It's also completely extensible via over 1,000 plugins that can add more serverless use-cases and workflows to the Framework.
+The Serverless Framework is a command-line tool that uses easy and approachable YAML syntax to deploy both your code and cloud infrastructure needed to make tons of serverless application use-cases. It's a multi-language framework that supports Node.js, Typescript, Python, Go, Java, and more. It's also completely extensible via over 1,000 plugins that can add more serverless use-cases and workflows to the Framework.
 
 Actively maintained by [Serverless Inc](https://www.serverless.com).
 
@@ -37,11 +37,11 @@ npm install -g serverless
 
 ### Set Up Your AWS Account Credentials.
 
-The Serverless Framework deploys to your own AWS account.  You'll need to enable Serverless Framework to deploy to your AWS account by giving it access. [Here is a guide to help you set up your credentials securely](https://www.serverless.com/framework/docs/providers/aws/guide/credentials)
+The Serverless Framework deploys to your own AWS account. You'll need to enable Serverless Framework to deploy to your AWS account by giving it access. [Here is a guide to help you set up your credentials securely](https://www.serverless.com/framework/docs/providers/aws/guide/credentials)
 
 ### Create A Service:
 
-A "Service" is the Framework's project or app concept.  You can create one from scratch or select an existing template by running...
+A "Service" is the Framework's project or app concept. You can create one from scratch or select an existing template by running...
 
 ```bash
 serverless
diff --git a/lib/plugins/aws/package/lib/generateCoreTemplate.js b/lib/plugins/aws/package/lib/generateCoreTemplate.js
index 38744f3f8cb..46e54bd1b5b 100644
--- a/lib/plugins/aws/package/lib/generateCoreTemplate.js
+++ b/lib/plugins/aws/package/lib/generateCoreTemplate.js
@@ -45,29 +45,22 @@ module.exports = {
 
       // enable S3 block public access for deployment bucket
       if (deploymentBucketObject.blockPublicAccess) {
-        Object.assign(
-          this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
-            deploymentBucketLogicalId
-          ].Properties,
-          {
-            PublicAccessBlockConfiguration: {
-              BlockPublicAcls: true,
-              BlockPublicPolicy: true,
-              IgnorePublicAcls: true,
-              RestrictPublicBuckets: true,
-            },
-          }
-        );
+        this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
+          deploymentBucketLogicalId
+        ].Properties.PublicAccessBlockConfiguration = {
+          BlockPublicAcls: true,
+          BlockPublicPolicy: true,
+          IgnorePublicAcls: true,
+          RestrictPublicBuckets: true,
+        };
       }
 
       // enable S3 bucket versioning
       if (deploymentBucketObject.versioning) {
         this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
           deploymentBucketLogicalId
-        ].Properties = {
-          VersioningConfiguration: {
-            Status: 'Enabled',
-          },
+        ].Properties.VersioningConfiguration = {
+          Status: 'Enabled',
         };
       }
 
diff --git a/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js b/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js
index 8a1c9863d23..86b791c3380 100644
--- a/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js
@@ -72,7 +72,7 @@ describe('#generateCoreTemplate()', () => {
     });
   });
 
-  it('should enable S3 Block Public Access if specified', () =>
+  it('should enable S3 Block Public Access & versioning if specified', () =>
     runServerless({
       config: {
         service: 'irrelevant',
@@ -80,6 +80,7 @@ describe('#generateCoreTemplate()', () => {
           name: 'aws',
           deploymentBucket: {
             blockPublicAccess: true,
+            versioning: true,
           },
         },
       },
@@ -92,30 +93,12 @@ describe('#generateCoreTemplate()', () => {
           IgnorePublicAcls: true,
           RestrictPublicBuckets: true,
         },
+        VersioningConfiguration: {
+          Status: 'Enabled',
+        },
       });
     }));
 
-  it('should enable S3 bucket versioning if specified', async () => {
-    const { cfTemplate } = await runServerless({
-      config: {
-        service: 'irrelevant',
-        provider: {
-          name: 'aws',
-          deploymentBucket: {
-            versioning: true,
-          },
-        },
-      },
-      command: 'package',
-    });
-
-    expect(cfTemplate.Resources.ServerlessDeploymentBucket.Properties).to.deep.include({
-      VersioningConfiguration: {
-        Status: 'Enabled',
-      },
-    });
-  });
-
   it('should add resource tags to the bucket if present', () =>
     runServerless({
       config: {

From 415bdefca092e60cacd867006bacddfda231ed94 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 22 Oct 2021 12:37:26 +0200
Subject: [PATCH 0657/1101] perf(CLI): Integrate CLI triage into this package

---
 bin/serverless.js                             |  35 ++--
 lib/cli/triage.js                             | 190 ++++++++++++++++++
 .../cli/js/component/serverless.js            |   3 +
 .../@serverless/cli/js/function/serverless.js |   3 +
 .../cli/json/component/serverless.json        |   3 +
 .../cli/yml/component/serverless.yml          |   2 +
 .../js/template/foo/instance/serverless.js    |   3 +
 .../components/js/template/foo/serverless.js  |   3 +
 .../json/component/serverless.component.json  |   1 +
 .../components/json/instance/serverless.json  |   3 +
 .../json/template/foo/serverless.json         |   1 +
 .../yml/component/serverless.component.yaml   |   1 +
 .../components/yml/instance/serverless.yml    |   1 +
 .../yml/template/foo/serverless.yml           |   1 +
 .../js/component-in-custom/serverless.js      |   3 +
 .../serverless/js/projects/bar/serverless.yml |   3 +
 .../serverless/js/projects/foo/serverless.js  |   3 +
 .../json/component-in-custom/serverless.json  |   1 +
 .../json/projects/bar/serverless.yml          |   3 +
 .../json/projects/foo/serverless.json         |   1 +
 .../fixtures/serverless/ts/any/serverless.ts  |   3 +
 .../yml/component-in-custom/serverless.yml    |   7 +
 .../yml/projects/bar/serverless.yml           |   3 +
 .../yml/projects/foo/serverless.yml           |   1 +
 test/unit/lib/cli/triage/index.test.js        | 115 +++++++++++
 25 files changed, 374 insertions(+), 19 deletions(-)
 create mode 100644 lib/cli/triage.js
 create mode 100644 test/unit/lib/cli/triage/fixtures/@serverless/cli/js/component/serverless.js
 create mode 100644 test/unit/lib/cli/triage/fixtures/@serverless/cli/js/function/serverless.js
 create mode 100644 test/unit/lib/cli/triage/fixtures/@serverless/cli/json/component/serverless.json
 create mode 100644 test/unit/lib/cli/triage/fixtures/@serverless/cli/yml/component/serverless.yml
 create mode 100644 test/unit/lib/cli/triage/fixtures/@serverless/components/js/template/foo/instance/serverless.js
 create mode 100644 test/unit/lib/cli/triage/fixtures/@serverless/components/js/template/foo/serverless.js
 create mode 100644 test/unit/lib/cli/triage/fixtures/@serverless/components/json/component/serverless.component.json
 create mode 100644 test/unit/lib/cli/triage/fixtures/@serverless/components/json/instance/serverless.json
 create mode 100644 test/unit/lib/cli/triage/fixtures/@serverless/components/json/template/foo/serverless.json
 create mode 100644 test/unit/lib/cli/triage/fixtures/@serverless/components/yml/component/serverless.component.yaml
 create mode 100644 test/unit/lib/cli/triage/fixtures/@serverless/components/yml/instance/serverless.yml
 create mode 100644 test/unit/lib/cli/triage/fixtures/@serverless/components/yml/template/foo/serverless.yml
 create mode 100644 test/unit/lib/cli/triage/fixtures/serverless/js/component-in-custom/serverless.js
 create mode 100644 test/unit/lib/cli/triage/fixtures/serverless/js/projects/bar/serverless.yml
 create mode 100644 test/unit/lib/cli/triage/fixtures/serverless/js/projects/foo/serverless.js
 create mode 100644 test/unit/lib/cli/triage/fixtures/serverless/json/component-in-custom/serverless.json
 create mode 100644 test/unit/lib/cli/triage/fixtures/serverless/json/projects/bar/serverless.yml
 create mode 100644 test/unit/lib/cli/triage/fixtures/serverless/json/projects/foo/serverless.json
 create mode 100644 test/unit/lib/cli/triage/fixtures/serverless/ts/any/serverless.ts
 create mode 100644 test/unit/lib/cli/triage/fixtures/serverless/yml/component-in-custom/serverless.yml
 create mode 100644 test/unit/lib/cli/triage/fixtures/serverless/yml/projects/bar/serverless.yml
 create mode 100644 test/unit/lib/cli/triage/fixtures/serverless/yml/projects/foo/serverless.yml
 create mode 100644 test/unit/lib/cli/triage/index.test.js

diff --git a/bin/serverless.js b/bin/serverless.js
index 4fbbf6709ac..572e3f8888c 100755
--- a/bin/serverless.js
+++ b/bin/serverless.js
@@ -31,23 +31,20 @@ if (require('../lib/utils/isStandaloneExecutable')) {
   }
 }
 
-// CLI Triage
-(() => {
-  try {
-    const componentsV1 = require('@serverless/cli');
-    const componentsV2 = require('@serverless/components');
-
-    // Serverless Components v1 CLI (deprecated)
-    if (componentsV1.runningComponents()) return () => componentsV1.runComponents();
-
-    // Serverless Components CLI
-    if (componentsV2.runningComponents()) return () => componentsV2.runComponents();
-  } catch (error) {
-    if (process.env.SLS_DEBUG) {
-      require('../lib/classes/Error').logWarning(`CLI triage crashed with: ${error.stack}`);
-    }
+(async () => {
+  const cliName = await require('../lib/cli/triage')();
+
+  switch (cliName) {
+    case 'serverless':
+      require('../scripts/serverless');
+      return;
+    case '@serverless/components':
+      require('@serverless/components').runComponents();
+      return;
+    case '@serverless/cli':
+      require('@serverless/cli').runComponents();
+      return;
+    default:
+      throw new Error(`Unrecognized CLI name "${cliName}"`);
   }
-
-  // Serverless Framework CLI
-  return () => require('../scripts/serverless');
-})()();
+})();
diff --git a/lib/cli/triage.js b/lib/cli/triage.js
new file mode 100644
index 00000000000..96c70fac866
--- /dev/null
+++ b/lib/cli/triage.js
@@ -0,0 +1,190 @@
+'use strict';
+
+module.exports = async () => {
+  const cliArgs = new Set(process.argv.slice(2));
+
+  // Unconditionally favor "serverless" for version check
+  if (cliArgs.has('--version')) return 'serverless';
+  if (cliArgs.has('-v')) return 'serverless';
+
+  // Unconditionally favor "@serverless/components" when component specific command or flag
+  const componentsCommands = new Set(['registry', 'init', 'publish']);
+  if (componentsCommands.has(process.argv[2])) return '@serverless/components';
+  if (cliArgs.has('--help-components')) return '@serverless/components';
+  if (cliArgs.has('--target')) return '@serverless/components';
+
+  // Detect eventual component configuration
+  const fsp = require('fs').promises;
+  if (
+    (
+      await Promise.all(
+        ['yml', 'yaml', 'json'].map(async (extension) => {
+          try {
+            await fsp.access(`serverless.component.${extension}`);
+            return true;
+          } catch {
+            return false;
+          }
+        })
+      )
+    ).some(Boolean)
+  ) {
+    return '@serverless/components';
+  }
+
+  // Detect eventual service configuration
+  const configurationExtension =
+    (
+      await Promise.all(
+        ['yml', 'yaml', 'json', 'js', 'ts'].map(async (extension) => {
+          try {
+            await fsp.access(`serverless.${extension}`);
+            return extension;
+          } catch {
+            return null;
+          }
+        })
+      )
+    ).find(Boolean) || null;
+
+  if (configurationExtension) {
+    // Found top level service configuration, recognize CLI by content
+
+    const resolveByObjectConfiguration = (configuration) => {
+      if (configuration.provider) return 'serverless';
+      if (configuration.component) return '@serverless/components';
+      for (const value of Object.values(configuration)) {
+        if (value.component) return '@serverless/cli';
+      }
+      return 'serverless';
+    };
+    switch (configurationExtension) {
+      case 'yml':
+      case 'yaml': {
+        const content = await fsp.readFile(`serverless.${configurationExtension}`, 'utf8');
+        if (content.search(/(?:^|\n)provider\s*:/) !== -1) return 'serverless';
+        if (content.search(/(?:^|\n)component\s*:/) !== -1) return '@serverless/components';
+        if (content.search(/\n\s+component\s*:/) !== -1) return '@serverless/cli';
+        return 'serverless';
+      }
+      case 'json': {
+        const configuration = (() => {
+          try {
+            return require(`${process.cwd()}/serverless.json`);
+          } catch {
+            return null;
+          }
+        })();
+        if (!configuration) return 'serverless';
+        return resolveByObjectConfiguration(configuration);
+      }
+      case 'js': {
+        const configuration = (() => {
+          try {
+            return require(`${process.cwd()}/serverless.js`);
+          } catch {
+            return null;
+          }
+        })();
+        if (!configuration) return 'serverless';
+        if (typeof configuration === 'function') return '@serverless/cli';
+        return resolveByObjectConfiguration(configuration);
+      }
+      case 'ts':
+        return 'serverless';
+      default:
+        throw new Error(`Unrecognized extension "${configurationExtension}"`);
+    }
+  }
+
+  // No top level service configuration
+  const isChinaUser = (() => {
+    if (process.env.SLS_GEO_LOCATION) return process.env.SLS_GEO_LOCATION === 'cn';
+    return new Intl.DateTimeFormat('en', { timeZoneName: 'long' })
+      .format()
+      .includes('China Standard Time');
+  })();
+
+  // If "sls" or "sls deploy" command and in China, force "@serverless/components"
+  if (
+    (process.argv.length === 2 || process.argv[2] === 'deploy') &&
+    (isChinaUser || process.env.SERVERLESS_PLATFORM_VENDOR === 'tencent')
+  ) {
+    return '@serverless/components';
+  }
+
+  // Detect eventual component template
+  const nestedTemplateKeywords = new Set([
+    'deploy',
+    'remove',
+    'info',
+    'help',
+    '--help',
+    'dev',
+    'logs',
+    'invoke',
+    'credentials',
+  ]);
+  if (!nestedTemplateKeywords.has(process.argv[2])) return 'serverless';
+
+  const path = require('path');
+  const detectSubServiceType = async (subDirname) => {
+    const subConfigurationExtension =
+      (
+        await Promise.all(
+          ['yml', 'yaml', 'json', 'js'].map(async (extension) => {
+            try {
+              await fsp.access(path.resolve(subDirname, `serverless.${extension}`));
+              return extension;
+            } catch {
+              return null;
+            }
+          })
+        )
+      ).find(Boolean) || null;
+    if (!subConfigurationExtension) return null;
+    switch (subConfigurationExtension) {
+      case 'yml':
+      case 'yaml': {
+        const content = await fsp.readFile(
+          path.resolve(subDirname, `serverless.${subConfigurationExtension}`),
+          'utf8'
+        );
+        if (content.search(/(?:^|\n)component\s*:/) !== -1) return '@serverless/components';
+        return 'other';
+      }
+      case 'json': {
+        const configuration = (() => {
+          try {
+            return require(`${path.resolve(subDirname)}/serverless.json`);
+          } catch {
+            return null;
+          }
+        })();
+        return configuration && configuration.component ? '@serverless/components' : 'other';
+      }
+      case 'js': {
+        const configuration = (() => {
+          try {
+            return require(`${path.resolve(subDirname)}/serverless.js`);
+          } catch {
+            return null;
+          }
+        })();
+        return configuration && configuration.component ? '@serverless/components' : 'other';
+      }
+      default:
+        throw new Error(`Unrecognized extension "${subConfigurationExtension}"`);
+    }
+  };
+  let hasComponent = false;
+  for (const subDirname of await fsp.readdir('.')) {
+    const stats = await fsp.lstat(subDirname);
+    if (!stats.isDirectory()) continue;
+    const subServiceType = await detectSubServiceType(subDirname);
+    if (!subServiceType) continue;
+    if (subServiceType === '@serverless/components') hasComponent = true;
+    else return 'serverless';
+  }
+  return hasComponent ? '@serverless/components' : 'serverless';
+};
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/cli/js/component/serverless.js b/test/unit/lib/cli/triage/fixtures/@serverless/cli/js/component/serverless.js
new file mode 100644
index 00000000000..216349131bb
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/@serverless/cli/js/component/serverless.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = { foo: { component: 'foo' } };
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/cli/js/function/serverless.js b/test/unit/lib/cli/triage/fixtures/@serverless/cli/js/function/serverless.js
new file mode 100644
index 00000000000..529aa95af4c
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/@serverless/cli/js/function/serverless.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = () => {};
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/cli/json/component/serverless.json b/test/unit/lib/cli/triage/fixtures/@serverless/cli/json/component/serverless.json
new file mode 100644
index 00000000000..20e58a33042
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/@serverless/cli/json/component/serverless.json
@@ -0,0 +1,3 @@
+{
+  "foo": { "component": "foo" }
+}
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/cli/yml/component/serverless.yml b/test/unit/lib/cli/triage/fixtures/@serverless/cli/yml/component/serverless.yml
new file mode 100644
index 00000000000..3f3c5a23c8d
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/@serverless/cli/yml/component/serverless.yml
@@ -0,0 +1,2 @@
+foo:
+  component: foo
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/components/js/template/foo/instance/serverless.js b/test/unit/lib/cli/triage/fixtures/@serverless/components/js/template/foo/instance/serverless.js
new file mode 100644
index 00000000000..b0676f30071
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/@serverless/components/js/template/foo/instance/serverless.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = { component: 'foo' };
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/components/js/template/foo/serverless.js b/test/unit/lib/cli/triage/fixtures/@serverless/components/js/template/foo/serverless.js
new file mode 100644
index 00000000000..b0676f30071
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/@serverless/components/js/template/foo/serverless.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = { component: 'foo' };
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/components/json/component/serverless.component.json b/test/unit/lib/cli/triage/fixtures/@serverless/components/json/component/serverless.component.json
new file mode 100644
index 00000000000..0967ef424bc
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/@serverless/components/json/component/serverless.component.json
@@ -0,0 +1 @@
+{}
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/components/json/instance/serverless.json b/test/unit/lib/cli/triage/fixtures/@serverless/components/json/instance/serverless.json
new file mode 100644
index 00000000000..f3c7bc43068
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/@serverless/components/json/instance/serverless.json
@@ -0,0 +1,3 @@
+{
+  "component": "foo"
+}
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/components/json/template/foo/serverless.json b/test/unit/lib/cli/triage/fixtures/@serverless/components/json/template/foo/serverless.json
new file mode 100644
index 00000000000..5f4c4daba5e
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/@serverless/components/json/template/foo/serverless.json
@@ -0,0 +1 @@
+{ "component": "foo" }
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/components/yml/component/serverless.component.yaml b/test/unit/lib/cli/triage/fixtures/@serverless/components/yml/component/serverless.component.yaml
new file mode 100644
index 00000000000..0967ef424bc
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/@serverless/components/yml/component/serverless.component.yaml
@@ -0,0 +1 @@
+{}
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/components/yml/instance/serverless.yml b/test/unit/lib/cli/triage/fixtures/@serverless/components/yml/instance/serverless.yml
new file mode 100644
index 00000000000..e3e6ecdf9ed
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/@serverless/components/yml/instance/serverless.yml
@@ -0,0 +1 @@
+component: foo
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/components/yml/template/foo/serverless.yml b/test/unit/lib/cli/triage/fixtures/@serverless/components/yml/template/foo/serverless.yml
new file mode 100644
index 00000000000..e3e6ecdf9ed
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/@serverless/components/yml/template/foo/serverless.yml
@@ -0,0 +1 @@
+component: foo
diff --git a/test/unit/lib/cli/triage/fixtures/serverless/js/component-in-custom/serverless.js b/test/unit/lib/cli/triage/fixtures/serverless/js/component-in-custom/serverless.js
new file mode 100644
index 00000000000..1901b327078
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/serverless/js/component-in-custom/serverless.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = { service: 'foo', provider: { name: 'foo' }, custom: { component: 'foo' } };
diff --git a/test/unit/lib/cli/triage/fixtures/serverless/js/projects/bar/serverless.yml b/test/unit/lib/cli/triage/fixtures/serverless/js/projects/bar/serverless.yml
new file mode 100644
index 00000000000..27b360ba434
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/serverless/js/projects/bar/serverless.yml
@@ -0,0 +1,3 @@
+service: foo
+provider:
+  name: any
diff --git a/test/unit/lib/cli/triage/fixtures/serverless/js/projects/foo/serverless.js b/test/unit/lib/cli/triage/fixtures/serverless/js/projects/foo/serverless.js
new file mode 100644
index 00000000000..b0676f30071
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/serverless/js/projects/foo/serverless.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = { component: 'foo' };
diff --git a/test/unit/lib/cli/triage/fixtures/serverless/json/component-in-custom/serverless.json b/test/unit/lib/cli/triage/fixtures/serverless/json/component-in-custom/serverless.json
new file mode 100644
index 00000000000..97fa86a70b5
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/serverless/json/component-in-custom/serverless.json
@@ -0,0 +1 @@
+{ "service": "foo", "provider": { "name": "foo" }, "custom": { "component": "foo" } }
diff --git a/test/unit/lib/cli/triage/fixtures/serverless/json/projects/bar/serverless.yml b/test/unit/lib/cli/triage/fixtures/serverless/json/projects/bar/serverless.yml
new file mode 100644
index 00000000000..27b360ba434
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/serverless/json/projects/bar/serverless.yml
@@ -0,0 +1,3 @@
+service: foo
+provider:
+  name: any
diff --git a/test/unit/lib/cli/triage/fixtures/serverless/json/projects/foo/serverless.json b/test/unit/lib/cli/triage/fixtures/serverless/json/projects/foo/serverless.json
new file mode 100644
index 00000000000..5f4c4daba5e
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/serverless/json/projects/foo/serverless.json
@@ -0,0 +1 @@
+{ "component": "foo" }
diff --git a/test/unit/lib/cli/triage/fixtures/serverless/ts/any/serverless.ts b/test/unit/lib/cli/triage/fixtures/serverless/ts/any/serverless.ts
new file mode 100644
index 00000000000..ee9b714f4db
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/serverless/ts/any/serverless.ts
@@ -0,0 +1,3 @@
+module.exports = {
+  foo: { component: 'foo' },
+};
diff --git a/test/unit/lib/cli/triage/fixtures/serverless/yml/component-in-custom/serverless.yml b/test/unit/lib/cli/triage/fixtures/serverless/yml/component-in-custom/serverless.yml
new file mode 100644
index 00000000000..c3e3f12ab00
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/serverless/yml/component-in-custom/serverless.yml
@@ -0,0 +1,7 @@
+service: foo
+
+provider:
+  name: aws
+
+custom:
+  component: foo
diff --git a/test/unit/lib/cli/triage/fixtures/serverless/yml/projects/bar/serverless.yml b/test/unit/lib/cli/triage/fixtures/serverless/yml/projects/bar/serverless.yml
new file mode 100644
index 00000000000..27b360ba434
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/serverless/yml/projects/bar/serverless.yml
@@ -0,0 +1,3 @@
+service: foo
+provider:
+  name: any
diff --git a/test/unit/lib/cli/triage/fixtures/serverless/yml/projects/foo/serverless.yml b/test/unit/lib/cli/triage/fixtures/serverless/yml/projects/foo/serverless.yml
new file mode 100644
index 00000000000..e3e6ecdf9ed
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/serverless/yml/projects/foo/serverless.yml
@@ -0,0 +1 @@
+component: foo
diff --git a/test/unit/lib/cli/triage/index.test.js b/test/unit/lib/cli/triage/index.test.js
new file mode 100644
index 00000000000..94ff5e81066
--- /dev/null
+++ b/test/unit/lib/cli/triage/index.test.js
@@ -0,0 +1,115 @@
+'use strict';
+
+const { expect } = require('chai');
+const fs = require('fs');
+const overrideCwd = require('process-utils/override-cwd');
+const overrideEnv = require('process-utils/override-env');
+const overrideArgv = require('process-utils/override-argv');
+const path = require('path');
+const triage = require('../../../../../lib/cli/triage');
+
+const fixturesDirname = path.resolve(__dirname, 'fixtures');
+
+describe('test/unit/lib/cli/triage/index.test.js', () => {
+  before(() => overrideEnv({ variables: { SLS_GEO_LOCATION: 'us' } }));
+
+  describe('CLI params', () => {
+    it('should recognize "registry" as "@serverless/components" command', async () =>
+      overrideArgv({ args: ['sls', 'registry'] }, async () => {
+        expect(await triage()).to.equal('@serverless/components');
+      }));
+    it('should recognize "init" as "@serverless/components" command', async () =>
+      overrideArgv({ args: ['sls', 'init'] }, async () => {
+        expect(await triage()).to.equal('@serverless/components');
+      }));
+    it('should recognize "publish" as "@serverless/components" command', async () =>
+      overrideArgv({ args: ['sls', 'publish'] }, async () => {
+        expect(await triage()).to.equal('@serverless/components');
+      }));
+    it('should recognize "--help-components" as "@serverless/components" exclusive flag', async () => {
+      await overrideArgv({ args: ['sls', '--help-components'] }, async () => {
+        expect(await triage()).to.equal('@serverless/components');
+      });
+      await overrideArgv({ args: ['sls', 'any', '--help-components'] }, async () => {
+        expect(await triage()).to.equal('@serverless/components');
+      });
+    });
+
+    it('should recognize "--target" as "@serverless/components" exclusive flag', async () => {
+      await overrideArgv({ args: ['sls', '--target'] }, async () => {
+        expect(await triage()).to.equal('@serverless/components');
+      });
+      await overrideArgv({ args: ['sls', 'any', '--target'] }, async () => {
+        expect(await triage()).to.equal('@serverless/components');
+      });
+    });
+
+    it('should favor "@serverless/components" for bare "sls" command when tencent platform set explicitly', async () =>
+      overrideEnv({ variables: { SERVERLESS_PLATFORM_VENDOR: 'tencent' } }, async () =>
+        overrideArgv({ args: ['sls'] }, async () => {
+          expect(await triage()).to.equal('@serverless/components');
+        })
+      ));
+
+    it('should recognize bare "sls" command in China as "@serverless/components" command', async () =>
+      overrideEnv({ variables: { SLS_GEO_LOCATION: 'cn' } }, async () =>
+        overrideArgv({ args: ['sls'] }, async () => {
+          expect(await triage()).to.equal('@serverless/components');
+        })
+      ));
+
+    it('should unconditionally favor "serverless" for version check', async () =>
+      overrideEnv(
+        { variables: { SERVERLESS_PLATFORM_VENDOR: 'tencent', SLS_GEO_LOCATION: 'cn' } },
+        async () => {
+          await overrideArgv({ args: ['sls', '-v'] }, async () => {
+            expect(await triage()).to.equal('serverless');
+          });
+          await overrideArgv({ args: ['sls', '--version'] }, async () => {
+            expect(await triage()).to.equal('serverless');
+          });
+        }
+      ));
+
+    it('should favor "serverless" in other cases', async () => {
+      await overrideArgv({ args: ['sls', 'print'] }, async () => {
+        expect(await triage()).to.equal('serverless');
+      });
+      await overrideArgv({ args: ['sls', 'deploy'] }, async () => {
+        expect(await triage()).to.equal('serverless');
+      });
+      await overrideArgv({ args: ['sls'] }, async () => {
+        expect(await triage()).to.equal('serverless');
+      });
+      await overrideArgv({ args: ['sls', '--help'] }, async () => {
+        expect(await triage()).to.equal('serverless');
+      });
+    });
+  });
+
+  describe('Service configuration', () => {
+    let restoreArgv;
+    before(() => {
+      ({ restoreArgv } = overrideArgv({ args: ['sls', 'deploy'] }));
+    });
+    after(() => restoreArgv());
+
+    for (const cliName of ['serverless', '@serverless/components', '@serverless/cli']) {
+      for (const extension of fs.readdirSync(path.resolve(fixturesDirname, cliName))) {
+        for (const fixtureName of fs.readdirSync(
+          path.resolve(fixturesDirname, cliName, extension)
+        )) {
+          const testName = `should recognize "${cliName}" at "${cliName}/${extension}/${fixtureName}"`;
+          it(testName, async () =>
+            overrideCwd(
+              path.resolve(fixturesDirname, cliName, extension, fixtureName),
+              async () => {
+                expect(await triage()).to.equal(cliName);
+              }
+            )
+          );
+        }
+      }
+    }
+  });
+});

From 26846d5879d655ffe299db694a33f1f6d187a941 Mon Sep 17 00:00:00 2001
From: Giang Nguyen <giangnm@live.com>
Date: Wed, 27 Oct 2021 18:51:49 +0700
Subject: [PATCH 0658/1101] feat(Templates): Upgrade `azure-nodejs-typescript`
 (#10163)

---
 .../create/templates/azure-nodejs-typescript/package.json       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/create/templates/azure-nodejs-typescript/package.json b/lib/plugins/create/templates/azure-nodejs-typescript/package.json
index 38f54eb901f..f6d2577abc6 100644
--- a/lib/plugins/create/templates/azure-nodejs-typescript/package.json
+++ b/lib/plugins/create/templates/azure-nodejs-typescript/package.json
@@ -15,7 +15,7 @@
     "@azure/functions": "^1.0.3",
     "@types/node": "^13.1.8",
     "fork-ts-checker-webpack-plugin": "^3.0.1",
-    "serverless-azure-functions": "^1.0.0",
+    "serverless-azure-functions": "^2.1.1",
     "serverless-webpack": "^5.3.1",
     "ts-loader": "^6.2.1",
     "typescript": "^3.7.5",

From 44484903b38eaa18c3e3838b8a3f217922a233e5 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 27 Oct 2021 15:31:02 +0200
Subject: [PATCH 0659/1101] refactor(CLI): Improve file size output in logs

---
 lib/plugins/aws/deployFunction.js    |  2 +-
 lib/plugins/aws/info/display.js      |  2 +-
 lib/utils/filesize.js                | 13 +++++++++
 test/unit/lib/utils/filesize.test.js | 42 ++++++++++++++++++++++++++++
 4 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 lib/utils/filesize.js
 create mode 100644 test/unit/lib/utils/filesize.test.js

diff --git a/lib/plugins/aws/deployFunction.js b/lib/plugins/aws/deployFunction.js
index f778312a275..122db864982 100644
--- a/lib/plugins/aws/deployFunction.js
+++ b/lib/plugins/aws/deployFunction.js
@@ -6,7 +6,7 @@ const path = require('path');
 const fs = require('fs');
 const wait = require('timers-ext/promise/sleep');
 const validate = require('./lib/validate');
-const filesize = require('filesize');
+const filesize = require('../../utils/filesize');
 const ServerlessError = require('../../serverless-error');
 const { log, style, legacy, progress } = require('@serverless/utils/log');
 
diff --git a/lib/plugins/aws/info/display.js b/lib/plugins/aws/info/display.js
index 190349bccb4..6d7b67a8057 100644
--- a/lib/plugins/aws/info/display.js
+++ b/lib/plugins/aws/info/display.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const chalk = require('chalk');
-const filesize = require('filesize');
+const filesize = require('../../../utils/filesize');
 const { legacy, isVerboseMode, style } = require('@serverless/utils/log');
 
 module.exports = {
diff --git a/lib/utils/filesize.js b/lib/utils/filesize.js
new file mode 100644
index 00000000000..753417a8a57
--- /dev/null
+++ b/lib/utils/filesize.js
@@ -0,0 +1,13 @@
+'use strict';
+
+const ensureNaturalNumber = require('type/natural-number/ensure');
+const filesize = require('filesize');
+
+const resolveSignificant = (size) => {
+  return size >= 1000 ? resolveSignificant(Math.floor(size / 1000)) : size;
+};
+
+module.exports = (size) =>
+  filesize(size, {
+    round: resolveSignificant(ensureNaturalNumber(size, { name: 'size' })) >= 9 ? 0 : 1,
+  });
diff --git a/test/unit/lib/utils/filesize.test.js b/test/unit/lib/utils/filesize.test.js
new file mode 100644
index 00000000000..589b13cd97a
--- /dev/null
+++ b/test/unit/lib/utils/filesize.test.js
@@ -0,0 +1,42 @@
+'use strict';
+
+const { expect } = require('chai');
+const filesize = require('../../../../lib/utils/filesize');
+
+describe('test/unit/lib/utils/filesize.test.js', () => {
+  it('should display sizes below 1kb literally', () => {
+    expect(filesize(1)).to.equal('1 B');
+    expect(filesize(10)).to.equal('10 B');
+    expect(filesize(12)).to.equal('12 B');
+    expect(filesize(100)).to.equal('100 B');
+    expect(filesize(123)).to.equal('123 B');
+    expect(filesize(987)).to.equal('987 B');
+  });
+
+  it('expect to display round values without decimals', () => {
+    expect(filesize(1000)).to.equal('1 kB');
+    expect(filesize(3000)).to.equal('3 kB');
+    expect(filesize(1000 * 1000)).to.equal('1 MB');
+    expect(filesize(4000 * 1000)).to.equal('4 MB');
+    expect(filesize(1000 * 1000 * 1000)).to.equal('1 GB');
+    expect(filesize(4000 * 1000 * 1000)).to.equal('4 GB');
+  });
+
+  it('expect to display not round values below 9 with decimals', () => {
+    expect(filesize(1123)).to.equal('1.1 kB');
+    expect(filesize(8123)).to.equal('8.1 kB');
+    expect(filesize(1234848)).to.equal('1.2 MB');
+    expect(filesize(8123494)).to.equal('8.1 MB');
+    expect(filesize(1123484848)).to.equal('1.1 GB');
+    expect(filesize(8123494934)).to.equal('8.1 GB');
+  });
+
+  it('expect to display not round values above 9 without decimals', () => {
+    expect(filesize(12123)).to.equal('12 kB');
+    expect(filesize(9123)).to.equal('9 kB');
+    expect(filesize(12234848)).to.equal('12 MB');
+    expect(filesize(9234949)).to.equal('9 MB');
+    expect(filesize(12348484848)).to.equal('12 GB');
+    expect(filesize(9349493432)).to.equal('9 GB');
+  });
+});

From 3aab5f86985598d6bb3135f4ab934092ad467df5 Mon Sep 17 00:00:00 2001
From: Adrien Cacciaguerra <adrien.caccia@gmail.com>
Date: Thu, 28 Oct 2021 10:22:06 +0200
Subject: [PATCH 0660/1101] feat(Templates): Package lambdas individually in
 `aws-nodejs-typescript`

---
 .../aws-nodejs-typescript/serverless.ts       | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts
index 2d35545646e..2960026f4b1 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts
@@ -5,17 +5,6 @@ import hello from '@functions/hello';
 const serverlessConfiguration: AWS = {
   service: 'aws-nodejs-typescript',
   frameworkVersion: '2',
-  custom: {
-    esbuild: {
-      bundle: true,
-      minify: false,
-      sourcemap: true,
-      exclude: ['aws-sdk'],
-      target: 'node14',
-      define: { 'require.resolve': undefined },
-      platform: 'node',
-    },
-  },
   plugins: ['serverless-esbuild'],
   provider: {
     name: 'aws',
@@ -32,6 +21,19 @@ const serverlessConfiguration: AWS = {
   },
   // import the function via paths
   functions: { hello },
+  package: { individually: true },
+  custom: {
+    esbuild: {
+      bundle: true,
+      minify: false,
+      sourcemap: true,
+      exclude: ['aws-sdk'],
+      target: 'node14',
+      define: { 'require.resolve': undefined },
+      platform: 'node',
+      concurrency: 10,
+    },
+  },
 };
 
 module.exports = serverlessConfiguration;

From ee38f6a3081a3a0f22ee9fea8975f13520ac18ec Mon Sep 17 00:00:00 2001
From: Andreas Kohn <andreas.kohn@gmail.com>
Date: Thu, 28 Oct 2021 11:08:20 +0200
Subject: [PATCH 0661/1101] fix(AWS EventBridge): Addres typos in error
 messages (#10165)

---
 lib/plugins/aws/package/compile/events/eventBridge/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/eventBridge/index.js b/lib/plugins/aws/package/compile/events/eventBridge/index.js
index 5910bde37d3..c4bd82af742 100644
--- a/lib/plugins/aws/package/compile/events/eventBridge/index.js
+++ b/lib/plugins/aws/package/compile/events/eventBridge/index.js
@@ -166,7 +166,7 @@ class AwsCompileEventBridgeEvents {
             if (RetryPolicy) {
               if (!shouldUseCloudFormation) {
                 throw new ServerlessError(
-                  'Configuring RetryPolicy is not supported for EventBrigde integration backed by Custom Resources. Please use "provider.eventBridge.useCloudFormation" setting to use native CloudFormation support for EventBridge.',
+                  'Configuring RetryPolicy is not supported for EventBridge integration backed by Custom Resources. Please use "provider.eventBridge.useCloudFormation" setting to use native CloudFormation support for EventBridge.',
                   'ERROR_INVALID_RETRY_POLICY_TO_EVENT_BUS_CUSTOM_RESOURCE'
                 );
               }
@@ -180,7 +180,7 @@ class AwsCompileEventBridgeEvents {
             if (event.eventBridge.deadLetterQueueArn) {
               if (!shouldUseCloudFormation) {
                 throw new ServerlessError(
-                  'Configuring DeadLetterConfig is not supported for EventBrigde integration backed by Custom Resources. Please use "provider.eventBridge.useCloudFormation" setting to use native CloudFormation support for EventBridge.',
+                  'Configuring DeadLetterConfig is not supported for EventBridge integration backed by Custom Resources. Please use "provider.eventBridge.useCloudFormation" setting to use native CloudFormation support for EventBridge.',
                   'ERROR_INVALID_DEAD_LETTER_CONFIG_TO_EVENT_BUS_CUSTOM_RESOURCE'
                 );
               }
@@ -263,7 +263,7 @@ class AwsCompileEventBridgeEvents {
   }) {
     if (_.isObject(eventBusName)) {
       throw new ServerlessError(
-        'Referencing event bus with CloudFormation intrinsic functions is not supported for EventBrigde integration backed by Custom Resources. Please use `provider.eventBridge.useCloudFormation` setting to use native CloudFormation support for EventBridge.',
+        'Referencing event bus with CloudFormation intrinsic functions is not supported for EventBridge integration backed by Custom Resources. Please use `provider.eventBridge.useCloudFormation` setting to use native CloudFormation support for EventBridge.',
         'ERROR_INVALID_REFERENCE_TO_EVENT_BUS_CUSTOM_RESOURCE'
       );
     }

From 7e246690b59396c71e7d3a4de37432b630502d2d Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Fri, 29 Oct 2021 09:36:18 +0200
Subject: [PATCH 0662/1101] docs: Switch to HTTP APIs by default (#9777)

---
 docs/providers/aws/guide/events.md         | 20 +++++---------------
 docs/providers/aws/guide/intro.md          | 16 ++++++++--------
 docs/providers/aws/guide/packaging.md      |  4 +---
 docs/providers/aws/guide/quick-start.md    | 10 ++++------
 docs/providers/aws/guide/resources.md      |  5 +----
 docs/providers/aws/guide/serverless.yml.md | 18 +++++++++---------
 docs/providers/aws/guide/services.md       |  4 ++--
 7 files changed, 30 insertions(+), 47 deletions(-)

diff --git a/docs/providers/aws/guide/events.md b/docs/providers/aws/guide/events.md
index 13f40e83db7..80c8f99af96 100644
--- a/docs/providers/aws/guide/events.md
+++ b/docs/providers/aws/guide/events.md
@@ -39,9 +39,7 @@ functions:
   createUser: # Function name
     handler: handler.createUser # Reference to file handler.js & exported function 'createUser'
     events: # All events associated with this function
-      - http:
-          path: users/create
-          method: post
+      - httpApi: 'POST /users/create'
 ```
 
 Events are objects, which can contain event-specific information.
@@ -56,15 +54,9 @@ functions:
   createUser: # Function name
     handler: handler.users # Reference to file handler.js & exported function 'users'
     events: # All events associated with this function
-      - http:
-          path: users/create
-          method: post
-      - http:
-          path: users/update
-          method: put
-      - http:
-          path: users/delete
-          method: delete
+      - httpApi: 'POST /users/create'
+      - httpApi: 'PUT /users/update'
+      - httpApi: 'DELETE /users/delete'
 ```
 
 ## Types
@@ -81,9 +73,7 @@ functions:
   createUser: # Function name
     handler: handler.users # Reference to file handler.js & exported function 'users'
     events: # All events associated with this function
-      - http:
-          path: users/{id}
-          method: get
+      - httpApi: 'GET /users/{id}'
 ```
 
 ## Deploying
diff --git a/docs/providers/aws/guide/intro.md b/docs/providers/aws/guide/intro.md
index a00e42da9f1..cc2ccfada30 100644
--- a/docs/providers/aws/guide/intro.md
+++ b/docs/providers/aws/guide/intro.md
@@ -71,10 +71,10 @@ service: users
 functions: # Your "Functions"
   usersCreate:
     events: # The "Events" that trigger this function
-      - http: post users/create
+      - httpApi: 'POST /users/create'
   usersDelete:
     events:
-      - http: delete users/delete
+      - httpApi: 'DELETE /users/delete'
 
 resources: # The "Resources" your "Functions" use.  Raw AWS CloudFormation goes in here.
 ```
@@ -88,14 +88,14 @@ _serverless.json_
     "usersCreate": {
       "events": [
         {
-          "http": "post users/create"
+          "httpApi": "POST /users/create"
         }
       ]
     },
     "usersDelete": {
       "events": [
         {
-          "http": "delete users/delete"
+          "httpApi": "DELETE /users/delete"
         }
       ]
     }
@@ -117,14 +117,14 @@ module.exports = {
     usersCreate: {
       events: [
         {
-          http: 'post users/create',
+          httpApi: 'POST /users/create',
         },
       ],
     },
     usersDelete: {
       events: [
         {
-          http: 'delete users/delete',
+          httpApi: 'DELETE /users/delete',
         },
       ],
     },
@@ -145,14 +145,14 @@ const serverlessConfiguration: Serverless = {
     usersCreate: {
       events: [
         {
-          http: 'post users/create',
+          httpApi: 'POST /users/create',
         },
       ],
     },
     usersDelete: {
       events: [
         {
-          http: 'delete users/delete',
+          httpApi: 'DELETE /users/delete',
         },
       ],
     },
diff --git a/docs/providers/aws/guide/packaging.md b/docs/providers/aws/guide/packaging.md
index 5d4cbde1ec9..567955a009c 100644
--- a/docs/providers/aws/guide/packaging.md
+++ b/docs/providers/aws/guide/packaging.md
@@ -112,9 +112,7 @@ functions:
   package:
     artifact: hello.jar
   events:
-    - http:
-        path: hello
-        method: get
+    - httpApi: 'GET /hello'
 ```
 
 #### Artifacts hosted on S3
diff --git a/docs/providers/aws/guide/quick-start.md b/docs/providers/aws/guide/quick-start.md
index eabf18166d1..64a8fe5d6ec 100644
--- a/docs/providers/aws/guide/quick-start.md
+++ b/docs/providers/aws/guide/quick-start.md
@@ -73,7 +73,7 @@ Looking to get started with something other than Node or Python? No problem. You
 
 ### Set up an endpoint
 
-An Event is anything that can trigger your serverless functions. In this case, you need to define an endpoint in your `serverless.yml` that will trigger your serverless function.
+An Event is anything that can trigger your serverless functions. You can define an endpoint in your `serverless.yml` that will trigger your serverless function.
 
 ```yaml
 functions:
@@ -81,9 +81,7 @@ functions:
     handler: handler.hello
     # Add the following lines:
     events:
-      - http:
-          path: hello
-          method: post
+      - httpApi: 'POST /hello'
 ```
 
 ### Deploy the Service
@@ -99,7 +97,7 @@ serverless deploy -v
 Replace the URL in the following curl command with your returned endpoint URL, which you can find in the `sls deploy` output, to hit your URL endpoint.
 
 ```bash
-$ curl -X POST https://xxxxxxxxxx.execute-api.us-east-1.amazonaws.com/dev/hello
+$ curl -X POST https://xxxxxxxxxx.execute-api.us-east-1.amazonaws.com/hello
 ```
 
 ### Invoke your Service's function
@@ -127,7 +125,7 @@ serverless invoke -f hello -d '{"body": "not a json string"}' # causes a JSON pa
 ```
 
 ```bash
-$ curl https://xxxxxxxxxx.execute-api.us-east-1.amazonaws.com/dev/hello --data-binary 'not a json string' # causes a JSON parsing error so error Insights will populate
+$ curl https://xxxxxxxxxx.execute-api.us-east-1.amazonaws.com/hello --data-binary 'not a json string' # causes a JSON parsing error so error Insights will populate
 ```
 
 ## Cleanup
diff --git a/docs/providers/aws/guide/resources.md b/docs/providers/aws/guide/resources.md
index 1b7de0741f4..9f2750ffc4f 100644
--- a/docs/providers/aws/guide/resources.md
+++ b/docs/providers/aws/guide/resources.md
@@ -115,10 +115,7 @@ functions:
   write-post:
     handler: handler.writePost
     events:
-      - http:
-          method: post
-          path: ${self:service}/api/posts/new
-          cors: true
+      - httpApi: 'POST /api/posts/new'
 
 resources:
   extensions:
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 32faf8a156c..da47a2aee45 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -355,7 +355,15 @@ functions:
       arn: arn:aws:elasticfilesystem:us-east-1:111111111111:access-point/fsap-a1a1a1a1a1a1a1a1a # ARN of EFS Access Point
       localMountPath: /mnt/example # path under which EFS will be mounted and accessible by Lambda function
     events: # The Events that trigger this Function
-      - http: # This creates an API Gateway HTTP endpoint which can be used to trigger this function.  Learn more in "events/apigateway"
+      - httpApi: # HTTP API endpoint (API Gateway v2)
+          method: GET
+          path: /some-get-path/{param}
+          authorizer: # Optional
+            name: someJwtAuthorizer # References by name authorizer defined in provider.httpApi.authorizers section
+            scopes: # Optional
+              - user.id
+              - user.email
+      - http: # REST API endpoint (API Gateway v1)
           path: users/create # Path for this endpoint
           method: get # HTTP method for this endpoint
           cors: true # Turn on CORS for this endpoint, but don't forget to return the right header in your response
@@ -389,14 +397,6 @@ functions:
                 name: ModelName  # Optional: Name of the API Gateway model
                 description: "Some description" # Optional: Description of the API Gateway model
                 schema: ${file(model_schema.json)} # Schema for selected content type
-      - httpApi: # HTTP API endpoint
-          method: GET
-          path: /some-get-path/{param}
-          authorizer: # Optional
-            name: someJwtAuthorizer # References by name authorizer defined in provider.httpApi.authorizers section
-            scopes: # Optional
-              - user.id
-              - user.email
       - websocket:
           route: $connect
           routeResponseSelectionExpression: $default # optional, setting this enables callbacks on websocket requests for two-way communication
diff --git a/docs/providers/aws/guide/services.md b/docs/providers/aws/guide/services.md
index 3e243ae4d03..dc085cbc476 100644
--- a/docs/providers/aws/guide/services.md
+++ b/docs/providers/aws/guide/services.md
@@ -141,11 +141,11 @@ functions:
   usersCreate: # A Function
     handler: users.create
     events: # The Events that trigger this Function
-      - http: post users/create
+      - httpApi: 'POST /users/create'
   usersDelete: # A Function
     handler: users.delete
     events: # The Events that trigger this Function
-      - http: delete users/delete
+      - httpApi: 'DELETE /users/delete'
 
 # The "Resources" your "Functions" use.  Raw AWS CloudFormation goes in here.
 resources:

From e3e02fe8e2f1bbd236cfa49f80a360fd828c1ead Mon Sep 17 00:00:00 2001
From: Caio Fauza <38479437+CaioFauza@users.noreply.github.com>
Date: Fri, 29 Oct 2021 06:40:00 -0300
Subject: [PATCH 0663/1101] fix(AWS HTTP API): Recognize max timeout as 30s not
 29s (#10119)

---
 .../aws/package/compile/events/httpApi.js     | 14 ++++++------
 .../package/compile/events/httpApi.test.js    | 22 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/httpApi.js b/lib/plugins/aws/package/compile/events/httpApi.js
index 10bc1f1eb0e..55f209161ee 100644
--- a/lib/plugins/aws/package/compile/events/httpApi.js
+++ b/lib/plugins/aws/package/compile/events/httpApi.js
@@ -611,29 +611,29 @@ Object.defineProperties(
         const functionTimeout =
           Number(functionData.timeout) || Number(this.serverless.service.provider.timeout) || 6;
 
-        if (functionTimeout > 29) {
+        if (functionTimeout > 30) {
           logWarning(
             `Function (${functionName}) timeout setting (${functionTimeout}) is greater than ` +
-              'maximum allowed timeout for HTTP API endpoint (29s). ' +
+              'maximum allowed timeout for HTTP API endpoint (30s). ' +
               'This may introduce a situation where endpoint times out ' +
               'for a succesful lambda invocation.'
           );
           log.warning(
             `Function (${functionName}) timeout setting (${functionTimeout}) is greater than ` +
-              'maximum allowed timeout for HTTP API endpoint (29s). ' +
+              'maximum allowed timeout for HTTP API endpoint (30s). ' +
               'This may introduce a situation where endpoint times out ' +
               'for a succesful lambda invocation.'
           );
-        } else if (functionTimeout === 29) {
+        } else if (functionTimeout === 30) {
           logWarning(
             `Function (${functionName}) timeout setting (${functionTimeout}) may not provide ` +
-              'enough room to process an HTTP API request (of which timeout is limited to 29s). ' +
+              'enough room to process an HTTP API request (of which timeout is limited to 30s). ' +
               'This may introduce a situation where endpoint times out ' +
               'for a succesful lambda invocation.'
           );
           log.warning(
             `Function (${functionName}) timeout setting (${functionTimeout}) may not provide ` +
-              'enough room to process an HTTP API request (of which timeout is limited to 29s). ' +
+              'enough room to process an HTTP API request (of which timeout is limited to 30s). ' +
               'This may introduce a situation where endpoint times out ' +
               'for a succesful lambda invocation.'
           );
@@ -642,7 +642,7 @@ Object.defineProperties(
         // It's a margin needed for some side processing time on AWS side.
         // Otherwise there's a risk of observing 503 status for successfully resolved invocation
         // (which just fit function timeout setting)
-        routeTargetData.timeout = Math.min(functionTimeout + 0.5, 29);
+        routeTargetData.timeout = Math.min(functionTimeout + 0.5, 30);
       }
     }),
     compileIntegration: d(function (routeTargetData) {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
index ced9d074cd3..0f00ff60aa2 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
@@ -45,6 +45,16 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
               handler: 'index.handler',
               events: [{ httpApi: 'ANY /payload' }],
             },
+            customTimeout: {
+              handler: 'index.handler',
+              events: [{ httpApi: 'ANY /custom-timeout' }],
+              timeout: 29,
+            },
+            maxTimeout: {
+              handler: 'index.handler',
+              events: [{ httpApi: 'ANY /max-timeout' }],
+              timeout: 30,
+            },
           },
         },
       }).then(({ awsNaming, cfTemplate }) => {
@@ -119,11 +129,21 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       expect(resource.Properties.RouteKey).to.equal(routeKey);
     });
 
-    it('should ensure higher timeout than function', () => {
+    it('should ensure higher timeout than function default value', () => {
       const resource = cfResources[naming.getHttpApiIntegrationLogicalId('foo')];
       expect(resource.Properties.TimeoutInMillis).to.equal(6500);
     });
 
+    it('should provide 0.5s time margin to custom function integration timeout', () => {
+      const resource = cfResources[naming.getHttpApiIntegrationLogicalId('customTimeout')];
+      expect(resource.Properties.TimeoutInMillis).to.equal(29500);
+    });
+
+    it('should limit function maximum integration timeout to 30s', () => {
+      const resource = cfResources[naming.getHttpApiIntegrationLogicalId('maxTimeout')];
+      expect(resource.Properties.TimeoutInMillis).to.equal(30000);
+    });
+
     it('should configure lambda permissions', () => {
       const resource = cfResources[naming.getLambdaHttpApiPermissionLogicalId('foo')];
       expect(resource.Type).to.equal('AWS::Lambda::Permission');

From 254e70cd0ad9bb1803d3a5741b966f5807e9d869 Mon Sep 17 00:00:00 2001
From: Sebastian Bille <sebastian.pettersson@live.com>
Date: Fri, 29 Oct 2021 11:41:03 +0200
Subject: [PATCH 0664/1101] fix(CLI): Fix `help` command usage information
 (#10175)

---
 lib/cli/commands-schema/no-service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli/commands-schema/no-service.js b/lib/cli/commands-schema/no-service.js
index 24fd3105113..cc90f181fad 100644
--- a/lib/cli/commands-schema/no-service.js
+++ b/lib/cli/commands-schema/no-service.js
@@ -161,7 +161,7 @@ commands.set('generate-event', {
 });
 
 commands.set('help', {
-  // Shows general "help", so has no specific usage info
+  usage: 'Show this help',
   serviceDependencyMode: 'optional',
 });
 

From 9ef46ba05ff033dbf04c451a214bf4ced23c90e8 Mon Sep 17 00:00:00 2001
From: "Shane R. Spencer" <305301+whardier@users.noreply.github.com>
Date: Mon, 1 Nov 2021 06:05:29 -0800
Subject: [PATCH 0665/1101] feat(AWS Local Invocation): Support decimal
 serialization for Python

---
 lib/plugins/aws/invokeLocal/runtimeWrappers/invoke.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/invoke.py b/lib/plugins/aws/invokeLocal/runtimeWrappers/invoke.py
index 0df5bc4bc27..5279f5e53c9 100755
--- a/lib/plugins/aws/invokeLocal/runtimeWrappers/invoke.py
+++ b/lib/plugins/aws/invokeLocal/runtimeWrappers/invoke.py
@@ -3,9 +3,17 @@
 import json
 import logging
 import sys
+import decimal
 from time import strftime, time
 from importlib import import_module
 
+def decimal_serializer(o):
+    if isinstance(o, decimal.Decimal):
+        f = float(o)
+        if f.is_integer():
+          return int(f)
+        return f
+    
 class FakeLambdaContext(object):
     def __init__(self, name='Fake', version='LATEST', timeout=6, **kwargs):
         self.name = name
@@ -84,4 +92,4 @@ def log(self):
 
     context = FakeLambdaContext(**input.get('context', {}))
     result = handler(input['event'], context)
-    sys.stdout.write(json.dumps(result, indent=4))
+    sys.stdout.write(json.dumps(result, default=decimal_serializer, indent=4))

From f400cdc6edb3c37089d773b1cba95a6aab29045c Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Thu, 23 Sep 2021 17:16:31 +0200
Subject: [PATCH 0666/1101] docs: Document the new plugin API for CLI output

---
 docs/guides/plugins/README.md                 | 122 +++++++++
 docs/guides/plugins/cli-output.md             | 238 ++++++++++++++++++
 .../plugins/creating-plugins.md}              | 150 +++--------
 3 files changed, 392 insertions(+), 118 deletions(-)
 create mode 100644 docs/guides/plugins/README.md
 create mode 100644 docs/guides/plugins/cli-output.md
 rename docs/{providers/aws/guide/plugins.md => guides/plugins/creating-plugins.md} (79%)

diff --git a/docs/guides/plugins/README.md b/docs/guides/plugins/README.md
new file mode 100644
index 00000000000..5a5decfc003
--- /dev/null
+++ b/docs/guides/plugins/README.md
@@ -0,0 +1,122 @@
+<!--
+title: Serverless Framework - Plugins
+menuText: Plugins
+menuOrder: 14
+description: How to install plugins to customize the Serverless Framework
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/guides/plugins)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# Plugins
+
+A Plugin is custom Javascript code that creates new or extends existing commands within the Serverless Framework. The Serverless Framework is merely a group of Plugins that are provided in the core. If you or your organization have a specific workflow, install a pre-written Plugin or write a plugin to customize the Framework to your needs. External Plugins are written exactly the same way as the core Plugins.
+
+Learn more about [creating a custom plugin](creating-plugins.md).
+
+## Installing plugins
+
+Plugins are installed per service. They are not applied globally.
+
+To install a plugin, run the following command in a service directory:
+
+```
+serverless plugin install -n custom-serverless-plugin
+```
+
+This command will install the plugin via NPM and register it.
+
+You can also install the plugin manually via NPM:
+
+```
+npm install --save custom-serverless-plugin
+```
+
+and then register it in `serverless.yml` in the `plugins` section:
+
+```yml
+# serverless.yml file
+
+plugins:
+  - custom-serverless-plugin
+```
+
+The `plugins` section supports two formats:
+
+Array object:
+
+```yml
+plugins:
+  - plugin1
+  - plugin2
+```
+
+Enhanced plugins object:
+
+```yml
+plugins:
+  localPath: './custom_serverless_plugins'
+  modules:
+    - plugin1
+    - plugin2
+```
+
+Plugins might want to add extra information which should be accessible to Serverless. The `custom` section in the `serverless.yml` file is the place where you can add necessary configurations for your plugins (the plugins author / documentation will tell you if you need to add anything there):
+
+```yml
+plugins:
+  - custom-serverless-plugin
+
+custom:
+  customkey: customvalue
+```
+
+## Service local plugin
+
+If you are working on a plugin or have a plugin that is just designed for one project, it can be loaded from the local `.serverless_plugins` folder at the root of your service. Local plugins can be added in the `plugins` array in `serverless.yml`.
+
+```yml
+plugins:
+  - custom-serverless-plugin
+```
+
+Local plugins folder can be changed by enhancing `plugins` object:
+
+```yml
+plugins:
+  localPath: './custom_serverless_plugins'
+  modules:
+    - custom-serverless-plugin
+```
+
+The `custom-serverless-plugin` will be loaded from the `custom_serverless_plugins` directory at the root of your service. If the `localPath` is not provided or empty, the `.serverless_plugins` directory will be used.
+
+The plugin will be loaded based on being named `custom-serverless-plugin.js` or `custom-serverless-plugin\index.js` in the root of `localPath` folder (`.serverless_plugins` by default).
+
+If you want to load a plugin from a specific directory without affecting other plugins, you can also specify a path relative to the root of your service:
+
+```yaml
+plugins:
+  # This plugin will be loaded from the `.serverless_plugins/` or `node_modules/` directories
+  - custom-serverless-plugin
+  # This plugin will be loaded from the `sub/directory/` directory
+  - ./sub/directory/another-custom-plugin
+```
+
+### Load Order
+
+Keep in mind that the order you define your plugins matters. When Serverless loads all the core plugins and then the custom plugins in the order you've defined them.
+
+```yml
+# serverless.yml
+
+plugins:
+  - plugin1
+  - plugin2
+```
+
+In this case `plugin1` is loaded before `plugin2`.
diff --git a/docs/guides/plugins/cli-output.md b/docs/guides/plugins/cli-output.md
new file mode 100644
index 00000000000..144d15d0fd7
--- /dev/null
+++ b/docs/guides/plugins/cli-output.md
@@ -0,0 +1,238 @@
+<!--
+title: Serverless Framework - Plugins - CLI output
+menuText: Plugins
+menuOrder: 14
+description: How to write to the CLI output in Serverless Framework plugins.
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/guides/plugins/cli-output)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# CLI output in plugins
+
+Plugins can integrate and extend the CLI output of the Serverless Framework in different ways.
+
+## Writing to the output
+
+Plugins can log messages to the CLI output via a standard `log` interface:
+
+```js
+class MyPlugin {
+  constructor(serverless, cliOptions, { log }) {
+    log.error('Error');
+    log.warning('Warning');
+    log.notice('Message');
+    log.info('Verbose message'); // --verbose log
+    log.debug('Debug message');  // --debug log
+  }
+}
+```
+
+Some aliases exist to make log levels more explicit:
+
+```js
+log('Here is a message');
+// is an alias to:
+log.notice('Here is a message');
+
+log.verbose('Here is a verbose message'); // displayed with --verbose
+// is an alias to:
+log.info('Here is a verbose message');    // displayed with --verbose
+```
+
+To write a formatted "success" message, use the following helper:
+
+```js
+log.success('The task executed with success');
+```
+
+**Best practices:**
+
+- **Keep the default CLI output minimal.**
+- Log most information to the `--verbose` output.
+- Warnings should be used exceptionally. Consider whether the plugin should instead throw an exception, log a `--verbose` message or trigger a deprecation (see below).
+- Before using `log.error()`, consider [throwing an exception](#errors): exceptions are automatically caught by the Serverless Framework and formatted with details.
+- Log developer-oriented messages to the `--debug` output, and prefix the messages with the name of the plugin (`[plugin-name] My message`).
+
+**By default, logs are written to `stderr`**, which displays in terminals (humans cannot tell the difference). This is intentional: plugins can safely log extra messages to any command, even commands meant to be piped or parsed by another program. Read the next section to learn more.
+
+### Writing command output to `stdout`
+
+By default, plugins should write messages to `stderr` via the `log` object. To write command output to `stdout` instead, use `writeText()`:
+
+```js
+class MyPlugin {
+  constructor(serverless, cliOptions, { writeText }) {
+    writeText('Command output');
+  }
+}
+```
+
+**Best practices:**
+
+- `stdout` output is usually meant to be piped to/parsed by another program.
+- Plugins should only write to `stdout` in commands they own (to avoid breaking the output of other commands).
+- The only content written to `stdout` should be the main output of the command.
+
+Take, for example, the `serverless invoke` command:
+
+- Its output is the result of the Lambda invocation: by writing that result (and only that) to `stdout`, it allows any script to parse the result of the Lambda invocation.
+- All other messages should be written to `stderr`: such logs are useful to humans, for example configuration warnings, upgrade notifications, Lambda logs… Since they are written to `stderr`, they do not break the parsable output of `stdout`.
+
+**If unsure, write to `stderr`** (with the `log` object) instead of `stdout`. Why: human users will not see any difference, but the door will stay open to write a parsable output later in the future.
+
+### Multi-line and formatted strings
+
+All log methods accept a string, a formatted string, or a multiline message:
+
+```js
+log.warning('Here is a log');
+log.warning([
+  'Here is a',
+  'multi-line log',
+]);
+log.warning('Here is a %s log', 'formatted');
+```
+
+## Errors
+
+The Serverless Framework differentiates between 2 errors:
+
+- user errors (wrong input, etc.)
+- internal errors (aka bugs)
+
+To throw a user error and have it properly formatted, use Serverless' error class:
+
+```js
+throw new serverless.classes.Error('Invalid configuration in X');
+```
+
+All other errors are considered internal errors (and are properly formatted in the CLI output as well).
+
+**Best practices:**
+
+- If an error should stop the execution of the command, throw an exception.
+- If an error should _not_ stop the execution of the command (which should be exceptional), log it via `log.error()`.
+  - For example any execution error in `serverless-offline` should not stop the local server.
+
+## Interactive progress
+
+Plugins can create an interactive progress:
+
+```js
+class MyPlugin {
+  constructor(serverless, cliOptions, { progress }) {
+    const myProgress = progress.create('Doing extra work in my-plugin');
+    // ...
+    myProgress.update('Almost finished');
+    // ...
+    myProgress.remove();
+  }
+}
+```
+
+In case of parallel processing (for example compiling multiple files in parallel), it is possible to create multiple progress items if that is useful to users.
+
+**Best practices:**
+
+- Create a progress for tasks that usually take **more than 2 seconds**. Below that threshold, plugins can operate silently and log to `--verbose` only.
+- Users should know which plugin is working from the progress message:
+  - Bad: "Compiling"
+  - Bad: "[Webpack] Compiling" (avoid prefixes)
+  - Good: "Compiling with webpack"
+- Displaying multiple progress should be exceptional, and limited to 3-4 progress at a time. It is better to keep the output minimal than too noisy.
+
+Note that it is possible to give a unique name to a progress. That name can be used to retrieve the progress without having to pass the instance around:
+
+```js
+// Progress without any name:
+const myProgress = progress.create('Working in my-plugin');
+
+// Progress with a unique name
+progress.create('Working in my-plugin', {
+  name: 'my-plugin-progress' // Try to make the name unique across all plugins
+});
+// elsewhere...
+progress.get('my-plugin-progress').update('Almost finished');
+// elsewhere...
+progress.get('my-plugin-progress').remove();
+```
+
+## Service information
+
+Plugins can add their own sections to the "Service information", i.e. the information displayed after `serverless deploy` or in `serverless info`.
+
+To add a single item:
+
+```js
+serverless.addServiceOutputSection('my section', 'content');
+```
+
+The example above will be displayed as:
+
+```
+$ serverless info
+functions:
+  ...
+my section: content
+```
+
+To add a multi-line section:
+
+```js
+serverless.addServiceOutputSection('my section', [
+    'line 1',
+    'line 2',
+]);
+```
+
+The example above will be displayed as:
+
+```
+$ serverless info
+functions:
+  ...
+my section:
+  line 1
+  line 2
+```
+
+## Deprecations
+
+Plugins can signal deprecated features to users via `logDeprecation()`:
+
+```js
+serverless.logDeprecation(
+  'DEPRECATION_CODE',
+  'Feature X of my-plugin is deprecated. Please use Y instead.'
+);
+```
+
+These deprecations will integrate with the deprecation system of the Serverless Framework.
+
+**Best practices:**
+
+- Prefix the deprecation code with the plugin name, for example: `OFFLINE_XXX`.
+- Make the message actionable for users: if a feature is deprecated, what should users use instead? Feel free to add links if necessary.
+
+## Retrieving the I/O API
+
+As shown in the examples above, the I/O API is injected in the constructor of plugins:
+
+```js
+class MyPlugin {
+  constructor(serverless, cliOptions, { writeText, log, progress }) {
+    // ...
+  }
+}
+```
+
+However, it is also possible to retrieve it from any JavaScript file by requiring the `@serverless/utils` package:
+
+```js
+const { writeText, log, progress } = require("@serverless/utils/log");
+```
diff --git a/docs/providers/aws/guide/plugins.md b/docs/guides/plugins/creating-plugins.md
similarity index 79%
rename from docs/providers/aws/guide/plugins.md
rename to docs/guides/plugins/creating-plugins.md
index 9fd435b62c1..b2df13294b9 100644
--- a/docs/providers/aws/guide/plugins.md
+++ b/docs/guides/plugins/creating-plugins.md
@@ -1,137 +1,51 @@
 <!--
-title: Serverless Framework - AWS Lambda Guide - Plugins
+title: Serverless Framework - Creating plugins
 menuText: Plugins
 menuOrder: 14
-description: How to install and create Plugins to extend or overwrite the functionality of the Serverless Framework
+description: How to create custom plugins to customize the Serverless Framework
 layout: Doc
 -->
 
 <!-- DOCS-SITE-LINK:START automatically generated  -->
 
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/guide/plugins)
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/guides/plugins/creating-plugins)
 
 <!-- DOCS-SITE-LINK:END -->
 
-# Plugins
+# Creating custom plugins
 
-A Plugin is custom Javascript code that creates new or extends existing commands within the Serverless Framework. The Serverless Framework is merely a group of Plugins that are provided in the core. If you or your organization have a specific workflow, install a pre-written Plugin or write a plugin to customize the Framework to your needs. External Plugins are written exactly the same way as the core Plugins.
+A plugin is custom Javascript code that adds new features to the Serverless Framework. The Serverless Framework is merely a group of Plugins that are provided in the core. If you or your organization have a specific workflow, install a pre-written Plugin or write a plugin to customize the Framework to your needs. External Plugins are written exactly the same way as the core Plugins.
 
 - [How to create serverless plugins - Part 1](https://serverless.com/blog/writing-serverless-plugins/)
 - [How to create serverless plugins - Part 2](https://serverless.com/blog/writing-serverless-plugins-2/)
 
-## Installing Plugins
+Plugins can:
 
-External Plugins are added on a per service basis and are not applied globally. Make sure you are in your Service's root directory, then install the corresponding Plugin with the help of NPM:
+- Define new CLI commands
+- Hook into core and custom _lifecycle events_
+- Define new variable sources
+- Extend the `serverless.yml` syntax
+- Write extra information to the CLI output
+- Add support for new cloud providers
 
-```
-npm install --save custom-serverless-plugin
-```
-
-We need to tell Serverless that we want to use the plugin inside our service. We do this by adding the name of the Plugin to the `plugins` section in the `serverless.yml` file.
-
-```yml
-# serverless.yml file
-
-plugins:
-  - custom-serverless-plugin
-```
-
-The `plugins` section supports two formats:
-
-Array object:
-
-```yml
-plugins:
-  - plugin1
-  - plugin2
-```
-
-Enhanced plugins object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - plugin1
-    - plugin2
-```
-
-Plugins might want to add extra information which should be accessible to Serverless. The `custom` section in the `serverless.yml` file is the place where you can add necessary configurations for your plugins (the plugins author / documentation will tell you if you need to add anything there):
-
-```yml
-plugins:
-  - custom-serverless-plugin
-
-custom:
-  customkey: customvalue
-```
-
-## Service local plugin
-
-If you are working on a plugin or have a plugin that is just designed for one project, it can be loaded from the local `.serverless_plugins` folder at the root of your service. Local plugins can be added in the `plugins` array in `serverless.yml`.
-
-```yml
-plugins:
-  - custom-serverless-plugin
-```
-
-Local plugins folder can be changed by enhancing `plugins` object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - custom-serverless-plugin
-```
-
-The `custom-serverless-plugin` will be loaded from the `custom_serverless_plugins` directory at the root of your service. If the `localPath` is not provided or empty, the `.serverless_plugins` directory will be used.
-
-The plugin will be loaded based on being named `custom-serverless-plugin.js` or `custom-serverless-plugin\index.js` in the root of `localPath` folder (`.serverless_plugins` by default).
-
-If you want to load a plugin from a specific directory without affecting other plugins, you can also specify a path relative to the root of your service:
-
-```yaml
-plugins:
-  # This plugin will be loaded from the `.serverless_plugins/` or `node_modules/` directories
-  - custom-serverless-plugin
-  # This plugin will be loaded from the `sub/directory/` directory
-  - ./sub/directory/another-custom-plugin
-```
-
-### Load Order
-
-Keep in mind that the order you define your plugins matters. When Serverless loads all the core plugins and then the custom plugins in the order you've defined them.
-
-```yml
-# serverless.yml
-
-plugins:
-  - plugin1
-  - plugin2
-```
-
-In this case `plugin1` is loaded before `plugin2`.
-
-## Writing Plugins
-
-**Note:** In order to ensure that your plugin works correctly with Framework in `v2.x`, keep the following things in mind:
+**Note:** To ensure that your plugin works correctly with Serverless Framework `v2.x` and `v3.x`, keep the following things in mind:
 
 - Do not depend on `Bluebird` API for Promises returned by Framework internals - we are actively migrating away from `Bluebird` at this point
 - If your plugin adds new properties, ensure to define corresponding schema definitions, please refer to: [Extending validation schema](#extending-validation-schema)
 - Avoid using `subcommands` as the support for them might become deprecated or removed in next major version of the Framework
 - Add `serverless` to `peerDependencies` in order to ensure officially supported Framework version(s)
 
-### Concepts
+## Concepts
 
-#### Plugin
+### Plugin
 
-Code which defines _Commands_, any _Events_ within a _Command_, and any _Hooks_ assigned to a _Lifecycle Event_.
+Code which defines _Commands_, any _Lifecycle Events_ within a _Command_, and any _Hooks_ assigned to a _Lifecycle Event_.
 
 - Command // CLI configuration, commands, options
   - LifecycleEvent(s) // Events that happen sequentially when the command is run
     - Hook(s) // Code that runs when a Lifecycle Event happens during a Command
 
-#### Command
+### Command
 
 A CLI _Command_ that can be called by a user, e.g. `serverless foo`. A Command has no logic, but simply defines the CLI configuration (e.g. command, parameters) and the _Lifecycle Events_ for the command. Every command defines its own lifecycle events.
 
@@ -151,9 +65,9 @@ class MyPlugin {
 module.exports = MyPlugin;
 ```
 
-#### Lifecycle Events
+### Lifecycle Events
 
-Events that fire sequentially during a Command. The above example lists two Events. However, for each Event, an additional `before` and `after` event is created. Therefore, six Events exist in the above example:
+Lifecycle Events are events that fire sequentially during a Command. The above example lists two Events. However, for each Event, an additional `before` and `after` event is created. Therefore, six Events exist in the above example:
 
 - `before:foo:resources`
 - `foo:resources`
@@ -164,7 +78,7 @@ Events that fire sequentially during a Command. The above example lists two Even
 
 The name of the command in front of lifecycle events when they are used for Hooks.
 
-#### Hooks
+### Hooks
 
 A Hook binds code to any lifecycle event from any command.
 
@@ -202,12 +116,11 @@ class MyPlugin {
 module.exports = MyPlugin;
 ```
 
-### Custom Variable Types
+## Custom variables
 
-Plugins may register its own configuration variables resolution sources.
+Plugins can register custom configuration variables sources, for example `${my-variable-source:some-variable}`.
 
-Resolvers should be configured at `configurationVariablesSources` in form of a plain object that exposes `resolve` function.
-Check below example
+Custom sources can be registered via `configurationVariablesSources` as a plain object that exposes a `resolve` function:
 
 ```javascript
 'use strict';
@@ -217,7 +130,7 @@ class SomePlugin {
 
     this.configurationVariablesSources = {
       foo: {
-        async resolve({ address, params, resolveConfigurationProperty, options  }) {
+        async resolve({address, params, resolveConfigurationProperty, options}) {
           // `address` and `params` reflect values configured with a variable:
           // ${foo(param1, param2):address}
           // Note: they're passed if they're configured into variable
@@ -225,21 +138,22 @@ class SomePlugin {
           // `options` is CLI options
           // `resolveConfigurationProperty` allows to access other configuration properties,
           // and guarantees to return a fully resolved form (even if property is configured with variables)
-          const stage = options.stage || await  resolveConfigurationProperty(["provider", "stage"]) || "dev";
+          const stage = options.stage || await resolveConfigurationProperty(["provider", "stage"]) || "dev";
 
           // Resolver is expected to return plain object, with resolved value set on `value` property.
           // Resolve value can be any JSON value
           return {
             //
-            value: `Resolution of "foo" source for "${stage}" stage at "${address || ""}" addresss with "${(params || []).join(", ")}" params`
+            value: `Resolution of "foo" source for "${stage}" stage at "${address || ""}" address with "${(params || []).join(", ")}" params`
           }
         }
       }
-
+    }
+  }
 }
 ```
 
-Having an above source resolver (as provided with a plugin), we may use new variable source in configuration as follows:
+The variable source defined above (registered via a plugin) can be used as follows:
 
 ```yaml
 service: test
@@ -247,10 +161,10 @@ provider: aws
 custom:
   value1: ${foo(one, two):whatever}
 plugins:
-  - ./some-plugin
+  - ./my-plugin
 ```
 
-Configuration will be resolved into following form:
+The configuration will be resolved into the following:
 
 ```yaml
 service: test
@@ -258,7 +172,7 @@ provider: aws
 custom:
   value1: Resolution of "foo" source for "dev" stage at "whatever" address with "one, two" params
 plugins:
-  - ./some-plugin
+  - ./my-plugin
 ```
 
 ### Defining Options

From 5d16fee7d7aec52cf13c07d12f613533db298079 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Mon, 18 Oct 2021 11:47:32 +0200
Subject: [PATCH 0667/1101] docs: Document colors and formatting for plugins

---
 docs/guides/plugins/cli-output.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/docs/guides/plugins/cli-output.md b/docs/guides/plugins/cli-output.md
index 144d15d0fd7..fee2797c874 100644
--- a/docs/guides/plugins/cli-output.md
+++ b/docs/guides/plugins/cli-output.md
@@ -85,6 +85,26 @@ Take, for example, the `serverless invoke` command:
 
 **If unsure, write to `stderr`** (with the `log` object) instead of `stdout`. Why: human users will not see any difference, but the door will stay open to write a parsable output later in the future.
 
+### Colors and formatting
+
+To format and color text output, use the [chalk](https://github.com/chalk/chalk) package. For example:
+
+```js
+log.notice(chalk.gray('Here is a message'));
+```
+
+**Best practices:**
+
+- Write primary information in **white**, secondary information in **gray**.
+  - Primary information is the direct outcome of a command (e.g. deployment result of the `deploy` command, or result of the `invoke` command). Secondary information is everything else.
+- Plugins should generally not use any other color, nor introduce any other custom formatting. Output formatting is meant to be minimalistic.
+- Plugins should use built-in formats documented in this page: success messages (`log.success()`), interactive progress…
+
+The "Serverless red" color (`#fd5750`) is used to grab the user's attention:
+
+- It should be used minimally, and maximum once per command.
+- It should be used only to grab attention to the command's most important information.
+
 ### Multi-line and formatted strings
 
 All log methods accept a string, a formatted string, or a multiline message:

From 0efc617f8ff8c4e15a721576d6613911dbcbf46a Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Wed, 20 Oct 2021 14:58:49 +0200
Subject: [PATCH 0668/1101] docs: Reorganizing the plugin documentation

---
 docs/guides/plugins/README.md               |  18 +-
 docs/guides/plugins/cli-output.md           |  18 +-
 docs/guides/plugins/creating-plugins.md     | 612 +++-----------------
 docs/guides/plugins/custom-commands.md      | 125 ++++
 docs/guides/plugins/custom-configuration.md | 345 +++++++++++
 docs/guides/plugins/custom-variables.md     | 128 ++++
 6 files changed, 695 insertions(+), 551 deletions(-)
 create mode 100644 docs/guides/plugins/custom-commands.md
 create mode 100644 docs/guides/plugins/custom-configuration.md
 create mode 100644 docs/guides/plugins/custom-variables.md

diff --git a/docs/guides/plugins/README.md b/docs/guides/plugins/README.md
index 5a5decfc003..58e21328078 100644
--- a/docs/guides/plugins/README.md
+++ b/docs/guides/plugins/README.md
@@ -14,9 +14,11 @@ layout: Doc
 
 # Plugins
 
-A Plugin is custom Javascript code that creates new or extends existing commands within the Serverless Framework. The Serverless Framework is merely a group of Plugins that are provided in the core. If you or your organization have a specific workflow, install a pre-written Plugin or write a plugin to customize the Framework to your needs. External Plugins are written exactly the same way as the core Plugins.
+A plugin is custom JavaScript code that extends the Serverless Framework with new features.
 
-Learn more about [creating a custom plugin](creating-plugins.md).
+If you or your organization have a specific workflow, install a pre-written plugin or write one to customize the Framework to your needs.
+
+Since the Serverless Framework is a group of "core" plugins, custom plugins are written exactly the same way as core plugins. Learn more about [creating a custom plugin](creating-plugins.md).
 
 ## Installing plugins
 
@@ -28,7 +30,7 @@ To install a plugin, run the following command in a service directory:
 serverless plugin install -n custom-serverless-plugin
 ```
 
-This command will install the plugin via NPM and register it.
+This command will install the plugin via NPM and register it in `serverless.yml`.
 
 You can also install the plugin manually via NPM:
 
@@ -65,7 +67,7 @@ plugins:
     - plugin2
 ```
 
-Plugins might want to add extra information which should be accessible to Serverless. The `custom` section in the `serverless.yml` file is the place where you can add necessary configurations for your plugins (the plugins author / documentation will tell you if you need to add anything there):
+Some plugins require extra configuration. The `custom` section in `serverless.yml` is where you can add extra configuration for plugins (the plugin's documentation will tell you if you need to add anything there):
 
 ```yml
 plugins:
@@ -84,7 +86,7 @@ plugins:
   - custom-serverless-plugin
 ```
 
-Local plugins folder can be changed by enhancing `plugins` object:
+The local plugin folder can be customized:
 
 ```yml
 plugins:
@@ -95,7 +97,7 @@ plugins:
 
 The `custom-serverless-plugin` will be loaded from the `custom_serverless_plugins` directory at the root of your service. If the `localPath` is not provided or empty, the `.serverless_plugins` directory will be used.
 
-The plugin will be loaded based on being named `custom-serverless-plugin.js` or `custom-serverless-plugin\index.js` in the root of `localPath` folder (`.serverless_plugins` by default).
+The plugin will be loaded based on being named `custom-serverless-plugin.js` or `custom-serverless-plugin/index.js` in the root of `localPath` folder (`.serverless_plugins` by default).
 
 If you want to load a plugin from a specific directory without affecting other plugins, you can also specify a path relative to the root of your service:
 
@@ -107,9 +109,9 @@ plugins:
   - ./sub/directory/another-custom-plugin
 ```
 
-### Load Order
+## Load Order
 
-Keep in mind that the order you define your plugins matters. When Serverless loads all the core plugins and then the custom plugins in the order you've defined them.
+Keep in mind that the order you define your plugins matters. Serverless loads all the core plugins, and then the custom plugins in the order you've defined them.
 
 ```yml
 # serverless.yml
diff --git a/docs/guides/plugins/cli-output.md b/docs/guides/plugins/cli-output.md
index fee2797c874..54dc4e2d765 100644
--- a/docs/guides/plugins/cli-output.md
+++ b/docs/guides/plugins/cli-output.md
@@ -27,7 +27,7 @@ class MyPlugin {
     log.warning('Warning');
     log.notice('Message');
     log.info('Verbose message'); // --verbose log
-    log.debug('Debug message');  // --debug log
+    log.debug('Debug message'); // --debug log
   }
 }
 ```
@@ -41,7 +41,7 @@ log.notice('Here is a message');
 
 log.verbose('Here is a verbose message'); // displayed with --verbose
 // is an alias to:
-log.info('Here is a verbose message');    // displayed with --verbose
+log.info('Here is a verbose message'); // displayed with --verbose
 ```
 
 To write a formatted "success" message, use the following helper:
@@ -111,11 +111,8 @@ All log methods accept a string, a formatted string, or a multiline message:
 
 ```js
 log.warning('Here is a log');
-log.warning([
-  'Here is a',
-  'multi-line log',
-]);
 log.warning('Here is a %s log', 'formatted');
+log.warning(['Here is a', 'multi-line log']);
 ```
 
 ## Errors
@@ -174,7 +171,7 @@ const myProgress = progress.create('Working in my-plugin');
 
 // Progress with a unique name
 progress.create('Working in my-plugin', {
-  name: 'my-plugin-progress' // Try to make the name unique across all plugins
+  name: 'my-plugin-progress', // Try to make the name unique across all plugins
 });
 // elsewhere...
 progress.get('my-plugin-progress').update('Almost finished');
@@ -204,10 +201,7 @@ my section: content
 To add a multi-line section:
 
 ```js
-serverless.addServiceOutputSection('my section', [
-    'line 1',
-    'line 2',
-]);
+serverless.addServiceOutputSection('my section', ['line 1', 'line 2']);
 ```
 
 The example above will be displayed as:
@@ -254,5 +248,5 @@ class MyPlugin {
 However, it is also possible to retrieve it from any JavaScript file by requiring the `@serverless/utils` package:
 
 ```js
-const { writeText, log, progress } = require("@serverless/utils/log");
+const { writeText, log, progress } = require('@serverless/utils/log');
 ```
diff --git a/docs/guides/plugins/creating-plugins.md b/docs/guides/plugins/creating-plugins.md
index b2df13294b9..abff4493f5b 100644
--- a/docs/guides/plugins/creating-plugins.md
+++ b/docs/guides/plugins/creating-plugins.md
@@ -14,626 +14,176 @@ layout: Doc
 
 # Creating custom plugins
 
-A plugin is custom Javascript code that adds new features to the Serverless Framework. The Serverless Framework is merely a group of Plugins that are provided in the core. If you or your organization have a specific workflow, install a pre-written Plugin or write a plugin to customize the Framework to your needs. External Plugins are written exactly the same way as the core Plugins.
+Creating a custom plugin lets you:
 
-- [How to create serverless plugins - Part 1](https://serverless.com/blog/writing-serverless-plugins/)
-- [How to create serverless plugins - Part 2](https://serverless.com/blog/writing-serverless-plugins-2/)
-
-Plugins can:
-
-- Define new CLI commands
-- Hook into core and custom _lifecycle events_
-- Define new variable sources
-- Extend the `serverless.yml` syntax
-- Write extra information to the CLI output
+- [Hook into _lifecycle events_ to add new logic](#lifecycle-events)
+- [Define new CLI commands](custom-commands.md)
+- [Define new variable sources](custom-variables.md)
+- [Extend the `serverless.yml` syntax](custom-configuration.md)
+- [Write extra information to the CLI output](cli-output.md)
 - Add support for new cloud providers
 
-**Note:** To ensure that your plugin works correctly with Serverless Framework `v2.x` and `v3.x`, keep the following things in mind:
-
-- Do not depend on `Bluebird` API for Promises returned by Framework internals - we are actively migrating away from `Bluebird` at this point
-- If your plugin adds new properties, ensure to define corresponding schema definitions, please refer to: [Extending validation schema](#extending-validation-schema)
-- Avoid using `subcommands` as the support for them might become deprecated or removed in next major version of the Framework
-- Add `serverless` to `peerDependencies` in order to ensure officially supported Framework version(s)
-
-## Concepts
-
-### Plugin
-
-Code which defines _Commands_, any _Lifecycle Events_ within a _Command_, and any _Hooks_ assigned to a _Lifecycle Event_.
-
-- Command // CLI configuration, commands, options
-  - LifecycleEvent(s) // Events that happen sequentially when the command is run
-    - Hook(s) // Code that runs when a Lifecycle Event happens during a Command
+## Creating a plugin
 
-### Command
-
-A CLI _Command_ that can be called by a user, e.g. `serverless foo`. A Command has no logic, but simply defines the CLI configuration (e.g. command, parameters) and the _Lifecycle Events_ for the command. Every command defines its own lifecycle events.
+The simplest way to create a Serverless Framework plugin is to write a JavaScript file:
 
 ```javascript
 'use strict';
 
 class MyPlugin {
   constructor() {
-    this.commands = {
-      foo: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
+    console.log('My plugin is loaded.');
   }
 }
 
 module.exports = MyPlugin;
 ```
 
-### Lifecycle Events
-
-Lifecycle Events are events that fire sequentially during a Command. The above example lists two Events. However, for each Event, an additional `before` and `after` event is created. Therefore, six Events exist in the above example:
-
-- `before:foo:resources`
-- `foo:resources`
-- `after:foo:resources`
-- `before:foo:functions`
-- `foo:functions`
-- `after:foo:functions`
-
-The name of the command in front of lifecycle events when they are used for Hooks.
-
-### Hooks
+The plugin can then be loaded in `serverless.yml` via a local path:
 
-A Hook binds code to any lifecycle event from any command.
+```yaml
+# serverless.yml
+service: app
 
-```javascript
-'use strict';
+functions:
+  # ...
 
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      foo: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
+plugins:
+  - ./my-plugin.js
+```
 
-    this.hooks = {
-      'before:foo:resources': this.beforeFooResources,
-      'foo:resources': this.fooResources,
-      'after:foo:functions': this.afterFooFunctions,
-    };
-  }
+### Distributing a plugin via NPM
 
-  beforeFooResources() {
-    console.log('Before Foo Resources');
-  }
+Plugins can also be published to NPM and later installed in separate projects.
 
-  fooResources() {
-    console.log('Foo Resources');
-  }
+To correctly configure the plugin's NPM package, set the `main` property to point to your plugin file in `package.json`:
 
-  afterFooFunctions() {
-    console.log('After Foo Functions');
-  }
+```json
+{
+  "main": "my-plugin.js"
 }
-
-module.exports = MyPlugin;
 ```
 
-## Custom variables
-
-Plugins can register custom configuration variables sources, for example `${my-variable-source:some-variable}`.
-
-Custom sources can be registered via `configurationVariablesSources` as a plain object that exposes a `resolve` function:
+It is also a good practice to add `serverless` to the `peerDependencies` section. That ensures that your plugin runs only with the Serverless Framework versions it supports.
 
-```javascript
-'use strict';
-
-class SomePlugin {
-  constructor() {
-
-    this.configurationVariablesSources = {
-      foo: {
-        async resolve({address, params, resolveConfigurationProperty, options}) {
-          // `address` and `params` reflect values configured with a variable:
-          // ${foo(param1, param2):address}
-          // Note: they're passed if they're configured into variable
-
-          // `options` is CLI options
-          // `resolveConfigurationProperty` allows to access other configuration properties,
-          // and guarantees to return a fully resolved form (even if property is configured with variables)
-          const stage = options.stage || await resolveConfigurationProperty(["provider", "stage"]) || "dev";
-
-          // Resolver is expected to return plain object, with resolved value set on `value` property.
-          // Resolve value can be any JSON value
-          return {
-            //
-            value: `Resolution of "foo" source for "${stage}" stage at "${address || ""}" address with "${(params || []).join(", ")}" params`
-          }
-        }
-      }
-    }
+```json
+{
+  ...
+  "peerDependencies": {
+    "serverless": "^2.60.0"
   }
 }
 ```
 
-The variable source defined above (registered via a plugin) can be used as follows:
+Once the plugin is published on NPM, follow the documentation on [Installing plugins](README.md) to use the custom plugin.
 
-```yaml
-service: test
-provider: aws
-custom:
-  value1: ${foo(one, two):whatever}
-plugins:
-  - ./my-plugin
-```
-
-The configuration will be resolved into the following:
-
-```yaml
-service: test
-provider: aws
-custom:
-  value1: Resolution of "foo" source for "dev" stage at "whatever" address with "one, two" params
-plugins:
-  - ./my-plugin
-```
-
-### Defining Options
-
-Each command can have multiple Options.
+## Lifecycle events
 
-Options are passed in with a double dash (`--`) like this: `serverless foo --function functionName`.
+Lifecycle events are events that fire sequentially during a CLI command.
 
-Option Shortcuts are passed in with a single dash (`-`) like this: `serverless foo -f functionName`.
+Additionally, for each event an additional `before` and `after` event is created. For example:
 
-The `options` object will be passed in as the second parameter to the constructor of your plugin.
+- `before:package:package`
+- `package:package`
+- `after:package:package`
+- `before:deploy:deploy`
+- `deploy:deploy`
+- `after:deploy:deploy`
 
-In it, you can optionally add a `shortcut` property, as well as a `required` property. The Framework will return an error if a `required` Option is not included. You can also set a `default` property if your option is not required.
+The `initialize` event is shared across all CLI commands and runs when the CLI starts.
 
-Additionally `type` for each option should be set. Supported types are `string`, `boolean` and `multiple` (multiple strings).
-
-**Note:** At this time, the Serverless Framework does not use parameters.
+Plugins can "hook" into existing lifecycle events to add behavior to commands like `deploy`, `package`, etc. via the `hooks` helper:
 
 ```javascript
 'use strict';
 
 class MyPlugin {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      foo: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to handle (e.g. "--function myFunction")',
-            shortcut: 'f',
-            required: true,
-            type: 'string', // Possible options: "string", "boolean", "multiple"
-          },
-        },
-      },
-    };
-
+  constructor() {
     this.hooks = {
-      'foo:functions': this.fooFunction.bind(this),
+      'initialize': this.init.bind(this),
+      'before:deploy:deploy': this.beforeDeploy.bind(this),
+      'after:deploy:deploy': this.afterDeploy.bind(this),
     };
   }
 
-  fooFunction() {
-    console.log('Foo function: ', this.options.function);
+  init() {
+    console.log('Initialization');
   }
-}
-
-module.exports = MyPlugin;
-```
 
-### Provider Specific Plugins
-
-Plugins can be provider specific which means that they are bound to a provider.
-
-**Note:** Binding a plugin to a provider is optional. Serverless will always consider your plugin if you don't specify a `provider`.
-
-The provider definition should be added inside the plugins constructor:
-
-```javascript
-'use strict';
-
-class ProviderX {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    // set the providers name here
-    this.provider = this.serverless.getProvider('providerX');
-
-    this.commands = {
-      foo: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to handle (e.g. "--function myFunction")',
-            required: true,
-            type: 'string', // Possible options: "string", "boolean", "multiple"
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'foo:functions': this.fooFunction.bind(this),
-    };
+  beforeDeploy() {
+    console.log('Before deploy');
   }
 
-  fooFunction() {
-    console.log('Foo function: ', this.options.function);
+  afterDeploy() {
+    console.log('After deploy');
   }
 }
 
-module.exports = ProviderX;
+module.exports = MyPlugin;
 ```
 
-The Plugin's functionality will now only be executed when the Serverless Service's provider matches the provider name which is defined inside the plugins constructor.
+Plugins can also create their own commands (with their own lifecycle events): read the [Custom commands documentation](custom-commands.md).
 
-### Serverless Instance
+## Serverless instance
 
-The `serverless` instance which enables access to global service config during runtime is passed in as the first parameter to the plugin constructor.
+The `serverless` parameter provides access to the service configuration at runtime:
 
 ```javascript
 'use strict';
 
 class MyPlugin {
-  constructor(serverless, options) {
+  constructor(serverless) {
     this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      log: {
-        lifecycleEvents: ['serverless'],
-      },
-    };
-
     this.hooks = {
-      'log:serverless': this.logServerless.bind(this),
+      initialize: this.init.bind(this),
     };
   }
 
-  logServerless() {
+  init() {
     console.log('Serverless instance: ', this.serverless);
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-**Note:** [Variable references](./variables.md#reference-properties-in-serverlessyml) in the `serverless` instance are not resolved before a Plugin's constructor is called, so if you need these, make sure to wait to access those from your [hooks](#hooks).
-
-### Command Naming
-
-Command names need to be unique. If we load two commands and both want to specify the same command (e.g. we have an integrated command `deploy` and an external command also wants to use `deploy`) the Serverless CLI will print an error and exit. If you want to have your own `deploy` command you need to name it something different like `myCompanyDeploy` so they don't clash with existing plugins.
-
-### Extending validation schema
-
-If your plugin adds support for additional params in `serverless.yml` file, you should also add validation rules to the Framework's schema. Otherwise, the Framework may place validation errors to command output about your params.
-
-The Framework uses JSON-schema validation backed by [AJV](https://github.com/ajv-validator/ajv). You can extend [initial schema](/lib/configSchema/index.js) inside your plugin constuctor by using `defineTopLevelProperty`, `defineCustomProperties`, `defineFunctionEvent`, `defineFunctionEventProperties`, `defineFunctionProperties` or `defineProvider` helpers.
-
-Use the following map to know which helper suits best your needs.
-
-```yml
-custom:
-  my-plugin:
-    customProperty: foobar # <-- use defineCustomProperties
-
-my-plugin: # <-- use defineTopLevelProperty
-  customProperty: foobar
-
-provider:
-  name: new-provider # <-- use defineProvider
-  my-plugin:
-    customProperty: foobar
-
-functions:
-  someFunc:
-    handler: handler.main
-    customProperty: foobar # <-- use defineFunctionProperties
-    events:
-      - yourPluginEvent: # <-- use defineFunctionEvent
-          customProperty: foobar
-      - http:
-          customProperty: foobar # <-- use defineFunctionEventProperties
-```
-
-We'll walk though those helpers. You may also want to check out examples from [helpers tests](tests/fixtures/configSchemaExtensions/test-plugin.js)
-
-#### `defineTopLevelProperty` helper
-
-If your plugin requires additional top-level properties (like `provider`, `custom`, `service`...), you can use the `defineTopLevelProperty` helper to add their definition.
-
-Considering the following example
-
-```yml
-// serverless.yml
 
-service: my-service
-
-yourPlugin:
-  someProperty: foobar
-```
-
-you'll need to add validation rules as described below:
-
-```javascript
-class NewTopLevelPropertyPlugin {
-  constructor(serverless) {
-    this.serverless = serverless;
-
-    // Create schema for your properties. For reference use https://github.com/ajv-validator/ajv
-    const newCustomPropSchema = {
-      type: 'object',
-      properties: {
-        someProperty: { type: 'string' },
-      },
-      required: ['someProperty'],
-    };
-
-    // Attach your piece of schema to main schema at top level
-    serverless.configSchemaHandler.defineTopLevelProperty('yourPlugin', newCustomPropSchema);
-  }
-}
-```
-
-This way, if user sets `someProperty` by mistake to `false`, the Framework would display an error:
-
-```
-Serverless: Configuration error: yourPlugin.someProperty should be string
-```
-
-#### `defineCustomProperties` helper
-
-Let's say your plugin depends on some properties defined in `custom` section of `serverless.yml` file.
-
-```yml
-// serverless.yml
-
-custom:
-  yourPlugin:
-    someProperty: foobar
-```
-
-To add validation rules to these properties, your plugin would look like this:
-
-```javascript
-class NewEventPlugin {
-  constructor(serverless) {
-    this.serverless = serverless;
-
-    // Create schema for your properties. For reference use https://github.com/ajv-validator/ajv
-    const newCustomPropSchema = {
-      type: 'object',
-      properties: {
-        someProperty: { type: 'string' },
-      },
-      required: ['someProperty'],
-    };
-
-    // Attach your piece of schema to main schema
-    serverless.configSchemaHandler.defineCustomProperties(newCustomPropSchema);
+    // `serverless.service` contains the (resolved) serverless.yml config
+    const service = this.serverless.service;
+    console.log('Provider name: ', service.provider.name);
+    console.log('Functions: ', service.functions);
   }
 }
-```
-
-This way, if user sets `someProperty` by mistake to `false`, the Framework would display an error:
-
-```
-Serverless: Configuration error: custom.yourPlugin.someProperty should be string
-```
-
-#### `defineFunctionEvent` helper
-
-Let's say your plugin adds support to a new `yourPluginEvent` function event. To use this event, a user would need to have `serverless.yml` file like this:
-
-```yml
-// serverless.yml
-
-functions:
-  someFunc:
-    handler: handler.main
-    events:
-      - yourPluginEvent:
-          someProp: hello
-          anotherProp: 1
-```
-
-In this case your plugin should add validation rules inside your plugin constructor. Otherwise, the Framework would display an error message saying that your event is not supported:
-
-```
-Serverless: Configuration error: Unsupported function event 'yourPluginEvent'
-```
-
-To fix this error and more importantly to provide validation rules for your event, modify your plugin constructor with code like this:
-
-```javascript
-class NewEventPlugin {
-  constructor(serverless) {
-    this.serverless = serverless;
 
-    // Create schema for your properties. For reference use https://github.com/ajv-validator/ajv
-    serverless.configSchemaHandler.defineFunctionEvent('providerName', 'yourPluginEvent', {
-      type: 'object',
-      properties: {
-        someProp: { type: 'string' },
-        anotherProp: { type: 'number' },
-      },
-      required: ['someProp'],
-      additionalProperties: false,
-    });
-  }
-}
-```
-
-This way, if user sets `anotherProp` by mistake to `some-string`, the Framework would display an error:
-
-```
-Serverless: Configuration error: functions.someFunc.events[0].yourPluginEvent.anotherProp should be number
-```
-
-#### `defineFunctionEventProperties` helper
-
-When your plugin extend other plugin events definition for a specific provider, you can use the `defineFunctionEventProperties` to extend event definition with your custom properties.
-
-For example, if your plugin adds support to a new `documentation` property on `http` event from `aws` provider, you should add validations rules inside your plugin constructor for this new property.
-
-```javascript
-class NewEventPlugin {
-  constructor(serverless) {
-    this.serverless = serverless;
-
-    // Create schema for your properties. For reference use https://github.com/ajv-validator/ajv
-    serverless.configSchemaHandler.defineFunctionEventProperties('aws', 'http', {
-      properties: {
-        documentation: { type: 'object' },
-      },
-      required: ['documentation'],
-    });
-  }
-}
-```
-
-This way, if user sets `documentation` by mistake to `anyString`, the Framework would display an error:
-
-```
-Serverless: Configuration error: functions.someFunc.events[0].http.documentation should be object
-```
-
-#### `defineFunctionProperties` helper
-
-Let's say your plugin adds support to a new `someProperty` function property. To use this property, a user would need to have `serverless.yml` file like this:
-
-```yml
-// serverless.yml
-
-functions:
-  someFunc:
-    handler: handler.main
-    someProperty: my-property-value
+module.exports = MyPlugin;
 ```
 
-In this case your plugin should add validation rules inside your plugin constructor. Otherwise, the Framework would display an error message saying that your property is not supported:
+**Note:** configuration values are only resolved _after_ plugins are initialized. Do not try to read configuration in the plugin constructor, as variables aren't resolved yet. Read configuration in lifecycle events only.
 
-```
-ServerlessError: Configuration error:
-at 'functions.someFunc': unrecognized property 'someProperty'
-```
+## CLI options
 
-To fix this error and more importantly to provide validation rules for your property, modify your plugin constructor with code like this:
+The `options` parameter provides access to the CLI options provided to the command:
 
 ```javascript
-class NewFunctionPropertiesPlugin {
-  constructor(serverless) {
-    this.serverless = serverless;
-
-    // Create schema for your properties. For reference use https://github.com/ajv-validator/ajv
-    serverless.configSchemaHandler.defineFunctionProperties('providerName', {
-      properties: {
-        someProperty: { type: 'string' },
-        anotherProperty: { type: 'number' },
-      },
-      required: ['someProperty'],
-    });
+class MyPlugin {
+  constructor(serverless, options) {
+    // Log if a --verbose option was passed:
+    console.log(options.verbose);
   }
 }
 ```
 
-This way, if user sets `anotherProperty` by mistake to `hello`, the Framework would display an error:
+## Provider-specific plugins
 
-```
-ServerlessError: Configuration error at 'functions.someFunc.anotherProperty': should be number
-```
+Plugins can be provider specific, which means that run only with a specific provider.
 
-#### `defineProvider` helper
+**Note:** Binding a plugin to a provider is optional. Serverless will always consider your plugin if you don't specify a `provider`.
 
-In case your plugin provides support for new provider, you would want to adjust validation schema. Here is example:
+To bind to a specific provider, retrieve it and set the `this.provider` property in the plugin constructor:
 
 ```javascript
-class NewProviderPlugin {
-  constructor(serverless) {
-    this.serverless = serverless;
+class MyPlugin {
+  constructor(serverless, options) {
+    // bind to a specific provider
+    this.provider = serverless.getProvider('providerX');
 
-    // Create schema for your provider. For reference use https://github.com/ajv-validator/ajv
-    serverless.configSchemaHandler.defineProvider('newProvider', {
-      // Eventual reusable schema definitions (will be put to top level "definitions" object)
-      definitions: {
-        // ...
-      },
-
-      // Top level "provider" properties
-      provider: {
-        properties: {
-          stage: { type: 'string' },
-          remoteFunctionData: { type: 'null' },
-        },
-      },
-
-      // Function level properties
-      function: {
-        properties: { handler: { type: 'string' } },
-      },
-
-      // Function events definitions (can be defined here or via `defineFunctionEvent` helper)
-      functionEvents: {
-        someEvent: {
-          name: 'someEvent',
-          schema: {
-            type: 'object',
-            properties: {
-              someRequiredStringProp: { type: 'string' },
-              someNumberProp: { type: 'number' },
-            },
-            required: ['someRequiredStringProp'],
-            additionalProperties: false,
-          },
-        },
-      },
-
-      // Definition for eventual top level "resources" section
-      resources: {
-        type: 'object',
-        properties: {
-          // ...
-        },
-      },
-
-      // Definition for eventual top level "layers" section
-      layers: {
-        type: 'object',
-        additionalProperties: {
-          type: 'object',
-          properties: {
-            // ...
-          },
-        },
-      },
-    });
+    // ...
   }
 }
 ```
 
-### Extending the `info` command
-
-The `info` command which is used to display information about the deployment has detailed `lifecycleEvents` you can hook into to add and display custom information.
-
-Here's an example overview of the info lifecycle events the AWS implementation exposes:
-
-```
--> info:info
-  -> aws:info:validate
-  -> aws:info:gatherData
-  -> aws:info:displayServiceInfo
-  -> aws:info:displayApiKeys
-  -> aws:info:displayEndpoints
-  -> aws:info:displayFunctions
-  -> aws:info:displayStackOutputs
-```
-
-Here you could e.g. hook into `after:aws:info:gatherData` and implement your own data collection and display it to the user.
-
-**Note:** Every provider implements its own `info` plugin so you might want to take a look into the `lifecycleEvents` the provider `info` plugin exposes.
+The plugin will now only be executed when the service's provider matches the given provider.
diff --git a/docs/guides/plugins/custom-commands.md b/docs/guides/plugins/custom-commands.md
new file mode 100644
index 00000000000..2e445f3c233
--- /dev/null
+++ b/docs/guides/plugins/custom-commands.md
@@ -0,0 +1,125 @@
+<!--
+title: Serverless Framework - Plugins - Custom commands
+menuText: Plugins
+menuOrder: 14
+description: How to create custom Serverless Framework commands via a plugin
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/guides/plugins/custom-commands)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# Custom commands
+
+Serverless Framework plugins can define custom CLI commands.
+
+These commands can then be called by users, for example: `serverless my-command`.
+
+```javascript
+class MyPlugin {
+  constructor() {
+    this.commands = {
+      'my-command': {
+        lifecycleEvents: ['resources', 'functions'],
+      },
+    };
+  }
+}
+
+module.exports = MyPlugin;
+```
+
+A CLI _Command_ that can be called by a user, e.g. `serverless foo`. A Command has no logic, but simply defines the CLI configuration (e.g. command, parameters) and the _Lifecycle Events_ for the command. Every command defines its own lifecycle events.
+
+## Lifecycle events
+
+By default, a command has no logic. Use _lifecycle event hooks_ to add logic when the command runs:
+
+```javascript
+class MyPlugin {
+  constructor() {
+    this.commands = {
+      'my-command': {
+        lifecycleEvents: ['run'],
+      },
+    };
+
+    this.hooks = {
+      'my-command:run': () => {
+        console.log('My command runs');
+      },
+    };
+  }
+}
+```
+
+For each event, an additional `before` and `after` event is created:
+
+```js
+this.hooks = {
+  'before:my-command:run': () => {
+    console.log('Before');
+  },
+  'my-command:run': () => {
+    console.log('My command runs');
+  },
+  'after:my-command:run': () => {
+    console.log('After');
+  },
+};
+```
+
+Note that a command can define multiple events: these will be called sequentially.
+
+## Command options
+
+Commands can have CLI options:
+
+- either passed with a double dash (`--`): `serverless my-command --function functionName`.
+- or as a shortcut with a single dash (`-`): `serverless my-command -f functionName`.
+
+Options can be specified in the command definition. The value of the CLI option can be retrieved via the `options` parameter of the plugin:
+
+```javascript
+class MyPlugin {
+  constructor(serverless, options) {
+    this.options = options;
+
+    this.commands = {
+      'my-command': {
+        // The 'usage' property is used to display the 'serverless --help' output
+        usage: 'This is my new custom command!',
+        lifecycleEvents: ['run'],
+        options: {
+          // Define the '--function' option with the '-f' shortcut
+          function: {
+            usage: 'Specify the function you want to handle (e.g. "--function myFunction")',
+            shortcut: 'f',
+            required: true,
+            type: 'string', // Possible values: 'string', 'boolean', 'multiple'
+          },
+        },
+      },
+    };
+
+    this.hooks = {
+      'my-command:run': this.run.bind(this),
+    };
+  }
+
+  run() {
+    console.log('The option was: ', this.options.function);
+  }
+}
+```
+
+If an option is not required, a `default` property can be set in the option definition.
+
+## Command naming
+
+Command names must be unique across all plugins. For example instead of defining a custom `deploy` command, name it `my-company-deploy` instead.
+
+If a plugin defines a command name that conflicts with Serverless Framework core or another plugin, the CLI will exit with an error.
diff --git a/docs/guides/plugins/custom-configuration.md b/docs/guides/plugins/custom-configuration.md
new file mode 100644
index 00000000000..8ce01378041
--- /dev/null
+++ b/docs/guides/plugins/custom-configuration.md
@@ -0,0 +1,345 @@
+<!--
+title: Serverless Framework - Plugins - Extending the configuration
+menuText: Plugins
+menuOrder: 14
+description: How to extend the serverless.yml syntax with custom configuration via a plugin
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/guides/plugins/custom-configuration)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# Extending the configuration
+
+Plugin can extend the `serverless.yml` syntax with custom configuration:
+
+```yaml
+service: app
+provider:
+  name: aws
+
+# ...
+
+my-plugin:
+  my-plugin-config: foo
+```
+
+To do so, plugins must define schema validation (see below), and can retrieve configuration values via `serverless.service`:
+
+```js
+class MyPlugin {
+  constructor(serverless) {
+    this.serverless = serverless;
+    this.hooks = {
+      'before:deploy': this.beforeDeploy.bind(this),
+    };
+  }
+
+  beforeDeploy() {
+    // `service` contains the (resolved) serverless.yml config
+    const service = this.serverless.service;
+    console.log('Provider name: ', service.provider.name);
+    console.log('Functions: ', service.functions);
+    console.log('Custom plugin config: ', service['my-plugin']['my-plugin-config']);
+  }
+}
+
+module.exports = MyPlugin;
+```
+
+**Note:** configuration values are only resolved _after_ plugins are initialized. Do not try to read configuration in the plugin constructor, as variables aren't resolved yet. Read configuration in lifecycle events only.
+
+## Validating the configuration
+
+Any additional configuration defined by plugins in `serverless.yml` must come with validation rules.
+
+Serverless Framework uses JSON schema validation backed by [the AJV library](https://github.com/ajv-validator/ajv). You can extend [the base schema](/lib/configSchema/index.js) in plugins via:
+
+- `defineTopLevelProperty`
+- `defineCustomProperties`
+- `defineFunctionEvent`
+- `defineFunctionEventProperties`
+- `defineFunctionProperties`
+- `defineProvider`
+
+Use the following map to know which helper suits your needs:
+
+```yml
+custom:
+  my-plugin:
+    customProperty: foobar # <-- use defineCustomProperties
+
+my-plugin: # <-- use defineTopLevelProperty
+  customProperty: foobar
+
+provider:
+  name: new-provider # <-- use defineProvider
+  my-plugin:
+    customProperty: foobar
+
+functions:
+  someFunc:
+    handler: handler.main
+    customProperty: foobar # <-- use defineFunctionProperties
+    events:
+      - yourPluginEvent: # <-- use defineFunctionEvent
+          customProperty: foobar
+      - http:
+          customProperty: foobar # <-- use defineFunctionEventProperties
+```
+
+We'll walk though those helpers. You may also want to check out examples from [helpers tests](tests/fixtures/configSchemaExtensions/test-plugin.js)
+
+### Top-level properties via `defineTopLevelProperty`
+
+If your plugin requires additional top-level properties (like `provider`, `custom`, `service`...), you can use the `defineTopLevelProperty` helper to add their definition. For example:
+
+```yml
+# serverless.yml
+service: my-service
+
+myPlugin:
+  someProperty: foobar
+```
+
+Add validation for the `myPlugin:` section:
+
+```javascript
+class MyPlugin {
+  constructor(serverless) {
+    // For reference on JSON schema, see https://github.com/ajv-validator/ajv
+    serverless.configSchemaHandler.defineTopLevelProperty('myPlugin', {
+      type: 'object',
+      properties: {
+        someProperty: { type: 'string' },
+      },
+      required: ['someProperty'],
+    });
+  }
+}
+```
+
+This way, if the user sets `someProperty` by mistake to `false`, the Framework would display an error:
+
+```
+Configuration error: yourPlugin.someProperty should be string
+```
+
+### Properties in `custom` via `defineCustomProperties`
+
+If your plugin depends on properties defined in the `custom:` section, you can use the `defineCustomProperties` helper. For example:
+
+```yml
+# serverless.yml
+
+custom:
+  myCustomProperty: foobar
+```
+
+Add validation for the `myCustomProperty` property:
+
+```javascript
+class MyPlugin {
+  constructor(serverless) {
+    // For reference on JSON schema, see https://github.com/ajv-validator/ajv
+    serverless.configSchemaHandler.defineCustomProperties({
+      type: 'object',
+      properties: {
+        myCustomProperty: { type: 'string' },
+      },
+      required: ['myCustomProperty'],
+    });
+  }
+}
+```
+
+This way, if the user sets `myCustomProperty` by mistake to `false`, the Framework would display an error:
+
+```
+Configuration error: custom.myCustomProperty should be string
+```
+
+### Function properties via `defineFunctionProperties`
+
+If your plugin adds new properties to functions, you can use the `defineFunctionProperties` helper. For example:
+
+```yml
+# serverless.yml
+
+functions:
+  foo:
+    handler: handler.main
+    someCustomProperty: my-property-value
+```
+
+Add validation for the `someCustomProperty` property:
+
+```javascript
+class MyPlugin {
+  constructor(serverless) {
+    // For reference on JSON schema, see https://github.com/ajv-validator/ajv
+    serverless.configSchemaHandler.defineFunctionProperties('providerName', {
+      properties: {
+        someCustomProperty: { type: 'string' },
+        anotherProperty: { type: 'number' },
+      },
+      required: ['someCustomProperty'],
+    });
+  }
+}
+```
+
+This way, if the user sets `anotherProperty` by mistake to `hello`, the Framework would display an error:
+
+```
+Configuration error at 'functions.foo.anotherProperty': should be number
+```
+
+### Function events via `defineFunctionEvent`
+
+If your plugin adds support to a new function event, you can use the `defineFunctionEvent` helper. For example:
+
+```yml
+# serverless.yml
+
+functions:
+  someFunc:
+    handler: handler.main
+    events:
+      - myPluginEvent:
+          someProp: hello
+          anotherProp: 1
+```
+
+Add validation for the `myPluginEvent` event:
+
+```javascript
+class MyPlugin {
+  constructor(serverless) {
+    // For reference on JSON schema, see https://github.com/ajv-validator/ajv
+    serverless.configSchemaHandler.defineFunctionEvent('providerName', 'myPluginEvent', {
+      type: 'object',
+      properties: {
+        someProp: { type: 'string' },
+        anotherProp: { type: 'number' },
+      },
+      required: ['someProp'],
+      additionalProperties: false,
+    });
+  }
+}
+```
+
+This way, if the user sets `anotherProp` by mistake to `some-string`, the Framework would display an error:
+
+```
+Configuration error: functions.someFunc.events[0].myPluginEvent.anotherProp should be number
+```
+
+### Function event properties via `defineFunctionEventProperties`
+
+If your plugin adds new properties to a function event, you can use the `defineFunctionEventProperties` helper. For example:
+
+```yml
+# serverless.yml
+
+functions:
+  foo:
+    handler: handler.main
+    events:
+      - http:
+          path: '/quote'
+          method: GET
+          documentation: Get a quote
+```
+
+In the example above, the plugin adds a new `documentation` property on `http` events for `aws`. To validate that properties:
+
+```javascript
+class MyPlugin {
+  constructor(serverless) {
+    // For reference on JSON schema, see https://github.com/ajv-validator/ajv
+    serverless.configSchemaHandler.defineFunctionEventProperties('aws', 'http', {
+      properties: {
+        documentation: { type: 'string' },
+      },
+      required: ['documentation'],
+    });
+  }
+}
+```
+
+This way, if the user sets `documentation` by mistake to `false`, the Framework would display an error:
+
+```
+Configuration error: functions.foo.events[0].http.documentation should be a string
+```
+
+### New provider via `defineProvider`
+
+If your plugin provides support for a new provider, register it via `defineProvider`:
+
+```javascript
+class MyPlugin {
+  constructor(serverless) {
+    // For reference on JSON schema, see https://github.com/ajv-validator/ajv
+    serverless.configSchemaHandler.defineProvider('newProvider', {
+      // Eventual reusable schema definitions (will be put to top level "definitions" object)
+      definitions: {
+        // ...
+      },
+
+      // Top level "provider" properties
+      provider: {
+        properties: {
+          stage: { type: 'string' },
+          remoteFunctionData: { type: 'null' },
+        },
+      },
+
+      // Function level properties
+      function: {
+        properties: { handler: { type: 'string' } },
+      },
+
+      // Function events definitions (can be defined here or via `defineFunctionEvent` helper)
+      functionEvents: {
+        someEvent: {
+          name: 'someEvent',
+          schema: {
+            type: 'object',
+            properties: {
+              someRequiredStringProp: { type: 'string' },
+              someNumberProp: { type: 'number' },
+            },
+            required: ['someRequiredStringProp'],
+            additionalProperties: false,
+          },
+        },
+      },
+
+      // Definition for eventual top level "resources" section
+      resources: {
+        type: 'object',
+        properties: {
+          // ...
+        },
+      },
+
+      // Definition for eventual top level "layers" section
+      layers: {
+        type: 'object',
+        additionalProperties: {
+          type: 'object',
+          properties: {
+            // ...
+          },
+        },
+      },
+    });
+  }
+}
+```
diff --git a/docs/guides/plugins/custom-variables.md b/docs/guides/plugins/custom-variables.md
new file mode 100644
index 00000000000..25292f6a709
--- /dev/null
+++ b/docs/guides/plugins/custom-variables.md
@@ -0,0 +1,128 @@
+<!--
+title: Serverless Framework - Plugins - Custom variables
+menuText: Plugins
+menuOrder: 14
+description: How to create custom Serverless Framework variables via a plugin
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/guides/plugins/custom-variables)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# Custom variables
+
+Plugins can register custom variables sources, for example `${foo:some-variable}`.
+
+Custom sources can be registered via `configurationVariablesSources` as an object with a `resolve` function:
+
+```javascript
+'use strict';
+
+class SomePlugin {
+  constructor() {
+    this.configurationVariablesSources = {
+      foo: {
+        async resolve({ address }) {
+          // `address` contains the name of the variable to resolve:
+          // In `${foo:some-variable}`, address will contain `some-variable`.
+
+          // Resolver is expected to return an object with the value in the `value` property:
+          return {
+            //
+            value: `Resolving variable ${address}`,
+          };
+        },
+      },
+    };
+  }
+}
+
+module.exports = MyPlugin;
+```
+
+The variable source defined above (registered via a plugin) can be used as follows:
+
+```yaml
+service: test
+# ...
+
+custom:
+  value1: ${foo:bar}
+
+plugins:
+  - ./my-plugin
+```
+
+The configuration will be resolved into the following:
+
+```yaml
+service: test
+# ...
+
+custom:
+  value1: Resolving variable bar
+
+plugins:
+  - ./my-plugin
+```
+
+## Variable parameters
+
+Variable sources can support advanced use cases via parameters:
+
+```yaml
+service: test
+# ...
+
+custom:
+  value1: ${foo(one, two):bar}
+```
+
+Parameters can be retrieved in the `params` argument:
+
+```javascript
+class SomePlugin {
+  constructor() {
+    this.configurationVariablesSources = {
+      foo: {
+        async resolve({ address, params }) {
+          return {
+            // In the example below, ${foo(one, two):bar} will
+            // resolve to "one,two"
+            value: (params || []).join(','),
+          };
+        },
+      },
+    };
+  }
+}
+```
+
+## Resolving configuration values and options
+
+It is possible to retrieve other configuration values and CLI options in the variable resolver:
+
+```javascript
+class SomePlugin {
+  constructor() {
+    this.configurationVariablesSources = {
+      foo: {
+        async resolve({ resolveConfigurationProperty, options }) {
+          // `options` is CLI options
+          // `resolveConfigurationProperty` allows to access other configuration properties,
+          // and guarantees to return a fully resolved form (even if property is configured with variables)
+          const stage =
+            options.stage || (await resolveConfigurationProperty(['provider', 'stage'])) || 'dev';
+
+          return {
+            value: `Resolving with ${stage}`,
+          };
+        },
+      },
+    };
+  }
+}
+```

From 39f0ea90043d039df473b671acdab8477e15f414 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Tue, 26 Oct 2021 10:36:44 +0200
Subject: [PATCH 0669/1101] docs: Explain that the "CLI output" plugin API is
 available for v3

---
 docs/guides/plugins/cli-output.md | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/guides/plugins/cli-output.md b/docs/guides/plugins/cli-output.md
index 54dc4e2d765..3cff6937790 100644
--- a/docs/guides/plugins/cli-output.md
+++ b/docs/guides/plugins/cli-output.md
@@ -14,11 +14,22 @@ layout: Doc
 
 # CLI output in plugins
 
+**Warning:** the API documented on this page is available in Serverless Framework v3, which is not released yet. This documentation is published to help plugins upgrade to v3.
+
 Plugins can integrate and extend the CLI output of the Serverless Framework in different ways.
 
 ## Writing to the output
 
-Plugins can log messages to the CLI output via a standard `log` interface:
+In Serverless Framework v2, plugins could write to the CLI output via `serverless.cli.log()`:
+
+```js
+// This approach is deprecated:
+serverless.cli.log('Message');
+```
+
+The method above is deprecated. It should no longer be used in Serverless Framework v3.
+
+Instead, plugins can log messages to the CLI output via a standard `log` interface:
 
 ```js
 class MyPlugin {

From 7739a039f89749dc50b08681a182a4ecddde027d Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Tue, 26 Oct 2021 10:50:16 +0200
Subject: [PATCH 0670/1101] docs: Organize plugin documentation in the menu

---
 docs/guides/plugins/README.md               | 2 +-
 docs/guides/plugins/cli-output.md           | 4 ++--
 docs/guides/plugins/creating-plugins.md     | 4 ++--
 docs/guides/plugins/custom-commands.md      | 4 ++--
 docs/guides/plugins/custom-configuration.md | 4 ++--
 docs/guides/plugins/custom-variables.md     | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/guides/plugins/README.md b/docs/guides/plugins/README.md
index 58e21328078..0218ec342d5 100644
--- a/docs/guides/plugins/README.md
+++ b/docs/guides/plugins/README.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework - Plugins
 menuText: Plugins
-menuOrder: 14
+menuOrder: 2
 description: How to install plugins to customize the Serverless Framework
 layout: Doc
 -->
diff --git a/docs/guides/plugins/cli-output.md b/docs/guides/plugins/cli-output.md
index 3cff6937790..7d9cee6181d 100644
--- a/docs/guides/plugins/cli-output.md
+++ b/docs/guides/plugins/cli-output.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework - Plugins - CLI output
-menuText: Plugins
-menuOrder: 14
+menuText: CLI output
+menuOrder: 2
 description: How to write to the CLI output in Serverless Framework plugins.
 layout: Doc
 -->
diff --git a/docs/guides/plugins/creating-plugins.md b/docs/guides/plugins/creating-plugins.md
index abff4493f5b..ce34b3f9936 100644
--- a/docs/guides/plugins/creating-plugins.md
+++ b/docs/guides/plugins/creating-plugins.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework - Creating plugins
-menuText: Plugins
-menuOrder: 14
+menuText: Creating plugins
+menuOrder: 1
 description: How to create custom plugins to customize the Serverless Framework
 layout: Doc
 -->
diff --git a/docs/guides/plugins/custom-commands.md b/docs/guides/plugins/custom-commands.md
index 2e445f3c233..97df0533994 100644
--- a/docs/guides/plugins/custom-commands.md
+++ b/docs/guides/plugins/custom-commands.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework - Plugins - Custom commands
-menuText: Plugins
-menuOrder: 14
+menuText: Custom commands
+menuOrder: 3
 description: How to create custom Serverless Framework commands via a plugin
 layout: Doc
 -->
diff --git a/docs/guides/plugins/custom-configuration.md b/docs/guides/plugins/custom-configuration.md
index 8ce01378041..c5450ca3746 100644
--- a/docs/guides/plugins/custom-configuration.md
+++ b/docs/guides/plugins/custom-configuration.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework - Plugins - Extending the configuration
-menuText: Plugins
-menuOrder: 14
+menuText: Extending the configuration
+menuOrder: 5
 description: How to extend the serverless.yml syntax with custom configuration via a plugin
 layout: Doc
 -->
diff --git a/docs/guides/plugins/custom-variables.md b/docs/guides/plugins/custom-variables.md
index 25292f6a709..b8bf4ef3468 100644
--- a/docs/guides/plugins/custom-variables.md
+++ b/docs/guides/plugins/custom-variables.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework - Plugins - Custom variables
-menuText: Plugins
-menuOrder: 14
+menuText: Custom variables
+menuOrder: 4
 description: How to create custom Serverless Framework variables via a plugin
 layout: Doc
 -->

From b64017cff58cc76e360420e558483fd8b3c96870 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Tue, 26 Oct 2021 11:24:28 +0200
Subject: [PATCH 0671/1101] docs: Remove documentation of `local_path` for
 loading plugins

This feature was deprecated
---
 docs/guides/plugins/README.md | 47 +++--------------------------------
 1 file changed, 3 insertions(+), 44 deletions(-)

diff --git a/docs/guides/plugins/README.md b/docs/guides/plugins/README.md
index 0218ec342d5..a0d06ab2813 100644
--- a/docs/guides/plugins/README.md
+++ b/docs/guides/plugins/README.md
@@ -47,26 +47,6 @@ plugins:
   - custom-serverless-plugin
 ```
 
-The `plugins` section supports two formats:
-
-Array object:
-
-```yml
-plugins:
-  - plugin1
-  - plugin2
-```
-
-Enhanced plugins object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - plugin1
-    - plugin2
-```
-
 Some plugins require extra configuration. The `custom` section in `serverless.yml` is where you can add extra configuration for plugins (the plugin's documentation will tell you if you need to add anything there):
 
 ```yml
@@ -79,35 +59,14 @@ custom:
 
 ## Service local plugin
 
-If you are working on a plugin or have a plugin that is just designed for one project, it can be loaded from the local `.serverless_plugins` folder at the root of your service. Local plugins can be added in the `plugins` array in `serverless.yml`.
+If you are working on a plugin, or have a plugin that is just designed for one project, it can be loaded from local files:
 
 ```yml
 plugins:
-  - custom-serverless-plugin
-```
-
-The local plugin folder can be customized:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - custom-serverless-plugin
+  - ./local-directory/custom-serverless-plugin
 ```
 
-The `custom-serverless-plugin` will be loaded from the `custom_serverless_plugins` directory at the root of your service. If the `localPath` is not provided or empty, the `.serverless_plugins` directory will be used.
-
-The plugin will be loaded based on being named `custom-serverless-plugin.js` or `custom-serverless-plugin/index.js` in the root of `localPath` folder (`.serverless_plugins` by default).
-
-If you want to load a plugin from a specific directory without affecting other plugins, you can also specify a path relative to the root of your service:
-
-```yaml
-plugins:
-  # This plugin will be loaded from the `.serverless_plugins/` or `node_modules/` directories
-  - custom-serverless-plugin
-  # This plugin will be loaded from the `sub/directory/` directory
-  - ./sub/directory/another-custom-plugin
-```
+The path must start with `./` and is relative to the root of your service.
 
 ## Load Order
 

From da2e15b245c353dfb90debb1a56252f8ee139614 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Tue, 26 Oct 2021 11:29:52 +0200
Subject: [PATCH 0672/1101] docs: Remove legacy "Plugin" documentation pages
 (in all providers)

---
 docs/providers/aliyun/guide/plugins.md    | 304 ----------------
 docs/providers/azure/guide/plugins.md     | 390 --------------------
 docs/providers/google/guide/plugins.md    | 365 -------------------
 docs/providers/knative/guide/plugins.md   | 420 ----------------------
 docs/providers/openwhisk/guide/plugins.md | 365 -------------------
 docs/providers/tencent/guide/plugins.md   | 420 ----------------------
 6 files changed, 2264 deletions(-)
 delete mode 100644 docs/providers/aliyun/guide/plugins.md
 delete mode 100644 docs/providers/azure/guide/plugins.md
 delete mode 100644 docs/providers/google/guide/plugins.md
 delete mode 100644 docs/providers/knative/guide/plugins.md
 delete mode 100644 docs/providers/openwhisk/guide/plugins.md
 delete mode 100644 docs/providers/tencent/guide/plugins.md

diff --git a/docs/providers/aliyun/guide/plugins.md b/docs/providers/aliyun/guide/plugins.md
deleted file mode 100644
index 4c31df76220..00000000000
--- a/docs/providers/aliyun/guide/plugins.md
+++ /dev/null
@@ -1,304 +0,0 @@
-<!--
-title: Serverless Framework - Alibaba Cloud Function Compute Guide - Plugins
-menuText: Plugins
-menuOrder: 13
-description: How to install and create Plugins to extend or overwrite the functionality of the Serverless Framework
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aliyun/guide/plugins)
-
-<!-- DOCS-SITE-LINK:END -->
-
-# Alibaba Cloud - Plugins
-
-A Plugin is custom Javascript code that creates new or extends existing commands within the Serverless Framework. The Serverless Framework is merely a group of Plugins that are provided in the core. If you or your organization have a specific workflow, install a pre-written Plugin or write a plugin to customize the Framework to your needs. External Plugins are written exactly the same way as the core Plugins.
-
-- [How to create serverless plugins - Part 1](https://serverless.com/blog/writing-serverless-plugins/)
-- [How to create serverless plugins - Part 2](https://serverless.com/blog/writing-serverless-plugins-2/)
-
-## Installing Plugins
-
-External Plugins are added on a per service basis and are not applied globally. Make sure you are in your Service's root directory, then install the corresponding Plugin with the help of npm:
-
-```
-npm install --save custom-serverless-plugin
-```
-
-We need to tell Serverless that we want to use the plugin inside our service. We do this by adding the name of the Plugin to the `plugins` section in the `serverless.yml` file.
-
-```yml
-# serverless.yml file
-
-plugins:
-  - custom-serverless-plugin
-```
-
-Plugins might want to add extra information which should be accessible to Serverless. The `custom` section in the `serverless.yml` file is the place where you can add necessary configurations for your plugins (the plugins author / documentation will tell you if you need to add anything there):
-
-```yml
-plugins:
-  - custom-serverless-plugin
-
-custom:
-  customkey: customvalue
-```
-
-## Service local plugin
-
-If you are working on a plugin or have a plugin that is just designed for one project you can add them to the `.serverless_plugins` directory at the root of your service, and in the `plugins` array in `serverless.yml`.
-
-The plugin will be loaded based on being named `custom-serverless-plugin.js` or `custom-serverless-plugin\index.js` in the root of `.serverless_plugins` folder.
-
-### Load Order
-
-Keep in mind that the order you define your plugins matters. When Serverless loads all the core plugins and then the custom plugins in the order you've defined them.
-
-```yml
-# serverless.yml
-
-plugins:
-  - plugin1
-  - plugin2
-```
-
-In this case `plugin1` is loaded before `plugin2`.
-
-## Writing Plugins
-
-### Concepts
-
-#### Plugin
-
-Code which defines _Commands_, any _Events_ within a _Command_, and any _Hooks_ assigned to an _Lifecycle Event_.
-
-- Command // CLI configuration, commands, subcommands, options
-  - LifecycleEvent(s) // Events that happen sequentially when the command is run
-    - Hook(s) // Code that runs when a Lifecycle Event happens during a Command
-
-#### Command
-
-A CLI _Command_ that can be called by a user, e.g. `serverless deploy`. A Command has no logic, but simply defines the CLI configuration (e.g. command, subcommands, parameters) and the _Lifecycle Events_ for the command. Every command defines its own lifecycle events.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-#### Lifecycle Events
-
-Events that fire sequentially during a Command. The above example list two Events. However, for each Event, and additional `before` and `after` event is created. Therefore, six Events exist in the above example:
-
-- `before:deploy:resources`
-- `deploy:resources`
-- `after:deploy:resources`
-- `before:deploy:functions`
-- `deploy:functions`
-- `after:deploy:functions`
-
-The name of the command in front of lifecycle events when they are used for Hooks.
-
-#### Hooks
-
-A Hook binds code to any lifecycle event from any command.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-
-    this.hooks = {
-      'before:deploy:resources': this.beforeDeployResources,
-      'deploy:resources': this.deployResources,
-      'after:deploy:functions': this.afterDeployFunctions,
-    };
-  }
-
-  beforeDeployResources() {
-    console.log('Before Deploy Resources');
-  }
-
-  deployResources() {
-    console.log('Deploy Resources');
-  }
-
-  afterDeployFunctions() {
-    console.log('After Deploy Functions');
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Nesting Commands
-
-You can also nest commands, e.g. if you want to provide a command `serverless deploy single`. Those nested commands have their own lifecycle events and do not inherit them from their parents.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-        commands: {
-          function: {
-            lifecycleEvents: ['package', 'deploy'],
-          },
-        },
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-### Defining Options
-
-Each (sub)command can have multiple Options.
-
-Options are passed in with a double dash (`--`) like this: `serverless function deploy --function functionName`.
-
-Option Shortcuts are passed in with a single dash (`-`) like this: `serverless function deploy -f functionName`.
-
-The `options` object will be passed in as the second parameter to the constructor of your plugin.
-
-In it, you can optionally add a `shortcut` property, as well as a `required` property. The Framework will return an error if a `required` Option is not included.
-
-**Note:** At this time, the Serverless Framework does not use parameters.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            shortcut: 'f',
-            required: true,
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Provider Specific Plugins
-
-Plugins can be provider specific which means that they are bound to a provider.
-
-**Note:** Binding a plugin to a provider is optional. Serverless will always consider your plugin if you don't specify a `provider`.
-
-The provider definition should be added inside the plugins constructor:
-
-```javascript
-'use strict';
-
-class ProviderDeploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    // set the providers name here
-    this.provider = this.serverless.getProvider('providerName');
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            required: true,
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = ProviderDeploy;
-```
-
-The Plugin's functionality will now only be executed when the Serverless Service's provider matches the provider name which is defined inside the plugins constructor.
-
-### Serverless Instance
-
-The `serverless` instance which enables access to global service config during runtime is passed in as the first parameter to the plugin constructor.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      log: {
-        lifecycleEvents: ['serverless'],
-      },
-    };
-
-    this.hooks = {
-      'log:serverless': this.logServerless.bind(this),
-    };
-  }
-
-  logServerless() {
-    console.log('Serverless instance: ', this.serverless);
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-### Command Naming
-
-Command names need to be unique. If we load two commands and both want to specify the same command (e.g. we have an integrated command `deploy` and an external command also wants to use `deploy`) the Serverless CLI will print an error and exit. If you want to have your own `deploy` command you need to name it something different like `myCompanyDeploy` so they don't clash with existing plugins.
diff --git a/docs/providers/azure/guide/plugins.md b/docs/providers/azure/guide/plugins.md
deleted file mode 100644
index 17b30fb9859..00000000000
--- a/docs/providers/azure/guide/plugins.md
+++ /dev/null
@@ -1,390 +0,0 @@
-<!--
-title: Serverless Framework - Azure Functions Guide - Plugins
-menuText: Plugins
-menuOrder: 13
-description: How to install and create Plugins to extend or overwrite the functionality of the Serverless Framework
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/azure/guide/plugins)
-
-<!-- DOCS-SITE-LINK:END -->
-
-# Azure - Plugins
-
-A Plugin is custom JavaScript code that creates new or extends existing commands within the Serverless Framework. The Serverless Framework is merely a group of Plugins that are provided in the core. If you or your organization have a specific workflow, install a pre-written Plugin or write a plugin to customize the Framework to your needs. External Plugins are written exactly the same way as the core Plugins.
-
-- [How to create serverless plugins - Part 1](https://serverless.com/blog/writing-serverless-plugins/)
-- [How to create serverless plugins - Part 2](https://serverless.com/blog/writing-serverless-plugins-2/)
-
-## Installing Plugins
-
-External Plugins are added on a per function app basis and are not applied globally.
-Make sure you are in your function app's root directory, then install the
-corresponding Plugin with the help of npm:
-
-```
-npm i --save custom-serverless-plugin
-```
-
-We need to tell Serverless that we want to use the plugin inside our function app. We do this by adding the name of the Plugin to the `plugins` section in the `serverless.yml` file.
-
-```yml
-# serverless.yml file
-
-plugins:
-  - custom-serverless-plugin
-```
-
-The `plugins` section supports two formats:
-
-Array object:
-
-```yml
-plugins:
-  - plugin1
-  - plugin2
-```
-
-Enhanced plugins object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - plugin1
-    - plugin2
-```
-
-Plugins might want to add extra information which should be accessible to Serverless. The `custom` section in the `serverless.yml` file is the place where you can add necessary configurations for your plugins (the plugins author / documentation will tell you if you need to add anything there):
-
-```yml
-plugins:
-  - custom-serverless-plugin
-
-custom:
-  customkey: customvalue
-```
-
-## Service local plugin
-
-If you are working on a plugin or have a plugin that is just designed for one project they can be loaded from the local folder. Local plugins can be added in the `plugins` array in `serverless.yml`.
-
-By default local plugins can be added to the `.serverless_plugins` directory at the root of your service, and in the `plugins` array in `serverless.yml`.
-
-```yml
-plugins:
-  - custom-serverless-plugin
-```
-
-Local plugins folder can be changed by enhancing `plugins` object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - custom-serverless-plugin
-```
-
-The `custom-serverless-plugin` will be loaded from the `custom_serverless_plugins` directory at the root of your service. If the `localPath` is not provided or empty `.serverless_plugins` directory will be taken as the `localPath`.
-
-The plugin will be loaded based on being named `custom-serverless-plugin.js` or `custom-serverless-plugin\index.js` in the root of `localPath` folder (`.serverless_plugins` by default).
-
-### Load Order
-
-Keep in mind that the order you define your plugins matters. When Serverless loads all the core plugins and then the custom plugins in the order you've defined them.
-
-```yml
-# serverless.yml
-
-plugins:
-  - plugin1
-  - plugin2
-```
-
-In this case `plugin1` is loaded before `plugin2`.
-
-## Writing Plugins
-
-### Concepts
-
-#### Plugin
-
-Code which defines _Commands_, any _Events_ within a _Command_, and any _Hooks_
-assigned to an _Lifecycle Event_.
-
-- Command // CLI configuration, commands, subcommands, options
-  - LifecycleEvent(s) // Events that happen sequentially when the command is run
-    - Hook(s) // Code that runs when a Lifecycle Event happens during a Command
-
-#### Command
-
-A CLI _Command_ that can be called by a user, e.g. `serverless deploy`. A
-Command has no logic, but simply defines the CLI configuration (e.g. command,
-subcommands, parameters) and the _Lifecycle Events_ for the command. Every
-command defines its own lifecycle events.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-#### Lifecycle Events
-
-Events that fire sequentially during a Command. The above example list two
-Events. However, for each Event, and additional `before` and `after` event is
-created. Therefore, six Events exist in the above example:
-
-- `before:deploy:resources`
-- `deploy:resources`
-- `after:deploy:resources`
-- `before:deploy:functions`
-- `deploy:functions`
-- `after:deploy:functions`
-
-The name of the command in front of lifecycle events when they are used for Hooks.
-
-#### Hooks
-
-A Hook binds code to any lifecycle event from any command.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-
-    this.hooks = {
-      'before:deploy:resources': this.beforeDeployResources,
-      'deploy:resources': this.deployResources,
-      'after:deploy:functions': this.afterDeployFunctions,
-    };
-  }
-
-  beforeDeployResources() {
-    console.log('Before Deploy Resources');
-  }
-
-  deployResources() {
-    console.log('Deploy Resources');
-  }
-
-  afterDeployFunctions() {
-    console.log('After Deploy Functions');
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Nesting Commands
-
-You can also nest commands, e.g. if you want to provide a command `serverless deploy single`. Those nested commands have their own lifecycle events and do not
-inherit them from their parents.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-        commands: {
-          function: {
-            lifecycleEvents: ['package', 'deploy'],
-          },
-        },
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-### Defining Options
-
-Each (sub)command can have multiple Options.
-
-Options are passed in with a double dash (`--`) like this: `serverless function deploy --function functionName`.
-
-Option Shortcuts are passed in with a single dash (`-`) like this: `serverless function deploy -f functionName`.
-
-The `options` object will be passed in as the second parameter to the constructor
-of your plugin.
-
-In it, you can optionally add a `shortcut` property, as well as a `required`
-property. The Framework will return an error if a `required` Option is not
-included.
-
-**Note:** At this time, the Serverless Framework does not use parameters.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            shortcut: 'f',
-            required: true,
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Provider Specific Plugins
-
-Plugins can be provider specific which means that they are bound to a provider.
-
-**Note:** Binding a plugin to a provider is optional. Serverless will always
-consider your plugin if you don't specify a `provider`.
-
-The provider definition should be added inside the plugins constructor:
-
-```javascript
-'use strict';
-
-class ProviderDeploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    // set the providers name here
-    this.provider = this.serverless.getProvider('providerName');
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            required: true,
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = ProviderDeploy;
-```
-
-The Plugin's functionality will now only be executed when the Serverless
-Service's provider matches the provider name which is defined inside the plugins
-constructor.
-
-### Serverless Instance
-
-The `serverless` instance which enables access to global service config during
-runtime is passed in as the first parameter to the plugin constructor.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      log: {
-        lifecycleEvents: ['serverless'],
-      },
-    };
-
-    this.hooks = {
-      'log:serverless': this.logServerless.bind(this),
-    };
-  }
-
-  logServerless() {
-    console.log('Serverless instance: ', this.serverless);
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-**Note:** [Variable references](./variables.md#reference-properties-in-serverlessyml) in the `serverless` instance are not resolved before a Plugin's constructor is called, so if you need these, make sure to wait to access those from your [hooks](#hooks).
-
-### Command Naming
-
-Command names need to be unique. If we load two commands and both want to specify
-the same command (e.g. we have an integrated command `deploy` and an external
-command also wants to use `deploy`) the Serverless CLI will print an error and
-exit. If you want to have your own `deploy` command you need to name it something
-different like `myCompanyDeploy` so they don't clash with existing plugins.
-
-### Extending the `info` command
-
-The `info` command which is used to display information about the deployment has
-detailed `lifecycleEvents` you can hook into to add and display custom
-information.
-
-Here's an example overview of the info lifecycle events the AWS implementation
-exposes:
-
-```
--> info:info
-  -> aws:info:validate
-  -> aws:info:gatherData
-  -> aws:info:displayServiceInfo
-  -> aws:info:displayApiKeys
-  -> aws:info:displayEndpoints
-  -> aws:info:displayFunctions
-  -> aws:info:displayStackOutputs
-```
-
-Here you could e.g. hook into `after:aws:info:gatherData` and implement your own
-data collection and display it to the user.
-
-**Note:** Every provider implements its own `info` plugin so you might want to
-take a look into the `lifecycleEvents` the provider `info` plugin exposes.
diff --git a/docs/providers/google/guide/plugins.md b/docs/providers/google/guide/plugins.md
deleted file mode 100644
index e7095ee0e96..00000000000
--- a/docs/providers/google/guide/plugins.md
+++ /dev/null
@@ -1,365 +0,0 @@
-<!--
-title: Serverless Framework - Google Cloud Functions Guide - Plugins
-menuText: Plugins
-menuOrder: 13
-description: How to install and create Plugins to extend or overwrite the functionality of the Serverless Framework
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/google/guide/plugins)
-
-<!-- DOCS-SITE-LINK:END -->
-
-# Google - Plugins
-
-A Plugin is custom Javascript code that creates new or extends existing commands within the Serverless Framework. The Serverless Framework is merely a group of Plugins that are provided in the core. If you or your organization have a specific workflow, install a pre-written Plugin or write a plugin to customize the Framework to your needs. External Plugins are written exactly the same way as the core Plugins.
-
-- [How to create serverless plugins - Part 1](https://serverless.com/blog/writing-serverless-plugins/)
-- [How to create serverless plugins - Part 2](https://serverless.com/blog/writing-serverless-plugins-2/)
-
-## Installing Plugins
-
-External Plugins are added on a per service basis and are not applied globally. Make sure you are in your Service's root directory, then install the corresponding Plugin with the help of npm:
-
-```
-npm install --save custom-serverless-plugin
-```
-
-We need to tell Serverless that we want to use the plugin inside our service. We do this by adding the name of the Plugin to the `plugins` section in the `serverless.yml` file.
-
-```yml
-# serverless.yml file
-
-plugins:
-  - custom-serverless-plugin
-```
-
-The `plugins` section supports two formats:
-
-Array object:
-
-```yml
-plugins:
-  - plugin1
-  - plugin2
-```
-
-Enhanced plugins object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - plugin1
-    - plugin2
-```
-
-Plugins might want to add extra information which should be accessible to Serverless. The `custom` section in the `serverless.yml` file is the place where you can add necessary configurations for your plugins (the plugins author / documentation will tell you if you need to add anything there):
-
-```yml
-plugins:
-  - custom-serverless-plugin
-
-custom:
-  customkey: customvalue
-```
-
-## Service local plugin
-
-If you are working on a plugin or have a plugin that is just designed for one project they can be loaded from the local folder. Local plugins can be added in the `plugins` array in `serverless.yml`.
-
-By default local plugins can be added to the `.serverless_plugins` directory at the root of your service, and in the `plugins` array in `serverless.yml`.
-
-```yml
-plugins:
-  - custom-serverless-plugin
-```
-
-Local plugins folder can be changed by enhancing `plugins` object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - custom-serverless-plugin
-```
-
-The `custom-serverless-plugin` will be loaded from the `custom_serverless_plugins` directory at the root of your service. If the `localPath` is not provided or empty `.serverless_plugins` directory will be taken as the `localPath`.
-
-The plugin will be loaded based on being named `custom-serverless-plugin.js` or `custom-serverless-plugin\index.js` in the root of `localPath` folder (`.serverless_plugins` by default).
-
-### Load Order
-
-Keep in mind that the order you define your plugins matters. When Serverless loads all the core plugins and then the custom plugins in the order you've defined them.
-
-```yml
-# serverless.yml
-
-plugins:
-  - plugin1
-  - plugin2
-```
-
-In this case `plugin1` is loaded before `plugin2`.
-
-## Writing Plugins
-
-### Concepts
-
-#### Plugin
-
-Code which defines _Commands_, any _Events_ within a _Command_, and any _Hooks_ assigned to an _Lifecycle Event_.
-
-- Command // CLI configuration, commands, subcommands, options
-  - LifecycleEvent(s) // Events that happen sequentially when the command is run
-    - Hook(s) // Code that runs when a Lifecycle Event happens during a Command
-
-#### Command
-
-A CLI _Command_ that can be called by a user, e.g. `serverless deploy`. A Command has no logic, but simply defines the CLI configuration (e.g. command, subcommands, parameters) and the _Lifecycle Events_ for the command. Every command defines its own lifecycle events.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-#### Lifecycle Events
-
-Events that fire sequentially during a Command. The above example list two Events. However, for each Event, and additional `before` and `after` event is created. Therefore, six Events exist in the above example:
-
-- `before:deploy:resources`
-- `deploy:resources`
-- `after:deploy:resources`
-- `before:deploy:functions`
-- `deploy:functions`
-- `after:deploy:functions`
-
-The name of the command in front of lifecycle events when they are used for Hooks.
-
-#### Hooks
-
-A Hook binds code to any lifecycle event from any command.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-
-    this.hooks = {
-      'before:deploy:resources': this.beforeDeployResources,
-      'deploy:resources': this.deployResources,
-      'after:deploy:functions': this.afterDeployFunctions,
-    };
-  }
-
-  beforeDeployResources() {
-    console.log('Before Deploy Resources');
-  }
-
-  deployResources() {
-    console.log('Deploy Resources');
-  }
-
-  afterDeployFunctions() {
-    console.log('After Deploy Functions');
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Nesting Commands
-
-You can also nest commands, e.g. if you want to provide a command `serverless deploy single`. Those nested commands have their own lifecycle events and do not inherit them from their parents.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-        commands: {
-          function: {
-            lifecycleEvents: ['package', 'deploy'],
-          },
-        },
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-### Defining Options
-
-Each (sub)command can have multiple Options.
-
-Options are passed in with a double dash (`--`) like this: `serverless function deploy --function functionName`.
-
-Option Shortcuts are passed in with a single dash (`-`) like this: `serverless function deploy -f functionName`.
-
-The `options` object will be passed in as the second parameter to the constructor of your plugin.
-
-In it, you can optionally add a `shortcut` property, as well as a `required` property. The Framework will return an error if a `required` Option is not included.
-
-**Note:** At this time, the Serverless Framework does not use parameters.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            shortcut: 'f',
-            required: true,
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Provider Specific Plugins
-
-Plugins can be provider specific which means that they are bound to a provider.
-
-**Note:** Binding a plugin to a provider is optional. Serverless will always consider your plugin if you don't specify a `provider`.
-
-The provider definition should be added inside the plugins constructor:
-
-```javascript
-'use strict';
-
-class ProviderDeploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    // set the providers name here
-    this.provider = this.serverless.getProvider('providerName');
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            required: true,
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = ProviderDeploy;
-```
-
-The Plugin's functionality will now only be executed when the Serverless Service's provider matches the provider name which is defined inside the plugins constructor.
-
-### Serverless Instance
-
-The `serverless` instance which enables access to global service config during runtime is passed in as the first parameter to the plugin constructor.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      log: {
-        lifecycleEvents: ['serverless'],
-      },
-    };
-
-    this.hooks = {
-      'log:serverless': this.logServerless.bind(this),
-    };
-  }
-
-  logServerless() {
-    console.log('Serverless instance: ', this.serverless);
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-**Note:** [Variable references](./variables.md#reference-properties-in-serverlessyml) in the `serverless` instance are not resolved before a Plugin's constructor is called, so if you need these, make sure to wait to access those from your [hooks](#hooks).
-
-### Command Naming
-
-Command names need to be unique. If we load two commands and both want to specify the same command (e.g. we have an integrated command `deploy` and an external command also wants to use `deploy`) the Serverless CLI will print an error and exit. If you want to have your own `deploy` command you need to name it something different like `myCompanyDeploy` so they don't clash with existing plugins.
-
-### Extending the `info` command
-
-The `info` command which is used to display information about the deployment has detailed `lifecycleEvents` you can hook into to add and display custom information.
-
-Here's an example overview of the info lifecycle events the Google implementation exposes:
-
-```
--> info:info
-  -> aws:info:validate
-  -> aws:info:gatherData
-  -> aws:info:displayServiceInfo
-  -> aws:info:displayApiKeys
-  -> aws:info:displayEndpoints
-  -> aws:info:displayFunctions
-  -> aws:info:displayStackOutputs
-```
-
-Here you could e.g. hook into `after:aws:info:gatherData` and implement your own data collection and display it to the user.
-
-**Note:** Every provider implements its own `info` plugin so you might want to take a look into the `lifecycleEvents` the provider `info` plugin exposes.
diff --git a/docs/providers/knative/guide/plugins.md b/docs/providers/knative/guide/plugins.md
deleted file mode 100644
index e67f5c98c73..00000000000
--- a/docs/providers/knative/guide/plugins.md
+++ /dev/null
@@ -1,420 +0,0 @@
-<!--
-title: Knative - Knative Guide - Plugins | Serverless Framework
-menuText: Plugins
-menuOrder: 11
-description: How to install and create Plugins to extend or overwrite the functionality of the Serverless Framework
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/knative/guide/plugins/)
-
-<!-- DOCS-SITE-LINK:END -->
-
-# Plugins
-
-A Plugin is custom Javascript code that creates new or extends existing commands within the Serverless Framework. The Serverless Framework is merely a group of Plugins that are provided in the core. If you or your organization have a specific workflow, install a pre-written Plugin or write a plugin to customize the Framework to your needs. External Plugins are written exactly the same way as the core Plugins.
-
-- [How to create serverless plugins - Part 1](https://serverless.com/blog/writing-serverless-plugins/)
-- [How to create serverless plugins - Part 2](https://serverless.com/blog/writing-serverless-plugins-2/)
-
-## Installing Plugins
-
-External Plugins are added on a per service basis and are not applied globally. Make sure you are in your Service's root directory, then install the corresponding Plugin with the help of NPM:
-
-```
-npm install --save custom-serverless-plugin
-```
-
-We need to tell Serverless that we want to use the plugin inside our service. We do this by adding the name of the Plugin to the `plugins` section in the `serverless.yml` file.
-
-```yaml
-# serverless.yml file
-
-plugins:
-  - custom-serverless-plugin
-```
-
-The `plugins` section supports two formats:
-
-Array object:
-
-```yaml
-plugins:
-  - plugin1
-  - plugin2
-```
-
-Enhanced plugins object:
-
-```yaml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - plugin1
-    - plugin2
-```
-
-Plugins might want to add extra information which should be accessible to Serverless. The `custom` section in the `serverless.yml` file is the place where you can add necessary configurations for your plugins (the plugins author / documentation will tell you if you need to add anything there):
-
-```yaml
-plugins:
-  - custom-serverless-plugin
-
-custom:
-  customkey: customvalue
-```
-
-## Service local plugin
-
-If you are working on a plugin or have a plugin that is just designed for one project, it can be loaded from the local `.serverless_plugins` folder at the root of your service. Local plugins can be added in the `plugins` array in `serverless.yml`.
-
-```yaml
-plugins:
-  - custom-serverless-plugin
-```
-
-Local plugins folder can be changed by enhancing `plugins` object:
-
-```yaml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - custom-serverless-plugin
-```
-
-The `custom-serverless-plugin` will be loaded from the `custom_serverless_plugins` directory at the root of your service. If the `localPath` is not provided or empty, the `.serverless_plugins` directory will be used.
-
-The plugin will be loaded based on being named `custom-serverless-plugin.js` or `custom-serverless-plugin\index.js` in the root of `localPath` folder (`.serverless_plugins` by default).
-
-If you want to load a plugin from a specific directory without affecting other plugins, you can also specify a path relative to the root of your service:
-
-```yaml
-plugins:
-  # This plugin will be loaded from the `.serverless_plugins/` or `node_modules/` directories
-  - custom-serverless-plugin
-  # This plugin will be loaded from the `sub/directory/` directory
-  - ./sub/directory/another-custom-plugin
-```
-
-### Load Order
-
-Keep in mind that the order you define your plugins matters. When Serverless loads all the core plugins and then the custom plugins in the order you've defined them.
-
-```yaml
-# serverless.yml
-
-plugins:
-  - plugin1
-  - plugin2
-```
-
-In this case `plugin1` is loaded before `plugin2`.
-
-## Writing Plugins
-
-### Concepts
-
-#### Plugin
-
-Code which defines _Commands_, any _Events_ within a _Command_, and any _Hooks_ assigned to a _Lifecycle Event_.
-
-- Command // CLI configuration, commands, subcommands, options
-  - LifecycleEvent(s) // Events that happen sequentially when the command is run
-    - Hook(s) // Code that runs when a Lifecycle Event happens during a Command
-
-#### Command
-
-A CLI _Command_ that can be called by a user, e.g. `serverless deploy`. A Command has no logic, but simply defines the CLI configuration (e.g. command, subcommands, parameters) and the _Lifecycle Events_ for the command. Every command defines its own lifecycle events.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-#### Lifecycle Events
-
-Events that fire sequentially during a Command. The above example lists two Events. However, for each Event, an additional `before` and `after` event is created. Therefore, six Events exist in the above example:
-
-- `before:deploy:resources`
-- `deploy:resources`
-- `after:deploy:resources`
-- `before:deploy:functions`
-- `deploy:functions`
-- `after:deploy:functions`
-
-The name of the command in front of lifecycle events when they are used for Hooks.
-
-#### Hooks
-
-A Hook binds code to any lifecycle event from any command.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-
-    this.hooks = {
-      'before:deploy:resources': this.beforeDeployResources,
-      'deploy:resources': this.deployResources,
-      'after:deploy:functions': this.afterDeployFunctions,
-    };
-  }
-
-  beforeDeployResources() {
-    console.log('Before Deploy Resources');
-  }
-
-  deployResources() {
-    console.log('Deploy Resources');
-  }
-
-  afterDeployFunctions() {
-    console.log('After Deploy Functions');
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Custom Variable Types
-
-As of version 1.52.0 of the Serverless framework, plugins can officially implement their own
-variable types for use in serverless config files.
-
-Example:
-
-```javascript
-'use strict';
-
-class EchoTestVarPlugin {
-  constructor() {
-    getEchoTestValue(src) {
-      return src.slice(5);
-    }
-    getDependentEchoTestValue(src) {
-      return src.slice(5);
-    }
-    this.variableResolvers = {
-      echo: this.getEchoTestValue,
-      // if a variable type depends on profile/stage/credentials, to avoid infinite loops in
-      // trying to resolve variables that depend on themselves, specify as such by setting a
-      // dependendServiceName property on the variable getter
-      echoStageDependent: {
-        resolver: this.getDependentEchoTestValue,
-        serviceName: 'echo that isnt prepopulated',
-        isDisabledAtPrepopulation: true
-    };
-  }
-}
-```
-
-The above plugin will add support for variables like `${echo:foobar}` and resolve to the key. EG:
-`${echo:foobar}` will resolve to `'foobar'`.
-
-#### `this.variableResolvers` structure
-
-The data structure of `this.variableResolvers` is an `Object` with keys that are either a
-`function` or `Object`.
-
-The keys are used to generate the regex which matches the variable type. Eg, a key of `test` will
-match variables like `${test:foobar}`.
-
-If the value is a `function` it is used to resolve variables matched. It must be `async` or return
-a `Promise` and accepts the variable string(with prefix but not the wrapping variable syntax,
-eg `test:foobar`) as it's only argument.
-
-If the value is an `Object`, it can have the following keys:
-
-- `resolver` - required, a function, same requirements as described above.
-- `isDisabledAtPrepopulation` - optional, a boolean, disable this variable type when populating
-  stage and credentials. This is important for variable types that depend on Knative or other
-  service that depend on those variables
-- `serviceName` - required if `isDisabledAtPrepopulation === true`, a string to display to users
-  if they try to use the variable type in one of the fields disabled for populating
-  stage / credentials.
-
-### Nesting Commands
-
-You can also nest commands, e.g. if you want to provide a command `serverless deploy function`. Those nested commands have their own lifecycle events and do not inherit them from their parents.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-        commands: {
-          function: {
-            lifecycleEvents: ['package', 'deploy'],
-          },
-        },
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-### Defining Options
-
-Each (sub)command can have multiple Options.
-
-Options are passed in with a double dash (`--`) like this: `serverless function deploy --function functionName`.
-
-Option Shortcuts are passed in with a single dash (`-`) like this: `serverless function deploy -f functionName`.
-
-The `options` object will be passed in as the second parameter to the constructor of your plugin.
-
-In it, you can optionally add a `shortcut` property, as well as a `required` property. The Framework will return an error if a `required` Option is not included. You can also set a `default` property if your option is not required.
-
-**Note:** At this time, the Serverless Framework does not use parameters.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            shortcut: 'f',
-            required: true,
-          },
-          stage: {
-            usage: 'Specify the stage you want to deploy to. (e.g. "--stage prod")',
-            shortcut: 's',
-            default: 'dev',
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Provider Specific Plugins
-
-Plugins can be provider specific which means that they are bound to a provider.
-
-**Note:** Binding a plugin to a provider is optional. Serverless will always consider your plugin if you don't specify a `provider`.
-
-The provider definition should be added inside the plugins constructor:
-
-```javascript
-'use strict';
-
-class ProviderDeploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    // set the providers name here
-    this.provider = this.serverless.getProvider('providerName');
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            required: true,
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = ProviderDeploy;
-```
-
-The Plugin's functionality will now only be executed when the Serverless Service's provider matches the provider name which is defined inside the plugins constructor.
-
-### Serverless Instance
-
-The `serverless` instance which enables access to global service config during runtime is passed in as the first parameter to the plugin constructor.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      log: {
-        lifecycleEvents: ['serverless'],
-      },
-    };
-
-    this.hooks = {
-      'log:serverless': this.logServerless.bind(this),
-    };
-  }
-
-  logServerless() {
-    console.log('Serverless instance: ', this.serverless);
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-**Note:** [Variable references](./variables.md#reference-properties-in-serverlessyml) in the `serverless` instance are not resolved before a Plugin's constructor is called, so if you need these, make sure to wait to access those from your [hooks](#hooks).
-
-### Command Naming
-
-Command names need to be unique. If we load two commands and both want to specify the same command (e.g. we have an integrated command `deploy` and an external command also wants to use `deploy`) the Serverless CLI will print an error and exit. If you want to have your own `deploy` command you need to name it something different like `myCompanyDeploy` so they don't clash with existing plugins.
-
-### Extending the `info` command
-
-The `info` command which is used to display information about the deployment has detailed `lifecycleEvents` you can hook into to add and display custom information.
-
-**Note:** Every provider implements its own `info` plugin so you might want to take a look into the `lifecycleEvents` the provider `info` plugin exposes.
diff --git a/docs/providers/openwhisk/guide/plugins.md b/docs/providers/openwhisk/guide/plugins.md
deleted file mode 100644
index a0b769921a0..00000000000
--- a/docs/providers/openwhisk/guide/plugins.md
+++ /dev/null
@@ -1,365 +0,0 @@
-<!--
-title: Serverless Framework - Apache OpenWhisk Guide - Plugins
-menuText: Plugins
-menuOrder: 13
-description: How to install and create Plugins to extend or overwrite the functionality of the Serverless Framework
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/openwhisk/guide/plugins)
-
-<!-- DOCS-SITE-LINK:END -->
-
-# OpenWhisk - Plugins
-
-A Plugin is custom Javascript code that creates new or extends existing commands within the Serverless Framework. The Serverless Framework is merely a group of Plugins that are provided in the core. If you or your organization have a specific workflow, install a pre-written Plugin or write a plugin to customize the Framework to your needs. External Plugins are written exactly the same way as the core Plugins.
-
-- [How to create serverless plugins - Part 1](https://serverless.com/blog/writing-serverless-plugins/)
-- [How to create serverless plugins - Part 2](https://serverless.com/blog/writing-serverless-plugins-2/)
-
-## Installing Plugins
-
-External Plugins are added on a per service basis and are not applied globally. Make sure you are in your Service's root directory, then install the corresponding Plugin with the help of NPM:
-
-```
-npm install --save custom-serverless-plugin
-```
-
-We need to tell Serverless that we want to use the plugin inside our service. We do this by adding the name of the Plugin to the `plugins` section in the `serverless.yml` file.
-
-```yml
-# serverless.yml file
-
-plugins:
-  - custom-serverless-plugin
-```
-
-The `plugins` section supports two formats:
-
-Array object:
-
-```yml
-plugins:
-  - plugin1
-  - plugin2
-```
-
-Enhanced plugins object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - plugin1
-    - plugin2
-```
-
-Plugins might want to add extra information which should be accessible to Serverless. The `custom` section in the `serverless.yml` file is the place where you can add necessary configurations for your plugins (the plugins author / documentation will tell you if you need to add anything there):
-
-```yml
-plugins:
-  - custom-serverless-plugin
-
-custom:
-  customkey: customvalue
-```
-
-## Service local plugin
-
-If you are working on a plugin or have a plugin that is just designed for one project they can be loaded from the local folder. Local plugins can be added in the `plugins` array in `serverless.yml`.
-
-By default local plugins can be added to the `.serverless_plugins` directory at the root of your service, and in the `plugins` array in `serverless.yml`.
-
-```yml
-plugins:
-  - custom-serverless-plugin
-```
-
-Local plugins folder can be changed by enhancing `plugins` object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - custom-serverless-plugin
-```
-
-The `custom-serverless-plugin` will be loaded from the `custom_serverless_plugins` directory at the root of your service. If the `localPath` is not provided or empty `.serverless_plugins` directory will be taken as the `localPath`.
-
-The plugin will be loaded based on being named `custom-serverless-plugin.js` or `custom-serverless-plugin\index.js` in the root of `localPath` folder (`.serverless_plugins` by default).
-
-### Load Order
-
-Keep in mind that the order you define your plugins matters. When Serverless loads all the core plugins and then the custom plugins in the order you've defined them.
-
-```yml
-# serverless.yml
-
-plugins:
-  - plugin1
-  - plugin2
-```
-
-In this case `plugin1` is loaded before `plugin2`.
-
-## Writing Plugins
-
-### Concepts
-
-#### Plugin
-
-Code which defines _Commands_, any _Events_ within a _Command_, and any _Hooks_ assigned to an _Lifecycle Event_.
-
-- Command // CLI configuration, commands, subcommands, options
-  - LifecycleEvent(s) // Events that happen sequentially when the command is run
-    - Hook(s) // Code that runs when a Lifecycle Event happens during a Command
-
-#### Command
-
-A CLI _Command_ that can be called by a user, e.g. `serverless deploy`. A Command has no logic, but simply defines the CLI configuration (e.g. command, subcommands, parameters) and the _Lifecycle Events_ for the command. Every command defines its own lifecycle events.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-#### Lifecycle Events
-
-Events that fire sequentially during a Command. The above example list two Events. However, for each Event, and additional `before` and `after` event is created. Therefore, six Events exist in the above example:
-
-- `before:deploy:resources`
-- `deploy:resources`
-- `after:deploy:resources`
-- `before:deploy:functions`
-- `deploy:functions`
-- `after:deploy:functions`
-
-The name of the command in front of lifecycle events when they are used for Hooks.
-
-#### Hooks
-
-A Hook binds code to any lifecycle event from any command.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-
-    this.hooks = {
-      'before:deploy:resources': this.beforeDeployResources,
-      'deploy:resources': this.deployResources,
-      'after:deploy:functions': this.afterDeployFunctions,
-    };
-  }
-
-  beforeDeployResources() {
-    console.log('Before Deploy Resources');
-  }
-
-  deployResources() {
-    console.log('Deploy Resources');
-  }
-
-  afterDeployFunctions() {
-    console.log('After Deploy Functions');
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Nesting Commands
-
-You can also nest commands, e.g. if you want to provide a command `serverless deploy single`. Those nested commands have their own lifecycle events and do not inherit them from their parents.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-        commands: {
-          function: {
-            lifecycleEvents: ['package', 'deploy'],
-          },
-        },
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-### Defining Options
-
-Each (sub)command can have multiple Options.
-
-Options are passed in with a double dash (`--`) like this: `serverless function deploy --function functionName`.
-
-Option Shortcuts are passed in with a single dash (`-`) like this: `serverless function deploy -f functionName`.
-
-The `options` object will be passed in as the second parameter to the constructor of your plugin.
-
-In it, you can optionally add a `shortcut` property, as well as a `required` property. The Framework will return an error if a `required` Option is not included.
-
-**Note:** At this time, the Serverless Framework does not use parameters.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            shortcut: 'f',
-            required: true,
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Provider Specific Plugins
-
-Plugins can be provider specific which means that they are bound to a provider.
-
-**Note:** Binding a plugin to a provider is optional. Serverless will always consider your plugin if you don't specify a `provider`.
-
-The provider definition should be added inside the plugins constructor:
-
-```javascript
-'use strict';
-
-class ProviderDeploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    // set the providers name here
-    this.provider = this.serverless.getProvider('providerName');
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            required: true,
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = ProviderDeploy;
-```
-
-The Plugin's functionality will now only be executed when the Serverless Service's provider matches the provider name which is defined inside the plugins constructor.
-
-### Serverless Instance
-
-The `serverless` instance which enables access to global service config during runtime is passed in as the first parameter to the plugin constructor.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      log: {
-        lifecycleEvents: ['serverless'],
-      },
-    };
-
-    this.hooks = {
-      'log:serverless': this.logServerless.bind(this),
-    };
-  }
-
-  logServerless() {
-    console.log('Serverless instance: ', this.serverless);
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-**Note:** [Variable references](./variables.md#reference-properties-in-serverlessyml) in the `serverless` instance are not resolved before a Plugin's constructor is called, so if you need these, make sure to wait to access those from your [hooks](#hooks).
-
-### Command Naming
-
-Command names need to be unique. If we load two commands and both want to specify the same command (e.g. we have an integrated command `deploy` and an external command also wants to use `deploy`) the Serverless CLI will print an error and exit. If you want to have your own `deploy` command you need to name it something different like `myCompanyDeploy` so they don't clash with existing plugins.
-
-### Extending the `info` command
-
-The `info` command which is used to display information about the deployment has detailed `lifecycleEvents` you can hook into to add and display custom information.
-
-Here's an example overview of the info lifecycle events the AWS implementation exposes:
-
-```
--> info:info
-  -> aws:info:validate
-  -> aws:info:gatherData
-  -> aws:info:displayServiceInfo
-  -> aws:info:displayApiKeys
-  -> aws:info:displayEndpoints
-  -> aws:info:displayFunctions
-  -> aws:info:displayStackOutputs
-```
-
-Here you could e.g. hook into `after:aws:info:gatherData` and implement your own data collection and display it to the user.
-
-**Note:** Every provider implements its own `info` plugin so you might want to take a look into the `lifecycleEvents` the provider `info` plugin exposes.
diff --git a/docs/providers/tencent/guide/plugins.md b/docs/providers/tencent/guide/plugins.md
deleted file mode 100644
index b429521a38d..00000000000
--- a/docs/providers/tencent/guide/plugins.md
+++ /dev/null
@@ -1,420 +0,0 @@
-<!--
-title: Tencent Cloud - Serverless Cloud Function (SCF) Guide - Plugins | Serverless Framework
-menuText: Plugins
-menuOrder: 13
-description: How to install and create Plugins to extend or overwrite the functionality of the Serverless Framework
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/tencent/guide/plugins/)
-
-<!-- DOCS-SITE-LINK:END -->
-
-# Plugins
-
-A Plugin is custom Javascript code that creates new or extends existing commands within the Serverless Framework. The Serverless Framework is merely a group of Plugins that are provided in the core. If you or your organization have a specific workflow, install a pre-written Plugin or write a plugin to customize the Framework to your needs. External Plugins are written exactly the same way as the core Plugins.
-
-- [How to create serverless plugins - Part 1](https://serverless.com/blog/writing-serverless-plugins/)
-- [How to create serverless plugins - Part 2](https://serverless.com/blog/writing-serverless-plugins-2/)
-
-## Installing Plugins
-
-External Plugins are added on a per service basis and are not applied globally. Make sure you are in your Service's root directory, then install the corresponding Plugin with the help of NPM:
-
-```
-npm install --save custom-serverless-plugin
-```
-
-We need to tell Serverless that we want to use the plugin inside our service. We do this by adding the name of the Plugin to the `plugins` section in the `serverless.yml` file.
-
-```yml
-# serverless.yml file
-
-plugins:
-  - custom-serverless-plugin
-```
-
-The `plugins` section supports two formats:
-
-Array object:
-
-```yml
-plugins:
-  - plugin1
-  - plugin2
-```
-
-Enhanced plugins object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - plugin1
-    - plugin2
-```
-
-Plugins might want to add extra information which should be accessible to Serverless. The `custom` section in the `serverless.yml` file is the place where you can add necessary configurations for your plugins (the plugins author / documentation will tell you if you need to add anything there):
-
-```yml
-plugins:
-  - custom-serverless-plugin
-
-custom:
-  customkey: customvalue
-```
-
-## Service local plugin
-
-If you are working on a plugin or have a plugin that is just designed for one project, it can be loaded from the local `.serverless_plugins` folder at the root of your service. Local plugins can be added in the `plugins` array in `serverless.yml`.
-
-```yml
-plugins:
-  - custom-serverless-plugin
-```
-
-Local plugins folder can be changed by enhancing `plugins` object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - custom-serverless-plugin
-```
-
-The `custom-serverless-plugin` will be loaded from the `custom_serverless_plugins` directory at the root of your service. If the `localPath` is not provided or empty, the `.serverless_plugins` directory will be used.
-
-The plugin will be loaded based on being named `custom-serverless-plugin.js` or `custom-serverless-plugin\index.js` in the root of `localPath` folder (`.serverless_plugins` by default).
-
-If you want to load a plugin from a specific directory without affecting other plugins, you can also specify a path relative to the root of your service:
-
-```yaml
-plugins:
-  # This plugin will be loaded from the `.serverless_plugins/` or `node_modules/` directories
-  - custom-serverless-plugin
-  # This plugin will be loaded from the `sub/directory/` directory
-  - ./sub/directory/another-custom-plugin
-```
-
-### Load Order
-
-Keep in mind that the order you define your plugins matters. When Serverless loads all the core plugins and then the custom plugins in the order you've defined them.
-
-```yml
-# serverless.yml
-
-plugins:
-  - plugin1
-  - plugin2
-```
-
-In this case `plugin1` is loaded before `plugin2`.
-
-## Writing Plugins
-
-### Concepts
-
-#### Plugin
-
-Code which defines _Commands_, any _Events_ within a _Command_, and any _Hooks_ assigned to a _Lifecycle Event_.
-
-- Command // CLI configuration, commands, subcommands, options
-  - LifecycleEvent(s) // Events that happen sequentially when the command is run
-    - Hook(s) // Code that runs when a Lifecycle Event happens during a Command
-
-#### Command
-
-A CLI _Command_ that can be called by a user, e.g. `serverless deploy`. A Command has no logic, but simply defines the CLI configuration (e.g. command, subcommands, parameters) and the _Lifecycle Events_ for the command. Every command defines its own lifecycle events.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-#### Lifecycle Events
-
-Events that fire sequentially during a Command. The above example lists two Events. However, for each Event, an additional `before` and `after` event is created. Therefore, six Events exist in the above example:
-
-- `before:deploy:resources`
-- `deploy:resources`
-- `after:deploy:resources`
-- `before:deploy:functions`
-- `deploy:functions`
-- `after:deploy:functions`
-
-The name of the command in front of lifecycle events when they are used for Hooks.
-
-#### Hooks
-
-A Hook binds code to any lifecycle event from any command.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-
-    this.hooks = {
-      'before:deploy:resources': this.beforeDeployResources,
-      'deploy:resources': this.deployResources,
-      'after:deploy:functions': this.afterDeployFunctions,
-    };
-  }
-
-  beforeDeployResources() {
-    console.log('Before Deploy Resources');
-  }
-
-  deployResources() {
-    console.log('Deploy Resources');
-  }
-
-  afterDeployFunctions() {
-    console.log('After Deploy Functions');
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Custom Variable Types
-
-As of version 1.52.0 of the Serverless framework, plugins can officially implement their own
-variable types for use in serverless config files.
-
-Example:
-
-```javascript
-'use strict';
-
-class EchoTestVarPlugin {
-  constructor() {
-    getEchoTestValue(src) {
-      return src.slice(5);
-    }
-    getDependentEchoTestValue(src) {
-      return src.slice(5);
-    }
-    this.variableResolvers = {
-      echo: this.getEchoTestValue,
-      // if a variable type depends on profile/stage/region/credentials, to avoid infinite loops in
-      // trying to resolve variables that depend on themselves, specify as such by setting a
-      // dependendServiceName property on the variable getter
-      echoStageDependent: {
-        resolver: this.getDependentEchoTestValue,
-        serviceName: 'echo that isnt prepopulated',
-        isDisabledAtPrepopulation: true
-    };
-  }
-}
-```
-
-The above plugin will add support for variables like `${echo:foobar}` and resolve to the key. EG:
-`${echo:foobar}` will resolve to `'foobar'`.
-
-#### `this.variableResolvers` structure
-
-The data structure of `this.variableResolvers` is an `Object` with keys that are either a
-`function` or `Object`.
-
-The keys are used to generate the regex which matches the variable type. Eg, a key of `test` will
-match variables like `${test:foobar}`.
-
-If the value is a `function` it is used to resolve variables matched. It must be `async` or return
-a `Promise` and accepts the variable string(with prefix but not the wrapping variable syntax,
-eg `test:foobar`) as it's only argument.
-
-If the value is an `Object`, it can have the following keys:
-
-- `resolver` - required, a function, same requirements as described above.
-- `isDisabledAtPrepopulation` - optional, a boolean, disable this variable type when populating
-  stage, region, and credentials. This is important for variable types that depend on Tencent Cloud or other
-  service that depend on those variables
-- `serviceName` - required if `isDisabledAtPrepopulation === true`, a string to display to users
-  if they try to use the variable type in one of the fields disabled for populating
-  stage/region/credentials.
-
-### Nesting Commands
-
-You can also nest commands, e.g. if you want to provide a command `serverless deploy function`. Those nested commands have their own lifecycle events and do not inherit them from their parents.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-        commands: {
-          function: {
-            lifecycleEvents: ['package', 'deploy'],
-          },
-        },
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-### Defining Options
-
-Each (sub)command can have multiple Options.
-
-Options are passed in with a double dash (`--`) like this: `serverless function deploy --function functionName`.
-
-Option Shortcuts are passed in with a single dash (`-`) like this: `serverless function deploy -f functionName`.
-
-The `options` object will be passed in as the second parameter to the constructor of your plugin.
-
-In it, you can optionally add a `shortcut` property, as well as a `required` property. The Framework will return an error if a `required` Option is not included. You can also set a `default` property if your option is not required.
-
-**Note:** At this time, the Serverless Framework does not use parameters.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            shortcut: 'f',
-            required: true,
-          },
-          stage: {
-            usage: 'Specify the stage you want to deploy to. (e.g. "--stage prod")',
-            shortcut: 's',
-            default: 'dev',
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Provider Specific Plugins
-
-Plugins can be provider specific which means that they are bound to a provider.
-
-**Note:** Binding a plugin to a provider is optional. Serverless will always consider your plugin if you don't specify a `provider`.
-
-The provider definition should be added inside the plugins constructor:
-
-```javascript
-'use strict';
-
-class ProviderDeploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    // set the providers name here
-    this.provider = this.serverless.getProvider('providerName');
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            required: true,
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = ProviderDeploy;
-```
-
-The Plugin's functionality will now only be executed when the Serverless Service's provider matches the provider name which is defined inside the plugins constructor.
-
-### Serverless Instance
-
-The `serverless` instance which enables access to global service config during runtime is passed in as the first parameter to the plugin constructor.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      log: {
-        lifecycleEvents: ['serverless'],
-      },
-    };
-
-    this.hooks = {
-      'log:serverless': this.logServerless.bind(this),
-    };
-  }
-
-  logServerless() {
-    console.log('Serverless instance: ', this.serverless);
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-**Note:** [Variable references](./variables.md#reference-properties-in-serverlessyml) in the `serverless` instance are not resolved before a Plugin's constructor is called, so if you need these, make sure to wait to access those from your [hooks](#hooks).
-
-### Command Naming
-
-Command names need to be unique. If we load two commands and both want to specify the same command (e.g. we have an integrated command `deploy` and an external command also wants to use `deploy`) the Serverless CLI will print an error and exit. If you want to have your own `deploy` command you need to name it something different like `myCompanyDeploy` so they don't clash with existing plugins.
-
-### Extending the `info` command
-
-The `info` command which is used to display information about the deployment has detailed `lifecycleEvents` you can hook into to add and display custom information.
-
-**Note:** Every provider implements its own `info` plugin so you might want to take a look into the `lifecycleEvents` the provider `info` plugin exposes.

From 061136f6051f50a6c74d761dbfb71f79fdcf8861 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Tue, 26 Oct 2021 11:32:41 +0200
Subject: [PATCH 0673/1101] docs: Plugin documentation: add a note about schema
 validation

---
 docs/guides/plugins/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/guides/plugins/README.md b/docs/guides/plugins/README.md
index a0d06ab2813..337d63aea8a 100644
--- a/docs/guides/plugins/README.md
+++ b/docs/guides/plugins/README.md
@@ -57,6 +57,8 @@ custom:
   customkey: customvalue
 ```
 
+Note for plugin authors: read [Extending the configuration](custom-configuration.md) to learn how to enhance `serverless.yml` with configuration validation.
+
 ## Service local plugin
 
 If you are working on a plugin, or have a plugin that is just designed for one project, it can be loaded from local files:

From 4abd10d8d1420102f1055231266b41a74df1871c Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Tue, 26 Oct 2021 11:39:21 +0200
Subject: [PATCH 0674/1101] docs: Make debug log namespacing a bit more obvious

---
 docs/guides/plugins/cli-output.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guides/plugins/cli-output.md b/docs/guides/plugins/cli-output.md
index 7d9cee6181d..fe42c2df247 100644
--- a/docs/guides/plugins/cli-output.md
+++ b/docs/guides/plugins/cli-output.md
@@ -38,7 +38,7 @@ class MyPlugin {
     log.warning('Warning');
     log.notice('Message');
     log.info('Verbose message'); // --verbose log
-    log.debug('Debug message'); // --debug log
+    log.debug('[my-plugin] Debug message'); // --debug log
   }
 }
 ```

From 3f4f972f5ccca98ac3da6dda9f3e026119456639 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Tue, 26 Oct 2021 14:58:02 +0200
Subject: [PATCH 0675/1101] docs: Plugin API documentation: improve examples

---
 docs/guides/plugins/creating-plugins.md     | 16 ++++++++--------
 docs/guides/plugins/custom-commands.md      | 10 +++++-----
 docs/guides/plugins/custom-configuration.md |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/guides/plugins/creating-plugins.md b/docs/guides/plugins/creating-plugins.md
index ce34b3f9936..0faa5598d28 100644
--- a/docs/guides/plugins/creating-plugins.md
+++ b/docs/guides/plugins/creating-plugins.md
@@ -32,7 +32,7 @@ The simplest way to create a Serverless Framework plugin is to write a JavaScrip
 
 class MyPlugin {
   constructor() {
-    console.log('My plugin is loaded.');
+    // The plugin is loaded
   }
 }
 
@@ -100,22 +100,22 @@ Plugins can "hook" into existing lifecycle events to add behavior to commands li
 class MyPlugin {
   constructor() {
     this.hooks = {
-      'initialize': this.init.bind(this),
-      'before:deploy:deploy': this.beforeDeploy.bind(this),
-      'after:deploy:deploy': this.afterDeploy.bind(this),
+      'initialize': () => this.init(),
+      'before:deploy:deploy': () => this.beforeDeploy(),
+      'after:deploy:deploy': () => this.afterDeploy(),
     };
   }
 
   init() {
-    console.log('Initialization');
+    // Initialization
   }
 
   beforeDeploy() {
-    console.log('Before deploy');
+    // Before deploy
   }
 
   afterDeploy() {
-    console.log('After deploy');
+    // After deploy
   }
 }
 
@@ -135,7 +135,7 @@ class MyPlugin {
   constructor(serverless) {
     this.serverless = serverless;
     this.hooks = {
-      initialize: this.init.bind(this),
+      initialize: () => this.init(),
     };
   }
 
diff --git a/docs/guides/plugins/custom-commands.md b/docs/guides/plugins/custom-commands.md
index 97df0533994..76f5b17f1d5 100644
--- a/docs/guides/plugins/custom-commands.md
+++ b/docs/guides/plugins/custom-commands.md
@@ -49,7 +49,7 @@ class MyPlugin {
 
     this.hooks = {
       'my-command:run': () => {
-        console.log('My command runs');
+        // Do something
       },
     };
   }
@@ -61,13 +61,13 @@ For each event, an additional `before` and `after` event is created:
 ```js
 this.hooks = {
   'before:my-command:run': () => {
-    console.log('Before');
+    // Before my command runs
   },
   'my-command:run': () => {
-    console.log('My command runs');
+    // My command runs
   },
   'after:my-command:run': () => {
-    console.log('After');
+    // After
   },
 };
 ```
@@ -106,7 +106,7 @@ class MyPlugin {
     };
 
     this.hooks = {
-      'my-command:run': this.run.bind(this),
+      'my-command:run': () => this.run(),
     };
   }
 
diff --git a/docs/guides/plugins/custom-configuration.md b/docs/guides/plugins/custom-configuration.md
index c5450ca3746..3f1cf75133a 100644
--- a/docs/guides/plugins/custom-configuration.md
+++ b/docs/guides/plugins/custom-configuration.md
@@ -34,7 +34,7 @@ class MyPlugin {
   constructor(serverless) {
     this.serverless = serverless;
     this.hooks = {
-      'before:deploy': this.beforeDeploy.bind(this),
+      'before:deploy': () => this.beforeDeploy(),
     };
   }
 

From 7c2ad77203c61419123ebe57db0bf1cb4af10455 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Tue, 26 Oct 2021 15:05:29 +0200
Subject: [PATCH 0676/1101] docs: Plugin API: document the `resolveVariable()`
 helper

---
 docs/guides/plugins/custom-variables.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/guides/plugins/custom-variables.md b/docs/guides/plugins/custom-variables.md
index b8bf4ef3468..a7233ad81d7 100644
--- a/docs/guides/plugins/custom-variables.md
+++ b/docs/guides/plugins/custom-variables.md
@@ -21,7 +21,7 @@ Custom sources can be registered via `configurationVariablesSources` as an objec
 ```javascript
 'use strict';
 
-class SomePlugin {
+class MyPlugin {
   constructor() {
     this.configurationVariablesSources = {
       foo: {
@@ -84,7 +84,7 @@ custom:
 Parameters can be retrieved in the `params` argument:
 
 ```javascript
-class SomePlugin {
+class MyPlugin {
   constructor() {
     this.configurationVariablesSources = {
       foo: {
@@ -101,24 +101,24 @@ class SomePlugin {
 }
 ```
 
-## Resolving configuration values and options
+## Resolving variables, configuration values and options
 
-It is possible to retrieve other configuration values and CLI options in the variable resolver:
+It is possible to retrieve other variables, configuration values and CLI options in the variable resolver:
 
 ```javascript
-class SomePlugin {
+class MyPlugin {
   constructor() {
     this.configurationVariablesSources = {
       foo: {
-        async resolve({ resolveConfigurationProperty, options }) {
+        async resolve({ resolveVariable, options }) {
           // `options` is CLI options
-          // `resolveConfigurationProperty` allows to access other configuration properties,
-          // and guarantees to return a fully resolved form (even if property is configured with variables)
-          const stage =
-            options.stage || (await resolveConfigurationProperty(['provider', 'stage'])) || 'dev';
+          // `resolveVariable` resolves other variables (for example here: `${sls:stage}`)
+          const stage = await resolveVariable('sls:stage');
+          // To retrieve a configuration value from serverless.yml, use the `self:xxx` variable source, for example:
+          // await resolveVariable('self:provider.region')
 
           return {
-            value: `Resolving with ${stage}`,
+            value: `The stage is ${stage}`,
           };
         },
       },

From 1467cf287af5fa7b027006728701aaa864e26c8e Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Tue, 26 Oct 2021 17:14:39 +0200
Subject: [PATCH 0677/1101] docs: Fix plugin documentation following review

---
 docs/guides/plugins/cli-output.md       | 17 +++++++----------
 docs/guides/plugins/creating-plugins.md |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/docs/guides/plugins/cli-output.md b/docs/guides/plugins/cli-output.md
index fe42c2df247..e73e16a63bc 100644
--- a/docs/guides/plugins/cli-output.md
+++ b/docs/guides/plugins/cli-output.md
@@ -61,6 +61,12 @@ To write a formatted "success" message, use the following helper:
 log.success('The task executed with success');
 ```
 
+Log methods also support the printf format:
+
+```js
+log.warning('Here is a %s log', 'formatted');
+```
+
 **Best practices:**
 
 - **Keep the default CLI output minimal.**
@@ -79,6 +85,7 @@ By default, plugins should write messages to `stderr` via the `log` object. To w
 class MyPlugin {
   constructor(serverless, cliOptions, { writeText }) {
     writeText('Command output');
+    writeText(['Here is a', 'multi-line output']);
   }
 }
 ```
@@ -116,16 +123,6 @@ The "Serverless red" color (`#fd5750`) is used to grab the user's attention:
 - It should be used minimally, and maximum once per command.
 - It should be used only to grab attention to the command's most important information.
 
-### Multi-line and formatted strings
-
-All log methods accept a string, a formatted string, or a multiline message:
-
-```js
-log.warning('Here is a log');
-log.warning('Here is a %s log', 'formatted');
-log.warning(['Here is a', 'multi-line log']);
-```
-
 ## Errors
 
 The Serverless Framework differentiates between 2 errors:
diff --git a/docs/guides/plugins/creating-plugins.md b/docs/guides/plugins/creating-plugins.md
index 0faa5598d28..94b1e6565c8 100644
--- a/docs/guides/plugins/creating-plugins.md
+++ b/docs/guides/plugins/creating-plugins.md
@@ -70,7 +70,7 @@ It is also a good practice to add `serverless` to the `peerDependencies` section
 {
   ...
   "peerDependencies": {
-    "serverless": "^2.60.0"
+    "serverless": "^2.60 || 3"
   }
 }
 ```

From f53033921f815f7c75f3fb53aebc1927a20c51a7 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Wed, 27 Oct 2021 15:06:19 +0200
Subject: [PATCH 0678/1101] docs: Update documentation for the progress API

---
 docs/guides/plugins/cli-output.md | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/docs/guides/plugins/cli-output.md b/docs/guides/plugins/cli-output.md
index e73e16a63bc..7eb5ef759f2 100644
--- a/docs/guides/plugins/cli-output.md
+++ b/docs/guides/plugins/cli-output.md
@@ -151,7 +151,9 @@ Plugins can create an interactive progress:
 ```js
 class MyPlugin {
   constructor(serverless, cliOptions, { progress }) {
-    const myProgress = progress.create('Doing extra work in my-plugin');
+    const myProgress = progress.create({
+      message: 'Doing extra work in my-plugin',
+    });
     // ...
     myProgress.update('Almost finished');
     // ...
@@ -169,16 +171,19 @@ In case of parallel processing (for example compiling multiple files in parallel
   - Bad: "Compiling"
   - Bad: "[Webpack] Compiling" (avoid prefixes)
   - Good: "Compiling with webpack"
-- Displaying multiple progress should be exceptional, and limited to 3-4 progress at a time. It is better to keep the output minimal than too noisy.
+- Displaying multiple progresses should be exceptional, and limited to 3-4 progresses at a time. It is better to keep the output minimal than too noisy.
 
 Note that it is possible to give a unique name to a progress. That name can be used to retrieve the progress without having to pass the instance around:
 
 ```js
 // Progress without any name:
-const myProgress = progress.create('Working in my-plugin');
+const myProgress = progress.create({
+  message: 'Doing extra work in my-plugin',
+});
 
 // Progress with a unique name
-progress.create('Working in my-plugin', {
+progress.create({
+  message: 'Doing extra work in my-plugin',
   name: 'my-plugin-progress', // Try to make the name unique across all plugins
 });
 // elsewhere...

From 49f265034bf707a4e5d6dc7719594cf43e74ab42 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Wed, 27 Oct 2021 16:27:04 +0200
Subject: [PATCH 0679/1101] docs: Plugin API: improve names and wording

---
 docs/guides/plugins/cli-output.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/guides/plugins/cli-output.md b/docs/guides/plugins/cli-output.md
index 7eb5ef759f2..31f7b52d4fb 100644
--- a/docs/guides/plugins/cli-output.md
+++ b/docs/guides/plugins/cli-output.md
@@ -127,20 +127,20 @@ The "Serverless red" color (`#fd5750`) is used to grab the user's attention:
 
 The Serverless Framework differentiates between 2 errors:
 
-- user errors (wrong input, etc.)
-- internal errors (aka bugs)
+- user errors (wrong input, invalid configuration, etc.)
+- programmer errors (aka bugs)
 
-To throw a user error and have it properly formatted, use Serverless' error class:
+To throw a **user error** and have it properly formatted, use Serverless' error class:
 
 ```js
 throw new serverless.classes.Error('Invalid configuration in X');
 ```
 
-All other errors are considered internal errors (and are properly formatted in the CLI output as well).
+All other errors are considered programmer errors by default (and are properly formatted in the CLI output as well).
 
 **Best practices:**
 
-- If an error should stop the execution of the command, throw an exception.
+- If an error should stop the execution of the command, use `throw`.
 - If an error should _not_ stop the execution of the command (which should be exceptional), log it via `log.error()`.
   - For example any execution error in `serverless-offline` should not stop the local server.
 

From 9b6ec32a265901ec5d58aa48960d26141709b099 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Fri, 29 Oct 2021 11:13:44 +0200
Subject: [PATCH 0680/1101] docs: Document namespacing debug logs

---
 docs/guides/plugins/cli-output.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guides/plugins/cli-output.md b/docs/guides/plugins/cli-output.md
index 31f7b52d4fb..582f76d0195 100644
--- a/docs/guides/plugins/cli-output.md
+++ b/docs/guides/plugins/cli-output.md
@@ -38,7 +38,7 @@ class MyPlugin {
     log.warning('Warning');
     log.notice('Message');
     log.info('Verbose message'); // --verbose log
-    log.debug('[my-plugin] Debug message'); // --debug log
+    log.debug('Debug message'); // --debug log
   }
 }
 ```
@@ -73,7 +73,7 @@ log.warning('Here is a %s log', 'formatted');
 - Log most information to the `--verbose` output.
 - Warnings should be used exceptionally. Consider whether the plugin should instead throw an exception, log a `--verbose` message or trigger a deprecation (see below).
 - Before using `log.error()`, consider [throwing an exception](#errors): exceptions are automatically caught by the Serverless Framework and formatted with details.
-- Log developer-oriented messages to the `--debug` output, and prefix the messages with the name of the plugin (`[plugin-name] My message`).
+- Debugging logs should be logged to the `--debug` level. Debug logs can be namespaced following the [`debug` convention](https://github.com/visionmedia/debug#usage) via `log.get('my-namespace').debug('Debug message')`. Such logs can then be filtered in the CLI output via `--debug=plugin-name:my-namespace`.
 
 **By default, logs are written to `stderr`**, which displays in terminals (humans cannot tell the difference). This is intentional: plugins can safely log extra messages to any command, even commands meant to be piped or parsed by another program. Read the next section to learn more.
 

From d202af1cd48b795606c94f3187ac60393b74dc56 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Fri, 29 Oct 2021 13:51:48 +0200
Subject: [PATCH 0681/1101] docs: Clarify wording in plugin documentation

---
 docs/guides/plugins/cli-output.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guides/plugins/cli-output.md b/docs/guides/plugins/cli-output.md
index 582f76d0195..fe235e7c913 100644
--- a/docs/guides/plugins/cli-output.md
+++ b/docs/guides/plugins/cli-output.md
@@ -93,7 +93,7 @@ class MyPlugin {
 **Best practices:**
 
 - `stdout` output is usually meant to be piped to/parsed by another program.
-- Plugins should only write to `stdout` in commands they own (to avoid breaking the output of other commands).
+- Plugins should only write to `stdout` in commands they define (to avoid breaking the output of other commands).
 - The only content written to `stdout` should be the main output of the command.
 
 Take, for example, the `serverless invoke` command:

From 533f709c5833619d5ce86ec987133ff0f148c8e0 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 2 Nov 2021 14:35:12 +0100
Subject: [PATCH 0682/1101] refactor(CLI): Improve main progress message

---
 lib/plugins/aws/deploy/index.js | 2 +-
 lib/plugins/aws/info/index.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index 981fa55eb01..e1703bd94cc 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -105,7 +105,7 @@ class AwsDeploy {
 
       // Deploy deploy inner lifecycle
       'before:aws:deploy:deploy:createStack': () =>
-        mainProgress.notice('Retrieving CloudFormation stack info', { isMainEvent: true }),
+        mainProgress.notice('Retrieving CloudFormation stack', { isMainEvent: true }),
       'aws:deploy:deploy:createStack': async () => this.createStack(),
 
       'aws:deploy:deploy:checkForChanges': async () => {
diff --git a/lib/plugins/aws/info/index.js b/lib/plugins/aws/info/index.js
index 4d57a7069e9..8259dd29613 100644
--- a/lib/plugins/aws/info/index.js
+++ b/lib/plugins/aws/info/index.js
@@ -50,7 +50,7 @@ class AwsInfo {
       'before:aws:info:validate': () => {
         const isDeployCommand = this.serverless.processedInput.commands.join(' ') === 'deploy';
         if (!isDeployCommand) return;
-        mainProgress.notice('Retrieving CloudFormation stack info', { isMainEvent: true });
+        mainProgress.notice('Retrieving CloudFormation stack', { isMainEvent: true });
       },
       'aws:info:validate': async () => BbPromise.bind(this).then(this.validate),
 

From 7bb2520f491d008075eb08be64bdb2e0b60ec5c6 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 2 Nov 2021 15:06:31 +0100
Subject: [PATCH 0683/1101] refactor: Seprate internal and plugin output
 sections

---
 lib/Serverless.js               |  5 +++--
 lib/plugins/aws/deploy/index.js |  1 +
 lib/plugins/aws/info/display.js | 20 ++++++++++----------
 lib/plugins/aws/info/index.js   |  1 +
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index 86004198ab6..d4ab61bd638 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -462,6 +462,7 @@ class Serverless {
     }
 
     this.serviceOutputs = new Map();
+    this.servicePluginOutputs = new Map();
 
     // trigger the plugin lifecycle when there's something which should be processed
     await this.pluginManager.run(this.processedInput.commands);
@@ -478,10 +479,10 @@ class Serverless {
     } else if (!content) {
       throw new TypeError('Section content cannot be empty string');
     }
-    if (this.serviceOutputs.has(sectionName)) {
+    if (this.serviceOutputs.has(sectionName) || this.servicePluginOutputs.has(sectionName)) {
       throw new TypeError(`Section content for "${sectionName}" was already set`);
     }
-    this.serviceOutputs.set(sectionName, content);
+    this.servicePluginOutputs.set(sectionName, content);
   }
 
   setProvider(name, provider) {
diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index e1703bd94cc..c603d1362bb 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -191,6 +191,7 @@ class AwsDeploy {
         );
         writeText();
         writeServiceOutputs(this.serverless.serviceOutputs);
+        writeServiceOutputs(this.serverless.servicePluginOutputs);
       },
     };
   }
diff --git a/lib/plugins/aws/info/display.js b/lib/plugins/aws/info/display.js
index 6d7b67a8057..8237e7f9bc6 100644
--- a/lib/plugins/aws/info/display.js
+++ b/lib/plugins/aws/info/display.js
@@ -25,10 +25,10 @@ module.exports = {
 
     legacy.consoleLog(message);
     if (this.serverless.processedInput.commands.join(' ') === 'info') {
-      this.serverless.addServiceOutputSection('service', this.serverless.service.service);
-      this.serverless.addServiceOutputSection('stage', this.provider.getStage());
-      this.serverless.addServiceOutputSection('region', this.provider.getRegion());
-      this.serverless.addServiceOutputSection('stack', this.provider.naming.getStackName());
+      this.serverless.serviceOutputs.set('service', this.serverless.service.service);
+      this.serverless.serviceOutputs.set('stage', this.provider.getStage());
+      this.serverless.serviceOutputs.set('region', this.provider.getRegion());
+      this.serverless.serviceOutputs.set('stack', this.provider.naming.getStackName());
     }
 
     return message;
@@ -50,7 +50,7 @@ module.exports = {
         }
         outputSectionItems.push(`${apiKeyInfo.name}: ${apiKeyInfo.value}${description}`);
       });
-      this.serverless.addServiceOutputSection('api keys', outputSectionItems);
+      this.serverless.serviceOutputs.set('api keys', outputSectionItems);
     } else {
       apiKeysMessage += '\n  None';
     }
@@ -123,9 +123,9 @@ module.exports = {
     }
 
     if (outputSectionItems.length > 1) {
-      this.serverless.addServiceOutputSection('endpoints', outputSectionItems);
+      this.serverless.serviceOutputs.set('endpoints', outputSectionItems);
     } else if (outputSectionItems.length) {
-      this.serverless.addServiceOutputSection('endpoint', outputSectionItems[0]);
+      this.serverless.serviceOutputs.set('endpoint', outputSectionItems[0]);
     }
     legacy.consoleLog(endpointsMessage);
     return endpointsMessage;
@@ -145,7 +145,7 @@ module.exports = {
           }`
         );
       });
-      this.serverless.addServiceOutputSection('functions', outputSectionItems);
+      this.serverless.serviceOutputs.set('functions', outputSectionItems);
     } else {
       functionsMessage += '\n  None';
     }
@@ -164,7 +164,7 @@ module.exports = {
         layersMessage += `\n  ${l.name}: ${l.arn}`;
         outputSectionItems.push(`${l.name}: ${l.arn}`);
       });
-      this.serverless.addServiceOutputSection('layers', outputSectionItems);
+      this.serverless.serviceOutputs.set('layers', outputSectionItems);
     } else {
       layersMessage += '\n  None';
     }
@@ -190,7 +190,7 @@ module.exports = {
         outputSectionItems.push(`${output.OutputKey}: ${output.OutputValue}`);
       });
 
-      this.serverless.addServiceOutputSection('\nStack Outputs', outputSectionItems);
+      this.serverless.serviceOutputs.set('\nStack Outputs', outputSectionItems);
     }
 
     return message;
diff --git a/lib/plugins/aws/info/index.js b/lib/plugins/aws/info/index.js
index 8259dd29613..53a8486fe6c 100644
--- a/lib/plugins/aws/info/index.js
+++ b/lib/plugins/aws/info/index.js
@@ -88,6 +88,7 @@ class AwsInfo {
       'finalize': () => {
         if (this.serverless.processedInput.commands.join(' ') !== 'info') return;
         writeServiceOutputs(this.serverless.serviceOutputs);
+        writeServiceOutputs(this.serverless.servicePluginOutputs);
       },
     };
   }

From cc7d7e4d531090e81bf08842433397588d00afce Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 2 Nov 2021 12:22:03 +0100
Subject: [PATCH 0684/1101] feat(Telemetry): Add `projectId` to payload

---
 lib/plugins/aws/deploy/index.js               |  9 ++++
 lib/plugins/aws/provider.js                   | 32 +++++++-------
 lib/utils/telemetry/generatePayload.js        | 14 +++++++
 .../aws/deploy/lib/extendedValidate.test.js   | 10 +++++
 .../lib/plugins/aws/deployFunction.test.js    |  2 +
 .../apiGateway/lib/hack/updateStage.test.js   |  2 +
 .../package/lib/generateCoreTemplate.test.js  | 42 ++++++++++++++++++-
 ...tripNullPropsFromTemplateResources.test.js |  2 +-
 .../utils/telemetry/generatePayload.test.js   | 21 ++++++++++
 9 files changed, 118 insertions(+), 16 deletions(-)

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index c603d1362bb..6cd94d2e434 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -80,6 +80,15 @@ class AwsDeploy {
               .getStage()} ${style.aside(`(${this.serverless.getProvider('aws').getRegion()})`)}`
           );
           log.info(); // Ensure gap between verbose logging
+
+          // This is used to ensure that for `deploy` command, the `accountId` will be resolved and available
+          // for `generatePayload` telemetry logic
+          this.provider.getAccountId().then(
+            (accountId) => (this.provider.accountId = accountId),
+            () => {
+              /* pass on all errors */
+            }
+          );
         }
       },
 
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 4703b9ded04..f3d9d3ccd15 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -1437,6 +1437,9 @@ class AwsProvider {
     // Store credentials in this variable to avoid creating them several times (messes up MFA).
     this.cachedCredentials = null;
 
+    // Store accountId to be used in `generateTelemetry` logic
+    this.accountId = null;
+
     Object.assign(this.naming, naming);
   }
 
@@ -1725,20 +1728,6 @@ class AwsProvider {
     return stageSourceValue.value || defaultStage;
   }
 
-  getAccountInfo() {
-    return this.request('STS', 'getCallerIdentity', {}).then((result) => {
-      const arn = result.Arn;
-      const accountId = result.Account;
-      const partition = arn.split(':')[1]; // ex: arn:aws:iam:acctId:user/xyz
-      return {
-        accountId,
-        partition,
-        arn: result.Arn,
-        userId: result.UserId,
-      };
-    });
-  }
-
   /**
    * Get API Gateway Rest API ID from serverless config
    */
@@ -1858,6 +1847,21 @@ class AwsProvider {
 Object.defineProperties(
   AwsProvider.prototype,
   memoizeeMethods({
+    getAccountInfo: d(
+      async function () {
+        const result = await this.request('STS', 'getCallerIdentity', {});
+        const arn = result.Arn;
+        const accountId = result.Account;
+        const partition = arn.split(':')[1]; // ex: arn:aws:iam:acctId:user/xyz
+        return {
+          accountId,
+          partition,
+          arn: result.Arn,
+          userId: result.UserId,
+        };
+      },
+      { promise: true }
+    ),
     getAccountId: d(
       async function () {
         const result = await this.getAccountInfo();
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index b124ac8f644..a047f20a294 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -3,6 +3,7 @@
 const path = require('path');
 const os = require('os');
 const fs = require('fs');
+const crypto = require('crypto');
 const resolveSync = require('ncjsm/resolve/sync');
 const _ = require('lodash');
 const isPlainObject = require('type/plain-object/is');
@@ -298,6 +299,19 @@ module.exports = ({
     payload.config = getServiceConfig({ configuration, options, variableSources });
     payload.isConfigValid = getConfigurationValidationResult(configuration);
     payload.dashboard.orgUid = serverless && serverless.service.orgUid;
+
+    if (serverless && command === 'deploy' && isAwsProvider) {
+      const serviceName = isObject(configuration.service)
+        ? configuration.service.name
+        : configuration.service;
+      const accountId = serverless.getProvider('aws').accountId;
+      if (serviceName && accountId) {
+        payload.projectId = crypto
+          .createHash('sha256')
+          .update(`${serviceName}-${accountId}`)
+          .digest('base64');
+      }
+    }
   }
 
   if (commandUsage) {
diff --git a/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js b/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
index 746d3478ae3..a3da6edef93 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
@@ -191,6 +191,16 @@ describe('test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js', () =>
           },
         },
       },
+      awsRequestStubMap: {
+        STS: {
+          getCallerIdentity: {
+            ResponseMetadata: { RequestId: 'ffffffff-ffff-ffff-ffff-ffffffffffff' },
+            UserId: 'XXXXXXXXXXXXXXXXXXXXX',
+            Account: '1234567890',
+            Arn: 'arn:aws:iam::1234567890:user/test',
+          },
+        },
+      },
       command: 'deploy',
       lastLifecycleHookName: 'before:deploy:deploy',
     });
diff --git a/test/unit/lib/plugins/aws/deployFunction.test.js b/test/unit/lib/plugins/aws/deployFunction.test.js
index 46280c76b56..42747c74996 100644
--- a/test/unit/lib/plugins/aws/deployFunction.test.js
+++ b/test/unit/lib/plugins/aws/deployFunction.test.js
@@ -128,6 +128,8 @@ describe('AwsDeployFunction', () => {
     let getRoleStub;
 
     beforeEach(() => {
+      // Ensure that memoized function will be properly stubbed
+      awsDeployFunction.provider.getAccountInfo;
       getAccountInfoStub = sinon
         .stub(awsDeployFunction.provider, 'getAccountInfo')
         .resolves({ accountId: '123456789012', partition: 'aws' });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
index 97c386f52f9..c27313708b0 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
@@ -33,6 +33,8 @@ describe('#updateStage()', () => {
     options = { stage: 'dev', region: 'us-east-1' };
     awsProvider = new AwsProvider(serverless, options);
     serverless.setProvider('aws', awsProvider);
+    // Ensure that memoized function will be properly stubbed
+    awsProvider.getAccountInfo;
     providerGetAccountInfoStub = sinon.stub(awsProvider, 'getAccountInfo').resolves({
       accountId: '123456',
       partition: 'aws',
diff --git a/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js b/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js
index 86b791c3380..6c0ffb604d5 100644
--- a/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js
@@ -147,10 +147,20 @@ describe('#generateCoreTemplate()', () => {
             deploymentBucket: bucketName,
           },
         },
+        awsRequestStubMap: {
+          S3: { getBucketLocation: { LocationConstraint: '' } },
+          STS: {
+            getCallerIdentity: {
+              ResponseMetadata: { RequestId: 'ffffffff-ffff-ffff-ffff-ffffffffffff' },
+              UserId: 'XXXXXXXXXXXXXXXXXXXXX',
+              Account: '1234567890',
+              Arn: 'arn:aws:iam::1234567890:user/test',
+            },
+          },
+        },
         command: 'deploy',
         options: { 'aws-s3-accelerate': true },
         lastLifecycleHookName: 'before:deploy:deploy',
-        awsRequestStubMap: { S3: { getBucketLocation: { LocationConstraint: '' } } },
       })
     ).to.eventually.be.rejected.and.have.property(
       'code',
@@ -185,6 +195,16 @@ describe('#generateCoreTemplate()', () => {
       command: 'deploy',
       options: { 'aws-s3-accelerate': true },
       lastLifecycleHookName: 'before:deploy:deploy',
+      awsRequestStubMap: {
+        STS: {
+          getCallerIdentity: {
+            ResponseMetadata: { RequestId: 'ffffffff-ffff-ffff-ffff-ffffffffffff' },
+            UserId: 'XXXXXXXXXXXXXXXXXXXXX',
+            Account: '1234567890',
+            Arn: 'arn:aws:iam::1234567890:user/test',
+          },
+        },
+      },
     }).then(({ cfTemplate: template }) => {
       expect(template.Outputs.ServerlessDeploymentBucketAccelerated).to.not.equal(null);
       expect(template.Outputs.ServerlessDeploymentBucketAccelerated.Value).to.equal(true);
@@ -196,6 +216,16 @@ describe('#generateCoreTemplate()', () => {
       command: 'deploy',
       options: { 'aws-s3-accelerate': false },
       lastLifecycleHookName: 'before:deploy:deploy',
+      awsRequestStubMap: {
+        STS: {
+          getCallerIdentity: {
+            ResponseMetadata: { RequestId: 'ffffffff-ffff-ffff-ffff-ffffffffffff' },
+            UserId: 'XXXXXXXXXXXXXXXXXXXXX',
+            Account: '1234567890',
+            Arn: 'arn:aws:iam::1234567890:user/test',
+          },
+        },
+      },
     }).then(({ cfTemplate: template }) => {
       expect(template.Resources.ServerlessDeploymentBucket).to.be.deep.equal({
         Type: 'AWS::S3::Bucket',
@@ -220,6 +250,16 @@ describe('#generateCoreTemplate()', () => {
     runServerless({
       config: { service: 'irrelevant', provider: { name: 'aws', region: 'us-gov-west-1' } },
       command: 'deploy',
+      awsRequestStubMap: {
+        STS: {
+          getCallerIdentity: {
+            ResponseMetadata: { RequestId: 'ffffffff-ffff-ffff-ffff-ffffffffffff' },
+            UserId: 'XXXXXXXXXXXXXXXXXXXXX',
+            Account: '1234567890',
+            Arn: 'arn:aws:iam::1234567890:user/test',
+          },
+        },
+      },
       options: { 'aws-s3-accelerate': false },
       lastLifecycleHookName: 'before:deploy:deploy',
     }).then(({ cfTemplate: template }) => {
diff --git a/test/unit/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.test.js b/test/unit/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.test.js
index dfd3bcdcbba..b8f3113d8c2 100644
--- a/test/unit/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.test.js
@@ -11,7 +11,7 @@ describe('test/unit/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResour
   before(async () => {
     const result = await runServerless({
       fixture: 'aws',
-      command: 'deploy',
+      command: 'package',
       lastLifecycleHookName: 'package:finalize',
       configExt: {
         resources: {
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index 740ac2a4fad..62d2f630b16 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -659,4 +659,25 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
 
     expect(payload.config.variableSources).to.deep.equal(['ssm', 'opt']);
   });
+
+  it('Should correctly resolve projectId property', async () => {
+    const { serverless } = await runServerless({
+      fixture: 'httpApi',
+      command: 'print',
+      configExt: {
+        service: 'to-ensure-unique-serivce-name',
+      },
+    });
+    serverless.getProvider('aws').accountId = '1234567890';
+    const payload = generatePayload({
+      command: 'deploy',
+      options: {},
+      commandSchema: commandsSchema.get('deploy'),
+      serviceDir: serverless.serviceDir,
+      configuration: serverless.configurationInput,
+      serverless,
+    });
+
+    expect(payload.projectId).to.deep.equal('35dsFwCaexwLHppAP4uDsjKW4ci54q1AKcN5JTNaDtw=');
+  });
 });

From 50a845709eb846ce5ca3b60116c4ec278896a8b3 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 28 Oct 2021 15:43:44 +0200
Subject: [PATCH 0685/1101] feat: Allow `legacy` option for
 `lambdaHashingVersion` property

---
 docs/deprecations.md                         | 6 ++++--
 lib/plugins/aws/package/compile/functions.js | 7 ++++---
 lib/plugins/aws/provider.js                  | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 8ceae7e5224..69b39758255 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -322,9 +322,11 @@ Org, app, service, stage, and region are required to resolve variables when logg
 
 Deprecation code: `LAMBDA_HASHING_VERSION_V2`
 
-Resolution of lambda version hashes was improved with better (fixed deterministism issues) algorithm, which will be used starting with v3.0.0
+Lambda version hashes were improved with a better algorithm (that fixed determinism issues). It will be used by default starting with v3.0.0.
 
-You can adapt your services to use it now, by setting `provider.lambdaHashingVersion` to `20201221`.
+You can adapt your services to use it now by setting `provider.lambdaHashingVersion` to `20201221`.
+
+While not recommended, you can keep using the old hashing algorithm by setting `provider.lambdaHashingVersion` to `20200924`. That will silence the deprecation and allow to upgrade to v3.
 
 **Notice:** If you apply this on already deployed service without any changes to lambda code, you might encounter an error similar to the one below:
 
diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index 105fa0c8ebe..7b1803a2010 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -62,7 +62,8 @@ class AwsCompileFunctions {
             'LAMBDA_HASHING_VERSION_V2',
             'Resolution of lambda version hashes was improved with better algorithm, ' +
               'which will be used in next major release.\n' +
-              'Switch to it now by setting "provider.lambdaHashingVersion" to "20201221"'
+              'Switch to it now by setting "provider.lambdaHashingVersion" to "20201221".\n' +
+              'While it is highly encouraged to upgrade to new algorithm, you can still use the old approach by setting "provider.lambdaHashingVersion" to "20200924".'
           );
         }
         if (
@@ -147,7 +148,7 @@ class AwsCompileFunctions {
 
   async addFileToHash(filePath, hash) {
     const lambdaHashingVersion = this.serverless.service.provider.lambdaHashingVersion;
-    if (lambdaHashingVersion) {
+    if (lambdaHashingVersion >= 20201221) {
       const filePathHash = await getHashForFilePath(filePath);
       hash.write(filePathHash);
     } else {
@@ -502,7 +503,7 @@ class AwsCompileFunctions {
       delete functionProperties.Tags;
 
       const lambdaHashingVersion = this.serverless.service.provider.lambdaHashingVersion;
-      if (lambdaHashingVersion) {
+      if (lambdaHashingVersion >= 20201221) {
         functionProperties.layerConfigurations = layerConfigurations;
         versionHash.write(JSON.stringify(deepSortObjectByKey(functionProperties)));
       } else {
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index f3d9d3ccd15..9d4d1c894fe 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -1010,7 +1010,7 @@ class AwsProvider {
             kmsKeyArn: { $ref: '#/definitions/awsKmsArn' },
             lambdaHashingVersion: {
               type: 'string',
-              enum: ['20201221'],
+              enum: ['20200924', '20201221'],
             },
             layers: { $ref: '#/definitions/awsLambdaLayers' },
             logRetentionInDays: {

From a5af62b43e494f03ce33ff45f97b9d4d8e22ef1e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 3 Nov 2021 14:22:36 +0100
Subject: [PATCH 0686/1101] chore: Upgrade`@serverless/eslint-config` to v4

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 65abb08711c..c1bc2fc41d7 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
   },
   "devDependencies": {
     "@commitlint/cli": "^12.1.4",
-    "@serverless/eslint-config": "^3.0.0",
+    "@serverless/eslint-config": "^4.0.0",
     "@serverless/test": "^8.4.0",
     "adm-zip": "^0.5.9",
     "chai": "^4.3.4",
@@ -110,7 +110,7 @@
     "xml2js": "^0.4.23"
   },
   "eslintConfig": {
-    "extends": "@serverless/eslint-config/node",
+    "extends": "@serverless/eslint-config/node/10",
     "root": true,
     "overrides": [
       {

From 87ee58a2d2f191a80ca2d4aaee8aa92e86dbce28 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 3 Nov 2021 13:01:44 +0100
Subject: [PATCH 0687/1101] chore: Bump dependencies

---
 package.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index c1bc2fc41d7..0169594155a 100644
--- a/package.json
+++ b/package.json
@@ -22,15 +22,15 @@
     "sls": "./bin/serverless.js"
   },
   "dependencies": {
-    "@serverless/cli": "^1.5.2",
-    "@serverless/components": "^3.17.1",
-    "@serverless/dashboard-plugin": "^5.5.0",
+    "@serverless/cli": "^1.5.3",
+    "@serverless/components": "^3.17.2",
+    "@serverless/dashboard-plugin": "^5.5.1",
     "@serverless/platform-client": "^4.3.0",
-    "@serverless/utils": "^5.19.0",
+    "@serverless/utils": "^5.20.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.1011.0",
+    "aws-sdk": "^2.1021.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.1.2",
     "cachedir": "^2.3.0",
@@ -46,7 +46,7 @@
     "essentials": "^1.1.1",
     "ext": "^1.6.0",
     "fastest-levenshtein": "^1.0.12",
-    "filesize": "^8.0.3",
+    "filesize": "^8.0.6",
     "fs-extra": "^9.1.0",
     "get-stdin": "^8.0.0",
     "globby": "^11.0.4",
@@ -62,7 +62,7 @@
     "memoizee": "^0.4.15",
     "micromatch": "^4.0.4",
     "ncjsm": "^4.2.0",
-    "node-fetch": "^2.6.5",
+    "node-fetch": "^2.6.6",
     "object-hash": "^2.2.0",
     "path2": "^0.1.0",
     "process-utils": "^4.0.0",
@@ -86,7 +86,7 @@
     "adm-zip": "^0.5.9",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "cos-nodejs-sdk-v5": "^2.10.5",
+    "cos-nodejs-sdk-v5": "^2.10.6",
     "eslint": "^7.32.0",
     "eslint-plugin-import": "^2.25.2",
     "git-list-updated": "^1.2.1",
@@ -95,7 +95,7 @@
     "jszip": "^3.7.1",
     "lint-staged": "^10.5.4",
     "log": "^6.3.1",
-    "log-node": "^8.0.1",
+    "log-node": "^8.0.2",
     "mocha": "^8.4.0",
     "mock-require": "^3.0.3",
     "nyc": "^15.1.0",

From 6a2be57a088e8caf5a0a735e677184f80c362e0b Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 4 Nov 2021 09:05:18 +0100
Subject: [PATCH 0688/1101] chore: Release v2.65.0

---
 CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1806b58bccb..21f58b1c057 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,43 @@
 
 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.
 
+## [2.65.0](https://github.com/serverless/serverless/compare/v2.64.1...v2.65.0) (2021-11-03)
+
+### Features
+
+- **AWS Lambda:**
+  - Support CF intrinsic functions at `functions[].reservedConcurrency` ([#10129](https://github.com/serverless/serverless/issues/10129)) ([7cfddff](https://github.com/serverless/serverless/commit/7cfddff31433582ac031be0a168eba2d356d7ee9)) ([ROSeaboyer](https://github.com/ROSeaboyer))
+  - Allow to stick to current default Lambda hashing version mode with `lambdaHashingVersion: 20200924` setting ([#10173](https://github.com/serverless/serverless/pull/10173)) ([50a8457](https://github.com/serverless/serverless/commit/50a845709eb846ce5ca3b60116c4ec278896a8b3)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS EventBridge:** Adjust deprecation of deployment method and allow to keep using old approach ([#10133](https://github.com/serverless/serverless/pull/10133)) ([bf62b7c](https://github.com/serverless/serverless/commit/bf62b7c4dabbecc892fde4d0d988dc2dd2cb7461)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS Local Invocation:** Support decimal serialization for Python ([#10178](https://github.com/serverless/serverless/pull/10178)) ([9ef46ba](https://github.com/serverless/serverless/commit/9ef46ba05ff033dbf04c451a214bf4ced23c90e8)) ([Shane R. Spencer](https://github.com/whardier))
+
+### Bug Fixes
+
+- **AWS Deploy:** Fix handling of deployment bucket extensions ([#10137](https://github.com/serverless/serverless/issues/10137)) ([39bdea0](https://github.com/serverless/serverless/commit/39bdea07500b8fb814a5cce83ec6f78a0c75006c)) ([Mars Lan](https://github.com/mars-lan))
+- **AWS HTTP API:** Recognize max timeout as 30s instead of 29s ([#10119](https://github.com/serverless/serverless/issues/10119)) ([e3e02fe](https://github.com/serverless/serverless/commit/e3e02fe8e2f1bbd236cfa49f80a360fd828c1ead)) ([Caio Fauza](https://github.com/CaioFauza))
+- **CLI:**
+  - Fix `help` command usage information ([#10175](https://github.com/serverless/serverless/issues/10175)) ([254e70c](https://github.com/serverless/serverless/commit/254e70cd0ad9bb1803d3a5741b966f5807e9d869)) ([Sebastian Bille](https://github.com/TastefulElk))
+  - Fix resolution of help for not integrated commands ([#10128](https://github.com/serverless/serverless/pull/10128)) ([204f205](https://github.com/serverless/serverless/commit/204f2051f6a5ca5f046eb905292dfae0c597e33f)) ([Mariusz Nowak](https://github.com/medikoo))
+- Recognize accessible configuration parts on validation errors ([#10134](https://github.com/serverless/serverless/pull/10134)) ([b7a6349](https://github.com/serverless/serverless/commit/b7a634974dc2ee138d85ec58609bf2559c5de9f6)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Performance Improvements
+
+- **CLI:** Integrate CLI triage into this package (no `@serverless/components` and `@serverless/cli` modules are loaded unless their CLI is used)([#10131](https://github.com/serverless/serverless/pull/10131)) ([415bdef](https://github.com/serverless/serverless/commit/415bdefca092e60cacd867006bacddfda231ed94)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **CLI:**
+  - Improve file size output in logs ([#10169](https://github.com/serverless/serverless/pull/10169)) ([4448490](https://github.com/serverless/serverless/commit/44484903b38eaa18c3e3838b8a3f217922a233e5)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Improve main progress message ([#10183](https://github.com/serverless/serverless/pull/10183)) ([533f709](https://github.com/serverless/serverless/commit/533f709c5833619d5ce86ec987133ff0f148c8e0)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Telemetry:** Add `projectId` to payload ([#10180](https://github.com/serverless/serverless/pull/10180)) ([cc7d7e4](https://github.com/serverless/serverless/commit/cc7d7e4d531090e81bf08842433397588d00afce)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS EventBridge:** Address typos in error messages ([#10165](https://github.com/serverless/serverless/issues/10165)) ([ee38f6a](https://github.com/serverless/serverless/commit/ee38f6a3081a3a0f22ee9fea8975f13520ac18ec)) ([Andreas Kohn](https://github.com/ankon))
+- Seprate internal and plugin output sections ([#10184](https://github.com/serverless/serverless/pull/10184)) ([7bb2520](https://github.com/serverless/serverless/commit/7bb2520f491d008075eb08be64bdb2e0b60ec5c6)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Templates
+
+- Package lambdas individually in `aws-nodejs-typescript` ([#10106](https://github.com/serverless/serverless/pull/10106)) ([3aab5f8](https://github.com/serverless/serverless/commit/3aab5f86985598d6bb3135f4ab934092ad467df5)) ([Adrien Cacciaguerra](https://github.com/adriencaccia))
+- Upgrade `azure-nodejs-typescript` ([#10163](https://github.com/serverless/serverless/issues/10163)) ([26846d5](https://github.com/serverless/serverless/commit/26846d5879d655ffe299db694a33f1f6d187a941)) ([Giang Nguyen](https://github.com/giangnm))
+
 ### [2.64.1](https://github.com/serverless/serverless/compare/v2.64.0...v2.64.1) (2021-10-20)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 0169594155a..6a1e609506b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.64.1",
+  "version": "2.65.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 53490a55183db5f304d0e3ef69feadd9a20fa815 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 5 Nov 2021 14:46:42 +0100
Subject: [PATCH 0689/1101] fix(CLI): Do not recomment `frameworkVersion` when
 running pre release

---
 lib/classes/Service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index c33025c8c16..7e1d0686dbc 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -145,7 +145,7 @@ class Service {
       );
       ymlVersion = null;
     }
-    if (!this.isLocallyInstalled && !ymlVersion) {
+    if (!this.isLocallyInstalled && !ymlVersion && !semver.parse(version).prerelease.length) {
       log.info(
         'To ensure safe major version upgrades ensure "frameworkVersion" setting in ' +
           'service configuration ' +

From ea05d7c41e84b0f68017804b06d6435062673d26 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 5 Nov 2021 17:46:53 +0100
Subject: [PATCH 0690/1101] refactor: Ensure to use `legacy.log` instead of
 `cli.log`

---
 lib/plugins/aws/remove/lib/bucket.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/aws/remove/lib/bucket.js b/lib/plugins/aws/remove/lib/bucket.js
index 5573a6692e5..c22ddcb83fc 100644
--- a/lib/plugins/aws/remove/lib/bucket.js
+++ b/lib/plugins/aws/remove/lib/bucket.js
@@ -36,7 +36,7 @@ module.exports = {
   async listObjectVersions() {
     this.objectsInBucket = [];
 
-    this.serverless.cli.log('Getting all objects in S3 bucket...');
+    legacy.log('Getting all objects in S3 bucket...');
     const serviceStage = `${this.serverless.service.service}/${this.provider.getStage()}`;
 
     const result = await this.provider.request('S3', 'listObjectVersions', {

From ecf2918694528e3225ad045980e3eae9a848ad07 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 5 Nov 2021 17:48:18 +0100
Subject: [PATCH 0691/1101] test: Remove dead tests

---
 .../lib/plugins/aws/deploy/lib/checkForChanges.test.js   | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
index d75dbe81d07..a3172263dde 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
@@ -44,7 +44,6 @@ describe('checkForChanges', () => {
       foo: 'bar',
     };
     s3Key = `serverless/${serverless.service.service}/${provider.getStage()}`;
-    awsDeploy.serverless.cli = { log: sandbox.spy() };
     cryptoStub = {
       createHash() {
         return this;
@@ -262,7 +261,6 @@ describe('checkForChanges', () => {
         expect(normalizeCloudFormationTemplateStub).to.not.have.been.called;
         expect(globbySyncStub).to.not.have.been.called;
         expect(readFileStub).to.not.have.been.called;
-        expect(awsDeploy.serverless.cli.log).to.not.have.been.called;
       }));
 
     it('should resolve if no objects are provided as input', () => {
@@ -272,7 +270,6 @@ describe('checkForChanges', () => {
         expect(normalizeCloudFormationTemplateStub).to.not.have.been.called;
         expect(globbySyncStub).to.not.have.been.called;
         expect(readFileStub).to.not.have.been.called;
-        expect(awsDeploy.serverless.cli.log).to.not.have.been.called;
       });
     });
 
@@ -286,7 +283,6 @@ describe('checkForChanges', () => {
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledOnce;
         expect(globbySyncStub).to.have.been.calledOnce;
         expect(readFileStub).to.have.been.calledOnce;
-        expect(awsDeploy.serverless.cli.log).to.not.have.been.called;
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledWithExactly(
           awsDeploy.serverless.service.provider.compiledCloudFormationTemplate
         );
@@ -321,7 +317,6 @@ describe('checkForChanges', () => {
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledOnce;
         expect(globbySyncStub).to.have.been.calledOnce;
         expect(readFileStub).to.have.been.calledOnce;
-        expect(awsDeploy.serverless.cli.log).to.not.have.been.called;
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledWithExactly(
           awsDeploy.serverless.service.provider.compiledCloudFormationTemplate
         );
@@ -351,7 +346,6 @@ describe('checkForChanges', () => {
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledOnce;
         expect(globbySyncStub).to.have.been.calledOnce;
         expect(readFileStub).to.have.been.calledOnce;
-        expect(awsDeploy.serverless.cli.log).to.not.have.been.called;
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledWithExactly(
           awsDeploy.serverless.service.provider.compiledCloudFormationTemplate
         );
@@ -383,7 +377,6 @@ describe('checkForChanges', () => {
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledOnce;
         expect(globbySyncStub).to.have.been.calledOnce;
         expect(readFileStub).to.have.been.calledTwice;
-        expect(awsDeploy.serverless.cli.log).to.not.have.been.called;
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledWithExactly(
           awsDeploy.serverless.service.provider.compiledCloudFormationTemplate
         );
@@ -420,7 +413,6 @@ describe('checkForChanges', () => {
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledOnce;
         expect(globbySyncStub).to.have.been.calledOnce;
         expect(readFileStub).to.have.been.calledOnce;
-        expect(awsDeploy.serverless.cli.log).to.not.have.been.called;
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledWithExactly(
           awsDeploy.serverless.service.provider.compiledCloudFormationTemplate
         );
@@ -552,7 +544,6 @@ describe('checkForChanges', () => {
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledOnce;
         expect(globbySyncStub).to.have.been.calledOnce;
         expect(readFileStub).to.have.been.calledOnce;
-        expect(awsDeploy.serverless.cli.log).not.to.be.called;
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledWithExactly(
           awsDeploy.serverless.service.provider.compiledCloudFormationTemplate
         );

From 93536fefd6f3c947f8303aa3febf1df5ebfb4fc7 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Wed, 3 Nov 2021 12:14:18 +0100
Subject: [PATCH 0692/1101] docs: Add v3 upgrading guide

---
 docs/deprecations.md        |   4 +-
 docs/getting-started.md     |  36 ++---
 docs/guides/upgrading-v3.md | 268 ++++++++++++++++++++++++++++++++++++
 3 files changed, 289 insertions(+), 19 deletions(-)
 create mode 100644 docs/guides/upgrading-v3.md

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 69b39758255..4d4b560eecc 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -100,7 +100,7 @@ Starting with `v3.0.0`, the default runtime will change from `nodejs12.x` to `no
 
 Deprecation code: `AWS_API_GATEWAY_NON_APPLICABLE_SETTINGS`
 
-When external API Gateway resource is used and imported via `provider.apiGateway.restApiId` setting, both `provider.logs.restApi` and `provider.tracing.apiGateway` will be ignored. These settings are applicable only if API Gateway resource is provisioned by Serverless Framework.
+When external API Gateway resource is used and imported via `provider.apiGateway.restApiId` setting, both `provider.logs.restApi` and `provider.tracing.apiGateway` are ignored. In v3, an error will be thrown if these options are defined. Indeed, these settings are applicable only if API Gateway resource is provisioned by Serverless Framework.
 
 <a name="CLI_OPTIONS_SCHEMA'"><div>&nbsp;</div></a>
 
@@ -212,7 +212,7 @@ It's recommended to expose all errors that eventually new resolver may report (t
 
 Deprecation code: `AWS_HTTP_API_USE_PROVIDER_TAGS`
 
-Starting with v3.0.0, `provider.tags` will be applied to Http Api Gateway by default
+Starting with v3.0.0, `provider.tags` will be applied to HTTP API Gateway stages by default
 Set `provider.httpApi.useProviderTags` to `true` to adapt to the new behavior now.
 
 <a name="MISSING_COMMANDS_OR_OPTIONS_AT_CONSTRUCTION"><div>&nbsp;</div></a>
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 4096abf0227..f2302f5da60 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -19,7 +19,19 @@ menuItems:
 
 # Get started with Serverless Framework Open Source & AWS
 
-Getting started with Serverless Framework’s Open Source CLI and AWS only takes a few minutes. Install as a standalone binary, or with npm.
+Getting started with Serverless Framework’s Open Source CLI and AWS only takes a few minutes. Install with NPM, or as a standalone binary if you don't use NPM.
+
+## via NPM
+
+Install the serverless CLI via NPM:
+
+```bash
+npm install -g serverless
+```
+
+_Note: If you don’t already have [Node](https://nodejs.org/en/download/package-manager/) on your machine, install it first. We suggest using the latest LTS version of NodeJS._
+
+If you don't want to install Node or NPM, you can install a standalone binary.
 
 ## Install as a standalone binary
 
@@ -47,16 +59,6 @@ Install with [Chocolatey](https://chocolatey.org/):
 choco install serverless
 ```
 
-### via npm
-
-_Note: If you don’t already have [Node](https://nodejs.org/en/download/package-manager/) on your machine, you’ll need to install it first. We suggest using the latest LTS version of NodeJS._
-
-Install the serverless CLI:
-
-```bash
-npm install -g serverless
-```
-
 ## Initial setup
 
 Run the command below and follow the prompts:
@@ -71,22 +73,22 @@ _Note: Users in China are presented with a setup centered around the chinese [Te
 
 ## Upgrade
 
-### MacOS/Linux
+### via npm
 
 ```bash
-serverless upgrade
+npm update -g serverless
 ```
 
-### Windows
+### MacOS/Linux
 
 ```bash
-choco upgrade serverless
+serverless upgrade
 ```
 
-### via npm
+### Windows
 
 ```bash
-npm update -g serverless
+choco upgrade serverless
 ```
 
 ## Set up your free Dashboard account
diff --git a/docs/guides/upgrading-v3.md b/docs/guides/upgrading-v3.md
new file mode 100644
index 00000000000..30573bed88c
--- /dev/null
+++ b/docs/guides/upgrading-v3.md
@@ -0,0 +1,268 @@
+<!--
+title: Serverless Framework - Upgrading to v3
+menuText: Upgrading to v3
+menuOrder: 12
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/guides/upgrading-v3/)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# Upgrading to Serverless Framework v3
+
+Serverless Framework v3 contains a few breaking changes that may impact some projects.
+
+This guide helps users upgrade from Serverless Framework v2 to v3.
+
+**Note:** Serverless Framework v3 isn't released yet. However, this guide helps to prepare to v3, or upgrade to the v3 beta version.
+
+## Am I impacted by breaking changes?
+
+Serverless Framework v2 signals any deprecated feature via a deprecation warning. The simplest way to upgrade to v3 is to:
+
+1. Upgrade Serverless Framework to the latest v2 version
+2. Run `serverless` commands in the project to see if there are any deprecation warnings
+
+Projects that do not have any deprecations can be immediately upgraded to v3. Projects that have deprecation warnings should first solve these deprecations, then upgrade to v3.
+
+## What about plugins?
+
+We have worked with the most popular plugins to make sure they support Serverless Framework v3. As long as a project has no deprecations, it can be safely upgraded to v3.
+
+That being said, some plugins need to be updated to be installable with v3. In most cases, it is a matter of allowing the plugin to be installed with Serverless Framework v3 in `package.json` (updating the `peerDependencies` requirement). Feel free to open an issue or pull request in the GitHub repository of the plugin.
+
+## Upgrading to v3
+
+First, upgrade to the latest v2 version and make sure that you do not see any deprecation warning.
+
+Then, to upgrade to Serverless Framework v3, run:
+
+```bash
+npm update -g serverless
+```
+
+If you [installed `serverless` as a standalone binary](../getting-started.md#install-as-a-standalone-binary), run the following command instead:
+
+- MacOS/Linux standalone binary: `serverless upgrade --major`
+- Windows: `choco upgrade serverless`
+
+## Using v2 and v3 in different projects
+
+It is possible to use v3 in some projects and v2 in other projects. To achieve that, install the Serverless Framework locally via NPM (`npm i --save-dev serverless`).
+
+There are 2 scenarios:
+
+- Using v3 globally, and v2 in specific projects.
+
+  This is the simplest. Upgrade the global version to v3, and install v2 in specific projects (via NPM). The `serverless` command will automatically run the correct version (v3 can run v2).
+
+- Using v2 globally, and v3 in specific projects.
+
+  To achieve that, install v3 in specific projects (via NPM). Then, use `serverless` for v2 projects, and `npx serverless` for v3 projects.
+
+## Breaking changes
+
+You will find below a complete list of all breaking changes. All those breaking changes were signaled via deprecation messages in Serverless Framework v2.
+
+### CLI commands and options
+
+The `serverless` CLI no longer runs on Node v10 because [that version is obsolete](https://endoflife.date/nodejs): upgrade to v12 or greater to run `serverless` on your machine.
+
+The `serverless` CLI used to accept free-form CLI options. This feature was deprecated and has been removed. The main reason is that this prevented us from detecting typos in options, which sometimes created unexpected situations and overall a bad user experience. [Learn more about this change](../deprecations.md#handling-of-unrecognized-cli-options).
+
+Additionally, all CLI options must now be passed at the end of the commands:
+
+```bash
+# Will no longer work in v3:
+serverless --verbose deploy
+
+# Correct syntax:
+serverless deploy --verbose
+```
+
+This change makes the CLI much more robust at detecting arguments from options and their values.
+
+On that note, the `-v` option is no longer recognized (it was ambiguous with `--version`): use the full `--verbose` option instead.
+
+When the `serverless` CLI is installed globally and locally (in the project’s `node_modules`), the local version will always be used. It is no longer possible to disable that behavior ([learn more](../deprecations.md#support-for-enablelocalinstallationfallback-setting-is-to-be-removed)).
+
+Finally, the `serverless studio` command has been removed: that feature was deprecated and is no longer available.
+
+### Service configuration
+
+The default Lambda runtime has changed from NodeJS 12 to NodeJS 14, given this is now the default runtime recommended by AWS.
+
+In `serverless.yml`, the `service` key no longer accepts a YAML object ([learn more](../deprecations.md#service-property-object-notation)).
+
+```yaml
+# Deprecated in v2, removed in v3:
+service:
+    name: my-service
+
+# Correct syntax:
+service: my-service
+```
+
+All options that used to be defined inside the `service` key have been moved to other sections (mentioned below in that document). This change clears up confusion that existed between the `service` and `provider` sections.
+
+### API Gateway
+
+When configuring API Gateway, some configuration options have moved to a dedicated sub-section of `provider`. That will help clear up confusion with similar `httpApi` settings.
+
+```yaml
+provider:
+  # Deprecated in v2, removed in v3:
+  apiKeys: ...
+  resourcePolicy: ...
+  usagePlan: ...
+
+  # Correct syntax:
+  apiGateway:
+    apiKeys: ...
+    resourcePolicy: ...
+    usagePlan: ...
+```
+
+The `schema` option on HTTP events has also been renamed to `schemas`. That change allowed us to support much more schema validation features:
+
+```yaml
+functions:
+  hello:
+    handler: hello.handler
+    events:
+      - http:
+          ...
+          request:
+            # Deprecated in v2, removed in v3:
+            schema: ...
+            # Correct syntax:
+            schemas: ...
+```
+
+Learn more about [schema changes](../deprecations.md#aws-api-gateway-schemas).
+
+When an external API Gateway is used and imported via `provider.apiGateway.restApiId`, both `provider.logs.restApi` and `provider.tracing.apiGateway` options are ignored. In v3, an error will be thrown if these options are defined. Indeed, these settings are applicable only if the API Gateway is provisioned by Serverless Framework.
+
+The CloudFormation tags defined in `provider.tags` will now be correctly applied to HTTP APIs stages ([learn more](../deprecations.md#http-api-provider-tags)).
+
+Starting with v3, AWS's recommended behavior for API Gateway authorizers will become the default: `functions[].events[].http.authorizer.identitySource` will no longer be set to `method.request.header.Authorization` by default when caching is disabled (i.e. for authorizers of type "request" with `resultTtlInSeconds` set to "0") ([learn more](../deprecations.md#default-identitysource-for-httpauthorizer)).
+
+### CloudFront
+
+Some CloudFront `behavior` options where deprecated by AWS: ForwardedValues, MinTTL, MaxTTL and DefaultTTL. These options have been removed. Use the new ["cache policy" feature](../providers/aws/events/cloudfront.md#cache-policy-configuration) instead ([learn more](../deprecations.md#cloudfront-event-behaviorforwardedvalues-property)).
+
+### EventBridge
+
+By default, all EventBridge resources (including Lambda triggers) will now be deployed using native CloudFormation resources, instead of a custom resource ([learn more](../deprecations.md#aws-eventbridge-lambda-event-triggers)). The change has the benefit of relying on native AWS features now, which will be more stable and future-proof.
+
+Since this is a hard breaking change for Serverless Framework v2 users, it is possible to keep the legacy behavior (based on custom resources) by using this flag:
+
+```yaml
+provider:
+  eventBridge:
+    useCloudFormation: false
+```
+
+With this flag, v2 users can upgrade to v3 without breaking change. Note that `useCloudFormation: false` will be deprecated eventually, and will not be supported in the future.
+
+### KMS
+
+When configuring KMS keys, some configuration options have moved ([learn more](../deprecations.md#awskmskeyarn-references)):
+
+```yaml
+# Deprecated in v2, removed in v3:
+service:
+  awsKmsKeyArn: ...
+functions:
+  hello:
+    awsKmsKeyArn: ...
+
+# Correct syntax:
+provider:
+  kmsKeyArn: ...
+functions:
+  hello:
+    kmsKeyArn: ...
+```
+
+That allowed us to make the KMS configuration consistent with all other AWS resources: these are now configured in the `provider` section.
+
+### Alexa skill
+
+`alexaSkill` events now require an `appId` ([learn more](../deprecations.md#support-for-alexaskill-event-without-appid-is-to-be-removed)). That change was required to implement a more stable deployment, as well as to deploy more restricted IAM permissions.
+
+### Low-level changes
+
+Internal changes that may impact plugins or advanced use cases:
+
+- Plugins can no longer define custom variables via the legacy variable resolver ([learn more](../deprecations.md#new-variables-resolver)).
+
+  The new variable resolver API was introduced to provide a simpler and more stable way of defining custom variables. Most plugins have switched to that new variable resolver, but older plugins may still require some updates.
+
+- CloudFormation outputs are now always exported ([learn more](../deprecations.md#disable-default-output-export-names)
+
+  This change allows us to simplify and clean up the internals by removing options and logic switches. The use cases for not exporting CloudFormation outputs were very uncommon.
+
+- When using the Serverless Framework programmatically, the service configuration must be at the root directory of the service ([learn more](../deprecations.md#service-configurations-should-not-be-nested-in-service-sub-directories)) and the arguments have changed ([learn more here](../deprecations.md#serverless-constructor-service-configuration-dependency) as well as [here](../deprecations.md#serverless-constructor-configcommands-and-configoptions-requirement)).
+
+  Using the Serverless Framework programmatically is a very unusual and low-level scenario: we took advantage of the major version to improve the API.
+
+### Deprecated features that will be kept in v3
+
+Some Serverless Framework v2 features were marked as deprecated. However, given they are still widely used, we have chosen to keep the following features in v3.
+
+IAM configuration has changed, yet both syntaxes are supported in v3:
+
+```yaml
+# Older syntax, still supported in v3
+provider:
+  role: ...
+  rolePermissionsBoundary: ...
+  iamRoleStatements: ...
+  iamManagedPolicies: ...
+  cfnRole: ...
+
+# New syntax
+provider:
+  iam:
+    role:
+      name: ...
+      permissionsBoundary: ...
+      statements: ...
+      managedPolicies: ...
+    deploymentRole: ...
+```
+
+In the same spirit, packaging configuration has changed but both syntaxes are supported in v3:
+
+```yaml
+# Older syntax, still supported in v3
+package:
+  exclude:
+    - 'src/**'
+  include:
+    - src/function/handler.js
+
+# New syntax
+package:
+  patterns:
+    - '!src/**'
+    - src/function/handler.js
+```
+
+Configuration validation is still kept at the "warning" level by default (instead of turning to errors, as initially planned). To turn validation issues into errors, use:
+
+```yaml
+# v2 and v3 both keep the same default behavior: warnings by default
+configValidationMode: warn
+
+# Opt-in errors via:
+configValidationMode: error
+```
+
+Unlike planned initially, loading `.env` files is kept opt-in via `useDotenv: true`.
+
+Additionally, the short form `serverless deploy -f <function>` is still allowed in v3, but `serverless deploy function -f <function>` stays the preferred form.

From 800f63d7aee0ed6f9892aab10738ad539a354ef3 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Mon, 8 Nov 2021 12:20:57 +0100
Subject: [PATCH 0693/1101] docs: Document #10207 in the upgrading guide

---
 docs/guides/upgrading-v3.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/guides/upgrading-v3.md b/docs/guides/upgrading-v3.md
index 30573bed88c..ad804866914 100644
--- a/docs/guides/upgrading-v3.md
+++ b/docs/guides/upgrading-v3.md
@@ -95,6 +95,8 @@ Finally, the `serverless studio` command has been removed: that feature was depr
 
 The default Lambda runtime has changed from NodeJS 12 to NodeJS 14, given this is now the default runtime recommended by AWS.
 
+Additionally, the `nodejs10.x`, `python2.7`, `ruby2.5` and `dotnetcore2.1` runtimes [are no longer supported and accepted by AWS Lambda](https://docs.aws.amazon.com/lambda/latest/dg/runtime-support-policy.html). As such, these runtimes will no longer be accepted in v3.
+
 In `serverless.yml`, the `service` key no longer accepts a YAML object ([learn more](../deprecations.md#service-property-object-notation)).
 
 ```yaml

From a591008dcf3fb713eb7727759045603a7a19b786 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Mon, 8 Nov 2021 14:10:16 +0100
Subject: [PATCH 0694/1101] docs: Improve "Upgrading" instructions

to clarify that NPM is the default recommended method
---
 docs/getting-started.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/getting-started.md b/docs/getting-started.md
index f2302f5da60..43ff19a0996 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -79,13 +79,17 @@ _Note: Users in China are presented with a setup centered around the chinese [Te
 npm update -g serverless
 ```
 
-### MacOS/Linux
+If you have installed `serverless` as a standalone binary, read the following section instead.
+
+### Standalone binary
+
+#### MacOS/Linux
 
 ```bash
 serverless upgrade
 ```
 
-### Windows
+#### Windows
 
 ```bash
 choco upgrade serverless

From 723927f2dcdcc425025da03ac0be5edd3c203dc7 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 8 Nov 2021 14:09:38 +0100
Subject: [PATCH 0695/1101] feat(Variables): Recognize `:` in address to
 support `output` source

---
 lib/configuration/variables/parse.js                |  5 -----
 test/unit/lib/configuration/variables/parse.test.js | 12 ++++++------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/lib/configuration/variables/parse.js b/lib/configuration/variables/parse.js
index c43eb09cf2f..c487304529b 100644
--- a/lib/configuration/variables/parse.js
+++ b/lib/configuration/variables/parse.js
@@ -426,11 +426,6 @@ module.exports = (inputValue) => {
               contextVariables
             );
             finalizeSource();
-          } else if (char === ':') {
-            throw new ServerlessError(
-              `Invalid variable address at index ${sourceStart} in "${value}"`,
-              'INVALID_VARIABLE_ADDRESS'
-            );
           }
           break;
         case 'afterAddressString':
diff --git a/test/unit/lib/configuration/variables/parse.test.js b/test/unit/lib/configuration/variables/parse.test.js
index db7a776dda7..0cdd8ceb809 100644
--- a/test/unit/lib/configuration/variables/parse.test.js
+++ b/test/unit/lib/configuration/variables/parse.test.js
@@ -32,6 +32,12 @@ describe('test/unit/lib/configuration/variables/parse.test.js', () => {
         { sources: [{ type: 'type', address: { value: 'address' } }] },
       ]));
 
+    // ${type:address:with:colons}
+    it('should support type and address with colons', () =>
+      expect(parse('${type:address:with:colons}')).to.deep.equal([
+        { sources: [{ type: 'type', address: { value: 'address:with:colons' } }] },
+      ]));
+
     // ${type(param)}
     it('should support param', () =>
       expect(parse('${type(param)}')).to.deep.equal([
@@ -394,12 +400,6 @@ describe('test/unit/lib/configuration/variables/parse.test.js', () => {
         .to.throw(ServerlessError)
         .with.property('code', 'INVALID_VARIABLE_TYPE'));
 
-    // ${type:foo:bar}
-    it('should reject ":" strings in address literal', () =>
-      expect(() => parse('${type:foo:bar}'))
-        .to.throw(ServerlessError)
-        .with.property('code', 'INVALID_VARIABLE_ADDRESS'));
-
     // ${type:address
     it('should detect not closed variable', () => {
       expect(() => parse('${type:address'))

From e8c8d259fb79ae04e33e01af162c6666f0060189 Mon Sep 17 00:00:00 2001
From: Vicary A <vicary@yahoo.com>
Date: Tue, 9 Nov 2021 00:33:00 +0800
Subject: [PATCH 0696/1101] fix(AWS API Gateway): Ensure
 `shouldStartNameWithService` support

---
 .../events/apiGateway/lib/hack/updateStage.js |  2 +-
 .../apiGateway/lib/hack/updateStage.test.js   | 63 +++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js
index 21483c3450b..bbd329edbab 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js
@@ -150,7 +150,7 @@ async function resolveRestApiId() {
     }
     const apiName = apiGatewayResource
       ? apiGatewayResource.Properties.Name
-      : provider.apiName || `${this.options.stage}-${this.state.service.service}`;
+      : provider.naming.getApiGatewayName();
     const resolveFromAws = (position) =>
       this.provider
         .request('APIGateway', 'getRestApis', { position, limit: 500 })
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
index c27313708b0..aa1b126091f 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
@@ -13,6 +13,7 @@ const {
   defaultApiGatewayLogLevel,
 } = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage');
 const runServerless = require('../../../../../../../../../../utils/run-serverless');
+const fixtures = require('../../../../../../../../../../fixtures/programmatic');
 
 chai.use(require('sinon-chai'));
 chai.use(require('chai-as-promised'));
@@ -811,4 +812,66 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/u
     expect(untagResourceStub).to.have.been.calledOnce;
     expect(untagResourceStub.args[0][0].tagKeys).to.deep.equal(['keytoremove']);
   });
+
+  it('should deploys shouldStartNameWithService without apiName', async () => {
+    const { serviceConfig, servicePath, updateConfig } = await fixtures.setup('apiGateway');
+    const getDeploymentsStub = sinon.stub().returns({ items: [{ id: 'deployment-id' }] });
+    const stage = 'dev';
+
+    await updateConfig({
+      provider: {
+        apiGateway: {
+          shouldStartNameWithService: true,
+        },
+        stackTags: { key: 'value' },
+      },
+    });
+
+    await runServerless({
+      command: 'deploy',
+      cwd: servicePath,
+      options: { stage },
+      lastLifecycleHookName: 'after:deploy:deploy',
+      awsRequestStubMap: {
+        APIGateway: {
+          createStage: {},
+          getDeployments: getDeploymentsStub,
+          getRestApis: { items: [{ id: 'api-id', name: `${serviceConfig.service}-${stage}` }] },
+          tagResource: {},
+        },
+        CloudFormation: {
+          describeStacks: { Stacks: [{}] },
+          describeStackEvents: {
+            StackEvents: [
+              {
+                ResourceStatus: 'UPDATE_COMPLETE',
+                ResourceType: 'AWS::CloudFormation::Stack',
+              },
+            ],
+          },
+          describeStackResource: {
+            StackResourceDetail: { PhysicalResourceId: 'deployment-bucket' },
+          },
+          listStackResources: {},
+          validateTemplate: {},
+          updateStack: {},
+        },
+        S3: {
+          listObjectsV2: {},
+          upload: {},
+        },
+        STS: {
+          getCallerIdentity: {
+            ResponseMetadata: { RequestId: 'ffffffff-ffff-ffff-ffff-ffffffffffff' },
+            UserId: 'XXXXXXXXXXXXXXXXXXXXX',
+            Account: '999999999999',
+            Arn: 'arn:aws-us-gov:iam::999999999999:user/test',
+          },
+        },
+      },
+    });
+
+    expect(getDeploymentsStub).to.have.been.calledOnce;
+    expect(getDeploymentsStub.args[0][0].restApiId).to.equal('api-id');
+  });
 });

From afd0a5bd6f131c9b12148199d4995e055e5963f0 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 8 Nov 2021 16:02:33 +0100
Subject: [PATCH 0697/1101] feat: Introduce `enforce-hash-update` flag to help
 hashing migration

---
 docs/deprecations.md                          |  2 +-
 docs/guides/upgrading-v3.md                   | 25 +++++++++++++
 lib/cli/commands-schema/aws-service.js        |  5 +++
 lib/plugins/aws/deploy/index.js               | 12 ++++++-
 lib/plugins/aws/package/compile/functions.js  | 10 ++++--
 .../aws/package/compile/functions.test.js     | 36 +++++++++++++++++++
 6 files changed, 86 insertions(+), 4 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 4d4b560eecc..fa5fd998594 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -336,7 +336,7 @@ While not recommended, you can keep using the old hashing algorithm by setting `
   An error occurred: FooLambdaVersion3IV5NZ3sE5T2UFimCOai2Tc6eCaW7yIYOP786U0Oc - A version for this Lambda function exists ( 11 ). Modify the function to create a new version..
 ```
 
-It is an expected behavior. AWS complains here that received a different hash for very same lambda configuration. To workaround that, you need to modify your function(s) code and try to redeploy it again. One common approach is to modify an utility function that is used by all/most of your Lambda functions.
+It is an expected behavior. AWS complains here that received a different hash for very same lambda configuration. To workaround that, you need to modify your function(s) code and try to redeploy it again. One common approach is to modify an utility function that is used by all/most of your Lambda functions. There's also a semi-automated migration available and described in [V3 Upgrade docs](./guides/upgrading-v3.md#lambda-hashing-algorithm).
 
 <a name="LOAD_VARIABLES_FROM_ENV_FILES"><div>&nbsp;</div></a>
 
diff --git a/docs/guides/upgrading-v3.md b/docs/guides/upgrading-v3.md
index ad804866914..0421507b363 100644
--- a/docs/guides/upgrading-v3.md
+++ b/docs/guides/upgrading-v3.md
@@ -196,6 +196,31 @@ That allowed us to make the KMS configuration consistent with all other AWS reso
 
 `alexaSkill` events now require an `appId` ([learn more](../deprecations.md#support-for-alexaskill-event-without-appid-is-to-be-removed)). That change was required to implement a more stable deployment, as well as to deploy more restricted IAM permissions.
 
+### Lambda Hashing Algorithm
+
+By default, Lambda version hashes will now be generated using an improved algorithm (fixes determinism issues). As it is a breaking change that requires more manual effort during migration, it is still possible (but not recommended) to keep using the old algorithm by using the following configuration:
+
+```
+provider:
+  lambdaHashingVersion: 20200924
+```
+
+However, we highly encourage an upgrade to the new algorithm. To upgrade, you must redeploy your service with code or configuration change in all functions. You can do it by following the guide below:
+
+**NOTE**: Please keep in mind that these changes require two deployments with manual configuration adjustment between them. It also creates two additional versions and temporarily overrides descriptions of your functions. Migration will need to be done separately for each of your environments/stages.
+
+1. Run `sls deploy` with additional `--enforce-hash-update` flag: that flag will override the description for Lambda functions, which will force the creation of new versions.
+2. Set `provider.lambdaHashingVersion` to `20201221` in your configuration: your service will now always deploy with the new Lambda version hashes (which is the new defualt in v3).
+3. Run `sls deploy`, this time without additional `--enforce-hash-update` flag: that will restore the original descriptions on all Lambda functions.
+
+Now your whole service is fully migrated to the new Lambda Hashing Algorithm.
+
+If you do not want to temporarily override descriptions of your functions or would like to avoid creating unnecessary versions of your functions, you might want to use one of the following approaches:
+
+- Ensure that code for all your functions will change during deployment, set `provider.lambdaHashingVersion: 20201221` in your configuration, and run `sls deploy`. Due to the fact that all functions have code changed, all your functions will be migrated to new hashing algorithm. Please note that the change can be caused by e.g. upgrading a dependency used by all your functions so you can pair it with regular chores.
+- Add a dummy file that will be included in deployment artifacts for all your functions, set `provider.lambdaHashingVersion: 20201221` in your configuration, and run `sls deploy`. Due to the fact that all functions have code changed, all your functions will be migrated to new hashing algorithm.
+- If it is safe in your case (e.g. it's only development sandbox), you can also tear down the whole service by `sls remove`, set `provider.lambdaHashingVersion: 20201221` in your configuration, and run `sls deploy`. Newly recreated environment will be using new hashing algorithm.
+
 ### Low-level changes
 
 Internal changes that may impact plugins or advanced use cases:
diff --git a/lib/cli/commands-schema/aws-service.js b/lib/cli/commands-schema/aws-service.js
index 520452ad3ef..0c4f8e71eea 100644
--- a/lib/cli/commands-schema/aws-service.js
+++ b/lib/cli/commands-schema/aws-service.js
@@ -34,6 +34,11 @@ commands.set('deploy', {
       usage: 'Enables S3 Transfer Acceleration making uploading artifacts much faster.',
       type: 'boolean',
     },
+    'enforce-hash-update': {
+      usage:
+        'Enforces new function version by overriding descriptions across all your functions. To be used only when migrating to new hashing algorithm.',
+      type: 'boolean',
+    },
   },
   // TODO: Remove deprecated events with v3
   lifecycleEvents: [
diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index 6cd94d2e434..4c79a575b36 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -12,7 +12,7 @@ const validateTemplate = require('./lib/validateTemplate');
 const updateStack = require('../lib/updateStack');
 const existsDeploymentBucket = require('./lib/existsDeploymentBucket');
 const path = require('path');
-const { style, log, progress, writeText } = require('@serverless/utils/log');
+const { style, log, progress, writeText, legacy } = require('@serverless/utils/log');
 const memoize = require('memoizee');
 
 const mainProgress = progress.get('main');
@@ -201,6 +201,16 @@ class AwsDeploy {
         writeText();
         writeServiceOutputs(this.serverless.serviceOutputs);
         writeServiceOutputs(this.serverless.servicePluginOutputs);
+
+        if (this.options['enforce-hash-update']) {
+          legacy.log(
+            'Your service has been deployed with new hashing algorithm. Please set "provider.lambdaHashingVersion: \'20201221\'" in your service configuration and re-deploy without "--enforce-hash-update" flag to restore function descriptions.'
+          );
+          log.notice();
+          log.notice(
+            'Your service has been deployed with new hashing algorithm. Please set "provider.lambdaHashingVersion: \'20201221\'" in your service configuration and re-deploy without "--enforce-hash-update" flag to restore function descriptions.'
+          );
+        }
       },
     };
   }
diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index 7b1803a2010..f81788cf49a 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -51,6 +51,7 @@ class AwsCompileFunctions {
         }
         if (
           !this.serverless.service.provider.lambdaHashingVersion &&
+          !this.options['enforce-hash-update'] &&
           Object.keys(this.serverless.service.functions).length &&
           Object.values(this.serverless.service.functions).some(({ handler }) => handler) &&
           (this.serverless.service.provider.versionFunctions ||
@@ -148,7 +149,7 @@ class AwsCompileFunctions {
 
   async addFileToHash(filePath, hash) {
     const lambdaHashingVersion = this.serverless.service.provider.lambdaHashingVersion;
-    if (lambdaHashingVersion >= 20201221) {
+    if (lambdaHashingVersion >= 20201221 || this.options['enforce-hash-update']) {
       const filePathHash = await getHashForFilePath(filePath);
       hash.write(filePathHash);
     } else {
@@ -161,6 +162,7 @@ class AwsCompileFunctions {
     const functionResource = this.cfLambdaFunctionTemplate();
     const functionObject = this.serverless.service.getFunction(functionName);
     functionObject.package = functionObject.package || {};
+    const enforceHashUpdate = this.options['enforce-hash-update'];
 
     if (!functionObject.handler && !functionObject.image) {
       throw new ServerlessError(
@@ -463,6 +465,10 @@ class AwsCompileFunctions {
       // to make sure that a new version is created on configuration changes and
       // not only on source changes.
 
+      if (enforceHashUpdate) {
+        functionResource.Properties.Description = 'temporary-description-to-enforce-hash-update';
+      }
+
       const versionHash = crypto.createHash('sha256');
       versionHash.setEncoding('base64');
       const layerConfigurations = _.cloneDeep(
@@ -503,7 +509,7 @@ class AwsCompileFunctions {
       delete functionProperties.Tags;
 
       const lambdaHashingVersion = this.serverless.service.provider.lambdaHashingVersion;
-      if (lambdaHashingVersion >= 20201221) {
+      if (lambdaHashingVersion >= 20201221 || enforceHashUpdate) {
         functionProperties.layerConfigurations = layerConfigurations;
         versionHash.write(JSON.stringify(deepSortObjectByKey(functionProperties)));
       } else {
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index bdaaf195a0e..811c3302e74 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -2553,6 +2553,42 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
     describe('lambdaHashingVersion: 20201221', () => {
       testLambdaHashingVersion('20201221');
     });
+
+    describe('lambdaHashingVersion migration', () => {
+      it('should enforce new description configuration and version with `--enforce-hash-update` flag', async () => {
+        const { servicePath: serviceDir } = await fixtures.setup('function', {
+          configExt: {
+            disabledDeprecations: ['LAMBDA_HASHING_VERSION_V2'],
+            provider: {
+              lambdaHashingVersion: null,
+            },
+          },
+        });
+
+        const { cfTemplate: originalTemplate, awsNaming } = await runServerless({
+          cwd: serviceDir,
+          command: 'package',
+        });
+        const originalVersionArn =
+          originalTemplate.Outputs.BasicLambdaFunctionQualifiedArn.Value.Ref;
+
+        const { cfTemplate: updatedTemplate, stdoutData } = await runServerless({
+          cwd: serviceDir,
+          command: 'deploy',
+          lastLifecycleHookName: 'before:deploy:deploy',
+          options: {
+            'enforce-hash-update': true,
+          },
+        });
+        const updatedVersionArn = updatedTemplate.Outputs.BasicLambdaFunctionQualifiedArn.Value.Ref;
+
+        expect(originalVersionArn).not.to.equal(updatedVersionArn);
+        expect(
+          updatedTemplate.Resources[awsNaming.getLambdaLogicalId('basic')].Properties.Description
+        ).to.equal('temporary-description-to-enforce-hash-update');
+        expect(stdoutData).to.include('Your service has been deployed with new hashing algorithm');
+      });
+    });
   });
 
   describe.skip('TODO: Download package artifact from S3 bucket', () => {

From be00e0850529e63d49e3d7de3b33e4a70fe1be45 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 9 Nov 2021 13:25:35 +0100
Subject: [PATCH 0698/1101] chore: Bump dependencies

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 6a1e609506b..77ab78654c2 100644
--- a/package.json
+++ b/package.json
@@ -26,11 +26,11 @@
     "@serverless/components": "^3.17.2",
     "@serverless/dashboard-plugin": "^5.5.1",
     "@serverless/platform-client": "^4.3.0",
-    "@serverless/utils": "^5.20.0",
+    "@serverless/utils": "^5.20.1",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.1021.0",
+    "aws-sdk": "^2.1024.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.1.2",
     "cachedir": "^2.3.0",
@@ -86,7 +86,7 @@
     "adm-zip": "^0.5.9",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "cos-nodejs-sdk-v5": "^2.10.6",
+    "cos-nodejs-sdk-v5": "^2.10.7",
     "eslint": "^7.32.0",
     "eslint-plugin-import": "^2.25.2",
     "git-list-updated": "^1.2.1",

From 53992814e1d404ae3ec1823be89263c215883049 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 9 Nov 2021 13:34:21 +0100
Subject: [PATCH 0699/1101] chore: Release v2.66.0

---
 CHANGELOG.md | 16 ++++++++++++++++
 package.json |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21f58b1c057..dbe6a7c96fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 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.
 
+## [2.66.0](https://github.com/serverless/serverless/compare/v2.65.0...v2.66.0) (2021-11-09)
+
+### Features
+
+- Introduce `enforce-hash-update` flag to help Lambda hashing version migration ([#10209](https://github.com/serverless/serverless/pull/10209)) ([afd0a5b](https://github.com/serverless/serverless/commit/afd0a5bd6f131c9b12148199d4995e055e5963f0)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **Variables:** Recognize `:` in variable address to support `output` source ([#10208](https://github.com/serverless/serverless/pull/10208)) ([723927f](https://github.com/serverless/serverless/commit/723927f2dcdcc425025da03ac0be5edd3c203dc7)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **AWS API Gateway:** Ensure `shouldStartNameWithService` support ([#10177](https://github.com/serverless/serverless/pull/10177)) ([e8c8d25](https://github.com/serverless/serverless/commit/e8c8d259fb79ae04e33e01af162c6666f0060189)) ([Vicary A.](https://github.com/vicary))
+- **CLI:** Do not recommend `frameworkVersion` when running pre release ([#10204](https://github.com/serverless/serverless/pull/10204)) ([53490a5](https://github.com/serverless/serverless/commit/53490a55183db5f304d0e3ef69feadd9a20fa815)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- Ensure to use `legacy.log` instead of `cli.log` ([#10206](https://github.com/serverless/serverless/pull/10206)) ([ea05d7c](https://github.com/serverless/serverless/commit/ea05d7c41e84b0f68017804b06d6435062673d26)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ## [2.65.0](https://github.com/serverless/serverless/compare/v2.64.1...v2.65.0) (2021-11-03)
 
 ### Features
diff --git a/package.json b/package.json
index 77ab78654c2..657cda48250 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.65.0",
+  "version": "2.66.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 55146c4595024b0e3702dc2023264af784b906e9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 9 Nov 2021 12:09:31 +0100
Subject: [PATCH 0700/1101] refactor(CLI): Improve timestamp visiblity in
 `deploy list` output

---
 lib/plugins/aws/deployList.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/plugins/aws/deployList.js b/lib/plugins/aws/deployList.js
index f696a97185a..6d378cd8ed8 100644
--- a/lib/plugins/aws/deployList.js
+++ b/lib/plugins/aws/deployList.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { legacy, log, writeText, style } = require('@serverless/utils/log');
+const { legacy, log, writeText } = require('@serverless/utils/log');
 const validate = require('./lib/validate');
 const findAndGroupDeployments = require('./utils/findAndGroupDeployments');
 const setBucketName = require('./lib/setBucketName');
@@ -61,8 +61,8 @@ class AwsDeployList {
           `${String(date.getUTCHours()).padStart(2, 0)}:${String(date.getUTCMinutes()).padStart(
             2,
             0
-          )}:${String(date.getUTCSeconds()).padStart(2, 0)} UTC ` +
-          `${style.aside(`(${match[1]})`)}`,
+          )}:${String(date.getUTCSeconds()).padStart(2, 0)} UTC`,
+        `Timestamp: ${match[1]}`,
         'Files:'
       );
       legacy.log(`Timestamp: ${match[1]}`);

From ad95e030b3581a65babc8dd175b8bb69f1215534 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Barthelet?= <fredericb@theodo.fr>
Date: Wed, 10 Nov 2021 09:50:15 +0100
Subject: [PATCH 0701/1101] refactor(Templates): Upgrade `middy` in
 `aws-nodejs-typescript` (#10215)

---
 .../create/templates/aws-nodejs-typescript/package.json       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/package.json b/lib/plugins/create/templates/aws-nodejs-typescript/package.json
index 6b74b626c98..471c877f812 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/package.json
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/package.json
@@ -10,8 +10,8 @@
     "node": ">=14.15.0"
   },
   "dependencies": {
-    "@middy/core": "^1.5.2",
-    "@middy/http-json-body-parser": "^1.5.2"
+    "@middy/core": "^2.5.3",
+    "@middy/http-json-body-parser": "^2.5.3"
   },
   "devDependencies": {
     "@serverless/typescript": "^2.23.0",

From 6671d98615ab7d003c3c7413c9334b63b2d735e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Barthelet?= <fredericb@theodo.fr>
Date: Wed, 10 Nov 2021 09:51:29 +0100
Subject: [PATCH 0702/1101] refactor(Templates): Use non deprecated API in
 `aws-nodejs-typescript`

(PR #10214)
---
 .../aws-nodejs-typescript/src/functions/hello/index.ts          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/index.ts b/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/index.ts
index 78a673877c5..3206215d22f 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/index.ts
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/index.ts
@@ -9,7 +9,7 @@ export default {
         method: 'post',
         path: 'hello',
         request: {
-          schema: {
+          schemas: {
             'application/json': schema
           }
         }

From 182955065c296291e04aaa30a7215e314d9f8ed6 Mon Sep 17 00:00:00 2001
From: Abdirahman Jama <45077645+abdirahmanjama@users.noreply.github.com>
Date: Wed, 10 Nov 2021 09:02:46 +0000
Subject: [PATCH 0703/1101] docs: Style improvements (#10216)

Co-authored-by: abdi.j <abdi.j@gembaadvantage.com>
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 8d1a8279367..04fbb2a067e 100644
--- a/README.md
+++ b/README.md
@@ -35,19 +35,19 @@ Actively maintained by [Serverless Inc](https://www.serverless.com).
 npm install -g serverless
 ```
 
-### Set Up Your AWS Account Credentials.
+### Set Up Your AWS Account Credentials:
 
 The Serverless Framework deploys to your own AWS account. You'll need to enable Serverless Framework to deploy to your AWS account by giving it access. [Here is a guide to help you set up your credentials securely](https://www.serverless.com/framework/docs/providers/aws/guide/credentials)
 
 ### Create A Service:
 
-A "Service" is the Framework's project or app concept. You can create one from scratch or select an existing template by running...
+A "Service" is the Framework's project or app concept. You can create one from scratch or select an existing template by running.
 
 ```bash
 serverless
 ```
 
-Go through the onboarding flow and then navigate into the newly created directory
+Go through the onboarding flow and then navigate into the newly created directory.
 
 ```bash
 cd my-new-service

From 95f3a5603897ad43ba6e008a7ea2a35d21a4eacf Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 10 Nov 2021 10:40:31 +0100
Subject: [PATCH 0704/1101] fix(AWS API Gateway): Ensure proper `apiId`
 resolution

---
 .../package/compile/events/apiGateway/lib/hack/updateStage.js   | 2 +-
 .../compile/events/apiGateway/lib/hack/updateStage.test.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js
index bbd329edbab..17956e737bd 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js
@@ -150,7 +150,7 @@ async function resolveRestApiId() {
     }
     const apiName = apiGatewayResource
       ? apiGatewayResource.Properties.Name
-      : provider.naming.getApiGatewayName();
+      : this.provider.naming.getApiGatewayName();
     const resolveFromAws = (position) =>
       this.provider
         .request('APIGateway', 'getRestApis', { position, limit: 500 })
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
index aa1b126091f..59b9929eae9 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
@@ -813,7 +813,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/u
     expect(untagResourceStub.args[0][0].tagKeys).to.deep.equal(['keytoremove']);
   });
 
-  it('should deploys shouldStartNameWithService without apiName', async () => {
+  it('should correctly resolve `apiId` during deployment', async () => {
     const { serviceConfig, servicePath, updateConfig } = await fixtures.setup('apiGateway');
     const getDeploymentsStub = sinon.stub().returns({ items: [{ id: 'deployment-id' }] });
     const stage = 'dev';

From f6272262eb50feeef7148a52ad47b1fbf62cc085 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 10 Nov 2021 12:57:51 +0100
Subject: [PATCH 0705/1101] chore: Bump dependencies

---
 package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 657cda48250..5c1a20f709c 100644
--- a/package.json
+++ b/package.json
@@ -23,14 +23,14 @@
   },
   "dependencies": {
     "@serverless/cli": "^1.5.3",
-    "@serverless/components": "^3.17.2",
+    "@serverless/components": "^3.18.0",
     "@serverless/dashboard-plugin": "^5.5.1",
     "@serverless/platform-client": "^4.3.0",
     "@serverless/utils": "^5.20.1",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.1024.0",
+    "aws-sdk": "^2.1025.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.1.2",
     "cachedir": "^2.3.0",
@@ -82,13 +82,13 @@
   "devDependencies": {
     "@commitlint/cli": "^12.1.4",
     "@serverless/eslint-config": "^4.0.0",
-    "@serverless/test": "^8.4.0",
+    "@serverless/test": "^8.5.0",
     "adm-zip": "^0.5.9",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "cos-nodejs-sdk-v5": "^2.10.7",
+    "cos-nodejs-sdk-v5": "^2.10.8",
     "eslint": "^7.32.0",
-    "eslint-plugin-import": "^2.25.2",
+    "eslint-plugin-import": "^2.25.3",
     "git-list-updated": "^1.2.1",
     "github-release-from-cc-changelog": "^2.2.0",
     "husky": "^4.3.8",

From 1f8597e168d145096e6e61c787f328343c084a61 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 10 Nov 2021 13:00:48 +0100
Subject: [PATCH 0706/1101] chore: Release v2.66.1

---
 CHANGELOG.md | 15 +++++++++++++++
 package.json |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbe6a7c96fd..66de299c58d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
 
 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.
 
+### [2.66.1](https://github.com/serverless/serverless/compare/v2.66.0...v2.66.1) (2021-11-10)
+
+### Bug Fixes
+
+- **AWS API Gateway:** Ensure proper `apiId` resolution ([#10221](https://github.com/serverless/serverless/pull/10221)) ([95f3a56](https://github.com/serverless/serverless/commit/95f3a5603897ad43ba6e008a7ea2a35d21a4eacf)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Maintenance Improvements
+
+- **CLI:** Improve timestamp visiblity in `deploy list` output ([#10211](https://github.com/serverless/serverless/pull/10211)) ([55146c4](https://github.com/serverless/serverless/commit/55146c4595024b0e3702dc2023264af784b906e9)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Templates
+
+- Upgrade `middy` in `aws-nodejs-typescript` ([#10215](https://github.com/serverless/serverless/issues/10215)) ([ad95e03](https://github.com/serverless/serverless/commit/ad95e030b3581a65babc8dd175b8bb69f1215534)) ([Frédéric Barthelet](https://github.com/fredericbarthelet))
+- Use non deprecated API in `aws-nodejs-typescript` ([#10214](https://github.com/serverless/serverless/issues/10214)) ([6671d98](https://github.com/serverless/serverless/commit/6671d98615ab7d003c3c7413c9334b63b2d735e8)) ([Frédéric Barthelet](https://github.com/fredericbarthelet))
+
 ## [2.66.0](https://github.com/serverless/serverless/compare/v2.65.0...v2.66.0) (2021-11-09)
 
 ### Features
diff --git a/package.json b/package.json
index 5c1a20f709c..0e0cfcfb4b3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.66.0",
+  "version": "2.66.1",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From a55d51c6a4aa38153f61192d374cb23bf09ff66c Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 10 Nov 2021 13:33:19 +0100
Subject: [PATCH 0707/1101] feat(Templates): Use `iam.role` syntax in templates

---
 .../aws-clojure-gradle/serverless.yml         | 30 ++++++++++---------
 .../aws-clojurescript-gradle/serverless.yml   | 30 ++++++++++---------
 .../templates/aws-csharp/serverless.yml       | 30 ++++++++++---------
 .../templates/aws-fsharp/serverless.yml       | 30 ++++++++++---------
 .../templates/aws-go-dep/serverless.yml       | 30 ++++++++++---------
 .../templates/aws-go-mod/serverless.yml       | 30 ++++++++++---------
 .../create/templates/aws-go/serverless.yml    | 30 ++++++++++---------
 .../aws-groovy-gradle/serverless.yml          | 30 ++++++++++---------
 .../templates/aws-java-gradle/serverless.yml  | 30 ++++++++++---------
 .../templates/aws-java-maven/serverless.yml   | 30 ++++++++++---------
 .../aws-kotlin-jvm-gradle-kts/serverless.yml  | 30 ++++++++++---------
 .../aws-kotlin-jvm-gradle/serverless.yml      | 30 ++++++++++---------
 .../aws-kotlin-jvm-maven/serverless.yml       | 30 ++++++++++---------
 .../aws-kotlin-nodejs-gradle/serverless.yml   | 30 ++++++++++---------
 .../aws-nodejs-docker/serverless.yml          | 30 ++++++++++---------
 .../templates/aws-nodejs/serverless.yml       | 30 ++++++++++---------
 .../templates/aws-provided/serverless.yml     | 30 ++++++++++---------
 .../aws-python-docker/serverless.yml          | 30 ++++++++++---------
 .../templates/aws-python/serverless.yml       | 30 ++++++++++---------
 .../templates/aws-python3/serverless.yml      | 30 ++++++++++---------
 .../create/templates/aws-ruby/serverless.yml  | 30 ++++++++++---------
 .../templates/aws-scala-sbt/serverless.yml    | 30 ++++++++++---------
 22 files changed, 352 insertions(+), 308 deletions(-)

diff --git a/lib/plugins/create/templates/aws-clojure-gradle/serverless.yml b/lib/plugins/create/templates/aws-clojure-gradle/serverless.yml
index 424f7f541b9..59dfccdf514 100644
--- a/lib/plugins/create/templates/aws-clojure-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-clojure-gradle/serverless.yml
@@ -34,20 +34,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-clojurescript-gradle/serverless.yml b/lib/plugins/create/templates/aws-clojurescript-gradle/serverless.yml
index 1583f3f660a..ec24cee9c45 100644
--- a/lib/plugins/create/templates/aws-clojurescript-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-clojurescript-gradle/serverless.yml
@@ -30,20 +30,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-csharp/serverless.yml b/lib/plugins/create/templates/aws-csharp/serverless.yml
index 90e86a50b82..db1152addec 100644
--- a/lib/plugins/create/templates/aws-csharp/serverless.yml
+++ b/lib/plugins/create/templates/aws-csharp/serverless.yml
@@ -30,20 +30,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-fsharp/serverless.yml b/lib/plugins/create/templates/aws-fsharp/serverless.yml
index 328c3f6a1b3..e61908b9ad6 100644
--- a/lib/plugins/create/templates/aws-fsharp/serverless.yml
+++ b/lib/plugins/create/templates/aws-fsharp/serverless.yml
@@ -30,20 +30,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-go-dep/serverless.yml b/lib/plugins/create/templates/aws-go-dep/serverless.yml
index 3240ae7003c..9bc52954e45 100644
--- a/lib/plugins/create/templates/aws-go-dep/serverless.yml
+++ b/lib/plugins/create/templates/aws-go-dep/serverless.yml
@@ -30,20 +30,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-go-mod/serverless.yml b/lib/plugins/create/templates/aws-go-mod/serverless.yml
index f7543659758..fa19175cf9a 100644
--- a/lib/plugins/create/templates/aws-go-mod/serverless.yml
+++ b/lib/plugins/create/templates/aws-go-mod/serverless.yml
@@ -30,20 +30,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-go/serverless.yml b/lib/plugins/create/templates/aws-go/serverless.yml
index 83e7197200e..69c6b1664cd 100644
--- a/lib/plugins/create/templates/aws-go/serverless.yml
+++ b/lib/plugins/create/templates/aws-go/serverless.yml
@@ -30,20 +30,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-groovy-gradle/serverless.yml b/lib/plugins/create/templates/aws-groovy-gradle/serverless.yml
index 181e27f9194..f9df600be50 100644
--- a/lib/plugins/create/templates/aws-groovy-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-groovy-gradle/serverless.yml
@@ -30,20 +30,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-java-gradle/serverless.yml b/lib/plugins/create/templates/aws-java-gradle/serverless.yml
index 63c5c79eb73..c759fbe57dd 100644
--- a/lib/plugins/create/templates/aws-java-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-java-gradle/serverless.yml
@@ -30,20 +30,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-java-maven/serverless.yml b/lib/plugins/create/templates/aws-java-maven/serverless.yml
index 5d03bc65e55..2c21f8e40e5 100644
--- a/lib/plugins/create/templates/aws-java-maven/serverless.yml
+++ b/lib/plugins/create/templates/aws-java-maven/serverless.yml
@@ -30,20 +30,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/serverless.yml b/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/serverless.yml
index 2775ade568e..de3003aece3 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/serverless.yml
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/serverless.yml
@@ -30,20 +30,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-gradle/serverless.yml b/lib/plugins/create/templates/aws-kotlin-jvm-gradle/serverless.yml
index cecb2f57ee5..de8a5c9ce2e 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-gradle/serverless.yml
@@ -30,20 +30,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-maven/serverless.yml b/lib/plugins/create/templates/aws-kotlin-jvm-maven/serverless.yml
index e41c9bff261..791a1bc3a3c 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-maven/serverless.yml
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-maven/serverless.yml
@@ -30,20 +30,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-kotlin-nodejs-gradle/serverless.yml b/lib/plugins/create/templates/aws-kotlin-nodejs-gradle/serverless.yml
index a6b7ea71822..1914d6c417f 100644
--- a/lib/plugins/create/templates/aws-kotlin-nodejs-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-kotlin-nodejs-gradle/serverless.yml
@@ -30,20 +30,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-nodejs-docker/serverless.yml b/lib/plugins/create/templates/aws-nodejs-docker/serverless.yml
index 3ae730f489c..6f7fc6d8837 100644
--- a/lib/plugins/create/templates/aws-nodejs-docker/serverless.yml
+++ b/lib/plugins/create/templates/aws-nodejs-docker/serverless.yml
@@ -34,20 +34,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-nodejs/serverless.yml b/lib/plugins/create/templates/aws-nodejs/serverless.yml
index b522ed1b2a8..c528e4c3b04 100644
--- a/lib/plugins/create/templates/aws-nodejs/serverless.yml
+++ b/lib/plugins/create/templates/aws-nodejs/serverless.yml
@@ -30,20 +30,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-provided/serverless.yml b/lib/plugins/create/templates/aws-provided/serverless.yml
index cc1ba743ec7..f95e23b65b5 100644
--- a/lib/plugins/create/templates/aws-provided/serverless.yml
+++ b/lib/plugins/create/templates/aws-provided/serverless.yml
@@ -30,20 +30,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-python-docker/serverless.yml b/lib/plugins/create/templates/aws-python-docker/serverless.yml
index aee3ca48315..35fb6ce3b4d 100644
--- a/lib/plugins/create/templates/aws-python-docker/serverless.yml
+++ b/lib/plugins/create/templates/aws-python-docker/serverless.yml
@@ -34,20 +34,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-python/serverless.yml b/lib/plugins/create/templates/aws-python/serverless.yml
index 3283a23c63e..29c0d0a873f 100644
--- a/lib/plugins/create/templates/aws-python/serverless.yml
+++ b/lib/plugins/create/templates/aws-python/serverless.yml
@@ -30,20 +30,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-python3/serverless.yml b/lib/plugins/create/templates/aws-python3/serverless.yml
index fdfe474b384..27969433518 100644
--- a/lib/plugins/create/templates/aws-python3/serverless.yml
+++ b/lib/plugins/create/templates/aws-python3/serverless.yml
@@ -30,20 +30,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-ruby/serverless.yml b/lib/plugins/create/templates/aws-ruby/serverless.yml
index 3c43ea2d7fe..07287df814d 100644
--- a/lib/plugins/create/templates/aws-ruby/serverless.yml
+++ b/lib/plugins/create/templates/aws-ruby/serverless.yml
@@ -30,20 +30,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-scala-sbt/serverless.yml b/lib/plugins/create/templates/aws-scala-sbt/serverless.yml
index 14b2d702387..d027e1b4f37 100644
--- a/lib/plugins/create/templates/aws-scala-sbt/serverless.yml
+++ b/lib/plugins/create/templates/aws-scala-sbt/serverless.yml
@@ -30,20 +30,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:

From 0746bf9af87e2ed0513e9c147da3b6a778648b2b Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 10 Nov 2021 13:33:40 +0100
Subject: [PATCH 0708/1101] docs: Ensure `iam.role` syntax is referenced in
 docs

---
 docs/providers/aws/cli-reference/invoke-local.md | 2 +-
 docs/providers/aws/guide/functions.md            | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/providers/aws/cli-reference/invoke-local.md b/docs/providers/aws/cli-reference/invoke-local.md
index dcdfe955280..ab61046a7a3 100644
--- a/docs/providers/aws/cli-reference/invoke-local.md
+++ b/docs/providers/aws/cli-reference/invoke-local.md
@@ -147,7 +147,7 @@ They _will not_ be set during the parsing of the `serverless.yml` file.
 
 ## Resource permissions
 
-Lambda functions assume an _IAM role_ during execution: the framework creates this role, and set all the permission provided in the `iamRoleStatements` section of `serverless.yml`.
+Lambda functions assume an _IAM role_ during execution: the framework creates this role, and set all the permission provided in the `provider.iam.role.statements` section of `serverless.yml`.
 
 Unless you explicitly state otherwise, every call to the AWS SDK inside the lambda function is made using this role (a temporary pair of key / secret is generated and set by AWS as environment variables, `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`).
 
diff --git a/docs/providers/aws/guide/functions.md b/docs/providers/aws/guide/functions.md
index 29321921bc6..c837721c22d 100644
--- a/docs/providers/aws/guide/functions.md
+++ b/docs/providers/aws/guide/functions.md
@@ -187,14 +187,15 @@ functions:
     memorySize: 512
 ```
 
-You can also use an existing IAM role by adding your IAM Role ARN in the `role` property. For example:
+You can also use an existing IAM role by adding your IAM Role ARN in the `iam.role` property. For example:
 
 ```yml
 # serverless.yml
 service: new-service
 provider:
   name: aws
-  role: arn:aws:iam::YourAccountNumber:role/YourIamRole
+  iam:
+    role: arn:aws:iam::YourAccountNumber:role/YourIamRole
 ```
 
 See the documentation about [IAM](./iam.md) for function level IAM roles.

From 6698fa657e5a5b35908c2b2de0815525f948064f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 4 Nov 2021 10:29:03 +0100
Subject: [PATCH 0709/1101] refactor(CLI): Expose dashboard provider name when
 starting deployment

---
 lib/plugins/aws/deploy/index.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index 4c79a575b36..d15eef1f6e5 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const _ = require('lodash');
 const writeServiceOutputs = require('../../../cli/write-service-outputs');
 const extendedValidate = require('./lib/extendedValidate');
 const setBucketName = require('../lib/setBucketName');
@@ -73,11 +74,19 @@ class AwsDeploy {
       'initialize': () => {
         const isDeployCommand = this.serverless.processedInput.commands.join(' ') === 'deploy';
         if (isDeployCommand && !this.options.function) {
+          const dashboardProviderName = _.get(
+            this.provider.cachedCredentials,
+            'dashboardProviderAlias'
+          );
           log.notice();
           log.notice(
             `Deploying ${this.serverless.service.service} to stage ${this.serverless
               .getProvider('aws')
-              .getStage()} ${style.aside(`(${this.serverless.getProvider('aws').getRegion()})`)}`
+              .getStage()} ${style.aside(
+              `(${this.serverless.getProvider('aws').getRegion()}${
+                dashboardProviderName ? `, "${dashboardProviderName}" provider` : ''
+              })`
+            )}`
           );
           log.info(); // Ensure gap between verbose logging
 

From 0c0f6e2bdbdeccd6377e8d6357d4084aba3a377d Mon Sep 17 00:00:00 2001
From: brampono <64628500+brampono@users.noreply.github.com>
Date: Thu, 11 Nov 2021 17:35:09 +0800
Subject: [PATCH 0710/1101] docs: Fix typo in `credentials` (#10233)

---
 docs/providers/google/guide/credentials.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/providers/google/guide/credentials.md b/docs/providers/google/guide/credentials.md
index e7c49344ae1..16322390dea 100644
--- a/docs/providers/google/guide/credentials.md
+++ b/docs/providers/google/guide/credentials.md
@@ -35,7 +35,7 @@ A Google Cloud Project is required to use Google Cloud Functions. Here's how to
 3. Enter a Project name and select the Billing Account you created in the steps above (or any Billing Account with a valid credit card attached).
 4. Click on "Create" to start the creation process.
 5. Wait until the Project was successfully created and Google will redirect you to your new Project.
-6. Verify your currently within your new Project by looking at the dropdown next to the search bar. This should mark your new Project as selected.
+6. Verify you're currently within your new Project by looking at the dropdown next to the search bar. This should mark your new Project as selected.
 
 ## Enable the necessary APIs
 

From e13160902848912a6bb652299d1bc6107cf09eb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Barthelet?= <fredericb@theodo.fr>
Date: Fri, 12 Nov 2021 17:11:32 +0100
Subject: [PATCH 0711/1101] feat(Templates): Update `ts-node` for es2020 and
 es2021 support

---
 lib/plugins/create/templates/aws-nodejs-typescript/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/package.json b/lib/plugins/create/templates/aws-nodejs-typescript/package.json
index 471c877f812..678d4e19ca2 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/package.json
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/package.json
@@ -20,7 +20,7 @@
     "json-schema-to-ts": "^1.5.0",
     "serverless": "^2.23.0",
     "serverless-esbuild": "^1.17.1",
-    "ts-node": "^9.1.1",
+    "ts-node": "^10.4.0",
     "tsconfig-paths": "^3.9.0",
     "typescript": "^4.1.3"
   },

From 0628fbf57e9f8e97837fc578f3d0d7fd99c6b069 Mon Sep 17 00:00:00 2001
From: Walid Elnozahy <walidelnozahy@gmail.com>
Date: Mon, 15 Nov 2021 17:05:00 +0300
Subject: [PATCH 0712/1101] Change menuText from Doc to Overview

---
 docs/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/README.md b/docs/README.md
index d601b824710..2cc0bf92d37 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,6 +1,6 @@
 <!--
 title: Serverless Framework Documentation
-menuText: Docs
+menuText: Overview
 layout: Doc
 menuItems:
   - {menuText: "Get Started", path: /framework/docs/getting-started/}

From eca599d0be3d74650871edde3c3feec63da578d9 Mon Sep 17 00:00:00 2001
From: Ikko Ashimine <eltociear@gmail.com>
Date: Tue, 16 Nov 2021 00:23:58 +0900
Subject: [PATCH 0713/1101] refactor: Fix inline comment typo (#10245)

---
 lib/Serverless.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index d4ab61bd638..8b7423ce185 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -418,7 +418,7 @@ class Serverless {
       // (https://github.com/serverless/serverless/issues/2041)
       await this.variables.populateService(this.pluginManager.cliOptions);
     } else {
-      // Some plugins resolve additional variables on their own by runnning `variables.populateObject`
+      // Some plugins resolve additional variables on their own by running `variables.populateObject`
       // e.g. https://github.com/serverless-operations/serverless-step-functions/blob/016da8db78f1972ba80d37941c34c8fd038fd8ca/lib/yamlParser.js#L26
       // and that requires `variableSyntax` and `options` initizalization which is guaranteed by
       // `variables.populateService`. Below lines ensure they're set

From b8d386547f30ee3701e1f6ee6cacc0be08df426a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 16 Nov 2021 16:07:17 +0100
Subject: [PATCH 0714/1101] test(Plugins): Ensure to not leave broken symlinks
 in a setup fixture

Otherwise it leaves a broken symlink of which copying crashes `fse.copy`
---
 test/fixtures/programmatic/curated-plugins/_setup.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/fixtures/programmatic/curated-plugins/_setup.js b/test/fixtures/programmatic/curated-plugins/_setup.js
index fb374507b1c..f075ebc2aa8 100644
--- a/test/fixtures/programmatic/curated-plugins/_setup.js
+++ b/test/fixtures/programmatic/curated-plugins/_setup.js
@@ -3,7 +3,12 @@
 const path = require('path');
 const fsp = require('fs').promises;
 
-const slsDependencyDir = path.resolve(__dirname, 'node_modules/serverless');
+const nodeModulesDir = path.resolve(__dirname, 'node_modules');
 
 // Ensure to remove "serverless" installed as peer-dependency to avoid local fallback
-module.exports = async () => fsp.rm(slsDependencyDir, { recursive: true, force: true });
+module.exports = async () =>
+  Promise.all([
+    fsp.rm(path.resolve(nodeModulesDir, 'serverless'), { recursive: true, force: true }),
+    fsp.unlink(path.resolve(nodeModulesDir, '.bin/serverless')).catch(() => {}),
+    fsp.unlink(path.resolve(nodeModulesDir, '.bin/sls')).catch(() => {}),
+  ]);

From 4494f77f6111249d97295923a706883a8910840d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 17 Nov 2021 12:02:41 +0100
Subject: [PATCH 0715/1101] fix(CLI): Fix component template recognition in
 triage

Top level configuration not containing `component` was considered unconditionally as `serverless`, that's not correct
---
 lib/cli/triage.js                             | 92 ++++++++++---------
 .../foo/serverless.yml                        |  1 +
 .../template-with-root-config/serverless.yml  |  1 +
 3 files changed, 49 insertions(+), 45 deletions(-)
 create mode 100644 test/unit/lib/cli/triage/fixtures/@serverless/components/yml/template-with-root-config/foo/serverless.yml
 create mode 100644 test/unit/lib/cli/triage/fixtures/@serverless/components/yml/template-with-root-config/serverless.yml

diff --git a/lib/cli/triage.js b/lib/cli/triage.js
index 96c70fac866..17737e72df4 100644
--- a/lib/cli/triage.js
+++ b/lib/cli/triage.js
@@ -49,52 +49,54 @@ module.exports = async () => {
 
   if (configurationExtension) {
     // Found top level service configuration, recognize CLI by content
-
-    const resolveByObjectConfiguration = (configuration) => {
-      if (configuration.provider) return 'serverless';
-      if (configuration.component) return '@serverless/components';
-      for (const value of Object.values(configuration)) {
-        if (value.component) return '@serverless/cli';
-      }
-      return 'serverless';
-    };
-    switch (configurationExtension) {
-      case 'yml':
-      case 'yaml': {
-        const content = await fsp.readFile(`serverless.${configurationExtension}`, 'utf8');
-        if (content.search(/(?:^|\n)provider\s*:/) !== -1) return 'serverless';
-        if (content.search(/(?:^|\n)component\s*:/) !== -1) return '@serverless/components';
-        if (content.search(/\n\s+component\s*:/) !== -1) return '@serverless/cli';
-        return 'serverless';
-      }
-      case 'json': {
-        const configuration = (() => {
-          try {
-            return require(`${process.cwd()}/serverless.json`);
-          } catch {
-            return null;
-          }
-        })();
-        if (!configuration) return 'serverless';
-        return resolveByObjectConfiguration(configuration);
-      }
-      case 'js': {
-        const configuration = (() => {
-          try {
-            return require(`${process.cwd()}/serverless.js`);
-          } catch {
-            return null;
-          }
-        })();
-        if (!configuration) return 'serverless';
-        if (typeof configuration === 'function') return '@serverless/cli';
-        return resolveByObjectConfiguration(configuration);
+    const targetCliName = await (async () => {
+      const resolveByObjectConfiguration = (configuration) => {
+        if (configuration.provider) return 'serverless';
+        if (configuration.component) return '@serverless/components';
+        for (const value of Object.values(configuration)) {
+          if (value.component) return '@serverless/cli';
+        }
+        return null;
+      };
+      switch (configurationExtension) {
+        case 'yml':
+        case 'yaml': {
+          const content = await fsp.readFile(`serverless.${configurationExtension}`, 'utf8');
+          if (content.search(/(?:^|\n)provider\s*:/) !== -1) return 'serverless';
+          if (content.search(/(?:^|\n)component\s*:/) !== -1) return '@serverless/components';
+          if (content.search(/\n\s+component\s*:/) !== -1) return '@serverless/cli';
+          return null;
+        }
+        case 'json': {
+          const configuration = (() => {
+            try {
+              return require(`${process.cwd()}/serverless.json`);
+            } catch {
+              return null;
+            }
+          })();
+          if (!configuration) return 'serverless';
+          return resolveByObjectConfiguration(configuration);
+        }
+        case 'js': {
+          const configuration = (() => {
+            try {
+              return require(`${process.cwd()}/serverless.js`);
+            } catch {
+              return null;
+            }
+          })();
+          if (!configuration) return 'serverless';
+          if (typeof configuration === 'function') return '@serverless/cli';
+          return resolveByObjectConfiguration(configuration);
+        }
+        case 'ts':
+          return 'serverless';
+        default:
+          throw new Error(`Unrecognized extension "${configurationExtension}"`);
       }
-      case 'ts':
-        return 'serverless';
-      default:
-        throw new Error(`Unrecognized extension "${configurationExtension}"`);
-    }
+    })();
+    if (targetCliName) return targetCliName;
   }
 
   // No top level service configuration
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/components/yml/template-with-root-config/foo/serverless.yml b/test/unit/lib/cli/triage/fixtures/@serverless/components/yml/template-with-root-config/foo/serverless.yml
new file mode 100644
index 00000000000..e3e6ecdf9ed
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/@serverless/components/yml/template-with-root-config/foo/serverless.yml
@@ -0,0 +1 @@
+component: foo
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/components/yml/template-with-root-config/serverless.yml b/test/unit/lib/cli/triage/fixtures/@serverless/components/yml/template-with-root-config/serverless.yml
new file mode 100644
index 00000000000..5127bd8469d
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/@serverless/components/yml/template-with-root-config/serverless.yml
@@ -0,0 +1 @@
+app: foo

From fcc9a93cdb8b846fb33ed0f0ae27e8cd7977a96f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 17 Nov 2021 10:54:55 +0100
Subject: [PATCH 0716/1101] test(Packaging): Improve test error reporting

When error happens on set comparision, no difference is shown. Switch to compare arrays
---
 test/integrationPackage/lambda-files.tests.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/integrationPackage/lambda-files.tests.js b/test/integrationPackage/lambda-files.tests.js
index 38b083270b5..9784fc8c3c1 100644
--- a/test/integrationPackage/lambda-files.tests.js
+++ b/test/integrationPackage/lambda-files.tests.js
@@ -39,7 +39,7 @@ describe('Integration test - Packaging - Lambda Files', function () {
       zipfiles.filter((f) => f.startsWith('node_modules')).map((f) => f.split(path.sep)[1])
     );
     const nonNodeModulesFiles = zipfiles.filter((f) => !f.startsWith('node_modules'));
-    expect(nodeModules).to.deep.equal(new Set(['lodash']));
+    expect(Array.from(nodeModules)).to.deep.equal(['lodash']);
     expect(nonNodeModulesFiles).to.deep.equal(['handler.js', 'package-lock.json', 'package.json']);
   });
 
@@ -53,7 +53,7 @@ describe('Integration test - Packaging - Lambda Files', function () {
       zipfiles.filter((f) => f.startsWith('node_modules')).map((f) => f.split(path.sep)[1])
     );
     const nonNodeModulesFiles = zipfiles.filter((f) => !f.startsWith('node_modules'));
-    expect(nodeModules).to.deep.equal(new Set([]));
+    expect(Array.from(nodeModules)).to.deep.equal([]);
     expect(nonNodeModulesFiles).to.deep.equal(['handler.js', 'package-lock.json', 'package.json']);
   });
 
@@ -71,7 +71,7 @@ describe('Integration test - Packaging - Lambda Files', function () {
       zipfiles.filter((f) => f.startsWith('node_modules')).map((f) => f.split(path.sep)[1])
     );
     const nonNodeModulesFiles = zipfiles.filter((f) => !f.startsWith('node_modules'));
-    expect(nodeModules).to.deep.equal(new Set(['lodash']));
+    expect(Array.from(nodeModules)).to.deep.equal(['lodash']);
     expect(nonNodeModulesFiles).to.deep.equal(['handler.js']);
   });
 

From 79b5b5e8a91f95f82140c77c113504c7b095507c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 17 Nov 2021 11:05:17 +0100
Subject: [PATCH 0717/1101] test(Packaging): Fix npm v8 compatibility

---
 test/integrationPackage/lambda-files.tests.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/integrationPackage/lambda-files.tests.js b/test/integrationPackage/lambda-files.tests.js
index 9784fc8c3c1..5c737e85189 100644
--- a/test/integrationPackage/lambda-files.tests.js
+++ b/test/integrationPackage/lambda-files.tests.js
@@ -38,6 +38,7 @@ describe('Integration test - Packaging - Lambda Files', function () {
     const nodeModules = new Set(
       zipfiles.filter((f) => f.startsWith('node_modules')).map((f) => f.split(path.sep)[1])
     );
+    nodeModules.delete('.package-lock.json');
     const nonNodeModulesFiles = zipfiles.filter((f) => !f.startsWith('node_modules'));
     expect(Array.from(nodeModules)).to.deep.equal(['lodash']);
     expect(nonNodeModulesFiles).to.deep.equal(['handler.js', 'package-lock.json', 'package.json']);
@@ -52,6 +53,7 @@ describe('Integration test - Packaging - Lambda Files', function () {
     const nodeModules = new Set(
       zipfiles.filter((f) => f.startsWith('node_modules')).map((f) => f.split(path.sep)[1])
     );
+    nodeModules.delete('.package-lock.json');
     const nonNodeModulesFiles = zipfiles.filter((f) => !f.startsWith('node_modules'));
     expect(Array.from(nodeModules)).to.deep.equal([]);
     expect(nonNodeModulesFiles).to.deep.equal(['handler.js', 'package-lock.json', 'package.json']);
@@ -70,6 +72,7 @@ describe('Integration test - Packaging - Lambda Files', function () {
     const nodeModules = new Set(
       zipfiles.filter((f) => f.startsWith('node_modules')).map((f) => f.split(path.sep)[1])
     );
+    nodeModules.delete('.package-lock.json');
     const nonNodeModulesFiles = zipfiles.filter((f) => !f.startsWith('node_modules'));
     expect(Array.from(nodeModules)).to.deep.equal(['lodash']);
     expect(nonNodeModulesFiles).to.deep.equal(['handler.js']);

From 09ffb287aa295917addf12a8e089409b8ca39f9a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 17 Nov 2021 14:44:20 +0100
Subject: [PATCH 0718/1101] test(AWS Local Invocation): Do not test env
 dependent characteristic

---
 test/unit/lib/plugins/aws/invokeLocal/index.test.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/test/unit/lib/plugins/aws/invokeLocal/index.test.js b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
index 0d0757b3529..c8253f14d14 100644
--- a/test/unit/lib/plugins/aws/invokeLocal/index.test.js
+++ b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
@@ -651,7 +651,6 @@ describe('AwsInvokeLocal', () => {
 
     it('calls docker with packaged artifact', async () => {
       await awsInvokeLocal.invokeLocalDocker();
-      const dockerfilePath = path.join('.serverless', 'invokeLocal', 'nodejs12.x', 'Dockerfile');
 
       expect(pluginMangerSpawnPackageStub.calledOnce).to.equal(true);
       expect(spawnExtStub.getCall(0).args).to.deep.equal(['docker', ['version']]);
@@ -659,10 +658,6 @@ describe('AwsInvokeLocal', () => {
         'docker',
         ['images', '-q', 'lambci/lambda:nodejs12.x'],
       ]);
-      expect(spawnExtStub.getCall(2).args).to.deep.equal([
-        'docker',
-        ['build', '-t', 'sls-docker-nodejs12.x', 'servicePath', '-f', dockerfilePath],
-      ]);
       expect(spawnExtStub.getCall(3).args).to.deep.equal([
         'docker',
         [

From b41c6e4849de6352d7c49d47c2318704e14f1f4b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 17 Nov 2021 14:52:21 +0100
Subject: [PATCH 0719/1101] test: Ensure to skip on Windows in case of EPERM
 errors

---
 test/unit/lib/utils/fs/fileExistsSync.test.js | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/test/unit/lib/utils/fs/fileExistsSync.test.js b/test/unit/lib/utils/fs/fileExistsSync.test.js
index 67dc1c7ab39..989146dd9b1 100644
--- a/test/unit/lib/utils/fs/fileExistsSync.test.js
+++ b/test/unit/lib/utils/fs/fileExistsSync.test.js
@@ -3,6 +3,7 @@
 const path = require('path');
 const expect = require('chai').expect;
 const fse = require('fs-extra');
+const skipOnDisabledSymlinksInWindows = require('@serverless/test/skip-on-disabled-symlinks-in-windows');
 const fileExistsSync = require('../../../../../lib/utils/fs/fileExistsSync');
 
 describe('#fileExistsSync()', () => {
@@ -19,22 +20,37 @@ describe('#fileExistsSync()', () => {
   });
 
   describe('When reading a symlink to a file', () => {
-    it('should detect if the file exists', () => {
-      fse.symlinkSync(__filename, 'sym');
+    it('should detect if the file exists', function () {
+      try {
+        fse.symlinkSync(__filename, 'sym');
+      } catch (error) {
+        skipOnDisabledSymlinksInWindows(error, this);
+        throw error;
+      }
       const found = fileExistsSync('sym');
       expect(found).to.equal(true);
       fse.unlinkSync('sym');
     });
 
-    it("should detect if the file doesn't exist w/ bad symlink", () => {
-      fse.symlinkSync('oops', 'invalid-sym');
+    it("should detect if the file doesn't exist w/ bad symlink", function () {
+      try {
+        fse.symlinkSync('oops', 'invalid-sym');
+      } catch (error) {
+        skipOnDisabledSymlinksInWindows(error, this);
+        throw error;
+      }
       const found = fileExistsSync('invalid-sym');
       expect(found).to.equal(false);
       fse.unlinkSync('invalid-sym');
     });
 
-    it("should detect if the file doesn't exist w/ symlink to dir", () => {
-      fse.symlinkSync(__dirname, 'dir-sym');
+    it("should detect if the file doesn't exist w/ symlink to dir", function () {
+      try {
+        fse.symlinkSync(__dirname, 'dir-sym');
+      } catch (error) {
+        skipOnDisabledSymlinksInWindows(error, this);
+        throw error;
+      }
       const found = fileExistsSync('dir-sym');
       expect(found).to.equal(false);
       fse.unlinkSync('dir-sym');

From b8bcaf8f838f4bba15493eda30ad9b86baba50f1 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 17 Nov 2021 15:37:43 +0100
Subject: [PATCH 0720/1101] chore: Bump dependencies

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 0e0cfcfb4b3..95b191030bd 100644
--- a/package.json
+++ b/package.json
@@ -23,14 +23,14 @@
   },
   "dependencies": {
     "@serverless/cli": "^1.5.3",
-    "@serverless/components": "^3.18.0",
+    "@serverless/components": "^3.18.1",
     "@serverless/dashboard-plugin": "^5.5.1",
     "@serverless/platform-client": "^4.3.0",
     "@serverless/utils": "^5.20.1",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.1025.0",
+    "aws-sdk": "^2.1030.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.1.2",
     "cachedir": "^2.3.0",
@@ -86,7 +86,7 @@
     "adm-zip": "^0.5.9",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "cos-nodejs-sdk-v5": "^2.10.8",
+    "cos-nodejs-sdk-v5": "^2.11.1",
     "eslint": "^7.32.0",
     "eslint-plugin-import": "^2.25.3",
     "git-list-updated": "^1.2.1",

From 9ef705f0b1eabd6a0fb65dcacab30a52df9aeb04 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 17 Nov 2021 16:37:41 +0100
Subject: [PATCH 0721/1101] chore: Upgrade `sinon` to v12

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 95b191030bd..e27b8546b61 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "prettier": "^2.4.1",
     "proxyquire": "^2.1.3",
     "semver-regex": "^3.1.3",
-    "sinon": "^11.1.2",
+    "sinon": "^12.0.1",
     "sinon-chai": "^3.7.0",
     "standard-version": "^9.3.2",
     "ws": "^7.5.5",

From ce66591a688ca734eb34eff929163134d1d21ae8 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 17 Nov 2021 17:24:02 +0100
Subject: [PATCH 0722/1101] chore: Release v2.66.2

---
 CHANGELOG.md | 15 +++++++++++++++
 package.json |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66de299c58d..c316db05d67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
 
 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.
 
+## [2.66.2](https://github.com/serverless/serverless/compare/v2.66.1...v2.67.0) (2021-11-17)
+
+### Bug Fixes
+
+- **CLI:** Fix component template recognition in triage ([#10252](https://github.com/serverless/serverless/issues/10252)) ([4494f77](https://github.com/serverless/serverless/commit/4494f77f6111249d97295923a706883a8910840d)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **CLI:** Expose dashboard provider name when starting deployment ([#10194](https://github.com/serverless/serverless/issues/10194)) ([6698fa6](https://github.com/serverless/serverless/commit/6698fa657e5a5b35908c2b2de0815525f948064f)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Templates
+
+- Use `iam.role` syntax ([#10227](https://github.com/serverless/serverless/issues/10227)) ([a55d51c](https://github.com/serverless/serverless/commit/a55d51c6a4aa38153f61192d374cb23bf09ff66c)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Update `ts-node` for es2020 and es2021 support in `aws-nodes-typescript` ([#10234](https://github.com/serverless/serverless/issues/10234)) ([e131609](https://github.com/serverless/serverless/commit/e13160902848912a6bb652299d1bc6107cf09eb1)) ([Frédéric Barthelet](https://github.com/fredericbarthelet))
+
 ### [2.66.1](https://github.com/serverless/serverless/compare/v2.66.0...v2.66.1) (2021-11-10)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index e27b8546b61..335229eebfc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.66.1",
+  "version": "2.66.2",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 44511f343b1a68ca147e8ba9e8b493143b89c324 Mon Sep 17 00:00:00 2001
From: nicoeft <nfrancisquelo2@gmail.com>
Date: Wed, 24 Nov 2021 12:46:08 +0100
Subject: [PATCH 0723/1101] feat(AWS SQS): Support `functionResponseType`
 (#10265)

---
 docs/providers/aws/events/sqs.md              |  7 +++-
 lib/plugins/aws/package/compile/events/sqs.js |  5 +++
 .../aws/package/compile/events/sqs.test.js    | 36 +++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/docs/providers/aws/events/sqs.md b/docs/providers/aws/events/sqs.md
index a4895a3866a..a19d9f8ce0b 100644
--- a/docs/providers/aws/events/sqs.md
+++ b/docs/providers/aws/events/sqs.md
@@ -51,7 +51,11 @@ functions:
 
 For the SQS event integration, you can set the `batchSize`, which effects how many SQS messages can be included in a single Lambda invocation. The default `batchSize` is `10`. The max `batchSize` is `10000` for a standard queue, `10` for a FIFO queue.
 
-You can also set `maximumBatchingWindow` to standard queues to specify the maximum amount of time in seconds to gather records before invoking the function. The max `maximumBatchingWindow` is `300` seconds. Check [AWS documentation](https://docs.aws.amazon.com/lambda/latest/dg/with-sqs.html) for more details.
+You can also set `maximumBatchingWindow` to standard queues to specify the maximum amount of time in seconds to gather records before invoking the function. The max `maximumBatchingWindow` is `300` seconds.
+
+You can set `functionResponseType` to `ReportBatchItemFailures` to let your function return a partial success result if one or more messages in the batch have failed.
+
+Check [AWS documentation](https://docs.aws.amazon.com/lambda/latest/dg/with-sqs.html) for more details.
 
 ```yml
 functions:
@@ -62,6 +66,7 @@ functions:
           arn: arn:aws:sqs:region:XXXXXX:myQueue
           batchSize: 10
           maximumBatchingWindow: 60
+          functionResponseType: ReportBatchItemFailures
 ```
 
 ## IAM Permissions
diff --git a/lib/plugins/aws/package/compile/events/sqs.js b/lib/plugins/aws/package/compile/events/sqs.js
index 5389ad2bb0f..13f18ef4c93 100644
--- a/lib/plugins/aws/package/compile/events/sqs.js
+++ b/lib/plugins/aws/package/compile/events/sqs.js
@@ -22,6 +22,7 @@ class AwsCompileSQSEvents {
             batchSize: { type: 'integer', minimum: 1, maximum: 10000 },
             enabled: { type: 'boolean' },
             maximumBatchingWindow: { type: 'integer', minimum: 0, maximum: 300 },
+            functionResponseType: { enum: ['ReportBatchItemFailures'] },
           },
           required: ['arn'],
           additionalProperties: false,
@@ -97,6 +98,10 @@ class AwsCompileSQSEvents {
               },
             };
 
+            if (event.sqs.functionResponseType != null) {
+              sqsTemplate.Properties.FunctionResponseTypes = [event.sqs.functionResponseType];
+            }
+
             // add event source ARNs to PolicyDocument statements
             sqsStatement.Resource.push(EventSourceArn);
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js b/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
index 81c1a81521a..8cb3c5b6d4b 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
@@ -676,3 +676,39 @@ describe('AwsCompileSQSEvents #2', () => {
     expect(eventSourceMappingResource.DependsOn).to.deep.equal([]);
   });
 });
+
+describe('regular configuration', () => {
+  let eventSourceMappingResource;
+
+  before(async () => {
+    const { awsNaming, cfTemplate } = await runServerless({
+      fixture: 'function',
+      configExt: {
+        functions: {
+          basic: {
+            provisionedConcurrency: 1,
+            events: [
+              {
+                sqs: {
+                  arn: 'arn:aws:sqs:region:account:MyQueue',
+                  batchSize: 10,
+                  maximumBatchingWindow: 100,
+                  functionResponseType: 'ReportBatchItemFailures',
+                },
+              },
+            ],
+          },
+        },
+      },
+      command: 'package',
+    });
+    const queueLogicalId = awsNaming.getQueueLogicalId('basic', 'MyQueue');
+    eventSourceMappingResource = cfTemplate.Resources[queueLogicalId];
+  });
+
+  it('should use functionResponseType', () => {
+    expect(eventSourceMappingResource.Properties.FunctionResponseTypes).to.include.members([
+      'ReportBatchItemFailures',
+    ]);
+  });
+});

From a4fa49844d23afea90f7c9aa4616beedd2a80db8 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 24 Nov 2021 22:15:22 +0100
Subject: [PATCH 0724/1101] feat(AWS S3): Support `Fn::If` CF function for s3
 event

---
 .../aws/package/compile/events/s3/index.js    |  6 +++-
 lib/plugins/aws/provider.js                   |  2 +-
 .../package/compile/events/s3/index.test.js   | 36 +++++++++++++++++++
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/s3/index.js b/lib/plugins/aws/package/compile/events/s3/index.js
index 099bdf508f2..947102a9f2d 100644
--- a/lib/plugins/aws/package/compile/events/s3/index.js
+++ b/lib/plugins/aws/package/compile/events/s3/index.js
@@ -18,7 +18,11 @@ class AwsCompileS3Events {
           type: 'object',
           properties: {
             bucket: {
-              anyOf: [{ type: 'string' }, { $ref: '#/definitions/awsCfFunction' }],
+              anyOf: [
+                { type: 'string' },
+                { $ref: '#/definitions/awsCfFunction' },
+                { $ref: '#/definitions/awsCfIf' },
+              ],
             },
             event: { type: 'string', pattern: '^s3:.+$' },
             existing: { type: 'boolean' },
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 9d4d1c894fe..a47738bd9c7 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -356,7 +356,7 @@ class AwsProvider {
                 type: 'array',
                 minItems: 3,
                 maxItems: 3,
-                items: { type: 'string', minLength: 1 },
+                items: { $ref: '#/definitions/awsCfInstruction' },
               },
             },
             required: ['Fn::If'],
diff --git a/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
index f0b49c9bbb1..620f9751b0c 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
@@ -865,6 +865,24 @@ describe('test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js', ()
               },
             ],
           },
+          withIf: {
+            handler: 'basic.handler',
+            events: [
+              {
+                s3: {
+                  bucket: {
+                    'Fn::If': [
+                      'isFirstBucketEmtpy',
+                      { Ref: 'FirstBucket' },
+                      { Ref: 'SecondBucket' },
+                    ],
+                  },
+                  event: 's3:ObjectCreated:*',
+                  existing: true,
+                },
+              },
+            ],
+          },
         },
       },
       command: 'package',
@@ -919,6 +937,24 @@ describe('test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js', ()
     });
   });
 
+  it('should support `bucket` provided as CF If function', () => {
+    expect(cfResources[naming.getCustomResourceS3ResourceLogicalId('withIf')]).to.deep.equal({
+      Type: 'Custom::S3',
+      Version: 1,
+      DependsOn: ['WithIfLambdaFunction', 'CustomDashresourceDashexistingDashs3LambdaFunction'],
+      Properties: {
+        ServiceToken: {
+          'Fn::GetAtt': ['CustomDashresourceDashexistingDashs3LambdaFunction', 'Arn'],
+        },
+        FunctionName: `${serverlessInstance.service.service}-dev-withIf`,
+        BucketName: {
+          'Fn::If': ['isFirstBucketEmtpy', { Ref: 'FirstBucket' }, { Ref: 'SecondBucket' }],
+        },
+        BucketConfigs: [{ Event: 's3:ObjectCreated:*', Rules: [] }],
+      },
+    });
+  });
+
   it('should disallow referencing multiple buckets in context of single function with CF references', async () => {
     await expect(
       runServerless({

From c9fefced103e47d5d793d979cbb10072daeabf01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Barthelet?= <fredericb@theodo.fr>
Date: Thu, 25 Nov 2021 11:15:09 +0100
Subject: [PATCH 0725/1101] feat(AWS Deploy): Support `disableRollback`
 parameter (#10236)

---
 docs/providers/aws/guide/serverless.yml.md | 1 +
 lib/plugins/aws/deploy/lib/createStack.js  | 5 +++++
 lib/plugins/aws/lib/updateStack.js         | 9 +++++++++
 lib/plugins/aws/provider.js                | 1 +
 4 files changed, 16 insertions(+)

diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index da47a2aee45..a4ba3714b1b 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -261,6 +261,7 @@ provider:
   stackParameters:
     - ParameterKey: 'Keyname'
       ParameterValue: 'Value'
+  disableRollback: true # To be used for non-production environment
   rollbackConfiguration:
     MonitoringTimeInMinutes: 20
     RollbackTriggers:
diff --git a/lib/plugins/aws/deploy/lib/createStack.js b/lib/plugins/aws/deploy/lib/createStack.js
index 4b00aff3dc0..fd16257e487 100644
--- a/lib/plugins/aws/deploy/lib/createStack.js
+++ b/lib/plugins/aws/deploy/lib/createStack.js
@@ -53,6 +53,11 @@ module.exports = {
       params.NotificationARNs = this.serverless.service.provider.notificationArns;
     }
 
+    if (this.serverless.service.provider.disableRollback) {
+      delete params.OnFailure;
+      params.DisableRollback = this.serverless.service.provider.disableRollback;
+    }
+
     return this.provider
       .request('CloudFormation', 'createStack', params)
       .then((cfData) => this.monitorStack('create', cfData));
diff --git a/lib/plugins/aws/lib/updateStack.js b/lib/plugins/aws/lib/updateStack.js
index adb97b92d40..1313705e092 100644
--- a/lib/plugins/aws/lib/updateStack.js
+++ b/lib/plugins/aws/lib/updateStack.js
@@ -62,6 +62,11 @@ module.exports = {
       params.Parameters = this.serverless.service.provider.stackParameters;
     }
 
+    if (this.serverless.service.provider.disableRollback) {
+      delete params.OnFailure;
+      params.DisableRollback = this.serverless.service.provider.disableRollback;
+    }
+
     return this.provider
       .request('CloudFormation', 'createStack', params)
       .then((cfData) => this.monitorStack('create', cfData));
@@ -133,6 +138,10 @@ module.exports = {
       params.RollbackConfiguration = this.serverless.service.provider.rollbackConfiguration;
     }
 
+    if (this.serverless.service.provider.disableRollback) {
+      params.DisableRollback = this.serverless.service.provider.disableRollback;
+    }
+
     let cfData;
     try {
       cfData = await this.provider.request('CloudFormation', 'updateStack', params);
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index a47738bd9c7..4783ac262bf 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -844,6 +844,7 @@ class AwsProvider {
             },
             deploymentPrefix: { type: 'string' },
             disableDefaultOutputExportNames: { const: true },
+            disableRollback: { const: true },
             endpointType: {
               anyOf: ['REGIONAL', 'EDGE', 'PRIVATE'].map(caseInsensitive),
             },

From 5b61b415a0f19ce0755924eae969caf02185d8af Mon Sep 17 00:00:00 2001
From: Zane Mountcastle <zane.mountcastle@gmail.com>
Date: Thu, 25 Nov 2021 09:35:10 -0800
Subject: [PATCH 0726/1101] feat(AWS Lambda): Add `platform` option for
 container images (#10237)

Co-authored-by: Matthieu Napoli <matthieu@mnapoli.fr>
---
 docs/providers/aws/guide/functions.md      |  11 +-
 lib/plugins/aws/provider.js                |  23 +++-
 test/unit/lib/plugins/aws/provider.test.js | 147 +++++++++++++++++++++
 3 files changed, 179 insertions(+), 2 deletions(-)

diff --git a/docs/providers/aws/guide/functions.md b/docs/providers/aws/guide/functions.md
index c837721c22d..c220e0d3e96 100644
--- a/docs/providers/aws/guide/functions.md
+++ b/docs/providers/aws/guide/functions.md
@@ -206,7 +206,15 @@ Alternatively lambda environment can be configured through docker images. Image
 
 Serverless will create an ECR repository for your image, but it currently does not manage updates to it. An ECR repository is created only for new services or the first time that a function configured with an `image` is deployed. In service configuration, you can configure the ECR repository to scan for CVEs via the `provider.ecr.scanOnPush` property, which is `false` by default. (See [documentation](https://docs.aws.amazon.com/AmazonECR/latest/userguide/image-scanning.html))
 
-In service configuration, images can be configured via `provider.ecr.images`. To define an image that will be built locally, you need to specify `path` property, which should point to valid docker context directory. Optionally, you can also set `file` to specify Dockerfile that should be used when building an image. It is also possible to define images that already exist in AWS ECR repository. In order to do that, you need to define `uri` property, which should follow `<account>.dkr.ecr.<region>.amazonaws.com/<repository>@<digest>` or `<account>.dkr.ecr.<region>.amazonaws.com/<repository>:<tag>` format. Additionally, with `buildArgs` property, you can define arguments that will be passed to `docker build` command with `--build-arg` flag. They might be later referenced via `ARG` within your `Dockerfile`. The `cacheFrom` property can be used to specify which images to use as a source for layer caching in the `docker build` command with `--cache-from` flag. When `uri` is defined for an image, `buildArgs` and `cacheFrom` cannot be defined.
+In service configuration, images can be configured via `provider.ecr.images`. To define an image that will be built locally, you need to specify `path` property, which should point to valid docker context directory. Optionally, you can also set `file` to specify Dockerfile that should be used when building an image. It is also possible to define images that already exist in AWS ECR repository. In order to do that, you need to define `uri` property, which should follow `<account>.dkr.ecr.<region>.amazonaws.com/<repository>@<digest>` or `<account>.dkr.ecr.<region>.amazonaws.com/<repository>:<tag>` format.
+
+Additionally, you can define arguments that will be passed to the `docker build` command via the following properties:
+
+- `buildArgs`: With the `buildArgs` property, you can define arguments that will be passed to `docker build` command with `--build-arg` flag. They might be later referenced via `ARG` within your `Dockerfile`. (See [Documentation](https://docs.docker.com/engine/reference/builder/#arg))
+- `cacheFrom`: The `cacheFrom` property can be used to specify which images to use as a source for layer caching in the `docker build` command with `--cache-from` flag. (See [Documentation](https://docs.docker.com/engine/reference/builder/#usage))
+- `platform`: The `platform` property can be used to specify the architecture target in the `docker build` command with the `--platform` flag. If not specified, Docker will build for your computer's architecture by default. AWS Lambda typically uses `x86` architecture unless otherwise specified in the Lambda's runtime settings. In order to avoid runtime errors when building on an ARM-based machine (e.g. Apple M1 Mac), `linux/amd64` must be used here. The options for this flag are `linux/amd64` (`x86`-based Lambdas), `linux/arm64` (`arm`-based Lambdas), or `windows/amd64`. (See [Documentation](https://docs.docker.com/engine/reference/builder/#from))
+
+When `uri` is defined for an image, `buildArgs`, `cacheFrom`, and `platform` cannot be defined.
 
 Example configuration
 
@@ -224,6 +232,7 @@ provider:
           STAGE: ${opt:stage}
         cacheFrom:
           - my-image:latest
+        platform: linux/amd64
       anotherimage:
         uri: 000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38
 ```
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 4783ac262bf..6b80f5ff98d 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -994,6 +994,7 @@ class AwsProvider {
                             file: { type: 'string' },
                             buildArgs: { type: 'object', additionalProperties: { type: 'string' } },
                             cacheFrom: { type: 'array', additionalProperties: { type: 'string' } },
+                            platform: { type: 'string' },
                           },
                           additionalProperties: false,
                         },
@@ -1953,7 +1954,15 @@ Object.defineProperties(
       { promise: true }
     ),
     resolveImageUriAndShaFromPath: d(
-      async function ({ imageName, imagePath, imageFilename, buildArgs, cacheFrom, scanOnPush }) {
+      async function ({
+        imageName,
+        imagePath,
+        imageFilename,
+        buildArgs,
+        cacheFrom,
+        platform,
+        scanOnPush,
+      }) {
         const imageProgress = progress.get(`containerImage:${imageName}`);
         await this.ensureDockerIsAvailable();
 
@@ -1998,6 +2007,9 @@ Object.defineProperties(
           imagePath,
         ];
 
+        // This is an optional argument, so we only append to the arguments if "platform" is specified.
+        if (platform !== '') buildDockerArgs.push(`--platform=${platform}`);
+
         let imageSha;
         try {
           imageProgress.notice(`Building image "${imageName}"`);
@@ -2123,6 +2135,7 @@ Object.defineProperties(
         const defaultBuildArgs = {};
         const defaultCacheFrom = [];
         const defaultScanOnPush = false;
+        const defaultPlatform = '';
 
         if (imageUri) {
           return await this.resolveImageUriAndShaFromUri(imageUri);
@@ -2171,6 +2184,12 @@ Object.defineProperties(
               'ECR_IMAGE_BOTH_URI_AND_CACHEFROM_DEFINED_ERROR'
             );
           }
+          if (imageDefinedInProvider.uri && imageDefinedInProvider.platform) {
+            throw new ServerlessError(
+              `The "platform" property cannot be used with "uri" property "${imageName}"`,
+              'ECR_IMAGE_BOTH_URI_AND_PLATFORM_DEFINED_ERROR'
+            );
+          }
           if (imageDefinedInProvider.path) {
             return await this.resolveImageUriAndShaFromPath({
               imageName,
@@ -2178,6 +2197,7 @@ Object.defineProperties(
               imageFilename: imageDefinedInProvider.file || defaultDockerfile,
               buildArgs: imageDefinedInProvider.buildArgs || defaultBuildArgs,
               cacheFrom: imageDefinedInProvider.cacheFrom || defaultCacheFrom,
+              platform: imageDefinedInProvider.platform || defaultPlatform,
               scanOnPush: imageScanDefinedInProvider,
             });
           }
@@ -2192,6 +2212,7 @@ Object.defineProperties(
           imageFilename: defaultDockerfile,
           buildArgs: imageDefinedInProvider.buildArgs || defaultBuildArgs,
           cacheFrom: imageDefinedInProvider.cacheFrom || defaultCacheFrom,
+          platform: imageDefinedInProvider.platform || defaultPlatform,
           scanOnPush: imageScanDefinedInProvider,
         });
       },
diff --git a/test/unit/lib/plugins/aws/provider.test.js b/test/unit/lib/plugins/aws/provider.test.js
index a0fd91f4914..59e7b1f509f 100644
--- a/test/unit/lib/plugins/aws/provider.test.js
+++ b/test/unit/lib/plugins/aws/provider.test.js
@@ -842,6 +842,95 @@ aws_secret_access_key = CUSTOMSECRET
       );
     });
 
+    it('should fail if `functions[].image` references image with both buildArgs and uri', async () => {
+      await expect(
+        runServerless({
+          fixture: 'function',
+          command: 'package',
+          configExt: {
+            provider: {
+              ecr: {
+                images: {
+                  invalidimage: {
+                    buildArgs: {
+                      TESTKEY: 'TESTVAL',
+                    },
+                    uri: '000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38',
+                  },
+                },
+              },
+            },
+            functions: {
+              fnProviderInvalidImage: {
+                image: 'invalidimage',
+              },
+            },
+          },
+        })
+      ).to.be.eventually.rejected.and.have.property(
+        'code',
+        'ECR_IMAGE_BOTH_URI_AND_BUILDARGS_DEFINED_ERROR'
+      );
+    });
+
+    it('should fail if `functions[].image` references image with both cacheFrom and uri', async () => {
+      await expect(
+        runServerless({
+          fixture: 'function',
+          command: 'package',
+          configExt: {
+            provider: {
+              ecr: {
+                images: {
+                  invalidimage: {
+                    cacheFrom: ['my-image:latest'],
+                    uri: '000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38',
+                  },
+                },
+              },
+            },
+            functions: {
+              fnProviderInvalidImage: {
+                image: 'invalidimage',
+              },
+            },
+          },
+        })
+      ).to.be.eventually.rejected.and.have.property(
+        'code',
+        'ECR_IMAGE_BOTH_URI_AND_CACHEFROM_DEFINED_ERROR'
+      );
+    });
+
+    it('should fail if `functions[].image` references image with both platform and uri', async () => {
+      await expect(
+        runServerless({
+          fixture: 'function',
+          command: 'package',
+          configExt: {
+            provider: {
+              ecr: {
+                images: {
+                  invalidimage: {
+                    platform: 'TESTVAL',
+                    uri: '000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38',
+                  },
+                },
+              },
+            },
+            functions: {
+              fnProviderInvalidImage: {
+                image: 'invalidimage',
+              },
+            },
+          },
+        })
+      ).to.be.eventually.rejected.and.have.property(
+        'code',
+        'ECR_IMAGE_BOTH_URI_AND_PLATFORM_DEFINED_ERROR'
+      );
+    });
+
     it('should fail if `functions[].image` references image without path and uri', async () => {
       await expect(
         runServerless({
@@ -1664,6 +1753,64 @@ aws_secret_access_key = CUSTOMSECRET
         ]);
       });
 
+      it('should work correctly when image is defined with `platform` set', async () => {
+        const awsRequestStubMap = {
+          ...baseAwsRequestStubMap,
+          ECR: {
+            ...baseAwsRequestStubMap.ECR,
+            describeRepositories: describeRepositoriesStub.resolves({
+              repositories: [{ repositoryUri }],
+            }),
+            createRepository: createRepositoryStub,
+          },
+        };
+        const {
+          awsNaming,
+          cfTemplate,
+          fixtureData: { servicePath: serviceDir },
+        } = await runServerless({
+          fixture: 'ecr',
+          command: 'package',
+          awsRequestStubMap,
+          modulesCacheStub,
+          configExt: {
+            provider: {
+              ecr: {
+                images: {
+                  baseimage: {
+                    path: './',
+                    file: 'Dockerfile.dev',
+                    platform: 'TESTVAL',
+                  },
+                },
+              },
+            },
+          },
+        });
+
+        const functionCfLogicalId = awsNaming.getLambdaLogicalId('foo');
+        const functionCfConfig = cfTemplate.Resources[functionCfLogicalId].Properties;
+        const versionCfConfig = Object.values(cfTemplate.Resources).find(
+          (resource) =>
+            resource.Type === 'AWS::Lambda::Version' &&
+            resource.Properties.FunctionName.Ref === functionCfLogicalId
+        ).Properties;
+
+        expect(functionCfConfig.Code.ImageUri).to.deep.equal(`${repositoryUri}@sha256:${imageSha}`);
+        expect(versionCfConfig.CodeSha256).to.equal(imageSha);
+        expect(describeRepositoriesStub).to.be.calledOnce;
+        expect(createRepositoryStub.notCalled).to.be.true;
+        expect(spawnExtStub).to.be.calledWith('docker', [
+          'build',
+          '-t',
+          `${awsNaming.getEcrRepositoryName()}:baseimage`,
+          '-f',
+          path.join(serviceDir, 'Dockerfile.dev'),
+          './',
+          '--platform=TESTVAL',
+        ]);
+      });
+
       it('should work correctly when `functions[].image` is defined with explicit name', async () => {
         const awsRequestStubMap = {
           ...baseAwsRequestStubMap,

From e8e7724cc7c440a5c3bf083dce5fba87cb7c7ec7 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 26 Nov 2021 10:22:16 +0100
Subject: [PATCH 0727/1101] chore: Bump dependencies

---
 package.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 335229eebfc..5c2164ad693 100644
--- a/package.json
+++ b/package.json
@@ -30,14 +30,14 @@
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.1030.0",
+    "aws-sdk": "^2.1036.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.1.2",
     "cachedir": "^2.3.0",
     "chalk": "^4.1.2",
     "child-process-ext": "^2.1.1",
-    "ci-info": "^3.2.0",
-    "cli-progress-footer": "^2.1.1",
+    "ci-info": "^3.3.0",
+    "cli-progress-footer": "^2.2.0",
     "d": "^1.0.1",
     "dayjs": "^1.10.7",
     "decompress": "^4.2.1",
@@ -50,7 +50,7 @@
     "fs-extra": "^9.1.0",
     "get-stdin": "^8.0.0",
     "globby": "^11.0.4",
-    "got": "^11.8.2",
+    "got": "^11.8.3",
     "graceful-fs": "^4.2.8",
     "https-proxy-agent": "^5.0.0",
     "is-docker": "^2.2.1",
@@ -69,7 +69,7 @@
     "promise-queue": "^2.2.5",
     "replaceall": "^0.1.6",
     "semver": "^7.3.5",
-    "signal-exit": "^3.0.5",
+    "signal-exit": "^3.0.6",
     "strip-ansi": "^6.0.1",
     "tabtab": "^3.0.2",
     "tar": "^6.1.11",
@@ -86,7 +86,7 @@
     "adm-zip": "^0.5.9",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "cos-nodejs-sdk-v5": "^2.11.1",
+    "cos-nodejs-sdk-v5": "^2.11.3",
     "eslint": "^7.32.0",
     "eslint-plugin-import": "^2.25.3",
     "git-list-updated": "^1.2.1",
@@ -100,13 +100,13 @@
     "mock-require": "^3.0.3",
     "nyc": "^15.1.0",
     "pkg": "^4.5.1",
-    "prettier": "^2.4.1",
+    "prettier": "^2.5.0",
     "proxyquire": "^2.1.3",
     "semver-regex": "^3.1.3",
     "sinon": "^12.0.1",
     "sinon-chai": "^3.7.0",
     "standard-version": "^9.3.2",
-    "ws": "^7.5.5",
+    "ws": "^7.5.6",
     "xml2js": "^0.4.23"
   },
   "eslintConfig": {

From 317cfe1e91eb7ba58fdb2a151a7cb4224ed21a37 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 26 Nov 2021 10:26:44 +0100
Subject: [PATCH 0728/1101] chore: Release v2.67.0

---
 CHANGELOG.md | 9 +++++++++
 package.json | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c316db05d67..186ac2b51a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 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.
 
+## [2.67.0](https://github.com/serverless/serverless/compare/v2.66.2...v2.67.0) (2021-11-26)
+
+### Features
+
+- **AWS Deploy:** Support `disableRollback` parameter ([#10236](https://github.com/serverless/serverless/issues/10236)) ([c9fefce](https://github.com/serverless/serverless/commit/c9fefced103e47d5d793d979cbb10072daeabf01)) ([Frédéric Barthelet](https://github.com/fredericbarthelet))
+- **AWS Lambda:** Add `platform` option for container images ([#10237](https://github.com/serverless/serverless/issues/10237)) ([5b61b41](https://github.com/serverless/serverless/commit/5b61b415a0f19ce0755924eae969caf02185d8af)) ([Zane Mountcastle](https://github.com/zanemountcastle))
+- **AWS S3:** Support `Fn::If` CF function for s3 event ([#10272](https://github.com/serverless/serverless/pull/10272)) ([a4fa498](https://github.com/serverless/serverless/commit/a4fa49844d23afea90f7c9aa4616beedd2a80db8)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS SQS:** Support `functionResponseType` ([#10265](https://github.com/serverless/serverless/issues/10265)) ([44511f3](https://github.com/serverless/serverless/commit/44511f343b1a68ca147e8ba9e8b493143b89c324)) ([nicoeft](https://github.com/nicoeft))
+
 ## [2.66.2](https://github.com/serverless/serverless/compare/v2.66.1...v2.67.0) (2021-11-17)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 5c2164ad693..422eeda5138 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.66.2",
+  "version": "2.67.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From f7bbd176866b99725dcf1fef1128b0d2194217e0 Mon Sep 17 00:00:00 2001
From: Sudipto Das <s.das001@yahoo.com>
Date: Fri, 26 Nov 2021 22:32:23 +0530
Subject: [PATCH 0729/1101] fix(AWS SQS): Accept only plain string form in
 direct ARN assignement

(PR #10263)
---
 lib/plugins/aws/package/compile/events/sqs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/aws/package/compile/events/sqs.js b/lib/plugins/aws/package/compile/events/sqs.js
index 13f18ef4c93..0caaed870da 100644
--- a/lib/plugins/aws/package/compile/events/sqs.js
+++ b/lib/plugins/aws/package/compile/events/sqs.js
@@ -14,7 +14,7 @@ class AwsCompileSQSEvents {
 
     this.serverless.configSchemaHandler.defineFunctionEvent('aws', 'sqs', {
       anyOf: [
-        { $ref: '#/definitions/awsArn' },
+        { $ref: '#/definitions/awsArnString' },
         {
           type: 'object',
           properties: {

From 0714f7df0642d7a900c9d72eb26ae8c5ae1eddd7 Mon Sep 17 00:00:00 2001
From: burakaktasfe <86488523+burakaktasfe@users.noreply.github.com>
Date: Mon, 29 Nov 2021 19:45:10 +0300
Subject: [PATCH 0730/1101] feat(Templates): Update dependencies in
 `aws-java-maven` (#10289)

---
 lib/plugins/create/templates/aws-java-maven/pom.xml    |  6 +++---
 .../create/templates/aws-kotlin-jvm-maven/pom.xml      | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/plugins/create/templates/aws-java-maven/pom.xml b/lib/plugins/create/templates/aws-java-maven/pom.xml
index 3f3bff61fb8..7bee00dfff5 100644
--- a/lib/plugins/create/templates/aws-java-maven/pom.xml
+++ b/lib/plugins/create/templates/aws-java-maven/pom.xml
@@ -32,17 +32,17 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.9.10</version>
+      <version>2.11.0</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.9.10</version>
+      <version>2.11.0</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.9.10</version>
+      <version>2.11.0</version>
     </dependency>
   </dependencies>
 
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml b/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml
index 534ccf6a87e..49408ed12df 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml
@@ -20,7 +20,7 @@
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
-                <version>2.9.10</version>
+                <version>2.11.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -56,22 +56,22 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.9.10</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.10</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.9.10</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-kotlin</artifactId>
-            <version>2.9.10</version>
+            <version>2.11.0</version>
         </dependency>
     </dependencies>
 

From fc0050559cd1ee7b8a53a08fae73940177da93cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Barthelet?= <fredericb@theodo.fr>
Date: Tue, 30 Nov 2021 10:18:03 +0100
Subject: [PATCH 0731/1101] feat(AWS Stream): Support `filterPatterns` (#10285)

---
 docs/providers/aws/events/streams.md          | 19 +++++++++
 docs/providers/aws/guide/serverless.yml.md    |  2 +
 .../aws/package/compile/events/stream.js      | 14 +++++++
 .../aws/package/compile/events/stream.test.js | 39 +++++++++++++++++++
 4 files changed, 74 insertions(+)

diff --git a/docs/providers/aws/events/streams.md b/docs/providers/aws/events/streams.md
index e4dada34fa6..b0c615e0d87 100644
--- a/docs/providers/aws/events/streams.md
+++ b/docs/providers/aws/events/streams.md
@@ -329,3 +329,22 @@ functions:
           arn: arn:aws:dynamodb:region:XXXXXX:table/foo/stream/1970-01-01T00:00:00.000
           tumblingWindowInSeconds: 30
 ```
+
+## Setting filter patterns
+
+This configuration allows customers to filter event before lambda invocation. It accepts up to 5 filter criterion by default and up to 10 with quota extension. If one event matches at least 1 pattern, lambda will process it.
+
+For more details and examples of filter patterns, please see the [AWS event filtering documentation](https://docs.aws.amazon.com/lambda/latest/dg/invocation-eventfiltering.html)
+
+Note: Serverless only sets this property if you explicitly add it to the stream configuration (see an example below). The following example will only process inserted items in the DynamoDB table (it will skip removed and modified items).
+
+```yml
+functions:
+  handleInsertedDynamoDBItem:
+    handler: handler.preprocess
+    events:
+      - stream:
+          arn: arn:aws:dynamodb:region:XXXXXX:table/foo/stream/1970-01-01T00:00:00.000
+          filterPatterns:
+            - eventName: [INSERT]
+```
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index a4ba3714b1b..6bd1506282c 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -458,6 +458,8 @@ functions:
           startingPosition: LATEST
           enabled: true
           functionResponseType: ReportBatchItemFailures
+          filterPatterns:
+            - partitionKey: [ 1 ]
       - msk:
           arn: arn:aws:kafka:us-east-1:111111111111:cluster/ClusterName/a1a1a1a1a1a1a1a1a # ARN of MSK Cluster
           topic: kafkaTopic # name of Kafka topic to consume from
diff --git a/lib/plugins/aws/package/compile/events/stream.js b/lib/plugins/aws/package/compile/events/stream.js
index 03264140bcb..21377addd94 100644
--- a/lib/plugins/aws/package/compile/events/stream.js
+++ b/lib/plugins/aws/package/compile/events/stream.js
@@ -69,6 +69,12 @@ class AwsCompileStreamEvents {
               required: ['onFailure'],
             },
             tumblingWindowInSeconds: { type: 'integer', minimum: 0, maximum: 900 },
+            filterPatterns: {
+              type: 'array',
+              minItems: 1,
+              maxItems: 10,
+              items: { type: 'object' },
+            },
           },
           additionalProperties: false,
           anyOf: [
@@ -273,6 +279,14 @@ class AwsCompileStreamEvents {
               };
             }
 
+            if (event.stream.filterPatterns) {
+              streamResource.Properties.FilterCriteria = {
+                Filters: event.stream.filterPatterns.map((pattern) => ({
+                  Pattern: JSON.stringify(pattern),
+                })),
+              };
+            }
+
             const newStreamObject = {
               [streamLogicalId]: streamResource,
             };
diff --git a/test/unit/lib/plugins/aws/package/compile/events/stream.test.js b/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
index cc894e2df08..6b640a4122d 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
@@ -1724,4 +1724,43 @@ describe('AwsCompileStreamEvents #2', () => {
       );
     });
   });
+  describe('with filterPatterns', () => {
+    let eventSourceMappingResource;
+
+    before(async () => {
+      const { awsNaming, cfTemplate } = await runServerless({
+        fixture: 'function',
+        configExt: {
+          functions: {
+            basic: {
+              events: [
+                {
+                  stream: {
+                    arn: 'arn:aws:dynamodb:region:account:table/foo/stream/1',
+                    filterPatterns: [{ eventName: ['INSERT'] }, { eventName: ['MODIFY'] }],
+                  },
+                },
+              ],
+            },
+          },
+        },
+        command: 'package',
+      });
+      const streamLogicalId = awsNaming.getStreamLogicalId('basic', 'dynamodb', 'foo');
+      eventSourceMappingResource = cfTemplate.Resources[streamLogicalId];
+    });
+
+    it('should wrap patterns within FilterCriteria property', () => {
+      expect(eventSourceMappingResource.Properties.FilterCriteria).to.deep.equal({
+        Filters: [
+          {
+            Pattern: JSON.stringify({ eventName: ['INSERT'] }),
+          },
+          {
+            Pattern: JSON.stringify({ eventName: ['MODIFY'] }),
+          },
+        ],
+      });
+    });
+  });
 });

From cc2423b57325d2f0b329af8d19e000e0344d32d4 Mon Sep 17 00:00:00 2001
From: Shalvah <shalvah@users.noreply.github.com>
Date: Tue, 30 Nov 2021 10:58:05 +0100
Subject: [PATCH 0732/1101] docs(AWS Local Invocation): Update supported
 runtimes (#10290)

---
 docs/providers/aws/cli-reference/invoke.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/providers/aws/cli-reference/invoke.md b/docs/providers/aws/cli-reference/invoke.md
index 85bad82a2fc..ddea5e0e65d 100644
--- a/docs/providers/aws/cli-reference/invoke.md
+++ b/docs/providers/aws/cli-reference/invoke.md
@@ -139,7 +139,7 @@ This example will pass the json context in the `lib/context.json` file (relative
 
 ### Limitations
 
-Currently, `invoke local` only supports the NodeJs and Python runtimes.
+Currently, `invoke local` only supports the Node.js, Python, Java and Ruby runtimes.
 
 ## Resource permissions
 

From d52526bb6059ce20eba341c29ad5a2373c238624 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 29 Nov 2021 15:58:44 +0100
Subject: [PATCH 0733/1101] feat(AWS Deploy): Ensure consistent function state
 in `deploy function`

---
 lib/plugins/aws/deployFunction.js             | 39 ++++++++++++
 .../lib/plugins/aws/deployFunction.test.js    | 59 +++++++++++++++++++
 .../package/lib/packageService.test.js        |  2 +
 3 files changed, 100 insertions(+)

diff --git a/lib/plugins/aws/deployFunction.js b/lib/plugins/aws/deployFunction.js
index 122db864982..671f63002f2 100644
--- a/lib/plugins/aws/deployFunction.js
+++ b/lib/plugins/aws/deployFunction.js
@@ -22,6 +22,8 @@ class AwsDeployFunction {
       path.join(this.serverless.serviceDir || '.', '.serverless');
     this.provider = this.serverless.getProvider('aws');
 
+    this.shouldEnsureFunctionState = false;
+
     Object.assign(this, validate);
 
     this.hooks = {
@@ -76,6 +78,9 @@ class AwsDeployFunction {
           await this.deployFunction();
         }
         await this.updateFunctionConfiguration();
+        if (this.shouldEnsureFunctionState) {
+          await this.ensureFunctionState();
+        }
         await this.serverless.pluginManager.spawn('aws:common:cleanupTempDir');
       },
     };
@@ -163,6 +168,38 @@ class AwsDeployFunction {
     return data.Arn;
   }
 
+  async ensureFunctionState() {
+    this.options.functionObj = this.serverless.service.getFunction(this.options.function);
+    const params = {
+      FunctionName: this.options.functionObj.name,
+    };
+    const startTime = Date.now();
+
+    const callWithRetry = async () => {
+      const result = await this.provider.request('Lambda', 'getFunction', params);
+      if (
+        result &&
+        result.Configuration.State === 'Active' &&
+        result.Configuration.LastUpdateStatus === 'Successful'
+      ) {
+        return;
+      }
+      const didOneMinutePass = Date.now() - startTime > 60 * 1000;
+      if (didOneMinutePass) {
+        throw new ServerlessError(
+          'Ensuring function state timed out. Please try to deploy your function once again.',
+          'DEPLOY_FUNCTION_ENSURE_STATE_TIMED_OUT'
+        );
+      }
+      legacy.log(`Retrying ensure function state for function: ${this.options.function}.`);
+      log.info(`Retrying ensure function state for function: ${this.options.function}.`);
+      await wait(500);
+      await callWithRetry();
+    };
+
+    await callWithRetry();
+  }
+
   async callUpdateFunctionConfiguration(params) {
     const startTime = Date.now();
 
@@ -389,6 +426,7 @@ class AwsDeployFunction {
 
     mainProgress.notice('Updating function configuration', { isMainEvent: true });
     await this.callUpdateFunctionConfiguration(params);
+    this.shouldEnsureFunctionState = true;
     if (this.options['update-config']) log.notice();
     log.notice.success(
       `Function configuration updated ${style.aside(
@@ -461,6 +499,7 @@ class AwsDeployFunction {
 
     mainProgress.notice('Deploying', { isMainEvent: true });
     await this.provider.request('Lambda', 'updateFunctionCode', params);
+    this.shouldEnsureFunctionState = true;
     legacy.log(`Successfully deployed function: ${this.options.function}`);
     log.notice();
     log.notice.success(
diff --git a/test/unit/lib/plugins/aws/deployFunction.test.js b/test/unit/lib/plugins/aws/deployFunction.test.js
index 42747c74996..9de68302c1a 100644
--- a/test/unit/lib/plugins/aws/deployFunction.test.js
+++ b/test/unit/lib/plugins/aws/deployFunction.test.js
@@ -326,6 +326,8 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       getFunction: {
         Configuration: {
           LastModified: '2020-05-20T15:34:16.494+0000',
+          State: 'Active',
+          LastUpdateStatus: 'Successful',
         },
       },
       updateFunctionCode: updateFunctionCodeStub,
@@ -408,6 +410,9 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
             Configuration: {
               LastModified: '2020-05-20T15:34:16.494+0000',
               CodeSha256: imageSha,
+              State: 'Active',
+              LastUpdateStatus: 'Successful',
+
               ImageConfigResponse: {
                 ImageConfig: {
                   Command: ['anotherexecutable'],
@@ -452,6 +457,8 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
             Configuration: {
               LastModified: '2020-05-20T15:34:16.494+0000',
               CodeSha256: imageSha,
+              State: 'Active',
+              LastUpdateStatus: 'Successful',
             },
           },
         },
@@ -482,6 +489,8 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
               Configuration: {
                 LastModified: '2020-05-20T15:34:16.494+0000',
                 PackageType: 'Zip',
+                State: 'Active',
+                LastUpdateStatus: 'Successful',
               },
             },
           },
@@ -514,6 +523,8 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
               Configuration: {
                 LastModified: '2020-05-20T15:34:16.494+0000',
                 PackageType: 'Image',
+                State: 'Active',
+                LastUpdateStatus: 'Successful',
               },
             },
           },
@@ -572,6 +583,8 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
             Configuration: {
               LastModified: '2020-05-20T15:34:16.494+0000',
               PackageType: 'Zip',
+              State: 'Active',
+              LastUpdateStatus: 'Successful',
             },
           },
         },
@@ -644,6 +657,8 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
             Configuration: {
               LastModified: '2020-05-20T15:34:16.494+0000',
               PackageType: 'Zip',
+              State: 'Active',
+              LastUpdateStatus: 'Successful',
             },
           },
         },
@@ -693,6 +708,8 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
             Configuration: {
               LastModified: '2020-05-20T15:34:16.494+0000',
               PackageType: 'Zip',
+              State: 'Active',
+              LastUpdateStatus: 'Successful',
             },
           },
         },
@@ -755,6 +772,9 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
               KMSKeyArn: kmsKeyArn,
               Description: description,
               Handler: handler,
+              State: 'Active',
+              LastUpdateStatus: 'Successful',
+
               Environment: {
                 Variables: {
                   ANOTHERVAR: 'anothervalue',
@@ -970,4 +990,43 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       })
     ).to.be.eventually.rejected.and.have.property('code', 'FUNCTION_NOT_YET_DEPLOYED');
   });
+
+  it('should handle situation where function is not immediately in desired state', async () => {
+    const successResponse = {
+      Configuration: {
+        LastModified: '2020-05-20T15:34:16.494+0000',
+        State: 'Active',
+        LastUpdateStatus: 'Successful',
+      },
+    };
+
+    const getFunctionStub = sinon
+      .stub()
+      .resolves(successResponse)
+      .onCall(1)
+      .resolves({
+        Configuration: {
+          LastModified: '2020-05-20T15:34:16.494+0000',
+          State: 'Active',
+          LastUpdateStatus: 'InProgress',
+        },
+      })
+      .onCall(2)
+      .resolves(successResponse);
+
+    await runServerless({
+      fixture: 'function',
+      command: 'deploy function',
+      options: { function: 'basic' },
+      lastLifecycleHookName: 'deploy:function:deploy',
+      awsRequestStubMap: {
+        ...awsRequestStubMap,
+        Lambda: {
+          ...awsRequestStubMap.Lambda,
+          getFunction: getFunctionStub,
+        },
+      },
+    });
+    expect(getFunctionStub).to.have.been.calledThrice;
+  });
 });
diff --git a/test/unit/lib/plugins/package/lib/packageService.test.js b/test/unit/lib/plugins/package/lib/packageService.test.js
index bf43454c4ca..549b7a47ec7 100644
--- a/test/unit/lib/plugins/package/lib/packageService.test.js
+++ b/test/unit/lib/plugins/package/lib/packageService.test.js
@@ -359,6 +359,8 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
           getFunction: {
             Configuration: {
               LastModified: '2020-05-20T15:34:16.494+0000',
+              State: 'Active',
+              LastUpdateStatus: 'Successful',
             },
           },
           updateFunctionCode: updateFunctionCodeStub,

From 3f0a80acd3fcf9eb7768625eb6cfe06cf572afa0 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 1 Dec 2021 17:24:57 +0100
Subject: [PATCH 0734/1101] feat(AWS SQS): Support `filterPatterns`

---
 docs/providers/aws/events/sqs.md              | 19 +++++++++++++++++++
 docs/providers/aws/events/streams.md          |  2 +-
 docs/providers/aws/guide/serverless.yml.md    |  2 ++
 lib/plugins/aws/package/compile/events/sqs.js |  9 +++++++++
 .../aws/package/compile/events/stream.js      |  7 +------
 lib/plugins/aws/provider.js                   |  6 ++++++
 .../aws/package/compile/events/sqs.test.js    | 14 ++++++++++++++
 7 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/docs/providers/aws/events/sqs.md b/docs/providers/aws/events/sqs.md
index a19d9f8ce0b..40ba80713ce 100644
--- a/docs/providers/aws/events/sqs.md
+++ b/docs/providers/aws/events/sqs.md
@@ -69,6 +69,25 @@ functions:
           functionResponseType: ReportBatchItemFailures
 ```
 
+## Setting filter patterns
+
+This configuration allows customers to filter event before lambda invocation. It accepts up to 5 filter patterns by default and up to 10 with quota extension. If one event matches at least 1 pattern, lambda will process it.
+
+For more details and examples of filter patterns, please see the [AWS event filtering documentation](https://docs.aws.amazon.com/lambda/latest/dg/invocation-eventfiltering.html)
+
+Note: Serverless only sets this property if you explicitly add it to the `sqs` configuration (see an example below). The following example will only process records where field `a` is equal to 1 or 2.
+
+```yml
+functions:
+  onlyOneOrTwo:
+    handler: handler.preprocess
+    events:
+      - sqs:
+          arn: arn:aws:sqs:region:XXXXXX:myQueue
+          filterPatterns:
+            - a: [1, 2]
+```
+
 ## IAM Permissions
 
 The Serverless Framework will automatically configure the most minimal set of IAM permissions for you. However you can still add additional permissions if you need to. Read the official [AWS documentation](https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-configure-lambda-function-trigger.html) for more information about IAM Permissions for SQS events.
diff --git a/docs/providers/aws/events/streams.md b/docs/providers/aws/events/streams.md
index b0c615e0d87..1a53ba41660 100644
--- a/docs/providers/aws/events/streams.md
+++ b/docs/providers/aws/events/streams.md
@@ -332,7 +332,7 @@ functions:
 
 ## Setting filter patterns
 
-This configuration allows customers to filter event before lambda invocation. It accepts up to 5 filter criterion by default and up to 10 with quota extension. If one event matches at least 1 pattern, lambda will process it.
+This configuration allows customers to filter event before lambda invocation. It accepts up to 5 filter patterns by default and up to 10 with quota extension. If one event matches at least 1 pattern, lambda will process it.
 
 For more details and examples of filter patterns, please see the [AWS event filtering documentation](https://docs.aws.amazon.com/lambda/latest/dg/invocation-eventfiltering.html)
 
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 6bd1506282c..a64afb501ee 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -451,6 +451,8 @@ functions:
           batchSize: 10
           maximumBatchingWindow: 10 # optional, minimum is 0 and the maximum is 300 (seconds)
           enabled: true
+          filterPatterns:
+            - a: [ 1, 2 ]
       - stream:
           arn: arn:aws:kinesis:region:XXXXXX:stream/foo
           batchSize: 100
diff --git a/lib/plugins/aws/package/compile/events/sqs.js b/lib/plugins/aws/package/compile/events/sqs.js
index 0caaed870da..4461fcda788 100644
--- a/lib/plugins/aws/package/compile/events/sqs.js
+++ b/lib/plugins/aws/package/compile/events/sqs.js
@@ -23,6 +23,7 @@ class AwsCompileSQSEvents {
             enabled: { type: 'boolean' },
             maximumBatchingWindow: { type: 'integer', minimum: 0, maximum: 300 },
             functionResponseType: { enum: ['ReportBatchItemFailures'] },
+            filterPatterns: { $ref: '#/definitions/filterPatterns' },
           },
           required: ['arn'],
           additionalProperties: false,
@@ -102,6 +103,14 @@ class AwsCompileSQSEvents {
               sqsTemplate.Properties.FunctionResponseTypes = [event.sqs.functionResponseType];
             }
 
+            if (event.sqs.filterPatterns) {
+              sqsTemplate.Properties.FilterCriteria = {
+                Filters: event.sqs.filterPatterns.map((pattern) => ({
+                  Pattern: JSON.stringify(pattern),
+                })),
+              };
+            }
+
             // add event source ARNs to PolicyDocument statements
             sqsStatement.Resource.push(EventSourceArn);
 
diff --git a/lib/plugins/aws/package/compile/events/stream.js b/lib/plugins/aws/package/compile/events/stream.js
index 21377addd94..191cb9f3f9b 100644
--- a/lib/plugins/aws/package/compile/events/stream.js
+++ b/lib/plugins/aws/package/compile/events/stream.js
@@ -69,12 +69,7 @@ class AwsCompileStreamEvents {
               required: ['onFailure'],
             },
             tumblingWindowInSeconds: { type: 'integer', minimum: 0, maximum: 900 },
-            filterPatterns: {
-              type: 'array',
-              minItems: 1,
-              maxItems: 10,
-              items: { type: 'object' },
-            },
+            filterPatterns: { $ref: '#/definitions/filterPatterns' },
           },
           additionalProperties: false,
           anyOf: [
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 6b80f5ff98d..cd5e20b2412 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -660,6 +660,12 @@ class AwsProvider {
             pattern:
               '^\\d+\\.dkr\\.ecr\\.[a-z0-9-]+..amazonaws.com\\/([^@]+)|([^@:]+@sha256:[a-f0-9]{64})$',
           },
+          filterPatterns: {
+            type: 'array',
+            minItems: 1,
+            maxItems: 10,
+            items: { type: 'object' },
+          },
         },
         provider: {
           properties: {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js b/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
index 8cb3c5b6d4b..7525676e54d 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
@@ -611,6 +611,7 @@ describe('AwsCompileSQSEvents #2', () => {
                     arn: 'arn:aws:sqs:region:account:MyQueue',
                     batchSize: 10,
                     maximumBatchingWindow: 100,
+                    filterPatterns: [{ a: [1, 2] }, { b: [3, 4] }],
                   },
                 },
               ],
@@ -642,6 +643,19 @@ describe('AwsCompileSQSEvents #2', () => {
     it('should have correct batching window size', () => {
       expect(eventSourceMappingResource.Properties.MaximumBatchingWindowInSeconds).to.equal(100);
     });
+
+    it('should have correct filtering patterns', () => {
+      expect(eventSourceMappingResource.Properties.FilterCriteria).to.deep.equal({
+        Filters: [
+          {
+            Pattern: JSON.stringify({ a: [1, 2] }),
+          },
+          {
+            Pattern: JSON.stringify({ b: [3, 4] }),
+          },
+        ],
+      });
+    });
   });
 
   it('should not depend on default IAM role when custom role defined', async () => {

From 971168dbe16ed22e216da1abadcd39605c1f9073 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 1 Dec 2021 12:01:48 +0100
Subject: [PATCH 0735/1101] refactor(Variables): Improve tests reliability

---
 test/unit/lib/configuration/variables/resolve.test.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/unit/lib/configuration/variables/resolve.test.js b/test/unit/lib/configuration/variables/resolve.test.js
index 1b516f283b5..e985e7be4d1 100644
--- a/test/unit/lib/configuration/variables/resolve.test.js
+++ b/test/unit/lib/configuration/variables/resolve.test.js
@@ -79,7 +79,9 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
         resolve: ({ params }) => ({ value: params.join('|') }),
       },
       sourceAddress: {
-        resolve: ({ address }) => ({ value: address }),
+        resolve: ({ address }) => ({
+          value: typeof address === 'string' ? address.split('').reverse().join('') : address,
+        }),
       },
       sourceDirect: {
         resolve: () => ({ value: 234 }),
@@ -200,7 +202,7 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
     });
 
     it('should pass address to source resolvers', () => {
-      expect(configuration.address).to.equal('fooaddress-result');
+      expect(configuration.address).to.equal('footluser-sserdda');
     });
 
     it('should resolve variables in params', () => {
@@ -223,7 +225,7 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
 
     it('should clear escapes', () => {
       expect(configuration.escape).to.equal(
-        'e${sourceDirect:}n\\$fooaddress-resultqe\\${sourceProperty(direct)}qn\\fooaddress-result'
+        'e${sourceDirect:}n\\$footluser-sserddaqe\\${sourceProperty(direct)}qn\\footluser-sserdda'
       );
     });
 

From ca045bae3e04f696057642a5a05acb14d7903da0 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 1 Dec 2021 12:10:21 +0100
Subject: [PATCH 0736/1101] refactor(Variables): Improve reliability of tests

---
 .../lib/configuration/variables/resolve.test.js  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/unit/lib/configuration/variables/resolve.test.js b/test/unit/lib/configuration/variables/resolve.test.js
index e985e7be4d1..af0b56406b0 100644
--- a/test/unit/lib/configuration/variables/resolve.test.js
+++ b/test/unit/lib/configuration/variables/resolve.test.js
@@ -76,7 +76,7 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
     let variablesMeta;
     const sources = {
       sourceParam: {
-        resolve: ({ params }) => ({ value: params.join('|') }),
+        resolve: ({ params }) => ({ value: params.join('|').split('').reverse().join('') }),
       },
       sourceAddress: {
         resolve: ({ address }) => ({
@@ -198,7 +198,7 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
     });
 
     it('should pass params to source resolvers', () => {
-      expect(configuration.foo.params).to.equal('param1|param2');
+      expect(configuration.foo.params).to.equal('2marap|1marap');
     });
 
     it('should pass address to source resolvers', () => {
@@ -206,7 +206,7 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
     });
 
     it('should resolve variables in params', () => {
-      expect(configuration.foo.varParam).to.equal('234');
+      expect(configuration.foo.varParam).to.equal('432');
     });
 
     it('should resolve variables in address', () => {
@@ -218,8 +218,8 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
       expect(configuration.otherProperty).to.equal('foo234');
       expect(configuration.static).to.equal(true);
       expect(configuration.deepProperty).to.deep.equal({
-        params: 'param1|param2',
-        varParam: '234',
+        params: '2marap|1marap',
+        varParam: '432',
       });
     });
 
@@ -263,8 +263,8 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
 
     it('should provide working resolveVariablesInString util', () => {
       expect(configuration.resolveVariablesInString).to.deep.equal({
-        params: 'param1|param2',
-        varParam: '234',
+        params: '2marap|1marap',
+        varParam: '432',
       });
     });
 
@@ -451,7 +451,7 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
 
     describe('"resolveVariable" source util', () => {
       it('should resolve variable', () => {
-        expect(configuration.resolvesVariables).to.equal('234');
+        expect(configuration.resolvesVariables).to.equal('432');
       });
       it('should support multiple sources', () => {
         expect(configuration.resolvesVariablesFallback).to.equal(null);

From c0f845968064852fd9f802f197cc41aa9ed801a9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 1 Dec 2021 12:43:57 +0100
Subject: [PATCH 0737/1101] refactor(Variables): Cleanup logic

---
 lib/configuration/variables/resolve.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/configuration/variables/resolve.js b/lib/configuration/variables/resolve.js
index f253c48883d..a1e94f99ed1 100644
--- a/lib/configuration/variables/resolve.js
+++ b/lib/configuration/variables/resolve.js
@@ -386,14 +386,8 @@ Object.defineProperties(
         const propertyPathKeys = propertyPath.split('\0');
         const { value, sourceValues } = valueMeta;
 
-        const valueEntries = (() => {
-          if (isPlainObject(value)) return Object.entries(value);
-          return Array.isArray(value) ? value.entries() : null;
-        })();
         let propertyVariablesMeta;
-        if (valueEntries) {
-          propertyVariablesMeta = parseEntries(valueEntries, propertyPathKeys, new Map());
-        } else if (typeof value === 'string') {
+        if (typeof value === 'string') {
           const valueVariables = (() => {
             const silentParse = (sourceValue) => {
               try {
@@ -444,6 +438,14 @@ Object.defineProperties(
           } else if (valueMeta.error) {
             return;
           }
+        } else {
+          const valueEntries = (() => {
+            if (isPlainObject(value)) return Object.entries(value);
+            return Array.isArray(value) ? value.entries() : null;
+          })();
+          if (valueEntries) {
+            propertyVariablesMeta = parseEntries(valueEntries, propertyPathKeys, new Map());
+          }
         }
         if (propertyVariablesMeta && propertyVariablesMeta.size) {
           // Register variables found in resolved value

From 9c75044fd59d8f181c7daee22d53a7bac3786e09 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 1 Dec 2021 12:53:28 +0100
Subject: [PATCH 0738/1101] refactor(Variables): Seclude internal logic for
 reuse

---
 lib/configuration/variables/resolve.js | 78 ++++++++++++--------------
 1 file changed, 37 insertions(+), 41 deletions(-)

diff --git a/lib/configuration/variables/resolve.js b/lib/configuration/variables/resolve.js
index a1e94f99ed1..707bcedde1e 100644
--- a/lib/configuration/variables/resolve.js
+++ b/lib/configuration/variables/resolve.js
@@ -27,6 +27,33 @@ const variableProcessingErrorNames = new Set(['ServerlessError', 'VariableSource
 
 let lastResolutionBatchId = 0;
 
+const resolveSourceValuesVariables = (sourceValues) => {
+  // Value is a result of concatenation of string values coming from multiple sources.
+  // Parse variables in each string part individually - it's to avoid accidental
+  // resolution of variable-like notation which may surface after joining two values.
+  // Also that way we do not accidentally re-parse an escaped variables notation
+  let baseIndex = 0;
+  let resolvedValueVariables = null;
+  for (const sourceValue of sourceValues) {
+    const sourceValueVariables = parse(sourceValue);
+    if (sourceValueVariables) {
+      for (const sourceValueVariable of sourceValueVariables) {
+        if (sourceValueVariable.end) {
+          sourceValueVariable.start += baseIndex;
+          sourceValueVariable.end += baseIndex;
+        } else {
+          sourceValueVariable.start = baseIndex;
+          sourceValueVariable.end = baseIndex + sourceValue.length;
+        }
+      }
+      if (!resolvedValueVariables) resolvedValueVariables = [];
+      resolvedValueVariables.push(...sourceValueVariables);
+    }
+    baseIndex += sourceValue.length;
+  }
+  return resolvedValueVariables;
+};
+
 class VariablesResolver {
   constructor({
     serviceDir,
@@ -389,48 +416,17 @@ Object.defineProperties(
         let propertyVariablesMeta;
         if (typeof value === 'string') {
           const valueVariables = (() => {
-            const silentParse = (sourceValue) => {
-              try {
-                return parse(sourceValue);
-              } catch (error) {
-                error.message = `Cannot resolve variable at "${humanizePropertyPath(
-                  propertyPathKeys
-                )}": Approached variable syntax error in resolved value "${value}": ${
-                  error.message
-                }`;
-                delete valueMeta.value;
-                valueMeta.error = error;
-                return null;
-              }
-            };
-            if (sourceValues) {
-              // Value is a result of concatenation of string values coming from multiple sources.
-              // Parse variables in each string part individually - it's to avoid accidental
-              // resolution of variable-like notation which may surface after joining two values.
-              // Also that way we do not accidentally re-parse an escaped variables notation
-              let baseIndex = 0;
-              let resolvedValueVariables = null;
-              for (const sourceValue of sourceValues) {
-                const sourceValueVariables = silentParse(sourceValue);
-                if (valueMeta.error) return null;
-                if (sourceValueVariables) {
-                  for (const sourceValueVariable of sourceValueVariables) {
-                    if (sourceValueVariable.end) {
-                      sourceValueVariable.start += baseIndex;
-                      sourceValueVariable.end += baseIndex;
-                    } else {
-                      sourceValueVariable.start = baseIndex;
-                      sourceValueVariable.end = baseIndex + sourceValue.length;
-                    }
-                  }
-                  if (!resolvedValueVariables) resolvedValueVariables = [];
-                  resolvedValueVariables.push(...sourceValueVariables);
-                }
-                baseIndex += sourceValue.length;
-              }
-              return resolvedValueVariables;
+            try {
+              if (sourceValues) return resolveSourceValuesVariables(sourceValues);
+              return parse(value);
+            } catch (error) {
+              error.message = `Cannot resolve variable at "${humanizePropertyPath(
+                propertyPathKeys
+              )}": Approached variable syntax error in resolved value "${value}": ${error.message}`;
+              delete valueMeta.value;
+              valueMeta.error = error;
+              return null;
             }
-            return silentParse(value);
           })();
 
           if (valueVariables) {

From 62046727460ac195062ebc13e290fceb124528b7 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 1 Dec 2021 14:14:34 +0100
Subject: [PATCH 0739/1101] test(Variables): Improve test error reporting

---
 .../configuration/variables/resolve.test.js   | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/test/unit/lib/configuration/variables/resolve.test.js b/test/unit/lib/configuration/variables/resolve.test.js
index af0b56406b0..2d39721dbe8 100644
--- a/test/unit/lib/configuration/variables/resolve.test.js
+++ b/test/unit/lib/configuration/variables/resolve.test.js
@@ -429,24 +429,22 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
     });
 
     it('should correctly record encountered variable sources', () => {
-      expect(variableSourcesInConfig).to.deep.equal(
-        new Set([
-          'sourceParam',
-          'sourceDirect',
-          'sourceAddress',
-          'sourceProperty',
-          'sourceResultVariables',
-          'sourceResolveVariablesInString',
-          'sourceResolveVariable',
-          'sourceIncomplete',
-          'sourceMissing',
-          'sourceUnrecognized',
-          'sourceError',
-          'sourceInfinite',
-          'sourceShared',
-          'sourceSharedProperty',
-        ])
-      );
+      expect(Array.from(variableSourcesInConfig)).to.deep.equal([
+        'sourceParam',
+        'sourceDirect',
+        'sourceAddress',
+        'sourceProperty',
+        'sourceResultVariables',
+        'sourceResolveVariablesInString',
+        'sourceResolveVariable',
+        'sourceIncomplete',
+        'sourceMissing',
+        'sourceUnrecognized',
+        'sourceError',
+        'sourceInfinite',
+        'sourceShared',
+        'sourceSharedProperty',
+      ]);
     });
 
     describe('"resolveVariable" source util', () => {

From 63d54e1537e10ae63c171892edd886f6b81e83f6 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 1 Dec 2021 14:16:53 +0100
Subject: [PATCH 0740/1101] fix(Variables): Resolve variables in resolved
 address & params values

---
 lib/configuration/variables/resolve.js        | 82 +++++++++++++++----
 .../configuration/variables/resolve.test.js   | 19 +++++
 2 files changed, 85 insertions(+), 16 deletions(-)

diff --git a/lib/configuration/variables/resolve.js b/lib/configuration/variables/resolve.js
index 707bcedde1e..bef1748f827 100644
--- a/lib/configuration/variables/resolve.js
+++ b/lib/configuration/variables/resolve.js
@@ -256,20 +256,14 @@ class VariablesResolver {
         sourceData.params.map(async (param) => {
           if (!param.variables) return;
           await this.resolveVariables(resolutionBatchId, propertyPath, param);
-          if (param.error) throw param.error;
+          await this.resolveInternalResult(resolutionBatchId, propertyPath, param);
         })
       );
-      if (sourceData.params.some((param) => param.variables)) {
-        throw new ServerlessError('Cannot resolve variable', 'MISSING_VARIABLE_DEPENDENCY');
-      }
     }
     if (sourceData.address && sourceData.address.variables) {
       // Ensure to have all eventual variables in address resolved
       await this.resolveVariables(resolutionBatchId, propertyPath, sourceData.address);
-      if (sourceData.address.error) throw sourceData.address.error;
-      if (sourceData.address.variables) {
-        throw new ServerlessError('Cannot resolve variable', 'MISSING_VARIABLE_DEPENDENCY');
-      }
+      await this.resolveInternalResult(resolutionBatchId, propertyPath, sourceData.address);
     }
     return JSON.parse(
       JSON.stringify(
@@ -309,6 +303,68 @@ class VariablesResolver {
       )
     );
   }
+
+  async resolveInternalResult(resolutionBatchId, propertyPath, valueMeta, nestTracker = 10) {
+    if (valueMeta.error) throw valueMeta.error;
+    if (valueMeta.variables) {
+      throw new ServerlessError('Cannot resolve variable', 'MISSING_VARIABLE_DEPENDENCY');
+    }
+    if (!nestTracker) {
+      throw new ServerlessError(
+        `Cannot resolve variable at "${humanizePropertyPath(
+          propertyPath.split('\0')
+        )}": Excessive variables nest depth`,
+        'EXCESSIVE_RESOLVED_VARIABLES_NEST_DEPTH'
+      );
+    }
+    if (typeof valueMeta.value === 'string') {
+      const valueVariables = (() => {
+        try {
+          if (valueMeta.sourceValues) return resolveSourceValuesVariables(valueMeta.sourceValues);
+          return parse(valueMeta.value);
+        } catch (error) {
+          error.message = `Cannot resolve variable at "${humanizePropertyPath(
+            propertyPath.split('\0')
+          )}": Approached variable syntax error in resolved value "${valueMeta.value}": ${
+            error.message
+          }`;
+          delete valueMeta.value;
+          valueMeta.error = error;
+          throw error;
+        }
+      })();
+
+      if (!valueVariables) return;
+      valueMeta.variables = valueVariables;
+      delete valueMeta.sourceValues;
+      await this.resolveVariables(resolutionBatchId, propertyPath, valueMeta);
+      await this.resolveInternalResult(resolutionBatchId, propertyPath, valueMeta, --nestTracker);
+      return;
+    }
+    const valueEntries = (() => {
+      if (isPlainObject(valueMeta.value)) return Object.entries(valueMeta.value);
+      return Array.isArray(valueMeta.value) ? valueMeta.value.entries() : null;
+    })();
+    if (!valueEntries) return;
+    const propertyVariablesMeta = parseEntries(valueEntries, [], new Map());
+    for (const [propertyKeyPath, propertyValueMeta] of propertyVariablesMeta) {
+      await this.resolveVariables(resolutionBatchId, propertyPath, propertyValueMeta);
+      await this.resolveInternalResult(
+        resolutionBatchId,
+        propertyPath,
+        propertyValueMeta,
+        --nestTracker
+      );
+      const propertyKeyPathKeys = propertyKeyPath.split('\0');
+      const targetKey = propertyKeyPathKeys[propertyKeyPathKeys.length - 1];
+      let targetObject = valueMeta.value;
+      for (const parentKey of propertyKeyPathKeys.slice(0, -1)) {
+        targetObject = targetObject[parentKey];
+      }
+      targetObject[targetKey] = propertyValueMeta.value;
+    }
+  }
+
   validateCrossPropertyDependency(dependentPropertyPath, dependencyPropertyPath) {
     if (dependentPropertyPath === dependencyPropertyPath) {
       throw new ServerlessError(
@@ -531,10 +587,7 @@ Object.defineProperties(
               variables: variableData,
             };
             await this.resolveVariables(resolutionBatchId, propertyPath, meta);
-            if (meta.error) throw meta.error;
-            if (meta.variables) {
-              throw new ServerlessError('Cannot resolve variable', 'MISSING_VARIABLE_DEPENDENCY');
-            }
+            await this.resolveInternalResult(resolutionBatchId, propertyPath, meta);
             return meta.value;
           },
           resolveVariablesInString: async (stringValue) => {
@@ -550,10 +603,7 @@ Object.defineProperties(
               variables: variableData,
             };
             await this.resolveVariables(resolutionBatchId, propertyPath, meta);
-            if (meta.error) throw meta.error;
-            if (meta.variables) {
-              throw new ServerlessError('Cannot resolve variable', 'MISSING_VARIABLE_DEPENDENCY');
-            }
+            await this.resolveInternalResult(resolutionBatchId, propertyPath, meta);
             return meta.value;
           },
         });
diff --git a/test/unit/lib/configuration/variables/resolve.test.js b/test/unit/lib/configuration/variables/resolve.test.js
index 2d39721dbe8..e16239204e6 100644
--- a/test/unit/lib/configuration/variables/resolve.test.js
+++ b/test/unit/lib/configuration/variables/resolve.test.js
@@ -40,6 +40,12 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
       resolvesResultVariablesStringInvalid: '${sourceResultVariables(stringInvalid)}',
       resolveDeepVariablesConcat:
         '${sourceResultVariables(string)}foo${sourceResultVariables(string)}',
+      resolveDeepVariablesConcatInParam:
+        '${sourceParam(${sourceResultVariables(string)}foo${sourceResultVariables(string)})}',
+      resolveDeepVariablesConcatInAddress:
+        '${sourceAddress:${sourceResultVariables(string)}foo${sourceResultVariables(string)}}',
+      infiniteDeepVariablesConcat:
+        '${sourceAddress:${sourceInfiniteString:}foo${sourceResultVariables(string)}}',
       resolveVariablesInString: "${sourceResolveVariablesInString('${sourceProperty(foo)}')}",
       resolvesVariables: '${sourceResolveVariable("sourceParam(${sourceDirect:})")}',
       resolvesVariablesFallback: '${sourceResolveVariable("sourceMissing:, null"), null}',
@@ -156,6 +162,9 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
       sourceInfinite: {
         resolve: () => ({ value: { nest: '${sourceInfinite:}' } }),
       },
+      sourceInfiniteString: {
+        resolve: () => ({ value: '${sourceInfiniteString:}' }),
+      },
       sourceShared: {
         resolve: () => ({
           value: {
@@ -259,6 +268,8 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
 
     it('should resolve variables in resolved strings which are subject to concatenation', () => {
       expect(configuration.resolveDeepVariablesConcat).to.equal('234foo234');
+      expect(configuration.resolveDeepVariablesConcatInParam).to.equal('432oof432');
+      expect(configuration.resolveDeepVariablesConcatInAddress).to.equal('432oof432');
     });
 
     it('should provide working resolveVariablesInString util', () => {
@@ -344,6 +355,12 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
       expect(valueMeta.error.code).to.equal('VARIABLE_RESOLUTION_ERROR');
     });
 
+    it('should error on infinite variables resolution recursion', () => {
+      const valueMeta = variablesMeta.get('infiniteDeepVariablesConcat');
+      expect(valueMeta).to.not.have.property('variables');
+      expect(valueMeta.error.code).to.equal('EXCESSIVE_RESOLVED_VARIABLES_NEST_DEPTH');
+    });
+
     it('should mark deep circular dependency among properties with error', () => {
       const valueMeta = variablesMeta.get('propertyDeepCircularA');
       expect(valueMeta).to.not.have.property('variables');
@@ -410,6 +427,7 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
         'propertyDeepCircularC',
         'propertyRoot',
         'resolvesResultVariablesStringInvalid',
+        'infiniteDeepVariablesConcat',
         'resolvesVariablesInvalid1',
         'resolvesVariablesInvalid2',
         'missing',
@@ -435,6 +453,7 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
         'sourceAddress',
         'sourceProperty',
         'sourceResultVariables',
+        'sourceInfiniteString',
         'sourceResolveVariablesInString',
         'sourceResolveVariable',
         'sourceIncomplete',

From 25eb571dd3299ac0f61dd1ea40b6b44b355f6898 Mon Sep 17 00:00:00 2001
From: maafk <2449193+maafk@users.noreply.github.com>
Date: Thu, 2 Dec 2021 06:12:16 -0500
Subject: [PATCH 0741/1101] feat(AWS Deploy): Support all regions from iso and
 isob partition

(PR #10299)
---
 lib/plugins/aws/provider.js                            |  3 +++
 lib/plugins/aws/utils/getS3EndpointForRegion.js        |  4 ++++
 .../plugins/aws/utils/getS3EndpointForRegion.test.js   | 10 ++++++++++
 3 files changed, 17 insertions(+)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index cd5e20b2412..c5b7a7d2914 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -1082,6 +1082,9 @@ class AwsProvider {
                 'us-east-2',
                 'us-gov-east-1',
                 'us-gov-west-1',
+                'us-iso-east-1',
+                'us-iso-west-1',
+                'us-isob-east-1',
                 'us-west-1',
                 'us-west-2',
                 'af-south-1',
diff --git a/lib/plugins/aws/utils/getS3EndpointForRegion.js b/lib/plugins/aws/utils/getS3EndpointForRegion.js
index 39392ff1099..24f35371a56 100644
--- a/lib/plugins/aws/utils/getS3EndpointForRegion.js
+++ b/lib/plugins/aws/utils/getS3EndpointForRegion.js
@@ -6,6 +6,10 @@ module.exports = function getS3EndpointForRegion(region) {
   if (strRegion.match(/us-gov/)) return `s3-${strRegion}.amazonaws.com`;
   // look for china - currently s3.cn-north-1.amazonaws.com.cn
   if (strRegion.match(/cn-/)) return `s3.${strRegion}.amazonaws.com.cn`;
+  // look for AWS ISO (US)
+  if (strRegion.match(/iso-/)) return `s3.${strRegion}.c2s.ic.gov`;
+  // look for AWS ISOB (US)
+  if (strRegion.match(/isob-/)) return `s3.${strRegion}.sc2s.sgov.gov`;
   // default s3 endpoint for other regions
   return 's3.amazonaws.com';
 };
diff --git a/test/unit/lib/plugins/aws/utils/getS3EndpointForRegion.test.js b/test/unit/lib/plugins/aws/utils/getS3EndpointForRegion.test.js
index c8b87ebbb41..0405e142570 100644
--- a/test/unit/lib/plugins/aws/utils/getS3EndpointForRegion.test.js
+++ b/test/unit/lib/plugins/aws/utils/getS3EndpointForRegion.test.js
@@ -18,4 +18,14 @@ describe('getS3EndpointForRegion', () => {
     const actual = getS3EndpointForRegion('cn-north-1');
     expect(actual).to.equal(expected);
   });
+  it('should return US isolated region', () => {
+    const expected = 's3.us-iso-east-1.c2s.ic.gov';
+    const actual = getS3EndpointForRegion('us-iso-east-1');
+    expect(actual).to.equal(expected);
+  });
+  it('should return US isolated B region', () => {
+    const expected = 's3.us-isob-east-1.sc2s.sgov.gov';
+    const actual = getS3EndpointForRegion('us-isob-east-1');
+    expect(actual).to.equal(expected);
+  });
 });

From 2cc2c442b6493f03beaa6bfcdc58558b05279455 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 2 Dec 2021 12:17:01 +0100
Subject: [PATCH 0742/1101] chore: Bump dependencies

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 422eeda5138..af9b3907352 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.1036.0",
+    "aws-sdk": "^2.1041.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.1.2",
     "cachedir": "^2.3.0",
@@ -86,7 +86,7 @@
     "adm-zip": "^0.5.9",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "cos-nodejs-sdk-v5": "^2.11.3",
+    "cos-nodejs-sdk-v5": "^2.11.4",
     "eslint": "^7.32.0",
     "eslint-plugin-import": "^2.25.3",
     "git-list-updated": "^1.2.1",

From 4c341b154096629341aecb99dd69117447bb1557 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 2 Dec 2021 12:30:19 +0100
Subject: [PATCH 0743/1101] chore: Release v2.68.0

---
 CHANGELOG.md | 23 +++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 186ac2b51a9..2660a1a5d55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,29 @@
 
 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.
 
+## [2.68.0](https://github.com/serverless/serverless/compare/v2.67.0...v2.68.0) (2021-12-02)
+
+### Features
+
+- **AWS Deploy:**
+  - Ensure consistent function state in `deploy function` ([#10288](https://github.com/serverless/serverless/pull/10288)) ([d52526b](https://github.com/serverless/serverless/commit/d52526bb6059ce20eba341c29ad5a2373c238624)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Support all regions from `iso` and `isob` partition ([25eb571](https://github.com/serverless/serverless/commit/25eb571dd3299ac0f61dd1ea40b6b44b355f6898)) ([#10299](https://github.com/serverless/serverless/issues/10299)) ([maafk](https://github.com/maafk))
+- **AWS SQS:** Support `filterPatterns` ([#10297](https://github.com/serverless/serverless/pull/10297)) ([3f0a80a](https://github.com/serverless/serverless/commit/3f0a80acd3fcf9eb7768625eb6cfe06cf572afa0)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS Stream:** Support `filterPatterns` ([#10285](https://github.com/serverless/serverless/issues/10285)) ([fc00505](https://github.com/serverless/serverless/commit/fc0050559cd1ee7b8a53a08fae73940177da93cb)) ([Frédéric Barthelet](https://github.com/fredericbarthelet))
+
+### Bug Fixes
+
+- **AWS SQS:** Accept only plain string form in direct ARN assignement ([#10263](https://github.com/serverless/serverless/issues/10263)) ([f7bbd17](https://github.com/serverless/serverless/commit/f7bbd176866b99725dcf1fef1128b0d2194217e0)) ([Sudipto Das](https://github.com/sdas13))
+- **Variables:** Resolve variables in resolved address & params values ([#10296](https://github.com/serverless/serverless/pull/10296)) ([63d54e1](https://github.com/serverless/serverless/commit/63d54e1537e10ae63c171892edd886f6b81e83f6)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **Variables:** Seclude internal logic for reuse ([#10296](https://github.com/serverless/serverless/pull/10296)) ([9c75044](https://github.com/serverless/serverless/commit/9c75044fd59d8f181c7daee22d53a7bac3786e09)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Templates
+
+- Update dependencies in `aws-java-maven` ([#10289](https://github.com/serverless/serverless/issues/10289)) ([0714f7d](https://github.com/serverless/serverless/commit/0714f7df0642d7a900c9d72eb26ae8c5ae1eddd7)) ([burakaktasfe](https://github.com/burakaktasfe))
+
 ## [2.67.0](https://github.com/serverless/serverless/compare/v2.66.2...v2.67.0) (2021-11-26)
 
 ### Features
diff --git a/package.json b/package.json
index af9b3907352..198ce1bb499 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.67.0",
+  "version": "2.68.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 9faf37aa153a60784ca783b1e2b7364625e8761f Mon Sep 17 00:00:00 2001
From: Misha Bruml <mishabruml@gmail.com>
Date: Sun, 5 Dec 2021 12:08:13 +0000
Subject: [PATCH 0744/1101] feat(AWS Kafka): Add support for `mTLS` access
 configuration (#10273)

---
 docs/providers/aws/events/kafka.md            |  73 ++-
 .../aws/package/compile/events/kafka.js       |  44 ++
 .../aws/package/compile/events/kafka.test.js  | 579 +++++++++++-------
 3 files changed, 455 insertions(+), 241 deletions(-)

diff --git a/docs/providers/aws/events/kafka.md b/docs/providers/aws/events/kafka.md
index be5c060c577..4128392402c 100644
--- a/docs/providers/aws/events/kafka.md
+++ b/docs/providers/aws/events/kafka.md
@@ -15,15 +15,53 @@ layout: Doc
 
 A self-managed Apache Kafka cluster can be used as an event source for AWS Lambda.
 
-## Simple event definition
+In order to configure lambda to trigger via `kafka` events, you must provide three required properties:
 
-In the following example, we specify that the `compute` function should be triggered whenever there are new messages available to consume from defined Kafka `topic`.
+- `accessConfigurations` which defines the chosen [authentication](#authentication) method configuration
+- `topic` to consume messages from
+- `bootstrapServers` - an array of bootstrap server addresses for your Kafka cluster
 
-In order to configure `kafka` event, you have to provide three required properties:
+## Authentication
 
-- `accessConfigurations`, which is either secret credentials required to do [SASL_SCRAM auth](https://docs.confluent.io/platform/current/kafka/authentication_sasl/authentication_sasl_scram.html),[SASL_PLAIN auth](https://docs.confluent.io/platform/current/kafka/authentication_sasl/authentication_sasl_plain.html) or this is VPC configuration to allow Lambda to connect to your cluster. Valid options are: `saslPlainAuth`, `saslScram256Auth`, or `saslScram512Auth`
-- `topic` to consume messages from.
-- `bootstrapServers` an array of bootstrap server addresses for your Kafka cluster
+You must authenticate your Lambda with a self-managed Apache Kafka cluster using one of;
+
+- VPC - subnet(s) and security group
+- SASL SCRAM/PLAIN - AWS Secrets Manager secret containing credentials
+- Mutual TLS (mTLS) - AWS Secrets Manager secret containing client certificate, private key, and optionally a CA certificate
+
+You can provide this configuration via `accessConfigurations`
+
+You must provide at least one method, but it is possible to use VPC in parallel with other methods. For example, you may choose to authenticate via mTLS or SASL/SCRAM, and also place your Lambda and cluster within a VPC.
+
+Valid options for `accessConfigurations` are:
+
+```yaml
+saslPlainAuth: arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslPlain
+saslScram256Auth: arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslScram256
+saslScram512Auth: arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslScram512
+clientCertificateTlsAuth: arn:aws:secretsmanager:us-east-1:01234567890:secret:ClientCertificateTLS
+serverRootCaCertificate: arn:aws:secretsmanager:us-east-1:01234567890:secret:ServerRootCaCertificate
+vpcSubnet:
+  - subnet-0011001100
+  - subnet-0022002200
+vpcSecurityGroup: sg-0123456789
+```
+
+For more information see:
+
+- [AWS Documentation - Using Lambda with self-managed Apache Kafka](https://docs.aws.amazon.com/lambda/latest/dg/with-kafka.html#smaa-authentication)
+
+- [AWS Documentation - AWS::Lambda::EventSourceMapping SourceAccessConfiguration](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-sourceaccessconfiguration.html)
+
+- [Confluent documentation - Authentication with SASL/PLAIN](https://docs.confluent.io/platform/current/kafka/authentication_sasl/authentication_sasl_plain.html)
+
+- [Confluent documentation - Authentication with SASL/SCRAM](https://docs.confluent.io/platform/current/kafka/authentication_sasl/authentication_sasl_scram.html)
+
+- [Confluent documentation Encryption and Authentication with SSL](https://docs.confluent.io/platform/current/kafka/authentication_ssl.html)
+
+## Basic Example: SASL/SCRAM
+
+In the following example, we specify that the `compute` function should be triggered whenever there are new messages available to consume from Kafka topic `MySelfManagedKafkaTopic` from self-hosted cluster at `xyz.com`. The cluster has been authenticated using SASL/SCRAM, the credentials are stored at secret `MyBrokerSecretName`
 
 ```yml
 functions:
@@ -33,7 +71,26 @@ functions:
       - kafka:
           accessConfigurations:
             saslScram512Auth: arn:aws:secretsmanager:us-east-1:01234567890:secret:MyBrokerSecretName
-          topic: AWSKafkaTopic
+          topic: MySelfManagedKafkaTopic
+          bootstrapServers:
+            - abc3.xyz.com:9092
+            - abc2.xyz.com:9092
+```
+
+## Example: Using mTLS
+
+In this example, the lambda event source is a self-managed Apache kafka cluster authenticated via mTLS. The value of `clientCertificateTlsAuth` is an arn of a secret containing the client certificate and privatekey required for the mTLS handshake. The value of `serverRootCaCertificate` is an arn of a secret containing the Certificate Authority (CA) Certificate. This is optional, you only need to provide if your cluster requires it.
+
+```yml
+functions:
+  compute:
+    handler: handler.compute
+    events:
+      - kafka:
+          accessConfigurations:
+            clientCertificateTlsAuth: arn:aws:secretsmanager:us-east-1:01234567890:secret:ClientCertificateTLS
+            serverRootCaCertificate: arn:aws:secretsmanager:us-east-1:01234567890:secret:ServerRootCaCertificate
+          topic: MySelfManagedMTLSKafkaTopic
           bootstrapServers:
             - abc3.xyz.com:9092
             - abc2.xyz.com:9092
@@ -60,7 +117,7 @@ functions:
             - abc2.xyz.com:9092
 ```
 
-## Enabling and disabling Kafka event
+## Enabling and disabling Kafka event trigger
 
 The `kafka` event also supports `enabled` parameter, which is used to control if the event source mapping is active. Setting it to `false` will pause polling for and processing new messages.
 
diff --git a/lib/plugins/aws/package/compile/events/kafka.js b/lib/plugins/aws/package/compile/events/kafka.js
index 2f1cff587a7..c5d4779815c 100644
--- a/lib/plugins/aws/package/compile/events/kafka.js
+++ b/lib/plugins/aws/package/compile/events/kafka.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const ServerlessError = require('../../../../../serverless-error');
+
 class AwsCompileKafkaEvents {
   constructor(serverless) {
     this.serverless = serverless;
@@ -47,6 +49,16 @@ class AwsCompileKafkaEvents {
               minItems: 1,
               items: { $ref: '#/definitions/awsSecretsManagerArnString' },
             },
+            clientCertificateTlsAuth: {
+              type: 'array',
+              minItems: 1,
+              items: { $ref: '#/definitions/awsSecretsManagerArnString' },
+            },
+            serverRootCaCertificate: {
+              type: 'array',
+              minItems: 1,
+              items: { $ref: '#/definitions/awsSecretsManagerArnString' },
+            },
           },
           additionalProperties: false,
         },
@@ -112,6 +124,30 @@ class AwsCompileKafkaEvents {
       functionObj.events.forEach((event) => {
         if (!event.kafka) return;
 
+        const {
+          accessConfigurations: {
+            vpcSecurityGroup,
+            vpcSubnet,
+            clientCertificateTlsAuth,
+            serverRootCaCertificate,
+          },
+        } = event.kafka;
+
+        if ((vpcSecurityGroup && !vpcSubnet) || (vpcSubnet && !vpcSecurityGroup)) {
+          const missing = vpcSecurityGroup ? 'vpcSubnet' : 'vpcSecurityGroup';
+          throw new ServerlessError(
+            `You must specify at least one "${missing}" accessConfiguration for function: ${functionName}`,
+            'FUNCTION_KAFKA_VPC_ACCESS_CONFIGURATION_INVALID'
+          );
+        }
+
+        if (serverRootCaCertificate && !clientCertificateTlsAuth) {
+          throw new ServerlessError(
+            `You cannot specify "serverRootCaCertificate" accessConfiguration without providing "clientCertificateTlsAuth" accessConfiguration for function: ${functionName}`,
+            'FUNCTION_KAFKA_CLIENT_CERTIFICATE_TLS_AUTH_CONFIGURATION_MISSING'
+          );
+        }
+
         hasKafkaEvent = true;
         const { topic, batchSize, enabled } = event.kafka;
         const startingPosition = event.kafka.startingPosition || 'TRIM_HORIZON';
@@ -167,6 +203,14 @@ class AwsCompileKafkaEvents {
                 type = 'SASL_SCRAM_512_AUTH';
                 needsSecretsManagerPermissions = true;
                 break;
+              case 'clientCertificateTlsAuth':
+                type = 'CLIENT_CERTIFICATE_TLS_AUTH';
+                needsSecretsManagerPermissions = true;
+                break;
+              case 'serverRootCaCertificate':
+                type = 'SERVER_ROOT_CA_CERTIFICATE';
+                needsSecretsManagerPermissions = true;
+                break;
               default:
                 type = accessConfigurationType;
             }
diff --git a/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js b/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js
index 6f91cf9024b..795aeda010a 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js
@@ -3,13 +3,18 @@
 const chai = require('chai');
 const runServerless = require('../../../../../../../utils/run-serverless');
 
-const { expect } = chai;
-
 chai.use(require('chai-as-promised'));
 
+const { expect } = chai;
+
 describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () => {
   const saslScram256AuthArn =
-    'arn:aws:secretsmanager:us-east-1:01234567890:secret:MyBrokerSecretName';
+    'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslScram256Auth';
+  const clientCertificateTlsAuthArn =
+    'arn:aws:secretsmanager:us-east-1:01234567890:secret:clientCertificateTlsAuth';
+  const serverRootCaCertificateArn =
+    'arn:aws:secretsmanager:us-east-1:01234567890:secret:ServerRootCaCertificate';
+
   const topic = 'TestingTopic';
   const enabled = false;
   const startingPosition = 'LATEST';
@@ -144,268 +149,376 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
       expect(eventSourceMappingResource.Properties).to.deep.equal(eventConfig.resource(awsNaming));
     };
 
-    it('should correctly compile EventSourceMapping resource properties for VPC_SECURITY_GROUP', async () => {
-      const eventConfig = {
-        event: {
-          topic,
-          bootstrapServers: ['abc.xyz:9092'],
-          accessConfigurations: { vpcSecurityGroup: 'sg-abc4567890' },
-        },
-        resource: (awsNaming) => {
-          return {
-            SelfManagedEventSource: {
-              Endpoints: {
-                KafkaBootstrapServers: ['abc.xyz:9092'],
+    describe('accessConfigurations', () => {
+      it('should correctly compile EventSourceMapping resource properties for VPC_SECURITY_GROUP and VPC_SUBNET', async () => {
+        const vpcSecurityGroup = 'sg-abc4567890';
+        const vpcSubnet = 'subnet-abc4567890';
+
+        const eventConfig = {
+          event: {
+            topic,
+            bootstrapServers: ['abc.xyz:9092'],
+            accessConfigurations: { vpcSecurityGroup, vpcSubnet },
+          },
+          resource: (awsNaming) => {
+            return {
+              SelfManagedEventSource: {
+                Endpoints: {
+                  KafkaBootstrapServers: ['abc.xyz:9092'],
+                },
               },
-            },
-            SourceAccessConfigurations: [
-              {
-                Type: 'VPC_SECURITY_GROUP',
-                URI: 'security_group:sg-abc4567890',
+              SourceAccessConfigurations: [
+                {
+                  Type: 'VPC_SECURITY_GROUP',
+                  URI: `security_group:${vpcSecurityGroup}`,
+                },
+                {
+                  Type: 'VPC_SUBNET',
+                  URI: `subnet:${vpcSubnet}`,
+                },
+              ],
+              StartingPosition: 'TRIM_HORIZON',
+              Topics: [topic],
+              FunctionName: {
+                'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
               },
-            ],
-            StartingPosition: 'TRIM_HORIZON',
-            Topics: [topic],
-            FunctionName: {
-              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
+            };
+          },
+        };
+        await runCompileEventSourceMappingTest(eventConfig);
+      });
+
+      it('should correctly compile EventSourceMapping resource properties for multiple VPC_SUBNETS', async () => {
+        const vpcSecurityGroup = 'sg-abc4567890';
+
+        const eventConfig = {
+          event: {
+            topic,
+            bootstrapServers: ['abc.xyz:9092'],
+            accessConfigurations: {
+              vpcSubnet: ['subnet-0011001100', 'subnet-0022002200'],
+              vpcSecurityGroup,
             },
-          };
-        },
-      };
-      await runCompileEventSourceMappingTest(eventConfig);
-    });
+          },
+          resource: (awsNaming) => {
+            return {
+              SelfManagedEventSource: {
+                Endpoints: {
+                  KafkaBootstrapServers: ['abc.xyz:9092'],
+                },
+              },
+              SourceAccessConfigurations: [
+                {
+                  Type: 'VPC_SUBNET',
+                  URI: 'subnet:subnet-0011001100',
+                },
+                {
+                  Type: 'VPC_SUBNET',
+                  URI: 'subnet:subnet-0022002200',
+                },
+                {
+                  Type: 'VPC_SECURITY_GROUP',
+                  URI: `security_group:${vpcSecurityGroup}`,
+                },
+              ],
+              StartingPosition: 'TRIM_HORIZON',
+              Topics: [topic],
+              FunctionName: {
+                'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
+              },
+            };
+          },
+        };
+        await runCompileEventSourceMappingTest(eventConfig);
+      });
 
-    it('should correctly compile EventSourceMapping resource properties for VPC_SUBNET', async () => {
-      const eventConfig = {
-        event: {
-          topic,
-          bootstrapServers: ['abc.xyz:9092'],
-          accessConfigurations: { vpcSubnet: 'subnet-abc4567890' },
-        },
-        resource: (awsNaming) => {
-          return {
-            SelfManagedEventSource: {
-              Endpoints: {
-                KafkaBootstrapServers: ['abc.xyz:9092'],
+      it('should fail to compile EventSourceMapping resource properties for VPC_SUBNET with no VPC_SECURITY GROUP', async () => {
+        await expect(
+          runServerless({
+            fixture: 'function',
+            configExt: {
+              functions: {
+                basic: {
+                  events: [
+                    {
+                      kafka: {
+                        topic,
+                        bootstrapServers: ['abc.xyz:9092'],
+                        accessConfigurations: { vpcSubnet: 'subnet-abc4567890' },
+                      },
+                    },
+                  ],
+                },
               },
             },
-            SourceAccessConfigurations: [
-              {
-                Type: 'VPC_SUBNET',
-                URI: 'subnet:subnet-abc4567890',
+            command: 'package',
+          })
+        ).to.be.rejected.and.eventually.contain({
+          code: 'FUNCTION_KAFKA_VPC_ACCESS_CONFIGURATION_INVALID',
+        });
+      });
+
+      it('should fail to compile EventSourceMapping resource properties for VPC_SECURITY GROUP with no VPC_SUBNET', async () => {
+        await expect(
+          runServerless({
+            fixture: 'function',
+            configExt: {
+              functions: {
+                basic: {
+                  events: [
+                    {
+                      kafka: {
+                        topic,
+                        bootstrapServers: ['abc.xyz:9092'],
+                        accessConfigurations: { vpcSecurityGroup: 'sg-abc4567890' },
+                      },
+                    },
+                  ],
+                },
               },
-            ],
-            StartingPosition: 'TRIM_HORIZON',
-            Topics: [topic],
-            FunctionName: {
-              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
             },
-          };
-        },
-      };
-      await runCompileEventSourceMappingTest(eventConfig);
-    });
+            command: 'package',
+          })
+        ).to.be.rejected.and.eventually.contain({
+          code: 'FUNCTION_KAFKA_VPC_ACCESS_CONFIGURATION_INVALID',
+        });
+      });
 
-    it('should correctly compile EventSourceMapping resource properties for multiple VPC_SUBNETs', async () => {
-      const eventConfig = {
-        event: {
-          topic,
-          bootstrapServers: ['abc.xyz:9092'],
-          accessConfigurations: { vpcSubnet: ['subnet-0011001100', 'subnet-0022002200'] },
-        },
-        resource: (awsNaming) => {
-          return {
-            SelfManagedEventSource: {
-              Endpoints: {
-                KafkaBootstrapServers: ['abc.xyz:9092'],
-              },
+      it('should correctly compile EventSourceMapping resource properties for SASL_PLAIN_AUTH', async () => {
+        const eventConfig = {
+          event: {
+            topic,
+            bootstrapServers: ['abc.xyz:9092'],
+            accessConfigurations: {
+              saslPlainAuth:
+                'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslPlainSecretName',
             },
-            SourceAccessConfigurations: [
-              {
-                Type: 'VPC_SUBNET',
-                URI: 'subnet:subnet-0011001100',
+          },
+          resource: (awsNaming) => {
+            return {
+              SelfManagedEventSource: {
+                Endpoints: {
+                  KafkaBootstrapServers: ['abc.xyz:9092'],
+                },
               },
-              {
-                Type: 'VPC_SUBNET',
-                URI: 'subnet:subnet-0022002200',
+              SourceAccessConfigurations: [
+                {
+                  Type: 'BASIC_AUTH',
+                  URI: 'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslPlainSecretName',
+                },
+              ],
+              StartingPosition: 'TRIM_HORIZON',
+              Topics: [topic],
+              FunctionName: {
+                'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
               },
-            ],
-            StartingPosition: 'TRIM_HORIZON',
-            Topics: [topic],
-            FunctionName: {
-              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
-            },
-          };
-        },
-      };
-      await runCompileEventSourceMappingTest(eventConfig);
-    });
+            };
+          },
+        };
+        await runCompileEventSourceMappingTest(eventConfig);
+      });
 
-    it('should correctly compile EventSourceMapping resource properties for SASL_PLAIN_AUTH', async () => {
-      const eventConfig = {
-        event: {
-          topic,
-          bootstrapServers: ['abc.xyz:9092'],
-          accessConfigurations: {
-            saslPlainAuth:
-              'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslPlainSecretName',
+      it('should correctly compile EventSourceMapping resource properties for SASL_SCRAM_256_AUTH', async () => {
+        const eventConfig = {
+          event: {
+            topic,
+            bootstrapServers: ['abc.xyz:9092'],
+            accessConfigurations: { saslScram256Auth: saslScram256AuthArn },
           },
-        },
-        resource: (awsNaming) => {
-          return {
-            SelfManagedEventSource: {
-              Endpoints: {
-                KafkaBootstrapServers: ['abc.xyz:9092'],
+          resource: (awsNaming) => {
+            return {
+              SelfManagedEventSource: {
+                Endpoints: {
+                  KafkaBootstrapServers: ['abc.xyz:9092'],
+                },
               },
-            },
-            SourceAccessConfigurations: [
-              {
-                Type: 'BASIC_AUTH',
-                URI: 'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslPlainSecretName',
+              SourceAccessConfigurations: [
+                {
+                  Type: 'SASL_SCRAM_256_AUTH',
+                  URI: saslScram256AuthArn,
+                },
+              ],
+              StartingPosition: 'TRIM_HORIZON',
+              Topics: [topic],
+              FunctionName: {
+                'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
               },
-            ],
-            StartingPosition: 'TRIM_HORIZON',
-            Topics: [topic],
-            FunctionName: {
-              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
-            },
-          };
-        },
-      };
-      await runCompileEventSourceMappingTest(eventConfig);
-    });
+            };
+          },
+        };
+        await runCompileEventSourceMappingTest(eventConfig);
+      });
 
-    it('should correctly compile EventSourceMapping resource properties for SASL_SCRAM_256_AUTH', async () => {
-      const eventConfig = {
-        event: {
-          topic,
-          bootstrapServers: ['abc.xyz:9092'],
-          accessConfigurations: { saslScram256Auth: saslScram256AuthArn },
-        },
-        resource: (awsNaming) => {
-          return {
-            SelfManagedEventSource: {
-              Endpoints: {
-                KafkaBootstrapServers: ['abc.xyz:9092'],
-              },
+      it('should correctly compile EventSourceMapping resource properties for SASL_SCRAM_512_AUTH', async () => {
+        const eventConfig = {
+          event: {
+            topic,
+            bootstrapServers: ['abc.xyz:9092'],
+            accessConfigurations: {
+              saslScram512Auth:
+                'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslScram512SecretName',
             },
-            SourceAccessConfigurations: [
-              {
-                Type: 'SASL_SCRAM_256_AUTH',
-                URI: saslScram256AuthArn,
+          },
+          resource: (awsNaming) => {
+            return {
+              SelfManagedEventSource: {
+                Endpoints: {
+                  KafkaBootstrapServers: ['abc.xyz:9092'],
+                },
               },
-            ],
-            StartingPosition: 'TRIM_HORIZON',
-            Topics: [topic],
-            FunctionName: {
-              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
-            },
-          };
-        },
-      };
-      await runCompileEventSourceMappingTest(eventConfig);
-    });
+              SourceAccessConfigurations: [
+                {
+                  Type: 'SASL_SCRAM_512_AUTH',
+                  URI: 'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslScram512SecretName',
+                },
+              ],
+              StartingPosition: 'TRIM_HORIZON',
+              Topics: [topic],
+              FunctionName: {
+                'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
+              },
+            };
+          },
+        };
+        await runCompileEventSourceMappingTest(eventConfig);
+      });
 
-    it('should correctly compile EventSourceMapping resource properties for SASL_SCRAM_256_AUTH', async () => {
-      const eventConfig = {
-        event: {
-          topic,
-          bootstrapServers: ['abc.xyz:9092'],
-          accessConfigurations: {
-            saslScram256Auth:
-              'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslScram256SecretName',
+      it('should correctly compile EventSourceMapping resource properties for CLIENT_CERTIFICATE_TLS_AUTH', async () => {
+        const eventConfig = {
+          event: {
+            topic,
+            bootstrapServers: ['abc.xyz:9092'],
+            accessConfigurations: {
+              clientCertificateTlsAuth: clientCertificateTlsAuthArn,
+            },
           },
-        },
-        resource: (awsNaming) => {
-          return {
-            SelfManagedEventSource: {
-              Endpoints: {
-                KafkaBootstrapServers: ['abc.xyz:9092'],
+          resource: (awsNaming) => {
+            return {
+              SelfManagedEventSource: {
+                Endpoints: {
+                  KafkaBootstrapServers: ['abc.xyz:9092'],
+                },
               },
-            },
-            SourceAccessConfigurations: [
-              {
-                Type: 'SASL_SCRAM_256_AUTH',
-                URI: 'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslScram256SecretName',
+              SourceAccessConfigurations: [
+                {
+                  Type: 'CLIENT_CERTIFICATE_TLS_AUTH',
+                  URI: clientCertificateTlsAuthArn,
+                },
+              ],
+              StartingPosition: 'TRIM_HORIZON',
+              Topics: [topic],
+              FunctionName: {
+                'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
               },
-            ],
-            StartingPosition: 'TRIM_HORIZON',
-            Topics: [topic],
-            FunctionName: {
-              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
-            },
-          };
-        },
-      };
-      await runCompileEventSourceMappingTest(eventConfig);
-    });
+            };
+          },
+        };
+        await runCompileEventSourceMappingTest(eventConfig);
+      });
 
-    it('should correctly compile EventSourceMapping resource properties for SASL_SCRAM_512_AUTH', async () => {
-      const eventConfig = {
-        event: {
-          topic,
-          bootstrapServers: ['abc.xyz:9092'],
-          accessConfigurations: {
-            saslScram512Auth:
-              'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslScram512SecretName',
+      it('should correctly compile EventSourceMapping resource properties for SERVER_ROOT_CA_CERTIFICATE', async () => {
+        const eventConfig = {
+          event: {
+            topic,
+            bootstrapServers: ['abc.xyz:9092'],
+            accessConfigurations: {
+              clientCertificateTlsAuth: clientCertificateTlsAuthArn,
+              serverRootCaCertificate: serverRootCaCertificateArn,
+            },
           },
-        },
-        resource: (awsNaming) => {
-          return {
-            SelfManagedEventSource: {
-              Endpoints: {
-                KafkaBootstrapServers: ['abc.xyz:9092'],
+          resource: (awsNaming) => {
+            return {
+              SelfManagedEventSource: {
+                Endpoints: {
+                  KafkaBootstrapServers: ['abc.xyz:9092'],
+                },
               },
-            },
-            SourceAccessConfigurations: [
-              {
-                Type: 'SASL_SCRAM_512_AUTH',
-                URI: 'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslScram512SecretName',
+              SourceAccessConfigurations: [
+                {
+                  Type: 'CLIENT_CERTIFICATE_TLS_AUTH',
+                  URI: clientCertificateTlsAuthArn,
+                },
+                {
+                  Type: 'SERVER_ROOT_CA_CERTIFICATE',
+                  URI: serverRootCaCertificateArn,
+                },
+              ],
+              StartingPosition: 'TRIM_HORIZON',
+              Topics: [topic],
+              FunctionName: {
+                'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
+              },
+            };
+          },
+        };
+        await runCompileEventSourceMappingTest(eventConfig);
+      });
+
+      it('should fail to compile EventSourceMapping resource properties for SERVER_ROOT_CA_CERTIFICATE with no CLIENT_CERTIFICATE_TLS_AUTH', async () => {
+        await expect(
+          runServerless({
+            fixture: 'function',
+            configExt: {
+              functions: {
+                basic: {
+                  events: [
+                    {
+                      kafka: {
+                        topic,
+                        bootstrapServers: ['abc.xyz:9092'],
+                        accessConfigurations: {
+                          serverRootCaCertificate: serverRootCaCertificateArn,
+                        },
+                      },
+                    },
+                  ],
+                },
               },
-            ],
-            StartingPosition: 'TRIM_HORIZON',
-            Topics: [topic],
-            FunctionName: {
-              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
             },
-          };
-        },
-      };
-      await runCompileEventSourceMappingTest(eventConfig);
-    });
+            command: 'package',
+          })
+        ).to.be.rejected.and.eventually.have.property(
+          'code',
+          'FUNCTION_KAFKA_CLIENT_CERTIFICATE_TLS_AUTH_CONFIGURATION_MISSING'
+        );
+      });
 
-    it('should update default IAM role with EC2 statement', async () => {
-      const { cfTemplate } = await runServerless({
-        fixture: 'function',
-        configExt: {
-          functions: {
-            basic: {
-              events: [
-                {
-                  kafka: {
-                    topic,
-                    bootstrapServers: ['abc.xyz:9092'],
-                    accessConfigurations: { vpcSecurityGroup: 'sg-abc4567890' },
+      it('should update default IAM role with EC2 statement when VPC accessConfiguration is provided', async () => {
+        const { cfTemplate } = await runServerless({
+          fixture: 'function',
+          configExt: {
+            functions: {
+              basic: {
+                events: [
+                  {
+                    kafka: {
+                      topic,
+                      bootstrapServers: ['abc.xyz:9092'],
+                      accessConfigurations: {
+                        vpcSecurityGroup: 'sg-abc4567890',
+                        vpcSubnet: 'subnet-abc4567890',
+                      },
+                    },
                   },
-                },
-              ],
+                ],
+              },
             },
           },
-        },
-        command: 'package',
-      });
-      const defaultIamRole = cfTemplate.Resources.IamRoleLambdaExecution;
-      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).to.deep.include({
-        Effect: 'Allow',
-        Action: [
-          'ec2:CreateNetworkInterface',
-          'ec2:DescribeNetworkInterfaces',
-          'ec2:DescribeVpcs',
-          'ec2:DeleteNetworkInterface',
-          'ec2:DescribeSubnets',
-          'ec2:DescribeSecurityGroups',
-        ],
-        Resource: '*',
+          command: 'package',
+        });
+        const defaultIamRole = cfTemplate.Resources.IamRoleLambdaExecution;
+        expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).to.deep.include({
+          Effect: 'Allow',
+          Action: [
+            'ec2:CreateNetworkInterface',
+            'ec2:DescribeNetworkInterfaces',
+            'ec2:DescribeVpcs',
+            'ec2:DeleteNetworkInterface',
+            'ec2:DescribeSubnets',
+            'ec2:DescribeSecurityGroups',
+          ],
+          Resource: '*',
+        });
       });
     });
 

From 1f58760f467f2dcb960e23c2eb028f4abef23209 Mon Sep 17 00:00:00 2001
From: GurmeharS <43488282+GurmeharS@users.noreply.github.com>
Date: Mon, 6 Dec 2021 08:36:05 -0500
Subject: [PATCH 0745/1101] fix(AWS Deploy): Ensure to strip all `null`
 properties (#10304)

---
 .../stripNullPropsFromTemplateResources.js    | 16 +++++++++----
 ...tripNullPropsFromTemplateResources.test.js | 24 +++++++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.js b/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.js
index b63b3c829de..8f42efbe534 100644
--- a/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.js
+++ b/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.js
@@ -1,16 +1,22 @@
 'use strict';
 
+const stripNullPropsFromObj = (obj) => {
+  Object.entries(obj).forEach(([propName, propVal]) => {
+    if (propVal === null) {
+      delete obj[propName];
+    } else if (typeof propVal === 'object') {
+      stripNullPropsFromObj(propVal);
+    }
+  });
+};
+
 module.exports = {
   stripNullPropsFromTemplateResources() {
     const resources = this.serverless.service.provider.compiledCloudFormationTemplate.Resources;
 
     for (const resource of Object.values(resources)) {
       if (resource.Properties) {
-        for (const [propName, propVal] of Object.entries(resource.Properties)) {
-          if (propVal === null) {
-            delete resource.Properties[propName];
-          }
-        }
+        stripNullPropsFromObj(resource.Properties);
       }
     }
   },
diff --git a/test/unit/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.test.js b/test/unit/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.test.js
index b8f3113d8c2..76bde758e0f 100644
--- a/test/unit/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.test.js
@@ -28,6 +28,24 @@ describe('test/unit/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResour
                 ObjectLockEnabled: false,
               },
             },
+            myLambdaFunction: {
+              Type: 'AWS::Lambda::Function',
+              Properties: {
+                Environment: {
+                  Variables: {
+                    MYNULLVAR: null,
+                  },
+                },
+                Handler: 'index.handler',
+                Role: {
+                  'Fn::GetAtt': ['MyLambdaRole', 'Arn'],
+                },
+                Code: {
+                  S3Bucket: 's3-containing-lambda',
+                },
+                Runtime: 'nodejs12.x',
+              },
+            },
           },
         },
       },
@@ -39,6 +57,12 @@ describe('test/unit/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResour
     expect(Object.keys(finalTemplate.Resources.myBucket.Properties).length).to.equal(0);
   });
 
+  it('Should remove null values within nested objects in resource properties', async () => {
+    expect(
+      Object.keys(finalTemplate.Resources.myLambdaFunction.Properties.Environment.Variables).length
+    ).to.equal(0);
+  });
+
   it('Should not affect resources without null props', async () => {
     expect(Object.keys(finalTemplate.Resources.anotherBucket.Properties).length).to.equal(1);
   });

From 4d4f8637d830ba9a72806fc127fe3497f7c0f23c Mon Sep 17 00:00:00 2001
From: mdanyalkhan <mdanyalkhan29@gmail.com>
Date: Mon, 6 Dec 2021 15:26:04 +0000
Subject: [PATCH 0746/1101] refactor: Configure promise returning functions as
 async (#10309)

---
 lib/plugins/aws/utils/credentials.js          | 6 +++---
 lib/plugins/aws/utils/resolveCfImportValue.js | 2 +-
 lib/plugins/aws/utils/resolveCfRefValue.js    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/plugins/aws/utils/credentials.js b/lib/plugins/aws/utils/credentials.js
index 24e008e3a9a..1ea82b923e3 100644
--- a/lib/plugins/aws/utils/credentials.js
+++ b/lib/plugins/aws/utils/credentials.js
@@ -44,7 +44,7 @@ const parseFileProfiles = (content) => {
   return profiles;
 };
 
-const writeCredentialsContent = (content) =>
+const writeCredentialsContent = async (content) =>
   new BbPromise((resolve, reject) =>
     writeFile(
       credentialsFilePath,
@@ -72,7 +72,7 @@ const writeCredentialsContent = (content) =>
   );
 
 module.exports = {
-  resolveFileProfiles() {
+  async resolveFileProfiles() {
     return new BbPromise((resolve, reject) => {
       if (!credentialsFilePath) {
         resolve(new Map());
@@ -100,7 +100,7 @@ module.exports = {
     };
   },
 
-  saveFileProfiles(profiles) {
+  async saveFileProfiles(profiles) {
     return new BbPromise((resolve) => {
       if (!credentialsFilePath) {
         throw new ServerlessError(
diff --git a/lib/plugins/aws/utils/resolveCfImportValue.js b/lib/plugins/aws/utils/resolveCfImportValue.js
index 5e9795e8299..78baba0d19e 100644
--- a/lib/plugins/aws/utils/resolveCfImportValue.js
+++ b/lib/plugins/aws/utils/resolveCfImportValue.js
@@ -2,7 +2,7 @@
 
 const ServerlessError = require('../../../serverless-error');
 
-function resolveCfImportValue(provider, name, sdkParams = {}) {
+async function resolveCfImportValue(provider, name, sdkParams = {}) {
   return provider.request('CloudFormation', 'listExports', sdkParams).then((result) => {
     const targetExportMeta = result.Exports.find((exportMeta) => exportMeta.Name === name);
     if (targetExportMeta) return targetExportMeta.Value;
diff --git a/lib/plugins/aws/utils/resolveCfRefValue.js b/lib/plugins/aws/utils/resolveCfRefValue.js
index 928e4f58e02..ba3de7a43c8 100644
--- a/lib/plugins/aws/utils/resolveCfRefValue.js
+++ b/lib/plugins/aws/utils/resolveCfRefValue.js
@@ -2,7 +2,7 @@
 
 const ServerlessError = require('../../../serverless-error');
 
-function resolveCfRefValue(provider, resourceLogicalId, sdkParams = {}) {
+async function resolveCfRefValue(provider, resourceLogicalId, sdkParams = {}) {
   return provider
     .request(
       'CloudFormation',

From 39e43b51e5e13c708900e0ccc4d4f25ccf0df61c Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 3 Dec 2021 16:34:37 +0100
Subject: [PATCH 0747/1101] refactor: Use `async/await` syntax in `bucket.js`

---
 lib/plugins/aws/remove/lib/bucket.js | 42 +++++++++++-----------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/lib/plugins/aws/remove/lib/bucket.js b/lib/plugins/aws/remove/lib/bucket.js
index c22ddcb83fc..43e82371362 100644
--- a/lib/plugins/aws/remove/lib/bucket.js
+++ b/lib/plugins/aws/remove/lib/bucket.js
@@ -1,13 +1,11 @@
 'use strict';
 
-const BbPromise = require('bluebird');
 const { legacy } = require('@serverless/utils/log');
 
 module.exports = {
   async setServerlessDeploymentBucketName() {
-    return this.provider.getServerlessDeploymentBucketName().then((bucketName) => {
-      this.bucketName = bucketName;
-    });
+    const bucketName = await this.provider.getServerlessDeploymentBucketName();
+    this.bucketName = bucketName;
   },
 
   async listObjectsV2() {
@@ -16,21 +14,18 @@ module.exports = {
     legacy.log('Getting all objects in S3 bucket...');
     const serviceStage = `${this.serverless.service.service}/${this.provider.getStage()}`;
 
-    return this.provider
-      .request('S3', 'listObjectsV2', {
-        Bucket: this.bucketName,
-        Prefix: `${this.provider.getDeploymentPrefix()}/${serviceStage}`,
-      })
-      .then((result) => {
-        if (result) {
-          result.Contents.forEach((object) => {
-            this.objectsInBucket.push({
-              Key: object.Key,
-            });
-          });
-        }
-        return BbPromise.resolve();
+    const result = await this.provider.request('S3', 'listObjectsV2', {
+      Bucket: this.bucketName,
+      Prefix: `${this.provider.getDeploymentPrefix()}/${serviceStage}`,
+    });
+
+    if (result) {
+      result.Contents.forEach((object) => {
+        this.objectsInBucket.push({
+          Key: object.Key,
+        });
       });
+    }
   },
 
   async listObjectVersions() {
@@ -75,21 +70,18 @@ module.exports = {
   async deleteObjects() {
     legacy.log('Removing objects in S3 bucket...');
     if (this.objectsInBucket.length) {
-      return this.provider.request('S3', 'deleteObjects', {
+      await this.provider.request('S3', 'deleteObjects', {
         Bucket: this.bucketName,
         Delete: {
           Objects: this.objectsInBucket,
         },
       });
     }
-
-    return BbPromise.resolve();
   },
 
   async emptyS3Bucket() {
-    return BbPromise.bind(this)
-      .then(this.setServerlessDeploymentBucketName)
-      .then(this.listObjects)
-      .then(this.deleteObjects);
+    await this.setServerlessDeploymentBucketName();
+    await this.listObjects();
+    await this.deleteObjects();
   },
 };

From f12c7d8d3027d4dbaa71af7ba45516e260e6bf82 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 3 Dec 2021 17:23:38 +0100
Subject: [PATCH 0748/1101] refactor: Cleanup `remove` tests

---
 .../unit/lib/plugins/aws/remove/index.test.js | 104 +++++++
 .../lib/plugins/aws/remove/lib/bucket.test.js | 270 ------------------
 2 files changed, 104 insertions(+), 270 deletions(-)
 delete mode 100644 test/unit/lib/plugins/aws/remove/lib/bucket.test.js

diff --git a/test/unit/lib/plugins/aws/remove/index.test.js b/test/unit/lib/plugins/aws/remove/index.test.js
index de5ab0e9900..939169dbea0 100644
--- a/test/unit/lib/plugins/aws/remove/index.test.js
+++ b/test/unit/lib/plugins/aws/remove/index.test.js
@@ -33,6 +33,7 @@ describe('test/unit/lib/plugins/aws/remove/index.test.js', () => {
     S3: {
       deleteObjects: deleteObjectsStub,
       listObjectsV2: { Contents: [{ Key: 'first' }, { Key: 'second' }] },
+      headBucket: {},
     },
     CloudFormation: {
       describeStackEvents: describeStackEventsStub,
@@ -105,6 +106,23 @@ describe('test/unit/lib/plugins/aws/remove/index.test.js', () => {
     expect(deleteRepositoryStub).not.to.be.called;
   });
 
+  it('executes expected operations related to files removal when S3 bucket has files', async () => {
+    await runServerless({
+      fixture: 'function',
+      command: 'remove',
+      awsRequestStubMap: {
+        ...awsRequestStubMap,
+        S3: {
+          deleteObjects: deleteObjectsStub,
+          listObjectsV2: { Contents: [] },
+          headBucket: {},
+        },
+      },
+    });
+
+    expect(deleteObjectsStub).not.to.be.called;
+  });
+
   it('removes ECR repository if it exists', async () => {
     describeRepositoriesStub.resolves();
     const { awsNaming } = await runServerless({
@@ -134,4 +152,90 @@ describe('test/unit/lib/plugins/aws/remove/index.test.js', () => {
 
     expect(deleteRepositoryStub).not.to.be.called;
   });
+
+  it('should execute expected operations with versioning enabled if no object versions are present', async () => {
+    const listObjectVersionsStub = sinon.stub().resolves();
+
+    const { serverless } = await runServerless({
+      command: 'remove',
+      fixture: 'function',
+      configExt: {
+        provider: {
+          deploymentPrefix: 'serverless',
+          deploymentBucket: {
+            name: 'bucket',
+            versioning: true,
+          },
+        },
+      },
+      awsRequestStubMap: {
+        ...awsRequestStubMap,
+        S3: {
+          listObjectVersions: listObjectVersionsStub,
+          headBucket: {},
+        },
+      },
+    });
+
+    expect(listObjectVersionsStub).to.be.calledWithExactly({
+      Bucket: 'bucket',
+      Prefix: `serverless/${serverless.service.service}/dev`,
+    });
+  });
+
+  it('should execute expected operations with versioning enabled if object versions are present', async () => {
+    const listObjectVersionsStub = sinon.stub().resolves({
+      Versions: [
+        { Key: 'object1', VersionId: null },
+        { Key: 'object2', VersionId: 'v1' },
+      ],
+      DeleteMarkers: [{ Key: 'object3', VersionId: 'v2' }],
+    });
+
+    const innerDeleteObjectsStub = sinon.stub().resolves({
+      Deleted: [
+        { Key: 'object1', VersionId: null },
+        { Key: 'object2', VersionId: 'v1' },
+        { Key: 'object3', VersionId: 'v2' },
+      ],
+    });
+
+    const { serverless } = await runServerless({
+      command: 'remove',
+      fixture: 'function',
+      configExt: {
+        provider: {
+          deploymentPrefix: 'serverless',
+          deploymentBucket: {
+            name: 'bucket',
+            versioning: true,
+          },
+        },
+      },
+      awsRequestStubMap: {
+        ...awsRequestStubMap,
+        S3: {
+          listObjectVersions: listObjectVersionsStub,
+          deleteObjects: innerDeleteObjectsStub,
+          headBucket: {},
+        },
+      },
+    });
+
+    expect(listObjectVersionsStub).to.be.calledWithExactly({
+      Bucket: 'bucket',
+      Prefix: `serverless/${serverless.service.service}/dev`,
+    });
+
+    expect(innerDeleteObjectsStub).to.be.calledWithExactly({
+      Bucket: 'bucket',
+      Delete: {
+        Objects: [
+          { Key: 'object1', VersionId: null },
+          { Key: 'object2', VersionId: 'v1' },
+          { Key: 'object3', VersionId: 'v2' },
+        ],
+      },
+    });
+  });
 });
diff --git a/test/unit/lib/plugins/aws/remove/lib/bucket.test.js b/test/unit/lib/plugins/aws/remove/lib/bucket.test.js
deleted file mode 100644
index cb1ab6813ae..00000000000
--- a/test/unit/lib/plugins/aws/remove/lib/bucket.test.js
+++ /dev/null
@@ -1,270 +0,0 @@
-'use strict';
-
-const expect = require('chai').expect;
-
-const sinon = require('sinon');
-const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
-const AwsRemove = require('../../../../../../../lib/plugins/aws/remove/index');
-const Serverless = require('../../../../../../../lib/Serverless');
-
-const runServerless = require('../../../../../../utils/run-serverless');
-
-describe('emptyS3Bucket', () => {
-  const options = {
-    stage: 'dev',
-    region: 'us-east-1',
-  };
-  const serverless = new Serverless();
-  serverless.service.service = 'emptyS3Bucket';
-  serverless.setProvider('aws', new AwsProvider(serverless, options));
-
-  let awsRemove;
-
-  beforeEach(() => {
-    awsRemove = new AwsRemove(serverless, options);
-    awsRemove.serverless.cli = new serverless.classes.CLI();
-  });
-
-  describe('#setServerlessDeploymentBucketName()', () => {
-    it('should store the name of the Serverless deployment bucket in the "this" variable', () => {
-      const getServerlessDeploymentBucketNameStub = sinon
-        .stub(awsRemove.provider, 'getServerlessDeploymentBucketName')
-        .resolves('new-service-dev-us-east-1-12345678');
-
-      return awsRemove.setServerlessDeploymentBucketName().then(() => {
-        expect(awsRemove.bucketName).to.equal('new-service-dev-us-east-1-12345678');
-        expect(getServerlessDeploymentBucketNameStub.calledOnce).to.be.equal(true);
-        expect(getServerlessDeploymentBucketNameStub.calledWithExactly()).to.be.equal(true);
-        awsRemove.provider.getServerlessDeploymentBucketName.restore();
-      });
-    });
-  });
-
-  describe('#listObjectsV2()', () => {
-    it('should resolve if no objects are present', () => {
-      const listObjectsStub = sinon.stub(awsRemove.provider, 'request').resolves();
-
-      const stage = awsRemove.provider.getStage();
-      const prefix = awsRemove.provider.getDeploymentPrefix();
-
-      return awsRemove.listObjects().then(() => {
-        expect(listObjectsStub.calledOnce).to.be.equal(true);
-        expect(
-          listObjectsStub.calledWithExactly('S3', 'listObjectsV2', {
-            Bucket: awsRemove.bucketName,
-            Prefix: `${prefix}/${serverless.service.service}/${stage}`,
-          })
-        ).to.be.equal(true);
-        expect(awsRemove.objectsInBucket.length).to.equal(0);
-        awsRemove.provider.request.restore();
-      });
-    });
-
-    it('should push objects to the array if present', () => {
-      const listObjectsStub = sinon.stub(awsRemove.provider, 'request').resolves({
-        Contents: [{ Key: 'object1' }, { Key: 'object2' }],
-      });
-
-      const stage = awsRemove.provider.getStage();
-      const prefix = awsRemove.provider.getDeploymentPrefix();
-
-      return awsRemove.listObjects().then(() => {
-        expect(listObjectsStub.calledOnce).to.be.equal(true);
-        expect(
-          listObjectsStub.calledWithExactly('S3', 'listObjectsV2', {
-            Bucket: awsRemove.bucketName,
-            Prefix: `${prefix}/${serverless.service.service}/${stage}`,
-          })
-        ).to.be.equal(true);
-        expect(awsRemove.objectsInBucket[0]).to.deep.equal({ Key: 'object1' });
-        expect(awsRemove.objectsInBucket[1]).to.deep.equal({ Key: 'object2' });
-        awsRemove.provider.request.restore();
-      });
-    });
-  });
-
-  describe('#listObjectVersions()', () => {
-    const baseAwsRequestStubMap = {
-      STS: {
-        getCallerIdentity: {
-          ResponseMetadata: { RequestId: 'ffffffff-ffff-ffff-ffff-ffffffffffff' },
-          UserId: 'XXXXXXXXXXXXXXXXXXXXX',
-          Account: '999999999999',
-          Arn: 'arn:aws:iam::999999999999:user/test',
-        },
-      },
-      ECR: {
-        describeRepositories: sinon.stub().throws({
-          providerError: { code: 'RepositoryNotFoundException' },
-        }),
-      },
-      CloudFormation: {
-        describeStacks: {},
-        describeStackEvents: {
-          StackEvents: [
-            {
-              EventId: '1e2f3g4h',
-              StackName: 'new-service-dev',
-              LogicalResourceId: 'new-service-dev',
-              ResourceType: 'AWS::CloudFormation::Stack',
-              Timestamp: new Date(),
-              ResourceStatus: 'DELETE_COMPLETE',
-            },
-          ],
-        },
-        describeStackResource: {
-          StackResourceDetail: { PhysicalResourceId: 'deployment-bucket' },
-        },
-        deleteStack: {},
-      },
-    };
-
-    it('should resolve if no object versions are present', async () => {
-      const listObjectVersionsStub = sinon.stub().resolves();
-
-      await runServerless({
-        command: 'remove',
-        config: {
-          service: 'test-service',
-          provider: {
-            name: 'aws',
-            stage: 'dev',
-            region: 'us-east-1',
-            deploymentPrefix: 'serverless',
-            deploymentBucket: {
-              name: 'bucket',
-              versioning: true,
-            },
-          },
-        },
-        awsRequestStubMap: {
-          ...baseAwsRequestStubMap,
-          S3: {
-            listObjectVersions: listObjectVersionsStub,
-          },
-        },
-      });
-
-      expect(
-        listObjectVersionsStub.calledWithExactly({
-          Bucket: 'bucket',
-          Prefix: 'serverless/test-service/dev',
-        })
-      ).to.be.equal(true);
-    });
-
-    it('should push objects to the array if present', async () => {
-      const listObjectVersionsStub = sinon.stub().resolves({
-        Versions: [
-          { Key: 'object1', VersionId: null },
-          { Key: 'object2', VersionId: 'v1' },
-        ],
-        DeleteMarkers: [{ Key: 'object3', VersionId: 'v2' }],
-      });
-
-      const deleteObjectsStub = sinon.stub().resolves({
-        Deleted: [
-          { Key: 'object1', VersionId: null },
-          { Key: 'object2', VersionId: 'v1' },
-          { Key: 'object3', VersionId: 'v2' },
-        ],
-      });
-
-      await runServerless({
-        command: 'remove',
-        config: {
-          service: 'test-service',
-          provider: {
-            name: 'aws',
-            stage: 'dev',
-            region: 'us-east-1',
-            deploymentPrefix: 'serverless',
-            deploymentBucket: {
-              name: 'bucket',
-              versioning: true,
-            },
-          },
-        },
-        awsRequestStubMap: {
-          ...baseAwsRequestStubMap,
-          S3: {
-            listObjectVersions: listObjectVersionsStub,
-            deleteObjects: deleteObjectsStub,
-          },
-        },
-      });
-
-      expect(listObjectVersionsStub.calledOnce).to.be.equal(true);
-      expect(
-        listObjectVersionsStub.calledWithExactly({
-          Bucket: 'bucket',
-          Prefix: 'serverless/test-service/dev',
-        })
-      ).to.be.equal(true);
-
-      expect(
-        deleteObjectsStub.calledWithExactly({
-          Bucket: 'bucket',
-          Delete: {
-            Objects: [
-              { Key: 'object1', VersionId: null },
-              { Key: 'object2', VersionId: 'v1' },
-              { Key: 'object3', VersionId: 'v2' },
-            ],
-          },
-        })
-      ).to.be.equal(true);
-    });
-  });
-
-  describe('#deleteObjects()', () => {
-    it('should delete all objects in the S3 bucket', () => {
-      awsRemove.objectsInBucket = [{ Key: 'foo' }];
-
-      const deleteObjectsStub = sinon.stub(awsRemove.provider, 'request').resolves();
-
-      return awsRemove.deleteObjects().then(() => {
-        expect(deleteObjectsStub.calledOnce).to.be.equal(true);
-        expect(
-          deleteObjectsStub.calledWithExactly('S3', 'deleteObjects', {
-            Bucket: awsRemove.bucketName,
-            Delete: {
-              Objects: awsRemove.objectsInBucket,
-            },
-          })
-        ).to.be.equal(true);
-        awsRemove.provider.request.restore();
-      });
-    });
-
-    it('should resolve if objectsInBucket is empty', (done) => {
-      awsRemove.objectsInBucket = [];
-
-      awsRemove.deleteObjects().then(() => {
-        done();
-      });
-    });
-  });
-
-  describe('#emptyS3Bucket()', () => {
-    it('should run promise chain in order', () => {
-      const setServerlessDeploymentBucketNameStub = sinon
-        .stub(awsRemove, 'setServerlessDeploymentBucketName')
-        .resolves();
-      const listObjectsStub = sinon.stub(awsRemove, 'listObjects').resolves();
-      const deleteObjectsStub = sinon.stub(awsRemove, 'deleteObjects').resolves();
-
-      return awsRemove.emptyS3Bucket().then(() => {
-        expect(setServerlessDeploymentBucketNameStub.calledOnce).to.be.equal(true);
-        expect(listObjectsStub.calledAfter(setServerlessDeploymentBucketNameStub)).to.be.equal(
-          true
-        );
-        expect(deleteObjectsStub.calledAfter(listObjectsStub)).to.be.equal(true);
-
-        awsRemove.setServerlessDeploymentBucketName.restore();
-        awsRemove.listObjects.restore();
-        awsRemove.deleteObjects.restore();
-      });
-    });
-  });
-});

From 1a85a4a901caf4ca05096bf11bfcad31959c8044 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 3 Dec 2021 17:25:13 +0100
Subject: [PATCH 0749/1101] fix(AWS Deploy): Allow removal of stack with bucket
 missing

---
 lib/plugins/aws/lib/check-if-bucket-exists.js | 18 +++++
 lib/plugins/aws/remove/index.js               |  4 +-
 lib/plugins/aws/remove/lib/bucket.js          | 26 +++++--
 .../unit/lib/plugins/aws/remove/index.test.js | 74 +++++++++++++++++++
 4 files changed, 116 insertions(+), 6 deletions(-)
 create mode 100644 lib/plugins/aws/lib/check-if-bucket-exists.js

diff --git a/lib/plugins/aws/lib/check-if-bucket-exists.js b/lib/plugins/aws/lib/check-if-bucket-exists.js
new file mode 100644
index 00000000000..269b1541247
--- /dev/null
+++ b/lib/plugins/aws/lib/check-if-bucket-exists.js
@@ -0,0 +1,18 @@
+'use strict';
+
+module.exports = {
+  async checkIfBucketExists(bucketName) {
+    try {
+      await this.provider.request('S3', 'headBucket', {
+        Bucket: bucketName,
+      });
+      return true;
+    } catch (err) {
+      if (err.code === 'AWS_S3_HEAD_BUCKET_NOT_FOUND') {
+        return false;
+      }
+
+      throw err;
+    }
+  },
+};
diff --git a/lib/plugins/aws/remove/index.js b/lib/plugins/aws/remove/index.js
index 3a654a1dfb6..403e31f9236 100644
--- a/lib/plugins/aws/remove/index.js
+++ b/lib/plugins/aws/remove/index.js
@@ -2,6 +2,7 @@
 
 const validate = require('../lib/validate');
 const monitorStack = require('../lib/monitorStack');
+const checkIfBucketExists = require('../lib/check-if-bucket-exists');
 const emptyS3Bucket = require('./lib/bucket');
 const removeStack = require('./lib/stack');
 const removeEcrRepository = require('./lib/ecr');
@@ -23,7 +24,8 @@ class AwsRemove {
       removeStack,
       monitorStack,
       removeEcrRepository,
-      checkIfEcrRepositoryExists
+      checkIfEcrRepositoryExists,
+      checkIfBucketExists
     );
 
     this.hooks = {
diff --git a/lib/plugins/aws/remove/lib/bucket.js b/lib/plugins/aws/remove/lib/bucket.js
index 43e82371362..1055d42871b 100644
--- a/lib/plugins/aws/remove/lib/bucket.js
+++ b/lib/plugins/aws/remove/lib/bucket.js
@@ -1,11 +1,22 @@
 'use strict';
 
-const { legacy } = require('@serverless/utils/log');
+const { legacy, log } = require('@serverless/utils/log');
 
 module.exports = {
   async setServerlessDeploymentBucketName() {
-    const bucketName = await this.provider.getServerlessDeploymentBucketName();
-    this.bucketName = bucketName;
+    try {
+      const bucketName = await this.provider.getServerlessDeploymentBucketName();
+      this.bucketName = bucketName;
+    } catch (err) {
+      // If there is a validation error with expected message, it means that logical resource for
+      // S3 bucket does not exist and we want to proceed with empty `bucketName`
+      if (
+        err.providerError.code !== 'ValidationError' ||
+        !err.message.includes('does not exist for stack')
+      ) {
+        throw err;
+      }
+    }
   },
 
   async listObjectsV2() {
@@ -81,7 +92,12 @@ module.exports = {
 
   async emptyS3Bucket() {
     await this.setServerlessDeploymentBucketName();
-    await this.listObjects();
-    await this.deleteObjects();
+    if (this.bucketName && (await this.checkIfBucketExists(this.bucketName))) {
+      await this.listObjects();
+      await this.deleteObjects();
+    } else {
+      legacy.log('S3 bucket not found. Skipping S3 bucket objects removal');
+      log.info('S3 bucket not found. Skipping S3 bucket objects removal');
+    }
   },
 };
diff --git a/test/unit/lib/plugins/aws/remove/index.test.js b/test/unit/lib/plugins/aws/remove/index.test.js
index 939169dbea0..fff8f1383e9 100644
--- a/test/unit/lib/plugins/aws/remove/index.test.js
+++ b/test/unit/lib/plugins/aws/remove/index.test.js
@@ -123,6 +123,80 @@ describe('test/unit/lib/plugins/aws/remove/index.test.js', () => {
     expect(deleteObjectsStub).not.to.be.called;
   });
 
+  it('executes expected operations related to files removal when S3 bucket is empty', async () => {
+    await runServerless({
+      fixture: 'function',
+      command: 'remove',
+      awsRequestStubMap,
+    });
+
+    expect(deleteObjectsStub).to.be.calledWithExactly({
+      Bucket: 'resource-id',
+      Delete: {
+        Objects: [{ Key: 'first' }, { Key: 'second' }],
+      },
+    });
+  });
+
+  it('skips attempts to remove S3 objects if S3 bucket not found', async () => {
+    const { awsNaming } = await runServerless({
+      fixture: 'function',
+      command: 'remove',
+      awsRequestStubMap: {
+        ...awsRequestStubMap,
+        S3: {
+          deleteObjects: deleteObjectsStub,
+          listObjectsV2: { Contents: [{ Key: 'first' }, { Key: 'second' }] },
+          headBucket: () => {
+            const err = new Error('err');
+            err.code = 'AWS_S3_HEAD_BUCKET_NOT_FOUND';
+            throw err;
+          },
+        },
+      },
+    });
+
+    expect(deleteObjectsStub).not.to.be.called;
+    expect(deleteStackStub).to.be.calledWithExactly({ StackName: awsNaming.getStackName() });
+    expect(describeStackEventsStub).to.be.calledWithExactly({
+      StackName: awsNaming.getStackName(),
+    });
+    expect(describeStackEventsStub.calledAfter(deleteStackStub)).to.be.true;
+  });
+
+  it('skips attempts to remove S3 objects if S3 bucket resource missing from CloudFormation template', async () => {
+    const headBucketStub = sinon.stub();
+    const { awsNaming } = await runServerless({
+      fixture: 'function',
+      command: 'remove',
+      awsRequestStubMap: {
+        ...awsRequestStubMap,
+        S3: {
+          ...awsRequestStubMap.S3,
+          headBucket: headBucketStub,
+        },
+        CloudFormation: {
+          ...awsRequestStubMap.CloudFormation,
+          describeStackResource: () => {
+            const err = new Error('does not exist for stack');
+            err.providerError = {
+              code: 'ValidationError',
+            };
+            throw err;
+          },
+        },
+      },
+    });
+
+    expect(headBucketStub).not.to.be.called;
+    expect(deleteObjectsStub).not.to.be.called;
+    expect(deleteStackStub).to.be.calledWithExactly({ StackName: awsNaming.getStackName() });
+    expect(describeStackEventsStub).to.be.calledWithExactly({
+      StackName: awsNaming.getStackName(),
+    });
+    expect(describeStackEventsStub.calledAfter(deleteStackStub)).to.be.true;
+  });
+
   it('removes ECR repository if it exists', async () => {
     describeRepositoriesStub.resolves();
     const { awsNaming } = await runServerless({

From e4431f26c12682a26bcea7233c61645088434f3b Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Mon, 6 Dec 2021 14:38:38 +0100
Subject: [PATCH 0750/1101] docs: Address #10242 to clarify v3 instructions

---
 docs/guides/upgrading-v3.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/guides/upgrading-v3.md b/docs/guides/upgrading-v3.md
index 0421507b363..dfdccb31e50 100644
--- a/docs/guides/upgrading-v3.md
+++ b/docs/guides/upgrading-v3.md
@@ -17,7 +17,7 @@ Serverless Framework v3 contains a few breaking changes that may impact some pro
 
 This guide helps users upgrade from Serverless Framework v2 to v3.
 
-**Note:** Serverless Framework v3 isn't released yet. However, this guide helps to prepare to v3, or upgrade to the v3 beta version.
+**Note:** Serverless Framework v3 isn't released yet. However, this guide helps to prepare to v3, or upgrade to the [v3 beta version](https://www.serverless.com/blog/serverless-framework-v3-beta).
 
 ## Am I impacted by breaking changes?
 
@@ -44,6 +44,8 @@ Then, to upgrade to Serverless Framework v3, run:
 npm update -g serverless
 ```
 
+**Note:** v3 is currently available as beta version. [Read the blog post](https://www.serverless.com/blog/serverless-framework-v3-beta) to upgrade to v3 beta until the stable version is released.
+
 If you [installed `serverless` as a standalone binary](../getting-started.md#install-as-a-standalone-binary), run the following command instead:
 
 - MacOS/Linux standalone binary: `serverless upgrade --major`

From 503c0319b7e9acc2b674d5d61874dfa3fcfc857e Mon Sep 17 00:00:00 2001
From: Omer Shacham <60183075+omerinvia@users.noreply.github.com>
Date: Wed, 8 Dec 2021 13:39:47 +0200
Subject: [PATCH 0751/1101] fix(Variables): Provide opt-out from forced
 decryption at`ssm` source

(PR #10315)
---
 docs/providers/aws/guide/variables.md         |  2 ++
 .../sources/instance-dependent/get-ssm.js     |  9 ++++---
 .../instance-dependent/get-ssm.test.js        | 26 ++++++++++++++++---
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/docs/providers/aws/guide/variables.md b/docs/providers/aws/guide/variables.md
index 57a725209b3..baeff7f778f 100644
--- a/docs/providers/aws/guide/variables.md
+++ b/docs/providers/aws/guide/variables.md
@@ -340,6 +340,8 @@ New variable resolver, ensures that automatically other types as `SecureString`
 
 All `SecureString` type parameters are automatically decrypted, and automatically parsed if they export stringified JSON content (Note: you can turn off parsing by passing `raw` instruction into variable as: `${ssm(raw):/path/to/secureparam}`, if you need to also pass custom region, put it first as: `${ssm(eu-west-1, raw):/path/to/secureparam}`)
 
+In order to get the encrypted content, you can pass `noDecrypt` instruction into variable as: `${ssm(noDecrypt):/path/to/secureparam}` (it can be passed aside of region param as e.g.: `${ssm(eu-west-1, noDecrypt):/path/to/secureparam})`
+
 ## Reference Variables using AWS Secrets Manager
 
 Variables in [AWS Secrets Manager](https://aws.amazon.com/secrets-manager/) can be referenced [using SSM](https://docs.aws.amazon.com/systems-manager/latest/userguide/integration-ps-secretsmanager.html), just use the `ssm:/aws/reference/secretsmanager/secret_ID_in_Secrets_Manager` syntax. For example:
diff --git a/lib/configuration/variables/sources/instance-dependent/get-ssm.js b/lib/configuration/variables/sources/instance-dependent/get-ssm.js
index 923eca7887b..0bb84013e47 100644
--- a/lib/configuration/variables/sources/instance-dependent/get-ssm.js
+++ b/lib/configuration/variables/sources/instance-dependent/get-ssm.js
@@ -3,6 +3,7 @@
 const ensureString = require('type/string/ensure');
 const ServerlessError = require('../../../../serverless-error');
 const logDeprecation = require('../../../../utils/logDeprecation');
+const _ = require('lodash');
 
 module.exports = (serverlessInstance) => {
   return {
@@ -19,8 +20,10 @@ module.exports = (serverlessInstance) => {
         errorMessage: 'Non-string address argument in variable "ssm" source: %v',
         errorCode: 'INVALID_SSM_SOURCE_ADDRESS',
       });
-      const region = !params || !params[0] || params[0] === 'raw' ? undefined : params[0];
-      const shouldReturnRawValue = params && (params[0] === 'raw' || params[1] === 'raw');
+      const shouldReturnRawValue = params && params.includes('raw');
+      const shouldSkipDecryption = params && params.includes('noDecrypt');
+      _.pull(params, 'raw', 'noDecrypt');
+      const region = params && params[0];
 
       // TODO: Remove legacy instruction separator handling with next major
       let legacyShouldEnforceDecrypt = false;
@@ -54,7 +57,7 @@ module.exports = (serverlessInstance) => {
             'getParameter',
             {
               Name: address,
-              WithDecryption: true,
+              WithDecryption: !shouldSkipDecryption,
             },
             { useCache: true, region }
           );
diff --git a/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js b/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js
index 85c46ab618f..46e38ce37b0 100644
--- a/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js
+++ b/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js
@@ -27,6 +27,8 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
           existingListRaw: '${ssm(raw):existingList}',
           secretManager: '${ssm:/aws/reference/secretsmanager/existing}',
           existingEncrypted: '${ssm:/secret/existing}',
+          encryptedWithSkipDecrypt: '${ssm(noDecrypt):/secret/existing}',
+          encryptedWithSkipDecryptAndRegion: '${ssm(noDecrypt, eu-west-1):/secret/existing}',
           existingEncryptedDirect: '${ssm:/secret/direct}',
           existingEncryptedRaw: '${ssm(raw):/aws/reference/secretsmanager/existing}',
           notExisting: '${ssm:notExisting, null}',
@@ -39,7 +41,7 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
 
       serverlessInstance = {
         getProvider: () => ({
-          request: async (name, method, { Name }, { region }) => {
+          request: async (name, method, { Name, WithDecryption }, { region }) => {
             if (!allowedRegionTypes.has(typeof region)) throw new Error('Invalid region value');
             if (Name === 'existing') {
               return { Parameter: { Type: 'String', Value: region || 'value' } };
@@ -48,10 +50,20 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
               return { Parameter: { Type: 'StringList', Value: 'one,two,three' } };
             }
             if (Name === '/secret/existing' || Name === '/aws/reference/secretsmanager/existing') {
-              return { Parameter: { Type: 'SecureString', Value: '{"someSecret":"someValue"}' } };
+              return {
+                Parameter: {
+                  Type: 'SecureString',
+                  Value: WithDecryption ? '{"someSecret":"someValue"}' : 'ENCRYPTED',
+                },
+              };
             }
             if (Name === '/secret/direct') {
-              return { Parameter: { Type: 'SecureString', Value: '12345678901234567890' } };
+              return {
+                Parameter: {
+                  Type: 'SecureString',
+                  Value: WithDecryption ? '12345678901234567890' : 'ENCRYPTED',
+                },
+              };
             }
             if (Name === 'notExisting') {
               throw Object.assign(
@@ -111,8 +123,16 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
       if (variablesMeta.get('custom\0existingDirect')) {
         throw variablesMeta.get('custom\0existingDirect').error;
       }
+      if (variablesMeta.get('custom\0encryptedWithSkipDecrypt')) {
+        throw variablesMeta.get('custom\0encryptedWithSkipDecrypt').error;
+      }
+      if (variablesMeta.get('custom\0encryptedWithSkipDecryptAndRegion')) {
+        throw variablesMeta.get('custom\0encryptedWithSkipDecrypt').error;
+      }
       expect(configuration.custom.existingEncrypted).to.deep.equal({ someSecret: 'someValue' });
       expect(configuration.custom.existingEncryptedDirect).to.equal('12345678901234567890');
+      expect(configuration.custom.encryptedWithSkipDecrypt).to.equal('ENCRYPTED');
+      expect(configuration.custom.encryptedWithSkipDecryptAndRegion).to.equal('ENCRYPTED');
     });
 
     it('should support "raw" output for decrypted data', () => {

From 664d8dc52687332bac72fd6e2c0e95b192da69b3 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Wed, 8 Dec 2021 10:56:37 +0100
Subject: [PATCH 0752/1101] docs: Improve the Serverless Variables page

---
 docs/providers/aws/guide/variables.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/providers/aws/guide/variables.md b/docs/providers/aws/guide/variables.md
index baeff7f778f..afe08277e7a 100644
--- a/docs/providers/aws/guide/variables.md
+++ b/docs/providers/aws/guide/variables.md
@@ -38,10 +38,10 @@ You can define your own variable syntax (regex) if it conflicts with CloudFormat
 
 ## Current variable sources:
 
+- [Other properties defined in `serverless.yml`](#reference-properties-in-serverlessyml)
 - [Serverless Core variables](#referencing-serverless-core-variables)
 - [Environment variables](#referencing-environment-variables)
 - [CLI options](#referencing-cli-options)
-- [Other properties defined in `serverless.yml`](#reference-properties-in-serverlessyml)
 - [External YAML/JSON files](#reference-properties-in-other-files)
 - [Variables from S3](#referencing-s3-objects)
 - [Variables from AWS SSM Parameter Store](#reference-variables-using-the-ssm-parameter-store)
@@ -51,8 +51,6 @@ You can define your own variable syntax (regex) if it conflicts with CloudFormat
 - [Read String Variable Values as Boolean Values](#read-string-variable-values-as-boolean-values)
 - [Pseudo Parameters Reference](#aws-cloudformation-pseudo-parameters-and-intrinsic-functions)
 
-## Casting string variables to boolean values
-
 ## Recursively reference properties
 
 You can also **Recursively reference properties** with the variable system. This means you can combine multiple values and variable sources for a lot of flexibility.

From f35858599ad749b5417c238f510e726615e221dc Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 7 Dec 2021 11:00:59 +0100
Subject: [PATCH 0753/1101] feat(AWS Deploy): Ensure existence of S3 bucket if
 possible

---
 lib/plugins/aws/deploy/index.js               |  15 +-
 .../deploy/lib/ensure-valid-bucket-exists.js  | 161 +++++++++++++++
 .../aws/deploy/lib/existsDeploymentBucket.js  |  33 ---
 .../unit/lib/plugins/aws/deploy/index.test.js | 189 ++++++++++++++++++
 .../aws/deploy/lib/checkForChanges.test.js    |  11 +
 .../aws/deploy/lib/createStack.test.js        |   1 +
 .../deploy/lib/existsDeploymentBucket.test.js |  92 ---------
 .../apiGateway/lib/hack/updateStage.test.js   |   2 +
 .../package/lib/packageService.test.js        |  26 ++-
 9 files changed, 385 insertions(+), 145 deletions(-)
 create mode 100644 lib/plugins/aws/deploy/lib/ensure-valid-bucket-exists.js
 delete mode 100644 lib/plugins/aws/deploy/lib/existsDeploymentBucket.js
 delete mode 100644 test/unit/lib/plugins/aws/deploy/lib/existsDeploymentBucket.test.js

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index d15eef1f6e5..b587d859b2f 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -6,12 +6,13 @@ const extendedValidate = require('./lib/extendedValidate');
 const setBucketName = require('../lib/setBucketName');
 const checkForChanges = require('./lib/checkForChanges');
 const monitorStack = require('../lib/monitorStack');
+const checkIfBucketExists = require('../lib/check-if-bucket-exists');
 const createStack = require('./lib/createStack');
 const cleanupS3Bucket = require('./lib/cleanupS3Bucket');
 const uploadArtifacts = require('./lib/uploadArtifacts');
 const validateTemplate = require('./lib/validateTemplate');
 const updateStack = require('../lib/updateStack');
-const existsDeploymentBucket = require('./lib/existsDeploymentBucket');
+const ensureValidBucketExists = require('./lib/ensure-valid-bucket-exists');
 const path = require('path');
 const { style, log, progress, writeText, legacy } = require('@serverless/utils/log');
 const memoize = require('memoizee');
@@ -36,11 +37,12 @@ class AwsDeploy {
       setBucketName,
       checkForChanges,
       cleanupS3Bucket,
+      ensureValidBucketExists,
       uploadArtifacts,
       validateTemplate,
       updateStack,
-      existsDeploymentBucket,
-      monitorStack
+      monitorStack,
+      checkIfBucketExists
     );
 
     this.getFileStats = memoize(this.getFileStats.bind(this), { promise: true });
@@ -104,11 +106,6 @@ class AwsDeploy {
       'before:deploy:deploy': async () => {
         await this.serverless.pluginManager.spawn('aws:common:validate');
 
-        const bucketName = this.serverless.service.provider.deploymentBucket;
-        if (bucketName) {
-          await this.existsDeploymentBucket(bucketName);
-        }
-
         if (!this.options.package && !this.serverless.service.package.path) {
           return this.extendedValidate();
         }
@@ -127,7 +124,7 @@ class AwsDeploy {
       'aws:deploy:deploy:createStack': async () => this.createStack(),
 
       'aws:deploy:deploy:checkForChanges': async () => {
-        await this.setBucketName();
+        await this.ensureValidBucketExists();
         await this.checkForChanges();
       },
 
diff --git a/lib/plugins/aws/deploy/lib/ensure-valid-bucket-exists.js b/lib/plugins/aws/deploy/lib/ensure-valid-bucket-exists.js
new file mode 100644
index 00000000000..28b22362e7b
--- /dev/null
+++ b/lib/plugins/aws/deploy/lib/ensure-valid-bucket-exists.js
@@ -0,0 +1,161 @@
+'use strict';
+
+const ServerlessError = require('../../../../serverless-error');
+const { log, legacy, progress } = require('@serverless/utils/log');
+
+const mainProgress = progress.get('main');
+
+module.exports = {
+  async ensureValidBucketExists() {
+    legacy.log('Ensuring that deployment bucket exists');
+
+    // Ensure to set bucket name if it can be resolved
+    // Result of this operation will determine how further validation will be performed
+    try {
+      await this.setBucketName();
+    } catch (err) {
+      // If there is a validation error with expected message, it means that logical resource for
+      // S3 bucket does not exist and we want to proceed with handling that situation
+      if (
+        err.providerError.code !== 'ValidationError' ||
+        !err.message.includes('does not exist for stack')
+      ) {
+        throw err;
+      }
+    }
+
+    // Validate that custom deployment bucket exists and has proper location
+    if (this.serverless.service.provider.deploymentBucket) {
+      let result;
+      try {
+        result = await this.provider.request('S3', 'getBucketLocation', {
+          Bucket: this.bucketName,
+        });
+      } catch (err) {
+        throw new ServerlessError(
+          `Could not locate deployment bucket. Error: ${err.message}`,
+          'DEPLOYMENT_BUCKET_NOT_FOUND'
+        );
+      }
+
+      if (result.LocationConstraint === '') result.LocationConstraint = 'us-east-1';
+      if (result.LocationConstraint === 'EU') result.LocationConstraint = 'eu-west-1';
+      if (result.LocationConstraint !== this.provider.getRegion()) {
+        throw new ServerlessError(
+          'Deployment bucket is not in the same region as the lambda function',
+          'DEPLOYMENT_BUCKET_INVALID_REGION'
+        );
+      }
+      // If above is satisfied, then custom S3 bucket is valid
+      return;
+    }
+
+    // If bucket name is set, it means it's defined as a part of CloudFormation template (custom bucket case was handled by logic above)
+    if (this.bucketName) {
+      if (!(await this.checkIfBucketExists(this.bucketName))) {
+        // It means that bucket was removed manually but is still a part of the CloudFormation stack, we cannot manually fix it
+        throw new ServerlessError(
+          'Deployment bucket has been removed manually. Please recreate it or remove your service and attempt to deploy it again',
+          'DEPLOYMENT_BUCKET_REMOVED_MANUALLY'
+        );
+      }
+      return;
+    }
+
+    legacy.log(
+      'Deployment bucket not found. Updating stack to include deployment bucket definition.'
+    );
+    log.info(
+      'Deployment bucket not found. Updating stack to include deployment bucket definition.'
+    );
+    const stackName = this.provider.naming.getStackName();
+
+    // This is situation where the bucket is not defined in the template at all
+    // It covers the case where someone was using custom deployment bucket
+    // but removed that setting from the configuration
+    mainProgress.notice('Ensuring that deployment bucket exists', { isMainEvent: true });
+    const getTemplateResult = await this.provider.request('CloudFormation', 'getTemplate', {
+      StackName: stackName,
+      TemplateStage: 'Original',
+    });
+
+    const templateBody = JSON.parse(getTemplateResult.TemplateBody);
+    if (!templateBody.Resources) {
+      templateBody.Resources = {};
+    }
+    if (!templateBody.Outputs) {
+      templateBody.Outputs = {};
+    }
+    Object.assign(
+      templateBody.Resources,
+      this.serverless.service.provider.coreCloudFormationTemplate.Resources
+    );
+    Object.assign(
+      templateBody.Outputs,
+      this.serverless.service.provider.coreCloudFormationTemplate.Outputs
+    );
+    let stackTags = { STAGE: this.provider.getStage() };
+
+    // Merge additional stack tags
+    if (this.serverless.service.provider.stackTags) {
+      const customKeys = Object.keys(this.serverless.service.provider.stackTags);
+      const collisions = Object.keys(stackTags).filter((defaultKey) =>
+        customKeys.some((key) => defaultKey.toLowerCase() === key.toLowerCase())
+      );
+
+      // Delete collisions upfront
+      for (const key of collisions) {
+        delete stackTags[key];
+      }
+
+      stackTags = Object.assign(stackTags, this.serverless.service.provider.stackTags);
+    }
+
+    const params = {
+      StackName: stackName,
+      Capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
+      Parameters: [],
+      Tags: Object.keys(stackTags).map((key) => ({ Key: key, Value: stackTags[key] })),
+      TemplateBody: JSON.stringify(templateBody),
+    };
+
+    const customDeploymentRole = this.provider.getCustomDeploymentRole();
+    if (customDeploymentRole) {
+      params.RoleARN = customDeploymentRole;
+    }
+
+    if (this.serverless.service.provider.notificationArns) {
+      params.NotificationARNs = this.serverless.service.provider.notificationArns;
+    }
+
+    if (this.serverless.service.provider.stackParameters) {
+      params.Parameters = this.serverless.service.provider.stackParameters;
+    }
+
+    // Policy must have at least one statement, otherwise no updates would be possible at all
+    if (
+      this.serverless.service.provider.stackPolicy &&
+      Object.keys(this.serverless.service.provider.stackPolicy).length
+    ) {
+      params.StackPolicyBody = JSON.stringify({
+        Statement: this.serverless.service.provider.stackPolicy,
+      });
+    }
+
+    if (this.serverless.service.provider.rollbackConfiguration) {
+      params.RollbackConfiguration = this.serverless.service.provider.rollbackConfiguration;
+    }
+
+    if (this.serverless.service.provider.disableRollback) {
+      params.DisableRollback = this.serverless.service.provider.disableRollback;
+    }
+
+    if (templateBody.Transform) {
+      params.Capabilities.push('CAPABILITY_AUTO_EXPAND');
+    }
+
+    const cfData = await this.provider.request('CloudFormation', 'updateStack', params);
+    await this.monitorStack('update', cfData);
+    await this.setBucketName();
+  },
+};
diff --git a/lib/plugins/aws/deploy/lib/existsDeploymentBucket.js b/lib/plugins/aws/deploy/lib/existsDeploymentBucket.js
deleted file mode 100644
index dbc71104c81..00000000000
--- a/lib/plugins/aws/deploy/lib/existsDeploymentBucket.js
+++ /dev/null
@@ -1,33 +0,0 @@
-'use strict';
-
-const BbPromise = require('bluebird');
-const ServerlessError = require('../../../../serverless-error');
-
-module.exports = {
-  async existsDeploymentBucket(bucketName) {
-    return BbPromise.resolve()
-      .then(() =>
-        this.provider.request('S3', 'getBucketLocation', {
-          Bucket: bucketName,
-        })
-      )
-      .then((resultParam) => {
-        const result = resultParam;
-        if (result.LocationConstraint === '') result.LocationConstraint = 'us-east-1';
-        if (result.LocationConstraint === 'EU') result.LocationConstraint = 'eu-west-1';
-        if (result.LocationConstraint !== this.provider.getRegion()) {
-          throw new ServerlessError(
-            'Deployment bucket is not in the same region as the lambda function',
-            'DEPLOYMENT_BUCKET_INVALID_REGION'
-          );
-        }
-        return BbPromise.resolve();
-      })
-      .catch((err) => {
-        throw new ServerlessError(
-          `Could not locate deployment bucket. Error: ${err.message}`,
-          'DEPLOYMENT_BUCKET_NOT_FOUND'
-        );
-      });
-  },
-};
diff --git a/test/unit/lib/plugins/aws/deploy/index.test.js b/test/unit/lib/plugins/aws/deploy/index.test.js
index 023b921e80c..409e23656cb 100644
--- a/test/unit/lib/plugins/aws/deploy/index.test.js
+++ b/test/unit/lib/plugins/aws/deploy/index.test.js
@@ -255,6 +255,7 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
         deleteObjects: deleteObjectsStub,
         listObjectsV2: { Contents: [] },
         upload: s3UploadStub,
+        headBucket: {},
       },
       CloudFormation: {
         describeStacks: describeStacksStub,
@@ -333,6 +334,7 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
         deleteObjects: deleteObjectsStub,
         listObjectsV2: listObjectsV2Stub,
         upload: s3UploadStub,
+        headBucket: {},
       },
       CloudFormation: {
         describeStacks: { Stacks: [{}] },
@@ -439,6 +441,7 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
         headObject: s3HeadObjectStub,
         listObjectsV2: listObjectsV2Stub,
         upload: s3UploadStub,
+        headBucket: {},
       },
       CloudFormation: {
         describeStacks: { Stacks: [{}] },
@@ -479,4 +482,190 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
     expect(updateStackStub).to.not.be.called;
     expect(s3UploadStub).to.not.be.called;
   });
+
+  it('with existing stack - missing custom deployment bucket', async () => {
+    const awsRequestStubMap = {
+      ...baseAwsRequestStubMap,
+      ECR: {
+        describeRepositories: sinon.stub().throws({
+          providerError: { code: 'RepositoryNotFoundException' },
+        }),
+      },
+      S3: {
+        getBucketLocation: () => {
+          throw new Error();
+        },
+      },
+      CloudFormation: {
+        describeStacks: { Stacks: [{}] },
+        validateTemplate: {},
+      },
+    };
+
+    await expect(
+      runServerless({
+        fixture: 'function',
+        command: 'deploy',
+        awsRequestStubMap,
+        lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
+        configExt: {
+          provider: {
+            deploymentBucket: 'bucket-name',
+          },
+        },
+      })
+    ).to.eventually.have.been.rejected.and.have.property('code', 'DEPLOYMENT_BUCKET_NOT_FOUND');
+  });
+
+  it('with existing stack - with custom deployment bucket in different region', async () => {
+    const awsRequestStubMap = {
+      ...baseAwsRequestStubMap,
+      ECR: {
+        describeRepositories: sinon.stub().throws({
+          providerError: { code: 'RepositoryNotFoundException' },
+        }),
+      },
+      S3: {
+        getBucketLocation: () => {
+          return {
+            LocationConstraint: 'us-west-1',
+          };
+        },
+      },
+      CloudFormation: {
+        describeStacks: { Stacks: [{}] },
+        validateTemplate: {},
+      },
+    };
+
+    await expect(
+      runServerless({
+        fixture: 'function',
+        command: 'deploy',
+        awsRequestStubMap,
+        lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
+        configExt: {
+          provider: {
+            deploymentBucket: 'bucket-name',
+          },
+        },
+      })
+    ).to.eventually.have.been.rejected.and.have.property(
+      'code',
+      'DEPLOYMENT_BUCKET_INVALID_REGION'
+    );
+  });
+
+  it('with existing stack - with deployment bucket from CloudFormation deleted manually', async () => {
+    const awsRequestStubMap = {
+      ...baseAwsRequestStubMap,
+      ECR: {
+        describeRepositories: sinon.stub().throws({
+          providerError: { code: 'RepositoryNotFoundException' },
+        }),
+      },
+      S3: {
+        headBucket: () => {
+          const err = new Error();
+          err.code = 'AWS_S3_HEAD_BUCKET_NOT_FOUND';
+          throw err;
+        },
+      },
+      CloudFormation: {
+        describeStacks: { Stacks: [{}] },
+        validateTemplate: {},
+        describeStackResource: {
+          StackResourceDetail: { PhysicalResourceId: 's3-bucket-resource' },
+        },
+      },
+    };
+
+    await expect(
+      runServerless({
+        fixture: 'function',
+        command: 'deploy',
+        awsRequestStubMap,
+        lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
+      })
+    ).to.eventually.have.been.rejected.and.have.property(
+      'code',
+      'DEPLOYMENT_BUCKET_REMOVED_MANUALLY'
+    );
+  });
+
+  it('with existing stack - with deployment bucket resource missing from CloudFormation template', async () => {
+    const updateStackStub = sinon.stub().resolves({});
+    const describeStackResourceStub = sinon
+      .stub()
+      .onFirstCall()
+      .throws(() => {
+        const err = new Error('does not exist for stack');
+        err.providerError = {
+          code: 'ValidationError',
+        };
+        return err;
+      })
+      .onSecondCall()
+      .resolves({
+        StackResourceDetail: { PhysicalResourceId: 's3-bucket-resource' },
+      });
+
+    const awsRequestStubMap = {
+      ...baseAwsRequestStubMap,
+      ECR: {
+        describeRepositories: sinon.stub().throws({
+          providerError: { code: 'RepositoryNotFoundException' },
+        }),
+      },
+      S3: {
+        listObjectsV2: { Contents: [] },
+        headBucket: () => {
+          const err = new Error();
+          err.code = 'AWS_S3_HEAD_BUCKET_NOT_FOUND';
+          throw err;
+        },
+      },
+      CloudFormation: {
+        describeStacks: { Stacks: [{}] },
+        validateTemplate: {},
+        updateStack: updateStackStub,
+        getTemplate: () => {
+          return {
+            TemplateBody: JSON.stringify({}),
+          };
+        },
+        describeStackEvents: {
+          StackEvents: [
+            {
+              EventId: '1e2f3g4h',
+              StackName: 'new-service-dev',
+              LogicalResourceId: 'new-service-dev',
+              ResourceType: 'AWS::CloudFormation::Stack',
+              Timestamp: new Date(),
+              ResourceStatus: 'UPDATE_COMPLETE',
+            },
+          ],
+        },
+        describeStackResource: describeStackResourceStub,
+      },
+    };
+
+    const { serverless, awsNaming } = await runServerless({
+      fixture: 'function',
+      command: 'deploy',
+      awsRequestStubMap,
+      lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
+    });
+
+    expect(updateStackStub).to.be.calledWithExactly({
+      StackName: awsNaming.getStackName(),
+      Capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
+      Parameters: [],
+      Tags: [{ Key: 'STAGE', Value: 'dev' }],
+      TemplateBody: JSON.stringify({
+        Resources: serverless.service.provider.coreCloudFormationTemplate.Resources,
+        Outputs: serverless.service.provider.coreCloudFormationTemplate.Outputs,
+      }),
+    });
+  });
 });
diff --git a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
index a3172263dde..7b6d93ddb3d 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
@@ -597,6 +597,7 @@ describe('checkForChanges #2', () => {
               },
             ],
           },
+          headBucket: {},
         },
         STS: {
           getCallerIdentity: {
@@ -1022,6 +1023,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
           },
         },
         S3: {
+          headBucket: {},
           headObject: (() => {
             const headObjectStub = sandbox.stub();
 
@@ -1081,6 +1083,8 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
         },
         S3: {
           listObjectsV2: {},
+          headObjects: {},
+          headBucket: {},
         },
       },
     });
@@ -1163,6 +1167,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
           S3: {
             listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
             headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
+            headBucket: {},
           },
           CloudFormation: {
             ...commonAwsSdkMock.CloudFormation,
@@ -1232,6 +1237,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
           S3: {
             listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
             headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
+            headBucket: {},
           },
           CloudFormation: {
             ...commonAwsSdkMock.CloudFormation,
@@ -1304,6 +1310,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
           S3: {
             listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
             headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
+            headBucket: {},
           },
           CloudFormation: {
             ...commonAwsSdkMock.CloudFormation,
@@ -1373,6 +1380,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
           S3: {
             listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
             headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
+            headBucket: {},
           },
           CloudFormation: {
             ...commonAwsSdkMock.CloudFormation,
@@ -1455,6 +1463,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
           S3: {
             listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
             headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
+            headBucket: {},
           },
           CloudFormation: {
             ...commonAwsSdkMock.CloudFormation,
@@ -1555,6 +1564,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
           S3: {
             listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
             headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
+            headBucket: {},
           },
           CloudFormation: {
             ...commonAwsSdkMock.CloudFormation,
@@ -1656,6 +1666,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
           S3: {
             listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
             headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
+            headBucket: {},
           },
           CloudWatchLogs: {
             describeSubscriptionFilters: sandbox.stub().callsFake(async () => {
diff --git a/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js b/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js
index 1eba20b83ff..5ab306c6b71 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js
@@ -230,6 +230,7 @@ describe('createStack #2', () => {
       deleteObjects: {},
       listObjectsV2: { Contents: [] },
       upload: {},
+      headBucket: {},
     },
     CloudFormation: {
       describeStacks: describeStacksStub,
diff --git a/test/unit/lib/plugins/aws/deploy/lib/existsDeploymentBucket.test.js b/test/unit/lib/plugins/aws/deploy/lib/existsDeploymentBucket.test.js
deleted file mode 100644
index 1a1a69be83c..00000000000
--- a/test/unit/lib/plugins/aws/deploy/lib/existsDeploymentBucket.test.js
+++ /dev/null
@@ -1,92 +0,0 @@
-'use strict';
-
-const sinon = require('sinon');
-const chai = require('chai');
-const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../../lib/Serverless');
-const existsDeploymentBucket = require('../../../../../../../lib/plugins/aws/deploy/lib/existsDeploymentBucket');
-chai.use(require('chai-as-promised'));
-const expect = require('chai').expect;
-
-describe('#existsDeploymentBucket()', () => {
-  let serverless;
-  let awsPluginStub;
-  const awsPlugin = {};
-
-  beforeEach(() => {
-    const options = {
-      stage: 'dev',
-      region: 'us-east-1',
-    };
-    serverless = new Serverless();
-    awsPlugin.serverless = serverless;
-    awsPlugin.provider = new AwsProvider(serverless, options);
-
-    Object.assign(awsPlugin, existsDeploymentBucket);
-  });
-
-  it('should validate the region for the given S3 bucket', () => {
-    const bucketName = 'com.serverless.deploys';
-
-    awsPluginStub = sinon.stub(awsPlugin.provider, 'request').resolves({
-      LocationConstraint: awsPlugin.provider.options.region,
-    });
-
-    return expect(awsPlugin.existsDeploymentBucket(bucketName)).to.be.fulfilled.then(() => {
-      expect(awsPluginStub.args[0][0]).to.equal('S3');
-      expect(awsPluginStub.args[0][1]).to.equal('getBucketLocation');
-      expect(awsPluginStub.args[0][2].Bucket).to.equal(bucketName);
-    });
-  });
-
-  it('should reject an S3 bucket that does not exist', () => {
-    const bucketName = 'com.serverless.deploys';
-    const errorObj = { message: 'Access Denied' };
-
-    sinon.stub(awsPlugin.provider, 'request').throws(errorObj);
-    return expect(awsPlugin.existsDeploymentBucket(bucketName)).to.be.rejected.then((err) => {
-      expect(awsPluginStub.args[0][0]).to.equal('S3');
-      expect(awsPluginStub.args[0][1]).to.equal('getBucketLocation');
-      expect(awsPluginStub.args[0][2].Bucket).to.equal(bucketName);
-      expect(err.message).to.contain(errorObj.message);
-      expect(err.message).to.contain('Could not locate deployment bucket');
-    });
-  });
-
-  it('should reject an S3 bucket in the wrong region', () => {
-    const bucketName = 'com.serverless.deploys';
-
-    sinon.stub(awsPlugin.provider, 'request').resolves({
-      LocationConstraint: 'us-west-1',
-    });
-
-    return expect(awsPlugin.existsDeploymentBucket(bucketName)).to.be.rejected.then((err) => {
-      expect(awsPluginStub.args[0][0]).to.equal('S3');
-      expect(awsPluginStub.args[0][1]).to.equal('getBucketLocation');
-      expect(awsPluginStub.args[0][2].Bucket).to.equal(bucketName);
-      expect(err.message).to.contain('not in the same region');
-    });
-  });
-
-  [
-    { region: 'eu-west-1', response: 'EU' },
-    { region: 'us-east-1', response: '' },
-  ].forEach((value) => {
-    it(`should handle inconsistent getBucketLocation responses for ${value.region} region`, () => {
-      const bucketName = 'com.serverless.deploys';
-
-      awsPlugin.provider.options.region = value.region;
-
-      sinon.stub(awsPlugin.provider, 'request').resolves({
-        LocationConstraint: value.response,
-      });
-
-      awsPlugin.serverless.service.provider.deploymentBucket = bucketName;
-      return expect(awsPlugin.existsDeploymentBucket(bucketName)).to.be.fulfilled.then(() => {
-        expect(awsPluginStub.args[0][0]).to.equal('S3');
-        expect(awsPluginStub.args[0][1]).to.equal('getBucketLocation');
-        expect(awsPluginStub.args[0][2].Bucket).to.equal(bucketName);
-      });
-    });
-  });
-});
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
index 59b9929eae9..b4ee4953570 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
@@ -790,6 +790,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/u
         S3: {
           listObjectsV2: {},
           headObject: {},
+          headBucket: {},
         },
         APIGateway: {
           getRestApis: () => ({
@@ -859,6 +860,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/u
         S3: {
           listObjectsV2: {},
           upload: {},
+          headBucket: {},
         },
         STS: {
           getCallerIdentity: {
diff --git a/test/unit/lib/plugins/package/lib/packageService.test.js b/test/unit/lib/plugins/package/lib/packageService.test.js
index 549b7a47ec7..0a2548e4a14 100644
--- a/test/unit/lib/plugins/package/lib/packageService.test.js
+++ b/test/unit/lib/plugins/package/lib/packageService.test.js
@@ -14,7 +14,10 @@ chai.use(require('sinon-chai'));
 const { expect } = require('chai');
 
 describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
-  const mockedDescribeStacksResponse = {
+  const awsRequestStubMap = {
+    S3: {
+      headBucket: {},
+    },
     CloudFormation: {
       describeStacks: {
         Stacks: [
@@ -46,7 +49,7 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
       } = await runServerless({
         fixture: 'packaging',
         command: 'package',
-        awsRequestStubMap: mockedDescribeStacksResponse,
+        awsRequestStubMap,
         configExt: {
           package: {
             patterns: [
@@ -144,7 +147,7 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
       } = await runServerless({
         fixture: 'packaging',
         command: 'package',
-        awsRequestStubMap: mockedDescribeStacksResponse,
+        awsRequestStubMap,
         configExt: {
           useDotenv: true,
         },
@@ -170,7 +173,7 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
       } = await runServerless({
         fixture: 'packaging',
         command: 'package',
-        awsRequestStubMap: mockedDescribeStacksResponse,
+        awsRequestStubMap,
         configExt: {
           package: {
             individually: true,
@@ -232,7 +235,7 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
       const { serverless: serverlessInstance } = await runServerless({
         fixture: 'packaging',
         command: 'package',
-        awsRequestStubMap: mockedDescribeStacksResponse,
+        awsRequestStubMap,
         configExt: {
           package: {
             artifact: 'artifact.zip',
@@ -272,7 +275,7 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
   describe('pre-prepared artifact with absolute artifact path', () => {
     describe('while deploying whole service', () => {
       const s3UploadStub = sinon.stub();
-      const awsRequestStubMap = {
+      const innerAwsRequestStubMap = {
         Lambda: {
           getFunction: {
             Configuration: {
@@ -283,6 +286,7 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
         S3: {
           upload: s3UploadStub,
           listObjectsV2: {},
+          headBucket: {},
         },
         CloudFormation: {
           describeStacks: {},
@@ -320,7 +324,7 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
           cwd: serviceDir,
           command: 'deploy',
           lastLifecycleHookName: 'aws:deploy:deploy:uploadArtifacts',
-          awsRequestStubMap,
+          awsRequestStubMap: innerAwsRequestStubMap,
         });
 
         const callArgs = s3UploadStub.args.find((item) =>
@@ -342,7 +346,7 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
           cwd: serviceDir,
           command: 'deploy',
           lastLifecycleHookName: 'aws:deploy:deploy:uploadArtifacts',
-          awsRequestStubMap,
+          awsRequestStubMap: innerAwsRequestStubMap,
         });
 
         const callArgs = s3UploadStub.args.find((item) =>
@@ -354,7 +358,7 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
 
     describe('while deploying specific function', () => {
       const updateFunctionCodeStub = sinon.stub();
-      const awsRequestStubMap = {
+      const innerAwsRequestStubMap = {
         Lambda: {
           getFunction: {
             Configuration: {
@@ -390,7 +394,7 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
           cwd: serviceDir,
           command: 'deploy function',
           options: { function: 'other' },
-          awsRequestStubMap,
+          awsRequestStubMap: innerAwsRequestStubMap,
         });
         expect(updateFunctionCodeStub).to.have.been.calledOnce;
         expect(updateFunctionCodeStub.args[0][0].ZipFile).to.deep.equal(Buffer.from(zipContent));
@@ -410,7 +414,7 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
           cwd: serviceDir,
           command: 'deploy function',
           options: { function: 'foo' },
-          awsRequestStubMap,
+          awsRequestStubMap: innerAwsRequestStubMap,
         });
         expect(updateFunctionCodeStub).to.have.been.calledOnce;
         expect(updateFunctionCodeStub.args[0][0].ZipFile).to.deep.equal(Buffer.from(zipContent));

From 92ae054f02dc631c178628492af7049ce2936204 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 30 Nov 2021 21:12:19 +0100
Subject: [PATCH 0754/1101] feat(Standalone): Support installation on M1-based
 Macs

---
 lib/utils/standalone.js | 5 +++++
 scripts/pkg/install.sh  | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/lib/utils/standalone.js b/lib/utils/standalone.js
index 484c9b1ddcc..ca0db1b67e3 100644
--- a/lib/utils/standalone.js
+++ b/lib/utils/standalone.js
@@ -17,7 +17,12 @@ const arch = (() => {
     case 'x32':
       return 'x86';
     case 'arm':
+      return 'armv6';
     case 'arm64':
+      if (process.platform === 'darwin') {
+        // Handle case of M1 Macs that are using x64 binary via Rosetta
+        return 'x64';
+      }
       return 'armv6';
     default:
       return process.arch;
diff --git a/scripts/pkg/install.sh b/scripts/pkg/install.sh
index 8c934c971fd..28b16b94185 100755
--- a/scripts/pkg/install.sh
+++ b/scripts/pkg/install.sh
@@ -30,6 +30,9 @@ fi
 MACHINE_TYPE=`uname -m`
 if [[ $MACHINE_TYPE == "x86_64" ]]; then
   ARCH='x64'
+elif [[ $OSTYPE == "darwin"* ]] && [[ $MACHINE_TYPE == "arm64" ]]; then
+  ARCH='x64'
+  echo "There is no native binary installer available for $MACHINE_TYPE architecture. Version for x86_64 architecture will be installed instead. In order to use it, you need to have Rosetta installed."
 else
   echo "$red Sorry, there's no serverless binary installer available for $MACHINE_TYPE architecture. Please open request for it at https://github.com/serverless/serverless/issues.$reset"
   exit 1

From eb8f474940c4cd69f08ec062adfaa15d62d81ee2 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 30 Nov 2021 21:12:38 +0100
Subject: [PATCH 0755/1101] feat(Standalone): Use Node 16 as base for binaries

---
 package.json         | 2 +-
 scripts/pkg/build.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 198ce1bb499..ca8fd6db29f 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "mocha": "^8.4.0",
     "mock-require": "^3.0.3",
     "nyc": "^15.1.0",
-    "pkg": "^4.5.1",
+    "pkg": "^5.5.1",
     "prettier": "^2.5.0",
     "proxyquire": "^2.1.3",
     "semver-regex": "^3.1.3",
diff --git a/scripts/pkg/build.js b/scripts/pkg/build.js
index 707f32fe26f..8620c2ffe89 100755
--- a/scripts/pkg/build.js
+++ b/scripts/pkg/build.js
@@ -31,7 +31,7 @@ const spawnOptions = { cwd: serverlessPath, stdio: 'inherit' };
         '-c',
         'scripts/pkg/config.js',
         '--targets',
-        'node14-linux-x64,node14-mac-x64,node14-win-x64',
+        'node16-linux-x64,node16-mac-x64,node16-win-x64',
         '--out-path',
         'dist',
         'bin/serverless.js',

From b8cc13f502b89765a67629a7354c1b27503b8956 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 30 Nov 2021 21:13:07 +0100
Subject: [PATCH 0756/1101] ci: Use Node 16 as main Node version

---
 .github/workflows/integrate.yml | 36 ++++++++++++++++-----------------
 .github/workflows/publish.yml   | 12 +++++------
 .github/workflows/validate.yml  | 36 ++++++++++++++++-----------------
 3 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
index d0ed62df4cf..50ab8484174 100644
--- a/.github/workflows/integrate.yml
+++ b/.github/workflows/integrate.yml
@@ -11,8 +11,8 @@ env:
   FORCE_COLOR: 1
 
 jobs:
-  linuxNode14:
-    name: '[Linux] Node.js 14: Publish canary, Unit & packaging tests '
+  linuxNode16:
+    name: '[Linux] Node.js 16: Publish canary, Unit & packaging tests '
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -21,7 +21,7 @@ jobs:
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
           registry-url: https://registry.npmjs.org
 
       - name: Publish canary
@@ -41,8 +41,8 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
-          restore-keys: npm-v14-${{ runner.os }}-${{ github.ref }}-
+          key: npm-v16-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          restore-keys: npm-v16-${{ runner.os }}-${{ github.ref }}-
 
       - name: Install dependencies
         if: steps.cacheNpm.outputs.cache-hit != 'true'
@@ -56,8 +56,8 @@ jobs:
       - name: Packaging tests
         run: npm run integration-test-run-package
 
-  windowsNode14:
-    name: '[Windows] Node.js v14: Unit tests'
+  windowsNode16:
+    name: '[Windows] Node.js v16: Unit tests'
     runs-on: windows-latest
     steps:
       - name: Checkout repository
@@ -70,13 +70,13 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
-          restore-keys: npm-v14-${{ runner.os }}-${{ github.ref }}-
+          key: npm-v16-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          restore-keys: npm-v16-${{ runner.os }}-${{ github.ref }}-
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
 
       - name: Install dependencies
         if: steps.cacheNpm.outputs.cache-hit != 'true'
@@ -86,8 +86,8 @@ jobs:
       - name: Unit tests
         run: npm test -- -b
 
-  linuxNode16:
-    name: '[Linux] Node.js 16: Isolated unit tests'
+  linuxNode14:
+    name: '[Linux] Node.js 14: Isolated unit tests'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -100,13 +100,13 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v16-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
-          restore-keys: npm-v16-${{ runner.os }}-${{ github.ref }}-
+          key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          restore-keys: npm-v14-${{ runner.os }}-${{ github.ref }}-
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 16.x
+          node-version: 14.x
 
       - name: Install dependencies
         if: steps.cacheNpm.outputs.cache-hit != 'true'
@@ -187,7 +187,7 @@ jobs:
   integrate:
     name: Integrate
     runs-on: ubuntu-latest
-    needs: [linuxNode14, windowsNode14, linuxNode16, linuxNode12, linuxNode10]
+    needs: [linuxNode16, windowsNode16, linuxNode14, linuxNode12, linuxNode10]
     timeout-minutes: 30 # Default is 360
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -211,7 +211,7 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          key: npm-v16-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
 
       # Potentially needed for test/integration/curated-plugins-python.test.js
       # (current GA runtime comes with Python 3.8 preinstalled, but that might be subject to changes)
@@ -222,7 +222,7 @@ jobs:
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
 
       # Note: No need to install dependencies as we have retrieved cached `node_modules` for very
       #       same `package.json` as stored with previous job
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index a070aafe4a5..ead46dddbdf 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -21,12 +21,12 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          key: npm-v16-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
           registry-url: https://registry.npmjs.org
 
       - name: Install dependencies
@@ -68,12 +68,12 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v14-${{ runner.os }}-refs/heads/master-${{ hashFiles('package.json') }}
+          key: npm-v16-${{ runner.os }}-refs/heads/master-${{ hashFiles('package.json') }}
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
           registry-url: https://registry.npmjs.org
 
       # Normally we have a guarantee that deps are already there, still it may not be the case when:
@@ -126,12 +126,12 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v14-${{ runner.os }}-refs/heads/master-${{ hashFiles('package.json') }}
+          key: npm-v16-${{ runner.os }}-refs/heads/master-${{ hashFiles('package.json') }}
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
           registry-url: https://registry.npmjs.org
 
       # Note: No need to install dependencies as we have retrieved cached `node_modules` for very
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index db763c01e99..97bd87a63be 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -11,8 +11,8 @@ env:
   FORCE_COLOR: 1
 
 jobs:
-  linuxNode14:
-    name: '[Linux] Node.js 14: Lint, Formatting, Eventual Commitlint, Eventual Changelog, Unit & packaging tests'
+  linuxNode16:
+    name: '[Linux] Node.js 16: Lint, Formatting, Eventual Commitlint, Eventual Changelog, Unit & packaging tests'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -36,15 +36,15 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          key: npm-v16-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
           restore-keys: |
-            npm-v14-${{ runner.os }}-${{ github.ref }}-
-            npm-v14-${{ runner.os }}-refs/heads/master-
+            npm-v16-${{ runner.os }}-${{ github.ref }}-
+            npm-v16-${{ runner.os }}-refs/heads/master-
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
 
       - name: Install dependencies
         if: steps.cacheNpm.outputs.cache-hit != 'true'
@@ -72,8 +72,8 @@ jobs:
       - name: Packaging tests
         run: npm run integration-test-run-package
 
-  windowsNode14:
-    name: '[Windows] Node.js v14: Unit tests'
+  windowsNode16:
+    name: '[Windows] Node.js v16: Unit tests'
     runs-on: windows-latest
     steps:
       - name: Checkout repository
@@ -86,15 +86,15 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          key: npm-v16-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
           restore-keys: |
-            npm-v14-${{ runner.os }}-${{ github.ref }}-
-            npm-v14-${{ runner.os }}-refs/heads/master-
+            npm-v16-${{ runner.os }}-${{ github.ref }}-
+            npm-v16-${{ runner.os }}-refs/heads/master-
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
 
       - name: Install dependencies
         if: steps.cacheNpm.outputs.cache-hit != 'true'
@@ -104,8 +104,8 @@ jobs:
       - name: Unit tests
         run: npm test -- -b
 
-  linuxNode16:
-    name: '[Linux] Node.js 16: Isolated unit tests'
+  linuxNode14:
+    name: '[Linux] Node.js 14: Isolated unit tests'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -118,15 +118,15 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v16-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
           restore-keys: |
-            npm-v16-${{ runner.os }}-${{ github.ref }}-
-            npm-v16-${{ runner.os }}-refs/heads/master-
+            npm-v14-${{ runner.os }}-${{ github.ref }}-
+            npm-v14-${{ runner.os }}-refs/heads/master-
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 16.x
+          node-version: 14.x
 
       - name: Install dependencies
         if: steps.cacheNpm.outputs.cache-hit != 'true'

From 2485c7efcc4f6f5b1d65b56d4d0d71297d113fa5 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 9 Dec 2021 15:36:59 +0100
Subject: [PATCH 0757/1101] fix(AWS Deploy): Recognize all boolean values at
 `provider.disableRollback`

---
 lib/plugins/aws/provider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index c5b7a7d2914..70654907d4a 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -850,7 +850,7 @@ class AwsProvider {
             },
             deploymentPrefix: { type: 'string' },
             disableDefaultOutputExportNames: { const: true },
-            disableRollback: { const: true },
+            disableRollback: { type: 'boolean' },
             endpointType: {
               anyOf: ['REGIONAL', 'EDGE', 'PRIVATE'].map(caseInsensitive),
             },

From ef1ed0a92d34767ad2a4808e93d7c3adaf2c2c50 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 9 Dec 2021 15:41:00 +0100
Subject: [PATCH 0758/1101] feat(AWS HTTP API) : Allow
 `shouldStartNameWithService: false`

---
 lib/plugins/aws/provider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 70654907d4a..68abf34425e 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -943,7 +943,7 @@ class AwsProvider {
                 metrics: { type: 'boolean' },
                 useProviderTags: { const: true },
                 disableDefaultEndpoint: { type: 'boolean' },
-                shouldStartNameWithService: { const: true },
+                shouldStartNameWithService: { type: 'boolean' },
               },
               additionalProperties: false,
             },

From f64f7c68abb1d6837ecaa6173f4b605cf3975acf Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 9 Dec 2021 15:41:44 +0100
Subject: [PATCH 0759/1101] feat(AWS API Gateway) : Allow
 `shouldStartNameWithService: false`

---
 lib/plugins/aws/provider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 68abf34425e..b35e9e35692 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -736,7 +736,7 @@ class AwsProvider {
                   },
                   additionalProperties: false,
                 },
-                shouldStartNameWithService: { const: true },
+                shouldStartNameWithService: { type: 'boolean' },
                 usagePlan: {
                   anyOf: [
                     apiGatewayUsagePlan,

From 04fac5ffbdfeeba62a4b2095488e0e1ff43414e3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 9 Dec 2021 16:47:22 +0100
Subject: [PATCH 0760/1101] test: Title cleanup

---
 .../lib/plugins/aws/package/compile/events/cloudFront.test.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
index 524c2a80456..902ed1f032b 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
@@ -1624,7 +1624,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js',
       });
     });
 
-    it('should not show preconfigured notice on "sls remove" if service doesn\'t have  cloudFront event', async () => {
+    it('should not show preconfigured notice on "sls remove" if service doesn\'t have cloudFront event', async () => {
       // Replaces
       // https://github.com/serverless/serverless/blob/85e480b5771d5deeb45ae5eb586723c26cf61a90/lib/plugins/aws/package/compile/events/cloudFront/index.test.js#L113-L118
 

From 320722c146b7ac4b7c6d1b799d8e723027193d30 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 9 Dec 2021 17:18:30 +0100
Subject: [PATCH 0761/1101] test(AWS SQS): Prepare tests refactor plan

---
 .../aws/package/compile/events/sqs.test.js    | 457 +++++-------------
 1 file changed, 123 insertions(+), 334 deletions(-)

diff --git a/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js b/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
index 7525676e54d..2cf7ecf279f 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
@@ -32,272 +32,7 @@ describe('AwsCompileSQSEvents', () => {
     awsCompileSQSEvents.serverless.service.service = 'new-service';
   });
 
-  describe('#constructor()', () => {
-    it('should set the provider variable to be an instance of AwsProvider', () =>
-      expect(awsCompileSQSEvents.provider).to.be.instanceof(AwsProvider));
-  });
-
   describe('#compileSQSEvents()', () => {
-    it('should not throw error or merge role statements if default policy is not present', () => {
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              sqs: 'arn:aws:sqs:region:account:queueName',
-            },
-          ],
-        },
-      };
-
-      // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
-        null;
-
-      expect(() => {
-        awsCompileSQSEvents.compileSQSEvents();
-      }).to.not.throw(Error);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .IamRoleLambdaExecution
-      ).to.equal(null);
-    });
-
-    it('should not throw error if custom IAM role is set in function', () => {
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          role: 'arn:aws:iam::account:role/foo',
-          events: [
-            {
-              sqs: 'arn:aws:sqs:region:account:MyQueue',
-            },
-          ],
-        },
-      };
-
-      // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
-        null;
-
-      expect(() => {
-        awsCompileSQSEvents.compileSQSEvents();
-      }).to.not.throw(Error);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn
-      ).to.be.instanceof(Array);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn.length
-      ).to.equal(0);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .IamRoleLambdaExecution
-      ).to.equal(null);
-    });
-
-    it('should not throw error if custom IAM role name reference is set in function', () => {
-      const roleLogicalId = 'RoleLogicalId';
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          role: roleLogicalId,
-          events: [
-            {
-              sqs: 'arn:aws:sqs:region:account:MyQueue',
-            },
-          ],
-        },
-      };
-
-      // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
-        null;
-
-      expect(() => {
-        awsCompileSQSEvents.compileSQSEvents();
-      }).to.not.throw(Error);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn
-      ).to.include(roleLogicalId);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn
-      ).to.have.lengthOf(1);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .IamRoleLambdaExecution
-      ).to.equal(null);
-    });
-
-    it('should not throw error if custom IAM role reference is set in function', () => {
-      const roleLogicalId = 'RoleLogicalId';
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          role: { 'Fn::GetAtt': [roleLogicalId, 'Arn'] },
-          events: [
-            {
-              sqs: 'arn:aws:sqs:region:account:MyQueue',
-            },
-          ],
-        },
-      };
-
-      // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
-        null;
-
-      expect(() => {
-        awsCompileSQSEvents.compileSQSEvents();
-      }).to.not.throw(Error);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn
-      ).to.include(roleLogicalId);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn
-      ).to.have.lengthOf(1);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .IamRoleLambdaExecution
-      ).to.equal(null);
-    });
-
-    it('should not throw error if custom IAM role is set in provider', () => {
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              sqs: 'arn:aws:sqs:region:account:MyQueue',
-            },
-          ],
-        },
-      };
-
-      // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
-        null;
-
-      awsCompileSQSEvents.serverless.service.provider.role = 'arn:aws:iam::account:role/foo';
-
-      expect(() => {
-        awsCompileSQSEvents.compileSQSEvents();
-      }).to.not.throw(Error);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn
-      ).to.be.instanceof(Array);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn.length
-      ).to.equal(0);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .IamRoleLambdaExecution
-      ).to.equal(null);
-    });
-
-    it('should not throw error if IAM role is imported', () => {
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          role: { 'Fn::ImportValue': 'ExportedRoleId' },
-          events: [
-            {
-              sqs: 'arn:aws:sqs:region:account:MyQueue',
-            },
-          ],
-        },
-      };
-
-      // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
-        null;
-
-      expect(() => {
-        awsCompileSQSEvents.compileSQSEvents();
-      }).to.not.throw(Error);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn.length
-      ).to.equal(0);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .IamRoleLambdaExecution
-      ).to.equal(null);
-    });
-
-    it('should not throw error if custom IAM role reference is set in provider', () => {
-      const roleLogicalId = 'RoleLogicalId';
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              sqs: 'arn:aws:sqs:region:account:MyQueue',
-            },
-          ],
-        },
-      };
-
-      // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
-        null;
-
-      awsCompileSQSEvents.serverless.service.provider.role = {
-        'Fn::GetAtt': [roleLogicalId, 'Arn'],
-      };
-
-      expect(() => {
-        awsCompileSQSEvents.compileSQSEvents();
-      }).to.not.throw(Error);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn
-      ).to.include(roleLogicalId);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn
-      ).to.have.lengthOf(1);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .IamRoleLambdaExecution
-      ).to.equal(null);
-    });
-
-    it('should not throw error if custom IAM role name reference is set in provider', () => {
-      const roleLogicalId = 'RoleLogicalId';
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              sqs: 'arn:aws:sqs:region:account:MyQueue',
-            },
-          ],
-        },
-      };
-
-      // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
-        null;
-
-      awsCompileSQSEvents.serverless.service.provider.role = roleLogicalId;
-
-      expect(() => {
-        awsCompileSQSEvents.compileSQSEvents();
-      }).to.not.throw(Error);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn
-      ).to.include(roleLogicalId);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn
-      ).to.have.lengthOf(1);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .IamRoleLambdaExecution
-      ).to.equal(null);
-    });
-
     describe('when a queue ARN is given', () => {
       it('should create event source mappings when a queue ARN is given', () => {
         awsCompileSQSEvents.serverless.service.functions = {
@@ -541,38 +276,6 @@ describe('AwsCompileSQSEvents', () => {
       });
     });
 
-    it('should not create event source mapping when sqs events are not given', () => {
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          events: [],
-        },
-      };
-
-      awsCompileSQSEvents.compileSQSEvents();
-
-      // should be 1 because we've mocked the IamRoleLambdaExecution above
-      expect(
-        Object.keys(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-        ).length
-      ).to.equal(1);
-    });
-
-    it('should not add the IAM role statements when sqs events are not given', () => {
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          events: [],
-        },
-      };
-
-      awsCompileSQSEvents.compileSQSEvents();
-
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement.length
-      ).to.equal(0);
-    });
-
     it('should remove all non-alphanumerics from queue names for the resource logical ids', () => {
       awsCompileSQSEvents.serverless.service.functions = {
         first: {
@@ -593,7 +296,129 @@ describe('AwsCompileSQSEvents', () => {
   });
 });
 
-describe('AwsCompileSQSEvents #2', () => {
+describe('test/unit/lib/plugins/aws/package/compile/events/sqs.test.js', () => {
+  describe('regular configuration', () => {
+    let eventSourceMappingResource;
+
+    before(async () => {
+      const { awsNaming, cfTemplate } = await runServerless({
+        fixture: 'function',
+        configExt: {
+          functions: {
+            basic: {
+              events: [
+                {
+                  sqs: {
+                    arn: 'arn:aws:sqs:region:account:some-queue-name',
+                    batchSize: 10,
+                    maximumBatchingWindow: 100,
+                    functionResponseType: 'ReportBatchItemFailures',
+                  },
+                },
+              ],
+            },
+            directArn: {
+              handler: 'basic.handler',
+              events: [{ sqs: 'arn:aws:sqs:region:account:MyQueue' }],
+            },
+            arnCfGetAtt: {
+              handler: 'basic.handler',
+              events: [{ sqs: { arn: { 'Fn::GetAtt': ['SomeQueue', 'Arn'] } } }],
+            },
+            arnCfImport: {
+              handler: 'basic.handler',
+              events: [{ sqs: { arn: { 'Fn::ImportValue': 'ForeignQueue' } } }],
+            },
+            arnCfJoin: {
+              handler: 'basic.handler',
+              events: [
+                {
+                  sqs: {
+                    arn: {
+                      'Fn::Join': [
+                        ':',
+                        [
+                          'arn',
+                          'aws',
+                          'sqs',
+                          {
+                            Ref: 'AWS::Region',
+                          },
+                          {
+                            Ref: 'AWS::AccountId',
+                          },
+                          'MyQueue',
+                        ],
+                      ],
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        },
+        command: 'package',
+      });
+      const queueLogicalId = awsNaming.getQueueLogicalId('basic', 'some-queue-name');
+      eventSourceMappingResource = cfTemplate.Resources[queueLogicalId];
+    });
+
+    it.skip('TODO: should suport direct ARN string', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js#L302-L405
+      //
+      // Confirm effect of functions.directArn.events[0].sqs`
+    });
+
+    it.skip('TODO: should suport `arn` (string)', () => {
+      // Replaces
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js#L302-L405 (partially)
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js#L576-L593
+      // Confirm effect of `functions.basic.events[0].sqs.arn`
+    });
+
+    it.skip('TODO: should suport `arn` (CF Fn::GetAtt)', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js#L407-L508
+      //
+      // Confirm effect of `functions.arnCfGetAtt.events[0].sqs.arn`
+    });
+
+    it.skip('TODO: should suport `arn` (CF Fn::ImportValue)', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js#L407-L508
+      //
+      // Confirm effect of `functions.arnCfImport.events[0].sqs.arn`
+    });
+
+    it.skip('TODO: should suport `arn` (CF Fn::Join)', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js#L407-L508
+      //
+      // Confirm effect of `functions.arnCfJoin.events[0].sqs.arn`
+    });
+
+    it.skip('TODO: should suport `batchSize`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js#L302-L405
+      //
+      // Confirm effect  of`functions.basic.events[0].sqs.batchSize`
+    });
+
+    it('should suport `functionResponseType`', () => {
+      expect(eventSourceMappingResource.Properties.FunctionResponseTypes).to.include.members([
+        'ReportBatchItemFailures',
+      ]);
+    });
+
+    it.skip('TODO: should ensure necessary IAM statememnts', () => {
+      // Replaces
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js#L510-L542
+      //
+      // Confirm expected IAM statements on final role
+    });
+  });
+
   describe('with provisioned concurrency', () => {
     let naming;
     let eventSourceMappingResource;
@@ -690,39 +515,3 @@ describe('AwsCompileSQSEvents #2', () => {
     expect(eventSourceMappingResource.DependsOn).to.deep.equal([]);
   });
 });
-
-describe('regular configuration', () => {
-  let eventSourceMappingResource;
-
-  before(async () => {
-    const { awsNaming, cfTemplate } = await runServerless({
-      fixture: 'function',
-      configExt: {
-        functions: {
-          basic: {
-            provisionedConcurrency: 1,
-            events: [
-              {
-                sqs: {
-                  arn: 'arn:aws:sqs:region:account:MyQueue',
-                  batchSize: 10,
-                  maximumBatchingWindow: 100,
-                  functionResponseType: 'ReportBatchItemFailures',
-                },
-              },
-            ],
-          },
-        },
-      },
-      command: 'package',
-    });
-    const queueLogicalId = awsNaming.getQueueLogicalId('basic', 'MyQueue');
-    eventSourceMappingResource = cfTemplate.Resources[queueLogicalId];
-  });
-
-  it('should use functionResponseType', () => {
-    expect(eventSourceMappingResource.Properties.FunctionResponseTypes).to.include.members([
-      'ReportBatchItemFailures',
-    ]);
-  });
-});

From 68fade814f998d7fe37cad03d75127a465b58926 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 9 Dec 2021 17:31:06 +0100
Subject: [PATCH 0762/1101] test(AWS Stream): Optimise tests

---
 .../aws/package/compile/events/stream.test.js | 158 +++++-------------
 1 file changed, 40 insertions(+), 118 deletions(-)

diff --git a/test/unit/lib/plugins/aws/package/compile/events/stream.test.js b/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
index 6b640a4122d..8dcfcf7a148 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
@@ -1591,49 +1591,8 @@ describe('AwsCompileStreamEvents', () => {
   });
 });
 
-describe('AwsCompileStreamEvents #2', () => {
-  describe('with provisioned concurrency', () => {
-    let naming;
-    let eventSourceMappingResource;
-
-    before(async () => {
-      const { awsNaming, cfTemplate } = await runServerless({
-        fixture: 'function',
-        configExt: {
-          functions: {
-            basic: {
-              provisionedConcurrency: 1,
-              events: [{ stream: 'arn:aws:kinesis:us-east-1:123456789012:stream/myStream' }],
-            },
-          },
-        },
-        command: 'package',
-      });
-      naming = awsNaming;
-      const streamLogicalId = awsNaming.getStreamLogicalId('basic', 'kinesis', 'myStream');
-      eventSourceMappingResource = cfTemplate.Resources[streamLogicalId];
-    });
-
-    it('should reference provisioned alias', () => {
-      expect(eventSourceMappingResource.Properties.FunctionName).to.deep.equal({
-        'Fn::Join': [
-          ':',
-          [
-            {
-              'Fn::GetAtt': ['BasicLambdaFunction', 'Arn'],
-            },
-            'provisioned',
-          ],
-        ],
-      });
-    });
-
-    it('should depend on provisioned alias', () => {
-      const aliasLogicalId = naming.getLambdaProvisionedConcurrencyAliasLogicalId('basic');
-      expect(eventSourceMappingResource.DependsOn).to.include(aliasLogicalId);
-    });
-  });
-  describe('with custom checkpoint enabled', () => {
+describe('test/unit/lib/plugins/aws/package/compile/events/stream.test.js', () => {
+  describe('regular', () => {
     let eventSourceMappingResource;
 
     before(async () => {
@@ -1647,6 +1606,8 @@ describe('AwsCompileStreamEvents #2', () => {
                   stream: {
                     arn: 'arn:aws:kinesis:us-east-1:123456789012:stream/myStream',
                     functionResponseType: 'ReportBatchItemFailures',
+                    tumblingWindowInSeconds: 30,
+                    filterPatterns: [{ eventName: ['INSERT'] }, { eventName: ['MODIFY'] }],
                   },
                 },
               ],
@@ -1659,72 +1620,32 @@ describe('AwsCompileStreamEvents #2', () => {
       eventSourceMappingResource = cfTemplate.Resources[streamLogicalId];
     });
 
-    it('should use functionResponseTypes', () => {
+    it('should support `functionResponseType`', () => {
       expect(eventSourceMappingResource.Properties.FunctionResponseTypes).to.include.members([
         'ReportBatchItemFailures',
       ]);
     });
-  });
-  describe('with TumblingWindowInSeconds enabled', () => {
-    let eventSourceMappingKinesisResource;
-    let eventSourceMappingDynamoDBResource;
-    let eventSourceMappingNoTumblingResource;
 
-    before(async () => {
-      const { awsNaming, cfTemplate } = await runServerless({
-        fixture: 'function',
-        configExt: {
-          functions: {
-            basic: {
-              events: [
-                {
-                  stream: {
-                    arn: 'arn:aws:kinesis:us-east-1:123456789012:stream/myKinesisStream',
-                    tumblingWindowInSeconds: 30,
-                  },
-                },
-                {
-                  stream: {
-                    arn: 'arn:aws:dynamodb:region:account:table/myDDBstream/stream/1',
-                    tumblingWindowInSeconds: 50,
-                  },
-                },
-                {
-                  stream: {
-                    arn: 'arn:aws:dynamodb:region:account:table/noTumblingStream/stream/1',
-                  },
-                },
-              ],
-            },
-          },
-        },
-        command: 'package',
-      });
-      const kinesisLogicalId = awsNaming.getStreamLogicalId('basic', 'kinesis', 'myKinesisStream');
-      const dynamoLogicalId = awsNaming.getStreamLogicalId('basic', 'dynamodb', 'myDDBstream');
-      const noTumblingLogicalId = awsNaming.getStreamLogicalId(
-        'basic',
-        'dynamodb',
-        'noTumblingStream'
-      );
-
-      eventSourceMappingKinesisResource = cfTemplate.Resources[kinesisLogicalId];
-      eventSourceMappingDynamoDBResource = cfTemplate.Resources[dynamoLogicalId];
-      eventSourceMappingNoTumblingResource = cfTemplate.Resources[noTumblingLogicalId];
-    });
-
-    it('should have TumblingWindowInSeconds property', () => {
-      expect(eventSourceMappingKinesisResource.Properties.TumblingWindowInSeconds).to.equal(30);
-      expect(eventSourceMappingDynamoDBResource.Properties.TumblingWindowInSeconds).to.equal(50);
+    it('should support `tumblingWindowInSeconds`', () => {
+      expect(eventSourceMappingResource.Properties.TumblingWindowInSeconds).to.equal(30);
     });
 
-    it('should not have TumblingWindowInSeconds property', () => {
-      expect(eventSourceMappingNoTumblingResource.Properties).to.not.have.property(
-        'TumblingWindowInSeconds'
-      );
+    it('should support `filterPatterns`', () => {
+      expect(eventSourceMappingResource.Properties.FilterCriteria).to.deep.equal({
+        Filters: [
+          {
+            Pattern: JSON.stringify({ eventName: ['INSERT'] }),
+          },
+          {
+            Pattern: JSON.stringify({ eventName: ['MODIFY'] }),
+          },
+        ],
+      });
     });
   });
-  describe('with filterPatterns', () => {
+
+  describe('with provisioned concurrency', () => {
+    let naming;
     let eventSourceMappingResource;
 
     before(async () => {
@@ -1733,34 +1654,35 @@ describe('AwsCompileStreamEvents #2', () => {
         configExt: {
           functions: {
             basic: {
-              events: [
-                {
-                  stream: {
-                    arn: 'arn:aws:dynamodb:region:account:table/foo/stream/1',
-                    filterPatterns: [{ eventName: ['INSERT'] }, { eventName: ['MODIFY'] }],
-                  },
-                },
-              ],
+              provisionedConcurrency: 1,
+              events: [{ stream: 'arn:aws:kinesis:us-east-1:123456789012:stream/myStream' }],
             },
           },
         },
         command: 'package',
       });
-      const streamLogicalId = awsNaming.getStreamLogicalId('basic', 'dynamodb', 'foo');
+      naming = awsNaming;
+      const streamLogicalId = awsNaming.getStreamLogicalId('basic', 'kinesis', 'myStream');
       eventSourceMappingResource = cfTemplate.Resources[streamLogicalId];
     });
 
-    it('should wrap patterns within FilterCriteria property', () => {
-      expect(eventSourceMappingResource.Properties.FilterCriteria).to.deep.equal({
-        Filters: [
-          {
-            Pattern: JSON.stringify({ eventName: ['INSERT'] }),
-          },
-          {
-            Pattern: JSON.stringify({ eventName: ['MODIFY'] }),
-          },
+    it('should reference provisioned alias', () => {
+      expect(eventSourceMappingResource.Properties.FunctionName).to.deep.equal({
+        'Fn::Join': [
+          ':',
+          [
+            {
+              'Fn::GetAtt': ['BasicLambdaFunction', 'Arn'],
+            },
+            'provisioned',
+          ],
         ],
       });
     });
+
+    it('should depend on provisioned alias', () => {
+      const aliasLogicalId = naming.getLambdaProvisionedConcurrencyAliasLogicalId('basic');
+      expect(eventSourceMappingResource.DependsOn).to.include(aliasLogicalId);
+    });
   });
 });

From e7c58f3c4fbfe46ca483bf23247fb30ff2db617a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 10 Dec 2021 15:12:44 +0100
Subject: [PATCH 0763/1101] test(AWS Stream): Prepare tests refactor plan

---
 .../aws/package/compile/events/stream.test.js | 527 +++++++++++++-----
 1 file changed, 377 insertions(+), 150 deletions(-)

diff --git a/test/unit/lib/plugins/aws/package/compile/events/stream.test.js b/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
index 8dcfcf7a148..08fa07a2f23 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
@@ -32,58 +32,7 @@ describe('AwsCompileStreamEvents', () => {
     awsCompileStreamEvents.serverless.service.service = 'new-service';
   });
 
-  describe('#constructor()', () => {
-    it('should set the provider variable to be an instance of AwsProvider', () =>
-      expect(awsCompileStreamEvents.provider).to.be.instanceof(AwsProvider));
-  });
-
   describe('#compileStreamEvents()', () => {
-    it('should throw an error if the "consumer" property is not a string, object, or boolean', () => {
-      awsCompileStreamEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              stream: {
-                type: 'kinesis',
-                arn: 'arn:aws:kinesis:us-east-1:123456789012:stream/myStream',
-                consumer: 42,
-              },
-            },
-          ],
-        },
-      };
-    });
-
-    it('should throw an error if stream event type is not a string or an object', () => {
-      awsCompileStreamEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              stream: 42,
-            },
-          ],
-        },
-      };
-
-      expect(() => awsCompileStreamEvents.compileStreamEvents()).to.throw(Error);
-    });
-
-    it('should throw an error if the "arn" property is not given', () => {
-      awsCompileStreamEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              stream: {
-                arn: null,
-              },
-            },
-          ],
-        },
-      };
-
-      expect(() => awsCompileStreamEvents.compileStreamEvents()).to.throw(Error);
-    });
-
     it('should not throw error or merge role statements if default policy is not present', () => {
       awsCompileStreamEvents.serverless.service.functions = {
         first: {
@@ -989,70 +938,6 @@ describe('AwsCompileStreamEvents', () => {
         expect(() => awsCompileStreamEvents.compileStreamEvents()).to.throw(Error);
       });
 
-      it('fails if onFailure ARN is given as a variable type other than string or object', () => {
-        awsCompileStreamEvents.serverless.service.functions = {
-          first: {
-            events: [
-              {
-                stream: {
-                  arn: 'arn:aws:dynamodb:region:account:table/foo/stream/1',
-                  destinations: {
-                    onFailure: 3,
-                  },
-                },
-              },
-            ],
-          },
-        };
-
-        expect(() => awsCompileStreamEvents.compileStreamEvents()).to.throw(Error);
-      });
-
-      it('fails if no arn key is given for a dynamic onFailure ARN', () => {
-        awsCompileStreamEvents.serverless.service.functions = {
-          first: {
-            events: [
-              {
-                stream: {
-                  arn: 'arn:aws:dynamodb:region:account:table/foo/stream/1',
-                  destinations: {
-                    onFailure: {
-                      notarn: ['SomeSNS', 'Arn'],
-                    },
-                  },
-                },
-              },
-            ],
-          },
-        };
-
-        expect(() => awsCompileStreamEvents.compileStreamEvents()).to.throw(Error);
-      });
-
-      it('fails if destinations structure is wrong', () => {
-        awsCompileStreamEvents.serverless.service.functions = {
-          first: {
-            events: [
-              {
-                stream: {
-                  arn: 'arn:aws:dynamodb:region:account:table/foo/stream/1',
-                  destinations: {
-                    notOnFailure: {
-                      arn: {
-                        'Fn::GetAtt': ['SomeSNS', 'Arn'],
-                        'batchSize': 1,
-                      },
-                    },
-                  },
-                },
-              },
-            ],
-          },
-        };
-
-        expect(() => awsCompileStreamEvents.compileStreamEvents()).to.throw(Error);
-      });
-
       it('should add the necessary IAM role statements', () => {
         awsCompileStreamEvents.serverless.service.functions = {
           first: {
@@ -1538,39 +1423,6 @@ describe('AwsCompileStreamEvents', () => {
       });
     });
 
-    it('should not create event source mapping when stream events are not given', () => {
-      awsCompileStreamEvents.serverless.service.functions = {
-        first: {
-          events: [],
-        },
-      };
-
-      awsCompileStreamEvents.compileStreamEvents();
-
-      // should be 1 because we've mocked the IamRoleLambdaExecution above
-      expect(
-        Object.keys(
-          awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate
-            .Resources
-        ).length
-      ).to.equal(1);
-    });
-
-    it('should not add the IAM role statements when stream events are not given', () => {
-      awsCompileStreamEvents.serverless.service.functions = {
-        first: {
-          events: [],
-        },
-      };
-
-      awsCompileStreamEvents.compileStreamEvents();
-
-      expect(
-        awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement.length
-      ).to.equal(0);
-    });
-
     it('should remove all non-alphanumerics from stream names for the resource logical ids', () => {
       awsCompileStreamEvents.serverless.service.functions = {
         first: {
@@ -1604,10 +1456,170 @@ describe('test/unit/lib/plugins/aws/package/compile/events/stream.test.js', () =
               events: [
                 {
                   stream: {
-                    arn: 'arn:aws:kinesis:us-east-1:123456789012:stream/myStream',
+                    arn: 'arn:aws:kinesis:us-east-1:123456789012:stream/some-long-name',
                     functionResponseType: 'ReportBatchItemFailures',
                     tumblingWindowInSeconds: 30,
                     filterPatterns: [{ eventName: ['INSERT'] }, { eventName: ['MODIFY'] }],
+                    parallelizationFactor: 10,
+                    bisectBatchOnFunctionError: true,
+                    consumer: true,
+                  },
+                },
+              ],
+            },
+            dynamo: {
+              handler: 'basic.handler',
+              events: [
+                {
+                  stream: {
+                    arn: 'arn:aws:dynamodb:region:account:table/foo/stream/1',
+                    batchSize: 1,
+                    startingPosition: 'LATEST',
+                    enabled: false,
+                    batchWindow: 15,
+                    maximumRetryAttempts: 4,
+                    maximumRecordAgeInSeconds: 120,
+                    destinations: {
+                      onFailure: 'arn:aws:sns:region:account:snstopic',
+                    },
+                  },
+                },
+              ],
+            },
+            kinesisImportCustomIam: {
+              handler: 'basic.handler',
+              role: {
+                'Fn::Sub': 'arn:aws:iam::${AWS::AccountId}:role/iam-role-name',
+              },
+              events: [
+                {
+                  stream: {
+                    arn: { 'Fn::ImportValue': 'ForeignKinesis' },
+                    type: 'kinesis',
+                    consumer:
+                      'arn:aws:kinesis:region:account:stream/xyz/consumer/foobar:1558544531',
+                  },
+                },
+              ],
+            },
+            arnVariants: {
+              handler: 'basic.handler',
+              events: [
+                {
+                  stream: {
+                    arn: { 'Fn::GetAtt': ['SomeDdbTable', 'StreamArn'] },
+                    type: 'dynamodb',
+                    destinations: {
+                      onFailure: {
+                        arn: { 'Fn::ImportValue': 'ForeignSQS' },
+                        type: 'sqs',
+                      },
+                    },
+                  },
+                },
+                {
+                  stream: {
+                    arn: {
+                      'Fn::Join': [
+                        ':',
+                        [
+                          'arn',
+                          'aws',
+                          'kinesis',
+                          {
+                            Ref: 'AWS::Region',
+                          },
+                          {
+                            Ref: 'AWS::AccountId',
+                          },
+                          'stream/MyStream',
+                        ],
+                      ],
+                    },
+                    type: 'kinesis',
+                  },
+                },
+                {
+                  stream: {
+                    arn: { Ref: 'SomeDdbTableStreamArn' },
+                    type: 'dynamodb',
+                    destinations: {
+                      onFailure: {
+                        arn: { 'Fn::ImportValue': 'ForeignSQS' },
+                        type: 'sqs',
+                      },
+                    },
+                  },
+                },
+                {
+                  stream: {
+                    arn: { Ref: 'ForeignKinesisStreamArn' },
+                    type: 'kinesis',
+                  },
+                },
+              ],
+            },
+            destinationVariants: {
+              handler: 'basic.handler',
+              events: [
+                {
+                  stream: {
+                    arn: 'arn:aws:dynamodb:region:account:table/foo/stream/1',
+                    destinations: {
+                      onFailure: {
+                        arn: { 'Fn::GetAtt': ['SomeSNS', 'Arn'] },
+                        type: 'sns',
+                      },
+                    },
+                  },
+                },
+                {
+                  stream: {
+                    arn: 'arn:aws:dynamodb:region:account:table/foo/stream/1',
+                    destinations: {
+                      onFailure: {
+                        arn: {
+                          'Fn::Join': [
+                            ':',
+                            [
+                              'arn',
+                              'aws',
+                              'sqs',
+                              {
+                                Ref: 'AWS::Region',
+                              },
+                              {
+                                Ref: 'AWS::AccountId',
+                              },
+                              'MyQueue',
+                            ],
+                          ],
+                        },
+                        type: 'sqs',
+                      },
+                    },
+                  },
+                },
+                {
+                  stream: {
+                    arn: 'arn:aws:dynamodb:region:account:table/buzz/stream/1',
+                    destinations: {
+                      onFailure: {
+                        arn: { Ref: 'SomeSNSArn' },
+                        type: 'sns',
+                      },
+                    },
+                  },
+                },
+                {
+                  stream: {
+                    arn: 'arn:aws:dynamodb:region:account:table/fizz/stream/1',
+                    destinations: {
+                      onFailure: {
+                        arn: { Ref: 'ForeignSQSArn' },
+                        type: 'sqs',
+                      },
+                    },
                   },
                 },
               ],
@@ -1616,10 +1628,159 @@ describe('test/unit/lib/plugins/aws/package/compile/events/stream.test.js', () =
         },
         command: 'package',
       });
-      const streamLogicalId = awsNaming.getStreamLogicalId('basic', 'kinesis', 'myStream');
+      const streamLogicalId = awsNaming.getStreamLogicalId('basic', 'kinesis', 'some-long-name');
       eventSourceMappingResource = cfTemplate.Resources[streamLogicalId];
     });
 
+    it.skip('TODO: should support ARN String for `arn`', () => {
+      // Replaces
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1106-L1453 (partially)
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1574-L1591
+      //
+      // Confirm effect of:
+      // - `functions.basic.events[0].stream.arn`
+      // - `functions.dynamodb.events[0].stream.arn`
+    });
+
+    it.skip('TODO: should support Fn::GetAtt for `arn`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L586-L741
+      //
+      // Confirm effect of `functions.arnVariants.events[0].stream.arn`
+    });
+
+    it.skip('TODO: should support Fn::ImportValue for `arn`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L586-L741
+      //
+      // Confirm effect of `functions.kinesisImportCustomIam.events[0].stream.arn`
+    });
+
+    it.skip('TODO: should support Fn::Join for `arn`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L586-L741
+      //
+      // Confirm effect of `functions.arnVariants.events[1].stream.arn`
+    });
+
+    it.skip('TODO: should support Ref for `arn`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L586-L741
+      //
+      // Confirm effect of:
+      // - `functions.arnVariants.events[2].stream.arn`
+      // - `functions.arnVariants.events[3].stream.arn`
+    });
+
+    it.skip('TODO: should support `batchSize`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L370-L584
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1106-L1453
+      //
+      // Confirm effect of `functions.dynamo.events[0].stream.batchSize`
+    });
+
+    it.skip('TODO: should support `startingPosition`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L370-L584
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1106-L1453
+      //
+      // Confirm effect of `functions.dynamo.events[0].stream.startingPosition`
+    });
+
+    it.skip('TODO: should support `enabled`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L370-L584
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1106-L1453
+      //
+      // Confirm effect of `functions.dynamo.events[0].stream.enabled`
+    });
+
+    it.skip('TODO: should support `batchWindow`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L370-L584
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1106-L1453
+      //
+      // Confirm effect of `functions.dynamo.events[0].stream.batchWindow`
+    });
+
+    it.skip('TODO: should support `maximumRetryAttempts`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L370-L584
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1106-L1453
+      //
+      // Confirm effect of `functions.dynamo.events[0].stream.maximumRetryAttempts`
+    });
+
+    it.skip('TODO: should support `maximumRecordAgeInSeconds`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L370-L584
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1106-L1453
+      //
+      // Confirm effect of `functions.dynamo.events[0].stream.maximumRecordAgeInSeconds`
+    });
+
+    it.skip('TODO: should support `parallelizationFactor`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1106-L1453
+      //
+      // Confirm effect of `functions.basic.events[0].stream.parallelizationFactor`
+    });
+
+    it.skip('TODO: should support `bisectBatchOnFunctionError`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1106-L1453
+      //
+      // Confirm effect of `functions.basic.events[0].stream.bisectBatchOnFunctionError`
+    });
+
+    it.skip('TODO: should support `consumer`', () => {
+      // Replaces
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1437-L1465
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1467-L1539 (partially)
+      //
+      // Confirm effect of:
+      // - `functions.basic.events[0].stream.consumer`
+      // - `functions.kinesisImportCustomIam.events[0].stream.consumer`
+    });
+
+    it.skip('TODO: should support ARN string for `destinations.onFailure`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L370-L584
+      //
+      // Confirm effect of: `functions.dynamo.events[0].stream.destinations`
+    });
+
+    it.skip('TODO: should support Fn::GetAtt for `destinations.onFailure`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L743-L916
+      //
+      // Confirm effect of: `functions.destinationVariants.events[0].stream.destinations`
+    });
+
+    it.skip('TODO: should support Fn::ImportValue for `destinations.onFailure`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L743-L916
+      //
+      // Confirm effect of: `functions.arnVariants.events[2].stream.destinations`
+    });
+
+    it.skip('TODO: should support Fn::Join for `destinations.onFailure`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L743-L916
+      //
+      // Confirm effect of: `functions.destinationVariants.events[1].stream.destinations`
+    });
+
+    it.skip('TODO: should support Ref for `destinations.onFailure`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L743-L916
+      //
+      // Confirm effect of:
+      // - `functions.destinationVariants.events[2].stream.destinations`
+      // - `functions.destinationVariants.events[3].stream.destinations`
+    });
+
     it('should support `functionResponseType`', () => {
       expect(eventSourceMappingResource.Properties.FunctionResponseTypes).to.include.members([
         'ReportBatchItemFailures',
@@ -1642,6 +1803,72 @@ describe('test/unit/lib/plugins/aws/package/compile/events/stream.test.js', () =
         ],
       });
     });
+
+    it.skip('TODO: should ensure necessary IAM statememnts', () => {
+      // Replaces
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L87-L366
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1056-L1103
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1467-L1539 (partially)
+      //
+      // Confirm expected IAM statements on final role
+    });
+  });
+
+  describe.skip('TODO: failures', () => {
+    it("should fail if stream `type` is not set and couldn't be assumed", async () => {
+      // Replaces
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L918-L932
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L955-L969
+      await expect(
+        runServerless({
+          fixture: 'function',
+          command: 'package',
+          configExt: {
+            functions: {
+              basic: {
+                events: [
+                  {
+                    stream: {
+                      arn: { Ref: 'SomeDdbTableStreamArn' },
+                    },
+                  },
+                ],
+              },
+            },
+          },
+        })
+      ).to.be.eventually.rejected.and.have.property('code', 'TODO');
+    });
+
+    it("should fail if destination `type` is not set and couldn't be assumed", async () => {
+      // Replaces
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L934-L953
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L971-L990
+      await expect(
+        runServerless({
+          fixture: 'function',
+          command: 'package',
+          configExt: {
+            functions: {
+              basic: {
+                events: [
+                  {
+                    stream: {
+                      arn: 'arn:aws:dynamodb:region:account:table/fizz/stream/1',
+                      destinations: {
+                        onFailure: {
+                          arn: { Ref: 'ForeignSQSArn' },
+                        },
+                      },
+                    },
+                  },
+                ],
+              },
+            },
+          },
+        })
+      ).to.be.eventually.rejected.and.have.property('code', 'TODO');
+    });
   });
 
   describe('with provisioned concurrency', () => {

From 654c50792ace1ee675fe5d6843faaafe1179bc25 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 10 Dec 2021 15:41:23 +0100
Subject: [PATCH 0764/1101] test(AWS Websocket): Prepare tests refactor plan

---
 .../compile/events/websockets/index.test.js   | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js
index 37854a19d65..c4de3c06708 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js
@@ -5,6 +5,7 @@ const sinon = require('sinon');
 const AwsProvider = require('../../../../../../../../../lib/plugins/aws/provider');
 const AwsCompileWebsocketsEvents = require('../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
 const Serverless = require('../../../../../../../../../lib/Serverless');
+const runServerless = require('../../../../../../../../utils/run-serverless');
 
 describe('AwsCompileWebsocketsEvents', () => {
   let awsCompileWebsocketsEvents;
@@ -111,3 +112,75 @@ describe('AwsCompileWebsocketsEvents', () => {
     });
   });
 });
+
+describe('test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js', () => {
+  describe.skip('TODO: regular configuration', () => {
+    before(async () => {
+      await runServerless({
+        fixture: 'function',
+        command: 'package',
+
+        configExt: {
+          functions: {
+            basic: {
+              events: [
+                {
+                  websocket: '$connect',
+                },
+              ],
+            },
+          },
+        },
+      });
+    });
+
+    it('should create a websocket api resource', () => {
+      // Replaces
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/api.test.js#L37-L52
+    });
+
+    it('should configure expected IAM', () => {
+      // Replaces
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/api.test.js#L66-L91
+    });
+  });
+
+  describe.skip('TODO: external websocket API', () => {
+    before(async () => {
+      await runServerless({
+        fixture: 'function',
+        command: 'package',
+
+        configExt: {
+          provider: {
+            apiGateway: {
+              websocketApiId: '5ezys3sght',
+            },
+            iam: {
+              role: 'arn:aws:iam::123456789012:role/fromProvider',
+            },
+          },
+          functions: {
+            basic: {
+              events: [
+                {
+                  websocket: '$connect',
+                },
+              ],
+            },
+          },
+        },
+      });
+    });
+
+    it('should not create a websocket api resource', () => {
+      // Replaces
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/api.test.js#L54-L64
+    });
+
+    it('should not configure IAM policies with custom roles', () => {
+      // Replaces
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/api.test.js#L93-L103
+    });
+  });
+});

From 925f4ffebf80cb08c21c8b30dcab5c262c88c56c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 13 Dec 2021 14:43:59 +0100
Subject: [PATCH 0765/1101] chore: Bump dependencies

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index ca8fd6db29f..2c644c9fa10 100644
--- a/package.json
+++ b/package.json
@@ -30,14 +30,14 @@
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.1041.0",
+    "aws-sdk": "^2.1046.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.1.2",
     "cachedir": "^2.3.0",
     "chalk": "^4.1.2",
     "child-process-ext": "^2.1.1",
     "ci-info": "^3.3.0",
-    "cli-progress-footer": "^2.2.0",
+    "cli-progress-footer": "^2.3.0",
     "d": "^1.0.1",
     "dayjs": "^1.10.7",
     "decompress": "^4.2.1",
@@ -100,7 +100,7 @@
     "mock-require": "^3.0.3",
     "nyc": "^15.1.0",
     "pkg": "^5.5.1",
-    "prettier": "^2.5.0",
+    "prettier": "^2.5.1",
     "proxyquire": "^2.1.3",
     "semver-regex": "^3.1.3",
     "sinon": "^12.0.1",

From 3b7735c70d45defc4f1cc2068d3226ddf6808d2e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 13 Dec 2021 15:38:34 +0100
Subject: [PATCH 0766/1101] chore: Release v2.69.0

---
 CHANGELOG.md | 23 +++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2660a1a5d55..0c808f9060e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,29 @@
 
 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.
 
+## [2.69.0](https://github.com/serverless/serverless/compare/v2.68.0...v2.69.0) (2021-12-13)
+
+### Features
+
+- **AWS Deploy:** Ensure existence of S3 deployment bucket (if possible) ([#10317](https://github.com/serverless/serverless/pull/10317)) ([f358585](https://github.com/serverless/serverless/commit/f35858599ad749b5417c238f510e726615e221dc)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS Kafka:** Add support for `mTLS` access configuration ([#10273](https://github.com/serverless/serverless/issues/10273)) ([9faf37a](https://github.com/serverless/serverless/commit/9faf37aa153a60784ca783b1e2b7364625e8761f)) ([Misha Bruml](https://github.com/mishabruml))
+- **Standalone:**
+  - Support installation on M1-based Macs ([#10291](https://github.com/serverless/serverless/pull/10291)) ([92ae054](https://github.com/serverless/serverless/commit/92ae054f02dc631c178628492af7049ce2936204)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Use Node 16 as base for binaries ([#10291](https://github.com/serverless/serverless/pull/10291)) ([eb8f474](https://github.com/serverless/serverless/commit/eb8f474940c4cd69f08ec062adfaa15d62d81ee2)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **AWS Deploy:**
+  - Allow removal of stack with bucket missing ([#10306](https://github.com/serverless/serverless/pull/10306)) ([1a85a4a](https://github.com/serverless/serverless/commit/1a85a4a901caf4ca05096bf11bfcad31959c8044)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Ensure to strip all `null` properties from CloudFormation template ([#10304](https://github.com/serverless/serverless/issues/10304)) ([1f58760](https://github.com/serverless/serverless/commit/1f58760f467f2dcb960e23c2eb028f4abef23209)) ([GurmeharS](https://github.com/GurmeharS))
+  - Recognize all boolean values at `provider.disableRollback` ([#10324](https://github.com/serverless/serverless/pull/10324)) ([2485c7e](https://github.com/serverless/serverless/commit/2485c7efcc4f6f5b1d65b56d4d0d71297d113fa5)) ([François Farge](https://github.com/fargito))
+- **Variables:** Provide opt-out from forced decryption at`ssm` source ([#10315](https://github.com/serverless/serverless/issues/10315)) ([503c031](https://github.com/serverless/serverless/commit/503c0319b7e9acc2b674d5d61874dfa3fcfc857e)) ([Omer Shacham](https://github.com/omerinvia))
+
+### Maintenance Improvements
+
+- Configure promise returning functions as async ([#10309](https://github.com/serverless/serverless/issues/10309)) ([4d4f863](https://github.com/serverless/serverless/commit/4d4f8637d830ba9a72806fc127fe3497f7c0f23c)) ([mdanyalkhan](https://github.com/mdanyalkhan))
+- Use `async/await` syntax in `bucket.js` ([#10306](https://github.com/serverless/serverless/pull/10306)) ([39e43b5](https://github.com/serverless/serverless/commit/39e43b51e5e13c708900e0ccc4d4f25ccf0df61c)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
 ## [2.68.0](https://github.com/serverless/serverless/compare/v2.67.0...v2.68.0) (2021-12-02)
 
 ### Features
diff --git a/package.json b/package.json
index 2c644c9fa10..2c03f42ce63 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.68.0",
+  "version": "2.69.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From d74adc3a86057646df89e8c1a20224b24826c9c1 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 13 Dec 2021 16:47:30 +0100
Subject: [PATCH 0767/1101] docs: Remove accidental typos

---
 docs/deprecations.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index fa5fd998594..7d316c73228 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -80,7 +80,7 @@ Starting with `v3.0.0`, it will not be possible to disable default export names
 
 ## CLI `--function`/`-f` option for `deploy` command
 
-Deprecation code: `CLI_DEPLOY_FUNCTION_OPTION'`
+Deprecation code: `CLI_DEPLOY_FUNCTION_OPTION`
 
 _Note: We've resigned from this deprecation in the context of v2 (it'll be re-added in the context of v3). We continue to advise using `deploy function -f` command instead of `deploy -f`._
 
@@ -106,7 +106,7 @@ When external API Gateway resource is used and imported via `provider.apiGateway
 
 ## CLI Options extensions, `type` requirement
 
-Deprecation code: `CLI_OPTIONS_SCHEMA'`
+Deprecation code: `CLI_OPTIONS_SCHEMA`
 
 Internal handling of CLI arguments was improved with type awareness for options. Now each option definition is expected have `type` defined in its settings.
 

From f6feb0b7b3b5ceb727119056e44e756a8105ec5b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 13 Dec 2021 17:01:43 +0100
Subject: [PATCH 0768/1101] fix(CLI): Do not crash on help request

---
 lib/cli/parse-args.js                | 10 ++++++++++
 test/unit/lib/cli/parse-args.test.js |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/lib/cli/parse-args.js b/lib/cli/parse-args.js
index 3b19fc5b36a..4bfdc1c0c49 100644
--- a/lib/cli/parse-args.js
+++ b/lib/cli/parse-args.js
@@ -14,6 +14,7 @@ module.exports = (
 ) => {
   const result = Object.create(null);
   result._ = [];
+  const isHelpRequest = args.includes('-h') || args.includes('--help');
   for (let i = 0, arg; (arg = args[i]); ++i) {
     if (arg === '--') {
       result._.push(...args.slice(i + 1));
@@ -32,6 +33,7 @@ module.exports = (
     if (aliasNames) {
       if (aliasNames.length > 1) {
         if (value != null) {
+          if (isHelpRequest) return result;
           throw new ServerlessError(
             `Unexpected value for "-${aliasNames}"`,
             'UNEXPECTED_CLI_PARAM_VALUE'
@@ -40,6 +42,7 @@ module.exports = (
         for (const aliasName of aliasNames) {
           paramName = alias.get(aliasName) || aliasName;
           if (result[paramName] != null) {
+            if (isHelpRequest) return result;
             throw new ServerlessError(
               `Unexpected multiple "--${paramName}" (aliased by "-${aliasName}") values`,
               'UNEXPECTED_CLI_PARAM_MULTIPLE_VALUE'
@@ -56,6 +59,7 @@ module.exports = (
 
     if (string.has(paramName) || multiple.has(paramName)) {
       if (isBoolean) {
+        if (isHelpRequest) return result;
         throw new ServerlessError(`Unexpected boolean "--${paramName}"`, 'MISSING_CLI_PARAM_VALUE');
       }
       if (multiple.has(paramName)) {
@@ -64,6 +68,7 @@ module.exports = (
         continue;
       }
       if (result[paramName] !== undefined) {
+        if (isHelpRequest) return result;
         throw new ServerlessError(
           `Unexpected multiple "--${paramName}"`,
           'UNEXPECTED_CLI_PARAM_MULTIPLE_VALUE'
@@ -76,12 +81,14 @@ module.exports = (
     if (paramName.startsWith('no-') && (boolean.has(paramName.slice(3)) || isBoolean)) {
       paramName = paramName.slice(3);
       if (value != null) {
+        if (isHelpRequest) return result;
         throw new ServerlessError(
           `Unexpected value for "--${paramName}"`,
           'UNEXPECTED_CLI_PARAM_VALUE'
         );
       }
       if (result[paramName] !== undefined) {
+        if (isHelpRequest) return result;
         throw new ServerlessError(
           `Unexpected multiple "--${paramName}"`,
           'UNEXPECTED_CLI_PARAM_MULTIPLE_VALUE'
@@ -93,12 +100,14 @@ module.exports = (
 
     if (boolean.has(paramName) || isBoolean) {
       if (value != null) {
+        if (isHelpRequest) return result;
         throw new ServerlessError(
           `Unexpected value for "--${paramName}"`,
           'UNEXPECTED_CLI_PARAM_VALUE'
         );
       }
       if (result[paramName] !== undefined) {
+        if (isHelpRequest) return result;
         throw new ServerlessError(
           `Unexpected multiple "--${paramName}"`,
           'UNEXPECTED_CLI_PARAM_MULTIPLE_VALUE'
@@ -112,6 +121,7 @@ module.exports = (
       if (Array.isArray(result[paramName])) {
         result[paramName].push(value == null ? args[++i] : value || null);
       } else if (typeof result[paramName] === 'boolean') {
+        if (isHelpRequest) return result;
         throw new ServerlessError(
           `Unexpected multiple "--${paramName}"`,
           'UNEXPECTED_CLI_PARAM_MULTIPLE_VALUE'
diff --git a/test/unit/lib/cli/parse-args.test.js b/test/unit/lib/cli/parse-args.test.js
index 2323ed4a396..a474cc55099 100644
--- a/test/unit/lib/cli/parse-args.test.js
+++ b/test/unit/lib/cli/parse-args.test.js
@@ -139,6 +139,11 @@ describe('test/unit/lib/cli/parse-args.test.js', () => {
     expect(parsedArgs).to.deep.equal({});
   });
 
+  it('should not throw if -h or --help param', () => {
+    parseArgs(['-ab=foo', '--help'], {});
+    parseArgs(['--boolean=value', '-h'], { boolean: new Set(['boolean']) });
+  });
+
   it('should reject value for mutliple boolean properties alias', () =>
     expect(() => parseArgs(['-ab=foo'], {}))
       .to.throw(ServerlessError)

From c1df4f860a585ff62c364ac8fd6d8b64b323b156 Mon Sep 17 00:00:00 2001
From: Vassili Gorshkov <vassili.gorshkov@atlasgurus.com>
Date: Mon, 13 Dec 2021 08:19:18 -0800
Subject: [PATCH 0769/1101] feat(Templates): Upgrade `log4j` in Java based
 templates (#10339)

---
 lib/plugins/create/templates/aws-java-maven/pom.xml       | 4 ++--
 lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/plugins/create/templates/aws-java-maven/pom.xml b/lib/plugins/create/templates/aws-java-maven/pom.xml
index 7bee00dfff5..e07a8f887b6 100644
--- a/lib/plugins/create/templates/aws-java-maven/pom.xml
+++ b/lib/plugins/create/templates/aws-java-maven/pom.xml
@@ -22,12 +22,12 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
-      <version>2.8.2</version>
+      <version>2.15.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
-      <version>2.8.2</version>
+      <version>2.15.0</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml b/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml
index 49408ed12df..2ea8070603e 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml
@@ -46,12 +46,12 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.11.1</version>
+            <version>2.15.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.11.1</version>
+            <version>2.15.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

From 7de020bbadad0aed47859f2129c9e58409b9ac65 Mon Sep 17 00:00:00 2001
From: Vassili Gorshkov <vassili.gorshkov1@fireeye.com>
Date: Wed, 15 Dec 2021 02:42:46 -0800
Subject: [PATCH 0770/1101] feat(Tempates): Upgrade `log4j` in Java based
 templates (#10363)

---
 lib/plugins/create/templates/aws-java-maven/pom.xml       | 4 ++--
 lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/plugins/create/templates/aws-java-maven/pom.xml b/lib/plugins/create/templates/aws-java-maven/pom.xml
index e07a8f887b6..a05a925aaac 100644
--- a/lib/plugins/create/templates/aws-java-maven/pom.xml
+++ b/lib/plugins/create/templates/aws-java-maven/pom.xml
@@ -22,12 +22,12 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
-      <version>2.15.0</version>
+      <version>2.16.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
-      <version>2.15.0</version>
+      <version>2.16.0</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml b/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml
index 2ea8070603e..d90a3258a4b 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml
@@ -46,12 +46,12 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.15.0</version>
+            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.15.0</version>
+            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

From 3b4e4539d8b56de6a7cccb2e9c8455f34a5289f6 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 15 Dec 2021 12:18:54 +0100
Subject: [PATCH 0771/1101] fix(AWS Lambda): Fix event config setup for
 provisioned lambdas

---
 lib/plugins/aws/package/compile/functions.js           |  1 +
 .../lib/plugins/aws/package/compile/functions.test.js  | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index f81788cf49a..4d878b63a2e 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -638,6 +638,7 @@ class AwsCompileFunctions {
         DestinationConfig: destinationConfig,
         Qualifier: functionObject.targetAlias ? functionObject.targetAlias.name : '$LATEST',
       },
+      DependsOn: _.get(functionObject.targetAlias, 'logicalId'),
     };
 
     if (maximumEventAge) {
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index 811c3302e74..57bee6e6556 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -1921,6 +1921,11 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
               handler: 'target.handler',
               layers: [{ Ref: 'ExternalLambdaLayer' }],
             },
+            fnProvisioned: {
+              handler: 'trigger.handler',
+              maximumRetryAttempts: 0,
+              provisionedConcurrency: 1,
+            },
           },
           resources: {
             Resources: {
@@ -2231,12 +2236,17 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
     it('should support `functions[].maximumRetryAttempts`', () => {
       const maximumRetryAttempts =
         serviceConfig.functions.fnMaximumRetryAttempts.maximumRetryAttempts;
+
       expect(maximumRetryAttempts).to.be.a('number');
 
       expect(
         cfResources[naming.getLambdaEventConfigLogicalId('fnMaximumRetryAttempts')].Properties
           .MaximumRetryAttempts
       ).to.equal(maximumRetryAttempts);
+
+      expect(cfResources[naming.getLambdaEventConfigLogicalId('fnProvisioned')].DependsOn).to.equal(
+        naming.getLambdaProvisionedConcurrencyAliasLogicalId('fnProvisioned')
+      );
     });
 
     it('should support `functions[].fileSystemConfig` (with vpc configured on function)', () => {

From 0dedd3e8790f568527b8a2444720fe47048ba719 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 15 Dec 2021 12:23:43 +0100
Subject: [PATCH 0772/1101] fix(CLI): Improve error handler resolution

Ensure it's bulletproof against serverless installation issues
---
 lib/cli/handle-error.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 902a4fb6c6a..2e1e267d6eb 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -4,6 +4,7 @@ const path = require('path');
 const isObject = require('type/object/is');
 const chalk = require('chalk');
 const stripAnsi = require('strip-ansi');
+const _ = require('lodash');
 const sfeVersion = require('@serverless/dashboard-plugin/package.json').version;
 const { platformClientVersion } = require('@serverless/dashboard-plugin');
 const { getDashboardProvidersUrl } = require('@serverless/dashboard-plugin/lib/dashboard');
@@ -105,7 +106,7 @@ module.exports = async (exception, options = {}) => {
       }
     })();
 
-    if (localErrorHandlerData) {
+    if (_.get(localErrorHandlerData, 'handle')) {
       localErrorHandlerData.handle(exception, localErrorHandlerData.options);
       return;
     }

From dd033e89342891b63295ebddd81f9ed8853d31bf Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 15 Dec 2021 13:34:40 +0100
Subject: [PATCH 0773/1101] chore: Release v269.1

---
 CHANGELOG.md | 14 ++++++++++++++
 package.json |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c808f9060e..b60c08f39e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 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.
 
+## [2.69.1](https://github.com/serverless/serverless/compare/v2.69.0...v2.70.0) (2021-12-15)
+
+### Bug Fixes
+
+- **AWS Lambda:** Fix event config setup for provisioned lambdas ([#10366](https://github.com/serverless/serverless/pull/10366)) ([3b4e453](https://github.com/serverless/serverless/commit/3b4e4539d8b56de6a7cccb2e9c8455f34a5289f6)) ([Mariusz Nowak](https://github.com/medikoo))
+- **CLI:**
+  - Do not crash on help request ([#10347](https://github.com/serverless/serverless/pull/10347)) ([f6feb0b](https://github.com/serverless/serverless/commit/f6feb0b7b3b5ceb727119056e44e756a8105ec5b)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Improve error handler resolution ([#10367](https://github.com/serverless/serverless/pull/10)) ([0dedd3e](https://github.com/serverless/serverless/commit/0dedd3e8790f568527b8a2444720fe47048ba719)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Templates
+
+- Upgrade `log4j` in Java based templates ([#10363](https://github.com/serverless/serverless/issues/10363)) ([7de020b](https://github.com/serverless/serverless/commit/7de020bbadad0aed47859f2129c9e58409b9ac65)) ([Vassili Gorshkov](https://github.com/atlasgurus))
+- Upgrade `log4j` in Java based templates ([#10339](https://github.com/serverless/serverless/issues/10339)) ([c1df4f8](https://github.com/serverless/serverless/commit/c1df4f860a585ff62c364ac8fd6d8b64b323b156)) ([Vassili Gorshkov](https://github.com/atlasgurus))
+
 ## [2.69.0](https://github.com/serverless/serverless/compare/v2.68.0...v2.69.0) (2021-12-13)
 
 ### Features
diff --git a/package.json b/package.json
index 2c03f42ce63..70a816941b5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.69.0",
+  "version": "2.69.1",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 2c0a962c4fc0ad82ecbc6a266d56bfaa81ad8054 Mon Sep 17 00:00:00 2001
From: Sudipto Das <s.das001@yahoo.com>
Date: Wed, 15 Dec 2021 21:46:28 +0530
Subject: [PATCH 0774/1101] fix(AWS API Gateway): Meaningfully reject missing
 `restApiRootResourceId`

(PR #10371)
---
 .../compile/events/apiGateway/lib/validate.js |  8 +++++
 .../events/apiGateway/lib/validate.test.js    | 35 +++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
index 5b99559e8d3..92623082528 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
@@ -41,6 +41,14 @@ module.exports = {
   validate() {
     const events = [];
     const corsPreflight = {};
+    const apiGateway = this.serverless.service.provider.apiGateway;
+
+    if (apiGateway && apiGateway.restApiId && !apiGateway.restApiRootResourceId) {
+      throw new ServerlessError(
+        'Missing required "provider.apiGateway.restApiRootResourceId" property (needed if "provider.apiGateway.restApiId" is provided)',
+        'API_GATEWAY_MISSING_REST_API_ROOT_RESOURCE_ID'
+      );
+    }
 
     Object.entries(this.serverless.service.functions).forEach(([functionName, functionObject]) => {
       (functionObject.events || []).forEach((event) => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
index 8cb9534b1d5..fa26161a646 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
@@ -8,6 +8,9 @@ const Serverless = require('../../../../../../../../../../lib/Serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 const ServerlessError = require('../../../../../../../../../../lib/serverless-error');
 
+const chai = require('chai');
+chai.use(require('chai-as-promised'));
+
 describe('#validate()', () => {
   let serverless;
   let awsCompileApigEvents;
@@ -1471,4 +1474,36 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/valida
         .IntegrationResponses[0].ResponseParameters
     ).to.deep.eq(expected);
   });
+
+  it('should throw an error when restApiRootResourceId is not provided with restApiId', async () => {
+    await expect(
+      runServerless({
+        fixture: 'function',
+        command: 'package',
+        configExt: {
+          provider: {
+            apiGateway: {
+              restApiId: 'ivrcdpj7y2',
+            },
+          },
+          functions: {
+            first: {
+              handler: 'index.handler',
+              events: [
+                {
+                  http: {
+                    method: 'GET',
+                    path: 'foo/bar',
+                  },
+                },
+              ],
+            },
+          },
+        },
+      })
+    ).to.be.eventually.rejected.and.have.property(
+      'code',
+      'API_GATEWAY_MISSING_REST_API_ROOT_RESOURCE_ID'
+    );
+  });
 });

From 729196f772f8399b052af31babfc6244061ced9c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 16 Dec 2021 15:10:18 +0100
Subject: [PATCH 0775/1101] test(AWS API Gateway): Improve tests organization

---
 .../events/apiGateway/lib/validate.test.js    | 100 +++++++++---------
 1 file changed, 51 insertions(+), 49 deletions(-)

diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
index fa26161a646..a5991252e08 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
@@ -1418,61 +1418,63 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/valida
   const getApiGatewayMethod = (path, method) =>
     cfResources[naming.getMethodLogicalId(naming.normalizePath(path), method)];
 
-  before(async () => {
-    const result = await runServerless({
-      fixture: 'function',
-      command: 'package',
-      configExt: {
-        functions: {
-          corsDefault: {
-            handler: 'index.handler',
-            events: [
-              {
-                http: {
-                  method: 'POST',
-                  path: '/cors-default-set-by-boolean',
-                  cors: true,
+  describe('regular', () => {
+    before(async () => {
+      const result = await runServerless({
+        fixture: 'function',
+        command: 'package',
+        configExt: {
+          functions: {
+            corsDefault: {
+              handler: 'index.handler',
+              events: [
+                {
+                  http: {
+                    method: 'POST',
+                    path: '/cors-default-set-by-boolean',
+                    cors: true,
+                  },
                 },
-              },
-              {
-                http: {
-                  method: 'POST',
-                  path: '/cors-default-set-by-object',
-                  cors: {},
+                {
+                  http: {
+                    method: 'POST',
+                    path: '/cors-default-set-by-object',
+                    cors: {},
+                  },
                 },
-              },
-            ],
+              ],
+            },
           },
         },
-      },
+      });
+      cfTemplate = result.cfTemplate;
+      cfResources = cfTemplate.Resources;
+      naming = result.awsNaming;
     });
-    cfTemplate = result.cfTemplate;
-    cfResources = cfTemplate.Resources;
-    naming = result.awsNaming;
-  });
 
-  it('should process cors defaults', async () => {
-    const expected = {
-      'method.response.header.Access-Control-Allow-Headers': `'${[
-        'Content-Type',
-        'X-Amz-Date',
-        'Authorization',
-        'X-Api-Key',
-        'X-Amz-Security-Token',
-        'X-Amz-User-Agent',
-      ].join(',')}'`,
-      'method.response.header.Access-Control-Allow-Methods': `'${['OPTIONS', 'POST'].join(',')}'`,
-      'method.response.header.Access-Control-Allow-Origin': "'*'",
-    };
-
-    expect(
-      getApiGatewayMethod('/cors-default-set-by-boolean', 'OPTIONS').Properties.Integration
-        .IntegrationResponses[0].ResponseParameters
-    ).to.deep.eq(expected);
-    expect(
-      getApiGatewayMethod('/cors-default-set-by-object', 'OPTIONS').Properties.Integration
-        .IntegrationResponses[0].ResponseParameters
-    ).to.deep.eq(expected);
+    it('should process cors defaults', async () => {
+      const expected = {
+        'method.response.header.Access-Control-Allow-Headers': `'${[
+          'Content-Type',
+          'X-Amz-Date',
+          'Authorization',
+          'X-Api-Key',
+          'X-Amz-Security-Token',
+          'X-Amz-User-Agent',
+        ].join(',')}'`,
+        'method.response.header.Access-Control-Allow-Methods': `'${['OPTIONS', 'POST'].join(',')}'`,
+        'method.response.header.Access-Control-Allow-Origin': "'*'",
+      };
+
+      expect(
+        getApiGatewayMethod('/cors-default-set-by-boolean', 'OPTIONS').Properties.Integration
+          .IntegrationResponses[0].ResponseParameters
+      ).to.deep.eq(expected);
+      expect(
+        getApiGatewayMethod('/cors-default-set-by-object', 'OPTIONS').Properties.Integration
+          .IntegrationResponses[0].ResponseParameters
+      ).to.deep.eq(expected);
+    });
   });
 
   it('should throw an error when restApiRootResourceId is not provided with restApiId', async () => {

From a782d68ac55abe5ebbf199461ce12f7df3835753 Mon Sep 17 00:00:00 2001
From: Graham Campbell <GrahamCampbell@users.noreply.github.com>
Date: Thu, 16 Dec 2021 19:56:50 +0000
Subject: [PATCH 0776/1101] docs: Fixed typo in `CHANGELOG.md` (#10380)

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b60c08f39e2..69227e2fcdf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 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.
 
-## [2.69.1](https://github.com/serverless/serverless/compare/v2.69.0...v2.70.0) (2021-12-15)
+## [2.69.1](https://github.com/serverless/serverless/compare/v2.69.0...v2.69.1) (2021-12-15)
 
 ### Bug Fixes
 

From 7bf8f1b723cc4f6624df7be3d27f246b3a826140 Mon Sep 17 00:00:00 2001
From: Varun <58342372+varun73@users.noreply.github.com>
Date: Fri, 17 Dec 2021 14:16:01 +0530
Subject: [PATCH 0777/1101] fix(Templates): Upgrade `log4j` in
 `aws-kotlin-jvm-gradle` (#10382)

---
 .../create/templates/aws-kotlin-jvm-gradle/build.gradle       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-gradle/build.gradle b/lib/plugins/create/templates/aws-kotlin-jvm-gradle/build.gradle
index b090c59c2c4..e5746ce28ac 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-gradle/build.gradle
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-gradle/build.gradle
@@ -36,8 +36,8 @@ dependencies {
       'org.jetbrains.kotlin:kotlin-stdlib:1.3.72',
       'com.amazonaws:aws-lambda-java-core:1.2.1',
       'com.amazonaws:aws-lambda-java-log4j2:1.2.0',
-      'org.apache.logging.log4j:log4j-api:2.13.3',
-      'org.apache.logging.log4j:log4j-core:2.13.3',
+      'org.apache.logging.log4j:log4j-api:2.16.0',
+      'org.apache.logging.log4j:log4j-core:2.16.0',
       'com.fasterxml.jackson.core:jackson-core:2.11.0',
       'com.fasterxml.jackson.core:jackson-databind:2.11.0',
       'com.fasterxml.jackson.core:jackson-annotations:2.11.0'

From 8daef830e0fb844f1fcf3c99cd385eba25aa4883 Mon Sep 17 00:00:00 2001
From: Thibault RICHARD <thibault@widop.com>
Date: Mon, 20 Dec 2021 09:51:10 +0100
Subject: [PATCH 0778/1101] docs: Update `httpApi` reference in
 `serverless.yml.md` (#10389)

---
 docs/providers/aws/guide/serverless.yml.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index a64afb501ee..716971cae38 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -188,6 +188,8 @@ provider:
     id: 'my-id' # If we want to attach to externally created HTTP API its id should be provided here
     name: 'dev-my-service' # Use custom name for the API Gateway API, default is ${sls:stage}-${self:service}
     payload: '2.0' # Specify payload format version for Lambda integration ('1.0' or '2.0'), default is '2.0'
+    disableDefaultEndpoint: false # Specify whether clients can invoke your API by using the default `execute-api` endpoint
+    metrics: true # Enable detailed metrics
     cors: true # Implies default behavior, can be fine tuned with specific options
     authorizers:
       # JWT authorizer to back HTTP API endpoints

From 352553e5bb02f661f3e8c7d36c5c622a5e76fb03 Mon Sep 17 00:00:00 2001
From: mdanyalkhan <mdanyalkhan29@gmail.com>
Date: Mon, 20 Dec 2021 12:26:56 +0000
Subject: [PATCH 0779/1101] test(AWS SQS): Refactor to `runServerless` based
 (#10388)

---
 .../aws/package/compile/events/sqs.test.js    | 447 +++++-------------
 1 file changed, 114 insertions(+), 333 deletions(-)

diff --git a/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js b/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
index 2cf7ecf279f..89b1030f5bc 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
@@ -1,304 +1,16 @@
 'use strict';
 
 const expect = require('chai').expect;
-const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
-const AwsCompileSQSEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/sqs');
-const Serverless = require('../../../../../../../../lib/Serverless');
 const runServerless = require('../../../../../../../utils/run-serverless');
 
-describe('AwsCompileSQSEvents', () => {
-  let serverless;
-  let awsCompileSQSEvents;
-
-  beforeEach(() => {
-    serverless = new Serverless();
-    serverless.service.provider.compiledCloudFormationTemplate = {
-      Resources: {
-        IamRoleLambdaExecution: {
-          Properties: {
-            Policies: [
-              {
-                PolicyDocument: {
-                  Statement: [],
-                },
-              },
-            ],
-          },
-        },
-      },
-    };
-    serverless.setProvider('aws', new AwsProvider(serverless));
-    awsCompileSQSEvents = new AwsCompileSQSEvents(serverless);
-    awsCompileSQSEvents.serverless.service.service = 'new-service';
-  });
-
-  describe('#compileSQSEvents()', () => {
-    describe('when a queue ARN is given', () => {
-      it('should create event source mappings when a queue ARN is given', () => {
-        awsCompileSQSEvents.serverless.service.functions = {
-          first: {
-            events: [
-              {
-                sqs: {
-                  arn: 'arn:aws:sqs:region:account:MyFirstQueue',
-                  batchSize: 1,
-                  enabled: false,
-                },
-              },
-              {
-                sqs: {
-                  arn: 'arn:aws:sqs:region:account:MySecondQueue',
-                },
-              },
-              {
-                sqs: 'arn:aws:sqs:region:account:MyThirdQueue',
-              },
-            ],
-          },
-        };
-
-        awsCompileSQSEvents.compileSQSEvents();
-
-        // event 1
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyFirstQueue.Type
-        ).to.equal('AWS::Lambda::EventSourceMapping');
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyFirstQueue.DependsOn
-        ).to.include('IamRoleLambdaExecution');
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyFirstQueue.DependsOn
-        ).to.have.lengthOf(1);
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyFirstQueue.Properties.EventSourceArn
-        ).to.equal(awsCompileSQSEvents.serverless.service.functions.first.events[0].sqs.arn);
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyFirstQueue.Properties.BatchSize
-        ).to.equal(awsCompileSQSEvents.serverless.service.functions.first.events[0].sqs.batchSize);
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyFirstQueue.Properties.Enabled
-        ).to.equal(false);
-
-        // event 2
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMySecondQueue.Type
-        ).to.equal('AWS::Lambda::EventSourceMapping');
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMySecondQueue.DependsOn
-        ).to.include('IamRoleLambdaExecution');
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMySecondQueue.DependsOn
-        ).to.have.lengthOf(1);
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMySecondQueue.Properties.EventSourceArn
-        ).to.equal(awsCompileSQSEvents.serverless.service.functions.first.events[1].sqs.arn);
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMySecondQueue.Properties.BatchSize
-        ).to.equal(10);
-
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMySecondQueue.Properties.Enabled
-        ).to.equal(true);
-
-        // event 3
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyThirdQueue.Type
-        ).to.equal('AWS::Lambda::EventSourceMapping');
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyThirdQueue.DependsOn
-        ).to.include('IamRoleLambdaExecution');
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyThirdQueue.DependsOn
-        ).to.have.lengthOf(1);
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyThirdQueue.Properties.EventSourceArn
-        ).to.equal(awsCompileSQSEvents.serverless.service.functions.first.events[2].sqs);
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyThirdQueue.Properties.BatchSize
-        ).to.equal(10);
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyThirdQueue.Properties.Enabled
-        ).to.equal(true);
-      });
-
-      it('should allow specifying SQS Queues as CFN reference types', () => {
-        awsCompileSQSEvents.serverless.service.functions = {
-          first: {
-            events: [
-              {
-                sqs: {
-                  arn: { 'Fn::GetAtt': ['SomeQueue', 'Arn'] },
-                },
-              },
-              {
-                sqs: {
-                  arn: { 'Fn::ImportValue': 'ForeignQueue' },
-                },
-              },
-              {
-                sqs: {
-                  arn: {
-                    'Fn::Join': [
-                      ':',
-                      [
-                        'arn',
-                        'aws',
-                        'sqs',
-                        {
-                          Ref: 'AWS::Region',
-                        },
-                        {
-                          Ref: 'AWS::AccountId',
-                        },
-                        'MyQueue',
-                      ],
-                    ],
-                  },
-                },
-              },
-            ],
-          },
-        };
-
-        awsCompileSQSEvents.compileSQSEvents();
-
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement[0]
-        ).to.deep.equal({
-          Action: ['sqs:ReceiveMessage', 'sqs:DeleteMessage', 'sqs:GetQueueAttributes'],
-          Effect: 'Allow',
-          Resource: [
-            {
-              'Fn::GetAtt': ['SomeQueue', 'Arn'],
-            },
-            {
-              'Fn::ImportValue': 'ForeignQueue',
-            },
-            {
-              'Fn::Join': [
-                ':',
-                [
-                  'arn',
-                  'aws',
-                  'sqs',
-                  {
-                    Ref: 'AWS::Region',
-                  },
-                  {
-                    Ref: 'AWS::AccountId',
-                  },
-                  'MyQueue',
-                ],
-              ],
-            },
-          ],
-        });
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSSomeQueue.Properties.EventSourceArn
-        ).to.deep.equal({ 'Fn::GetAtt': ['SomeQueue', 'Arn'] });
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSForeignQueue.Properties.EventSourceArn
-        ).to.deep.equal({ 'Fn::ImportValue': 'ForeignQueue' });
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyQueue.Properties.EventSourceArn
-        ).to.deep.equal({
-          'Fn::Join': [
-            ':',
-            [
-              'arn',
-              'aws',
-              'sqs',
-              {
-                Ref: 'AWS::Region',
-              },
-              {
-                Ref: 'AWS::AccountId',
-              },
-              'MyQueue',
-            ],
-          ],
-        });
-      });
-
-      it('should add the necessary IAM role statements', () => {
-        awsCompileSQSEvents.serverless.service.functions = {
-          first: {
-            events: [
-              {
-                sqs: 'arn:aws:sqs:region:account:MyFirstQueue',
-              },
-              {
-                sqs: 'arn:aws:sqs:region:account:MySecondQueue',
-              },
-            ],
-          },
-        };
-
-        const iamRoleStatements = [
-          {
-            Effect: 'Allow',
-            Action: ['sqs:ReceiveMessage', 'sqs:DeleteMessage', 'sqs:GetQueueAttributes'],
-            Resource: [
-              'arn:aws:sqs:region:account:MyFirstQueue',
-              'arn:aws:sqs:region:account:MySecondQueue',
-            ],
-          },
-        ];
-
-        awsCompileSQSEvents.compileSQSEvents();
-
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement
-        ).to.deep.equal(iamRoleStatements);
-      });
-    });
-
-    it('should remove all non-alphanumerics from queue names for the resource logical ids', () => {
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              sqs: 'arn:aws:sqs:region:account:some-queue-name',
-            },
-          ],
-        },
-      };
-
-      awsCompileSQSEvents.compileSQSEvents();
-
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-      ).to.have.any.keys('FirstEventSourceMappingSQSSomequeuename');
-    });
-  });
-});
-
 describe('test/unit/lib/plugins/aws/package/compile/events/sqs.test.js', () => {
   describe('regular configuration', () => {
-    let eventSourceMappingResource;
+    let directArnEventSourceMappingResource;
+    let basicEventSourceMappingResource;
+    let arnCfGetAttEventSourceMappingResource;
+    let arnCfImportEventSourceMappingResource;
+    let arnCfJoinEventSourceMappingResource;
+    let iamRoleLambdaExecution;
 
     before(async () => {
       const { awsNaming, cfTemplate } = await runServerless({
@@ -359,63 +71,132 @@ describe('test/unit/lib/plugins/aws/package/compile/events/sqs.test.js', () => {
         },
         command: 'package',
       });
-      const queueLogicalId = awsNaming.getQueueLogicalId('basic', 'some-queue-name');
-      eventSourceMappingResource = cfTemplate.Resources[queueLogicalId];
+      const directArnFunctionLogicalId = awsNaming.getQueueLogicalId('directArn', 'MyQueue');
+      directArnEventSourceMappingResource = cfTemplate.Resources[directArnFunctionLogicalId];
+
+      const basicFunctionLogicalId = awsNaming.getQueueLogicalId('basic', 'some-queue-name');
+      basicEventSourceMappingResource = cfTemplate.Resources[basicFunctionLogicalId];
+
+      const arnCfGetAttLogicalId = awsNaming.getQueueLogicalId('arnCfGetAtt', 'SomeQueue');
+      arnCfGetAttEventSourceMappingResource = cfTemplate.Resources[arnCfGetAttLogicalId];
+
+      const arnCfImportLogicalId = awsNaming.getQueueLogicalId('arnCfImport', 'ForeignQueue');
+      arnCfImportEventSourceMappingResource = cfTemplate.Resources[arnCfImportLogicalId];
+
+      const arnCfJoinLogicalId = awsNaming.getQueueLogicalId('arnCfJoin', 'MyQueue');
+      arnCfJoinEventSourceMappingResource = cfTemplate.Resources[arnCfJoinLogicalId];
+
+      iamRoleLambdaExecution = cfTemplate.Resources.IamRoleLambdaExecution;
     });
 
-    it.skip('TODO: should suport direct ARN string', () => {
-      // Replaces partially
-      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js#L302-L405
-      //
-      // Confirm effect of functions.directArn.events[0].sqs`
+    it('should suport direct ARN string', () => {
+      const directSqsArn = 'arn:aws:sqs:region:account:MyQueue';
+      expect(directArnEventSourceMappingResource.Properties.EventSourceArn).to.equal(directSqsArn);
     });
 
-    it.skip('TODO: should suport `arn` (string)', () => {
-      // Replaces
-      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js#L302-L405 (partially)
-      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js#L576-L593
-      // Confirm effect of `functions.basic.events[0].sqs.arn`
+    it('should support `arn` (string)', () => {
+      const basicSqsArn = 'arn:aws:sqs:region:account:some-queue-name';
+      expect(basicEventSourceMappingResource.Properties.EventSourceArn).to.equal(basicSqsArn);
     });
 
-    it.skip('TODO: should suport `arn` (CF Fn::GetAtt)', () => {
-      // Replaces partially
-      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js#L407-L508
-      //
-      // Confirm effect of `functions.arnCfGetAtt.events[0].sqs.arn`
+    it('should suport `arn` (CF Fn::GetAtt)', () => {
+      const getAttSqsArn = { 'Fn::GetAtt': ['SomeQueue', 'Arn'] };
+      expect(
+        arnCfGetAttEventSourceMappingResource.Properties.EventSourceArn['Fn::GetAtt']
+      ).to.deep.equal(getAttSqsArn['Fn::GetAtt']);
     });
 
-    it.skip('TODO: should suport `arn` (CF Fn::ImportValue)', () => {
-      // Replaces partially
-      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js#L407-L508
-      //
-      // Confirm effect of `functions.arnCfImport.events[0].sqs.arn`
+    it('should suport `arn` (CF Fn::ImportValue)', () => {
+      const cfImportArn = { 'Fn::ImportValue': 'ForeignQueue' };
+      expect(
+        arnCfImportEventSourceMappingResource.Properties.EventSourceArn['Fn::ImportValue']
+      ).to.deep.equal(cfImportArn['Fn::ImportValue']);
     });
 
-    it.skip('TODO: should suport `arn` (CF Fn::Join)', () => {
-      // Replaces partially
-      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js#L407-L508
-      //
-      // Confirm effect of `functions.arnCfJoin.events[0].sqs.arn`
+    it('should suport `arn` (CF Fn::Join)', () => {
+      const cfJoinArn = {
+        'Fn::Join': [
+          ':',
+          [
+            'arn',
+            'aws',
+            'sqs',
+            {
+              Ref: 'AWS::Region',
+            },
+            {
+              Ref: 'AWS::AccountId',
+            },
+            'MyQueue',
+          ],
+        ],
+      };
+      expect(
+        arnCfJoinEventSourceMappingResource.Properties.EventSourceArn['Fn::Join']
+      ).to.deep.equal(cfJoinArn['Fn::Join']);
     });
 
-    it.skip('TODO: should suport `batchSize`', () => {
-      // Replaces partially
-      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js#L302-L405
-      //
-      // Confirm effect  of`functions.basic.events[0].sqs.batchSize`
+    it('should suport `batchSize`', () => {
+      const requestedBatchSize = 10;
+      expect(basicEventSourceMappingResource.Properties.BatchSize).to.equal(requestedBatchSize);
     });
 
     it('should suport `functionResponseType`', () => {
-      expect(eventSourceMappingResource.Properties.FunctionResponseTypes).to.include.members([
-        'ReportBatchItemFailures',
+      const requestedFunctionResponseType = 'ReportBatchItemFailures';
+      expect(basicEventSourceMappingResource.Properties.FunctionResponseTypes).to.include.members([
+        requestedFunctionResponseType,
       ]);
     });
 
-    it.skip('TODO: should ensure necessary IAM statememnts', () => {
-      // Replaces
-      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js#L510-L542
-      //
-      // Confirm expected IAM statements on final role
+    it('should ensure necessary IAM statememnts', () => {
+      const iamRoleStatments = [
+        {
+          Effect: 'Allow',
+          Action: ['sqs:ReceiveMessage', 'sqs:DeleteMessage', 'sqs:GetQueueAttributes'],
+          Resource: ['arn:aws:sqs:region:account:some-queue-name'],
+        },
+        {
+          Effect: 'Allow',
+          Action: ['sqs:ReceiveMessage', 'sqs:DeleteMessage', 'sqs:GetQueueAttributes'],
+          Resource: ['arn:aws:sqs:region:account:MyQueue'],
+        },
+        {
+          Effect: 'Allow',
+          Action: ['sqs:ReceiveMessage', 'sqs:DeleteMessage', 'sqs:GetQueueAttributes'],
+          Resource: [{ 'Fn::GetAtt': ['SomeQueue', 'Arn'] }],
+        },
+        {
+          Effect: 'Allow',
+          Action: ['sqs:ReceiveMessage', 'sqs:DeleteMessage', 'sqs:GetQueueAttributes'],
+          Resource: [{ 'Fn::ImportValue': 'ForeignQueue' }],
+        },
+        {
+          Effect: 'Allow',
+          Action: ['sqs:ReceiveMessage', 'sqs:DeleteMessage', 'sqs:GetQueueAttributes'],
+          Resource: [
+            {
+              'Fn::Join': [
+                ':',
+                [
+                  'arn',
+                  'aws',
+                  'sqs',
+                  {
+                    Ref: 'AWS::Region',
+                  },
+                  {
+                    Ref: 'AWS::AccountId',
+                  },
+                  'MyQueue',
+                ],
+              ],
+            },
+          ],
+        },
+      ];
+      expect(
+        iamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement
+      ).to.deep.include.members(iamRoleStatments);
     });
   });
 

From 365a7f13afaf40e9e2d573b0668159d6dea7aa02 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 20 Dec 2021 17:31:02 +0100
Subject: [PATCH 0780/1101] refactor(Variables): Support custom sources in
 internal resolver

---
 lib/configuration/variables/index.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/configuration/variables/index.js b/lib/configuration/variables/index.js
index 2dc5e6538ff..5b0e130e213 100644
--- a/lib/configuration/variables/index.js
+++ b/lib/configuration/variables/index.js
@@ -9,7 +9,7 @@ const ServerlessError = require('../../serverless-error');
 const resolveMeta = require('./resolve-meta');
 const resolve = require('./resolve');
 
-const sources = {
+const defaultSources = {
   env: require('./sources/env'),
   file: require('./sources/file'),
   opt: require('./sources/opt'),
@@ -33,7 +33,7 @@ const reportEventualErrors = (variablesMeta) => {
   );
 };
 
-module.exports = async ({ serviceDir, servicePath, configuration, options }) => {
+module.exports = async ({ serviceDir, servicePath, configuration, options, sources = null }) => {
   // TODO: Remove support for `servicePath` with next major
   serviceDir = ensureString(serviceDir || servicePath);
   ensurePlainObject(configuration);
@@ -42,13 +42,14 @@ module.exports = async ({ serviceDir, servicePath, configuration, options }) =>
   const variablesMeta = resolveMeta(configuration);
   reportEventualErrors(variablesMeta);
 
+  if (!sources) sources = defaultSources;
   await resolve({
     serviceDir,
     configuration,
     variablesMeta,
     sources,
     options,
-    fulfilledSources: new Set(['env', 'file', 'opt', 'self', 'strToBool']),
+    fulfilledSources: new Set(Object.keys(sources)),
   });
 
   reportEventualErrors(variablesMeta);

From 4de779d5c662d52089f3cc54a6299c8875d7e742 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 20 Dec 2021 17:52:50 +0100
Subject: [PATCH 0781/1101] docs: Fix typo

---
 docs/deprecations.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 7d316c73228..5d71b34d0af 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -102,7 +102,7 @@ Deprecation code: `AWS_API_GATEWAY_NON_APPLICABLE_SETTINGS`
 
 When external API Gateway resource is used and imported via `provider.apiGateway.restApiId` setting, both `provider.logs.restApi` and `provider.tracing.apiGateway` are ignored. In v3, an error will be thrown if these options are defined. Indeed, these settings are applicable only if API Gateway resource is provisioned by Serverless Framework.
 
-<a name="CLI_OPTIONS_SCHEMA'"><div>&nbsp;</div></a>
+<a name="CLI_OPTIONS_SCHEMA"><div>&nbsp;</div></a>
 
 ## CLI Options extensions, `type` requirement
 

From 41ebc860d8a97be4e824356ea4955c04a6e67687 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 20 Dec 2021 17:56:02 +0100
Subject: [PATCH 0782/1101] docs: Add note signalling that deprecation was
 dropped

---
 docs/deprecations.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 5d71b34d0af..902102ae4c4 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -108,6 +108,8 @@ When external API Gateway resource is used and imported via `provider.apiGateway
 
 Deprecation code: `CLI_OPTIONS_SCHEMA`
 
+_Note: We've resigned from this deprecation in the context of v2 (it'll be re-added in the context of v3). We continue to advise upgrade so schema for CLI options is provided._
+
 Internal handling of CLI arguments was improved with type awareness for options. Now each option definition is expected have `type` defined in its settings.
 
 Possible values are `string`, `boolean` and `multiple`. Check [Defining options](/framework/docs/providers/aws/guide/plugins#defining-options) documentation for more info.

From 86fa60445c83cf35f3411ae49c2a1c4fc7fd82f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Berm=C3=BAdez?=
 <64878517+JuanBermudezN@users.noreply.github.com>
Date: Tue, 21 Dec 2021 05:27:03 -0300
Subject: [PATCH 0783/1101] feat(Templates): Upgrade `log4j` dependencies
 (#10392)

---
 .../create/templates/aws-kotlin-jvm-gradle/build.gradle     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-gradle/build.gradle b/lib/plugins/create/templates/aws-kotlin-jvm-gradle/build.gradle
index e5746ce28ac..0d57cede3bc 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-gradle/build.gradle
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-gradle/build.gradle
@@ -35,9 +35,9 @@ dependencies {
   api (
       'org.jetbrains.kotlin:kotlin-stdlib:1.3.72',
       'com.amazonaws:aws-lambda-java-core:1.2.1',
-      'com.amazonaws:aws-lambda-java-log4j2:1.2.0',
-      'org.apache.logging.log4j:log4j-api:2.16.0',
-      'org.apache.logging.log4j:log4j-core:2.16.0',
+      'com.amazonaws:aws-lambda-java-log4j2:1.5.0',
+      'org.apache.logging.log4j:log4j-api:2.17.0',
+      'org.apache.logging.log4j:log4j-core:2.17.0',
       'com.fasterxml.jackson.core:jackson-core:2.11.0',
       'com.fasterxml.jackson.core:jackson-databind:2.11.0',
       'com.fasterxml.jackson.core:jackson-annotations:2.11.0'

From c0eda272901fd91947c6f37589b33f65c804dc9b Mon Sep 17 00:00:00 2001
From: Adam Lanners <adamlanners@gmail.com>
Date: Tue, 21 Dec 2021 03:49:50 -0600
Subject: [PATCH 0784/1101] feat(AWS API Gateway): Allow use of custom
 authorizer with authorizerId

Co-authored-by: Adam Lanners <adam@onetapaway.com>
---
 .../compile/events/apiGateway/index.js        |  4 +-
 .../events/apiGateway/lib/validate.test.js    | 63 +++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/index.js b/lib/plugins/aws/package/compile/events/apiGateway/index.js
index 1757943f502..ef920d3d77b 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/index.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/index.js
@@ -66,7 +66,9 @@ const authorizerSchema = {
         resultTtlInSeconds: { type: 'integer', minimum: 0, maximum: 3600 },
         scopes: { type: 'array', items: { type: 'string' } },
         type: {
-          anyOf: ['token', 'cognito_user_pools', 'request', 'aws_iam'].map(caseInsensitive),
+          anyOf: ['token', 'cognito_user_pools', 'request', 'aws_iam', 'custom'].map(
+            caseInsensitive
+          ),
         },
       },
       required: [],
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
index a5991252e08..fadc690a950 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
@@ -1508,4 +1508,67 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/valida
       'API_GATEWAY_MISSING_REST_API_ROOT_RESOURCE_ID'
     );
   });
+
+  it('should throw when using a CUSTOM authorizer without an authorizer id', async () => {
+    await expect(
+      runServerless({
+        fixture: 'function',
+        command: 'package',
+        configExt: {
+          functions: {
+            first: {
+              handler: 'index.handler',
+              events: [
+                {
+                  http: {
+                    method: 'POST',
+                    path: '/custom-authorizer',
+                    integration: 'lambda-proxy',
+                    authorizer: {
+                      type: 'CUSTOM',
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        },
+      })
+    ).to.be.eventually.rejected.and.have.property(
+      'code',
+      'API_GATEWAY_MISSING_AUTHORIZER_NAME_OR_ARN'
+    );
+  });
+
+  it('should not throw when using CUSTOM authorizer with an authorizer id', async () => {
+    const result = await runServerless({
+      fixture: 'function',
+      command: 'package',
+      configExt: {
+        functions: {
+          first: {
+            handler: 'index.handler',
+            events: [
+              {
+                http: {
+                  method: 'POST',
+                  path: '/custom-authorizer',
+                  integration: 'lambda-proxy',
+                  authorizer: {
+                    type: 'CUSTOM',
+                    authorizerId: 'MyAuthorizerId',
+                  },
+                },
+              },
+            ],
+          },
+        },
+      },
+    });
+
+    cfResources = result.cfTemplate.Resources;
+    naming = result.awsNaming;
+    const resource = getApiGatewayMethod('/custom-authorizer', 'POST');
+    expect(resource.Properties.AuthorizationType).to.equal('CUSTOM');
+  });
 });

From 2782ed4221caa410708cbabbbd09d45a6363be29 Mon Sep 17 00:00:00 2001
From: Vassili Gorshkov <vassili.gorshkov1@fireeye.com>
Date: Tue, 21 Dec 2021 01:54:04 -0800
Subject: [PATCH 0785/1101] fix(AWS Local Invocation): Upgrade log4j to version
 2.17.0 (#10396)

---
 lib/plugins/aws/invokeLocal/runtimeWrappers/java/pom.xml  | 2 +-
 lib/plugins/create/templates/aws-java-maven/pom.xml       | 6 +++---
 lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/pom.xml b/lib/plugins/aws/invokeLocal/runtimeWrappers/java/pom.xml
index 44327eba0e3..c069ceef634 100644
--- a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/pom.xml
+++ b/lib/plugins/aws/invokeLocal/runtimeWrappers/java/pom.xml
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-lambda-java-log4j</artifactId>
-      <version>1.0.1</version>
+      <version>1.5.0</version>
     </dependency>
     <dependency>
       <groupId>com.amazonaws</groupId>
diff --git a/lib/plugins/create/templates/aws-java-maven/pom.xml b/lib/plugins/create/templates/aws-java-maven/pom.xml
index a05a925aaac..982dfdeb810 100644
--- a/lib/plugins/create/templates/aws-java-maven/pom.xml
+++ b/lib/plugins/create/templates/aws-java-maven/pom.xml
@@ -17,17 +17,17 @@
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-lambda-java-log4j2</artifactId>
-      <version>1.1.0</version>
+      <version>1.5.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
-      <version>2.16.0</version>
+      <version>2.17.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
-      <version>2.16.0</version>
+      <version>2.17.0</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml b/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml
index d90a3258a4b..2f2f20e610c 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml
@@ -41,17 +41,17 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.1.0</version>
+            <version>1.5.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.16.0</version>
+            <version>2.17.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.16.0</version>
+            <version>2.17.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

From 0190d0df05f4e37c8e965913ef1ceaf6b8a9b525 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 22 Dec 2021 12:11:43 +0100
Subject: [PATCH 0786/1101] fix(AWS Deploy): Check for VPC config change in
 `deploy function`

---
 lib/plugins/aws/deployFunction.js                | 14 ++++++++------
 test/unit/lib/plugins/aws/deployFunction.test.js |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/plugins/aws/deployFunction.js b/lib/plugins/aws/deployFunction.js
index 671f63002f2..dfcd76d50b7 100644
--- a/lib/plugins/aws/deployFunction.js
+++ b/lib/plugins/aws/deployFunction.js
@@ -361,14 +361,16 @@ class AwsDeployFunction {
       const didVpcChange = () => {
         const remoteConfigToCompare = { SecurityGroupIds: [], SubnetIds: [] };
         if (remoteFunctionConfiguration.VpcConfig) {
-          remoteConfigToCompare.SecurityGroupIds =
-            remoteFunctionConfiguration.VpcConfig.SecurityGroupIds || [];
-          remoteConfigToCompare.SubnetIds = remoteFunctionConfiguration.VpcConfig.SubnetIds || [];
+          remoteConfigToCompare.SecurityGroupIds = new Set(
+            remoteFunctionConfiguration.VpcConfig.SecurityGroupIds || []
+          );
+          remoteConfigToCompare.SubnetIds = new Set(
+            remoteFunctionConfiguration.VpcConfig.SubnetIds || []
+          );
         }
         const localConfigToCompare = {
-          SecurityGroupIds: [],
-          SubnetIds: [],
-          ...params.VpcConfig,
+          SecurityGroupIds: new Set(params.VpcConfig.SecurityGroupIds || []),
+          SubnetIds: new Set(params.VpcConfig.SubnetIds || []),
         };
         return _.isEqual(remoteConfigToCompare, localConfigToCompare);
       };
diff --git a/test/unit/lib/plugins/aws/deployFunction.test.js b/test/unit/lib/plugins/aws/deployFunction.test.js
index 9de68302c1a..012ad403ef7 100644
--- a/test/unit/lib/plugins/aws/deployFunction.test.js
+++ b/test/unit/lib/plugins/aws/deployFunction.test.js
@@ -792,7 +792,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
               VpcConfig: {
                 VpcId: 'vpc-xxxx',
                 SecurityGroupIds: ['sg-111', 'sg-222'],
-                SubnetIds: ['subnet-111', 'subnet-222'],
+                SubnetIds: ['subnet-222', 'subnet-111'],
               },
             },
           },

From 08b5acbaa901c7ce529064c394151e05bdd43aef Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 21 Dec 2021 16:19:52 +0100
Subject: [PATCH 0787/1101] refactor(Telemetry): Ensure to report `projectId`
 for interactive

---
 lib/cli/interactive-setup/deploy.js           |  5 ++++-
 lib/cli/interactive-setup/index.js            |  1 +
 lib/utils/telemetry/generatePayload.js        |  8 ++++++--
 scripts/serverless.js                         |  8 +++++---
 .../lib/cli/interactive-setup/deploy.test.js  | 20 +++++++++++++++++++
 .../utils/telemetry/generatePayload.test.js   | 20 +++++++++++++++++++
 6 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/lib/cli/interactive-setup/deploy.js b/lib/cli/interactive-setup/deploy.js
index 5d55e162ec7..8f9c0112348 100644
--- a/lib/cli/interactive-setup/deploy.js
+++ b/lib/cli/interactive-setup/deploy.js
@@ -142,7 +142,8 @@ module.exports = {
     context.inapplicabilityReasonCode = 'NO_CREDENTIALS_CONFIGURED';
     return false;
   },
-  async run({ initial, configuration, configurationFilename, serviceDir, stepHistory }) {
+  async run(context) {
+    const { initial, configuration, configurationFilename, serviceDir, stepHistory } = context;
     const serviceName = configuration.service;
     const shouldDeploy = await promptWithHistory({
       name: 'shouldDeploy',
@@ -183,6 +184,7 @@ module.exports = {
       await serverless.init();
       delete serverless.isLocallyInstalled;
       await serverless.run();
+      context.awsAccountId = serverless.getProvider('aws').accountId;
     } else {
       try {
         await overrideStdoutWrite(
@@ -197,6 +199,7 @@ module.exports = {
             // Remove previously set `isLocallyInstalled` as it was only needed to avoid local fallback in `init()`
             delete serverless.isLocallyInstalled;
             await serverless.run();
+            context.awsAccountId = serverless.getProvider('aws').accountId;
           }
         );
       } catch (err) {
diff --git a/lib/cli/interactive-setup/index.js b/lib/cli/interactive-setup/index.js
index c3352b918e4..aeadd596b63 100644
--- a/lib/cli/interactive-setup/index.js
+++ b/lib/cli/interactive-setup/index.js
@@ -59,5 +59,6 @@ module.exports = async (context) => {
 
   return {
     configuration: context.configuration,
+    awsAccountId: context.awsAccountId,
   };
 };
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index a047f20a294..cfb6bb1c279 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -138,6 +138,7 @@ module.exports = ({
   serverless,
   commandUsage,
   variableSources,
+  awsAccountId,
 }) => {
   let commandDurationMs;
 
@@ -300,11 +301,14 @@ module.exports = ({
     payload.isConfigValid = getConfigurationValidationResult(configuration);
     payload.dashboard.orgUid = serverless && serverless.service.orgUid;
 
-    if (serverless && command === 'deploy' && isAwsProvider) {
+    if (
+      isAwsProvider &&
+      ((serverless && command === 'deploy') || (command === '' && awsAccountId))
+    ) {
       const serviceName = isObject(configuration.service)
         ? configuration.service.name
         : configuration.service;
-      const accountId = serverless.getProvider('aws').accountId;
+      const accountId = awsAccountId || (serverless && serverless.getProvider('aws').accountId);
       if (serviceName && accountId) {
         payload.projectId = crypto
           .createHash('sha256')
diff --git a/scripts/serverless.js b/scripts/serverless.js
index ff89beab7b1..ebae14697f2 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -514,6 +514,7 @@ const processSpanPromise = (async () => {
     const isStandaloneCommand = notIntegratedCommands.has(command);
 
     if (!isHelpRequest && (isInteractiveSetup || isStandaloneCommand)) {
+      let interactiveResult;
       if (configuration) require('../lib/cli/ensure-supported-command')(configuration);
       if (isInteractiveSetup) {
         if (!process.stdin.isTTY && !process.env.SLS_INTERACTIVE_SETUP_ENABLE) {
@@ -523,15 +524,15 @@ const processSpanPromise = (async () => {
             'INTERACTIVE_SETUP_IN_NON_TTY'
           );
         }
-        const result = await require('../lib/cli/interactive-setup')({
+        interactiveResult = await require('../lib/cli/interactive-setup')({
           configuration,
           serviceDir,
           configurationFilename,
           options,
           commandUsage,
         });
-        if (result.configuration) {
-          configuration = result.configuration;
+        if (interactiveResult.configuration) {
+          configuration = interactiveResult.configuration;
         }
       } else {
         await require(`../commands/${commands.join('-')}`)({
@@ -558,6 +559,7 @@ const processSpanPromise = (async () => {
               configuration,
               commandUsage,
               variableSources: variableSourcesInConfig,
+              awsAccountId: interactiveResult.awsAccountId,
             }),
             outcome: 'success',
           });
diff --git a/test/unit/lib/cli/interactive-setup/deploy.test.js b/test/unit/lib/cli/interactive-setup/deploy.test.js
index 271ea53d1ed..d6d59d1e1a9 100644
--- a/test/unit/lib/cli/interactive-setup/deploy.test.js
+++ b/test/unit/lib/cli/interactive-setup/deploy.test.js
@@ -215,6 +215,11 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
             ],
             dashboardPlugin: {},
           };
+          this.getProvider = () => {
+            return {
+              accountId: '123',
+            };
+          };
         }
       }
 
@@ -276,6 +281,11 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
             ],
             dashboardPlugin: {},
           };
+          this.getProvider = () => {
+            return {
+              accountId: '123',
+            };
+          };
         }
       }
 
@@ -336,6 +346,11 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
               },
             ],
           };
+          this.getProvider = () => {
+            return {
+              accountId: '123',
+            };
+          };
         }
       }
 
@@ -388,6 +403,11 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
               },
             ],
           };
+          this.getProvider = () => {
+            return {
+              accountId: '123',
+            };
+          };
         }
       }
 
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index 62d2f630b16..3e5c7dd9cc4 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -680,4 +680,24 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
 
     expect(payload.projectId).to.deep.equal('35dsFwCaexwLHppAP4uDsjKW4ci54q1AKcN5JTNaDtw=');
   });
+
+  it('Should correctly resolve projectId property when account passed externally', async () => {
+    const { serverless } = await runServerless({
+      fixture: 'httpApi',
+      command: 'print',
+      configExt: {
+        service: 'to-ensure-unique-serivce-name',
+      },
+    });
+    const payload = generatePayload({
+      command: '',
+      options: {},
+      commandSchema: commandsSchema.get('deploy'),
+      serviceDir: serverless.serviceDir,
+      configuration: serverless.configurationInput,
+      awsAccountId: '1234567890',
+    });
+
+    expect(payload.projectId).to.deep.equal('35dsFwCaexwLHppAP4uDsjKW4ci54q1AKcN5JTNaDtw=');
+  });
 });

From 4fa20a56eafcab9d8675baa2f0fe6a9c6ee5e184 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 22 Dec 2021 10:06:20 +0100
Subject: [PATCH 0788/1101] feat(Telemetry): Report `didCreateService` property

---
 lib/cli/interactive-setup/deploy.js           |  4 ++--
 lib/cli/interactive-setup/index.js            |  5 +----
 lib/plugins/aws/deploy/lib/createStack.js     |  1 +
 lib/plugins/aws/lib/updateStack.js            |  1 +
 lib/utils/telemetry/generatePayload.js        | 12 +++++------
 scripts/serverless.js                         | 12 ++++++-----
 .../lib/cli/interactive-setup/deploy.test.js  | 20 -------------------
 .../utils/telemetry/generatePayload.test.js   |  7 ++++---
 8 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/lib/cli/interactive-setup/deploy.js b/lib/cli/interactive-setup/deploy.js
index 8f9c0112348..e1c281c1e19 100644
--- a/lib/cli/interactive-setup/deploy.js
+++ b/lib/cli/interactive-setup/deploy.js
@@ -184,7 +184,7 @@ module.exports = {
       await serverless.init();
       delete serverless.isLocallyInstalled;
       await serverless.run();
-      context.awsAccountId = serverless.getProvider('aws').accountId;
+      context.serverless = serverless;
     } else {
       try {
         await overrideStdoutWrite(
@@ -199,7 +199,7 @@ module.exports = {
             // Remove previously set `isLocallyInstalled` as it was only needed to avoid local fallback in `init()`
             delete serverless.isLocallyInstalled;
             await serverless.run();
-            context.awsAccountId = serverless.getProvider('aws').accountId;
+            context.serverless = serverless;
           }
         );
       } catch (err) {
diff --git a/lib/cli/interactive-setup/index.js b/lib/cli/interactive-setup/index.js
index aeadd596b63..2c12edcda86 100644
--- a/lib/cli/interactive-setup/index.js
+++ b/lib/cli/interactive-setup/index.js
@@ -57,8 +57,5 @@ module.exports = async (context) => {
     }
   }
 
-  return {
-    configuration: context.configuration,
-    awsAccountId: context.awsAccountId,
-  };
+  return context;
 };
diff --git a/lib/plugins/aws/deploy/lib/createStack.js b/lib/plugins/aws/deploy/lib/createStack.js
index fd16257e487..0f9a4789ee8 100644
--- a/lib/plugins/aws/deploy/lib/createStack.js
+++ b/lib/plugins/aws/deploy/lib/createStack.js
@@ -58,6 +58,7 @@ module.exports = {
       params.DisableRollback = this.serverless.service.provider.disableRollback;
     }
 
+    this.provider.didCreateService = true;
     return this.provider
       .request('CloudFormation', 'createStack', params)
       .then((cfData) => this.monitorStack('create', cfData));
diff --git a/lib/plugins/aws/lib/updateStack.js b/lib/plugins/aws/lib/updateStack.js
index 1313705e092..729bd7c108b 100644
--- a/lib/plugins/aws/lib/updateStack.js
+++ b/lib/plugins/aws/lib/updateStack.js
@@ -67,6 +67,7 @@ module.exports = {
       params.DisableRollback = this.serverless.service.provider.disableRollback;
     }
 
+    this.provider.didCreateService = true;
     return this.provider
       .request('CloudFormation', 'createStack', params)
       .then((cfData) => this.monitorStack('create', cfData));
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index cfb6bb1c279..e0f16779709 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -138,7 +138,6 @@ module.exports = ({
   serverless,
   commandUsage,
   variableSources,
-  awsAccountId,
 }) => {
   let commandDurationMs;
 
@@ -301,20 +300,21 @@ module.exports = ({
     payload.isConfigValid = getConfigurationValidationResult(configuration);
     payload.dashboard.orgUid = serverless && serverless.service.orgUid;
 
-    if (
-      isAwsProvider &&
-      ((serverless && command === 'deploy') || (command === '' && awsAccountId))
-    ) {
+    if (isAwsProvider && serverless && (command === 'deploy' || command === '')) {
       const serviceName = isObject(configuration.service)
         ? configuration.service.name
         : configuration.service;
-      const accountId = awsAccountId || (serverless && serverless.getProvider('aws').accountId);
+      const accountId = serverless && serverless.getProvider('aws').accountId;
       if (serviceName && accountId) {
         payload.projectId = crypto
           .createHash('sha256')
           .update(`${serviceName}-${accountId}`)
           .digest('base64');
       }
+
+      payload.didCreateService = Boolean(
+        serverless && serverless.getProvider('aws').didCreateService
+      );
     }
   }
 
diff --git a/scripts/serverless.js b/scripts/serverless.js
index ebae14697f2..e1bd5ddc8ae 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -514,7 +514,6 @@ const processSpanPromise = (async () => {
     const isStandaloneCommand = notIntegratedCommands.has(command);
 
     if (!isHelpRequest && (isInteractiveSetup || isStandaloneCommand)) {
-      let interactiveResult;
       if (configuration) require('../lib/cli/ensure-supported-command')(configuration);
       if (isInteractiveSetup) {
         if (!process.stdin.isTTY && !process.env.SLS_INTERACTIVE_SETUP_ENABLE) {
@@ -524,15 +523,18 @@ const processSpanPromise = (async () => {
             'INTERACTIVE_SETUP_IN_NON_TTY'
           );
         }
-        interactiveResult = await require('../lib/cli/interactive-setup')({
+        const interactiveContext = await require('../lib/cli/interactive-setup')({
           configuration,
           serviceDir,
           configurationFilename,
           options,
           commandUsage,
         });
-        if (interactiveResult.configuration) {
-          configuration = interactiveResult.configuration;
+        if (interactiveContext.configuration) {
+          configuration = interactiveContext.configuration;
+        }
+        if (interactiveContext.serverless) {
+          serverless = interactiveContext.serverless;
         }
       } else {
         await require(`../commands/${commands.join('-')}`)({
@@ -559,7 +561,7 @@ const processSpanPromise = (async () => {
               configuration,
               commandUsage,
               variableSources: variableSourcesInConfig,
-              awsAccountId: interactiveResult.awsAccountId,
+              serverless,
             }),
             outcome: 'success',
           });
diff --git a/test/unit/lib/cli/interactive-setup/deploy.test.js b/test/unit/lib/cli/interactive-setup/deploy.test.js
index d6d59d1e1a9..271ea53d1ed 100644
--- a/test/unit/lib/cli/interactive-setup/deploy.test.js
+++ b/test/unit/lib/cli/interactive-setup/deploy.test.js
@@ -215,11 +215,6 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
             ],
             dashboardPlugin: {},
           };
-          this.getProvider = () => {
-            return {
-              accountId: '123',
-            };
-          };
         }
       }
 
@@ -281,11 +276,6 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
             ],
             dashboardPlugin: {},
           };
-          this.getProvider = () => {
-            return {
-              accountId: '123',
-            };
-          };
         }
       }
 
@@ -346,11 +336,6 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
               },
             ],
           };
-          this.getProvider = () => {
-            return {
-              accountId: '123',
-            };
-          };
         }
       }
 
@@ -403,11 +388,6 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
               },
             ],
           };
-          this.getProvider = () => {
-            return {
-              accountId: '123',
-            };
-          };
         }
       }
 
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index 3e5c7dd9cc4..64e9590d3c8 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -681,7 +681,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     expect(payload.projectId).to.deep.equal('35dsFwCaexwLHppAP4uDsjKW4ci54q1AKcN5JTNaDtw=');
   });
 
-  it('Should correctly resolve projectId property when account passed externally', async () => {
+  it('Should correctly resolve `didCreateService` property', async () => {
     const { serverless } = await runServerless({
       fixture: 'httpApi',
       command: 'print',
@@ -689,15 +689,16 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
         service: 'to-ensure-unique-serivce-name',
       },
     });
+    serverless.getProvider('aws').didCreateService = true;
     const payload = generatePayload({
       command: '',
       options: {},
       commandSchema: commandsSchema.get('deploy'),
       serviceDir: serverless.serviceDir,
       configuration: serverless.configurationInput,
-      awsAccountId: '1234567890',
+      serverless,
     });
 
-    expect(payload.projectId).to.deep.equal('35dsFwCaexwLHppAP4uDsjKW4ci54q1AKcN5JTNaDtw=');
+    expect(payload.didCreateService).to.be.true;
   });
 });

From 8a53b08a68f11c502b3fb877484ae3b8aa1a0cc8 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Tue, 14 Dec 2021 15:31:13 +0000
Subject: [PATCH 0789/1101] docs: Consolidate "Getting started" pages into a
 single guide

---
 docs/getting-started.md                       |  94 ++++++---
 docs/guides/plugins/README.md                 |   2 +
 docs/providers/aws/README.md                  |   1 -
 .../aws/examples/hello-world/csharp/README.md |   2 +-
 .../aws/examples/hello-world/fsharp/README.md |   2 +-
 .../aws/examples/hello-world/go/README.md     |   2 +-
 .../aws/examples/hello-world/node/README.md   |   2 +-
 .../aws/examples/hello-world/python/README.md |   2 +-
 .../aws/examples/hello-world/ruby/README.md   |   2 +-
 docs/providers/aws/guide/installation.md      |  53 ------
 docs/providers/aws/guide/intro.md             |   2 +
 docs/providers/aws/guide/quick-start.md       | 178 ------------------
 12 files changed, 81 insertions(+), 261 deletions(-)
 delete mode 100644 docs/providers/aws/guide/installation.md
 delete mode 100644 docs/providers/aws/guide/quick-start.md

diff --git a/docs/getting-started.md b/docs/getting-started.md
index 43ff19a0996..dfe75bed76a 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -4,7 +4,6 @@ menuText: Get Started
 layout: Doc
 menuOrder: 0
 menuItems:
-  - {menuText: AWS Guide, path: /framework/docs/providers/aws/guide/quick-start}
   - {menuText: Azure Functions Guide, path: /framework/docs/providers/azure/guide/quick-start}
   - {menuText: Apache OpenWhisk Guide, path: /framework/docs/providers/openwhisk/guide/quick-start}
   - {menuText: Google Functions Guide, path: /framework/docs/providers/google/guide/quick-start}
@@ -19,9 +18,9 @@ menuItems:
 
 # Get started with Serverless Framework Open Source & AWS
 
-Getting started with Serverless Framework’s Open Source CLI and AWS only takes a few minutes. Install with NPM, or as a standalone binary if you don't use NPM.
+Getting started with Serverless Framework’s Open Source CLI and AWS only takes a few minutes.
 
-## via NPM
+## Installation
 
 Install the serverless CLI via NPM:
 
@@ -29,11 +28,11 @@ Install the serverless CLI via NPM:
 npm install -g serverless
 ```
 
-_Note: If you don’t already have [Node](https://nodejs.org/en/download/package-manager/) on your machine, install it first. We suggest using the latest LTS version of NodeJS._
+_Note: If you don’t already have Node on your machine, [install it first](https://nodejs.org/). We suggest using the latest LTS version of NodeJS._
 
 If you don't want to install Node or NPM, you can install a standalone binary.
 
-## Install as a standalone binary
+### Install as a standalone binary
 
 ### MacOS/Linux
 
@@ -59,54 +58,103 @@ Install with [Chocolatey](https://chocolatey.org/):
 choco install serverless
 ```
 
-## Initial setup
+## Upgrade
+
+If `serverless` was installed via NPM, upgrade it via:
+
+```bash
+npm update -g serverless
+```
+
+If you installed `serverless` as a standalone binary, read the following section instead.
+
+### Standalone binary
+
+On MacOS/Linux, run:
+
+```bash
+serverless upgrade
+```
+
+On Windows, run:
+
+```bash
+choco upgrade serverless
+```
+
+## Getting started
 
 Run the command below and follow the prompts:
 
 ```bash
+# Create a new serverless project
 serverless
+
+# Move into the newly created directory
+cd your-service-name
 ```
 
-The command will guide you to create a new serverless project.
+The `serverless` command will guide you to create a new project, [configure your AWS credentials](https://serverless.com/framework/docs/providers/aws/guide/credentials/), and optionally set up a free [Serverless Dashboard](https://www.serverless.com/monitoring) account to monitor, troubleshoot, and test your new service.
 
-_Note: Users in China are presented with a setup centered around the chinese [Tencent](https://intl.cloud.tencent.com/) provider. If you're based in China and prefer to be presented with steps as outside of China, set the following environment variable: `SERVERLESS_PLATFORM_VENDOR=aws`_
+_Note: Users in China are presented with a setup centered around the chinese [Tencent](https://intl.cloud.tencent.com/) provider. If you are based in China and prefer to use AWS, set the following environment variable: `SERVERLESS_PLATFORM_VENDOR=aws`._
 
-## Upgrade
+The newly created project should contain a `serverless.yml` file. This file defines everything that should be deployed to AWS: functions, events, resources and more. You can learn more about this in the [Core Concepts documentation](./providers/aws/guide/intro.md).
 
-### via npm
+If the templates proposed by the `serverless` command do not fit your needs, you can also explore the [project examples from Serverless Inc. and our community](https://www.serverless.com/examples/). You can install any example with the `create` command:
+
+```sh
+# replace folder-name below with the folder name of the example you want to use
+$ serverless create -u https://github.com/serverless/examples/tree/master/folder-name -n my-project
+```
+
+### Deploying
+
+If you haven't done so already within the `serverless` command, you can deploy the project at any time by running:
 
 ```bash
-npm update -g serverless
+serverless deploy
 ```
 
-If you have installed `serverless` as a standalone binary, read the following section instead.
+The deployed functions, resources and URLs will be displayed in the command output.
 
-### Standalone binary
+### Invoking function
 
-#### MacOS/Linux
+If you deployed an API, query its URL to trigger the associated Lambda function. You can find that URL in the `serverless deploy` output, or retrieve it later via `serverless info`.
+
+If you deployed a function that isn't exposed via a URL, you can invoke it via:
 
 ```bash
-serverless upgrade
+serverless invoke -f hello
+
+# Invoke and display logs:
+serverless invoke -f hello --log
 ```
 
-#### Windows
+### Fetching function logs
+
+All logs generated by a function's invocation are automatically stored in AWS CloudWatch. Retrieve those logs in the CLI via:
 
 ```bash
-choco upgrade serverless
+serverless logs -f hello
+
+# Tail logs
+serverless logs -f hello --tail
 ```
 
-## Set up your free Dashboard account
+### Monitoring
 
-Learn more about the [Serverless Framework Dashboard](https://serverless.com/framework/) and [sign up for free](https://app.serverless.com).
+You can monitor and debug Lambda functions and APIs via the [Serverless Dashboard](https://www.serverless.com/monitoring).
 
-Once you’ve signed up, login to your dashboard from the CLI:
+To set up Serverless Dashboard, [create a free account](https://www.serverless.com/monitoring) and run the following command in your project:
 
 ```bash
-serverless login
+serverless
 ```
 
-You can either add a new service in your dashboard, or with the CLI, using the command:
+## Remove your service
+
+To delete your service, run `serverless remove`. This will delete all the AWS resources created by your project and ensure that you don't incur any unexpected charges. It will also remove the service from Serverless Dashboard.
 
 ```bash
-serverless
+serverless remove
 ```
diff --git a/docs/guides/plugins/README.md b/docs/guides/plugins/README.md
index 337d63aea8a..e42e80367d9 100644
--- a/docs/guides/plugins/README.md
+++ b/docs/guides/plugins/README.md
@@ -20,6 +20,8 @@ If you or your organization have a specific workflow, install a pre-written plug
 
 Since the Serverless Framework is a group of "core" plugins, custom plugins are written exactly the same way as core plugins. Learn more about [creating a custom plugin](creating-plugins.md).
 
+Explore existing plugins in the [Serverless Framework Plugins repository](https://www.serverless.com/plugins).
+
 ## Installing plugins
 
 Plugins are installed per service. They are not applied globally.
diff --git a/docs/providers/aws/README.md b/docs/providers/aws/README.md
index a08cc56c7a3..b205dbfe6c3 100644
--- a/docs/providers/aws/README.md
+++ b/docs/providers/aws/README.md
@@ -21,7 +21,6 @@ layout: Doc
     <div class="docsProviderItems">
       <ul>
         <li><a href="./guide/intro.md">Intro</a></li>
-        <li><a href="./guide/installation.md">Installation</a></li>
         <li><a href="./guide/credentials.md">Credentials</a></li>
         <li><a href="./guide/services.md">Services</a></li>
         <li><a href="./guide/functions.md">Functions</a></li>
diff --git a/docs/providers/aws/examples/hello-world/csharp/README.md b/docs/providers/aws/examples/hello-world/csharp/README.md
index a590b3c0645..166904daa2a 100644
--- a/docs/providers/aws/examples/hello-world/csharp/README.md
+++ b/docs/providers/aws/examples/hello-world/csharp/README.md
@@ -13,7 +13,7 @@ layout: Doc
 
 # Hello World C# Example
 
-Make sure `serverless` is installed. [See installation guide](../../../guide/installation.md).
+Make sure `serverless` is installed. [See installation guide](https://www.serverless.com/framework/docs/getting-started).
 
 Once installed the Serverless CLI can be called with `serverless` or the shorthand `sls` command.
 
diff --git a/docs/providers/aws/examples/hello-world/fsharp/README.md b/docs/providers/aws/examples/hello-world/fsharp/README.md
index e918bbf330c..f0dd7a25d14 100644
--- a/docs/providers/aws/examples/hello-world/fsharp/README.md
+++ b/docs/providers/aws/examples/hello-world/fsharp/README.md
@@ -13,7 +13,7 @@ layout: Doc
 
 # Hello World F# Example
 
-Make sure `serverless` is installed. [See installation guide](../../../guide/installation.md).
+Make sure `serverless` is installed. [See installation guide](https://www.serverless.com/framework/docs/getting-started).
 
 Once installed the Serverless CLI can be called with `serverless` or the shorthand `sls` command.
 
diff --git a/docs/providers/aws/examples/hello-world/go/README.md b/docs/providers/aws/examples/hello-world/go/README.md
index 792750628d9..c5ed3e2527b 100644
--- a/docs/providers/aws/examples/hello-world/go/README.md
+++ b/docs/providers/aws/examples/hello-world/go/README.md
@@ -13,7 +13,7 @@ layout: Doc
 
 # Hello World Go Example
 
-Make sure `serverless` is installed. [See installation guide](../../../guide/installation.md).
+Make sure `serverless` is installed. [See installation guide](https://www.serverless.com/framework/docs/getting-started).
 
 Once installed the Serverless CLI can be called with `serverless` or the shorthand `sls` command.
 
diff --git a/docs/providers/aws/examples/hello-world/node/README.md b/docs/providers/aws/examples/hello-world/node/README.md
index 468585566d1..2420af6ad9d 100644
--- a/docs/providers/aws/examples/hello-world/node/README.md
+++ b/docs/providers/aws/examples/hello-world/node/README.md
@@ -13,7 +13,7 @@ layout: Doc
 
 # Hello World Node.js Example
 
-Make sure `serverless` is installed. [See installation guide](../../../guide/installation.md).
+Make sure `serverless` is installed. [See installation guide](https://www.serverless.com/framework/docs/getting-started).
 
 Once installed the Serverless CLI can be called with `serverless` or the shorthand `sls` command.
 
diff --git a/docs/providers/aws/examples/hello-world/python/README.md b/docs/providers/aws/examples/hello-world/python/README.md
index e614bd509df..74d5fafd703 100644
--- a/docs/providers/aws/examples/hello-world/python/README.md
+++ b/docs/providers/aws/examples/hello-world/python/README.md
@@ -13,7 +13,7 @@ layout: Doc
 
 # Hello World Python Example
 
-Make sure `serverless` is installed. [See installation guide](../../../guide/installation.md).
+Make sure `serverless` is installed. [See installation guide](https://www.serverless.com/framework/docs/getting-started).
 
 Once installed the Serverless CLI can be called with `serverless` or the shorthand `sls` command.
 
diff --git a/docs/providers/aws/examples/hello-world/ruby/README.md b/docs/providers/aws/examples/hello-world/ruby/README.md
index 9aa16fb7eb1..c1eb278d890 100644
--- a/docs/providers/aws/examples/hello-world/ruby/README.md
+++ b/docs/providers/aws/examples/hello-world/ruby/README.md
@@ -13,7 +13,7 @@ layout: Doc
 
 # Hello World Ruby Example
 
-Make sure `serverless` is installed. [See installation guide](../../../guide/installation.md).
+Make sure `serverless` is installed. [See installation guide](https://www.serverless.com/framework/docs/getting-started).
 
 Once installed the Serverless CLI can be called with `serverless` or the shorthand `sls` command.
 
diff --git a/docs/providers/aws/guide/installation.md b/docs/providers/aws/guide/installation.md
deleted file mode 100644
index 864db1f8e0f..00000000000
--- a/docs/providers/aws/guide/installation.md
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-title: Serverless Framework - AWS Lambda Guide - Installing The Serverless Framework
-menuText: Installation
-menuOrder: 2
-description: How to install the Serverless Framework and start using AWS Lambda
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/guide/installation)
-
-<!-- DOCS-SITE-LINK:END -->
-
-# AWS - Installation
-
-### Installing Node.js
-
-Serverless is a [Node.js](https://nodejs.org) CLI tool so the first thing you need to do is to install Node.js on your machine.
-
-Go to the official [Node.js website](https://nodejs.org), download and follow the [installation instructions](https://nodejs.org/en/download/) to install Node.js on your local machine.
-
-**Note:** Serverless runs on Node v6 or higher.
-
-You can verify that Node.js is installed successfully by running `node --version` in your terminal. You should see the corresponding Node version number printed out.
-
-### Installing the Serverless Framework
-
-Next, install the Serverless Framework via [npm](https://npmjs.org) which was already installed when you installed Node.js.
-
-Open up a terminal and type `npm install -g serverless` to install Serverless.
-
-```bash
-npm install -g serverless
-```
-
-Once the installation process is done you can verify that Serverless is installed successfully by running the following command in your terminal:
-
-```bash
-serverless
-```
-
-To see which version of serverless you have installed run:
-
-```bash
-serverless --version
-```
-
-### Setting up AWS
-
-To run serverless commands that interface with your AWS account, you will need to setup your AWS account credentials on your machine.
-
-[Follow these instructions on setting up AWS credentials](./credentials.md)
diff --git a/docs/providers/aws/guide/intro.md b/docs/providers/aws/guide/intro.md
index cc2ccfada30..4b5a492118f 100644
--- a/docs/providers/aws/guide/intro.md
+++ b/docs/providers/aws/guide/intro.md
@@ -178,3 +178,5 @@ plugins:
   - serverless-offline
   - serverless-secrets
 ```
+
+Read more about plugins in the [Plugin documentation](../../../guides/plugins).
diff --git a/docs/providers/aws/guide/quick-start.md b/docs/providers/aws/guide/quick-start.md
deleted file mode 100644
index 64a8fe5d6ec..00000000000
--- a/docs/providers/aws/guide/quick-start.md
+++ /dev/null
@@ -1,178 +0,0 @@
-<!--
-title: Serverless Framework - AWS Lambda Guide - Quick Start
-menuText: Quick Start
-menuOrder: 1
-description: Getting started with the Serverless Framework on AWS Lambda
-layout: Doc
--->
-
-# Quick Start
-
-Complete the steps in this guide to install the Serverless Framework open-source CLI and deploy a sample Service on AWS that reports deployment information and operational metrics to the Serverless Framework Dashboard.
-
-## Initial Setup
-
-There are a few prerequisites you need to install and configure:
-
-- [Install Node.js 6.x or later on your local machine](#install-nodejs-and-npm)
-- [Install the Serverless Framework open-source CLI version 1.47.0 or later](#install-the-serverless-framework-open-source-cli)
-
-If you already have these prerequisites setup you can skip ahead to deploy an example Service.
-
-### Install Node.js and NPM
-
-- Follow these [installation instructions](https://nodejs.org/en/download/).
-- At the end, you should be able to run `node -v` from your command line and get a result like this...
-
-```sh
-$ node -v
-vx.x.x
-```
-
-- You should also be able to run `npm -v` from your command line and should see...
-
-```sh
-$ npm -v
-x.x.x
-```
-
-### Install the Serverless Framework open-source CLI
-
-- Run this command in your terminal
-
-```sh
-npm install -g serverless
-```
-
-- After install is complete, you should be able to run `serverless -v` from your command line and get a result like this...
-
-```sh
-$ serverless -v
-x.x.x
-```
-
-## Create and deploy a serverless Service
-
-Now that you’ve completed your setup, let’s create and deploy a serverless Service.
-
-### Create a new Service from a Template
-
-Use the Serverless Framework open-source CLI to create a new Service.
-
-```sh
-# Create a new Serverless service/project
-$ serverless
-
-# Change into the newly created directory
-$ cd your-service-name
-```
-
-The `serverless` command will guide you through creating a new Node or Python Service, [configuring your AWS Account](https://serverless.com/framework/docs/providers/aws/guide/credentials/) to work with the Serverless Framework, and setting up a free Serverless Framework Dashboard account so you can monitor, troubleshoot, and test your new service.
-
-Looking to get started with something other than Node or Python? No problem. You can use the [`create`](https://serverless.com/framework/docs/providers/aws/cli-reference/create/) command to get started with a variety of other languages.
-
-### Set up an endpoint
-
-An Event is anything that can trigger your serverless functions. You can define an endpoint in your `serverless.yml` that will trigger your serverless function.
-
-```yaml
-functions:
-  hello:
-    handler: handler.hello
-    # Add the following lines:
-    events:
-      - httpApi: 'POST /hello'
-```
-
-### Deploy the Service
-
-Use this command to deploy your service for the first time and after you make changes to your Functions, Events or Resources in `serverless.yml` and want to deploy all changes within your Service at the same time.
-
-```bash
-serverless deploy -v
-```
-
-### Test your Service
-
-Replace the URL in the following curl command with your returned endpoint URL, which you can find in the `sls deploy` output, to hit your URL endpoint.
-
-```bash
-$ curl -X POST https://xxxxxxxxxx.execute-api.us-east-1.amazonaws.com/hello
-```
-
-### Invoke your Service's function
-
-Invokes a Function and returns logs.
-
-```bash
-serverless invoke -f hello -l
-```
-
-### Fetch the Function Logs
-
-Open up a separate tab in your console and stream all logs for a specific Function using this command.
-
-```bash
-serverless logs -f hello -t
-```
-
-### Monitor your Service
-
-Use either of the two commands below to generate mock errors that you will then be able to visualize in the Serverless Framework Dashboard. If you use the curl command remember to replace the URL in the command with your returned endpoint URL, which you can find in your `sls deploy` output.
-
-```bash
-serverless invoke -f hello -d '{"body": "not a json string"}' # causes a JSON parsing error so error Insights will populate
-```
-
-```bash
-$ curl https://xxxxxxxxxx.execute-api.us-east-1.amazonaws.com/hello --data-binary 'not a json string' # causes a JSON parsing error so error Insights will populate
-```
-
-## Cleanup
-
-### Remove your Service
-
-If at any point you no longer need your Service, you can run the following command to remove the Functions, Events and Resources that were created. This will delete the AWS resources you created and ensure that you don't incur any unexpected charges. It will also remove the Service from your Serverless Framework Dashboard.
-
-```sh
-serverless remove
-```
-
-## Deploy more Services!
-
-Now you are ready to leverage the hundreds of Service Examples available to you from Serverless, Inc. and our large and growing community to build your own Services.
-
-### Create a new Service from an Example
-
-The `serverless` introduction above guided you through creating a new service for a simple Node.js project. However, if you want to create a project for a more advanced use case and you don’t want to start from scratch, check out the list of available examples.
-
-Clone a Service from the Serverless Inc. repository of [Examples](https://serverless.com/examples/)
-
-```sh
-# replace folder-name below with the folder name of the example you want to use
-$ serverless create -u https://github.com/serverless/examples/tree/master/folder-name -n my-project
-```
-
-Or, clone a Service example from the Serverless open-source community
-
-```sh
-$ serverless create -u https://github.com/author/project -n my-project
-```
-
-### Remember to configure your new Service to work with the Serverless Framework account for monitoring, troubleshooting and testing features.
-
-Run the `serverless` command in your new project to connect it to your Serverless Framework Dashboard account to enable the monitoring, troubleshooting and testing features.
-
-```sh
-$ serverless
-```
-
-Deploy your service
-
-```sh
-$ sls deploy
-```
-
-## Additional Tutorials
-
-Want to learn more? Check out a list of available tutorials [here](https://serverless.com/courses/).

From 56bdef503cda3fafb521fadd269da2a686786ce7 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 23 Dec 2021 12:26:55 +0100
Subject: [PATCH 0790/1101] docs(AWS API Gateway): Fix binary response example

---
 docs/providers/aws/events/apigateway.md | 34 ++++++++++++++-----------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/docs/providers/aws/events/apigateway.md b/docs/providers/aws/events/apigateway.md
index 1e01101a271..adcbff94ad8 100644
--- a/docs/providers/aws/events/apigateway.md
+++ b/docs/providers/aws/events/apigateway.md
@@ -1676,31 +1676,35 @@ provider:
 
 API Gateway makes it possible to return binary media such as images or files as responses.
 
-Configuring API Gateway to return binary media can be done via the `binaryMediaTypes` config:
+To return binary media in proxy integration, set the `binaryMediaTypes` config:
 
 ```yml
 provider:
   apiGateway:
     binaryMediaTypes:
       - '*/*'
+functions:
+  binaryExample:
+    handler: binaryExample.handler
+    events:
+      - http:
+          path: binary
+          method: GET
 ```
 
-In your Lambda function you need to ensure that the correct `content-type` header is set. Furthermore you might want to return the response body in base64 format.
+Having that in your Lambda function, you need to ensure that the correct `content-type` header is set and provide a base64 encoded string for a body.
+e.g., Assuming that there's an `image.jpg` file located aside of `binaryExample.js` lambda handler, the handler can be set up as follows:
 
-To convert the request or response payload, you can set the [contentHandling](https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-payload-encodings-workflow.html) property (if set, the response contentHandling property will be passed to integration responses with 2XXs method response statuses).
+```js
+const fsp = require('fs').promises;
+const path = require('path');
 
-```yml
-functions:
-  create:
-    handler: posts.create
-    events:
-      - http:
-          path: posts/create
-          method: post
-          request:
-            contentHandling: CONVERT_TO_TEXT
-          response:
-            contentHandling: CONVERT_TO_TEXT
+module.exports.handler = async () => ({
+  statusCode: 200,
+  headers: { 'Content-type': 'image/jpeg' },
+  body: (await fsp.readFile(path.resolve(__dirname, 'image.jpg'))).toString('base64'),
+  isBase64Encoded: true,
+});
 ```
 
 ## Detailed CloudWatch Metrics

From 0de3bc3cb9c1685226ea0c610e030f9279e79e4e Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 23 Dec 2021 14:29:34 +0100
Subject: [PATCH 0791/1101] feat(Telemetry): Report `projectId` in remove
 command

---
 lib/plugins/aws/remove/index.js        | 9 +++++++++
 lib/utils/telemetry/generatePayload.js | 5 ++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/aws/remove/index.js b/lib/plugins/aws/remove/index.js
index 403e31f9236..43658933041 100644
--- a/lib/plugins/aws/remove/index.js
+++ b/lib/plugins/aws/remove/index.js
@@ -37,6 +37,15 @@ class AwsRemove {
               .getStage()} ${style.aside(`(${this.serverless.getProvider('aws').getRegion()})`)}`
           );
           log.info(); // Ensure gap between verbose logging
+
+          // This is used to ensure that for `remove` command, the `accountId` will be resolved and available
+          // for `generatePayload` telemetry logic
+          this.provider.getAccountId().then(
+            (accountId) => (this.provider.accountId = accountId),
+            () => {
+              /* pass on all errors */
+            }
+          );
         }
       },
       'remove:remove': async () => {
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index e0f16779709..ba9b4702857 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -20,6 +20,7 @@ const ci = require('ci-info');
 const AWS = require('aws-sdk');
 
 const configValidationModeValues = new Set(['off', 'warn', 'error']);
+const commandsReportingProjectId = new Set(['deploy', '', 'remove']);
 
 const checkIsTabAutocompletionInstalled = () => {
   try {
@@ -300,7 +301,7 @@ module.exports = ({
     payload.isConfigValid = getConfigurationValidationResult(configuration);
     payload.dashboard.orgUid = serverless && serverless.service.orgUid;
 
-    if (isAwsProvider && serverless && (command === 'deploy' || command === '')) {
+    if (isAwsProvider && serverless && commandsReportingProjectId.has(command)) {
       const serviceName = isObject(configuration.service)
         ? configuration.service.name
         : configuration.service;
@@ -311,7 +312,9 @@ module.exports = ({
           .update(`${serviceName}-${accountId}`)
           .digest('base64');
       }
+    }
 
+    if (isAwsProvider && serverless && (command === 'deploy' || command === '')) {
       payload.didCreateService = Boolean(
         serverless && serverless.getProvider('aws').didCreateService
       );

From 5a451ad0249b6924cd4105e5c372028402517ecd Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 23 Dec 2021 13:56:00 +0100
Subject: [PATCH 0792/1101] refactor: Replace internal old logging utils with
 modern interface

---
 lib/utils/log/consoleLog.js    |  7 -------
 lib/utils/log/fileLog.js       | 12 ------------
 lib/utils/log/log.js           | 14 --------------
 lib/utils/log/serverlessLog.js | 11 -----------
 lib/utils/telemetry/index.js   | 28 +++++++++++++++++++---------
 lib/utils/yamlAstParser.js     | 13 +++++--------
 6 files changed, 24 insertions(+), 61 deletions(-)
 delete mode 100644 lib/utils/log/consoleLog.js
 delete mode 100644 lib/utils/log/fileLog.js
 delete mode 100644 lib/utils/log/log.js
 delete mode 100644 lib/utils/log/serverlessLog.js

diff --git a/lib/utils/log/consoleLog.js b/lib/utils/log/consoleLog.js
deleted file mode 100644
index 4bbe9966199..00000000000
--- a/lib/utils/log/consoleLog.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-
-const consoleLog = function (...args) {
-  console.log(args); // eslint-disable-line no-console
-};
-
-module.exports = consoleLog;
diff --git a/lib/utils/log/fileLog.js b/lib/utils/log/fileLog.js
deleted file mode 100644
index 4b7e5f0f640..00000000000
--- a/lib/utils/log/fileLog.js
+++ /dev/null
@@ -1,12 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-
-const fileLog = function (...args) {
-  // TODO BRN: This does not guarantee order, is not multi process safe,
-  // TODO BRN: and is not guaranteed to complete before exit.
-  fs.appendFileSync(path.join(process.cwd(), 'sls.log'), `${args.join()}\n`);
-};
-
-module.exports = fileLog;
diff --git a/lib/utils/log/log.js b/lib/utils/log/log.js
deleted file mode 100644
index 81e7d2233e3..00000000000
--- a/lib/utils/log/log.js
+++ /dev/null
@@ -1,14 +0,0 @@
-'use strict';
-
-const fileLog = require('./fileLog');
-
-const loggers = [
-  // consoleLog,
-  fileLog,
-];
-
-const log = function (...args) {
-  loggers.forEach((logger) => logger(...args));
-};
-
-module.exports = log;
diff --git a/lib/utils/log/serverlessLog.js b/lib/utils/log/serverlessLog.js
deleted file mode 100644
index 94ba61795e0..00000000000
--- a/lib/utils/log/serverlessLog.js
+++ /dev/null
@@ -1,11 +0,0 @@
-'use strict';
-
-/* eslint-disable no-console */
-
-const chalk = require('chalk');
-
-const log = function (message) {
-  console.log(`Serverless: ${chalk.yellow(message)}`);
-};
-
-module.exports = log;
diff --git a/lib/utils/telemetry/index.js b/lib/utils/telemetry/index.js
index 58c0732adeb..64ca61377a0 100644
--- a/lib/utils/telemetry/index.js
+++ b/lib/utils/telemetry/index.js
@@ -8,10 +8,12 @@ const fetch = require('node-fetch');
 const fse = require('fs-extra');
 const fsp = require('fs').promises;
 const telemetryUrl = require('@serverless/utils/analytics-and-notfications-url');
-const log = require('../log/serverlessLog');
+const { legacy, log } = require('@serverless/utils/log');
 const isTelemetryDisabled = require('./areDisabled');
 const cacheDirPath = require('./cache-path');
 
+const debugLog = log.get('telemetry');
+
 const timestampWeekBefore = Date.now() - 1000 * 60 * 60 * 24 * 7;
 
 const isUuid = RegExp.prototype.test.bind(
@@ -21,8 +23,9 @@ const isUuid = RegExp.prototype.test.bind(
 let serverlessRunEndTime;
 
 const logError = (type, error) => {
+  debugLog('User stats error: %s: %O', type, error);
   if (!process.env.SLS_STATS_DEBUG) return;
-  log(format('User stats error: %s: %O', type, error));
+  legacy.log(format('User stats error: %s: %O', type, error));
 };
 
 const markServerlessRunEnd = () => (serverlessRunEndTime = Date.now());
@@ -38,14 +41,21 @@ const processResponseBody = async (response, ids, startTime) => {
   }
 
   const endTime = Date.now();
-  if (serverlessRunEndTime && process.env.SLS_STATS_DEBUG) {
-    log(
-      format(
-        'Stats request prevented process from exiting for %dms (request time: %dms)',
-        endTime - serverlessRunEndTime,
-        endTime - startTime
-      )
+  if (serverlessRunEndTime) {
+    debugLog(
+      'Stats request prevented process from exiting for %dms (request time: %dms)',
+      endTime - serverlessRunEndTime,
+      endTime - startTime
     );
+    if (process.env.SLS_STATS_DEBUG) {
+      legacy.log(
+        format(
+          'Stats request prevented process from exiting for %dms (request time: %dms)',
+          endTime - serverlessRunEndTime,
+          endTime - startTime
+        )
+      );
+    }
   }
   return result;
 };
diff --git a/lib/utils/yamlAstParser.js b/lib/utils/yamlAstParser.js
index 0e2a3a5adba..fbbd3619fd5 100644
--- a/lib/utils/yamlAstParser.js
+++ b/lib/utils/yamlAstParser.js
@@ -5,8 +5,7 @@ const BbPromise = require('bluebird');
 const fs = BbPromise.promisifyAll(require('fs'));
 const _ = require('lodash');
 const os = require('os');
-const chalk = require('chalk');
-const log = require('./log/serverlessLog');
+const { legacy, log } = require('@serverless/utils/log');
 
 const findKeyChain = (astContent) => {
   let content = astContent;
@@ -25,12 +24,10 @@ const parseAST = (ymlAstContent, astObject) => {
   if (ymlAstContent.mappings && Array.isArray(ymlAstContent.mappings)) {
     ymlAstContent.mappings.forEach((v) => {
       if (!v.value) {
-        const errorMessage = [
-          'Serverless: ',
-          `${chalk.red('Your serverless.yml has an invalid value with key:')} `,
-          `${chalk.red(`"${v.key.value}"`)}`,
-        ].join('');
-        log(errorMessage);
+        legacy.log(`Your serverless.yml has an invalid value with key: "${v.key.value}"`, {
+          color: 'red',
+        });
+        log.error(`Your serverless.yml has an invalid value with key: "${v.key.value}"`);
         return;
       }
 

From ccf82364c0e9dcb5e4635ac9d4b5bc854c481f39 Mon Sep 17 00:00:00 2001
From: Gustavo Efeiche <gustavo.efeiche@gmail.com>
Date: Mon, 27 Dec 2021 06:43:51 -0300
Subject: [PATCH 0793/1101] docs: Remove redundant permission from IAM code
 snippet (#10420)

---
 docs/guides/providers.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/guides/providers.md b/docs/guides/providers.md
index ba4b3802f1d..fbf99775fa3 100644
--- a/docs/guides/providers.md
+++ b/docs/guides/providers.md
@@ -154,7 +154,6 @@ If you are create a custom IAM Role with this policy, you will need to add a Tru
                 "s3:DeleteObjectVersion",
                 "events:PutRule",
                 "lambda:GetAccountSettings",
-                "s3:ListBucket",
                 "lambda:GetLayerVersionPolicy",
                 "s3:PutEncryptionConfiguration",
                 "apigateway:DELETE",

From 786f5e45d54ae9925649367b0a0e8660eda542e6 Mon Sep 17 00:00:00 2001
From: Marina <MarinaMeza@users.noreply.github.com>
Date: Mon, 27 Dec 2021 07:34:40 -0300
Subject: [PATCH 0794/1101] fix(Templates): Update `aws-lambda-java-log4j2`
 (#10383)

---
 .../create/templates/aws-kotlin-jvm-gradle-kts/build.gradle.kts | 2 +-
 lib/plugins/create/templates/aws-scala-sbt/build.sbt            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/build.gradle.kts b/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/build.gradle.kts
index 63e6ef2e0b1..03b76cdaf6d 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/build.gradle.kts
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/build.gradle.kts
@@ -38,7 +38,7 @@ repositories {
 dependencies {
     api("org.jetbrains.kotlin:kotlin-stdlib:1.3.71")
     api("com.amazonaws:aws-lambda-java-core:1.2.1")
-    api("com.amazonaws:aws-lambda-java-log4j2:1.2.0")
+    api("com.amazonaws:aws-lambda-java-log4j2:1.5.0")
     api("org.slf4j:slf4j-simple:1.7.30")
     api("com.fasterxml.jackson.core:jackson-core:2.11.0")
     api("com.fasterxml.jackson.core:jackson-databind:2.11.0")
diff --git a/lib/plugins/create/templates/aws-scala-sbt/build.sbt b/lib/plugins/create/templates/aws-scala-sbt/build.sbt
index d53e7357f61..93b0957a69b 100644
--- a/lib/plugins/create/templates/aws-scala-sbt/build.sbt
+++ b/lib/plugins/create/templates/aws-scala-sbt/build.sbt
@@ -13,7 +13,7 @@ assemblyJarName in assembly := "hello.jar"
 libraryDependencies ++= Seq(
   "com.amazonaws" % "aws-lambda-java-events" % "2.2.7",
   "com.amazonaws" % "aws-lambda-java-core" % "1.2.0",
-  "com.amazonaws" % "aws-lambda-java-log4j2" % "1.1.0"
+  "com.amazonaws" % "aws-lambda-java-log4j2" % "1.5.0"
 )
 
 scalacOptions ++= Seq(

From bc595afae84ca69914cfb4e7a1b45e002aceb5fe Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 27 Dec 2021 16:43:45 +0100
Subject: [PATCH 0795/1101] chore: Bump dependencies

---
 package.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 70a816941b5..6f87712321f 100644
--- a/package.json
+++ b/package.json
@@ -24,13 +24,13 @@
   "dependencies": {
     "@serverless/cli": "^1.5.3",
     "@serverless/components": "^3.18.1",
-    "@serverless/dashboard-plugin": "^5.5.1",
+    "@serverless/dashboard-plugin": "^5.5.2",
     "@serverless/platform-client": "^4.3.0",
-    "@serverless/utils": "^5.20.1",
+    "@serverless/utils": "^5.20.2",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.1046.0",
+    "aws-sdk": "^2.1048.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.1.2",
     "cachedir": "^2.3.0",
@@ -43,7 +43,7 @@
     "decompress": "^4.2.1",
     "dotenv": "^10.0.0",
     "dotenv-expand": "^5.1.0",
-    "essentials": "^1.1.1",
+    "essentials": "^1.2.0",
     "ext": "^1.6.0",
     "fastest-levenshtein": "^1.0.12",
     "filesize": "^8.0.6",
@@ -82,11 +82,11 @@
   "devDependencies": {
     "@commitlint/cli": "^12.1.4",
     "@serverless/eslint-config": "^4.0.0",
-    "@serverless/test": "^8.5.0",
+    "@serverless/test": "^8.6.0",
     "adm-zip": "^0.5.9",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "cos-nodejs-sdk-v5": "^2.11.4",
+    "cos-nodejs-sdk-v5": "^2.11.6",
     "eslint": "^7.32.0",
     "eslint-plugin-import": "^2.25.3",
     "git-list-updated": "^1.2.1",
@@ -95,7 +95,7 @@
     "jszip": "^3.7.1",
     "lint-staged": "^10.5.4",
     "log": "^6.3.1",
-    "log-node": "^8.0.2",
+    "log-node": "^8.0.3",
     "mocha": "^8.4.0",
     "mock-require": "^3.0.3",
     "nyc": "^15.1.0",

From 6901fa6e05aee7a6c2d4d85f211710a8f633c098 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 27 Dec 2021 17:33:02 +0100
Subject: [PATCH 0796/1101] chore: Release v2.70.0

---
 CHANGELOG.md | 27 +++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69227e2fcdf..5c5bd5fa032 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,33 @@
 
 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.
 
+## [2.70.0](https://github.com/serverless/serverless/compare/v2.69.1...v2.70.0) (2021-12-27)
+
+### Features
+
+- **AWS API Gateway:** Allow use of custom authorizer with authorizerId ([#10384](https://github.com/serverless/serverless/pull/10384)) ([c0eda27](https://github.com/serverless/serverless/commit/c0eda272901fd91947c6f37589b33f65c804dc9b)) ([Adam Lanners](https://github.com/darksun))
+- **AWS Local Invocation:** Upgrade `log4j` to version 2.17.0 ([#10396](https://github.com/serverless/serverless/issues/10396)) ([2782ed4](https://github.com/serverless/serverless/commit/2782ed4221caa410708cbabbbd09d45a6363be29)) ([Vassili Gorshkov](https://github.com/atlasgurus))
+
+### Bug Fixes
+
+- **AWS API Gateway:** Meaningfully reject missing `restApiRootResourceId` ([#10371](https://github.com/serverless/serverless/issues/10371)) ([2c0a962](https://github.com/serverless/serverless/commit/2c0a962c4fc0ad82ecbc6a266d56bfaa81ad8054)) ([Sudipto Das](https://github.com/sdas13))
+- **AWS Deploy:** Fix reliability of VPC config change detection in `deploy function` ([#10409](https://github.com/serverless/serverless/issues/10409)) ([0190d0d](https://github.com/serverless/serverless/commit/0190d0df05f4e37c8e965913ef1ceaf6b8a9b525)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Templates
+
+- Upgrade `log4j` in `aws-lambda-java-log4j2` ([#10383](https://github.com/serverless/serverless/issues/10383)) ([786f5e4](https://github.com/serverless/serverless/commit/786f5e45d54ae9925649367b0a0e8660eda542e6)) ([Marina](https://github.com/MarinaMeza))
+- Upgrade `log4j` in `aws-kotlin-jvm-gradle` ([#10382](https://github.com/serverless/serverless/issues/10382)) ([7bf8f1b](https://github.com/serverless/serverless/commit/7bf8f1b723cc4f6624df7be3d27f246b3a826140)) ([Varun](https://github.com/varun73))
+- Upgrade `log4j` dependencies ([#10392](https://github.com/serverless/serverless/issues/10392)) ([86fa604](https://github.com/serverless/serverless/commit/86fa60445c83cf35f3411ae49c2a1c4fc7fd82f0)) ([Juan Bermúdez](https://github.com/JuanBermudezN))
+
+### Maintenance Improvements
+
+- **Telemetry:**
+  - Report `didCreateService` property ([#10406](https://github.com/serverless/serverless/pull/10406)) ([4fa20a5](https://github.com/serverless/serverless/commit/4fa20a56eafcab9d8675baa2f0fe6a9c6ee5e184)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Report `projectId` in remove command ([#10415](https://github.com/serverless/serverless/pull/10415)) ([0de3bc3](https://github.com/serverless/serverless/commit/0de3bc3cb9c1685226ea0c610e030f9279e79e4e)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Ensure to report `projectId` for interactive ([#10406](https://github.com/serverless/serverless/pull/10406)) ([08b5acb](https://github.com/serverless/serverless/commit/08b5acbaa901c7ce529064c394151e05bdd43aef)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI:** Replace internal old logging utils with modern interface ([#10417](https://github.com/serverless/serverless/pull/10417)) ([5a451ad](https://github.com/serverless/serverless/commit/5a451ad0249b6924cd4105e5c372028402517ecd)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Variables:** Support custom sources in internal resolver ([#10393](https://github.com/serverless/serverless/pull/10393)) ([365a7f1](https://github.com/serverless/serverless/commit/365a7f13afaf40e9e2d573b0668159d6dea7aa02)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ## [2.69.1](https://github.com/serverless/serverless/compare/v2.69.0...v2.69.1) (2021-12-15)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 6f87712321f..f06cf5c5d28 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.69.1",
+  "version": "2.70.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 7b360386eadb9a83af73514ced34bc901af43457 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 28 Dec 2021 15:45:36 +0100
Subject: [PATCH 0797/1101] refactor(CLI): Ensure telemetry logs are issued at
 debug level

---
 lib/utils/telemetry/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/utils/telemetry/index.js b/lib/utils/telemetry/index.js
index 64ca61377a0..d1b48b8f54f 100644
--- a/lib/utils/telemetry/index.js
+++ b/lib/utils/telemetry/index.js
@@ -12,7 +12,7 @@ const { legacy, log } = require('@serverless/utils/log');
 const isTelemetryDisabled = require('./areDisabled');
 const cacheDirPath = require('./cache-path');
 
-const debugLog = log.get('telemetry');
+const telemetryLog = log.get('telemetry');
 
 const timestampWeekBefore = Date.now() - 1000 * 60 * 60 * 24 * 7;
 
@@ -23,7 +23,7 @@ const isUuid = RegExp.prototype.test.bind(
 let serverlessRunEndTime;
 
 const logError = (type, error) => {
-  debugLog('User stats error: %s: %O', type, error);
+  telemetryLog.debug('User stats error: %s: %O', type, error);
   if (!process.env.SLS_STATS_DEBUG) return;
   legacy.log(format('User stats error: %s: %O', type, error));
 };
@@ -42,7 +42,7 @@ const processResponseBody = async (response, ids, startTime) => {
 
   const endTime = Date.now();
   if (serverlessRunEndTime) {
-    debugLog(
+    telemetryLog.debug(
       'Stats request prevented process from exiting for %dms (request time: %dms)',
       endTime - serverlessRunEndTime,
       endTime - startTime

From fa1d8fdb31ef2834f19b64dceca879974d18d9ff Mon Sep 17 00:00:00 2001
From: Mark Tse <mark.tse@neverendingqs.com>
Date: Mon, 27 Dec 2021 04:43:10 -0500
Subject: [PATCH 0798/1101] refactor(CLI): Fix typo in error message (#10421)

---
 scripts/serverless.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index e1bd5ddc8ae..382e347521e 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -519,7 +519,7 @@ const processSpanPromise = (async () => {
         if (!process.stdin.isTTY && !process.env.SLS_INTERACTIVE_SETUP_ENABLE) {
           throw new ServerlessError(
             'Attempted to run an interactive setup in non TTY environment.\n' +
-              "If that's intentended enforce with SLS_INTERACTIVE_SETUP_ENABLE=1 environment variable",
+              "If that's intended enforce with SLS_INTERACTIVE_SETUP_ENABLE=1 environment variable",
             'INTERACTIVE_SETUP_IN_NON_TTY'
           );
         }

From f8937723967537eb0c0b739b50c5861386722393 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Wed, 29 Dec 2021 11:47:17 +0100
Subject: [PATCH 0799/1101] docs: Fix headers in `getting-started.md` (#10427)

---
 docs/getting-started.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/getting-started.md b/docs/getting-started.md
index dfe75bed76a..9ab8f811abe 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -34,7 +34,7 @@ If you don't want to install Node or NPM, you can install a standalone binary.
 
 ### Install as a standalone binary
 
-### MacOS/Linux
+#### MacOS/Linux
 
 To install the latest version, run this command in your terminal:
 
@@ -50,7 +50,7 @@ curl -o- -L https://slss.io/install | VERSION=2.21.1 bash
 
 Then, open another terminal window to run the `serverless` program.
 
-### Windows
+#### Windows
 
 Install with [Chocolatey](https://chocolatey.org/):
 

From dbb044c8b781236a3ba740b5d6afbdafacc9f361 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Wed, 29 Dec 2021 17:37:43 +0100
Subject: [PATCH 0800/1101] docs: Various text improvements

---
 docs/deprecations.md                          | 24 +++++----
 docs/getting-started.md                       |  4 +-
 lib/cli/interactive-setup/aws-credentials.js  | 16 +++---
 lib/cli/interactive-setup/utils.js            |  2 +-
 scripts/serverless.js                         | 50 +++++++++----------
 .../interactive-setup/aws-credentials.test.js |  8 +--
 6 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 902102ae4c4..d40bd72d58f 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -6,9 +6,11 @@ layout: Doc
 
 # Serverless Framework Deprecations
 
-## How to disable specific deprecation logs
+## How to disable a specific deprecation
 
-To disable specific deprecations set `SLS_DEPRECATION_DISABLE` environment variable. Setting `SLS_DEPRECATION_DISABLE=*` will disable all deprecations. If you want to disable specific deprecations set `SLS_DEPRECATION_DISABLE=CODE1,CODE2`. Alternatively, you can also use `disabledDeprecations` in your `serverless.yml` in the following manner:
+To disable a deprecation, use the `SLS_DEPRECATION_DISABLE=CODE` environment variable. You can disable multiple deprecations via `SLS_DEPRECATION_DISABLE=CODE1,CODE2` or disable them all via `SLS_DEPRECATION_DISABLE=*`.
+
+Alternatively, you can set `disabledDeprecations` in `serverless.yml`:
 
 ```yml
 service: myService
@@ -17,24 +19,24 @@ disabledDeprecations:
   - '*' # To disable all deprecation messages
 ```
 
-## Notifications mode
-
-By default deprecations are logged, after command finalizes with a warning summary (`warn:summary` mode)
-
-Alternatively deprecation warnings can be displayed as they're discovered, on the go, that can be turned on with `warn` mode (this mode is automatically pursued on in case we fallback to locally installed Serverless Framework installation)
+## Notification mode
 
-If there's an intention to work with _deprecation_ free service, reporting mode can be switched to `error`, so approached deprecation is reported with a thrown error.
+By default, deprecations are logged after the command finalizes with a warning summary.
 
-Mode can be set via environment variable: `SLS_DEPRECATION_NOTIFICATION_MODE=error` or via top level service configuration setting:
+This notification mode can be changed via the `SLS_DEPRECATION_NOTIFICATION_MODE=error` environment variable or via `serverless.yml`:
 
 ```yaml
 deprecationNotificationMode: error
 ```
 
+The `error` mode turns all deprecations into strict errors.
+
+The `warn` mode displays deprecations as they're discovered (this mode is automatically enabled in case of fallback to a locally installed Serverless Framework installation).
+
 Note:
 
-- In service configuration setting is ineffective for deprecations reported before service configuration is read.
-- `SLS_DEPRECATION_DISABLE` env var and `disabledDeprecations` configuration setting remain respected, and no errors will be thrown for mentioned deprecation coodes.
+- The `serverless.yml` setting is ineffective for deprecations reported before the configuration is read.
+- `SLS_DEPRECATION_DISABLE` and `disabledDeprecations` remain respected, and no errors will be thrown for mentioned deprecation codes.
 
 <a name="S3_TRANSFER_ACCELERATION_ON_EXISTING_BUCKET"><div>&nbsp;</div></a>
 
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 9ab8f811abe..05566dddd38 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -104,7 +104,9 @@ If the templates proposed by the `serverless` command do not fit your needs, you
 
 ```sh
 # replace folder-name below with the folder name of the example you want to use
-$ serverless create -u https://github.com/serverless/examples/tree/master/folder-name -n my-project
+$ serverless create \
+  -u https://github.com/serverless/examples/tree/master/folder-name \
+  -n my-project
 ```
 
 ### Deploying
diff --git a/lib/cli/interactive-setup/aws-credentials.js b/lib/cli/interactive-setup/aws-credentials.js
index 50e30d4c680..16e05a58c7e 100644
--- a/lib/cli/interactive-setup/aws-credentials.js
+++ b/lib/cli/interactive-setup/aws-credentials.js
@@ -45,7 +45,7 @@ const getOrgUidByName = memoizee(
     } catch (err) {
       if (err.statusCode && err.statusCode >= 500) {
         throw new ServerlessError(
-          'Dashboard service is currently unavailable, please try again later',
+          'Serverless Dashboard is currently unavailable, please try again later',
           'DASHBOARD_UNAVAILABLE'
         );
       }
@@ -66,7 +66,7 @@ const getProviders = memoizee(
     } catch (err) {
       if (err.statusCode && err.statusCode >= 500) {
         throw new ServerlessError(
-          'Dashboard service is currently unavailable, please try again later',
+          'Serverless Dashboard is currently unavailable, please try again later',
           'DASHBOARD_UNAVAILABLE'
         );
       }
@@ -87,7 +87,7 @@ const awsAccessKeyIdInput = async ({ stepHistory }) => {
     stepHistory,
     validate: (input) => {
       if (isValidAwsAccessKeyId(input.trim())) return true;
-      return 'AWS Access Key Id seems not valid.\n   Expected something like AKIAIOSFODNN7EXAMPLE';
+      return 'AWS Access Key Id seems invalid.\n   Expected something like AKIAIOSFODNN7EXAMPLE';
     },
   });
   return accessKeyId;
@@ -102,7 +102,7 @@ const awsSecretAccessKeyInput = async ({ stepHistory }) => {
     validate: (input) => {
       if (isValidAwsSecretAccessKey(input.trim())) return true;
       return (
-        'AWS Secret Access Key seems not valid.\n' +
+        'AWS Secret Access Key seems invalid.\n' +
         '   Expected something like wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'
       );
     },
@@ -230,7 +230,7 @@ const steps = {
         stepHistory.start(promptName);
         inquirerPrompt = inquirer.prompt({
           message:
-            '\n [If you approached an issue when setting up a provider, you may press Enter to skip this step]',
+            '\n [If you encountered an issue when setting up a provider, you may press Enter to skip this step]',
           name: promptName,
         });
 
@@ -267,7 +267,7 @@ const steps = {
 
       if (err.statusCode && err.statusCode >= 500) {
         throw new ServerlessError(
-          'Dashboard service is currently unavailable, please try again later',
+          'Serverless Dashboard is currently unavailable, please try again later',
           'DASHBOARD_UNAVAILABLE'
         );
       }
@@ -324,11 +324,11 @@ const steps = {
       if (err.statusCode && err.statusCode >= 500) {
         legacy.write(
           `\n${chalk.yellow(
-            'Dashboard service is currently unavailable, please try again later'
+            'Serverless Dashboard is currently unavailable, please try again later'
           )}\n`
         );
         log.error();
-        log.error('Dashboard service is currently unavailable, please try again later');
+        log.error('Serverless Dashboard is currently unavailable, please try again later');
         return false;
       }
       throw err;
diff --git a/lib/cli/interactive-setup/utils.js b/lib/cli/interactive-setup/utils.js
index c6215a0e03a..9a49f7ebbb7 100644
--- a/lib/cli/interactive-setup/utils.js
+++ b/lib/cli/interactive-setup/utils.js
@@ -39,7 +39,7 @@ module.exports = {
     } catch (err) {
       if (err.statusCode && err.statusCode >= 500) {
         throw new ServerlessError(
-          'Dashboard service is currently unavailable, please try again later',
+          'Serverless Dashboard is currently unavailable, please try again later',
           'DASHBOARD_UNAVAILABLE'
         );
       }
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 382e347521e..99f99d9f2dc 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -173,10 +173,10 @@ const processSpanPromise = (async () => {
         'NEW_VARIABLES_RESOLVER',
         `"${humanizedPropertyPath}" is not accessible ` +
           '(configured behind variables which cannot be resolved at this stage).\n' +
-          'Starting with next major release, ' +
-          'this will be communicated with a thrown error.\n' +
-          'Set "variablesResolutionMode: 20210326" in your service config, ' +
-          'to adapt to this behavior now',
+          'In the next major version ' +
+          'this will result in an error.\n' +
+          'Set "variablesResolutionMode: 20210326" in your service config ' +
+          'to opt in to this behavior now',
         { serviceConfig: configuration }
       );
       return false;
@@ -230,7 +230,7 @@ const processSpanPromise = (async () => {
               throw new ServerlessError(
                 `Cannot resolve ${path.basename(
                   configurationPath
-                )}: "variableSyntax" is not supported with new variables resolver. ` +
+                )}: "variableSyntax" is not supported with the new variables resolver. ` +
                   'Please drop this setting',
                 'UNSUPPORTED_VARIABLE_SYNTAX_CONFIGURATION'
               );
@@ -238,9 +238,9 @@ const processSpanPromise = (async () => {
             logDeprecation(
               'NEW_VARIABLES_RESOLVER',
               'Serverless Framework was enhanced with a new variables resolver ' +
-                'which doesn\'t recognize "provider.variableSyntax" setting.' +
-                "Starting with a new major it will be the only resolver that's used." +
-                '. Drop setting from a configuration to adapt to it',
+                'which ignores the "provider.variableSyntax" setting. ' +
+                "In the next major version it will be the only resolver that's used. " +
+                'Remove the "provider.variableSyntax" setting to prepare to the next major version.',
               { serviceConfig: configuration }
             );
             return;
@@ -519,7 +519,7 @@ const processSpanPromise = (async () => {
         if (!process.stdin.isTTY && !process.env.SLS_INTERACTIVE_SETUP_ENABLE) {
           throw new ServerlessError(
             'Attempted to run an interactive setup in non TTY environment.\n' +
-              "If that's intended enforce with SLS_INTERACTIVE_SETUP_ENABLE=1 environment variable",
+              "If that's intended, run with the SLS_INTERACTIVE_SETUP_ENABLE=1 environment variable",
             'INTERACTIVE_SETUP_IN_NON_TTY'
           );
         }
@@ -752,10 +752,10 @@ const processSpanPromise = (async () => {
             if (sourceType === 'param' || sourceType === 'output') {
               logDeprecation(
                 'NEW_VARIABLES_RESOLVER',
-                '"param" and "output" variable sources can be resolved only in context of ' +
-                  'services deployed to Serverless Dashboard (with "org" setting configured).\n' +
-                  'Starting with next major release, ' +
-                  'this will be communicated with a thrown error.\n',
+                '"param" and "output" variables can only be used in ' +
+                  'services deployed with Serverless Dashboard (with "org" setting configured).\n' +
+                  'In the next major release ' +
+                  'this will result in an error.\n',
                 { serviceConfig: configuration }
               );
               unresolvedSources.delete(sourceType);
@@ -769,8 +769,8 @@ const processSpanPromise = (async () => {
                 '"${cf.<region>:stackName.outputName}" is now deprecated, ' +
                 'as not supported by new variables resolver).\n' +
                 'Please upgrade to use new form instead.' +
-                'Starting with next major release, ' +
-                'this will be communicated with a thrown error.\n',
+                'In the next major release ' +
+                'this will result in an error.\n',
               { serviceConfig: configuration }
             );
           }
@@ -781,9 +781,9 @@ const processSpanPromise = (async () => {
                 '"${ssm(<region>):parameter-path}" (while  ' +
                 '"${ssm.<region>:parameter-path}" is now deprecated, ' +
                 'as not supported by new variables resolver).\n' +
-                'Please upgrade to use new form instead.' +
-                'Starting with next major release, ' +
-                'this will be communicated with a thrown error.\n',
+                'Please upgrade to use the new form instead.' +
+                'In the next major release ' +
+                'this will result in an error.\n',
               { serviceConfig: configuration }
             );
           }
@@ -794,12 +794,12 @@ const processSpanPromise = (async () => {
           if (unrecognizedSourceNames.length) {
             logDeprecation(
               'NEW_VARIABLES_RESOLVER',
-              `Approached unrecognized configuration variable sources: "${unrecognizedSourceNames.join(
+              `Unrecognized configuration variable sources: "${unrecognizedSourceNames.join(
                 '", "'
               )}".\n` +
-                'From a next major this will be communicated with a thrown error.\n' +
-                'Set "variablesResolutionMode: 20210326" in your service config, ' +
-                'to adapt to new behavior now',
+                'In the next major version this will result in an error.\n' +
+                'Set "variablesResolutionMode: 20210326" in your service config ' +
+                'to adapt to the new behavior now',
               { serviceConfig: configuration }
             );
           }
@@ -814,13 +814,13 @@ const processSpanPromise = (async () => {
           ) {
             throw new ServerlessError(
               '"Cannot resolve configuration: ' +
-                '"param" and "output" variable sources can be resolved only in context of ' +
-                'services deployed to Serverless Dashboard (with "org" setting configured)',
+                '"param" and "output" variables can only be used in ' +
+                'services deployed with Serverless Dashboard (with "org" setting configured)',
               'DASHBOARD_VARIABLE_SOURCES_MISUSE'
             );
           }
           throw new ServerlessError(
-            `Approached unrecognized configuration variable sources: "${unrecognizedSourceNames.join(
+            `Unrecognized configuration variable sources: "${unrecognizedSourceNames.join(
               '", "'
             )}"`,
             'UNRECOGNIZED_VARIABLE_SOURCES'
diff --git a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
index d1718376eac..c65eb595cfd 100644
--- a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
+++ b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
@@ -227,7 +227,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         ).to.be.false
     );
 
-    expect(stdoutData).to.include('Dashboard service is currently unavailable');
+    expect(stdoutData).to.include('Serverless Dashboard is currently unavailable');
   });
 
   it('Should be effective, at AWS service and no credentials are set', async () =>
@@ -616,7 +616,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         async () => await mockedStep.run(context)
       );
 
-      expect(stdoutData).to.include('Dashboard service is currently unavailable');
+      expect(stdoutData).to.include('Serverless Dashboard is currently unavailable');
       expect(mockedOpenBrowser).to.have.been.calledWith(
         chalk.bold.white(
           'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
@@ -744,7 +744,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       );
 
       expect(stdoutData).to.include(
-        'Dashboard service is currently unavailable, please try again later'
+        'Serverless Dashboard is currently unavailable, please try again later'
       );
       expect(stdoutData).not.to.include('Selected provider was successfully linked');
       expect(mockedCreateProviderLink).to.have.been.calledWith(
@@ -787,7 +787,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
           })
       );
 
-      expect(stdoutData).to.include('Dashboard service is currently unavailable');
+      expect(stdoutData).to.include('Serverless Dashboard is currently unavailable');
     });
   });
 });

From 9e1fe0ad5da8b936ccb238041fb2b452e6309faf Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 5 Jan 2022 10:40:39 +0100
Subject: [PATCH 0801/1101] fix(Config Schema): Address invalid schema
 definitions

---
 .../aws/package/compile/events/cloudFront.js        | 12 ++++++------
 .../aws/package/compile/events/eventBridge/index.js |  2 +-
 lib/plugins/aws/provider.js                         | 13 +++++++------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/cloudFront.js b/lib/plugins/aws/package/compile/events/cloudFront.js
index be6e9129fa8..c78d5ba9dad 100644
--- a/lib/plugins/aws/package/compile/events/cloudFront.js
+++ b/lib/plugins/aws/package/compile/events/cloudFront.js
@@ -26,18 +26,18 @@ class AwsCompileCloudFrontEvents {
     const originObjectSchema = {
       type: 'object',
       properties: {
-        ConnectionAttempts: { type: 'integer', miminum: 1, maximum: 3 },
-        ConnectionTimeout: { type: 'integer', miminum: 1, maximum: 10 },
+        ConnectionAttempts: { type: 'integer', minimum: 1, maximum: 3 },
+        ConnectionTimeout: { type: 'integer', minimum: 1, maximum: 10 },
         CustomOriginConfig: {
           type: 'object',
           properties: {
-            HTTPPort: { type: 'integer', miminum: 0, maximum: 65535 },
-            HTTPSPort: { type: 'integer', miminum: 0, maximum: 65535 },
-            OriginKeepaliveTimeout: { type: 'integer', miminum: 1, maximum: 60 },
+            HTTPPort: { type: 'integer', minimum: 0, maximum: 65535 },
+            HTTPSPort: { type: 'integer', minimum: 0, maximum: 65535 },
+            OriginKeepaliveTimeout: { type: 'integer', minimum: 1, maximum: 60 },
             OriginProtocolPolicy: {
               enum: ['http-only', 'match-viewer', 'https-only'],
             },
-            OriginReadTimeout: { type: 'integer', miminum: 1, maximum: 60 },
+            OriginReadTimeout: { type: 'integer', minimum: 1, maximum: 60 },
             OriginSSLProtocols: {
               type: 'array',
               items: { enum: ['SSLv3', 'TLSv1', 'TLSv1.1', 'TLSv1.2'] },
diff --git a/lib/plugins/aws/package/compile/events/eventBridge/index.js b/lib/plugins/aws/package/compile/events/eventBridge/index.js
index c4bd82af742..d5f99a41ee9 100644
--- a/lib/plugins/aws/package/compile/events/eventBridge/index.js
+++ b/lib/plugins/aws/package/compile/events/eventBridge/index.js
@@ -56,7 +56,7 @@ class AwsCompileEventBridgeEvents {
             },
           ],
         },
-        schedule: { pattern: '^(?:cron|rate)\\(.+\\)$' },
+        schedule: { pattern: '^(?:cron|rate)\\(.+\\)$', type: 'string' },
         enabled: { type: 'boolean' },
         pattern: {
           type: 'object',
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index b35e9e35692..dac17ee7974 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -171,12 +171,12 @@ const oidcAlbAuthorizer = {
   type: 'object',
   properties: {
     type: { const: 'oidc' },
-    authorizationEndpoint: { format: 'uri' },
+    authorizationEndpoint: { format: 'uri', type: 'string' },
     clientId: { type: 'string' },
     clientSecret: { type: 'string' },
-    issuer: { format: 'uri' },
-    tokenEndpoint: { format: 'uri' },
-    userInfoEndpoint: { format: 'uri' },
+    issuer: { format: 'uri', type: 'string' },
+    tokenEndpoint: { format: 'uri', type: 'string' },
+    userInfoEndpoint: { format: 'uri', type: 'string' },
     ...baseAlbAuthorizerProperties,
   },
   required: [
@@ -805,7 +805,7 @@ class AwsProvider {
                             additionalProperties: false,
                           },
                         },
-                        requires: [
+                        required: [
                           'CookiesConfig',
                           'EnableAcceptEncodingGzip',
                           'HeadersConfig',
@@ -999,7 +999,7 @@ class AwsProvider {
                             path: { type: 'string' },
                             file: { type: 'string' },
                             buildArgs: { type: 'object', additionalProperties: { type: 'string' } },
-                            cacheFrom: { type: 'array', additionalProperties: { type: 'string' } },
+                            cacheFrom: { type: 'array', items: { type: 'string' } },
                             platform: { type: 'string' },
                           },
                           additionalProperties: false,
@@ -1348,6 +1348,7 @@ class AwsProvider {
           },
         },
         resources: {
+          type: 'object',
           properties: {
             AWSTemplateFormatVersion: {
               type: 'string',

From c67a3f1a4fe6c64f2b6c68ef1b184b2642ad2266 Mon Sep 17 00:00:00 2001
From: Tsimpitas Dimitris <dimitristsimpitas@yahoo.gr>
Date: Wed, 5 Jan 2022 15:17:24 +0200
Subject: [PATCH 0802/1101] feat(AWS Cognito): Support `forceDeploy` setting
 (#10435)

---
 .../providers/aws/events/cognito-user-pool.md | 16 +++++++++
 docs/providers/aws/guide/serverless.yml.md    |  1 +
 .../package/compile/events/cognitoUserPool.js |  5 ++-
 .../compile/events/cognitoUserPool.test.js    | 33 +++++++++++++++++++
 4 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/docs/providers/aws/events/cognito-user-pool.md b/docs/providers/aws/events/cognito-user-pool.md
index a8b9129f9a5..5fb141949b7 100644
--- a/docs/providers/aws/events/cognito-user-pool.md
+++ b/docs/providers/aws/events/cognito-user-pool.md
@@ -134,5 +134,21 @@ resources:
       Type: AWS::Cognito::UserPool
 ```
 
+## Forcing deploying of triggers
+
+A Cognito User Pool with triggers attached may not be correctly updated by AWS Cloudformation on subsequent deployments. To circumvent this issue you can use the `forceDeploy` flag which will try to force Cloudformation to update the triggers no matter what. This flag has to be used in conjuction with the `existing: true` flag.
+
+```yml
+functions:
+  preSignUp:
+    handler: preSignUp.handler
+    events:
+      - cognitoUserPool:
+          pool: MyUserPool1
+          trigger: PreSignUp
+          existing: true
+          forceDeploy: true
+```
+
 [aws-triggers-guide]: http://docs.aws.amazon.com/cognito/latest/developerguide/cognito-user-identity-pools-working-with-aws-lambda-triggers.html
 [aws-triggers-list]: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 716971cae38..82064b7fe68 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -509,6 +509,7 @@ functions:
           pool: MyUserPool
           trigger: PreSignUp
           existing: true # optional, if you're referencing an existing User Pool
+          forceDeploy: true # optional, for forcing deployment of triggers on existing User Pools
       - alb:
           listenerArn: arn:aws:elasticloadbalancing:us-east-1:12345:listener/app/my-load-balancer/50dc6c495c0c9188/
           priority: 1
diff --git a/lib/plugins/aws/package/compile/events/cognitoUserPool.js b/lib/plugins/aws/package/compile/events/cognitoUserPool.js
index 34bafdace0a..2b08bf74d67 100644
--- a/lib/plugins/aws/package/compile/events/cognitoUserPool.js
+++ b/lib/plugins/aws/package/compile/events/cognitoUserPool.js
@@ -39,6 +39,7 @@ class AwsCompileCognitoUserPoolEvents {
         pool: { type: 'string', maxLength: 128, pattern: '^[\\w\\s+=,.@-]+$' },
         trigger: { enum: validTriggerSources },
         existing: { type: 'boolean' },
+        forceDeploy: { type: 'boolean' },
       },
       required: ['pool', 'trigger'],
       additionalProperties: false,
@@ -141,7 +142,7 @@ class AwsCompileCognitoUserPoolEvents {
         functionObj.events.forEach((event) => {
           if (event.cognitoUserPool && event.cognitoUserPool.existing) {
             numEventsForFunc++;
-            const { pool, trigger } = event.cognitoUserPool;
+            const { pool, trigger, forceDeploy } = event.cognitoUserPool;
             usesExistingCognitoUserPool = funcUsesExistingCognitoUserPool = true;
 
             if (!currentPoolName) {
@@ -171,6 +172,7 @@ class AwsCompileCognitoUserPoolEvents {
             }
 
             let customCognitoUserPoolResource;
+            const forceDeployProperty = forceDeploy ? Date.now() : undefined;
             if (numEventsForFunc === 1) {
               customCognitoUserPoolResource = {
                 [customPoolResourceLogicalId]: {
@@ -188,6 +190,7 @@ class AwsCompileCognitoUserPoolEvents {
                         Trigger: trigger,
                       },
                     ],
+                    ForceDeploy: forceDeployProperty,
                   },
                 },
               };
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js b/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
index a920b1dfca0..4ea548fe63c 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
@@ -7,6 +7,7 @@ const chai = require('chai');
 const proxyquire = require('proxyquire').noCallThru();
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
 const Serverless = require('../../../../../../../../lib/Serverless');
+const runServerless = require('../../../../../../../utils/run-serverless');
 
 const { expect } = chai;
 chai.use(require('sinon-chai'));
@@ -339,11 +340,40 @@ describe('AwsCompileCognitoUserPoolEvents', () => {
                 Trigger: 'CustomMessage',
               },
             ],
+            ForceDeploy: undefined,
           },
         });
       });
     });
 
+    it('should support `forceDeploy` setting', async () => {
+      const result = await runServerless({
+        fixture: 'cognitoUserPool',
+        configExt: {
+          functions: {
+            existingSimple: {
+              events: [
+                {
+                  cognitoUserPool: {
+                    forceDeploy: true,
+                  },
+                },
+              ],
+            },
+          },
+        },
+        command: 'package',
+      });
+
+      const { Resources } = result.cfTemplate;
+      const { awsNaming } = result;
+
+      const customResource =
+        Resources[awsNaming.getCustomResourceCognitoUserPoolResourceLogicalId('existingSimple')];
+
+      expect(typeof customResource.Properties.ForceDeploy).to.equal('number');
+    });
+
     it('should create the necessary resources for a service using multiple event definitions', () => {
       awsCompileCognitoUserPoolEvents.serverless.service.functions = {
         first: {
@@ -427,6 +457,7 @@ describe('AwsCompileCognitoUserPoolEvents', () => {
                 Trigger: 'DefineAuthChallenge',
               },
             ],
+            ForceDeploy: undefined,
           },
         });
       });
@@ -556,6 +587,7 @@ describe('AwsCompileCognitoUserPoolEvents', () => {
                 Trigger: 'DefineAuthChallenge',
               },
             ],
+            ForceDeploy: undefined,
           },
         });
         expect(Resources.SecondCustomCognitoUserPool1).to.deep.equal({
@@ -583,6 +615,7 @@ describe('AwsCompileCognitoUserPoolEvents', () => {
                 Trigger: 'PostAuthentication',
               },
             ],
+            ForceDeploy: undefined,
           },
         });
       });

From 95a61a2fc685b33bf791d2c09ab5617f1e2fdfe9 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Thu, 23 Dec 2021 15:01:58 +0100
Subject: [PATCH 0803/1101] docs: Fix long lines in code examples

---
 .../aws/cli-reference/config-credentials.md   | 13 ++++++++--
 docs/providers/aws/cli-reference/config.md    |  4 ++--
 docs/providers/aws/cli-reference/create.md    | 15 ++++++++----
 .../aws/cli-reference/deploy-function.md      |  4 +++-
 .../aws/cli-reference/invoke-local.md         |  7 ++++--
 docs/providers/aws/cli-reference/invoke.md    | 15 ++++++------
 docs/providers/aws/cli-reference/login.md     |  3 ---
 docs/providers/aws/cli-reference/logs.md      |  2 +-
 docs/providers/aws/cli-reference/metrics.md   |  4 +++-
 .../aws/cli-reference/rollback-function.md    |  3 ++-
 docs/providers/aws/events/apigateway.md       | 15 ++++++++----
 .../aws/examples/hello-world/csharp/README.md | 24 +++++++++----------
 .../aws/examples/hello-world/fsharp/README.md | 24 +++++++++----------
 .../aws/examples/hello-world/go/README.md     | 12 +++++-----
 .../aws/examples/hello-world/node/README.md   | 12 +++++-----
 .../aws/examples/hello-world/python/README.md | 12 +++++-----
 .../aws/examples/hello-world/ruby/README.md   |  6 ++---
 docs/providers/aws/guide/credentials.md       | 12 ++++++----
 docs/providers/aws/guide/services.md          | 12 ++++++----
 docs/providers/aws/guide/workflow.md          | 17 +++++++------
 20 files changed, 126 insertions(+), 90 deletions(-)

diff --git a/docs/providers/aws/cli-reference/config-credentials.md b/docs/providers/aws/cli-reference/config-credentials.md
index d7eb8168cb4..adb3fb81b56 100644
--- a/docs/providers/aws/cli-reference/config-credentials.md
+++ b/docs/providers/aws/cli-reference/config-credentials.md
@@ -43,7 +43,11 @@ This example will configure the `default` profile with the `aws_access_key_id` o
 ### Configure a custom profile
 
 ```bash
-serverless config credentials --provider aws --key 1234 --secret 5678 --profile custom-profile
+serverless config credentials \
+  --provider aws \
+  --key 1234 \
+  --secret 5678 \
+  --profile custom-profile
 ```
 
 This example create and configure a `custom-profile` profile with the `aws_access_key_id` of `1234` and the `aws_secret_access_key` of `5678`.
@@ -51,7 +55,12 @@ This example create and configure a `custom-profile` profile with the `aws_acces
 ### Update an existing profile
 
 ```bash
-serverless config credentials --provider aws --key 1234 --secret 5678 --profile custom-profile --overwrite
+serverless config credentials \
+  --provider aws \
+  --key 1234 \
+  --secret 5678 \
+  --profile custom-profile \
+  --overwrite
 ```
 
 This example overwrite `custom-profile` profile with the `aws_access_key_id` of `1234` and the `aws_secret_access_key` of `5678`.
diff --git a/docs/providers/aws/cli-reference/config.md b/docs/providers/aws/cli-reference/config.md
index 10540d6fa77..53fd6cb2e63 100644
--- a/docs/providers/aws/cli-reference/config.md
+++ b/docs/providers/aws/cli-reference/config.md
@@ -29,12 +29,12 @@ The purpose of `serverless config` is to allow to enable or disable automatic up
 
 ### Turn on auto update mechanism
 
-```
+```bash
 serverless config --autoupdate
 ```
 
 ### Turn off auto update mechanism
 
-```
+```bash
 serverless config --no-autoupdate
 ```
diff --git a/docs/providers/aws/cli-reference/create.md b/docs/providers/aws/cli-reference/create.md
index 7a6f9a491f3..516749102b4 100644
--- a/docs/providers/aws/cli-reference/create.md
+++ b/docs/providers/aws/cli-reference/create.md
@@ -16,22 +16,24 @@ layout: Doc
 
 Creates a new service in the current working directory based on the provided template.
 
-**Create service in current working directory:**
+**Create a service in the current working directory:**
 
 ```bash
 serverless create --template aws-nodejs
 ```
 
-**Create service in new folder:**
+**Create a service in a new folder:**
 
 ```bash
 serverless create --template aws-nodejs --path myService
 ```
 
-**Create service in new folder using a custom template:**
+**Create a service in a new folder using a custom template:**
 
 ```bash
-serverless create --template-url https://github.com/serverless/serverless/tree/master/lib/plugins/create/templates/aws-nodejs --path myService
+serverless create \
+  --template-url https://github.com/serverless/serverless/tree/master/lib/plugins/create/templates/aws-nodejs \
+  --path myService
 ```
 
 ## Options
@@ -106,7 +108,10 @@ renamed to `my-new-service`.
 ### Creating a new service using a local template
 
 ```bash
-serverless create --template-path path/to/my/template/folder --path path/to/my/service --name my-new-service
+serverless create \
+  --template-path path/to/my/template/folder \
+  --path path/to/my/service \
+  --name my-new-service
 ```
 
 This will copy the `path/to/my/template/folder` folder into `path/to/my/service` and rename the service to `my-new-service`.
diff --git a/docs/providers/aws/cli-reference/deploy-function.md b/docs/providers/aws/cli-reference/deploy-function.md
index c9a22f4b236..1ae83240171 100644
--- a/docs/providers/aws/cli-reference/deploy-function.md
+++ b/docs/providers/aws/cli-reference/deploy-function.md
@@ -43,7 +43,9 @@ serverless deploy function --function helloWorld
 ### Deployment with stage and region options
 
 ```bash
-serverless deploy function --function helloWorld --stage dev --region us-east-1
+serverless deploy function --function helloWorld \
+  --stage dev \
+  --region us-east-1
 ```
 
 ### Deploy only configuration changes
diff --git a/docs/providers/aws/cli-reference/invoke-local.md b/docs/providers/aws/cli-reference/invoke-local.md
index ab61046a7a3..117d2067bc5 100644
--- a/docs/providers/aws/cli-reference/invoke-local.md
+++ b/docs/providers/aws/cli-reference/invoke-local.md
@@ -98,7 +98,8 @@ serverless invoke local --function functionName --context "hello world"
 ### Local function invocation with context passing
 
 ```bash
-serverless invoke local --function functionName --contextPath lib/context.json
+serverless invoke local --function functionName \
+  --contextPath lib/context.json
 ```
 
 This example will pass the json context in the `lib/context.json` file (relative to the root of the service) while invoking the specified/deployed function.
@@ -110,7 +111,9 @@ serverless invoke local -f functionName -e VAR1=value1
 
 # Or more than one variable
 
-serverless invoke local -f functionName -e VAR1=value1 -e VAR2=value2
+serverless invoke local -f functionName \
+  -e VAR1=value1 \
+  -e VAR2=value2
 ```
 
 When using [AWS CloudFormation intrinsic functions](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference.html) as environment variables value, **only Fn::ImportValue and Ref** will be automatically resolved for function invocation. Other intrinsic functions use will result in the corresponding configuration object passed in the function as environment variable.
diff --git a/docs/providers/aws/cli-reference/invoke.md b/docs/providers/aws/cli-reference/invoke.md
index ddea5e0e65d..cc48d21aa54 100644
--- a/docs/providers/aws/cli-reference/invoke.md
+++ b/docs/providers/aws/cli-reference/invoke.md
@@ -72,19 +72,19 @@ output the result of the invocation in your terminal.
 #### Function invocation with data
 
 ```bash
-serverless invoke --function functionName --stage dev --region us-east-1 --data "hello world"
+serverless invoke --function functionName --data "hello world"
 ```
 
 #### Function invocation with custom context
 
 ```bash
-serverless invoke --function functionName --stage dev --region us-east-1 --context "hello world"
+serverless invoke --function functionName --context "hello world"
 ```
 
 #### Function invocation with context passing
 
 ```bash
-serverless invoke --function functionName --stage dev --region us-east-1 --contextPath lib/context.json
+serverless invoke --function functionName --contextPath lib/context.json
 ```
 
 This example will pass the json context in the `lib/context.json` file (relative to the root of the service) while invoking the specified/deployed function.
@@ -92,13 +92,13 @@ This example will pass the json context in the `lib/context.json` file (relative
 #### Function invocation with data from standard input
 
 ```bash
-node dataGenerator.js | serverless invoke --function functionName --stage dev --region us-east-1
+node dataGenerator.js | serverless invoke --function functionName
 ```
 
 #### Function invocation with logging
 
 ```bash
-serverless invoke --function functionName --stage dev --region us-east-1 --log
+serverless invoke --function functionName --log
 ```
 
 Just like the first example, but will also outputs logging information about your invocation.
@@ -106,7 +106,7 @@ Just like the first example, but will also outputs logging information about you
 #### Function invocation with data passing
 
 ```bash
-serverless invoke --function functionName --stage dev --region us-east-1 --path lib/data.json
+serverless invoke --function functionName --path lib/data.json
 ```
 
 This example will pass the json data in the `lib/data.json` file (relative to the root of the service) while invoking
@@ -132,7 +132,8 @@ serverless invoke local --function functionName --context "hello world"
 ### Local function invocation with context passing
 
 ```bash
-serverless invoke local --function functionName --contextPath lib/context.json
+serverless invoke local --function functionName \
+  --contextPath lib/context.json
 ```
 
 This example will pass the json context in the `lib/context.json` file (relative to the root of the service) while invoking the specified/deployed function.
diff --git a/docs/providers/aws/cli-reference/login.md b/docs/providers/aws/cli-reference/login.md
index 511644bf59f..b34339d2f79 100644
--- a/docs/providers/aws/cli-reference/login.md
+++ b/docs/providers/aws/cli-reference/login.md
@@ -20,7 +20,4 @@ It will create a new serverless platform account if one doesn't already exist.
 
 ```bash
 serverless login
-
-# Shorthand
-sls login
 ```
diff --git a/docs/providers/aws/cli-reference/logs.md b/docs/providers/aws/cli-reference/logs.md
index 8cae90f8492..2c05bb88cd4 100644
--- a/docs/providers/aws/cli-reference/logs.md
+++ b/docs/providers/aws/cli-reference/logs.md
@@ -19,7 +19,7 @@ Lets you watch the logs of a specific function.
 ```bash
 serverless logs -f hello
 
-# Optionally tail the logs with -t
+# Optionally tail the logs with --tail or -t
 serverless logs -f hello -t
 ```
 
diff --git a/docs/providers/aws/cli-reference/metrics.md b/docs/providers/aws/cli-reference/metrics.md
index 1ea7cad9370..c562803d779 100644
--- a/docs/providers/aws/cli-reference/metrics.md
+++ b/docs/providers/aws/cli-reference/metrics.md
@@ -59,7 +59,9 @@ Displays all `hello` function metrics for the last 24h.
 ### See metrics for the function `hello` of a specific timespan
 
 ```bash
-serverless metrics --function hello --startTime 2016-01-01 --endTime 2016-01-02
+serverless metrics --function hello \
+  --startTime 2016-01-01 \
+  --endTime 2016-01-02
 ```
 
 Displays all `hello` function metrics for the time between January 1, 2016 and January 2, 2016.
diff --git a/docs/providers/aws/cli-reference/rollback-function.md b/docs/providers/aws/cli-reference/rollback-function.md
index 5a152b57fc3..43ecfd5f5f2 100644
--- a/docs/providers/aws/cli-reference/rollback-function.md
+++ b/docs/providers/aws/cli-reference/rollback-function.md
@@ -17,7 +17,8 @@ layout: Doc
 Rollback a function service to a specific version.
 
 ```bash
-serverless rollback function --function <name> --function-version <version>
+serverless rollback function --function <name> \
+  --function-version <version>
 ```
 
 **Note:** You can only rollback a function which was previously deployed through `serverless deploy`. Functions are not versioned when running `serverless deploy function`.
diff --git a/docs/providers/aws/events/apigateway.md b/docs/providers/aws/events/apigateway.md
index adcbff94ad8..fd2a37dda26 100644
--- a/docs/providers/aws/events/apigateway.md
+++ b/docs/providers/aws/events/apigateway.md
@@ -339,7 +339,8 @@ functions:
               - X-Amz-Security-Token
               - X-Amz-User-Agent
             allowCredentials: false
-            cacheControl: 'max-age=600, s-maxage=600, proxy-revalidate' # Caches on browser and proxy for 10 minutes and doesnt allow proxy to serve out of date content
+            # Caches on browser and proxy for 10 minutes and doesnt allow proxy to serve out of date content
+            cacheControl: 'max-age=600, s-maxage=600, proxy-revalidate'
 ```
 
 CORS header accepts single value too
@@ -367,8 +368,10 @@ module.exports.hello = function (event, context, callback) {
   const response = {
     statusCode: 200,
     headers: {
-      'Access-Control-Allow-Origin': '*', // Required for CORS support to work
-      'Access-Control-Allow-Credentials': true, // Required for cookies, authorization headers with HTTPS
+      // Required for CORS support to work
+      'Access-Control-Allow-Origin': '*',
+      // Required for cookies, authorization headers with HTTPS
+      'Access-Control-Allow-Credentials': true,
     },
     body: JSON.stringify({ message: 'Hello World!' }),
   };
@@ -636,10 +639,12 @@ provider:
     apiKeys:
       - myFirstKey
       - ${opt:stage}-myFirstKey
-      - ${env:MY_API_KEY} # you can hide it in a serverless variable
+      # you can hide it in a serverless variable
+      - ${env:MY_API_KEY}
       - name: myThirdKey
         value: myThirdKeyValue
-      - value: myFourthKeyValue # let cloudformation name the key (recommended when setting api key value)
+      # let cloudformation name the key (recommended when setting api key value)
+      - value: myFourthKeyValue
         description: Api key description # Optional
         customerId: A string that will be set as the customerID for the key # Optional
     usagePlan:
diff --git a/docs/providers/aws/examples/hello-world/csharp/README.md b/docs/providers/aws/examples/hello-world/csharp/README.md
index 166904daa2a..982534e5f4f 100644
--- a/docs/providers/aws/examples/hello-world/csharp/README.md
+++ b/docs/providers/aws/examples/hello-world/csharp/README.md
@@ -31,7 +31,7 @@ Commands
 
 ## 1. Create a service
 
-```
+```bash
 sls create --template aws-csharp --path myService
 ```
 
@@ -41,19 +41,19 @@ The `--path` or shorthand `-p` is the location to be created with the template s
 
 ## 2. Build using .NET Core 3.1 CLI tools and create zip package
 
-```
+```bash
 # Linux or Mac OS
 ./build.sh
 ```
 
-```
+```bash
 # Windows PowerShell
 .\build.cmd
 ```
 
 ## 3. Deploy
 
-```
+```bash
 sls deploy
 ```
 
@@ -61,7 +61,7 @@ This will deploy your function to AWS Lambda based on the settings in `serverles
 
 ## 4. Invoke deployed function
 
-```
+```bash
 sls invoke -f hello
 ```
 
@@ -69,14 +69,14 @@ Invoke deployed function with command `invoke` and `--function` or shorthand `-f
 
 In your terminal window you should see the response from AWS Lambda.
 
-```bash
+```json
 {
-    "Message": "Go Serverless v1.0! Your function executed successfully!",
-    "Request": {
-        "Key1": null,
-        "Key2": null,
-        "Key3": null
-    }
+  "Message": "Go Serverless v1.0! Your function executed successfully!",
+  "Request": {
+    "Key1": null,
+    "Key2": null,
+    "Key3": null
+  }
 }
 ```
 
diff --git a/docs/providers/aws/examples/hello-world/fsharp/README.md b/docs/providers/aws/examples/hello-world/fsharp/README.md
index f0dd7a25d14..bd0e8afb829 100644
--- a/docs/providers/aws/examples/hello-world/fsharp/README.md
+++ b/docs/providers/aws/examples/hello-world/fsharp/README.md
@@ -29,7 +29,7 @@ Commands
 
 ## 1. Create a service
 
-```
+```bash
 sls create --template aws-fsharp --path myService
 ```
 
@@ -39,19 +39,19 @@ The `--path` or shorthand `-p` is the location to be created with the template s
 
 ## 2. Build using .NET Core 3.1.x CLI tools and create zip package
 
-```
+```bash
 # Linux or Mac OS
 ./build.sh
 ```
 
-```
+```bash
 # Windows PowerShell
 ./build.cmd
 ```
 
 ## 3. Deploy
 
-```
+```bash
 sls deploy
 ```
 
@@ -59,7 +59,7 @@ This will deploy your function to AWS Lambda based on the settings in `serverles
 
 ## 4. Invoke deployed function
 
-```
+```bash
 sls invoke -f hello
 ```
 
@@ -67,14 +67,14 @@ Invoke deployed function with command `invoke` and `--function` or shorthand `-f
 
 In your terminal window you should see the response from AWS Lambda.
 
-```bash
+```json
 {
-    "Message": "Go Serverless v1.0! Your function executed successfully!",
-    "Request": {
-        "Key1": null,
-        "Key2": null,
-        "Key3": null
-    }
+  "Message": "Go Serverless v1.0! Your function executed successfully!",
+  "Request": {
+    "Key1": null,
+    "Key2": null,
+    "Key3": null
+  }
 }
 ```
 
diff --git a/docs/providers/aws/examples/hello-world/go/README.md b/docs/providers/aws/examples/hello-world/go/README.md
index c5ed3e2527b..7c29a2fc8ec 100644
--- a/docs/providers/aws/examples/hello-world/go/README.md
+++ b/docs/providers/aws/examples/hello-world/go/README.md
@@ -39,7 +39,7 @@ The Serverless Framework includes starter templates for various languages and pr
 
 `aws-go` fetches dependencies using standard `go get`.
 
-```
+```bash
 sls create --template aws-go --path myService
 ```
 
@@ -47,7 +47,7 @@ sls create --template aws-go --path myService
 
 `aws-go-dep` uses [go dep](https://github.com/golang/dep) and requires your project to be in `$GOPATH/src`.
 
-```
+```bash
 sls create --template aws-go-dep --path myService
 ```
 
@@ -55,7 +55,7 @@ sls create --template aws-go-dep --path myService
 
 `aws-go-mod` uses standard [Go modules] and requires your project to be **outside** `$GOPATH` and to use Go 1.13+.
 
-```
+```bash
 sls create --template aws-go-mod --path myService
 ```
 
@@ -88,7 +88,7 @@ Run `make build` to build both functions. Successful build should generate the f
 
 ## 3. Deploy
 
-```
+```bash
 sls deploy
 ```
 
@@ -96,11 +96,11 @@ This will deploy your function to AWS Lambda based on the settings in `serverles
 
 ## 4. Invoke deployed function
 
-```
+```bash
 sls invoke -f hello
 ```
 
-```
+```bash
 sls invoke -f world
 ```
 
diff --git a/docs/providers/aws/examples/hello-world/node/README.md b/docs/providers/aws/examples/hello-world/node/README.md
index 2420af6ad9d..be9a78158fb 100644
--- a/docs/providers/aws/examples/hello-world/node/README.md
+++ b/docs/providers/aws/examples/hello-world/node/README.md
@@ -29,7 +29,7 @@ Commands
 
 ## 1. Create a service
 
-```
+```bash
 sls create --template aws-nodejs --path myService
 ```
 
@@ -39,7 +39,7 @@ The `--path` or shorthand `-p` is the location to be created with the template s
 
 ## 2. Deploy
 
-```
+```bash
 sls deploy
 ```
 
@@ -47,7 +47,7 @@ This will deploy your function to AWS Lambda based on the settings in `serverles
 
 ## 3. Invoke deployed function
 
-```
+```bash
 sls invoke -f hello
 ```
 
@@ -55,10 +55,10 @@ Invoke deployed function with command `invoke` and `--function` or shorthand `-f
 
 In your terminal window you should see the response from AWS Lambda.
 
-```bash
+```json
 {
-    "statusCode": 200,
-    "body": "{\"message\":\"Go Serverless v1.0! Your function executed successfully!\",\"input\":{}}"
+  "statusCode": 200,
+  "body": "{\"message\":\"Go Serverless v1.0! Your function executed successfully!\",\"input\":{}}"
 }
 ```
 
diff --git a/docs/providers/aws/examples/hello-world/python/README.md b/docs/providers/aws/examples/hello-world/python/README.md
index 74d5fafd703..8bdbed0b0ad 100644
--- a/docs/providers/aws/examples/hello-world/python/README.md
+++ b/docs/providers/aws/examples/hello-world/python/README.md
@@ -29,7 +29,7 @@ Commands
 
 ## 1. Create a service
 
-```
+```bash
 sls create --template aws-python3 --path myService
 ```
 
@@ -39,7 +39,7 @@ The `--path` or shorthand `-p` is the location to be created with the template s
 
 ## 2. Deploy
 
-```
+```bash
 sls deploy
 ```
 
@@ -47,7 +47,7 @@ This will deploy your function to AWS Lambda based on the settings in `serverles
 
 ## 3. Invoke deployed function
 
-```
+```bash
 sls invoke -f hello
 ```
 
@@ -55,10 +55,10 @@ Invoke deployed function with command `invoke` and `--function` or shorthand `-f
 
 In your terminal window you should see the response from AWS Lambda.
 
-```bash
+```json
 {
-    "statusCode": 200,
-    "body": "{\"message\":\"Go Serverless v1.0! Your function executed successfully!\",\"input\":{}}"
+  "statusCode": 200,
+  "body": "{\"message\":\"Go Serverless v1.0! Your function executed successfully!\",\"input\":{}}"
 }
 ```
 
diff --git a/docs/providers/aws/examples/hello-world/ruby/README.md b/docs/providers/aws/examples/hello-world/ruby/README.md
index c1eb278d890..c40a574add0 100644
--- a/docs/providers/aws/examples/hello-world/ruby/README.md
+++ b/docs/providers/aws/examples/hello-world/ruby/README.md
@@ -29,7 +29,7 @@ Commands
 
 ## 1. Create a service
 
-```
+```bash
 sls create --template aws-ruby --path myService
 ```
 
@@ -39,7 +39,7 @@ The `--path` or shorthand `-p` is the location to be created with the template s
 
 ## 2. Deploy
 
-```
+```bash
 sls deploy
 ```
 
@@ -47,7 +47,7 @@ This will deploy your function to AWS Lambda based on the settings in `serverles
 
 ## 3. Invoke deployed function
 
-```
+```bash
 sls invoke -f hello
 ```
 
diff --git a/docs/providers/aws/guide/credentials.md b/docs/providers/aws/guide/credentials.md
index eabd2d50a22..994f36b3bcd 100644
--- a/docs/providers/aws/guide/credentials.md
+++ b/docs/providers/aws/guide/credentials.md
@@ -91,7 +91,8 @@ export AWS_SECRET_ACCESS_KEY=<your-secret-key-here>
 # AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY are now available for serverless to use
 serverless deploy
 
-# 'export' command is valid only for unix shells. In Windows - use 'set' instead of 'export'
+# 'export' command is valid only for unix shells
+# In Windows use 'set' instead of 'export'
 ```
 
 **Please note:** _If you are using a self-signed certificate you'll need to do one of the following:_
@@ -109,8 +110,8 @@ export cafile="/path/to/cafile.pem"
 # or multiple, comma separated
 export cafile="/path/to/cafile1.pem,/path/to/cafile2.pem"
 
-
-# 'export' command is valid only for unix shells. In Windows - use 'set' instead of 'export'
+# 'export' command is valid only for unix shells
+# In Windows use 'set' instead of 'export'
 ```
 
 #### Using AWS Profiles
@@ -124,7 +125,10 @@ Serverless provides a convenient way to configure AWS profiles with the help of
 Here's an example how you can configure the `default` AWS profile:
 
 ```bash
-serverless config credentials --provider aws --key AKIAIOSFODNN7EXAMPLE --secret wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
+serverless config credentials \
+  --provider aws \
+  --key AKIAIOSFODNN7EXAMPLE \
+  --secret wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
 ```
 
 Take a look at the [`config` CLI reference](../cli-reference/config-credentials.md) for more information about credential configuration.
diff --git a/docs/providers/aws/guide/services.md b/docs/providers/aws/guide/services.md
index dc085cbc476..4bce2d54b4d 100644
--- a/docs/providers/aws/guide/services.md
+++ b/docs/providers/aws/guide/services.md
@@ -24,18 +24,22 @@ In the beginning of an application, many people use a single Service to define a
 
 ```bash
 myService/
-  serverless.yml  # Contains all functions and infrastructure resources
+  # Contains all functions and infrastructure resources
+  serverless.yml
 ```
 
 However, as your application grows, you can break it out into multiple services. A lot of people organize their services by workflows or data models, and group the functions related to those workflows and data models together in the service.
 
 ```bash
 users/
-  serverless.yml # Contains 4 functions that do Users CRUD operations and the Users database
+  # Contains 4 functions that do Users CRUD operations and the Users database
+  serverless.yml
 posts/
-  serverless.yml # Contains 4 functions that do Posts CRUD operations and the Posts database
+  # Contains 4 functions that do Posts CRUD operations and the Posts database
+  serverless.yml
 comments/
-  serverless.yml # Contains 4 functions that do Comments CRUD operations and the Comments database
+  # Contains 4 functions that do Comments CRUD operations and the Comments database
+  serverless.yml
 ```
 
 This makes sense since related functions usually use common infrastructure resources, and you want to keep those functions and resources together as a single unit of deployment, for better organization and separation of concerns.
diff --git a/docs/providers/aws/guide/workflow.md b/docs/providers/aws/guide/workflow.md
index 025b761a7c2..67d72f5a0bb 100644
--- a/docs/providers/aws/guide/workflow.md
+++ b/docs/providers/aws/guide/workflow.md
@@ -45,7 +45,7 @@ A handy list of commands to use when developing with the Serverless Framework.
 
 Creates a new Service
 
-```
+```bash
 serverless create -p [SERVICE NAME] -t aws-nodejs
 ```
 
@@ -53,7 +53,7 @@ serverless create -p [SERVICE NAME] -t aws-nodejs
 
 This is a convenience method to install a pre-made Serverless Service locally by downloading the Github repo and unzipping it.
 
-```
+```bash
 serverless install -u [GITHUB URL OF SERVICE]
 ```
 
@@ -61,7 +61,7 @@ serverless install -u [GITHUB URL OF SERVICE]
 
 Use this when you have made changes to your Functions, Events or Resources in `serverless.yml` or you simply want to deploy all changes within your Service at the same time.
 
-```
+```bash
 serverless deploy -s [STAGE NAME] -r [REGION NAME] -v
 ```
 
@@ -69,7 +69,7 @@ serverless deploy -s [STAGE NAME] -r [REGION NAME] -v
 
 Use this to quickly overwrite your AWS Lambda code on AWS, allowing you to develop faster.
 
-```
+```bash
 serverless deploy function -f [FUNCTION NAME] -s [STAGE NAME] -r [REGION NAME]
 ```
 
@@ -77,14 +77,17 @@ serverless deploy function -f [FUNCTION NAME] -s [STAGE NAME] -r [REGION NAME]
 
 Invokes an AWS Lambda Function on AWS and returns logs.
 
-```
-serverless invoke -f [FUNCTION NAME] -s [STAGE NAME] -r [REGION NAME] -l
+```bash
+serverless invoke -f [FUNCTION NAME] \
+  -s [STAGE NAME] \
+  -r [REGION NAME] \
+  -l
 ```
 
 ##### Streaming Logs
 
 Open up a separate tab in your console and stream all logs for a specific Function using this command.
 
-```
+```bash
 serverless logs -f [FUNCTION NAME] -s [STAGE NAME] -r [REGION NAME]
 ```

From 80fef653974a5b42798cb2fd1a3ccc8dd867fca9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 6 Jan 2022 14:20:48 +0100
Subject: [PATCH 0804/1101] refactor(CLI): Upgrade to v7 of `open` library

It's to unify open browser method with dashboard plugin, and this method feels more solid
---
 lib/utils/open.js        | 173 ---------------------------------------
 lib/utils/openBrowser.js |  21 ++---
 package.json             |   1 +
 3 files changed, 12 insertions(+), 183 deletions(-)
 delete mode 100644 lib/utils/open.js

diff --git a/lib/utils/open.js b/lib/utils/open.js
deleted file mode 100644
index 2fd3108357a..00000000000
--- a/lib/utils/open.js
+++ /dev/null
@@ -1,173 +0,0 @@
-'use strict';
-// copied from https://raw.githubusercontent.com/sindresorhus/open/master/index.js
-// and adapted for node 6 support. Because open>6 requries node >= 8 but open<6 fails npm audit
-// changes:
-//  * use bluebird.promisify instead of util.promisfy
-//  * Object.assign instead of spread
-//  * use Array.prototype.push.apply(a,b) instead of a.push(...b)
-//  * async/await -> then :|
-//  * prettified with our config
-
-const { promisify } = require('bluebird');
-const chalk = require('chalk');
-const path = require('path');
-const childProcess = require('child_process');
-const fs = require('fs');
-const isWsl = require('is-wsl');
-const { legacy, log } = require('@serverless/utils/log');
-
-const pAccess = promisify(fs.access);
-const pExecFile = promisify(childProcess.execFile);
-
-// Path to included `xdg-open`
-const localXdgOpenPath = path.join(__dirname, 'xdg-open');
-
-// Convert a path from WSL format to Windows format:
-// `/mnt/c/Program Files/Example/MyApp.exe` → `C:\Program Files\Example\MyApp.exe`
-const wslToWindowsPath = (filePath) =>
-  pExecFile('wslpath', ['-w', filePath]).then(({ stdout }) => stdout.trim());
-
-module.exports = async (target, options) => {
-  if (typeof target !== 'string') {
-    throw new TypeError('Expected a `target`');
-  }
-
-  options = Object.assign(
-    {
-      wait: false,
-      background: false,
-    },
-    options
-  );
-
-  let command;
-  let appArguments = [];
-  const cliArguments = [];
-  const childProcessOptions = {};
-
-  if (Array.isArray(options.app)) {
-    appArguments = options.app.slice(1);
-    options.app = options.app[0];
-  }
-
-  return Promise.resolve()
-    .then(() => {
-      if (process.platform === 'darwin') {
-        command = 'open';
-
-        if (options.wait) {
-          cliArguments.push('--wait-apps');
-        }
-
-        if (options.background) {
-          cliArguments.push('--background');
-        }
-
-        if (options.app) {
-          cliArguments.push('-a', options.app);
-        }
-        return null;
-      } else if (process.platform === 'win32' || isWsl) {
-        command = `cmd${isWsl ? '.exe' : ''}`;
-        cliArguments.push('/c', 'start', '""', '/b');
-        target = target.replace(/&/g, '^&');
-
-        if (options.wait) {
-          cliArguments.push('/wait');
-        }
-
-        return Promise.resolve()
-          .then(() => {
-            if (options.app) {
-              if (isWsl && options.app.startsWith('/mnt/')) {
-                return wslToWindowsPath(options.app).then((windowsPath) => {
-                  options.app = windowsPath;
-                  cliArguments.push(options.app);
-                });
-              }
-
-              cliArguments.push(options.app);
-            }
-            return null;
-          })
-          .then(() => {
-            if (appArguments.length > 0) {
-              Array.prototype.push.apply(cliArguments, appArguments);
-            }
-            return null;
-          });
-      }
-      return Promise.resolve()
-        .then(() => {
-          if (options.app) {
-            command = options.app;
-          } else {
-            // When bundled by Webpack, there's no actual package file path and no local `xdg-open`.
-            const isBundled = !__dirname || __dirname === '/';
-
-            // Check if local `xdg-open` exists and is executable.
-            return pAccess(localXdgOpenPath, fs.constants.X_OK)
-              .then(() => true)
-              .catch(() => false)
-              .then((exeLocalXdgOpen) => {
-                const useSystemXdgOpen =
-                  process.versions.electron ||
-                  process.platform === 'android' ||
-                  isBundled ||
-                  !exeLocalXdgOpen;
-                command = useSystemXdgOpen ? 'xdg-open' : localXdgOpenPath;
-              });
-          }
-          return null;
-        })
-        .then(() => {
-          if (appArguments.length > 0) {
-            Array.prototype.push.apply(cliArguments, appArguments);
-          }
-
-          if (!options.wait) {
-            // `xdg-open` will block the process unless stdio is ignored
-            // and it's detached from the parent even if it's unref'd.
-            childProcessOptions.stdio = 'ignore';
-            childProcessOptions.detached = true;
-          }
-        });
-    })
-    .then(() => {
-      cliArguments.push(target);
-
-      if (process.platform === 'darwin' && appArguments.length > 0) {
-        cliArguments.push('--args');
-        Array.prototype.push.apply(cliArguments, appArguments);
-      }
-
-      const subprocess = childProcess.spawn(command, cliArguments, childProcessOptions);
-
-      if (options.wait) {
-        return new Promise((resolve, reject) => {
-          subprocess.once('error', reject);
-
-          subprocess.once('close', (exitCode) => {
-            if (exitCode > 0) {
-              reject(new Error(`Exited with code ${exitCode}`));
-              return;
-            }
-
-            resolve(subprocess);
-          });
-        });
-      }
-      subprocess.once('error', (error) => {
-        if (process.env.SLS_DEBUG) {
-          legacy.write(
-            `Serverless: ${chalk.red(`Opening of browser window errored with ${error.stack}`)}\n`
-          );
-        }
-        log.info(`Opening of browser window errored with ${error.stack}`);
-      });
-
-      subprocess.unref();
-
-      return subprocess;
-    });
-};
diff --git a/lib/utils/openBrowser.js b/lib/utils/openBrowser.js
index 6bc25e7ec3a..ba8f043e788 100644
--- a/lib/utils/openBrowser.js
+++ b/lib/utils/openBrowser.js
@@ -2,7 +2,7 @@
 
 /* eslint-disable no-console */
 
-const opn = require('./open');
+const open = require('open');
 const chalk = require('chalk');
 const isDockerContainer = require('is-docker');
 const { legacy, log, style } = require('@serverless/utils/log');
@@ -17,13 +17,14 @@ module.exports = function openBrowser(url) {
   let browser = process.env.BROWSER;
   if (browser === 'none' || isDockerContainer()) return;
   if (process.platform === 'darwin' && browser === 'open') browser = undefined;
-  const options = { wait: false, app: browser };
-  opn(url, options).catch((err) => {
-    if (process.env.SLS_DEBUG) {
-      legacy.write(
-        `Serverless: ${chalk.red(`Opening of browser window errored with ${err.stack}`)}\n`
-      );
-    }
-    log.info(`Opening of browser window errored with ${err.stack}`);
-  });
+  open(url).then((subprocess) =>
+    subprocess.on('error', (err) => {
+      if (process.env.SLS_DEBUG) {
+        legacy.write(
+          `Serverless: ${chalk.red(`Opening of browser window errored with ${err.stack}`)}\n`
+        );
+      }
+      log.info(`Opening of browser window errored with ${err.stack}`);
+    })
+  );
 };
diff --git a/package.json b/package.json
index f06cf5c5d28..ee2541dd350 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
     "ncjsm": "^4.2.0",
     "node-fetch": "^2.6.6",
     "object-hash": "^2.2.0",
+    "open": "^7.4.2",
     "path2": "^0.1.0",
     "process-utils": "^4.0.0",
     "promise-queue": "^2.2.5",

From 7ebe133b35fa9affafd73b61ee4626d8ce5aee1f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 6 Jan 2022 14:31:26 +0100
Subject: [PATCH 0805/1101] fix(CLI): Fix handling of provider URL handling

---
 lib/cli/interactive-setup/aws-credentials.js        |  2 +-
 .../cli/interactive-setup/aws-credentials.test.js   | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/lib/cli/interactive-setup/aws-credentials.js b/lib/cli/interactive-setup/aws-credentials.js
index 16e05a58c7e..ee4e572dfdd 100644
--- a/lib/cli/interactive-setup/aws-credentials.js
+++ b/lib/cli/interactive-setup/aws-credentials.js
@@ -210,7 +210,7 @@ const steps = {
   },
   handleProviderCreation: async ({ configuration: { org: orgName }, stepHistory }) => {
     const providersUrl = `https://app.serverless.com/${orgName}/settings/providers?source=cli&providerId=new&provider=aws`;
-    openBrowser(chalk.bold.white(providersUrl));
+    openBrowser(providersUrl);
     legacy.write('To learn more about providers, visit: http://slss.io/add-providers-dashboard\n');
     log.notice('To learn more about providers, visit: http://slss.io/add-providers-dashboard');
     legacy.write('\nWaiting for creation of AWS Access Role provider...\n');
diff --git a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
index c65eb595cfd..17ab8804442 100644
--- a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
+++ b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
@@ -6,7 +6,6 @@ const proxyquire = require('proxyquire');
 const overrideEnv = require('process-utils/override-env');
 const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const requireUncached = require('ncjsm/require-uncached');
-const chalk = require('chalk');
 const { StepHistory } = require('@serverless/utils/telemetry');
 
 const { expect } = chai;
@@ -485,9 +484,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
 
       expect(stdoutData).to.include('AWS Access Role provider was successfully created');
       expect(mockedOpenBrowser).to.have.been.calledWith(
-        chalk.bold.white(
-          'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
-        )
+        'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
       );
       expect(mockedDisconnect).to.have.been.called;
       expect(mockedCreateProviderLink).not.to.have.been.called;
@@ -562,9 +559,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
 
       expect(stdoutData).to.include('AWS Access Role provider was successfully created');
       expect(mockedOpenBrowser).to.have.been.calledWith(
-        chalk.bold.white(
-          'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
-        )
+        'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
       );
       expect(mockedDisconnect).to.have.been.called;
       expect(mockedCreateProviderLink).to.have.been.calledWith(
@@ -618,9 +613,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
 
       expect(stdoutData).to.include('Serverless Dashboard is currently unavailable');
       expect(mockedOpenBrowser).to.have.been.calledWith(
-        chalk.bold.white(
-          'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
-        )
+        'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
       );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([['credentialsSetupChoice', '_create_provider_']])

From 62d8da209e28547e48763d15328852ad8e868cf8 Mon Sep 17 00:00:00 2001
From: Shalvah <shalvah@users.noreply.github.com>
Date: Thu, 6 Jan 2022 16:18:16 +0100
Subject: [PATCH 0806/1101] fix(Packaging):  Do not include local plugins in a
 bundle (#10259)

---
 lib/classes/PluginManager.js                  | 76 +++++++++++++------
 lib/plugins/package/lib/packageService.js     |  5 +-
 .../custom-plugins/plugin-2/index.js          |  3 +
 .../custom-plugins/plugin-3/package.json      |  3 +
 .../custom-plugins/plugin-3/src/main.js       |  3 +
 .../custom-plugins/plugin-4/index.js          |  3 +
 test/unit/lib/classes/PluginManager.test.js   | 20 +----
 .../package/lib/packageService.test.js        | 32 ++++++++
 8 files changed, 102 insertions(+), 43 deletions(-)
 create mode 100644 test/fixtures/programmatic/packaging/custom-plugins/plugin-2/index.js
 create mode 100644 test/fixtures/programmatic/packaging/custom-plugins/plugin-3/package.json
 create mode 100644 test/fixtures/programmatic/packaging/custom-plugins/plugin-3/src/main.js
 create mode 100644 test/fixtures/programmatic/packaging/custom-plugins/plugin-4/index.js

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 38992dcd70a..188b3a0b089 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -19,29 +19,6 @@ const isTelemetryDisabled = require('../utils/telemetry/areDisabled');
 const tokenizeException = require('../utils/tokenize-exception');
 const { legacy, log } = require('@serverless/utils/log');
 
-const requireServicePlugin = (serviceDir, pluginPath, localPluginsPath) => {
-  if (localPluginsPath && !pluginPath.startsWith('./')) {
-    // TODO (BREAKING): Consider removing support for localPluginsPath with next major
-    const absoluteLocalPluginPath = path.resolve(localPluginsPath, pluginPath);
-
-    try {
-      return require(absoluteLocalPluginPath);
-    } catch (error) {
-      if (!isModuleNotFoundError(error, absoluteLocalPluginPath)) throw error;
-    }
-  }
-  try {
-    return require(cjsResolve(serviceDir, pluginPath).realPath);
-  } catch (error) {
-    if (!isModuleNotFoundError(error, pluginPath) || pluginPath.startsWith('.')) {
-      throw error;
-    }
-  }
-
-  // Search in "node_modules" in which framework is placed
-  return require(cjsResolve(__dirname, pluginPath).realPath);
-};
-
 const mergeCommands = (target, source) => {
   if (!target) return source;
   for (const key of Object.keys(source)) {
@@ -96,6 +73,7 @@ class PluginManager {
 
     this.plugins = [];
     this.externalPlugins = new Set();
+    this.localPluginsPaths = [];
     this.commands = {};
     this.aliases = {};
     this.hooks = {};
@@ -167,6 +145,33 @@ class PluginManager {
     return this.asyncPluginInit();
   }
 
+  requireServicePlugin(serviceDir, pluginPath, localPluginsPath) {
+    if (localPluginsPath && !pluginPath.startsWith('./')) {
+      // TODO (BREAKING): Consider removing support for localPluginsPath with next major
+      const absoluteLocalPluginPath = path.resolve(localPluginsPath, pluginPath);
+
+      try {
+        return require(absoluteLocalPluginPath);
+      } catch (error) {
+        if (!isModuleNotFoundError(error, absoluteLocalPluginPath)) throw error;
+      }
+    }
+    try {
+      const entryFilePath = cjsResolve(serviceDir, pluginPath).realPath;
+      if (pluginPath.startsWith('./')) {
+        this.localPluginsPaths.push({ resolvedPath: entryFilePath, inputPath: pluginPath });
+      }
+      return require(entryFilePath);
+    } catch (error) {
+      if (!isModuleNotFoundError(error, pluginPath) || pluginPath.startsWith('.')) {
+        throw error;
+      }
+    }
+
+    // Search in "node_modules" in which framework is placed
+    return require(cjsResolve(__dirname, pluginPath).realPath);
+  }
+
   resolveServicePlugins(servicePlugs) {
     const pluginsObject = this.parsePluginsObject(servicePlugs);
     const serviceDir = this.serverless.serviceDir;
@@ -178,7 +183,7 @@ class PluginManager {
         .map((name) => {
           let Plugin;
           try {
-            Plugin = requireServicePlugin(serviceDir, name, pluginsObject.localPath);
+            Plugin = this.requireServicePlugin(serviceDir, name, pluginsObject.localPath);
           } catch (error) {
             if (!isModuleNotFoundError(error, name)) throw error;
 
@@ -215,6 +220,29 @@ class PluginManager {
     );
   }
 
+  getLocalPluginsPathPatterns() {
+    return this.localPluginsPaths
+      .map(({ resolvedPath, inputPath }) => {
+        const absoluteInputPath = path.resolve(this.serverless.serviceDir, inputPath);
+        if (
+          absoluteInputPath === resolvedPath ||
+          absoluteInputPath + path.extname(resolvedPath) === resolvedPath
+        ) {
+          return path.relative(this.serverless.serviceDir, resolvedPath);
+        }
+
+        if (resolvedPath.startsWith(absoluteInputPath + path.sep)) {
+          return path.relative(
+            this.serverless.serviceDir,
+            path.join(path.dirname(resolvedPath), '/**')
+          );
+        }
+
+        return null;
+      })
+      .filter((v) => v !== null);
+  }
+
   resolveEnterprisePlugin() {
     if (config.getConfig().enterpriseDisabled) return null;
     this.pluginIndependentCommands.add('login').add('logout').add('dashboard');
diff --git a/lib/plugins/package/lib/packageService.js b/lib/plugins/package/lib/packageService.js
index 765166f12a2..e8624400690 100644
--- a/lib/plugins/package/lib/packageService.js
+++ b/lib/plugins/package/lib/packageService.js
@@ -39,7 +39,10 @@ module.exports = {
     const pluginsLocalPath = this.serverless.pluginManager.parsePluginsObject(
       this.serverless.service.plugins
     ).localPath;
-    const localPathExcludes = pluginsLocalPath ? [pluginsLocalPath] : [];
+    const localPathExcludes = this.serverless.pluginManager.getLocalPluginsPathPatterns();
+    if (pluginsLocalPath) {
+      localPathExcludes.push(pluginsLocalPath);
+    }
     // add layer paths
     const layerExcludes = excludeLayers
       ? this.serverless.service
diff --git a/test/fixtures/programmatic/packaging/custom-plugins/plugin-2/index.js b/test/fixtures/programmatic/packaging/custom-plugins/plugin-2/index.js
new file mode 100644
index 00000000000..2f63a91388c
--- /dev/null
+++ b/test/fixtures/programmatic/packaging/custom-plugins/plugin-2/index.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = function SomePlugin() {};
diff --git a/test/fixtures/programmatic/packaging/custom-plugins/plugin-3/package.json b/test/fixtures/programmatic/packaging/custom-plugins/plugin-3/package.json
new file mode 100644
index 00000000000..7847c0fa914
--- /dev/null
+++ b/test/fixtures/programmatic/packaging/custom-plugins/plugin-3/package.json
@@ -0,0 +1,3 @@
+{
+  "main": "src/main.js"
+}
diff --git a/test/fixtures/programmatic/packaging/custom-plugins/plugin-3/src/main.js b/test/fixtures/programmatic/packaging/custom-plugins/plugin-3/src/main.js
new file mode 100644
index 00000000000..2f63a91388c
--- /dev/null
+++ b/test/fixtures/programmatic/packaging/custom-plugins/plugin-3/src/main.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = function SomePlugin() {};
diff --git a/test/fixtures/programmatic/packaging/custom-plugins/plugin-4/index.js b/test/fixtures/programmatic/packaging/custom-plugins/plugin-4/index.js
new file mode 100644
index 00000000000..2f63a91388c
--- /dev/null
+++ b/test/fixtures/programmatic/packaging/custom-plugins/plugin-4/index.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = function SomePlugin() {};
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
index a1c4b4d724a..5e24f99effa 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/PluginManager.test.js
@@ -1821,7 +1821,7 @@ describe('PluginManager', () => {
         localPath: path.join(serviceDir, 'serverless-plugins-custom'),
         modules: ['local-plugin'],
       });
-      // Had to use contructor.name because the class will be loaded via
+      // Had to use constructor.name because the class will be loaded via
       // require and the reference will not match with SynchronousPluginMock
       expect(pluginManager.plugins).to.satisfy((plugins) =>
         plugins.some((plugin) => plugin.constructor.name === 'SynchronousPluginMock')
@@ -1837,23 +1837,7 @@ describe('PluginManager', () => {
         localPath: serviceDir,
         modules: ['local-plugin'],
       });
-      // Had to use contructor.name because the class will be loaded via
-      // require and the reference will not match with SynchronousPluginMock
-      expect(pluginManager.plugins).to.satisfy((plugins) =>
-        plugins.some((plugin) => plugin.constructor.name === 'SynchronousPluginMock')
-      );
-    });
-
-    it('should load plugins from custom folder outside of serviceDir', () => {
-      serviceDir = path.join(tmpDir, 'serverless-plugins-custom');
-      const localPluginDir = path.join(serviceDir, 'local-plugin');
-      installPlugin(localPluginDir, SynchronousPluginMock);
-
-      pluginManager.loadAllPlugins({
-        localPath: '../serverless-plugins-custom',
-        modules: ['local-plugin'],
-      });
-      // Had to use contructor.name because the class will be loaded via
+      // Had to use constructor.name because the class will be loaded via
       // require and the reference will not match with SynchronousPluginMock
       expect(pluginManager.plugins).to.satisfy((plugins) =>
         plugins.some((plugin) => plugin.constructor.name === 'SynchronousPluginMock')
diff --git a/test/unit/lib/plugins/package/lib/packageService.test.js b/test/unit/lib/plugins/package/lib/packageService.test.js
index 0a2548e4a14..51c3b920d56 100644
--- a/test/unit/lib/plugins/package/lib/packageService.test.js
+++ b/test/unit/lib/plugins/package/lib/packageService.test.js
@@ -229,6 +229,38 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
     });
   });
 
+  describe('with local plugins', async () => {
+    it('should exclude local plugins with relative paths', async () => {
+      const {
+        fixtureData: {
+          servicePath: serviceDir,
+          serviceConfig: { service: serviceName },
+        },
+      } = await runServerless({
+        fixture: 'packaging',
+        command: 'package',
+        awsRequestStubMap,
+        configExt: {
+          plugins: [
+            './custom-plugins/index.js',
+            './custom-plugins/plugin-2/index',
+            './custom-plugins/plugin-3',
+            './custom-plugins/plugin-4/',
+          ],
+        },
+      });
+
+      const zippedFiles = await listZipFiles(
+        path.join(serviceDir, '.serverless', `${serviceName}.zip`)
+      );
+
+      expect(zippedFiles).to.not.include('custom-plugins/index.js');
+      expect(zippedFiles).to.not.include('custom-plugins/plugin-2/index.js');
+      expect(zippedFiles).to.not.include('custom-plugins/plugin-3/src/main.js');
+      expect(zippedFiles).to.not.include('custom-plugins/plugin-4/index.js');
+    });
+  });
+
   describe('pre-prepared artifact', () => {
     let serverless;
     before(async () => {

From 46d090a302b9f7f4a3cf479695489b7ffc46b75b Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 4 Jan 2022 16:40:34 +0100
Subject: [PATCH 0807/1101] refactor(CLI Onboarding): Download templates from
 v2 examples branch

---
 lib/cli/interactive-setup/service.js                |  2 +-
 test/unit/lib/cli/interactive-setup/service.test.js | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index e8d0e234402..14d49701d09 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -203,7 +203,7 @@ module.exports = {
         stepHistory: context.stepHistory,
       });
       projectDir = join(workingDir, projectName);
-      const templateUrl = `https://github.com/serverless/examples/tree/master/${projectType}`;
+      const templateUrl = `https://github.com/serverless/examples/tree/v2/${projectType}`;
       legacy.write(`\nDownloading "${projectType}" template...\n`);
       const downloadProgress = progress.get('template-download');
       downloadProgress.notice(`Downloading "${projectType}" template`);
diff --git a/test/unit/lib/cli/interactive-setup/service.test.js b/test/unit/lib/cli/interactive-setup/service.test.js
index 0947ab5db20..48e69a43254 100644
--- a/test/unit/lib/cli/interactive-setup/service.test.js
+++ b/test/unit/lib/cli/interactive-setup/service.test.js
@@ -104,7 +104,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       const stats = await fsp.lstat('test-project/serverless.yml');
       expect(stats.isFile()).to.be.true;
       expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
-        'https://github.com/serverless/examples/tree/master/aws-nodejs',
+        'https://github.com/serverless/examples/tree/v2/aws-nodejs',
         'aws-nodejs',
         'test-project'
       );
@@ -145,7 +145,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       const stats = await fsp.lstat('test-project-template/serverless.yml');
       expect(stats.isFile()).to.be.true;
       expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
-        'https://github.com/serverless/examples/tree/master/aws-nodejs',
+        'https://github.com/serverless/examples/tree/v2/aws-nodejs',
         'aws-nodejs',
         'test-project-template'
       );
@@ -192,7 +192,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       const stats = await fsp.lstat('test-project-package-json/serverless.yml');
       expect(stats.isFile()).to.be.true;
       expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
-        'https://github.com/serverless/examples/tree/master/aws-nodejs',
+        'https://github.com/serverless/examples/tree/v2/aws-nodejs',
         'aws-nodejs',
         'test-project-package-json'
       );
@@ -368,7 +368,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       const stats = await fsp.lstat('test-project-from-provided-template/serverless.yml');
       expect(stats.isFile()).to.be.true;
       expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
-        'https://github.com/serverless/examples/tree/master/test-template',
+        'https://github.com/serverless/examples/tree/v2/test-template',
         'test-template',
         'test-project-from-provided-template'
       );
@@ -379,8 +379,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
     });
 
     it('Should create project at not existing directory with provided `template-url`', async () => {
-      const providedTemplateUrl =
-        'https://github.com/serverless/examples/tree/master/test-template';
+      const providedTemplateUrl = 'https://github.com/serverless/examples/tree/v2/test-template';
       const downloadTemplateFromRepoStub = sinon.stub();
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
         '../../utils/downloadTemplateFromRepo': {

From 129c0ee0a561be458ef2e82c13de3ffe2c8f558d Mon Sep 17 00:00:00 2001
From: Elin <elin.fritiofsson@gmail.com>
Date: Fri, 7 Jan 2022 15:10:15 +0100
Subject: [PATCH 0808/1101] test(AWS Websocket): Refactor API tests (#10466)

---
 .../compile/events/websockets/index.test.js   |  45 +++++---
 .../compile/events/websockets/lib/api.test.js | 104 ------------------
 2 files changed, 31 insertions(+), 118 deletions(-)
 delete mode 100644 test/unit/lib/plugins/aws/package/compile/events/websockets/lib/api.test.js

diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js
index c4de3c06708..719aada0685 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js
@@ -114,9 +114,11 @@ describe('AwsCompileWebsocketsEvents', () => {
 });
 
 describe('test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js', () => {
-  describe.skip('TODO: regular configuration', () => {
+  describe('regular configuration', () => {
+    let cfTemplate;
+    let awsNaming;
     before(async () => {
-      await runServerless({
+      ({ cfTemplate, awsNaming } = await runServerless({
         fixture: 'function',
         command: 'package',
 
@@ -131,23 +133,39 @@ describe('test/unit/lib/plugins/aws/package/compile/events/websockets/index.test
             },
           },
         },
-      });
+      }));
     });
 
     it('should create a websocket api resource', () => {
-      // Replaces
-      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/api.test.js#L37-L52
+      const websocketsApiName = awsNaming.getWebsocketsApiName();
+      expect(cfTemplate.Resources.WebsocketsApi).to.deep.equal({
+        Type: 'AWS::ApiGatewayV2::Api',
+        Properties: {
+          Name: websocketsApiName,
+          RouteSelectionExpression: '$request.body.action',
+          Description: 'Serverless Websockets',
+          ProtocolType: 'WEBSOCKET',
+        },
+      });
     });
 
     it('should configure expected IAM', () => {
-      // Replaces
-      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/api.test.js#L66-L91
+      const id = awsNaming.getRoleLogicalId();
+      expect(
+        cfTemplate.Resources[id].Properties.Policies[0].PolicyDocument.Statement
+      ).to.deep.include({
+        Effect: 'Allow',
+        Action: ['execute-api:ManageConnections'],
+        Resource: [{ 'Fn::Sub': 'arn:${AWS::Partition}:execute-api:*:*:*/@connections/*' }],
+      });
     });
   });
 
-  describe.skip('TODO: external websocket API', () => {
+  describe('external websocket API', () => {
+    let cfTemplate;
+    let awsNaming;
     before(async () => {
-      await runServerless({
+      ({ cfTemplate, awsNaming } = await runServerless({
         fixture: 'function',
         command: 'package',
 
@@ -170,17 +188,16 @@ describe('test/unit/lib/plugins/aws/package/compile/events/websockets/index.test
             },
           },
         },
-      });
+      }));
     });
 
     it('should not create a websocket api resource', () => {
-      // Replaces
-      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/api.test.js#L54-L64
+      expect(cfTemplate.Resources.WebsocketsApi).to.equal(undefined);
     });
 
     it('should not configure IAM policies with custom roles', () => {
-      // Replaces
-      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/api.test.js#L93-L103
+      const id = awsNaming.getRoleLogicalId();
+      expect(cfTemplate.Resources[id]).to.equal(undefined);
     });
   });
 });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/api.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/api.test.js
deleted file mode 100644
index c11588e8bd5..00000000000
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/api.test.js
+++ /dev/null
@@ -1,104 +0,0 @@
-'use strict';
-
-const expect = require('chai').expect;
-const AwsCompileWebsocketsEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
-const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
-
-describe('#compileApi()', () => {
-  let awsCompileWebsocketsEvents;
-  let roleLogicalId;
-
-  beforeEach(() => {
-    const serverless = new Serverless();
-    serverless.setProvider('aws', new AwsProvider(serverless));
-    serverless.service.service = 'my-service';
-    serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
-
-    awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless);
-
-    roleLogicalId = awsCompileWebsocketsEvents.provider.naming.getRoleLogicalId();
-    awsCompileWebsocketsEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
-      {
-        [roleLogicalId]: {
-          Properties: {
-            Policies: [
-              {
-                PolicyDocument: {
-                  Statement: [],
-                },
-              },
-            ],
-          },
-        },
-      };
-  });
-
-  it('should create a websocket api resource', () => {
-    awsCompileWebsocketsEvents.compileApi();
-    const resources =
-      awsCompileWebsocketsEvents.serverless.service.provider.compiledCloudFormationTemplate
-        .Resources;
-
-    expect(resources.WebsocketsApi).to.deep.equal({
-      Type: 'AWS::ApiGatewayV2::Api',
-      Properties: {
-        Name: 'dev-my-service-websockets',
-        RouteSelectionExpression: '$request.body.action',
-        Description: 'Serverless Websockets',
-        ProtocolType: 'WEBSOCKET',
-      },
-    });
-  });
-
-  it('should ignore API resource creation if there is predefined websocketApi config', () => {
-    awsCompileWebsocketsEvents.serverless.service.provider.apiGateway = {
-      websocketApiId: '5ezys3sght',
-    };
-    awsCompileWebsocketsEvents.compileApi();
-    const resources =
-      awsCompileWebsocketsEvents.serverless.service.provider.compiledCloudFormationTemplate
-        .Resources;
-
-    expect(resources).to.not.have.property('WebsocketsApi');
-  });
-
-  it('should add the websockets policy', () => {
-    awsCompileWebsocketsEvents.compileApi();
-    const resources =
-      awsCompileWebsocketsEvents.serverless.service.provider.compiledCloudFormationTemplate
-        .Resources;
-
-    expect(resources[roleLogicalId]).to.deep.equal({
-      Properties: {
-        Policies: [
-          {
-            PolicyDocument: {
-              Statement: [
-                {
-                  Action: ['execute-api:ManageConnections'],
-                  Effect: 'Allow',
-                  Resource: [
-                    { 'Fn::Sub': 'arn:${AWS::Partition}:execute-api:*:*:*/@connections/*' },
-                  ],
-                },
-              ],
-            },
-          },
-        ],
-      },
-    });
-  });
-
-  it('should NOT add the websockets policy if role resource does not exist', () => {
-    awsCompileWebsocketsEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
-      {};
-
-    awsCompileWebsocketsEvents.compileApi();
-    const resources =
-      awsCompileWebsocketsEvents.serverless.service.provider.compiledCloudFormationTemplate
-        .Resources;
-
-    expect(resources[roleLogicalId]).to.deep.equal(undefined);
-  });
-});

From 2c3ab1db9aa7c22c315957d1e474568e62e07e37 Mon Sep 17 00:00:00 2001
From: Graham Campbell <GrahamCampbell@users.noreply.github.com>
Date: Mon, 10 Jan 2022 09:43:49 +0000
Subject: [PATCH 0809/1101] fix(Templates): Upgrade `log4j` to `2.17.1`
 (#10430)

---
 lib/plugins/create/templates/aws-java-maven/pom.xml         | 4 ++--
 .../templates/aws-kotlin-jvm-gradle-kts/build.gradle.kts    | 2 +-
 .../create/templates/aws-kotlin-jvm-gradle/build.gradle     | 6 +++---
 lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml   | 4 ++--
 lib/plugins/create/templates/aws-scala-sbt/build.sbt        | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/plugins/create/templates/aws-java-maven/pom.xml b/lib/plugins/create/templates/aws-java-maven/pom.xml
index 982dfdeb810..4970bb7a044 100644
--- a/lib/plugins/create/templates/aws-java-maven/pom.xml
+++ b/lib/plugins/create/templates/aws-java-maven/pom.xml
@@ -22,12 +22,12 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
-      <version>2.17.0</version>
+      <version>2.17.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
-      <version>2.17.0</version>
+      <version>2.17.1</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/build.gradle.kts b/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/build.gradle.kts
index 03b76cdaf6d..71e0cf981e5 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/build.gradle.kts
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/build.gradle.kts
@@ -38,7 +38,7 @@ repositories {
 dependencies {
     api("org.jetbrains.kotlin:kotlin-stdlib:1.3.71")
     api("com.amazonaws:aws-lambda-java-core:1.2.1")
-    api("com.amazonaws:aws-lambda-java-log4j2:1.5.0")
+    api("com.amazonaws:aws-lambda-java-log4j2:1.5.1")
     api("org.slf4j:slf4j-simple:1.7.30")
     api("com.fasterxml.jackson.core:jackson-core:2.11.0")
     api("com.fasterxml.jackson.core:jackson-databind:2.11.0")
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-gradle/build.gradle b/lib/plugins/create/templates/aws-kotlin-jvm-gradle/build.gradle
index 0d57cede3bc..f105c694a1a 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-gradle/build.gradle
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-gradle/build.gradle
@@ -35,9 +35,9 @@ dependencies {
   api (
       'org.jetbrains.kotlin:kotlin-stdlib:1.3.72',
       'com.amazonaws:aws-lambda-java-core:1.2.1',
-      'com.amazonaws:aws-lambda-java-log4j2:1.5.0',
-      'org.apache.logging.log4j:log4j-api:2.17.0',
-      'org.apache.logging.log4j:log4j-core:2.17.0',
+      'com.amazonaws:aws-lambda-java-log4j2:1.5.1',
+      'org.apache.logging.log4j:log4j-api:2.17.1',
+      'org.apache.logging.log4j:log4j-core:2.17.1',
       'com.fasterxml.jackson.core:jackson-core:2.11.0',
       'com.fasterxml.jackson.core:jackson-databind:2.11.0',
       'com.fasterxml.jackson.core:jackson-annotations:2.11.0'
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml b/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml
index 2f2f20e610c..213fac1329e 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml
@@ -46,12 +46,12 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.17.0</version>
+            <version>2.17.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.17.0</version>
+            <version>2.17.1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/lib/plugins/create/templates/aws-scala-sbt/build.sbt b/lib/plugins/create/templates/aws-scala-sbt/build.sbt
index 93b0957a69b..8f8e5bf6e9f 100644
--- a/lib/plugins/create/templates/aws-scala-sbt/build.sbt
+++ b/lib/plugins/create/templates/aws-scala-sbt/build.sbt
@@ -12,8 +12,8 @@ assemblyJarName in assembly := "hello.jar"
 
 libraryDependencies ++= Seq(
   "com.amazonaws" % "aws-lambda-java-events" % "2.2.7",
-  "com.amazonaws" % "aws-lambda-java-core" % "1.2.0",
-  "com.amazonaws" % "aws-lambda-java-log4j2" % "1.5.0"
+  "com.amazonaws" % "aws-lambda-java-core" % "1.2.1",
+  "com.amazonaws" % "aws-lambda-java-log4j2" % "1.5.1"
 )
 
 scalacOptions ++= Seq(

From 5a764373c49d5fb313f50218ab8166f1638c2c32 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 10 Jan 2022 10:48:23 +0100
Subject: [PATCH 0810/1101] feat(Variables): Resign from `projectDir` concept

---
 docs/providers/aws/guide/serverless.yml.md            |  2 --
 docs/providers/aws/guide/variables.md                 |  2 --
 lib/configuration/variables/sources/file.js           | 11 -----------
 .../programmatic/multiService/serviceA/serverless.yml |  2 --
 .../lib/configuration/variables/sources/file.test.js  |  7 +------
 5 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 82064b7fe68..2d2428c0b71 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -21,8 +21,6 @@ Here is a list of all available properties in `serverless.yml` when the provider
 
 service: myService
 
-projectDir: ./ # Boundary of a project in which service is configured. Influences file resolution
-
 frameworkVersion: '2'
 configValidationMode: warn # Modes for config validation. `error` throws an exception, `warn` logs error to console, `off` disables validation at all. The default is warn.
 enableLocalInstallationFallback: false # If set to 'true', guarantees that it's a locally (for service, in its node_modules) installed framework which processes the command
diff --git a/docs/providers/aws/guide/variables.md b/docs/providers/aws/guide/variables.md
index afe08277e7a..42cdac9385a 100644
--- a/docs/providers/aws/guide/variables.md
+++ b/docs/providers/aws/guide/variables.md
@@ -411,8 +411,6 @@ custom:
 
 You can reference properties in other YAML or JSON files. To reference properties in other YAML files use the `${file(./myFile.yml):someProperty}` syntax in your `serverless.yml` configuration file.
 
-Files need to be referenced by relative paths, which should not reach out beyond project directory (by default service directory). If you work with multi-service project, you can change project directory boundary with `projectDir` setting (e.g. set `projectDir: ../` if you're service is nested in top level _service-x_ directory)
-
 To reference properties in other JSON files use the `${file(./myFile.json):someProperty}` syntax. It is important that the file you are referencing has the correct suffix, or file extension, for its file type (`.yml` for YAML or `.json` for JSON) in order for it to be interpreted correctly.
 
 Here's an example:
diff --git a/lib/configuration/variables/sources/file.js b/lib/configuration/variables/sources/file.js
index acadebcb0d8..ed0c285cda6 100644
--- a/lib/configuration/variables/sources/file.js
+++ b/lib/configuration/variables/sources/file.js
@@ -44,17 +44,6 @@ module.exports = {
         errorCode: 'INVALID_FILE_SOURCE_PATH_ARGUMENT',
       })
     );
-    const projectDir = path.resolve(
-      serviceDir,
-      (await resolveConfigurationProperty(['projectDir'])) || '.'
-    );
-    if (!filePath.startsWith(`${projectDir}${path.sep}`)) {
-      throw new ServerlessError(
-        'Cannot load file from outside of a project directory ' +
-          '(configure "projectDir" to extend project boundary)',
-        'FILE_SOURCE_PATH_OUTSIDE_OF_PROJECT'
-      );
-    }
     if (address != null) {
       address = ensureString(address, {
         Error: ServerlessError,
diff --git a/test/fixtures/programmatic/multiService/serviceA/serverless.yml b/test/fixtures/programmatic/multiService/serviceA/serverless.yml
index 40b0ffaf722..41d4892a2aa 100644
--- a/test/fixtures/programmatic/multiService/serviceA/serverless.yml
+++ b/test/fixtures/programmatic/multiService/serviceA/serverless.yml
@@ -3,8 +3,6 @@ service: service
 configValidationMode: error
 frameworkVersion: '*'
 
-projectDir: ../
-
 provider:
   name: aws
   runtime: nodejs12.x
diff --git a/test/unit/lib/configuration/variables/sources/file.test.js b/test/unit/lib/configuration/variables/sources/file.test.js
index cc2828b1eee..fc5789c6a88 100644
--- a/test/unit/lib/configuration/variables/sources/file.test.js
+++ b/test/unit/lib/configuration/variables/sources/file.test.js
@@ -49,7 +49,6 @@ describe('test/unit/lib/configuration/variables/sources/file.test.js', () => {
       notFile: '${file(dir.yaml)}',
       noParams: '${file:}',
       noParams2: '${file():}',
-      external: '${file(../file.test.js)}',
       invalidYaml: '${file(invalid.yml)}',
       invalidJson: '${file(invalid.json)}',
       invalidJs: '${file(invalid.js)}',
@@ -178,9 +177,6 @@ describe('test/unit/lib/configuration/variables/sources/file.test.js', () => {
     expect(variablesMeta.get('noParams2').error.code).to.equal('VARIABLE_RESOLUTION_ERROR');
   });
 
-  it('should report with an error attempt to access external path', () =>
-    expect(variablesMeta.get('external').error.code).to.equal('VARIABLE_RESOLUTION_ERROR'));
-
   it('should report with an error an invalid YAML file', () =>
     expect(variablesMeta.get('invalidYaml').error.code).to.equal('VARIABLE_RESOLUTION_ERROR'));
 
@@ -222,9 +218,8 @@ describe('test/unit/lib/configuration/variables/sources/file.test.js', () => {
     );
   });
 
-  it('should support "projectDir"', async () => {
+  it('should support reaching out beyond service directory', async () => {
     configuration = {
-      projectDir: '..',
       yml: '${file(../file.yml)}',
     };
     variablesMeta = resolveMeta(configuration);

From 1608e743deaecd925bc445a3a4800f40801553a5 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 10 Jan 2022 12:42:57 +0100
Subject: [PATCH 0811/1101] fix(Packaging): Revert exclusion of local plugins
 from a bundle

As it was discovered as breaking for some existing projects
---
 lib/plugins/package/lib/packageService.js     |  2 +-
 .../package/lib/packageService.test.js        | 32 -------------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/lib/plugins/package/lib/packageService.js b/lib/plugins/package/lib/packageService.js
index e8624400690..33e4a81deff 100644
--- a/lib/plugins/package/lib/packageService.js
+++ b/lib/plugins/package/lib/packageService.js
@@ -39,7 +39,7 @@ module.exports = {
     const pluginsLocalPath = this.serverless.pluginManager.parsePluginsObject(
       this.serverless.service.plugins
     ).localPath;
-    const localPathExcludes = this.serverless.pluginManager.getLocalPluginsPathPatterns();
+    const localPathExcludes = [];
     if (pluginsLocalPath) {
       localPathExcludes.push(pluginsLocalPath);
     }
diff --git a/test/unit/lib/plugins/package/lib/packageService.test.js b/test/unit/lib/plugins/package/lib/packageService.test.js
index 51c3b920d56..0a2548e4a14 100644
--- a/test/unit/lib/plugins/package/lib/packageService.test.js
+++ b/test/unit/lib/plugins/package/lib/packageService.test.js
@@ -229,38 +229,6 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
     });
   });
 
-  describe('with local plugins', async () => {
-    it('should exclude local plugins with relative paths', async () => {
-      const {
-        fixtureData: {
-          servicePath: serviceDir,
-          serviceConfig: { service: serviceName },
-        },
-      } = await runServerless({
-        fixture: 'packaging',
-        command: 'package',
-        awsRequestStubMap,
-        configExt: {
-          plugins: [
-            './custom-plugins/index.js',
-            './custom-plugins/plugin-2/index',
-            './custom-plugins/plugin-3',
-            './custom-plugins/plugin-4/',
-          ],
-        },
-      });
-
-      const zippedFiles = await listZipFiles(
-        path.join(serviceDir, '.serverless', `${serviceName}.zip`)
-      );
-
-      expect(zippedFiles).to.not.include('custom-plugins/index.js');
-      expect(zippedFiles).to.not.include('custom-plugins/plugin-2/index.js');
-      expect(zippedFiles).to.not.include('custom-plugins/plugin-3/src/main.js');
-      expect(zippedFiles).to.not.include('custom-plugins/plugin-4/index.js');
-    });
-  });
-
   describe('pre-prepared artifact', () => {
     let serverless;
     before(async () => {

From 08cf320fabc7405e6a69f4e9115d1fa0f48ab396 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 10 Jan 2022 13:07:16 +0100
Subject: [PATCH 0812/1101] chore: Bump dependencies

---
 package.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index ee2541dd350..0165c7a0b8b 100644
--- a/package.json
+++ b/package.json
@@ -22,15 +22,15 @@
     "sls": "./bin/serverless.js"
   },
   "dependencies": {
-    "@serverless/cli": "^1.5.3",
+    "@serverless/cli": "^1.6.0",
     "@serverless/components": "^3.18.1",
-    "@serverless/dashboard-plugin": "^5.5.2",
+    "@serverless/dashboard-plugin": "^5.5.3",
     "@serverless/platform-client": "^4.3.0",
     "@serverless/utils": "^5.20.2",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.1048.0",
+    "aws-sdk": "^2.1053.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.1.2",
     "cachedir": "^2.3.0",
@@ -49,9 +49,9 @@
     "filesize": "^8.0.6",
     "fs-extra": "^9.1.0",
     "get-stdin": "^8.0.0",
-    "globby": "^11.0.4",
+    "globby": "^11.1.0",
     "got": "^11.8.3",
-    "graceful-fs": "^4.2.8",
+    "graceful-fs": "^4.2.9",
     "https-proxy-agent": "^5.0.0",
     "is-docker": "^2.2.1",
     "is-wsl": "^2.2.0",
@@ -83,13 +83,13 @@
   "devDependencies": {
     "@commitlint/cli": "^12.1.4",
     "@serverless/eslint-config": "^4.0.0",
-    "@serverless/test": "^8.6.0",
+    "@serverless/test": "^8.8.0",
     "adm-zip": "^0.5.9",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "cos-nodejs-sdk-v5": "^2.11.6",
     "eslint": "^7.32.0",
-    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-import": "^2.25.4",
     "git-list-updated": "^1.2.1",
     "github-release-from-cc-changelog": "^2.2.0",
     "husky": "^4.3.8",

From 0cc77747df73c2ad68e6766c13080369be1c2724 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 10 Jan 2022 13:10:03 +0100
Subject: [PATCH 0813/1101] chore: Release v2.71.0

---
 CHANGELOG.md | 21 +++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c5bd5fa032..8fee0929a8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,27 @@
 
 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.
 
+## [2.71.0](https://github.com/serverless/serverless/compare/v2.70.0...v2.71.0) (2022-01-10)
+
+### Features
+
+- **AWS Cognito:** Support `forceDeploy` setting ([#10435](https://github.com/serverless/serverless/issues/10435)) ([c67a3f1](https://github.com/serverless/serverless/commit/c67a3f1a4fe6c64f2b6c68ef1b184b2642ad2266)) ([TsimpDim](https://github.com/TsimpDim))
+- **Variables:** Resign from `projectDir` concept ([#10478](https://github.com/serverless/serverless/pull/10478)) ([5a76437](https://github.com/serverless/serverless/commit/5a764373c49d5fb313f50218ab8166f1638c2c32)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **CLI:** Fix handling of provider URL handling ([#10461](https://github.com/serverless/serverless/pull/10461)) ([7ebe133](https://github.com/serverless/serverless/commit/7ebe133b35fa9affafd73b61ee4626d8ce5aee1f)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Config Schema:** Address invalid schema definitions ([#10452](https://github.com/serverless/serverless/pull/10452)) ([9e1fe0a](https://github.com/serverless/serverless/commit/9e1fe0ad5da8b936ccb238041fb2b452e6309faf)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Maintenance Improvements
+
+- **CLI Onboarding:** Download templates from v2 examples branch ([#10447](https://github.com/serverless/serverless/pull/10447)) ([46d090a](https://github.com/serverless/serverless/commit/46d090a302b9f7f4a3cf479695489b7ffc46b75b)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI:** Ensure telemetry logs are issued at debug level ([#10424](https://github.com/serverless/serverless/pull/10424)) ([7b36038](https://github.com/serverless/serverless/commit/7b360386eadb9a83af73514ced34bc901af43457)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Templates
+
+- Upgrade `log4j` to `2.17.1` in corresponding templates ([#10430](https://github.com/serverless/serverless/issues/10430)) ([2c3ab1d](https://github.com/serverless/serverless/commit/2c3ab1db9aa7c22c315957d1e474568e62e07e37)) ([Graham Campbell](https://github.com/GrahamCampbell))
+
 ## [2.70.0](https://github.com/serverless/serverless/compare/v2.69.1...v2.70.0) (2021-12-27)
 
 ### Features
diff --git a/package.json b/package.json
index 0165c7a0b8b..faf4cf31599 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.70.0",
+  "version": "2.71.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 702f779b59b4b5fe90747b81ef513341dfb073d9 Mon Sep 17 00:00:00 2001
From: Daniel Mackenzie <DanielMackenzie93@users.noreply.github.com>
Date: Mon, 10 Jan 2022 16:56:31 +0000
Subject: [PATCH 0814/1101] docs: Add `ts-node` dependency warning to README
 (#10472)

---
 docs/providers/aws/guide/intro.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/providers/aws/guide/intro.md b/docs/providers/aws/guide/intro.md
index 4b5a492118f..553d52e3310 100644
--- a/docs/providers/aws/guide/intro.md
+++ b/docs/providers/aws/guide/intro.md
@@ -163,6 +163,8 @@ const serverlessConfiguration: Serverless = {
 module.exports = serverlessConfiguration;
 ```
 
+> If deploying using a serverless.ts file, ts-node needs to be installed separately as a dev dependency.
+
 When you deploy with the Framework by running `serverless deploy`, everything in the service configuration file is deployed at once.
 
 > For the sake of simplicity, most code snippet detailed in this documentation only refer to the `serverless.yml` YAML service file format. However, all functionalities work as well in the other available service file formats.

From 452e4d8279802ab2ce1ca300ab2c75ec8588a9e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Farge?= <fr.farge96@gmail.com>
Date: Mon, 10 Jan 2022 23:24:47 +0100
Subject: [PATCH 0815/1101] fix(Templates): Ensure `esbuild` dependency in
 `aws-nodejs-typescript`

---
 .../create/templates/aws-nodejs-typescript/package.json        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/package.json b/lib/plugins/create/templates/aws-nodejs-typescript/package.json
index 678d4e19ca2..52e6f538a56 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/package.json
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/package.json
@@ -17,9 +17,10 @@
     "@serverless/typescript": "^2.23.0",
     "@types/aws-lambda": "^8.10.71",
     "@types/node": "^14.14.25",
+    "esbuild": "^0.14.11",
     "json-schema-to-ts": "^1.5.0",
     "serverless": "^2.23.0",
-    "serverless-esbuild": "^1.17.1",
+    "serverless-esbuild": "^1.23.3",
     "ts-node": "^10.4.0",
     "tsconfig-paths": "^3.9.0",
     "typescript": "^4.1.3"

From cc905c1e39f36526d570f6df9a73b567e494888a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 12 Jan 2022 15:49:50 +0100
Subject: [PATCH 0816/1101] refactor: Remove not actual TODO comments

---
 lib/classes/CLI.js                                            | 1 -
 lib/configuration/variables/index.js                          | 1 -
 lib/plugins/aws/provider.js                                   | 1 -
 test/integration/aws/httpApi.test.js                          | 2 --
 test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js | 1 -
 5 files changed, 6 deletions(-)

diff --git a/lib/classes/CLI.js b/lib/classes/CLI.js
index 699d20309a0..dc70f1ce73c 100644
--- a/lib/classes/CLI.js
+++ b/lib/classes/CLI.js
@@ -7,7 +7,6 @@ const log = require('@serverless/utils/log');
 const resolveCliInput = require('../cli/resolve-input');
 const renderHelp = require('../cli/render-help');
 
-// TODO: Remove this class with next major
 class CLI {
   constructor(serverless) {
     this.serverless = serverless;
diff --git a/lib/configuration/variables/index.js b/lib/configuration/variables/index.js
index 5b0e130e213..2a24e4cf6ab 100644
--- a/lib/configuration/variables/index.js
+++ b/lib/configuration/variables/index.js
@@ -34,7 +34,6 @@ const reportEventualErrors = (variablesMeta) => {
 };
 
 module.exports = async ({ serviceDir, servicePath, configuration, options, sources = null }) => {
-  // TODO: Remove support for `servicePath` with next major
   serviceDir = ensureString(serviceDir || servicePath);
   ensurePlainObject(configuration);
   options = ensurePlainObject(options, { default: {} });
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index dac17ee7974..3983d39e6a8 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -236,7 +236,6 @@ class AwsProvider {
       // Below ideally should be in hooks.intialize, but variables resolution depend on this
       this.serverless.service.provider.region = this.getRegion();
       require('../../utils/awsSdkPatch');
-      // TODO: Complete schema, see https://github.com/serverless/serverless/issues/8016
       serverless.configSchemaHandler.defineProvider('aws', {
         definitions: {
           awsAccountId: {
diff --git a/test/integration/aws/httpApi.test.js b/test/integration/aws/httpApi.test.js
index bdec5f3ba0e..f15eeaaee99 100644
--- a/test/integration/aws/httpApi.test.js
+++ b/test/integration/aws/httpApi.test.js
@@ -255,8 +255,6 @@ describe('HTTP API Integration Test', function () {
     });
 
     after(async function () {
-      // Added temporarily to inspect random fails
-      // TODO: Remove once properly diagnosed
       if (this.test.parent.tests.some((test) => test.state === 'failed')) return;
       log.notice('Removing service...');
       await removeService(serviceDir);
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
index 8c1f5c2b35d..d8d2e7222bd 100644
--- a/test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js
+++ b/test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js
@@ -107,7 +107,6 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
     });
   });
 
-  // TODO: VERIFY THESE CLEANUPS
   after(() => {
     sinon.restore();
   });

From 521861b6510fd345c2b596e4ec9e9ef7be01ac10 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 12 Jan 2022 15:50:09 +0100
Subject: [PATCH 0817/1101] refactor(AWS Deploy): Improve custom resource
 generation log

---
 lib/plugins/aws/customResources/index.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/plugins/aws/customResources/index.js b/lib/plugins/aws/customResources/index.js
index 872c33e3a7d..0a45818426b 100644
--- a/lib/plugins/aws/customResources/index.js
+++ b/lib/plugins/aws/customResources/index.js
@@ -10,9 +10,8 @@ const generateZip = require('./generateZip');
 const ServerlessError = require('../../../serverless-error');
 
 const prepareCustomResourcePackage = _.memoize(async (zipFilePath) => {
-  // TODO: check every once in a while if external packages are still necessary
-  legacy.log('Installing dependencies for custom CloudFormation resources...');
-  log.info('Installing dependencies for custom CloudFormation resources');
+  legacy.log('Generating custom CloudFormation resources...');
+  log.info('Generating custom CloudFormation resources');
   return BbPromise.all([generateZip(), fse.mkdirs(path.dirname(zipFilePath))])
     .then(([cachedZipFilePath]) => fse.copy(cachedZipFilePath, zipFilePath))
     .then(() => path.basename(zipFilePath));

From ae547a83450086820223aa8e57d0486c12e38bad Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Wed, 12 Jan 2022 15:20:49 +0100
Subject: [PATCH 0818/1101] docs: Document the migration for
 `serverless-dotenv-plugin`

---
 docs/guides/upgrading-v3.md | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/docs/guides/upgrading-v3.md b/docs/guides/upgrading-v3.md
index dfdccb31e50..60156b1d9e8 100644
--- a/docs/guides/upgrading-v3.md
+++ b/docs/guides/upgrading-v3.md
@@ -295,3 +295,28 @@ configValidationMode: error
 Unlike planned initially, loading `.env` files is kept opt-in via `useDotenv: true`.
 
 Additionally, the short form `serverless deploy -f <function>` is still allowed in v3, but `serverless deploy function -f <function>` stays the preferred form.
+
+### Plugins
+
+The [`serverless-dotenv-plugin`](https://github.com/neverendingqs/serverless-dotenv-plugin) is directly impacted by v3. Indeed, for technical reasons the plugin will no longer be able to resolve `${env:xxx}` variables from `.env` files.
+
+However, `.env` files are now natively supported by Serverless Framework v3. Set `useDotenv: true` to use `.env` variables with `${env:xxx}`:
+
+```yaml
+useDotenv: true
+
+provider:
+  environment:
+    FOO: ${env:FOO}
+```
+
+The plugin can still be used as usual if you want to automatically import **all** variables from `.env` into functions.
+
+```yaml
+plugins:
+  - serverless-dotenv-plugin
+
+provider:
+  environment:
+    # With the plugin enabled, all variables in .env are automatically imported
+```

From e4c60227dd0b6f9cf834d288128d0d461c5f398d Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Thu, 13 Jan 2022 09:57:42 +0100
Subject: [PATCH 0819/1101] docs: Fix links

---
 docs/guides/dashboard.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guides/dashboard.md b/docs/guides/dashboard.md
index d6c42fc2189..1ad553031eb 100644
--- a/docs/guides/dashboard.md
+++ b/docs/guides/dashboard.md
@@ -15,7 +15,7 @@ layout: Doc
 
 The [Serverless Framework Dashboard](https://app.serverless.com/) is a SaaS solution that augments the Serverless Framework open source CLI to provide a powerful, unified experience to develop, deploy, test, secure and monitor your serverless applications.
 
-The Serverless Framework free tier gives developers full access to all features included in the Serverless Framework Dashboard, but is limited to 100,000 function invocations per month. If you are interested in expanding your usage of the Serverless Framework beyond the free tier [contact us](https://serverless.com/enterprise/contact/) for details re available plans and pricing.
+The Serverless Framework free tier gives developers full access to all features included in the Serverless Framework Dashboard, but is limited to 100,000 function invocations per month. If you are interested in expanding your usage of the Serverless Framework beyond the free tier [contact us](https://www.serverless.com/sales) for details re available plans and pricing.
 
 ## Minimum Version Requirements
 
@@ -29,7 +29,7 @@ Currently, the Serverless Framework Dashboard supports the following providers,
 - Runtimes: Node.js, Python
 - Regions: us-east-1, us-east-2, us-west-1, us-west-2, eu-central-1, eu-west-1, eu-west-2, eu-west-3, ap-northeast-1, ap-south-1, ap-southeast-1, ap-southeast-2, sa-east-1, ca-central-1
 
-Need unsupported providers, runtimes or regions? [Let us know](https://serverless.com/enterprise/) what you need. We are working hard to quickly expand our supported runtimes and regions.
+Need unsupported providers, runtimes or regions? [Let us know](https://www.serverless.com/sales) what you need. We are working hard to quickly expand our supported runtimes and regions.
 
 ## Installing
 

From 427920ee0fc1c98109c0b673c794baac1cc5caf7 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 13 Jan 2022 13:13:24 +0100
Subject: [PATCH 0820/1101] fix(CLI): Respect old Node.js versions in version
 detection

---
 .github/workflows/integrate.yml | 17 ++++++++++++++++-
 .github/workflows/validate.yml  | 15 +++++++++++++++
 bin/serverless.js               | 10 ++++++----
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
index 50ab8484174..0b86cbf0a52 100644
--- a/.github/workflows/integrate.yml
+++ b/.github/workflows/integrate.yml
@@ -184,10 +184,25 @@ jobs:
         # Workaround taken from https://github.com/actions/runner/issues/241#issuecomment-577360161
         run: script -e -c "npm test -- -b"
 
+  linuxNode4:
+    name: '[Linux] Node.js v4: Node version validation test'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Install Node.js and npm
+        uses: actions/setup-node@v1
+        with:
+          node-version: 4.x
+
+      - name: Node version validation test
+        run: ./bin/serverless.js | grep -q "Initialization error"
+
   integrate:
     name: Integrate
     runs-on: ubuntu-latest
-    needs: [linuxNode16, windowsNode16, linuxNode14, linuxNode12, linuxNode10]
+    needs: [linuxNode16, windowsNode16, linuxNode14, linuxNode12, linuxNode10, linuxNode4]
     timeout-minutes: 30 # Default is 360
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 97bd87a63be..a187f87c0d8 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -207,3 +207,18 @@ jobs:
         # Some tests depend on TTY support, which is missing in GA runner
         # Workaround taken from https://github.com/actions/runner/issues/241#issuecomment-577360161
         run: script -e -c "npm test -- -b"
+
+  linuxNode4:
+    name: '[Linux] Node.js v4: Node version validation test'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Install Node.js and npm
+        uses: actions/setup-node@v1
+        with:
+          node-version: 4.x
+
+      - name: Node version validation test
+        run: ./bin/serverless.js | grep -q "Initialization error"
diff --git a/bin/serverless.js b/bin/serverless.js
index 572e3f8888c..399016d5b16 100755
--- a/bin/serverless.js
+++ b/bin/serverless.js
@@ -1,5 +1,9 @@
 #!/usr/bin/env node
 
+// WARNING: Do not use syntax not supported by old Node.js versions (v4 lowest)
+// It's to ensure that users running those versions, see properly the error message
+// (as constructed below) instead of the syntax error
+
 'use strict';
 
 // `EvalError` is used to not pollute global namespace but still have the value accessible globally
@@ -31,9 +35,7 @@ if (require('../lib/utils/isStandaloneExecutable')) {
   }
 }
 
-(async () => {
-  const cliName = await require('../lib/cli/triage')();
-
+require('../lib/cli/triage')().then((cliName) => {
   switch (cliName) {
     case 'serverless':
       require('../scripts/serverless');
@@ -47,4 +49,4 @@ if (require('../lib/utils/isStandaloneExecutable')) {
     default:
       throw new Error(`Unrecognized CLI name "${cliName}"`);
   }
-})();
+});

From 0dacf1bb3bd53da32a24cf2286cf081aecf22806 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 13 Jan 2022 13:48:33 +0100
Subject: [PATCH 0821/1101] refactor: Support `conceal` option in modern logs

---
 lib/plugins/aws/info/display.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/aws/info/display.js b/lib/plugins/aws/info/display.js
index 8237e7f9bc6..62ff5399efa 100644
--- a/lib/plugins/aws/info/display.js
+++ b/lib/plugins/aws/info/display.js
@@ -45,10 +45,11 @@ module.exports = {
         const description = apiKeyInfo.description ? ` - ${apiKeyInfo.description}` : '';
         if (conceal) {
           apiKeysMessage += `\n  ${apiKeyInfo.name}${description}`;
+          outputSectionItems.push(`${apiKeyInfo.name}${description}`);
         } else {
           apiKeysMessage += `\n  ${apiKeyInfo.name}: ${apiKeyInfo.value}${description}`;
+          outputSectionItems.push(`${apiKeyInfo.name}: ${apiKeyInfo.value}${description}`);
         }
-        outputSectionItems.push(`${apiKeyInfo.name}: ${apiKeyInfo.value}${description}`);
       });
       this.serverless.serviceOutputs.set('api keys', outputSectionItems);
     } else {

From 20afe339231112e4d5ade9498386ac3c00e37e04 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 14 Jan 2022 09:35:42 +0100
Subject: [PATCH 0822/1101] refactor(CLI): Improve user message

---
 lib/cli/interactive-setup/dashboard-set-org.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/cli/interactive-setup/dashboard-set-org.js b/lib/cli/interactive-setup/dashboard-set-org.js
index da5a57bacdd..e46b55bc783 100644
--- a/lib/cli/interactive-setup/dashboard-set-org.js
+++ b/lib/cli/interactive-setup/dashboard-set-org.js
@@ -33,12 +33,8 @@ const orgUpdateConfirm = async (stepHistory) => {
 };
 
 const appUpdateConfirm = async (appName, orgName, stepHistory) => {
-  legacy.write(
-    "Service seems to have monitoring enabled, but configured app doesn't seem to exist in an organization.\n\n"
-  );
-  log.notice(
-    "Service seems to have monitoring enabled, but configured app doesn't seem to exist in an organization."
-  );
+  legacy.write('The "app" used in this Service does not yet exist in your Organization.\n\n');
+  log.notice('The "app" used in this Service does not yet exist in your Organization.');
   log.notice();
 
   const appUpdateType = await promptWithHistory({

From 82303b38942b35fa6cb8ad3f19f2d528a1736587 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 13 Jan 2022 14:27:06 +0100
Subject: [PATCH 0823/1101] refactor: Ensure support for `warn` mode for modern
 deprecations

---
 lib/utils/logDeprecation.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/utils/logDeprecation.js b/lib/utils/logDeprecation.js
index f9d84c492e1..906990e1430 100644
--- a/lib/utils/logDeprecation.js
+++ b/lib/utils/logDeprecation.js
@@ -55,9 +55,10 @@ const resolveMode = (serviceConfig) => {
   }
 };
 
-function writeDeprecation(code, message) {
+function writeDeprecation(code, message, { onlyLegacy } = {}) {
   const prefix = 'Serverless: ';
   const messageLines = message.split('\n');
+  const modernLogsMessageLines = [...messageLines];
   const followingLinesPrefix = ' '.repeat(prefix.length);
   for (let i = 1; i < messageLines.length; ++i) {
     messageLines[i] = followingLinesPrefix + messageLines[i];
@@ -65,12 +66,18 @@ function writeDeprecation(code, message) {
   message = messageLines.join('\n');
   legacy.write(`Serverless: ${chalk.keyword('orange')(`Deprecation warning: ${message}`)}\n`);
   if (!code.startsWith('EXT_')) {
+    modernLogsMessageLines.push(
+      `More Info: https://www.serverless.com/framework/docs/deprecations/#${code}`
+    );
     legacy.write(
       `            ${chalk.keyword('orange')(
         `More Info: https://www.serverless.com/framework/docs/deprecations/#${code}`
       )}\n`
     );
   }
+  if (!onlyLegacy) {
+    log.warning(modernLogsMessageLines.join('\n'));
+  }
 }
 
 module.exports = (code, message, { serviceConfig } = {}) => {
@@ -167,7 +174,7 @@ module.exports.printSummary = async () => {
 
     if (bufferedDeprecations.length === 1) {
       const { code, message } = bufferedDeprecations[0];
-      writeDeprecation(code, message);
+      writeDeprecation(code, message, { onlyLegacy: true });
       return;
     }
     const prefix = 'Serverless: ';

From 3580cb98dd2e5f1ef5e103073dab7adb82d24a7d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 14 Jan 2022 17:32:58 +0100
Subject: [PATCH 0824/1101] chore: Remove not used dependencies

---
 package.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package.json b/package.json
index faf4cf31599..ed2e84de994 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,6 @@
     "graceful-fs": "^4.2.9",
     "https-proxy-agent": "^5.0.0",
     "is-docker": "^2.2.1",
-    "is-wsl": "^2.2.0",
     "js-yaml": "^4.1.0",
     "json-cycle": "^1.3.0",
     "json-refs": "^3.0.15",
@@ -63,7 +62,6 @@
     "micromatch": "^4.0.4",
     "ncjsm": "^4.2.0",
     "node-fetch": "^2.6.6",
-    "object-hash": "^2.2.0",
     "open": "^7.4.2",
     "path2": "^0.1.0",
     "process-utils": "^4.0.0",

From dcf52731ea3920ecf16b2484e2673080acbfe1cd Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 14 Jan 2022 11:41:44 +0100
Subject: [PATCH 0825/1101] feat(CLI Onboarding): Auto login if `org` provided
 or configured

---
 lib/cli/interactive-setup/dashboard-login.js  | 23 ++++++++---
 .../interactive-setup/dashboard-login.test.js | 40 +++++++++++++++++++
 2 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/lib/cli/interactive-setup/dashboard-login.js b/lib/cli/interactive-setup/dashboard-login.js
index 43462cebf0c..b862cfe3b02 100644
--- a/lib/cli/interactive-setup/dashboard-login.js
+++ b/lib/cli/interactive-setup/dashboard-login.js
@@ -18,8 +18,11 @@ const loginOrRegisterQuestion = async (stepHistory) =>
 
 const steps = {
   loginOrRegister: async (context) => {
-    const result = await loginOrRegisterQuestion(context.stepHistory);
-    if (result) {
+    const shouldLoginOrRegister =
+      context.options.org ||
+      context.configuration.org ||
+      (await loginOrRegisterQuestion(context.stepHistory));
+    if (shouldLoginOrRegister) {
       await login({ isInteractive: true });
     }
   },
@@ -66,10 +69,18 @@ module.exports = {
     return !isLoggedIn;
   },
   async run(context) {
-    legacy.write(
-      'Enable Serverless Dashboard to get enhanced monitoring, logs and secrets management: https://serverless.com/monitoring\n\n'
-    );
-    if (context.initial.isInServiceContext && !context.initial.isDashboardEnabled) {
+    const isOrgProvided = context.options.org || context.configuration.org;
+    if (!isOrgProvided) {
+      legacy.write(
+        'Enable Serverless Dashboard to get enhanced monitoring, logs and secrets management: https://serverless.com/monitoring\n\n'
+      );
+    }
+
+    if (
+      context.initial.isInServiceContext &&
+      !context.initial.isDashboardEnabled &&
+      !isOrgProvided
+    ) {
       showOnboardingWelcome(context);
     }
 
diff --git a/test/unit/lib/cli/interactive-setup/dashboard-login.test.js b/test/unit/lib/cli/interactive-setup/dashboard-login.test.js
index 4193953e9f0..51835424b7d 100644
--- a/test/unit/lib/cli/interactive-setup/dashboard-login.test.js
+++ b/test/unit/lib/cli/interactive-setup/dashboard-login.test.js
@@ -139,6 +139,46 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-login.test.js', function
     );
   });
 
+  it('Should login and skip question when user providers `org` option', async () => {
+    const loginStep = proxyquire('../../../../../lib/cli/interactive-setup/dashboard-login', {
+      '@serverless/dashboard-plugin/lib/login': loginStub,
+      '@serverless/platform-client': {
+        ServerlessSDK: ServerlessSDKMock,
+      },
+    });
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: { provider: { name: 'aws', runtime: 'nodejs12.x' } },
+      configurationFilename: 'serverless.yml',
+      options: { org: 'someorg' },
+      initial: {},
+      inquirer,
+      stepHistory: new StepHistory(),
+    };
+    await loginStep.run(context);
+    expect(loginStub.calledOnce).to.be.true;
+  });
+
+  it('Should login and skip question when `org` configured', async () => {
+    const loginStep = proxyquire('../../../../../lib/cli/interactive-setup/dashboard-login', {
+      '@serverless/dashboard-plugin/lib/login': loginStub,
+      '@serverless/platform-client': {
+        ServerlessSDK: ServerlessSDKMock,
+      },
+    });
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: { org: 'someorg', provider: { name: 'aws', runtime: 'nodejs12.x' } },
+      configurationFilename: 'serverless.yml',
+      options: {},
+      initial: {},
+      inquirer,
+      stepHistory: new StepHistory(),
+    };
+    await loginStep.run(context);
+    expect(loginStub.calledOnce).to.be.true;
+  });
+
   it('Should not login when user decides not to login/register', async () => {
     configureInquirerStub(inquirer, {
       confirm: { shouldLoginOrRegister: false },

From a4ec51869f4b827859e2e69819d1051c3fd68b76 Mon Sep 17 00:00:00 2001
From: Mark Tse <mark.tse@neverendingqs.com>
Date: Fri, 14 Jan 2022 18:24:47 -0500
Subject: [PATCH 0826/1101] docs: Fix `initialize` hook reference in comment

---
 lib/plugins/aws/provider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 3983d39e6a8..74affe4ef7b 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -233,7 +233,7 @@ class AwsProvider {
     };
 
     if (this.serverless.service.provider.name === 'aws') {
-      // Below ideally should be in hooks.intialize, but variables resolution depend on this
+      // Below ideally should be in hooks.initialize, but variables resolution depend on this
       this.serverless.service.provider.region = this.getRegion();
       require('../../utils/awsSdkPatch');
       serverless.configSchemaHandler.defineProvider('aws', {

From 7fb26cccae8d41439e5fbcdba6b6e7136de09a86 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 17 Jan 2022 10:46:52 +0100
Subject: [PATCH 0827/1101] chore: Bump dependencies

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index ed2e84de994..3e8eee94c36 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.1053.0",
+    "aws-sdk": "^2.1058.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.1.2",
     "cachedir": "^2.3.0",
@@ -61,7 +61,7 @@
     "memoizee": "^0.4.15",
     "micromatch": "^4.0.4",
     "ncjsm": "^4.2.0",
-    "node-fetch": "^2.6.6",
+    "node-fetch": "^2.6.7",
     "open": "^7.4.2",
     "path2": "^0.1.0",
     "process-utils": "^4.0.0",
@@ -98,7 +98,7 @@
     "mocha": "^8.4.0",
     "mock-require": "^3.0.3",
     "nyc": "^15.1.0",
-    "pkg": "^5.5.1",
+    "pkg": "^5.5.2",
     "prettier": "^2.5.1",
     "proxyquire": "^2.1.3",
     "semver-regex": "^3.1.3",

From 714d8640ad6de82d324b58fa71e4adec74079d7b Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 17 Jan 2022 10:53:33 +0100
Subject: [PATCH 0828/1101] chore: Release v2.72.0

---
 CHANGELOG.md | 21 +++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fee0929a8f..59f08aaf4ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,27 @@
 
 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.
 
+## [2.72.0](https://github.com/serverless/serverless/compare/v2.71.0...v2.72.0) (2022-01-17)
+
+### Features
+
+- **CLI Onboarding:** Auto login if `org` provided or configured ([#10510](https://github.com/serverless/serverless/pull/10510)) ([dcf5273](https://github.com/serverless/serverless/commit/dcf52731ea3920ecf16b2484e2673080acbfe1cd)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **CLI:** Respect old Node.js versions in version detection ([#10499](https://github.com/serverless/serverless/pull/10499)) ([427920e](https://github.com/serverless/serverless/commit/427920ee0fc1c98109c0b673c794baac1cc5caf7)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **AWS Deploy:** Improve custom resource generation log ([#10496](https://github.com/serverless/serverless/pull/10496)) ([521861b](https://github.com/serverless/serverless/commit/521861b6510fd345c2b596e4ec9e9ef7be01ac10)) ([Mariusz Nowak](https://github.com/medikoo))
+- **CLI Onboarding:** Improve user message when `app` does not exist ([#10509](https://github.com/serverless/serverless/pull/10509)) ([20afe33](https://github.com/serverless/serverless/commit/20afe339231112e4d5ade9498386ac3c00e37e04)) ([Mariusz Nowak](https://github.com/medikoo))
+- Ensure support for `warn` mode for modern deprecations ([#10502](https://github.com/serverless/serverless/pull/10502)) ([82303b3](https://github.com/serverless/serverless/commit/82303b38942b35fa6cb8ad3f19f2d528a1736587)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Support `conceal` option in modern logs ([#10501](https://github.com/serverless/serverless/pull/10501)) ([0dacf1b](https://github.com/serverless/serverless/commit/0dacf1bb3bd53da32a24cf2286cf081aecf22806)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Templates
+
+- Ensure `esbuild` dependency in `aws-nodejs-typescript` ([#10484](https://github.com/serverless/serverless/pull/10484)) ([452e4d8](https://github.com/serverless/serverless/commit/452e4d8279802ab2ce1ca300ab2c75ec8588a9e8)) ([François Farge](https://github.com/fargito))
+
 ## [2.71.0](https://github.com/serverless/serverless/compare/v2.70.0...v2.71.0) (2022-01-10)
 
 ### Features
diff --git a/package.json b/package.json
index 3e8eee94c36..d6592f09cac 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.71.0",
+  "version": "2.72.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From be446db9ec8ea3fb1776f55b0e292988895bd661 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 17 Jan 2022 15:15:15 +0100
Subject: [PATCH 0829/1101] docs(Dashboard): Remove `tenant` wording

---
 docs/guides/cicd/running-in-your-own-cicd.md | 2 +-
 docs/providers/aws/cli-reference/slstats.md  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guides/cicd/running-in-your-own-cicd.md b/docs/guides/cicd/running-in-your-own-cicd.md
index ad245764192..17100de8bd5 100644
--- a/docs/guides/cicd/running-in-your-own-cicd.md
+++ b/docs/guides/cicd/running-in-your-own-cicd.md
@@ -48,7 +48,7 @@ Follow these steps to create an access token:
 5. Provide a name and press “Create”
 6. You will be presented with the access key on the new page.
 
-**Note**: The access token has permission to the tenant; however, it is associated with your account. If your account is deleted, then the access token will be revoked too.
+**Note**: The access token has permission to the org; however, it is associated with your account. If your account is deleted, then the access token will be revoked too.
 
 ### Configure environment variables
 
diff --git a/docs/providers/aws/cli-reference/slstats.md b/docs/providers/aws/cli-reference/slstats.md
index 597fd824a98..c01ca586a62 100644
--- a/docs/providers/aws/cli-reference/slstats.md
+++ b/docs/providers/aws/cli-reference/slstats.md
@@ -55,6 +55,6 @@ The following is a list of the events that we collect:
 
 ## Signed in to the Dashboard
 
-If you are signed in to the [Serverless Dashboard](https://app.serverless.com), we do receive your userId as part of the event payloads. We can use this information to understand your tenant and users interactions with the CLI and building services.
+If you are signed in to the [Serverless Dashboard](https://app.serverless.com), we do receive your userId as part of the event payloads. We can use this information to understand your org and users interactions with the CLI and building services.
 
 If you are not signed in, we do not send any identifying information, such as an userId, within any of the event payloads.

From 05fb97fdab0c0ddc471ca554e48e09e661f797db Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 18 Jan 2022 16:24:19 +0100
Subject: [PATCH 0830/1101] refactor: Refactor direct use of
 `@serverless/utils/log`

---
 lib/aws/request.js                                        | 3 ++-
 .../variables/eventually-report-resolution-errors.js      | 8 ++++++--
 lib/plugins/aws/package/compile/functions.js              | 4 ++--
 lib/utils/npmPackage/isWritable.js                        | 7 +++++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/aws/request.js b/lib/aws/request.js
index 6a68d08e92f..c7a102a3f8d 100644
--- a/lib/aws/request.js
+++ b/lib/aws/request.js
@@ -96,7 +96,8 @@ const shouldS3Accelerate = (method, params) => {
     params &&
     params.isS3TransferAccelerationEnabled
   ) {
-    log('Using S3 Transfer Acceleration Endpoint...');
+    legacy.log('Using S3 Transfer Acceleration Endpoint...');
+    log.notice('Using S3 Transfer Acceleration Endpoint...');
     return true;
   }
   return false;
diff --git a/lib/configuration/variables/eventually-report-resolution-errors.js b/lib/configuration/variables/eventually-report-resolution-errors.js
index 29819fac025..ead279da64a 100644
--- a/lib/configuration/variables/eventually-report-resolution-errors.js
+++ b/lib/configuration/variables/eventually-report-resolution-errors.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const log = require('@serverless/utils/log');
+const { log, legacy } = require('@serverless/utils/log');
 const ServerlessError = require('../../serverless-error');
 const resolveCliInput = require('../../cli/resolve-input');
 const logDeprecation = require('../../utils/logDeprecation');
@@ -14,11 +14,15 @@ module.exports = (configurationPath, configuration, variablesMeta) => {
   if (!resolutionErrors.size) return false;
 
   if (resolveCliInput().isHelpRequest) {
-    log(
+    legacy.log(
       'Resolution of service configuration failed when resolving variables: ' +
         `${Array.from(resolutionErrors, (error) => `\n  - ${error.message}`)}\n`,
       { color: 'orange' }
     );
+    log.warning(
+      'Resolution of service configuration failed when resolving variables: ' +
+        `${Array.from(resolutionErrors, (error) => `\n  - ${error.message}`)}\n`
+    );
   } else {
     if (configuration.variablesResolutionMode) {
       throw new ServerlessError(
diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index 4d878b63a2e..e4559bb44b3 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -6,7 +6,6 @@ const crypto = require('crypto');
 const fs = require('fs');
 const _ = require('lodash');
 const path = require('path');
-const oldLog = require('@serverless/utils/log');
 const ServerlessError = require('../../../../serverless-error');
 const deepSortObjectByKey = require('../../../../utils/deepSortObjectByKey');
 const getHashForFilePath = require('../lib/getHashForFilePath');
@@ -755,8 +754,9 @@ function extractLayerConfigurationsFromFunction(functionProperties, cfTemplate)
       const configuration = cfTemplate.Resources[potentialLocalLayerObject.Ref];
 
       if (!configuration) {
+        log.info(`Could not find reference to layer: ${potentialLocalLayerObject.Ref}.`);
         if (process.env.SLS_DEBUG) {
-          oldLog(`Could not find reference to layer: ${potentialLocalLayerObject.Ref}.`);
+          legacy.log(`Could not find reference to layer: ${potentialLocalLayerObject.Ref}.`);
         }
         return;
       }
diff --git a/lib/utils/npmPackage/isWritable.js b/lib/utils/npmPackage/isWritable.js
index b8333b3456b..4fb18ebdfaf 100644
--- a/lib/utils/npmPackage/isWritable.js
+++ b/lib/utils/npmPackage/isWritable.js
@@ -3,7 +3,7 @@
 const { format } = require('util');
 const path = require('path');
 const fsp = require('fs').promises;
-const log = require('@serverless/utils/log');
+const { log, legacy } = require('@serverless/utils/log');
 
 const npmPackageRoot = path.resolve(__dirname, '../../../');
 
@@ -13,7 +13,10 @@ module.exports = async () => {
     await fsp.utimes(npmPackageRoot, String(stats.atimeMs / 1000), String(stats.mtimeMs / 1000));
     return true;
   } catch (error) {
-    if (process.env.SLS_DEBUG) log(format('Auto update: file access error: %O', error));
+    if (process.env.SLS_DEBUG) {
+      legacy.log(format('Auto update: file access error: %O', error));
+    }
+    log.info('Auto update: file access error: %O', error);
     return false;
   }
 };

From cd772d85ded801a0c3face49924e2ff986b42dd7 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 21 Jan 2022 09:58:20 +0100
Subject: [PATCH 0831/1101] chore: Bump dependencies

---
 package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d6592f09cac..9356d020317 100644
--- a/package.json
+++ b/package.json
@@ -23,14 +23,14 @@
   },
   "dependencies": {
     "@serverless/cli": "^1.6.0",
-    "@serverless/components": "^3.18.1",
-    "@serverless/dashboard-plugin": "^5.5.3",
+    "@serverless/components": "^3.18.2",
+    "@serverless/dashboard-plugin": "^5.5.4",
     "@serverless/platform-client": "^4.3.0",
-    "@serverless/utils": "^5.20.2",
+    "@serverless/utils": "^5.20.3",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.1058.0",
+    "aws-sdk": "^2.1061.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.1.2",
     "cachedir": "^2.3.0",
@@ -46,7 +46,7 @@
     "essentials": "^1.2.0",
     "ext": "^1.6.0",
     "fastest-levenshtein": "^1.0.12",
-    "filesize": "^8.0.6",
+    "filesize": "^8.0.7",
     "fs-extra": "^9.1.0",
     "get-stdin": "^8.0.0",
     "globby": "^11.1.0",

From 1729e0f7bfa6a16388259b79b6271c6622cb2b89 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 21 Jan 2022 09:59:22 +0100
Subject: [PATCH 0832/1101] chore: Release v2.72.1

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59f08aaf4ed..4a5f6dafd05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 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.
 
+### [2.72.1](https://github.com/serverless/serverless/compare/v2.72.0...v2.72.1) (2022-01-21)
+
+### Maintenance Improvements
+
+- Refactor direct use of `@serverless/utils/log` ([#10534](https://github.com/serverless/serverless/pull/10534)) ([05fb97f](https://github.com/serverless/serverless/commit/05fb97fdab0c0ddc471ca554e48e09e661f797db)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
 ## [2.72.0](https://github.com/serverless/serverless/compare/v2.71.0...v2.72.0) (2022-01-17)
 
 ### Features
diff --git a/package.json b/package.json
index 9356d020317..3008291c50e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.72.0",
+  "version": "2.72.1",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 8db03c90ffba68ebda800d2a009452cd09f7bf7f Mon Sep 17 00:00:00 2001
From: Steven Noorbergen <91969936+steven-xaroth@users.noreply.github.com>
Date: Mon, 24 Jan 2022 14:03:32 +0100
Subject: [PATCH 0833/1101] fix(Variables): Fix too eager nested resolution
 tracking (#10554)

---
 lib/configuration/variables/resolve.js               |  4 ++--
 .../lib/configuration/variables/sources/file.test.js |  4 ++++
 .../sources/fixture/file-function-many-variables.js  |  5 +++++
 .../fixture/file-function-many-variables.yaml        | 12 ++++++++++++
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 test/unit/lib/configuration/variables/sources/fixture/file-function-many-variables.js
 create mode 100644 test/unit/lib/configuration/variables/sources/fixture/file-function-many-variables.yaml

diff --git a/lib/configuration/variables/resolve.js b/lib/configuration/variables/resolve.js
index bef1748f827..d6ee3c185ca 100644
--- a/lib/configuration/variables/resolve.js
+++ b/lib/configuration/variables/resolve.js
@@ -338,7 +338,7 @@ class VariablesResolver {
       valueMeta.variables = valueVariables;
       delete valueMeta.sourceValues;
       await this.resolveVariables(resolutionBatchId, propertyPath, valueMeta);
-      await this.resolveInternalResult(resolutionBatchId, propertyPath, valueMeta, --nestTracker);
+      await this.resolveInternalResult(resolutionBatchId, propertyPath, valueMeta, nestTracker - 1);
       return;
     }
     const valueEntries = (() => {
@@ -353,7 +353,7 @@ class VariablesResolver {
         resolutionBatchId,
         propertyPath,
         propertyValueMeta,
-        --nestTracker
+        nestTracker - 1
       );
       const propertyKeyPathKeys = propertyKeyPath.split('\0');
       const targetKey = propertyKeyPathKeys[propertyKeyPathKeys.length - 1];
diff --git a/test/unit/lib/configuration/variables/sources/file.test.js b/test/unit/lib/configuration/variables/sources/file.test.js
index fc5789c6a88..c43fa942229 100644
--- a/test/unit/lib/configuration/variables/sources/file.test.js
+++ b/test/unit/lib/configuration/variables/sources/file.test.js
@@ -25,6 +25,7 @@ describe('test/unit/lib/configuration/variables/sources/file.test.js', () => {
       addressSupport: '${file(file.json):result}',
       jsFunctionResolveVariable: '${file(file-function-variable.js)}',
       jsFunctionResolveVariableMissingSource: '${file(file-function-variable-missing-source.js)}',
+      jsFunctionResolveManyVariables: '${file(file-function-many-variables.js)}',
       jsPropertyFunctionResolveVariable: '${file(file-property-function-variable.js):property}',
       jsPropertyFunctionResolveVariableMissingSource:
         '${file(file-property-function-variable-missing-source.js):property}',
@@ -101,6 +102,9 @@ describe('test/unit/lib/configuration/variables/sources/file.test.js', () => {
     expect(configuration.jsPropertyFunctionResolveVariable).to.deep.equal({
       varResult: { result: 'json' },
     });
+    expect(configuration.jsFunctionResolveManyVariables).to.deep.equal({
+      varResult: { result: ['yml', 'yml', 'yml', 'yml', 'yml', 'yml', 'yml', 'yml', 'yml', 'yml'] },
+    });
   });
 
   it('should resolve variables across address resolution', () => {
diff --git a/test/unit/lib/configuration/variables/sources/fixture/file-function-many-variables.js b/test/unit/lib/configuration/variables/sources/fixture/file-function-many-variables.js
new file mode 100644
index 00000000000..9bc3345e994
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/fixture/file-function-many-variables.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = async ({ resolveVariable }) => ({
+  varResult: await resolveVariable('file(file-function-many-variables.yaml)'),
+});
diff --git a/test/unit/lib/configuration/variables/sources/fixture/file-function-many-variables.yaml b/test/unit/lib/configuration/variables/sources/fixture/file-function-many-variables.yaml
new file mode 100644
index 00000000000..025a204d325
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/fixture/file-function-many-variables.yaml
@@ -0,0 +1,12 @@
+# The resolve nest depth is 10, so we have to resolve at least 10 files to ensure it's not being hit.
+result:
+  - ${file(./file.yml):result}
+  - ${file(./file.yml):result}
+  - ${file(./file.yml):result}
+  - ${file(./file.yml):result}
+  - ${file(./file.yml):result}
+  - ${file(./file.yml):result}
+  - ${file(./file.yml):result}
+  - ${file(./file.yml):result}
+  - ${file(./file.yml):result}
+  - ${file(./file.yml):result}

From e4feff649705b74dad236d031f466ef51a4a579f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 16:40:06 +0100
Subject: [PATCH 0834/1101] test(AWS Deploy): Ensure we tests against unached
 version

---
 package.json                                                | 2 +-
 .../lib/plugins/aws/customResources/generateZip.test.js     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 3008291c50e..5275ba06404 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "lodash": "^4.17.21",
     "memoizee": "^0.4.15",
     "micromatch": "^4.0.4",
-    "ncjsm": "^4.2.0",
+    "ncjsm": "^4.3.0",
     "node-fetch": "^2.6.7",
     "open": "^7.4.2",
     "path2": "^0.1.0",
diff --git a/test/unit/lib/plugins/aws/customResources/generateZip.test.js b/test/unit/lib/plugins/aws/customResources/generateZip.test.js
index 450bf6bc4b4..da68d7b24e5 100644
--- a/test/unit/lib/plugins/aws/customResources/generateZip.test.js
+++ b/test/unit/lib/plugins/aws/customResources/generateZip.test.js
@@ -2,9 +2,9 @@
 
 const path = require('path');
 const globby = require('globby');
+const requireUncached = require('ncjsm/require-uncached');
 const { listZipFiles } = require('../../../../../utils/fs');
 const { expect } = require('chai');
-const generateZip = require('../../../../../../lib/plugins/aws/customResources/generateZip');
 
 // The directory that holds the files that generateZip zips up
 const resourcesDir = path.resolve(
@@ -15,7 +15,9 @@ const resourcesDir = path.resolve(
 describe('test/unit/lib/plugins/aws/customResources/generateZip.test.js', () => {
   describe('when generating a zip file', () => {
     it('should generate a zip file with the contents of the resources directory', async () => {
-      const zipFilePath = await generateZip();
+      const zipFilePath = await requireUncached(async () =>
+        require('../../../../../../lib/plugins/aws/customResources/generateZip')()
+      );
 
       // List the files in the zip to make sure it is valid
       const filesInZip = await listZipFiles(zipFilePath);

From d69ccb5ef45c10f8e8c14169e0524f4899718bf0 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 21:00:45 +0100
Subject: [PATCH 0835/1101] chore: Bump dependencies

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5275ba06404..e214a57e874 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.1061.0",
+    "aws-sdk": "^2.1062.0",
     "bluebird": "^3.7.2",
     "boxen": "^5.1.2",
     "cachedir": "^2.3.0",

From 9b17e8d01a8586af9b46fb4e2c61c350680ed871 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 21:02:45 +0100
Subject: [PATCH 0836/1101] chore: Release v2.72.2

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a5f6dafd05..a6fcff08ec5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 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.
 
+### [2.72.2](https://github.com/serverless/serverless/compare/v2.72.1...v2.72.2) (2022-01-24)
+
+### Bug Fixes
+
+- **Variables:** Fix too eager nested resolution tracking ([#10554](https://github.com/serverless/serverless/issues/10554)) ([8db03c9](https://github.com/serverless/serverless/commit/8db03c90ffba68ebda800d2a009452cd09f7bf7f)) ([Steven Noorbergen](https://github.com/steven-xaroth))
+
 ### [2.72.1](https://github.com/serverless/serverless/compare/v2.72.0...v2.72.1) (2022-01-21)
 
 ### Maintenance Improvements
diff --git a/package.json b/package.json
index e214a57e874..2c5094a1b1a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.72.1",
+  "version": "2.72.2",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 04db0bb66a6e189b47cb861cf41772f26a6989a3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 21:36:43 +0100
Subject: [PATCH 0837/1101] test: Remove obsolete files

---
 .../aws/invokeLocal/fixture/.gitignore        |  1 -
 .../aws/invokeLocal/fixture/__init__.py       |  0
 .../fixture/asyncHandlerWithError.js          |  7 ---
 .../fixture/asyncHandlerWithSuccess.js        | 50 -------------------
 .../aws/invokeLocal/fixture/handler.py        | 12 -----
 .../aws/invokeLocal/fixture/handler.rb        | 19 -------
 .../invokeLocal/fixture/handlerWithError.js   |  9 ----
 .../fixture/handlerWithInitializationError.js |  3 --
 .../fixture/handlerWithLoadingError.js        |  2 -
 .../invokeLocal/fixture/handlerWithSuccess.js | 36 -------------
 10 files changed, 139 deletions(-)
 delete mode 100644 test/unit/lib/plugins/aws/invokeLocal/fixture/.gitignore
 delete mode 100644 test/unit/lib/plugins/aws/invokeLocal/fixture/__init__.py
 delete mode 100644 test/unit/lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithError.js
 delete mode 100644 test/unit/lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithSuccess.js
 delete mode 100644 test/unit/lib/plugins/aws/invokeLocal/fixture/handler.py
 delete mode 100644 test/unit/lib/plugins/aws/invokeLocal/fixture/handler.rb
 delete mode 100644 test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithError.js
 delete mode 100644 test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithInitializationError.js
 delete mode 100644 test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithLoadingError.js
 delete mode 100644 test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithSuccess.js

diff --git a/test/unit/lib/plugins/aws/invokeLocal/fixture/.gitignore b/test/unit/lib/plugins/aws/invokeLocal/fixture/.gitignore
deleted file mode 100644
index 0d20b6487c6..00000000000
--- a/test/unit/lib/plugins/aws/invokeLocal/fixture/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pyc
diff --git a/test/unit/lib/plugins/aws/invokeLocal/fixture/__init__.py b/test/unit/lib/plugins/aws/invokeLocal/fixture/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/test/unit/lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithError.js b/test/unit/lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithError.js
deleted file mode 100644
index 854b89bdffb..00000000000
--- a/test/unit/lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithError.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-
-module.exports.withError = () => new Error('failed');
-
-module.exports.withMessage = () => new Error('failed');
-
-module.exports.returnsError = () => new Error('failed');
diff --git a/test/unit/lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithSuccess.js b/test/unit/lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithSuccess.js
deleted file mode 100644
index 97ad5f24af6..00000000000
--- a/test/unit/lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithSuccess.js
+++ /dev/null
@@ -1,50 +0,0 @@
-'use strict';
-
-module.exports.withError = () => new Error('failed');
-
-module.exports.withMessage = () => 'Succeed';
-
-module.exports.withErrorByDone = (event, context) => {
-  context.done(new Error('failed'));
-
-  // this should not actually trigger a success
-  return 'this should not trigger';
-};
-
-module.exports.withMessageByDone = (event, context) => {
-  context.done(null, 'Succeed');
-  return 'this should not trigger';
-};
-
-module.exports.withMessageByCallback = (event, context, callback) => {
-  callback(null, 'Succeed');
-
-  return;
-};
-
-module.exports.withMessageAndDelayByCallback = (event, context, callback) => {
-  setTimeout(() => callback(null, 'Succeed'), 1);
-};
-
-module.exports.withMessageByLambdaProxy = () => ({
-  statusCode: 200,
-  headers: {
-    'Content-Type': 'application/json',
-  },
-  body: JSON.stringify({
-    result: true,
-    message: 'Whatever',
-  }),
-});
-
-module.exports.withRemainingTime = (event, context) => {
-  const start = context.getRemainingTimeInMillis();
-
-  const stopAt = new Date().getTime() + 1;
-  while (new Date().getTime() < stopAt);
-
-  return {
-    start,
-    stop: context.getRemainingTimeInMillis(),
-  };
-};
diff --git a/test/unit/lib/plugins/aws/invokeLocal/fixture/handler.py b/test/unit/lib/plugins/aws/invokeLocal/fixture/handler.py
deleted file mode 100644
index 13ffcf9f995..00000000000
--- a/test/unit/lib/plugins/aws/invokeLocal/fixture/handler.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from time import sleep
-
-
-def withRemainingTime(event, context):
-    start = context.get_remaining_time_in_millis()
-    sleep(0.001)
-    stop = context.get_remaining_time_in_millis()
-
-    return {
-        "start": start,
-        "stop": stop
-    }
diff --git a/test/unit/lib/plugins/aws/invokeLocal/fixture/handler.rb b/test/unit/lib/plugins/aws/invokeLocal/fixture/handler.rb
deleted file mode 100644
index 5bb48c10966..00000000000
--- a/test/unit/lib/plugins/aws/invokeLocal/fixture/handler.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-def withRemainingTime(event:, context:)
-  start = context.get_remaining_time_in_millis()
-  sleep(0.001)
-  stop = context.get_remaining_time_in_millis()
-
-  {"start" => start, "stop" => stop}
-end
-
-def withDeadlineMs(event:, context:)
-  {"deadlineMs" => context.deadline_ms}
-end
-
-module MyModule
-  class MyClass
-    def self.my_class_method(event:, context:)
-      {"foo" => "bar"}
-    end
-  end
-end
diff --git a/test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithError.js b/test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithError.js
deleted file mode 100644
index c20d1810705..00000000000
--- a/test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithError.js
+++ /dev/null
@@ -1,9 +0,0 @@
-'use strict';
-
-module.exports.withError = (event, context, callback) => {
-  callback(new Error('failed'));
-};
-
-module.exports.withMessage = (event, context, callback) => {
-  callback('failed');
-};
diff --git a/test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithInitializationError.js b/test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithInitializationError.js
deleted file mode 100644
index aa92137d266..00000000000
--- a/test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithInitializationError.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-throw new Error('Initialization failed');
diff --git a/test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithLoadingError.js b/test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithLoadingError.js
deleted file mode 100644
index a945eb0fdf1..00000000000
--- a/test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithLoadingError.js
+++ /dev/null
@@ -1,2 +0,0 @@
-'use strict';
-throw new Error('loading exception');
diff --git a/test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithSuccess.js b/test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithSuccess.js
deleted file mode 100644
index 6fbc7750f56..00000000000
--- a/test/unit/lib/plugins/aws/invokeLocal/fixture/handlerWithSuccess.js
+++ /dev/null
@@ -1,36 +0,0 @@
-'use strict';
-
-module.exports.withErrorByDone = (event, context) => {
-  context.done(new Error('failed'));
-};
-
-module.exports.withMessageByReturn = () => 'Succeed';
-
-module.exports.withMessageByDone = (event, context) => {
-  context.done(null, 'Succeed');
-};
-
-module.exports.withMessageByLambdaProxy = (event, context) => {
-  context.done(null, {
-    statusCode: 200,
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      result: true,
-      message: 'Whatever',
-    }),
-  });
-};
-
-module.exports.withRemainingTime = (event, context) => {
-  const start = context.getRemainingTimeInMillis();
-
-  const stopAt = new Date().getTime() + 1;
-  while (new Date().getTime() < stopAt);
-
-  context.done(null, {
-    start,
-    stop: context.getRemainingTimeInMillis(),
-  });
-};

From cb58fb99674653e97fd3ab68c495d8bd8c4c1024 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:24:15 +0100
Subject: [PATCH 0838/1101] docs: Remove outdated `anatomy` doc

---
 docs/anatomy.md | 62 -------------------------------------------------
 1 file changed, 62 deletions(-)
 delete mode 100644 docs/anatomy.md

diff --git a/docs/anatomy.md b/docs/anatomy.md
deleted file mode 100644
index 04e34cb58b8..00000000000
--- a/docs/anatomy.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# Anatomy - Overview of internals
-
-## `serverless` binary (front door for three distinct CLI programs)
-
-[`serverless` binary](https://github.com/serverless/serverless/blob/master/bin/serverless.js) serves as an entrance for three independent CLI programs. [Initial logic](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/bin/serverless.js#L25-L38) decides which CLI is actually run in current working directory context. Possible options are listed below
-
-### 1. Serverless Framework CLI
-
-Documented at [serverless.com/framework/docs](https://www.serverless.com/framework/docs/) of which code is hosted in this repository.
-
-See [Anatomy of the Serverless Framework CLI](#anatomy-of-the-serverless-framework-cli)
-
-### 2. (old v1 of) Serverless Components CLI
-
-_Deprecated old version of Serverless Components_
-
-Documented at [serverless/components/blob/v1](https://github.com/serverless/components/blob/v1/README.md), with code hosted at [serverless/cli](https://github.com/serverless/cli)
-
-### 3. Serverless Components CLI
-
-Documented at [serverless.com/components](https://www.serverless.com/components/), with code hosted at [serverless/components](https://github.com/serverless/components)
-
-## Anatomy of the Serverless Framework CLI
-
-### Overview
-
-Core flow of a process is managed through internal lifecycle engine, for which, internal (core) and external (user-made) plugins register supported CLI commands attributing to them ordered lifecycle events, plus hooks (event listeners) which are invoked when given event is triggered.
-
-#### Code organization
-
-Internals are configured with following modules.
-
-_Note: that each of these modules are considered private, there should be no dependency on them in external packages. Organization of files and internal API is subject to constant changes_
-
-##### Core classes
-
-Located in [lib/classes](https://github.com/serverless/serverless/tree/master/lib/classes). Core machinery with lifecycle engine internals
-
-##### Internal plugins
-
-Located in [lib/plugins](https://github.com/serverless/serverless/tree/master/lib/plugins). Register and implement core CLI commands with its events and attaches hooks for registered events
-
-##### Utils
-
-Located in [lib/utils](https://github.com/serverless/serverless/tree/master/lib/utils). General utils to be used in either core classes or internal plugins
-
-### Flow of a CLI process
-
-1. Setup essentials related to general error handling and eventual debugging ([bin/serverless.js#L40-L56](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/bin/serverless.js#L40-L56))
-1. Setup autocompletion (only if explicitly turned on) ([bin/serverless.js#L58-L61](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/bin/serverless.js#L58-L61))
-1. Propagate eventual analytics requests which weren't successful in previous runs ([bin/serverless.js#L64-L66](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/bin/serverless.js#L64-L66))
-1. Resolve location of eventual service configuration in current working directory ([lib/Serverless.js#L40-L42](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/lib/Serverless.js#L40-L42))
-1. Parse CLI arguments ([lib/Serverless.js#L67](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/lib/Serverless.js#L67))
-1. (If in service context) Read service configuration (just read, no normalization and variables resolution at this point) ([lib/classes/PluginManager.js#L60-L63](https://github.com/serverless/serverless/blob/master/lib/classes/PluginManager.js#L60-L63))
-1. Check whether there's a newer version of a Framework available, and notify user if there is ([Serverless.js#L79-L89](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/lib/Serverless.js#L79-L89))
-1. (If in service context) Normalize service configuration by filling defaults and ensuring core structure (no variables resolution yet) ([lib/classes/Service.js#L38-L53](https://github.com/serverless/serverless/blob/master/lib/classes/Service.js#L38-L53))
-1. Load all plugins (internal and those installed by user). They configure supported CLI commands, register events for lifecycle engine, and attach hooks to events eventually triggered by lifecycle engine ([lib/classes/PluginManager.js#L107-L116](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/lib/classes/PluginManager.js#L107-L116)
-1. If it's `sls --help` command, show help and abort ([lib/Serverless.js#L108-L110](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/lib/Serverless.js#L108-L110)
-1. (If in service context) Populate all variables in service configuration ([lib/Serverless.js#L118-L125](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/lib/Serverless.js#L118-L125))
-1. (if in service context) Validate service configuration ([lib/Serverless.js#L128](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/lib/Serverless.js#L128)
-1. Run lifecycle engine (emit all events that were registered for invoked CLI command) ([lib/classes/PluginManager.js#L509-L511](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/lib/classes/PluginManager.js#L509-L511))
-1. If execution ended with an error, log it in user friendly way ([lib/classes/Error.js#L68-L129](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/lib/classes/Error.js#L68-L129))

From 73cb9cdef7f7875b2eac85e49d3df4a823a83151 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 25 Oct 2021 17:03:23 +0200
Subject: [PATCH 0839/1101] chore: Set `frameworkVersion` to `v3` in templates
 and docs

---
 docs/providers/aws/guide/serverless.yml.md                      | 2 +-
 docs/providers/azure/guide/serverless.yml.md                    | 2 +-
 docs/providers/openwhisk/guide/serverless.yml.md                | 2 +-
 lib/plugins/create/templates/aliyun-nodejs/serverless.yml       | 2 +-
 .../create/templates/aws-alexa-typescript/serverless.yml        | 2 +-
 lib/plugins/create/templates/aws-clojure-gradle/serverless.yml  | 2 +-
 .../create/templates/aws-clojurescript-gradle/serverless.yml    | 2 +-
 lib/plugins/create/templates/aws-csharp/serverless.yml          | 2 +-
 lib/plugins/create/templates/aws-fsharp/serverless.yml          | 2 +-
 lib/plugins/create/templates/aws-go-dep/serverless.yml          | 2 +-
 lib/plugins/create/templates/aws-go-mod/serverless.yml          | 2 +-
 lib/plugins/create/templates/aws-go/serverless.yml              | 2 +-
 lib/plugins/create/templates/aws-groovy-gradle/serverless.yml   | 2 +-
 lib/plugins/create/templates/aws-java-gradle/serverless.yml     | 2 +-
 lib/plugins/create/templates/aws-java-maven/serverless.yml      | 2 +-
 .../create/templates/aws-kotlin-jvm-gradle-kts/serverless.yml   | 2 +-
 .../create/templates/aws-kotlin-jvm-gradle/serverless.yml       | 2 +-
 .../create/templates/aws-kotlin-jvm-maven/serverless.yml        | 2 +-
 .../create/templates/aws-kotlin-nodejs-gradle/serverless.yml    | 2 +-
 lib/plugins/create/templates/aws-nodejs-docker/serverless.yml   | 2 +-
 .../create/templates/aws-nodejs-ecma-script/serverless.yml      | 2 +-
 .../create/templates/aws-nodejs-typescript/serverless.ts        | 2 +-
 lib/plugins/create/templates/aws-nodejs/serverless.yml          | 2 +-
 lib/plugins/create/templates/aws-provided/serverless.yml        | 2 +-
 lib/plugins/create/templates/aws-python-docker/serverless.yml   | 2 +-
 lib/plugins/create/templates/aws-python/serverless.yml          | 2 +-
 lib/plugins/create/templates/aws-python3/serverless.yml         | 2 +-
 lib/plugins/create/templates/aws-ruby/serverless.yml            | 2 +-
 lib/plugins/create/templates/aws-scala-sbt/serverless.yml       | 2 +-
 lib/plugins/create/templates/azure-csharp/serverless.yml        | 2 +-
 .../create/templates/azure-nodejs-typescript/serverless.yml     | 2 +-
 lib/plugins/create/templates/azure-nodejs/serverless.yml        | 2 +-
 lib/plugins/create/templates/azure-python/serverless.yml        | 2 +-
 .../templates/cloudflare-workers-enterprise/serverless.yml      | 2 +-
 .../create/templates/cloudflare-workers-rust/serverless.yml     | 2 +-
 lib/plugins/create/templates/cloudflare-workers/serverless.yml  | 2 +-
 lib/plugins/create/templates/fn-go/serverless.yml               | 2 +-
 lib/plugins/create/templates/fn-nodejs/serverless.yml           | 2 +-
 lib/plugins/create/templates/google-go/serverless.yml           | 2 +-
 .../create/templates/google-nodejs-typescript/serverless.ts     | 2 +-
 lib/plugins/create/templates/google-nodejs/serverless.yml       | 2 +-
 lib/plugins/create/templates/google-python/serverless.yml       | 2 +-
 lib/plugins/create/templates/hello-world/serverless.yml         | 2 +-
 lib/plugins/create/templates/knative-docker/serverless.yml      | 2 +-
 lib/plugins/create/templates/kubeless-nodejs/serverless.yml     | 2 +-
 45 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 2d2428c0b71..e3112813b49 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -21,7 +21,7 @@ Here is a list of all available properties in `serverless.yml` when the provider
 
 service: myService
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 configValidationMode: warn # Modes for config validation. `error` throws an exception, `warn` logs error to console, `off` disables validation at all. The default is warn.
 enableLocalInstallationFallback: false # If set to 'true', guarantees that it's a locally (for service, in its node_modules) installed framework which processes the command
 useDotenv: false # If set to 'true', environment variables will be automatically loaded from .env files
diff --git a/docs/providers/azure/guide/serverless.yml.md b/docs/providers/azure/guide/serverless.yml.md
index 9b4f01c0b78..60fbce9825e 100644
--- a/docs/providers/azure/guide/serverless.yml.md
+++ b/docs/providers/azure/guide/serverless.yml.md
@@ -20,7 +20,7 @@ Here is a list of all available properties in `serverless.yml` when the provider
 # serverless.yml
 service: azure-nodejs
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: azure
diff --git a/docs/providers/openwhisk/guide/serverless.yml.md b/docs/providers/openwhisk/guide/serverless.yml.md
index 4e18c0de3ca..aa3257cb90f 100644
--- a/docs/providers/openwhisk/guide/serverless.yml.md
+++ b/docs/providers/openwhisk/guide/serverless.yml.md
@@ -21,7 +21,7 @@ Here is a list of all available properties in `serverless.yml` when the provider
 
 service: myService
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: openwhisk
diff --git a/lib/plugins/create/templates/aliyun-nodejs/serverless.yml b/lib/plugins/create/templates/aliyun-nodejs/serverless.yml
index 1f6e61f6c23..f4c2a9f0477 100644
--- a/lib/plugins/create/templates/aliyun-nodejs/serverless.yml
+++ b/lib/plugins/create/templates/aliyun-nodejs/serverless.yml
@@ -11,7 +11,7 @@
 
 service: aliyun-nodejs
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aliyun
diff --git a/lib/plugins/create/templates/aws-alexa-typescript/serverless.yml b/lib/plugins/create/templates/aws-alexa-typescript/serverless.yml
index 9f6b529bda6..9a442bac172 100644
--- a/lib/plugins/create/templates/aws-alexa-typescript/serverless.yml
+++ b/lib/plugins/create/templates/aws-alexa-typescript/serverless.yml
@@ -4,7 +4,7 @@ service: aws-alexa-typescript # NOTE: update this with your service name
 #app: your-app-name
 #org: your-org-name
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 plugins:
   - serverless-webpack
diff --git a/lib/plugins/create/templates/aws-clojure-gradle/serverless.yml b/lib/plugins/create/templates/aws-clojure-gradle/serverless.yml
index 59dfccdf514..3e1d0072546 100644
--- a/lib/plugins/create/templates/aws-clojure-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-clojure-gradle/serverless.yml
@@ -19,7 +19,7 @@ service: aws-clojure
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-clojurescript-gradle/serverless.yml b/lib/plugins/create/templates/aws-clojurescript-gradle/serverless.yml
index ec24cee9c45..d0dd74cd068 100644
--- a/lib/plugins/create/templates/aws-clojurescript-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-clojurescript-gradle/serverless.yml
@@ -18,7 +18,7 @@ service: aws-clojurescript-gradle
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-csharp/serverless.yml b/lib/plugins/create/templates/aws-csharp/serverless.yml
index db1152addec..1db8f795790 100644
--- a/lib/plugins/create/templates/aws-csharp/serverless.yml
+++ b/lib/plugins/create/templates/aws-csharp/serverless.yml
@@ -18,7 +18,7 @@ service: aws-csharp # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-fsharp/serverless.yml b/lib/plugins/create/templates/aws-fsharp/serverless.yml
index e61908b9ad6..2d38ca1dbee 100644
--- a/lib/plugins/create/templates/aws-fsharp/serverless.yml
+++ b/lib/plugins/create/templates/aws-fsharp/serverless.yml
@@ -18,7 +18,7 @@ service: aws-fsharp # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-go-dep/serverless.yml b/lib/plugins/create/templates/aws-go-dep/serverless.yml
index 9bc52954e45..3c6d7b3a62b 100644
--- a/lib/plugins/create/templates/aws-go-dep/serverless.yml
+++ b/lib/plugins/create/templates/aws-go-dep/serverless.yml
@@ -18,7 +18,7 @@ service: aws-go-dep # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-go-mod/serverless.yml b/lib/plugins/create/templates/aws-go-mod/serverless.yml
index fa19175cf9a..1cb94c913e6 100644
--- a/lib/plugins/create/templates/aws-go-mod/serverless.yml
+++ b/lib/plugins/create/templates/aws-go-mod/serverless.yml
@@ -18,7 +18,7 @@ service: aws-go-mod # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-go/serverless.yml b/lib/plugins/create/templates/aws-go/serverless.yml
index 69c6b1664cd..9b3afdcc5ca 100644
--- a/lib/plugins/create/templates/aws-go/serverless.yml
+++ b/lib/plugins/create/templates/aws-go/serverless.yml
@@ -18,7 +18,7 @@ service: aws-go # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-groovy-gradle/serverless.yml b/lib/plugins/create/templates/aws-groovy-gradle/serverless.yml
index f9df600be50..9b8dc4f2644 100644
--- a/lib/plugins/create/templates/aws-groovy-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-groovy-gradle/serverless.yml
@@ -18,7 +18,7 @@ service: aws-groovy-gradle # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-java-gradle/serverless.yml b/lib/plugins/create/templates/aws-java-gradle/serverless.yml
index c759fbe57dd..d464a74324c 100644
--- a/lib/plugins/create/templates/aws-java-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-java-gradle/serverless.yml
@@ -18,7 +18,7 @@ service: aws-java-gradle # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-java-maven/serverless.yml b/lib/plugins/create/templates/aws-java-maven/serverless.yml
index 2c21f8e40e5..d1d683687e9 100644
--- a/lib/plugins/create/templates/aws-java-maven/serverless.yml
+++ b/lib/plugins/create/templates/aws-java-maven/serverless.yml
@@ -18,7 +18,7 @@ service: aws-java-maven # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/serverless.yml b/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/serverless.yml
index de3003aece3..b9faff756b8 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/serverless.yml
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/serverless.yml
@@ -18,7 +18,7 @@ service: aws-kotlin-jvm-gradle # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-gradle/serverless.yml b/lib/plugins/create/templates/aws-kotlin-jvm-gradle/serverless.yml
index de8a5c9ce2e..e63a3abb667 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-gradle/serverless.yml
@@ -18,7 +18,7 @@ service: aws-kotlin-jvm-gradle # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-maven/serverless.yml b/lib/plugins/create/templates/aws-kotlin-jvm-maven/serverless.yml
index 791a1bc3a3c..d4508df9a34 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-maven/serverless.yml
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-maven/serverless.yml
@@ -18,7 +18,7 @@ service: aws-kotlin-jvm-maven # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-kotlin-nodejs-gradle/serverless.yml b/lib/plugins/create/templates/aws-kotlin-nodejs-gradle/serverless.yml
index 1914d6c417f..ff67ec5bc30 100644
--- a/lib/plugins/create/templates/aws-kotlin-nodejs-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-kotlin-nodejs-gradle/serverless.yml
@@ -18,7 +18,7 @@ service: aws-kotlin-nodejs-gradle # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-nodejs-docker/serverless.yml b/lib/plugins/create/templates/aws-nodejs-docker/serverless.yml
index 6f7fc6d8837..fe199f6d009 100644
--- a/lib/plugins/create/templates/aws-nodejs-docker/serverless.yml
+++ b/lib/plugins/create/templates/aws-nodejs-docker/serverless.yml
@@ -18,7 +18,7 @@ service: test-aws-nodejs-docker # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-nodejs-ecma-script/serverless.yml b/lib/plugins/create/templates/aws-nodejs-ecma-script/serverless.yml
index a88a6be4d4b..54867b4717f 100644
--- a/lib/plugins/create/templates/aws-nodejs-ecma-script/serverless.yml
+++ b/lib/plugins/create/templates/aws-nodejs-ecma-script/serverless.yml
@@ -3,7 +3,7 @@ service:
 # app and org for use with dashboard.serverless.com
 #app: your-app-name
 #org: your-org-name
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 # Add the serverless-webpack plugin
 plugins:
diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts
index 2960026f4b1..85c0b280165 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts
@@ -4,7 +4,7 @@ import hello from '@functions/hello';
 
 const serverlessConfiguration: AWS = {
   service: 'aws-nodejs-typescript',
-  frameworkVersion: '2',
+  frameworkVersion: '3',
   plugins: ['serverless-esbuild'],
   provider: {
     name: 'aws',
diff --git a/lib/plugins/create/templates/aws-nodejs/serverless.yml b/lib/plugins/create/templates/aws-nodejs/serverless.yml
index c528e4c3b04..a16c53d2381 100644
--- a/lib/plugins/create/templates/aws-nodejs/serverless.yml
+++ b/lib/plugins/create/templates/aws-nodejs/serverless.yml
@@ -18,7 +18,7 @@ service: aws-nodejs # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-provided/serverless.yml b/lib/plugins/create/templates/aws-provided/serverless.yml
index f95e23b65b5..ec70363d375 100644
--- a/lib/plugins/create/templates/aws-provided/serverless.yml
+++ b/lib/plugins/create/templates/aws-provided/serverless.yml
@@ -18,7 +18,7 @@ service: aws-provided # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-python-docker/serverless.yml b/lib/plugins/create/templates/aws-python-docker/serverless.yml
index 35fb6ce3b4d..42ccb1ed3a3 100644
--- a/lib/plugins/create/templates/aws-python-docker/serverless.yml
+++ b/lib/plugins/create/templates/aws-python-docker/serverless.yml
@@ -18,7 +18,7 @@ service: test-aws-python-docker # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-python/serverless.yml b/lib/plugins/create/templates/aws-python/serverless.yml
index 29c0d0a873f..f9145e9cc6e 100644
--- a/lib/plugins/create/templates/aws-python/serverless.yml
+++ b/lib/plugins/create/templates/aws-python/serverless.yml
@@ -18,7 +18,7 @@ service: aws-python # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-python3/serverless.yml b/lib/plugins/create/templates/aws-python3/serverless.yml
index 27969433518..95f6e337dd1 100644
--- a/lib/plugins/create/templates/aws-python3/serverless.yml
+++ b/lib/plugins/create/templates/aws-python3/serverless.yml
@@ -18,7 +18,7 @@ service: aws-python3 # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-ruby/serverless.yml b/lib/plugins/create/templates/aws-ruby/serverless.yml
index 07287df814d..3347eb5f21f 100644
--- a/lib/plugins/create/templates/aws-ruby/serverless.yml
+++ b/lib/plugins/create/templates/aws-ruby/serverless.yml
@@ -18,7 +18,7 @@ service: aws-ruby # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/aws-scala-sbt/serverless.yml b/lib/plugins/create/templates/aws-scala-sbt/serverless.yml
index d027e1b4f37..b52b3e7411d 100644
--- a/lib/plugins/create/templates/aws-scala-sbt/serverless.yml
+++ b/lib/plugins/create/templates/aws-scala-sbt/serverless.yml
@@ -18,7 +18,7 @@ service: aws-scala-sbt # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
diff --git a/lib/plugins/create/templates/azure-csharp/serverless.yml b/lib/plugins/create/templates/azure-csharp/serverless.yml
index 992b59110ba..98227293224 100644
--- a/lib/plugins/create/templates/azure-csharp/serverless.yml
+++ b/lib/plugins/create/templates/azure-csharp/serverless.yml
@@ -15,7 +15,7 @@ service: azure-dotnet # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: azure
diff --git a/lib/plugins/create/templates/azure-nodejs-typescript/serverless.yml b/lib/plugins/create/templates/azure-nodejs-typescript/serverless.yml
index 3d551ae68b8..8bc88e436f9 100644
--- a/lib/plugins/create/templates/azure-nodejs-typescript/serverless.yml
+++ b/lib/plugins/create/templates/azure-nodejs-typescript/serverless.yml
@@ -15,7 +15,7 @@ service: azure-nodejs-typescript # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 custom:
   webpack:
diff --git a/lib/plugins/create/templates/azure-nodejs/serverless.yml b/lib/plugins/create/templates/azure-nodejs/serverless.yml
index 733d86ab345..73ad9b7ad7a 100644
--- a/lib/plugins/create/templates/azure-nodejs/serverless.yml
+++ b/lib/plugins/create/templates/azure-nodejs/serverless.yml
@@ -15,7 +15,7 @@ service: azure-nodejs # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: azure
diff --git a/lib/plugins/create/templates/azure-python/serverless.yml b/lib/plugins/create/templates/azure-python/serverless.yml
index 16ca718f32b..c438a088a29 100644
--- a/lib/plugins/create/templates/azure-python/serverless.yml
+++ b/lib/plugins/create/templates/azure-python/serverless.yml
@@ -15,7 +15,7 @@ service: azure-python # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: azure
diff --git a/lib/plugins/create/templates/cloudflare-workers-enterprise/serverless.yml b/lib/plugins/create/templates/cloudflare-workers-enterprise/serverless.yml
index 9023cbca4b8..8c6e80e91d0 100644
--- a/lib/plugins/create/templates/cloudflare-workers-enterprise/serverless.yml
+++ b/lib/plugins/create/templates/cloudflare-workers-enterprise/serverless.yml
@@ -1,6 +1,6 @@
 service: hello-world # NOTE: update this with your service name
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: cloudflare
diff --git a/lib/plugins/create/templates/cloudflare-workers-rust/serverless.yml b/lib/plugins/create/templates/cloudflare-workers-rust/serverless.yml
index 2e99fc83f6d..7d58ebdca75 100644
--- a/lib/plugins/create/templates/cloudflare-workers-rust/serverless.yml
+++ b/lib/plugins/create/templates/cloudflare-workers-rust/serverless.yml
@@ -1,6 +1,6 @@
 service: hello-world # NOTE: update this with your service name
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: cloudflare
diff --git a/lib/plugins/create/templates/cloudflare-workers/serverless.yml b/lib/plugins/create/templates/cloudflare-workers/serverless.yml
index d5ed93c7107..59986de8c6f 100644
--- a/lib/plugins/create/templates/cloudflare-workers/serverless.yml
+++ b/lib/plugins/create/templates/cloudflare-workers/serverless.yml
@@ -1,6 +1,6 @@
 service: hello-world # NOTE: update this with your service name
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: cloudflare
diff --git a/lib/plugins/create/templates/fn-go/serverless.yml b/lib/plugins/create/templates/fn-go/serverless.yml
index cf46dfb403e..6f393ec5e3e 100644
--- a/lib/plugins/create/templates/fn-go/serverless.yml
+++ b/lib/plugins/create/templates/fn-go/serverless.yml
@@ -7,7 +7,7 @@
 # The `service` block is the name of the service
 service: hello-world # NOTE: update this with your service name
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 # The `provider` block defines where your service will be deployed
 provider:
diff --git a/lib/plugins/create/templates/fn-nodejs/serverless.yml b/lib/plugins/create/templates/fn-nodejs/serverless.yml
index f5e3780bbbf..f9780f0257d 100644
--- a/lib/plugins/create/templates/fn-nodejs/serverless.yml
+++ b/lib/plugins/create/templates/fn-nodejs/serverless.yml
@@ -7,7 +7,7 @@
 # The `service` block is the name of the service
 service: hello-world # NOTE: update this with your service name
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 # The `provider` block defines where your service will be deployed
 provider:
diff --git a/lib/plugins/create/templates/google-go/serverless.yml b/lib/plugins/create/templates/google-go/serverless.yml
index f1165bd8e9c..871857b4243 100644
--- a/lib/plugins/create/templates/google-go/serverless.yml
+++ b/lib/plugins/create/templates/google-go/serverless.yml
@@ -10,7 +10,7 @@ provider:
   # the path to the credentials file needs to be absolute
   credentials: ~/.gcloud/keyfile.json
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 plugins:
   - serverless-google-cloudfunctions
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/serverless.ts b/lib/plugins/create/templates/google-nodejs-typescript/serverless.ts
index 4cc31920b07..4d7e53d8617 100644
--- a/lib/plugins/create/templates/google-nodejs-typescript/serverless.ts
+++ b/lib/plugins/create/templates/google-nodejs-typescript/serverless.ts
@@ -2,7 +2,7 @@ import { functions } from '@functions/config';
 
 const serverlessConfiguration = {
   service: 'gcf-nodejs-typescript-template', // NOTE: Don't put the word "google" in here
-  frameworkVersion: '2',
+  frameworkVersion: '3',
   custom: {
     webpack: {
       webpackConfig: './webpack.config.js',
diff --git a/lib/plugins/create/templates/google-nodejs/serverless.yml b/lib/plugins/create/templates/google-nodejs/serverless.yml
index ed58e9b4d82..b66bbccf32b 100644
--- a/lib/plugins/create/templates/google-nodejs/serverless.yml
+++ b/lib/plugins/create/templates/google-nodejs/serverless.yml
@@ -12,7 +12,7 @@ provider:
   # the path to the credentials file needs to be absolute
   credentials: ~/.gcloud/keyfile.json
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 plugins:
   - serverless-google-cloudfunctions
diff --git a/lib/plugins/create/templates/google-python/serverless.yml b/lib/plugins/create/templates/google-python/serverless.yml
index 8d76f944f3e..0eec58449e4 100644
--- a/lib/plugins/create/templates/google-python/serverless.yml
+++ b/lib/plugins/create/templates/google-python/serverless.yml
@@ -12,7 +12,7 @@ provider:
   # the path to the credentials file needs to be absolute
   credentials: ~/.gcloud/keyfile.json
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 plugins:
   - serverless-google-cloudfunctions
 
diff --git a/lib/plugins/create/templates/hello-world/serverless.yml b/lib/plugins/create/templates/hello-world/serverless.yml
index 572e28eb625..48623f3dd87 100644
--- a/lib/plugins/create/templates/hello-world/serverless.yml
+++ b/lib/plugins/create/templates/hello-world/serverless.yml
@@ -7,7 +7,7 @@
 # The `service` block is the name of the service
 service: serverless-hello-world
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 # The `provider` block defines where your service will be deployed
 provider:
diff --git a/lib/plugins/create/templates/knative-docker/serverless.yml b/lib/plugins/create/templates/knative-docker/serverless.yml
index c07627325d3..ca6d58cdc52 100644
--- a/lib/plugins/create/templates/knative-docker/serverless.yml
+++ b/lib/plugins/create/templates/knative-docker/serverless.yml
@@ -1,6 +1,6 @@
 service: knative
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: knative
diff --git a/lib/plugins/create/templates/kubeless-nodejs/serverless.yml b/lib/plugins/create/templates/kubeless-nodejs/serverless.yml
index bbfec9a816b..5835e563bd1 100644
--- a/lib/plugins/create/templates/kubeless-nodejs/serverless.yml
+++ b/lib/plugins/create/templates/kubeless-nodejs/serverless.yml
@@ -9,7 +9,7 @@
 # Update the service name below with your own service name
 service: capitalize
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 # Please ensure the serverless-kubeless provider plugin is installed globally.
 # $ npm install -g serverless-kubeless

From 13e8ca6f8307089fcd22dafa2055de336f6bb4b4 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 3 Nov 2021 09:38:53 +0100
Subject: [PATCH 0840/1101] feat: Remove support for Node v10

BREAKING CHANGE: Node in versions lower than 12 is no longer supported
---
 .github/workflows/integrate.yml             | 36 ++-------------------
 .github/workflows/validate.yml              | 36 +--------------------
 bin/serverless.js                           | 23 ++++++-------
 package.json                                |  4 +--
 test/unit/lib/classes/PluginManager.test.js |  2 --
 5 files changed, 14 insertions(+), 87 deletions(-)

diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
index 0b86cbf0a52..b941e78617c 100644
--- a/.github/workflows/integrate.yml
+++ b/.github/workflows/integrate.yml
@@ -152,38 +152,6 @@ jobs:
       - name: Push coverage
         run: npx codecov
 
-  linuxNode10:
-    name: '[Linux] Node.js v10: Unit tests'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Retrieve dependencies from cache
-        id: cacheNpm
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.npm
-            node_modules
-          key: npm-v10-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
-          restore-keys: npm-v10-${{ runner.os }}-${{ github.ref }}-
-
-      - name: Install Node.js and npm
-        uses: actions/setup-node@v1
-        with:
-          node-version: 10.x
-
-      - name: Install dependencies
-        if: steps.cacheNpm.outputs.cache-hit != 'true'
-        run: |
-          npm update --no-save
-          npm update --save-dev --no-save
-      - name: Unit tests
-        # Some tests depend on TTY support, which is missing in GA runner
-        # Workaround taken from https://github.com/actions/runner/issues/241#issuecomment-577360161
-        run: script -e -c "npm test -- -b"
-
   linuxNode4:
     name: '[Linux] Node.js v4: Node version validation test'
     runs-on: ubuntu-latest
@@ -197,12 +165,12 @@ jobs:
           node-version: 4.x
 
       - name: Node version validation test
-        run: ./bin/serverless.js | grep -q "Initialization error"
+        run: ./bin/serverless.js 2>&1 | grep -q "does not support"
 
   integrate:
     name: Integrate
     runs-on: ubuntu-latest
-    needs: [linuxNode16, windowsNode16, linuxNode14, linuxNode12, linuxNode10, linuxNode4]
+    needs: [linuxNode16, windowsNode16, linuxNode14, linuxNode12, linuxNode4]
     timeout-minutes: 30 # Default is 360
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index a187f87c0d8..269c2766ba8 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -174,40 +174,6 @@ jobs:
       - name: Push coverage
         run: npx codecov
 
-  linuxNode10:
-    name: '[Linux] Node.js v10: Unit tests'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Retrieve dependencies from cache
-        id: cacheNpm
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.npm
-            node_modules
-          key: npm-v10-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
-          restore-keys: |
-            npm-v10-${{ runner.os }}-${{ github.ref }}-
-            npm-v10-${{ runner.os }}-refs/heads/master-
-
-      - name: Install Node.js and npm
-        uses: actions/setup-node@v1
-        with:
-          node-version: 10.x
-
-      - name: Install dependencies
-        if: steps.cacheNpm.outputs.cache-hit != 'true'
-        run: |
-          npm update --no-save
-          npm update --save-dev --no-save
-      - name: Unit tests
-        # Some tests depend on TTY support, which is missing in GA runner
-        # Workaround taken from https://github.com/actions/runner/issues/241#issuecomment-577360161
-        run: script -e -c "npm test -- -b"
-
   linuxNode4:
     name: '[Linux] Node.js v4: Node version validation test'
     runs-on: ubuntu-latest
@@ -221,4 +187,4 @@ jobs:
           node-version: 4.x
 
       - name: Node version validation test
-        run: ./bin/serverless.js | grep -q "Initialization error"
+        run: ./bin/serverless.js 2>&1 | grep -q "does not support"
diff --git a/bin/serverless.js b/bin/serverless.js
index 399016d5b16..0c3799cea97 100755
--- a/bin/serverless.js
+++ b/bin/serverless.js
@@ -10,21 +10,16 @@
 EvalError.$serverlessCommandStartTime = process.hrtime();
 
 const nodeVersion = Number(process.version.split('.')[0].slice(1));
+const minimumSupportedVersion = 12;
 
-if (nodeVersion < 12) {
-  if (nodeVersion >= 10) {
-    require('../lib/utils/logDeprecation')(
-      'OUTDATED_NODEJS',
-      'Support for Node.js versions below v12 will be dropped with next major release. Please upgrade at https://nodejs.org/en/'
-    );
-  } else {
-    const serverlessVersion = Number(require('../package.json').version.split('.')[0]);
-    process.stdout.write(
-      `Serverless: \x1b[91mInitialization error: Node.js v${nodeVersion} is not supported by ` +
-        `Serverless Framework v${serverlessVersion}. Please upgrade\x1b[39m\n`
-    );
-    process.exit(1);
-  }
+if (nodeVersion < minimumSupportedVersion) {
+  const serverlessVersion = Number(require('../package.json').version.split('.')[0]);
+  process.stderr.write(
+    `\x1b[91mError: Serverless Framework v${serverlessVersion} does not support ` +
+      `Node.js v${nodeVersion}. Please upgrade Node.js to the latest ` +
+      `LTS version (v${minimumSupportedVersion} is a minimum supported version)\x1b[39m\n`
+  );
+  process.exit(1);
 }
 
 if (require('../lib/utils/isStandaloneExecutable')) {
diff --git a/package.json b/package.json
index 2c5094a1b1a..21cf5301d29 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
     "xml2js": "^0.4.23"
   },
   "eslintConfig": {
-    "extends": "@serverless/eslint-config/node/10",
+    "extends": "@serverless/eslint-config/node",
     "root": true,
     "overrides": [
       {
@@ -218,7 +218,7 @@
     "test:isolated": "mocha-isolated \"test/unit/**/*.test.js\""
   },
   "engines": {
-    "node": ">=10.0"
+    "node": ">=12.0"
   },
   "license": "MIT"
 }
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
index 5e24f99effa..895fb83f005 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/PluginManager.test.js
@@ -1863,8 +1863,6 @@ describe('PluginManager', () => {
 
     before(() => {
       env = resolveAwsEnv();
-      // Test may be run against deprecated Node.js versions
-      env.SLS_DEPRECATION_DISABLE = 'OUTDATED_NODEJS';
     });
 
     beforeEach(() => {

From 6a659f1b201e0e764814cbe2f85ca7a0aa65454f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 8 Nov 2021 17:04:59 +0100
Subject: [PATCH 0841/1101] refactor: Upgrade `@serverless/utils` to v6

---
 .../deploy-progress-plugin.js                 | 36 -------------
 lib/cli/interactive-setup/deploy.js           | 54 ++-----------------
 package.json                                  |  2 +-
 test/integrationBasic.test.js                 |  2 +-
 test/unit/commands/doctor.test.js             |  1 -
 test/unit/lib/classes/PluginManager.test.js   |  4 ++
 test/unit/scripts/serverless.test.js          | 22 ++++----
 7 files changed, 22 insertions(+), 99 deletions(-)
 delete mode 100644 lib/cli/interactive-setup/deploy-progress-plugin.js

diff --git a/lib/cli/interactive-setup/deploy-progress-plugin.js b/lib/cli/interactive-setup/deploy-progress-plugin.js
deleted file mode 100644
index c058c45f9fe..00000000000
--- a/lib/cli/interactive-setup/deploy-progress-plugin.js
+++ /dev/null
@@ -1,36 +0,0 @@
-'use strict';
-
-const cliProgressFooter = require('cli-progress-footer');
-const chalk = require('chalk');
-
-class InteractiveDeployProgress {
-  constructor(serverless) {
-    this.serverless = serverless;
-    this.progress = cliProgressFooter({ overrideStdout: false, redirectStderr: false });
-    this.progress.shouldAddProgressAnimationPrefix = true;
-
-    this.hooks = {
-      'before:deploy:deploy': async () => {
-        this.progress.updateProgress('Deploying your project. This might take a few minutes...\n');
-      },
-      'deploy:finalize': async () => {
-        this.progress.updateProgress('');
-        this.progress.writeStdout(chalk.green('\nDeployment succesful\n'));
-      },
-
-      'package:initialize': async () => {
-        this.progress.updateProgress('Packaging your project...\n');
-      },
-      'package:finalize': async () => {
-        this.progress.updateProgress('');
-        this.progress.writeStdout(chalk.green('\nPackaging succesful\n'));
-      },
-    };
-  }
-
-  handleError() {
-    this.progress.updateProgress('');
-  }
-}
-
-module.exports = InteractiveDeployProgress;
diff --git a/lib/cli/interactive-setup/deploy.js b/lib/cli/interactive-setup/deploy.js
index e1c281c1e19..f821a29c352 100644
--- a/lib/cli/interactive-setup/deploy.js
+++ b/lib/cli/interactive-setup/deploy.js
@@ -6,13 +6,10 @@ const { legacy, writeText, style } = require('@serverless/utils/log');
 const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-history');
 const { doesServiceInstanceHaveLinkedProvider } = require('./utils');
 const _ = require('lodash');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const { getDashboardInteractUrl } = require('@serverless/dashboard-plugin/lib/dashboard');
 const AWS = require('aws-sdk');
 const isAuthenticated = require('@serverless/dashboard-plugin/lib/isAuthenticated');
 
-const isModernStyle = Number(process.env.SLS_DEV_LOG_MODE) & 1;
-
 const printMessage = ({
   serviceName,
   hasBeenDeployed,
@@ -102,15 +99,6 @@ const printMessage = ({
   );
 };
 
-const configurePlugin = (serverless, originalStdWrite) => {
-  serverless.pluginManager.addPlugin(require('./deploy-progress-plugin'));
-  const interactivePlugin = serverless.pluginManager.plugins.find(
-    (plugin) => plugin.constructor.name === 'InteractiveDeployProgress'
-  );
-  interactivePlugin.progress._writeOriginalStdout = (data) => originalStdWrite(data);
-  return interactivePlugin;
-};
-
 module.exports = {
   async isApplicable(context) {
     const { configuration, serviceDir, options } = context;
@@ -172,43 +160,11 @@ module.exports = {
       options: {},
     });
 
-    let interactiveOutputPlugin;
-
-    if (isModernStyle) {
-      // With modern logs do not hijack Framework output
-      //
-      // This is a hack to disable local fallback for interactive setup
-      // After https://github.com/serverless/serverless/issues/1720 is addressed
-      // We can change the approach to deployment in interactive setup and remove this hack
-      serverless.isLocallyInstalled = true;
-      await serverless.init();
-      delete serverless.isLocallyInstalled;
-      await serverless.run();
-      context.serverless = serverless;
-    } else {
-      try {
-        await overrideStdoutWrite(
-          () => {},
-          async (originalStdWrite) => {
-            // This is a hack to disable local fallback for interactive setup
-            // After https://github.com/serverless/serverless/issues/1720 is addressed
-            // We can change the approach to deployment in interactive setup and remove this hack
-            serverless.isLocallyInstalled = true;
-            await serverless.init();
-            interactiveOutputPlugin = configurePlugin(serverless, originalStdWrite);
-            // Remove previously set `isLocallyInstalled` as it was only needed to avoid local fallback in `init()`
-            delete serverless.isLocallyInstalled;
-            await serverless.run();
-            context.serverless = serverless;
-          }
-        );
-      } catch (err) {
-        if (interactiveOutputPlugin) {
-          interactiveOutputPlugin.handleError();
-        }
-        throw err;
-      }
-    }
+    serverless.isLocallyInstalled = true;
+    await serverless.init();
+    delete serverless.isLocallyInstalled;
+    await serverless.run();
+    context.serverless = serverless;
 
     printMessage({
       initialContext: initial,
diff --git a/package.json b/package.json
index 21cf5301d29..7134a73ec21 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@serverless/components": "^3.18.2",
     "@serverless/dashboard-plugin": "^5.5.4",
     "@serverless/platform-client": "^4.3.0",
-    "@serverless/utils": "^5.20.3",
+    "@serverless/utils": "^6.0.0",
     "ajv": "^6.12.6",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.3.0",
diff --git a/test/integrationBasic.test.js b/test/integrationBasic.test.js
index b9ada1425cf..f18c4442f00 100644
--- a/test/integrationBasic.test.js
+++ b/test/integrationBasic.test.js
@@ -111,7 +111,7 @@ describe('Service Lifecyle Integration Test', function () {
       spawnOptions
     );
     const output = stripAnsi(listDeploys.toString());
-    const match = output.match(new RegExp('Datetime: (.+)'));
+    const match = output.match(new RegExp('Timestamp: (.+)'));
     if (match) {
       timestamp = match[1];
     }
diff --git a/test/unit/commands/doctor.test.js b/test/unit/commands/doctor.test.js
index c351569d9a7..7a5fb82efbb 100644
--- a/test/unit/commands/doctor.test.js
+++ b/test/unit/commands/doctor.test.js
@@ -12,7 +12,6 @@ const serverlessPath = path.resolve(__dirname, '../../../scripts/serverless.js')
 describe('test/unit/commands/doctor.test.js', async () => {
   before(() => {
     process.env.SLS_DEPRECATION_NOTIFICATION_MODE = 'warn:summary';
-    process.env.SLS_DEV_LOG_MODE = '3';
   });
 
   it('should print health status after command which triggered deprecation', async () => {
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
index 895fb83f005..16223dc1d86 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/PluginManager.test.js
@@ -120,6 +120,10 @@ describe('PluginManager', () => {
                 },
               },
             },
+            other: {
+              usage: 'Deploy to other infrastructure',
+              lifecycleEvents: ['resources', 'functions'],
+            },
           },
         },
       };
diff --git a/test/unit/scripts/serverless.test.js b/test/unit/scripts/serverless.test.js
index 064afd69de7..c9487e5b641 100644
--- a/test/unit/scripts/serverless.test.js
+++ b/test/unit/scripts/serverless.test.js
@@ -27,7 +27,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
         })
       ).stdoutBuffer
     );
-    expect(output).to.include('You can run commands with');
+    expect(output).to.include('serverless <command> <options>');
   });
 
   it('should report with an error invalid configuration', async () => {
@@ -38,7 +38,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
       throw new Error('Unexpected');
     } catch (error) {
       expect(error.code).to.equal(1);
-      expect(String(error.stdoutBuffer)).to.include('Your Environment Information');
+      expect(String(error.stdoutBuffer)).to.include('Environment: ');
     }
   });
 
@@ -50,7 +50,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
       throw new Error('Unexpected');
     } catch (error) {
       expect(error.code).to.equal(1);
-      expect(String(error.stdoutBuffer)).to.include('Your Environment Information');
+      expect(String(error.stdoutBuffer)).to.include('Environment: ');
     }
   });
 
@@ -62,7 +62,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
       throw new Error('Unexpected');
     } catch (error) {
       expect(error.code).to.equal(1);
-      expect(String(error.stdoutBuffer)).to.include('Your Environment Information');
+      expect(String(error.stdoutBuffer)).to.include('Environment: ');
     }
   });
 
@@ -72,9 +72,9 @@ describe('test/unit/scripts/serverless.test.js', () => {
         await spawn('node', [serverlessPath, '--help'], {
           cwd: (await programmaticFixturesEngine.setup('locallyInstalledServerless')).servicePath,
         })
-      ).stdoutBuffer
+      ).stderrBuffer
     );
-    expect(output).to.include('Running "serverless" installed locally');
+    expect(output).to.include('Running "serverless" from node_modules');
   });
 
   it('should handle no service related commands', async () => {
@@ -85,7 +85,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
         })
       ).stdoutBuffer
     );
-    expect(output).to.include('To install a plugin run');
+    expect(output).to.include('Install a plugin by running');
   });
 
   it('should resolve variables', async () => {
@@ -222,12 +222,12 @@ describe('test/unit/scripts/serverless.test.js', () => {
         })
       ).stdoutBuffer
     );
-    expect(output).to.include('Documentation: http://slss.io/docs');
+    expect(output).to.include('serverless <command> <options>');
   });
 
   it('should print general --help to stdout', async () => {
     const output = String((await spawn('node', [serverlessPath, '--help'])).stdoutBuffer);
-    expect(output).to.include('Documentation: http://slss.io/docs');
+    expect(output).to.include('serverless <command> <options>');
   });
 
   it('should print command --help to stdout', async () => {
@@ -249,7 +249,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
       (await spawn('node', [serverlessPath, '--help-interactive'])).stdoutBuffer
     );
     expect(output).to.include('Interactive CLI');
-    expect(output).to.not.include('General Commands');
+    expect(output).to.not.include('Main commands');
   });
 
   it('should show help when running container command', async () => {
@@ -257,7 +257,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
     const output = stripAnsi(
       String((await spawn('node', [serverlessPath, 'plugin'])).stdoutBuffer)
     );
-    expect(output).to.include('plugin install .......');
+    expect(output).to.include('plugin install');
   });
 
   it('should crash in required option is missing', async () => {

From f4e499b4bfcc4a76279fef24734cb5351d9a923e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 8 Nov 2021 17:12:54 +0100
Subject: [PATCH 0842/1101] chore: Upgrade `@serverless/dashboard-plugin` to v6

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7134a73ec21..75155b9c7b5 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "@serverless/cli": "^1.6.0",
     "@serverless/components": "^3.18.2",
-    "@serverless/dashboard-plugin": "^5.5.4",
+    "@serverless/dashboard-plugin": "^6.0.0",
     "@serverless/platform-client": "^4.3.0",
     "@serverless/utils": "^6.0.0",
     "ajv": "^6.12.6",

From b30a2277a78ee8a5ebcf82c4921d2ac26b5bbfaa Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 10 Nov 2021 16:08:18 +0100
Subject: [PATCH 0843/1101] test: Upgrade `@serverless/test` to v9

---
 package.json                                  |    2 +-
 test/unit/lib/classes/Error.test.js           |   18 -
 test/unit/lib/classes/Variables.test.js       | 2915 -----------------
 test/unit/lib/cli/handle-error.test.js        |  144 +-
 .../interactive-setup/aws-credentials.test.js |   88 +-
 .../interactive-setup/dashboard-login.test.js |   23 +-
 .../dashboard-set-org.test.js                 |  274 +-
 .../lib/cli/interactive-setup/deploy.test.js  |   92 +-
 .../lib/cli/interactive-setup/service.test.js |   46 -
 test/unit/lib/cli/render-help/command.test.js |   34 +-
 test/unit/lib/cli/render-help/general.test.js |   14 +-
 test/unit/lib/cli/render-help/index.test.js   |   56 +-
 .../cli/render-help/interactive-setup.test.js |   14 +-
 test/unit/lib/cli/render-help/options.test.js |   37 +-
 test/unit/lib/cli/render-version.test.js      |   12 +-
 test/unit/lib/configSchema.test.js            |    4 +-
 .../aws/deploy/lib/checkForChanges.test.js    |   25 -
 .../aws/deploy/lib/extendedValidate.test.js   |   44 -
 .../lib/plugins/aws/deployFunction.test.js    |   25 +-
 test/unit/lib/plugins/aws/invoke.test.js      |    4 +-
 .../lib/plugins/aws/invokeLocal/index.test.js |   62 +-
 .../aws/package/compile/functions.test.js     |    3 +-
 test/unit/lib/plugins/aws/provider.test.js    |   35 -
 .../unit/lib/plugins/aws/remove/index.test.js |   15 -
 test/unit/lib/plugins/print.test.js           |    4 +-
 test/unit/lib/utils/logDeprecation.test.js    |  137 +-
 26 files changed, 241 insertions(+), 3886 deletions(-)
 delete mode 100644 test/unit/lib/classes/Error.test.js
 delete mode 100644 test/unit/lib/classes/Variables.test.js

diff --git a/package.json b/package.json
index 75155b9c7b5..08c4e76df0e 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
   "devDependencies": {
     "@commitlint/cli": "^12.1.4",
     "@serverless/eslint-config": "^4.0.0",
-    "@serverless/test": "^8.8.0",
+    "@serverless/test": "^9.0.0",
     "adm-zip": "^0.5.9",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
diff --git a/test/unit/lib/classes/Error.test.js b/test/unit/lib/classes/Error.test.js
deleted file mode 100644
index ddd47cbeb10..00000000000
--- a/test/unit/lib/classes/Error.test.js
+++ /dev/null
@@ -1,18 +0,0 @@
-'use strict';
-
-const expect = require('chai').expect;
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
-const { logWarning } = require('../../../../lib/classes/Error');
-
-describe('#logWarning()', () => {
-  it('should log warning and proceed', () => {
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => logWarning('a message')
-    );
-
-    expect(stdoutData).to.have.string('Serverless Warning');
-    expect(stdoutData).to.have.string('a message');
-  });
-});
diff --git a/test/unit/lib/classes/Variables.test.js b/test/unit/lib/classes/Variables.test.js
deleted file mode 100644
index 2bf500195f4..00000000000
--- a/test/unit/lib/classes/Variables.test.js
+++ /dev/null
@@ -1,2915 +0,0 @@
-'use strict';
-
-/* eslint-disable no-unused-expressions */
-
-const BbPromise = require('bluebird');
-const chai = require('chai');
-const jc = require('json-cycle');
-const os = require('os');
-const path = require('path');
-const proxyquire = require('proxyquire');
-const sinon = require('sinon');
-const yaml = require('js-yaml');
-const _ = require('lodash');
-const overrideEnv = require('process-utils/override-env');
-
-const AwsProvider = require('../../../../lib/plugins/aws/provider');
-const fse = require('fs-extra');
-const Serverless = require('../../../../lib/Serverless');
-const slsError = require('../../../../lib/classes/Error');
-const Utils = require('../../../../lib/classes/Utils');
-const Variables = require('../../../../lib/classes/Variables');
-const ServerlessError = require('../../../../lib/serverless-error');
-const { getTmpDirPath } = require('../../../utils/fs');
-const skipOnDisabledSymlinksInWindows = require('@serverless/test/skip-on-disabled-symlinks-in-windows');
-const runServerless = require('../../../utils/run-serverless');
-
-BbPromise.longStackTraces(true);
-
-chai.use(require('chai-as-promised'));
-chai.use(require('sinon-chai'));
-
-chai.should();
-
-const expect = chai.expect;
-
-describe('Variables', () => {
-  let serverless;
-  let restoreEnv;
-
-  beforeEach(() => {
-    ({ restoreEnv } = overrideEnv());
-    serverless = new Serverless({
-      commands: ['print'],
-      options: {},
-      serviceDir: process.cwd(),
-      configuration: {},
-      configurationFilename: 'serverless.yml',
-    });
-  });
-
-  const afterCallback = () => restoreEnv();
-  afterEach(afterCallback);
-
-  describe('#constructor()', () => {
-    it('should attach serverless instance', () => {
-      const variablesInstance = new Variables(serverless);
-      expect(variablesInstance.serverless).to.equal(serverless);
-    });
-    it('should not set variableSyntax in constructor', () => {
-      const variablesInstance = new Variables(serverless);
-      expect(variablesInstance.variableSyntax).to.be.undefined;
-    });
-  });
-
-  describe('#loadVariableSyntax()', () => {
-    it('should set variableSyntax', () => {
-      // eslint-disable-next-line no-template-curly-in-string
-      serverless.service.provider.variableSyntax = '\\${{([ ~:a-zA-Z0-9._@\'",\\-\\/\\(\\)*?]+?)}}';
-      serverless.variables.loadVariableSyntax();
-      expect(serverless.variables.variableSyntax).to.be.a('RegExp');
-    });
-  });
-
-  describe('#populateService()', () => {
-    it('should remove problematic attributes bofore calling populateObjectImpl with the service', () => {
-      const prepopulateServiceStub = sinon
-        .stub(serverless.variables, 'prepopulateService')
-        .returns(BbPromise.resolve());
-      const populateObjectStub = sinon
-        .stub(serverless.variables, 'populateObjectImpl')
-        .callsFake((val) => {
-          expect(val).to.equal(serverless.service);
-          expect(val.provider.variableSyntax).to.be.undefined;
-          expect(val.serverless).to.be.undefined;
-          return BbPromise.resolve();
-        });
-      return serverless.variables
-        .populateService()
-        .should.be.fulfilled.then()
-        .finally(() => {
-          prepopulateServiceStub.restore();
-          populateObjectStub.restore();
-        });
-    });
-    it('should clear caches and remaining state *before* [pre]populating service', () => {
-      const prepopulateServiceStub = sinon
-        .stub(serverless.variables, 'prepopulateService')
-        .callsFake((val) => {
-          expect(serverless.variables.deep).to.eql([]);
-          expect(serverless.variables.tracker.getAll()).to.eql([]);
-          return BbPromise.resolve(val);
-        });
-      const populateObjectStub = sinon
-        .stub(serverless.variables, 'populateObjectImpl')
-        .callsFake((val) => {
-          expect(serverless.variables.deep).to.eql([]);
-          expect(serverless.variables.tracker.getAll()).to.eql([]);
-          return BbPromise.resolve(val);
-        });
-      serverless.variables.deep.push('${foo:}');
-      const prms = BbPromise.resolve('foo');
-      serverless.variables.tracker.add('foo:', prms, '${foo:}');
-      prms.state = 'resolved';
-      return serverless.variables
-        .populateService()
-        .should.be.fulfilled.then()
-        .finally(() => {
-          prepopulateServiceStub.restore();
-          populateObjectStub.restore();
-        });
-    });
-    it('should clear caches and remaining *after* [pre]populating service', () => {
-      const prepopulateServiceStub = sinon
-        .stub(serverless.variables, 'prepopulateService')
-        .callsFake((val) => {
-          serverless.variables.deep.push('${foo:}');
-          const promise = BbPromise.resolve(val);
-          serverless.variables.tracker.add('foo:', promise, '${foo:}');
-          promise.state = 'resolved';
-          return BbPromise.resolve();
-        });
-      const populateObjectStub = sinon
-        .stub(serverless.variables, 'populateObjectImpl')
-        .callsFake((val) => {
-          serverless.variables.deep.push('${bar:}');
-          const promise = BbPromise.resolve(val);
-          serverless.variables.tracker.add('bar:', promise, '${bar:}');
-          promise.state = 'resolved';
-          return BbPromise.resolve();
-        });
-      return serverless.variables
-        .populateService()
-        .should.be.fulfilled.then(() => {
-          expect(serverless.variables.deep).to.eql([]);
-          expect(serverless.variables.tracker.getAll()).to.eql([]);
-        })
-        .finally(() => {
-          prepopulateServiceStub.restore();
-          populateObjectStub.restore();
-        });
-    });
-  });
-
-  describe('fallback', () => {
-    describe('should fallback if ${self} syntax fail to populate but fallback is provided', () => {
-      [
-        { value: 'fallback123_*', description: 'regular ASCII characters' },
-        { value: 'hello+world^*$@(!', description: 'different ASCII characters' },
-        { value: '+++++', description: 'plus sign' },
-        { value: 'システム管理者*', description: 'japanese characters' },
-        { value: 'deす', description: 'mixed japanese ending' },
-        { value: 'でsu', description: 'mixed japanese leading' },
-        { value: 'suごi', description: 'mixed japanese middle' },
-        { value: '①⑴⒈⒜Ⓐⓐⓟ ..▉가Ὠ', description: 'random unicode' },
-      ].forEach((testCase) => {
-        it(testCase.description, () => {
-          serverless.variables.service.custom = {
-            settings: `\${self:nonExistent, "${testCase.value}"}`,
-          };
-          return serverless.variables.populateService().should.be.fulfilled.then((result) => {
-            expect(result.custom).to.be.deep.eql({
-              settings: testCase.value,
-            });
-          });
-        });
-      });
-    });
-
-    it('should fallback if ${opt} syntax fail to populate but fallback is provided', () => {
-      serverless.variables.service.custom = {
-        settings: '${opt:nonExistent, "fallback"}',
-      };
-      return serverless.variables.populateService().should.be.fulfilled.then((result) => {
-        expect(result.custom).to.be.deep.eql({
-          settings: 'fallback',
-        });
-      });
-    });
-
-    it('should fallback if ${env} syntax fail to populate but fallback is provided', () => {
-      serverless.variables.service.custom = {
-        settings: '${env:nonExistent, "fallback"}',
-      };
-      return serverless.variables.populateService().should.be.fulfilled.then((result) => {
-        expect(result.custom).to.be.deep.eql({
-          settings: 'fallback',
-        });
-      });
-    });
-
-    describe('file syntax', () => {
-      it('should fallback if file does not exist but fallback is provided', () => {
-        serverless.variables.service.custom = {
-          settings: '${file(~/config.yml):xyz, "fallback"}',
-        };
-
-        const fileExistsStub = sinon.stub(serverless.utils, 'fileExistsSync').returns(false);
-        const realpathSync = sinon.stub(fse, 'realpathSync').returns(`${os.homedir()}/config.yml`);
-
-        return serverless.variables
-          .populateService()
-          .should.be.fulfilled.then((result) => {
-            expect(result.custom).to.be.deep.eql({
-              settings: 'fallback',
-            });
-          })
-          .finally(() => {
-            fileExistsStub.restore();
-            realpathSync.restore();
-          });
-      });
-
-      it('should fallback if file exists but given key not found and fallback is provided', () => {
-        serverless.variables.service.custom = {
-          settings: '${file(~/config.yml):xyz, "fallback"}',
-        };
-
-        const fileExistsStub = sinon.stub(serverless.utils, 'fileExistsSync').returns(true);
-        const realpathSync = sinon.stub(fse, 'realpathSync').returns(`${os.homedir()}/config.yml`);
-        const readFileSyncStub = sinon.stub(serverless.utils, 'readFileSync').returns({
-          test: 1,
-          test2: 'test2',
-        });
-
-        return serverless.variables
-          .populateService()
-          .should.be.fulfilled.then((result) => {
-            expect(result.custom).to.be.deep.eql({
-              settings: 'fallback',
-            });
-          })
-          .finally(() => {
-            fileExistsStub.restore();
-            realpathSync.restore();
-            readFileSyncStub.restore();
-          });
-      });
-    });
-
-    describe('ensure unique instances', () => {
-      it('should not produce same instances for same variable patters used more than once', () => {
-        serverless.variables.service.custom = {
-          settings1: '${file(~/config.yml)}',
-          settings2: '${file(~/config.yml)}',
-        };
-
-        const fileExistsStub = sinon.stub(serverless.utils, 'fileExistsSync').returns(true);
-        const realpathSync = sinon.stub(fse, 'realpathSync').returns(`${os.homedir()}/config.yml`);
-        const readFileSyncStub = sinon.stub(serverless.utils, 'readFileSync').returns({
-          test: 1,
-          test2: 'test2',
-        });
-
-        return serverless.variables
-          .populateService()
-          .should.be.fulfilled.then((result) => {
-            expect(result.custom.settings1).to.not.equal(result.custom.settings2);
-          })
-          .finally(() => {
-            fileExistsStub.restore();
-            realpathSync.restore();
-            readFileSyncStub.restore();
-          });
-      });
-    });
-
-    describe('aws-specific syntax', () => {
-      let awsProvider;
-      let requestStub;
-      beforeEach(() => {
-        awsProvider = new AwsProvider(serverless, {});
-        requestStub = sinon
-          .stub(awsProvider, 'request')
-          .callsFake(() => BbPromise.reject(new ServerlessError('Not found.', 400)));
-      });
-      afterEach(() => {
-        requestStub.restore();
-      });
-      it('should fallback if ${s3} syntax fail to populate but fallback is provided', () => {
-        serverless.variables.service.custom = {
-          settings: '${s3:bucket/key, "fallback"}',
-        };
-        return serverless.variables.populateService().should.be.fulfilled.then((result) => {
-          expect(result.custom).to.be.deep.eql({
-            settings: 'fallback',
-          });
-        });
-      });
-
-      it('should fallback if ${cf} syntax fail to populate but fallback is provided', () => {
-        serverless.variables.service.custom = {
-          settings: '${cf:stack.value, "fallback"}',
-        };
-        return serverless.variables.populateService().should.be.fulfilled.then((result) => {
-          expect(result.custom).to.be.deep.eql({
-            settings: 'fallback',
-          });
-        });
-      });
-
-      it('should fallback if ${ssm} syntax fail to populate but fallback is provided', () => {
-        serverless.variables.service.custom = {
-          settings: '${ssm:/path/param, "fallback"}',
-        };
-        return serverless.variables.populateService().should.be.fulfilled.then((result) => {
-          expect(result.custom).to.be.deep.eql({
-            settings: 'fallback',
-          });
-        });
-      });
-
-      it('should throw an error if fallback fails too', () => {
-        serverless.variables.service.custom = {
-          settings: '${s3:bucket/key, ${ssm:/path/param}}',
-        };
-        return serverless.variables.populateService().should.be.rejected;
-      });
-    });
-  });
-
-  describe('#prepopulateService', () => {
-    // TL;DR: call populateService to test prepopulateService (note addition of 'pre')
-    //
-    // The prepopulateService resolver basically assumes invocation of of populateService (i.e. that
-    // variable syntax is loaded, and that the service object is cleaned up.  Just use
-    // populateService to do that work.
-    let awsProvider;
-    let populateObjectImplStub;
-    let requestStub; // just in case... don't want to actually call...
-    beforeEach(() => {
-      awsProvider = new AwsProvider(serverless, {});
-      populateObjectImplStub = sinon.stub(serverless.variables, 'populateObjectImpl');
-      populateObjectImplStub.withArgs(serverless.variables.service).returns(BbPromise.resolve());
-      requestStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.reject(new Error('unexpected')));
-    });
-    afterEach(() => {
-      populateObjectImplStub.restore();
-      requestStub.restore();
-    });
-    const prepopulatedProperties = [
-      { name: 'region', getter: (provider) => provider.getRegion() },
-      { name: 'stage', getter: (provider) => provider.getStage() },
-      { name: 'profile', getter: (provider) => provider.getProfile() },
-    ];
-    describe('basic population tests', () => {
-      prepopulatedProperties.forEach((property) => {
-        it(`should populate variables in ${property.name} values`, () => {
-          _.set(
-            awsProvider.serverless.service.provider,
-            property.name,
-            '${self:foobar, "default"}'
-          );
-          return serverless.variables
-            .populateService()
-            .should.be.fulfilled.then(() =>
-              expect(property.getter(awsProvider)).to.be.eql('default')
-            );
-        });
-      });
-    });
-    //
-    describe('dependent service rejections', () => {
-      const dependentConfigs = [
-        { value: '${cf:stack.value}', name: 'CloudFormation' },
-        { value: '${s3:bucket/key}', name: 'S3' },
-        { value: '${ssm:/path/param}', name: 'SSM' },
-      ];
-      prepopulatedProperties.forEach((property) => {
-        dependentConfigs.forEach((config) => {
-          it(`should reject ${config.name} variables in ${property.name} values`, () => {
-            _.set(awsProvider.serverless.service.provider, property.name, config.value);
-            return serverless.variables
-              .populateService()
-              .should.be.rejectedWith('Variable dependency failure');
-          });
-          it(`should reject recursively dependent ${config.name} service dependencies`, () => {
-            serverless.variables.service.custom = {
-              settings: config.value,
-            };
-            awsProvider.serverless.service.provider.region = '${self:custom.settings.region}';
-            return serverless.variables
-              .populateService()
-              .should.be.rejectedWith('Variable dependency failure');
-          });
-        });
-      });
-    });
-    describe('dependent service non-interference', () => {
-      const stateCombinations = [
-        { region: 'foo', state: 'bar' },
-        { region: 'foo', state: '${self:bar, "bar"}' },
-        { region: '${self:foo, "foo"}', state: 'bar' },
-        { region: '${self:foo, "foo"}', state: '${self:bar, "bar"}' },
-      ];
-      stateCombinations.forEach((combination) => {
-        it('must leave the dependent services in their original state', () => {
-          const dependentMethods = [
-            { name: 'getValueFromCf', original: serverless.variables.getValueFromCf },
-            { name: 'getValueFromS3', original: serverless.variables.getValueFromS3 },
-            { name: 'getValueFromSsm', original: serverless.variables.getValueFromSsm },
-          ];
-          awsProvider.serverless.service.provider.region = combination.region;
-          awsProvider.serverless.service.provider.state = combination.state;
-          return serverless.variables.populateService().should.be.fulfilled.then(() => {
-            dependentMethods.forEach((method) => {
-              expect(serverless.variables[method.name]).to.equal(method.original);
-            });
-          });
-        });
-      });
-    });
-  });
-
-  describe('#getProperties', () => {
-    it('extracts all terminal properties of an object', () => {
-      const date = new Date();
-      const regex = /^.*$/g;
-      const func = () => {};
-      const obj = {
-        foo: {
-          bar: 'baz',
-          biz: 'buz',
-        },
-        b: [{ c: 'd' }, { e: 'f' }],
-        g: date,
-        h: regex,
-        i: func,
-      };
-      const expected = [
-        { path: ['foo', 'bar'], value: 'baz' },
-        { path: ['foo', 'biz'], value: 'buz' },
-        { path: ['b', 0, 'c'], value: 'd' },
-        { path: ['b', 1, 'e'], value: 'f' },
-        { path: ['g'], value: date },
-        { path: ['h'], value: regex },
-        { path: ['i'], value: func },
-      ];
-      const result = serverless.variables.getProperties(obj, true, obj);
-      expect(result).to.eql(expected);
-    });
-    it('ignores self references', () => {
-      const obj = {};
-      obj.self = obj;
-      const expected = [];
-      const result = serverless.variables.getProperties(obj, true, obj);
-      expect(result).to.eql(expected);
-    });
-  });
-
-  describe('#populateObject()', () => {
-    beforeEach(() => {
-      serverless.variables.loadVariableSyntax();
-    });
-    it('should populate object and return it', () => {
-      const object = {
-        stage: '${opt:stage}',
-      };
-      const expectedPopulatedObject = {
-        stage: 'prod',
-      };
-
-      sinon.stub(serverless.variables, 'populateValue').resolves('prod');
-
-      return serverless.variables
-        .populateObject(object)
-        .then((populatedObject) => {
-          expect(populatedObject).to.deep.equal(expectedPopulatedObject);
-        })
-        .finally(() => serverless.variables.populateValue.restore());
-    });
-
-    it('should persist keys with dot notation', () => {
-      const object = {
-        stage: '${opt:stage}',
-      };
-      object['some.nested.key'] = 'hello';
-      const expectedPopulatedObject = {
-        stage: 'prod',
-      };
-      expectedPopulatedObject['some.nested.key'] = 'hello';
-      const populateValueStub = sinon.stub(serverless.variables, 'populateValue').callsFake(
-        // eslint-disable-next-line no-template-curly-in-string
-        (val) => {
-          return val === '${opt:stage}' ? BbPromise.resolve('prod') : BbPromise.resolve(val);
-        }
-      );
-      return serverless.variables
-        .populateObject(object)
-        .should.become(expectedPopulatedObject)
-        .then()
-        .finally(() => populateValueStub.restore());
-    });
-    describe('significant variable usage corner cases', () => {
-      let service;
-      const makeDefault = () => ({
-        service: 'my-service',
-        provider: {
-          name: 'aws',
-        },
-      });
-      beforeEach(() => {
-        service = makeDefault();
-        // eslint-disable-next-line no-template-curly-in-string
-        service.provider.variableSyntax = '\\${([ ~:a-zA-Z0-9._@\'",\\-\\/\\(\\)*?]+?)}'; // default
-        serverless.service = serverless.variables.service = service;
-        serverless.variables.loadVariableSyntax();
-        delete service.provider.variableSyntax;
-      });
-      it('should properly replace self-references', () => {
-        service.custom = {
-          me: '${self:}',
-        };
-        const expected = makeDefault();
-        expected.custom = {
-          me: expected,
-        };
-        return expect(
-          serverless.variables.populateObject(service).then((result) => {
-            expect(jc.stringify(result)).to.eql(jc.stringify(expected));
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly populate embedded variables', () => {
-        service.custom = {
-          val0: 'my value 0',
-          val1: '0', // eslint-disable-next-line no-template-curly-in-string
-          val2: '${self:custom.val${self:custom.val1}}',
-        };
-        const expected = {
-          val0: 'my value 0',
-          val1: '0',
-          val2: 'my value 0',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly populate an overwrite with a default value that is a string', () => {
-        service.custom = {
-          val0: 'my value', // eslint-disable-next-line no-template-curly-in-string
-          val1: '${self:custom.NOT_A_VAL1, self:custom.NOT_A_VAL2, "string"}',
-        };
-        const expected = {
-          val0: 'my value',
-          val1: 'string',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly populate an overwrite with a default value that is the string *', () => {
-        service.custom = {
-          val0: 'my value', // eslint-disable-next-line no-template-curly-in-string
-          val1: '${self:custom.NOT_A_VAL1, self:custom.NOT_A_VAL2, "*"}',
-        };
-        const expected = {
-          val0: 'my value',
-          val1: '*',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly populate an overwrite with a default value that is a string w/*', () => {
-        service.custom = {
-          val0: 'my value', // eslint-disable-next-line no-template-curly-in-string
-          val1: '${self:custom.NOT_A_VAL1, self:custom.NOT_A_VAL2, "foo*"}',
-        };
-        const expected = {
-          val0: 'my value',
-          val1: 'foo*',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly populate overwrites where the first value is valid', () => {
-        service.custom = {
-          val0: 'my value', // eslint-disable-next-line no-template-curly-in-string
-          val1: '${self:custom.val0, self:custom.NOT_A_VAL1, self:custom.NOT_A_VAL2}',
-        };
-        const expected = {
-          val0: 'my value',
-          val1: 'my value',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it("should treat '*' literally when not wrapped in quotes", async () => {
-        service.custom = {
-          val0: "${self:custom.*, 'fallback'}",
-        };
-        const expected = { val0: 'fallback' };
-        const result = await serverless.variables.populateObject(service.custom);
-        expect(result).to.eql(expected);
-      });
-      it('should properly populate overwrites where the middle value is valid', () => {
-        service.custom = {
-          val0: 'my value', // eslint-disable-next-line no-template-curly-in-string
-          val1: '${self:custom.NOT_A_VAL1, self:custom.val0, self:custom.NOT_A_VAL2}',
-        };
-        const expected = {
-          val0: 'my value',
-          val1: 'my value',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly populate overwrites where the last value is valid', () => {
-        service.custom = {
-          val0: 'my value', // eslint-disable-next-line no-template-curly-in-string
-          val1: '${self:custom.NOT_A_VAL1, self:custom.NOT_A_VAL2, self:custom.val0}',
-        };
-        const expected = {
-          val0: 'my value',
-          val1: 'my value',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly populate overwrites with nested variables in the first value', () => {
-        service.custom = {
-          val0: 'my value',
-          val1: 0, // eslint-disable-next-line no-template-curly-in-string
-          val2: '${self:custom.val${self:custom.val1}, self:custom.NO_1, self:custom.NO_2}',
-        };
-        const expected = {
-          val0: 'my value',
-          val1: 0,
-          val2: 'my value',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly populate overwrites with nested variables in the middle value', () => {
-        service.custom = {
-          val0: 'my value',
-          val1: 0, // eslint-disable-next-line no-template-curly-in-string
-          val2: '${self:custom.NO_1, self:custom.val${self:custom.val1}, self:custom.NO_2}',
-        };
-        const expected = {
-          val0: 'my value',
-          val1: 0,
-          val2: 'my value',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly populate overwrites with nested variables in the last value', () => {
-        service.custom = {
-          val0: 'my value',
-          val1: 0, // eslint-disable-next-line no-template-curly-in-string
-          val2: '${self:custom.NO_1, self:custom.NO_2, self:custom.val${self:custom.val1}}',
-        };
-        const expected = {
-          val0: 'my value',
-          val1: 0,
-          val2: 'my value',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly replace duplicate variable declarations', () => {
-        service.custom = {
-          val0: 'my value',
-          val1: '${self:custom.val0}',
-          val2: '${self:custom.val0}',
-        };
-        const expected = {
-          val0: 'my value',
-          val1: 'my value',
-          val2: 'my value',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should recursively populate, regardless of order and duplication', () => {
-        service.custom = {
-          val1: '${self:custom.depVal}',
-          depVal: '${self:custom.val0}',
-          val0: 'my value',
-          val2: '${self:custom.depVal}',
-        };
-        const expected = {
-          val1: 'my value',
-          depVal: 'my value',
-          val0: 'my value',
-          val2: 'my value',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      // see https://github.com/serverless/serverless/pull/4713#issuecomment-366975172
-      it('should handle deep references into deep variables', () => {
-        service.provider.stage = 'dev';
-        service.custom = {
-          stage: '${env:stage, self:provider.stage}',
-          secrets: '${self:custom.${self:custom.stage}}',
-          dev: {
-            SECRET: 'secret',
-          },
-          environment: {
-            SECRET: '${self:custom.secrets.SECRET}',
-          },
-        };
-        const expected = {
-          stage: 'dev',
-          secrets: {
-            SECRET: 'secret',
-          },
-          dev: {
-            SECRET: 'secret',
-          },
-          environment: {
-            SECRET: 'secret',
-          },
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle deep variables that reference overrides', () => {
-        service.custom = {
-          val1: '${self:not.a.value, "bar"}',
-          val2: '${self:custom.val1}',
-        };
-        const expected = {
-          val1: 'bar',
-          val2: 'bar',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle deep references into deep variables', () => {
-        service.custom = {
-          val0: {
-            foo: 'bar',
-          },
-          val1: '${self:custom.val0}',
-          val2: '${self:custom.val1.foo}',
-        };
-        const expected = {
-          val0: {
-            foo: 'bar',
-          },
-          val1: {
-            foo: 'bar',
-          },
-          val2: 'bar',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle deep variables that reference overrides', () => {
-        service.custom = {
-          val1: '${self:not.a.value, "bar"}',
-          val2: 'foo${self:custom.val1}',
-        };
-        const expected = {
-          val1: 'bar',
-          val2: 'foobar',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle referenced deep variables that reference overrides', () => {
-        service.custom = {
-          val1: '${self:not.a.value, "bar"}',
-          val2: '${self:custom.val1}',
-          val3: '${self:custom.val2}',
-        };
-        const expected = {
-          val1: 'bar',
-          val2: 'bar',
-          val3: 'bar',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle partial referenced deep variables that reference overrides', () => {
-        service.custom = {
-          val1: '${self:not.a.value, "bar"}',
-          val2: '${self:custom.val1}',
-          val3: 'foo${self:custom.val2}',
-        };
-        const expected = {
-          val1: 'bar',
-          val2: 'bar',
-          val3: 'foobar',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle referenced contained deep variables that reference overrides', () => {
-        service.custom = {
-          val1: '${self:not.a.value, "bar"}',
-          val2: 'foo${self:custom.val1}',
-          val3: '${self:custom.val2}',
-        };
-        const expected = {
-          val1: 'bar',
-          val2: 'foobar',
-          val3: 'foobar',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle multiple referenced contained deep variables referencing overrides', () => {
-        service.custom = {
-          val0: '${self:not.a.value, "foo"}',
-          val1: '${self:not.a.value, "bar"}',
-          val2: '${self:custom.val0}:${self:custom.val1}',
-          val3: '${self:custom.val2}',
-        };
-        const expected = {
-          val0: 'foo',
-          val1: 'bar',
-          val2: 'foo:bar',
-          val3: 'foo:bar',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle overrides that are populated by unresolvable deep variables', () => {
-        service.custom = {
-          val0: 'foo',
-          val1: '${self:custom.val0}',
-          val2: '${self:custom.val1.notAnAttribute, "fallback"}',
-        };
-        const expected = {
-          val0: 'foo',
-          val1: 'foo',
-          val2: 'fallback',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle embedded deep variable replacements in overrides', () => {
-        service.custom = {
-          foo: 'bar',
-          val0: 'foo',
-          val1: '${self:custom.val0, "fallback 1"}',
-          val2: '${self:custom.${self:custom.val0, self:custom.val1}, "fallback 2"}',
-        };
-        const expected = {
-          foo: 'bar',
-          val0: 'foo',
-          val1: 'foo',
-          val2: 'bar',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should deal with overwites that reference embedded deep references', () => {
-        service.custom = {
-          val0: 'val',
-          val1: 'val0',
-          val2: '${self:custom.val1}',
-          val3: '${self:custom.${self:custom.val2}, "fallback"}',
-          val4: '${self:custom.val3, self:custom.val3}',
-        };
-        const expected = {
-          val0: 'val',
-          val1: 'val0',
-          val2: 'val0',
-          val3: 'val',
-          val4: 'val',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should preserve whitespace in double-quote literal fallback', () => {
-        service.custom = {
-          val0: '${self:custom.val, "rate(3 hours)"}',
-        };
-        const expected = {
-          val0: 'rate(3 hours)',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should preserve whitespace in single-quote literal fallback', () => {
-        service.custom = {
-          val0: "${self:custom.val, 'rate(1 hour)'}",
-        };
-        const expected = {
-          val0: 'rate(1 hour)',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should preserve question mark in single-quote literal fallback', () => {
-        service.custom = {
-          val0: "${self:custom.val, '?'}",
-        };
-        const expected = {
-          val0: '?',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should preserve question mark in single-quote literal fallback', () => {
-        service.custom = {
-          val0: "${self:custom.val, 'cron(0 0 * * ? *)'}",
-        };
-        const expected = {
-          val0: 'cron(0 0 * * ? *)',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should accept whitespace in variables', () => {
-        service.custom = {
-          val0: '${self: custom.val}',
-          val: 'foobar',
-        };
-        const expected = {
-          val: 'foobar',
-          val0: 'foobar',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle deep variables regardless of custom variableSyntax', () => {
-        service.provider.variableSyntax = '\\${{([ ~:a-zA-Z0-9._@\\\'",\\-\\/\\(\\)*?]+?)}}';
-        serverless.variables.loadVariableSyntax();
-        delete service.provider.variableSyntax;
-        service.custom = {
-          my0thStage: 'DEV',
-          my1stStage: '${{self:custom.my0thStage}}',
-          my2ndStage: '${{self:custom.my1stStage}}',
-        };
-        const expected = {
-          my0thStage: 'DEV',
-          my1stStage: 'DEV',
-          my2ndStage: 'DEV',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle deep variable continuations regardless of custom variableSyntax', () => {
-        service.provider.variableSyntax = '\\${{([ ~:a-zA-Z0-9._@\\\'",\\-\\/\\(\\)*?]+?)}}';
-        serverless.variables.loadVariableSyntax();
-        delete service.provider.variableSyntax;
-        service.custom = {
-          my0thStage: { we: 'DEV' },
-          my1stStage: '${{self:custom.my0thStage}}',
-          my2ndStage: '${{self:custom.my1stStage.we}}',
-        };
-        const expected = {
-          my0thStage: { we: 'DEV' },
-          my1stStage: { we: 'DEV' },
-          my2ndStage: 'DEV',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle deep variables regardless of recursion into custom variableSyntax', () => {
-        service.provider.variableSyntax = '\\${{([ ~:a-zA-Z0-9._@\\\'",\\-\\/\\(\\)*?]+?)}}';
-        serverless.variables.loadVariableSyntax();
-        delete service.provider.variableSyntax;
-        service.custom = {
-          my0thIndex: '0th',
-          my1stIndex: '1st',
-          my0thStage: 'DEV',
-          my1stStage: '${{self:custom.my${{self:custom.my0thIndex}}Stage}}',
-          my2ndStage: '${{self:custom.my${{self:custom.my1stIndex}}Stage}}',
-        };
-        const expected = {
-          my0thIndex: '0th',
-          my1stIndex: '1st',
-          my0thStage: 'DEV',
-          my1stStage: 'DEV',
-          my2ndStage: 'DEV',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle deep variables in complex recursions of custom variableSyntax', () => {
-        service.provider.variableSyntax = '\\${{([ ~:a-zA-Z0-9._@\\\'",\\-\\/\\(\\)*?]+?)}}';
-        serverless.variables.loadVariableSyntax();
-        delete service.provider.variableSyntax;
-        service.custom = {
-          i0: '0',
-          s0: 'DEV',
-          s1: '${{self:custom.s0}}! ${{self:custom.s0}}',
-          s2: 'I am a ${{self:custom.s0}}! A ${{self:custom.s${{self:custom.i0}}}}!',
-          s3: '${{self:custom.s0}}!, I am a ${{self:custom.s1}}!, ${{self:custom.s2}}',
-        };
-        const expected = {
-          i0: '0',
-          s0: 'DEV',
-          s1: 'DEV! DEV',
-          s2: 'I am a DEV! A DEV!',
-          s3: 'DEV!, I am a DEV! DEV!, I am a DEV! A DEV!',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      describe('file reading cases', () => {
-        let tmpDirPath;
-        beforeEach(() => {
-          tmpDirPath = getTmpDirPath();
-          fse.mkdirsSync(tmpDirPath);
-          serverless.serviceDir = tmpDirPath;
-        });
-        afterEach(() => {
-          fse.removeSync(tmpDirPath);
-        });
-        const makeTempFile = (fileName, fileContent) => {
-          fse.outputFileSync(path.join(tmpDirPath, fileName), fileContent);
-        };
-        const asyncFileName = 'async.load.js';
-        const asyncContent = `'use strict';
-let i = 0
-const str = () => new Promise((resolve) => {
-  setTimeout(() => {
-    i += 1 // side effect
-    resolve(\`my-async-value-\${i}\`)
-  }, 200);
-});
-const obj = () => new Promise((resolve) => {
-  setTimeout(() => {
-    i += 1 // side effect
-    resolve({
-      val0: \`my-async-value-\${i}\`,
-      val1: '\${opt:stage}',
-    });
-  }, 200);
-});
-module.exports = {
-  str,
-  obj,
-};
-`;
-        it('should populate any given variable only once', () => {
-          makeTempFile(asyncFileName, asyncContent);
-          service.custom = {
-            val1: '${self:custom.val0}',
-            val2: '${self:custom.val1}',
-            val0: `\${file(${asyncFileName}):str}`,
-          };
-          const expected = {
-            val1: 'my-async-value-1',
-            val2: 'my-async-value-1',
-            val0: 'my-async-value-1',
-          };
-          return serverless.variables.populateObject(service.custom).should.become(expected);
-        });
-        it('should still work with a default file name in double or single quotes', () => {
-          makeTempFile(asyncFileName, asyncContent);
-          service.custom = {
-            val1: '${self:custom.val0}',
-            val2: '${self:custom.val1}',
-            val3: `\${file(\${self:custom.nonexistent, "${asyncFileName}"}):str}`,
-            val0: `\${file(\${self:custom.nonexistent, '${asyncFileName}'}):str}`,
-          };
-          const expected = {
-            val1: 'my-async-value-1',
-            val2: 'my-async-value-1',
-            val3: 'my-async-value-1',
-            val0: 'my-async-value-1',
-          };
-          return serverless.variables.populateObject(service.custom).should.become(expected);
-        });
-        it('should populate any given variable only once regardless of ordering or reference count', () => {
-          makeTempFile(asyncFileName, asyncContent);
-          service.custom = {
-            val9: '${self:custom.val7}',
-            val7: '${self:custom.val5}',
-            val5: '${self:custom.val3}',
-            val3: '${self:custom.val1}',
-            val1: '${self:custom.val0}',
-            val2: '${self:custom.val1}',
-            val4: '${self:custom.val3}',
-            val6: '${self:custom.val5}',
-            val8: '${self:custom.val7}',
-            val0: `\${file(${asyncFileName}):str}`,
-          };
-          const expected = {
-            val9: 'my-async-value-1',
-            val7: 'my-async-value-1',
-            val5: 'my-async-value-1',
-            val3: 'my-async-value-1',
-            val1: 'my-async-value-1',
-            val2: 'my-async-value-1',
-            val4: 'my-async-value-1',
-            val6: 'my-async-value-1',
-            val8: 'my-async-value-1',
-            val0: 'my-async-value-1',
-          };
-          return serverless.variables.populateObject(service.custom).should.become(expected);
-        });
-        it('should populate async objects with contained variables', () => {
-          makeTempFile(asyncFileName, asyncContent);
-          serverless.variables.options = {
-            stage: 'dev',
-          };
-          service.custom = {
-            obj: `\${file(${asyncFileName}):obj}`,
-          };
-          const expected = {
-            obj: {
-              val0: 'my-async-value-1',
-              val1: 'dev',
-            },
-          };
-          return serverless.variables.populateObject(service.custom).should.become(expected);
-        });
-        it("should populate variables from filesnames including '@',  e.g scoped npm packages", () => {
-          const fileName = `./node_modules/@scoped-org/${asyncFileName}`;
-          makeTempFile(fileName, asyncContent);
-          service.custom = {
-            val0: `\${file(${fileName}):str}`,
-          };
-          const expected = {
-            val0: 'my-async-value-1',
-          };
-          return serverless.variables.populateObject(service.custom).should.become(expected);
-        });
-        const selfFileName = 'self.yml';
-        const selfContent = `foo: baz
-bar: \${self:custom.self.foo}
-`;
-        it('should populate a "cyclic" reference across an unresolved dependency (issue #4687)', () => {
-          makeTempFile(selfFileName, selfContent);
-          service.custom = {
-            self: `\${file(${selfFileName})}`,
-          };
-          const expected = {
-            self: {
-              foo: 'baz',
-              bar: 'baz',
-            },
-          };
-          return serverless.variables.populateObject(service.custom).should.become(expected);
-        });
-        const emptyFileName = 'empty.js';
-        const emptyContent = `'use strict';
-module.exports = {
-  func: () => ({ value: 'a value' }),
-}
-`;
-        it('should reject population of an attribute not exported from a file', () => {
-          makeTempFile(emptyFileName, emptyContent);
-          service.custom = {
-            val: `\${file(${emptyFileName}):func.notAValue}`,
-          };
-          return serverless.variables
-            .populateObject(service.custom)
-            .should.be.rejectedWith(
-              ServerlessError,
-              'Invalid variable syntax when referencing file'
-            );
-        });
-      });
-    });
-  });
-
-  describe('#populateProperty()', () => {
-    beforeEach(() => {
-      serverless.variables.loadVariableSyntax();
-    });
-
-    it('should call overwrite if overwrite syntax provided', () => {
-      // eslint-disable-next-line no-template-curly-in-string
-      const property = 'my stage is ${opt:stage, self:provider.stage}';
-      serverless.variables.options = { stage: 'dev' };
-      serverless.service.provider.stage = 'prod';
-      return serverless.variables
-        .populateProperty(property)
-        .should.eventually.eql('my stage is dev');
-    });
-
-    it('should allow a single-quoted string if overwrite syntax provided', () => {
-      // eslint-disable-next-line no-template-curly-in-string
-      const property = "my stage is ${opt:stage, 'prod'}";
-      serverless.variables.options = {};
-      return serverless.variables
-        .populateProperty(property)
-        .should.eventually.eql('my stage is prod');
-    });
-
-    it('should allow a double-quoted string if overwrite syntax provided', () => {
-      // eslint-disable-next-line no-template-curly-in-string
-      const property = 'my stage is ${opt:stage, "prod"}';
-      serverless.variables.options = {};
-      return serverless.variables
-        .populateProperty(property)
-        .should.eventually.eql('my stage is prod');
-    });
-
-    it('should not allow partially double-quoted string', async () => {
-      const property = '${opt:stage, prefix"prod"suffix}';
-      serverless.variables.options = {};
-      const handleUnresolvedSpy = sinon.spy(serverless.variables, 'handleUnresolved');
-      try {
-        expect(await serverless.variables.populateProperty(property)).to.equal(undefined);
-        expect(handleUnresolvedSpy.callCount).to.equal(1);
-      } finally {
-        handleUnresolvedSpy.restore();
-      }
-    });
-
-    it('should allow a boolean with value true if overwrite syntax provided', () => {
-      const property = '${opt:stage, true}';
-      serverless.variables.options = {};
-      return serverless.variables.populateProperty(property).should.eventually.eql(true);
-    });
-
-    it('should allow a boolean with value false if overwrite syntax provided', () => {
-      const property = '${opt:stage, false}';
-      serverless.variables.options = {};
-      return serverless.variables.populateProperty(property).should.eventually.eql(false);
-    });
-
-    it('should not match a boolean with value containing word true or false if overwrite syntax provided', () => {
-      const property = '${opt:stage, foofalsebar}';
-      serverless.variables.options = {};
-      const handleUnresolvedSpy = sinon.spy(serverless.variables, 'handleUnresolved');
-      return serverless.variables
-        .populateProperty(property)
-        .should.become(undefined)
-        .then(() => {
-          expect(handleUnresolvedSpy.callCount).to.equal(1);
-        })
-        .finally(() => {
-          handleUnresolvedSpy.restore();
-        });
-    });
-
-    it('should allow an integer if overwrite syntax provided', () => {
-      const property = '${opt:quantity, 123}';
-      serverless.variables.options = {};
-      return serverless.variables.populateProperty(property).should.eventually.eql(123);
-    });
-
-    it('should call getValueFromSource if no overwrite syntax provided', () => {
-      // eslint-disable-next-line no-template-curly-in-string
-      const property = 'my stage is ${opt:stage}';
-      serverless.variables.options = { stage: 'prod' };
-      return serverless.variables
-        .populateProperty(property)
-        .should.eventually.eql('my stage is prod');
-    });
-
-    it('should warn if an SSM parameter does not exist', () => {
-      const options = {
-        stage: 'prod',
-        region: 'us-east-1',
-      };
-      serverless.variables.options = options;
-      const awsProvider = new AwsProvider(serverless, options);
-      const param = '/some/path/to/invalidparam';
-      const property = `\${ssm:${param}}`;
-      const error = Object.assign(new Error(`Parameter ${param} not found.`), {
-        providerError: { statusCode: 400 },
-      });
-      const requestStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.reject(error));
-      const handleUnresolvedSpy = sinon.spy(serverless.variables, 'handleUnresolved');
-
-      return serverless.variables
-        .populateProperty(property)
-        .should.become(undefined)
-        .then(() => {
-          expect(requestStub.callCount).to.equal(1);
-          expect(handleUnresolvedSpy.callCount).to.equal(1);
-        })
-        .finally(() => {
-          requestStub.restore();
-          handleUnresolvedSpy.restore();
-        });
-    });
-
-    it('should throw an Error if the SSM request fails', () => {
-      const options = {
-        stage: 'prod',
-        region: 'us-east-1',
-      };
-      serverless.variables.options = options;
-      const awsProvider = new AwsProvider(serverless, options);
-      const param = '/some/path/to/invalidparam';
-      const property = `\${ssm:${param}}`;
-      const error = new ServerlessError('Some random failure.', 123);
-      const requestStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.reject(error));
-      return serverless.variables
-        .populateProperty(property)
-        .should.be.rejectedWith(ServerlessError)
-        .then(() => expect(requestStub.callCount).to.equal(1))
-        .finally(() => requestStub.restore());
-    });
-
-    it('should run recursively if nested variables provided', () => {
-      // eslint-disable-next-line no-template-curly-in-string
-      const property = 'my stage is ${env:${opt:name}}';
-      process.env.TEST_VAR = 'dev';
-      serverless.variables.options = { name: 'TEST_VAR' };
-      return serverless.variables
-        .populateProperty(property)
-        .should.eventually.eql('my stage is dev');
-    });
-
-    it('should run recursively through many nested variables', () => {
-      // eslint-disable-next-line no-template-curly-in-string
-      const property = 'my stage is ${env:${opt:name}}';
-      process.env.TEST_VAR = 'dev';
-      serverless.variables.options = {
-        name: 'T${opt:lvl0}',
-        lvl0: 'E${opt:lvl1}',
-        lvl1: 'S${opt:lvl2}',
-        lvl2: 'T${opt:lvl3}',
-        lvl3: '_${opt:lvl4}',
-        lvl4: 'V${opt:lvl5}',
-        lvl5: 'A${opt:lvl6}',
-        lvl6: 'R',
-      };
-      return serverless.variables
-        .populateProperty(property)
-        .should.eventually.eql('my stage is dev');
-    });
-  });
-
-  describe('#populateVariable()', () => {
-    it('should populate string variables as sub string', () => {
-      const valueToPopulate = 'dev';
-      const matchedString = '${opt:stage}';
-      // eslint-disable-next-line no-template-curly-in-string
-      const property = 'my stage is ${opt:stage}';
-      serverless.variables
-        .populateVariable(property, matchedString, valueToPopulate)
-        .should.eql('my stage is dev');
-    });
-
-    it('should populate number variables as sub string', () => {
-      const valueToPopulate = 5;
-      const matchedString = '${opt:number}';
-      // eslint-disable-next-line no-template-curly-in-string
-      const property = 'your account number is ${opt:number}';
-      serverless.variables
-        .populateVariable(property, matchedString, valueToPopulate)
-        .should.eql('your account number is 5');
-    });
-
-    it('should populate non string variables', () => {
-      const valueToPopulate = 5;
-      const matchedString = '${opt:number}';
-      const property = '${opt:number}';
-      return serverless.variables
-        .populateVariable(property, matchedString, valueToPopulate)
-        .should.equal(5);
-    });
-
-    it('should throw error if populating non string or non number variable as sub string', () => {
-      const valueToPopulate = {};
-      const matchedString = '${opt:object}';
-      // eslint-disable-next-line no-template-curly-in-string
-      const property = 'your account number is ${opt:object}';
-      return expect(() =>
-        serverless.variables.populateVariable(property, matchedString, valueToPopulate)
-      ).to.throw(ServerlessError);
-    });
-  });
-
-  describe('#splitByComma', () => {
-    it('should return a given empty string', () => {
-      const input = '';
-      const expected = [input];
-      expect(serverless.variables.splitByComma(input)).to.eql(expected);
-    });
-    it('should return a undelimited string', () => {
-      const input = 'foo:bar';
-      const expected = [input];
-      expect(serverless.variables.splitByComma(input)).to.eql(expected);
-    });
-    it('should split basic comma delimited strings', () => {
-      const input = 'my,values,to,split';
-      const expected = ['my', 'values', 'to', 'split'];
-      expect(serverless.variables.splitByComma(input)).to.eql(expected);
-    });
-    it('should remove leading and following white space', () => {
-      const input = ' \t\nfoobar\n\t ';
-      const expected = ['foobar'];
-      expect(serverless.variables.splitByComma(input)).to.eql(expected);
-    });
-    it('should remove white space surrounding commas', () => {
-      const input = 'a,b ,c , d, e  ,  f\t,g\n,h,\ti,\nj,\t\n , \n\tk';
-      const expected = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k'];
-      expect(serverless.variables.splitByComma(input)).to.eql(expected);
-    });
-    it('should ignore quoted commas', () => {
-      const input = '",", \',\', ",\', \',\'", "\',\', \',\'", \',", ","\', \'",", ","\'';
-      const expected = ['","', "','", "\",', ','\"", "\"',', ','\"", '\',", ","\'', '\'",", ","\''];
-      expect(serverless.variables.splitByComma(input)).to.eql(expected);
-    });
-    it('should deal with a combination of these cases', () => {
-      const input = " \t\n'a'\t\n , \n\t\"foo,bar\", opt:foo, \",\", ',', \"',', ','\", foo\n\t ";
-      const expected = ["'a'", '"foo,bar"', 'opt:foo', '","', "','", "\"',', ','\"", 'foo'];
-      expect(serverless.variables.splitByComma(input)).to.eql(expected);
-    });
-  });
-
-  describe('#overwrite()', () => {
-    beforeEach(() => {
-      serverless.service.provider.variableSyntax = '\\${{([ ~:a-zA-Z0-9._@\'",\\-\\/\\(\\)*?]+?)}}';
-      serverless.variables.loadVariableSyntax();
-      delete serverless.service.provider.variableSyntax;
-    });
-    it('should overwrite undefined and null values', () => {
-      const getValueFromSourceStub = sinon.stub(serverless.variables, 'getValueFromSource');
-      getValueFromSourceStub.onCall(0).resolves(undefined);
-      getValueFromSourceStub.onCall(1).resolves(null);
-      getValueFromSourceStub.onCall(2).resolves('variableValue');
-      return serverless.variables
-        .overwrite(['opt:stage', 'env:stage', 'self:provider.stage'])
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.equal('variableValue');
-          expect(getValueFromSourceStub).to.have.been.calledThrice;
-        })
-        .finally(() => getValueFromSourceStub.restore());
-    });
-
-    it('should overwrite empty object values', () => {
-      const getValueFromSourceStub = sinon.stub(serverless.variables, 'getValueFromSource');
-      getValueFromSourceStub.onCall(0).resolves({});
-      getValueFromSourceStub.onCall(1).resolves('variableValue');
-      return serverless.variables
-        .overwrite(['opt:stage', 'env:stage'])
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.equal('variableValue');
-          expect(getValueFromSourceStub).to.have.been.calledTwice;
-        })
-        .finally(() => getValueFromSourceStub.restore());
-    });
-
-    it('should overwrite values with an array even if it is empty', () => {
-      const getValueFromSourceStub = sinon.stub(serverless.variables, 'getValueFromSource');
-      getValueFromSourceStub.onCall(0).resolves(undefined);
-      getValueFromSourceStub.onCall(1).resolves([]);
-      return serverless.variables
-        .overwrite(['opt:stage', 'env:stage'])
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.deep.equal([]);
-          expect(getValueFromSourceStub).to.have.been.calledTwice;
-        })
-        .finally(() => getValueFromSourceStub.restore());
-    });
-
-    it('should not overwrite 0 values', () => {
-      const getValueFromSourceStub = sinon.stub(serverless.variables, 'getValueFromSource');
-      getValueFromSourceStub.onCall(0).resolves(0);
-      getValueFromSourceStub.onCall(1).resolves('variableValue');
-      return serverless.variables
-        .overwrite(['opt:stage', 'env:stage'])
-        .should.become(0)
-        .then()
-        .finally(() => getValueFromSourceStub.restore());
-    });
-
-    it('should not overwrite false values', () => {
-      const getValueFromSourceStub = sinon.stub(serverless.variables, 'getValueFromSource');
-      getValueFromSourceStub.onCall(0).resolves(false);
-      getValueFromSourceStub.onCall(1).resolves('variableValue');
-      return serverless.variables
-        .overwrite(['opt:stage', 'env:stage'])
-        .should.become(false)
-        .then()
-        .finally(() => getValueFromSourceStub.restore());
-    });
-
-    it('should skip getting values once a value has been found', () => {
-      const getValueFromSourceStub = sinon.stub(serverless.variables, 'getValueFromSource');
-      getValueFromSourceStub.onCall(0).resolves(undefined);
-      getValueFromSourceStub.onCall(1).resolves('variableValue');
-      getValueFromSourceStub.onCall(2).resolves('variableValue2');
-      return serverless.variables
-        .overwrite(['opt:stage', 'env:stage', 'self:provider.stage'])
-        .should.be.fulfilled.then((valueToPopulate) =>
-          expect(valueToPopulate).to.equal('variableValue')
-        )
-        .finally(() => getValueFromSourceStub.restore());
-    });
-    it('should properly handle string values containing commas', () => {
-      const str = '"foo,bar"';
-      const getValueFromSourceStub = sinon
-        .stub(serverless.variables, 'getValueFromSource')
-        .resolves(undefined);
-      return serverless.variables
-        .overwrite(['opt:stage', str])
-        .should.be.fulfilled.then(() =>
-          expect(getValueFromSourceStub.getCall(1).args[0]).to.eql(str)
-        )
-        .finally(() => getValueFromSourceStub.restore());
-    });
-  });
-
-  describe('#getValueFromSource()', () => {
-    const variableValue = 'variableValue';
-    let getValueFromSlsStub;
-    let getValueFromEnvStub;
-    let getValueFromOptionsStub;
-    let getValueFromSelfStub;
-    let getValueFromFileStub;
-    let getValueFromCfStub;
-    let getValueFromS3Stub;
-    let getValueFromSsmStub;
-
-    beforeEach(() => {
-      getValueFromSlsStub = sinon
-        .stub(serverless.variables.variableResolvers[0], 'resolver')
-        .resolves('variableValue');
-      getValueFromEnvStub = sinon
-        .stub(serverless.variables.variableResolvers[1], 'resolver')
-        .resolves('variableValue');
-      getValueFromOptionsStub = sinon
-        .stub(serverless.variables.variableResolvers[2], 'resolver')
-        .resolves('variableValue');
-      getValueFromSelfStub = sinon
-        .stub(serverless.variables.variableResolvers[3], 'resolver')
-        .resolves('variableValue');
-      getValueFromFileStub = sinon
-        .stub(serverless.variables.variableResolvers[4], 'resolver')
-        .resolves('variableValue');
-      getValueFromCfStub = sinon
-        .stub(serverless.variables.variableResolvers[5], 'resolver')
-        .resolves('variableValue');
-      getValueFromS3Stub = sinon
-        .stub(serverless.variables.variableResolvers[6], 'resolver')
-        .resolves('variableValue');
-      getValueFromSsmStub = sinon
-        .stub(serverless.variables.variableResolvers[10], 'resolver')
-        .resolves('variableValue');
-    });
-
-    afterEach(() => {
-      serverless.variables.variableResolvers[0].resolver.restore();
-      serverless.variables.variableResolvers[1].resolver.restore();
-      serverless.variables.variableResolvers[2].resolver.restore();
-      serverless.variables.variableResolvers[3].resolver.restore();
-      serverless.variables.variableResolvers[4].resolver.restore();
-      serverless.variables.variableResolvers[5].resolver.restore();
-      serverless.variables.variableResolvers[6].resolver.restore();
-      serverless.variables.variableResolvers[10].resolver.restore();
-    });
-
-    it('should call getValueFromSls if referencing sls var', () =>
-      serverless.variables
-        .getValueFromSource('sls:instanceId')
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.equal(variableValue);
-          expect(getValueFromSlsStub).to.have.been.called;
-          expect(getValueFromSlsStub).to.have.been.calledWith('sls:instanceId');
-        }));
-
-    it('should call getValueFromEnv if referencing env var', () =>
-      serverless.variables
-        .getValueFromSource('env:TEST_VAR')
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.equal(variableValue);
-          expect(getValueFromEnvStub).to.have.been.called;
-          expect(getValueFromEnvStub).to.have.been.calledWith('env:TEST_VAR');
-        }));
-
-    it('should call getValueFromOptions if referencing an option', () =>
-      serverless.variables
-        .getValueFromSource('opt:stage')
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.equal(variableValue);
-          expect(getValueFromOptionsStub).to.have.been.called;
-          expect(getValueFromOptionsStub).to.have.been.calledWith('opt:stage');
-        }));
-
-    it('should call getValueFromSelf if referencing from self', () =>
-      serverless.variables
-        .getValueFromSource('self:provider')
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.equal(variableValue);
-          expect(getValueFromSelfStub).to.have.been.called;
-          expect(getValueFromSelfStub).to.have.been.calledWith('self:provider');
-        }));
-
-    it('should call getValueFromFile if referencing from another file', () =>
-      serverless.variables
-        .getValueFromSource('file(./config.yml)')
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.equal(variableValue);
-          expect(getValueFromFileStub).to.have.been.called;
-          expect(getValueFromFileStub).to.have.been.calledWith('file(./config.yml)');
-        }));
-
-    it('should call getValueFromCf if referencing CloudFormation Outputs', () =>
-      serverless.variables
-        .getValueFromSource('cf:test-stack.testOutput')
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.equal(variableValue);
-          expect(getValueFromCfStub).to.have.been.called;
-          expect(getValueFromCfStub).to.have.been.calledWith('cf:test-stack.testOutput');
-        }));
-
-    it('should call getValueFromS3 if referencing variable in S3', () =>
-      serverless.variables
-        .getValueFromSource('s3:test-bucket/path/to/key')
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.equal(variableValue);
-          expect(getValueFromS3Stub).to.have.been.called;
-          expect(getValueFromS3Stub).to.have.been.calledWith('s3:test-bucket/path/to/key');
-        }));
-
-    it('should call getValueFromSsm if referencing variable in SSM', () =>
-      serverless.variables
-        .getValueFromSource('ssm:/test/path/to/param')
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.equal(variableValue);
-          expect(getValueFromSsmStub).to.have.been.called;
-          expect(getValueFromSsmStub).to.have.been.calledWith('ssm:/test/path/to/param');
-        }));
-
-    it('should reject invalid sources', () =>
-      serverless.variables
-        .getValueFromSource('weird:source')
-        .should.be.rejectedWith(ServerlessError));
-
-    describe('caching', () => {
-      const sources = [
-        { functionIndex: 0, function: 'getValueFromSls', variableString: 'sls:instanceId' },
-        { functionIndex: 1, function: 'getValueFromEnv', variableString: 'env:NODE_ENV' },
-        { functionIndex: 2, function: 'getValueFromOptions', variableString: 'opt:stage' },
-        { functionIndex: 3, function: 'getValueFromSelf', variableString: 'self:provider' },
-        { functionIndex: 4, function: 'getValueFromFile', variableString: 'file(./config.yml)' },
-        {
-          functionIndex: 5,
-          function: 'getValueFromCf',
-          variableString: 'cf:test-stack.testOutput',
-        },
-        {
-          functionIndex: 6,
-          function: 'getValueFromS3',
-          variableString: 's3:test-bucket/path/to/ke',
-        },
-        {
-          functionIndex: 10,
-          function: 'getValueFromSsm',
-          variableString: 'ssm:/test/path/to/param',
-        },
-      ];
-      sources.forEach((source) => {
-        it(`should only call ${source.function} once, returning the cached value otherwise`, () => {
-          const getValueFunctionStub =
-            serverless.variables.variableResolvers[source.functionIndex].resolver;
-          return BbPromise.all([
-            serverless.variables
-              .getValueFromSource(source.variableString)
-              .should.become(variableValue),
-            BbPromise.delay(100).then(() =>
-              serverless.variables
-                .getValueFromSource(source.variableString)
-                .should.become(variableValue)
-            ),
-          ]).then(() => {
-            expect(getValueFunctionStub).to.have.been.calledOnce;
-            expect(getValueFunctionStub).to.have.been.calledWith(source.variableString);
-          });
-        });
-      });
-    });
-  });
-
-  describe('#getValueFromSls()', () => {
-    it('should get variable from Serverless Framework provided variables', () => {
-      serverless.instanceId = 12345678;
-      return serverless.variables.getValueFromSls('sls:instanceId').then((valueToPopulate) => {
-        expect(valueToPopulate).to.equal(12345678);
-      });
-    });
-  });
-
-  describe('#getValueFromEnv()', () => {
-    it('should get variable from environment variables', () => {
-      process.env.TEST_VAR = 'someValue';
-      return serverless.variables.getValueFromEnv('env:TEST_VAR').should.become('someValue');
-    });
-
-    it('should allow top-level references to the environment variables hive', () => {
-      process.env.TEST_VAR = 'someValue';
-      return serverless.variables.getValueFromEnv('env:').then((valueToPopulate) => {
-        expect(valueToPopulate.TEST_VAR).to.be.equal('someValue');
-      });
-    });
-  });
-
-  describe('#getValueFromOptions()', () => {
-    it('should get variable from options', () => {
-      serverless.variables.options = { stage: 'prod' };
-      return serverless.variables.getValueFromOptions('opt:stage').should.become('prod');
-    });
-
-    it('should allow top-level references to the options hive', () => {
-      serverless.variables.options = { stage: 'prod' };
-      return serverless.variables
-        .getValueFromOptions('opt:')
-        .should.become(serverless.variables.options);
-    });
-  });
-
-  describe('#getValueFromSelf()', () => {
-    beforeEach(() => {
-      serverless.service.provider.variableSyntax = '\\${{([ ~:a-zA-Z0-9._@\'",\\-\\/\\(\\)*?]+?)}}';
-      serverless.variables.loadVariableSyntax();
-      delete serverless.service.provider.variableSyntax;
-    });
-    it('should get variable from self serverless.yml file', () => {
-      serverless.variables.service = {
-        service: 'testService',
-        provider: serverless.service.provider,
-      };
-      return serverless.variables.getValueFromSelf('self:service').should.become('testService');
-    });
-    it('should redirect ${self:service.name} to ${self:service}', () => {
-      serverless.variables.service = {
-        service: 'testService',
-        provider: serverless.service.provider,
-      };
-      return serverless.variables
-        .getValueFromSelf('self:service.name')
-        .should.become('testService');
-    });
-    it('should redirect ${self:provider} to ${self:provider.name}', () => {
-      serverless.variables.service = {
-        service: 'testService',
-        provider: { name: 'aws' },
-      };
-      return serverless.variables.getValueFromSelf('self:provider').should.become('aws');
-    });
-    it('should redirect ${self:service.awsKmsKeyArn} to ${self:serviceObject.awsKmsKeyArn}', () => {
-      const keyArn = 'arn:aws:kms:us-east-1:xxxxxxxxxxxx:key/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx';
-      serverless.variables.service = {
-        service: 'testService',
-        serviceObject: {
-          name: 'testService',
-          awsKmsKeyArn: keyArn,
-        },
-      };
-      return serverless.variables
-        .getValueFromSelf('self:service.awsKmsKeyArn')
-        .should.become(keyArn);
-    });
-    it('should handle self-references to the root of the serverless.yml file', () => {
-      serverless.variables.service = {
-        service: 'testService',
-        provider: 'testProvider',
-        defaults: serverless.service.defaults,
-      };
-      return serverless.variables
-        .getValueFromSelf('self:')
-        .should.eventually.equal(serverless.variables.service);
-    });
-  });
-
-  describe('#getValueFromFile()', () => {
-    it('should work for absolute paths with ~ ', () => {
-      const expectedFileName = `${os.homedir()}/somedir/config.yml`;
-      const configYml = {
-        test: 1,
-        test2: 'test2',
-        testObj: {
-          sub: 2,
-          prob: 'prob',
-        },
-      };
-      const fileExistsStub = sinon.stub(serverless.utils, 'fileExistsSync').returns(true);
-      const realpathSync = sinon.stub(fse, 'realpathSync').returns(expectedFileName);
-      const readFileSyncStub = sinon.stub(serverless.utils, 'readFileSync').returns(configYml);
-      return serverless.variables
-        .getValueFromFile('file(~/somedir/config.yml)')
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(realpathSync).to.not.have.been.called;
-          expect(fileExistsStub).to.have.been.calledWithMatch(expectedFileName);
-          expect(readFileSyncStub).to.have.been.calledWithMatch(expectedFileName);
-          expect(valueToPopulate).to.deep.equal(configYml);
-        })
-        .finally(() => {
-          realpathSync.restore();
-          readFileSyncStub.restore();
-          fileExistsStub.restore();
-        });
-    });
-
-    it('should populate an entire variable file', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const configYml = {
-        test: 1,
-        test2: 'test2',
-        testObj: {
-          sub: 2,
-          prob: 'prob',
-        },
-      };
-      SUtils.writeFileSync(path.join(tmpDirPath, 'config.yml'), yaml.dump(configYml));
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./config.yml)')
-        .should.eventually.eql(configYml);
-    });
-
-    it('should get undefined if non existing file and the second argument is true', () => {
-      const tmpDirPath = getTmpDirPath();
-      serverless.serviceDir = tmpDirPath;
-      const realpathSync = sinon.spy(fse, 'realpathSync');
-      const existsSync = sinon.spy(fse, 'existsSync');
-      return serverless.variables
-        .getValueFromFile('file(./non-existing.yml)')
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(realpathSync).to.not.have.been.called;
-          expect(existsSync).to.have.been.calledOnce;
-          expect(valueToPopulate).to.be.undefined;
-        })
-        .finally(() => {
-          realpathSync.restore();
-          existsSync.restore();
-        });
-    });
-
-    it('should populate non json/yml files', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      SUtils.writeFileSync(path.join(tmpDirPath, 'someFile'), 'hello world');
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables.getValueFromFile('file(./someFile)').should.become('hello world');
-    });
-
-    it('should populate symlinks', function () {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const realFilePath = path.join(tmpDirPath, 'someFile');
-      const symlinkPath = path.join(tmpDirPath, 'refSomeFile');
-      SUtils.writeFileSync(realFilePath, 'hello world');
-      try {
-        fse.ensureSymlinkSync(realFilePath, symlinkPath);
-      } catch (error) {
-        skipOnDisabledSymlinksInWindows(error, this, afterCallback);
-        throw error;
-      }
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./refSomeFile)')
-        .should.become('hello world')
-        .then()
-        .finally(() => {
-          fse.removeSync(realFilePath);
-          fse.removeSync(symlinkPath);
-        });
-    });
-
-    it('should trim trailing whitespace and new line character', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      SUtils.writeFileSync(path.join(tmpDirPath, 'someFile'), 'hello world \n');
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables.getValueFromFile('file(./someFile)').should.become('hello world');
-    });
-
-    it('should populate from another file when variable is of any type', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const configYml = {
-        test0: 0,
-        test1: 'test1',
-        test2: {
-          sub: 2,
-          prob: 'prob',
-        },
-      };
-      SUtils.writeFileSync(path.join(tmpDirPath, 'config.yml'), yaml.dump(configYml));
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./config.yml):test2.sub')
-        .should.become(configYml.test2.sub);
-    });
-
-    it('should populate from a javascript file that exports a function', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const jsData = 'module.exports.hello=function(){return "hello world";};';
-      SUtils.writeFileSync(path.join(tmpDirPath, 'hello.js'), jsData);
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./hello.js):hello')
-        .should.become('hello world');
-    });
-
-    it('should populate from a javascript file that exports a string', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const jsData = 'module.exports.hello="hello world";';
-      SUtils.writeFileSync(path.join(tmpDirPath, 'hello.js'), jsData);
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./hello.js):hello')
-        .should.become('hello world');
-    });
-
-    it('should populate an entire variable exported by a javascript file function', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const jsData = 'module.exports=function(){return { hello: "hello world" };};';
-      SUtils.writeFileSync(path.join(tmpDirPath, 'hello.js'), jsData);
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./hello.js)')
-        .should.become({ hello: 'hello world' });
-    });
-
-    it('should populate an entire variable exported by a javascript file object', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const jsData = 'module.exports={ hello: "hello world" };';
-      SUtils.writeFileSync(path.join(tmpDirPath, 'hello.js'), jsData);
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./hello.js)')
-        .should.become({ hello: 'hello world' });
-    });
-
-    it('should populate an entire variable exported by a javascript file literal', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const jsData = 'module.exports="hello world";';
-      SUtils.writeFileSync(path.join(tmpDirPath, 'hello.js'), jsData);
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables.getValueFromFile('file(./hello.js)').should.become('hello world');
-    });
-
-    it('should populate deep object from a javascript file', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const jsData = `module.exports.hello=function(){
-        return {one:{two:{three: 'hello world'}}}
-      };`;
-      SUtils.writeFileSync(path.join(tmpDirPath, 'hello.js'), jsData);
-      serverless.serviceDir = tmpDirPath;
-      serverless.variables.loadVariableSyntax();
-      return serverless.variables
-        .getValueFromFile('file(./hello.js):hello.one.two.three')
-        .should.become('hello world');
-    });
-
-    it('should preserve the exported function context when executing', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const jsData = `
-      module.exports.one = {two: {three: 'hello world'}}
-      module.exports.hello=function(){ return this; };`;
-      SUtils.writeFileSync(path.join(tmpDirPath, 'hello.js'), jsData);
-      serverless.serviceDir = tmpDirPath;
-      serverless.variables.loadVariableSyntax();
-      return serverless.variables
-        .getValueFromFile('file(./hello.js):hello.one.two.three')
-        .should.become('hello world');
-    });
-
-    it('should file variable not using ":" syntax', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const configYml = {
-        test: 1,
-        test2: 'test2',
-        testObj: {
-          sub: 2,
-          prob: 'prob',
-        },
-      };
-      SUtils.writeFileSync(path.join(tmpDirPath, 'config.yml'), yaml.dump(configYml));
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./config.yml).testObj.sub')
-        .should.be.rejectedWith(ServerlessError);
-    });
-
-    it('should throw an error if resolved value is undefined', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const jsData = 'module.exports=undefined;';
-      SUtils.writeFileSync(path.join(tmpDirPath, 'hello.js'), jsData);
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./hello.js)')
-        .should.be.rejectedWith(ServerlessError);
-    });
-
-    it('should throw an error if resolved value is a symbol', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const jsData = 'module.exports=Symbol()';
-      SUtils.writeFileSync(path.join(tmpDirPath, 'hello.js'), jsData);
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./hello.js)')
-        .should.be.rejectedWith(ServerlessError);
-    });
-
-    it('should throw an error if resolved value is a function', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const jsData = 'module.exports=function(){ return function(){}; };';
-      SUtils.writeFileSync(path.join(tmpDirPath, 'hello.js'), jsData);
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./hello.js)')
-        .should.be.rejectedWith(ServerlessError);
-    });
-  });
-
-  describe('#getValueFromCf()', () => {
-    it('should get variable from CloudFormation', () => {
-      const options = {
-        stage: 'prod',
-        region: 'us-west-2',
-      };
-      const awsProvider = new AwsProvider(serverless, options);
-      serverless.setProvider('aws', awsProvider);
-      serverless.variables.options = options;
-      const awsResponseMock = {
-        Stacks: [
-          {
-            Outputs: [
-              {
-                OutputKey: 'MockExport',
-                OutputValue: 'MockValue',
-              },
-            ],
-          },
-        ],
-      };
-      const cfStub = sinon
-        .stub(serverless.getProvider('aws'), 'request')
-        .callsFake(() => BbPromise.resolve(awsResponseMock));
-      return serverless.variables
-        .getValueFromCf('cf:some-stack.MockExport')
-        .should.become('MockValue')
-        .then(() => {
-          expect(cfStub).to.have.been.calledOnce;
-          expect(cfStub).to.have.been.calledWithExactly(
-            'CloudFormation',
-            'describeStacks',
-            { StackName: 'some-stack' },
-            { useCache: true }
-          );
-        })
-        .finally(() => cfStub.restore());
-    });
-
-    it('should get variable from CloudFormation of different region', () => {
-      const options = {
-        stage: 'prod',
-        region: 'us-west-2',
-      };
-      const awsProvider = new AwsProvider(serverless, options);
-      serverless.setProvider('aws', awsProvider);
-      serverless.variables.options = options;
-      const awsResponseMock = {
-        Stacks: [
-          {
-            Outputs: [
-              {
-                OutputKey: 'MockExport',
-                OutputValue: 'MockValue',
-              },
-            ],
-          },
-        ],
-      };
-      const cfStub = sinon
-        .stub(serverless.getProvider('aws'), 'request')
-        .callsFake(() => BbPromise.resolve(awsResponseMock));
-      return serverless.variables
-        .getValueFromCf('cf.us-east-1:some-stack.MockExport')
-        .should.become('MockValue')
-        .then(() => {
-          expect(cfStub).to.have.been.calledOnce;
-          expect(cfStub).to.have.been.calledWithExactly(
-            'CloudFormation',
-            'describeStacks',
-            { StackName: 'some-stack' },
-            { region: 'us-east-1', useCache: true }
-          );
-        })
-        .finally(() => cfStub.restore());
-    });
-
-    it('should reject CloudFormation variables that do not exist', () => {
-      const options = {
-        stage: 'prod',
-        region: 'us-west-2',
-      };
-      const awsProvider = new AwsProvider(serverless, options);
-      serverless.setProvider('aws', awsProvider);
-      serverless.variables.options = options;
-      const awsResponseMock = {
-        Stacks: [
-          {
-            Outputs: [
-              {
-                OutputKey: 'MockExport',
-                OutputValue: 'MockValue',
-              },
-            ],
-          },
-        ],
-      };
-      const cfStub = sinon
-        .stub(serverless.getProvider('aws'), 'request')
-        .callsFake(() => BbPromise.resolve(awsResponseMock));
-      return serverless.variables
-        .getValueFromCf('cf:some-stack.DoestNotExist')
-        .should.be.rejectedWith(
-          ServerlessError,
-          /to request a non exported variable from CloudFormation/
-        )
-        .then(() => {
-          expect(cfStub).to.have.been.calledOnce;
-          expect(cfStub).to.have.been.calledWithExactly(
-            'CloudFormation',
-            'describeStacks',
-            { StackName: 'some-stack' },
-            { useCache: true }
-          );
-        })
-        .finally(() => cfStub.restore());
-    });
-  });
-
-  describe('#getValueFromS3()', () => {
-    let awsProvider;
-    beforeEach(() => {
-      const options = {
-        stage: 'prod',
-        region: 'us-west-2',
-      };
-      awsProvider = new AwsProvider(serverless, options);
-      serverless.setProvider('aws', awsProvider);
-      serverless.variables.options = options;
-    });
-    it('should get variable from S3', () => {
-      const awsResponseMock = {
-        Body: 'MockValue',
-      };
-      const s3Stub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.resolve(awsResponseMock));
-      return serverless.variables
-        .getValueFromS3('s3:some.bucket/path/to/key')
-        .should.become('MockValue')
-        .then(() => {
-          expect(s3Stub).to.have.been.calledOnce;
-          expect(s3Stub).to.have.been.calledWithExactly(
-            'S3',
-            'getObject',
-            {
-              Bucket: 'some.bucket',
-              Key: 'path/to/key',
-            },
-            { useCache: true }
-          );
-        })
-        .finally(() => s3Stub.restore());
-    });
-
-    it('should throw error if error getting value from S3', () => {
-      const error = new Error('The specified bucket is not valid');
-      const requestStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.reject(error));
-      return expect(serverless.variables.getValueFromS3('s3:some.bucket/path/to/key'))
-        .to.be.rejectedWith(
-          ServerlessError,
-          'Error getting value for s3:some.bucket/path/to/key. The specified bucket is not valid'
-        )
-        .then()
-        .finally(() => requestStub.restore());
-    });
-  });
-
-  describe('#getValueFromSsm()', () => {
-    const param = 'Param-01_valid.chars';
-    const value = 'MockValue';
-    const awsResponseMock = {
-      Parameter: {
-        Value: value,
-      },
-    };
-    let awsProvider;
-    beforeEach(() => {
-      const options = {
-        stage: 'prod',
-        region: 'us-west-2',
-      };
-      awsProvider = new AwsProvider(serverless, options);
-      serverless.setProvider('aws', awsProvider);
-      serverless.variables.options = options;
-    });
-    it('should get variable from Ssm using regular-style param', () => {
-      const ssmStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.resolve(awsResponseMock));
-      return serverless.variables
-        .getValueFromSsm(`ssm:${param}`)
-        .should.become(value)
-        .then(() => {
-          expect(ssmStub).to.have.been.calledOnce;
-          expect(ssmStub).to.have.been.calledWithExactly(
-            'SSM',
-            'getParameter',
-            {
-              Name: param,
-              WithDecryption: false,
-            },
-            { useCache: true }
-          );
-        })
-        .finally(() => ssmStub.restore());
-    });
-    it('should get variable from Ssm of different region', () => {
-      const ssmStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.resolve(awsResponseMock));
-      return serverless.variables
-        .getValueFromSsm(`ssm.us-east-1:${param}`)
-        .should.become(value)
-        .then(() => {
-          expect(ssmStub).to.have.been.calledOnce;
-          expect(ssmStub).to.have.been.calledWithExactly(
-            'SSM',
-            'getParameter',
-            {
-              Name: param,
-              WithDecryption: false,
-            },
-            { region: 'us-east-1', useCache: true }
-          );
-        })
-        .finally(() => ssmStub.restore());
-    });
-    it('should get variable from Ssm using path-style param', () => {
-      const ssmStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.resolve(awsResponseMock));
-      return serverless.variables
-        .getValueFromSsm(`ssm:${param}`)
-        .should.become(value)
-        .then(() => {
-          expect(ssmStub).to.have.been.calledOnce;
-          expect(ssmStub).to.have.been.calledWithExactly(
-            'SSM',
-            'getParameter',
-            {
-              Name: param,
-              WithDecryption: false,
-            },
-            { useCache: true }
-          );
-        })
-        .finally(() => ssmStub.restore());
-    });
-    it('should get encrypted variable from Ssm using extended syntax', () => {
-      const ssmStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.resolve(awsResponseMock));
-      return serverless.variables
-        .getValueFromSsm(`ssm:${param}~true`)
-        .should.become(value)
-        .then(() => {
-          expect(ssmStub).to.have.been.calledOnce;
-          expect(ssmStub).to.have.been.calledWithExactly(
-            'SSM',
-            'getParameter',
-            {
-              Name: param,
-              WithDecryption: true,
-            },
-            { useCache: true }
-          );
-        })
-        .finally(() => ssmStub.restore());
-    });
-    it('should get unencrypted variable from Ssm using extended syntax', () => {
-      const ssmStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.resolve(awsResponseMock));
-      return serverless.variables
-        .getValueFromSsm(`ssm:${param}~false`)
-        .should.become(value)
-        .then(() => {
-          expect(ssmStub).to.have.been.calledOnce;
-          expect(ssmStub).to.have.been.calledWithExactly(
-            'SSM',
-            'getParameter',
-            {
-              Name: param,
-              WithDecryption: false,
-            },
-            { useCache: true }
-          );
-        })
-        .finally(() => ssmStub.restore());
-    });
-    it('should ignore bad values for extended syntax', () => {
-      const ssmStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.resolve(awsResponseMock));
-      return serverless.variables
-        .getValueFromSsm(`ssm:${param}~badvalue`)
-        .should.become(value)
-        .then(() => {
-          expect(ssmStub).to.have.been.calledOnce;
-          expect(ssmStub).to.have.been.calledWithExactly(
-            'SSM',
-            'getParameter',
-            {
-              Name: param,
-              WithDecryption: false,
-            },
-            { useCache: true }
-          );
-        })
-        .finally(() => ssmStub.restore());
-    });
-    it('should get split StringList variable from Ssm using extended syntax', () => {
-      const stringListValue = 'MockValue1,MockValue2';
-      const parsedValue = ['MockValue1', 'MockValue2'];
-      const stringListResponseMock = {
-        Parameter: {
-          Value: stringListValue,
-          Type: 'StringList',
-        },
-      };
-      const ssmStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.resolve(stringListResponseMock));
-      return serverless.variables
-        .getValueFromSsm(`ssm:${param}~split`)
-        .should.become(parsedValue)
-        .then(() => {
-          expect(ssmStub).to.have.been.calledOnce;
-          expect(ssmStub).to.have.been.calledWithExactly(
-            'SSM',
-            'getParameter',
-            {
-              Name: param,
-              WithDecryption: false,
-            },
-            { useCache: true }
-          );
-        })
-        .finally(() => ssmStub.restore());
-    });
-    it('should get unsplit StringList variable from Ssm by default', () => {
-      const stringListValue = 'MockValue1,MockValue2';
-      const stringListResponseMock = {
-        Parameter: {
-          Value: stringListValue,
-          Type: 'StringList',
-        },
-      };
-      const ssmStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.resolve(stringListResponseMock));
-      return serverless.variables
-        .getValueFromSsm(`ssm:${param}`)
-        .should.become(stringListValue)
-        .then(() => {
-          expect(ssmStub).to.have.been.calledOnce;
-          expect(ssmStub).to.have.been.calledWithExactly(
-            'SSM',
-            'getParameter',
-            {
-              Name: param,
-              WithDecryption: false,
-            },
-            { useCache: true }
-          );
-        })
-        .finally(() => ssmStub.restore());
-    });
-    it('should warn when attempting to split a non-StringList Ssm variable', () => {
-      const logWarningSpy = sinon.spy(slsError, 'logWarning');
-      const consoleLogStub = sinon.stub(console, 'log').returns();
-      const ProxyQuiredVariables = proxyquire('../../../../lib/classes/Variables.js', {
-        './Error': logWarningSpy,
-      });
-      const varProxy = new ProxyQuiredVariables(serverless);
-      const stringListResponseMock = {
-        Parameter: {
-          Value: value,
-          Type: 'String',
-        },
-      };
-      const ssmStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.resolve(stringListResponseMock));
-      return varProxy
-        .getValueFromSsm(`ssm:${param}~split`)
-        .should.become(value)
-        .then(() => {
-          expect(ssmStub).to.have.been.calledOnce;
-          expect(ssmStub).to.have.been.calledWithExactly(
-            'SSM',
-            'getParameter',
-            {
-              Name: param,
-              WithDecryption: false,
-            },
-            { useCache: true }
-          );
-          expect(logWarningSpy).to.have.been.calledWithExactly(
-            `Cannot split SSM parameter '${param}' of type 'String'. Must be 'StringList'.`
-          );
-        })
-        .finally(() => {
-          ssmStub.restore();
-          logWarningSpy.restore();
-          consoleLogStub.restore();
-        });
-    });
-    describe('Referencing to AWS SecretsManager', () => {
-      it('should NOT parse value as json if not referencing to AWS SecretsManager', () => {
-        const secretParam = '/path/to/foo-bar';
-        const jsonLikeText = '{"str":"abc","num":123}';
-        const awsResponse = {
-          Parameter: {
-            Value: jsonLikeText,
-          },
-        };
-        const ssmStub = sinon
-          .stub(awsProvider, 'request')
-          .callsFake(() => BbPromise.resolve(awsResponse));
-        return serverless.variables
-          .getValueFromSsm(`ssm:${secretParam}~true`)
-          .should.become(jsonLikeText)
-          .then()
-          .finally(() => ssmStub.restore());
-      });
-      it('should parse value as json if returned value is json-like', () => {
-        const secretParam = '/aws/reference/secretsmanager/foo-bar';
-        const jsonLikeText = '{"str":"abc","num":123}';
-        const json = {
-          str: 'abc',
-          num: 123,
-        };
-        const awsResponse = {
-          Parameter: {
-            Value: jsonLikeText,
-          },
-        };
-        const ssmStub = sinon
-          .stub(awsProvider, 'request')
-          .callsFake(() => BbPromise.resolve(awsResponse));
-        return serverless.variables
-          .getValueFromSsm(`ssm:${secretParam}~true`)
-          .should.become(json)
-          .then()
-          .finally(() => ssmStub.restore());
-      });
-      it('should get value as text if returned value is NOT json-like', () => {
-        const secretParam = '/aws/reference/secretsmanager/foo-bar';
-        const plainText = 'I am plain text';
-        const awsResponse = {
-          Parameter: {
-            Value: plainText,
-          },
-        };
-        const ssmStub = sinon
-          .stub(awsProvider, 'request')
-          .callsFake(() => BbPromise.resolve(awsResponse));
-        return serverless.variables
-          .getValueFromSsm(`ssm:${secretParam}~true`)
-          .should.become(plainText)
-          .then()
-          .finally(() => ssmStub.restore());
-      });
-    });
-    it('should return undefined if SSM parameter does not exist', () => {
-      const error = Object.assign(new Error(`Parameter ${param} not found.`), {
-        providerError: { statusCode: 400 },
-      });
-      const requestStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.reject(error));
-      return serverless.variables
-        .getValueFromSsm(`ssm:${param}`)
-        .should.become(undefined)
-        .then()
-        .finally(() => requestStub.restore());
-    });
-
-    it('should reject if SSM request returns unexpected error', () => {
-      const error = new Error(
-        'User: <arn> is not authorized to perform: ssm:GetParameter on resource: <arn>'
-      );
-      const requestStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.reject(error));
-      return serverless.variables
-        .getValueFromSsm(`ssm:${param}`)
-        .should.be.rejected.then()
-        .finally(() => requestStub.restore());
-    });
-  });
-
-  describe('#getValueStrToBool()', () => {
-    const errMessage = 'Unexpected strToBool input; expected either "true", "false", "0", or "1".';
-    beforeEach(() => {
-      serverless.variables.service = {
-        service: 'testService',
-        provider: serverless.service.provider,
-      };
-      serverless.variables.loadVariableSyntax();
-    });
-    it('regex for "true" input', () => {
-      expect(serverless.variables.strToBoolRefSyntax.test('${strToBool(true)}')).to.equal(true);
-    });
-    it('regex for "false" input', () => {
-      expect(serverless.variables.strToBoolRefSyntax.test('${strToBool(false)}')).to.equal(true);
-    });
-    it('regex for "0" input', () => {
-      expect(serverless.variables.strToBoolRefSyntax.test('${strToBool(0)}')).to.equal(true);
-    });
-    it('regex for "1" input', () => {
-      expect(serverless.variables.strToBoolRefSyntax.test('${strToBool(1)}')).to.equal(true);
-    });
-    it('regex for "null" input', () => {
-      expect(serverless.variables.strToBoolRefSyntax.test('${strToBool(null)}')).to.equal(true);
-    });
-    it('regex for truthy input', () => {
-      expect(serverless.variables.strToBoolRefSyntax.test('${strToBool(anything)}')).to.equal(true);
-    });
-    it('regex for empty input', () => {
-      expect(serverless.variables.strToBoolRefSyntax.test('${strToBool()}')).to.equal(false);
-    });
-    it('true (string) should return true (boolean)', () => {
-      return serverless.variables.getValueStrToBool('strToBool(true)').should.become(true);
-    });
-    it('false (string) should return false (boolean)', () => {
-      return serverless.variables.getValueStrToBool('strToBool(false)').should.become(false);
-    });
-    it('1 (string) should return true (boolean)', () => {
-      return serverless.variables.getValueStrToBool('strToBool(1)').should.become(true);
-    });
-    it('0 (string) should return false (boolean)', () => {
-      return serverless.variables.getValueStrToBool('strToBool(0)').should.become(false);
-    });
-    it('truthy string should throw an error', () => {
-      return serverless.variables
-        .getValueStrToBool('strToBool(anything)')
-        .catch((err) => err.message)
-        .should.become(errMessage);
-    });
-    it('null (string) should throw an error', () => {
-      return serverless.variables
-        .getValueStrToBool('strToBool(null)')
-        .catch((err) => err.message)
-        .should.become(errMessage);
-    });
-    it('strToBool(true) as an input to strToBool', () => {
-      const input = serverless.variables.getValueStrToBool('strToBool(true)');
-      return serverless.variables.getValueStrToBool(input).should.become(true);
-    });
-    it('strToBool(false) as an input to strToBool', () => {
-      const input = serverless.variables.getValueStrToBool('strToBool(false)');
-      return serverless.variables.getValueStrToBool(input).should.become(true);
-    });
-  });
-
-  describe('#getDeeperValue()', () => {
-    it('should get deep values', () => {
-      const valueToPopulateMock = {
-        service: 'testService',
-        custom: {
-          subProperty: {
-            deep: 'deepValue',
-          },
-        },
-      };
-      serverless.variables.loadVariableSyntax();
-      return serverless.variables
-        .getDeeperValue(['custom', 'subProperty', 'deep'], valueToPopulateMock)
-        .should.become('deepValue');
-    });
-    it('should not throw error if referencing invalid properties', () => {
-      const valueToPopulateMock = {
-        service: 'testService',
-        custom: {
-          subProperty: 'hello',
-        },
-      };
-      serverless.variables.loadVariableSyntax();
-      return serverless.variables
-        .getDeeperValue(['custom', 'subProperty', 'deep', 'deeper'], valueToPopulateMock)
-        .should.eventually.deep.equal({});
-    });
-    it('should return a simple deep variable when final deep value is variable', () => {
-      serverless.variables.service = {
-        service: 'testService',
-        custom: {
-          subProperty: {
-            // eslint-disable-next-line no-template-curly-in-string
-            deep: '${self:custom.anotherVar.veryDeep}',
-          },
-        },
-        provider: serverless.service.provider,
-      };
-      serverless.variables.loadVariableSyntax();
-      return serverless.variables
-        .getDeeperValue(['custom', 'subProperty', 'deep'], serverless.variables.service)
-        .should.become('${deep:0}');
-    });
-    it('should return a deep continuation when middle deep value is variable', () => {
-      serverless.variables.service = {
-        service: 'testService',
-        custom: {
-          anotherVar: '${self:custom.var}',
-        },
-        provider: serverless.service.provider,
-      };
-      serverless.variables.loadVariableSyntax();
-      return serverless.variables
-        .getDeeperValue(['custom', 'anotherVar', 'veryDeep'], serverless.variables.service)
-        .should.become('${deep:0.veryDeep}');
-    });
-  });
-
-  describe('#handleUnresolved()', () => {
-    let logWarningSpy;
-    let consoleLogStub;
-    let varProxy;
-
-    beforeEach(() => {
-      logWarningSpy = sinon.spy(slsError, 'logWarning');
-      consoleLogStub = sinon.stub(console, 'log').returns();
-      const ProxyQuiredVariables = proxyquire('../../../../lib/classes/Variables.js', {
-        './Error': logWarningSpy,
-      });
-      varProxy = new ProxyQuiredVariables(serverless);
-    });
-
-    afterEach(() => {
-      logWarningSpy.restore();
-      consoleLogStub.restore();
-    });
-
-    it('should do nothing if variable has valid value.', () => {
-      varProxy.handleUnresolved('self:service', 'a-valid-value');
-      expect(logWarningSpy).to.not.have.been.calledOnce;
-    });
-
-    describe('when variable string does not match any of syntax', () => {
-      // These situation happen when deep variable population fails
-      it('should do nothing if variable has null value.', () => {
-        varProxy.handleUnresolved('', null);
-        expect(logWarningSpy).to.not.have.been.calledOnce;
-      });
-
-      it('should do nothing if variable has undefined value.', () => {
-        varProxy.handleUnresolved('', undefined);
-        expect(logWarningSpy).to.not.have.been.calledOnce;
-      });
-
-      it('should do nothing if variable has empty object value.', () => {
-        varProxy.handleUnresolved('', {});
-        expect(logWarningSpy).to.not.have.been.calledOnce;
-      });
-    });
-    it('should log if variable has null value.', () => {
-      varProxy.handleUnresolved('self:service', null);
-      expect(logWarningSpy).to.have.been.calledOnce;
-    });
-    it('should log if variable has undefined value.', () => {
-      varProxy.handleUnresolved('self:service', undefined);
-      expect(logWarningSpy).to.have.been.calledOnce;
-    });
-
-    it('should log if variable has empty object value.', () => {
-      varProxy.handleUnresolved('self:service', {});
-      expect(logWarningSpy).to.have.been.calledOnce;
-    });
-
-    it('should not log if variable has empty array value.', () => {
-      varProxy.handleUnresolved('self:service', []);
-      expect(logWarningSpy).to.not.have.been.called;
-    });
-
-    it('should detect the "environment variable" variable type', () => {
-      varProxy.handleUnresolved('env:service', null);
-      expect(logWarningSpy).to.have.been.calledOnce;
-      expect(logWarningSpy.args[0][0]).to.contain('environment variable');
-    });
-
-    it('should detect the "option" variable type', () => {
-      varProxy.handleUnresolved('opt:service', null);
-      expect(logWarningSpy).to.have.been.calledOnce;
-      expect(logWarningSpy.args[0][0]).to.contain('option');
-    });
-
-    it('should detect the "service attribute" variable type', () => {
-      varProxy.handleUnresolved('self:service', null);
-      expect(logWarningSpy).to.have.been.calledOnce;
-      expect(logWarningSpy.args[0][0]).to.contain('service attribute');
-    });
-
-    it('should detect the "file" variable type', () => {
-      varProxy.handleUnresolved('file(service)', null);
-      expect(logWarningSpy).to.have.been.calledOnce;
-      expect(logWarningSpy.args[0][0]).to.contain('file');
-    });
-  });
-});
-
-describe('test/unit/lib/classes/Variables.test.js', () => {
-  let processedConfig = null;
-  before(async () => {
-    const result = await runServerless({
-      fixture: 'variables-legacy',
-      command: 'print',
-      shouldUseLegacyVariablesResolver: true,
-    });
-    processedConfig = result.serverless.service;
-  });
-
-  it('should support ${file(...)} syntax', () => {
-    expect(processedConfig.custom.importedFile).to.deep.equal({
-      foo: 'bar',
-    });
-  });
-
-  it('should support ${file(...):key} syntax', () => {
-    expect(processedConfig.custom.importedFileWithKey).to.equal('bar');
-  });
-
-  it('should support ${file(...)} syntax for Terraform state', () => {
-    expect(processedConfig.custom.importedTerraformState).to.deep.equal({
-      version: 4,
-      terraform_version: '0.14.4',
-      serial: 11,
-      lineage: '12ab3c45-abc1-0a1b-1a23-a12b34567c89',
-      outputs: {
-        listenerarn: {
-          value:
-            'arn:aws:elasticloadbalancing:us-west-2:123456789876:listener/app/myapp/1a2b3c4f1a23456b/a1b23c45de6789fa',
-          type: 'string',
-        },
-      },
-      resources: [],
-    });
-  });
-
-  it('should support ${file(...):key} syntax for Terraform state', () => {
-    expect(processedConfig.custom.importedTerraformStateWithKey).to.equal('string');
-  });
-
-  it('should ignore native CloudFormation variables', () => {
-    expect(processedConfig.custom.awsVariable).to.equal('${AWS::Region}');
-  });
-
-  it('should ignore CloudFormation references', () => {
-    expect(processedConfig.custom.cloudFormationReference).to.equal('${AnotherResource}');
-  });
-
-  it('should support ${self:key} syntax', () => {
-    expect(processedConfig.custom.selfReference).to.equal('bar');
-  });
-  it('should support ${self:} syntax', () => {
-    expect(processedConfig.custom.serviceReference).to.equal(processedConfig);
-  });
-  it('should support nested resolution', () => {
-    expect(processedConfig.custom.nestedReference).to.equal('resolvedNested');
-  });
-
-  it('should handle resolving variables when `prototype` is part of the path', async () => {
-    expect(processedConfig.custom.prototype.nestedInPrototype).to.equal('bar-in-prototype');
-  });
-
-  describe('variable resolving', () => {
-    describe('when unresolvedVariablesNotificationMode is set to "error"', () => {
-      it('should error for missing "environment variable" type variables', async () => {
-        await expect(
-          runServerless({
-            fixture: 'variables-legacy',
-            command: 'print',
-            configExt: {
-              unresolvedVariablesNotificationMode: 'error',
-              custom: { myVariable: '${env:missingEnvVar}' },
-            },
-            shouldUseLegacyVariablesResolver: true,
-          })
-        ).to.eventually.be.rejected.and.have.property('code', 'UNRESOLVED_CONFIG_VARIABLE');
-      });
-
-      it('should error for missing "option" type variables', async () => {
-        await expect(
-          runServerless({
-            fixture: 'variables-legacy',
-            command: 'print',
-            configExt: {
-              unresolvedVariablesNotificationMode: 'error',
-              custom: { myVariable: '${opt:missingOpt}' },
-            },
-            shouldUseLegacyVariablesResolver: true,
-          })
-        ).to.eventually.be.rejected.and.have.property('code', 'UNRESOLVED_CONFIG_VARIABLE');
-      });
-
-      it('should error for missing "service attribute" type variables', async () => {
-        await expect(
-          runServerless({
-            fixture: 'variables-legacy',
-            command: 'print',
-            configExt: {
-              unresolvedVariablesNotificationMode: 'error',
-              custom: { myVariable: '${self:missingAttribute}' },
-            },
-            shouldUseLegacyVariablesResolver: true,
-          })
-        ).to.eventually.be.rejected.and.have.property('code', 'UNRESOLVED_CONFIG_VARIABLE');
-      });
-
-      it('should error for missing "file" type variables', async () => {
-        await expect(
-          runServerless({
-            fixture: 'variables-legacy',
-            command: 'print',
-            configExt: {
-              unresolvedVariablesNotificationMode: 'error',
-              custom: { myVariable: '${file(./missingFile)}' },
-            },
-            shouldUseLegacyVariablesResolver: true,
-          })
-        ).to.eventually.be.rejected.and.have.property('code', 'UNRESOLVED_CONFIG_VARIABLE');
-      });
-    });
-
-    describe('when unresolvedVariablesNotificationMode is set to "warn"', () => {
-      it('should warn', async () => {
-        const { stdoutData } = await runServerless({
-          fixture: 'variables-legacy',
-          command: 'print',
-          configExt: {
-            unresolvedVariablesNotificationMode: 'warn',
-            custom: {
-              myVariable1: '${env:missingEnvVar}',
-              myVariable2: '${opt:missingOpt}',
-              myVariable3: '${self:missingAttribute}',
-              myVariable4: '${file(./missingFile)}',
-            },
-          },
-          shouldUseLegacyVariablesResolver: true,
-        });
-        expect(stdoutData).to.include('Serverless Warning');
-        expect(stdoutData).to.include('A valid environment variable to satisfy the declaration');
-        expect(stdoutData).to.include('A valid option to satisfy the declaration');
-        expect(stdoutData).to.include('A valid service attribute to satisfy the declaration');
-        expect(stdoutData).to.include('A valid file to satisfy the declaration');
-      });
-    });
-
-    describe('when unresolvedVariablesNotificationMode is not set', () => {
-      it('should warn', async () => {
-        const { stdoutData } = await runServerless({
-          fixture: 'variables-legacy',
-          command: 'print',
-          configExt: {
-            custom: {
-              myVariable1: '${env:missingEnvVar}',
-              myVariable2: '${opt:missingOpt}',
-              myVariable3: '${self:missingAttribute}',
-              myVariable4: '${file(./missingFile)}',
-            },
-          },
-          shouldUseLegacyVariablesResolver: true,
-        });
-
-        expect(stdoutData).to.include('Serverless Warning');
-        expect(stdoutData).to.include('A valid environment variable to satisfy the declaration');
-        expect(stdoutData).to.include('A valid option to satisfy the declaration');
-        expect(stdoutData).to.include('A valid service attribute to satisfy the declaration');
-        expect(stdoutData).to.include('A valid file to satisfy the declaration');
-      });
-    });
-  });
-});
diff --git a/test/unit/lib/cli/handle-error.test.js b/test/unit/lib/cli/handle-error.test.js
index bcab06b80eb..029cdfe1745 100644
--- a/test/unit/lib/cli/handle-error.test.js
+++ b/test/unit/lib/cli/handle-error.test.js
@@ -3,8 +3,7 @@
 const chai = require('chai');
 const sinon = require('sinon');
 
-const path = require('path');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
+const observeOutput = require('@serverless/test/observe-output');
 const handleError = require('../../../../lib/cli/handle-error');
 const isStandaloneExecutable = require('../../../../lib/utils/isStandaloneExecutable');
 const ServerlessError = require('../../../../lib/serverless-error');
@@ -15,31 +14,19 @@ chai.use(require('sinon-chai'));
 const expect = chai.expect;
 
 describe('test/unit/lib/cli/handle-error.test.js', () => {
-  it('should log environment information', async () => {
-    let stdoutData = '';
-    await overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => handleError(new ServerlessError('Test error'))
-    );
-    expect(stdoutData).to.have.string('Serverless Error');
-    expect(stdoutData).to.have.string('Test error');
-    expect(stdoutData).to.have.string('Your Environment Information');
-    expect(stdoutData).to.have.string('Operating System:');
-    expect(stdoutData).to.have.string('Node Version:');
-    expect(stdoutData).to.have.string('Framework Version:');
-    expect(stdoutData).to.have.string('Plugin Version:');
-    expect(stdoutData).to.have.string('SDK Version:');
-    expect(stdoutData).to.have.string('Components Version:');
+  it('should output environment information', async () => {
+    const output = await observeOutput(() => handleError(new ServerlessError('Test error')));
+    expect(output).to.have.string('Environment: ');
+    expect(output).to.have.string('node');
+    expect(output).to.have.string('framework');
+    expect(output).to.have.string('plugin');
+    expect(output).to.have.string('SDK');
   });
 
   it('should support `isUncaughtException` option', async () => {
     const processExitStub = sinon.stub(process, 'exit').returns();
     try {
-      let stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        () => handleError(new ServerlessError('Test error'), { isUncaughtException: true })
-      );
+      await handleError(new ServerlessError('Test error'), { isUncaughtException: true });
       expect(processExitStub.called).to.be.true;
     } finally {
       processExitStub.restore();
@@ -48,57 +35,25 @@ describe('test/unit/lib/cli/handle-error.test.js', () => {
 
   if (isStandaloneExecutable) {
     it('should report standalone installation', async () => {
-      let stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        () => handleError(new ServerlessError('Test error'))
-      );
-      expect(stdoutData).to.have.string('(standalone)');
+      const output = await observeOutput(() => handleError(new ServerlessError('Test error')));
+      expect(output).to.have.string('(standalone)');
     });
   } else {
     it('should support `isLocallyInstalled` option', async () => {
-      let stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        () => handleError(new ServerlessError('Test error'), { isLocallyInstalled: false })
+      const output = await observeOutput(() =>
+        handleError(new ServerlessError('Test error'), { isLocallyInstalled: false })
       );
-      expect(stdoutData).to.not.have.string('(local)');
-      stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        () => handleError(new ServerlessError('Test error'), { isLocallyInstalled: true })
+      expect(output).to.not.have.string('(local)');
+      const output2 = await observeOutput(() =>
+        handleError(new ServerlessError('Test error'), { isLocallyInstalled: true })
       );
-      expect(stdoutData).to.have.string('(local)');
+      expect(output2).to.have.string('(local)');
     });
   }
 
-  it('should print stack trace with SLS_DEBUG', async () => {
-    let stdoutData = '';
-    process.env.SLS_DEBUG = '1';
-    await overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => handleError(new ServerlessError('Test error'))
-    );
-    expect(stdoutData).to.have.string(path.basename(__filename));
-  });
-
-  it('should not print stack trace without SLS_DEBUG', async () => {
-    let stdoutData = '';
-    delete process.env.SLS_DEBUG;
-    await overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => handleError(new ServerlessError('Test error'))
-    );
-    expect(stdoutData).to.not.have.string(path.basename(__filename));
-  });
-
   it('should handle non-error objects', async () => {
-    let stdoutData = '';
-    await overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => handleError('NON-ERROR')
-    );
-    expect(stdoutData).to.have.string('NON-ERROR');
+    const output = await observeOutput(() => handleError(handleError('NON-ERROR')));
+    expect(output).to.have.string('NON-ERROR');
   });
 
   describe('with mocked telemetry', () => {
@@ -122,14 +77,9 @@ describe('test/unit/lib/cli/handle-error.test.js', () => {
     });
 
     it('should record telemetry only if `hasTelemetryBeenReported` is `false`', async () => {
-      // Override to avoid printing to stdout in tests
-      await overrideStdoutWrite(
-        () => {},
-        () =>
-          handleErrorWithMocks(new ServerlessError('Test error', 'ERR_CODE'), {
-            hasTelemetryBeenReported: false,
-          })
-      );
+      await handleErrorWithMocks(new ServerlessError('Test error', 'ERR_CODE'), {
+        hasTelemetryBeenReported: false,
+      });
       expect(generateTelemetryPayloadStub).to.be.calledOnce;
       expect(storeTelemetryLocallyStub).to.be.calledOnce;
       expect(sendTelemetryStub).to.be.calledOnce;
@@ -143,14 +93,9 @@ describe('test/unit/lib/cli/handle-error.test.js', () => {
     });
 
     it('should add `location` to `failureReason` in telemetry if error code missing', async () => {
-      // Override to avoid printing to stdout in tests
-      await overrideStdoutWrite(
-        () => {},
-        () =>
-          handleErrorWithMocks(new ServerlessError('Test error'), {
-            hasTelemetryBeenReported: false,
-          })
-      );
+      await handleErrorWithMocks(new ServerlessError('Test error'), {
+        hasTelemetryBeenReported: false,
+      });
       expect(generateTelemetryPayloadStub).to.be.calledOnce;
       expect(storeTelemetryLocallyStub).to.be.calledOnce;
       expect(sendTelemetryStub).to.be.calledOnce;
@@ -160,14 +105,9 @@ describe('test/unit/lib/cli/handle-error.test.js', () => {
     });
 
     it('should add `location` to `failureReason` in telemetry for non-user errors', async () => {
-      // Override to avoid printing to stdout in tests
-      await overrideStdoutWrite(
-        () => {},
-        () =>
-          handleErrorWithMocks(new Error('Test error'), {
-            hasTelemetryBeenReported: false,
-          })
-      );
+      await handleErrorWithMocks(new Error('Test error'), {
+        hasTelemetryBeenReported: false,
+      });
       expect(generateTelemetryPayloadStub).to.be.calledOnce;
       expect(storeTelemetryLocallyStub).to.be.calledOnce;
       expect(sendTelemetryStub).to.be.calledOnce;
@@ -177,25 +117,16 @@ describe('test/unit/lib/cli/handle-error.test.js', () => {
     });
 
     it('should not record telemetry if `hasTelemetryBeenReported` is `true`', async () => {
-      // Override to avoid printing to stdout in tests
-      await overrideStdoutWrite(
-        () => {},
-        () =>
-          handleErrorWithMocks(new ServerlessError('Test error'), {
-            hasTelemetryBeenReported: true,
-          })
-      );
+      await handleErrorWithMocks(new ServerlessError('Test error'), {
+        hasTelemetryBeenReported: true,
+      });
       expect(generateTelemetryPayloadStub).not.to.be.called;
       expect(storeTelemetryLocallyStub).not.to.be.called;
       expect(sendTelemetryStub).not.to.be.called;
     });
 
     it('should not record telemetry if `hasTelemetryBeenReported` is not passed', async () => {
-      // Override to avoid printing to stdout in tests
-      await overrideStdoutWrite(
-        () => {},
-        () => handleErrorWithMocks(new ServerlessError('Test error'))
-      );
+      await handleErrorWithMocks(new ServerlessError('Test error'));
       expect(generateTelemetryPayloadStub).not.to.be.called;
       expect(storeTelemetryLocallyStub).not.to.be.called;
       expect(sendTelemetryStub).not.to.be.called;
@@ -205,14 +136,9 @@ describe('test/unit/lib/cli/handle-error.test.js', () => {
       // Ensure that `commandSchema` is not included in result of `resolveInput`
       resolveInputStub.returns({});
 
-      // Override to avoid printing to stdout in tests
-      await overrideStdoutWrite(
-        () => {},
-        () =>
-          handleErrorWithMocks(new ServerlessError('Test error'), {
-            hasTelemetryBeenReported: false,
-          })
-      );
+      await handleErrorWithMocks(new ServerlessError('Test error'), {
+        hasTelemetryBeenReported: false,
+      });
       expect(generateTelemetryPayloadStub).not.to.be.called;
       expect(storeTelemetryLocallyStub).not.to.be.called;
       expect(sendTelemetryStub).not.to.be.called;
diff --git a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
index 17ab8804442..ab73d811787 100644
--- a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
+++ b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
@@ -197,7 +197,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
     ).to.be.true;
   });
 
-  it('Should emit warning when dashboard is not available when fetching providers', async () => {
+  it('Should be ineffective dashboard is not available', async () => {
     const internalMockedSdk = {
       ...mockedSdk,
       getProviders: async () => {
@@ -213,20 +213,13 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
     });
 
-    let stdoutData = '';
-    await overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      async () =>
-        expect(
-          await mockedStep.isApplicable({
-            serviceDir: process.cwd(),
-            configuration: { provider: { name: 'aws' }, org: 'someorg' },
-            configurationFilename: 'serverless.yml',
-          })
-        ).to.be.false
-    );
-
-    expect(stdoutData).to.include('Serverless Dashboard is currently unavailable');
+    expect(
+      await mockedStep.isApplicable({
+        serviceDir: process.cwd(),
+        configuration: { provider: { name: 'aws' }, org: 'someorg' },
+        configurationFilename: 'serverless.yml',
+      })
+    ).to.be.false;
   });
 
   it('Should be effective, at AWS service and no credentials are set', async () =>
@@ -238,7 +231,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       })
     ).to.equal(true));
 
-  it('Should emit a message when user decides to skip credentials setup', async () => {
+  it('Should allow to skip credentials setup', async () => {
     configureInquirerStub(inquirer, {
       list: { credentialsSetupChoice: '_skip_' },
     });
@@ -256,7 +249,6 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       async () => await step.run(context)
     );
 
-    expect(stdoutData).to.include('You can setup your AWS account later');
     expect(context.stepHistory.valuesMap()).to.deep.equal(
       new Map([['credentialsSetupChoice', '_skip_']])
     );
@@ -464,7 +456,6 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         list: { credentialsSetupChoice: '_create_provider_' },
       });
 
-      let stdoutData = '';
       const context = {
         serviceDir: process.cwd(),
         configuration: {
@@ -477,12 +468,8 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         configurationFilename: 'serverless.yml',
         stepHistory: new StepHistory(),
       };
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        async () => await mockedStep.run(context)
-      );
+      await mockedStep.run(context);
 
-      expect(stdoutData).to.include('AWS Access Role provider was successfully created');
       expect(mockedOpenBrowser).to.have.been.calledWith(
         'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
       );
@@ -551,13 +538,8 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         configurationFilename: 'serverless.yml',
         stepHistory: new StepHistory(),
       };
-      let stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        async () => await mockedStep.run(context)
-      );
+      await mockedStep.run(context);
 
-      expect(stdoutData).to.include('AWS Access Role provider was successfully created');
       expect(mockedOpenBrowser).to.have.been.calledWith(
         'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
       );
@@ -605,13 +587,8 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         configurationFilename: 'serverless.yml',
         stepHistory: new StepHistory(),
       };
-      let stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        async () => await mockedStep.run(context)
-      );
+      await mockedStep.run(context);
 
-      expect(stdoutData).to.include('Serverless Dashboard is currently unavailable');
       expect(mockedOpenBrowser).to.have.been.calledWith(
         'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
       );
@@ -664,11 +641,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         configurationFilename: 'serverless.yml',
         stepHistory: new StepHistory(),
       };
-      let stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        async () => await mockedStep.run(context)
-      );
+      await mockedStep.run(context);
 
       expect(mockedCreateProviderLink).to.have.been.calledWith(
         'org-uid',
@@ -676,13 +649,12 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         'appName|someapp|serviceName|someservice|stage|dev|region|us-east-1',
         'provideruid'
       );
-      expect(stdoutData).to.include('Selected provider was successfully linked');
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([['credentialsSetupChoice', '_user_choice_']])
       );
     });
 
-    it('Should emit a warning when dashboard is not available and link cannot be created', async () => {
+    it('Should handle gently dashboard unavailabiilty when linking provider', async () => {
       const providerUid = 'provideruid';
       const mockedCreateProviderLink = sinon.stub().callsFake(async () => {
         const err = new Error('error');
@@ -730,16 +702,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         stepHistory: new StepHistory(),
         configurationFilename: 'serverless.yml',
       };
-      let stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        async () => await mockedStep.run(context)
-      );
-
-      expect(stdoutData).to.include(
-        'Serverless Dashboard is currently unavailable, please try again later'
-      );
-      expect(stdoutData).not.to.include('Selected provider was successfully linked');
+      await mockedStep.run(context);
       expect(mockedCreateProviderLink).to.have.been.calledWith(
         'org-uid',
         'instance',
@@ -752,7 +715,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       );
     });
 
-    it('Should emit a warning when dashboard is not available when fetching providers', async () => {
+    it('Should handle gently dashboard unavailabiilty when fetching providers', async () => {
       const internalMockedSdk = {
         ...mockedSdk,
         getProviders: async () => {
@@ -768,19 +731,12 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
       });
 
-      let stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        async () =>
-          await mockedStep.run({
-            serviceDir: process.cwd(),
-            configuration: { provider: { name: 'aws' }, org: 'someorg' },
-            options: {},
-            configurationFilename: 'serverless.yml',
-          })
-      );
-
-      expect(stdoutData).to.include('Serverless Dashboard is currently unavailable');
+      await mockedStep.run({
+        serviceDir: process.cwd(),
+        configuration: { provider: { name: 'aws' }, org: 'someorg' },
+        options: {},
+        configurationFilename: 'serverless.yml',
+      });
     });
   });
 });
diff --git a/test/unit/lib/cli/interactive-setup/dashboard-login.test.js b/test/unit/lib/cli/interactive-setup/dashboard-login.test.js
index 51835424b7d..8061bd02b5a 100644
--- a/test/unit/lib/cli/interactive-setup/dashboard-login.test.js
+++ b/test/unit/lib/cli/interactive-setup/dashboard-login.test.js
@@ -5,7 +5,6 @@ const sinon = require('sinon');
 const proxyquire = require('proxyquire');
 const overrideCwd = require('process-utils/override-cwd');
 const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const { StepHistory } = require('@serverless/utils/telemetry');
 const inquirer = require('@serverless/utils/inquirer');
 
@@ -123,20 +122,11 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-login.test.js', function
       inquirer,
       stepHistory: new StepHistory(),
     };
-    let stdoutData = '';
-    await overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      async () => {
-        await loginStep.run(context);
-      }
-    );
+    await loginStep.run(context);
     expect(loginStub.calledOnce).to.be.true;
     expect(context.stepHistory.valuesMap()).to.deep.equal(
       new Map([['shouldLoginOrRegister', true]])
     );
-    expect(stdoutData).to.include(
-      'Enable Serverless Dashboard to get enhanced monitoring, logs and secrets management: https://serverless.com/monitoring'
-    );
   });
 
   it('Should login and skip question when user providers `org` option', async () => {
@@ -198,19 +188,10 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-login.test.js', function
       inquirer,
       stepHistory: new StepHistory(),
     };
-    let stdoutData = '';
-    await overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      async () => {
-        await loginStep.run(context);
-      }
-    );
+    await loginStep.run(context);
     expect(loginStub.called).to.be.false;
     expect(context.stepHistory.valuesMap()).to.deep.equal(
       new Map([['shouldLoginOrRegister', false]])
     );
-    expect(stdoutData).to.include(
-      'Enable Serverless Dashboard to get enhanced monitoring, logs and secrets management: https://serverless.com/monitoring'
-    );
   });
 });
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
index d8d2e7222bd..491311be90e 100644
--- a/test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js
+++ b/test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js
@@ -7,10 +7,8 @@ const proxyquire = require('proxyquire');
 const fsp = require('fs').promises;
 const yaml = require('js-yaml');
 const overrideCwd = require('process-utils/override-cwd');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const overrideEnv = require('process-utils/override-env');
 const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
-const stripAnsi = require('strip-ansi');
 const { StepHistory } = require('@serverless/utils/telemetry');
 const inquirer = require('@serverless/utils/inquirer');
 
@@ -328,16 +326,11 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         inquirer,
         stepHistory: new StepHistory(),
       };
-      let stdoutData = '';
+
       await overrideCwd(serviceDir, async () => {
-        await overrideStdoutWrite(
-          (data) => (stdoutData += data),
-          async () => {
-            const stepData = await step.isApplicable(context);
-            if (!stepData) throw new Error('Step resolved as not applicable');
-            await step.run(context, stepData);
-          }
-        );
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
       });
       const serviceConfig = yaml.load(
         String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
@@ -346,9 +339,6 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       expect(serviceConfig.app).to.equal('other-app');
       expect(context.configuration.org).to.equal('testinteractivecli');
       expect(context.configuration.app).to.equal('other-app');
-      expect(stripAnsi(stdoutData)).to.include(
-        'Your project has been setup with org testinteractivecli and app other-app'
-      );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
           ['orgName', '_user_choice_'],
@@ -373,17 +363,11 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         inquirer,
         stepHistory: new StepHistory(),
       };
-      let stdoutData = '';
       await overrideEnv({ variables: { SERVERLESS_ACCESS_KEY: 'validkey' } }, async () => {
         await overrideCwd(serviceDir, async () => {
-          await overrideStdoutWrite(
-            (data) => (stdoutData += data),
-            async () => {
-              const stepData = await step.isApplicable(context);
-              if (!stepData) throw new Error('Step resolved as not applicable');
-              await step.run(context, stepData);
-            }
-          );
+          const stepData = await step.isApplicable(context);
+          if (!stepData) throw new Error('Step resolved as not applicable');
+          await step.run(context, stepData);
         });
       });
       const serviceConfig = yaml.load(
@@ -393,9 +377,6 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       expect(serviceConfig.app).to.equal('other-app');
       expect(context.configuration.org).to.equal('fromaccesskey');
       expect(context.configuration.app).to.equal('other-app');
-      expect(stripAnsi(stdoutData)).to.include(
-        'Your project has been setup with org fromaccesskey and app other-app'
-      );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
           ['orgName', '_user_choice_'],
@@ -420,17 +401,11 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         inquirer,
         stepHistory: new StepHistory(),
       };
-      let stdoutData = '';
       await overrideEnv({ variables: { SERVERLESS_ACCESS_KEY: 'validkey' } }, async () => {
         await overrideCwd(serviceDir, async () => {
-          await overrideStdoutWrite(
-            (data) => (stdoutData += data),
-            async () => {
-              const stepData = await step.isApplicable(context);
-              if (!stepData) throw new Error('Step resolved as not applicable');
-              await step.run(context, stepData);
-            }
-          );
+          const stepData = await step.isApplicable(context);
+          if (!stepData) throw new Error('Step resolved as not applicable');
+          await step.run(context, stepData);
         });
       });
       const serviceConfig = yaml.load(
@@ -600,16 +575,10 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         stepHistory: new StepHistory(),
       };
 
-      let stdoutData = '';
       await overrideCwd(serviceDir, async () => {
-        await overrideStdoutWrite(
-          (data) => (stdoutData += data),
-          async () => {
-            const stepData = await step.isApplicable(context);
-            if (!stepData) throw new Error('Step resolved as not applicable');
-            await step.run(context, stepData);
-          }
-        );
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
       });
       const serviceConfig = yaml.load(
         String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
@@ -618,9 +587,6 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       expect(serviceConfig.app).to.equal(configuration.service);
       expect(context.configuration.org).to.equal('orgwithoutapps');
       expect(context.configuration.app).to.equal(configuration.service);
-      expect(stripAnsi(stdoutData)).to.include(
-        `Your project has been setup with org orgwithoutapps and app ${configuration.service}`
-      );
       expect(context.stepHistory.valuesMap()).to.deep.equal(new Map());
     });
   });
@@ -641,16 +607,10 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         stepHistory: new StepHistory(),
       };
 
-      let stdoutData = '';
       await overrideCwd(serviceDir, async () => {
-        await overrideStdoutWrite(
-          (data) => (stdoutData += data),
-          async () => {
-            const stepData = await step.isApplicable(context);
-            if (!stepData) throw new Error('Step resolved as not applicable');
-            await step.run(context, stepData);
-          }
-        );
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
       });
       const serviceConfig = yaml.load(
         String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
@@ -659,9 +619,6 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       expect(serviceConfig.app).to.equal('other-app');
       expect(context.configuration.org).to.equal('testinteractivecli');
       expect(context.configuration.app).to.equal('other-app');
-      expect(stripAnsi(stdoutData)).to.include(
-        'Your project has been setup with org testinteractivecli and app other-app'
-      );
       expect(context.stepHistory.valuesMap()).to.deep.equal(new Map());
     });
 
@@ -683,16 +640,10 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         stepHistory: new StepHistory(),
       };
 
-      let stdoutData = '';
       await overrideCwd(serviceDir, async () => {
-        await overrideStdoutWrite(
-          (data) => (stdoutData += data),
-          async () => {
-            const stepData = await step.isApplicable(context);
-            if (!stepData) throw new Error('Step resolved as not applicable');
-            await step.run(context, stepData);
-          }
-        );
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
       });
       const serviceConfig = yaml.load(
         String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
@@ -701,9 +652,6 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       expect(serviceConfig.app).to.equal('app-from-flag');
       expect(context.configuration.org).to.equal('otherorg');
       expect(context.configuration.app).to.equal('app-from-flag');
-      expect(stripAnsi(stdoutData)).to.include(
-        'Your project has been setup with org otherorg and app app-from-flag'
-      );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([['shouldOverrideDashboardConfig', true]])
       );
@@ -758,16 +706,10 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         stepHistory: new StepHistory(),
       };
 
-      let stdoutData = '';
       await overrideCwd(serviceDir, async () => {
-        await overrideStdoutWrite(
-          (data) => (stdoutData += data),
-          async () => {
-            const stepData = await step.isApplicable(context);
-            if (!stepData) throw new Error('Step resolved as not applicable');
-            await step.run(context, stepData);
-          }
-        );
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
       });
       const serviceConfig = yaml.load(
         String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
@@ -776,9 +718,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       expect(serviceConfig.app).to.equal('other-app');
       expect(context.configuration.org).to.equal('testinteractivecli');
       expect(context.configuration.app).to.equal('other-app');
-      expect(stripAnsi(stdoutData)).to.include(
-        'Your project has been setup with org testinteractivecli and app other-app'
-      );
+
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
           ['orgName', '_user_choice_'],
@@ -807,16 +747,10 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         stepHistory: new StepHistory(),
       };
 
-      let stdoutData = '';
       await overrideCwd(serviceDir, async () => {
-        await overrideStdoutWrite(
-          (data) => (stdoutData += data),
-          async () => {
-            const stepData = await step.isApplicable(context);
-            if (!stepData) throw new Error('Step resolved as not applicable');
-            await step.run(context, stepData);
-          }
-        );
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
       });
       const serviceConfig = yaml.load(
         String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
@@ -825,9 +759,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       expect(serviceConfig.app).to.equal('other-app');
       expect(context.configuration.org).to.equal('otherorg');
       expect(context.configuration.app).to.equal('other-app');
-      expect(stripAnsi(stdoutData)).to.include(
-        'Your project has been setup with org otherorg and app other-app'
-      );
+
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
           ['orgName', '_user_choice_'],
@@ -855,16 +787,10 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         history: new Map(),
         stepHistory: new StepHistory(),
       };
-      let stdoutData = '';
       await overrideCwd(serviceDir, async () => {
-        await overrideStdoutWrite(
-          (data) => (stdoutData += data),
-          async () => {
-            const stepData = await step.isApplicable(context);
-            if (!stepData) throw new Error('Step resolved as not applicable');
-            await step.run(context, stepData);
-          }
-        );
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
       });
       const serviceConfig = yaml.load(
         String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
@@ -873,9 +799,6 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       expect(serviceConfig.app).to.equal('other-app');
       expect(context.configuration.org).to.equal('testinteractivecli');
       expect(context.configuration.app).to.equal('other-app');
-      expect(stripAnsi(stdoutData)).to.include(
-        'Your project has been setup with org testinteractivecli and app other-app'
-      );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
           ['orgName', '_user_choice_'],
@@ -903,16 +826,10 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         stepHistory: new StepHistory(),
       };
 
-      let stdoutData = '';
       await overrideCwd(serviceDir, async () => {
-        await overrideStdoutWrite(
-          (data) => (stdoutData += data),
-          async () => {
-            const stepData = await step.isApplicable(context);
-            if (!stepData) throw new Error('Step resolved as not applicable');
-            await step.run(context, stepData);
-          }
-        );
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
       });
       const serviceConfig = yaml.load(
         String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
@@ -921,9 +838,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       expect(serviceConfig.app).to.equal('other-app');
       expect(context.configuration.org).to.equal('testinteractivecli');
       expect(context.configuration.app).to.equal('other-app');
-      expect(stripAnsi(stdoutData)).to.include(
-        'Your project has been setup with org testinteractivecli and app other-app'
-      );
+
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([['appName', '_user_choice_']])
       );
@@ -947,16 +862,10 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         history: new Map(),
         stepHistory: new StepHistory(),
       };
-      let stdoutData = '';
       await overrideCwd(serviceDir, async () => {
-        await overrideStdoutWrite(
-          (data) => (stdoutData += data),
-          async () => {
-            const stepData = await step.isApplicable(context);
-            if (!stepData) throw new Error('Step resolved as not applicable');
-            await step.run(context, stepData);
-          }
-        );
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
       });
       const serviceConfig = yaml.load(
         String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
@@ -965,9 +874,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       expect(serviceConfig.app).to.equal('frominput');
       expect(context.configuration.org).to.equal('testinteractivecli');
       expect(context.configuration.app).to.equal('frominput');
-      expect(stripAnsi(stdoutData)).to.include(
-        'Your project has been setup with org testinteractivecli and app frominput'
-      );
+
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
           ['orgName', '_user_choice_'],
@@ -997,16 +904,10 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         history: new Map(),
         stepHistory: new StepHistory(),
       };
-      let stdoutData = '';
       await overrideCwd(serviceDir, async () => {
-        await overrideStdoutWrite(
-          (data) => (stdoutData += data),
-          async () => {
-            const stepData = await step.isApplicable(context);
-            if (!stepData) throw new Error('Step resolved as not applicable');
-            await step.run(context, stepData);
-          }
-        );
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
       });
       const serviceConfig = yaml.load(
         String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
@@ -1015,9 +916,6 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       expect(serviceConfig.app).to.equal('other-app');
       expect(context.configuration.org).to.equal('testinteractivecli');
       expect(context.configuration.app).to.equal('other-app');
-      expect(stripAnsi(stdoutData)).to.include(
-        'Your project has been setup with org testinteractivecli and app other-app'
-      );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
           ['shouldUpdateOrg', true],
@@ -1047,16 +945,10 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         stepHistory: new StepHistory(),
       };
 
-      let stdoutData = '';
       await overrideCwd(serviceDir, async () => {
-        await overrideStdoutWrite(
-          (data) => (stdoutData += data),
-          async () => {
-            const stepData = await step.isApplicable(context);
-            if (!stepData) throw new Error('Step resolved as not applicable');
-            await step.run(context, stepData);
-          }
-        );
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
       });
       const serviceConfig = yaml.load(
         String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
@@ -1065,9 +957,6 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       expect(serviceConfig.app).to.equal('other-app');
       expect(context.configuration.org).to.equal('testinteractivecli');
       expect(context.configuration.app).to.equal('other-app');
-      expect(stripAnsi(stdoutData)).to.include(
-        'Your project has been setup with org testinteractivecli and app other-app'
-      );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([['appName', '_user_choice_']])
       );
@@ -1090,16 +979,10 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         stepHistory: new StepHistory(),
       };
 
-      let stdoutData = '';
       await overrideCwd(serviceDir, async () => {
-        await overrideStdoutWrite(
-          (data) => (stdoutData += data),
-          async () => {
-            const stepData = await step.isApplicable(context);
-            if (!stepData) throw new Error('Step resolved as not applicable');
-            await step.run(context, stepData);
-          }
-        );
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
       });
       const serviceConfig = yaml.load(
         String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
@@ -1108,9 +991,6 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       expect(serviceConfig.app).to.equal('app-from-flag');
       expect(context.configuration.org).to.equal('testinteractivecli');
       expect(context.configuration.app).to.equal('app-from-flag');
-      expect(stripAnsi(stdoutData)).to.include(
-        'Your project has been setup with org testinteractivecli and app app-from-flag'
-      );
       expect(context.stepHistory.valuesMap()).to.deep.equal(new Map());
     });
 
@@ -1130,16 +1010,10 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         stepHistory: new StepHistory(),
       };
 
-      let stdoutData = '';
       await overrideCwd(serviceDir, async () => {
-        await overrideStdoutWrite(
-          (data) => (stdoutData += data),
-          async () => {
-            const stepData = await step.isApplicable(context);
-            if (!stepData) throw new Error('Step resolved as not applicable');
-            await step.run(context, stepData);
-          }
-        );
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
       });
       const serviceConfig = yaml.load(
         String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
@@ -1148,9 +1022,6 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       expect(serviceConfig.app).to.equal(configuration.service);
       expect(context.configuration.org).to.equal('orgwithoutapps');
       expect(context.configuration.app).to.equal(configuration.service);
-      expect(stripAnsi(stdoutData)).to.include(
-        `Your project has been setup with org orgwithoutapps and app ${configuration.service}`
-      );
       expect(context.stepHistory.valuesMap()).to.deep.equal(new Map());
     });
 
@@ -1172,16 +1043,10 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         stepHistory: new StepHistory(),
       };
 
-      let stdoutData = '';
       await overrideCwd(serviceDir, async () => {
-        await overrideStdoutWrite(
-          (data) => (stdoutData += data),
-          async () => {
-            const stepData = await step.isApplicable(context);
-            if (!stepData) throw new Error('Step resolved as not applicable');
-            await step.run(context, stepData);
-          }
-        );
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
       });
       const serviceConfig = yaml.load(
         String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
@@ -1190,9 +1055,6 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       expect(serviceConfig.app).to.equal('other-app');
       expect(context.configuration.org).to.equal('testinteractivecli');
       expect(context.configuration.app).to.equal('other-app');
-      expect(stripAnsi(stdoutData)).to.include(
-        'Your project has been setup with org testinteractivecli and app other-app'
-      );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([['appName', '_user_choice_']])
       );
@@ -1224,16 +1086,10 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         stepHistory: new StepHistory(),
       };
 
-      let stdoutData = '';
       await overrideCwd(serviceDir, async () => {
-        await overrideStdoutWrite(
-          (data) => (stdoutData += data),
-          async () => {
-            const stepData = await step.isApplicable(context);
-            if (!stepData) throw new Error('Step resolved as not applicable');
-            await step.run(context, stepData);
-          }
-        );
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
       });
       const serviceConfig = yaml.load(
         String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
@@ -1242,9 +1098,6 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       expect(serviceConfig.app).to.equal('not-created-app');
       expect(context.configuration.org).to.equal('testinteractivecli');
       expect(context.configuration.app).to.equal('not-created-app');
-      expect(stripAnsi(stdoutData)).to.include(
-        'Your project has been setup with org testinteractivecli and app not-created-app'
-      );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([['appUpdateType', '_create_']])
       );
@@ -1274,16 +1127,10 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
         stepHistory: new StepHistory(),
       };
 
-      let stdoutData = '';
       await overrideCwd(serviceDir, async () => {
-        await overrideStdoutWrite(
-          (data) => (stdoutData += data),
-          async () => {
-            const stepData = await step.isApplicable(context);
-            if (!stepData) throw new Error('Step resolved as not applicable');
-            await step.run(context, stepData);
-          }
-        );
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
       });
       const serviceConfig = yaml.load(
         String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
@@ -1292,9 +1139,6 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       expect(serviceConfig.app).to.equal('other-app');
       expect(context.configuration.org).to.equal('testinteractivecli');
       expect(context.configuration.app).to.equal('other-app');
-      expect(stripAnsi(stdoutData)).to.include(
-        'Your project has been setup with org testinteractivecli and app other-app'
-      );
       expect(context.stepHistory.valuesMap()).to.deep.equal(
         new Map([
           ['appUpdateType', '_choose_existing_'],
diff --git a/test/unit/lib/cli/interactive-setup/deploy.test.js b/test/unit/lib/cli/interactive-setup/deploy.test.js
index 271ea53d1ed..8d26082e397 100644
--- a/test/unit/lib/cli/interactive-setup/deploy.test.js
+++ b/test/unit/lib/cli/interactive-setup/deploy.test.js
@@ -1,13 +1,11 @@
 'use strict';
 
-const stripAnsi = require('strip-ansi');
 const chai = require('chai');
 const sinon = require('sinon');
 const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
 const overrideEnv = require('process-utils/override-env');
 const step = require('../../../../../lib/cli/interactive-setup/deploy');
 const proxyquire = require('proxyquire');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const { StepHistory } = require('@serverless/utils/telemetry');
 
 const { expect } = chai;
@@ -89,16 +87,8 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
           isInServiceContext: false,
         },
       };
-      let stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        async () => await step.run(context)
-      );
-
-      expect(stripAnsi(stdoutData)).to.include(
-        'Your project is ready for deployment and available in'
-      );
-      expect(stripAnsi(stdoutData)).to.include('Run serverless in the project directory');
+      await step.run(context);
+
       expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', false]]));
     });
 
@@ -119,14 +109,8 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
           isInServiceContext: true,
         },
       };
-      let stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        async () => await step.run(context)
-      );
-
-      expect(stripAnsi(stdoutData)).to.include('Your project is ready for deployment\n');
-      expect(stripAnsi(stdoutData)).to.include('Run serverless in the project directory');
+      await step.run(context);
+
       expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', false]]));
     });
 
@@ -149,18 +133,8 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
           isInServiceContext: false,
         },
       };
-      let stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        async () => await step.run(context)
-      );
-
-      expect(stripAnsi(stdoutData)).to.include(
-        'Your project is ready for deployment and available in'
-      );
-      expect(stripAnsi(stdoutData)).to.include(
-        'Invoke your functions and view logs in the dashboard'
-      );
+      await step.run(context);
+
       expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', false]]));
     });
 
@@ -183,16 +157,8 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
           isInServiceContext: true,
         },
       };
-      let stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        async () => await step.run(context)
-      );
-
-      expect(stripAnsi(stdoutData)).to.include('Your project is ready for deployment\n');
-      expect(stripAnsi(stdoutData)).to.include(
-        'Invoke your functions and view logs in the dashboard'
-      );
+      await step.run(context);
+
       expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', false]]));
     });
 
@@ -243,16 +209,7 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
           isInServiceContext: false,
         },
       };
-      let stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        async () => await mockedStep.run(context)
-      );
-
-      expect(stripAnsi(stdoutData)).to.include('Your project is live and available');
-      expect(stripAnsi(stdoutData)).to.include(
-        'Open https://app.serverless-dev.com/path/to/dashboard'
-      );
+      await mockedStep.run(context);
 
       expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', true]]));
     });
@@ -304,16 +261,7 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
           isInServiceContext: true,
         },
       };
-      let stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        async () => await mockedStep.run(context)
-      );
-
-      expect(stripAnsi(stdoutData)).to.include('Your project is live\n');
-      expect(stripAnsi(stdoutData)).to.include(
-        'Open https://app.serverless-dev.com/path/to/dashboard'
-      );
+      await mockedStep.run(context);
 
       expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', true]]));
     });
@@ -359,14 +307,8 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
           isInServiceContext: false,
         },
       };
-      let stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        async () => await mockedStep.run(context)
-      );
-
-      expect(stripAnsi(stdoutData)).to.include('Your project is live and available');
-      expect(stripAnsi(stdoutData)).to.include('Run serverless');
+      await mockedStep.run(context);
+
       expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', true]]));
     });
 
@@ -411,14 +353,8 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
           isInServiceContext: true,
         },
       };
-      let stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        async () => await mockedStep.run(context)
-      );
-
-      expect(stripAnsi(stdoutData)).to.include('Your project is live\n');
-      expect(stripAnsi(stdoutData)).to.include('Run serverless');
+      await mockedStep.run(context);
+
       expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', true]]));
     });
   });
diff --git a/test/unit/lib/cli/interactive-setup/service.test.js b/test/unit/lib/cli/interactive-setup/service.test.js
index 48e69a43254..695dbd54cb6 100644
--- a/test/unit/lib/cli/interactive-setup/service.test.js
+++ b/test/unit/lib/cli/interactive-setup/service.test.js
@@ -6,7 +6,6 @@ const sinon = require('sinon');
 const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
 const step = require('../../../../../lib/cli/interactive-setup/service');
 const proxyquire = require('proxyquire');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const ServerlessError = require('../../../../../lib/serverless-error');
 const { StepHistory } = require('@serverless/utils/telemetry');
 
@@ -208,51 +207,6 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       );
     });
 
-    it('Should emit warning if npm installation not found', async () => {
-      const downloadTemplateFromRepoStub = sinon.stub();
-      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
-        'child-process-ext/spawn': sinon.stub().rejects({ code: 'ENOENT' }),
-        '../../utils/downloadTemplateFromRepo': {
-          downloadTemplateFromRepo: downloadTemplateFromRepoStub.callsFake(
-            async (templateUrl, projectType, projectName) => {
-              await fsp.mkdir(projectName);
-              const serverlessYmlContent = `
-            service: service
-            provider:
-              name: aws
-           `;
-
-              await fsp.writeFile(path.join(projectName, 'serverless.yml'), serverlessYmlContent);
-              await fsp.writeFile(path.join(projectName, 'package.json'), '{}');
-            }
-          ),
-        },
-      });
-
-      configureInquirerStub(inquirer, {
-        list: { projectType: 'aws-nodejs' },
-        input: { projectName: 'test-project-missing-npm' },
-      });
-
-      const context = { options: {}, stepHistory: new StepHistory() };
-      let stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        async () => mockedStep.run(context)
-      );
-
-      const stats = await fsp.lstat('test-project-missing-npm/serverless.yml');
-      expect(stats.isFile()).to.be.true;
-      expect(stdoutData).to.include('Cannot install dependencies');
-
-      expect(context.stepHistory.valuesMap()).to.deep.equal(
-        new Map([
-          ['projectType', 'aws-nodejs'],
-          ['projectName', '_user_input_'],
-        ])
-      );
-    });
-
     it('Should emit warning if npm installation not found', async () => {
       const downloadTemplateFromRepoStub = sinon.stub();
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
diff --git a/test/unit/lib/cli/render-help/command.test.js b/test/unit/lib/cli/render-help/command.test.js
index 02e8a8e1728..6fb7d00ab63 100644
--- a/test/unit/lib/cli/render-help/command.test.js
+++ b/test/unit/lib/cli/render-help/command.test.js
@@ -1,31 +1,23 @@
 'use strict';
 
 const { expect } = require('chai');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const renderCommandHelp = require('../../../../../lib/cli/render-help/command');
 const commandsSchema = require('../../../../../lib/cli/commands-schema');
+const observeOutput = require('@serverless/test/observe-output');
 
 describe('test/unit/lib/cli/render-help/command.test.js', () => {
-  it('should show help', () => {
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => renderCommandHelp('deploy')
-    );
-    expect(stdoutData).to.have.string('deploy');
-    expect(stdoutData).to.have.string('deploy function');
-    expect(stdoutData).to.have.string('--help');
-    expect(stdoutData).to.have.string(commandsSchema.get('deploy').usage);
-    expect(stdoutData).to.have.string(commandsSchema.get('deploy function').usage);
+  it('should show help', async () => {
+    const output = await observeOutput(() => renderCommandHelp('deploy'));
+    expect(output).to.have.string('deploy');
+    expect(output).to.have.string('deploy function');
+    expect(output).to.have.string('--help');
+    expect(output).to.have.string(commandsSchema.get('deploy').usage);
+    expect(output).to.have.string(commandsSchema.get('deploy function').usage);
   });
-  it('should show help for container command', () => {
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => renderCommandHelp('config tabcompletion')
-    );
-    expect(stdoutData).to.have.string('config tabcompletion install');
-    expect(stdoutData).to.have.string(commandsSchema.get('config tabcompletion install').usage);
-    expect(stdoutData).to.have.string(commandsSchema.get('config tabcompletion uninstall').usage);
+  it('should show help for container command', async () => {
+    const output = await observeOutput(() => renderCommandHelp('config tabcompletion'));
+    expect(output).to.have.string('config tabcompletion install');
+    expect(output).to.have.string(commandsSchema.get('config tabcompletion install').usage);
+    expect(output).to.have.string(commandsSchema.get('config tabcompletion uninstall').usage);
   });
 });
diff --git a/test/unit/lib/cli/render-help/general.test.js b/test/unit/lib/cli/render-help/general.test.js
index 9e5fb8b3e58..240a1d63328 100644
--- a/test/unit/lib/cli/render-help/general.test.js
+++ b/test/unit/lib/cli/render-help/general.test.js
@@ -1,17 +1,13 @@
 'use strict';
 
 const { expect } = require('chai');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const renderGeneralHelp = require('../../../../../lib/cli/render-help/general');
+const observeOutput = require('@serverless/test/observe-output');
 
 describe('test/unit/lib/cli/render-help/general.test.js', () => {
-  it('should show help', () => {
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => renderGeneralHelp(new Set())
-    );
-    expect(stdoutData).to.have.string('General Commands');
-    expect(stdoutData).to.have.string('deploy function');
+  it('should show help', async () => {
+    const output = await observeOutput(() => renderGeneralHelp(new Set()));
+    expect(output).to.have.string('Usage');
+    expect(output).to.have.string('deploy function');
   });
 });
diff --git a/test/unit/lib/cli/render-help/index.test.js b/test/unit/lib/cli/render-help/index.test.js
index 986c45a1668..54d6f0cc0a9 100644
--- a/test/unit/lib/cli/render-help/index.test.js
+++ b/test/unit/lib/cli/render-help/index.test.js
@@ -3,11 +3,11 @@
 const { expect } = require('chai');
 const overrideArgv = require('process-utils/override-argv');
 const resolveInput = require('../../../../../lib/cli/resolve-input');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const renderHelp = require('../../../../../lib/cli/render-help');
+const observeOutput = require('@serverless/test/observe-output');
 
 describe('test/unit/lib/cli/render-help/index.test.js', () => {
-  it('should show general help on main command', () => {
+  it('should show general help on main command', async () => {
     resolveInput.clear();
     overrideArgv(
       {
@@ -15,16 +15,12 @@ describe('test/unit/lib/cli/render-help/index.test.js', () => {
       },
       () => resolveInput()
     );
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => renderHelp(new Set())
-    );
-    expect(stdoutData).to.have.string('General Commands');
-    expect(stdoutData).to.have.string('deploy function');
+    const output = await observeOutput(() => renderHelp(new Set()));
+    expect(output).to.have.string('Usage');
+    expect(output).to.have.string('deploy function');
   });
 
-  it('should show interactive help when requested', () => {
+  it('should show interactive help when requested', async () => {
     resolveInput.clear();
     overrideArgv(
       {
@@ -32,16 +28,12 @@ describe('test/unit/lib/cli/render-help/index.test.js', () => {
       },
       () => resolveInput()
     );
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => renderHelp(new Set())
-    );
-    expect(stdoutData).to.have.string('Interactive CLI');
-    expect(stdoutData).to.have.string('--help-interactive');
+    const output = await observeOutput(() => renderHelp(new Set()));
+    expect(output).to.have.string('Interactive CLI');
+    expect(output).to.have.string('--help-interactive');
   });
 
-  it('should show general help on help command', () => {
+  it('should show general help on help command', async () => {
     resolveInput.clear();
     overrideArgv(
       {
@@ -49,16 +41,12 @@ describe('test/unit/lib/cli/render-help/index.test.js', () => {
       },
       () => resolveInput()
     );
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => renderHelp(new Set())
-    );
-    expect(stdoutData).to.have.string('General Commands');
-    expect(stdoutData).to.have.string('deploy function');
+    const output = await observeOutput(() => renderHelp(new Set()));
+    expect(output).to.have.string('Usage');
+    expect(output).to.have.string('deploy function');
   });
 
-  it('should show specific commmand help with specific command', () => {
+  it('should show specific commmand help with specific command', async () => {
     resolveInput.clear();
     const { commandsSchema } = overrideArgv(
       {
@@ -66,15 +54,11 @@ describe('test/unit/lib/cli/render-help/index.test.js', () => {
       },
       () => resolveInput()
     );
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => renderHelp(new Set())
-    );
-    expect(stdoutData).to.have.string('deploy');
-    expect(stdoutData).to.have.string('deploy function');
-    expect(stdoutData).to.have.string('--help');
-    expect(stdoutData).to.have.string(commandsSchema.get('deploy').usage);
-    expect(stdoutData).to.have.string(commandsSchema.get('deploy function').usage);
+    const output = await observeOutput(() => renderHelp(new Set()));
+    expect(output).to.have.string('deploy');
+    expect(output).to.have.string('deploy function');
+    expect(output).to.have.string('--help');
+    expect(output).to.have.string(commandsSchema.get('deploy').usage);
+    expect(output).to.have.string(commandsSchema.get('deploy function').usage);
   });
 });
diff --git a/test/unit/lib/cli/render-help/interactive-setup.test.js b/test/unit/lib/cli/render-help/interactive-setup.test.js
index 7bdf98bc25b..03ed8c0ff0f 100644
--- a/test/unit/lib/cli/render-help/interactive-setup.test.js
+++ b/test/unit/lib/cli/render-help/interactive-setup.test.js
@@ -1,17 +1,13 @@
 'use strict';
 
 const { expect } = require('chai');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const renderInteractiveSetupHelp = require('../../../../../lib/cli/render-help/interactive-setup');
+const observeOutput = require('@serverless/test/observe-output');
 
 describe('test/unit/lib/cli/render-help/interactive-setup.test.js', () => {
-  it('should show help', () => {
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => renderInteractiveSetupHelp()
-    );
-    expect(stdoutData).to.have.string('Interactive CLI');
-    expect(stdoutData).to.have.string('--help-interactive');
+  it('should show help', async () => {
+    const output = await observeOutput(() => renderInteractiveSetupHelp());
+    expect(output).to.have.string('Interactive CLI');
+    expect(output).to.have.string('--help-interactive');
   });
 });
diff --git a/test/unit/lib/cli/render-help/options.test.js b/test/unit/lib/cli/render-help/options.test.js
index 81ee6f9cd86..901440504f3 100644
--- a/test/unit/lib/cli/render-help/options.test.js
+++ b/test/unit/lib/cli/render-help/options.test.js
@@ -1,29 +1,26 @@
 'use strict';
 
 const { expect } = require('chai');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const renderOptionsHelp = require('../../../../../lib/cli/render-help/options');
+const observeOutput = require('@serverless/test/observe-output');
 
 describe('test/unit/lib/cli/render-help/options.test.js', () => {
-  it('should list options', () => {
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () =>
-        renderOptionsHelp({
-          foo: {
-            usage: 'Some option',
-            shortcut: 'b',
-            required: true,
-          },
-          bar: {
-            usage: 'Elo',
-          },
-          noData: {},
-        })
+  it('should list options', async () => {
+    const output = await observeOutput(() =>
+      renderOptionsHelp({
+        foo: {
+          usage: 'Some option',
+          shortcut: 'b',
+          required: true,
+        },
+        bar: {
+          usage: 'Elo',
+        },
+        noData: {},
+      })
     );
-    expect(stdoutData).to.have.string('--foo');
-    expect(stdoutData).to.have.string('-b');
-    expect(stdoutData).to.have.string('Some option');
+    expect(output).to.have.string('--foo');
+    expect(output).to.have.string('-b');
+    expect(output).to.have.string('Some option');
   });
 });
diff --git a/test/unit/lib/cli/render-version.test.js b/test/unit/lib/cli/render-version.test.js
index 1ec9cf8a0dd..fbe4d239256 100644
--- a/test/unit/lib/cli/render-version.test.js
+++ b/test/unit/lib/cli/render-version.test.js
@@ -1,17 +1,13 @@
 'use strict';
 
 const { expect } = require('chai');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const listVersion = require('../../../../lib/cli/render-version');
+const observeOutput = require('@serverless/test/observe-output');
 
 describe('test/unit/lib/cli/list-version.test.js', () => {
   it('should log version', async () => {
-    let stdoutData = '';
-    await overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => listVersion()
-    );
-    expect(stdoutData).to.have.string('Framework Core: ');
-    expect(stdoutData).to.have.string('SDK: ');
+    const output = await observeOutput(() => listVersion());
+    expect(output).to.have.string('Framework Core: ');
+    expect(output).to.have.string('SDK: ');
   });
 });
diff --git a/test/unit/lib/configSchema.test.js b/test/unit/lib/configSchema.test.js
index 84b8a27566a..beabbf6e0a7 100644
--- a/test/unit/lib/configSchema.test.js
+++ b/test/unit/lib/configSchema.test.js
@@ -63,7 +63,6 @@ describe('test/unit/lib/configSchema.test.js', () => {
     },
     {
       isValid: true,
-      logMessage: 'Unrecognized provider',
       description: 'provider not existing name',
       mutation: {
         provider: { name: 'awssss' },
@@ -93,11 +92,10 @@ describe('test/unit/lib/configSchema.test.js', () => {
         configExt: someCase.mutation,
         command: 'info',
       }).then(
-        ({ stdoutData }) => {
+        () => {
           if (!someCase.isValid) {
             expect(false).to.be.true;
           }
-          if (someCase.logMessage) expect(stdoutData).to.include(someCase.logMessage);
           return;
         },
         (err) => {
diff --git a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
index 7b6d93ddb3d..5dc4dfb1e5d 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
@@ -1071,31 +1071,6 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
     expect(serverless.service.provider.shouldNotDeploy).to.equal(true);
   });
 
-  it('should print a warning if missing lambda:GetFunction permission', async () => {
-    const { stdoutData } = await runServerless({
-      fixture: 'checkForChanges',
-      command: 'deploy',
-      lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
-      awsRequestStubMap: {
-        ...commonAwsSdkMock,
-        Lambda: {
-          getFunction: sandbox.stub().throws({ providerError: { statusCode: 403 } }),
-        },
-        S3: {
-          listObjectsV2: {},
-          headObjects: {},
-          headBucket: {},
-        },
-      },
-    });
-    expect(stdoutData).to.include(
-      [
-        'WARNING: Not authorized to perform: lambda:GetFunction for at least one of the lambda functions.',
-        ' Deployment will not be skipped even if service files did not change.',
-      ].join('')
-    );
-  });
-
   it.skip('TODO: should crash meaningfully if bucket does not exist', () => {
     // Replaces:
     // https://github.com/serverless/serverless/blob/11fb14115ea47d53a61fa666a94e60d585fb3a4d/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js#L137-L149
diff --git a/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js b/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
index a3da6edef93..c7f51082766 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
@@ -7,7 +7,6 @@ const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 const AwsDeploy = require('../../../../../../../lib/plugins/aws/deploy/index');
 const Serverless = require('../../../../../../../lib/Serverless');
 const { getTmpDirPath } = require('../../../../../../utils/fs');
-const runServerless = require('../../../../../../utils/run-serverless');
 
 chai.use(require('sinon-chai'));
 
@@ -165,46 +164,3 @@ describe('extendedValidate', () => {
     });
   });
 });
-
-describe('test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js', () => {
-  it("should not warn if function's timeout is greater than 30 and it's attached to APIGW, but it has [async] mode", async () => {
-    const msg = [
-      "WARNING: Function foo has timeout of 31 seconds, however, it's",
-      "attached to API Gateway so it's automatically limited to 30 seconds.",
-    ].join(' ');
-
-    const { stdoutData } = await runServerless({
-      fixture: 'function',
-      configExt: {
-        functions: {
-          basic: {
-            timeout: 31,
-            events: [
-              {
-                http: {
-                  method: 'GET',
-                  path: '/foo',
-                  async: true,
-                },
-              },
-            ],
-          },
-        },
-      },
-      awsRequestStubMap: {
-        STS: {
-          getCallerIdentity: {
-            ResponseMetadata: { RequestId: 'ffffffff-ffff-ffff-ffff-ffffffffffff' },
-            UserId: 'XXXXXXXXXXXXXXXXXXXXX',
-            Account: '1234567890',
-            Arn: 'arn:aws:iam::1234567890:user/test',
-          },
-        },
-      },
-      command: 'deploy',
-      lastLifecycleHookName: 'before:deploy:deploy',
-    });
-
-    expect(stdoutData.includes(msg)).to.be.equal(false);
-  });
-});
diff --git a/test/unit/lib/plugins/aws/deployFunction.test.js b/test/unit/lib/plugins/aws/deployFunction.test.js
index 012ad403ef7..8643acdeb42 100644
--- a/test/unit/lib/plugins/aws/deployFunction.test.js
+++ b/test/unit/lib/plugins/aws/deployFunction.test.js
@@ -398,7 +398,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
   });
 
   it('should skip updating function configuration if image config did not change', async () => {
-    const { stdoutData } = await runServerless({
+    await runServerless({
       fixture: 'function',
       command: 'deploy function',
       options: { function: 'basic' },
@@ -439,13 +439,10 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       },
     });
     expect(updateFunctionConfigurationStub).not.to.be.called;
-    expect(stdoutData).to.include(
-      'Configuration did not change. Skipping function configuration update.'
-    );
   });
 
   it('should skip deployment if image sha did not change', async () => {
-    const { stdoutData } = await runServerless({
+    await runServerless({
       fixture: 'function',
       command: 'deploy function',
       options: { function: 'basic' },
@@ -472,7 +469,6 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       },
     });
     expect(updateFunctionCodeStub).not.to.be.called;
-    expect(stdoutData).to.include('Image did not change. Skipping function deployment.');
   });
 
   it('should fail if function with image was previously defined with handler', async () => {
@@ -543,7 +539,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       .throws({ providerError: { code: 'ResourceConflictException' } })
       .onSecondCall()
       .resolves({});
-    const { stdoutData } = await runServerless({
+    await runServerless({
       fixture: 'function',
       command: 'deploy function',
       options: { function: 'basic' },
@@ -566,12 +562,11 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       },
     });
 
-    expect(stdoutData).to.include('Retrying configuration update for function');
     expect(innerUpdateFunctionConfigurationStub.callCount).to.equal(2);
   });
 
   it('should update function configuration if configuration changed', async () => {
-    const { stdoutData } = await runServerless({
+    await runServerless({
       fixture: 'function',
       command: 'deploy function',
       options: { function: 'basic' },
@@ -641,11 +636,10 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       },
       Layers: [layerArn, secondLayerArn],
     });
-    expect(stdoutData).to.include('Successfully updated function');
   });
 
   it('should skip updating properties that contain references', async () => {
-    const { stdoutData } = await runServerless({
+    await runServerless({
       fixture: 'function',
       command: 'deploy function',
       options: { function: 'basic' },
@@ -692,11 +686,10 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       },
       Role: role,
     });
-    expect(stdoutData).to.include('Successfully updated function');
   });
 
   it('should update function configuration with provider-level properties', async () => {
-    const { stdoutData } = await runServerless({
+    await runServerless({
       fixture: 'function',
       command: 'deploy function',
       options: { function: 'basic' },
@@ -753,11 +746,10 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
         SubnetIds: ['subnet-111', 'subnet-222'],
       },
     });
-    expect(stdoutData).to.include('Successfully updated function');
   });
 
   it('should not update function configuration if configuration did not change', async () => {
-    const { stdoutData } = await runServerless({
+    await runServerless({
       fixture: 'function',
       command: 'deploy function',
       options: { function: 'basic' },
@@ -828,9 +820,6 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
     });
 
     expect(updateFunctionConfigurationStub).not.to.be.called;
-    expect(stdoutData).to.include(
-      'Configuration did not change. Skipping function configuration update.'
-    );
   });
 
   it('configuration uses the "kmsKeyArn" instead of functionObj.awsKmsKeyArn', async () => {
diff --git a/test/unit/lib/plugins/aws/invoke.test.js b/test/unit/lib/plugins/aws/invoke.test.js
index 709342d35f4..89c6f9672c5 100644
--- a/test/unit/lib/plugins/aws/invoke.test.js
+++ b/test/unit/lib/plugins/aws/invoke.test.js
@@ -63,9 +63,7 @@ describe('test/unit/lib/plugins/aws/invoke.test.js', () => {
     });
 
     it('should log payload', () => {
-      expect(result.stdoutData).to.contain(
-        '{\n    "inputKey": "inputValue"\n}\n\u001b[90m--------------------------------------------------------------------\u001b[39m\ntest\n'
-      );
+      expect(result.output).to.contain('"inputKey": "inputValue"');
     });
   });
 
diff --git a/test/unit/lib/plugins/aws/invokeLocal/index.test.js b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
index c8253f14d14..560f50a9685 100644
--- a/test/unit/lib/plugins/aws/invokeLocal/index.test.js
+++ b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
@@ -970,7 +970,7 @@ describe('test/unit/lib/plugins/aws/invokeLocal/index.test.js', () => {
         process.env.AWS_ACCESS_KEY_ID = 'AAKIXXX';
         process.env.AWS_SECRET_ACCESS_KEY = 'ASAKXXX';
 
-        // Confirm outcome on { stdout }
+        // Confirm outcome on { output }
         const response = await runServerless({
           fixture: 'invocation',
           command: 'invoke local',
@@ -997,8 +997,8 @@ describe('test/unit/lib/plugins/aws/invokeLocal/index.test.js', () => {
             },
           },
         });
-        const stdoutAsJson = JSON.parse(response.stdoutData);
-        responseBody = JSON.parse(stdoutAsJson.body);
+        const outputAsJson = JSON.parse(response.output);
+        responseBody = JSON.parse(outputAsJson.body);
       });
 
       after(() => {
@@ -1046,33 +1046,33 @@ describe('test/unit/lib/plugins/aws/invokeLocal/index.test.js', () => {
     testRuntime('callback');
 
     it('should support success resolution via async function', async () => {
-      const { stdoutData } = await runServerless({
+      const { output } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'async' },
       });
 
-      expect(stdoutData).to.include('Invoked');
+      expect(output).to.include('Invoked');
     });
 
     it('should support success resolution via context.done', async () => {
-      const { stdoutData } = await runServerless({
+      const { output } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'contextDone' },
       });
 
-      expect(stdoutData).to.include('Invoked');
+      expect(output).to.include('Invoked');
     });
 
     it('should support success resolution via context.succeed', async () => {
-      const { stdoutData } = await runServerless({
+      const { output } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'contextSucceed' },
       });
 
-      expect(stdoutData).to.include('Invoked');
+      expect(output).to.include('Invoked');
     });
 
     it('should support immediate failure at initialization', async () => {
@@ -1099,69 +1099,69 @@ describe('test/unit/lib/plugins/aws/invokeLocal/index.test.js', () => {
     });
 
     it('should support failure resolution via async function', async () => {
-      const { stdoutData } = await runServerless({
+      const { output } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'async', data: '{"shouldFail":true}' },
       });
 
-      expect(stdoutData).to.include('Failed on request');
+      expect(output).to.include('Failed on request');
     });
 
     it('should support failure resolution via callback', async () => {
-      const { stdoutData } = await runServerless({
+      const { output } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'callback', data: '{"shouldFail":true}' },
       });
 
-      expect(stdoutData).to.include('Failed on request');
+      expect(output).to.include('Failed on request');
     });
 
     it('should support failure resolution via context.done', async () => {
-      const { stdoutData } = await runServerless({
+      const { output } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'contextDone', data: '{"shouldFail":true}' },
       });
 
-      expect(stdoutData).to.include('Failed on request');
+      expect(output).to.include('Failed on request');
     });
 
     it('should support failure resolution via context.fail', async () => {
-      const { stdoutData } = await runServerless({
+      const { output } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'contextSucceed', data: '{"shouldFail":true}' },
       });
 
-      expect(stdoutData).to.include('Failed on request');
+      expect(output).to.include('Failed on request');
     });
 
     it('should recognize first resolution', async () => {
-      const { stdoutData: firstRunStdout } = await runServerless({
+      const { output: firstRunOutput } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'doubledResolutionCallbackFirst' },
       });
-      const { stdoutData: secondRunStdout } = await runServerless({
+      const { output: secondRunOutput } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'doubledResolutionPromiseFirst' },
       });
 
-      expect(firstRunStdout).to.include('callback');
-      expect(secondRunStdout).to.include('promise');
+      expect(firstRunOutput).to.include('callback');
+      expect(secondRunOutput).to.include('promise');
     });
 
     it('should support context.remainingTimeInMillis()', async () => {
-      const { stdoutData } = await runServerless({
+      const { output } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'remainingTime' },
       });
 
-      const body = JSON.parse(stdoutData).body;
+      const body = JSON.parse(output).body;
       const [firstRemainingMs, secondRemainingMs, thirdRemainingMs] = JSON.parse(body).data;
       expect(firstRemainingMs).to.be.lte(3000);
       expect(secondRemainingMs).to.be.lte(2910);
@@ -1182,13 +1182,13 @@ describe('test/unit/lib/plugins/aws/invokeLocal/index.test.js', () => {
     testRuntime('python');
     describe('context.remainingTimeInMillis', () => {
       it('should support context.get_remaining_time_in_millis()', async () => {
-        const { stdoutData } = await runServerless({
+        const { output } = await runServerless({
           fixture: 'invocation',
           command: 'invoke local',
           options: { function: 'pythonRemainingTime' },
         });
 
-        const { start, stop } = JSON.parse(stdoutData);
+        const { start, stop } = JSON.parse(output);
         expect(start).to.lte(3000);
         expect(stop).to.lte(2910);
       });
@@ -1208,33 +1208,33 @@ describe('test/unit/lib/plugins/aws/invokeLocal/index.test.js', () => {
     testRuntime('ruby');
 
     it('should support class/module address in handler for "ruby*" runtime', async () => {
-      const { stdoutData } = await runServerless({
+      const { output } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'rubyClass' },
       });
 
-      expect(stdoutData).to.include('rubyclass');
+      expect(output).to.include('rubyclass');
     });
     it('should support context.get_remaining_time_in_millis()', async () => {
-      const { stdoutData } = await runServerless({
+      const { output } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'rubyRemainingTime' },
       });
 
-      const { start, stop } = JSON.parse(stdoutData);
+      const { start, stop } = JSON.parse(output);
       expect(start).to.lte(6000);
       expect(stop).to.lte(5910);
     });
     it('should support context.deadline_ms', async () => {
-      const { stdoutData } = await runServerless({
+      const { output } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'rubyDeadline' },
       });
 
-      const { deadlineMs } = JSON.parse(stdoutData);
+      const { deadlineMs } = JSON.parse(output);
       expect(deadlineMs).to.be.gt(Date.now());
     });
   });
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index 57bee6e6556..aad025e2996 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -2582,7 +2582,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
         const originalVersionArn =
           originalTemplate.Outputs.BasicLambdaFunctionQualifiedArn.Value.Ref;
 
-        const { cfTemplate: updatedTemplate, stdoutData } = await runServerless({
+        const { cfTemplate: updatedTemplate } = await runServerless({
           cwd: serviceDir,
           command: 'deploy',
           lastLifecycleHookName: 'before:deploy:deploy',
@@ -2596,7 +2596,6 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
         expect(
           updatedTemplate.Resources[awsNaming.getLambdaLogicalId('basic')].Properties.Description
         ).to.equal('temporary-description-to-enforce-hash-update');
-        expect(stdoutData).to.include('Your service has been deployed with new hashing algorithm');
       });
     });
   });
diff --git a/test/unit/lib/plugins/aws/provider.test.js b/test/unit/lib/plugins/aws/provider.test.js
index 59e7b1f509f..cd46508f06b 100644
--- a/test/unit/lib/plugins/aws/provider.test.js
+++ b/test/unit/lib/plugins/aws/provider.test.js
@@ -1501,41 +1501,6 @@ aws_secret_access_key = CUSTOMSECRET
         ]);
       });
 
-      it('should emit warning if docker login stores unencrypted credentials', async () => {
-        const awsRequestStubMap = {
-          ...baseAwsRequestStubMap,
-          ECR: {
-            ...baseAwsRequestStubMap.ECR,
-            describeRepositories: describeRepositoriesStub.resolves({
-              repositories: [{ repositoryUri }],
-            }),
-            createRepository: createRepositoryStub,
-          },
-        };
-
-        const { stdoutData } = await runServerless({
-          fixture: 'ecr',
-          command: 'package',
-          awsRequestStubMap,
-          modulesCacheStub: {
-            ...modulesCacheStub,
-            'child-process-ext/spawn': sinon
-              .stub()
-              .returns({
-                stdBuffer: `digest: sha256:${imageSha} size: 1787`,
-              })
-              .onCall(3)
-              .throws({ stdBuffer: 'no basic auth credentials' })
-              .onCall(4)
-              .returns({ stdBuffer: 'your password will be stored unencrypted' }),
-          },
-        });
-
-        expect(stdoutData).to.include(
-          'WARNING: Docker authentication token will be stored unencrypted in docker config.'
-        );
-      });
-
       it('should work correctly when image is defined with implicit path in provider', async () => {
         const awsRequestStubMap = {
           ...baseAwsRequestStubMap,
diff --git a/test/unit/lib/plugins/aws/remove/index.test.js b/test/unit/lib/plugins/aws/remove/index.test.js
index fff8f1383e9..2cd2a9d1b83 100644
--- a/test/unit/lib/plugins/aws/remove/index.test.js
+++ b/test/unit/lib/plugins/aws/remove/index.test.js
@@ -212,21 +212,6 @@ describe('test/unit/lib/plugins/aws/remove/index.test.js', () => {
     });
   });
 
-  it('emits warning when repository cannot be accessed due to denied access but there are images defined', async () => {
-    describeRepositoriesStub.throws({ providerError: { code: 'AccessDeniedException' } });
-
-    const { stdoutData } = await runServerless({
-      fixture: 'ecr',
-      command: 'remove',
-      awsRequestStubMap,
-    });
-
-    expect(stdoutData).to.include('WARNING: Could not access ECR repository due to denied access');
-    expect(stdoutData).to.include('ECR repository removal will be skipped.');
-
-    expect(deleteRepositoryStub).not.to.be.called;
-  });
-
   it('should execute expected operations with versioning enabled if no object versions are present', async () => {
     const listObjectVersionsStub = sinon.stub().resolves();
 
diff --git a/test/unit/lib/plugins/print.test.js b/test/unit/lib/plugins/print.test.js
index d20a61e8634..877b7ea8eb2 100644
--- a/test/unit/lib/plugins/print.test.js
+++ b/test/unit/lib/plugins/print.test.js
@@ -10,11 +10,11 @@ const expect = chai.expect;
 
 describe('test/unit/lib/plugins/print.test.js', () => {
   it('correctly prints config', async () => {
-    const { stdoutData } = await runServerless({
+    const { output } = await runServerless({
       fixture: 'aws',
       command: 'print',
     });
 
-    expect(stdoutData).to.include('name: aws');
+    expect(output).to.include('name: aws');
   });
 });
diff --git a/test/unit/lib/utils/logDeprecation.test.js b/test/unit/lib/utils/logDeprecation.test.js
index 013607d4746..abfdf5022eb 100644
--- a/test/unit/lib/utils/logDeprecation.test.js
+++ b/test/unit/lib/utils/logDeprecation.test.js
@@ -3,17 +3,14 @@
 const sandbox = require('sinon');
 const expect = require('chai').expect;
 const overrideEnv = require('process-utils/override-env');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
-const runServerless = require('../../../utils/run-serverless');
 const ServerlessError = require('../../../../lib/serverless-error');
 
 describe('test/unit/lib/utils/logDeprecation.test.js', () => {
   let restoreEnv;
-  let originalEnv;
 
   beforeEach(() => {
     delete require.cache[require.resolve('../../../../lib/utils/logDeprecation')];
-    ({ originalEnv, restoreEnv } = overrideEnv({
+    ({ restoreEnv } = overrideEnv({
       whitelist: ['APPDATA', 'HOME', 'PATH', 'TEMP', 'TMP', 'TMPDIR', 'USERPROFILE'],
     }));
   });
@@ -23,88 +20,6 @@ describe('test/unit/lib/utils/logDeprecation.test.js', () => {
     restoreEnv();
   });
 
-  it('should log deprecation message if not disabled and first time', () => {
-    const logDeprecation = require('../../../../lib/utils/logDeprecation');
-    logDeprecation.defaultMode = 'warn';
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => logDeprecation('CODE1', 'Start using deprecation log')
-    );
-    expect(stdoutData).to.include('Start using deprecation log');
-
-    expect(stdoutData).to.include('Deprecation warning');
-    expect(stdoutData).to.include('https://www.serverless.com/framework/docs/deprecations/#CODE1');
-  });
-
-  it('should not log deprecation if disabled in env.SLS_DEPRECATION_DISABLE', () => {
-    process.env.SLS_DEPRECATION_DISABLE = 'CODE1';
-    const logDeprecation = require('../../../../lib/utils/logDeprecation');
-
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => logDeprecation('CODE1', 'Start using deprecation log')
-    );
-    expect(stdoutData).to.equal('');
-  });
-
-  it('should not log deprecation if disabled in serviceConfig', () => {
-    // We need original process env variables for npm-conf
-    Object.assign(process.env, originalEnv);
-    const logDeprecation = require('../../../../lib/utils/logDeprecation');
-    return runServerless({
-      fixture: 'function',
-      configExt: { disabledDeprecations: ['CODE1'] },
-      command: 'package',
-    }).then(({ serverless }) => {
-      const serviceConfig = serverless.service;
-      let stdoutData = '';
-      overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        () => logDeprecation('CODE1', 'Start using deprecation log', { serviceConfig })
-      );
-      expect(stdoutData).to.equal('');
-    });
-  });
-
-  it('should not log deprecation if disabled by wildcard in env', () => {
-    process.env.SLS_DEPRECATION_DISABLE = '*';
-    const logDeprecation = require('../../../../lib/utils/logDeprecation');
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => logDeprecation('CODE1', 'Start using deprecation log')
-    );
-    expect(stdoutData).to.equal('');
-  });
-
-  it('should not log deprecation if disabled by wildcard in service config', () => {
-    Object.assign(process.env, originalEnv);
-    const logDeprecation = require('../../../../lib/utils/logDeprecation');
-    return runServerless({
-      fixture: 'function',
-      configExt: { disabledDeprecations: '*' },
-      command: 'package',
-    }).then(({ serverless }) => {
-      const serviceConfig = serverless.service;
-      let stdoutData = '';
-      overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        () => logDeprecation('CODE1', 'Start using deprecation log', { serviceConfig })
-      );
-      expect(stdoutData).to.equal('');
-    });
-  });
-
-  it('should throw on deprecation if env.SLS_DEPRECATION_NOTIFICATION_MODE=error', () => {
-    process.env.SLS_DEPRECATION_NOTIFICATION_MODE = 'error';
-    const logDeprecation = require('../../../../lib/utils/logDeprecation');
-    expect(() => logDeprecation('CODE1', 'Start using deprecation log'))
-      .to.throw(ServerlessError)
-      .with.property('code', 'REJECTED_DEPRECATION_CODE1');
-  });
-
   it('should throw on deprecation if error notifications mode set in service config', () => {
     const logDeprecation = require('../../../../lib/utils/logDeprecation');
     expect(() =>
@@ -115,54 +30,4 @@ describe('test/unit/lib/utils/logDeprecation.test.js', () => {
       .to.throw(ServerlessError)
       .with.property('code', 'REJECTED_DEPRECATION_CODE1');
   });
-
-  it('should not log deprecation twice', () => {
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => {
-        const logDeprecation = require('../../../../lib/utils/logDeprecation');
-        logDeprecation.defaultMode = 'warn';
-        logDeprecation('CODE1', 'Start using deprecation log');
-        expect(stdoutData).to.include('Start using deprecation log');
-        stdoutData = '';
-        logDeprecation('CODE1', 'Start using deprecation log');
-      }
-    );
-    expect(stdoutData).to.equal('');
-  });
-
-  it('should expose working `flushBuffered` method', () => {
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => {
-        const logDeprecation = require('../../../../lib/utils/logDeprecation');
-        logDeprecation('CODE1', 'First deprecation');
-        expect(stdoutData).to.not.include('First deprecation');
-        logDeprecation('CODE2', 'Second deprecation');
-        expect(stdoutData).to.not.include('Second deprecation');
-        logDeprecation.flushBuffered();
-      }
-    );
-    expect(stdoutData).to.include('First deprecation');
-    expect(stdoutData).to.include('Second deprecation');
-  });
-
-  it('should expose working `printSummary` method', async () => {
-    let stdoutData = '';
-    await overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      async () => {
-        const logDeprecation = require('../../../../lib/utils/logDeprecation');
-        logDeprecation('CODE1', 'First deprecation');
-        expect(stdoutData).to.not.include('First deprecation');
-        logDeprecation('CODE2', 'Second deprecation');
-        expect(stdoutData).to.not.include('Second deprecation');
-        await logDeprecation.printSummary();
-      }
-    );
-    expect(stdoutData).to.include('First deprecation');
-    expect(stdoutData).to.include('Second deprecation');
-  });
 });

From 126a0763432b8eb5a17516f885ce35fc60530fdf Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 17 Jan 2022 13:14:08 +0100
Subject: [PATCH 0844/1101] test: Upgrade curated plugins

---
 .../programmatic/curated-plugins/package.json  | 18 +++++++++---------
 test/integration/curated-plugins.test.js       |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/test/fixtures/programmatic/curated-plugins/package.json b/test/fixtures/programmatic/curated-plugins/package.json
index 1fc8395547f..d445ba75c64 100755
--- a/test/fixtures/programmatic/curated-plugins/package.json
+++ b/test/fixtures/programmatic/curated-plugins/package.json
@@ -1,14 +1,14 @@
 {
   "devDependencies": {
-    "serverless-offline": "7.0.0",
-    "webpack": "5.41.1",
-    "serverless-webpack": "5.5.1",
-    "serverless-domain-manager": "5.1.0",
-    "serverless-prune-plugin": "1.5.0",
-    "serverless-dotenv-plugin": "3.9.0",
+    "serverless-offline": "8.3.1",
+    "webpack": "5.66.0",
+    "serverless-webpack": "5.6.0",
+    "serverless-domain-manager": "5.3.0",
+    "serverless-prune-plugin": "2.0.1",
+    "serverless-dotenv-plugin": "3.12.2",
     "serverless-iam-roles-per-function": "3.2.0",
-    "serverless-plugin-typescript": "1.1.9",
-    "typescript": "4.3.5",
-    "serverless-step-functions": "2.32.0"
+    "serverless-plugin-typescript": "2.1.0",
+    "typescript": "4.5.4",
+    "serverless-step-functions": "3.5.1"
   }
 }
diff --git a/test/integration/curated-plugins.test.js b/test/integration/curated-plugins.test.js
index 6dfc796d151..5109d1a2823 100644
--- a/test/integration/curated-plugins.test.js
+++ b/test/integration/curated-plugins.test.js
@@ -44,8 +44,8 @@ describe('test/integration/curated-plugins.test.js', function () {
     let output = '';
     slsProcess.stdout.on('data', function self(data) {
       output += data;
-      if (output.includes('server ready:')) {
-        slsProcess.stdout.off('data', self);
+      if (output.includes('Server ready:')) {
+        slsProcess.stderr.off('data', self);
         got('http://localhost:3000/dev/foo')
           .json()
           .then(async (responseBody) => {
@@ -75,10 +75,10 @@ describe('test/integration/curated-plugins.test.js', function () {
 
   it('should be extended by "serverless-prune-plugin"', async () => {
     await updateConfig({ plugins: ['serverless-prune-plugin'] });
-    const { stdoutBuffer } = await spawn(serverlessExec, ['prune', '-n', '10'], {
+    const { stderrBuffer } = await spawn(serverlessExec, ['prune', '-n', '10'], {
       cwd: serviceDir,
     });
-    expect(String(stdoutBuffer)).to.include('Prune: Pruning complete.');
+    expect(String(stderrBuffer)).to.include('Pruning of functions complete');
   });
 
   it('should be extended by "serverless-dotenv-plugin"', async () => {

From f9e6e2c4058f3bcf2a13f9a5b1c985d1d80e3146 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 20 Oct 2021 11:10:52 +0200
Subject: [PATCH 0845/1101] feat(Plugins): Pass log writers to plugin
 constructor

---
 lib/classes/PluginManager.js                | 13 +++++++++++--
 test/fixtures/programmatic/plugin/plugin.js |  7 +++++--
 test/unit/lib/classes/PluginManager.test.js | 16 ++++++++++++++++
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 188b3a0b089..2eac8efd397 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -17,7 +17,7 @@ const generateTelemetryPayload = require('../utils/telemetry/generatePayload');
 const processBackendNotificationRequest = require('../utils/processBackendNotificationRequest');
 const isTelemetryDisabled = require('../utils/telemetry/areDisabled');
 const tokenizeException = require('../utils/tokenize-exception');
-const { legacy, log } = require('@serverless/utils/log');
+const { legacy, log, getPluginWriters } = require('@serverless/utils/log');
 
 const mergeCommands = (target, source) => {
   if (!target) return source;
@@ -89,7 +89,11 @@ class PluginManager {
   }
 
   addPlugin(Plugin) {
-    const pluginInstance = new Plugin(this.serverless, this.cliOptions);
+    const pluginUtils = {};
+    if (Plugin._serverlessExternalPluginName) {
+      Object.assign(pluginUtils, getPluginWriters(Plugin._serverlessExternalPluginName));
+    }
+    const pluginInstance = new Plugin(this.serverless, this.cliOptions, pluginUtils);
     if (isRegisteringExternalPlugins) {
       this.externalPlugins.add(pluginInstance);
     }
@@ -215,6 +219,11 @@ class PluginManager {
               'MISSING_PLUGIN_NAME'
             );
           }
+          Object.defineProperty(Plugin, '_serverlessExternalPluginName', {
+            value: name,
+            configurable: true,
+            writable: true,
+          });
           return Plugin;
         })
     );
diff --git a/test/fixtures/programmatic/plugin/plugin.js b/test/fixtures/programmatic/plugin/plugin.js
index 53945e6470a..6e8a0d2381c 100644
--- a/test/fixtures/programmatic/plugin/plugin.js
+++ b/test/fixtures/programmatic/plugin/plugin.js
@@ -1,7 +1,10 @@
 'use strict';
 
-module.exports = class Plugin {
-  constructor() {
+module.exports = class TestPlugin {
+  constructor(serverless, options, utils) {
+    this.serverless = serverless;
+    this.options = options;
+    this.utils = utils;
     this.commands = {
       customCommand: {
         usage: 'Description of custom command',
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
index 16223dc1d86..1bb2a928742 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/PluginManager.test.js
@@ -8,6 +8,7 @@ const cjsResolve = require('ncjsm/resolve/sync');
 const spawn = require('child-process-ext/spawn');
 const overrideArgv = require('process-utils/override-argv');
 const resolveAwsEnv = require('@serverless/test/resolve-env');
+const runServerless = require('../../../utils/run-serverless');
 const Serverless = require('../../../../lib/Serverless');
 const CLI = require('../../../../lib/classes/CLI');
 const resolveInput = require('../../../../lib/cli/resolve-input');
@@ -1922,3 +1923,18 @@ describe('PluginManager', () => {
     });
   });
 });
+
+describe('test/unit/lib/classes/PluginManager.test.js', () => {
+  it('should pass log writers to external plugins', async () => {
+    const { serverless } = await runServerless({
+      fixture: 'plugin',
+      command: 'print',
+    });
+    const plugin = Array.from(serverless.pluginManager.externalPlugins).find(
+      (externalPlugin) => externalPlugin.constructor.name === 'TestPlugin'
+    );
+    expect(typeof plugin.utils.log).to.equal('function');
+    expect(typeof plugin.utils.progress.create).to.equal('function');
+    expect(typeof plugin.utils.writeText).to.equal('function');
+  });
+});

From 59116758c973e2c3e3022cb1ade7ad477079955c Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 25 Oct 2021 14:08:52 +0200
Subject: [PATCH 0846/1101] feat(AWS Lambda): Remove support for `awsKmsKeyArn`
 setting

BREAKING CHANGE: Properties `service.awsKmsKeyArn` and
`functions[].awsKmsKeyArn` are no longer supported. Use `provider.kmsKeyArn`
and `functions[].kmsKeyArn` instead.
---
 lib/classes/ConfigSchemaHandler/index.js      |   3 +-
 lib/configSchema.js                           |   5 -
 lib/plugins/aws/deployFunction.js             |  24 +-
 lib/plugins/aws/package/compile/functions.js  |  19 --
 lib/plugins/aws/provider.js                   |   6 +
 .../lib/plugins/aws/deployFunction.test.js    |  91 +------
 .../aws/package/compile/functions.test.js     | 229 +-----------------
 7 files changed, 21 insertions(+), 356 deletions(-)

diff --git a/lib/classes/ConfigSchemaHandler/index.js b/lib/classes/ConfigSchemaHandler/index.js
index 4ae40493560..b5ca846179e 100644
--- a/lib/classes/ConfigSchemaHandler/index.js
+++ b/lib/classes/ConfigSchemaHandler/index.js
@@ -65,8 +65,7 @@ class ConfigSchemaHandler {
     this.serverless = serverless;
     this.schema = _.cloneDeep(schema);
 
-    // TODO: Switch back to deepFreeze(this.schema.properties.service) once awsKmsKeyArn property is removed, see https://github.com/serverless/serverless/issues/8261
-    Object.freeze(this.schema.properties.service.name);
+    deepFreeze(this.schema.properties.service);
     deepFreeze(this.schema.properties.plugins);
     deepFreeze(this.schema.properties.package);
   }
diff --git a/lib/configSchema.js b/lib/configSchema.js
index 6b45341a64b..3581f3d50ab 100644
--- a/lib/configSchema.js
+++ b/lib/configSchema.js
@@ -135,11 +135,6 @@ const schema = {
   additionalProperties: false,
   required: ['provider', 'service'],
   definitions: {
-    // TODO: awsKmsArn definition to be moved to lib/plugins/aws/provider/awsProvider.js once service.awsKmsKeyArn removed with v3.0.0, see https://github.com/serverless/serverless/issues/8261
-    // TODO: awsKmsArn to include #/definitions/awsCfFunction instead of type: object as one of the possible definition, see https://github.com/serverless/serverless/issues/8261
-    awsKmsArn: {
-      anyOf: [{ type: 'object' }, { type: 'string', pattern: '^arn:aws[a-z-]*:kms' }],
-    },
     errorCode: {
       type: 'string',
       pattern: '^[A-Z0-9_]+$',
diff --git a/lib/plugins/aws/deployFunction.js b/lib/plugins/aws/deployFunction.js
index dfcd76d50b7..ee551003408 100644
--- a/lib/plugins/aws/deployFunction.js
+++ b/lib/plugins/aws/deployFunction.js
@@ -47,23 +47,6 @@ class AwsDeployFunction {
         await this.validate();
         await this.checkIfFunctionExists();
         this.checkIfFunctionChangesBetweenImageAndHandler();
-
-        if (_.get(this.serverless.service.serviceObject, 'awsKmsKeyArn')) {
-          this.serverless._logDeprecation(
-            'AWS_KMS_KEY_ARN',
-            'Starting with next major version, ' +
-              '"awsKmsKeyArn" service property will be replaced by "provider.kmsKeyArn"'
-          );
-        }
-        if (
-          Object.values(this.serverless.service.functions).some(({ awsKmsKeyArn }) => awsKmsKeyArn)
-        ) {
-          this.serverless._logDeprecation(
-            'AWS_KMS_KEY_ARN',
-            'Starting with next major version, ' +
-              '"awsKmsKeyArn" function property will be replaced by "kmsKeyArn"'
-          );
-        }
       },
 
       'before:deploy:function:packageFunction': () =>
@@ -235,7 +218,6 @@ class AwsDeployFunction {
 
   async updateFunctionConfiguration() {
     const functionObj = this.options.functionObj;
-    const serviceObj = this.serverless.service.serviceObject;
     const providerObj = this.serverless.service.provider;
     const remoteFunctionConfiguration =
       this.serverless.service.provider.remoteFunctionData.Configuration;
@@ -243,11 +225,7 @@ class AwsDeployFunction {
       FunctionName: functionObj.name,
     };
 
-    const kmsKeyArn =
-      functionObj.kmsKeyArn ||
-      providerObj.kmsKeyArn ||
-      functionObj.awsKmsKeyArn ||
-      serviceObj.awsKmsKeyArn;
+    const kmsKeyArn = functionObj.kmsKeyArn || providerObj.kmsKeyArn;
 
     if (kmsKeyArn) {
       params.KMSKeyArn = kmsKeyArn;
diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index e4559bb44b3..c0bf2d3cf7e 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -32,22 +32,6 @@ class AwsCompileFunctions {
 
     this.hooks = {
       'initialize': () => {
-        if (_.get(this.serverless.service.serviceObject, 'awsKmsKeyArn')) {
-          this.serverless._logDeprecation(
-            'AWS_KMS_KEY_ARN',
-            'Starting with next major version, ' +
-              '"awsKmsKeyArn" service property will be replaced by "provider.kmsKeyArn"'
-          );
-        }
-        if (
-          Object.values(this.serverless.service.functions).some(({ awsKmsKeyArn }) => awsKmsKeyArn)
-        ) {
-          this.serverless._logDeprecation(
-            'AWS_KMS_KEY_ARN',
-            'Starting with next major version, ' +
-              '"awsKmsKeyArn" function property will be replaced by "kmsKeyArn"'
-          );
-        }
         if (
           !this.serverless.service.provider.lambdaHashingVersion &&
           !this.options['enforce-hash-update'] &&
@@ -300,12 +284,9 @@ class AwsCompileFunctions {
     }
 
     let kmsKeyArn;
-    const serviceObj = this.serverless.service.serviceObject;
-    if (serviceObj && serviceObj.awsKmsKeyArn) kmsKeyArn = serviceObj.awsKmsKeyArn;
     if (this.serverless.service.provider.kmsKeyArn) {
       kmsKeyArn = this.serverless.service.provider.kmsKeyArn;
     }
-    if (functionObject.awsKmsKeyArn) kmsKeyArn = functionObject.awsKmsKeyArn;
     if (functionObject.kmsKeyArn) kmsKeyArn = functionObject.kmsKeyArn;
 
     if (kmsKeyArn) {
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 74affe4ef7b..1bcc033a02d 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -503,6 +503,12 @@ class AwsProvider {
               ],
             },
           },
+          awsKmsArn: {
+            anyOf: [
+              { $ref: '#/definitions/awsCfFunction' },
+              { type: 'string', pattern: '^arn:aws[a-z-]*:kms' },
+            ],
+          },
           awsLambdaArchitecture: { enum: ['arm64', 'x86_64'] },
           awsLambdaEnvironment: {
             type: 'object',
diff --git a/test/unit/lib/plugins/aws/deployFunction.test.js b/test/unit/lib/plugins/aws/deployFunction.test.js
index 8643acdeb42..bab1d702abd 100644
--- a/test/unit/lib/plugins/aws/deployFunction.test.js
+++ b/test/unit/lib/plugins/aws/deployFunction.test.js
@@ -822,7 +822,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
     expect(updateFunctionConfigurationStub).not.to.be.called;
   });
 
-  it('configuration uses the "kmsKeyArn" instead of functionObj.awsKmsKeyArn', async () => {
+  it('configuration uses `provider.kmsKeyArn` if no `kmsKeyArn` provided on function level', async () => {
     await runServerless({
       fixture: 'function',
       command: 'deploy function',
@@ -830,100 +830,13 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       lastLifecycleHookName: 'deploy:function:deploy',
       awsRequestStubMap,
       configExt: {
-        disabledDeprecations: ['AWS_KMS_KEY_ARN'],
-        functions: {
-          basic: {
-            handler: 'index.handler',
-            name: 'foobar',
-            awsKmsKeyArn: 'arn:aws:kms:us-east-1:oldKey',
-          },
-        },
         provider: {
-          kmsKeyArn: 'arn:aws:kms:us-east-1:newKey',
+          kmsKeyArn: 'arn:aws:kms:us-east-1:oldKey',
         },
-      },
-    });
-
-    sinon.assert.calledWith(updateFunctionConfigurationStub, {
-      Handler: 'index.handler',
-      FunctionName: 'foobar',
-      KMSKeyArn: 'arn:aws:kms:us-east-1:newKey',
-    });
-  });
-
-  it('configuration uses the "kmsKeyArn" instead of serviceObj.awsKmsKeyArn', async () => {
-    await runServerless({
-      fixture: 'function',
-      command: 'deploy function',
-      options: { function: 'basic' },
-      lastLifecycleHookName: 'deploy:function:deploy',
-      awsRequestStubMap,
-      configExt: {
-        disabledDeprecations: ['AWS_KMS_KEY_ARN', 'SERVICE_OBJECT_NOTATION'],
-        functions: {
-          basic: {
-            handler: 'index.handler',
-            name: 'foobar',
-            kmsKeyArn: 'arn:aws:kms:us-east-1:newKey',
-          },
-        },
-        service: {
-          name: 'service',
-          awsKmsKeyArn: 'arn:aws:kms:us-east-1:oldKey',
-        },
-      },
-    });
-
-    sinon.assert.calledWith(updateFunctionConfigurationStub, {
-      Handler: 'index.handler',
-      FunctionName: 'foobar',
-      KMSKeyArn: 'arn:aws:kms:us-east-1:newKey',
-    });
-  });
-
-  it('configuration uses serviceObj.awsKmsKeyArn if no kmsKeyArn provided', async () => {
-    await runServerless({
-      fixture: 'function',
-      command: 'deploy function',
-      options: { function: 'basic' },
-      lastLifecycleHookName: 'deploy:function:deploy',
-      awsRequestStubMap,
-      configExt: {
-        disabledDeprecations: ['AWS_KMS_KEY_ARN', 'SERVICE_OBJECT_NOTATION'],
-        functions: {
-          basic: {
-            handler: 'index.handler',
-            name: 'foobar',
-          },
-        },
-        service: {
-          name: 'service',
-          awsKmsKeyArn: 'arn:aws:kms:us-east-1:oldKey',
-        },
-      },
-    });
-
-    sinon.assert.calledWith(updateFunctionConfigurationStub, {
-      Handler: 'index.handler',
-      FunctionName: 'foobar',
-      KMSKeyArn: 'arn:aws:kms:us-east-1:oldKey',
-    });
-  });
-
-  it('configuration uses functionObj.awsKmsKeyArn and if kmsKeyArn not provided', async () => {
-    await runServerless({
-      fixture: 'function',
-      command: 'deploy function',
-      options: { function: 'basic' },
-      lastLifecycleHookName: 'deploy:function:deploy',
-      awsRequestStubMap,
-      configExt: {
-        disabledDeprecations: ['AWS_KMS_KEY_ARN'],
         functions: {
           basic: {
             handler: 'index.handler',
             name: 'foobar',
-            awsKmsKeyArn: 'arn:aws:kms:us-east-1:oldKey',
           },
         },
       },
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index aad025e2996..bea1b3ac7fa 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -636,192 +636,6 @@ describe('AwsCompileFunctions', () => {
       });
     });
 
-    describe('when using awsKmsKeyArn config', () => {
-      let s3Folder;
-      let s3FileName;
-
-      beforeEach(() => {
-        s3Folder = awsCompileFunctions.serverless.service.package.artifactDirectoryName;
-        s3FileName = awsCompileFunctions.serverless.service.package.artifact.split(path.sep).pop();
-      });
-
-      it('should allow if config is provided as a Fn::GetAtt', () => {
-        awsCompileFunctions.serverless.service.functions = {
-          func: {
-            handler: 'func.function.handler',
-            name: 'new-service-dev-func',
-            awsKmsKeyArn: {
-              'Fn::GetAtt': ['MyKms', 'Arn'],
-            },
-          },
-        };
-
-        const compiledFunction = {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            Code: {
-              S3Bucket: { Ref: 'ServerlessDeploymentBucket' },
-              S3Key: 'somedir/new-service.zip',
-            },
-            FunctionName: 'new-service-dev-func',
-            Handler: 'func.function.handler',
-            MemorySize: 1024,
-            Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-            Runtime: 'nodejs12.x',
-            Timeout: 6,
-            KmsKeyArn: { 'Fn::GetAtt': ['MyKms', 'Arn'] },
-          },
-          DependsOn: ['FuncLogGroup'],
-        };
-
-        return expect(awsCompileFunctions.compileFunctions()).to.be.fulfilled.then(() => {
-          const compiledCfTemplate =
-            awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate;
-          const functionResource = compiledCfTemplate.Resources.FuncLambdaFunction;
-          expect(functionResource).to.deep.equal(compiledFunction);
-        });
-      });
-
-      it('should allow if config is provided as a Ref', () => {
-        awsCompileFunctions.serverless.service.functions = {
-          func: {
-            handler: 'func.function.handler',
-            name: 'new-service-dev-func',
-            awsKmsKeyArn: {
-              Ref: 'foobar',
-            },
-          },
-        };
-
-        const compiledFunction = {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            Code: {
-              S3Bucket: { Ref: 'ServerlessDeploymentBucket' },
-              S3Key: 'somedir/new-service.zip',
-            },
-            FunctionName: 'new-service-dev-func',
-            Handler: 'func.function.handler',
-            MemorySize: 1024,
-            Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-            Runtime: 'nodejs12.x',
-            Timeout: 6,
-            KmsKeyArn: { Ref: 'foobar' },
-          },
-          DependsOn: ['FuncLogGroup'],
-        };
-
-        return expect(awsCompileFunctions.compileFunctions()).to.be.fulfilled.then(() => {
-          const compiledCfTemplate =
-            awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate;
-          const functionResource = compiledCfTemplate.Resources.FuncLambdaFunction;
-          expect(functionResource).to.deep.equal(compiledFunction);
-        });
-      });
-
-      it('should allow if config is provided as a Fn::ImportValue', () => {
-        awsCompileFunctions.serverless.service.functions = {
-          func: {
-            handler: 'func.function.handler',
-            name: 'new-service-dev-func',
-            awsKmsKeyArn: {
-              'Fn::ImportValue': 'KmsKey',
-            },
-          },
-        };
-
-        const compiledFunction = {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            Code: {
-              S3Bucket: { Ref: 'ServerlessDeploymentBucket' },
-              S3Key: 'somedir/new-service.zip',
-            },
-            FunctionName: 'new-service-dev-func',
-            Handler: 'func.function.handler',
-            MemorySize: 1024,
-            Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-            Runtime: 'nodejs12.x',
-            Timeout: 6,
-            KmsKeyArn: { 'Fn::ImportValue': 'KmsKey' },
-          },
-          DependsOn: ['FuncLogGroup'],
-        };
-
-        return expect(awsCompileFunctions.compileFunctions()).to.be.fulfilled.then(() => {
-          const compiledCfTemplate =
-            awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate;
-          const functionResource = compiledCfTemplate.Resources.FuncLambdaFunction;
-          expect(functionResource).to.deep.equal(compiledFunction);
-        });
-      });
-
-      describe('when IamRoleLambdaExecution is used', () => {
-        beforeEach(() => {
-          // pretend that the IamRoleLambdaExecution is used
-          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
-            {
-              Properties: {
-                Policies: [
-                  {
-                    PolicyDocument: {
-                      Statement: [],
-                    },
-                  },
-                ],
-              },
-            };
-        });
-
-        it('should create necessary resources if a KMS key arn is provided', () => {
-          awsCompileFunctions.serverless.service.functions = {
-            func: {
-              handler: 'func.function.handler',
-              name: 'new-service-dev-func',
-              awsKmsKeyArn: 'arn:aws:kms:region:accountid:foo/bar',
-            },
-          };
-
-          const compiledFunction = {
-            Type: 'AWS::Lambda::Function',
-            DependsOn: ['FuncLogGroup'],
-            Properties: {
-              Code: {
-                S3Key: `${s3Folder}/${s3FileName}`,
-                S3Bucket: { Ref: 'ServerlessDeploymentBucket' },
-              },
-              FunctionName: 'new-service-dev-func',
-              Handler: 'func.function.handler',
-              MemorySize: 1024,
-              Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
-              Timeout: 6,
-              KmsKeyArn: 'arn:aws:kms:region:accountid:foo/bar',
-            },
-          };
-
-          const compiledKmsStatement = {
-            Effect: 'Allow',
-            Action: ['kms:Decrypt'],
-            Resource: ['arn:aws:kms:region:accountid:foo/bar'],
-          };
-
-          return expect(awsCompileFunctions.compileFunctions()).to.be.fulfilled.then(() => {
-            const compiledCfTemplate =
-              awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate;
-
-            const functionResource = compiledCfTemplate.Resources.FuncLambdaFunction;
-            const dlqStatement =
-              compiledCfTemplate.Resources.IamRoleLambdaExecution.Properties.Policies[0]
-                .PolicyDocument.Statement[0];
-
-            expect(functionResource).to.deep.equal(compiledFunction);
-            expect(dlqStatement).to.deep.equal(compiledKmsStatement);
-          });
-        });
-      });
-    });
-
     describe('when using tracing config', () => {
       let s3Folder;
       let s3FileName;
@@ -1362,14 +1176,8 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
         fixture: 'packageArtifact',
         command: 'package',
         configExt: {
-          service: {
-            // TODO: When removing support for service.awsKmsKeyArn, whole service object
-            // should be removed from this configuration
-            name: 'service',
-            awsKmsKeyArn: 'arn:aws:kms:region:accountid:pro/vider',
-          },
-          disabledDeprecations: ['SERVICE_OBJECT_NOTATION', 'AWS_KMS_KEY_ARN'],
           provider: {
+            kmsKeyArn: 'arn:aws:kms:region:accountid:pro/vider',
             vpc: {
               subnetIds: ['subnet-01010101'],
               securityGroupIds: ['sg-0a0a0a0a'],
@@ -1401,7 +1209,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
                 subnetIds: ['subnet-02020202'],
                 securityGroupIds: ['sg-1b1b1b1b'],
               },
-              awsKmsKeyArn: 'arn:aws:kms:region:accountid:fun/ction',
+              kmsKeyArn: 'arn:aws:kms:region:accountid:fun/ction',
               tracing: 'PassThrough',
               environment: {
                 funcEnvVarA: 'funcEnvVarAValue',
@@ -1499,27 +1307,27 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       expect(Tags).to.deep.include.members(expectedTags);
     });
 
-    it('should support `service.awsKmsKeyArn`', () => {
+    it('should support `provider.kmsKeyArn`', () => {
       const { KmsKeyArn } = cfResources[naming.getLambdaLogicalId('other')].Properties;
 
-      expect(KmsKeyArn).to.equal(serviceConfig.service.awsKmsKeyArn);
+      expect(KmsKeyArn).to.equal(serviceConfig.provider.kmsKeyArn);
       expect(iamRolePolicyStatements).to.deep.include({
         Effect: 'Allow',
         Action: ['kms:Decrypt'],
-        Resource: [serviceConfig.service.awsKmsKeyArn],
+        Resource: [serviceConfig.provider.kmsKeyArn],
       });
     });
 
-    it('should prefer `functions[].awsKmsKeyArn` over `service.awsKmsKeyArn`', () => {
+    it('should prefer `functions[].kmsKeyArn` over `provider.kmsKeyArn`', () => {
       const fooFunctionConfig = serviceConfig.functions.foo;
 
       const { KmsKeyArn } = cfResources[naming.getLambdaLogicalId('foo')].Properties;
 
-      expect(KmsKeyArn).to.equal(fooFunctionConfig.awsKmsKeyArn);
+      expect(KmsKeyArn).to.equal(fooFunctionConfig.kmsKeyArn);
       expect(iamRolePolicyStatements).to.deep.include({
         Effect: 'Allow',
         Action: ['kms:Decrypt'],
-        Resource: [fooFunctionConfig.awsKmsKeyArn],
+        Resource: [fooFunctionConfig.kmsKeyArn],
       });
     });
 
@@ -2031,26 +1839,11 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L907-L948
     });
 
-    it.skip('TODO: should support `functions[].awsKmsKeyArn` as arn string', () => {
-      // Replacement for
-      // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L1232-L1278
-      //
-      // Confirm also that IAM policy statement was added
-    });
-    it.skip('TODO: should support `functions[].awsKmsKeyArn` as Fn::GetAtt', () => {
-      // Replacement for
-      // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L1001-L1036
-    });
+    it.skip('TODO: should support `functions[].kmsKeyArn` as Fn::GetAtt', () => {});
 
-    it.skip('TODO: should support `functions[].awsKmsKeyArn` as Ref', () => {
-      // Replacement for
-      // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L1038-L1073
-    });
+    it.skip('TODO: should support `functions[].kmsKeyArn` as Ref', () => {});
 
-    it.skip('TODO: should support `functions[].awsKmsKeyArn` as Fn::ImportValue', () => {
-      // Replacement for
-      // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L1075-L1110
-    });
+    it.skip('TODO: should support `functions[].kmsKeyArn` as Fn::ImportValue', () => {});
 
     it.skip('TODO: should support `functions[].environment`', () => {
       // Replacement for

From c71bab3cd42ed096edaa4a10242de147250a2794 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 25 Oct 2021 15:18:42 +0200
Subject: [PATCH 0847/1101] feat(AWS Lambda): Change default runtime to
 `nodejs14.x`

BREAKING CHANGE: Default runtime has been changed from `nodejs12.x` to
`nodejs14.x`
---
 lib/plugins/aws/customResources/index.js      |   2 +-
 lib/plugins/aws/package/compile/functions.js  |  12 --
 lib/plugins/aws/provider.js                   |   2 +-
 .../programmatic/function/serverless.yml      |   1 -
 .../plugins/aws/customResources/index.test.js |   6 +-
 .../aws/package/compile/functions.test.js     | 114 +++---------------
 6 files changed, 21 insertions(+), 116 deletions(-)

diff --git a/lib/plugins/aws/customResources/index.js b/lib/plugins/aws/customResources/index.js
index 0a45818426b..160184f7952 100644
--- a/lib/plugins/aws/customResources/index.js
+++ b/lib/plugins/aws/customResources/index.js
@@ -173,7 +173,7 @@ async function addCustomResourceToService(awsProvider, resourceName, iamRoleStat
       FunctionName: absoluteFunctionName,
       Handler,
       MemorySize: 1024,
-      Runtime: 'nodejs12.x',
+      Runtime: 'nodejs14.x',
       Timeout: 180,
     },
     DependsOn: [],
diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index c0bf2d3cf7e..5cda2c6f452 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -50,18 +50,6 @@ class AwsCompileFunctions {
               'While it is highly encouraged to upgrade to new algorithm, you can still use the old approach by setting "provider.lambdaHashingVersion" to "20200924".'
           );
         }
-        if (
-          !this.serverless.service.provider.runtime &&
-          Object.keys(this.serverless.service.functions).length &&
-          Object.values(this.serverless.service.functions).some(
-            ({ handler, runtime }) => handler && !runtime
-          )
-        ) {
-          this.serverless._logDeprecation(
-            'CHANGE_OF_DEFAULT_RUNTIME_TO_NODEJS14X',
-            'Starting with `v3.0.0`, the default runtime will change from `nodejs12.x` to `nodejs14.x`. In order to hide the deprecation message and ensure seamless upgrade, please set the runtime explicitly.'
-          );
-        }
       },
       'package:compileFunctions': async () =>
         BbPromise.bind(this).then(this.downloadPackageArtifacts).then(this.compileFunctions),
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 1bcc033a02d..5b54b61899d 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -1595,7 +1595,7 @@ class AwsProvider {
   }
 
   getRuntime(runtime) {
-    const defaultRuntime = 'nodejs12.x';
+    const defaultRuntime = 'nodejs14.x';
     const runtimeSourceValue = this.getRuntimeSourceValue();
     return runtime || runtimeSourceValue.value || defaultRuntime;
   }
diff --git a/test/fixtures/programmatic/function/serverless.yml b/test/fixtures/programmatic/function/serverless.yml
index 33d10a05a01..245e088e9d2 100644
--- a/test/fixtures/programmatic/function/serverless.yml
+++ b/test/fixtures/programmatic/function/serverless.yml
@@ -5,7 +5,6 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  runtime: nodejs12.x
   lambdaHashingVersion: 20201221
 
 functions:
diff --git a/test/unit/lib/plugins/aws/customResources/index.test.js b/test/unit/lib/plugins/aws/customResources/index.test.js
index b59e130c9ef..e0b6a425b42 100644
--- a/test/unit/lib/plugins/aws/customResources/index.test.js
+++ b/test/unit/lib/plugins/aws/customResources/index.test.js
@@ -109,7 +109,7 @@ describe('#addCustomResourceToService()', () => {
           Role: {
             'Fn::GetAtt': ['IamRoleCustomResourcesLambdaExecution', 'Arn'],
           },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs14.x',
           Timeout: 180,
         },
         DependsOn: ['IamRoleCustomResourcesLambdaExecution'],
@@ -128,7 +128,7 @@ describe('#addCustomResourceToService()', () => {
           Role: {
             'Fn::GetAtt': ['IamRoleCustomResourcesLambdaExecution', 'Arn'],
           },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs14.x',
           Timeout: 180,
         },
         DependsOn: ['IamRoleCustomResourcesLambdaExecution'],
@@ -147,7 +147,7 @@ describe('#addCustomResourceToService()', () => {
           Role: {
             'Fn::GetAtt': ['IamRoleCustomResourcesLambdaExecution', 'Arn'],
           },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs14.x',
           Timeout: 180,
         },
         DependsOn: ['IamRoleCustomResourcesLambdaExecution'],
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index bea1b3ac7fa..9dc01099e1b 100644
--- 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: 'nodejs14.x',
           Timeout: 6,
         },
       };
@@ -347,51 +347,6 @@ describe('AwsCompileFunctions', () => {
       });
     });
 
-    it('should create a function resource with function level tags', () => {
-      const s3Folder = awsCompileFunctions.serverless.service.package.artifactDirectoryName;
-      const s3FileName = awsCompileFunctions.serverless.service.package.artifact
-        .split(path.sep)
-        .pop();
-      awsCompileFunctions.serverless.service.functions = {
-        func: {
-          handler: 'func.function.handler',
-          name: 'new-service-dev-func',
-          tags: {
-            foo: 'bar',
-            baz: 'qux',
-          },
-        },
-      };
-
-      const compiledFunction = {
-        Type: 'AWS::Lambda::Function',
-        DependsOn: ['FuncLogGroup'],
-        Properties: {
-          Code: {
-            S3Key: `${s3Folder}/${s3FileName}`,
-            S3Bucket: { Ref: 'ServerlessDeploymentBucket' },
-          },
-          FunctionName: 'new-service-dev-func',
-          Handler: 'func.function.handler',
-          MemorySize: 1024,
-          Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
-          Timeout: 6,
-          Tags: [
-            { Key: 'foo', Value: 'bar' },
-            { Key: 'baz', Value: 'qux' },
-          ],
-        },
-      };
-
-      return expect(awsCompileFunctions.compileFunctions()).to.be.fulfilled.then(() => {
-        expect(
-          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FuncLambdaFunction
-        ).to.deep.equal(compiledFunction);
-      });
-    });
-
     describe('when using onError config', () => {
       let s3Folder;
       let s3FileName;
@@ -439,7 +394,7 @@ describe('AwsCompileFunctions', () => {
               Handler: 'func.function.handler',
               MemorySize: 1024,
               Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
+              Runtime: 'nodejs14.x',
               Timeout: 6,
               DeadLetterConfig: {
                 TargetArn: 'arn:aws:sns:region:accountid:foo',
@@ -490,7 +445,7 @@ describe('AwsCompileFunctions', () => {
               Handler: 'func.function.handler',
               MemorySize: 1024,
               Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
+              Runtime: 'nodejs14.x',
               Timeout: 6,
               DeadLetterConfig: {
                 TargetArn: {
@@ -532,7 +487,7 @@ describe('AwsCompileFunctions', () => {
               Handler: 'func.function.handler',
               MemorySize: 1024,
               Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
+              Runtime: 'nodejs14.x',
               Timeout: 6,
               DeadLetterConfig: {
                 TargetArn: {
@@ -574,7 +529,7 @@ describe('AwsCompileFunctions', () => {
               Handler: 'func.function.handler',
               MemorySize: 1024,
               Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
+              Runtime: 'nodejs14.x',
               Timeout: 6,
               DeadLetterConfig: {
                 TargetArn: {
@@ -616,7 +571,7 @@ describe('AwsCompileFunctions', () => {
               Handler: 'func.function.handler',
               MemorySize: 1024,
               Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
+              Runtime: 'nodejs14.x',
               Timeout: 6,
               DeadLetterConfig: {
                 TargetArn: 'arn:aws:sns:region:accountid:foo',
@@ -683,7 +638,7 @@ describe('AwsCompileFunctions', () => {
               Handler: 'func.function.handler',
               MemorySize: 1024,
               Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
+              Runtime: 'nodejs14.x',
               Timeout: 6,
               TracingConfig: {
                 Mode: 'Active',
@@ -740,7 +695,7 @@ describe('AwsCompileFunctions', () => {
           Handler: 'func.function.handler',
           MemorySize: 1024,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs14.x',
           Timeout: 6,
           Environment: {
             Variables: {
@@ -807,7 +762,7 @@ describe('AwsCompileFunctions', () => {
           Handler: 'func.function.handler',
           MemorySize: 128,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs14.x',
           Timeout: 10,
         },
       };
@@ -820,43 +775,6 @@ describe('AwsCompileFunctions', () => {
       });
     });
 
-    it('should default to the nodejs12.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)
-        .pop();
-      awsCompileFunctions.serverless.service.provider.runtime = null;
-      awsCompileFunctions.serverless.service.functions = {
-        func: {
-          handler: 'func.function.handler',
-          name: 'new-service-dev-func',
-        },
-      };
-      const compiledFunction = {
-        Type: 'AWS::Lambda::Function',
-        DependsOn: ['FuncLogGroup'],
-        Properties: {
-          Code: {
-            S3Key: `${s3Folder}/${s3FileName}`,
-            S3Bucket: { Ref: 'ServerlessDeploymentBucket' },
-          },
-          FunctionName: 'new-service-dev-func',
-          Handler: 'func.function.handler',
-          MemorySize: 1024,
-          Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
-          Timeout: 6,
-        },
-      };
-
-      return expect(awsCompileFunctions.compileFunctions()).to.be.fulfilled.then(() => {
-        expect(
-          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FuncLambdaFunction
-        ).to.deep.equal(compiledFunction);
-      });
-    });
-
     it('should include description if specified', () => {
       awsCompileFunctions.serverless.service.functions = {
         func: {
@@ -978,7 +896,7 @@ describe('AwsCompileFunctions', () => {
           MemorySize: 1024,
           ReservedConcurrentExecutions: 5,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs14.x',
           Timeout: 6,
         },
       };
@@ -1034,7 +952,7 @@ describe('AwsCompileFunctions', () => {
           MemorySize: 1024,
           ReservedConcurrentExecutions: 0,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs14.x',
           Timeout: 6,
         },
       };
@@ -1073,7 +991,7 @@ describe('AwsCompileFunctions', () => {
           Handler: 'func.function.handler',
           MemorySize: 1024,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs14.x',
           Timeout: 6,
         },
       };
@@ -1111,7 +1029,7 @@ describe('AwsCompileFunctions', () => {
           Handler: 'func.function.handler',
           MemorySize: 1024,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs14.x',
           Timeout: 6,
           Layers: ['arn:aws:xxx:*:*'],
         },
@@ -1868,9 +1786,9 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L1784-L1820
     });
 
-    it.skip('TODO: should default to "nodejs12.x" runtime`', () => {
-      // Replacement for
-      // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L1864-L1899
+    it('should default to "nodejs14.x" runtime`', () => {
+      const funcResource = cfResources[naming.getLambdaLogicalId('target')];
+      expect(funcResource.Properties.Runtime).to.equal('nodejs14.x');
     });
 
     it.skip('TODO: should support `functions[].runtime`', () => {

From 7474746a8eb34b9f4bf1b4a963ec1b23cac6e5f5 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 25 Oct 2021 14:57:08 +0200
Subject: [PATCH 0848/1101] feat: Remove support for
 `provider.disableDefaultOutputExportNames`

BREAKING CHANGE: Removed support for `provider.disableDefaultOutputExportNames`
---
 docs/providers/aws/guide/serverless.yml.md         |  1 -
 lib/plugins/aws/package/index.js                   |  7 -------
 .../aws/package/lib/addExportNameForOutputs.js     | 14 ++++++--------
 lib/plugins/aws/provider.js                        |  1 -
 .../package/lib/addExportNameForOutputs.test.js    | 14 --------------
 5 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index e3112813b49..d4388b5e3e4 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -62,7 +62,6 @@ provider:
       key1: value1
       key2: value2
   deploymentPrefix: serverless # The S3 prefix under which deployed artifacts should be stored. Default is serverless
-  disableDefaultOutputExportNames: false # optional, if set to 'true', disables default behavior of generating export names for CloudFormation outputs
   lambdaHashingVersion: 20201221 # optional, version of hashing algorithm that should be used by the framework
   ecr:
     scanOnPush: true
diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
index 5548b37b01b..4f703fe05ca 100644
--- a/lib/plugins/aws/package/index.js
+++ b/lib/plugins/aws/package/index.js
@@ -59,13 +59,6 @@ class AwsPackage {
 
     this.hooks = {
       'initialize': () => {
-        if (this.serverless.service.provider.disableDefaultOutputExportNames) {
-          this.serverless._logDeprecation(
-            'DISABLE_DEFAULT_OUTPUT_EXPORT_NAMES',
-            'Starting with `v3.0.0`, it will not be possible to disable default export names for outputs. To hide this deprecation message and ensure seamless upgrade, please remove this flag.'
-          );
-        }
-
         if (this.serverless.processedInput.commands.join(' ') === 'package') {
           log.notice();
           log.notice(
diff --git a/lib/plugins/aws/package/lib/addExportNameForOutputs.js b/lib/plugins/aws/package/lib/addExportNameForOutputs.js
index efaf142ae26..01ce67f5712 100644
--- a/lib/plugins/aws/package/lib/addExportNameForOutputs.js
+++ b/lib/plugins/aws/package/lib/addExportNameForOutputs.js
@@ -2,14 +2,12 @@
 
 module.exports = {
   addExportNameForOutputs() {
-    if (!this.serverless.service.provider.disableDefaultOutputExportNames) {
-      const outputs = this.serverless.service.provider.compiledCloudFormationTemplate.Outputs;
-      for (const [key, data] of Object.entries(outputs)) {
-        if (!data.Export) {
-          data.Export = {
-            Name: `sls-${this.serverless.service.service}-${this.provider.getStage()}-${key}`,
-          };
-        }
+    const outputs = this.serverless.service.provider.compiledCloudFormationTemplate.Outputs;
+    for (const [key, data] of Object.entries(outputs)) {
+      if (!data.Export) {
+        data.Export = {
+          Name: `sls-${this.serverless.service.service}-${this.provider.getStage()}-${key}`,
+        };
       }
     }
   },
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 5b54b61899d..8588ff4100b 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -854,7 +854,6 @@ class AwsProvider {
               ],
             },
             deploymentPrefix: { type: 'string' },
-            disableDefaultOutputExportNames: { const: true },
             disableRollback: { type: 'boolean' },
             endpointType: {
               anyOf: ['REGIONAL', 'EDGE', 'PRIVATE'].map(caseInsensitive),
diff --git a/test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js b/test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js
index e348d454885..fa5e724a297 100644
--- a/test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js
@@ -47,18 +47,4 @@ describe('test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js'
   it('Should not override Export.Name for user configured Outputs', () => {
     expect(outputs.CustomOutput.Export.Name).to.equal('someExportName');
   });
-
-  it('Should not add Export.Name if `provider.disableDefaultOutputExportNames` set to `true`', async () => {
-    const { cfTemplate } = await runServerless({
-      fixture: 'apiGateway',
-      command: 'package',
-      configExt: {
-        disabledDeprecations: ['DISABLE_DEFAULT_OUTPUT_EXPORT_NAMES'],
-        provider: {
-          disableDefaultOutputExportNames: true,
-        },
-      },
-    });
-    expect(Object.values(cfTemplate.Outputs).some((value) => value.Export)).to.be.false;
-  });
 });

From 98848ab4fc8ff7232fb6a9974388d252b34c92c4 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 25 Oct 2021 16:54:33 +0200
Subject: [PATCH 0849/1101] feat: Throw for `--aws-s3-accelerate` when custom
 bucket used

BREAKING CHANGE: Using `--aws-s3-accelerate` flag will result in an error
instead of deprecation when custom S3 bucket is used.
---
 lib/plugins/aws/package/lib/generateCoreTemplate.js         | 6 +++---
 .../plugins/aws/package/lib/generateCoreTemplate.test.js    | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/plugins/aws/package/lib/generateCoreTemplate.js b/lib/plugins/aws/package/lib/generateCoreTemplate.js
index 46e54bd1b5b..903b615e2d5 100644
--- a/lib/plugins/aws/package/lib/generateCoreTemplate.js
+++ b/lib/plugins/aws/package/lib/generateCoreTemplate.js
@@ -86,9 +86,9 @@ module.exports = {
 
     if (bucketName) {
       if (isS3TransferAccelerationEnabled) {
-        this.serverless._logDeprecation(
-          'S3_TRANSFER_ACCELERATION_ON_EXISTING_BUCKET',
-          'Starting with "v3.0.0", attempt to enable S3 Transfer Acceleration on user provided bucket will result in error instead of a warning. To ensure seamless upgrade, please stop using "--aws-s3-accelerate" flag.'
+        throw new ServerlessError(
+          'It is not possible to enable S3 Transfer Acceleration on an user provided bucket. In order to avoid this error, stop using `--aws-s3-accelerate` flag',
+          'S3_TRANSFER_ACCELERATION_ON_EXISTING_BUCKET'
         );
       }
       this.bucketName = bucketName;
diff --git a/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js b/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js
index 6c0ffb604d5..ef3bbcc9576 100644
--- a/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js
@@ -5,6 +5,7 @@ const runServerless = require('../../../../../../utils/run-serverless');
 const expect = require('chai').expect;
 
 chai.use(require('chai-as-promised'));
+chai.use(require('sinon-chai'));
 
 describe('#generateCoreTemplate()', () => {
   it('should reject non-HTTPS requests to the deployment bucket', () =>
@@ -135,7 +136,7 @@ describe('#generateCoreTemplate()', () => {
       });
     }));
 
-  it('should result in deprecation error for custom bucket and accelerate flag', async () => {
+  it('should result in error for custom bucket and accelerate flag', async () => {
     const bucketName = 'com.serverless.deploys';
 
     await expect(
@@ -164,7 +165,7 @@ describe('#generateCoreTemplate()', () => {
       })
     ).to.eventually.be.rejected.and.have.property(
       'code',
-      'REJECTED_DEPRECATION_S3_TRANSFER_ACCELERATION_ON_EXISTING_BUCKET'
+      'S3_TRANSFER_ACCELERATION_ON_EXISTING_BUCKET'
     );
   });
 

From b24ab3c0590e37597dbed533778f5d4d0bad1806 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 25 Oct 2021 16:38:24 +0200
Subject: [PATCH 0850/1101] feat: Throw error on duplicated plugin definition

BREAKING CHANGE: Duplicate plugin definition in configuration will now result
in an error instead of a warning.
---
 lib/classes/PluginManager.js                |  7 +++----
 test/unit/lib/classes/PluginManager.test.js | 12 ++++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 2eac8efd397..905d8e057a5 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -115,11 +115,10 @@ class PluginManager {
 
     // don't load plugins twice
     if (this.plugins.some((plugin) => plugin instanceof Plugin)) {
-      this.serverless._logDeprecation(
-        'DUPLICATE_PLUGIN_DEFINITION',
-        'Starting with "v3.0.0", duplicate plugin definition will result in an error instead of a warning. To ensure seamless upgrade, please remove duplicate plugins from your configuration.'
+      throw new ServerlessError(
+        'Encountered duplicate plugin definition. Please remove duplicate plugins from your configuration.',
+        'DUPLICATE_PLUGIN_DEFINITION'
       );
-      return null;
     }
 
     this.loadCommands(pluginInstance);
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
index 1bb2a928742..83321150c22 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/PluginManager.test.js
@@ -1937,4 +1937,16 @@ describe('test/unit/lib/classes/PluginManager.test.js', () => {
     expect(typeof plugin.utils.progress.create).to.equal('function');
     expect(typeof plugin.utils.writeText).to.equal('function');
   });
+
+  it('should error out for duplicate plugin definiton', async () => {
+    await expect(
+      runServerless({
+        fixture: 'plugin',
+        command: 'print',
+        configExt: {
+          plugins: ['./plugin', './plugin'],
+        },
+      })
+    ).to.be.eventually.rejected.and.have.property('code', 'DUPLICATE_PLUGIN_DEFINITION');
+  });
 });

From ff9bbb0ff4b33b142da01e7d194e33e1edfa718f Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 25 Oct 2021 15:59:44 +0200
Subject: [PATCH 0851/1101] feat(AWS CloudFront): Remove support for deprecated
 `behavior` props

BREAKING CHANGE: Support for `MinTTL`, `MaxTTL`, `DefaultTTL` and
`ForwardedValues` on `cloudfront.behavior` has been removed.
---
 .../aws/package/compile/events/cloudFront.js  |  82 +-------------
 .../package/compile/events/cloudFront.test.js | 104 +-----------------
 2 files changed, 2 insertions(+), 184 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/cloudFront.js b/lib/plugins/aws/package/compile/events/cloudFront.js
index c78d5ba9dad..78ddee1f729 100644
--- a/lib/plugins/aws/package/compile/events/cloudFront.js
+++ b/lib/plugins/aws/package/compile/events/cloudFront.js
@@ -124,37 +124,6 @@ class AwsCompileCloudFrontEvents {
             },
           ],
         },
-        ForwardedValues: {
-          type: 'object',
-          properties: {
-            Cookies: {
-              anyOf: [
-                {
-                  type: 'object',
-                  properties: {
-                    Forward: { enum: ['all', 'none'] },
-                  },
-                  additionalProperties: false,
-                  required: ['Forward'],
-                },
-                {
-                  type: 'object',
-                  properties: {
-                    Forward: { const: 'whitelist' },
-                    WhitelistedNames: { type: 'array', items: { type: 'string' } },
-                  },
-                  additionalProperties: false,
-                  required: ['Forward', 'WhitelistedNames'],
-                },
-              ],
-            },
-            Headers: { type: 'array', items: { type: 'string' } },
-            QueryString: { type: 'boolean' },
-            QueryStringCacheKeys: { type: 'array', items: { type: 'string' } },
-          },
-          additionalProperties: false,
-          required: ['QueryString'],
-        },
         CachePolicyId: { type: 'string' },
         Compress: { type: 'boolean' },
         FieldLevelEncryptionId: { type: 'string' },
@@ -205,32 +174,6 @@ class AwsCompileCloudFrontEvents {
     });
 
     this.hooks = {
-      'initialize': () => {
-        if (
-          this.serverless.service.provider.name === 'aws' &&
-          Object.values(this.serverless.service.functions).some(({ events }) =>
-            events.some(({ cloudFront: eventObject }) => {
-              const behaviorConfig = eventObject && eventObject.behavior;
-              if (!behaviorConfig) return false;
-              return (
-                behaviorConfig.ForwardedValues ||
-                behaviorConfig.MinTTL !== undefined ||
-                behaviorConfig.MaxTTL !== undefined ||
-                behaviorConfig.DefaultTTL !== undefined
-              );
-            })
-          )
-        ) {
-          this.serverless._logDeprecation(
-            'CLOUDFRONT_CACHE_BEHAVIOR_FORWARDED_VALUES_AND_TTL',
-            'Cloudfront has deprecated the use of the ForwardedValues, MinTTL, MaxTTL' +
-              'and DefaultTTL field to configure cache behavior.' +
-              'Please use "provider.cloudfront.cachePolicies" to define Cache Policies' +
-              'and reference it here with "cachePolicy.name" property.' +
-              'You can also reference existing policies with "cachePolicy.id".'
-          );
-        }
-      },
       'package:initialize': this.validate.bind(this),
       'before:package:compileFunctions': this.prepareFunctions.bind(this),
       'package:compileEvents': () => {
@@ -440,32 +383,9 @@ class AwsCompileCloudFrontEvents {
             };
             let shouldAssignCachePolicy = true;
             if (event.cloudFront.behavior) {
-              if (
-                event.cloudFront.behavior.ForwardedValues ||
-                event.cloudFront.behavior.MinTTL !== undefined ||
-                event.cloudFront.behavior.MaxTTL !== undefined ||
-                event.cloudFront.behavior.DefaultTTL !== undefined
-              ) {
-                behavior.ForwardedValues = { QueryString: false };
-                shouldAssignCachePolicy = false;
-              }
               Object.assign(behavior, event.cloudFront.behavior);
             }
 
-            if (
-              (event.cloudFront.cachePolicy ||
-                (event.cloudFront.behavior && event.cloudFront.behavior.CachePolicyId)) &&
-              !shouldAssignCachePolicy
-            ) {
-              throw new ServerlessError(
-                'Both cachePolicy and deprecated fields ForwardedValues, MinTTL, MaxTTL' +
-                  'and DefaultTTL found in function ${functionObj.name} configuration.' +
-                  'Specifying a cachePolicy override those deprecated parameters.' +
-                  'Please remove one of the cache behavior definition.',
-                'CACHE_POLICY_ID_AND_DEPRECATED_FIELDS_USED'
-              );
-            }
-
             if (event.cloudFront.behavior && event.cloudFront.behavior.CachePolicyId) {
               Object.assign(behavior, {
                 CachePolicyId: event.cloudFront.behavior.CachePolicyId,
@@ -492,7 +412,7 @@ class AwsCompileCloudFrontEvents {
               shouldAssignCachePolicy = false;
             }
 
-            // Assigning default cache policy only if neither cache policy reference nor any of the ForwardedValues, MinTTL, MaxTTL, and DefaultTTL deprecated fields is defined.
+            // Assigning default cache policy only if cache policy reference is not defined.
             if (shouldAssignCachePolicy) {
               // Assigning default Managed-CachingOptimized Cache Policy.
               // See details at https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html#managed-cache-policies-list
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
index 902ed1f032b..13efad79092 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
@@ -1418,71 +1418,6 @@ describe('AwsCompileCloudFrontEvents', () => {
       ).to.not.have.any.keys('CacheBehaviors');
     });
 
-    it('should create behavior with all values given as an object', () => {
-      awsCompileCloudFrontEvents.serverless.service.functions = {
-        first: {
-          name: 'first',
-          events: [
-            {
-              cloudFront: {
-                eventType: 'viewer-request',
-                origin: 's3://bucketname.s3.amazonaws.com/files',
-                behavior: {
-                  ForwardedValues: {
-                    QueryString: true,
-                    Headers: ['*'],
-                  },
-                  ViewerProtocolPolicy: 'https-only',
-                  AllowedMethods: ['GET', 'HEAD', 'OPTIONS'],
-                  CachedMethods: ['GET', 'HEAD', 'OPTIONS'],
-                },
-              },
-            },
-          ],
-        },
-      };
-
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
-        {
-          FirstLambdaFunction: {
-            Type: 'AWS::Lambda::Function',
-            Properties: {
-              FunctionName: 'first',
-            },
-          },
-          FirstLambdaVersion: {
-            Type: 'AWS::Lambda::Version',
-            Properties: {
-              FunctionName: { Ref: 'FirstLambdaFunction' },
-            },
-          },
-        };
-
-      awsCompileCloudFrontEvents.compileCloudFrontEvents();
-
-      expect(
-        awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.CloudFrontDistribution.Properties.DistributionConfig.DefaultCacheBehavior
-      ).to.eql({
-        TargetOriginId: 's3/bucketname.s3.amazonaws.com/files',
-        ViewerProtocolPolicy: 'https-only',
-        ForwardedValues: {
-          QueryString: true,
-          Headers: ['*'],
-        },
-        AllowedMethods: ['GET', 'HEAD', 'OPTIONS'],
-        CachedMethods: ['GET', 'HEAD', 'OPTIONS'],
-        LambdaFunctionAssociations: [
-          {
-            EventType: 'viewer-request',
-            LambdaFunctionARN: {
-              Ref: 'FirstLambdaVersion',
-            },
-          },
-        ],
-      });
-    });
-
     it('should throw if more than one behavior with the same PathPattern', () => {
       awsCompileCloudFrontEvents.serverless.service.functions = {
         first: {
@@ -1749,43 +1684,6 @@ describe('test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js',
       ).to.eventually.be.rejected.and.have.property('code', 'UNRECOGNIZED_CLOUDFRONT_CACHE_POLICY');
     });
 
-    it('Should throw if lambda config includes both deprecated behavior values and cache policy reference', () => {
-      const cachePolicyId = '08627262-05a9-4f76-9ded-b50ca2e3a84f';
-      return expect(
-        runServerless({
-          fixture: 'function',
-          command: 'package',
-          configExt: {
-            disabledDeprecations: ['CLOUDFRONT_CACHE_BEHAVIOR_FORWARDED_VALUES_AND_TTL'],
-            functions: {
-              basic: {
-                handler: 'myLambdaAtEdge.handler',
-                events: [
-                  {
-                    cloudFront: {
-                      origin: 's3://bucketname.s3.amazonaws.com/files',
-                      eventType: 'viewer-response',
-                      behavior: {
-                        ForwardedValues: {
-                          QueryString: true,
-                        },
-                      },
-                      cachePolicy: {
-                        id: cachePolicyId,
-                      },
-                    },
-                  },
-                ],
-              },
-            },
-          },
-        })
-      ).to.eventually.be.rejected.and.have.property(
-        'code',
-        'CACHE_POLICY_ID_AND_DEPRECATED_FIELDS_USED'
-      );
-    });
-
     it('Should not throw if lambda config includes AllowedMethods or CachedMethods behavior values and cache policy reference', async () => {
       const cachePolicyId = '08627262-05a9-4f76-9ded-b50ca2e3a84f';
       await runServerless({
@@ -2150,7 +2048,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js',
       });
     });
 
-    it('Should attach a default cache policy when none are provided, and no deprecated behavior values are used', () => {
+    it('Should attach a default cache policy when none are provided', () => {
       // Default Managed-CachingOptimized Cache Policy id
       const defaultCachePolicyId = '658327ea-f89d-4fab-a63d-7e88639e58f6';
       expect(getAssociatedCacheBehavior('noPolicy').CachePolicyId).to.eq(defaultCachePolicyId);

From b5e6857c8322789497171f614336020737ecaaaa Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 25 Oct 2021 16:13:32 +0200
Subject: [PATCH 0852/1101] feat(CLI): Remove `-v` alias for `--verbose` flag

BREAKING CHANGE: The `--verbose` CLI flag does no longer support `-v` alias
---
 lib/Serverless.js                      | 10 ----------
 lib/cli/commands-schema/aws-service.js |  4 ----
 2 files changed, 14 deletions(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index 8b7423ce185..13d88b0561a 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -438,16 +438,6 @@ class Serverless {
       }
     }
 
-    if (
-      process.argv.slice(2).includes('-v') &&
-      _.get(resolveCliInput().commandSchema, 'options.verbose.shortcut') === 'v'
-    ) {
-      this._logDeprecation(
-        'CLI_VERBOSE_OPTION_ALIAS',
-        'Starting with v3.0.0, "-v" will no longer be supported as alias for "--verbose" option. Please use "--verbose" flag instead.'
-      );
-    }
-
     if (resolveCliInput().commands[0] !== 'plugin') {
       // merge arrays after variables have been populated
       // (https://github.com/serverless/serverless/issues/3511)
diff --git a/lib/cli/commands-schema/aws-service.js b/lib/cli/commands-schema/aws-service.js
index 0c4f8e71eea..bb40027273a 100644
--- a/lib/cli/commands-schema/aws-service.js
+++ b/lib/cli/commands-schema/aws-service.js
@@ -19,7 +19,6 @@ commands.set('deploy', {
     },
     'verbose': {
       usage: 'Show all stack events during deployment',
-      shortcut: 'v',
       type: 'boolean',
     },
     'force': {
@@ -94,7 +93,6 @@ commands.set('info', {
     },
     verbose: {
       usage: 'List stack outputs',
-      shortcut: 'v',
       type: 'boolean',
     },
   },
@@ -237,7 +235,6 @@ commands.set('remove', {
   options: {
     verbose: {
       usage: 'Show all stack events during deployment',
-      shortcut: 'v',
       type: 'boolean',
     },
   },
@@ -254,7 +251,6 @@ commands.set('rollback', {
     },
     verbose: {
       usage: 'Show all stack events during deployment',
-      shortcut: 'v',
       type: 'boolean',
     },
   },

From dcc9fc0cab7fd88c4e95df7a254921f12b1537ff Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 25 Oct 2021 11:22:22 +0200
Subject: [PATCH 0853/1101] feat(AWS API Gateway): Remove support for
 `request.schema`

BREAKING CHANGE: Support for `http.request.schema` has been removed and replaced
with `http.request.schemas`.
---
 .../compile/events/apiGateway/index.js        |  16 ---
 .../events/apiGateway/lib/requestValidator.js |  29 -----
 .../programmatic/requestSchema/serverless.yml |  14 ---
 .../apiGateway/lib/requestValidator.test.js   | 117 ------------------
 4 files changed, 176 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/index.js b/lib/plugins/aws/package/compile/events/apiGateway/index.js
index ef920d3d77b..0d130dc0434 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/index.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/index.js
@@ -114,10 +114,6 @@ const requestSchema = {
       additionalProperties: false,
     },
     passThrough: { enum: ['NEVER', 'WHEN_NO_MATCH', 'WHEN_NO_TEMPLATES'] },
-    schema: {
-      type: 'object',
-      additionalProperties: { anyOf: [{ type: 'object' }, { type: 'string' }] },
-    },
     schemas: {
       type: 'object',
       additionalProperties: { anyOf: [{ type: 'object' }, { type: 'string' }] },
@@ -256,18 +252,6 @@ class AwsCompileApigEvents {
           );
         }
 
-        if (
-          this.serverless.service.provider.name === 'aws' &&
-          Object.values(this.serverless.service.functions).some(({ events }) =>
-            events.some(({ http }) => _.get(http, 'request.schema'))
-          )
-        ) {
-          this.serverless._logDeprecation(
-            'AWS_API_GATEWAY_SCHEMAS',
-            'Starting with next major version, "http.request.schema" property will be replaced by "http.request.schemas".'
-          );
-        }
-
         if (
           this.serverless.service.provider.name === 'aws' &&
           Object.values(this.serverless.service.functions).some(({ events }) =>
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
index 04414d1c7f8..69d4a536502 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
@@ -98,35 +98,6 @@ module.exports = {
           template.Properties.RequestModels = template.Properties.RequestModels || {};
           template.Properties.RequestModels[contentType] = { Ref: modelLogicalId };
         }
-      } else if (event.http.request && event.http.request.schema) {
-        // Old functionality
-        for (const [contentType, schema] of _.entries(event.http.request.schema)) {
-          const modelLogicalId = this.provider.naming.getEndpointModelLogicalId(
-            resourceName,
-            event.http.method,
-            contentType
-          );
-
-          if (!validatorLogicalId) {
-            const requestValidator = this.createRequestValidator();
-            validatorLogicalId = requestValidator.validatorLogicalId;
-          }
-
-          template.Properties.RequestValidatorId = { Ref: validatorLogicalId };
-          template.Properties.RequestModels = template.Properties.RequestModels || {};
-          template.Properties.RequestModels[contentType] = { Ref: modelLogicalId };
-
-          Object.assign(this.serverless.service.provider.compiledCloudFormationTemplate.Resources, {
-            [modelLogicalId]: {
-              Type: 'AWS::ApiGateway::Model',
-              Properties: {
-                RestApiId: this.provider.getApiGatewayRestApiId(),
-                ContentType: contentType,
-                Schema: schema,
-              },
-            },
-          });
-        }
       }
     });
   },
diff --git a/test/fixtures/programmatic/requestSchema/serverless.yml b/test/fixtures/programmatic/requestSchema/serverless.yml
index ec142d6142b..252fa5881cf 100644
--- a/test/fixtures/programmatic/requestSchema/serverless.yml
+++ b/test/fixtures/programmatic/requestSchema/serverless.yml
@@ -1,5 +1,4 @@
 service: service
-disabledDeprecations: AWS_API_GATEWAY_SCHEMAS
 
 provider:
   name: aws
@@ -50,12 +49,6 @@ functions:
                 name: TestMethodModel
                 description: 'Test Method Model Desc'
                 schema: '${file(dummySchema.json)}'
-      - http:
-          path: test-deprecated-simple
-          method: get
-          request:
-            schema:
-              application/json: '${file(dummySchema.json)}'
       - http:
           path: test-multiple
           method: get
@@ -63,10 +56,3 @@ functions:
             schemas:
               application/json: '${file(dummySchema.json)}'
               text/plain: 'foo'
-      - http:
-          path: test-deprecated-multiple
-          method: get
-          request:
-            schema:
-              application/json: '${file(dummySchema.json)}'
-              text/plain: 'foo'
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
index 97924dcc01a..6a0b8e2fe03 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
@@ -287,54 +287,6 @@ describe('#compileRequestValidators() - schemas', () => {
       });
     });
 
-    it('should support existing request:schema property for regression', () => {
-      const modelLogicalId = naming.getEndpointModelLogicalId(
-        'TestDashdeprecatedDashsimple',
-        'get',
-        'application/json'
-      );
-      const validatorLogicalId = naming.getValidatorLogicalId();
-      const methodLogicalId = naming.getMethodLogicalId('TestDashdeprecatedDashsimple', 'get');
-      const methodResource = cfResources[methodLogicalId];
-
-      expect(methodResource.Properties).to.have.property('RequestModels');
-      expect(methodResource.Properties).to.have.property('RequestValidatorId');
-
-      expect(methodResource.Properties.RequestModels['application/json']).to.deep.equal({
-        Ref: modelLogicalId,
-      });
-
-      expect(methodResource.Properties.RequestValidatorId).to.deep.equal({
-        Ref: validatorLogicalId,
-      });
-
-      const modelResource = cfResources[modelLogicalId];
-
-      expect(modelResource).to.deep.equal({
-        Type: 'AWS::ApiGateway::Model',
-        Properties: {
-          ContentType: 'application/json',
-          RestApiId: {
-            Ref: 'ApiGatewayRestApi',
-          },
-          Schema: {
-            $schema: 'http://json-schema.org/draft-04/schema#',
-            definitions: {},
-            properties: {
-              id: {
-                pattern: '[0-9]+',
-                title: 'ID for object',
-                type: 'number',
-              },
-            },
-            required: ['id'],
-            title: 'Test Validation Schema',
-            type: 'object',
-          },
-        },
-      });
-    });
-
     it('should create validator with that includes `service` and `stage`', () => {
       const validatorLogicalId = naming.getValidatorLogicalId();
       const validatorResource = cfResources[validatorLogicalId];
@@ -343,75 +295,6 @@ describe('#compileRequestValidators() - schemas', () => {
         `${serviceName}-${stage} | Validate request body and querystring parameters`
       );
     });
-
-    it('should support multiple request:schema property for regression', () => {
-      const modelJsonLogicalId = naming.getEndpointModelLogicalId(
-        'TestDashdeprecatedDashmultiple',
-        'get',
-        'application/json'
-      );
-      const modelPlainTextLogicalId = naming.getEndpointModelLogicalId(
-        'TestDashdeprecatedDashmultiple',
-        'get',
-        'text/plain'
-      );
-      const validatorLogicalId = naming.getValidatorLogicalId();
-      const methodLogicalId = naming.getMethodLogicalId('TestDashdeprecatedDashmultiple', 'get');
-      const methodResource = cfResources[methodLogicalId];
-
-      expect(methodResource.Properties).to.have.property('RequestModels');
-      expect(methodResource.Properties).to.have.property('RequestValidatorId');
-
-      expect(methodResource.Properties.RequestModels['application/json']).to.deep.equal({
-        Ref: modelJsonLogicalId,
-      });
-
-      expect(methodResource.Properties.RequestModels['text/plain']).to.deep.equal({
-        Ref: modelPlainTextLogicalId,
-      });
-
-      expect(methodResource.Properties.RequestValidatorId).to.deep.equal({
-        Ref: validatorLogicalId,
-      });
-
-      const modelJsonResource = cfResources[modelJsonLogicalId];
-      const modelPlainTextResource = cfResources[modelPlainTextLogicalId];
-
-      expect(modelJsonResource).to.deep.equal({
-        Type: 'AWS::ApiGateway::Model',
-        Properties: {
-          ContentType: 'application/json',
-          RestApiId: {
-            Ref: 'ApiGatewayRestApi',
-          },
-          Schema: {
-            $schema: 'http://json-schema.org/draft-04/schema#',
-            definitions: {},
-            properties: {
-              id: {
-                pattern: '[0-9]+',
-                title: 'ID for object',
-                type: 'number',
-              },
-            },
-            required: ['id'],
-            title: 'Test Validation Schema',
-            type: 'object',
-          },
-        },
-      });
-
-      expect(modelPlainTextResource).to.deep.equal({
-        Type: 'AWS::ApiGateway::Model',
-        Properties: {
-          ContentType: 'text/plain',
-          RestApiId: {
-            Ref: 'ApiGatewayRestApi',
-          },
-          Schema: 'foo',
-        },
-      });
-    });
   });
 });
 

From afc095509344f94bb73b36481d1bb534af84bc8c Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 25 Oct 2021 11:31:32 +0200
Subject: [PATCH 0854/1101] feat(AWS HTTP API): Always apply `provider.tags` to
 HTTP API

BREAKING CHANGE: Tags from `provider.tags` are applied by default to HTTP API
Gateway.
---
 .../aws/package/compile/events/httpApi.js     | 30 ++-----------------
 .../package/compile/events/httpApi.test.js    |  1 -
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/httpApi.js b/lib/plugins/aws/package/compile/events/httpApi.js
index 55f209161ee..d7ce41153e0 100644
--- a/lib/plugins/aws/package/compile/events/httpApi.js
+++ b/lib/plugins/aws/package/compile/events/httpApi.js
@@ -43,24 +43,6 @@ class HttpApiEvents {
     serverless.httpApiEventsPlugin = this;
 
     this.hooks = {
-      'initialize': () => {
-        if (
-          this.serverless.service.provider.name === 'aws' &&
-          this.serverless.service.provider.tags &&
-          !_.get(this.serverless.service.provider.httpApi, 'useProviderTags') &&
-          Object.values(this.serverless.service.functions).some(({ events }) =>
-            events.some(({ httpApi }) => httpApi)
-          )
-        ) {
-          this.serverless._logDeprecation(
-            'AWS_HTTP_API_USE_PROVIDER_TAGS',
-            'Starting with next major version, the provider tags ' +
-              'will be applied to Http Api Gateway by default. \n' +
-              'Set "provider.httpApi.useProviderTags" to "true" ' +
-              'to adapt to the new behavior now.'
-          );
-        }
-      },
       'package:compileEvents': () => {
         this.resolveConfiguration();
         if (!this.config.routes.size) return;
@@ -117,11 +99,7 @@ class HttpApiEvents {
       DisableExecuteApiEndpoint:
         this.config.disableDefaultEndpoint == null ? undefined : this.config.disableDefaultEndpoint,
     };
-    if (
-      this.serverless.service.provider.tags &&
-      this.serverless.service.provider.httpApi &&
-      this.serverless.service.provider.httpApi.useProviderTags
-    ) {
+    if (this.serverless.service.provider.tags) {
       const tags = Object.assign({}, this.serverless.service.provider.tags);
       properties.Tags = tags;
     }
@@ -167,11 +145,7 @@ class HttpApiEvents {
       },
     };
 
-    if (
-      this.serverless.service.provider.tags &&
-      this.serverless.service.provider.httpApi &&
-      this.serverless.service.provider.httpApi.useProviderTags
-    ) {
+    if (this.serverless.service.provider.tags) {
       properties.Tags = Object.assign({}, this.serverless.service.provider.tags);
     }
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
index 0f00ff60aa2..7959d038adb 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
@@ -201,7 +201,6 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
                   audience: 'audiencexxx',
                 },
               },
-              useProviderTags: true,
             },
             logs: {
               httpApi: true,

From 650ed37db3fd5bab5b4573d85cf7c401181cd2a6 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 25 Oct 2021 11:44:35 +0200
Subject: [PATCH 0855/1101] feat(AWS HTTP API): Deprecate
 `provider.httpApi.useProviderTags`

---
 docs/deprecations.md                          |  8 ++++++++
 .../aws/package/compile/events/httpApi.js     | 11 +++++++++++
 .../package/compile/events/httpApi.test.js    | 19 +++++++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index d40bd72d58f..2e8dc3068a8 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -38,6 +38,14 @@ Note:
 - The `serverless.yml` setting is ineffective for deprecations reported before the configuration is read.
 - `SLS_DEPRECATION_DISABLE` and `disabledDeprecations` remain respected, and no errors will be thrown for mentioned deprecation codes.
 
+<a name="AWS_HTTP_API_USE_PROVIDER_TAGS_PROPERTY"><div>&nbsp;</div></a>
+
+## Ineffective property `provider.httpApi.useProviderTags`
+
+Deprecation code: `AWS_HTTP_API_USE_PROVIDER_TAGS_PROPERTY`
+
+Starting with "v3.0.0", property `provider.httpApi.useProviderTags` is no longer effective as provider tags are applied to Http Api Gateway by default. You can safely remove this property from your configuration.
+
 <a name="S3_TRANSFER_ACCELERATION_ON_EXISTING_BUCKET"><div>&nbsp;</div></a>
 
 ## Attempt to enable S3 Transfer Acceleration on provided S3 buckets
diff --git a/lib/plugins/aws/package/compile/events/httpApi.js b/lib/plugins/aws/package/compile/events/httpApi.js
index d7ce41153e0..1e7a0cfe0bf 100644
--- a/lib/plugins/aws/package/compile/events/httpApi.js
+++ b/lib/plugins/aws/package/compile/events/httpApi.js
@@ -43,6 +43,17 @@ class HttpApiEvents {
     serverless.httpApiEventsPlugin = this;
 
     this.hooks = {
+      'initialize': () => {
+        if (
+          this.serverless.service.provider.name === 'aws' &&
+          _.get(this.serverless.service.provider.httpApi, 'useProviderTags')
+        ) {
+          this.serverless._logDeprecation(
+            'AWS_HTTP_API_USE_PROVIDER_TAGS_PROPERTY',
+            'Property "provider.httpApi.useProviderTags" is no longer effective as provider tags are applied to Http Api Gateway by default. You can safely remove this property from your configuration.'
+          );
+        }
+      },
       'package:compileEvents': () => {
         this.resolveConfiguration();
         if (!this.config.routes.size) return;
diff --git a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
index 7959d038adb..2d6b6feeae1 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
@@ -1188,4 +1188,23 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       });
     });
   });
+
+  it('should trigger a deprecation when `provider.httpApi.useProviderTags` is set', async () => {
+    await expect(
+      runServerless({
+        fixture: 'httpApi',
+        configExt: {
+          provider: {
+            httpApi: {
+              useProviderTags: true,
+            },
+          },
+        },
+        command: 'package',
+      })
+    ).to.eventually.be.rejected.and.have.property(
+      'code',
+      'REJECTED_DEPRECATION_AWS_HTTP_API_USE_PROVIDER_TAGS_PROPERTY'
+    );
+  });
 });

From 8d803e33920015b982eb914350cf15ebe395e72b Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 26 Oct 2021 12:18:25 +0200
Subject: [PATCH 0856/1101] feat(AWS Alexa): Remove support for alexaSkill
 without appId

BREAKING CHANGE: Support for simple `alexaSkill` event was removed and now
`appId` is required for all `alexaSkill` events.
---
 .../aws/package/compile/events/alexaSkill.js     | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/alexaSkill.js b/lib/plugins/aws/package/compile/events/alexaSkill.js
index 556ec9105b6..5637a34c854 100644
--- a/lib/plugins/aws/package/compile/events/alexaSkill.js
+++ b/lib/plugins/aws/package/compile/events/alexaSkill.js
@@ -46,17 +46,15 @@ class AwsCompileAlexaSkillEvents {
       let alexaSkillNumberInFunction = 0;
 
       functionObj.events.forEach((event) => {
-        if (event === 'alexaSkill' || event.alexaSkill) {
+        if (event.alexaSkill) {
           let enabled = true;
           let appId;
-          if (event !== 'alexaSkill') {
-            if (typeof event.alexaSkill === 'string') {
-              appId = event.alexaSkill;
-            } else {
-              appId = event.alexaSkill.appId;
-              // Parameter `enabled` is optional, hence the explicit non-equal check for false.
-              enabled = event.alexaSkill.enabled !== false;
-            }
+          if (typeof event.alexaSkill === 'string') {
+            appId = event.alexaSkill;
+          } else {
+            appId = event.alexaSkill.appId;
+            // Parameter `enabled` is optional, hence the explicit non-equal check for false.
+            enabled = event.alexaSkill.enabled !== false;
           }
           alexaSkillNumberInFunction++;
 

From bd3ec282732079c6cc4526afac3466c990ae51d3 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 26 Oct 2021 13:08:58 +0200
Subject: [PATCH 0857/1101] feat(AWS API Gateway): Remove API specific settings
 from `provider`

BREAKING CHANGE: Support for `usagePlan`, `resourcePolicy` and `apiKeys` on
`provider` level is removed. Use `provider.apiGateway` level instead to set
them.
---
 docs/providers/aws/events/apigateway.md       | 21 ++++++++++---------
 .../compile/events/apiGateway/index.js        | 14 -------------
 .../compile/events/apiGateway/lib/apiKeys.js  |  8 ++-----
 .../lib/hack/disassociateUsagePlan.js         |  4 +---
 .../compile/events/apiGateway/lib/restApi.js  |  4 +---
 .../events/apiGateway/lib/usagePlan.js        | 12 +++--------
 .../events/apiGateway/lib/usagePlanKeys.js    |  4 +---
 lib/plugins/aws/provider.js                   | 15 -------------
 8 files changed, 19 insertions(+), 63 deletions(-)

diff --git a/docs/providers/aws/events/apigateway.md b/docs/providers/aws/events/apigateway.md
index fd2a37dda26..efd1bf56d7d 100644
--- a/docs/providers/aws/events/apigateway.md
+++ b/docs/providers/aws/events/apigateway.md
@@ -1654,16 +1654,17 @@ provider:
   name: aws
   runtime: nodejs12.x
 
-  resourcePolicy:
-    - Effect: Allow
-      Principal: '*'
-      Action: execute-api:Invoke
-      Resource:
-        - execute-api:/*/*/*
-      Condition:
-        IpAddress:
-          aws:SourceIp:
-            - '123.123.123.123'
+  apiGateway:
+    resourcePolicy:
+      - Effect: Allow
+        Principal: '*'
+        Action: execute-api:Invoke
+        Resource:
+          - execute-api:/*/*/*
+        Condition:
+          IpAddress:
+            aws:SourceIp:
+              - '123.123.123.123'
 ```
 
 ## Compression
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/index.js b/lib/plugins/aws/package/compile/events/apiGateway/index.js
index 0d130dc0434..27c96b51c41 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/index.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/index.js
@@ -238,20 +238,6 @@ class AwsCompileApigEvents {
 
     this.hooks = {
       'initialize': () => {
-        if (
-          this.serverless.service.provider.name === 'aws' &&
-          (this.serverless.service.provider.apiKeys ||
-            this.serverless.service.provider.resourcePolicy ||
-            this.serverless.service.provider.usagePlan)
-        ) {
-          this.serverless._logDeprecation(
-            'AWS_API_GATEWAY_SPECIFIC_KEYS',
-            'Starting with next major version, API Gateway-specific configuration keys ' +
-              '"apiKeys", "resourcePolicy" and "usagePlan" will be relocated from "provider" ' +
-              'to "provider.apiGateway"'
-          );
-        }
-
         if (
           this.serverless.service.provider.name === 'aws' &&
           Object.values(this.serverless.service.functions).some(({ events }) =>
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.js
index 533bcc87f2f..600e2807cba 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.js
@@ -32,18 +32,14 @@ function createApiKeyResource(that, apiKey) {
 
 module.exports = {
   compileApiKeys() {
-    const apiKeys =
-      _.get(this.serverless.service.provider.apiGateway, 'apiKeys') ||
-      this.serverless.service.provider.apiKeys;
+    const apiKeys = _.get(this.serverless.service.provider.apiGateway, 'apiKeys');
     if (apiKeys) {
       const resources = this.serverless.service.provider.compiledCloudFormationTemplate.Resources;
       let keyNumber = 0;
       apiKeys.forEach((apiKeyDefinition) => {
         // if multiple API key types are used
         const name = Object.keys(apiKeyDefinition)[0];
-        const usagePlan =
-          _.get(this.serverless.service.provider.apiGateway, 'usagePlan') ||
-          this.serverless.service.provider.usagePlan;
+        const usagePlan = _.get(this.serverless.service.provider.apiGateway, 'usagePlan');
         if (
           _.isObject(apiKeyDefinition) &&
           Array.isArray(usagePlan) &&
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.js
index 401bd886bbb..96073240226 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.js
@@ -6,9 +6,7 @@ const { legacy, log } = require('@serverless/utils/log');
 
 module.exports = {
   async disassociateUsagePlan() {
-    const apiKeys =
-      _.get(this.serverless.service.provider.apiGateway, 'apiKeys') ||
-      this.serverless.service.provider.apiKeys;
+    const apiKeys = _.get(this.serverless.service.provider.apiGateway, 'apiKeys');
 
     if (apiKeys && apiKeys.length) {
       legacy.log('Removing usage plan association...');
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js
index 3f27d318f40..3ab8143a88b 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js
@@ -59,9 +59,7 @@ module.exports = {
       },
     });
 
-    const resourcePolicy =
-      _.get(this.serverless.service.provider.apiGateway, 'resourcePolicy') ||
-      this.serverless.service.provider.resourcePolicy;
+    const resourcePolicy = _.get(this.serverless.service.provider.apiGateway, 'resourcePolicy');
     if (resourcePolicy && Object.keys(resourcePolicy).length) {
       const policy = {
         Version: '2012-10-17',
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.js
index 4a412f77e4c..a0eabc41044 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.js
@@ -20,9 +20,7 @@ function createUsagePlanResource(that, name) {
     },
   };
   const template = _.cloneDeep(resourceTemplate);
-  const usagePlan =
-    _.get(that.serverless.service.provider.apiGateway, 'usagePlan') ||
-    that.serverless.service.provider.usagePlan;
+  const usagePlan = _.get(that.serverless.service.provider.apiGateway, 'usagePlan');
   // this is done for backward compatibility
   if (name === 'default') {
     // create old legacy resources
@@ -97,12 +95,8 @@ function createUsagePlanResource(that, name) {
 
 module.exports = {
   compileUsagePlan() {
-    const apiKeys =
-      _.get(this.serverless.service.provider.apiGateway, 'apiKeys') ||
-      this.serverless.service.provider.apiKeys;
-    const usagePlan =
-      _.get(this.serverless.service.provider.apiGateway, 'usagePlan') ||
-      this.serverless.service.provider.usagePlan;
+    const apiKeys = _.get(this.serverless.service.provider.apiGateway, 'apiKeys');
+    const usagePlan = _.get(this.serverless.service.provider.apiGateway, 'usagePlan');
     if (usagePlan || apiKeys) {
       const resources = this.serverless.service.provider.compiledCloudFormationTemplate.Resources;
       this.apiGatewayUsagePlanNames = [];
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.js
index d017514661d..8d1d047352d 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.js
@@ -24,9 +24,7 @@ function createUsagePlanKeyResource(that, usagePlanLogicalId, keyNumber, keyName
 
 module.exports = {
   compileUsagePlanKeys() {
-    const apiKeys =
-      _.get(this.serverless.service.provider.apiGateway, 'apiKeys') ||
-      this.serverless.service.provider.apiKeys;
+    const apiKeys = _.get(this.serverless.service.provider.apiGateway, 'apiKeys');
     if (apiKeys) {
       const resources = this.serverless.service.provider.compiledCloudFormationTemplate.Resources;
       let keyNumber = 0;
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 8588ff4100b..57672acf6f8 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -759,7 +759,6 @@ class AwsProvider {
               },
               additionalProperties: false,
             },
-            apiKeys: { $ref: '#/definitions/awsApiGatewayApiKeys' },
             apiName: { type: 'string' },
             architecture: { $ref: '#/definitions/awsLambdaArchitecture' },
             cfnRole: { $ref: '#/definitions/awsArn' },
@@ -1112,7 +1111,6 @@ class AwsProvider {
                 'sa-east-1',
               ],
             },
-            resourcePolicy: { $ref: '#/definitions/awsResourcePolicyStatements' },
             role: { $ref: '#/definitions/awsLambdaRole' },
             rolePermissionsBoundary: { $ref: '#/definitions/awsArnString' },
             rollbackConfiguration: {
@@ -1170,19 +1168,6 @@ class AwsProvider {
               },
               additionalProperties: false,
             },
-            usagePlan: {
-              anyOf: [
-                apiGatewayUsagePlan,
-                {
-                  type: 'array',
-                  items: {
-                    type: 'object',
-                    additionalProperties: apiGatewayUsagePlan,
-                    maxProperties: 1,
-                  },
-                },
-              ],
-            },
             vpc: { $ref: '#/definitions/awsLambdaVpcConfig' },
             vpcEndpointIds: { $ref: '#/definitions/awsCfArrayInstruction' },
             versionFunctions: { $ref: '#/definitions/awsLambdaVersioning' },

From 33bd501f06856a291de86cec8f921ae1bd1415c7 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 26 Oct 2021 16:16:52 +0200
Subject: [PATCH 0858/1101] feat: Error instead of warning when missing
 "commands" or "options"

BREAKING CHANGE: When creating `Serverless` class instance programatically,
both "options" and "commands" have to be passed via "config" to the constructor.
---
 lib/Serverless.js                             | 33 +++++--------------
 test/unit/lib/Serverless.test.js              |  2 +-
 test/unit/lib/classes/CLI.test.js             |  2 +-
 test/unit/lib/classes/Config.test.js          |  2 +-
 test/unit/lib/classes/PluginManager.test.js   |  4 +--
 test/unit/lib/classes/Utils.test.js           |  2 +-
 test/unit/lib/classes/YamlParser.test.js      |  2 +-
 .../unit/lib/plugins/aws/common/index.test.js |  2 +-
 .../plugins/aws/common/lib/artifacts.test.js  |  4 +--
 .../aws/common/lib/cleanupTempDir.test.js     |  2 +-
 .../plugins/aws/customResources/index.test.js |  2 +-
 .../unit/lib/plugins/aws/deploy/index.test.js |  2 +-
 .../aws/deploy/lib/checkForChanges.test.js    |  2 +-
 .../aws/deploy/lib/cleanupS3Bucket.test.js    |  2 +-
 .../aws/deploy/lib/createStack.test.js        |  2 +-
 .../aws/deploy/lib/extendedValidate.test.js   |  2 +-
 .../aws/deploy/lib/uploadArtifacts.test.js    |  2 +-
 .../aws/deploy/lib/validateTemplate.test.js   |  2 +-
 test/unit/lib/plugins/aws/deployList.test.js  |  2 +-
 .../plugins/aws/info/getApiKeyValues.test.js  |  2 +-
 .../plugins/aws/info/getResourceCount.test.js |  2 +-
 .../lib/plugins/aws/info/getStackInfo.test.js |  2 +-
 test/unit/lib/plugins/aws/info/index.test.js  |  2 +-
 .../lib/plugins/aws/invokeLocal/index.test.js |  2 +-
 .../plugins/aws/lib/getServiceState.test.js   |  2 +-
 .../lib/plugins/aws/lib/monitorStack.test.js  |  2 +-
 test/unit/lib/plugins/aws/lib/naming.test.js  |  2 ++
 .../lib/plugins/aws/lib/setBucketName.test.js |  2 +-
 .../lib/plugins/aws/lib/updateStack.test.js   |  2 +-
 .../unit/lib/plugins/aws/lib/validate.test.js |  2 +-
 test/unit/lib/plugins/aws/logs.test.js        |  4 +--
 test/unit/lib/plugins/aws/metrics.test.js     |  2 +-
 .../events/alb/lib/listenerRules.test.js      |  2 +-
 .../events/alb/lib/permissions.test.js        |  2 +-
 .../events/alb/lib/targetGroups.test.js       |  2 +-
 .../compile/events/alb/lib/validate.test.js   |  2 +-
 .../package/compile/events/alexaSkill.test.js |  2 +-
 .../compile/events/alexaSmartHome.test.js     |  2 +-
 .../compile/events/apiGateway/index.test.js   |  2 +-
 .../events/apiGateway/lib/apiKeys.test.js     |  2 +-
 .../events/apiGateway/lib/authorizers.test.js |  2 +-
 .../events/apiGateway/lib/cors.test.js        |  2 +-
 .../events/apiGateway/lib/deployment.test.js  |  2 +-
 .../lib/hack/disassociateUsagePlan.test.js    |  2 +-
 .../apiGateway/lib/hack/updateStage.test.js   |  2 +-
 .../apiGateway/lib/method/index.test.js       |  2 +-
 .../events/apiGateway/lib/permissions.test.js |  2 +-
 .../events/apiGateway/lib/resources.test.js   |  2 +-
 .../events/apiGateway/lib/restApi.test.js     |  2 +-
 .../events/apiGateway/lib/stage/index.test.js |  2 +-
 .../events/apiGateway/lib/usagePlan.test.js   |  2 +-
 .../apiGateway/lib/usagePlanKeys.test.js      |  2 +-
 .../package/compile/events/cloudFront.test.js |  2 +-
 .../compile/events/cloudWatchEvent.test.js    |  2 +-
 .../compile/events/cloudWatchLog.test.js      |  2 +-
 .../compile/events/cognitoUserPool.test.js    |  2 +-
 .../aws/package/compile/events/iot.test.js    |  2 +-
 .../package/compile/events/s3/index.test.js   |  2 +-
 .../aws/package/compile/events/sns.test.js    |  2 +-
 .../aws/package/compile/events/stream.test.js |  2 +-
 .../compile/events/websockets/index.test.js   |  2 +-
 .../events/websockets/lib/authorizers.test.js |  4 +--
 .../events/websockets/lib/deployment.test.js  |  2 +-
 .../websockets/lib/integrations.test.js       |  2 +-
 .../events/websockets/lib/permissions.test.js |  2 +-
 .../websockets/lib/routeResponses.test.js     |  2 +-
 .../events/websockets/lib/routes.test.js      |  2 +-
 .../events/websockets/lib/stage.test.js       |  2 +-
 .../events/websockets/lib/validate.test.js    |  2 +-
 .../aws/package/compile/functions.test.js     |  2 ++
 .../lib/plugins/aws/package/index.test.js     |  2 +-
 .../lib/generateArtifactDirectoryName.test.js |  2 +-
 .../lib/mergeCustomProviderResources.test.js  |  2 +-
 .../package/lib/saveCompiledTemplate.test.js  |  2 +-
 .../aws/package/lib/saveServiceState.test.js  |  2 +-
 test/unit/lib/plugins/aws/provider.test.js    |  4 ++-
 .../lib/plugins/aws/remove/lib/stack.test.js  |  2 +-
 test/unit/lib/plugins/aws/rollback.test.js    |  2 +-
 .../lib/plugins/aws/rollbackFunction.test.js  |  2 +-
 test/unit/lib/plugins/create/create.test.js   |  2 +-
 test/unit/lib/plugins/deploy.test.js          |  2 +-
 test/unit/lib/plugins/info.test.js            |  2 +-
 test/unit/lib/plugins/invoke.test.js          |  2 +-
 test/unit/lib/plugins/metrics.test.js         |  2 +-
 .../plugins/package/lib/zipService.test.js    |  2 +-
 test/unit/lib/plugins/plugin/install.test.js  |  2 +-
 .../unit/lib/plugins/plugin/lib/utils.test.js |  2 +-
 test/unit/lib/plugins/plugin/list.test.js     |  2 +-
 test/unit/lib/plugins/plugin/search.test.js   |  2 +-
 .../unit/lib/plugins/plugin/uninstall.test.js |  2 +-
 test/unit/lib/plugins/remove.test.js          |  2 +-
 test/unit/lib/plugins/rollback.test.js        |  2 +-
 test/unit/lib/utils/fs/writeFile.test.js      |  2 +-
 test/unit/lib/utils/fs/writeFileSync.test.js  |  2 +-
 94 files changed, 110 insertions(+), 119 deletions(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index 13d88b0561a..3c5abc41a57 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -93,17 +93,12 @@ class Serverless {
       this._shouldResolveConfigurationInternally = true;
       this._shouldReportMissingServiceDeprecation = true;
     }
-    const commands = ensureArray(configObject.commands, { isOptional: true });
-    let options = ensurePlainObject(configObject.options, { isOptional: true });
+    const commands = ensureArray(configObject.commands);
+    let options = ensurePlainObject(configObject.options);
     // This is a temporary workaround to ensure that original `options` are not mutated
     // Should be removed after addressing: https://github.com/serverless/serverless/issues/2582
     if (options) options = { ...options };
-    if (!commands || !options) {
-      this._shouldReportCommandsDeprecation = true;
-      this.processedInput = resolveCliInput();
-    } else {
-      this.processedInput = { commands, options };
-    }
+    this.processedInput = { commands, options };
     this.hasResolvedCommandsExternally = Boolean(configObject.hasResolvedCommandsExternally);
     this.isTelemetryReportedExternally = Boolean(configObject.isTelemetryReportedExternally);
 
@@ -157,22 +152,12 @@ class Serverless {
     if (this._isInvokedByGlobalInstallation) {
       logDeprecation.defaultMode = 'warn';
       logDeprecation.flushBuffered();
-    } else {
-      if (this._shouldReportMissingServiceDeprecation) {
-        this._logDeprecation(
-          'MISSING_SERVICE_CONFIGURATION',
-          'Serverless constructor expects service configuration details to be provided.\n' +
-            'Starting from next major Serverless will no longer auto resolve it internally.'
-        );
-      }
-      if (this._shouldReportCommandsDeprecation) {
-        this._logDeprecation(
-          'MISSING_COMMANDS_OR_OPTIONS_AT_CONSTRUCTION',
-          'Serverless constructor expects resolved CLI commands and options to be provided ' +
-            'via "config.commands" and "config.options".\n' +
-            'Starting from next major Serverless will no longer auto resolve CLI arguments internally.'
-        );
-      }
+    } else if (this._shouldReportMissingServiceDeprecation) {
+      this._logDeprecation(
+        'MISSING_SERVICE_CONFIGURATION',
+        'Serverless constructor expects service configuration details to be provided.\n' +
+          'Starting from next major Serverless will no longer auto resolve it internally.'
+      );
     }
     if (this._shouldResolveConfigurationInternally) {
       const configurationPath = await resolveConfigurationPath();
diff --git a/test/unit/lib/Serverless.test.js b/test/unit/lib/Serverless.test.js
index a9a9fed1aa1..f83d9a0f07c 100644
--- a/test/unit/lib/Serverless.test.js
+++ b/test/unit/lib/Serverless.test.js
@@ -33,7 +33,7 @@ describe('Serverless', () => {
 
   describe('#constructor()', () => {
     it('should set the correct config if a config object is passed', () => {
-      const configObj = { some: 'config' };
+      const configObj = { some: 'config', commands: [], options: {} };
       const serverlessWithConfig = new Serverless(configObj);
 
       expect(serverlessWithConfig.config.some).to.equal('config');
diff --git a/test/unit/lib/classes/CLI.test.js b/test/unit/lib/classes/CLI.test.js
index 2bfa1d1cb9e..6053c189583 100644
--- a/test/unit/lib/classes/CLI.test.js
+++ b/test/unit/lib/classes/CLI.test.js
@@ -15,7 +15,7 @@ describe('CLI', () => {
   let serverless;
 
   beforeEach(() => {
-    serverless = new Serverless({});
+    serverless = new Serverless({ commands: [], options: {} });
   });
 
   describe('#constructor()', () => {
diff --git a/test/unit/lib/classes/Config.test.js b/test/unit/lib/classes/Config.test.js
index bb0164592ac..114ca742885 100644
--- a/test/unit/lib/classes/Config.test.js
+++ b/test/unit/lib/classes/Config.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const Config = require('../../../../lib/classes/Config');
 const Serverless = require('../../../../lib/Serverless');
 
-const serverless = new Serverless();
+const serverless = new Serverless({ commands: [], options: {} });
 
 describe('Config', () => {
   describe('#constructor()', () => {
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
index 83321150c22..4a9fb31fb16 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/PluginManager.test.js
@@ -422,7 +422,7 @@ describe('PluginManager', () => {
 
   beforeEach(() => {
     ({ restoreEnv } = overrideEnv({ whitelist: ['APPDATA', 'PATH'] }));
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.cli = new CLI();
     serverless.processedInput = { commands: ['print'], options: {} };
     pluginManager = new PluginManager(serverless);
@@ -1257,7 +1257,7 @@ describe('PluginManager', () => {
     let pluginManagerInstance;
 
     beforeEach(() => {
-      serverlessInstance = new Serverless();
+      serverlessInstance = new Serverless({ commands: [], options: {} });
       serverlessInstance.configurationInput = null;
       serverlessInstance.serviceDir = 'my-service';
       pluginManagerInstance = new PluginManager(serverlessInstance);
diff --git a/test/unit/lib/classes/Utils.test.js b/test/unit/lib/classes/Utils.test.js
index 1cf640b7278..c521d2f8994 100644
--- a/test/unit/lib/classes/Utils.test.js
+++ b/test/unit/lib/classes/Utils.test.js
@@ -16,7 +16,7 @@ describe('Utils', () => {
   let serverless;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     utils = new Utils(serverless);
   });
 
diff --git a/test/unit/lib/classes/YamlParser.test.js b/test/unit/lib/classes/YamlParser.test.js
index 4b7b0c99611..041f0d591b5 100644
--- a/test/unit/lib/classes/YamlParser.test.js
+++ b/test/unit/lib/classes/YamlParser.test.js
@@ -14,7 +14,7 @@ const { getTmpFilePath, getTmpDirPath } = require('../../../utils/fs');
 chai.use(require('chai-as-promised'));
 const expect = require('chai').expect;
 
-const serverless = new Serverless();
+const serverless = new Serverless({ commands: [], options: {} });
 
 describe('YamlParser', () => {
   describe('#parse()', () => {
diff --git a/test/unit/lib/plugins/aws/common/index.test.js b/test/unit/lib/plugins/aws/common/index.test.js
index 87ebce8e09a..899b1bd3e6f 100644
--- a/test/unit/lib/plugins/aws/common/index.test.js
+++ b/test/unit/lib/plugins/aws/common/index.test.js
@@ -9,7 +9,7 @@ const sinon = require('sinon');
 describe('AwsCommon', () => {
   let awsCommon;
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     const options = {
       stage: 'dev',
       region: 'us-east-1',
diff --git a/test/unit/lib/plugins/aws/common/lib/artifacts.test.js b/test/unit/lib/plugins/aws/common/lib/artifacts.test.js
index 4876595e92d..650606677ed 100644
--- a/test/unit/lib/plugins/aws/common/lib/artifacts.test.js
+++ b/test/unit/lib/plugins/aws/common/lib/artifacts.test.js
@@ -14,7 +14,7 @@ describe('#moveArtifactsToPackage()', () => {
   const moveServerlessPath = path.join(moveBasePath, '.serverless');
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     awsCommon = new AWSCommon(serverless, {});
 
     serverless.serviceDir = moveBasePath;
@@ -104,7 +104,7 @@ describe('#moveArtifactsToTemp()', () => {
   const moveTargetPath = path.join(moveBasePath, 'target');
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     awsCommon = new AWSCommon(serverless, {});
 
     serverless.serviceDir = moveBasePath;
diff --git a/test/unit/lib/plugins/aws/common/lib/cleanupTempDir.test.js b/test/unit/lib/plugins/aws/common/lib/cleanupTempDir.test.js
index 2ef090f086a..9cba4b3e6d6 100644
--- a/test/unit/lib/plugins/aws/common/lib/cleanupTempDir.test.js
+++ b/test/unit/lib/plugins/aws/common/lib/cleanupTempDir.test.js
@@ -11,7 +11,7 @@ describe('#cleanupTempDir()', () => {
   let packageService;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     packageService = new Package(serverless);
 
     serverless.serviceDir = getTmpDirPath();
diff --git a/test/unit/lib/plugins/aws/customResources/index.test.js b/test/unit/lib/plugins/aws/customResources/index.test.js
index e0b6a425b42..4825b876ce9 100644
--- a/test/unit/lib/plugins/aws/customResources/index.test.js
+++ b/test/unit/lib/plugins/aws/customResources/index.test.js
@@ -36,7 +36,7 @@ describe('#addCustomResourceToService()', () => {
       region: 'us-east-1',
     };
     tmpDirPath = createTmpDir();
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.cli = new CLI();
     serverless.pluginManager.cliOptions = options;
     provider = new AwsProvider(serverless, options);
diff --git a/test/unit/lib/plugins/aws/deploy/index.test.js b/test/unit/lib/plugins/aws/deploy/index.test.js
index 409e23656cb..72c009a8f23 100644
--- a/test/unit/lib/plugins/aws/deploy/index.test.js
+++ b/test/unit/lib/plugins/aws/deploy/index.test.js
@@ -22,7 +22,7 @@ describe('AwsDeploy', () => {
   let options;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     options = {
       stage: 'dev',
       region: 'us-east-1',
diff --git a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
index 5dc4dfb1e5d..a061e0878bc 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
@@ -33,7 +33,7 @@ describe('checkForChanges', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.serviceDir = 'my-service';
     provider = new AwsProvider(serverless, options);
     serverless.setProvider('aws', provider);
diff --git a/test/unit/lib/plugins/aws/deploy/lib/cleanupS3Bucket.test.js b/test/unit/lib/plugins/aws/deploy/lib/cleanupS3Bucket.test.js
index c6039cf8518..5c99eec2e35 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/cleanupS3Bucket.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/cleanupS3Bucket.test.js
@@ -24,7 +24,7 @@ describe('cleanupS3Bucket', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.serviceDir = 'foo';
     provider = new AwsProvider(serverless, options);
     serverless.setProvider('aws', provider);
diff --git a/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js b/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js
index 5ab306c6b71..e141232e7fc 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js
@@ -30,7 +30,7 @@ describe('createStack', () => {
   };
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, {}));
     serverless.utils.writeFileSync(serverlessYmlPath, serverlessYml);
     serverless.serviceDir = tmpDirPath;
diff --git a/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js b/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
index c7f51082766..51e1a3db24d 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
@@ -40,7 +40,7 @@ describe('extendedValidate', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.utils.writeFileSync(serverlessYmlPath, serverlessYml);
     serverless.serviceDir = tmpDirPath;
diff --git a/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js b/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js
index c8b64667748..cf6810d32d3 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js
@@ -25,7 +25,7 @@ describe('uploadArtifacts', () => {
   let cryptoStub;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.serviceDir = 'foo';
     serverless.setProvider('aws', new AwsProvider(serverless, {}));
     const options = {
diff --git a/test/unit/lib/plugins/aws/deploy/lib/validateTemplate.test.js b/test/unit/lib/plugins/aws/deploy/lib/validateTemplate.test.js
index cbcd2038672..130a6eb8c01 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/validateTemplate.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/validateTemplate.test.js
@@ -23,7 +23,7 @@ describe('validateTemplate', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.serviceDir = 'foo';
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     awsDeploy = new AwsDeploy(serverless, options);
diff --git a/test/unit/lib/plugins/aws/deployList.test.js b/test/unit/lib/plugins/aws/deployList.test.js
index 4ced21b4467..5607df8dd56 100644
--- a/test/unit/lib/plugins/aws/deployList.test.js
+++ b/test/unit/lib/plugins/aws/deployList.test.js
@@ -17,7 +17,7 @@ describe('AwsDeployList', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     provider = new AwsProvider(serverless, options);
     serverless.setProvider('aws', provider);
     serverless.service.service = 'listDeployments';
diff --git a/test/unit/lib/plugins/aws/info/getApiKeyValues.test.js b/test/unit/lib/plugins/aws/info/getApiKeyValues.test.js
index 82825130cfc..c986ab5e75b 100644
--- a/test/unit/lib/plugins/aws/info/getApiKeyValues.test.js
+++ b/test/unit/lib/plugins/aws/info/getApiKeyValues.test.js
@@ -16,7 +16,7 @@ describe('#getApiKeyValues()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.service.service = 'my-service';
     awsInfo = new AwsInfo(serverless, options);
diff --git a/test/unit/lib/plugins/aws/info/getResourceCount.test.js b/test/unit/lib/plugins/aws/info/getResourceCount.test.js
index c00b44f43f7..2165a29da20 100644
--- a/test/unit/lib/plugins/aws/info/getResourceCount.test.js
+++ b/test/unit/lib/plugins/aws/info/getResourceCount.test.js
@@ -18,7 +18,7 @@ describe('#getResourceCount()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.service.service = 'my-service';
     serverless.service.functions = {
diff --git a/test/unit/lib/plugins/aws/info/getStackInfo.test.js b/test/unit/lib/plugins/aws/info/getStackInfo.test.js
index cbea5ab2958..4731e94fbec 100644
--- a/test/unit/lib/plugins/aws/info/getStackInfo.test.js
+++ b/test/unit/lib/plugins/aws/info/getStackInfo.test.js
@@ -16,7 +16,7 @@ describe('#getStackInfo()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.service.service = 'my-service';
     serverless.service.functions = {
diff --git a/test/unit/lib/plugins/aws/info/index.test.js b/test/unit/lib/plugins/aws/info/index.test.js
index 1fb70099629..d06f5f556fc 100644
--- a/test/unit/lib/plugins/aws/info/index.test.js
+++ b/test/unit/lib/plugins/aws/info/index.test.js
@@ -25,7 +25,7 @@ describe('AwsInfo', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.cli = {
       log: sinon.stub().returns(),
diff --git a/test/unit/lib/plugins/aws/invokeLocal/index.test.js b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
index 560f50a9685..6763dd684e8 100644
--- a/test/unit/lib/plugins/aws/invokeLocal/index.test.js
+++ b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
@@ -64,7 +64,7 @@ describe('AwsInvokeLocal', () => {
       'get-stdin': stdinStub,
       'child-process-ext/spawn': spawnExtStub,
     });
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.serviceDir = 'servicePath';
     serverless.cli = new CLI(serverless);
     serverless.processedInput = { commands: ['invoke'] };
diff --git a/test/unit/lib/plugins/aws/lib/getServiceState.test.js b/test/unit/lib/plugins/aws/lib/getServiceState.test.js
index dfcf4d47701..c7c2c942b71 100644
--- a/test/unit/lib/plugins/aws/lib/getServiceState.test.js
+++ b/test/unit/lib/plugins/aws/lib/getServiceState.test.js
@@ -17,7 +17,7 @@ describe('#getServiceState()', () => {
   const awsPlugin = {};
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.serviceDir = 'my-service';
     awsPlugin.serverless = serverless;
     awsPlugin.provider = new AwsProvider(serverless, options);
diff --git a/test/unit/lib/plugins/aws/lib/monitorStack.test.js b/test/unit/lib/plugins/aws/lib/monitorStack.test.js
index 33badff6d05..f11936de19e 100644
--- a/test/unit/lib/plugins/aws/lib/monitorStack.test.js
+++ b/test/unit/lib/plugins/aws/lib/monitorStack.test.js
@@ -12,7 +12,7 @@ chai.use(require('chai-as-promised'));
 const { expect } = chai;
 
 describe('monitorStack', () => {
-  const serverless = new Serverless();
+  const serverless = new Serverless({ commands: [], options: {} });
   const awsPlugin = {};
 
   beforeEach(() => {
diff --git a/test/unit/lib/plugins/aws/lib/naming.test.js b/test/unit/lib/plugins/aws/lib/naming.test.js
index 7fa3f1f65f9..d131f378905 100644
--- a/test/unit/lib/plugins/aws/lib/naming.test.js
+++ b/test/unit/lib/plugins/aws/lib/naming.test.js
@@ -15,6 +15,8 @@ describe('#naming()', () => {
     options = {
       stage: 'dev',
       region: 'us-east-1',
+      commands: [],
+      options: {},
     };
     serverless = new Serverless(options);
     sdk = new SDK(serverless, options);
diff --git a/test/unit/lib/plugins/aws/lib/setBucketName.test.js b/test/unit/lib/plugins/aws/lib/setBucketName.test.js
index a015119bd81..8a57df73f8d 100644
--- a/test/unit/lib/plugins/aws/lib/setBucketName.test.js
+++ b/test/unit/lib/plugins/aws/lib/setBucketName.test.js
@@ -12,7 +12,7 @@ describe('#setBucketName()', () => {
   let getServerlessDeploymentBucketNameStub;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.serviceDir = 'foo';
     const options = {
       stage: 'dev',
diff --git a/test/unit/lib/plugins/aws/lib/updateStack.test.js b/test/unit/lib/plugins/aws/lib/updateStack.test.js
index 76e4276505d..72824ea88d1 100644
--- a/test/unit/lib/plugins/aws/lib/updateStack.test.js
+++ b/test/unit/lib/plugins/aws/lib/updateStack.test.js
@@ -17,7 +17,7 @@ describe('updateStack', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.serviceDir = 'foo';
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     awsDeploy = new AwsDeploy(serverless, options);
diff --git a/test/unit/lib/plugins/aws/lib/validate.test.js b/test/unit/lib/plugins/aws/lib/validate.test.js
index 4f9f149bc52..173a3a16c34 100644
--- a/test/unit/lib/plugins/aws/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/lib/validate.test.js
@@ -11,7 +11,7 @@ chai.use(require('chai-as-promised'));
 const expect = chai.expect;
 
 describe('#validate', () => {
-  const serverless = new Serverless();
+  const serverless = new Serverless({ commands: [], options: {} });
   let provider;
   const awsPlugin = {};
 
diff --git a/test/unit/lib/plugins/aws/logs.test.js b/test/unit/lib/plugins/aws/logs.test.js
index ec92dc92a6f..ce282259a13 100644
--- a/test/unit/lib/plugins/aws/logs.test.js
+++ b/test/unit/lib/plugins/aws/logs.test.js
@@ -21,7 +21,7 @@ describe('AwsLogs', () => {
       region: 'us-east-1',
       function: 'first',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     const provider = new AwsProvider(serverless, options);
     provider.cachedCredentials = {
       credentials: { accessKeyId: 'foo', secretAccessKey: 'bar' },
@@ -335,7 +335,7 @@ describe('AwsLogs', () => {
         region: 'us-east-1',
         function: 'first',
       };
-      serverless = new Serverless();
+      serverless = new Serverless({ commands: [], options: {} });
       const provider = new AwsProvider(serverless, options);
       provider.cachedCredentials = {
         credentials: { accessKeyId: 'foo', secretAccessKey: 'bar' },
diff --git a/test/unit/lib/plugins/aws/metrics.test.js b/test/unit/lib/plugins/aws/metrics.test.js
index 43466946e27..1de6eee99ce 100644
--- a/test/unit/lib/plugins/aws/metrics.test.js
+++ b/test/unit/lib/plugins/aws/metrics.test.js
@@ -17,7 +17,7 @@ describe('AwsMetrics', () => {
   let serverless;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.cli = new CLI(serverless);
     const options = {
       stage: 'dev',
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/listenerRules.test.js b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/listenerRules.test.js
index 1ed580aa7b9..b60e7287a68 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/listenerRules.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/listenerRules.test.js
@@ -9,7 +9,7 @@ describe('#compileListenerRules()', () => {
   let awsCompileAlbEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.service = 'some-service';
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/permissions.test.js b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/permissions.test.js
index 3c00dc18e3e..cbafe6f3417 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/permissions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/permissions.test.js
@@ -9,7 +9,7 @@ describe('#compilePermissions()', () => {
   let awsCompileAlbEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.service = 'some-service';
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.test.js b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.test.js
index a023dae550b..742d7d981f8 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.test.js
@@ -9,7 +9,7 @@ describe('#compileTargetGroups()', () => {
   let awsCompileAlbEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.service = 'some-service';
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/validate.test.js b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/validate.test.js
index 79f5a719ea8..535fca6f431 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/validate.test.js
@@ -9,7 +9,7 @@ describe('#validate()', () => {
   let awsCompileAlbEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.service = 'some-service';
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alexaSkill.test.js b/test/unit/lib/plugins/aws/package/compile/events/alexaSkill.test.js
index 27a5d860386..d22d8b85547 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/alexaSkill.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/alexaSkill.test.js
@@ -12,7 +12,7 @@ describe('AwsCompileAlexaSkillEvents', () => {
   let awsCompileAlexaSkillEvents;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
     serverless.setProvider('aws', new AwsProvider(serverless));
     awsCompileAlexaSkillEvents = new AwsCompileAlexaSkillEvents(serverless);
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alexaSmartHome.test.js b/test/unit/lib/plugins/aws/package/compile/events/alexaSmartHome.test.js
index cbb6613a28e..829af3611d1 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/alexaSmartHome.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/alexaSmartHome.test.js
@@ -10,7 +10,7 @@ describe('AwsCompileAlexaSmartHomeEvents', () => {
   let awsCompileAlexaSmartHomeEvents;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
     serverless.setProvider('aws', new AwsProvider(serverless));
     awsCompileAlexaSmartHomeEvents = new AwsCompileAlexaSmartHomeEvents(serverless);
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js
index 79b9d43c2ee..ad726600e93 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js
@@ -14,7 +14,7 @@ describe('AwsCompileApigEvents', () => {
   let awsCompileApigEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.service.environment = {
       vars: {},
       stages: {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js
index 35bc5d93150..80ffabc9507 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js
@@ -15,7 +15,7 @@ describe('#compileApiKeys()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.service.service = 'first-service';
     serverless.service.provider.compiledCloudFormationTemplate = {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js
index 6b153ce392b..36163642cde 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js
@@ -11,7 +11,7 @@ describe('#compileAuthorizers()', () => {
   let awsCompileApigEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.service = 'first-service';
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/cors.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/cors.test.js
index ba9423bcdc1..78420ce86e4 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/cors.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/cors.test.js
@@ -14,7 +14,7 @@ describe('#compileCors()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.service.service = 'first-service';
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/deployment.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/deployment.test.js
index fa8152eea16..1c0071c7cb3 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/deployment.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/deployment.test.js
@@ -15,7 +15,7 @@ describe('#compileDeployment()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     provider = new AwsProvider(serverless, options);
     serverless.setProvider('aws', provider);
     serverless.service.provider.compiledCloudFormationTemplate = {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.test.js
index 5bd08566ef1..520883d060d 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.test.js
@@ -13,7 +13,7 @@ describe('#disassociateUsagePlan()', () => {
   let providerRequestStub;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.service = 'my-service';
     serverless.cli = {
       log: sinon.spy(),
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
index b4ee4953570..3f24f2bcb44 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
@@ -29,7 +29,7 @@ describe('#updateStage()', () => {
   let context;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.service = 'my-service';
     options = { stage: 'dev', region: 'us-east-1' };
     awsProvider = new AwsProvider(serverless, options);
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js
index ea2330abe72..b1bba8056b8 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js
@@ -15,7 +15,7 @@ describe('#compileMethods()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.service.service = 'first-service';
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.test.js
index 08a29de6f84..ad5f56a3a0f 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.test.js
@@ -9,7 +9,7 @@ describe('#awsCompilePermissions()', () => {
   let awsCompileApigEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/resources.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/resources.test.js
index d6db4f6c4a5..a158d814b3d 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/resources.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/resources.test.js
@@ -10,7 +10,7 @@ describe('#compileResources()', () => {
   let awsCompileApigEvents;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
     awsCompileApigEvents = new AwsCompileApigEvents(serverless);
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
index e1a507fe1ec..d7fa225f42c 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
@@ -18,7 +18,7 @@ describe('#compileRestApi()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
     awsCompileApigEvents = new AwsCompileApigEvents(serverless, options);
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js
index 72b83a30ddf..678f2576440 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js
@@ -24,7 +24,7 @@ describe('#compileStage()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     provider = new AwsProvider(serverless, options);
     serverless.setProvider('aws', provider);
     serverless.service.service = 'my-service';
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js
index 5b91a921fa9..e9d0d82bee2 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js
@@ -15,7 +15,7 @@ describe('#compileUsagePlan()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.service.service = 'first-service';
     serverless.service.provider.compiledCloudFormationTemplate = {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.test.js
index 47dd0823438..afc1c648fc9 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.test.js
@@ -15,7 +15,7 @@ describe('#compileUsagePlanKeys()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.service.service = 'first-service';
     serverless.service.provider.compiledCloudFormationTemplate = {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
index 13efad79092..200b7a15fb0 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
@@ -21,7 +21,7 @@ describe('AwsCompileCloudFrontEvents', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.processedInput = {
       commands: [],
     };
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudWatchEvent.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloudWatchEvent.test.js
index fb02e8ef735..3197b288d56 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudWatchEvent.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloudWatchEvent.test.js
@@ -10,7 +10,7 @@ describe('awsCompileCloudWatchEventEvents', () => {
   let awsCompileCloudWatchEventEvents;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
     serverless.setProvider('aws', new AwsProvider(serverless));
     awsCompileCloudWatchEventEvents = new AwsCompileCloudWatchEventEvents(serverless);
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudWatchLog.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloudWatchLog.test.js
index aa5ef1d307d..0a7e78a2d0a 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudWatchLog.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloudWatchLog.test.js
@@ -10,7 +10,7 @@ describe('AwsCompileCloudWatchLogEvents', () => {
   let awsCompileCloudWatchLogEvents;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
     serverless.setProvider('aws', new AwsProvider(serverless));
     awsCompileCloudWatchLogEvents = new AwsCompileCloudWatchLogEvents(serverless);
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js b/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
index 4ea548fe63c..f29e3e0dec7 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
@@ -28,7 +28,7 @@ describe('AwsCompileCognitoUserPoolEvents', () => {
         },
       }
     );
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
     serverless.setProvider('aws', new AwsProvider(serverless));
     awsCompileCognitoUserPoolEvents = new AwsCompileCognitoUserPoolEvents(serverless);
diff --git a/test/unit/lib/plugins/aws/package/compile/events/iot.test.js b/test/unit/lib/plugins/aws/package/compile/events/iot.test.js
index 6c71de0eeb0..3ebb54ab5ea 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/iot.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/iot.test.js
@@ -10,7 +10,7 @@ describe('AwsCompileIoTEvents', () => {
   let awsCompileIoTEvents;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
     serverless.setProvider('aws', new AwsProvider(serverless));
     awsCompileIoTEvents = new AwsCompileIoTEvents(serverless);
diff --git a/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
index 620f9751b0c..1a29816b14e 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
@@ -28,7 +28,7 @@ describe('AwsCompileS3Events', () => {
         },
       }
     );
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
     serverless.setProvider('aws', new AwsProvider(serverless));
     awsCompileS3Events = new AwsCompileS3Events(serverless);
diff --git a/test/unit/lib/plugins/aws/package/compile/events/sns.test.js b/test/unit/lib/plugins/aws/package/compile/events/sns.test.js
index ac5f7ff6820..40693a3bd89 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/sns.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/sns.test.js
@@ -10,7 +10,7 @@ describe('AwsCompileSNSEvents', () => {
   let awsCompileSNSEvents;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     const options = {
       region: 'some-region',
     };
diff --git a/test/unit/lib/plugins/aws/package/compile/events/stream.test.js b/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
index 08fa07a2f23..7459c8d18ea 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
@@ -11,7 +11,7 @@ describe('AwsCompileStreamEvents', () => {
   let awsCompileStreamEvents;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.provider.compiledCloudFormationTemplate = {
       Resources: {
         IamRoleLambdaExecution: {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js
index 719aada0685..ad6e74f0d8c 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js
@@ -11,7 +11,7 @@ describe('AwsCompileWebsocketsEvents', () => {
   let awsCompileWebsocketsEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.service.environment = {
       vars: {},
       stages: {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/authorizers.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/authorizers.test.js
index 1c5da2675b3..0d1eacd2779 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/authorizers.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/authorizers.test.js
@@ -10,7 +10,7 @@ describe('#compileAuthorizers()', () => {
 
   describe('for routes with authorizer definition', () => {
     beforeEach(() => {
-      const serverless = new Serverless();
+      const serverless = new Serverless({ commands: [], options: {} });
       serverless.setProvider('aws', new AwsProvider(serverless));
       serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
 
@@ -106,7 +106,7 @@ describe('#compileAuthorizers()', () => {
 
   describe('for routes without authorizer definition', () => {
     beforeEach(() => {
-      const serverless = new Serverless();
+      const serverless = new Serverless({ commands: [], options: {} });
       serverless.setProvider('aws', new AwsProvider(serverless));
       serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/deployment.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/deployment.test.js
index 4b1c1f4e899..05443b93560 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/deployment.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/deployment.test.js
@@ -13,7 +13,7 @@ describe('#compileDeployment()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.provider.compiledCloudFormationTemplate = {
       Resources: {},
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/integrations.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/integrations.test.js
index e624610121e..f7b577c0372 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/integrations.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/integrations.test.js
@@ -9,7 +9,7 @@ describe('#compileIntegrations()', () => {
   let awsCompileWebsocketsEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/permissions.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/permissions.test.js
index bdda6014341..367d5a3f048 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/permissions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/permissions.test.js
@@ -9,7 +9,7 @@ describe('#compilePermissions()', () => {
   let awsCompileWebsocketsEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.test.js
index 535161a3226..3a921c58162 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.test.js
@@ -9,7 +9,7 @@ describe('#compileRouteResponses()', () => {
   let awsCompileWebsocketsEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routes.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routes.test.js
index 95c64247ed1..ddefee1bb95 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routes.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routes.test.js
@@ -9,7 +9,7 @@ describe('#compileRoutes()', () => {
   let awsCompileWebsocketsEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js
index 89c5fd3a196..b9686290b3e 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js
@@ -24,7 +24,7 @@ describe('#compileStage()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.service = 'my-service';
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/validate.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/validate.test.js
index 07af507669f..41a9257e62b 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/validate.test.js
@@ -15,7 +15,7 @@ describe('#validate()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless, options);
   });
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index 9dc01099e1b..6670e61b1fe 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -32,6 +32,8 @@ describe('AwsCompileFunctions', () => {
     const options = {
       stage: 'dev',
       region: 'us-east-1',
+      commands: [],
+      options: {},
     };
     serverless = new Serverless(options);
     awsProvider = new AwsProvider(serverless, options);
diff --git a/test/unit/lib/plugins/aws/package/index.test.js b/test/unit/lib/plugins/aws/package/index.test.js
index aba358a28c1..9358865ab83 100644
--- a/test/unit/lib/plugins/aws/package/index.test.js
+++ b/test/unit/lib/plugins/aws/package/index.test.js
@@ -14,7 +14,7 @@ describe('AwsPackage', () => {
   let options;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     options = {
       stage: 'dev',
       region: 'us-east-1',
diff --git a/test/unit/lib/plugins/aws/package/lib/generateArtifactDirectoryName.test.js b/test/unit/lib/plugins/aws/package/lib/generateArtifactDirectoryName.test.js
index b2a17f77e8b..f340fe43d55 100644
--- a/test/unit/lib/plugins/aws/package/lib/generateArtifactDirectoryName.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/generateArtifactDirectoryName.test.js
@@ -10,7 +10,7 @@ describe('#generateArtifactDirectoryName()', () => {
   let awsPackage;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     const options = {
       stage: 'dev',
       region: 'us-east-1',
diff --git a/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js b/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
index be0036bc0e8..6f70246f41b 100644
--- a/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
@@ -12,7 +12,7 @@ describe('mergeCustomProviderResources', () => {
   let coreCloudFormationTemplate;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     awsPackage = new AwsPackage(serverless, {});
 
     coreCloudFormationTemplate = awsPackage.serverless.utils.readFileSync(
diff --git a/test/unit/lib/plugins/aws/package/lib/saveCompiledTemplate.test.js b/test/unit/lib/plugins/aws/package/lib/saveCompiledTemplate.test.js
index ae0e40ce550..493b262cb96 100644
--- a/test/unit/lib/plugins/aws/package/lib/saveCompiledTemplate.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/saveCompiledTemplate.test.js
@@ -15,7 +15,7 @@ describe('#saveCompiledTemplate()', () => {
 
   beforeEach(() => {
     const options = {};
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     awsPackage = new AwsPackage(serverless, options);
     serverless.serviceDir = 'my-service';
diff --git a/test/unit/lib/plugins/aws/package/lib/saveServiceState.test.js b/test/unit/lib/plugins/aws/package/lib/saveServiceState.test.js
index ca7077cac10..5fa0b4e20ee 100644
--- a/test/unit/lib/plugins/aws/package/lib/saveServiceState.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/saveServiceState.test.js
@@ -15,7 +15,7 @@ describe('#saveServiceState()', () => {
 
   beforeEach(() => {
     const options = {};
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     awsPackage = new AwsPackage(serverless, options);
     serverless.serviceDir = 'my-service';
diff --git a/test/unit/lib/plugins/aws/provider.test.js b/test/unit/lib/plugins/aws/provider.test.js
index cd46508f06b..e6f4a8376b1 100644
--- a/test/unit/lib/plugins/aws/provider.test.js
+++ b/test/unit/lib/plugins/aws/provider.test.js
@@ -31,7 +31,7 @@ describe('AwsProvider', () => {
 
   beforeEach(() => {
     ({ restoreEnv } = overrideEnv());
-    serverless = new Serverless(options);
+    serverless = new Serverless({ ...options, commands: [], options: {} });
     serverless.cli = new serverless.classes.CLI();
     awsProvider = new AwsProvider(serverless, options);
   });
@@ -53,6 +53,8 @@ describe('AwsProvider', () => {
             even if http event is present and stage is ${stage}`, () => {
           const config = {
             stage,
+            commands: [],
+            options: {},
           };
           serverless = new Serverless(config);
 
diff --git a/test/unit/lib/plugins/aws/remove/lib/stack.test.js b/test/unit/lib/plugins/aws/remove/lib/stack.test.js
index 7e039991ae1..c53bec98f9e 100644
--- a/test/unit/lib/plugins/aws/remove/lib/stack.test.js
+++ b/test/unit/lib/plugins/aws/remove/lib/stack.test.js
@@ -11,7 +11,7 @@ describe('removeStack', () => {
     stage: 'dev',
     region: 'us-east-1',
   };
-  const serverless = new Serverless();
+  const serverless = new Serverless({ commands: [], options: {} });
   serverless.service.service = 'removeStack';
   serverless.setProvider('aws', new AwsProvider(serverless, options));
 
diff --git a/test/unit/lib/plugins/aws/rollback.test.js b/test/unit/lib/plugins/aws/rollback.test.js
index b0f0d27c289..1e4ce49ef50 100644
--- a/test/unit/lib/plugins/aws/rollback.test.js
+++ b/test/unit/lib/plugins/aws/rollback.test.js
@@ -15,7 +15,7 @@ describe('AwsRollback', () => {
   let provider;
 
   const createInstance = (options) => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     provider = new AwsProvider(serverless, options);
     serverless.setProvider('aws', provider);
     serverless.service.service = 'rollback';
diff --git a/test/unit/lib/plugins/aws/rollbackFunction.test.js b/test/unit/lib/plugins/aws/rollbackFunction.test.js
index 979121439c6..339e7518a95 100644
--- a/test/unit/lib/plugins/aws/rollbackFunction.test.js
+++ b/test/unit/lib/plugins/aws/rollbackFunction.test.js
@@ -18,7 +18,7 @@ describe('AwsRollbackFunction', () => {
     AwsRollbackFunction = proxyquire('../../../../../lib/plugins/aws/rollbackFunction.js', {
       'node-fetch': fetchStub,
     });
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.functions = {
       hello: {
         handler: true,
diff --git a/test/unit/lib/plugins/create/create.test.js b/test/unit/lib/plugins/create/create.test.js
index d0924dfaa49..7ad58864300 100644
--- a/test/unit/lib/plugins/create/create.test.js
+++ b/test/unit/lib/plugins/create/create.test.js
@@ -21,7 +21,7 @@ describe('Create', () => {
   let create;
 
   before(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     const options = {};
     create = new Create(serverless, options);
     create.serverless.cli = new serverless.classes.CLI();
diff --git a/test/unit/lib/plugins/deploy.test.js b/test/unit/lib/plugins/deploy.test.js
index fa162ef7ff7..d2a636deae9 100644
--- a/test/unit/lib/plugins/deploy.test.js
+++ b/test/unit/lib/plugins/deploy.test.js
@@ -17,7 +17,7 @@ describe('Deploy', () => {
   let options;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     options = {};
     deploy = new Deploy(serverless, options);
     deploy.serverless.providers = { validProvider: true };
diff --git a/test/unit/lib/plugins/info.test.js b/test/unit/lib/plugins/info.test.js
index b3e8a21f712..ff15634e2a0 100644
--- a/test/unit/lib/plugins/info.test.js
+++ b/test/unit/lib/plugins/info.test.js
@@ -13,7 +13,7 @@ describe('Info', () => {
   let serverless;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     info = new Info(serverless);
   });
 
diff --git a/test/unit/lib/plugins/invoke.test.js b/test/unit/lib/plugins/invoke.test.js
index 67f36ba1094..9afed54c409 100644
--- a/test/unit/lib/plugins/invoke.test.js
+++ b/test/unit/lib/plugins/invoke.test.js
@@ -16,7 +16,7 @@ describe('Invoke', () => {
 
   beforeEach(() => {
     ({ restoreEnv } = overrideEnv());
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     invoke = new Invoke(serverless);
   });
 
diff --git a/test/unit/lib/plugins/metrics.test.js b/test/unit/lib/plugins/metrics.test.js
index 714214f2935..a7155bf9c56 100644
--- a/test/unit/lib/plugins/metrics.test.js
+++ b/test/unit/lib/plugins/metrics.test.js
@@ -9,7 +9,7 @@ describe('Metrics', () => {
   let serverless;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     const options = {};
     metrics = new Metrics(serverless, options);
   });
diff --git a/test/unit/lib/plugins/package/lib/zipService.test.js b/test/unit/lib/plugins/package/lib/zipService.test.js
index eabcf73b74e..f2243faa31e 100644
--- a/test/unit/lib/plugins/package/lib/zipService.test.js
+++ b/test/unit/lib/plugins/package/lib/zipService.test.js
@@ -29,7 +29,7 @@ describe('zipService', () => {
 
   beforeEach(() => {
     tmpDirPath = getTmpDirPath();
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.service = 'first-service';
     serverless.serviceDir = tmpDirPath;
     packagePlugin = new Package(serverless, {});
diff --git a/test/unit/lib/plugins/plugin/install.test.js b/test/unit/lib/plugins/plugin/install.test.js
index 88038d868a1..ca78ad5723b 100644
--- a/test/unit/lib/plugins/plugin/install.test.js
+++ b/test/unit/lib/plugins/plugin/install.test.js
@@ -44,7 +44,7 @@ describe('PluginInstall', () => {
   ];
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.cli = new CLI(serverless);
     const options = {};
     pluginInstall = new PluginInstall(serverless, options);
diff --git a/test/unit/lib/plugins/plugin/lib/utils.test.js b/test/unit/lib/plugins/plugin/lib/utils.test.js
index cc46c1f65bd..3ee389f4fd4 100644
--- a/test/unit/lib/plugins/plugin/lib/utils.test.js
+++ b/test/unit/lib/plugins/plugin/lib/utils.test.js
@@ -34,7 +34,7 @@ describe('PluginUtils', () => {
   ];
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.cli = new CLI(serverless);
     const options = {};
     pluginUtils = new PluginInstall(serverless, options);
diff --git a/test/unit/lib/plugins/plugin/list.test.js b/test/unit/lib/plugins/plugin/list.test.js
index 5df677f9c3e..3800db8a304 100644
--- a/test/unit/lib/plugins/plugin/list.test.js
+++ b/test/unit/lib/plugins/plugin/list.test.js
@@ -14,7 +14,7 @@ describe('PluginList', () => {
   let serverless;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.cli = new CLI(serverless);
     const options = {};
     pluginList = new PluginList(serverless, options);
diff --git a/test/unit/lib/plugins/plugin/search.test.js b/test/unit/lib/plugins/plugin/search.test.js
index f7bd123b8bd..4b0f6ff5441 100644
--- a/test/unit/lib/plugins/plugin/search.test.js
+++ b/test/unit/lib/plugins/plugin/search.test.js
@@ -32,7 +32,7 @@ describe('PluginSearch', () => {
   ];
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.cli = new CLI(serverless);
     const options = {};
     pluginSearch = new PluginSearch(serverless, options);
diff --git a/test/unit/lib/plugins/plugin/uninstall.test.js b/test/unit/lib/plugins/plugin/uninstall.test.js
index 02e9b1923ea..bede83767ca 100644
--- a/test/unit/lib/plugins/plugin/uninstall.test.js
+++ b/test/unit/lib/plugins/plugin/uninstall.test.js
@@ -39,7 +39,7 @@ describe('PluginUninstall', () => {
   ];
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.cli = new CLI(serverless);
     const options = {};
     pluginUninstall = new PluginUninstall(serverless, options);
diff --git a/test/unit/lib/plugins/remove.test.js b/test/unit/lib/plugins/remove.test.js
index 0e07d73db20..d7dd8a7176a 100644
--- a/test/unit/lib/plugins/remove.test.js
+++ b/test/unit/lib/plugins/remove.test.js
@@ -11,7 +11,7 @@ describe('Remove', () => {
   let serverless;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     remove = new Remove(serverless);
   });
 
diff --git a/test/unit/lib/plugins/rollback.test.js b/test/unit/lib/plugins/rollback.test.js
index 6983fcc5a47..d20fb3132f3 100644
--- a/test/unit/lib/plugins/rollback.test.js
+++ b/test/unit/lib/plugins/rollback.test.js
@@ -9,7 +9,7 @@ describe('Rollback', () => {
   let serverless;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     rollback = new Rollback(serverless);
   });
 
diff --git a/test/unit/lib/utils/fs/writeFile.test.js b/test/unit/lib/utils/fs/writeFile.test.js
index d070e67482f..d9e4f7535cf 100644
--- a/test/unit/lib/utils/fs/writeFile.test.js
+++ b/test/unit/lib/utils/fs/writeFile.test.js
@@ -17,7 +17,7 @@ describe('#writeFile()', function () {
   this.timeout(0);
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
   });
 
   it('should write a .json file asynchronously', () => {
diff --git a/test/unit/lib/utils/fs/writeFileSync.test.js b/test/unit/lib/utils/fs/writeFileSync.test.js
index f9bd8e42ece..f0409567202 100644
--- a/test/unit/lib/utils/fs/writeFileSync.test.js
+++ b/test/unit/lib/utils/fs/writeFileSync.test.js
@@ -11,7 +11,7 @@ describe('#writeFileSync()', () => {
   let serverless;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
   });
 
   it('should write a .json file synchronously', () => {

From 46e47d0225d26103ec5e5c131be16bf23de3238f Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 26 Oct 2021 12:53:59 +0200
Subject: [PATCH 0859/1101] feat: Remove support for object notation for
 `service`

BREAKING CHANGE: Object notation is no longer supported for `service` property.
Set name directly to `service`.
---
 lib/classes/Service.js | 10 +++-------
 lib/configSchema.js    | 15 +--------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index 7e1d0686dbc..0b973d55fe5 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -91,13 +91,10 @@ class Service {
 
     // `service` (read by dashboard plugin)
     if (_.isObject(configurationInput.service)) {
-      this.serverless._logDeprecation(
-        'SERVICE_OBJECT_NOTATION',
-        'Starting from next major object notation for "service" property will no longer be ' +
-          'recognized. Set "service" property directly with service name.'
+      throw new ServerlessError(
+        'Object notation for "service" property is not supported. Set "service" property directly with service name.',
+        'SERVICE_OBJECT_NOTATION'
       );
-      this.serviceObject = configurationInput.service;
-      this.service = configurationInput.service.name;
     } else {
       this.serviceObject = { name: configurationInput.service };
       this.service = configurationInput.service;
@@ -276,7 +273,6 @@ class Service {
 
   validate() {
     const userConfig = this.initialServerlessConfig;
-    userConfig.service = this.serviceObject;
 
     // Ensure to validate normalized (after mergeArrays) input
     if (userConfig.functions) userConfig.functions = this.functions;
diff --git a/lib/configSchema.js b/lib/configSchema.js
index 3581f3d50ab..05af35a96bf 100644
--- a/lib/configSchema.js
+++ b/lib/configSchema.js
@@ -114,20 +114,7 @@ const schema = {
       required: ['name'],
       additionalProperties: false,
     },
-    service: {
-      anyOf: [
-        { $ref: '#/definitions/serviceName' },
-        {
-          type: 'object',
-          properties: {
-            name: { $ref: '#/definitions/serviceName' },
-            awsKmsKeyArn: { $ref: '#/definitions/awsKmsArn' },
-          },
-          additionalProperties: false,
-          required: ['name'],
-        },
-      ],
-    },
+    service: { $ref: '#/definitions/serviceName' },
     unresolvedVariablesNotificationMode: { enum: ['error', 'warn'] },
     useDotenv: { const: true },
     variablesResolutionMode: { type: 'string', enum: ['20210219', '20210326'] },

From 786a76d1dd7435a373aa9a104f446fb7a062a91a Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 27 Oct 2021 13:52:01 +0200
Subject: [PATCH 0860/1101] feat(AWS API Gateway): Change default identity
 source for authorizers

BREAKING CHANGE: For authorizers with `request` type and caching disabled
(`resultTtlInSeconds: 0`), the `identitySource` will no longer be set to
`method.request.header.Authorization` by default.
---
 .../compile/events/apiGateway/index.js        | 22 -------------------
 .../compile/events/apiGateway/lib/validate.js |  5 ++++-
 .../events/apiGateway/lib/validate.test.js    | 21 ++++++++++++++++++
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/index.js b/lib/plugins/aws/package/compile/events/apiGateway/index.js
index 27c96b51c41..22aa7e910d6 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/index.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/index.js
@@ -3,7 +3,6 @@
 /* eslint-disable global-require */
 
 const BbPromise = require('bluebird');
-const _ = require('lodash');
 const memoize = require('memoizee');
 
 const validate = require('./lib/validate');
@@ -238,27 +237,6 @@ class AwsCompileApigEvents {
 
     this.hooks = {
       'initialize': () => {
-        if (
-          this.serverless.service.provider.name === 'aws' &&
-          Object.values(this.serverless.service.functions).some(({ events }) =>
-            events.some(({ http }) => {
-              return (
-                http &&
-                _.isObject(http.authorizer) &&
-                http.authorizer.type &&
-                http.authorizer.type.toUpperCase() === 'REQUEST' &&
-                http.authorizer.identitySource === undefined &&
-                http.authorizer.resultTtlInSeconds === 0
-              );
-            })
-          )
-        ) {
-          this.serverless._logDeprecation(
-            'AWS_API_GATEWAY_DEFAULT_IDENTITY_SOURCE',
-            'Starting with v3.0.0, "functions[].events[].http.authorizer.identitySource" will no longer be set to "method.request.header.Authorization" by default for authorizers of "request" type with caching disabled ("resultTtlInSeconds" set to "0").\nIf you want to keep this setting, please set it explicitly in your configuration. If you do not want this to be set, please set it explicitly to "null".'
-          );
-        }
-
         if (
           this.serverless.service.provider.name === 'aws' &&
           this.serverless.service.provider.apiGateway &&
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
index 92623082528..0e5c04e379e 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
@@ -297,7 +297,10 @@ module.exports = {
       managedExternally = false;
     }
 
-    if (typeof identitySource === 'undefined') {
+    if (
+      !identitySource &&
+      !(type && type.toUpperCase() === 'REQUEST' && resultTtlInSeconds === 0)
+    ) {
       identitySource = 'method.request.header.Authorization';
     }
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
index fadc690a950..20e06760c59 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
@@ -1425,6 +1425,22 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/valida
         command: 'package',
         configExt: {
           functions: {
+            authorized: {
+              handler: 'index.handler',
+              events: [
+                {
+                  http: {
+                    method: 'get',
+                    path: '/authorized',
+                    authorizer: {
+                      type: 'REQUEST',
+                      name: 'basic',
+                      resultTtlInSeconds: 0,
+                    },
+                  },
+                },
+              ],
+            },
             corsDefault: {
               handler: 'index.handler',
               events: [
@@ -1475,6 +1491,11 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/valida
           .IntegrationResponses[0].ResponseParameters
       ).to.deep.eq(expected);
     });
+
+    it('Should not set default `identitySource` for `request` authorizers with caching disabled', async () => {
+      expect(cfResources[naming.getAuthorizerLogicalId('basic')].Properties.IdentitySource).to.be
+        .undefined;
+    });
   });
 
   it('should throw an error when restApiRootResourceId is not provided with restApiId', async () => {

From 16f2159761063c8f4d42cf513e9367e489bba8c9 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 27 Oct 2021 12:48:56 +0200
Subject: [PATCH 0861/1101] feat(AWS EventBridge): Change default deployment
 method to native CF

BREAKING CHANGE: By default, EventBridge resources now will be deployed using
native CloudFormation resources instead of Custom Resources.
---
 docs/deprecations.md                          | 10 +++
 .../compile/events/eventBridge/index.js       | 38 ++++++++---
 test/integration/aws/eventBridge.test.js      | 12 ++--
 .../compile/events/eventBridge/index.test.js  | 66 +++++++++++--------
 4 files changed, 84 insertions(+), 42 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 2e8dc3068a8..2c5f930e680 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -38,6 +38,16 @@ Note:
 - The `serverless.yml` setting is ineffective for deprecations reported before the configuration is read.
 - `SLS_DEPRECATION_DISABLE` and `disabledDeprecations` remain respected, and no errors will be thrown for mentioned deprecation codes.
 
+<a name="AwS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN"><div>&nbsp;</div></a>
+
+## AWS EventBridge lambda event triggers based on Custom Resources
+
+Deprecation code: `AWS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN`
+
+Support for provisioning AWS EventBridge resources without native CloudFormation resources is deprecated and will no longer be maintained. If you want to upgrade to native CloudFormation, remove "eventBridge.useCloudFormation" setting from your configuration. If you are currently using "eventBridge.useCloudFormation" set to `true` to enable native CloudFormation, you can safely remove this setting from your configuration.
+
+Note that to migrate away from the legacy behavior, you will need to remove (or comment) EventBridge triggers, deploy, re-add them and re-deploy in order to migrate from the legacy behavior.
+
 <a name="AWS_HTTP_API_USE_PROVIDER_TAGS_PROPERTY"><div>&nbsp;</div></a>
 
 ## Ineffective property `provider.httpApi.useProviderTags`
diff --git a/lib/plugins/aws/package/compile/events/eventBridge/index.js b/lib/plugins/aws/package/compile/events/eventBridge/index.js
index d5f99a41ee9..50dae1984d1 100644
--- a/lib/plugins/aws/package/compile/events/eventBridge/index.js
+++ b/lib/plugins/aws/package/compile/events/eventBridge/index.js
@@ -13,16 +13,38 @@ class AwsCompileEventBridgeEvents {
 
     this.hooks = {
       'initialize': () => {
-        if (_.get(this.serverless.service.provider, 'eventBridge.useCloudFormation') == null) {
-          const hasFunctionsWithEventBridgeTrigger = Object.values(
-            this.serverless.service.functions
-          ).some(({ events }) => events.some(({ eventBridge }) => eventBridge));
-          if (hasFunctionsWithEventBridgeTrigger) {
+        const useCloudFormation = _.get(
+          this.serverless.service.provider,
+          'eventBridge.useCloudFormation'
+        );
+        const hasFunctionsWithEventBridgeTrigger = Object.values(
+          this.serverless.service.functions
+        ).some(({ events }) => events.some(({ eventBridge }) => eventBridge));
+
+        if (hasFunctionsWithEventBridgeTrigger) {
+          if (useCloudFormation === false) {
             this.serverless._logDeprecation(
-              'AWS_EVENT_BRIDGE_CUSTOM_RESOURCE',
-              'Starting with "v3.0.0", AWS EventBridge resources will be created using native CloudFormation resources by default. It is possible to use that functionality now by setting "eventBridge.useCloudFormation: true" as provider property in your configuration. If you want to keep using the old creation method, set that property to "false" to hide this deprecation message.'
+              'AWS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN',
+              'Support for provisioning AWS EventBridge resources without native CloudFormation' +
+                ' resources is deprecated and will no longer be maintained. If you want to' +
+                ' upgrade to native CloudFormation, remove "eventBridge.useCloudFormation"' +
+                ' setting from your configuration.'
+            );
+          } else if (useCloudFormation === true) {
+            this.serverless._logDeprecation(
+              'AWS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN',
+              'Provisioning AWS EventBridge resources with native CloudFormation is now' +
+                ' enabled by default. Please remove "eventBridge.useCloudFormation" from your' +
+                ' configuration as this setting will not be recognized in the next major release.'
             );
           }
+        } else if (useCloudFormation != null) {
+          this.serverless._logDeprecation(
+            'AWS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN',
+            'Your service does not configure any "eventBridge" events. Please remove' +
+              ' "eventBridge.useCloudFormation" from your configuration as this setting' +
+              ' will not be recognized in the next major release.'
+          );
         }
       },
       'package:compileEvents': this.compileEventBridgeEvents.bind(this),
@@ -114,7 +136,7 @@ class AwsCompileEventBridgeEvents {
     const { compiledCloudFormationTemplate } = provider;
     const iamRoleStatements = [];
     const { eventBridge: options } = provider;
-    const shouldUseCloudFormation = options ? options.useCloudFormation : false;
+    const shouldUseCloudFormation = options ? options.useCloudFormation : true;
     let hasEventBusesIamRoleStatement = false;
     let anyFuncUsesEventBridge = false;
 
diff --git a/test/integration/aws/eventBridge.test.js b/test/integration/aws/eventBridge.test.js
index 6d6349599be..dc0f3697b53 100644
--- a/test/integration/aws/eventBridge.test.js
+++ b/test/integration/aws/eventBridge.test.js
@@ -50,7 +50,12 @@ describe('AWS - Event Bridge Integration Test', () => {
       arnEventBusArn = (await createEventBus(arnEventBusName)).EventBusArn;
       // update the YAML file with the arn
       await serviceData.updateConfig({
-        disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE'],
+        disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN'],
+        provider: {
+          eventBridge: {
+            useCloudFormation: false,
+          },
+        },
         functions: {
           eventBusDefaultArn: {
             events: [
@@ -183,11 +188,6 @@ describe('AWS - Event Bridge Integration Test', () => {
       // NOTE: deployment can only be done once the Event Bus is created
       arnEventBusArn = (await createEventBus(arnEventBusName)).EventBusArn;
       await serviceData.updateConfig({
-        provider: {
-          eventBridge: {
-            useCloudFormation: true,
-          },
-        },
         functions: {
           eventBusDefaultArn: {
             events: [
diff --git a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
index cfd7d2bb0d8..3bca32b89dc 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
@@ -164,6 +164,7 @@ describe('EventBridgeEvents', () => {
         fixture: 'function',
         configExt: {
           ...serverlessConfigurationExtension,
+          disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN'],
           provider: {
             eventBridge: {
               useCloudFormation: false,
@@ -284,7 +285,12 @@ describe('EventBridgeEvents', () => {
         runServerless({
           fixture: 'function',
           configExt: {
-            disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE'],
+            disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN'],
+            provider: {
+              eventBridge: {
+                useCloudFormation: false,
+              },
+            },
             functions: {
               basic: {
                 events: [
@@ -316,7 +322,12 @@ describe('EventBridgeEvents', () => {
         runServerless({
           fixture: 'function',
           configExt: {
-            disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE'],
+            disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN'],
+            provider: {
+              eventBridge: {
+                useCloudFormation: false,
+              },
+            },
             functions: {
               basic: {
                 events: [
@@ -347,7 +358,12 @@ describe('EventBridgeEvents', () => {
         runServerless({
           fixture: 'function',
           configExt: {
-            disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE'],
+            disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN'],
+            provider: {
+              eventBridge: {
+                useCloudFormation: false,
+              },
+            },
             functions: {
               basic: {
                 events: [
@@ -368,21 +384,6 @@ describe('EventBridgeEvents', () => {
         'ERROR_INVALID_REFERENCE_TO_EVENT_BUS_CUSTOM_RESOURCE'
       );
     });
-
-    it('should emit deprecation when `eventBridge.useCloudFormation` is not explicitly set', async () => {
-      await expect(
-        runServerless({
-          fixture: 'function',
-          configExt: {
-            ...serverlessConfigurationExtension,
-          },
-          command: 'package',
-        })
-      ).to.be.eventually.rejected.and.have.property(
-        'code',
-        'REJECTED_DEPRECATION_AWS_EVENT_BRIDGE_CUSTOM_RESOURCE'
-      );
-    });
   });
 
   describe('using native CloudFormation', () => {
@@ -429,11 +430,6 @@ describe('EventBridgeEvents', () => {
         const { cfTemplate, awsNaming } = await runServerless({
           fixture: 'function',
           configExt: {
-            provider: {
-              eventBridge: {
-                useCloudFormation: true,
-              },
-            },
             functions: {
               basic: {
                 events: [
@@ -595,11 +591,6 @@ describe('EventBridgeEvents', () => {
           fixture: 'function',
           command: 'package',
           configExt: {
-            provider: {
-              eventBridge: {
-                useCloudFormation: true,
-              },
-            },
             functions: {
               basic: {
                 events: [
@@ -677,4 +668,23 @@ describe('EventBridgeEvents', () => {
       });
     });
   });
+
+  it('should trigger deprecation when `useCloudFormation` is set without any `eventBridge` events', async () => {
+    await expect(
+      runServerless({
+        fixture: 'function',
+        command: 'package',
+        configExt: {
+          provider: {
+            eventBridge: {
+              useCloudFormation: true,
+            },
+          },
+        },
+      })
+    ).to.be.eventually.rejected.and.have.property(
+      'code',
+      'REJECTED_DEPRECATION_AWS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN'
+    );
+  });
 });

From fe1a2db773043e6924246e7744f6dfb687781058 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 28 Oct 2021 14:12:17 +0200
Subject: [PATCH 0862/1101] feat(CLI): Remove support for unrecognized cli
 options

BREAKING CHANGE: Unrecognized CLI options will no longer be supported and
will result in an error.
---
 lib/cli/ensure-supported-command.js                |  9 +++------
 test/unit/commands/doctor.test.js                  | 12 +++++++++++-
 test/unit/lib/cli/ensure-supported-command.test.js |  4 +---
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/lib/cli/ensure-supported-command.js b/lib/cli/ensure-supported-command.js
index 9ab32236a4c..ba8b673af86 100644
--- a/lib/cli/ensure-supported-command.js
+++ b/lib/cli/ensure-supported-command.js
@@ -3,7 +3,6 @@
 const { distance: getDistance } = require('fastest-levenshtein');
 const resolveInput = require('./resolve-input');
 const ServerlessError = require('../serverless-error');
-const logDeprecation = require('../utils/logDeprecation');
 
 const getCommandSuggestion = (command, commandsSchema) => {
   let suggestion;
@@ -42,11 +41,9 @@ module.exports = (configuration = null) => {
     (optionName) => !supportedOptions.has(optionName)
   );
   if (unrecognizedOptions.length) {
-    logDeprecation(
-      'UNSUPPORTED_CLI_OPTIONS',
-      `Detected unrecognized CLI options: "--${unrecognizedOptions.join('", "--')}".\n` +
-        'Starting with the next major, Serverless Framework will report them with a thrown error',
-      { serviceConfig: configuration }
+    throw new ServerlessError(
+      `Detected unrecognized CLI options: "--${unrecognizedOptions.join('", "--')}".\n`,
+      'UNSUPPORTED_CLI_OPTIONS'
     );
   }
   if (isContainerCommand) return;
diff --git a/test/unit/commands/doctor.test.js b/test/unit/commands/doctor.test.js
index 7a5fb82efbb..bc31d017989 100644
--- a/test/unit/commands/doctor.test.js
+++ b/test/unit/commands/doctor.test.js
@@ -4,6 +4,7 @@ const chai = require('chai');
 const path = require('path');
 const spawn = require('child-process-ext/spawn');
 const { expect } = require('chai');
+const fixturesEngine = require('../../fixtures/programmatic');
 
 chai.use(require('chai-as-promised'));
 
@@ -15,8 +16,17 @@ describe('test/unit/commands/doctor.test.js', async () => {
   });
 
   it('should print health status after command which triggered deprecation', async () => {
+    const { servicePath: serviceDir } = await fixturesEngine.setup('httpApi', {
+      configExt: {
+        provider: {
+          httpApi: {
+            useProviderTags: true,
+          },
+        },
+      },
+    });
     // Trigger deprecation
-    await spawn('node', [serverlessPath, 'config', '--foo']);
+    await spawn('node', [serverlessPath, 'print'], { cwd: serviceDir });
 
     // Gather Health status
     expect(String((await spawn('node', [serverlessPath, 'doctor'])).stdoutBuffer)).to.include(
diff --git a/test/unit/lib/cli/ensure-supported-command.test.js b/test/unit/lib/cli/ensure-supported-command.test.js
index 4b57eb7742d..785a321ea12 100644
--- a/test/unit/lib/cli/ensure-supported-command.test.js
+++ b/test/unit/lib/cli/ensure-supported-command.test.js
@@ -18,7 +18,6 @@ describe('test/unit/lib/cli/ensure-supported-command.test.js', () => {
       () => resolveInput()
     );
     ensureSupportedCommand();
-    expect(triggeredDeprecations.has('UNSUPPORTED_CLI_OPTIONS')).to.be.false;
   });
 
   it('should do nothing on container commmand', async () => {
@@ -31,7 +30,6 @@ describe('test/unit/lib/cli/ensure-supported-command.test.js', () => {
       () => resolveInput()
     );
     ensureSupportedCommand();
-    expect(triggeredDeprecations.has('UNSUPPORTED_CLI_OPTIONS')).to.be.false;
   });
 
   it('should reject invalid command', async () => {
@@ -59,7 +57,7 @@ describe('test/unit/lib/cli/ensure-supported-command.test.js', () => {
     );
     expect(() => ensureSupportedCommand())
       .to.throw(ServerlessError)
-      .with.property('code', 'REJECTED_DEPRECATION_UNSUPPORTED_CLI_OPTIONS');
+      .with.property('code', 'UNSUPPORTED_CLI_OPTIONS');
   });
 
   it('should reject missing options', async () => {

From 99129394320dad89f3ba2170767d24b2665d5112 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 3 Nov 2021 17:13:55 +0100
Subject: [PATCH 0863/1101] feat: Remove `studio` command schema

BREAKING CHANGE: Remove `studio` command schema
---
 lib/cli/commands-schema/aws-service.js | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/lib/cli/commands-schema/aws-service.js b/lib/cli/commands-schema/aws-service.js
index bb40027273a..ec70c7cbe95 100644
--- a/lib/cli/commands-schema/aws-service.js
+++ b/lib/cli/commands-schema/aws-service.js
@@ -273,18 +273,6 @@ commands.set('rollback function', {
   lifecycleEvents: ['rollback'],
 });
 
-commands.set('studio', {
-  usage: 'Develop a Serverless application in the cloud.',
-  options: {
-    autoStage: {
-      usage: 'If specified, generate a random stage. This stage will be removed on exit.',
-      shortcut: 'a',
-      type: 'boolean',
-    },
-  },
-  lifecycleEvents: ['studio'],
-});
-
 commands.set('test', {
   usage: 'Run HTTP tests',
   options: {

From 30a3be8de7877d21f0ce64a706ac2b74babefe63 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 4 Nov 2021 13:18:53 +0100
Subject: [PATCH 0864/1101] feat: Do not decorate `cli.log` logs

---
 lib/classes/CLI.js                       | 14 ++++++++++++--
 test/integration/curated-plugins.test.js | 10 +++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/lib/classes/CLI.js b/lib/classes/CLI.js
index dc70f1ce73c..d6214199959 100644
--- a/lib/classes/CLI.js
+++ b/lib/classes/CLI.js
@@ -3,10 +3,12 @@
 const version = require('../../package.json').version;
 const os = require('os');
 const chalk = require('chalk');
-const log = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 const resolveCliInput = require('../cli/resolve-input');
 const renderHelp = require('../cli/render-help');
 
+const legacyPluginLog = log.get('plugin-legacy');
+
 class CLI {
   constructor(serverless) {
     this.serverless = serverless;
@@ -68,7 +70,15 @@ class CLI {
   }
 
   log(message, entity, opts) {
-    log(message, { ...opts, entity: entity || 'Serverless' });
+    const { underline = false, bold = false, color = null } = opts || {};
+
+    let print = chalk;
+
+    if (color) print = chalk.keyword(color);
+    if (underline) print = print.underline;
+    if (bold) print = print.bold;
+
+    legacyPluginLog.notice(entity ? `${entity}: ${print(message)}` : print(message));
   }
 
   consoleLog(message) {
diff --git a/test/integration/curated-plugins.test.js b/test/integration/curated-plugins.test.js
index 5109d1a2823..2b426877c95 100644
--- a/test/integration/curated-plugins.test.js
+++ b/test/integration/curated-plugins.test.js
@@ -42,7 +42,7 @@ describe('test/integration/curated-plugins.test.js', function () {
     });
     const slsProcess = slsProcessPromise.child;
     let output = '';
-    slsProcess.stdout.on('data', function self(data) {
+    slsProcess.stderr.on('data', function self(data) {
       output += data;
       if (output.includes('Server ready:')) {
         slsProcess.stderr.off('data', self);
@@ -69,8 +69,8 @@ describe('test/integration/curated-plugins.test.js', function () {
 
   it('should be extended by "serverless-domain-manager"', async () => {
     await updateConfig({ plugins: ['serverless-domain-manager'] });
-    const { stdoutBuffer } = await spawn(serverlessExec, ['info'], { cwd: serviceDir });
-    expect(String(stdoutBuffer)).to.include('Serverless Domain Manager:');
+    const { stderrBuffer } = await spawn(serverlessExec, ['info'], { cwd: serviceDir });
+    expect(String(stderrBuffer)).to.include('Serverless Domain Manager:');
   });
 
   it('should be extended by "serverless-prune-plugin"', async () => {
@@ -83,10 +83,10 @@ describe('test/integration/curated-plugins.test.js', function () {
 
   it('should be extended by "serverless-dotenv-plugin"', async () => {
     await updateConfig({ plugins: ['serverless-dotenv-plugin'] });
-    const { stdoutBuffer } = await spawn(serverlessExec, ['package'], {
+    const { stderrBuffer } = await spawn(serverlessExec, ['package'], {
       cwd: serviceDir,
     });
-    expect(String(stdoutBuffer)).to.include('DOTENV: Loading environment variables');
+    expect(String(stderrBuffer)).to.include('DOTENV: Loading environment variables');
     const cfTemplate = JSON.parse(
       await fsp.readFile(
         path.resolve(serviceDir, '.serverless/cloudformation-template-update-stack.json')

From d4222c10cf717ada4963ca4a1b5ce7dc86d3985c Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 4 Nov 2021 15:41:59 +0100
Subject: [PATCH 0865/1101] feat(AWS API Gateway): Error on tracing or logs set
 for external API

BREAKING CHANGE: Enabling logs or tracing for imported API Gateway will
now result in an error instead of warning
---
 .../compile/events/apiGateway/index.js        | 30 ------------
 .../compile/events/apiGateway/lib/validate.js | 24 ++++++++++
 .../events/apiGateway/lib/validate.test.js    | 47 +++++++++++++++++--
 3 files changed, 68 insertions(+), 33 deletions(-)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/index.js b/lib/plugins/aws/package/compile/events/apiGateway/index.js
index 22aa7e910d6..bd8a26e480a 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/index.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/index.js
@@ -236,36 +236,6 @@ class AwsCompileApigEvents {
     this.createRequestValidator = memoize(this.createRequestValidator.bind(this));
 
     this.hooks = {
-      'initialize': () => {
-        if (
-          this.serverless.service.provider.name === 'aws' &&
-          this.serverless.service.provider.apiGateway &&
-          this.serverless.service.provider.apiGateway.restApiId &&
-          this.serverless.service.provider.tracing &&
-          this.serverless.service.provider.tracing.apiGateway != null
-        ) {
-          this.serverless._logDeprecation(
-            'AWS_API_GATEWAY_NON_APPLICABLE_SETTINGS',
-            'When external API Gateway resource is imported via ' +
-              '`provider.apiGateway.restApiId`, property ' +
-              '"provider.tracing.apiGateway" will be ignored.'
-          );
-        }
-        if (
-          this.serverless.service.provider.name === 'aws' &&
-          this.serverless.service.provider.apiGateway &&
-          this.serverless.service.provider.apiGateway.restApiId &&
-          this.serverless.service.provider.logs &&
-          this.serverless.service.provider.logs.restApi != null
-        ) {
-          this.serverless._logDeprecation(
-            'AWS_API_GATEWAY_NON_APPLICABLE_SETTINGS',
-            'When external API Gateway resource is imported via ' +
-              '`provider.apiGateway.restApiId`, property ' +
-              '"provider.logs.restApi" will be ignored.'
-          );
-        }
-      },
       'package:compileEvents': async () => {
         this.validated = this.validate();
 
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
index 0e5c04e379e..13c21c3a976 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
@@ -50,6 +50,30 @@ module.exports = {
       );
     }
 
+    if (
+      this.serverless.service.provider.apiGateway &&
+      this.serverless.service.provider.apiGateway.restApiId &&
+      this.serverless.service.provider.tracing &&
+      this.serverless.service.provider.tracing.apiGateway != null
+    ) {
+      throw new ServerlessError(
+        'When external API Gateway resource is imported via "provider.apiGateway.restApiId", property "provider.tracing.apiGateway" is ineffective.',
+        'API_GATEWAY_EXTERNAL_API_TRACING'
+      );
+    }
+
+    if (
+      this.serverless.service.provider.apiGateway &&
+      this.serverless.service.provider.apiGateway.restApiId &&
+      this.serverless.service.provider.logs &&
+      this.serverless.service.provider.logs.restApi != null
+    ) {
+      throw new ServerlessError(
+        'When external API Gateway resource is imported via "provider.apiGateway.restApiId", property "provider.logs.restApi" is ineffective.',
+        'API_GATEWAY_EXTERNAL_API_LOGS'
+      );
+    }
+
     Object.entries(this.serverless.service.functions).forEach(([functionName, functionObject]) => {
       (functionObject.events || []).forEach((event) => {
         if (event.http) {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
index 20e06760c59..15c5f3d530d 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const expect = require('chai').expect;
+const chai = require('chai');
 const sinon = require('sinon');
 const runServerless = require('../../../../../../../../../utils/run-serverless');
 const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
@@ -8,8 +8,10 @@ const Serverless = require('../../../../../../../../../../lib/Serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 const ServerlessError = require('../../../../../../../../../../lib/serverless-error');
 
-const chai = require('chai');
 chai.use(require('chai-as-promised'));
+chai.use(require('sinon-chai'));
+
+const expect = chai.expect;
 
 describe('#validate()', () => {
   let serverless;
@@ -1529,7 +1531,6 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/valida
       'API_GATEWAY_MISSING_REST_API_ROOT_RESOURCE_ID'
     );
   });
-
   it('should throw when using a CUSTOM authorizer without an authorizer id', async () => {
     await expect(
       runServerless({
@@ -1592,4 +1593,44 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/valida
     const resource = getApiGatewayMethod('/custom-authorizer', 'POST');
     expect(resource.Properties.AuthorizationType).to.equal('CUSTOM');
   });
+
+  it('Should error when using external API Gateway and enabling tracing', async () => {
+    await expect(
+      runServerless({
+        fixture: 'apiGateway',
+        command: 'package',
+        configExt: {
+          provider: {
+            apiGateway: {
+              restApiId: 'xxx',
+              restApiRootResourceId: 'yyy',
+            },
+            tracing: {
+              apiGateway: true,
+            },
+          },
+        },
+      })
+    ).to.be.eventually.rejected.and.have.property('code', 'API_GATEWAY_EXTERNAL_API_TRACING');
+  });
+
+  it('Should error when using external API Gateway and enabling logs', async () => {
+    await expect(
+      runServerless({
+        fixture: 'apiGateway',
+        command: 'package',
+        configExt: {
+          provider: {
+            apiGateway: {
+              restApiId: 'xxx',
+              restApiRootResourceId: 'yyy',
+            },
+            logs: {
+              restApi: true,
+            },
+          },
+        },
+      })
+    ).to.be.eventually.rejected.and.have.property('code', 'API_GATEWAY_EXTERNAL_API_LOGS');
+  });
 });

From fcd386b33b5ec130b086bd9b14719b71880612d9 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 5 Nov 2021 15:52:25 +0100
Subject: [PATCH 0866/1101] feat: Disallow custom nested configuration path

BREAKING CHANGE: Custom nested configuration paths will no longer be
supported and such usage will result in an error.
---
 lib/cli/resolve-configuration-path.js                |  8 +++-----
 test/unit/lib/cli/resolve-configuration-path.test.js | 11 +++++------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/lib/cli/resolve-configuration-path.js b/lib/cli/resolve-configuration-path.js
index 8c535450715..234231e7328 100644
--- a/lib/cli/resolve-configuration-path.js
+++ b/lib/cli/resolve-configuration-path.js
@@ -6,7 +6,6 @@ const path = require('path');
 const fsp = require('fs').promises;
 const ServerlessError = require('../serverless-error');
 const fileExists = require('../utils/fs/fileExists');
-const logDeprecation = require('../utils/logDeprecation');
 const resolveInput = require('./resolve-input');
 
 const supportedExtensions = new Set(['yml', 'yaml', 'json', 'js', 'ts']);
@@ -50,10 +49,9 @@ module.exports = async (options = {}) => {
       );
     }
     if (cwd !== path.dirname(customConfigPath)) {
-      logDeprecation(
-        'NESTED_CUSTOM_CONFIGURATION_PATH',
-        'Service configuration is expected to be placed in a root of a service (working directory). All paths, function handlers in a configuration are resolved against service directory".\n' +
-          'Starting from next major Serverless will no longer permit configurations nested in sub directories.'
+      throw new ServerlessError(
+        'Service configuration is expected to be placed in a root of a service (working directory). All paths, function handlers in a configuration are resolved against service directory.\n',
+        'NESTED_CUSTOM_CONFIGURATION_PATH'
       );
     }
     return customConfigPath;
diff --git a/test/unit/lib/cli/resolve-configuration-path.test.js b/test/unit/lib/cli/resolve-configuration-path.test.js
index 82b770ac1a6..c3bcccc5f7c 100644
--- a/test/unit/lib/cli/resolve-configuration-path.test.js
+++ b/test/unit/lib/cli/resolve-configuration-path.test.js
@@ -86,19 +86,18 @@ describe('test/unit/lib/cli/resolve-configuration-path.test.js', () => {
         process.env.SLS_DEPRECATION_NOTIFICATION_MODE = 'warn';
         const uncached = requireUncached(() => ({
           resolveServerlessConfigPath: require('../../../../lib/cli/resolve-configuration-path'),
-          triggeredDeprecations: require('../../../../lib/utils/logDeprecation')
-            .triggeredDeprecations,
         }));
         await overrideArgv(
           {
             args: ['serverless', '--config', 'nested/custom.yml'],
           },
           async () => {
-            expect(await uncached.resolveServerlessConfigPath()).to.equal(
-              path.resolve('nested/custom.yml')
+            await expect(
+              uncached.resolveServerlessConfigPath()
+            ).to.eventually.be.rejected.and.have.property(
+              'code',
+              'NESTED_CUSTOM_CONFIGURATION_PATH'
             );
-            expect(uncached.triggeredDeprecations.has('NESTED_CUSTOM_CONFIGURATION_PATH')).to.be
-              .true;
           }
         );
       });

From 7abbde611c3275f151dff28e444f935eb59704ef Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 16 Nov 2021 12:37:20 +0100
Subject: [PATCH 0867/1101] feat(AWS Lambda): Remove support for obsolete
 runtimes

BREAKING CHANGE: Runtimes `nodejs10.x`, `python2.7`, `ruby2.5` and
`dotnetcore2.1` reached end of support on AWS and are no longer recognized
in configuration.
---
 lib/plugins/aws/provider.js                                 | 4 ----
 test/unit/lib/plugins/aws/package/compile/functions.test.js | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 57672acf6f8..7e4147cc148 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -538,23 +538,19 @@ class AwsProvider {
           },
           awsLambdaRuntime: {
             enum: [
-              'dotnetcore2.1',
               'dotnetcore3.1',
               'go1.x',
               'java11',
               'java8',
               'java8.al2',
-              'nodejs10.x',
               'nodejs12.x',
               'nodejs14.x',
               'provided',
               'provided.al2',
-              'python2.7',
               'python3.6',
               'python3.7',
               'python3.8',
               'python3.9',
-              'ruby2.5',
               'ruby2.7',
             ],
           },
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index 6670e61b1fe..3923eb9a04d 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -1118,7 +1118,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
               providerCfIfEnvVar: { 'Fn::If': ['cond', 'first', 'second'] },
             },
             memorySize: 4096,
-            runtime: 'nodejs10.x',
+            runtime: 'nodejs14.x',
             deploymentBucket: 'com.serverless.deploys',
             versionFunctions: false,
           },

From 38412ce88bbc3cf9bc5c80a8e8a87fabc968e60e Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 9 Nov 2021 11:58:04 +0100
Subject: [PATCH 0868/1101] feat: Simplify `logs` command output

---
 lib/plugins/aws/invoke.js                     | 12 ++-----
 lib/plugins/aws/logs.js                       |  8 +++--
 lib/plugins/aws/utils/formatLambdaLogEvent.js | 32 ++++++++++---------
 .../aws/utils/formatLambdaLogEvent.test.js    | 25 ++++++++-------
 4 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/lib/plugins/aws/invoke.js b/lib/plugins/aws/invoke.js
index 0f5eebb0b3f..a26efe8da89 100644
--- a/lib/plugins/aws/invoke.js
+++ b/lib/plugins/aws/invoke.js
@@ -1,12 +1,11 @@
 'use strict';
 
-const chalk = require('chalk');
 const path = require('path');
 const validate = require('./lib/validate');
 const stdin = require('get-stdin');
 const formatLambdaLogEvent = require('./utils/formatLambdaLogEvent');
 const ServerlessError = require('../../serverless-error');
-const { legacy, writeText, style } = require('@serverless/utils/log');
+const { writeText, style } = require('@serverless/utils/log');
 
 class AwsInvoke {
   constructor(serverless, options) {
@@ -102,26 +101,19 @@ class AwsInvoke {
   }
 
   log(invocationReply) {
-    const color = !invocationReply.FunctionError ? (x) => x : chalk.red;
-
     if (invocationReply.Payload) {
       const response = JSON.parse(invocationReply.Payload);
 
-      legacy.consoleLog(color(JSON.stringify(response, null, 4)));
       writeText(JSON.stringify(response, null, 4));
     }
 
     if (invocationReply.LogResult) {
-      legacy.consoleLog(
-        chalk.gray('--------------------------------------------------------------------')
-      );
       writeText(
         style.aside('--------------------------------------------------------------------')
       );
       const logResult = Buffer.from(invocationReply.LogResult, 'base64').toString();
       logResult.split('\n').forEach((line) => {
-        legacy.consoleLog(formatLambdaLogEvent(line));
-        writeText(formatLambdaLogEvent(line, { isModern: true }));
+        writeText(formatLambdaLogEvent(line));
       });
     }
 
diff --git a/lib/plugins/aws/logs.js b/lib/plugins/aws/logs.js
index e99899b9f22..91133627ac8 100644
--- a/lib/plugins/aws/logs.js
+++ b/lib/plugins/aws/logs.js
@@ -4,7 +4,7 @@ const _ = require('lodash');
 const dayjs = require('dayjs');
 const utc = require('dayjs/plugin/utc');
 const wait = require('timers-ext/promise/sleep');
-const { legacy, writeText } = require('@serverless/utils/log');
+const { writeText } = require('@serverless/utils/log');
 const validate = require('./lib/validate');
 const formatLambdaLogEvent = require('./utils/formatLambdaLogEvent');
 const ServerlessError = require('../../serverless-error');
@@ -95,8 +95,10 @@ class AwsLogs {
     const results = await this.provider.request('CloudWatchLogs', 'filterLogEvents', params);
     if (results.events) {
       results.events.forEach((e) => {
-        legacy.write(formatLambdaLogEvent(e.message));
-        writeText(formatLambdaLogEvent(e.message, { isModern: true }));
+        if (e.message.includes('SERVERLESS_ENTERPRISE') || e.message.startsWith('END')) {
+          return;
+        }
+        writeText(formatLambdaLogEvent(e.message));
       });
     }
 
diff --git a/lib/plugins/aws/utils/formatLambdaLogEvent.js b/lib/plugins/aws/utils/formatLambdaLogEvent.js
index 4b99a1d34d6..ac2a8e1bafc 100644
--- a/lib/plugins/aws/utils/formatLambdaLogEvent.js
+++ b/lib/plugins/aws/utils/formatLambdaLogEvent.js
@@ -1,25 +1,28 @@
 'use strict';
 
 const dayjs = require('dayjs');
-const chalk = require('chalk');
-const os = require('os');
 const { style } = require('@serverless/utils/log');
 
-module.exports = (msgParam, options = {}) => {
-  const { isModern } = options;
+module.exports = (msgParam) => {
   let msg = msgParam;
-  const dateFormat = 'YYYY-MM-DD HH:mm:ss.SSS (Z)';
+  const dateFormat = 'YYYY-MM-DD HH:mm:ss.SSS';
 
-  if (isModern) {
-    if (!msg.startsWith('REPORT')) msg = msg.trimRight();
-  } else if (msg.startsWith('REPORT')) {
-    msg += os.EOL;
+  if (!msg.startsWith('REPORT')) msg = msg.trimRight();
+
+  if (msg.startsWith('START')) {
+    msg = 'START';
+    return style.aside(msg);
+  }
+
+  if (msg.startsWith('REPORT')) {
+    const splitted = msg.split('\t');
+    // Replace REPORT with END and filter out RequestId
+    msg = `END ${splitted.slice(1).join('\t')}`;
+    return style.aside(msg);
   }
 
-  if (msg.startsWith('START') || msg.startsWith('END') || msg.startsWith('REPORT')) {
-    return isModern ? style.aside(msg) : chalk.gray(msg);
-  } else if (msg.trim() === 'Process exited before completing request') {
-    return isModern ? style.error(msg) : chalk.red(msg);
+  if (msg.trim() === 'Process exited before completing request') {
+    return style.error(msg);
   }
 
   const splitted = msg.split('\t');
@@ -44,6 +47,5 @@ module.exports = (msgParam, options = {}) => {
   const text = msg.split(`${reqId}\t`)[1];
   const time = dayjs(date).format(dateFormat);
 
-  if (isModern) return `${style.aside(`${time}\t${reqId}`)}\t${level}${text}`;
-  return `${chalk.green(time)}\t${chalk.yellow(reqId)}\t${level}${text}`;
+  return `${style.aside(`${time}\t`)}${level}${text}`;
 };
diff --git a/test/unit/lib/plugins/aws/utils/formatLambdaLogEvent.test.js b/test/unit/lib/plugins/aws/utils/formatLambdaLogEvent.test.js
index 015a8fb74a7..7f260302426 100644
--- a/test/unit/lib/plugins/aws/utils/formatLambdaLogEvent.test.js
+++ b/test/unit/lib/plugins/aws/utils/formatLambdaLogEvent.test.js
@@ -2,30 +2,32 @@
 
 const expect = require('chai').expect;
 const dayjs = require('dayjs');
-const chalk = require('chalk');
-const os = require('os');
+const { style } = require('@serverless/utils/log');
 const formatLambdaLogEvent = require('../../../../../../lib/plugins/aws/utils/formatLambdaLogEvent');
 
 describe('#formatLambdaLogEvent()', () => {
   it('should format invocation report', () => {
     const msg =
-      'REPORT\tRequestId: 99c30000-b01a-11e5-93f7-b8e85631a00e\tDuration: 0.40 ms\tBilled Duration: 100 ms\tMemory Size: 512 MB\tMax Memory Used: 30 MB';
+      'REPORT RequestId: 99c30000-b01a-11e5-93f7-b8e85631a00e\tDuration: 0.40 ms\tBilled Duration: 100 ms\tMemory Size: 512 MB\tMax Memory Used: 30 MB';
+    const expectedMsg = style.aside(
+      'END Duration: 0.40 ms\tBilled Duration: 100 ms\tMemory Size: 512 MB\tMax Memory Used: 30 MB'
+    );
 
-    expect(formatLambdaLogEvent(msg)).to.equal(chalk.grey(msg + os.EOL));
+    expect(formatLambdaLogEvent(msg)).to.deep.equal(expectedMsg);
   });
 
   it('should format invocation failures', () => {
     const msg = 'Process exited before completing request';
-    expect(formatLambdaLogEvent(msg)).to.equal(chalk.red(msg));
+    expect(formatLambdaLogEvent(msg)).to.deep.equal(style.error(msg));
   });
 
   it('should format lambda console.log lines', () => {
-    const nodeLogLine = '2016-01-01T12:00:00Z\t99c30000-b01a-11e5-93f7-b8e85631a00e\ttest';
+    const nodeLogLine = '2016-01-01T12:00:00Z\t99c30000-b01a-11e5-93f7-b8e85631a00e\tINFO\ttest';
 
     let expectedLogMessage = '';
-    const date = dayjs('2016-01-01T12:00:00Z').format('YYYY-MM-DD HH:mm:ss.SSS (Z)');
-    expectedLogMessage += `${chalk.green(date)}\t`;
-    expectedLogMessage += `${chalk.yellow('99c30000-b01a-11e5-93f7-b8e85631a00e')}\t`;
+    const date = dayjs('2016-01-01T12:00:00Z').format('YYYY-MM-DD HH:mm:ss.SSS');
+    expectedLogMessage += `${style.aside(date)}\t`;
+    expectedLogMessage += 'INFO\t';
     expectedLogMessage += 'test';
 
     expect(formatLambdaLogEvent(nodeLogLine)).to.equal(expectedLogMessage);
@@ -36,9 +38,8 @@ describe('#formatLambdaLogEvent()', () => {
       '[INFO]\t2016-01-01T12:00:00Z\t99c30000-b01a-11e5-93f7-b8e85631a00e\ttest';
 
     let expectedLogMessage = '';
-    const date = dayjs('2016-01-01T12:00:00Z').format('YYYY-MM-DD HH:mm:ss.SSS (Z)');
-    expectedLogMessage += `${chalk.green(date)}\t`;
-    expectedLogMessage += `${chalk.yellow('99c30000-b01a-11e5-93f7-b8e85631a00e')}\t`;
+    const date = dayjs('2016-01-01T12:00:00Z').format('YYYY-MM-DD HH:mm:ss.SSS');
+    expectedLogMessage += `${style.aside(date)}\t`;
     expectedLogMessage += `${'[INFO]'}\t`;
     expectedLogMessage += 'test';
 

From 5194030462add10a7ce0c83897fc71109ceb6fb6 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 4 Nov 2021 13:42:32 +0100
Subject: [PATCH 0869/1101] feat(CLI): Global `--verbose` flag for verbose
 logging

---
 lib/cli/commands-schema/aws-service.js         | 18 ------------------
 .../commands-schema/common-options/global.js   |  1 +
 .../lib/cli/filter-supported-options.test.js   |  2 ++
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/lib/cli/commands-schema/aws-service.js b/lib/cli/commands-schema/aws-service.js
index ec70c7cbe95..bbe204be31a 100644
--- a/lib/cli/commands-schema/aws-service.js
+++ b/lib/cli/commands-schema/aws-service.js
@@ -17,10 +17,6 @@ commands.set('deploy', {
       usage: 'Path of the deployment package',
       shortcut: 'p',
     },
-    'verbose': {
-      usage: 'Show all stack events during deployment',
-      type: 'boolean',
-    },
     'force': {
       usage: 'Forces a deployment to take place',
       type: 'boolean',
@@ -91,10 +87,6 @@ commands.set('info', {
       usage: 'Hide secrets from the output (e.g. API Gateway key values)',
       type: 'boolean',
     },
-    verbose: {
-      usage: 'List stack outputs',
-      type: 'boolean',
-    },
   },
   lifecycleEvents: ['info'],
 });
@@ -232,12 +224,6 @@ commands.set('metrics', {
 
 commands.set('remove', {
   usage: 'Remove Serverless service and all resources',
-  options: {
-    verbose: {
-      usage: 'Show all stack events during deployment',
-      type: 'boolean',
-    },
-  },
   lifecycleEvents: ['remove'],
 });
 
@@ -249,10 +235,6 @@ commands.set('rollback', {
       shortcut: 't',
       required: false,
     },
-    verbose: {
-      usage: 'Show all stack events during deployment',
-      type: 'boolean',
-    },
   },
   lifecycleEvents: ['initialize', 'rollback'],
 });
diff --git a/lib/cli/commands-schema/common-options/global.js b/lib/cli/commands-schema/common-options/global.js
index 92ec7976bf4..a41074c172d 100644
--- a/lib/cli/commands-schema/common-options/global.js
+++ b/lib/cli/commands-schema/common-options/global.js
@@ -3,6 +3,7 @@
 module.exports = {
   help: { usage: 'Show this message', shortcut: 'h', type: 'boolean' },
   version: { usage: 'Show version info', type: 'boolean' },
+  verbose: { usage: 'Show verbose logs', type: 'boolean' },
 };
 
 for (const optionSchema of Object.values(module.exports)) {
diff --git a/test/unit/lib/cli/filter-supported-options.test.js b/test/unit/lib/cli/filter-supported-options.test.js
index ae0c4c8cb91..5540c901c1a 100644
--- a/test/unit/lib/cli/filter-supported-options.test.js
+++ b/test/unit/lib/cli/filter-supported-options.test.js
@@ -57,6 +57,7 @@ describe('test/unit/lib/cli/filter-supported-options.test.js', () => {
       'app': null,
       'org': null,
       'use-local-credentials': null,
+      'verbose': null,
     });
   });
 
@@ -77,6 +78,7 @@ describe('test/unit/lib/cli/filter-supported-options.test.js', () => {
       version: null,
       config: null,
       stage: 'marko',
+      verbose: null,
     });
   });
 });

From dc0bf5c9aaeb5bb349ee5c113878010f98fcd555 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 4 Nov 2021 13:47:27 +0100
Subject: [PATCH 0870/1101] feat(CLI): Global `--debug` flag for debug logging

---
 lib/cli/commands-schema/common-options/global.js   | 1 +
 test/unit/lib/cli/filter-supported-options.test.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lib/cli/commands-schema/common-options/global.js b/lib/cli/commands-schema/common-options/global.js
index a41074c172d..1a2d8379629 100644
--- a/lib/cli/commands-schema/common-options/global.js
+++ b/lib/cli/commands-schema/common-options/global.js
@@ -4,6 +4,7 @@ module.exports = {
   help: { usage: 'Show this message', shortcut: 'h', type: 'boolean' },
   version: { usage: 'Show version info', type: 'boolean' },
   verbose: { usage: 'Show verbose logs', type: 'boolean' },
+  debug: { usage: 'Namespace of debug logs to expose (use "*" to display all)', type: 'string' },
 };
 
 for (const optionSchema of Object.values(module.exports)) {
diff --git a/test/unit/lib/cli/filter-supported-options.test.js b/test/unit/lib/cli/filter-supported-options.test.js
index 5540c901c1a..eddafba4ec4 100644
--- a/test/unit/lib/cli/filter-supported-options.test.js
+++ b/test/unit/lib/cli/filter-supported-options.test.js
@@ -58,6 +58,7 @@ describe('test/unit/lib/cli/filter-supported-options.test.js', () => {
       'org': null,
       'use-local-credentials': null,
       'verbose': null,
+      'debug': null,
     });
   });
 
@@ -79,6 +80,7 @@ describe('test/unit/lib/cli/filter-supported-options.test.js', () => {
       config: null,
       stage: 'marko',
       verbose: null,
+      debug: null,
     });
   });
 });

From 9a834152a9fe87a561b7c1b0b37a7e92503d8310 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 19 Nov 2021 13:50:27 +0100
Subject: [PATCH 0871/1101] feat(AWS Lambda): Change default hashing algorithm

BREAKING CHANGE: Default lambda hashing algorithm was changed to `20201221`
---
 docs/deprecations.md                          | 12 ++++++
 docs/providers/aws/guide/functions.md         | 25 +++++++++++
 lib/plugins/aws/deploy/index.js               |  7 +---
 lib/plugins/aws/package/compile/functions.js  | 42 ++++++++++---------
 .../aws-alexa-typescript/serverless.yml       |  1 -
 .../aws-clojure-gradle/serverless.yml         |  1 -
 .../aws-clojurescript-gradle/serverless.yml   |  1 -
 .../templates/aws-csharp/serverless.yml       |  1 -
 .../templates/aws-fsharp/serverless.yml       |  1 -
 .../templates/aws-go-dep/serverless.yml       |  1 -
 .../templates/aws-go-mod/serverless.yml       |  1 -
 .../create/templates/aws-go/serverless.yml    |  1 -
 .../aws-groovy-gradle/serverless.yml          |  1 -
 .../templates/aws-java-gradle/serverless.yml  |  1 -
 .../templates/aws-java-maven/serverless.yml   |  1 -
 .../aws-kotlin-jvm-gradle-kts/serverless.yml  |  1 -
 .../aws-kotlin-jvm-gradle/serverless.yml      |  1 -
 .../aws-kotlin-jvm-maven/serverless.yml       |  1 -
 .../aws-kotlin-nodejs-gradle/serverless.yml   |  1 -
 .../aws-nodejs-docker/serverless.yml          |  1 -
 .../aws-nodejs-ecma-script/serverless.yml     |  1 -
 .../aws-nodejs-typescript/serverless.ts       |  1 -
 .../templates/aws-nodejs/serverless.yml       |  1 -
 .../templates/aws-provided/serverless.yml     |  1 -
 .../aws-python-docker/serverless.yml          |  1 -
 .../templates/aws-python/serverless.yml       |  1 -
 .../templates/aws-python3/serverless.yml      |  1 -
 .../create/templates/aws-ruby/serverless.yml  |  1 -
 .../templates/aws-scala-sbt/serverless.yml    |  1 -
 .../programmatic/apiGateway/serverless.yml    |  1 -
 .../checkForChanges/serverless.yml            |  1 -
 .../curated-plugins-python/serverless.yml     |  1 -
 .../curated-plugins/serverless.yml            |  1 -
 .../programmatic/function/serverless.yml      |  1 -
 .../functionCloudFront/serverless.yml         |  1 -
 .../functionLayers/serverless.yml             |  1 -
 .../programmatic/httpApi/serverless.yml       |  1 -
 .../httpApiCatchAll/serverless.yml            |  1 -
 .../programmatic/httpApiExport/serverless.yml |  1 -
 .../programmatic/invocation/serverless.yml    |  1 -
 .../programmatic/layer/serverless.yml         |  1 -
 .../multiService/serviceA/serverless.yml      |  1 -
 .../packageArtifact/serverless.yml            |  1 -
 .../serverless.yml                            |  1 -
 .../programmatic/packaging/serverless.yml     |  1 -
 .../programmatic/plugin/serverless.yml        |  1 -
 .../requestParameters/serverless.yml          |  1 -
 .../programmatic/requestSchema/serverless.yml |  1 -
 .../fixtures/artifact/serverless.yml          |  1 -
 .../individually-function/serverless.yml      |  1 -
 .../fixtures/individually/serverless.yml      |  1 -
 .../fixtures/regular/serverless.yml           |  1 -
 test/unit/lib/classes/Service.test.js         |  3 --
 .../aws/package/compile/functions.test.js     | 16 ++++---
 54 files changed, 72 insertions(+), 81 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 2c5f930e680..b6dc71c1732 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -38,6 +38,18 @@ Note:
 - The `serverless.yml` setting is ineffective for deprecations reported before the configuration is read.
 - `SLS_DEPRECATION_DISABLE` and `disabledDeprecations` remain respected, and no errors will be thrown for mentioned deprecation codes.
 
+<a name="LAMBDA_HASHING_VERSION_PROPERTY"><div>&nbsp;</div></a>
+
+## Property `provider.lambdaHashingVersion`
+
+Deprecation code: `LAMBDA_HASHING_VERSION_PROPERTY`
+
+Lambda version hashes were improved with a better algorithm (that fixed determinism issues), which is used by default, starting with v3.0.0.
+
+If you previously opted-in to use new algorithm by setting `provider.lambdaHashingVersion` to `20201221`, you can safely remove that property from your configuration to silence the deprecation.
+
+The old `20200924` algorithm is deprecated and it is recommended to migrate to the new version. In order to do that, you can follow the guide in [Functions Docs](./providers/aws/guide/functions.md#lambda-hashing-algorithm-migration).
+
 <a name="AwS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN"><div>&nbsp;</div></a>
 
 ## AWS EventBridge lambda event triggers based on Custom Resources
diff --git a/docs/providers/aws/guide/functions.md b/docs/providers/aws/guide/functions.md
index c220e0d3e96..870236b4a8b 100644
--- a/docs/providers/aws/guide/functions.md
+++ b/docs/providers/aws/guide/functions.md
@@ -665,4 +665,29 @@ functions:
         - securityGroupId1
       subnetIds:
         - subnetId1
+``**
+
+## Lambda Hashing Algorithm migration
+
+**Note** Below migration guide is intended to be used if you are already using `v3` version of the Framework and you have `provider.lambdaHashingVersion` property set to `20200924` in your configuration file. If you are still on v2 and want to upgrade to v3, please refer to [V3 Upgrade docs](../../../guides/upgrading-v3.md#lambda-hashing-algorithm).
+
+In `v3`, Lambda version hashes are generated using an improved algorithm that fixes determinism issues. If you are still using the old hashing algorithm, you can follow the guide below to migrate to new default version.
+
+Please keep in mind that these changes require two deployments with manual configuration adjustment between them. It also creates two additional versions and temporarily overrides descriptions of your functions. Migration will need to be done separately for each of your environments/stages.
+
+1. Run `sls deploy` with additional `--enforce-hash-update` flag: that flag will override the description for Lambda functions, which will force the creation of new versions.
+2. Remove `provider.lambdaHashingVersion` setting from your configuration: your service will now always deploy with the new Lambda version hashes (which is the new default in v3).
+3. Run `sls deploy`, this time without additional `--enforce-hash-update` flag: that will restore the original descriptions on all Lambda functions.
+
+Now your whole service is fully migrated to the new Lambda Hashing Algorithm.
+
+If you do not want to temporarily override descriptions of your functions or would like to avoid creating unnecessary versions of your functions, you might want to use one of the following approaches:
+
+- Ensure that code for all your functions will change during deployment, remove `provider.lambdaHashingVersion` from your configuration, and run `sls deploy`. Due to the fact that all functions have code changed, all your functions will be migrated to new hashing algorithm. Please note that the change can be caused by e.g. upgrading a dependency used by all your functions so you can pair it with regular chores.
+- Add a dummy file that will be included in deployment artifacts for all your functions, remove `provider.lambdaHashingVersion` from your configuration, and run `sls deploy`. Due to the fact that all functions have code changed, all your functions will be migrated to new hashing algorithm.
+- If it is safe in your case (e.g. it's only development sandbox), you can also tear down the whole service by `sls remove`, remove `provider.lambdaHashingVersion` from your configuration, and run `sls deploy`. Newly recreated environment will be using new hashing algorithm.
+
+
+
+
 ```
diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index b587d859b2f..b2eab3602e3 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -14,7 +14,7 @@ const validateTemplate = require('./lib/validateTemplate');
 const updateStack = require('../lib/updateStack');
 const ensureValidBucketExists = require('./lib/ensure-valid-bucket-exists');
 const path = require('path');
-const { style, log, progress, writeText, legacy } = require('@serverless/utils/log');
+const { style, log, progress, writeText } = require('@serverless/utils/log');
 const memoize = require('memoizee');
 
 const mainProgress = progress.get('main');
@@ -209,12 +209,9 @@ class AwsDeploy {
         writeServiceOutputs(this.serverless.servicePluginOutputs);
 
         if (this.options['enforce-hash-update']) {
-          legacy.log(
-            'Your service has been deployed with new hashing algorithm. Please set "provider.lambdaHashingVersion: \'20201221\'" in your service configuration and re-deploy without "--enforce-hash-update" flag to restore function descriptions.'
-          );
           log.notice();
           log.notice(
-            'Your service has been deployed with new hashing algorithm. Please set "provider.lambdaHashingVersion: \'20201221\'" in your service configuration and re-deploy without "--enforce-hash-update" flag to restore function descriptions.'
+            'Your service has been deployed with new hashing algorithm. Please remove "provider.lambdaHashingVersion" from your service configuration and re-deploy without "--enforce-hash-update" flag to restore function descriptions.'
           );
         }
       },
diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index 5cda2c6f452..dbda0bcb4fe 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -33,21 +33,23 @@ class AwsCompileFunctions {
     this.hooks = {
       'initialize': () => {
         if (
-          !this.serverless.service.provider.lambdaHashingVersion &&
-          !this.options['enforce-hash-update'] &&
-          Object.keys(this.serverless.service.functions).length &&
-          Object.values(this.serverless.service.functions).some(({ handler }) => handler) &&
-          (this.serverless.service.provider.versionFunctions ||
-            Object.values(this.serverless.service.functions).some(
-              ({ versionFunction }) => versionFunction
-            ))
+          this.serverless.service.provider.lambdaHashingVersion === '20200924' &&
+          !this.options['enforce-hash-update']
         ) {
           this.serverless._logDeprecation(
-            'LAMBDA_HASHING_VERSION_V2',
-            'Resolution of lambda version hashes was improved with better algorithm, ' +
-              'which will be used in next major release.\n' +
-              'Switch to it now by setting "provider.lambdaHashingVersion" to "20201221".\n' +
-              'While it is highly encouraged to upgrade to new algorithm, you can still use the old approach by setting "provider.lambdaHashingVersion" to "20200924".'
+            'LAMBDA_HASHING_VERSION_PROPERTY',
+            'Resolution of lambda version hashes with the "20200924" algorithm is deprecated.' +
+              ' It is highly recommend to migrate to new default algorithm. Please see' +
+              ' the deprecation documentation for more details about the migration process.'
+          );
+        }
+
+        if (this.serverless.service.provider.lambdaHashingVersion === '20201221') {
+          this.serverless._logDeprecation(
+            'LAMBDA_HASHING_VERSION_PROPERTY',
+            'Setting "20201221" for "provider.lambdaHashingVersion" is no longer effective as' +
+              ' new hashing algorithm is now used by default. You can safely remove this' +
+              ' property from your configuration.'
           );
         }
       },
@@ -120,11 +122,11 @@ class AwsCompileFunctions {
 
   async addFileToHash(filePath, hash) {
     const lambdaHashingVersion = this.serverless.service.provider.lambdaHashingVersion;
-    if (lambdaHashingVersion >= 20201221 || this.options['enforce-hash-update']) {
+    if (lambdaHashingVersion < 20201221 && !this.options['enforce-hash-update']) {
+      await addFileContentsToHashes(filePath, [hash]);
+    } else {
       const filePathHash = await getHashForFilePath(filePath);
       hash.write(filePathHash);
-    } else {
-      await addFileContentsToHashes(filePath, [hash]);
     }
   }
 
@@ -477,10 +479,7 @@ class AwsCompileFunctions {
       delete functionProperties.Tags;
 
       const lambdaHashingVersion = this.serverless.service.provider.lambdaHashingVersion;
-      if (lambdaHashingVersion >= 20201221 || enforceHashUpdate) {
-        functionProperties.layerConfigurations = layerConfigurations;
-        versionHash.write(JSON.stringify(deepSortObjectByKey(functionProperties)));
-      } else {
+      if (lambdaHashingVersion < 20201221 && !this.options['enforce-hash-update']) {
         // sort the layer configurations for hash consistency
         const sortedLayerConfigurations = {};
         const byKey = ([key1], [key2]) => key1.localeCompare(key2);
@@ -495,6 +494,9 @@ class AwsCompileFunctions {
         );
 
         versionHash.write(JSON.stringify(sortedFunctionProperties));
+      } else {
+        functionProperties.layerConfigurations = layerConfigurations;
+        versionHash.write(JSON.stringify(deepSortObjectByKey(functionProperties)));
       }
 
       versionHash.end();
diff --git a/lib/plugins/create/templates/aws-alexa-typescript/serverless.yml b/lib/plugins/create/templates/aws-alexa-typescript/serverless.yml
index 9a442bac172..f374b0e9374 100644
--- a/lib/plugins/create/templates/aws-alexa-typescript/serverless.yml
+++ b/lib/plugins/create/templates/aws-alexa-typescript/serverless.yml
@@ -13,7 +13,6 @@ plugins:
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 custom:
   alexa:
diff --git a/lib/plugins/create/templates/aws-clojure-gradle/serverless.yml b/lib/plugins/create/templates/aws-clojure-gradle/serverless.yml
index 3e1d0072546..35be126645b 100644
--- a/lib/plugins/create/templates/aws-clojure-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-clojure-gradle/serverless.yml
@@ -27,7 +27,6 @@ provider:
   timeout: 300
   memorySize: 1536
   logRetentionInDays: 30
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
diff --git a/lib/plugins/create/templates/aws-clojurescript-gradle/serverless.yml b/lib/plugins/create/templates/aws-clojurescript-gradle/serverless.yml
index d0dd74cd068..2f8d059037d 100644
--- a/lib/plugins/create/templates/aws-clojurescript-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-clojurescript-gradle/serverless.yml
@@ -23,7 +23,6 @@ frameworkVersion: '3'
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
diff --git a/lib/plugins/create/templates/aws-csharp/serverless.yml b/lib/plugins/create/templates/aws-csharp/serverless.yml
index 1db8f795790..3eeec6bff50 100644
--- a/lib/plugins/create/templates/aws-csharp/serverless.yml
+++ b/lib/plugins/create/templates/aws-csharp/serverless.yml
@@ -23,7 +23,6 @@ frameworkVersion: '3'
 provider:
   name: aws
   runtime: dotnetcore3.1
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
diff --git a/lib/plugins/create/templates/aws-fsharp/serverless.yml b/lib/plugins/create/templates/aws-fsharp/serverless.yml
index 2d38ca1dbee..2e946dc400f 100644
--- a/lib/plugins/create/templates/aws-fsharp/serverless.yml
+++ b/lib/plugins/create/templates/aws-fsharp/serverless.yml
@@ -23,7 +23,6 @@ frameworkVersion: '3'
 provider:
   name: aws
   runtime: dotnetcore3.1
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
diff --git a/lib/plugins/create/templates/aws-go-dep/serverless.yml b/lib/plugins/create/templates/aws-go-dep/serverless.yml
index 3c6d7b3a62b..154b5293848 100644
--- a/lib/plugins/create/templates/aws-go-dep/serverless.yml
+++ b/lib/plugins/create/templates/aws-go-dep/serverless.yml
@@ -23,7 +23,6 @@ frameworkVersion: '3'
 provider:
   name: aws
   runtime: go1.x
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
diff --git a/lib/plugins/create/templates/aws-go-mod/serverless.yml b/lib/plugins/create/templates/aws-go-mod/serverless.yml
index 1cb94c913e6..da2d0d82b8b 100644
--- a/lib/plugins/create/templates/aws-go-mod/serverless.yml
+++ b/lib/plugins/create/templates/aws-go-mod/serverless.yml
@@ -23,7 +23,6 @@ frameworkVersion: '3'
 provider:
   name: aws
   runtime: go1.x
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
diff --git a/lib/plugins/create/templates/aws-go/serverless.yml b/lib/plugins/create/templates/aws-go/serverless.yml
index 9b3afdcc5ca..5ca39c85e9e 100644
--- a/lib/plugins/create/templates/aws-go/serverless.yml
+++ b/lib/plugins/create/templates/aws-go/serverless.yml
@@ -23,7 +23,6 @@ frameworkVersion: '3'
 provider:
   name: aws
   runtime: go1.x
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
diff --git a/lib/plugins/create/templates/aws-groovy-gradle/serverless.yml b/lib/plugins/create/templates/aws-groovy-gradle/serverless.yml
index 9b8dc4f2644..8693ab18396 100644
--- a/lib/plugins/create/templates/aws-groovy-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-groovy-gradle/serverless.yml
@@ -23,7 +23,6 @@ frameworkVersion: '3'
 provider:
   name: aws
   runtime: java8
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
diff --git a/lib/plugins/create/templates/aws-java-gradle/serverless.yml b/lib/plugins/create/templates/aws-java-gradle/serverless.yml
index d464a74324c..c1183c8ea26 100644
--- a/lib/plugins/create/templates/aws-java-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-java-gradle/serverless.yml
@@ -23,7 +23,6 @@ frameworkVersion: '3'
 provider:
   name: aws
   runtime: java8
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
diff --git a/lib/plugins/create/templates/aws-java-maven/serverless.yml b/lib/plugins/create/templates/aws-java-maven/serverless.yml
index d1d683687e9..5878ea50ff7 100644
--- a/lib/plugins/create/templates/aws-java-maven/serverless.yml
+++ b/lib/plugins/create/templates/aws-java-maven/serverless.yml
@@ -23,7 +23,6 @@ frameworkVersion: '3'
 provider:
   name: aws
   runtime: java8
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/serverless.yml b/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/serverless.yml
index b9faff756b8..39316daa66b 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/serverless.yml
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/serverless.yml
@@ -23,7 +23,6 @@ frameworkVersion: '3'
 provider:
   name: aws
   runtime: java8
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-gradle/serverless.yml b/lib/plugins/create/templates/aws-kotlin-jvm-gradle/serverless.yml
index e63a3abb667..7f357662082 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-gradle/serverless.yml
@@ -23,7 +23,6 @@ frameworkVersion: '3'
 provider:
   name: aws
   runtime: java11
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-maven/serverless.yml b/lib/plugins/create/templates/aws-kotlin-jvm-maven/serverless.yml
index d4508df9a34..b25ed8bf613 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-maven/serverless.yml
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-maven/serverless.yml
@@ -23,7 +23,6 @@ frameworkVersion: '3'
 provider:
   name: aws
   runtime: java8
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
diff --git a/lib/plugins/create/templates/aws-kotlin-nodejs-gradle/serverless.yml b/lib/plugins/create/templates/aws-kotlin-nodejs-gradle/serverless.yml
index ff67ec5bc30..67787db0a70 100644
--- a/lib/plugins/create/templates/aws-kotlin-nodejs-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-kotlin-nodejs-gradle/serverless.yml
@@ -23,7 +23,6 @@ frameworkVersion: '3'
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
diff --git a/lib/plugins/create/templates/aws-nodejs-docker/serverless.yml b/lib/plugins/create/templates/aws-nodejs-docker/serverless.yml
index fe199f6d009..5f57c8c7ba7 100644
--- a/lib/plugins/create/templates/aws-nodejs-docker/serverless.yml
+++ b/lib/plugins/create/templates/aws-nodejs-docker/serverless.yml
@@ -22,7 +22,6 @@ frameworkVersion: '3'
 
 provider:
   name: aws
-  lambdaHashingVersion: 20201221
   ecr:
     # In this section you can define images that will be built locally and uploaded to ECR
     images:
diff --git a/lib/plugins/create/templates/aws-nodejs-ecma-script/serverless.yml b/lib/plugins/create/templates/aws-nodejs-ecma-script/serverless.yml
index 54867b4717f..aec574d84e3 100644
--- a/lib/plugins/create/templates/aws-nodejs-ecma-script/serverless.yml
+++ b/lib/plugins/create/templates/aws-nodejs-ecma-script/serverless.yml
@@ -12,7 +12,6 @@ plugins:
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 functions:
   first:
diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts
index 85c0b280165..07bea3c0f67 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts
@@ -17,7 +17,6 @@ const serverlessConfiguration: AWS = {
       AWS_NODEJS_CONNECTION_REUSE_ENABLED: '1',
       NODE_OPTIONS: '--enable-source-maps --stack-trace-limit=1000',
     },
-    lambdaHashingVersion: '20201221',
   },
   // import the function via paths
   functions: { hello },
diff --git a/lib/plugins/create/templates/aws-nodejs/serverless.yml b/lib/plugins/create/templates/aws-nodejs/serverless.yml
index a16c53d2381..984423a12e3 100644
--- a/lib/plugins/create/templates/aws-nodejs/serverless.yml
+++ b/lib/plugins/create/templates/aws-nodejs/serverless.yml
@@ -23,7 +23,6 @@ frameworkVersion: '3'
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
diff --git a/lib/plugins/create/templates/aws-provided/serverless.yml b/lib/plugins/create/templates/aws-provided/serverless.yml
index ec70363d375..a90016897af 100644
--- a/lib/plugins/create/templates/aws-provided/serverless.yml
+++ b/lib/plugins/create/templates/aws-provided/serverless.yml
@@ -23,7 +23,6 @@ frameworkVersion: '3'
 provider:
   name: aws
   runtime: provided
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
diff --git a/lib/plugins/create/templates/aws-python-docker/serverless.yml b/lib/plugins/create/templates/aws-python-docker/serverless.yml
index 42ccb1ed3a3..d58f5e7a451 100644
--- a/lib/plugins/create/templates/aws-python-docker/serverless.yml
+++ b/lib/plugins/create/templates/aws-python-docker/serverless.yml
@@ -22,7 +22,6 @@ frameworkVersion: '3'
 
 provider:
   name: aws
-  lambdaHashingVersion: 20201221
   ecr:
     # In this section you can define images that will be built locally and uploaded to ECR
     images:
diff --git a/lib/plugins/create/templates/aws-python/serverless.yml b/lib/plugins/create/templates/aws-python/serverless.yml
index f9145e9cc6e..2ae4d3e81bb 100644
--- a/lib/plugins/create/templates/aws-python/serverless.yml
+++ b/lib/plugins/create/templates/aws-python/serverless.yml
@@ -23,7 +23,6 @@ frameworkVersion: '3'
 provider:
   name: aws
   runtime: python2.7
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
diff --git a/lib/plugins/create/templates/aws-python3/serverless.yml b/lib/plugins/create/templates/aws-python3/serverless.yml
index 95f6e337dd1..3d517792839 100644
--- a/lib/plugins/create/templates/aws-python3/serverless.yml
+++ b/lib/plugins/create/templates/aws-python3/serverless.yml
@@ -23,7 +23,6 @@ frameworkVersion: '3'
 provider:
   name: aws
   runtime: python3.8
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
diff --git a/lib/plugins/create/templates/aws-ruby/serverless.yml b/lib/plugins/create/templates/aws-ruby/serverless.yml
index 3347eb5f21f..cad58cbc693 100644
--- a/lib/plugins/create/templates/aws-ruby/serverless.yml
+++ b/lib/plugins/create/templates/aws-ruby/serverless.yml
@@ -23,7 +23,6 @@ frameworkVersion: '3'
 provider:
   name: aws
   runtime: ruby2.7
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
diff --git a/lib/plugins/create/templates/aws-scala-sbt/serverless.yml b/lib/plugins/create/templates/aws-scala-sbt/serverless.yml
index b52b3e7411d..82baf5a44a0 100644
--- a/lib/plugins/create/templates/aws-scala-sbt/serverless.yml
+++ b/lib/plugins/create/templates/aws-scala-sbt/serverless.yml
@@ -23,7 +23,6 @@ frameworkVersion: '3'
 provider:
   name: aws
   runtime: java8
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
diff --git a/test/fixtures/programmatic/apiGateway/serverless.yml b/test/fixtures/programmatic/apiGateway/serverless.yml
index e0d9dc301b7..3af9f6033cd 100644
--- a/test/fixtures/programmatic/apiGateway/serverless.yml
+++ b/test/fixtures/programmatic/apiGateway/serverless.yml
@@ -5,7 +5,6 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  lambdaHashingVersion: 20201221
   runtime: nodejs12.x
   apiGateway:
     shouldStartNameWithService: true
diff --git a/test/fixtures/programmatic/checkForChanges/serverless.yml b/test/fixtures/programmatic/checkForChanges/serverless.yml
index 4a86560d160..db9e2271e89 100644
--- a/test/fixtures/programmatic/checkForChanges/serverless.yml
+++ b/test/fixtures/programmatic/checkForChanges/serverless.yml
@@ -6,7 +6,6 @@ frameworkVersion: '*'
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 functions:
   fn1:
diff --git a/test/fixtures/programmatic/curated-plugins-python/serverless.yml b/test/fixtures/programmatic/curated-plugins-python/serverless.yml
index 301d0863baf..29c044bb37f 100644
--- a/test/fixtures/programmatic/curated-plugins-python/serverless.yml
+++ b/test/fixtures/programmatic/curated-plugins-python/serverless.yml
@@ -6,7 +6,6 @@ frameworkVersion: '*'
 provider:
   name: aws
   runtime: python3.8
-  lambdaHashingVersion: 20201221
 
 functions:
   function:
diff --git a/test/fixtures/programmatic/curated-plugins/serverless.yml b/test/fixtures/programmatic/curated-plugins/serverless.yml
index 4b659dd18dc..f93463dc0a2 100644
--- a/test/fixtures/programmatic/curated-plugins/serverless.yml
+++ b/test/fixtures/programmatic/curated-plugins/serverless.yml
@@ -11,7 +11,6 @@ custom:
 provider:
   name: aws
   runtime: nodejs14.x
-  lambdaHashingVersion: 20201221
 
 functions:
   function:
diff --git a/test/fixtures/programmatic/function/serverless.yml b/test/fixtures/programmatic/function/serverless.yml
index 245e088e9d2..8225e60810a 100644
--- a/test/fixtures/programmatic/function/serverless.yml
+++ b/test/fixtures/programmatic/function/serverless.yml
@@ -5,7 +5,6 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  lambdaHashingVersion: 20201221
 
 functions:
   basic:
diff --git a/test/fixtures/programmatic/functionCloudFront/serverless.yml b/test/fixtures/programmatic/functionCloudFront/serverless.yml
index 3bbf8c5146f..e39c570bb22 100644
--- a/test/fixtures/programmatic/functionCloudFront/serverless.yml
+++ b/test/fixtures/programmatic/functionCloudFront/serverless.yml
@@ -6,7 +6,6 @@ frameworkVersion: '*'
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 functions:
   foo:
diff --git a/test/fixtures/programmatic/functionLayers/serverless.yml b/test/fixtures/programmatic/functionLayers/serverless.yml
index 45323a22442..17cadeee56f 100644
--- a/test/fixtures/programmatic/functionLayers/serverless.yml
+++ b/test/fixtures/programmatic/functionLayers/serverless.yml
@@ -2,7 +2,6 @@ service: service
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 layers:
   testLayer:
diff --git a/test/fixtures/programmatic/httpApi/serverless.yml b/test/fixtures/programmatic/httpApi/serverless.yml
index 686b5acb850..22bd5f88166 100644
--- a/test/fixtures/programmatic/httpApi/serverless.yml
+++ b/test/fixtures/programmatic/httpApi/serverless.yml
@@ -7,7 +7,6 @@ provider:
   name: aws
   runtime: nodejs12.x
   logRetentionInDays: 14
-  lambdaHashingVersion: 20201221
 
 functions:
   foo:
diff --git a/test/fixtures/programmatic/httpApiCatchAll/serverless.yml b/test/fixtures/programmatic/httpApiCatchAll/serverless.yml
index 7fdad70e4ac..5e85f556cad 100644
--- a/test/fixtures/programmatic/httpApiCatchAll/serverless.yml
+++ b/test/fixtures/programmatic/httpApiCatchAll/serverless.yml
@@ -6,7 +6,6 @@ frameworkVersion: '*'
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 functions:
   foo:
diff --git a/test/fixtures/programmatic/httpApiExport/serverless.yml b/test/fixtures/programmatic/httpApiExport/serverless.yml
index 7e46297bfc7..23360190fd1 100644
--- a/test/fixtures/programmatic/httpApiExport/serverless.yml
+++ b/test/fixtures/programmatic/httpApiExport/serverless.yml
@@ -6,7 +6,6 @@ frameworkVersion: '*'
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 resources:
   Resources:
diff --git a/test/fixtures/programmatic/invocation/serverless.yml b/test/fixtures/programmatic/invocation/serverless.yml
index b1a342fdbe6..e1657f10240 100644
--- a/test/fixtures/programmatic/invocation/serverless.yml
+++ b/test/fixtures/programmatic/invocation/serverless.yml
@@ -6,7 +6,6 @@ frameworkVersion: '*'
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 functions:
   callback:
diff --git a/test/fixtures/programmatic/layer/serverless.yml b/test/fixtures/programmatic/layer/serverless.yml
index 2980a939776..ce3c9a46348 100644
--- a/test/fixtures/programmatic/layer/serverless.yml
+++ b/test/fixtures/programmatic/layer/serverless.yml
@@ -6,7 +6,6 @@ frameworkVersion: '*'
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 functions:
   function:
diff --git a/test/fixtures/programmatic/multiService/serviceA/serverless.yml b/test/fixtures/programmatic/multiService/serviceA/serverless.yml
index 41d4892a2aa..df2d1797e9e 100644
--- a/test/fixtures/programmatic/multiService/serviceA/serverless.yml
+++ b/test/fixtures/programmatic/multiService/serviceA/serverless.yml
@@ -6,7 +6,6 @@ frameworkVersion: '*'
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 custom:
   env: ${env:ENV_SOURCE_TEST, null}
diff --git a/test/fixtures/programmatic/packageArtifact/serverless.yml b/test/fixtures/programmatic/packageArtifact/serverless.yml
index 3c11b9f9032..07a5bfb4a32 100644
--- a/test/fixtures/programmatic/packageArtifact/serverless.yml
+++ b/test/fixtures/programmatic/packageArtifact/serverless.yml
@@ -6,7 +6,6 @@ frameworkVersion: '*'
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 package:
   artifact: artifact.zip
diff --git a/test/fixtures/programmatic/packageArtifactInServerlessDir/serverless.yml b/test/fixtures/programmatic/packageArtifactInServerlessDir/serverless.yml
index 400dfbf323e..e953856575b 100644
--- a/test/fixtures/programmatic/packageArtifactInServerlessDir/serverless.yml
+++ b/test/fixtures/programmatic/packageArtifactInServerlessDir/serverless.yml
@@ -6,7 +6,6 @@ frameworkVersion: '*'
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 plugins:
   # Mutates `package.artifact` to point to copied `.serverless/NAME.zip`
diff --git a/test/fixtures/programmatic/packaging/serverless.yml b/test/fixtures/programmatic/packaging/serverless.yml
index 3eca74e636f..34320d253a3 100644
--- a/test/fixtures/programmatic/packaging/serverless.yml
+++ b/test/fixtures/programmatic/packaging/serverless.yml
@@ -7,7 +7,6 @@ disabledDeprecations: LOAD_VARIABLES_FROM_ENV_FILES
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 functions:
   fnService:
diff --git a/test/fixtures/programmatic/plugin/serverless.yml b/test/fixtures/programmatic/plugin/serverless.yml
index b5954d13f16..e36e6d08362 100644
--- a/test/fixtures/programmatic/plugin/serverless.yml
+++ b/test/fixtures/programmatic/plugin/serverless.yml
@@ -6,7 +6,6 @@ frameworkVersion: '*'
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 plugins:
   - ./plugin
diff --git a/test/fixtures/programmatic/requestParameters/serverless.yml b/test/fixtures/programmatic/requestParameters/serverless.yml
index 642dec642cb..cebec66e7e2 100644
--- a/test/fixtures/programmatic/requestParameters/serverless.yml
+++ b/test/fixtures/programmatic/requestParameters/serverless.yml
@@ -3,7 +3,6 @@ service: service
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 functions:
   target:
diff --git a/test/fixtures/programmatic/requestSchema/serverless.yml b/test/fixtures/programmatic/requestSchema/serverless.yml
index 252fa5881cf..b405608da1c 100644
--- a/test/fixtures/programmatic/requestSchema/serverless.yml
+++ b/test/fixtures/programmatic/requestSchema/serverless.yml
@@ -3,7 +3,6 @@ service: service
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
   apiGateway:
     request:
       schemas:
diff --git a/test/integrationPackage/fixtures/artifact/serverless.yml b/test/integrationPackage/fixtures/artifact/serverless.yml
index afdb2ec60a0..57c66f926e8 100644
--- a/test/integrationPackage/fixtures/artifact/serverless.yml
+++ b/test/integrationPackage/fixtures/artifact/serverless.yml
@@ -5,7 +5,6 @@ configValidationMode: error
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 functions:
   hello:
diff --git a/test/integrationPackage/fixtures/individually-function/serverless.yml b/test/integrationPackage/fixtures/individually-function/serverless.yml
index 864c0e5e92e..a32f27072a3 100644
--- a/test/integrationPackage/fixtures/individually-function/serverless.yml
+++ b/test/integrationPackage/fixtures/individually-function/serverless.yml
@@ -5,7 +5,6 @@ configValidationMode: error
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 functions:
   hello:
diff --git a/test/integrationPackage/fixtures/individually/serverless.yml b/test/integrationPackage/fixtures/individually/serverless.yml
index 0d50543bad9..70a1c6e4c7e 100644
--- a/test/integrationPackage/fixtures/individually/serverless.yml
+++ b/test/integrationPackage/fixtures/individually/serverless.yml
@@ -5,7 +5,6 @@ configValidationMode: error
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 package:
   individually: true
diff --git a/test/integrationPackage/fixtures/regular/serverless.yml b/test/integrationPackage/fixtures/regular/serverless.yml
index 8e99372996b..8208d3a5829 100644
--- a/test/integrationPackage/fixtures/regular/serverless.yml
+++ b/test/integrationPackage/fixtures/regular/serverless.yml
@@ -5,7 +5,6 @@ configValidationMode: error
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 functions:
   hello:
diff --git a/test/unit/lib/classes/Service.test.js b/test/unit/lib/classes/Service.test.js
index 1d12776ec4b..72079479f0c 100644
--- a/test/unit/lib/classes/Service.test.js
+++ b/test/unit/lib/classes/Service.test.js
@@ -91,9 +91,6 @@ describe('Service', () => {
       runServerless({
         fixture: 'aws',
         configExt: {
-          provider: {
-            lambdaHashingVersion: 20201221,
-          },
           functions: [
             {
               a: {},
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index 3923eb9a04d..bc8423e95ec 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -1533,7 +1533,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
   });
 
   describe('`provider.lambdaHashingVersion` support', () => {
-    it('CodeSha256 for functions should be the same for default hashing and for 20201221 version', async () => {
+    it('CodeSha256 for functions should be the same for default hashing and for 20200924 version', async () => {
       const { servicePath: serviceDir, updateConfig } = await fixtures.setup('function', {
         configExt: {
           provider: {
@@ -1556,8 +1556,9 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       ).Properties;
 
       await updateConfig({
+        disabledDeprecations: ['LAMBDA_HASHING_VERSION_PROPERTY'],
         provider: {
-          lambdaHashingVersion: '20201221',
+          lambdaHashingVersion: '20200924',
         },
       });
       const { cfTemplate: updatedTemplate } = await runServerless({
@@ -2039,7 +2040,12 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
 
   describe('Version hash resolution', () => {
     const testLambdaHashingVersion = (lambdaHashingVersion) => {
-      const configExt = lambdaHashingVersion ? { provider: { lambdaHashingVersion } } : {};
+      const configExt = lambdaHashingVersion
+        ? {
+            provider: { lambdaHashingVersion },
+            disabledDeprecations: ['LAMBDA_HASHING_VERSION_PROPERTY'],
+          }
+        : {};
 
       it.skip('TODO: should create a different version if configuration changed', () => {
         // Replacement for
@@ -2273,8 +2279,8 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       testLambdaHashingVersion();
     });
 
-    describe('lambdaHashingVersion: 20201221', () => {
-      testLambdaHashingVersion('20201221');
+    describe('lambdaHashingVersion: 20200924', () => {
+      testLambdaHashingVersion('20200924');
     });
 
     describe('lambdaHashingVersion migration', () => {

From a6461351189b541dabbac1cf1595ba7d362e9ce1 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 8 Dec 2021 14:45:12 +0100
Subject: [PATCH 0872/1101] feat(CLI): Support `serverless-tencent` CLI

---
 bin/serverless.js                             |   8 +
 lib/cli/render-version.js                     |  37 ++++-
 lib/cli/run-serverless-tencent.js             | 149 ++++++++++++++++++
 lib/cli/triage.js                             |  50 +++---
 .../js/template/foo/instance/serverless.js    |   0
 .../js/template/foo/serverless.js             |   0
 .../json/component/serverless.component.json  |   0
 .../json/instance/serverless.json             |   0
 .../json/template/foo/serverless.json         |   0
 .../yml/component/serverless.component.yaml   |   0
 .../yml/instance/serverless.yml               |   0
 .../foo/serverless.yml                        |   0
 .../template-with-root-config/serverless.yml  |   0
 .../yml/template/foo/serverless.yml           |   0
 test/unit/lib/cli/triage/index.test.js        |  66 +++-----
 15 files changed, 240 insertions(+), 70 deletions(-)
 create mode 100644 lib/cli/run-serverless-tencent.js
 rename test/unit/lib/cli/triage/fixtures/{@serverless/components => platform}/js/template/foo/instance/serverless.js (100%)
 rename test/unit/lib/cli/triage/fixtures/{@serverless/components => platform}/js/template/foo/serverless.js (100%)
 rename test/unit/lib/cli/triage/fixtures/{@serverless/components => platform}/json/component/serverless.component.json (100%)
 rename test/unit/lib/cli/triage/fixtures/{@serverless/components => platform}/json/instance/serverless.json (100%)
 rename test/unit/lib/cli/triage/fixtures/{@serverless/components => platform}/json/template/foo/serverless.json (100%)
 rename test/unit/lib/cli/triage/fixtures/{@serverless/components => platform}/yml/component/serverless.component.yaml (100%)
 rename test/unit/lib/cli/triage/fixtures/{@serverless/components => platform}/yml/instance/serverless.yml (100%)
 rename test/unit/lib/cli/triage/fixtures/{@serverless/components => platform}/yml/template-with-root-config/foo/serverless.yml (100%)
 rename test/unit/lib/cli/triage/fixtures/{@serverless/components => platform}/yml/template-with-root-config/serverless.yml (100%)
 rename test/unit/lib/cli/triage/fixtures/{@serverless/components => platform}/yml/template/foo/serverless.yml (100%)

diff --git a/bin/serverless.js b/bin/serverless.js
index 0c3799cea97..8aeedd41567 100755
--- a/bin/serverless.js
+++ b/bin/serverless.js
@@ -35,6 +35,14 @@ require('../lib/cli/triage')().then((cliName) => {
     case 'serverless':
       require('../scripts/serverless');
       return;
+    case 'serverless-tencent':
+      require('../lib/cli/run-serverless-tencent')().catch((error) => {
+        // Expose eventual resolution error as regular crash, and not unhandled rejection
+        process.nextTick(() => {
+          throw error;
+        });
+      });
+      return;
     case '@serverless/components':
       require('@serverless/components').runComponents();
       return;
diff --git a/lib/cli/render-version.js b/lib/cli/render-version.js
index e070e83a9d6..f75fbb342d9 100644
--- a/lib/cli/render-version.js
+++ b/lib/cli/render-version.js
@@ -1,7 +1,9 @@
 'use strict';
 
 const path = require('path');
+const os = require('os');
 const { version } = require('../../package');
+const spawn = require('child-process-ext/spawn');
 const { version: dashboardPluginVersion } = require('@serverless/dashboard-plugin/package');
 const { version: componentsVersion } = require('@serverless/components/package');
 const { platformClientVersion } = require('@serverless/dashboard-plugin');
@@ -13,6 +15,26 @@ const ServerlessError = require('../serverless-error');
 
 const serverlessPath = path.resolve(__dirname, '../..');
 
+const resolveTencentCliVersion = async () => {
+  try {
+    return String(
+      (
+        await spawn(
+          path.resolve(
+            os.homedir(),
+            `.serverless-tencent/bin/serverless-tencent${
+              process.platform === 'win32' ? '.exe' : ''
+            }`
+          ),
+          ['--version', '--plain']
+        )
+      ).stdoutBuffer
+    ).trim();
+  } catch (error) {
+    return null;
+  }
+};
+
 module.exports = async () => {
   const localServerlessPath = resolveLocalServerlessPath();
 
@@ -54,16 +76,21 @@ module.exports = async () => {
     return '';
   })();
 
+  const tencentCliVersion = await resolveTencentCliVersion();
   legacy.write(
-    `Framework Core: ${version}${installationModePostfix}\n` +
+    `${
+      `Framework Core: ${version}${installationModePostfix}\n` +
       `Plugin: ${dashboardPluginVersion}\n` +
-      `SDK: ${platformClientVersion}\n` +
-      `Components: ${componentsVersion}\n`
+      `SDK: ${platformClientVersion}\n`
+    }${
+      tencentCliVersion ? `Tencent CLI: ${tencentCliVersion}\n` : ''
+    }Components: ${componentsVersion}\n`
   );
   writeText(
     `Framework Core: ${version}${installationModePostfix}`,
     `Plugin: ${dashboardPluginVersion}`,
-    `SDK: ${platformClientVersion}`,
-    `Components: ${componentsVersion}`
+    `SDK: ${platformClientVersion}\n${
+      tencentCliVersion ? `Tencent CLI: ${tencentCliVersion}\n` : ''
+    }Components: ${componentsVersion}`
   );
 };
diff --git a/lib/cli/run-serverless-tencent.js b/lib/cli/run-serverless-tencent.js
new file mode 100644
index 00000000000..ab7f0b91578
--- /dev/null
+++ b/lib/cli/run-serverless-tencent.js
@@ -0,0 +1,149 @@
+'use strict';
+
+const { createRequire } = require('module');
+const os = require('os');
+const path = require('path');
+const fsp = require('fs').promises;
+const childProcess = require('child_process');
+const spawn = require('child-process-ext/spawn');
+
+const relativeBinPath = 'serverless-tencent/bin/serverless-tencent';
+const standaloneFilename = path.resolve(
+  os.homedir(),
+  `.serverless-tencent/bin/serverless-tencent${process.platform === 'win32' ? '.exe' : ''}`
+);
+const standaloneServerUrl = 'https://slt-binary-sv-1300963013.cos.accelerate.myqcloud.com';
+
+const resolveAbsoluteModulePath = (contextDirname, modulePath) => {
+  try {
+    return createRequire(path.resolve(contextDirname, 'require-resolver')).resolve(modulePath);
+  } catch {
+    return null;
+  }
+};
+
+const resolveGlobalNpmPath = async () => {
+  const npmNodeModulesPath = await (async () => {
+    try {
+      return String((await spawn('npm', ['root', '-g'])).stdoutBuffer).trim();
+    } catch (error) {
+      return null;
+    }
+  })();
+
+  if (!npmNodeModulesPath) return null;
+  try {
+    return require.resolve(`${npmNodeModulesPath}/${relativeBinPath}`);
+  } catch (globalDepError) {
+    return null;
+  }
+};
+
+const isStandaloneInstalled = async () => {
+  try {
+    await fsp.access(standaloneFilename);
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+const resolvePlatform = () => {
+  switch (process.platform) {
+    case 'darwin':
+      return 'macos';
+    case 'win32':
+      return 'win';
+    default:
+      return process.platform;
+  }
+};
+const resolveArch = () => {
+  switch (process.arch) {
+    case 'x32':
+      return 'x86';
+    case 'arm':
+    case 'arm64':
+      return 'armv6';
+    default:
+      return process.arch;
+  }
+};
+
+const resolveExtname = () => {
+  return process.platform === 'win32' ? '.exe' : '';
+};
+
+module.exports = async () => {
+  // 1. If installed locally in service node_modules, run it
+  const localNpmPath = resolveAbsoluteModulePath(process.cwd(), relativeBinPath);
+  if (localNpmPath) {
+    require(localNpmPath);
+    return;
+  }
+
+  // 2. If installed as npm global installation, run it
+  const globalNpmPath = await resolveGlobalNpmPath();
+  if (globalNpmPath) {
+    require(globalNpmPath);
+    return;
+  }
+
+  // 3. Fallback to standalone executable
+  if (!(await isStandaloneInstalled())) {
+    // 3.1 Auto install if not installed
+    const getCliProgressFooter = require('cli-progress-footer');
+    const cliProgressFooter = getCliProgressFooter();
+    cliProgressFooter.shouldAddProgressAnimationPrefix = true;
+    cliProgressFooter.progressAnimationPrefixFrames =
+      cliProgressFooter.progressAnimationPrefixFrames.map((frame) => `\x1b[93m${frame}\x1b[39m`);
+
+    // EN: Installing Tencent Serverless CLI...
+    cliProgressFooter.updateProgress('正在安装 Tencent Serverless CLI');
+
+    try {
+      const stream = require('stream');
+      const { promisify } = require('util');
+      const fs = require('fs');
+      const fse = require('fs-extra');
+      const got = require('got');
+      const safeMoveFile = require('../utils/fs/safeMoveFile');
+
+      const pipeline = promisify(stream.pipeline);
+
+      const latestTag = (await got(`${standaloneServerUrl}/latest-tag`)).body;
+      const standaloneTmpPath = path.resolve(os.tmpdir(), 'serverless-tencent-binary-tmp');
+
+      try {
+        await pipeline(
+          got.stream(
+            `${standaloneServerUrl}/${latestTag}/serverless-tencent-${resolvePlatform()}-${resolveArch()}${resolveExtname()}`
+          ),
+          fs.createWriteStream(standaloneTmpPath)
+        );
+      } catch (error) {
+        if (error.response && error.response.statusCode === 404) {
+          process.stdout.write(
+            `${[
+              '',
+              // EN: Unable to install Tencent Serverless CLI automatically.
+              '无法自动安装 Tencent Serverless CLI.',
+              // EN: Please use "npm install -g serverless-tencent" to complete the manual
+              //     installation and re-execute this command
+              '请使用 "npm install -g serverless-tencent" 完成手动安装，并重新执行此命令',
+            ].join('\n')}\n`
+          );
+          return;
+        }
+        throw error;
+      }
+      await fse.ensureDir(path.dirname(standaloneFilename));
+      await safeMoveFile(standaloneTmpPath, standaloneFilename);
+      await fsp.chmod(standaloneFilename, 0o755);
+    } finally {
+      cliProgressFooter.updateProgress();
+    }
+  }
+
+  childProcess.spawn(standaloneFilename, process.argv.slice(2), { stdio: 'inherit' });
+};
diff --git a/lib/cli/triage.js b/lib/cli/triage.js
index 17737e72df4..a72712e2004 100644
--- a/lib/cli/triage.js
+++ b/lib/cli/triage.js
@@ -7,14 +7,29 @@ module.exports = async () => {
   if (cliArgs.has('--version')) return 'serverless';
   if (cliArgs.has('-v')) return 'serverless';
 
-  // Unconditionally favor "@serverless/components" when component specific command or flag
-  const componentsCommands = new Set(['registry', 'init', 'publish']);
-  if (componentsCommands.has(process.argv[2])) return '@serverless/components';
-  if (cliArgs.has('--help-components')) return '@serverless/components';
-  if (cliArgs.has('--target')) return '@serverless/components';
-
   // Detect eventual component configuration
   const fsp = require('fs').promises;
+
+  const isChinaUser = (() => {
+    if (process.env.SLS_GEO_LOCATION) return process.env.SLS_GEO_LOCATION === 'cn';
+    return new Intl.DateTimeFormat('en', { timeZoneName: 'long' })
+      .format()
+      .includes('China Standard Time');
+  })();
+
+  const resolvePlatformCli = () => {
+    // Support SERVERLESS_PLATFORM_VENDOR to be configured in .env files
+    const dotenv = require('dotenv');
+    dotenv.config({ path: require('path').resolve('.env') });
+
+    if (process.env.SERVERLESS_PLATFORM_VENDOR) {
+      return process.env.SERVERLESS_PLATFORM_VENDOR === 'tencent'
+        ? 'serverless-tencent'
+        : '@serverless/components';
+    }
+    return isChinaUser ? 'serverless-tencent' : '@serverless/components';
+  };
+
   if (
     (
       await Promise.all(
@@ -29,7 +44,7 @@ module.exports = async () => {
       )
     ).some(Boolean)
   ) {
-    return '@serverless/components';
+    return resolvePlatformCli();
   }
 
   // Detect eventual service configuration
@@ -52,7 +67,7 @@ module.exports = async () => {
     const targetCliName = await (async () => {
       const resolveByObjectConfiguration = (configuration) => {
         if (configuration.provider) return 'serverless';
-        if (configuration.component) return '@serverless/components';
+        if (configuration.component) return resolvePlatformCli();
         for (const value of Object.values(configuration)) {
           if (value.component) return '@serverless/cli';
         }
@@ -63,7 +78,7 @@ module.exports = async () => {
         case 'yaml': {
           const content = await fsp.readFile(`serverless.${configurationExtension}`, 'utf8');
           if (content.search(/(?:^|\n)provider\s*:/) !== -1) return 'serverless';
-          if (content.search(/(?:^|\n)component\s*:/) !== -1) return '@serverless/components';
+          if (content.search(/(?:^|\n)component\s*:/) !== -1) return resolvePlatformCli();
           if (content.search(/\n\s+component\s*:/) !== -1) return '@serverless/cli';
           return null;
         }
@@ -100,20 +115,7 @@ module.exports = async () => {
   }
 
   // No top level service configuration
-  const isChinaUser = (() => {
-    if (process.env.SLS_GEO_LOCATION) return process.env.SLS_GEO_LOCATION === 'cn';
-    return new Intl.DateTimeFormat('en', { timeZoneName: 'long' })
-      .format()
-      .includes('China Standard Time');
-  })();
-
-  // If "sls" or "sls deploy" command and in China, force "@serverless/components"
-  if (
-    (process.argv.length === 2 || process.argv[2] === 'deploy') &&
-    (isChinaUser || process.env.SERVERLESS_PLATFORM_VENDOR === 'tencent')
-  ) {
-    return '@serverless/components';
-  }
+  if (isChinaUser) return resolvePlatformCli();
 
   // Detect eventual component template
   const nestedTemplateKeywords = new Set([
@@ -188,5 +190,5 @@ module.exports = async () => {
     if (subServiceType === '@serverless/components') hasComponent = true;
     else return 'serverless';
   }
-  return hasComponent ? '@serverless/components' : 'serverless';
+  return hasComponent ? resolvePlatformCli() : 'serverless';
 };
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/components/js/template/foo/instance/serverless.js b/test/unit/lib/cli/triage/fixtures/platform/js/template/foo/instance/serverless.js
similarity index 100%
rename from test/unit/lib/cli/triage/fixtures/@serverless/components/js/template/foo/instance/serverless.js
rename to test/unit/lib/cli/triage/fixtures/platform/js/template/foo/instance/serverless.js
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/components/js/template/foo/serverless.js b/test/unit/lib/cli/triage/fixtures/platform/js/template/foo/serverless.js
similarity index 100%
rename from test/unit/lib/cli/triage/fixtures/@serverless/components/js/template/foo/serverless.js
rename to test/unit/lib/cli/triage/fixtures/platform/js/template/foo/serverless.js
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/components/json/component/serverless.component.json b/test/unit/lib/cli/triage/fixtures/platform/json/component/serverless.component.json
similarity index 100%
rename from test/unit/lib/cli/triage/fixtures/@serverless/components/json/component/serverless.component.json
rename to test/unit/lib/cli/triage/fixtures/platform/json/component/serverless.component.json
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/components/json/instance/serverless.json b/test/unit/lib/cli/triage/fixtures/platform/json/instance/serverless.json
similarity index 100%
rename from test/unit/lib/cli/triage/fixtures/@serverless/components/json/instance/serverless.json
rename to test/unit/lib/cli/triage/fixtures/platform/json/instance/serverless.json
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/components/json/template/foo/serverless.json b/test/unit/lib/cli/triage/fixtures/platform/json/template/foo/serverless.json
similarity index 100%
rename from test/unit/lib/cli/triage/fixtures/@serverless/components/json/template/foo/serverless.json
rename to test/unit/lib/cli/triage/fixtures/platform/json/template/foo/serverless.json
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/components/yml/component/serverless.component.yaml b/test/unit/lib/cli/triage/fixtures/platform/yml/component/serverless.component.yaml
similarity index 100%
rename from test/unit/lib/cli/triage/fixtures/@serverless/components/yml/component/serverless.component.yaml
rename to test/unit/lib/cli/triage/fixtures/platform/yml/component/serverless.component.yaml
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/components/yml/instance/serverless.yml b/test/unit/lib/cli/triage/fixtures/platform/yml/instance/serverless.yml
similarity index 100%
rename from test/unit/lib/cli/triage/fixtures/@serverless/components/yml/instance/serverless.yml
rename to test/unit/lib/cli/triage/fixtures/platform/yml/instance/serverless.yml
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/components/yml/template-with-root-config/foo/serverless.yml b/test/unit/lib/cli/triage/fixtures/platform/yml/template-with-root-config/foo/serverless.yml
similarity index 100%
rename from test/unit/lib/cli/triage/fixtures/@serverless/components/yml/template-with-root-config/foo/serverless.yml
rename to test/unit/lib/cli/triage/fixtures/platform/yml/template-with-root-config/foo/serverless.yml
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/components/yml/template-with-root-config/serverless.yml b/test/unit/lib/cli/triage/fixtures/platform/yml/template-with-root-config/serverless.yml
similarity index 100%
rename from test/unit/lib/cli/triage/fixtures/@serverless/components/yml/template-with-root-config/serverless.yml
rename to test/unit/lib/cli/triage/fixtures/platform/yml/template-with-root-config/serverless.yml
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/components/yml/template/foo/serverless.yml b/test/unit/lib/cli/triage/fixtures/platform/yml/template/foo/serverless.yml
similarity index 100%
rename from test/unit/lib/cli/triage/fixtures/@serverless/components/yml/template/foo/serverless.yml
rename to test/unit/lib/cli/triage/fixtures/platform/yml/template/foo/serverless.yml
diff --git a/test/unit/lib/cli/triage/index.test.js b/test/unit/lib/cli/triage/index.test.js
index 94ff5e81066..521eb7e7579 100644
--- a/test/unit/lib/cli/triage/index.test.js
+++ b/test/unit/lib/cli/triage/index.test.js
@@ -14,47 +14,10 @@ describe('test/unit/lib/cli/triage/index.test.js', () => {
   before(() => overrideEnv({ variables: { SLS_GEO_LOCATION: 'us' } }));
 
   describe('CLI params', () => {
-    it('should recognize "registry" as "@serverless/components" command', async () =>
-      overrideArgv({ args: ['sls', 'registry'] }, async () => {
-        expect(await triage()).to.equal('@serverless/components');
-      }));
-    it('should recognize "init" as "@serverless/components" command', async () =>
-      overrideArgv({ args: ['sls', 'init'] }, async () => {
-        expect(await triage()).to.equal('@serverless/components');
-      }));
-    it('should recognize "publish" as "@serverless/components" command', async () =>
-      overrideArgv({ args: ['sls', 'publish'] }, async () => {
-        expect(await triage()).to.equal('@serverless/components');
-      }));
-    it('should recognize "--help-components" as "@serverless/components" exclusive flag', async () => {
-      await overrideArgv({ args: ['sls', '--help-components'] }, async () => {
-        expect(await triage()).to.equal('@serverless/components');
-      });
-      await overrideArgv({ args: ['sls', 'any', '--help-components'] }, async () => {
-        expect(await triage()).to.equal('@serverless/components');
-      });
-    });
-
-    it('should recognize "--target" as "@serverless/components" exclusive flag', async () => {
-      await overrideArgv({ args: ['sls', '--target'] }, async () => {
-        expect(await triage()).to.equal('@serverless/components');
-      });
-      await overrideArgv({ args: ['sls', 'any', '--target'] }, async () => {
-        expect(await triage()).to.equal('@serverless/components');
-      });
-    });
-
-    it('should favor "@serverless/components" for bare "sls" command when tencent platform set explicitly', async () =>
-      overrideEnv({ variables: { SERVERLESS_PLATFORM_VENDOR: 'tencent' } }, async () =>
-        overrideArgv({ args: ['sls'] }, async () => {
-          expect(await triage()).to.equal('@serverless/components');
-        })
-      ));
-
-    it('should recognize bare "sls" command in China as "@serverless/components" command', async () =>
+    it('should recognize "serverless-tencent" unonditionally when in China and not at service context', async () =>
       overrideEnv({ variables: { SLS_GEO_LOCATION: 'cn' } }, async () =>
-        overrideArgv({ args: ['sls'] }, async () => {
-          expect(await triage()).to.equal('@serverless/components');
+        overrideArgv({ args: ['sls any'] }, async () => {
+          expect(await triage()).to.equal('serverless-tencent');
         })
       ));
 
@@ -94,7 +57,7 @@ describe('test/unit/lib/cli/triage/index.test.js', () => {
     });
     after(() => restoreArgv());
 
-    for (const cliName of ['serverless', '@serverless/components', '@serverless/cli']) {
+    for (const cliName of ['serverless', '@serverless/cli']) {
       for (const extension of fs.readdirSync(path.resolve(fixturesDirname, cliName))) {
         for (const fixtureName of fs.readdirSync(
           path.resolve(fixturesDirname, cliName, extension)
@@ -111,5 +74,26 @@ describe('test/unit/lib/cli/triage/index.test.js', () => {
         }
       }
     }
+    for (const extension of fs.readdirSync(path.resolve(fixturesDirname, 'platform'))) {
+      for (const fixtureName of fs.readdirSync(
+        path.resolve(fixturesDirname, 'platform', extension)
+      )) {
+        const register = (cliName, geoLocation) => {
+          const testName = `should recognize "${cliName}" at "platform/${extension}/${fixtureName}" for "${geoLocation}" location`;
+          it(testName, async () =>
+            overrideEnv({ variables: { SLS_GEO_LOCATION: geoLocation } }, async () =>
+              overrideCwd(
+                path.resolve(fixturesDirname, 'platform', extension, fixtureName),
+                async () => {
+                  expect(await triage()).to.equal(cliName);
+                }
+              )
+            )
+          );
+        };
+        register('serverless-tencent', 'cn');
+        register('@serverless/components', 'us');
+      }
+    }
   });
 });

From a4e5e5f3e32555c1fe2052e5fdcf822e0f95a437 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 9 Dec 2021 16:17:38 +0100
Subject: [PATCH 0873/1101] feat: Remove `@serverless/components` CLI
 integration

BREAKING CHANGE:
Serverless Components (`@serverless/components`) CLI is no longer integrated with Framework CLI.
---
 .github/prepare-canary.js |  1 -
 bin/serverless.js         | 15 ++++++++++++++-
 lib/cli/handle-error.js   |  9 ---------
 lib/cli/render-version.js |  9 ++-------
 package.json              |  1 -
 5 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/.github/prepare-canary.js b/.github/prepare-canary.js
index 81c17ed9924..d7ba7dc2780 100755
--- a/.github/prepare-canary.js
+++ b/.github/prepare-canary.js
@@ -10,7 +10,6 @@ const packageJsonPath = path.resolve(__dirname, '../package.json');
 const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
 
 packageJson.version = `${packageJson.version}-${process.env.GITHUB_SHA.slice(0, 8)}`;
-packageJson.dependencies['@serverless/components'] = 'canary';
 packageJson.dependencies['@serverless/dashboard-plugin'] = 'canary';
 
 fs.writeFileSync(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}\n`);
diff --git a/bin/serverless.js b/bin/serverless.js
index 8aeedd41567..86068a08a5d 100755
--- a/bin/serverless.js
+++ b/bin/serverless.js
@@ -44,7 +44,20 @@ require('../lib/cli/triage')().then((cliName) => {
       });
       return;
     case '@serverless/components':
-      require('@serverless/components').runComponents();
+      {
+        const chalk = require('chalk');
+        process.stdout.write(
+          `${[
+            'Serverless Components CLI is no longer bundled with Serverless Framework CLI',
+            '',
+            "To run it, ensure it's installed:",
+            chalk.bold('npm install -g @serverless/components'),
+            '',
+            'Then run:',
+            chalk.bold('components <command> <options>'),
+          ].join('\n')}\n`
+        );
+      }
       return;
     case '@serverless/cli':
       require('@serverless/cli').runComponents();
diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 2e1e267d6eb..6773b194ff6 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -139,13 +139,6 @@ module.exports = async (exception, options = {}) => {
     if (isLocallyInstalled != null) return isLocallyInstalled ? ' (local)' : '';
     return resolveIsLocallyInstalled() ? ' (local)' : '';
   })();
-  const componentsVersion = (() => {
-    try {
-      return require('@serverless/components/package').version;
-    } catch (error) {
-      return 'Unavailable';
-    }
-  })();
 
   const detailsTextTokens = [
     `Environment: ${platform}, node ${nodeVersion}, framework ${slsVersion}${installationModePostfix}, plugin ${sfeVersion}, SDK ${platformClientVersion}`,
@@ -207,8 +200,6 @@ module.exports = async (exception, options = {}) => {
   );
   legacy.consoleLog(chalk.yellow(`     Plugin Version:            ${sfeVersion}`));
   legacy.consoleLog(chalk.yellow(`     SDK Version:               ${platformClientVersion}`));
-
-  legacy.consoleLog(chalk.yellow(`     Components Version:        ${componentsVersion}`));
   legacy.consoleLog(' ');
 
   await logDeprecation.printSummary();
diff --git a/lib/cli/render-version.js b/lib/cli/render-version.js
index f75fbb342d9..aabd343b087 100644
--- a/lib/cli/render-version.js
+++ b/lib/cli/render-version.js
@@ -5,7 +5,6 @@ const os = require('os');
 const { version } = require('../../package');
 const spawn = require('child-process-ext/spawn');
 const { version: dashboardPluginVersion } = require('@serverless/dashboard-plugin/package');
-const { version: componentsVersion } = require('@serverless/components/package');
 const { platformClientVersion } = require('@serverless/dashboard-plugin');
 const { legacy, log, writeText } = require('@serverless/utils/log');
 const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
@@ -82,15 +81,11 @@ module.exports = async () => {
       `Framework Core: ${version}${installationModePostfix}\n` +
       `Plugin: ${dashboardPluginVersion}\n` +
       `SDK: ${platformClientVersion}\n`
-    }${
-      tencentCliVersion ? `Tencent CLI: ${tencentCliVersion}\n` : ''
-    }Components: ${componentsVersion}\n`
+    }${tencentCliVersion ? `Tencent CLI: ${tencentCliVersion}\n` : ''}`
   );
   writeText(
     `Framework Core: ${version}${installationModePostfix}`,
     `Plugin: ${dashboardPluginVersion}`,
-    `SDK: ${platformClientVersion}\n${
-      tencentCliVersion ? `Tencent CLI: ${tencentCliVersion}\n` : ''
-    }Components: ${componentsVersion}`
+    `SDK: ${platformClientVersion}\n${tencentCliVersion ? `Tencent CLI: ${tencentCliVersion}` : ''}`
   );
 };
diff --git a/package.json b/package.json
index 08c4e76df0e..59d2c3ea987 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,6 @@
   },
   "dependencies": {
     "@serverless/cli": "^1.6.0",
-    "@serverless/components": "^3.18.2",
     "@serverless/dashboard-plugin": "^6.0.0",
     "@serverless/platform-client": "^4.3.0",
     "@serverless/utils": "^6.0.0",

From bd6fd4fc3dd1906c9e5d027bb712ebdfe7368d92 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 10 Dec 2021 17:08:17 +0100
Subject: [PATCH 0874/1101] feat(CLI): Register `-v` as global `--version`
 alias

---
 lib/cli/commands-schema/common-options/global.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli/commands-schema/common-options/global.js b/lib/cli/commands-schema/common-options/global.js
index 1a2d8379629..f53106bda21 100644
--- a/lib/cli/commands-schema/common-options/global.js
+++ b/lib/cli/commands-schema/common-options/global.js
@@ -2,7 +2,7 @@
 
 module.exports = {
   help: { usage: 'Show this message', shortcut: 'h', type: 'boolean' },
-  version: { usage: 'Show version info', type: 'boolean' },
+  version: { usage: 'Show version info', shortcut: 'v', type: 'boolean' },
   verbose: { usage: 'Show verbose logs', type: 'boolean' },
   debug: { usage: 'Namespace of debug logs to expose (use "*" to display all)', type: 'string' },
 };

From eedaa2469f231270112ab31fb5b63baa454ec701 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 10 Dec 2021 17:17:28 +0100
Subject: [PATCH 0875/1101] feat(CLI): Simplify CLI args parsing to <command>
 <options> format

BREAKING CHANGE:
CLI params put before command tokens are no longer recgonized (e.g. `sls -f <function-name> deploy function` will no longer work). In all cases construct CLI args in `sls <command> <options>` order
---
 lib/cli/resolve-input.js                | 58 +++++--------------------
 test/unit/lib/cli/resolve-input.test.js | 42 +-----------------
 2 files changed, 13 insertions(+), 87 deletions(-)

diff --git a/lib/cli/resolve-input.js b/lib/cli/resolve-input.js
index 7d17895ff36..df9e87dc124 100644
--- a/lib/cli/resolve-input.js
+++ b/lib/cli/resolve-input.js
@@ -5,15 +5,11 @@
 const ensureMap = require('type/map/ensure');
 const memoizee = require('memoizee');
 const parseArgs = require('./parse-args');
+const globalOptionsSchema = require('./commands-schema/common-options/global');
 
-const baseArgsSchema = {
-  boolean: new Set(['help', 'help-interactive', 'use-local-credentials', 'v', 'version']),
-  string: new Set(['app', 'config', 'org', 'stage']),
-  alias: new Map([
-    ['c', 'config'],
-    ['h', 'help'],
-  ]),
-};
+const paramRe =
+  /^-(?:-(?<fullName>[a-zA-Z][A-Za-z0-9:_-]+)|(?<aliasNames>[a-z]+))(?:=(?<value>.*)|$)/;
+const isParamName = RegExp.prototype.test.bind(paramRe);
 
 const resolveArgsSchema = (commandOptionsSchema) => {
   const options = { boolean: new Set(), string: new Set(), alias: new Map(), multiple: new Set() };
@@ -38,36 +34,17 @@ const resolveArgsSchema = (commandOptionsSchema) => {
 module.exports = memoizee((commandsSchema = require('./commands-schema')) => {
   commandsSchema = ensureMap(commandsSchema);
   const args = process.argv.slice(2);
+  const firstParamIndex = args.findIndex(isParamName);
 
-  // Ideally no options should be passed before command (to know what options are supported,
-  // and whether they're boolean or not, we need to know command name upfront).
-  // Still so far we (kind of) supported such notation and we need to maintain it in current major.
-  // Thefore at first resolution stage we use schema that recognizes just some popular options
-  let options = parseArgs(args, baseArgsSchema);
-  let commands = options._;
+  const commands = args.slice(0, firstParamIndex === -1 ? Infinity : firstParamIndex);
+  const command = commands.join(' ');
+  const commandSchema = commandsSchema.get(command);
+  const options = parseArgs(
+    args.slice(firstParamIndex === -1 ? Infinity : firstParamIndex),
+    resolveArgsSchema(commandSchema ? commandSchema.options : globalOptionsSchema)
+  );
   delete options._;
 
-  let command = commands.join(' ');
-
-  // Having command potentially resolved, resolve options again with help of the command schema
-  let commandSchema = commandsSchema.get(command);
-  while (commandSchema) {
-    const resolvedOptions = parseArgs(args, resolveArgsSchema(commandSchema.options));
-    const resolvedCommand = resolvedOptions._.join(' ');
-    if (resolvedCommand === command) {
-      options = resolvedOptions;
-      commands = options._;
-      delete options._;
-      break;
-    }
-    // Unlikely scenario, where after applying the command schema different command resolves
-    // It can happen only in cases where e.g. for "sls deploy --force  function -f foo"
-    // we initially assume "deploy" command, while after applying "deploy" command schema it's
-    // actually a "deploy function" command that resolves
-    command = resolvedCommand;
-    commandSchema = commandsSchema.get(resolvedCommand);
-  }
-
   const result = { commands, options, command, commandSchema, commandsSchema };
   if (!commandSchema) {
     result.isContainerCommand = Array.from(commandsSchema.keys()).some((commandName) =>
@@ -86,17 +63,6 @@ module.exports = memoizee((commandsSchema = require('./commands-schema')) => {
     command === 'help'
   ) {
     result.isHelpRequest = true;
-    return result;
-  }
-
-  const argsString = args.join(' ');
-  if (command && argsString !== command && !argsString.startsWith(`${command} `)) {
-    // Some options were passed before command name (e.g. "sls -v deploy"), deprecate such usage
-    require('../utils/logDeprecation')(
-      'CLI_OPTIONS_BEFORE_COMMAND',
-      '"serverless" command options are expected to follow command and not be put before the command.\n' +
-        'Starting from next major Serverless will no longer support the latter form.'
-    );
   }
 
   return result;
diff --git a/test/unit/lib/cli/resolve-input.test.js b/test/unit/lib/cli/resolve-input.test.js
index d885f5d4386..37c50633355 100644
--- a/test/unit/lib/cli/resolve-input.test.js
+++ b/test/unit/lib/cli/resolve-input.test.js
@@ -33,7 +33,7 @@ describe('test/unit/lib/cli/resolve-input.test.js', () => {
     });
 
     it('should resolve commands', async () => {
-      expect(data.commands).to.deep.equal(['cmd1', 'cmd2', 'ver', 'h', 'elo', 'other']);
+      expect(data.commands).to.deep.equal(['cmd1', 'cmd2']);
     });
 
     it('should recognize --version as boolean', async () => {
@@ -47,46 +47,6 @@ describe('test/unit/lib/cli/resolve-input.test.js', () => {
     it('should recognize --config', async () => {
       expect(data.options.config).to.equal('conf');
     });
-
-    describe('"-v" handling', () => {
-      before(() => {
-        resolveInput.clear();
-        data = overrideArgv(
-          {
-            args: ['serverless', 'cmd1', 'cmd2', '-v', 'ver', 'other'],
-          },
-          () => resolveInput()
-        );
-      });
-      it('should not recognize as version alias', async () => {
-        expect(data.options).to.not.have.property('version');
-      });
-      it('should recognize as boolean', async () => {
-        expect(data.options.v).to.equal(true);
-      });
-    });
-
-    describe('Command with initially not recognized boolean', () => {
-      before(() => {
-        resolveInput.clear();
-        data = overrideArgv(
-          {
-            args: ['serverless', 'deploy', '--force', 'function', '-f', 'foo'],
-          },
-          () => resolveInput()
-        );
-      });
-
-      it('should recognize target command', async () => {
-        expect(data).to.deep.equal({
-          commandSchema: commandsSchema.get('deploy function'),
-          command: 'deploy function',
-          commands: ['deploy', 'function'],
-          options: { force: true, function: 'foo' },
-          commandsSchema,
-        });
-      });
-    });
   });
 
   describe('"-s" handling', () => {

From 2746b854bbe78444fe0d5fe491646f3a57f7af8d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 13 Dec 2021 15:48:35 +0100
Subject: [PATCH 0876/1101] refactor: Remove evaluation of deprecated lifecycle
 events

BREAKING CHANGE:
Lifecycle events marked as deprecated (in context of v1) are no longer evaluated
---
 lib/classes/PluginManager.js             | 12 +-----------
 lib/cli/commands-schema/aws-service.js   | 12 +-----------
 lib/cli/commands-schema/resolve-final.js |  5 -----
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 905d8e057a5..da8e9641ee9 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -352,17 +352,7 @@ class PluginManager {
     if (pluginInstance.commands) {
       Object.entries(pluginInstance.commands).forEach(([key, details]) => {
         const command = this.loadCommand(pluginName, details, key);
-        // Grab and extract deprecated events
-        command.lifecycleEvents = (command.lifecycleEvents || []).map((event) => {
-          if (event.startsWith('deprecated#')) {
-            // Extract event and optional redirect
-            const transformedEvent = /^deprecated#(.*?)(?:->(.*?))?$/.exec(event);
-            this.deprecatedEvents[`${command.key}:${transformedEvent[1]}`] =
-              transformedEvent[2] || null;
-            return transformedEvent[1];
-          }
-          return event;
-        });
+        if (!command.lifecycleEvents) command.lifecycleEvents = [];
         this.commands[key] = mergeCommands(
           this.commands[key],
           _.merge({}, command, {
diff --git a/lib/cli/commands-schema/aws-service.js b/lib/cli/commands-schema/aws-service.js
index bbe204be31a..3ddd19168d4 100644
--- a/lib/cli/commands-schema/aws-service.js
+++ b/lib/cli/commands-schema/aws-service.js
@@ -35,17 +35,7 @@ commands.set('deploy', {
       type: 'boolean',
     },
   },
-  // TODO: Remove deprecated events with v3
-  lifecycleEvents: [
-    'deprecated#cleanup->package:cleanup',
-    'deprecated#initialize->package:initialize',
-    'deprecated#setupProviderConfiguration->package:setupProviderConfiguration',
-    'deprecated#createDeploymentArtifacts->package:createDeploymentArtifacts',
-    'deprecated#compileFunctions->package:compileFunctions',
-    'deprecated#compileEvents->package:compileEvents',
-    'deploy',
-    'finalize',
-  ],
+  lifecycleEvents: ['deploy', 'finalize'],
 });
 
 commands.set('deploy function', {
diff --git a/lib/cli/commands-schema/resolve-final.js b/lib/cli/commands-schema/resolve-final.js
index 4a5c2fe809c..bd712db57ed 100644
--- a/lib/cli/commands-schema/resolve-final.js
+++ b/lib/cli/commands-schema/resolve-final.js
@@ -11,8 +11,6 @@ const awsServiceOptions = require('./common-options/aws-service');
 const { logWarning } = require('../../classes/Error');
 const { log } = require('@serverless/utils/log');
 
-const deprecatedEventPattern = /^deprecated#(.*?)(?:->(.*?))?$/;
-
 module.exports = (loadedPlugins, { providerName }) => {
   const commands = new Map(providerName === 'aws' ? awsServiceCommands : serviceCommands);
 
@@ -28,9 +26,6 @@ module.exports = (loadedPlugins, { providerName }) => {
           .map(([name, schema]) => {
             const lifecycleEventNamePrefix = name.split(' ').join(':');
             return (schema.lifecycleEvents || []).map((lifecycleEventBaseName) => {
-              if (lifecycleEventBaseName.startsWith('deprecated#')) {
-                lifecycleEventBaseName = lifecycleEventBaseName.match(deprecatedEventPattern)[1];
-              }
               const lifecycleEventName = `${lifecycleEventNamePrefix}:${lifecycleEventBaseName}`;
               return [
                 [`before:${lifecycleEventName}`, name],

From da0e4637f31cf69f154f9eb389ab962d504c5361 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 13 Dec 2021 16:07:33 +0100
Subject: [PATCH 0877/1101] refactor(CLI): Seclude `paramRegExp`

---
 lib/cli/param-reg-exp.js | 4 ++++
 lib/cli/parse-args.js    | 7 +++----
 lib/cli/resolve-input.js | 4 +---
 3 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 lib/cli/param-reg-exp.js

diff --git a/lib/cli/param-reg-exp.js b/lib/cli/param-reg-exp.js
new file mode 100644
index 00000000000..5d55aaf4ff3
--- /dev/null
+++ b/lib/cli/param-reg-exp.js
@@ -0,0 +1,4 @@
+'use strict';
+
+module.exports =
+  /^-(?:-(?<fullName>[a-zA-Z][A-Za-z0-9:_-]+)|(?<aliasNames>[a-z]+))(?:=(?<value>.*)|$)/;
diff --git a/lib/cli/parse-args.js b/lib/cli/parse-args.js
index 4bfdc1c0c49..f3dfbf177d6 100644
--- a/lib/cli/parse-args.js
+++ b/lib/cli/parse-args.js
@@ -3,10 +3,9 @@
 'use strict';
 
 const ServerlessError = require('../serverless-error');
+const paramRegExp = require('./param-reg-exp');
 
-const paramRe =
-  /^-(?:-(?<fullName>[a-zA-Z][A-Za-z0-9:_-]+)|(?<aliasNames>[a-z]+))(?:=(?<value>.*)|$)/;
-const isParamName = RegExp.prototype.test.bind(paramRe);
+const isParamName = RegExp.prototype.test.bind(paramRegExp);
 
 module.exports = (
   args,
@@ -20,7 +19,7 @@ module.exports = (
       result._.push(...args.slice(i + 1));
       break;
     }
-    const paramMatch = arg.match(paramRe);
+    const paramMatch = arg.match(paramRegExp);
     if (!paramMatch) {
       result._.push(arg);
       continue;
diff --git a/lib/cli/resolve-input.js b/lib/cli/resolve-input.js
index df9e87dc124..937305e4069 100644
--- a/lib/cli/resolve-input.js
+++ b/lib/cli/resolve-input.js
@@ -7,9 +7,7 @@ const memoizee = require('memoizee');
 const parseArgs = require('./parse-args');
 const globalOptionsSchema = require('./commands-schema/common-options/global');
 
-const paramRe =
-  /^-(?:-(?<fullName>[a-zA-Z][A-Za-z0-9:_-]+)|(?<aliasNames>[a-z]+))(?:=(?<value>.*)|$)/;
-const isParamName = RegExp.prototype.test.bind(paramRe);
+const isParamName = RegExp.prototype.test.bind(require('./param-reg-exp'));
 
 const resolveArgsSchema = (commandOptionsSchema) => {
   const options = { boolean: new Set(), string: new Set(), alias: new Map(), multiple: new Set() };

From b5069ef8cb3dff0127781cecad1774faa62a7415 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 13 Dec 2021 16:42:41 +0100
Subject: [PATCH 0878/1101] feat(CLI):  Deprecate support for `deploy -f` alias

---
 docs/deprecations.md                   |  8 ++++++++
 lib/cli/commands-schema/aws-service.js |  4 ----
 lib/plugins/aws/deployFunction.js      |  5 +----
 lib/plugins/deploy.js                  | 25 -------------------------
 scripts/serverless.js                  | 17 +++++++++++++++++
 test/unit/lib/plugins/deploy.test.js   | 16 ----------------
 6 files changed, 26 insertions(+), 49 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index b6dc71c1732..7b936a7c2e2 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -38,6 +38,14 @@ Note:
 - The `serverless.yml` setting is ineffective for deprecations reported before the configuration is read.
 - `SLS_DEPRECATION_DISABLE` and `disabledDeprecations` remain respected, and no errors will be thrown for mentioned deprecation codes.
 
+<a name="CLI_DEPLOY_FUNCTION_OPTION_V3"><div>&nbsp;</div></a>
+
+## CLI `--function`/`-f` option for `deploy` command
+
+Deprecation code: `CLI_DEPLOY_FUNCTION_OPTION_V3`
+
+Starting with `v4.0.0`, `--function` or `-f` option for `deploy` command will no longer be supported. In order to deploy a single function, please use `deploy function` command instead.
+
 <a name="LAMBDA_HASHING_VERSION_PROPERTY"><div>&nbsp;</div></a>
 
 ## Property `provider.lambdaHashingVersion`
diff --git a/lib/cli/commands-schema/aws-service.js b/lib/cli/commands-schema/aws-service.js
index 3ddd19168d4..58ce9173581 100644
--- a/lib/cli/commands-schema/aws-service.js
+++ b/lib/cli/commands-schema/aws-service.js
@@ -21,10 +21,6 @@ commands.set('deploy', {
       usage: 'Forces a deployment to take place',
       type: 'boolean',
     },
-    'function': {
-      usage: "Function name. Deploys a single function. DEPRECATED: use 'deploy function' instead.",
-      shortcut: 'f',
-    },
     'aws-s3-accelerate': {
       usage: 'Enables S3 Transfer Acceleration making uploading artifacts much faster.',
       type: 'boolean',
diff --git a/lib/plugins/aws/deployFunction.js b/lib/plugins/aws/deployFunction.js
index ee551003408..9324f7fc015 100644
--- a/lib/plugins/aws/deployFunction.js
+++ b/lib/plugins/aws/deployFunction.js
@@ -29,10 +29,7 @@ class AwsDeployFunction {
     this.hooks = {
       'initialize': () => {
         const commandName = this.serverless.processedInput.commands.join(' ');
-        // TODO: Remove second part of condition with v3
-        if (commandName !== 'deploy function' && !(commandName === 'deploy' && options.function)) {
-          return;
-        }
+        if (commandName !== 'deploy function') return;
         log.notice();
         log.notice(
           `Deploying function ${this.options.function} to stage ${this.serverless
diff --git a/lib/plugins/deploy.js b/lib/plugins/deploy.js
index c151251e5a6..d1b3ce35cf9 100644
--- a/lib/plugins/deploy.js
+++ b/lib/plugins/deploy.js
@@ -2,8 +2,6 @@
 
 const ServerlessError = require('../serverless-error');
 const cliCommandsSchema = require('../cli/commands-schema');
-const { logWarning } = require('../classes/Error');
-const { log } = require('@serverless/utils/log');
 
 class Deploy {
   constructor(serverless, options) {
@@ -31,19 +29,6 @@ class Deploy {
     };
 
     this.hooks = {
-      'initialize': () => {
-        if (
-          this.serverless.processedInput.commands.join(' ') === 'deploy' &&
-          this.options.function
-        ) {
-          logWarning(
-            'Please use "deploy function -f" command directly. Support for "deploy -f" alias is likely to be removed in the future.'
-          );
-          log.warning(
-            'Please use "deploy function -f" command directly. Support for "deploy -f" alias is likely to be removed in the future.'
-          );
-        }
-      },
       'before:deploy:deploy': async () => {
         const provider = this.serverless.service.provider.name;
         if (!this.serverless.getProvider(provider)) {
@@ -51,16 +36,6 @@ class Deploy {
           throw new ServerlessError(errorMessage, 'INVALID_PROVIDER');
         }
 
-        if (this.options.function) {
-          // If the user has given a function parameter, spawn a function deploy
-          // and terminate execution right afterwards. We did not enter the
-          // deploy lifecycle yet, so nothing has to be cleaned up.
-          await this.serverless.pluginManager.spawn('deploy:function', {
-            terminateLifecycleAfterExecution: true,
-          });
-          return;
-        }
-
         if (!this.options.package && !this.serverless.service.package.path) {
           await this.serverless.pluginManager.spawn('package');
         }
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 99f99d9f2dc..8daa48488e2 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -108,11 +108,28 @@ const humanizePropertyPathKeys = require('../lib/configuration/variables/humaniz
 const processBackendNotificationRequest = require('../lib/utils/processBackendNotificationRequest');
 const logDeprecation = require('../lib/utils/logDeprecation');
 
+const rewriteDeployFunctionParam = () => {
+  const isParamName = RegExp.prototype.test.bind(require('../lib/cli/param-reg-exp'));
+
+  const args = process.argv.slice(2);
+  const firstParamIndex = args.findIndex(isParamName);
+  const commands = args.slice(0, firstParamIndex === -1 ? Infinity : firstParamIndex);
+  if (commands.join(' ') !== 'deploy') return;
+  if (!args.includes('-f') && !args.includes('--function')) return;
+  logDeprecation(
+    'CLI_DEPLOY_FUNCTION_OPTION_V3',
+    'Starting with v4.0.0, `--function` or `-f` option for `deploy` command will no longer be supported. In order to deploy a single function, please use `deploy function` command instead.'
+  );
+  process.argv.splice(3, 0, 'function');
+};
+
 const processSpanPromise = (async () => {
   try {
     const wait = require('timers-ext/promise/sleep');
     await wait(); // Ensure access to "processSpanPromise"
 
+    rewriteDeployFunctionParam();
+
     const resolveInput = require('../lib/cli/resolve-input');
 
     let commands;
diff --git a/test/unit/lib/plugins/deploy.test.js b/test/unit/lib/plugins/deploy.test.js
index d2a636deae9..aa6b69627be 100644
--- a/test/unit/lib/plugins/deploy.test.js
+++ b/test/unit/lib/plugins/deploy.test.js
@@ -79,22 +79,6 @@ describe('Deploy', () => {
       );
     });
 
-    it('should execute deploy function if a function option is given', () => {
-      deploy.options.package = false;
-      deploy.options.function = 'myfunc';
-      deploy.serverless.service.package.path = false;
-
-      return expect(deploy.hooks['before:deploy:deploy']()).to.be.fulfilled.then(() =>
-        BbPromise.all([
-          expect(spawnPackageStub).to.not.be.called,
-          expect(spawnDeployFunctionStub).to.be.calledOnce,
-          expect(spawnDeployFunctionStub).to.be.calledWithExactly('deploy:function', {
-            terminateLifecycleAfterExecution: true,
-          }),
-        ])
-      );
-    });
-
     it('should throw an error if provider does not exist', () => {
       deploy.serverless.service.provider.name = 'nonExistentProvider';
 

From 62017754f771c02478ac06e015db6767230b2fc3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 13 Dec 2021 17:16:43 +0100
Subject: [PATCH 0879/1101] feat(Packaging): Deprecate `package.include` and
 `package.exclude`

---
 docs/deprecations.md           | 10 ++++++++++
 lib/plugins/package/package.js | 20 ++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 7b936a7c2e2..0f40fa2f11a 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -38,6 +38,16 @@ Note:
 - The `serverless.yml` setting is ineffective for deprecations reported before the configuration is read.
 - `SLS_DEPRECATION_DISABLE` and `disabledDeprecations` remain respected, and no errors will be thrown for mentioned deprecation codes.
 
+<a name="PACKAGE_PATTERNS"><div>&nbsp;</div></a>
+
+## New way to define packaging patterns
+
+Deprecation code: `PACKAGE_PATTERNS`
+
+Support for `package.include` and `package.exclude` will be removed with v4.0.0. Instead please use `package.patterns` with which both _include_ and _exclude_ (prefixed with `!`) rules can be configured.
+
+Check [Packaging Patterns](/framework/docs/providers/aws/guide/packaging/#patterns) documentation for more info.
+
 <a name="CLI_DEPLOY_FUNCTION_OPTION_V3"><div>&nbsp;</div></a>
 
 ## CLI `--function`/`-f` option for `deploy` command
diff --git a/lib/plugins/package/package.js b/lib/plugins/package/package.js
index 20ad625d1a9..327533cd287 100644
--- a/lib/plugins/package/package.js
+++ b/lib/plugins/package/package.js
@@ -33,6 +33,26 @@ class Package {
     };
 
     this.hooks = {
+      'initialize': () => {
+        const usesIncludeOrExclude = (packageConfig = {}) =>
+          packageConfig.include || packageConfig.exclude;
+
+        if (
+          usesIncludeOrExclude(this.serverless.service.package || {}) ||
+          Object.values(this.serverless.service.functions).some((func) =>
+            usesIncludeOrExclude(func.package)
+          ) ||
+          Object.values(this.serverless.service.layers || {}).some((func) =>
+            usesIncludeOrExclude(func.package)
+          )
+        ) {
+          this.serverless._logDeprecation(
+            'PACKAGE_PATTERNS',
+            'Support for "package.include" and "package.exclude" will be removed in the next' +
+              ' major release. Please use "package.patterns" instead'
+          );
+        }
+      },
       'package:createDeploymentArtifacts': async () =>
         BbPromise.bind(this).then(this.packageService),
 

From b40838630c18945bf00bf931bc98cf5fe6eac8c5 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 13 Dec 2021 17:25:32 +0100
Subject: [PATCH 0880/1101] feat(Config Schema): Deprecate `warn` as a
 validation mode default

---
 docs/deprecations.md                     | 10 ++++++++++
 lib/classes/ConfigSchemaHandler/index.js |  8 ++++++++
 2 files changed, 18 insertions(+)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 0f40fa2f11a..9fd19cf95cb 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -38,6 +38,16 @@ Note:
 - The `serverless.yml` setting is ineffective for deprecations reported before the configuration is read.
 - `SLS_DEPRECATION_DISABLE` and `disabledDeprecations` remain respected, and no errors will be thrown for mentioned deprecation codes.
 
+<a name="CONFIG_VALIDATION_MODE_DEFAULT_V3"><div>&nbsp;</div></a>
+
+## `configValidationMode: error` will be new default
+
+Deprecation code: `CONFIG_VALIDATION_MODE_DEFAULT_V3`
+
+Starting with v4.0.0, Serverless will throw on configuration errors by default. This is changing from the previous default, `configValidationMode: warn`
+
+Learn more about configuration validation here: http://slss.io/configuration-validation
+
 <a name="PACKAGE_PATTERNS"><div>&nbsp;</div></a>
 
 ## New way to define packaging patterns
diff --git a/lib/classes/ConfigSchemaHandler/index.js b/lib/classes/ConfigSchemaHandler/index.js
index b5ca846179e..4d0b4c50597 100644
--- a/lib/classes/ConfigSchemaHandler/index.js
+++ b/lib/classes/ConfigSchemaHandler/index.js
@@ -180,6 +180,14 @@ class ConfigSchemaHandler {
             )}`,
           ].join('\n')
         );
+        if (!this.serverless.configurationInput.configValidationMode) {
+          this.serverless._logDeprecation(
+            'CONFIG_VALIDATION_MODE_DEFAULT_V3',
+            'Starting with the next major, Serverless will throw on configuration errors by' +
+              ' default. Adapt to this behavior now by adding "configValidationMode: error" to' +
+              ' the service configuration'
+          );
+        }
       }
     }
   }

From 6f3a63277312bb1819c31eccefacfcda278bd068 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 13 Dec 2021 17:57:23 +0100
Subject: [PATCH 0881/1101] feat(AWS IAM): Deprecate IAM settings grouped
 directly at `provider`

---
 docs/deprecations.md                          | 18 +++++++++++
 lib/plugins/aws/provider.js                   | 13 ++++++++
 lib/utils/report-deprecated-properties.js     | 30 +++++++++++++++++++
 .../aws/deploy/lib/createStack.test.js        |  4 +--
 .../aws/package/compile/functions.test.js     |  2 +-
 .../aws/package/lib/mergeIamTemplates.test.js |  6 ++--
 6 files changed, 67 insertions(+), 6 deletions(-)
 create mode 100644 lib/utils/report-deprecated-properties.js

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 9fd19cf95cb..80ff8a1cfef 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -38,6 +38,24 @@ Note:
 - The `serverless.yml` setting is ineffective for deprecations reported before the configuration is read.
 - `SLS_DEPRECATION_DISABLE` and `disabledDeprecations` remain respected, and no errors will be thrown for mentioned deprecation codes.
 
+<a name="PROVIDER_IAM_SETTINGS_V3"><div>&nbsp;</div></a>
+
+## Grouping IAM settings under `provider.iam`
+
+Deprecation code: `PROVIDER_IAM_SETTINGS_v3`
+
+All IAM-related settings of _provider_ including `iamRoleStatements`, `iamManagedPolicies`, `role` and `cfnRole` are also now supported at `iam` property. Refer to the [IAM Guide](/framework/docs/providers/aws/guide/iam.md).
+
+- `provider.role` -> `provider.iam.role`
+- `provider.rolePermissionsBoundary` -> `provider.iam.role.permissionsBoundary`
+- `provider.iamRoleStatements` -> `provider.iam.role.statements`
+- `provider.iamManagedPolicies` -> `provider.iam.role.managedPolicies`
+- `provider.cfnRole` -> `provider.iam.deploymentRole`
+
+In addition `iam.role.permissionBoundary` can also be set at `iam.role.permissionsBoundary` (which matches CloudFormation property name).
+
+Starting with v4.0.0 old versions of settings will no longer be supported
+
 <a name="CONFIG_VALIDATION_MODE_DEFAULT_V3"><div>&nbsp;</div></a>
 
 ## `configValidationMode: error` will be new default
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 7e4147cc148..85778827e89 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -15,6 +15,7 @@ const spawnExt = require('child-process-ext/spawn');
 const ServerlessError = require('../../serverless-error');
 const awsRequest = require('../../aws/request');
 const { cfValue } = require('../../utils/aws-schema-get-cf-value');
+const reportDeprecatedProperties = require('../../utils/report-deprecated-properties');
 const deepSortObjectByKey = require('../../utils/deepSortObjectByKey');
 const { progress, legacy, log } = require('@serverless/utils/log');
 
@@ -229,6 +230,18 @@ class AwsProvider {
             }
           }
         }
+        reportDeprecatedProperties(
+          'PROVIDER_IAM_SETTINGS_V3',
+          {
+            'provider.role': 'provider.iam.role',
+            'provider.rolePermissionsBoundary': 'provider.iam.role.permissionsBoundary',
+            'provider.iam.role.permissionBoundary': 'provider.iam.role.permissionsBoundary',
+            'provider.iamManagedPolicies': 'provider.iam.role.managedPolicies',
+            'provider.iamRoleStatements': 'provider.iam.role.statements',
+            'provider.cfnRole': 'provider.iam.deploymentRole',
+          },
+          { serviceConfig: this.serverless.service }
+        );
       },
     };
 
diff --git a/lib/utils/report-deprecated-properties.js b/lib/utils/report-deprecated-properties.js
new file mode 100644
index 00000000000..3c3625c10c3
--- /dev/null
+++ b/lib/utils/report-deprecated-properties.js
@@ -0,0 +1,30 @@
+'use strict';
+
+const _ = require('lodash');
+const logDeprecation = require('./logDeprecation');
+
+const getMessage = (props, serviceConfig) => {
+  const warnings = [];
+
+  for (const [oldProp, newProp] of Object.entries(props)) {
+    if (_.get(serviceConfig, oldProp) != null) {
+      warnings.push([oldProp, newProp]);
+    }
+  }
+
+  if (warnings.length) {
+    const what = warnings.length > 1 ? 'properties' : 'property';
+    const details = warnings
+      .map(([oldProp, newProp]) => `  "${oldProp}" -> "${newProp}"`)
+      .join('\n');
+    return `Starting with version 4.0.0, following ${what} will be replaced:\n${details}`;
+  }
+  return null;
+};
+
+module.exports = (code, props, { serviceConfig } = {}) => {
+  const msg = getMessage(props, serviceConfig);
+  if (msg) {
+    logDeprecation(code, msg, { serviceConfig });
+  }
+};
diff --git a/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js b/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js
index e141232e7fc..17555064f8b 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js
@@ -261,7 +261,7 @@ describe('createStack #2', () => {
       fixture: 'function',
       command: 'deploy',
       configExt: {
-        disabledDeprecations: ['PROVIDER_IAM_SETTINGS'],
+        disabledDeprecations: ['PROVIDER_IAM_SETTINGS_V3'],
         provider: {
           iam: {
             deploymentRole: 'arn:aws:iam::123456789012:role/role-a',
@@ -283,7 +283,7 @@ describe('createStack #2', () => {
       fixture: 'function',
       command: 'deploy',
       configExt: {
-        disabledDeprecations: ['PROVIDER_IAM_SETTINGS'],
+        disabledDeprecations: ['PROVIDER_IAM_SETTINGS_V3'],
         provider: {
           cfnRole: 'arn:aws:iam::123456789012:role/role-b',
         },
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index bc8423e95ec..0091ed88445 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -191,7 +191,7 @@ describe('AwsCompileFunctions', () => {
       const { cfTemplate } = await runServerless({
         fixture: 'function',
         configExt: {
-          disabledDeprecations: ['PROVIDER_IAM_SETTINGS'],
+          disabledDeprecations: ['PROVIDER_IAM_SETTINGS_V3'],
           provider: {
             role: 'role-a',
             iam: { role: 'role-b' },
diff --git a/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js b/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
index c13a96260a2..eab2d0fc557 100644
--- a/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
@@ -23,7 +23,7 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
         fixture: 'function',
         command: 'package',
         configExt: {
-          disabledDeprecations: ['PROVIDER_IAM_SETTINGS'],
+          disabledDeprecations: ['PROVIDER_IAM_SETTINGS_V3'],
           provider: {
             name: 'aws',
             role: 'arn:aws:iam::YourAccountNumber:role/YourIamRole',
@@ -180,7 +180,7 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
           fixture: 'function',
           command: 'package',
           configExt: {
-            disabledDeprecations: ['PROVIDER_IAM_SETTINGS'],
+            disabledDeprecations: ['PROVIDER_IAM_SETTINGS_V3'],
             provider: {
               iamRoleStatements: [
                 {
@@ -247,7 +247,7 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
           fixture: 'function',
           command: 'package',
           configExt: {
-            disabledDeprecations: ['PROVIDER_IAM_SETTINGS'],
+            disabledDeprecations: ['PROVIDER_IAM_SETTINGS_V3'],
             provider: {
               iam: {
                 role: {

From 96015a11f6fc48c904714ba86582e7fbc0e15cfe Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 13 Dec 2021 17:55:25 +0100
Subject: [PATCH 0882/1101] feat(Standalone): Upgrade `npm` to v8

---
 scripts/pkg/build.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pkg/build.js b/scripts/pkg/build.js
index 8620c2ffe89..91fa85ff762 100755
--- a/scripts/pkg/build.js
+++ b/scripts/pkg/build.js
@@ -20,7 +20,7 @@ const spawnOptions = { cwd: serverlessPath, stdio: 'inherit' };
   // It's due to fact that npm tends to issue buggy releases
   // Node.js confirms on given version before including it within its bundle
   // Version mappings reference: https://nodejs.org/en/download/releases/
-  await spawn('npm', ['install', '--no-save', 'npm@6.14.15'], spawnOptions);
+  await spawn('npm', ['install', '--no-save', 'npm@8.1.2'], spawnOptions);
 
   try {
     process.stdout.write('Build binaries\n');

From a196e0403ea551e9bd1cb9708415f603ca97c0b2 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 20 Dec 2021 17:49:33 +0100
Subject: [PATCH 0883/1101] feat(CLI): Deprecate missing options schema

---
 docs/deprecations.md                     | 14 ++++++++++++++
 lib/cli/commands-schema/resolve-final.js | 24 ++++++++----------------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 80ff8a1cfef..aa8ddc16d2b 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -38,6 +38,20 @@ Note:
 - The `serverless.yml` setting is ineffective for deprecations reported before the configuration is read.
 - `SLS_DEPRECATION_DISABLE` and `disabledDeprecations` remain respected, and no errors will be thrown for mentioned deprecation codes.
 
+<a name="CLI_OPTIONS_SCHEMA_V3"><div>&nbsp;</div></a>
+
+## CLI Options extensions, `type` requirement
+
+Deprecation code: `CLI_OPTIONS_SCHEMA_V3`
+
+Internal handling of CLI arguments was improved with type awareness for options. Now each option definition is expected have `type` defined in its settings.
+
+Possible values are `string`, `boolean` and `multiple`. Check [Defining options](/framework/docs/providers/aws/guide/plugins#defining-options) documentation for more info.
+
+If you rely on a plugin which does not set types (yet) please report the issue at its issue tracker.
+
+Starting with v4.0.0 any option extensions which does not have `type` defined will be communicated with a thrown error
+
 <a name="PROVIDER_IAM_SETTINGS_V3"><div>&nbsp;</div></a>
 
 ## Grouping IAM settings under `provider.iam`
diff --git a/lib/cli/commands-schema/resolve-final.js b/lib/cli/commands-schema/resolve-final.js
index bd712db57ed..6f46d89beb5 100644
--- a/lib/cli/commands-schema/resolve-final.js
+++ b/lib/cli/commands-schema/resolve-final.js
@@ -8,10 +8,9 @@ const serviceCommands = require('./service');
 const awsServiceCommands = require('./aws-service');
 const serviceOptions = require('./common-options/service');
 const awsServiceOptions = require('./common-options/aws-service');
-const { logWarning } = require('../../classes/Error');
-const { log } = require('@serverless/utils/log');
+const logDeprecation = require('../../utils/logDeprecation');
 
-module.exports = (loadedPlugins, { providerName }) => {
+module.exports = (loadedPlugins, { providerName, configuration }) => {
   const commands = new Map(providerName === 'aws' ? awsServiceCommands : serviceCommands);
 
   if (providerName !== 'aws') {
@@ -108,25 +107,18 @@ module.exports = (loadedPlugins, { providerName }) => {
   for (const loadedPlugin of loadedPlugins) resolveCommands(loadedPlugin, loadedPlugin);
 
   if (missingOptionTypes.size) {
-    logWarning(
+    logDeprecation(
+      'CLI_OPTIONS_SCHEMA_V3',
       'CLI options definitions were upgraded with "type" property (which could be one of "string", "boolean", "multiple"). ' +
         'Below listed plugins do not predefine type for introduced options:\n' +
         ` - ${Array.from(
           missingOptionTypes,
           ([plugin, optionNames]) =>
             `${plugin.constructor.name} for "${Array.from(optionNames).join('", "')}"`
-        ).join('\n - ')}\n\n` +
-        'Please report this issue in plugin issue tracker.'
-    );
-    log.warning(
-      'CLI options definitions were upgraded with "type" property (which could be one of "string", "boolean", "multiple"). ' +
-        'Plugins listed below do not predefine type for introduced options:\n' +
-        ` - ${Array.from(
-          missingOptionTypes,
-          ([plugin, optionNames]) =>
-            `${plugin.constructor.name} for "${Array.from(optionNames).join('", "')}"`
-        ).join('\n - ')}\n\n` +
-        'Please report this issue in issue tracker of the corresponding plugin.\n'
+        ).join('\n - ')}\n` +
+        'Please report this issue in plugin issue tracker.\n' +
+        'Starting with next major release, this will be communicated with a thrown error.',
+      { serviceConfig: configuration }
     );
   }
 

From 82b373e9c7787bad05751bfffdcd30b0173473ae Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 20 Dec 2021 09:08:54 +0100
Subject: [PATCH 0884/1101] refactor(AWS Deploy): Use change sets in CF
 deployments

---
 lib/plugins/aws/deploy/index.js               |  19 +-
 lib/plugins/aws/deploy/lib/cleanupS3Bucket.js |  27 +-
 lib/plugins/aws/deploy/lib/createStack.js     |  75 +--
 .../deploy/lib/ensure-valid-bucket-exists.js  |  81 +--
 .../aws/lib/get-create-change-set-params.js   |  80 +++
 .../aws/lib/get-execute-change-set-params.js  |  19 +
 lib/plugins/aws/lib/monitorStack.js           |   3 +-
 lib/plugins/aws/lib/naming.js                 |   4 +
 lib/plugins/aws/lib/updateStack.js            | 188 ++----
 .../aws/lib/wait-for-change-set-creation.js   |  46 ++
 lib/plugins/aws/rollback.js                   |  14 +-
 .../aws/utils/get-monitoring-frequency.js     |   5 +
 .../utils/is-change-set-without-changes.js    |  15 +
 .../unit/lib/plugins/aws/deploy/index.test.js | 634 +++++++++++-------
 .../aws/deploy/lib/createStack.test.js        | 299 ---------
 test/unit/lib/plugins/aws/lib/naming.test.js  |  16 +
 .../lib/plugins/aws/lib/updateStack.test.js   | 311 ---------
 .../apiGateway/lib/hack/updateStage.test.js   |  10 +-
 18 files changed, 779 insertions(+), 1067 deletions(-)
 create mode 100644 lib/plugins/aws/lib/get-create-change-set-params.js
 create mode 100644 lib/plugins/aws/lib/get-execute-change-set-params.js
 create mode 100644 lib/plugins/aws/lib/wait-for-change-set-creation.js
 create mode 100644 lib/plugins/aws/utils/get-monitoring-frequency.js
 create mode 100644 lib/plugins/aws/utils/is-change-set-without-changes.js
 delete mode 100644 test/unit/lib/plugins/aws/deploy/lib/createStack.test.js
 delete mode 100644 test/unit/lib/plugins/aws/lib/updateStack.test.js

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index b2eab3602e3..bba41727230 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -7,6 +7,9 @@ const setBucketName = require('../lib/setBucketName');
 const checkForChanges = require('./lib/checkForChanges');
 const monitorStack = require('../lib/monitorStack');
 const checkIfBucketExists = require('../lib/check-if-bucket-exists');
+const getCreateChangeSetParams = require('../lib/get-create-change-set-params');
+const getExecuteChangeSetParams = require('../lib/get-execute-change-set-params');
+const waitForChangeSetCreation = require('../lib/wait-for-change-set-creation');
 const createStack = require('./lib/createStack');
 const cleanupS3Bucket = require('./lib/cleanupS3Bucket');
 const uploadArtifacts = require('./lib/uploadArtifacts');
@@ -42,7 +45,10 @@ class AwsDeploy {
       validateTemplate,
       updateStack,
       monitorStack,
-      checkIfBucketExists
+      checkIfBucketExists,
+      waitForChangeSetCreation,
+      getCreateChangeSetParams,
+      getExecuteChangeSetParams
     );
 
     this.getFileStats = memoize(this.getFileStats.bind(this), { promise: true });
@@ -194,6 +200,17 @@ class AwsDeploy {
           );
           return;
         }
+        if (this.serverless.service.provider.deploymentWithEmptyChangeSet) {
+          log.notice();
+          log.notice.skip(
+            `Change set did not include any changes to be deployed. ${style.aside(
+              `(${Math.floor(
+                (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+              )}s)`
+            )}`
+          );
+          return;
+        }
         log.notice();
         log.notice.success(
           `Service deployed to stack ${this.serverless
diff --git a/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js b/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
index 319bd143998..f7e6d8dd3bd 100644
--- a/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
+++ b/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
@@ -30,7 +30,6 @@ module.exports = {
   async removeObjects(objectsToRemove) {
     if (!objectsToRemove || !objectsToRemove.length) return;
     legacy.log('Removing old service artifacts from S3...');
-    log.info('Removing old service artifacts from S3');
     await this.provider.request('S3', 'deleteObjects', {
       Bucket: this.bucketName,
       Delete: { Objects: objectsToRemove },
@@ -38,7 +37,31 @@ module.exports = {
   },
 
   async cleanupS3Bucket() {
-    const objectsToRemove = await this.getObjectsToRemove();
+    if (this.serverless.service.provider.deploymentWithEmptyChangeSet) {
+      log.info('Removing unnecessary service artifacts from S3');
+      await this.cleanupArtifactsForEmptyChangeSet();
+    } else {
+      log.info('Removing old service artifacts from S3');
+      const objectsToRemove = await this.getObjectsToRemove();
+      await this.removeObjects(objectsToRemove);
+    }
+  },
+
+  async cleanupArtifactsForEmptyChangeSet() {
+    const response = await this.provider.request('S3', 'listObjectsV2', {
+      Bucket: this.bucketName,
+      Prefix: this.serverless.service.package.artifactDirectoryName,
+    });
+    const service = this.serverless.service.service;
+    const stage = this.provider.getStage();
+    const deploymentPrefix = this.provider.getDeploymentPrefix();
+
+    const objectsToRemove = getS3ObjectsFromStacks(
+      findAndGroupDeployments(response, deploymentPrefix, service, stage),
+      deploymentPrefix,
+      service,
+      stage
+    );
     await this.removeObjects(objectsToRemove);
   },
 };
diff --git a/lib/plugins/aws/deploy/lib/createStack.js b/lib/plugins/aws/deploy/lib/createStack.js
index 0f9a4789ee8..4eb6aaf7d51 100644
--- a/lib/plugins/aws/deploy/lib/createStack.js
+++ b/lib/plugins/aws/deploy/lib/createStack.js
@@ -3,6 +3,7 @@
 const BbPromise = require('bluebird');
 const ServerlessError = require('../../../../serverless-error');
 const { legacy, progress, log } = require('@serverless/utils/log');
+const isChangeSetWithoutChanges = require('../../utils/is-change-set-without-changes');
 
 module.exports = {
   async create() {
@@ -10,58 +11,42 @@ module.exports = {
     legacy.log('Creating Stack...');
     progress.get('main').notice('Creating CloudFormation stack', { isMainEvent: true });
     const stackName = this.provider.naming.getStackName();
+    const changeSetName = this.provider.naming.getStackChangeSetName();
+    const createChangeSetParams = this.getCreateChangeSetParams({
+      changeSetType: 'CREATE',
+      templateBody: this.serverless.service.provider.coreCloudFormationTemplate,
+    });
 
-    let stackTags = { STAGE: this.provider.getStage() };
+    const executeChangeSetParams = this.getExecuteChangeSetParams();
 
-    // Merge additional stack tags
-    if (this.serverless.service.provider.stackTags) {
-      const customKeys = Object.keys(this.serverless.service.provider.stackTags);
-      const collisions = Object.keys(stackTags).filter((defaultKey) =>
-        customKeys.some((key) => defaultKey.toLowerCase() === key.toLowerCase())
-      );
+    // Create new change set
+    log.info('Creating new change set');
+    const changeSet = await this.provider.request(
+      'CloudFormation',
+      'createChangeSet',
+      createChangeSetParams
+    );
 
-      // Delete collisions upfront
-      for (const key of collisions) {
-        delete stackTags[key];
-      }
+    // Wait for changeset to be created
+    log.info('Waiting for new change set to be created');
+    const changeSetDescription = await this.waitForChangeSetCreation(changeSetName, stackName);
 
-      stackTags = Object.assign(stackTags, this.serverless.service.provider.stackTags);
-    }
-
-    const params = {
-      StackName: stackName,
-      OnFailure: 'DELETE',
-      Capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
-      Parameters: [],
-      TemplateBody: JSON.stringify(this.serverless.service.provider.coreCloudFormationTemplate),
-      Tags: Object.keys(stackTags).map((key) => ({ Key: key, Value: stackTags[key] })),
-    };
-
-    if (
-      this.serverless.service.provider.compiledCloudFormationTemplate &&
-      this.serverless.service.provider.compiledCloudFormationTemplate.Transform
-    ) {
-      params.Capabilities.push('CAPABILITY_AUTO_EXPAND');
-    }
-
-    const customDeploymentRole = this.provider.getCustomDeploymentRole();
-    if (customDeploymentRole) {
-      params.RoleARN = customDeploymentRole;
-    }
-
-    if (this.serverless.service.provider.notificationArns) {
-      params.NotificationARNs = this.serverless.service.provider.notificationArns;
-    }
-
-    if (this.serverless.service.provider.disableRollback) {
-      delete params.OnFailure;
-      params.DisableRollback = this.serverless.service.provider.disableRollback;
+    // Check if stack has changes
+    if (isChangeSetWithoutChanges(changeSetDescription)) {
+      // Cleanup changeset when it does not include any changes
+      log.info('Created change set does not include any changes, removing it');
+      await this.provider.request('CloudFormation', 'deleteChangeSet', {
+        StackName: stackName,
+        ChangeSetName: changeSetName,
+      });
+      this.serverless.service.provider.deploymentWithEmptyChangeSet = true;
+      return;
     }
 
     this.provider.didCreateService = true;
-    return this.provider
-      .request('CloudFormation', 'createStack', params)
-      .then((cfData) => this.monitorStack('create', cfData));
+    log.info('Executing created change set');
+    await this.provider.request('CloudFormation', 'executeChangeSet', executeChangeSetParams);
+    await this.monitorStack('create', changeSet);
   },
 
   async createStack() {
diff --git a/lib/plugins/aws/deploy/lib/ensure-valid-bucket-exists.js b/lib/plugins/aws/deploy/lib/ensure-valid-bucket-exists.js
index 28b22362e7b..56aba8165ee 100644
--- a/lib/plugins/aws/deploy/lib/ensure-valid-bucket-exists.js
+++ b/lib/plugins/aws/deploy/lib/ensure-valid-bucket-exists.js
@@ -69,6 +69,7 @@ module.exports = {
       'Deployment bucket not found. Updating stack to include deployment bucket definition.'
     );
     const stackName = this.provider.naming.getStackName();
+    const changeSetName = this.provider.naming.getStackChangeSetName();
 
     // This is situation where the bucket is not defined in the template at all
     // It covers the case where someone was using custom deployment bucket
@@ -94,68 +95,38 @@ module.exports = {
       templateBody.Outputs,
       this.serverless.service.provider.coreCloudFormationTemplate.Outputs
     );
-    let stackTags = { STAGE: this.provider.getStage() };
-
-    // Merge additional stack tags
-    if (this.serverless.service.provider.stackTags) {
-      const customKeys = Object.keys(this.serverless.service.provider.stackTags);
-      const collisions = Object.keys(stackTags).filter((defaultKey) =>
-        customKeys.some((key) => defaultKey.toLowerCase() === key.toLowerCase())
-      );
-
-      // Delete collisions upfront
-      for (const key of collisions) {
-        delete stackTags[key];
-      }
-
-      stackTags = Object.assign(stackTags, this.serverless.service.provider.stackTags);
-    }
-
-    const params = {
-      StackName: stackName,
-      Capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
-      Parameters: [],
-      Tags: Object.keys(stackTags).map((key) => ({ Key: key, Value: stackTags[key] })),
-      TemplateBody: JSON.stringify(templateBody),
-    };
-
-    const customDeploymentRole = this.provider.getCustomDeploymentRole();
-    if (customDeploymentRole) {
-      params.RoleARN = customDeploymentRole;
-    }
 
-    if (this.serverless.service.provider.notificationArns) {
-      params.NotificationARNs = this.serverless.service.provider.notificationArns;
-    }
+    const createChangeSetParams = this.getCreateChangeSetParams({
+      changeSetType: 'UPDATE',
+      templateBody,
+    });
 
-    if (this.serverless.service.provider.stackParameters) {
-      params.Parameters = this.serverless.service.provider.stackParameters;
-    }
+    const executeChangeSetParams = this.getExecuteChangeSetParams();
 
-    // Policy must have at least one statement, otherwise no updates would be possible at all
-    if (
-      this.serverless.service.provider.stackPolicy &&
-      Object.keys(this.serverless.service.provider.stackPolicy).length
-    ) {
-      params.StackPolicyBody = JSON.stringify({
-        Statement: this.serverless.service.provider.stackPolicy,
-      });
-    }
+    // Ensure that previous change set has been removed
+    await this.provider.request('CloudFormation', 'deleteChangeSet', {
+      StackName: stackName,
+      ChangeSetName: changeSetName,
+    });
 
-    if (this.serverless.service.provider.rollbackConfiguration) {
-      params.RollbackConfiguration = this.serverless.service.provider.rollbackConfiguration;
-    }
+    log.info('Creating new change set.');
+    // Create new change set
+    const changeSet = await this.provider.request(
+      'CloudFormation',
+      'createChangeSet',
+      createChangeSetParams
+    );
 
-    if (this.serverless.service.provider.disableRollback) {
-      params.DisableRollback = this.serverless.service.provider.disableRollback;
-    }
+    // Wait for changeset to be created
+    log.info('Waiting for new change set to be created.');
+    await this.waitForChangeSetCreation(changeSetName, stackName);
 
-    if (templateBody.Transform) {
-      params.Capabilities.push('CAPABILITY_AUTO_EXPAND');
-    }
+    // We are not checking if change set has any changes here because we already know that there was no deployment bucket
+    // that needs to be created as a part of change set
+    // If that would not be the case, that means we have a bug in the logic above
 
-    const cfData = await this.provider.request('CloudFormation', 'updateStack', params);
-    await this.monitorStack('update', cfData);
+    await this.provider.request('CloudFormation', 'executeChangeSet', executeChangeSetParams);
+    await this.monitorStack('update', changeSet);
     await this.setBucketName();
   },
 };
diff --git a/lib/plugins/aws/lib/get-create-change-set-params.js b/lib/plugins/aws/lib/get-create-change-set-params.js
new file mode 100644
index 00000000000..4d78461dad7
--- /dev/null
+++ b/lib/plugins/aws/lib/get-create-change-set-params.js
@@ -0,0 +1,80 @@
+'use strict';
+
+module.exports = {
+  getCreateChangeSetParams({ changeSetType, templateUrl, templateBody }) {
+    let stackTags = { STAGE: this.provider.getStage() };
+    const stackName = this.provider.naming.getStackName();
+    const changeSetName = this.provider.naming.getStackChangeSetName();
+
+    // Merge additional stack tags
+    if (this.serverless.service.provider.stackTags) {
+      const customKeys = Object.keys(this.serverless.service.provider.stackTags);
+      const collisions = Object.keys(stackTags).filter((defaultKey) =>
+        customKeys.some((key) => defaultKey.toLowerCase() === key.toLowerCase())
+      );
+
+      // Delete collisions upfront
+      for (const key of collisions) {
+        delete stackTags[key];
+      }
+
+      stackTags = Object.assign(stackTags, this.serverless.service.provider.stackTags);
+    }
+
+    const createChangeSetParams = {
+      StackName: stackName,
+      ChangeSetName: changeSetName,
+      ChangeSetType: changeSetType,
+      Capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
+      Parameters: [],
+      Tags: Object.keys(stackTags).map((key) => ({ Key: key, Value: stackTags[key] })),
+    };
+
+    if (templateUrl) {
+      createChangeSetParams.TemplateURL = templateUrl;
+    }
+
+    if (templateBody) {
+      createChangeSetParams.TemplateBody = JSON.stringify(templateBody);
+    }
+
+    if (
+      (templateUrl &&
+        this.serverless.service.provider.compiledCloudFormationTemplate &&
+        this.serverless.service.provider.compiledCloudFormationTemplate.Transform) ||
+      (templateBody && templateBody.Transform)
+    ) {
+      createChangeSetParams.Capabilities.push('CAPABILITY_AUTO_EXPAND');
+    }
+
+    const customDeploymentRole = this.provider.getCustomDeploymentRole();
+    if (customDeploymentRole) {
+      createChangeSetParams.RoleARN = customDeploymentRole;
+    }
+
+    if (this.serverless.service.provider.notificationArns) {
+      createChangeSetParams.NotificationARNs = this.serverless.service.provider.notificationArns;
+    }
+
+    if (this.serverless.service.provider.stackParameters) {
+      createChangeSetParams.Parameters = this.serverless.service.provider.stackParameters;
+    }
+
+    // Policy must have at least one statement, otherwise no updates would be possible at all
+    if (
+      this.serverless.service.provider.stackPolicy &&
+      Object.keys(this.serverless.service.provider.stackPolicy).length
+    ) {
+      createChangeSetParams.StackPolicyBody = JSON.stringify({
+        Statement: this.serverless.service.provider.stackPolicy,
+      });
+    }
+
+    if (this.serverless.service.provider.rollbackConfiguration) {
+      createChangeSetParams.RollbackConfiguration =
+        this.serverless.service.provider.rollbackConfiguration;
+    }
+
+    return createChangeSetParams;
+  },
+};
diff --git a/lib/plugins/aws/lib/get-execute-change-set-params.js b/lib/plugins/aws/lib/get-execute-change-set-params.js
new file mode 100644
index 00000000000..37cb21ebd32
--- /dev/null
+++ b/lib/plugins/aws/lib/get-execute-change-set-params.js
@@ -0,0 +1,19 @@
+'use strict';
+
+module.exports = {
+  getExecuteChangeSetParams() {
+    const stackName = this.provider.naming.getStackName();
+    const changeSetName = this.provider.naming.getStackChangeSetName();
+
+    const executeChangeSetParams = {
+      StackName: stackName,
+      ChangeSetName: changeSetName,
+    };
+
+    if (this.serverless.service.provider.disableRollback) {
+      executeChangeSetParams.DisableRollback = this.serverless.service.provider.disableRollback;
+    }
+
+    return executeChangeSetParams;
+  },
+};
diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js
index 087887a1328..178816e51de 100644
--- a/lib/plugins/aws/lib/monitorStack.js
+++ b/lib/plugins/aws/lib/monitorStack.js
@@ -6,6 +6,7 @@ const wait = require('timers-ext/promise/sleep');
 const identity = require('ext/function/identity');
 const ServerlessError = require('../../../serverless-error');
 const { log, legacy, style } = require('@serverless/utils/log');
+const getMonitoringFrequency = require('../utils/get-monitoring-frequency');
 
 const validStatuses = new Set(['CREATE_COMPLETE', 'UPDATE_COMPLETE', 'DELETE_COMPLETE']);
 
@@ -28,7 +29,7 @@ module.exports = {
     options,
     { loggedEventIds = new Set(), stackStatus = null, stackLatestError = null, firstEventId = null }
   ) {
-    return wait(options.frequency || process.env.SLS_AWS_MONITORING_FREQUENCY || 5000)
+    return wait(getMonitoringFrequency(options.frequency))
       .then(() =>
         this.provider
           .request('CloudFormation', 'describeStackEvents', { StackName: cfData.StackId })
diff --git a/lib/plugins/aws/lib/naming.js b/lib/plugins/aws/lib/naming.js
index c5d2d5e6a24..0fad307f649 100644
--- a/lib/plugins/aws/lib/naming.js
+++ b/lib/plugins/aws/lib/naming.js
@@ -58,6 +58,10 @@ module.exports = {
     return `${this.provider.serverless.service.service}-${this.provider.getStage()}`;
   },
 
+  getStackChangeSetName() {
+    return `${this.getStackName()}-change-set`;
+  },
+
   getServiceArtifactName() {
     return `${this.provider.serverless.service.service}.zip`;
   },
diff --git a/lib/plugins/aws/lib/updateStack.js b/lib/plugins/aws/lib/updateStack.js
index 729bd7c108b..f8bf8840bbd 100644
--- a/lib/plugins/aws/lib/updateStack.js
+++ b/lib/plugins/aws/lib/updateStack.js
@@ -2,9 +2,8 @@
 
 const BbPromise = require('bluebird');
 const getS3EndpointForRegion = require('../utils/getS3EndpointForRegion');
-const { legacy, progress } = require('@serverless/utils/log');
-
-const NO_UPDATE_MESSAGE = 'No updates are to be performed.';
+const { log, legacy, progress } = require('@serverless/utils/log');
+const isChangeSetWithoutChanges = require('../utils/is-change-set-without-changes');
 
 module.exports = {
   async createFallback() {
@@ -13,64 +12,47 @@ module.exports = {
     progress.get('main').notice('Creating CloudFormation stack', { isMainEvent: true });
 
     const stackName = this.provider.naming.getStackName();
-    let stackTags = { STAGE: this.provider.getStage() };
+    const changeSetName = this.provider.naming.getStackChangeSetName();
+
     const compiledTemplateFileName = this.provider.naming.getCompiledTemplateS3Suffix();
     const s3Endpoint = getS3EndpointForRegion(this.provider.getRegion());
     const templateUrl = `https://${s3Endpoint}/${this.bucketName}/${this.serverless.service.package.artifactDirectoryName}/${compiledTemplateFileName}`;
 
-    // Merge additional stack tags
-    if (this.serverless.service.provider.stackTags) {
-      const customKeys = Object.keys(this.serverless.service.provider.stackTags);
-      const collisions = Object.keys(stackTags).filter((defaultKey) =>
-        customKeys.some((key) => defaultKey.toLowerCase() === key.toLowerCase())
-      );
-
-      // Delete collisions upfront
-      for (const key of collisions) {
-        delete stackTags[key];
-      }
-
-      stackTags = Object.assign(stackTags, this.serverless.service.provider.stackTags);
-    }
-
-    const params = {
-      StackName: stackName,
-      OnFailure: 'DELETE',
-      Capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
-      Parameters: [],
-      TemplateURL: templateUrl,
-      Tags: Object.keys(stackTags).map((key) => ({ Key: key, Value: stackTags[key] })),
-    };
-
-    if (
-      this.serverless.service.provider.compiledCloudFormationTemplate &&
-      this.serverless.service.provider.compiledCloudFormationTemplate.Transform
-    ) {
-      params.Capabilities.push('CAPABILITY_AUTO_EXPAND');
-    }
-
-    const customDeploymentRole = this.provider.getCustomDeploymentRole();
-    if (customDeploymentRole) {
-      params.RoleARN = customDeploymentRole;
-    }
+    const createChangeSetParams = this.getCreateChangeSetParams({
+      changeSetType: 'CREATE',
+      templateUrl,
+    });
 
-    if (this.serverless.service.provider.notificationArns) {
-      params.NotificationARNs = this.serverless.service.provider.notificationArns;
-    }
+    const executeChangeSetParams = this.getExecuteChangeSetParams();
 
-    if (this.serverless.service.provider.stackParameters) {
-      params.Parameters = this.serverless.service.provider.stackParameters;
-    }
-
-    if (this.serverless.service.provider.disableRollback) {
-      delete params.OnFailure;
-      params.DisableRollback = this.serverless.service.provider.disableRollback;
+    // Create new change set
+    this.provider.didCreateService = true;
+    log.info('Creating new change set');
+    const changeSet = await this.provider.request(
+      'CloudFormation',
+      'createChangeSet',
+      createChangeSetParams
+    );
+
+    // Wait for changeset to be created
+    log.info('Waiting for new change set to be created');
+    const changeSetDescription = await this.waitForChangeSetCreation(changeSetName, stackName);
+
+    // Check if stack has changes
+    if (isChangeSetWithoutChanges(changeSetDescription)) {
+      // Cleanup changeset when it does not include any changes
+      log.info('Created change set does not include any changes, removing it');
+      await this.provider.request('CloudFormation', 'deleteChangeSet', {
+        StackName: stackName,
+        ChangeSetName: changeSetName,
+      });
+      this.serverless.service.provider.deploymentWithEmptyChangeSet = true;
+      return false;
     }
 
-    this.provider.didCreateService = true;
-    return this.provider
-      .request('CloudFormation', 'createStack', params)
-      .then((cfData) => this.monitorStack('create', cfData));
+    log.info('Executing created change set');
+    await this.provider.request('CloudFormation', 'executeChangeSet', executeChangeSetParams);
+    return await this.monitorStack('create', changeSet);
   },
 
   async update() {
@@ -80,80 +62,50 @@ module.exports = {
 
     legacy.log('Updating Stack...');
     const stackName = this.provider.naming.getStackName();
-    let stackTags = { STAGE: this.provider.getStage() };
-
-    // Merge additional stack tags
-    if (this.serverless.service.provider.stackTags) {
-      const customKeys = Object.keys(this.serverless.service.provider.stackTags);
-      const collisions = Object.keys(stackTags).filter((defaultKey) =>
-        customKeys.some((key) => defaultKey.toLowerCase() === key.toLowerCase())
-      );
-
-      // Delete collisions upfront
-      for (const key of collisions) {
-        delete stackTags[key];
-      }
-
-      stackTags = Object.assign(stackTags, this.serverless.service.provider.stackTags);
-    }
+    const changeSetName = this.provider.naming.getStackChangeSetName();
 
-    const params = {
-      StackName: stackName,
-      Capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
-      Parameters: [],
-      TemplateURL: templateUrl,
-      Tags: Object.keys(stackTags).map((key) => ({ Key: key, Value: stackTags[key] })),
-    };
-
-    if (
-      this.serverless.service.provider.compiledCloudFormationTemplate &&
-      this.serverless.service.provider.compiledCloudFormationTemplate.Transform
-    ) {
-      params.Capabilities.push('CAPABILITY_AUTO_EXPAND');
-    }
-
-    const customDeploymentRole = this.provider.getCustomDeploymentRole();
-    if (customDeploymentRole) {
-      params.RoleARN = customDeploymentRole;
-    }
+    const createChangeSetParams = this.getCreateChangeSetParams({
+      changeSetType: 'UPDATE',
+      templateUrl,
+    });
 
-    if (this.serverless.service.provider.notificationArns) {
-      params.NotificationARNs = this.serverless.service.provider.notificationArns;
-    }
+    const executeChangeSetParams = this.getExecuteChangeSetParams();
 
-    if (this.serverless.service.provider.stackParameters) {
-      params.Parameters = this.serverless.service.provider.stackParameters;
-    }
+    // Ensure that previous change set has been removed
+    await this.provider.request('CloudFormation', 'deleteChangeSet', {
+      StackName: stackName,
+      ChangeSetName: changeSetName,
+    });
 
-    // Policy must have at least one statement, otherwise no updates would be possible at all
-    if (
-      this.serverless.service.provider.stackPolicy &&
-      Object.keys(this.serverless.service.provider.stackPolicy).length
-    ) {
-      params.StackPolicyBody = JSON.stringify({
-        Statement: this.serverless.service.provider.stackPolicy,
+    // Create new change set
+    log.info('Creating new change set');
+    const changeSet = await this.provider.request(
+      'CloudFormation',
+      'createChangeSet',
+      createChangeSetParams
+    );
+
+    // Wait for changeset to be created
+    log.info('Waiting for new change set to be created');
+    const changeSetDescription = await this.waitForChangeSetCreation(changeSetName, stackName);
+
+    // Check if stack has changes
+    if (isChangeSetWithoutChanges(changeSetDescription)) {
+      // Cleanup changeset when it does not include any changes
+      log.info('Created change set does not include any changes, removing it');
+      await this.provider.request('CloudFormation', 'deleteChangeSet', {
+        StackName: stackName,
+        ChangeSetName: changeSetName,
       });
+      this.serverless.service.provider.deploymentWithEmptyChangeSet = true;
+      return false;
     }
 
-    if (this.serverless.service.provider.rollbackConfiguration) {
-      params.RollbackConfiguration = this.serverless.service.provider.rollbackConfiguration;
-    }
-
-    if (this.serverless.service.provider.disableRollback) {
-      params.DisableRollback = this.serverless.service.provider.disableRollback;
-    }
+    log.info('Executing created change set');
+    await this.provider.request('CloudFormation', 'executeChangeSet', executeChangeSetParams);
 
-    let cfData;
-    try {
-      cfData = await this.provider.request('CloudFormation', 'updateStack', params);
-    } catch (e) {
-      if (e.message.includes(NO_UPDATE_MESSAGE)) {
-        return false;
-      }
-      throw e;
-    }
+    await this.monitorStack('update', changeSet);
 
-    await this.monitorStack('update', cfData);
     return true;
   },
 
diff --git a/lib/plugins/aws/lib/wait-for-change-set-creation.js b/lib/plugins/aws/lib/wait-for-change-set-creation.js
new file mode 100644
index 00000000000..499fe40c2ca
--- /dev/null
+++ b/lib/plugins/aws/lib/wait-for-change-set-creation.js
@@ -0,0 +1,46 @@
+'use strict';
+
+const wait = require('timers-ext/promise/sleep');
+const ServerlessError = require('../../../serverless-error');
+const isChangeSetWithoutChanges = require('../utils/is-change-set-without-changes');
+const { log } = require('@serverless/utils/log');
+const getMonitoringFrequency = require('../utils/get-monitoring-frequency');
+
+module.exports = {
+  async waitForChangeSetCreation(changeSetName, stackName) {
+    const params = {
+      ChangeSetName: changeSetName,
+      StackName: stackName,
+    };
+
+    const callWithRetry = async () => {
+      const changeSetDescription = await this.provider.request(
+        'CloudFormation',
+        'describeChangeSet',
+        params
+      );
+      if (
+        changeSetDescription.Status === 'CREATE_COMPLETE' ||
+        isChangeSetWithoutChanges(changeSetDescription)
+      ) {
+        return changeSetDescription;
+      }
+
+      if (
+        changeSetDescription.Status === 'CREATE_PENDING' ||
+        changeSetDescription.Status === 'CREATE_IN_PROGRESS'
+      ) {
+        log.info('Change Set did not reach desired state, retrying');
+        await wait(getMonitoringFrequency());
+        return await callWithRetry();
+      }
+
+      throw new ServerlessError(
+        `Could not create Change Set "${changeSetDescription.ChangeSetName}" due to: ${changeSetDescription.StatusReason}`,
+        'AWS_CLOUD_FORMATION_CHANGE_SET_CREATION_FAILED'
+      );
+    };
+
+    return await callWithRetry();
+  },
+};
diff --git a/lib/plugins/aws/rollback.js b/lib/plugins/aws/rollback.js
index e9c12eae9ce..5eb228329a0 100644
--- a/lib/plugins/aws/rollback.js
+++ b/lib/plugins/aws/rollback.js
@@ -3,6 +3,9 @@ const validate = require('./lib/validate');
 const setBucketName = require('./lib/setBucketName');
 const updateStack = require('./lib/updateStack');
 const monitorStack = require('./lib/monitorStack');
+const waitForChangeSetCreation = require('./lib/wait-for-change-set-creation');
+const getCreateChangeSetParams = require('./lib/get-create-change-set-params');
+const getExecuteChangeSetParams = require('./lib/get-execute-change-set-params');
 const findAndGroupDeployments = require('./utils/findAndGroupDeployments');
 const ServerlessError = require('../../serverless-error');
 const { style, log, progress, legacy } = require('@serverless/utils/log');
@@ -15,7 +18,16 @@ class AwsRollback {
     this.options = options;
     this.provider = this.serverless.getProvider('aws');
 
-    Object.assign(this, validate, setBucketName, updateStack, monitorStack);
+    Object.assign(
+      this,
+      validate,
+      setBucketName,
+      updateStack,
+      monitorStack,
+      waitForChangeSetCreation,
+      getCreateChangeSetParams,
+      getExecuteChangeSetParams
+    );
 
     this.hooks = {
       'before:rollback:initialize': async () => this.validate(),
diff --git a/lib/plugins/aws/utils/get-monitoring-frequency.js b/lib/plugins/aws/utils/get-monitoring-frequency.js
new file mode 100644
index 00000000000..8c978df21c4
--- /dev/null
+++ b/lib/plugins/aws/utils/get-monitoring-frequency.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = (frequency = null) => {
+  return frequency || process.env.SLS_AWS_MONITORING_FREQUENCY || 5000;
+};
diff --git a/lib/plugins/aws/utils/is-change-set-without-changes.js b/lib/plugins/aws/utils/is-change-set-without-changes.js
new file mode 100644
index 00000000000..3b1a33201d5
--- /dev/null
+++ b/lib/plugins/aws/utils/is-change-set-without-changes.js
@@ -0,0 +1,15 @@
+'use strict';
+
+module.exports = (changeSetDescription) => {
+  const errorMessages = [
+    'No updates are to be performed.',
+    "The submitted information didn't contain changes.",
+  ];
+
+  return (
+    changeSetDescription.Status === 'FAILED' &&
+    errorMessages.some(
+      (msg) => changeSetDescription.StatusReason && changeSetDescription.StatusReason.includes(msg)
+    )
+  );
+};
diff --git a/test/unit/lib/plugins/aws/deploy/index.test.js b/test/unit/lib/plugins/aws/deploy/index.test.js
index 72c009a8f23..646761c1f90 100644
--- a/test/unit/lib/plugins/aws/deploy/index.test.js
+++ b/test/unit/lib/plugins/aws/deploy/index.test.js
@@ -1,226 +1,14 @@
 'use strict';
 
-/* eslint-disable no-unused-expressions */
-
-const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const AwsDeploy = require('../../../../../../lib/plugins/aws/deploy/index');
 const chai = require('chai');
-const Serverless = require('../../../../../../lib/Serverless');
 const sinon = require('sinon');
-const path = require('path');
 
 const runServerless = require('../../../../../utils/run-serverless');
 
-// Configure chai
 chai.use(require('chai-as-promised'));
 chai.use(require('sinon-chai'));
 const expect = require('chai').expect;
 
-describe('AwsDeploy', () => {
-  let awsDeploy;
-  let serverless;
-  let options;
-
-  beforeEach(() => {
-    serverless = new Serverless({ commands: [], options: {} });
-    options = {
-      stage: 'dev',
-      region: 'us-east-1',
-    };
-    serverless.setProvider('aws', new AwsProvider(serverless, options));
-    serverless.serviceDir = 'foo';
-    awsDeploy = new AwsDeploy(serverless, options);
-  });
-
-  describe('#constructor()', () => {
-    it('should set the serverless instance', () => {
-      expect(awsDeploy.serverless).to.equal(serverless);
-    });
-
-    it('should set options', () => {
-      expect(awsDeploy.options).to.equal(options);
-    });
-
-    it('should set the service path if provided', () => {
-      expect(awsDeploy.servicePath).to.equal('foo');
-    });
-
-    it('should default to an empty service path if not provided', () => {
-      serverless.serviceDir = false;
-      awsDeploy = new AwsDeploy(serverless, options);
-
-      expect(awsDeploy.servicePath).to.equal('');
-    });
-
-    it('should use the options package path if provided', () => {
-      options.package = 'package-options';
-      awsDeploy = new AwsDeploy(serverless, options);
-
-      expect(awsDeploy.packagePath).to.equal('package-options');
-    });
-
-    it('should use the services package path if provided', () => {
-      serverless.service = {
-        package: {
-          path: 'package-service',
-        },
-      };
-      awsDeploy = new AwsDeploy(serverless, options);
-
-      expect(awsDeploy.packagePath).to.equal('package-service');
-    });
-
-    it('should default to the .serverless directory as the package path', () => {
-      expect(awsDeploy.packagePath).to.equal(path.join('foo', '.serverless'));
-    });
-
-    it('should set the provider variable to an instance of AwsProvider', () =>
-      expect(awsDeploy.provider).to.be.instanceof(AwsProvider));
-
-    it('should have commands', () => expect(awsDeploy.commands).to.be.not.empty);
-
-    it('should have hooks', () => expect(awsDeploy.hooks).to.be.not.empty);
-  });
-
-  describe('hooks', () => {
-    let spawnStub;
-
-    beforeEach(() => {
-      spawnStub = sinon.stub(serverless.pluginManager, 'spawn');
-    });
-
-    afterEach(() => {
-      serverless.pluginManager.spawn.restore();
-    });
-
-    describe('"before:deploy:deploy" hook', () => {
-      let extendedValidateStub;
-      let spawnPackageStub;
-      let spawnAwsCommonValidateStub;
-      let spawnAwsCommonMoveArtifactsToTemp;
-
-      beforeEach(() => {
-        extendedValidateStub = sinon.stub(awsDeploy, 'extendedValidate').resolves();
-        spawnPackageStub = spawnStub.withArgs('package').resolves();
-        spawnAwsCommonValidateStub = spawnStub.withArgs('aws:common:validate').resolves();
-        spawnAwsCommonMoveArtifactsToTemp = spawnStub
-          .withArgs('aws:common:moveArtifactsToTemp')
-          .resolves();
-      });
-
-      afterEach(() => {
-        awsDeploy.extendedValidate.restore();
-      });
-
-      it('should use the default packaging mechanism if no packaging config is provided', () => {
-        awsDeploy.options.package = false;
-        awsDeploy.serverless.service.package.path = false;
-
-        return awsDeploy.hooks['before:deploy:deploy']().then(() => {
-          expect(spawnAwsCommonValidateStub.calledOnce).to.equal(true);
-          expect(extendedValidateStub.calledAfter(spawnAwsCommonValidateStub)).to.equal(true);
-          expect(spawnAwsCommonMoveArtifactsToTemp.calledOnce).to.equal(false);
-        });
-      });
-
-      it('should move the artifacts to the tmp dir if options based config is provided', () => {
-        awsDeploy.options.package = true;
-        awsDeploy.serverless.service.package.path = false;
-
-        return awsDeploy.hooks['before:deploy:deploy']().then(() => {
-          expect(spawnAwsCommonValidateStub.calledOnce).to.equal(true);
-          expect(
-            spawnAwsCommonMoveArtifactsToTemp.calledAfter(spawnAwsCommonValidateStub)
-          ).to.equal(true);
-          expect(extendedValidateStub.calledAfter(spawnAwsCommonMoveArtifactsToTemp)).to.equal(
-            true
-          );
-          expect(spawnPackageStub.calledOnce).to.equal(false);
-        });
-      });
-
-      it('should move the artifacts to the tmp dir if service based config is provided', () => {
-        awsDeploy.options.package = false;
-        awsDeploy.serverless.service.package.path = true;
-
-        return awsDeploy.hooks['before:deploy:deploy']().then(() => {
-          expect(spawnAwsCommonValidateStub.calledOnce).to.equal(true);
-          expect(
-            spawnAwsCommonMoveArtifactsToTemp.calledAfter(spawnAwsCommonValidateStub)
-          ).to.equal(true);
-          expect(extendedValidateStub.calledAfter(spawnAwsCommonMoveArtifactsToTemp)).to.equal(
-            true
-          );
-          expect(spawnPackageStub.calledOnce).to.equal(false);
-        });
-      });
-    });
-
-    it('should run "deploy:finalize" hook', () => {
-      const spawnAwsDeployFinalizeStub = spawnStub.withArgs('aws:deploy:finalize').resolves();
-
-      return awsDeploy.hooks['deploy:finalize']().then(() => {
-        expect(spawnAwsDeployFinalizeStub.calledOnce).to.equal(true);
-      });
-    });
-
-    describe('"aws:deploy:finalize:cleanup" hook', () => {
-      let cleanupS3BucketStub;
-      let spawnAwsCommonCleanupTempDirStub;
-
-      beforeEach(() => {
-        cleanupS3BucketStub = sinon.stub(awsDeploy, 'cleanupS3Bucket').resolves();
-        spawnAwsCommonCleanupTempDirStub = spawnStub
-          .withArgs('aws:common:cleanupTempDir')
-          .resolves();
-      });
-
-      afterEach(() => {
-        awsDeploy.cleanupS3Bucket.restore();
-      });
-
-      it('should do the default cleanup if no packaging config is used', () => {
-        awsDeploy.options.package = false;
-        awsDeploy.serverless.service.package.path = false;
-
-        return awsDeploy.hooks['aws:deploy:finalize:cleanup']().then(() => {
-          expect(cleanupS3BucketStub.calledOnce).to.equal(true);
-          expect(spawnAwsCommonCleanupTempDirStub.calledOnce).to.equal(false);
-        });
-      });
-
-      it('should cleanup the tmp dir if options based packaging config is used', () => {
-        awsDeploy.options.package = true;
-        awsDeploy.serverless.service.package.path = false;
-
-        return awsDeploy.hooks['aws:deploy:finalize:cleanup']().then(() => {
-          expect(cleanupS3BucketStub.calledOnce).to.equal(true);
-          expect(spawnAwsCommonCleanupTempDirStub.calledAfter(cleanupS3BucketStub)).to.equal(true);
-        });
-      });
-
-      it('should cleanup the tmp dir if service based packaging config is used', () => {
-        awsDeploy.options.package = false;
-        awsDeploy.serverless.service.package.path = true;
-
-        return awsDeploy.hooks['aws:deploy:finalize:cleanup']().then(() => {
-          expect(cleanupS3BucketStub.calledOnce).to.equal(true);
-          expect(spawnAwsCommonCleanupTempDirStub.calledAfter(cleanupS3BucketStub)).to.equal(true);
-        });
-      });
-
-      it('should not cleanup if a deployment was not necessary', () => {
-        awsDeploy.serverless.service.provider.shouldNotDeploy = true;
-
-        return awsDeploy.hooks['aws:deploy:finalize:cleanup']().then(() => {
-          expect(cleanupS3BucketStub.called).to.equal(false);
-          expect(spawnAwsCommonCleanupTempDirStub.called).to.equal(false);
-        });
-      });
-    });
-  });
-});
-
 describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
   const baseAwsRequestStubMap = {
     STS: {
@@ -233,6 +21,84 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
     },
   };
 
+  it('with nonexistent stack - first deploy with custom deployment bucket', async () => {
+    const describeStacksStub = sinon
+      .stub()
+      .onFirstCall()
+      .throws('error', 'stack does not exist')
+      .onSecondCall()
+      .resolves({ Stacks: [{}] });
+    const createChangeSetStub = sinon.stub().resolves({});
+    const executeChangeSetStub = sinon.stub().resolves({});
+    const s3UploadStub = sinon.stub().resolves();
+    const deleteObjectsStub = sinon.stub().resolves({});
+    const awsRequestStubMap = {
+      ...baseAwsRequestStubMap,
+      ECR: {
+        describeRepositories: sinon.stub().throws({
+          providerError: { code: 'RepositoryNotFoundException' },
+        }),
+      },
+      S3: {
+        deleteObjects: deleteObjectsStub,
+        listObjectsV2: { Contents: [] },
+        upload: s3UploadStub,
+        headBucket: {},
+        getBucketLocation: () => {
+          return {
+            LocationConstraint: 'us-east-1',
+          };
+        },
+      },
+      CloudFormation: {
+        describeStacks: describeStacksStub,
+        createChangeSet: createChangeSetStub,
+        executeChangeSet: executeChangeSetStub,
+        deleteChangeSet: {},
+        describeChangeSet: {
+          ChangeSetName: 'new-service-dev-change-set',
+          ChangeSetId: 'some-change-set-id',
+          StackName: 'new-service-dev',
+          Status: 'CREATE_COMPLETE',
+        },
+        describeStackEvents: {
+          StackEvents: [
+            {
+              EventId: '1e2f3g4h',
+              StackName: 'new-service-dev',
+              LogicalResourceId: 'new-service-dev',
+              ResourceType: 'AWS::CloudFormation::Stack',
+              Timestamp: new Date(),
+              ResourceStatus: 'CREATE_COMPLETE',
+            },
+          ],
+        },
+        validateTemplate: {},
+        listStackResources: {},
+      },
+    };
+
+    await runServerless({
+      fixture: 'function',
+      command: 'deploy',
+      awsRequestStubMap,
+      configExt: {
+        provider: {
+          deploymentBucket: 'existing-s3-bucket',
+        },
+      },
+    });
+
+    expect(createChangeSetStub).to.be.calledOnce;
+    expect(createChangeSetStub.getCall(0).args[0].ChangeSetType).to.equal('CREATE');
+    expect(executeChangeSetStub).to.be.calledOnce;
+    const wasCloudFormationTemplateUploadInitiated = s3UploadStub.args.some((call) =>
+      call[0].Key.endsWith('compiled-cloudformation-template.json')
+    );
+    expect(wasCloudFormationTemplateUploadInitiated).to.be.true;
+    expect(deleteObjectsStub).not.to.be.called;
+  });
+
   it('with nonexistent stack - first deploy', async () => {
     const describeStacksStub = sinon
       .stub()
@@ -240,9 +106,9 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
       .throws('error', 'stack does not exist')
       .onSecondCall()
       .resolves({ Stacks: [{}] });
-    const createStackStub = sinon.stub().resolves({});
+    const createChangeSetStub = sinon.stub().resolves({});
+    const executeChangeSetStub = sinon.stub().resolves({});
     const s3UploadStub = sinon.stub().resolves();
-    const updateStackStub = sinon.stub().resolves({});
     const deleteObjectsStub = sinon.stub().resolves({});
     const awsRequestStubMap = {
       ...baseAwsRequestStubMap,
@@ -259,7 +125,15 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
       },
       CloudFormation: {
         describeStacks: describeStacksStub,
-        createStack: createStackStub,
+        createChangeSet: createChangeSetStub,
+        executeChangeSet: executeChangeSetStub,
+        deleteChangeSet: {},
+        describeChangeSet: {
+          ChangeSetName: 'new-service-dev-change-set',
+          ChangeSetId: 'some-change-set-id',
+          StackName: 'new-service-dev',
+          Status: 'CREATE_COMPLETE',
+        },
         describeStackEvents: {
           StackEvents: [
             {
@@ -276,7 +150,6 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
           StackResourceDetail: { PhysicalResourceId: 's3-bucket-resource' },
         },
         validateTemplate: {},
-        updateStack: updateStackStub,
         listStackResources: {},
       },
     };
@@ -287,20 +160,22 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
       awsRequestStubMap,
     });
 
-    expect(createStackStub).to.be.calledOnce;
+    expect(createChangeSetStub).to.be.calledTwice;
+    expect(createChangeSetStub.getCall(0).args[0].ChangeSetType).to.equal('CREATE');
+    expect(createChangeSetStub.getCall(1).args[0].ChangeSetType).to.equal('UPDATE');
+    expect(executeChangeSetStub).to.be.calledTwice;
     const wasCloudFormationTemplateUploadInitiated = s3UploadStub.args.some((call) =>
       call[0].Key.endsWith('compiled-cloudformation-template.json')
     );
     expect(wasCloudFormationTemplateUploadInitiated).to.be.true;
-    expect(updateStackStub).to.be.calledOnce;
     expect(deleteObjectsStub).not.to.be.called;
   });
 
   it('with existing stack - subsequent deploy', async () => {
     const s3BucketPrefix = 'serverless/test-aws-deploy-with-existing-stack/dev';
-    const createStackStub = sinon.stub().resolves({});
     const s3UploadStub = sinon.stub().resolves();
-    const updateStackStub = sinon.stub().resolves({});
+    const createChangeSetStub = sinon.stub().resolves({});
+    const executeChangeSetStub = sinon.stub().resolves({});
     const listObjectsV2Stub = sinon
       .stub()
       .onFirstCall()
@@ -338,7 +213,15 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
       },
       CloudFormation: {
         describeStacks: { Stacks: [{}] },
-        createStack: createStackStub,
+        deleteChangeSet: {},
+        createChangeSet: createChangeSetStub,
+        executeChangeSet: executeChangeSetStub,
+        describeChangeSet: {
+          ChangeSetName: 'new-service-dev-change-set',
+          ChangeSetId: 'some-change-set-id',
+          StackName: 'new-service-dev',
+          Status: 'CREATE_COMPLETE',
+        },
         describeStackEvents: {
           StackEvents: [
             {
@@ -355,7 +238,6 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
           StackResourceDetail: { PhysicalResourceId: 's3-bucket-resource' },
         },
         validateTemplate: {},
-        updateStack: updateStackStub,
         listStackResources: {},
       },
     };
@@ -375,12 +257,13 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
       },
     });
 
-    expect(createStackStub).to.not.be.called;
+    expect(createChangeSetStub).to.be.calledOnce;
+    expect(createChangeSetStub.getCall(0).args[0].ChangeSetType).to.equal('UPDATE');
+    expect(executeChangeSetStub).to.be.calledOnce;
     const wasCloudFormationTemplateUploadInitiated = s3UploadStub.args.some((call) =>
       call[0].Key.endsWith('compiled-cloudformation-template.json')
     );
     expect(wasCloudFormationTemplateUploadInitiated).to.be.true;
-    expect(updateStackStub).to.be.calledOnce;
     expect(deleteObjectsStub).to.be.calledWithExactly({
       Bucket: 's3-bucket-resource',
       Delete: {
@@ -394,10 +277,127 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
     });
   });
 
+  it('with existing stack - subsequent deploy with empty changeset', async () => {
+    const createChangeSetStub = sinon.stub().resolves({});
+    const executeChangeSetStub = sinon.stub().resolves({});
+    const deleteChangeSetStub = sinon.stub().resolves();
+    const deleteObjectsStub = sinon.stub().resolves();
+    let objectsToRemove;
+    const listObjectsV2Stub = sinon
+      .stub()
+      .onFirstCall()
+      .resolves({ Contents: [] })
+      .onSecondCall()
+      .callsFake((params) => {
+        objectsToRemove = [
+          {
+            Key: `${params.Prefix}/compiled-cloudformation-template.json`,
+          },
+          {
+            Key: `${params.Prefix}/artifact.zip`,
+          },
+        ];
+        return {
+          Contents: objectsToRemove,
+        };
+      });
+    const awsRequestStubMap = {
+      ...baseAwsRequestStubMap,
+      ECR: {
+        describeRepositories: sinon.stub().throws({
+          providerError: { code: 'RepositoryNotFoundException' },
+        }),
+      },
+      S3: {
+        deleteObjects: deleteObjectsStub,
+        listObjectsV2: listObjectsV2Stub,
+        upload: {},
+        headBucket: {},
+      },
+      CloudFormation: {
+        describeStacks: { Stacks: [{}] },
+        deleteChangeSet: deleteChangeSetStub,
+        createChangeSet: createChangeSetStub,
+        executeChangeSet: executeChangeSetStub,
+        describeChangeSet: {
+          ChangeSetName: 'new-service-dev-change-set',
+          ChangeSetId: 'some-change-set-id',
+          StackName: 'new-service-dev',
+          Status: 'FAILED',
+          StatusReason: 'No updates are to be performed.',
+        },
+        describeStackResource: {
+          StackResourceDetail: { PhysicalResourceId: 's3-bucket-resource' },
+        },
+        validateTemplate: {},
+        listStackResources: {},
+      },
+    };
+
+    await runServerless({
+      fixture: 'function',
+      command: 'deploy',
+      awsRequestStubMap,
+    });
+
+    expect(createChangeSetStub).to.be.calledOnce;
+    expect(createChangeSetStub.getCall(0).args[0].ChangeSetType).to.equal('UPDATE');
+    expect(executeChangeSetStub).not.to.be.called;
+    expect(deleteChangeSetStub).to.be.calledTwice;
+    expect(deleteObjectsStub).to.be.calledWithExactly({
+      Bucket: 's3-bucket-resource',
+      Delete: { Objects: objectsToRemove },
+    });
+  });
+
+  it('should fail if cannot create a change set', async () => {
+    const awsRequestStubMap = {
+      ...baseAwsRequestStubMap,
+      ECR: {
+        describeRepositories: sinon.stub().throws({
+          providerError: { code: 'RepositoryNotFoundException' },
+        }),
+      },
+      S3: {
+        deleteObjects: {},
+        listObjectsV2: {},
+        upload: {},
+        headBucket: {},
+      },
+      CloudFormation: {
+        describeStacks: { Stacks: [{}] },
+        deleteChangeSet: {},
+        createChangeSet: {},
+        executeChangeSet: {},
+        describeChangeSet: {
+          ChangeSetName: 'new-service-dev-change-set',
+          ChangeSetId: 'some-change-set-id',
+          StackName: 'new-service-dev',
+          Status: 'FAILED',
+          StatusReason: 'Some internal reason',
+        },
+        describeStackResource: {
+          StackResourceDetail: { PhysicalResourceId: 's3-bucket-resource' },
+        },
+        validateTemplate: {},
+        listStackResources: {},
+      },
+    };
+
+    await expect(
+      runServerless({
+        fixture: 'function',
+        command: 'deploy',
+        awsRequestStubMap,
+      })
+    ).to.have.been.eventually.rejected.with.property(
+      'code',
+      'AWS_CLOUD_FORMATION_CHANGE_SET_CREATION_FAILED'
+    );
+  });
+
   it('with existing stack - should skip deploy if nothing changed', async () => {
-    const createStackStub = sinon.stub().resolves({});
     const s3UploadStub = sinon.stub().resolves();
-    const updateStackStub = sinon.stub().resolves({});
 
     const listObjectsV2Stub = sinon.stub().resolves({
       Contents: [
@@ -445,7 +445,6 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
       },
       CloudFormation: {
         describeStacks: { Stacks: [{}] },
-        createStack: createStackStub,
         describeStackEvents: {
           StackEvents: [
             {
@@ -462,7 +461,6 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
           StackResourceDetail: { PhysicalResourceId: 's3-bucket-resource' },
         },
         validateTemplate: {},
-        updateStack: updateStackStub,
         listStackResources: {},
       },
     };
@@ -478,8 +476,6 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
     });
 
     expect(serverless.service.provider.shouldNotDeploy).to.be.true;
-    expect(createStackStub).to.not.be.called;
-    expect(updateStackStub).to.not.be.called;
     expect(s3UploadStub).to.not.be.called;
   });
 
@@ -594,7 +590,8 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
   });
 
   it('with existing stack - with deployment bucket resource missing from CloudFormation template', async () => {
-    const updateStackStub = sinon.stub().resolves({});
+    const createChangeSetStub = sinon.stub().resolves({});
+    const executeChangeSetStub = sinon.stub().resolves({});
     const describeStackResourceStub = sinon
       .stub()
       .onFirstCall()
@@ -628,7 +625,15 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
       CloudFormation: {
         describeStacks: { Stacks: [{}] },
         validateTemplate: {},
-        updateStack: updateStackStub,
+        deleteChangeSet: {},
+        createChangeSet: createChangeSetStub,
+        executeChangeSet: executeChangeSetStub,
+        describeChangeSet: {
+          ChangeSetName: 'new-service-dev-change-set',
+          ChangeSetId: 'some-change-set-id',
+          StackName: 'new-service-dev',
+          Status: 'CREATE_COMPLETE',
+        },
         getTemplate: () => {
           return {
             TemplateBody: JSON.stringify({}),
@@ -657,8 +662,10 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
       lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
     });
 
-    expect(updateStackStub).to.be.calledWithExactly({
+    expect(createChangeSetStub).to.be.calledWithExactly({
       StackName: awsNaming.getStackName(),
+      ChangeSetName: awsNaming.getStackChangeSetName(),
+      ChangeSetType: 'UPDATE',
       Capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
       Parameters: [],
       Tags: [{ Key: 'STAGE', Value: 'dev' }],
@@ -667,5 +674,166 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
         Outputs: serverless.service.provider.coreCloudFormationTemplate.Outputs,
       }),
     });
+    expect(executeChangeSetStub).to.be.calledWithExactly({
+      StackName: awsNaming.getStackName(),
+      ChangeSetName: awsNaming.getStackChangeSetName(),
+    });
+  });
+
+  describe('custom deployment-related properties', () => {
+    let createChangeSetStub;
+    let executeChangeSetStub;
+    const deploymentRole = 'arn:xxx';
+    const notificationArns = ['arn:xxx', 'arn:yyy'];
+    const stackParameters = [
+      {
+        ParameterKey: 'key',
+        ParameterValue: 'val',
+      },
+      {
+        ParameterKey: 'key2',
+        ParameterValue: 'val2',
+      },
+    ];
+
+    const stackPolicy = [
+      {
+        Effect: 'Allow',
+        Principal: '*',
+        Action: ['Update:*'],
+        Resource: '*',
+      },
+    ];
+
+    const rollbackConfiguration = {
+      MonitoringTimeInMinutes: 20,
+    };
+
+    const disableRollback = true;
+    const stackTags = {
+      TAG: 'value',
+      ANOTHERTAG: 'anotherval',
+    };
+
+    before(async () => {
+      const describeStacksStub = sinon
+        .stub()
+        .onFirstCall()
+        .throws('error', 'stack does not exist')
+        .onSecondCall()
+        .resolves({ Stacks: [{}] });
+      createChangeSetStub = sinon.stub().resolves({});
+      executeChangeSetStub = sinon.stub().resolves({});
+      const awsRequestStubMap = {
+        ...baseAwsRequestStubMap,
+        ECR: {
+          describeRepositories: sinon.stub().throws({
+            providerError: { code: 'RepositoryNotFoundException' },
+          }),
+        },
+        S3: {
+          deleteObjects: {},
+          listObjectsV2: { Contents: [] },
+          upload: {},
+          headBucket: {},
+        },
+        CloudFormation: {
+          describeStacks: describeStacksStub,
+          createChangeSet: createChangeSetStub,
+          executeChangeSet: executeChangeSetStub,
+          deleteChangeSet: {},
+          describeChangeSet: {
+            ChangeSetName: 'new-service-dev-change-set',
+            ChangeSetId: 'some-change-set-id',
+            StackName: 'new-service-dev',
+            Status: 'CREATE_COMPLETE',
+          },
+          describeStackEvents: {
+            StackEvents: [
+              {
+                EventId: '1e2f3g4h',
+                StackName: 'new-service-dev',
+                LogicalResourceId: 'new-service-dev',
+                ResourceType: 'AWS::CloudFormation::Stack',
+                Timestamp: new Date(),
+                ResourceStatus: 'CREATE_COMPLETE',
+              },
+            ],
+          },
+          describeStackResource: {
+            StackResourceDetail: { PhysicalResourceId: 's3-bucket-resource' },
+          },
+          validateTemplate: {},
+          listStackResources: {},
+        },
+      };
+
+      await runServerless({
+        fixture: 'function',
+        command: 'deploy',
+        awsRequestStubMap,
+        configExt: {
+          provider: {
+            notificationArns,
+            rollbackConfiguration,
+            stackParameters,
+            stackPolicy,
+            stackTags,
+            disableRollback,
+            iam: {
+              deploymentRole,
+            },
+          },
+        },
+      });
+    });
+
+    it('should support custom deployment role', () => {
+      expect(createChangeSetStub.getCall(0).args[0].RoleARN).to.equal(deploymentRole);
+      expect(createChangeSetStub.getCall(1).args[0].RoleARN).to.equal(deploymentRole);
+    });
+
+    it('should support `notificationsArns`', () => {
+      expect(createChangeSetStub.getCall(0).args[0].NotificationARNs).to.deep.equal(
+        notificationArns
+      );
+      expect(createChangeSetStub.getCall(1).args[0].NotificationARNs).to.deep.equal(
+        notificationArns
+      );
+    });
+
+    it('should support `stackParameters`', () => {
+      expect(createChangeSetStub.getCall(1).args[0].Parameters).to.deep.equal(stackParameters);
+    });
+
+    it('should support `stackPolicy`', () => {
+      expect(createChangeSetStub.getCall(1).args[0].StackPolicyBody).to.deep.equal(
+        JSON.stringify({ Statement: stackPolicy })
+      );
+    });
+
+    it('should support `rollbackConfiguration`', () => {
+      expect(createChangeSetStub.getCall(1).args[0].RollbackConfiguration).to.deep.equal(
+        rollbackConfiguration
+      );
+    });
+
+    it('should support `disableRollback`', () => {
+      expect(executeChangeSetStub.getCall(0).args[0].DisableRollback).to.be.true;
+      expect(executeChangeSetStub.getCall(1).args[0].DisableRollback).to.be.true;
+    });
+
+    it('should support `stackTags`', () => {
+      expect(createChangeSetStub.getCall(0).args[0].Tags).to.deep.equal([
+        { Key: 'STAGE', Value: 'dev' },
+        { Key: 'TAG', Value: 'value' },
+        { Key: 'ANOTHERTAG', Value: 'anotherval' },
+      ]);
+      expect(createChangeSetStub.getCall(1).args[0].Tags).to.deep.equal([
+        { Key: 'STAGE', Value: 'dev' },
+        { Key: 'TAG', Value: 'value' },
+        { Key: 'ANOTHERTAG', Value: 'anotherval' },
+      ]);
+    });
   });
 });
diff --git a/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js b/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js
deleted file mode 100644
index 17555064f8b..00000000000
--- a/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js
+++ /dev/null
@@ -1,299 +0,0 @@
-'use strict';
-
-const chai = require('chai');
-const sandbox = require('sinon');
-const path = require('path');
-const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
-const AwsDeploy = require('../../../../../../../lib/plugins/aws/deploy/index');
-const Serverless = require('../../../../../../../lib/Serverless');
-const ServerlessError = require('../../../../../../../lib/serverless-error');
-const { getTmpDirPath } = require('../../../../../../utils/fs');
-const runServerless = require('../../../../../../utils/run-serverless');
-
-chai.use(require('chai-as-promised'));
-chai.use(require('sinon-chai'));
-const expect = require('chai').expect;
-
-describe('createStack', () => {
-  let awsDeploy;
-  const tmpDirPath = getTmpDirPath();
-
-  const serverlessYmlPath = path.join(tmpDirPath, 'serverless.yml');
-  const serverlessYml = {
-    service: 'first-service',
-    provider: 'aws',
-    functions: {
-      first: {
-        handler: 'sample.handler',
-      },
-    },
-  };
-
-  beforeEach(() => {
-    const serverless = new Serverless({ commands: [], options: {} });
-    serverless.setProvider('aws', new AwsProvider(serverless, {}));
-    serverless.utils.writeFileSync(serverlessYmlPath, serverlessYml);
-    serverless.serviceDir = tmpDirPath;
-    const options = {
-      stage: 'dev',
-      region: 'us-east-1',
-    };
-    awsDeploy = new AwsDeploy(serverless, options);
-    awsDeploy.serverless.service.service = `service-${new Date().getTime().toString()}`;
-    awsDeploy.serverless.cli = new serverless.classes.CLI();
-  });
-
-  describe('#create()', () => {
-    it('should include custom stack tags', () => {
-      awsDeploy.serverless.service.provider.stackTags = { STAGE: 'overridden', tag1: 'value1' };
-
-      const createStackStub = sandbox.stub(awsDeploy.provider, 'request').resolves();
-      sandbox.stub(awsDeploy, 'monitorStack').resolves();
-
-      return awsDeploy.create().then(() => {
-        expect(createStackStub.args[0][2].Tags).to.deep.equal([
-          { Key: 'STAGE', Value: 'overridden' },
-          { Key: 'tag1', Value: 'value1' },
-        ]);
-      });
-    });
-
-    it('should override the default tags custom stack tags (case-insensitive)', () => {
-      awsDeploy.serverless.service.provider.stackTags = { stage: 'overridden', tag1: 'value1' };
-
-      const createStackStub = sandbox.stub(awsDeploy.provider, 'request').resolves();
-      sandbox.stub(awsDeploy, 'monitorStack').resolves();
-
-      return awsDeploy.create().then(() => {
-        expect(createStackStub.args[0][2].Tags).to.deep.equal([
-          { Key: 'stage', Value: 'overridden' },
-          { Key: 'tag1', Value: 'value1' },
-        ]);
-      });
-    });
-
-    it('should add CAPABILITY_AUTO_EXPAND if a Transform directive is specified', () => {
-      awsDeploy.serverless.service.provider.compiledCloudFormationTemplate = {
-        Transform: 'MyMacro',
-      };
-
-      const createStackStub = sandbox.stub(awsDeploy.provider, 'request').resolves();
-      sandbox.stub(awsDeploy, 'monitorStack').resolves();
-
-      return awsDeploy.create().then(() => {
-        expect(createStackStub.args[0][2].Capabilities).to.contain('CAPABILITY_AUTO_EXPAND');
-      });
-    });
-
-    it('should use use notificationArns if it is specified', () => {
-      const mytopicArn = 'arn:aws:sns::123456789012:mytopic';
-      awsDeploy.serverless.service.provider.notificationArns = [mytopicArn];
-
-      const createStackStub = sandbox.stub(awsDeploy.provider, 'request').resolves();
-      sandbox.stub(awsDeploy, 'monitorStack').resolves();
-
-      return awsDeploy.create().then(() => {
-        expect(createStackStub.args[0][2].NotificationARNs).to.deep.equal([mytopicArn]);
-        awsDeploy.provider.request.restore();
-        awsDeploy.monitorStack.restore();
-      });
-    });
-  });
-
-  describe('#createStack()', () => {
-    it('should resolve if stack already created', () => {
-      const createStub = sandbox.stub(awsDeploy, 'create').resolves();
-
-      sandbox.stub(awsDeploy.provider, 'request').resolves();
-
-      return awsDeploy.createStack().then(() => {
-        expect(createStub.called).to.be.equal(false);
-      });
-    });
-
-    it('should throw error if invalid stack name', async () => {
-      sandbox.stub(awsDeploy, 'create').resolves();
-      sandbox.stub(awsDeploy.provider, 'request').resolves();
-      awsDeploy.serverless.service.service = 'service-name'.repeat(100);
-
-      await expect(awsDeploy.createStack()).to.eventually.be.rejected.and.have.property(
-        'code',
-        'INVALID_STACK_NAME_ERROR'
-      );
-    });
-
-    it('should set the createLater flag and resolve if deployment bucket is provided', async () => {
-      awsDeploy.serverless.service.provider.deploymentBucket = 'serverless';
-      sandbox.stub(awsDeploy.provider, 'request').rejects(new Error('does not exist'));
-
-      await awsDeploy.createStack();
-      expect(awsDeploy.createLater).to.be.true;
-    });
-
-    it('should throw error if describeStackResources fails for other reason than not found', async () => {
-      const errorMock = new ServerlessError('Something went wrong');
-
-      sandbox.stub(awsDeploy.provider, 'request').rejects(errorMock);
-      sandbox.stub(awsDeploy, 'create').resolves();
-
-      await expect(awsDeploy.createStack()).to.eventually.be.rejectedWith(errorMock);
-    });
-
-    it('should run promise chain in order', () => {
-      const errorMock = {
-        message: 'does not exist',
-      };
-
-      sandbox.stub(awsDeploy.provider, 'request').rejects(errorMock);
-
-      const createStub = sandbox.stub(awsDeploy, 'create').resolves();
-
-      return awsDeploy.createStack().then(() => {
-        expect(createStub.calledOnce).to.be.true;
-      });
-    });
-
-    it('should disable S3 Transfer Acceleration if missing Output', () => {
-      const disableTransferAccelerationStub = sandbox
-        .stub(awsDeploy.provider, 'disableTransferAccelerationForCurrentDeploy')
-        .resolves();
-
-      const describeStacksOutput = {
-        Stacks: [
-          {
-            Outputs: [],
-          },
-        ],
-      };
-      sandbox.stub(awsDeploy.provider, 'request').resolves(describeStacksOutput);
-
-      awsDeploy.provider.options['aws-s3-accelerate'] = true;
-
-      return awsDeploy.createStack().then(() => {
-        expect(disableTransferAccelerationStub.calledOnce).to.be.true;
-      });
-    });
-
-    it('should not disable S3 Transfer Acceleration if custom bucket is used', () => {
-      const disableTransferAccelerationStub = sandbox
-        .stub(awsDeploy.provider, 'disableTransferAccelerationForCurrentDeploy')
-        .resolves();
-
-      const describeStacksOutput = {
-        Stacks: [
-          {
-            Outputs: [],
-          },
-        ],
-      };
-      sandbox.stub(awsDeploy.provider, 'request').resolves(describeStacksOutput);
-
-      awsDeploy.provider.options['aws-s3-accelerate'] = true;
-      awsDeploy.serverless.service.provider.deploymentBucket = 'my-custom-bucket';
-
-      return awsDeploy.createStack().then(() => {
-        expect(disableTransferAccelerationStub.called).to.be.false;
-      });
-    });
-  });
-});
-
-describe('createStack #2', () => {
-  const createStackStub = sandbox.stub().resolves({});
-  const describeStacksStub = sandbox
-    .stub()
-    .onFirstCall()
-    .throws('error', 'stack does not exist')
-    .onSecondCall()
-    .resolves({ Stacks: [{}] });
-
-  afterEach(() => {
-    createStackStub.resetHistory();
-    describeStacksStub.resetHistory();
-  });
-
-  const awsRequestStubMap = {
-    STS: {
-      getCallerIdentity: {
-        ResponseMetadata: { RequestId: 'ffffffff-ffff-ffff-ffff-ffffffffffff' },
-        UserId: 'XXXXXXXXXXXXXXXXXXXXX',
-        Account: '999999999999',
-        Arn: 'arn:aws:iam::999999999999:user/test',
-      },
-    },
-    ECR: {
-      describeRepositories: sandbox.stub().throws({
-        providerError: { code: 'RepositoryNotFoundException' },
-      }),
-    },
-    S3: {
-      deleteObjects: {},
-      listObjectsV2: { Contents: [] },
-      upload: {},
-      headBucket: {},
-    },
-    CloudFormation: {
-      describeStacks: describeStacksStub,
-      createStack: createStackStub,
-      describeStackEvents: {
-        StackEvents: [
-          {
-            EventId: '1e2f3g4h',
-            StackName: 'new-service-dev',
-            LogicalResourceId: 'new-service-dev',
-            ResourceType: 'AWS::CloudFormation::Stack',
-            Timestamp: new Date(),
-            ResourceStatus: 'CREATE_COMPLETE',
-          },
-        ],
-      },
-      describeStackResource: {
-        StackResourceDetail: { PhysicalResourceId: 's3-bucket-resource' },
-      },
-      validateTemplate: {},
-      updateStack: {},
-      listStackResources: {},
-    },
-  };
-
-  it('should use iam.deploymentRole service role if set', async () => {
-    await runServerless({
-      fixture: 'function',
-      command: 'deploy',
-      configExt: {
-        disabledDeprecations: ['PROVIDER_IAM_SETTINGS_V3'],
-        provider: {
-          iam: {
-            deploymentRole: 'arn:aws:iam::123456789012:role/role-a',
-          },
-          cfnRole: 'arn:aws:iam::123456789012:role/role-b',
-        },
-      },
-      awsRequestStubMap,
-      lastLifecycleHookName: 'deploy:function:deploy',
-    });
-    expect(createStackStub).to.be.calledOnce;
-    expect(createStackStub.getCall(0).firstArg.RoleARN).to.equal(
-      'arn:aws:iam::123456789012:role/role-a'
-    );
-  });
-
-  it('should use CloudFormation service role ARN if it is specified', async () => {
-    await runServerless({
-      fixture: 'function',
-      command: 'deploy',
-      configExt: {
-        disabledDeprecations: ['PROVIDER_IAM_SETTINGS_V3'],
-        provider: {
-          cfnRole: 'arn:aws:iam::123456789012:role/role-b',
-        },
-      },
-      awsRequestStubMap,
-      lastLifecycleHookName: 'deploy:function:deploy',
-    });
-    expect(createStackStub).to.be.calledOnce;
-    expect(createStackStub.getCall(0).firstArg.RoleARN).to.equal(
-      'arn:aws:iam::123456789012:role/role-b'
-    );
-  });
-});
diff --git a/test/unit/lib/plugins/aws/lib/naming.test.js b/test/unit/lib/plugins/aws/lib/naming.test.js
index d131f378905..360e1108620 100644
--- a/test/unit/lib/plugins/aws/lib/naming.test.js
+++ b/test/unit/lib/plugins/aws/lib/naming.test.js
@@ -104,6 +104,22 @@ describe('#naming()', () => {
     });
   });
 
+  describe('#getStackChangeSetName()', () => {
+    it('should use the service name & stage if custom stack name not provided', () => {
+      serverless.service.service = 'myService';
+      expect(sdk.naming.getStackChangeSetName()).to.equal(
+        `${serverless.service.service}-${sdk.naming.provider.getStage()}-change-set`
+      );
+    });
+
+    it('should use the custom stack name if provided', () => {
+      serverless.service.provider.stackName = 'app-dev-testApp';
+      serverless.service.service = 'myService';
+      serverless.service.provider.stage = sdk.naming.provider.getStage();
+      expect(sdk.naming.getStackChangeSetName()).to.equal('app-dev-testApp-change-set');
+    });
+  });
+
   describe('#getRolePath()', () => {
     it('should return `/`', () => {
       expect(sdk.naming.getRolePath()).to.equal('/');
diff --git a/test/unit/lib/plugins/aws/lib/updateStack.test.js b/test/unit/lib/plugins/aws/lib/updateStack.test.js
deleted file mode 100644
index 72824ea88d1..00000000000
--- a/test/unit/lib/plugins/aws/lib/updateStack.test.js
+++ /dev/null
@@ -1,311 +0,0 @@
-'use strict';
-
-const expect = require('chai').expect;
-const sinon = require('sinon');
-const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const AwsDeploy = require('../../../../../../lib/plugins/aws/deploy');
-const Serverless = require('../../../../../../lib/Serverless');
-const { getTmpDirPath } = require('../../../../../utils/fs');
-
-describe('updateStack', () => {
-  let serverless;
-  let awsDeploy;
-  const tmpDirPath = getTmpDirPath();
-
-  beforeEach(() => {
-    const options = {
-      stage: 'dev',
-      region: 'us-east-1',
-    };
-    serverless = new Serverless({ commands: [], options: {} });
-    serverless.serviceDir = 'foo';
-    serverless.setProvider('aws', new AwsProvider(serverless, options));
-    awsDeploy = new AwsDeploy(serverless, options);
-
-    awsDeploy.deployedFunctions = [{ name: 'first', zipFileKey: 'zipFileOfFirstFunction' }];
-    awsDeploy.bucketName = 'deployment-bucket';
-    serverless.service.service = `service-${new Date().getTime().toString()}`;
-    serverless.serviceDir = tmpDirPath;
-    awsDeploy.serverless.service.package.artifactDirectoryName = 'somedir';
-    awsDeploy.serverless.cli = new serverless.classes.CLI();
-  });
-
-  describe('#createFallback()', () => {
-    let createStackStub;
-
-    beforeEach(() => {
-      createStackStub = sinon.stub(awsDeploy.provider, 'request').resolves();
-      sinon.stub(awsDeploy, 'monitorStack').resolves();
-    });
-
-    afterEach(() => {
-      awsDeploy.provider.request.restore();
-      awsDeploy.monitorStack.restore();
-    });
-
-    it('should create a stack with the CF template URL', () => {
-      const compiledTemplateFileName = 'compiled-cloudformation-template.json';
-
-      return awsDeploy.createFallback().then(() => {
-        expect(createStackStub.calledOnce).to.be.equal(true);
-        expect(
-          createStackStub.calledWithExactly('CloudFormation', 'createStack', {
-            StackName: awsDeploy.provider.naming.getStackName(),
-            OnFailure: 'DELETE',
-            Capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
-            Parameters: [],
-            TemplateURL: `https://s3.amazonaws.com/${awsDeploy.bucketName}/${awsDeploy.serverless.service.package.artifactDirectoryName}/${compiledTemplateFileName}`,
-            Tags: [{ Key: 'STAGE', Value: awsDeploy.provider.getStage() }],
-          })
-        ).to.be.equal(true);
-      });
-    });
-
-    it('should include custom stack tags', () => {
-      awsDeploy.serverless.service.provider.stackTags = { STAGE: 'overridden', tag1: 'value1' };
-
-      return awsDeploy.createFallback().then(() => {
-        expect(createStackStub.args[0][2].Tags).to.deep.equal([
-          { Key: 'STAGE', Value: 'overridden' },
-          { Key: 'tag1', Value: 'value1' },
-        ]);
-      });
-    });
-
-    it('should override the default tags custom stack tags (case-insensitive)', () => {
-      awsDeploy.serverless.service.provider.stackTags = { stage: 'overridden', tag1: 'value1' };
-
-      return awsDeploy.createFallback().then(() => {
-        expect(createStackStub.args[0][2].Tags).to.deep.equal([
-          { Key: 'stage', Value: 'overridden' },
-          { Key: 'tag1', Value: 'value1' },
-        ]);
-      });
-    });
-
-    it('should add CAPABILITY_AUTO_EXPAND if a Transform directive is specified', () => {
-      awsDeploy.serverless.service.provider.compiledCloudFormationTemplate = {
-        Transform: 'MyMacro',
-      };
-
-      return awsDeploy.createFallback().then(() => {
-        expect(createStackStub.args[0][2].Capabilities).to.contain('CAPABILITY_AUTO_EXPAND');
-      });
-    });
-
-    it('should use CloudFormation service role if it is specified', () => {
-      awsDeploy.serverless.service.provider.cfnRole = 'arn:aws:iam::123456789012:role/myrole';
-
-      return awsDeploy.createFallback().then(() => {
-        expect(createStackStub.args[0][2].RoleARN).to.equal(
-          'arn:aws:iam::123456789012:role/myrole'
-        );
-      });
-    });
-
-    it('should use use notificationArns if it is specified', () => {
-      const mytopicArn = 'arn:aws:sns::123456789012:mytopic';
-      awsDeploy.serverless.service.provider.notificationArns = [mytopicArn];
-
-      return awsDeploy.createFallback().then(() => {
-        expect(createStackStub.args[0][2].NotificationARNs).to.deep.equal([mytopicArn]);
-      });
-    });
-
-    it('should add Stack Parameters on createFallback', () => {
-      awsDeploy.serverless.service.provider.stackParameters = [
-        { ParameterKey: 'key', ParameterValue: 'value' },
-      ];
-
-      return awsDeploy.createFallback().then(() => {
-        expect(createStackStub.args[0][2].Parameters).to.deep.equal(
-          awsDeploy.serverless.service.provider.stackParameters
-        );
-      });
-    });
-  });
-
-  describe('#update()', () => {
-    let updateStackStub;
-
-    beforeEach(() => {
-      updateStackStub = sinon.stub(awsDeploy.provider, 'request').resolves();
-      sinon.stub(awsDeploy, 'monitorStack').resolves();
-    });
-
-    afterEach(() => {
-      awsDeploy.provider.request.restore();
-      awsDeploy.monitorStack.restore();
-    });
-
-    it('should update the stack', () =>
-      awsDeploy.update().then(() => {
-        const compiledTemplateFileName = 'compiled-cloudformation-template.json';
-        expect(updateStackStub.calledOnce).to.be.equal(true);
-        expect(
-          updateStackStub.calledWithExactly('CloudFormation', 'updateStack', {
-            StackName: awsDeploy.provider.naming.getStackName(),
-            Capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
-            Parameters: [],
-            TemplateURL: `https://s3.amazonaws.com/${awsDeploy.bucketName}/${awsDeploy.serverless.service.package.artifactDirectoryName}/${compiledTemplateFileName}`,
-            Tags: [{ Key: 'STAGE', Value: awsDeploy.provider.getStage() }],
-          })
-        ).to.be.equal(true);
-      }));
-
-    it('should include custom stack tags and policy', () => {
-      awsDeploy.serverless.service.provider.stackTags = { STAGE: 'overridden', tag1: 'value1' };
-      awsDeploy.serverless.service.provider.stackPolicy = [
-        {
-          Effect: 'Allow',
-          Principal: '*',
-          Action: 'Update:*',
-          Resource: '*',
-        },
-        {
-          Effect: 'Allow',
-          Principal: '*',
-          Action: 'Update:*',
-          Resource: 'LogicalResourceId/myEC2instance',
-        },
-        {
-          Effect: 'Deny',
-          Principal: '*',
-          Action: ['Update:Replace', 'Update:Delete'],
-          Resource: 'LogicalResourceId/CriticalResource*',
-        },
-      ];
-
-      return awsDeploy.update().then(() => {
-        expect(updateStackStub.args[0][2].Tags).to.deep.equal([
-          { Key: 'STAGE', Value: 'overridden' },
-          { Key: 'tag1', Value: 'value1' },
-        ]);
-        expect(updateStackStub.args[0][2].StackPolicyBody).to.equal(
-          '{"Statement":[{"Effect":"Allow","Principal":"*","Action":"Update:*","Resource":"*"},' +
-            '{"Effect":"Allow","Principal":"*","Action":"Update:*","Resource":"LogicalResourceId/myEC2instance"},' +
-            '{"Effect":"Deny","Principal":"*","Action":["Update:Replace","Update:Delete"],"Resource":"LogicalResourceId/CriticalResource*"}]}'
-        );
-      });
-    });
-
-    it('should include custom policy and override the default tags custom stack tags (case-insensitive)', () => {
-      awsDeploy.serverless.service.provider.stackTags = { stage: 'overridden', tag1: 'value1' };
-      awsDeploy.serverless.service.provider.stackPolicy = [
-        {
-          Effect: 'Allow',
-          Principal: '*',
-          Action: 'Update:*',
-          Resource: '*',
-        },
-      ];
-
-      return awsDeploy.update().then(() => {
-        expect(updateStackStub.args[0][2].Tags).to.deep.equal([
-          { Key: 'stage', Value: 'overridden' },
-          { Key: 'tag1', Value: 'value1' },
-        ]);
-        expect(updateStackStub.args[0][2].StackPolicyBody).to.equal(
-          '{"Statement":[{"Effect":"Allow","Principal":"*","Action":"Update:*","Resource":"*"}]}'
-        );
-      });
-    });
-
-    it('should success if no changes to stack happened', () => {
-      awsDeploy.provider.request.restore();
-      sinon
-        .stub(awsDeploy.provider, 'request')
-        .rejects(new Error('No updates are to be performed.'));
-
-      return awsDeploy.update();
-    });
-
-    it('should add CAPABILITY_AUTO_EXPAND if a Transform directive is specified', () => {
-      awsDeploy.serverless.service.provider.compiledCloudFormationTemplate = {
-        Transform: 'MyMacro',
-      };
-
-      return awsDeploy.update().then(() => {
-        expect(updateStackStub.args[0][2].Capabilities).to.contain('CAPABILITY_AUTO_EXPAND');
-      });
-    });
-
-    it('should use CloudFormation service role if it is specified', () => {
-      awsDeploy.serverless.service.provider.cfnRole = 'arn:aws:iam::123456789012:role/myrole';
-
-      return awsDeploy.update().then(() => {
-        expect(updateStackStub.args[0][2].RoleARN).to.equal(
-          'arn:aws:iam::123456789012:role/myrole'
-        );
-      });
-    });
-
-    it('should use use notificationArns if it is specified', () => {
-      const mytopicArn = 'arn:aws:sns::123456789012:mytopic';
-      awsDeploy.serverless.service.provider.notificationArns = [mytopicArn];
-
-      return awsDeploy.update().then(() => {
-        expect(updateStackStub.args[0][2].NotificationARNs).to.deep.equal([mytopicArn]);
-      });
-    });
-
-    it('should use use rollbackConfiguration if it is specified', () => {
-      const myRollbackConfiguration = {
-        MonitoringTimeInMinutes: 20,
-        RollbackTriggers: [
-          {
-            Arn: 'arn:aws:cloudwatch:us-east-1:000000000000:alarm:health',
-            Type: 'AWS::CloudWatch::Alarm',
-          },
-          {
-            Arn: 'arn:aws:cloudwatch:us-east-1:000000000000:alarm:latency',
-            Type: 'AWS::CloudWatch::Alarm',
-          },
-        ],
-      };
-      awsDeploy.serverless.service.provider.rollbackConfiguration = myRollbackConfiguration;
-
-      return awsDeploy.update().then(() => {
-        expect(updateStackStub.args[0][2].RollbackConfiguration).to.deep.equal(
-          myRollbackConfiguration
-        );
-      });
-    });
-
-    it('should add Stack Parameters on update', () => {
-      awsDeploy.serverless.service.provider.stackParameters = [
-        { ParameterKey: 'key', ParameterValue: 'value' },
-      ];
-
-      return awsDeploy.update().then(() => {
-        expect(updateStackStub.args[0][2].Parameters).to.deep.equal(
-          awsDeploy.serverless.service.provider.stackParameters
-        );
-      });
-    });
-  });
-
-  describe('#updateStack()', () => {
-    it('should fallback to createStack if createLater flag exists', () => {
-      awsDeploy.createLater = true;
-      const createFallbackStub = sinon.stub(awsDeploy, 'createFallback').resolves();
-      const updateStub = sinon.stub(awsDeploy, 'update').resolves();
-
-      return awsDeploy.updateStack().then(() => {
-        expect(createFallbackStub.calledOnce).to.be.equal(true);
-        expect(updateStub.called).to.be.equal(false);
-        awsDeploy.update.restore();
-      });
-    });
-
-    it('should run promise chain in order', () => {
-      const updateStub = sinon.stub(awsDeploy, 'update').resolves();
-
-      return awsDeploy.updateStack().then(() => {
-        expect(updateStub.calledOnce).to.be.equal(true);
-
-        awsDeploy.update.restore();
-      });
-    });
-  });
-});
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
index 3f24f2bcb44..2bfe99b2d1f 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
@@ -855,7 +855,15 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/u
           },
           listStackResources: {},
           validateTemplate: {},
-          updateStack: {},
+          deleteChangeSet: {},
+          createChangeSet: {},
+          executeChangeSet: {},
+          describeChangeSet: {
+            ChangeSetName: 'new-service-dev-change-set',
+            ChangeSetId: 'some-change-set-id',
+            StackName: 'new-service-dev',
+            Status: 'CREATE_COMPLETE',
+          },
         },
         S3: {
           listObjectsV2: {},

From 5374e04503b0d01cf8d6979800b49a8de153537b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 14 Dec 2021 17:59:42 +0100
Subject: [PATCH 0885/1101] feat: Restrict stage name with pattern

---
 lib/configSchema.js         | 2 ++
 lib/plugins/aws/provider.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/configSchema.js b/lib/configSchema.js
index 05af35a96bf..c888ba1ab31 100644
--- a/lib/configSchema.js
+++ b/lib/configSchema.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const functionNamePattern = '^[a-zA-Z0-9-_]+$';
+const stagePattern = '^[a-zA-Z0-9-]+$';
 
 const schema = {
   type: 'object',
@@ -131,6 +132,7 @@ const schema = {
       pattern: functionNamePattern,
     },
     serviceName: { type: 'string', pattern: '^[a-zA-Z][0-9a-zA-Z-]+$' },
+    stage: { type: 'string', pattern: stagePattern },
   },
 };
 
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 85778827e89..1c7ab3b3344 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -1146,7 +1146,7 @@ class AwsProvider {
               type: 'object',
               additionalProperties: require('./package/compile/events/s3/configSchema'),
             },
-            stage: { type: 'string' },
+            stage: { $ref: '#/definitions/stage' },
             stackName: {
               type: 'string',
               pattern: '^[a-zA-Z][a-zA-Z0-9-]*$',

From bd506286ad931c0cc22b2dd8b96615ea87d1918a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 21 Dec 2021 14:45:54 +0100
Subject: [PATCH 0886/1101] feat: Support `params` configuration

---
 docs/guides/cicd/README.md                 |   2 +-
 docs/guides/dashboard.md                   |   2 +-
 docs/guides/parameters.md                  | 109 ++++++++++++++++-----
 docs/guides/plugins/README.md              |   2 +-
 docs/providers/aws/guide/serverless.yml.md |   6 ++
 docs/providers/aws/guide/variables.md      |  15 +++
 lib/configSchema.js                        |   9 ++
 scripts/serverless.js                      |  29 +++---
 8 files changed, 130 insertions(+), 44 deletions(-)

diff --git a/docs/guides/cicd/README.md b/docs/guides/cicd/README.md
index 1e1bd699b38..2bd22320870 100644
--- a/docs/guides/cicd/README.md
+++ b/docs/guides/cicd/README.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Dashboard - CI/CD
 menuText: CI/CD
-menuOrder: 3
+menuOrder: 4
 layout: Doc
 -->
 
diff --git a/docs/guides/dashboard.md b/docs/guides/dashboard.md
index 1ad553031eb..c8befead0dc 100644
--- a/docs/guides/dashboard.md
+++ b/docs/guides/dashboard.md
@@ -1,5 +1,5 @@
 <!--
-title: Serverless - Dashboard
+title: Serverless Dashboard
 menuText: Dashboard
 menuOrder: 1
 layout: Doc
diff --git a/docs/guides/parameters.md b/docs/guides/parameters.md
index b9e240736e6..71ea90975d9 100644
--- a/docs/guides/parameters.md
+++ b/docs/guides/parameters.md
@@ -1,7 +1,7 @@
 <!--
-title: Serverless Dashboard - Parameters
+title: Serverless Framework - Parameters
 menuText: Parameters
-menuOrder: 6
+menuOrder: 2
 layout: Doc
 -->
 
@@ -13,38 +13,86 @@ layout: Doc
 
 # Parameters
 
-The Serverless Framework Dashboard enables you to create and manage parameters, helping you to configure and secure your services by securely storing parameters used by your Serverless Framework services. The [Serverless Framework Dashboard](https://app.serverless.com/) provides an interface to store and encrypt parameters and manage access to those parameters from your services. The Serverless Framework loads the parameters when the service is deployed.
+Parameters can be defined in `serverless.yml` or in [Serverless Dashboard](https://www.serverless.com/secrets). They can be used for example to:
 
-All parameters are treated as sensitive values, therefore they are always encrypted at rest, and only decrypted during deployment or to load them in the dashboard.
+- adapt the configuration based on the stage
+- store secrets securely
+- share configuration values between team members
 
-## Managing parameter using the dashboard
+## Stage parameters
 
-Parameters can be added to either services or instances.
+Parameters can be defined **for each stage** in `serverless.yml` under the `params` key:
 
-To manage parameters on the service, go to the **apps** section of the dashboard, and select **settings** under the **...** menu.
+```yaml
+params:
+  prod:
+    domain: myapp.com
+  dev:
+    domain: preview.myapp.com
+```
 
-To manage parameters on the instance, go to the **app** section of the dashboard, select the instance, and go to the **params** tab.
+Use the `default` key to define parameters that apply to all stages by default:
 
-### Inheritance and overriding
+```yaml
+params:
+  default:
+    domain: ${sls:stage}.preview.myapp.com
+  prod:
+    domain: myapp.com
+  dev:
+    domain: preview.myapp.com
+```
 
-Parameters set on instances take precedence over parameters set on services when deploying. If a parameter with the same key is set on both the instance and the service, then the value set on the instance will be used. If a parameter is set on the service, but not the instance, then the value set on the service will be used.
+Parameters can then be used via the `${param:XXX}` variables:
 
-This enables you to treat the parameters on services as defaults. This is especially useful in development when you may deploy instances to ephemeral stages (e.g. "feature-x"). In development the instance might not have any new parameters, therefore it will default to the parameters set on the service. However, in other stages, like "prod", or "staging", you may override the service-level parameters with instance-level parameters to use values unique to that stage.
+```yaml
+provider:
+  environment:
+    APP_DOMAIN: ${param:domain}
+```
 
-## Using a Parameter in serverless.yml
+The variable will be resolved based on the current stage.
 
-In your `serverless.yml` file add the variable `${param:<key>}` anywhere you would like to use the parameter. The `<key>` references the parameter key configured in the profile.
+## Serverless Dashboard parameters
 
-When you run `serverless deploy` the parameter values will be obtained, decrypted and used to replace the variables in the `serverless.yml` for the deployment.
+[Serverless Dashboard](https://www.serverless.com/secrets) lets you create and manage parameters, which is perfect for storing secrets securely or sharing configuration values across team members.
 
-## Use parameters from the command line
+On top of that, Dashboard parameters can be stored on the service (applies to all stages) or on a specific instance (applies to a specific stage).
 
-Parameters can also be accessed on the CLI. You can use this at development time to look up the parameters without opening the dashboard, or in your CI/CD pipeline to use the parameters in custom scripts.
+Dashboard parameters are treated as sensitive values, they are always encrypted at rest, and only decrypted during deployment or to view them in the dashboard.
 
-### List parameters
+Just like any other parameter, they can be used in `serverless.yml` via the `${param:XXX}` variables:
 
+```yaml
+provider:
+  environment:
+    STRIPE_SECRET_KEY: ${param:stripeSecret}
 ```
-sls param list
+
+### Creating Serverless Dashboard parameters
+
+Parameters can be created in the [Dashboard](https://app.serverless.com/) at the service level (applies to all stages) or instance level (stage-specific).
+
+To manage parameters on a service, go to the **apps** section of the dashboard, and select **settings** under the **...** menu.
+
+To manage parameters on an instance, go to the **app** section of the dashboard, select the instance, and go to the **params** tab.
+
+### Retrieving parameters from the command line
+
+Dashboard parameters can also be accessed on the CLI. You can use this at development time to look up the parameters without opening the dashboard, or in your CI/CD pipeline to use the parameters in custom scripts.
+
+#### List parameters
+
+If you are in a directory with a `serverless.yml`, the parameters will be listed for the org, app, and service specified in the `serverless.yml` file:
+
+```bash
+serverless param list [--stage <stage>]
+```
+
+If you are in a directory without a `serverless.yml`, or if you want to access parameters from another org, app, service, stage, or region, you can pass in the optional flags:
+
+```bash
+serverless param list
   [--org <org>]
   [--app <app>]
   [--service <service>]
@@ -52,15 +100,12 @@ sls param list
   [--region <region>]
 ```
 
-If you are in a working directory with a `serverless.yml` then the parameters will be listed for the org, app, and service specified in the `serverless.yml` file.
+#### Get a parameter
 
-If you are not in a working directory, without a `serverless.yml`, or if you want to access parameters from another org, app, service, stage, or region, you can pass in the optional flags.
-
-### Get a parameter
+Individual parameters can also be accessed from the CLI using the `param get` sub-command. This command requires the `--name <name>` flag to identify the parameter name. Like the `sls param list`, you can optionally specify a different org, app, service, stage, ore region using flags.
 
-```
-sls param get
-  --name <name>
+```bash
+serverless param get --name <name>
   [--org <org>]
   [--app <app>]
   [--service <service>]
@@ -68,4 +113,16 @@ sls param get
   [--region <region>]
 ```
 
-Individual parameters can also be accessed from the CLI using the `param get` sub-command. This command requires the `--name <name>` flag to identify the parameter name. Like the `sls param list`, you can optionally specify a different org, app, service, stage, ore region using flags.
+## Inheritance and overriding
+
+Parameters can be defined in `serverless.yml` per stage, as well as in Serverless Dashboard on the service or the instance (stage). Here is the priority used to resolve a `${param:XXX}` variable:
+
+- First, look in `params.<stage>` in `serverless.yml`
+- If not found, then look in the instance's parameters in the Dashboard
+- If not found, then look in `params.default` in `serverless.yml`
+- If not found, then look in the service's parameters in the Dashboard
+- If not found, throw an error, or use the fallback value if one was provided: `${param:XXX, 'default value'}`
+
+This gives you flexibility to mix `serverless.yml` parameters as well as secure Serverless Dashboard parameters.
+
+This is especially useful in development when deploying to ephemeral stages (e.g. "feature-x"). The stage might not have any parameter, therefore it will default to the parameters set on the service. However, in other stages, like "prod", or "staging", you may override the service-level parameters with stage-level parameters to use values unique to that stage.
diff --git a/docs/guides/plugins/README.md b/docs/guides/plugins/README.md
index e42e80367d9..1b4265101c5 100644
--- a/docs/guides/plugins/README.md
+++ b/docs/guides/plugins/README.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework - Plugins
 menuText: Plugins
-menuOrder: 2
+menuOrder: 3
 description: How to install plugins to customize the Serverless Framework
 layout: Doc
 -->
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index d4388b5e3e4..2bb1c9baab0 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -296,6 +296,12 @@ provider:
       versioningConfiguration:
         Status: Enabled
 
+params: # Stage parameters
+  prod: # Values for the "prod" stage
+    my-parameter: foo
+  dev: # Values for the "dev" stage
+    my-parameter: bar
+
 package: # Optional deployment packaging configuration
   patterns: # Specify the directories and files which should be included in the deployment package
     - src/**
diff --git a/docs/providers/aws/guide/variables.md b/docs/providers/aws/guide/variables.md
index 42cdac9385a..ca2ec07900d 100644
--- a/docs/providers/aws/guide/variables.md
+++ b/docs/providers/aws/guide/variables.md
@@ -41,6 +41,7 @@ You can define your own variable syntax (regex) if it conflicts with CloudFormat
 - [Other properties defined in `serverless.yml`](#reference-properties-in-serverlessyml)
 - [Serverless Core variables](#referencing-serverless-core-variables)
 - [Environment variables](#referencing-environment-variables)
+- [Parameters](#referencing-parameters)
 - [CLI options](#referencing-cli-options)
 - [External YAML/JSON files](#reference-properties-in-other-files)
 - [Variables from S3](#referencing-s3-objects)
@@ -158,6 +159,20 @@ functions:
 
 In the above example you're dynamically adding a prefix to the function names by referencing the `FUNC_PREFIX` env var. So you can easily change that prefix for all functions by changing the `FUNC_PREFIX` env var.
 
+## Referencing Parameters
+
+Parameters can be defined in `serverless.yml` under the `params` key, or in [Serverless Dashboard](https://www.serverless.com/secrets).
+
+To reference parameters, use the `${param:XXX}` syntax in `serverless.yml`.
+
+```yaml
+provider:
+  environment:
+    APP_DOMAIN: ${param:domain}
+```
+
+Read all about parameters in the [Parameters documentation](../../../guides/parameters.md).
+
 ## Referencing CLI Options
 
 To reference CLI options that you passed, use the `${opt:<option>}` syntax in your `serverless.yml` configuration file. It is valid to use the empty string in place of `<option>`. This looks like "`${opt:}`" and the result of declaring this in your `serverless.yml` is to embed the complete `options` object (i.e. all the command line options from your `serverless` command).
diff --git a/lib/configSchema.js b/lib/configSchema.js
index c888ba1ab31..67877275467 100644
--- a/lib/configSchema.js
+++ b/lib/configSchema.js
@@ -86,6 +86,15 @@ const schema = {
       },
       additionalProperties: false,
     },
+    params: {
+      type: 'object',
+      patternProperties: {
+        [stagePattern]: {
+          type: 'object',
+        },
+      },
+      additionalProperties: false,
+    },
     plugins: {
       anyOf: [
         {
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 8daa48488e2..ae7276f7051 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -714,16 +714,18 @@ const processSpanPromise = (async () => {
         }
 
         // Register dashboard specific variable source resolvers
-        if (
-          // TODO: Remove "tenant" support with next major
-          (configuration.org || configuration.tenant) &&
-          serverless.pluginManager.dashboardPlugin
-        ) {
-          for (const [sourceName, sourceConfig] of Object.entries(
-            serverless.pluginManager.dashboardPlugin.configurationVariablesSources
-          )) {
-            resolverConfiguration.sources[sourceName] = sourceConfig;
-            resolverConfiguration.fulfilledSources.add(sourceName);
+        if (serverless.pluginManager.dashboardPlugin) {
+          if (configuration.org) {
+            for (const [sourceName, sourceConfig] of Object.entries(
+              serverless.pluginManager.dashboardPlugin.configurationVariablesSources
+            )) {
+              resolverConfiguration.sources[sourceName] = sourceConfig;
+              resolverConfiguration.fulfilledSources.add(sourceName);
+            }
+          } else {
+            resolverConfiguration.sources.param =
+              serverless.pluginManager.dashboardPlugin.configurationVariablesSources.param;
+            resolverConfiguration.fulfilledSources.add('param');
           }
         }
 
@@ -766,7 +768,7 @@ const processSpanPromise = (async () => {
               for (const propertyPath of propertyPaths) legacySsmVarPropertyPaths.add(propertyPath);
               unresolvedSources.delete(sourceType);
             }
-            if (sourceType === 'param' || sourceType === 'output') {
+            if (sourceType === 'output') {
               logDeprecation(
                 'NEW_VARIABLES_RESOLVER',
                 '"param" and "output" variables can only be used in ' +
@@ -825,10 +827,7 @@ const processSpanPromise = (async () => {
             (sourceName) => !recognizedSourceNames.has(sourceName)
           );
 
-          if (
-            unrecognizedSourceNames.includes('param') ||
-            unrecognizedSourceNames.includes('output')
-          ) {
+          if (unrecognizedSourceNames.includes('output')) {
             throw new ServerlessError(
               '"Cannot resolve configuration: ' +
                 '"param" and "output" variables can only be used in ' +

From b4a25d70d3ddc25ad94bed9a181692173e2a380c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 23 Dec 2021 14:45:50 +0100
Subject: [PATCH 0887/1101] feat: Remove tab autocomplete feature

Reasoning:
- Performance is very poor due to slow command startup time
- `tabtab` package is no longer maintained and shares security issues
- Feature usage is relatively low (telemetry data shows 7% of users has the autocompletion on)

BREAKING CHANGE:
Opt-in tab-tab autocompletion feature is removed due to performance and security issues
---
 .../aws/cli-reference/config-tabcompletion.md | 36 ---------
 docs/providers/aws/cli-reference/config.md    |  2 +-
 lib/Serverless.js                             |  1 -
 lib/classes/PluginManager.js                  | 33 --------
 lib/cli/commands-schema/no-service.js         | 32 +-------
 lib/plugins/config.js                         | 75 -------------------
 lib/utils/autocomplete.js                     | 60 ---------------
 lib/utils/getCacheFile.js                     | 17 -----
 lib/utils/getCacheFilePath.js                 | 13 ----
 lib/utils/log/muteConsoleLog.js               | 33 --------
 lib/utils/tabCompletion/isSupported.js        |  3 -
 .../promptDisabledConfigPropertyName.js       |  3 -
 lib/utils/tabCompletion/tabtabOptions.js      |  3 -
 lib/utils/telemetry/generatePayload.js        | 13 ----
 package.json                                  |  1 -
 scripts/serverless.js                         |  5 --
 test/unit/lib/classes/PluginManager.test.js   | 62 +--------------
 .../lib/cli/ensure-supported-command.test.js  |  2 +-
 test/unit/lib/cli/render-help/command.test.js |  8 +-
 test/unit/lib/plugins/config.test.js          | 48 ------------
 .../utils/tabCompletion/isSupported.test.js   |  9 ---
 .../utils/telemetry/generatePayload.test.js   |  6 --
 22 files changed, 8 insertions(+), 457 deletions(-)
 delete mode 100644 docs/providers/aws/cli-reference/config-tabcompletion.md
 delete mode 100644 lib/utils/autocomplete.js
 delete mode 100644 lib/utils/getCacheFile.js
 delete mode 100644 lib/utils/getCacheFilePath.js
 delete mode 100644 lib/utils/log/muteConsoleLog.js
 delete mode 100644 lib/utils/tabCompletion/isSupported.js
 delete mode 100644 lib/utils/tabCompletion/promptDisabledConfigPropertyName.js
 delete mode 100644 lib/utils/tabCompletion/tabtabOptions.js
 delete mode 100644 test/unit/lib/utils/tabCompletion/isSupported.test.js

diff --git a/docs/providers/aws/cli-reference/config-tabcompletion.md b/docs/providers/aws/cli-reference/config-tabcompletion.md
deleted file mode 100644
index 2fcab3e3b8c..00000000000
--- a/docs/providers/aws/cli-reference/config-tabcompletion.md
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-title: Serverless Framework Commands - AWS Lambda - Config Tabcompletion
-menuText: config tabcompletion
-menuOrder: 1
-description: Configure Serverless Tabcompletion
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/cli-reference/config-tabcompletion)
-
-<!-- DOCS-SITE-LINK:END -->
-
-# AWS - Config
-
-The purpose of `serverless config tabcompletion` is to allow to enable or disable tab completion for the Framework in your shell. Currently supported shells are `fish`, `bash` and `zsh`.
-
-## Provided lifecycle events
-
-- `config:tabcompletion:install:install`
-- `config:tabcompletion:uninstall:uninstall`
-
-## Examples
-
-### Enable tab completion
-
-```
-serverless config tabcompletion install
-```
-
-### Disable tab completion
-
-```
-serverless config tabcompletion uninstall
-```
diff --git a/docs/providers/aws/cli-reference/config.md b/docs/providers/aws/cli-reference/config.md
index 53fd6cb2e63..21bb7d7c10b 100644
--- a/docs/providers/aws/cli-reference/config.md
+++ b/docs/providers/aws/cli-reference/config.md
@@ -14,7 +14,7 @@ layout: Doc
 
 # AWS - Config
 
-The purpose of `serverless config` is to allow to enable or disable automatic update mechanism of the Framework. Additionally, it supports two subcommands, `config credentials` and `config tabcompletion`. For more details about them, please refer to their corresponding documentation pages. Auto update mechanism is supported for global installations across all operating systems with the exception of standalone binary installation on Windows.
+The purpose of `serverless config` is to allow to enable or disable automatic update mechanism of the Framework. Additionally, it supports `config credentials` subcommand. For more details about them, please refer to their corresponding documentation pages. Auto update mechanism is supported for global installations across all operating systems with the exception of standalone binary installation on Windows.
 
 ## Options
 
diff --git a/lib/Serverless.js b/lib/Serverless.js
index 3c5abc41a57..a5f50e87d9b 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -200,7 +200,6 @@ class Serverless {
     // information such as options when the user enters --help
     this.cli.setLoadedPlugins(this.pluginManager.getPlugins());
     this.cli.setLoadedCommands(this.pluginManager.getCommands());
-    await this.pluginManager.updateAutocompleteCacheFile();
   }
   async eventuallyFallbackToLocal() {
     if (
diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index da8e9641ee9..7154fabe010 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -4,12 +4,9 @@ const path = require('path');
 const config = require('@serverless/utils/config');
 const cjsResolve = require('ncjsm/resolve/sync');
 const _ = require('lodash');
-const crypto = require('crypto');
 const isModuleNotFoundError = require('ncjsm/is-module-not-found-error');
 const ServerlessError = require('../serverless-error');
 const resolveCliInput = require('../cli/resolve-input');
-const writeFile = require('../utils/fs/writeFile');
-const getCacheFilePath = require('../utils/getCacheFilePath');
 const getCommandSuggestion = require('../utils/getCommandSuggestion');
 const renderCommandHelp = require('../cli/render-help/command');
 const { storeLocally: storeTelemetryLocally, send: sendTelemetry } = require('../utils/telemetry');
@@ -784,36 +781,6 @@ class PluginManager {
     }
   }
 
-  updateAutocompleteCacheFile() {
-    const commands = _.clone(this.getCommands());
-    const cacheFile = {
-      commands: {},
-      validationHash: '',
-    };
-
-    Object.entries(commands).forEach(([commandName, commandObj]) => {
-      const command = commandObj;
-      if (!command.options) {
-        command.options = {};
-      }
-      if (!command.commands) {
-        command.commands = {};
-      }
-      cacheFile.commands[commandName] = Object.keys(command.options)
-        .map((option) => `--${option}`)
-        .concat(Object.keys(command.commands));
-    });
-
-    const serverlessConfigFileHash = crypto
-      .createHash('sha256')
-      .update(JSON.stringify(this.serverless.configurationInput || null))
-      .digest('hex');
-    cacheFile.validationHash = serverlessConfigFileHash;
-    const cacheFilePath = getCacheFilePath(this.serverless.serviceDir);
-
-    return writeFile(cacheFilePath, cacheFile);
-  }
-
   convertShortcutsIntoOptions(command) {
     if (command.options) {
       Object.entries(command.options).forEach(([optionKey, optionObject]) => {
diff --git a/lib/cli/commands-schema/no-service.js b/lib/cli/commands-schema/no-service.js
index cc90f181fad..8cf19711649 100644
--- a/lib/cli/commands-schema/no-service.js
+++ b/lib/cli/commands-schema/no-service.js
@@ -25,7 +25,7 @@ commands.set('', {
       usage: 'Template url for the service.',
     },
   },
-  lifecycleEvents: ['initializeService', 'setupAws', 'autoUpdate', 'tabCompletion', 'end'],
+  lifecycleEvents: ['initializeService', 'setupAws', 'autoUpdate', 'end'],
 });
 
 commands.set('config', {
@@ -71,36 +71,6 @@ commands.set('config credentials', {
   lifecycleEvents: ['config'],
 });
 
-(() => {
-  const isHidden = process.platform === 'win32';
-  const noSupportNotice = '<tab> completion is not supported on Windows';
-
-  commands.set('config tabcompletion install', {
-    usage: 'Install a <tab> completion for chosen shell',
-    isHidden,
-    noSupportNotice,
-    options: {
-      shell: {
-        usage:
-          'Shell for which <tab> completion should be installed. ' +
-          'Supported options: bash (default), zsh, fish ',
-        shortcut: 's',
-      },
-      location: {
-        usage: 'Custom location for shell config',
-        shortcut: 'l',
-      },
-    },
-    lifecycleEvents: ['install'],
-  });
-  commands.set('config tabcompletion uninstall', {
-    usage: 'Uninstall a <tab> completion',
-    isHidden,
-    noSupportNotice,
-    lifecycleEvents: ['uninstall'],
-  });
-})();
-
 commands.set('create', {
   usage: 'Create new Serverless service',
   options: {
diff --git a/lib/plugins/config.js b/lib/plugins/config.js
index 2edc7507b1d..b00977e21d1 100644
--- a/lib/plugins/config.js
+++ b/lib/plugins/config.js
@@ -1,11 +1,8 @@
 'use strict';
 
-const BbPromise = require('bluebird');
 const config = require('@serverless/utils/config');
 const ServerlessError = require('../serverless-error');
 const cliCommandsSchema = require('../cli/commands-schema');
-const muteConsoleLog = require('../utils/log/muteConsoleLog');
-const tabtabOptions = require('../utils/tabCompletion/tabtabOptions');
 const isNpmPackageWritable = require('../utils/npmPackage/isWritable');
 const isNpmGlobalPackage = require('../utils/npmPackage/isGlobal');
 const renderCommandHelp = require('../cli/render-help/command');
@@ -13,7 +10,6 @@ const { legacy, log } = require('@serverless/utils/log');
 
 // class wide constants
 const validProviders = new Set(['aws']);
-const validShells = new Set(['bash', 'zsh', 'fish']);
 
 // TODO: update to look like the list in the "create" plugin
 // once more than one provider is supported
@@ -42,23 +38,9 @@ class Config {
       },
     };
 
-    this.commands.config.commands.tabcompletion = {
-      type: 'container',
-      commands: {
-        install: {
-          ...cliCommandsSchema.get('config tabcompletion install'),
-        },
-        uninstall: {
-          ...cliCommandsSchema.get('config tabcompletion uninstall'),
-        },
-      },
-    };
-
     this.hooks = {
       'config:config': async () => this.updateConfig(),
       'before:config:credentials:config': () => this.validate(),
-      'config:tabcompletion:install:install': async () => this.tabtabCompletionInstall(),
-      'config:tabcompletion:uninstall:uninstall': async () => this.tabtabCompletionUninstall(),
     };
   }
 
@@ -126,63 +108,6 @@ class Config {
       );
     }
   }
-
-  async tabtabCompletionInstall() {
-    return BbPromise.try(() => {
-      const shell = this.serverless.processedInput.options.shell || 'bash';
-
-      if (!validShells.has(shell)) {
-        throw new ServerlessError(
-          `Shell "${shell}" is not supported. Supported shells: ${Array.from(validShells)}.`,
-          'TABCOMPLETION_INVALID_SHELL_ARGUMENT'
-        );
-      }
-      const location = (() => {
-        if (this.serverless.processedInput.options.location) {
-          return this.serverless.processedInput.options.location;
-        }
-        const { BASH_LOCATION, FISH_LOCATION, ZSH_LOCATION } = require('tabtab/lib/constants');
-        switch (shell) {
-          case 'bash':
-            return BASH_LOCATION;
-          case 'zsh':
-            return ZSH_LOCATION;
-          case 'fish':
-            return FISH_LOCATION;
-          default:
-            throw new Error('Unexpected shell choice');
-        }
-      })();
-      const { install } = require('tabtab/lib/installer');
-      return muteConsoleLog(() =>
-        tabtabOptions.reduce(
-          (previousOperation, options) =>
-            previousOperation.then(() => install(Object.assign({ location }, options))),
-          BbPromise.resolve()
-        )
-      ).then(() => {
-        legacy.log(`Tab autocompletion setup for ${shell}. Make sure to reload your SHELL.`);
-        log.notice.success(
-          `Tab autocompletion setup for ${shell}. Make sure to reload your SHELL.`
-        );
-      });
-    });
-  }
-
-  async tabtabCompletionUninstall() {
-    return BbPromise.try(() => {
-      const { uninstall } = require('tabtab/lib/installer');
-      return muteConsoleLog(() =>
-        tabtabOptions.reduce(
-          (previousOperation, options) => previousOperation.then(() => uninstall(options)),
-          BbPromise.resolve()
-        )
-      ).then(() => {
-        legacy.log('Tab autocompletion uninstalled (for all configured shells).');
-        log.notice.success('Tab autocompletion uninstalled (for all configured shells).');
-      });
-    });
-  }
 }
 
 module.exports = Config;
diff --git a/lib/utils/autocomplete.js b/lib/utils/autocomplete.js
deleted file mode 100644
index 744255ef5f8..00000000000
--- a/lib/utils/autocomplete.js
+++ /dev/null
@@ -1,60 +0,0 @@
-'use strict';
-
-const Serverless = require('../Serverless');
-const crypto = require('crypto');
-
-const resolveConfigurationPath = require('../../lib/cli/resolve-configuration-path');
-const readConfiguration = require('../../lib/configuration/read');
-const getCacheFile = require('./getCacheFile');
-
-const getSuggestions = (commands, env) => {
-  if (!env.complete) return;
-  const tokens = env.line.split(/\s+/);
-  const { log } = require('tabtab');
-  switch (tokens.length) {
-    case 1:
-    case 2:
-      log(Object.keys(commands).filter((commandName) => !commands[commandName].isHidden));
-      return;
-    case 3:
-      if (commands[env.prev]) log(commands[env.prev]);
-      return;
-    default:
-      return;
-  }
-};
-
-const cacheFileValid = (configurationInput, validationHash) => {
-  const serverlessConfigFileHash = crypto
-    .createHash('sha256')
-    .update(JSON.stringify(configurationInput))
-    .digest('hex');
-
-  return validationHash === serverlessConfigFileHash;
-};
-
-const autocomplete = async () => {
-  const configurationPath = await resolveConfigurationPath();
-  const serviceDir = process.cwd();
-  const configurationInput = configurationPath
-    ? await (async () => {
-        try {
-          return await readConfiguration(configurationPath);
-        } catch (error) {
-          return null;
-        }
-      })()
-    : null;
-  let cacheFile = await getCacheFile(serviceDir);
-  if (!cacheFile || !cacheFileValid(configurationInput, cacheFile.validationHash)) {
-    const serverless = new Serverless();
-    await serverless.init();
-    cacheFile = await getCacheFile(serviceDir);
-  }
-  if (!cacheFile || !cacheFileValid(configurationInput, cacheFile.validationHash)) {
-    return null;
-  }
-  return getSuggestions(cacheFile.commands, require('tabtab').parseEnv(process.env));
-};
-
-module.exports = autocomplete;
diff --git a/lib/utils/getCacheFile.js b/lib/utils/getCacheFile.js
deleted file mode 100644
index 3be6cd7d417..00000000000
--- a/lib/utils/getCacheFile.js
+++ /dev/null
@@ -1,17 +0,0 @@
-'use strict';
-
-const fileExists = require('./fs/fileExists');
-const readFile = require('./fs/readFile');
-const getCacheFilePath = require('./getCacheFilePath');
-
-const getCacheFile = async function (serviceDir) {
-  const cacheFilePath = getCacheFilePath(serviceDir);
-  return fileExists(cacheFilePath).then((exists) => {
-    if (!exists) {
-      return false;
-    }
-    return readFile(cacheFilePath);
-  });
-};
-
-module.exports = getCacheFile;
diff --git a/lib/utils/getCacheFilePath.js b/lib/utils/getCacheFilePath.js
deleted file mode 100644
index f87a6d7926e..00000000000
--- a/lib/utils/getCacheFilePath.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use strict';
-
-const homedir = require('os').homedir();
-const path = require('path');
-const crypto = require('crypto');
-
-const getCacheFilePath = function (srvcPath) {
-  const serviceDir = srvcPath || process.cwd();
-  const serviceDirHash = crypto.createHash('sha256').update(serviceDir).digest('hex');
-  return path.join(homedir, '.serverless', 'cache', serviceDirHash, 'autocomplete.json');
-};
-
-module.exports = getCacheFilePath;
diff --git a/lib/utils/log/muteConsoleLog.js b/lib/utils/log/muteConsoleLog.js
deleted file mode 100644
index ab3e8e1f63f..00000000000
--- a/lib/utils/log/muteConsoleLog.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/* eslint no-console: 0 */
-
-// Created to workaround a limitation of tabtab package:
-// https://github.com/mklabs/tabtab/issues/51
-
-'use strict';
-
-module.exports = async (callback) => {
-  const original = console.log;
-  console.log = () => {};
-  const restore = () => (console.log = original);
-  let result;
-  try {
-    result = callback();
-  } catch (error) {
-    restore();
-    throw error;
-  }
-  if (result && typeof result.then === 'function') {
-    return result.then(
-      (resolution) => {
-        restore();
-        return resolution;
-      },
-      (error) => {
-        restore();
-        throw error;
-      }
-    );
-  }
-  restore();
-  return result;
-};
diff --git a/lib/utils/tabCompletion/isSupported.js b/lib/utils/tabCompletion/isSupported.js
deleted file mode 100644
index 1d1e489c868..00000000000
--- a/lib/utils/tabCompletion/isSupported.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = process.platform !== 'win32';
diff --git a/lib/utils/tabCompletion/promptDisabledConfigPropertyName.js b/lib/utils/tabCompletion/promptDisabledConfigPropertyName.js
deleted file mode 100644
index 367520bf4ba..00000000000
--- a/lib/utils/tabCompletion/promptDisabledConfigPropertyName.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = 'tabCompletionPromptDisabled';
diff --git a/lib/utils/tabCompletion/tabtabOptions.js b/lib/utils/tabCompletion/tabtabOptions.js
deleted file mode 100644
index 57328ecc9ea..00000000000
--- a/lib/utils/tabCompletion/tabtabOptions.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = ['serverless', 'sls'].map((name) => ({ name, completer: name }));
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index ba9b4702857..f05c4da9582 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -1,8 +1,6 @@
 'use strict';
 
 const path = require('path');
-const os = require('os');
-const fs = require('fs');
 const crypto = require('crypto');
 const resolveSync = require('ncjsm/resolve/sync');
 const _ = require('lodash');
@@ -22,16 +20,6 @@ const AWS = require('aws-sdk');
 const configValidationModeValues = new Set(['off', 'warn', 'error']);
 const commandsReportingProjectId = new Set(['deploy', '', 'remove']);
 
-const checkIsTabAutocompletionInstalled = () => {
-  try {
-    return fs
-      .readdirSync(path.resolve(os.homedir(), '.config/tabtab'))
-      .some((filename) => filename.startsWith('serverless.'));
-  } catch {
-    return false;
-  }
-};
-
 const getServiceConfig = ({ configuration, options, variableSources }) => {
   const providerName = isObject(configuration.provider)
     ? configuration.provider.name
@@ -259,7 +247,6 @@ module.exports = ({
       return 'local:direct';
     })(),
     isAutoUpdateEnabled: Boolean(userConfig.get('autoUpdate.enabled')),
-    isTabAutocompletionInstalled: checkIsTabAutocompletionInstalled(),
     notificationsMode: getNotificationsMode(),
     timestamp: Date.now(),
     timezone,
diff --git a/package.json b/package.json
index 59d2c3ea987..24772f318a9 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,6 @@
     "semver": "^7.3.5",
     "signal-exit": "^3.0.6",
     "strip-ansi": "^6.0.1",
-    "tabtab": "^3.0.2",
     "tar": "^6.1.11",
     "timers-ext": "^0.1.7",
     "type": "^2.5.0",
diff --git a/scripts/serverless.js b/scripts/serverless.js
index ae7276f7051..41893ce709c 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -8,11 +8,6 @@ require('essentials');
 // https://github.com/isaacs/node-graceful-fs#global-patching
 require('graceful-fs').gracefulify(require('fs'));
 
-if (require('../lib/utils/tabCompletion/isSupported') && process.argv[2] === 'completion') {
-  require('../lib/utils/autocomplete')();
-  return;
-}
-
 // Setup log writing
 require('@serverless/utils/log-reporters/node');
 const { legacy, log, progress } = require('@serverless/utils/log');
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
index 4a9fb31fb16..e9df20f6af3 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/PluginManager.test.js
@@ -22,7 +22,6 @@ const mockRequire = require('mock-require');
 const sinon = require('sinon');
 const proxyquire = require('proxyquire');
 const BbPromise = require('bluebird');
-const getCacheFilePath = require('../../../../lib/utils/getCacheFilePath');
 const { installPlugin } = require('../../../utils/plugins');
 const { getTmpDirPath } = require('../../../utils/fs');
 
@@ -416,7 +415,7 @@ describe('PluginManager', () => {
 
   let restoreEnv;
   let serviceDir;
-  let PluginManager = proxyquire('../../../../lib/classes/PluginManager', {
+  const PluginManager = proxyquire('../../../../lib/classes/PluginManager', {
     'ncjsm/resolve/sync': resolveStub,
   });
 
@@ -471,65 +470,6 @@ describe('PluginManager', () => {
     });
   });
 
-  describe('#updateAutocompleteCacheFile()', () => {
-    let writeFileStub;
-    let cacheFilePath;
-    let getCommandsStub;
-
-    beforeEach(() => {
-      writeFileStub = sinon.stub().returns(BbPromise.resolve());
-      PluginManager = proxyquire('../../../../lib/classes/PluginManager.js', {
-        '../utils/fs/writeFile': writeFileStub,
-        'ncjsm/resolve/sync': resolveStub,
-      });
-      pluginManager = new PluginManager(serverless);
-      pluginManager.serverless.config = { servicePath: 'somePath' };
-      serviceDir = pluginManager.serverless.serviceDir;
-      cacheFilePath = getCacheFilePath(serviceDir);
-      getCommandsStub = sinon.stub(pluginManager, 'getCommands');
-    });
-
-    afterEach(() => {
-      pluginManager.getCommands.restore();
-    });
-
-    it('should update autocomplete cache file', () => {
-      const commandsMock = {
-        deploy: {
-          options: {
-            stage: {},
-          },
-          commands: {
-            function: {},
-          },
-        },
-        invoke: {
-          options: {
-            region: {},
-          },
-          commands: {
-            local: {},
-          },
-        },
-        remove: {},
-      };
-      const expectedCommands = {
-        deploy: ['--stage', 'function'],
-        invoke: ['--region', 'local'],
-        remove: [],
-      };
-      getCommandsStub.returns(commandsMock);
-
-      return pluginManager.updateAutocompleteCacheFile().then(() => {
-        expect(getCommandsStub.calledOnce).to.equal(true);
-        expect(writeFileStub.calledOnce).to.equal(true);
-        expect(writeFileStub.getCall(0).args[0]).to.equal(cacheFilePath);
-        expect(writeFileStub.getCall(0).args[1].commands).to.deep.equal(expectedCommands);
-        expect(typeof writeFileStub.getCall(0).args[1].validationHash).to.equal('string');
-      });
-    });
-  });
-
   describe('#convertShortcutsIntoOptions()', () => {
     it('should convert shortcuts into options when a one level deep command matches', () => {
       const cliOptionsMock = { r: 'eu-central-1', region: 'us-east-1' };
diff --git a/test/unit/lib/cli/ensure-supported-command.test.js b/test/unit/lib/cli/ensure-supported-command.test.js
index 785a321ea12..5003bc1ba57 100644
--- a/test/unit/lib/cli/ensure-supported-command.test.js
+++ b/test/unit/lib/cli/ensure-supported-command.test.js
@@ -25,7 +25,7 @@ describe('test/unit/lib/cli/ensure-supported-command.test.js', () => {
     triggeredDeprecations.clear();
     overrideArgv(
       {
-        args: ['serverless', 'config', 'tabcompletion'],
+        args: ['serverless', 'plugin'],
       },
       () => resolveInput()
     );
diff --git a/test/unit/lib/cli/render-help/command.test.js b/test/unit/lib/cli/render-help/command.test.js
index 6fb7d00ab63..ae465163284 100644
--- a/test/unit/lib/cli/render-help/command.test.js
+++ b/test/unit/lib/cli/render-help/command.test.js
@@ -15,9 +15,9 @@ describe('test/unit/lib/cli/render-help/command.test.js', () => {
     expect(output).to.have.string(commandsSchema.get('deploy function').usage);
   });
   it('should show help for container command', async () => {
-    const output = await observeOutput(() => renderCommandHelp('config tabcompletion'));
-    expect(output).to.have.string('config tabcompletion install');
-    expect(output).to.have.string(commandsSchema.get('config tabcompletion install').usage);
-    expect(output).to.have.string(commandsSchema.get('config tabcompletion uninstall').usage);
+    const output = await observeOutput(() => renderCommandHelp('plugin'));
+    expect(output).to.have.string('plugin install');
+    expect(output).to.have.string(commandsSchema.get('plugin install').usage);
+    expect(output).to.have.string(commandsSchema.get('plugin uninstall').usage);
   });
 });
diff --git a/test/unit/lib/plugins/config.test.js b/test/unit/lib/plugins/config.test.js
index e089709a204..d8e22f9a3cf 100644
--- a/test/unit/lib/plugins/config.test.js
+++ b/test/unit/lib/plugins/config.test.js
@@ -1,20 +1,13 @@
 'use strict';
 
 const fs = require('fs');
-const path = require('path');
-const os = require('os');
 const BbPromise = require('bluebird');
 const { expect } = require('chai');
 const config = require('@serverless/utils/config');
 const runServerless = require('../../../utils/run-serverless');
-const isTabCompletionSupported = require('../../../../lib/utils/tabCompletion/isSupported');
 
 BbPromise.promisifyAll(fs);
 
-const unexpected = () => {
-  throw new Error('Unexpected');
-};
-
 describe('Config', () => {
   it('should support "config credentials" command', () =>
     runServerless({
@@ -23,47 +16,6 @@ describe('Config', () => {
       options: { provider: 'aws', key: 'foo', secret: 'bar' },
     }));
 
-  if (isTabCompletionSupported) {
-    it('should support "config tabcompletion install" command', () =>
-      runServerless({
-        cwd: os.homedir(),
-        env: { SHELL: 'bash' },
-        command: 'config tabcompletion install',
-      }).then(() =>
-        Promise.all([
-          fs
-            .readFileAsync(path.resolve(os.homedir(), '.bashrc'), 'utf8')
-            .then((bashRcContent) =>
-              expect(bashRcContent).to.include(' ~/.config/tabtab/__tabtab.bash')
-            ),
-          fs.readFileAsync(path.resolve(os.homedir(), '.config/tabtab/serverless.bash'), 'utf8'),
-          fs.readFileAsync(path.resolve(os.homedir(), '.config/tabtab/sls.bash'), 'utf8'),
-        ])
-      ));
-
-    it('should support "config tabcompletion uninstall" command', () =>
-      runServerless({
-        cwd: os.homedir(),
-        env: { SHELL: 'bash' },
-        command: 'config tabcompletion install',
-      }).then(() =>
-        runServerless({
-          cwd: os.homedir(),
-          env: { SHELL: 'bash' },
-          command: 'config tabcompletion uninstall',
-        }).then(() =>
-          Promise.all([
-            fs
-              .readFileAsync(path.resolve(os.homedir(), '.config/tabtab/serverless.bash'))
-              .then(unexpected, (error) => expect(error.code).to.equal('ENOENT')),
-            fs
-              .readFileAsync(path.resolve(os.homedir(), '.config/tabtab/sls.bash'))
-              .then(unexpected, (error) => expect(error.code).to.equal('ENOENT')),
-          ])
-        )
-      ));
-  }
-
   it('should turn on autoupdate with "--autoupdate"', async () => {
     await runServerless({
       cwd: require('os').homedir(),
diff --git a/test/unit/lib/utils/tabCompletion/isSupported.test.js b/test/unit/lib/utils/tabCompletion/isSupported.test.js
deleted file mode 100644
index b571b496b64..00000000000
--- a/test/unit/lib/utils/tabCompletion/isSupported.test.js
+++ /dev/null
@@ -1,9 +0,0 @@
-'use strict';
-
-const { expect } = require('chai');
-
-const isSuported = require('../../../../../lib/utils/tabCompletion/isSupported');
-
-describe('isTabtabCompletionSuported', () => {
-  it('Should resolve boolean', () => expect(typeof isSuported).to.equal('boolean'));
-});
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index 64e9590d3c8..ae92b433f38 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -154,7 +154,6 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
         variableSources: [],
       },
       isAutoUpdateEnabled: false,
-      isTabAutocompletionInstalled: false,
       notificationsMode: 'on',
       npmDependencies: ['fooDep', 'barDep', 'fooOpt', 'someDev', 'otherDev'],
       triggeredDeprecations: [],
@@ -215,7 +214,6 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
         variableSources: [],
       },
       isAutoUpdateEnabled: false,
-      isTabAutocompletionInstalled: false,
       notificationsMode: 'on',
       npmDependencies: [],
       triggeredDeprecations: [],
@@ -279,7 +277,6 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
         variableSources: [],
       },
       isAutoUpdateEnabled: false,
-      isTabAutocompletionInstalled: false,
       notificationsMode: 'on',
       npmDependencies: [],
       triggeredDeprecations: [],
@@ -322,7 +319,6 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       command: 'config',
       commandOptionNames: [],
       isAutoUpdateEnabled: false,
-      isTabAutocompletionInstalled: false,
       notificationsMode: 'on',
       triggeredDeprecations: [],
       installationType: 'global:other',
@@ -373,7 +369,6 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
         resources: { general: [] },
       },
       isAutoUpdateEnabled: false,
-      isTabAutocompletionInstalled: false,
       triggeredDeprecations: [],
       installationType: 'global:other',
       notificationsMode: 'on',
@@ -410,7 +405,6 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       command: 'plugin list',
       commandOptionNames: [],
       isAutoUpdateEnabled: false,
-      isTabAutocompletionInstalled: false,
       notificationsMode: 'on',
       triggeredDeprecations: [],
       installationType: 'global:other',

From d0d016168506177ba3a7dcb066607b8685f00f38 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 23 Dec 2021 16:57:31 +0100
Subject: [PATCH 0888/1101] refactor(CLI): Improve post install log to reflect
 modern style

---
 package.json           |  1 -
 scripts/postinstall.js | 14 +-------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 mode change 100644 => 100755 scripts/postinstall.js

diff --git a/package.json b/package.json
index 24772f318a9..216dcf34d70 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,6 @@
     "archiver": "^5.3.0",
     "aws-sdk": "^2.1062.0",
     "bluebird": "^3.7.2",
-    "boxen": "^5.1.2",
     "cachedir": "^2.3.0",
     "chalk": "^4.1.2",
     "child-process-ext": "^2.1.1",
diff --git a/scripts/postinstall.js b/scripts/postinstall.js
old mode 100644
new mode 100755
index 2670cb819f5..d8094db81a3
--- a/scripts/postinstall.js
+++ b/scripts/postinstall.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const boxen = require('boxen');
 const chalk = require('chalk');
 const isStandaloneExecutable = require('../lib/utils/isStandaloneExecutable');
 
@@ -29,16 +28,5 @@ if (!truthyStr(CI) && !truthyStr(ADBLOCK) && !truthyStr(SILENT)) {
     messageTokens.push('Uninstall at any time by running “serverless uninstall”.');
   }
 
-  const message = messageTokens.join('\n\n');
-  process.stdout.write(
-    `${
-      isStandaloneExecutable && isWindows
-        ? message
-        : boxen(chalk.yellow(message), {
-            padding: 1,
-            margin: 1,
-            borderColor: 'yellow',
-          })
-    }\n`
-  );
+  process.stdout.write(`${chalk.grey(messageTokens.join('\n\n'))}\n`);
 }

From 766b58da610d6d22479c4b114bcdfdf5c16e8a41 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 30 Dec 2021 12:12:07 +0100
Subject: [PATCH 0889/1101] refactor: Upgrade `ajv` to `v8` along with related
 packages

---
 .github/workflows/integrate.yml               |   1 +
 .github/workflows/validate.yml                |   1 +
 lib/Serverless.js                             |   2 +-
 lib/classes/ConfigSchemaHandler/index.js      |   8 +-
 .../ConfigSchemaHandler/normalizeAjvErrors.js | 132 ++++++++++--------
 .../ConfigSchemaHandler/resolveAjvValidate.js |  62 ++++++++
 .../resolveDataPathSize.js                    |  41 ------
 lib/classes/Service.js                        |   4 +-
 package.json                                  |   7 +-
 .../normalizeAjvErrors.test.js                |  38 ++---
 .../resolveAjvValidate.test.js                |  60 ++++++++
 .../resolveDataPathSize.test.js               |  18 ---
 test/unit/lib/configSchema.test.js            |   4 +-
 .../aws/package/lib/mergeIamTemplates.test.js |   2 +-
 14 files changed, 228 insertions(+), 152 deletions(-)
 create mode 100644 lib/classes/ConfigSchemaHandler/resolveAjvValidate.js
 delete mode 100644 lib/classes/ConfigSchemaHandler/resolveDataPathSize.js
 create mode 100644 test/unit/lib/classes/ConfigSchemaHandler/resolveAjvValidate.test.js
 delete mode 100644 test/unit/lib/classes/ConfigSchemaHandler/resolveDataPathSize.test.js

diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
index b941e78617c..dbd86bc9a63 100644
--- a/.github/workflows/integrate.yml
+++ b/.github/workflows/integrate.yml
@@ -9,6 +9,7 @@ on:
 env:
   SLS_IGNORE_WARNING: '*'
   FORCE_COLOR: 1
+  SLS_SCHEMA_CACHE_BASE_DIR: '/home/runner'
 
 jobs:
   linuxNode16:
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 269c2766ba8..2436a52d437 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -9,6 +9,7 @@ on:
 env:
   SLS_IGNORE_WARNING: '*'
   FORCE_COLOR: 1
+  SLS_SCHEMA_CACHE_BASE_DIR: '/home/runner'
 
 jobs:
   linuxNode16:
diff --git a/lib/Serverless.js b/lib/Serverless.js
index a5f50e87d9b..e1a029d05c5 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -432,7 +432,7 @@ class Serverless {
       this.service.setFunctionNames(this.processedInput.options);
 
       // If in context of service, validate the service configuration
-      if (this.serviceDir) this.service.validate();
+      if (this.serviceDir) await this.service.validate();
     }
 
     this.serviceOutputs = new Map();
diff --git a/lib/classes/ConfigSchemaHandler/index.js b/lib/classes/ConfigSchemaHandler/index.js
index 4d0b4c50597..8c305dc07a4 100644
--- a/lib/classes/ConfigSchemaHandler/index.js
+++ b/lib/classes/ConfigSchemaHandler/index.js
@@ -1,11 +1,11 @@
 'use strict';
 
-const Ajv = require('ajv');
 const _ = require('lodash');
 const ensurePlainObject = require('type/plain-object/ensure');
 const schema = require('../../configSchema');
 const ServerlessError = require('../../serverless-error');
 const normalizeAjvErrors = require('./normalizeAjvErrors');
+const resolveAjvValidate = require('./resolveAjvValidate');
 const { legacy, log, style } = require('@serverless/utils/log');
 
 const FUNCTION_NAME_PATTERN = '^[a-zA-Z0-9-_]+$';
@@ -75,7 +75,7 @@ class ConfigSchemaHandler {
     return configurationValidationResults.get(ensurePlainObject(configuration));
   }
 
-  validateConfig(userConfig) {
+  async validateConfig(userConfig) {
     if (!this.schema.properties.provider.properties.name) {
       configurationValidationResults.set(this.serverless.configurationInput, false);
       if (this.serverless.service.configValidationMode !== 'off') {
@@ -119,11 +119,9 @@ class ConfigSchemaHandler {
       this.relaxProviderSchema();
     }
 
-    const ajv = new Ajv({ allErrors: true, coerceTypes: 'array', verbose: true });
-    require('ajv-keywords')(ajv, 'regexp');
     // Workaround https://github.com/ajv-validator/ajv/issues/1255
     normalizeSchemaObject(this.schema, this.schema);
-    const validate = ajv.compile(this.schema);
+    const validate = await resolveAjvValidate(this.schema);
 
     const denormalizeOptions = normalizeUserConfig(userConfig);
     validate(userConfig);
diff --git a/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.js b/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.js
index fe5a6a536ae..bca4c69f63e 100644
--- a/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.js
+++ b/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.js
@@ -1,24 +1,22 @@
 'use strict';
 
 const _ = require('lodash');
-const resolveDataPathSize = require('./resolveDataPathSize');
 
-const isEventTypeDataPath = RegExp.prototype.test.bind(/^\.functions\[[^\]]+\]\.events\[\d+\]$/);
+const isEventTypeInstancePath = RegExp.prototype.test.bind(/^\/functions\/[^/]+\/events\/\d+$/);
 const oneOfPathPattern = /\/(?:anyOf|oneOf)(?:\/\d+\/|$)/;
 const isAnyOfPathTypePostfix = RegExp.prototype.test.bind(/^\/\d+\/type$/);
-const dataPathPropertyBracketsPattern = /\['([a-zA-Z_0-9]+)'\]/g;
 const oneOfKeywords = new Set(['anyOf', 'oneOf']);
 
 const filterIrreleventEventConfigurationErrors = (resultErrorsSet) => {
   // 1. Resolve all errors at event type configuration level
-  const eventTypeErrors = Array.from(resultErrorsSet).filter(({ dataPath }) =>
-    isEventTypeDataPath(dataPath)
+  const eventTypeErrors = Array.from(resultErrorsSet).filter(({ instancePath }) =>
+    isEventTypeInstancePath(instancePath)
   );
   // 2. Group event type configuration errors by event instance
-  const eventTypeErrorsByEvent = _.groupBy(eventTypeErrors, ({ dataPath }) => dataPath);
+  const eventTypeErrorsByEvent = _.groupBy(eventTypeErrors, ({ instancePath }) => instancePath);
 
   // 3. Process each error group individually
-  for (const [dataPath, eventEventTypeErrors] of Object.entries(eventTypeErrorsByEvent)) {
+  for (const [instancePath, eventEventTypeErrors] of Object.entries(eventTypeErrorsByEvent)) {
     // 3.1 Resolve error that signals that no event schema was matched
     const noMatchingEventError = eventEventTypeErrors.find(({ keyword }) =>
       oneOfKeywords.has(keyword)
@@ -43,7 +41,8 @@ const filterIrreleventEventConfigurationErrors = (resultErrorsSet) => {
       // 3.4 If there are no event type configuration errors for intended event type
       if (
         !Array.from(resultErrorsSet).some(
-          (error) => error.dataPath.startsWith(dataPath) && error.dataPath !== dataPath
+          (error) =>
+            error.instancePath.startsWith(instancePath) && error.instancePath !== instancePath
         )
       ) {
         // 3.4.1 If there are no event configuration errors, it means it's not supported event type:
@@ -69,8 +68,11 @@ const filterIrreleventEventConfigurationErrors = (resultErrorsSet) => {
       //       - All event configuration errors
       const meaningfulSchemaPath = eventConfiguredEventTypeErrors[0];
       for (const error of resultErrorsSet) {
-        if (!error.dataPath.startsWith(dataPath)) continue;
-        if (error.dataPath === dataPath && error.schemaPath.startsWith(meaningfulSchemaPath)) {
+        if (!error.instancePath.startsWith(instancePath)) continue;
+        if (
+          error.instancePath === instancePath &&
+          error.schemaPath.startsWith(meaningfulSchemaPath)
+        ) {
           continue;
         }
         resultErrorsSet.delete(error);
@@ -98,29 +100,28 @@ const filterIrrelevantAnyOfErrors = (resultErrorsSet) => {
   for (const [oneOfPath, oneOfPathErrors] of Object.entries(oneOfErrorsByPath)) {
     // 2.1. If just one error, set was already filtered by event configuration errors filter
     if (oneOfPathErrors.length === 1) continue;
-    // 2.2. Group by dataPath
-    oneOfPathErrors.sort(({ dataPath: dataPathA }, { dataPath: dataPathB }) =>
-      dataPathA.localeCompare(dataPathB)
+    // 2.2. Group by instancePath
+    oneOfPathErrors.sort(({ instancePath: instancePathA }, { instancePath: instancePathB }) =>
+      instancePathA.localeCompare(instancePathB)
     );
-    let currentDataPath = oneOfPathErrors[0].dataPath;
+    let currentInstancePath = oneOfPathErrors[0].instancePath;
     Object.values(
-      _.groupBy(oneOfPathErrors, ({ dataPath }) => {
+      _.groupBy(oneOfPathErrors, ({ instancePath }) => {
         if (
-          dataPath !== currentDataPath &&
-          !dataPath.startsWith(`${currentDataPath}.`) &&
-          !dataPath.startsWith(`${currentDataPath}[`)
+          instancePath !== currentInstancePath &&
+          !instancePath.startsWith(`${currentInstancePath}/`)
         ) {
-          currentDataPath = dataPath;
+          currentInstancePath = instancePath;
         }
-        return currentDataPath;
+        return currentInstancePath;
       })
-    ).forEach((dataPathOneOfPathErrors) => {
+    ).forEach((instancePathOneOfPathErrors) => {
       // 2.2.1.If just one error, set was already filtered by event configuration errors filter
-      if (dataPathOneOfPathErrors.length === 1) return;
+      if (instancePathOneOfPathErrors.length === 1) return;
       // 2.2.2 Group by anyOf variant
       const groupFromIndex = oneOfPath.length + 1;
-      const dataPathOneOfPathErrorsByVariant = _.groupBy(
-        dataPathOneOfPathErrors,
+      const instancePathOneOfPathErrorsByVariant = _.groupBy(
+        instancePathOneOfPathErrors,
         ({ schemaPath }) => {
           if (groupFromIndex > schemaPath.length) return 'root';
           return schemaPath.slice(groupFromIndex, schemaPath.indexOf('/', groupFromIndex));
@@ -128,52 +129,59 @@ const filterIrrelevantAnyOfErrors = (resultErrorsSet) => {
       );
 
       // 2.2.3 If no root error, set was already filtered by event configuration errors filter
-      if (!dataPathOneOfPathErrorsByVariant.root) return;
-      const noMatchingVariantError = dataPathOneOfPathErrorsByVariant.root[0];
-      delete dataPathOneOfPathErrorsByVariant.root;
-      let dataPathOneOfPathVariants = Object.values(dataPathOneOfPathErrorsByVariant);
+      if (!instancePathOneOfPathErrorsByVariant.root) return;
+      const noMatchingVariantError = instancePathOneOfPathErrorsByVariant.root[0];
+      delete instancePathOneOfPathErrorsByVariant.root;
+      let instancePathOneOfPathVariants = Object.values(instancePathOneOfPathErrorsByVariant);
       // 2.2.4 If no variants, set was already filtered by event configuration errors filter
-      if (!dataPathOneOfPathVariants.length) return;
+      if (!instancePathOneOfPathVariants.length) return;
 
-      if (dataPathOneOfPathVariants.length > 1) {
+      if (instancePathOneOfPathVariants.length > 1) {
         // 2.2.5 If errors reported for more than one variant
         // 2.2.5.1 Filter variants where value type was not met
-        dataPathOneOfPathVariants = dataPathOneOfPathVariants.filter(
-          (dataPathOneOfPathVariantErrors) => {
-            if (dataPathOneOfPathVariantErrors.length !== 1) return true;
-            if (dataPathOneOfPathVariantErrors[0].keyword !== 'type') return true;
+        instancePathOneOfPathVariants = instancePathOneOfPathVariants.filter(
+          (instancePathOneOfPathVariantErrors) => {
+            if (instancePathOneOfPathVariantErrors.length !== 1) return true;
+            if (instancePathOneOfPathVariantErrors[0].keyword !== 'type') return true;
             if (
               !isAnyOfPathTypePostfix(
-                dataPathOneOfPathVariantErrors[0].schemaPath.slice(oneOfPath.length)
+                instancePathOneOfPathVariantErrors[0].schemaPath.slice(oneOfPath.length)
               )
             ) {
               return true;
             }
-            for (const dataPathOneOfPathVariantError of dataPathOneOfPathVariantErrors) {
-              resultErrorsSet.delete(dataPathOneOfPathVariantError);
+            for (const instancePathOneOfPathVariantError of instancePathOneOfPathVariantErrors) {
+              resultErrorsSet.delete(instancePathOneOfPathVariantError);
             }
             return false;
           }
         );
-        if (dataPathOneOfPathVariants.length > 1) {
+        if (instancePathOneOfPathVariants.length > 1) {
           // 2.2.5.2 Leave out variants where errors address deepest data paths
-          let deepestDataPathSize = 0;
-          for (const dataPathOneOfPathVariantErrors of dataPathOneOfPathVariants) {
-            dataPathOneOfPathVariantErrors.deepestDataPathSize = Math.max(
-              ...dataPathOneOfPathVariantErrors.map(({ dataPath }) => resolveDataPathSize(dataPath))
+          let deepestInstancePathSize = 0;
+          for (const instancePathOneOfPathVariantErrors of instancePathOneOfPathVariants) {
+            instancePathOneOfPathVariantErrors.deepestInstancePathSize = Math.max(
+              ...instancePathOneOfPathVariantErrors.map(
+                ({ instancePath }) => (instancePath.match(/\//g) || []).length
+              )
             );
-            if (dataPathOneOfPathVariantErrors.deepestDataPathSize > deepestDataPathSize) {
-              deepestDataPathSize = dataPathOneOfPathVariantErrors.deepestDataPathSize;
+            if (
+              instancePathOneOfPathVariantErrors.deepestInstancePathSize > deepestInstancePathSize
+            ) {
+              deepestInstancePathSize = instancePathOneOfPathVariantErrors.deepestInstancePathSize;
             }
           }
 
-          dataPathOneOfPathVariants = dataPathOneOfPathVariants.filter(
-            (dataPathAnyOfPathVariantErrors) => {
-              if (dataPathAnyOfPathVariantErrors.deepestDataPathSize === deepestDataPathSize) {
+          instancePathOneOfPathVariants = instancePathOneOfPathVariants.filter(
+            (instancePathAnyOfPathVariantErrors) => {
+              if (
+                instancePathAnyOfPathVariantErrors.deepestInstancePathSize ===
+                deepestInstancePathSize
+              ) {
                 return true;
               }
-              for (const dataPathOneOfPathVariantError of dataPathAnyOfPathVariantErrors) {
-                resultErrorsSet.delete(dataPathOneOfPathVariantError);
+              for (const instancePathOneOfPathVariantError of instancePathAnyOfPathVariantErrors) {
+                resultErrorsSet.delete(instancePathOneOfPathVariantError);
               }
               return false;
             }
@@ -182,19 +190,19 @@ const filterIrrelevantAnyOfErrors = (resultErrorsSet) => {
       }
 
       // 2.2.6 If all variants were filtered, expose just "no matching variant" error
-      if (!dataPathOneOfPathVariants.length) return;
+      if (!instancePathOneOfPathVariants.length) return;
       // 2.2.7 If just one variant left, expose only errors for that variant
-      if (dataPathOneOfPathVariants.length === 1) {
+      if (instancePathOneOfPathVariants.length === 1) {
         resultErrorsSet.delete(noMatchingVariantError);
         return;
       }
       // 2.2.8 If more than one variant left, expose just "no matching variant" error
-      for (const dataPathOneOfPathVariantErrors of dataPathOneOfPathVariants) {
+      for (const instancePathOneOfPathVariantErrors of instancePathOneOfPathVariants) {
         const types = new Set();
-        for (const dataPathOneOfPathVariantError of dataPathOneOfPathVariantErrors) {
-          const parentSchema = dataPathOneOfPathVariantError.parentSchema;
+        for (const instancePathOneOfPathVariantError of instancePathOneOfPathVariantErrors) {
+          const parentSchema = instancePathOneOfPathVariantError.parentSchema;
           types.add(parentSchema.const ? 'const' : parentSchema.type);
-          resultErrorsSet.delete(dataPathOneOfPathVariantError);
+          resultErrorsSet.delete(instancePathOneOfPathVariantError);
         }
         if (types.size === 1) noMatchingVariantError.commonType = types.values().next().value;
       }
@@ -202,18 +210,18 @@ const filterIrrelevantAnyOfErrors = (resultErrorsSet) => {
   }
 };
 
-const normalizeDataPath = (dataPath) => {
-  if (!dataPath) return 'root';
+const normalizeInstancePath = (instancePath) => {
+  if (!instancePath) return 'root';
 
-  // This regex helps replace functions['someFunc'].foo with functions.someFunc.foo
-  return `'${dataPath.slice(1).replace(dataPathPropertyBracketsPattern, '.$1')}'`;
+  // This code removes leading / and replaces / with . in error path indication
+  return `'${instancePath.slice(1).replace(/\//g, '.')}'`;
 };
 
 const improveMessages = (resultErrorsSet) => {
   for (const error of resultErrorsSet) {
     switch (error.keyword) {
       case 'additionalProperties':
-        if (error.dataPath === '.functions') {
+        if (error.instancePath === '/functions') {
           error.message = `name '${error.params.additionalProperty}' must be alphanumeric`;
         } else {
           error.message = `unrecognized property '${error.params.additionalProperty}'`;
@@ -223,7 +231,7 @@ const improveMessages = (resultErrorsSet) => {
         error.message = `value '${error.data}' does not satisfy pattern ${error.schema}`;
         break;
       case 'anyOf':
-        if (isEventTypeDataPath(error.dataPath)) {
+        if (isEventTypeInstancePath(error.instancePath)) {
           error.message = 'unsupported function event';
           break;
         }
@@ -243,7 +251,7 @@ const improveMessages = (resultErrorsSet) => {
         break;
       default:
     }
-    error.message = `at ${normalizeDataPath(error.dataPath)}: ${error.message}`;
+    error.message = `at ${normalizeInstancePath(error.instancePath)}: ${error.message}`;
   }
 };
 
diff --git a/lib/classes/ConfigSchemaHandler/resolveAjvValidate.js b/lib/classes/ConfigSchemaHandler/resolveAjvValidate.js
new file mode 100644
index 00000000000..cba53e1e9bd
--- /dev/null
+++ b/lib/classes/ConfigSchemaHandler/resolveAjvValidate.js
@@ -0,0 +1,62 @@
+'use strict';
+
+const Ajv = require('ajv').default;
+const objectHash = require('object-hash');
+const path = require('path');
+const os = require('os');
+const standaloneCode = require('ajv/dist/standalone').default;
+const fs = require('fs');
+const requireFromString = require('require-from-string');
+const deepSortObjectByKey = require('../../utils/deepSortObjectByKey');
+const ensureExists = require('../../utils/ensureExists');
+
+const getCacheDir = () => {
+  return path.resolve(
+    process.env.SLS_SCHEMA_CACHE_BASE_DIR || os.homedir(),
+    `.serverless/artifacts/ajv-validate-${require('ajv/package').version}`
+  );
+};
+
+// Validators are cached by schema hash for the purpose
+// of speeding up tests and reducing their memory footprint.
+// If that solution proves to not be enough, we can improve it
+// with `uni-global` package.
+const cachedValidatorsBySchemaHash = {};
+
+const getValidate = async (schema) => {
+  const schemaHash = objectHash(deepSortObjectByKey(schema));
+  if (cachedValidatorsBySchemaHash[schemaHash]) {
+    return cachedValidatorsBySchemaHash[schemaHash];
+  }
+  const filename = `${schemaHash}.js`;
+  const cachePath = path.resolve(getCacheDir(), filename);
+
+  const generate = async () => {
+    const ajv = new Ajv({
+      allErrors: true,
+      coerceTypes: 'array',
+      verbose: true,
+      strict: true,
+      strictRequired: false,
+      code: { source: true },
+    });
+    require('ajv-formats').default(ajv);
+    // Ensure AJV related packages work well when there are mutliple AJV installations around
+    // See: https://github.com/ajv-validator/ajv/issues/1390#issuecomment-763138202
+    ajv.opts.code.formats = Ajv._`require("ajv-formats/dist/formats").fullFormats`;
+    require('ajv-keywords')(ajv, 'regexp');
+    const validate = ajv.compile(schema);
+    const moduleCode = standaloneCode(ajv, validate);
+    await fs.promises.writeFile(cachePath, moduleCode);
+  };
+  await ensureExists(cachePath, generate);
+  const loadedModuleCode = await fs.promises.readFile(cachePath, 'utf-8');
+  const validator = requireFromString(
+    loadedModuleCode,
+    path.resolve(__dirname, `[generated-ajv-validate]${filename}`)
+  );
+  cachedValidatorsBySchemaHash[schemaHash] = validator;
+  return validator;
+};
+
+module.exports = getValidate;
diff --git a/lib/classes/ConfigSchemaHandler/resolveDataPathSize.js b/lib/classes/ConfigSchemaHandler/resolveDataPathSize.js
deleted file mode 100644
index beeccbc0e95..00000000000
--- a/lib/classes/ConfigSchemaHandler/resolveDataPathSize.js
+++ /dev/null
@@ -1,41 +0,0 @@
-'use strict';
-
-const memoizee = require('memoizee');
-
-module.exports = memoizee(
-  (dataPath) => {
-    let index;
-    let size = 0;
-    let mode = 'literal';
-    let char;
-    for (index = 0; (char = dataPath[index]); ++index) {
-      switch (mode) {
-        case 'literal':
-          if (char === '.') {
-            ++size;
-          } else if (char === '[') {
-            ++size;
-            mode = 'openBracket';
-          }
-          break;
-        case 'openBracket':
-          mode = char === "'" ? 'string' : 'number';
-          break;
-        case 'string':
-          if (char === "'") mode = 'stringQuote';
-          break;
-        case 'stringQuote':
-          if (char === ']') mode = 'literal';
-          else if (char !== "'") mode = 'string';
-          break;
-        case 'number':
-          if (char === ']') mode = 'literal';
-          break;
-        default:
-          throw new Error(`Unexpected mode ${mode}`);
-      }
-    }
-    return size;
-  },
-  { primitive: true }
-);
diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index 0b973d55fe5..db35c9a3806 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -271,14 +271,14 @@ class Service {
     });
   }
 
-  validate() {
+  async validate() {
     const userConfig = this.initialServerlessConfig;
 
     // Ensure to validate normalized (after mergeArrays) input
     if (userConfig.functions) userConfig.functions = this.functions;
     if (userConfig.resources) userConfig.resources = this.resources;
 
-    this.serverless.configSchemaHandler.validateConfig(userConfig);
+    await this.serverless.configSchemaHandler.validateConfig(userConfig);
 
     return this;
   }
diff --git a/package.json b/package.json
index 216dcf34d70..9926e12ac6c 100644
--- a/package.json
+++ b/package.json
@@ -26,8 +26,9 @@
     "@serverless/dashboard-plugin": "^6.0.0",
     "@serverless/platform-client": "^4.3.0",
     "@serverless/utils": "^6.0.0",
-    "ajv": "^6.12.6",
-    "ajv-keywords": "^3.5.2",
+    "ajv": "^8.8.2",
+    "ajv-formats": "^2.1.1",
+    "ajv-keywords": "^5.1.0",
     "archiver": "^5.3.0",
     "aws-sdk": "^2.1062.0",
     "bluebird": "^3.7.2",
@@ -60,11 +61,13 @@
     "micromatch": "^4.0.4",
     "ncjsm": "^4.3.0",
     "node-fetch": "^2.6.7",
+    "object-hash": "^2.2.0",
     "open": "^7.4.2",
     "path2": "^0.1.0",
     "process-utils": "^4.0.0",
     "promise-queue": "^2.2.5",
     "replaceall": "^0.1.6",
+    "require-from-string": "^2.0.2",
     "semver": "^7.3.5",
     "signal-exit": "^3.0.6",
     "strip-ansi": "^6.0.1",
diff --git a/test/unit/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.test.js b/test/unit/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.test.js
index f17355f0dda..ecca1c5e2b0 100644
--- a/test/unit/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.test.js
+++ b/test/unit/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.test.js
@@ -2,7 +2,7 @@
 
 const { expect } = require('chai');
 
-const Ajv = require('ajv');
+const Ajv = require('ajv').default;
 const memoize = require('memoizee');
 const normalizeAjvErrors = require('../../../../../lib/classes/ConfigSchemaHandler/normalizeAjvErrors');
 
@@ -219,7 +219,7 @@ describe('#normalizeAjvErrors', () => {
     it('should report error for unrecognized root property', () =>
       expect(
         errors.some((error) => {
-          if (error.dataPath !== '') return false;
+          if (error.instancePath !== '') return false;
           if (error.keyword !== 'additionalProperties') return false;
           error.isExpected = true;
           return true;
@@ -228,7 +228,7 @@ describe('#normalizeAjvErrors', () => {
     it('should report error for unrecognized deep level property', () =>
       expect(
         errors.some((error) => {
-          if (error.dataPath !== '.package') return false;
+          if (error.instancePath !== '/package') return false;
           if (error.keyword !== 'additionalProperties') return false;
           error.isExpected = true;
           return true;
@@ -237,7 +237,7 @@ describe('#normalizeAjvErrors', () => {
     it('should report error for invalid function name', () =>
       expect(
         errors.some((error) => {
-          if (error.dataPath !== '.functions') return false;
+          if (error.instancePath !== '/functions') return false;
           if (error.keyword !== 'additionalProperties') return false;
           error.isExpected = true;
           return true;
@@ -246,7 +246,7 @@ describe('#normalizeAjvErrors', () => {
     it('should report error for unrecognized event', () =>
       expect(
         errors.some((error) => {
-          if (error.dataPath !== ".functions['foo'].events[0]") return false;
+          if (error.instancePath !== '/functions/foo/events/0') return false;
           if (error.keyword !== 'anyOf') return false;
           error.isExpected = true;
           return true;
@@ -255,7 +255,7 @@ describe('#normalizeAjvErrors', () => {
     it('should report error for unrecognized property at event type configuration level', () =>
       expect(
         errors.some((error) => {
-          if (error.dataPath !== ".functions['foo'].events[1]") return false;
+          if (error.instancePath !== '/functions/foo/events/1') return false;
           if (error.keyword !== 'additionalProperties') return false;
           error.isExpected = true;
           return true;
@@ -274,7 +274,7 @@ describe('#normalizeAjvErrors', () => {
         //         method: GET # Should be additionally indented
         expect(
           errors.some((error) => {
-            if (error.dataPath !== ".functions['foo'].events[2]") return false;
+            if (error.instancePath !== '/functions/foo/events/2') return false;
             if (error.keyword !== 'additionalProperties') return false;
             error.isExpected = true;
             return true;
@@ -287,7 +287,7 @@ describe('#normalizeAjvErrors', () => {
       () =>
         expect(
           errors.some((error) => {
-            if (error.dataPath !== ".functions['foo'].events[3].http") return false;
+            if (error.instancePath !== '/functions/foo/events/3/http') return false;
             if (error.keyword !== 'additionalProperties') return false;
             error.isExpected = true;
             return true;
@@ -300,7 +300,7 @@ describe('#normalizeAjvErrors', () => {
       () =>
         expect(
           errors.some((error) => {
-            if (error.dataPath !== ".functions['foo'].events[4].http") return false;
+            if (error.instancePath !== '/functions/foo/events/4/http') return false;
             if (error.keyword !== 'pattern') return false;
             error.isExpected = true;
             return true;
@@ -313,7 +313,7 @@ describe('#normalizeAjvErrors', () => {
       () =>
         expect(
           errors.some((error) => {
-            if (error.dataPath !== ".functions['foo'].events[5].http") return false;
+            if (error.instancePath !== '/functions/foo/events/5/http') return false;
             if (error.keyword !== 'required') return false;
             error.isExpected = true;
             return true;
@@ -326,7 +326,9 @@ describe('#normalizeAjvErrors', () => {
       () =>
         expect(
           errors.some((error) => {
-            if (error.dataPath !== '.provider.deploymentBucket.maxPreviousDeploymentArtifacts') {
+            if (
+              error.instancePath !== '/provider/deploymentBucket/maxPreviousDeploymentArtifacts'
+            ) {
               return false;
             }
             if (error.keyword !== 'type') return false;
@@ -341,7 +343,7 @@ describe('#normalizeAjvErrors', () => {
       () =>
         expect(
           errors.some((error) => {
-            if (error.dataPath !== '.custom.someCustom') {
+            if (error.instancePath !== '/custom/someCustom') {
               return false;
             }
             if (error.keyword !== 'anyOf') return false;
@@ -356,7 +358,7 @@ describe('#normalizeAjvErrors', () => {
       () =>
         expect(
           errors.some((error) => {
-            if (error.dataPath !== '.custom.someString') {
+            if (error.instancePath !== '/custom/someString') {
               return false;
             }
             if (error.keyword !== 'anyOf') return false;
@@ -378,7 +380,7 @@ describe('#normalizeAjvErrors', () => {
     it('should report "additionalProperties" error with meaningful message', () =>
       expect(
         errors.find((error) => {
-          if (error.dataPath !== '.package') return false;
+          if (error.instancePath !== '/package') return false;
           if (error.keyword !== 'additionalProperties') return false;
           return true;
         }).message
@@ -386,7 +388,7 @@ describe('#normalizeAjvErrors', () => {
     it('should report invalid function name error with meaningful message', () =>
       expect(
         errors.find((error) => {
-          if (error.dataPath !== '.functions') return false;
+          if (error.instancePath !== '/functions') return false;
           if (error.keyword !== 'additionalProperties') return false;
           return true;
         }).message
@@ -394,7 +396,7 @@ describe('#normalizeAjvErrors', () => {
     it('should report unrecognized event error with a meaningful message', () =>
       expect(
         errors.find((error) => {
-          if (error.dataPath !== ".functions['foo'].events[0]") return false;
+          if (error.instancePath !== '/functions/foo/events/0') return false;
           if (error.keyword !== 'anyOf') return false;
           return true;
         }).message
@@ -402,7 +404,7 @@ describe('#normalizeAjvErrors', () => {
     it('should report value which do not match multiple constants with a meaningful message', () =>
       expect(
         errors.find((error) => {
-          if (error.dataPath !== '.custom.someCustom') return false;
+          if (error.instancePath !== '/custom/someCustom') return false;
           if (error.keyword !== 'anyOf') return false;
           return true;
         }).message
@@ -410,7 +412,7 @@ describe('#normalizeAjvErrors', () => {
     it('should report value which do not match multiple string formats with a meaningful message', () =>
       expect(
         errors.find((error) => {
-          if (error.dataPath !== '.custom.someString') return false;
+          if (error.instancePath !== '/custom/someString') return false;
           if (error.keyword !== 'anyOf') return false;
           return true;
         }).message
diff --git a/test/unit/lib/classes/ConfigSchemaHandler/resolveAjvValidate.test.js b/test/unit/lib/classes/ConfigSchemaHandler/resolveAjvValidate.test.js
new file mode 100644
index 00000000000..87f697caa83
--- /dev/null
+++ b/test/unit/lib/classes/ConfigSchemaHandler/resolveAjvValidate.test.js
@@ -0,0 +1,60 @@
+'use strict';
+
+const chai = require('chai');
+const resolveAjvValidate = require('../../../../../lib/classes/ConfigSchemaHandler/resolveAjvValidate');
+const objectHash = require('object-hash');
+const deepSortObjectByKey = require('../../../../../lib/utils/deepSortObjectByKey');
+const path = require('path');
+const os = require('os');
+const fsp = require('fs').promises;
+
+chai.use(require('chai-as-promised'));
+
+const expect = chai.expect;
+
+describe('test/unit/lib/classes/ConfigSchemaHandler/resolveAjvValidate.test.js', () => {
+  const schema = {
+    $id: 'https://example.com/person.schema.json',
+    $schema: 'http://json-schema.org/draft-07/schema#',
+    title: 'TestSchema',
+    type: 'object',
+    properties: {
+      firstProp: {
+        type: 'string',
+      },
+    },
+  };
+
+  it('generates schema validation file', async () => {
+    await resolveAjvValidate(schema);
+    const schemaHash = objectHash(deepSortObjectByKey(schema));
+
+    const fileStat = await fsp.lstat(
+      path.resolve(
+        process.env.SLS_SCHEMA_CACHE_BASE_DIR || os.homedir(),
+        `.serverless/artifacts/ajv-validate-${require('ajv/package').version}`,
+        `${schemaHash}.js`
+      )
+    );
+    expect(fileStat.isFile()).to.be.true;
+  });
+
+  it('regenerates schema validation file if schema changes', async () => {
+    await resolveAjvValidate(schema);
+    const updatedSchema = {
+      ...schema,
+      title: 'ChangedTitle',
+    };
+    await resolveAjvValidate(updatedSchema);
+    const schemaHash = objectHash(deepSortObjectByKey(updatedSchema));
+
+    const fileStat = await fsp.lstat(
+      path.resolve(
+        process.env.SLS_SCHEMA_CACHE_BASE_DIR || os.homedir(),
+        `.serverless/artifacts/ajv-validate-${require('ajv/package').version}`,
+        `${schemaHash}.js`
+      )
+    );
+    expect(fileStat.isFile()).to.be.true;
+  });
+});
diff --git a/test/unit/lib/classes/ConfigSchemaHandler/resolveDataPathSize.test.js b/test/unit/lib/classes/ConfigSchemaHandler/resolveDataPathSize.test.js
deleted file mode 100644
index 9bbd2ade9db..00000000000
--- a/test/unit/lib/classes/ConfigSchemaHandler/resolveDataPathSize.test.js
+++ /dev/null
@@ -1,18 +0,0 @@
-'use strict';
-
-const { expect } = require('chai');
-const resolveDataPathSize = require('../../../../../lib/classes/ConfigSchemaHandler/resolveDataPathSize');
-
-describe('#resolveDataPathSize', () => {
-  it('should count root property as 1', () => expect(resolveDataPathSize('.foo'), 1));
-  it('should recognize all deep litera properties', () =>
-    expect(resolveDataPathSize('.foo.bar.mar'), 3));
-  it('should recognize string property', () => expect(resolveDataPathSize(".foo['bar']"), 2));
-  it('should recognize multiple string property', () =>
-    expect(resolveDataPathSize(".foo['bar']['or']"), 3));
-  it('should recognize numeric property', () => expect(resolveDataPathSize('.foo[1]'), 2));
-  it('should recognize multiple numeric properties', () =>
-    expect(resolveDataPathSize('.foo[1][2]'), 3));
-  it('should recognize mixed multiple property notations', () =>
-    expect(resolveDataPathSize(".foo[1]['2'].elo['3'].bar[2].foo['2'][3]"), 10));
-});
diff --git a/test/unit/lib/configSchema.test.js b/test/unit/lib/configSchema.test.js
index beabbf6e0a7..e431e1d53eb 100644
--- a/test/unit/lib/configSchema.test.js
+++ b/test/unit/lib/configSchema.test.js
@@ -12,7 +12,7 @@ describe('test/unit/lib/configSchema.test.js', () => {
     },
     {
       isValid: false,
-      errorMessage: "should have required property 'name'",
+      errorMessage: "must have required property 'name'",
       description: 'service required properties',
       mutation: {
         provider: { name: null },
@@ -20,7 +20,7 @@ describe('test/unit/lib/configSchema.test.js', () => {
     },
     {
       isValid: false,
-      errorMessage: 'should match pattern "^[a-zA-Z][0-9a-zA-Z-]+$"',
+      errorMessage: 'must match pattern "^[a-zA-Z][0-9a-zA-Z-]+$"',
       description: 'service name in string typed service',
       mutation: {
         service: '1-first-number-is-not-allowed',
diff --git a/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js b/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
index eab2d0fc557..231129f2f34 100644
--- a/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
@@ -341,7 +341,7 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
               },
             },
           })
-        ).to.be.eventually.rejectedWith(/'provider.iam.role.path': should match pattern/);
+        ).to.be.eventually.rejectedWith(/'provider.iam.role.path': must match pattern/);
       });
 
       it('should support `provider.iam.role.statements`', async () => {

From 1e774170267da496f009c5504136201e86116901 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 5 Jan 2022 15:05:08 +0100
Subject: [PATCH 0890/1101] refactor(CLI): Improve progress for CloudFormation
 updates

---
 lib/plugins/aws/deploy/lib/createStack.js |  8 ++----
 lib/plugins/aws/lib/monitorStack.js       | 31 +++++++++++++++++++++--
 lib/plugins/aws/lib/updateStack.js        | 16 +++---------
 3 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/lib/plugins/aws/deploy/lib/createStack.js b/lib/plugins/aws/deploy/lib/createStack.js
index 4eb6aaf7d51..c64783c4c5a 100644
--- a/lib/plugins/aws/deploy/lib/createStack.js
+++ b/lib/plugins/aws/deploy/lib/createStack.js
@@ -21,11 +21,7 @@ module.exports = {
 
     // Create new change set
     log.info('Creating new change set');
-    const changeSet = await this.provider.request(
-      'CloudFormation',
-      'createChangeSet',
-      createChangeSetParams
-    );
+    await this.provider.request('CloudFormation', 'createChangeSet', createChangeSetParams);
 
     // Wait for changeset to be created
     log.info('Waiting for new change set to be created');
@@ -46,7 +42,7 @@ module.exports = {
     this.provider.didCreateService = true;
     log.info('Executing created change set');
     await this.provider.request('CloudFormation', 'executeChangeSet', executeChangeSetParams);
-    await this.monitorStack('create', changeSet);
+    await this.monitorStack('create', changeSetDescription);
   },
 
   async createStack() {
diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js
index 178816e51de..2255d12478c 100644
--- a/lib/plugins/aws/lib/monitorStack.js
+++ b/lib/plugins/aws/lib/monitorStack.js
@@ -5,9 +5,10 @@ const chalk = require('chalk');
 const wait = require('timers-ext/promise/sleep');
 const identity = require('ext/function/identity');
 const ServerlessError = require('../../../serverless-error');
-const { log, legacy, style } = require('@serverless/utils/log');
+const { log, legacy, style, progress } = require('@serverless/utils/log');
 const getMonitoringFrequency = require('../utils/get-monitoring-frequency');
 
+const mainProgress = progress.get('main');
 const validStatuses = new Set(['CREATE_COMPLETE', 'UPDATE_COMPLETE', 'DELETE_COMPLETE']);
 
 const normalizerPattern = /(?<!^)([A-Z])/g;
@@ -27,7 +28,13 @@ module.exports = {
     cfData,
     stackUrl,
     options,
-    { loggedEventIds = new Set(), stackStatus = null, stackLatestError = null, firstEventId = null }
+    {
+      loggedEventIds = new Set(),
+      stackStatus = null,
+      stackLatestError = null,
+      firstEventId = null,
+      completedResources = new Set(),
+    }
   ) {
     return wait(getMonitoringFrequency(options.frequency))
       .then(() =>
@@ -92,6 +99,25 @@ module.exports = {
                   legacy.write(chalk.yellow('.'));
                 }
 
+                if (
+                  event.ResourceType !== 'AWS::CloudFormation::Stack' &&
+                  eventStatus &&
+                  eventStatus.endsWith('COMPLETE')
+                ) {
+                  completedResources.add(event.LogicalResourceId);
+                }
+
+                if (action !== 'delete' && cfData.Changes) {
+                  const progressMessagePrefix = (() => {
+                    if (action === 'create') return 'Creating';
+                    if (action === 'update') return 'Updating';
+                    throw new Error(`Unrecgonized action: ${action}`);
+                  })();
+                  mainProgress.notice(
+                    `${progressMessagePrefix} CloudFormation stack (${completedResources.size}/${cfData.Changes.length})`
+                  );
+                }
+
                 // Prepare for next monitoring action
                 loggedEventIds.add(event.EventId);
               });
@@ -165,6 +191,7 @@ module.exports = {
           stackStatus,
           stackLatestError,
           firstEventId,
+          completedResources,
         });
       });
   },
diff --git a/lib/plugins/aws/lib/updateStack.js b/lib/plugins/aws/lib/updateStack.js
index f8bf8840bbd..f12c7940a20 100644
--- a/lib/plugins/aws/lib/updateStack.js
+++ b/lib/plugins/aws/lib/updateStack.js
@@ -28,11 +28,7 @@ module.exports = {
     // Create new change set
     this.provider.didCreateService = true;
     log.info('Creating new change set');
-    const changeSet = await this.provider.request(
-      'CloudFormation',
-      'createChangeSet',
-      createChangeSetParams
-    );
+    await this.provider.request('CloudFormation', 'createChangeSet', createChangeSetParams);
 
     // Wait for changeset to be created
     log.info('Waiting for new change set to be created');
@@ -52,7 +48,7 @@ module.exports = {
 
     log.info('Executing created change set');
     await this.provider.request('CloudFormation', 'executeChangeSet', executeChangeSetParams);
-    return await this.monitorStack('create', changeSet);
+    return await this.monitorStack('create', changeSetDescription);
   },
 
   async update() {
@@ -79,11 +75,7 @@ module.exports = {
 
     // Create new change set
     log.info('Creating new change set');
-    const changeSet = await this.provider.request(
-      'CloudFormation',
-      'createChangeSet',
-      createChangeSetParams
-    );
+    await this.provider.request('CloudFormation', 'createChangeSet', createChangeSetParams);
 
     // Wait for changeset to be created
     log.info('Waiting for new change set to be created');
@@ -104,7 +96,7 @@ module.exports = {
     log.info('Executing created change set');
     await this.provider.request('CloudFormation', 'executeChangeSet', executeChangeSetParams);
 
-    await this.monitorStack('update', changeSet);
+    await this.monitorStack('update', changeSetDescription);
 
     return true;
   },

From ae169f564a0e148a75064cca6b5ca3fff029ff33 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 6 Jan 2022 12:52:57 +0100
Subject: [PATCH 0891/1101] refactor(Telemetry): Include `paramsCount` in
 telemetry

---
 lib/utils/telemetry/generatePayload.js        | 11 +++++++
 .../utils/telemetry/generatePayload.test.js   | 33 +++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index f05c4da9582..b5885c5c94f 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -66,6 +66,16 @@ const getServiceConfig = ({ configuration, options, variableSources }) => {
     ? configuration.plugins.modules || configuration.plugins
     : [];
 
+  const resolveUniqueParamsCount = (params) => {
+    if (!isPlainObject(params)) return 0;
+    return new Set(
+      Object.values(params)
+        .filter(isPlainObject)
+        .map((stageParams) => Object.keys(stageParams))
+        .reduce((acc, stageParamsKeys) => [...acc, ...stageParamsKeys], [])
+    ).size;
+  };
+
   const result = {
     // TODO: Update when upgrading the default for next major
     configValidationMode: configValidationModeValues.has(configuration.configValidationMode)
@@ -99,6 +109,7 @@ const getServiceConfig = ({ configuration, options, variableSources }) => {
       })
       .filter(Boolean),
     resources,
+    paramsCount: resolveUniqueParamsCount(configuration.params),
   };
 
   // We want to recognize types of constructs from `serverless-lift` plugin if possible
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index ae92b433f38..9673f3176cc 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -152,6 +152,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
           general: ['AWS::Logs::LogGroup', 'AWS::S3::Bucket', 'Custom'],
         },
         variableSources: [],
+        paramsCount: 0,
       },
       isAutoUpdateEnabled: false,
       notificationsMode: 'on',
@@ -212,6 +213,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
         ],
         resources: undefined,
         variableSources: [],
+        paramsCount: 0,
       },
       isAutoUpdateEnabled: false,
       notificationsMode: 'on',
@@ -275,6 +277,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
         functions: [],
         resources: { general: [] },
         variableSources: [],
+        paramsCount: 0,
       },
       isAutoUpdateEnabled: false,
       notificationsMode: 'on',
@@ -367,6 +370,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
         plugins: [],
         functions: [],
         resources: { general: [] },
+        paramsCount: 0,
       },
       isAutoUpdateEnabled: false,
       triggeredDeprecations: [],
@@ -695,4 +699,33 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
 
     expect(payload.didCreateService).to.be.true;
   });
+
+  it('Should correctly resolve `params` property', () => {
+    const payload = generatePayload({
+      command: 'print',
+      options: {},
+      commandSchema: commandsSchema.get('print'),
+      serviceDir: process.cwd(),
+      configuration: {
+        service: 'foo',
+        provider: 'aws',
+        params: {
+          prod: {
+            val: '1',
+            other: '2',
+          },
+          staging: {
+            val: 'dev',
+            stagingonly: '1',
+          },
+          dev: {
+            devonly: 123,
+          },
+        },
+      },
+      commandUsage: [],
+    });
+
+    expect(payload.config.paramsCount).to.equal(4);
+  });
 });

From bdce13e36450ae5d3b2183df22e6f121e7ad6ea6 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 6 Jan 2022 16:34:04 +0100
Subject: [PATCH 0892/1101] feat: Remove `@serverless/cli` CLI integration

BREAKING CHANGE:
Serverless Components v1 (`@serverless/cli`) CLI is no longer integrated with Framework CLI.
---
 bin/serverless.js | 15 ++++++++++++++-
 package.json      |  1 -
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/bin/serverless.js b/bin/serverless.js
index 86068a08a5d..e876f476ada 100755
--- a/bin/serverless.js
+++ b/bin/serverless.js
@@ -60,7 +60,20 @@ require('../lib/cli/triage')().then((cliName) => {
       }
       return;
     case '@serverless/cli':
-      require('@serverless/cli').runComponents();
+      {
+        const chalk = require('chalk');
+        process.stdout.write(
+          `${[
+            'Serverless Components CLI v1 is no longer bundled with Serverless Framework CLI',
+            '',
+            "To run it, ensure it's installed:",
+            chalk.bold('npm install -g @serverless/cli'),
+            '',
+            'Then run:',
+            chalk.bold('components-v1 <command> <options>'),
+          ].join('\n')}\n`
+        );
+      }
       return;
     default:
       throw new Error(`Unrecognized CLI name "${cliName}"`);
diff --git a/package.json b/package.json
index 9926e12ac6c..91e6b27f49b 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
     "sls": "./bin/serverless.js"
   },
   "dependencies": {
-    "@serverless/cli": "^1.6.0",
     "@serverless/dashboard-plugin": "^6.0.0",
     "@serverless/platform-client": "^4.3.0",
     "@serverless/utils": "^6.0.0",

From 4dbb496506d8e7937a08176cf9d7e307f4d64157 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Mon, 10 Jan 2022 14:41:03 +0100
Subject: [PATCH 0893/1101] refactor(CLI Onboarding): Download templates from
 v3 examples branch

---
 lib/cli/interactive-setup/service.js                |  2 +-
 test/unit/lib/cli/interactive-setup/service.test.js | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index 14d49701d09..fe50c860cee 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -203,7 +203,7 @@ module.exports = {
         stepHistory: context.stepHistory,
       });
       projectDir = join(workingDir, projectName);
-      const templateUrl = `https://github.com/serverless/examples/tree/v2/${projectType}`;
+      const templateUrl = `https://github.com/serverless/examples/tree/v3/${projectType}`;
       legacy.write(`\nDownloading "${projectType}" template...\n`);
       const downloadProgress = progress.get('template-download');
       downloadProgress.notice(`Downloading "${projectType}" template`);
diff --git a/test/unit/lib/cli/interactive-setup/service.test.js b/test/unit/lib/cli/interactive-setup/service.test.js
index 695dbd54cb6..abf1cfd5f76 100644
--- a/test/unit/lib/cli/interactive-setup/service.test.js
+++ b/test/unit/lib/cli/interactive-setup/service.test.js
@@ -103,7 +103,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       const stats = await fsp.lstat('test-project/serverless.yml');
       expect(stats.isFile()).to.be.true;
       expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
-        'https://github.com/serverless/examples/tree/v2/aws-nodejs',
+        'https://github.com/serverless/examples/tree/v3/aws-nodejs',
         'aws-nodejs',
         'test-project'
       );
@@ -144,7 +144,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       const stats = await fsp.lstat('test-project-template/serverless.yml');
       expect(stats.isFile()).to.be.true;
       expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
-        'https://github.com/serverless/examples/tree/v2/aws-nodejs',
+        'https://github.com/serverless/examples/tree/v3/aws-nodejs',
         'aws-nodejs',
         'test-project-template'
       );
@@ -191,7 +191,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       const stats = await fsp.lstat('test-project-package-json/serverless.yml');
       expect(stats.isFile()).to.be.true;
       expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
-        'https://github.com/serverless/examples/tree/v2/aws-nodejs',
+        'https://github.com/serverless/examples/tree/v3/aws-nodejs',
         'aws-nodejs',
         'test-project-package-json'
       );
@@ -322,7 +322,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       const stats = await fsp.lstat('test-project-from-provided-template/serverless.yml');
       expect(stats.isFile()).to.be.true;
       expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
-        'https://github.com/serverless/examples/tree/v2/test-template',
+        'https://github.com/serverless/examples/tree/v3/test-template',
         'test-template',
         'test-project-from-provided-template'
       );
@@ -333,7 +333,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
     });
 
     it('Should create project at not existing directory with provided `template-url`', async () => {
-      const providedTemplateUrl = 'https://github.com/serverless/examples/tree/v2/test-template';
+      const providedTemplateUrl = 'https://github.com/serverless/examples/tree/v3/test-template';
       const downloadTemplateFromRepoStub = sinon.stub();
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
         '../../utils/downloadTemplateFromRepo': {

From 420d124fd384b03d7e3e5d74f0b7eb7d263683cc Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Tue, 11 Jan 2022 12:38:00 +0100
Subject: [PATCH 0894/1101] refactor(Config Schema): Do not rely on
 `ajv-keywords` (#10490)

---
 .../ConfigSchemaHandler/regexpKeyword.js      | 54 +++++++++++++++++++
 .../ConfigSchemaHandler/resolveAjvValidate.js |  2 +-
 package.json                                  |  1 -
 3 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 lib/classes/ConfigSchemaHandler/regexpKeyword.js

diff --git a/lib/classes/ConfigSchemaHandler/regexpKeyword.js b/lib/classes/ConfigSchemaHandler/regexpKeyword.js
new file mode 100644
index 00000000000..0fd17529c2b
--- /dev/null
+++ b/lib/classes/ConfigSchemaHandler/regexpKeyword.js
@@ -0,0 +1,54 @@
+'use strict';
+
+// Implementation has been heavily inspired by `ajv-keywords` implementation from:
+// https://github.com/ajv-validator/ajv-keywords/blob/9656614be0104fe71d229459a5217ccac11958a6/src/definitions/regexp.ts
+// Copyright (c) 2016 Evgeny Poberezkin (https://github.com/ajv-validator/ajv-keywords/blob/master/LICENSE)
+// The reason for that is the issue with `peerDependencies` of `ajv-keywords`, that causes the project to fail when other
+// dependency also relies on different `ajv` version and `npm@6` is used.
+// Related issue: https://github.com/ajv-validator/ajv-keywords/issues/170
+// After the issue is addressed, or if `npm@6` is no longer supported, this module can be removed
+// and we can go back to using `ajv-keywords` directly.
+
+const { _ } = require('ajv/dist/compile/codegen');
+
+const regexpMetaSchema = {
+  type: 'object',
+  properties: {
+    pattern: { type: 'string' },
+    flags: { type: 'string', nullable: true },
+  },
+  required: ['pattern'],
+  additionalProperties: false,
+};
+
+const metaRegexp = /^\/(.*)\/([gimuy]*)$/;
+
+const usePattern = ({ gen, it: { opts } }, pattern, flags = opts.unicodeRegExp ? 'u' : '') => {
+  const rx = new RegExp(pattern, flags);
+  return gen.scopeValue('pattern', {
+    key: rx.toString(),
+    ref: rx,
+    code: _`new RegExp(${pattern}, ${flags})`,
+  });
+};
+
+module.exports = {
+  keyword: 'regexp',
+  type: 'string',
+  schemaType: ['string', 'object'],
+  code(cxt) {
+    const { data, schema } = cxt;
+    const regx = getRegExp(schema);
+    cxt.pass(_`${regx}.test(${data})`);
+
+    function getRegExp(sch) {
+      if (typeof sch === 'object') return usePattern(cxt, sch.pattern, sch.flags);
+      const rx = metaRegexp.exec(sch);
+      if (rx) return usePattern(cxt, rx[1], rx[2]);
+      throw new Error('cannot parse string into RegExp');
+    }
+  },
+  metaSchema: {
+    anyOf: [{ type: 'string' }, regexpMetaSchema],
+  },
+};
diff --git a/lib/classes/ConfigSchemaHandler/resolveAjvValidate.js b/lib/classes/ConfigSchemaHandler/resolveAjvValidate.js
index cba53e1e9bd..60eafb2855a 100644
--- a/lib/classes/ConfigSchemaHandler/resolveAjvValidate.js
+++ b/lib/classes/ConfigSchemaHandler/resolveAjvValidate.js
@@ -44,7 +44,7 @@ const getValidate = async (schema) => {
     // Ensure AJV related packages work well when there are mutliple AJV installations around
     // See: https://github.com/ajv-validator/ajv/issues/1390#issuecomment-763138202
     ajv.opts.code.formats = Ajv._`require("ajv-formats/dist/formats").fullFormats`;
-    require('ajv-keywords')(ajv, 'regexp');
+    ajv.addKeyword(require('./regexpKeyword'));
     const validate = ajv.compile(schema);
     const moduleCode = standaloneCode(ajv, validate);
     await fs.promises.writeFile(cachePath, moduleCode);
diff --git a/package.json b/package.json
index 91e6b27f49b..d18b0c713ab 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,6 @@
     "@serverless/utils": "^6.0.0",
     "ajv": "^8.8.2",
     "ajv-formats": "^2.1.1",
-    "ajv-keywords": "^5.1.0",
     "archiver": "^5.3.0",
     "aws-sdk": "^2.1062.0",
     "bluebird": "^3.7.2",

From 3df6d1566458b8b7536def4d4253b7232e6d5118 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 13 Jan 2022 17:13:22 +0100
Subject: [PATCH 0895/1101] feat: Expose `sls doctor` command

---
 lib/cli/commands-schema/no-service.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/cli/commands-schema/no-service.js b/lib/cli/commands-schema/no-service.js
index 8cf19711649..de07e6bd1dc 100644
--- a/lib/cli/commands-schema/no-service.js
+++ b/lib/cli/commands-schema/no-service.js
@@ -107,8 +107,6 @@ commands.set('dashboard', {
 
 commands.set('doctor', {
   usage: 'Print status on reported deprecations triggered in the last command run',
-  // TODO: Expose in v3
-  isHidden: true,
 });
 
 commands.set('generate-event', {

From 5fc55c046497bdfa3d1d895c44fe69ac9de8b3ba Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 7 Jan 2022 15:53:24 +0100
Subject: [PATCH 0896/1101] refactor: Replace `ncjsm/resolve` usage with native
 `createRequire`

---
 lib/classes/PluginManager.js                |  6 +++---
 lib/cli/resolve-local-serverless-path.js    |  9 +++++++--
 lib/configuration/read.js                   |  6 +++---
 lib/utils/get-require.js                    |  9 +++++++++
 lib/utils/telemetry/generatePayload.js      |  8 +++-----
 test/mochaPatch.js                          | 11 ++++++++++-
 test/unit/lib/classes/PluginManager.test.js | 14 +++++++++-----
 test/unit/lib/configuration/read.test.js    |  4 +++-
 8 files changed, 47 insertions(+), 20 deletions(-)
 create mode 100644 lib/utils/get-require.js

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 7154fabe010..a5a3b6ecb58 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -2,7 +2,6 @@
 
 const path = require('path');
 const config = require('@serverless/utils/config');
-const cjsResolve = require('ncjsm/resolve/sync');
 const _ = require('lodash');
 const isModuleNotFoundError = require('ncjsm/is-module-not-found-error');
 const ServerlessError = require('../serverless-error');
@@ -14,6 +13,7 @@ const generateTelemetryPayload = require('../utils/telemetry/generatePayload');
 const processBackendNotificationRequest = require('../utils/processBackendNotificationRequest');
 const isTelemetryDisabled = require('../utils/telemetry/areDisabled');
 const tokenizeException = require('../utils/tokenize-exception');
+const getRequire = require('../utils/get-require');
 const { legacy, log, getPluginWriters } = require('@serverless/utils/log');
 
 const mergeCommands = (target, source) => {
@@ -157,7 +157,7 @@ class PluginManager {
       }
     }
     try {
-      const entryFilePath = cjsResolve(serviceDir, pluginPath).realPath;
+      const entryFilePath = getRequire(serviceDir).resolve(pluginPath);
       if (pluginPath.startsWith('./')) {
         this.localPluginsPaths.push({ resolvedPath: entryFilePath, inputPath: pluginPath });
       }
@@ -169,7 +169,7 @@ class PluginManager {
     }
 
     // Search in "node_modules" in which framework is placed
-    return require(cjsResolve(__dirname, pluginPath).realPath);
+    return require(pluginPath);
   }
 
   resolveServicePlugins(servicePlugs) {
diff --git a/lib/cli/resolve-local-serverless-path.js b/lib/cli/resolve-local-serverless-path.js
index b9562f658e3..57a2454dd25 100644
--- a/lib/cli/resolve-local-serverless-path.js
+++ b/lib/cli/resolve-local-serverless-path.js
@@ -2,14 +2,19 @@
 
 const path = require('path');
 const memoizee = require('memoizee');
-const resolveSync = require('ncjsm/resolve/sync');
+const { createRequire } = require('module');
 
 // This method should be kept as sync. The reason for it is the fact that
 // telemetry generation and persistence needs to be run in sync manner
 // and it depends on this function, either directly or indirectly.
 module.exports = memoizee(() => {
   try {
-    return path.resolve(path.dirname(resolveSync(process.cwd(), 'serverless').realPath), '..');
+    return path.resolve(
+      path.dirname(
+        createRequire(path.resolve(process.cwd(), 'require-resolver')).resolve('serverless')
+      ),
+      '..'
+    );
   } catch {
     return null;
   }
diff --git a/lib/configuration/read.js b/lib/configuration/read.js
index 77e040da922..74eefcafccf 100644
--- a/lib/configuration/read.js
+++ b/lib/configuration/read.js
@@ -5,8 +5,8 @@ const isPlainObject = require('type/plain-object/is');
 const path = require('path');
 const fsp = require('fs').promises;
 const yaml = require('js-yaml');
-const resolveModulePath = require('ncjsm/resolve');
 const isModuleNotFoundError = require('ncjsm/is-module-not-found-error');
+const getRequire = require('../utils/get-require');
 const spawn = require('child-process-ext/spawn');
 const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
 const ServerlessError = require('../serverless-error');
@@ -14,7 +14,7 @@ const ServerlessError = require('../serverless-error');
 const resolveTsNode = async (serviceDir) => {
   // 1. If installed aside of a Framework, use it
   try {
-    return (await resolveModulePath(__dirname, 'ts-node')).realPath;
+    return getRequire(__dirname).resolve('ts-node');
   } catch (slsDepError) {
     if (slsDepError.code !== 'MODULE_NOT_FOUND') {
       throw new ServerlessError(
@@ -25,7 +25,7 @@ const resolveTsNode = async (serviceDir) => {
 
     // 2. If installed in a service, use it
     try {
-      return (await resolveModulePath(serviceDir, 'ts-node')).realPath;
+      return getRequire(serviceDir).resolve('ts-node');
     } catch (serviceDepError) {
       if (serviceDepError.code !== 'MODULE_NOT_FOUND') {
         throw new ServerlessError(
diff --git a/lib/utils/get-require.js b/lib/utils/get-require.js
new file mode 100644
index 00000000000..0ccc87879aa
--- /dev/null
+++ b/lib/utils/get-require.js
@@ -0,0 +1,9 @@
+'use strict';
+
+const path = require('path');
+const { createRequire } = require('module');
+const memoize = require('memoizee');
+
+module.exports = memoize((dirname) => createRequire(path.resolve(dirname, 'require-resolver')), {
+  primitive: true,
+});
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index b5885c5c94f..7e79a7ae949 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -2,7 +2,6 @@
 
 const path = require('path');
 const crypto = require('crypto');
-const resolveSync = require('ncjsm/resolve/sync');
 const _ = require('lodash');
 const isPlainObject = require('type/plain-object/is');
 const isObject = require('type/object/is');
@@ -14,6 +13,7 @@ const { triggeredDeprecations } = require('../logDeprecation');
 const isNpmGlobal = require('../npmPackage/isGlobal');
 const resolveLocalServerlessPath = require('../../cli/resolve-local-serverless-path');
 const resolveIsLocallyInstalled = require('../../utils/is-locally-installed');
+const getRequire = require('../../utils/get-require');
 const ci = require('ci-info');
 const AWS = require('aws-sdk');
 
@@ -214,16 +214,14 @@ module.exports = ({
       // Since v2.42.0 it's "@serverless/dashboard-plugin"
       '@serverless/dashboard-plugin': (() => {
         try {
-          return require(resolveSync(localServerlessPath, '@serverless/dashboard-plugin/package')
-            .realPath).version;
+          return getRequire(localServerlessPath)('@serverless/dashboard-plugin/package').version;
         } catch {
           return undefined;
         }
       })(),
       '@serverless/enterprise-plugin': (() => {
         try {
-          return require(resolveSync(localServerlessPath, '@serverless/enterprise-plugin/package')
-            .realPath).version;
+          return getRequire(localServerlessPath)('@serverless/enterprise-plugin/package').version;
         } catch {
           return undefined;
         }
diff --git a/test/mochaPatch.js b/test/mochaPatch.js
index 5507a5d438d..759d294c858 100644
--- a/test/mochaPatch.js
+++ b/test/mochaPatch.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const fs = require('fs');
+const Module = require('module');
 
 // Temporary patch to help tackle peekaboo error, by revelaing fuller stack trace for "fs" errors
 // https://github.com/serverless/serverless/runs/1740873363
@@ -63,7 +64,15 @@ runnerEmitter.on('runner', (runner) => {
     resolveInput.clear();
     // Ensure to reset cache for local serverless installation resolution
     // Leaking it across test files may introduce wrong assumptions when result is used for testing
-    resolveLocalServerless.clear();
+    if (resolveLocalServerless._has('data')) {
+      // As we rely on native require.resolve, we need to ensure that it's cache related to
+      // tmp homedir is cleared
+      const homedir = require('os').homedir();
+      for (const key of Object.keys(Module._pathCache)) {
+        if (key.includes(homedir)) delete Module._pathCache[key];
+      }
+      resolveLocalServerless.clear();
+    }
     // Ensure to reset memoization on artifacts generation after each test file run.
     // Reason is that homedir is automatically cleaned for each test,
     // therefore eventually built custom resource file is also removed
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
index e9df20f6af3..3403d01c909 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/PluginManager.test.js
@@ -4,7 +4,6 @@
 
 const chai = require('chai');
 const overrideEnv = require('process-utils/override-env');
-const cjsResolve = require('ncjsm/resolve/sync');
 const spawn = require('child-process-ext/spawn');
 const overrideArgv = require('process-utils/override-argv');
 const resolveAwsEnv = require('@serverless/test/resolve-env');
@@ -14,6 +13,7 @@ const CLI = require('../../../../lib/classes/CLI');
 const resolveInput = require('../../../../lib/cli/resolve-input');
 const Create = require('../../../../lib/plugins/create/create');
 const ServerlessError = require('../../../../lib/serverless-error');
+const getRequire = require('../../../../lib/utils/get-require');
 
 const path = require('path');
 const fs = require('fs');
@@ -405,18 +405,22 @@ describe('PluginManager', () => {
       case 'BrokenPluginMock':
       case 'ServicePluginMock1':
       case 'ServicePluginMock2':
-        return { realPath: pluginPath };
+        return pluginPath;
       case './RelativePath/ServicePluginMock2':
-        return { realPath: `${serviceDir}/RelativePath/ServicePluginMock2` };
+        return `${serviceDir}/RelativePath/ServicePluginMock2`;
       default:
-        return cjsResolve(directory, pluginPath);
+        return getRequire(directory).resolve(pluginPath);
     }
   };
 
   let restoreEnv;
   let serviceDir;
   const PluginManager = proxyquire('../../../../lib/classes/PluginManager', {
-    'ncjsm/resolve/sync': resolveStub,
+    '../utils/get-require': (directory) => {
+      const resultRequire = require('module').createRequire(path.resolve(directory, 'req'));
+      resultRequire.resolve = (pluginPath) => resolveStub(directory, pluginPath);
+      return resultRequire;
+    },
   });
 
   beforeEach(() => {
diff --git a/test/unit/lib/configuration/read.test.js b/test/unit/lib/configuration/read.test.js
index 337df002bea..2f278383cf6 100644
--- a/test/unit/lib/configuration/read.test.js
+++ b/test/unit/lib/configuration/read.test.js
@@ -160,11 +160,13 @@ describe('test/unit/lib/configuration/read.test.js', () => {
   });
 
   it('should reject TS configuration if "ts-node" is not found', async () => {
-    configurationPath = 'serverless-errored.ts';
+    // Test against different service dir, to not fall into cached `require.resolve` value
+    configurationPath = 'other/serverless-errored.ts';
     const configuration = {
       service: 'test-ts',
       provider: { name: 'aws' },
     };
+    await fse.ensureFile(configurationPath);
     await fsp.writeFile(configurationPath, `module.exports = ${JSON.stringify(configuration)}`);
     await expect(
       proxyquire('../../../../lib/configuration/read', {

From 870a116bb1e800f5bf64dc53af3b43047c0336c7 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 7 Jan 2022 16:19:07 +0100
Subject: [PATCH 0897/1101] refactor: Rely on `require.resolve` to detect
 wether module exist

---
 lib/classes/PluginManager.js | 43 ++++++++++++++++++++++--------------
 lib/configuration/read.js    | 15 +++++++------
 package.json                 |  2 +-
 3 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index a5a3b6ecb58..8aeaa89a3a7 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -3,7 +3,6 @@
 const path = require('path');
 const config = require('@serverless/utils/config');
 const _ = require('lodash');
-const isModuleNotFoundError = require('ncjsm/is-module-not-found-error');
 const ServerlessError = require('../serverless-error');
 const resolveCliInput = require('../cli/resolve-input');
 const getCommandSuggestion = require('../utils/getCommandSuggestion');
@@ -145,30 +144,42 @@ class PluginManager {
     return this.asyncPluginInit();
   }
 
-  requireServicePlugin(serviceDir, pluginPath, localPluginsPath) {
-    if (localPluginsPath && !pluginPath.startsWith('./')) {
+  requireServicePlugin(serviceDir, pluginPath, legacyLocalPluginsPath) {
+    if (legacyLocalPluginsPath && !pluginPath.startsWith('./')) {
       // TODO (BREAKING): Consider removing support for localPluginsPath with next major
-      const absoluteLocalPluginPath = path.resolve(localPluginsPath, pluginPath);
-
+      const absolutePluginPath = path.resolve(legacyLocalPluginsPath, pluginPath);
+
+      const isLocatedAtLegacyPluginsPath = (() => {
+        try {
+          require.resolve(absolutePluginPath);
+          return true;
+        } catch {
+          return false;
+        }
+      })();
+      if (isLocatedAtLegacyPluginsPath) return require(absolutePluginPath);
+    }
+    const serviceDirRequire = getRequire(serviceDir);
+    const entryFilePath = (() => {
       try {
-        return require(absoluteLocalPluginPath);
-      } catch (error) {
-        if (!isModuleNotFoundError(error, absoluteLocalPluginPath)) throw error;
+        return serviceDirRequire.resolve(pluginPath);
+      } catch {
+        return null;
       }
-    }
-    try {
-      const entryFilePath = getRequire(serviceDir).resolve(pluginPath);
+    })();
+    if (entryFilePath) {
       if (pluginPath.startsWith('./')) {
         this.localPluginsPaths.push({ resolvedPath: entryFilePath, inputPath: pluginPath });
       }
       return require(entryFilePath);
-    } catch (error) {
-      if (!isModuleNotFoundError(error, pluginPath) || pluginPath.startsWith('.')) {
-        throw error;
-      }
     }
 
     // Search in "node_modules" in which framework is placed
+    try {
+      require.resolve(pluginPath);
+    } catch {
+      throw Object.assign(new Error('Plugin not found'), { code: 'PLUGIN_NOT_FOUND' });
+    }
     return require(pluginPath);
   }
 
@@ -185,7 +196,7 @@ class PluginManager {
           try {
             Plugin = this.requireServicePlugin(serviceDir, name, pluginsObject.localPath);
           } catch (error) {
-            if (!isModuleNotFoundError(error, name)) throw error;
+            if (error.code !== 'PLUGIN_NOT_FOUND') throw error;
 
             // Plugin not installed
             if (
diff --git a/lib/configuration/read.js b/lib/configuration/read.js
index 74eefcafccf..6667233d3d0 100644
--- a/lib/configuration/read.js
+++ b/lib/configuration/read.js
@@ -5,7 +5,6 @@ const isPlainObject = require('type/plain-object/is');
 const path = require('path');
 const fsp = require('fs').promises;
 const yaml = require('js-yaml');
-const isModuleNotFoundError = require('ncjsm/is-module-not-found-error');
 const getRequire = require('../utils/get-require');
 const spawn = require('child-process-ext/spawn');
 const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
@@ -137,15 +136,17 @@ const parseConfigurationFile = async (configurationPath) => {
     // fallthrough
     case '.js': {
       const configurationEventuallyDeferred = (() => {
+        try {
+          require.resolve(configurationPath);
+        } catch {
+          throw new ServerlessError(
+            `Cannot load "${path.basename(configurationPath)}": File not found`,
+            'CONFIGURATION_NOT_FOUND'
+          );
+        }
         try {
           return require(configurationPath);
         } catch (error) {
-          if (isModuleNotFoundError(error, configurationPath)) {
-            throw new ServerlessError(
-              `Cannot load "${path.basename(configurationPath)}": File not found`,
-              'CONFIGURATION_NOT_FOUND'
-            );
-          }
           throw new ServerlessError(
             `Cannot load "${path.basename(configurationPath)}": Initialization error: ${
               error && error.stack ? error.stack : error
diff --git a/package.json b/package.json
index d18b0c713ab..f971e05af01 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,6 @@
     "lodash": "^4.17.21",
     "memoizee": "^0.4.15",
     "micromatch": "^4.0.4",
-    "ncjsm": "^4.3.0",
     "node-fetch": "^2.6.7",
     "object-hash": "^2.2.0",
     "open": "^7.4.2",
@@ -95,6 +94,7 @@
     "log-node": "^8.0.3",
     "mocha": "^8.4.0",
     "mock-require": "^3.0.3",
+    "ncjsm": "^4.3.0",
     "nyc": "^15.1.0",
     "pkg": "^5.5.2",
     "prettier": "^2.5.1",

From c18e1b308bd4d2f30186d77dc77493cc8c17a4c1 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 11 Jan 2022 12:59:46 +0100
Subject: [PATCH 0898/1101] refactor(CLI): Export resolved local installation
 path directly

---
 lib/Serverless.js                             |  3 +-
 lib/cli/handle-error.js                       |  4 +-
 lib/cli/local-serverless-path.js              | 17 ++++++
 lib/cli/render-version.js                     |  4 +-
 lib/cli/resolve-local-serverless-path.js      | 21 --------
 lib/utils/is-locally-installed.js             |  7 +--
 lib/utils/telemetry/generatePayload.js        |  3 +-
 test/mochaPatch.js                            |  7 +--
 ....test.js => local-serverless-path.test.js} | 14 +++--
 .../utils/telemetry/generatePayload.test.js   | 54 ++++++++++---------
 10 files changed, 65 insertions(+), 69 deletions(-)
 create mode 100644 lib/cli/local-serverless-path.js
 delete mode 100644 lib/cli/resolve-local-serverless-path.js
 rename test/unit/lib/cli/{resolve-local-serverless-path.test.js => local-serverless-path.test.js} (67%)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index e1a029d05c5..d29eee296e1 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -24,7 +24,7 @@ const isStandaloneExecutable = require('./utils/isStandaloneExecutable');
 const resolveConfigurationPath = require('./cli/resolve-configuration-path');
 const logDeprecation = require('./utils/logDeprecation');
 const eventuallyUpdate = require('./utils/eventuallyUpdate');
-const resolveLocalServerlessPath = require('./cli/resolve-local-serverless-path');
+const localServerlessPath = require('./cli/local-serverless-path');
 const commmandsSchema = require('./cli/commands-schema');
 const resolveCliInput = require('./cli/resolve-input');
 const readConfiguration = require('./configuration/read');
@@ -214,7 +214,6 @@ class Serverless {
       );
     }
     if (this.isLocallyInstalled) return;
-    const localServerlessPath = resolveLocalServerlessPath();
     if (!localServerlessPath) return;
     if (localServerlessPath === serverlessPath) {
       this.isLocallyInstalled = true;
diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 6773b194ff6..962744af699 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -20,7 +20,7 @@ const { storeLocally: storeTelemetryLocally, send: sendTelemetry } = require('..
 const generateTelemetryPayload = require('../utils/telemetry/generatePayload');
 const resolveErrorLocation = require('../utils/telemetry/resolve-error-location');
 const resolveInput = require('./resolve-input');
-const resolveLocalServerlessPath = require('./resolve-local-serverless-path');
+const localServerlessPath = require('./local-serverless-path');
 
 const writeMessage = (title, message) => {
   let line = '';
@@ -65,8 +65,6 @@ module.exports = async (exception, options = {}) => {
   // If provided serverless instance is a local fallback, and we're not in context of it
   // Pass error handling to this local fallback implementation
   if (isInvokedByGlobalInstallation && !resolveIsLocallyInstalled()) {
-    const localServerlessPath = resolveLocalServerlessPath();
-
     const localErrorHandlerData = (() => {
       try {
         return {
diff --git a/lib/cli/local-serverless-path.js b/lib/cli/local-serverless-path.js
new file mode 100644
index 00000000000..158ede44d0a
--- /dev/null
+++ b/lib/cli/local-serverless-path.js
@@ -0,0 +1,17 @@
+'use strict';
+
+// This module should be dependencies free (as it's used at local fallback triage) and
+// kept async (as telemetry payload generation depends on it)
+try {
+  const path = require('path');
+  const { createRequire } = require('module');
+
+  module.exports = path.resolve(
+    path.dirname(
+      createRequire(path.resolve(process.cwd(), 'require-resolver')).resolve('serverless')
+    ),
+    '..'
+  );
+} catch {
+  module.exports = null;
+}
diff --git a/lib/cli/render-version.js b/lib/cli/render-version.js
index aabd343b087..5a21d2b5d69 100644
--- a/lib/cli/render-version.js
+++ b/lib/cli/render-version.js
@@ -8,7 +8,7 @@ const { version: dashboardPluginVersion } = require('@serverless/dashboard-plugi
 const { platformClientVersion } = require('@serverless/dashboard-plugin');
 const { legacy, log, writeText } = require('@serverless/utils/log');
 const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
-const resolveLocalServerlessPath = require('./resolve-local-serverless-path');
+const localServerlessPath = require('./local-serverless-path');
 const chalk = require('chalk');
 const ServerlessError = require('../serverless-error');
 
@@ -35,8 +35,6 @@ const resolveTencentCliVersion = async () => {
 };
 
 module.exports = async () => {
-  const localServerlessPath = resolveLocalServerlessPath();
-
   if (localServerlessPath) {
     // If the version is already local, do not try to fallback for version resolution to avoid falling into the loop
     // TODO: Remove local version fallback with next major (when its moved to the top of the process)
diff --git a/lib/cli/resolve-local-serverless-path.js b/lib/cli/resolve-local-serverless-path.js
deleted file mode 100644
index 57a2454dd25..00000000000
--- a/lib/cli/resolve-local-serverless-path.js
+++ /dev/null
@@ -1,21 +0,0 @@
-'use strict';
-
-const path = require('path');
-const memoizee = require('memoizee');
-const { createRequire } = require('module');
-
-// This method should be kept as sync. The reason for it is the fact that
-// telemetry generation and persistence needs to be run in sync manner
-// and it depends on this function, either directly or indirectly.
-module.exports = memoizee(() => {
-  try {
-    return path.resolve(
-      path.dirname(
-        createRequire(path.resolve(process.cwd(), 'require-resolver')).resolve('serverless')
-      ),
-      '..'
-    );
-  } catch {
-    return null;
-  }
-});
diff --git a/lib/utils/is-locally-installed.js b/lib/utils/is-locally-installed.js
index 83689ee5cd6..3e8b2fa6837 100644
--- a/lib/utils/is-locally-installed.js
+++ b/lib/utils/is-locally-installed.js
@@ -1,14 +1,11 @@
 'use strict';
 
 const path = require('path');
-const resolveLocalServerlessPath = require('../cli/resolve-local-serverless-path');
+const localServerlessPath = require('../cli/local-serverless-path');
 
 const serverlessPath = path.resolve(__dirname, '../..');
 
 // This method should be kept as sync. The reason for it is the fact that
 // telemetry generation and persistence needs to be run in sync manner
 // and it depends on this function, either directly or indirectly.
-module.exports = () => {
-  const localServerlessPath = resolveLocalServerlessPath();
-  return serverlessPath === localServerlessPath;
-};
+module.exports = () => serverlessPath === localServerlessPath;
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index 7e79a7ae949..fc17f8102bd 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -11,7 +11,7 @@ const isStandalone = require('../isStandaloneExecutable');
 const { getConfigurationValidationResult } = require('../../classes/ConfigSchemaHandler');
 const { triggeredDeprecations } = require('../logDeprecation');
 const isNpmGlobal = require('../npmPackage/isGlobal');
-const resolveLocalServerlessPath = require('../../cli/resolve-local-serverless-path');
+const localServerlessPath = require('../../cli/local-serverless-path');
 const resolveIsLocallyInstalled = require('../../utils/is-locally-installed');
 const getRequire = require('../../utils/get-require');
 const ci = require('ci-info');
@@ -197,7 +197,6 @@ module.exports = ({
         '@serverless/dashboard-plugin': require('@serverless/dashboard-plugin/package').version,
       };
     }
-    const localServerlessPath = resolveLocalServerlessPath();
     try {
       require.resolve(path.resolve(localServerlessPath, 'package.json'));
     } catch {
diff --git a/test/mochaPatch.js b/test/mochaPatch.js
index 759d294c858..bd251202277 100644
--- a/test/mochaPatch.js
+++ b/test/mochaPatch.js
@@ -46,7 +46,8 @@ patchCallback('open');
 patchCallback('readFile');
 
 const ensureArtifact = require('../lib/utils/ensureArtifact');
-const resolveLocalServerless = require('../lib/cli/resolve-local-serverless-path');
+
+const localServerlessPathModulePath = require.resolve('../lib/cli/local-serverless-path');
 const resolveInput = require('../lib/cli/resolve-input');
 
 const BbPromise = require('bluebird');
@@ -64,14 +65,14 @@ runnerEmitter.on('runner', (runner) => {
     resolveInput.clear();
     // Ensure to reset cache for local serverless installation resolution
     // Leaking it across test files may introduce wrong assumptions when result is used for testing
-    if (resolveLocalServerless._has('data')) {
+    if (require.cache[localServerlessPathModulePath]) {
       // As we rely on native require.resolve, we need to ensure that it's cache related to
       // tmp homedir is cleared
       const homedir = require('os').homedir();
       for (const key of Object.keys(Module._pathCache)) {
         if (key.includes(homedir)) delete Module._pathCache[key];
       }
-      resolveLocalServerless.clear();
+      delete require.cache[localServerlessPathModulePath];
     }
     // Ensure to reset memoization on artifacts generation after each test file run.
     // Reason is that homedir is automatically cleaned for each test,
diff --git a/test/unit/lib/cli/resolve-local-serverless-path.test.js b/test/unit/lib/cli/local-serverless-path.test.js
similarity index 67%
rename from test/unit/lib/cli/resolve-local-serverless-path.test.js
rename to test/unit/lib/cli/local-serverless-path.test.js
index 24dc62da481..1dc7d350346 100644
--- a/test/unit/lib/cli/resolve-local-serverless-path.test.js
+++ b/test/unit/lib/cli/local-serverless-path.test.js
@@ -5,15 +5,17 @@ const path = require('path');
 const os = require('os');
 const fsp = require('fs').promises;
 const fse = require('fs-extra');
-const resolveLocalServerless = require('../../../../lib/cli/resolve-local-serverless-path');
 
-describe('test/unit/lib/cli/resolve-local-serverless.test.js', () => {
+describe('test/unit/lib/cli/local-serverless.test.js', () => {
+  beforeEach(() => {
+    delete require.cache[require.resolve('../../../../lib/cli/local-serverless-path')];
+  });
+
   it('should resolve with `null` when no local installation is found', () => {
-    expect(resolveLocalServerless()).to.equal(null);
+    expect(require('../../../../lib/cli/local-serverless-path')).to.equal(null);
   });
 
   it('should resolve with `null` when no local installation is found', async () => {
-    resolveLocalServerless.delete();
     const tmpServerlessPath = path.resolve(
       await fsp.realpath(os.homedir()),
       'node_modules/serverless'
@@ -26,6 +28,8 @@ describe('test/unit/lib/cli/resolve-local-serverless.test.js', () => {
         JSON.stringify({ main: 'lib/Serverless.js' })
       ),
     ]);
-    expect(await fsp.realpath(resolveLocalServerless())).to.equal(tmpServerlessPath);
+    expect(await fsp.realpath(require('../../../../lib/cli/local-serverless-path'))).to.equal(
+      tmpServerlessPath
+    );
   });
 });
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index 9673f3176cc..b485180911b 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -8,7 +8,6 @@ const overrideEnv = require('process-utils/override-env');
 const overrideCwd = require('process-utils/override-cwd');
 const proxyquire = require('proxyquire');
 
-const resolveLocalServerless = require('../../../../../lib/cli/resolve-local-serverless-path');
 const commandsSchema = require('../../../../../lib/cli/commands-schema');
 const runServerless = require('../../../../utils/run-serverless');
 const fixtures = require('../../../../fixtures/programmatic');
@@ -18,25 +17,30 @@ const versions = {
   '@serverless/dashboard-plugin': require('@serverless/dashboard-plugin/package').version,
 };
 
-const generatePayload = proxyquire('../../../../../lib/utils/telemetry/generatePayload', {
-  '@serverless/utils/get-notifications-mode': () => 'on',
-});
+const getGeneratePayload = () =>
+  proxyquire('../../../../../lib/utils/telemetry/generatePayload', {
+    '@serverless/utils/get-notifications-mode': () => 'on',
+  });
 
 describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   let isTTYCache;
+  let originalModulesCache;
   before(() => {
     // In order for tests below to return `commandDurationMs`
     EvalError.$serverlessCommandStartTime = process.hrtime();
     isTTYCache = process.stdin.isTTY;
     process.stdin.isTTY = true;
+    originalModulesCache = Object.assign({}, require.cache);
   });
 
   after(() => {
     process.stdin.isTTY = isTTYCache;
+    for (const key of Object.keys(require.cache)) delete require.cache[key];
+    Object.assign(require.cache, originalModulesCache);
   });
 
   beforeEach(() => {
-    resolveLocalServerless.clear();
+    for (const key of Object.keys(require.cache)) delete require.cache[key];
   });
 
   it('Should resolve payload for AWS service', async () => {
@@ -104,7 +108,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       cwd: serviceDir,
       command: 'print',
     });
-    const payload = generatePayload({
+    const payload = getGeneratePayload()({
       command: 'print',
       options: {},
       commandSchema: commandsSchema.get('print'),
@@ -169,7 +173,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       fixture: 'customProvider',
       command: 'print',
     });
-    const payload = generatePayload({
+    const payload = getGeneratePayload()({
       command: 'print',
       options: {},
       commandSchema: commandsSchema.get('print'),
@@ -235,7 +239,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       modulesCacheStub: {},
     });
     const payload = overrideCwd(serviceDir, () =>
-      generatePayload({
+      getGeneratePayload()({
         command: 'print',
         options: {},
         commandSchema: commandsSchema.get('print'),
@@ -294,7 +298,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should resolve service-agnostic payload', async () => {
-    const payload = generatePayload({
+    const payload = getGeneratePayload()({
       command: 'config',
       options: {},
       commandSchema: commandsSchema.get('config'),
@@ -330,7 +334,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should resolve service-agnostic payload for command with `serviceDependencyMode: "optional"`', () => {
-    const payload = generatePayload({
+    const payload = getGeneratePayload()({
       command: '',
       options: {},
       commandSchema: commandsSchema.get(''),
@@ -383,7 +387,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should correctly resolve payload with missing service configuration', () => {
-    const payload = generatePayload({
+    const payload = getGeneratePayload()({
       command: 'plugin list',
       options: {},
       commandSchema: commandsSchema.get('plugin list'),
@@ -428,7 +432,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       })
     );
 
-    const payload = generatePayload({
+    const payload = getGeneratePayload()({
       command: 'config',
       options: {},
       commandSchema: commandsSchema.get('config'),
@@ -452,7 +456,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     let payload;
 
     overrideEnv({ variables: { SERVERLESS_ACCESS_KEY: 'some-key' } }, () => {
-      payload = generatePayload({
+      payload = getGeneratePayload()({
         command: 'config',
         options: {},
         commandSchema: commandsSchema.get('config'),
@@ -468,7 +472,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     let payload;
 
     overrideEnv({ variables: { SERVERLESS_CI_CD: 'true' } }, () => {
-      payload = generatePayload({
+      payload = getGeneratePayload()({
         command: 'config',
         options: {},
         commandSchema: commandsSchema.get('config'),
@@ -483,7 +487,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     let payload;
 
     overrideEnv({ variables: { SEED_APP_NAME: 'some-app' } }, () => {
-      payload = generatePayload({
+      payload = getGeneratePayload()({
         command: 'config',
         options: {},
         commandSchema: commandsSchema.get('config'),
@@ -495,7 +499,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should correctly resolve `commandOptionNames` property', () => {
-    const payload = generatePayload({
+    const payload = getGeneratePayload()({
       command: 'print',
       options: {
         region: 'eu-west-1',
@@ -513,7 +517,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should correctly resolve `constructs` property', () => {
-    const payload = generatePayload({
+    const payload = getGeneratePayload()({
       command: 'print',
       commandSchema: commandsSchema.get('print'),
       options: {},
@@ -549,7 +553,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should correctly resolve `configValidationMode` property', () => {
-    const payload = generatePayload({
+    const payload = getGeneratePayload()({
       command: 'print',
       commandSchema: commandsSchema.get('print'),
       options: {},
@@ -568,7 +572,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     overrideEnv(
       { variables: { AWS_ACCESS_KEY_ID: 'someaccesskey', AWS_SECRET_ACCESS_KEY: 'secretkey' } },
       () => {
-        payload = generatePayload({
+        payload = getGeneratePayload()({
           command: 'print',
           options: {},
           commandSchema: commandsSchema.get('print'),
@@ -586,7 +590,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     overrideEnv(
       { variables: { AWS_ACCESS_KEY_ID: 'someaccesskey', AWS_SECRET_ACCESS_KEY: 'secretkey' } },
       () => {
-        payload = generatePayload({
+        payload = getGeneratePayload()({
           command: 'print',
           options: {},
           commandSchema: commandsSchema.get('print'),
@@ -600,7 +604,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should correctly resolve `commandUsage` property', () => {
-    const payload = generatePayload({
+    const payload = getGeneratePayload()({
       command: 'print',
       options: {},
       commandSchema: commandsSchema.get('print'),
@@ -645,7 +649,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should correctly resolve `variableSources` property', () => {
-    const payload = generatePayload({
+    const payload = getGeneratePayload()({
       command: 'print',
       options: {},
       commandSchema: commandsSchema.get('print'),
@@ -667,7 +671,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       },
     });
     serverless.getProvider('aws').accountId = '1234567890';
-    const payload = generatePayload({
+    const payload = getGeneratePayload()({
       command: 'deploy',
       options: {},
       commandSchema: commandsSchema.get('deploy'),
@@ -688,7 +692,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
       },
     });
     serverless.getProvider('aws').didCreateService = true;
-    const payload = generatePayload({
+    const payload = getGeneratePayload()({
       command: '',
       options: {},
       commandSchema: commandsSchema.get('deploy'),
@@ -701,7 +705,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should correctly resolve `params` property', () => {
-    const payload = generatePayload({
+    const payload = getGeneratePayload()({
       command: 'print',
       options: {},
       commandSchema: commandsSchema.get('print'),

From fdf25aab448ec4418beaf2f7701ee9c76c37eca2 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 12 Jan 2022 14:56:46 +0100
Subject: [PATCH 0899/1101] refactor: Move `isLocalyInstalled` util to CLI
 context

---
 lib/cli/handle-error.js                    | 2 +-
 lib/{utils => cli}/is-locally-installed.js | 2 +-
 lib/utils/telemetry/generatePayload.js     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/{utils => cli}/is-locally-installed.js (84%)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 962744af699..5e9299b1cf7 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -14,7 +14,7 @@ const { logWarning } = require('../classes/Error');
 const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
 const tokenizeException = require('../utils/tokenize-exception');
 const logDeprecation = require('../utils/logDeprecation');
-const resolveIsLocallyInstalled = require('../utils/is-locally-installed');
+const resolveIsLocallyInstalled = require('./is-locally-installed');
 const isTelemetryDisabled = require('../utils/telemetry/areDisabled');
 const { storeLocally: storeTelemetryLocally, send: sendTelemetry } = require('../utils/telemetry');
 const generateTelemetryPayload = require('../utils/telemetry/generatePayload');
diff --git a/lib/utils/is-locally-installed.js b/lib/cli/is-locally-installed.js
similarity index 84%
rename from lib/utils/is-locally-installed.js
rename to lib/cli/is-locally-installed.js
index 3e8b2fa6837..703f5ffe76b 100644
--- a/lib/utils/is-locally-installed.js
+++ b/lib/cli/is-locally-installed.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const localServerlessPath = require('../cli/local-serverless-path');
+const localServerlessPath = require('./local-serverless-path');
 
 const serverlessPath = path.resolve(__dirname, '../..');
 
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index fc17f8102bd..c06bde9dd3d 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -12,7 +12,7 @@ const { getConfigurationValidationResult } = require('../../classes/ConfigSchema
 const { triggeredDeprecations } = require('../logDeprecation');
 const isNpmGlobal = require('../npmPackage/isGlobal');
 const localServerlessPath = require('../../cli/local-serverless-path');
-const resolveIsLocallyInstalled = require('../../utils/is-locally-installed');
+const resolveIsLocallyInstalled = require('../../cli/is-locally-installed');
 const getRequire = require('../../utils/get-require');
 const ci = require('ci-info');
 const AWS = require('aws-sdk');

From 38fe60e04292d2712b957cb3c8374caeb3449bd4 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 12 Jan 2022 15:09:43 +0100
Subject: [PATCH 0900/1101] refactor(CLI): Convert `isLocallyInstalled` to
 export result directly

---
 lib/cli/handle-error.js                |  6 +++---
 lib/cli/is-locally-installed.js        |  7 +------
 lib/cli/local-serverless-path.js       | 11 ++++++-----
 lib/utils/telemetry/generatePayload.js |  6 +++---
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 5e9299b1cf7..32268d165a5 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -14,7 +14,7 @@ const { logWarning } = require('../classes/Error');
 const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
 const tokenizeException = require('../utils/tokenize-exception');
 const logDeprecation = require('../utils/logDeprecation');
-const resolveIsLocallyInstalled = require('./is-locally-installed');
+const isThisLocallyInstalled = require('./is-locally-installed');
 const isTelemetryDisabled = require('../utils/telemetry/areDisabled');
 const { storeLocally: storeTelemetryLocally, send: sendTelemetry } = require('../utils/telemetry');
 const generateTelemetryPayload = require('../utils/telemetry/generatePayload');
@@ -64,7 +64,7 @@ module.exports = async (exception, options = {}) => {
 
   // If provided serverless instance is a local fallback, and we're not in context of it
   // Pass error handling to this local fallback implementation
-  if (isInvokedByGlobalInstallation && !resolveIsLocallyInstalled()) {
+  if (isInvokedByGlobalInstallation && !isThisLocallyInstalled) {
     const localErrorHandlerData = (() => {
       try {
         return {
@@ -135,7 +135,7 @@ module.exports = async (exception, options = {}) => {
   const installationModePostfix = (() => {
     if (isStandaloneExecutable) return ' (standalone)';
     if (isLocallyInstalled != null) return isLocallyInstalled ? ' (local)' : '';
-    return resolveIsLocallyInstalled() ? ' (local)' : '';
+    return isThisLocallyInstalled ? ' (local)' : '';
   })();
 
   const detailsTextTokens = [
diff --git a/lib/cli/is-locally-installed.js b/lib/cli/is-locally-installed.js
index 703f5ffe76b..610cb83eabb 100644
--- a/lib/cli/is-locally-installed.js
+++ b/lib/cli/is-locally-installed.js
@@ -3,9 +3,4 @@
 const path = require('path');
 const localServerlessPath = require('./local-serverless-path');
 
-const serverlessPath = path.resolve(__dirname, '../..');
-
-// This method should be kept as sync. The reason for it is the fact that
-// telemetry generation and persistence needs to be run in sync manner
-// and it depends on this function, either directly or indirectly.
-module.exports = () => serverlessPath === localServerlessPath;
+module.exports = localServerlessPath === path.resolve(__dirname, '../../');
diff --git a/lib/cli/local-serverless-path.js b/lib/cli/local-serverless-path.js
index 158ede44d0a..af3c4eba4f4 100644
--- a/lib/cli/local-serverless-path.js
+++ b/lib/cli/local-serverless-path.js
@@ -1,11 +1,12 @@
 'use strict';
 
-// This module should be dependencies free (as it's used at local fallback triage) and
-// kept async (as telemetry payload generation depends on it)
-try {
-  const path = require('path');
-  const { createRequire } = require('module');
+// This module should be dependencies free (as it's used at local fallback triage)
+// and kept async (as telemetry payload generation depends on it)
+
+const path = require('path');
+const { createRequire } = require('module');
 
+try {
   module.exports = path.resolve(
     path.dirname(
       createRequire(path.resolve(process.cwd(), 'require-resolver')).resolve('serverless')
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index c06bde9dd3d..f2e89103fb4 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -12,7 +12,7 @@ const { getConfigurationValidationResult } = require('../../classes/ConfigSchema
 const { triggeredDeprecations } = require('../logDeprecation');
 const isNpmGlobal = require('../npmPackage/isGlobal');
 const localServerlessPath = require('../../cli/local-serverless-path');
-const resolveIsLocallyInstalled = require('../../cli/is-locally-installed');
+const isThisLocallyInstalled = require('../../cli/is-locally-installed');
 const getRequire = require('../../utils/get-require');
 const ci = require('ci-info');
 const AWS = require('aws-sdk');
@@ -187,11 +187,11 @@ module.exports = ({
       return serverless.isLocallyInstalled;
     }
 
-    return resolveIsLocallyInstalled();
+    return isThisLocallyInstalled;
   })();
 
   const usedVersions = (() => {
-    if (!isLocallyInstalled || resolveIsLocallyInstalled()) {
+    if (!isLocallyInstalled || isThisLocallyInstalled) {
       return {
         'serverless': require('../../../package').version,
         '@serverless/dashboard-plugin': require('@serverless/dashboard-plugin/package').version,

From d62c3288b28c952702e18ea7bb8f31b1f2489b2b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 14 Jan 2022 15:14:06 +0100
Subject: [PATCH 0901/1101] feat: Unconditionally fallback when local
 installation found

BREAKING CHANGE:
`enableLocalInstallationFallback` configuration property is no longer supported.
---
 bin/serverless.js                             |  44 +-
 docs/deprecations.md                          |   4 +-
 docs/providers/aws/guide/serverless.yml.md    |   1 -
 lib/Serverless.js                             | 356 ++---------
 lib/classes/PluginManager.js                  |  85 +--
 lib/classes/Service.js                        |   3 +-
 lib/cli/conditionally-load-dotenv.js          |  20 +-
 lib/cli/handle-error.js                       | 104 +---
 lib/cli/interactive-setup/deploy.js           |   4 -
 lib/cli/render-version.js                     |  47 +-
 lib/configSchema.js                           |   1 -
 lib/plugins/config.js                         |   3 +-
 lib/plugins/index.js                          |   3 -
 lib/plugins/interactiveCli/index.js           |  58 --
 lib/plugins/plugin/install.js                 | 229 -------
 lib/plugins/plugin/lib/utils.js               |  34 --
 lib/plugins/plugin/uninstall.js               | 179 ------
 lib/utils/eventuallyUpdate.js                 |   3 +-
 lib/utils/getCommandSuggestion.js             |  37 --
 lib/utils/telemetry/generatePayload.js        |  49 +-
 package.json                                  |   1 +
 scripts/serverless.js                         |  54 +-
 .../locallyInstalledServerless/_setup.js      |   2 +-
 .../node_modules/serverless/bin/serverless.js |   4 +
 .../node_modules/serverless/lib/Serverless.js |  30 -
 .../serverless/lib/cli/commands-schema.js     |   5 -
 .../lib/cli/resolve-configuration-path.js     |   5 -
 .../serverless/lib/cli/resolve-input.js       |   5 -
 .../serverless/lib/configuration/read.js      |   5 -
 .../serverless/lib/configuration/variables.js |   5 -
 .../lib/utils/analytics/areDisabled.js        |   3 -
 .../@serverless/dashboard-plugin/package.json |   3 -
 test/unit/lib/Serverless.test.js              | 202 -------
 test/unit/lib/classes/PluginManager.test.js   | 112 ----
 .../lib/cli/conditionally-load-dotenv.test.js |   1 -
 test/unit/lib/cli/handle-error.test.js        |  11 -
 .../instance-dependent/get-aws.test.js        |   1 -
 .../instance-dependent/get-sls.test.js        |   1 -
 test/unit/lib/plugins/plugin/install.test.js  | 561 ------------------
 .../unit/lib/plugins/plugin/lib/utils.test.js |  28 +-
 .../unit/lib/plugins/plugin/uninstall.test.js | 522 ----------------
 .../lib/utils/getCommandSuggestion.test.js    |  29 -
 .../utils/telemetry/generatePayload.test.js   |  69 ---
 test/unit/scripts/serverless.test.js          |   3 +-
 44 files changed, 161 insertions(+), 2765 deletions(-)
 delete mode 100644 lib/plugins/interactiveCli/index.js
 delete mode 100644 lib/plugins/plugin/install.js
 delete mode 100644 lib/plugins/plugin/uninstall.js
 delete mode 100644 lib/utils/getCommandSuggestion.js
 create mode 100644 test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/bin/serverless.js
 delete mode 100644 test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/commands-schema.js
 delete mode 100644 test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/resolve-configuration-path.js
 delete mode 100644 test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/resolve-input.js
 delete mode 100644 test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/configuration/read.js
 delete mode 100644 test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/configuration/variables.js
 delete mode 100644 test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/utils/analytics/areDisabled.js
 delete mode 100644 test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/node_modules/@serverless/dashboard-plugin/package.json
 delete mode 100644 test/unit/lib/plugins/plugin/install.test.js
 delete mode 100644 test/unit/lib/plugins/plugin/uninstall.test.js
 delete mode 100644 test/unit/lib/utils/getCommandSuggestion.test.js

diff --git a/bin/serverless.js b/bin/serverless.js
index e876f476ada..abf8c0bc3a8 100755
--- a/bin/serverless.js
+++ b/bin/serverless.js
@@ -7,7 +7,9 @@
 'use strict';
 
 // `EvalError` is used to not pollute global namespace but still have the value accessible globally
-EvalError.$serverlessCommandStartTime = process.hrtime();
+// Can already be set, if we're in context of local fallback
+const isMainModule = !EvalError.$serverlessCommandStartTime;
+if (isMainModule) EvalError.$serverlessCommandStartTime = process.hrtime();
 
 const nodeVersion = Number(process.version.split('.')[0].slice(1));
 const minimumSupportedVersion = 12;
@@ -22,11 +24,41 @@ if (nodeVersion < minimumSupportedVersion) {
   process.exit(1);
 }
 
-if (require('../lib/utils/isStandaloneExecutable')) {
-  require('../lib/utils/standalone-patch');
-  if (process.argv[2] === 'binary-postinstall' && process.argv.length === 3) {
-    require('../scripts/postinstall');
-    return;
+if (isMainModule) {
+  if (require('../lib/utils/isStandaloneExecutable')) {
+    require('../lib/utils/standalone-patch');
+    if (process.argv[2] === 'binary-postinstall' && process.argv.length === 3) {
+      require('../scripts/postinstall');
+      return;
+    }
+  }
+
+  const path = require('path');
+  const localInstallationPath = require('../lib/cli/local-serverless-path');
+
+  if (localInstallationPath && localInstallationPath !== path.dirname(__dirname)) {
+    // Local fallback
+    const localServerlessBinPath = (() => {
+      try {
+        return require.resolve(path.resolve(localInstallationPath, 'bin/serverless'));
+      } catch (ignore) {
+        // Unrecognized "serverless" installation, continue with this one
+        return null;
+      }
+    })();
+
+    if (localServerlessBinPath) {
+      EvalError.$serverlessInitInstallationVersion = require('../package').version;
+      const colorSupportLevel = require('supports-color').stdout.level;
+      let message = 'Running "serverless" from node_modules\n';
+      if (colorSupportLevel) {
+        message =
+          colorSupportLevel > 2 ? `\x1b[38;5;145m${message}\x1b[39m` : `\x1b[90m${message}\x1b[39m`;
+      }
+      process.stderr.write(message);
+      require(localServerlessBinPath);
+      return;
+    }
   }
 }
 
diff --git a/docs/deprecations.md b/docs/deprecations.md
index aa8ddc16d2b..1f978219a6f 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -29,9 +29,7 @@ This notification mode can be changed via the `SLS_DEPRECATION_NOTIFICATION_MODE
 deprecationNotificationMode: error
 ```
 
-The `error` mode turns all deprecations into strict errors.
-
-The `warn` mode displays deprecations as they're discovered (this mode is automatically enabled in case of fallback to a locally installed Serverless Framework installation).
+The `error` mode turns all deprecations into strict errors, the `warn` mode displays deprecations as they're discovered.
 
 Note:
 
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 2bb1c9baab0..4a934f2a218 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -23,7 +23,6 @@ service: myService
 
 frameworkVersion: '3'
 configValidationMode: warn # Modes for config validation. `error` throws an exception, `warn` logs error to console, `off` disables validation at all. The default is warn.
-enableLocalInstallationFallback: false # If set to 'true', guarantees that it's a locally (for service, in its node_modules) installed framework which processes the command
 useDotenv: false # If set to 'true', environment variables will be automatically loaded from .env files
 variablesResolutionMode: null # To crash on variable resolution errors (as coming from new resolver), set this value to "20210326"
 unresolvedVariablesNotificationMode: warn # If set to 'error', references to variables that cannot be resolved will result in an error being thrown (applies to legacy resolver)
diff --git a/lib/Serverless.js b/lib/Serverless.js
index d29eee296e1..433e6f1ec5a 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -6,10 +6,9 @@ const ensureString = require('type/string/ensure');
 const ensureValue = require('type/value/ensure');
 const ensureArray = require('type/array/ensure');
 const ensureIterable = require('type/iterable/ensure');
+const isPlainObject = require('type/plain-object/is');
 const ensurePlainObject = require('type/plain-object/ensure');
-const clear = require('ext/object/clear');
-const { legacy, log, style } = require('@serverless/utils/log');
-const _ = require('lodash');
+const { legacy, log } = require('@serverless/utils/log');
 const CLI = require('./classes/CLI');
 const Config = require('./classes/Config');
 const YamlParser = require('./classes/YamlParser');
@@ -21,100 +20,75 @@ const ConfigSchemaHandler = require('./classes/ConfigSchemaHandler');
 const ServerlessError = require('./serverless-error');
 const version = require('./../package.json').version;
 const isStandaloneExecutable = require('./utils/isStandaloneExecutable');
-const resolveConfigurationPath = require('./cli/resolve-configuration-path');
 const logDeprecation = require('./utils/logDeprecation');
 const eventuallyUpdate = require('./utils/eventuallyUpdate');
-const localServerlessPath = require('./cli/local-serverless-path');
 const commmandsSchema = require('./cli/commands-schema');
 const resolveCliInput = require('./cli/resolve-input');
-const readConfiguration = require('./configuration/read');
-const conditionallyLoadDotenv = require('./cli/conditionally-load-dotenv');
 
-const serverlessPath = path.resolve(__dirname, '..');
+// Old local fallback is triggered in older versions by Serverless constructor directly
+const isStackFromOldLocalFallback = RegExp.prototype.test.bind(
+  /lib[\\/]Serverless.js:\d+[^]+lib[\\/]Serverless.js:\d+/i
+);
 
 class Serverless {
-  constructor(config) {
-    let configObject = config;
-    configObject = configObject || {};
-    this._isInvokedByGlobalInstallation = Boolean(configObject._isInvokedByGlobalInstallation);
-
-    if (configObject.serviceDir != null) {
-      // Modern intialization way, to be the only supported way with v3
-      this.serviceDir = path.resolve(
-        ensureString(configObject.serviceDir, {
-          name: 'config.serviceDir',
-          Error: ServerlessError,
-          errorCode: 'INVALID_NON_STRING_SERVICE_DIR',
-        })
+  constructor(config = {}) {
+    if (!isPlainObject(config)) config = {};
+
+    if (isStackFromOldLocalFallback(new Error().stack)) {
+      // Prevent old local fallback, as it's not compatible with this version of the Framework
+      const chalk = require('chalk');
+      throw new ServerlessError(
+        [
+          'Cannot run local installation of the Serverless Framework by the outdated global version.',
+          'Please upgrade via:',
+          '',
+          chalk.bold(
+            isStandaloneExecutable ? 'serverless upgrade --major' : 'npm install -g serverless'
+          ),
+          chalk.grey(
+            'Note: Latest release can run any version of the locally installed Serverless Framework.'
+          ),
+          '',
+          'Alternatively run locally installed version directly via:',
+          '',
+          chalk.bold('npx serverless <command> <options>'),
+        ].join('\n'),
+        'UNSUPPORTED_LOCAL_FALLBACK'
       );
-      this.configurationFilename = ensureString(configObject.configurationFilename, {
+    }
+
+    this.serviceDir = ensureString(config.serviceDir, {
+      name: 'options.serviceDir',
+      Error: ServerlessError,
+      errorCode: 'INVALID_NON_STRING_SERVICE_DIR',
+      isOptional: true,
+    });
+    if (this.serviceDir != null) {
+      this.serviceDir = path.resolve(this.serviceDir);
+      this.configurationFilename = ensureString(config.configurationFilename, {
         name: 'config.configurationFilename',
         Error: ServerlessError,
         errorCode: 'INVALID_NON_STRING_CONFIGURATION_FILENAME',
       });
       if (path.isAbsolute(this.configurationFilename)) {
         throw new ServerlessError(
-          `"config.configurationFilename" cannot be absolute path. Received: ${configObject.configurationFilename}`,
+          `"config.configurationFilename" cannot be absolute path. Received: ${config.configurationFilename}`,
           'INVALID_ABSOLUTE_PATH_CONFIGURATION_FILENAME'
         );
       }
-      this.configurationInput = ensurePlainObject(configObject.configuration, {
-        name: 'config.configuration',
-        Error: ServerlessError,
-        errorCode: 'INVALID_NON_OBJECT_CONFIGURATION',
-      });
-      this.isConfigurationInputResolved = Boolean(configObject.isConfigurationResolved);
-    } else if (configObject.configurationPath != null) {
-      // Semi-modern initialization way, mid-step introduced over the course of v2 refactor
-      const configurationPath = path.resolve(
-        ensureString(configObject.configurationPath, {
-          name: 'config.configurationPath',
-          Error: ServerlessError,
-          errorCode: 'INVALID_NON_STRING_CONFIGURATION_PATH',
-        })
-      );
-      this.serviceDir = process.cwd();
-      this.configurationFilename = configurationPath.slice(this.serviceDir.length + 1);
-      this.configurationInput = ensurePlainObject(configObject.configuration, {
-        isOptional: true,
+      this.configurationInput = ensurePlainObject(config.configuration, {
         name: 'config.configuration',
         Error: ServerlessError,
         errorCode: 'INVALID_NON_OBJECT_CONFIGURATION',
       });
-      if (this.configurationInput) {
-        this.isConfigurationInputResolved = Boolean(configObject.isConfigurationResolved);
-      }
-      this._shouldReportMissingServiceDeprecation = true;
-    } else if (
-      configObject.configurationPath === undefined &&
-      configObject.serviceDir === undefined
-    ) {
-      // Old intialization way
-      this._shouldResolveConfigurationInternally = true;
-      this._shouldReportMissingServiceDeprecation = true;
+      this.isConfigurationInputResolved = Boolean(config.isConfigurationResolved);
     }
-    const commands = ensureArray(configObject.commands);
-    let options = ensurePlainObject(configObject.options);
-    // This is a temporary workaround to ensure that original `options` are not mutated
-    // Should be removed after addressing: https://github.com/serverless/serverless/issues/2582
-    if (options) options = { ...options };
-    this.processedInput = { commands, options };
-    this.hasResolvedCommandsExternally = Boolean(configObject.hasResolvedCommandsExternally);
-    this.isTelemetryReportedExternally = Boolean(configObject.isTelemetryReportedExternally);
 
-    // Due to design flaw properties of configObject (which is to be merged onto `this.config`)
-    // also are subject to variables resolution.
-    // To avoid that we clear configObject after consuming it's properties.
-    // Once new variables engine is in, we can remove that patch
-    delete configObject.configurationPath;
-    delete configObject.configuration;
-    delete configObject.serviceDir;
-    delete configObject._isInvokedByGlobalInstallation;
-    delete configObject.commands;
-    delete configObject.isConfigurationResolved;
-    delete configObject.hasResolvedCommandsExternally;
-    delete configObject.isTelemetryReportedExternally;
-    delete configObject.options;
+    const commands = ensureArray(config.commands);
+    // Ensure that original `options` are not mutated, can be removed after addressing:
+    // https://github.com/serverless/serverless/issues/2582
+    const cliOptions = { ...ensurePlainObject(config.options) };
+    this.processedInput = { commands, options: cliOptions };
 
     this.providers = {};
 
@@ -127,7 +101,7 @@ class Serverless {
     this.pluginManager = new PluginManager(this);
     this.configSchemaHandler = new ConfigSchemaHandler(this);
 
-    this.config = new Config(this, configObject);
+    this.config = new Config(this, { serviceDir: config.serviceDir });
 
     this.classes = {};
     this.classes.CLI = CLI;
@@ -141,7 +115,6 @@ class Serverless {
 
     this.serverlessDirPath = path.join(os.homedir(), '.serverless');
     this.isStandaloneExecutable = isStandaloneExecutable;
-    this.isLocallyInstalled = false;
     this.triggeredDeprecations = logDeprecation.triggeredDeprecations;
 
     // TODO: Remove once "@serverless/dashboard-plugin" is integrated into this repository
@@ -149,50 +122,17 @@ class Serverless {
   }
 
   async init() {
-    if (this._isInvokedByGlobalInstallation) {
-      logDeprecation.defaultMode = 'warn';
-      logDeprecation.flushBuffered();
-    } else if (this._shouldReportMissingServiceDeprecation) {
-      this._logDeprecation(
-        'MISSING_SERVICE_CONFIGURATION',
-        'Serverless constructor expects service configuration details to be provided.\n' +
-          'Starting from next major Serverless will no longer auto resolve it internally.'
-      );
-    }
-    if (this._shouldResolveConfigurationInternally) {
-      const configurationPath = await resolveConfigurationPath();
-      if (configurationPath) {
-        this.serviceDir = process.cwd();
-        this.configurationFilename = configurationPath.slice(this.serviceDir.length + 1);
-      }
-    }
-    if (this.configurationFilename && !this.configurationInput) {
-      this.configurationInput = await (async () => {
-        try {
-          return await readConfiguration(path.resolve(this.serviceDir, this.configurationFilename));
-        } catch (error) {
-          if (resolveCliInput().isHelpRequest) return null;
-          throw error;
-        }
-      })();
-    }
-
     // create an instanceId (can be e.g. used when a predictable random value is needed)
     this.instanceId = new Date().getTime().toString();
 
     // create a new CLI instance
     this.cli = new this.classes.CLI(this);
 
-    await this.eventuallyFallbackToLocal();
-    if (this.isOverridenByLocal) return;
     eventuallyUpdate(this);
     // set the options and commands which were processed by the CLI
     this.pluginManager.setCliOptions(this.processedInput.options);
     this.pluginManager.setCliCommands(this.processedInput.commands);
 
-    // TODO: Remove with next major
-    await this.loadEnvVariables();
-
     await this.service.load(this.processedInput.options);
     // load all plugins
     await this.pluginManager.loadAllPlugins(this.service.plugins);
@@ -201,197 +141,9 @@ class Serverless {
     this.cli.setLoadedPlugins(this.pluginManager.getPlugins());
     this.cli.setLoadedCommands(this.pluginManager.getCommands());
   }
-  async eventuallyFallbackToLocal() {
-    if (
-      this.configurationInput &&
-      this.configurationInput.enableLocalInstallationFallback != null
-    ) {
-      this._logDeprecation(
-        'DISABLE_LOCAL_INSTALLATION_FALLBACK_SETTING',
-        'Starting with next major version, "enableLocalInstallationFallback" setting will no longer be supported.' +
-          'CLI will unconditionally fallback to service local installation when its found.\n' +
-          'Remove this setting to clear this deprecation warning'
-      );
-    }
-    if (this.isLocallyInstalled) return;
-    if (!localServerlessPath) return;
-    if (localServerlessPath === serverlessPath) {
-      this.isLocallyInstalled = true;
-      return;
-    }
-    if (
-      this.configurationInput &&
-      this.configurationInput.enableLocalInstallationFallback != null &&
-      !this.configurationInput.enableLocalInstallationFallback
-    ) {
-      return;
-    }
-    logDeprecation.defaultMode = 'warn';
-    logDeprecation.flushBuffered();
-    legacy.log('Running "serverless" installed locally (in service node_modules)');
-    log.notice(style.aside('Running "serverless" from node_modules'));
-    // TODO: Replace below fallback logic with more straightforward one at top of the CLI
-    // when we willl drop support for the "disableLocalInstallationFallback" setting
-    this.isOverridenByLocal = true;
-    const ServerlessLocal = require(localServerlessPath);
-    const serverlessLocal = new ServerlessLocal({
-      serviceDir: this.serviceDir || null,
-      configurationFilename: this.configurationFilename,
-      configurationPath:
-        (this.configurationFilename && path.resolve(this.serviceDir, this.configurationFilename)) ||
-        null,
-      configuration: this.configurationInput,
-      isConfigurationResolved: this.isConfigurationInputResolved,
-      hasResolvedCommandsExternally: this.hasResolvedCommandsExternally,
-      isTelemetryReportedExternally: this.isTelemetryReportedExternally,
-      commands: this.processedInput.commands,
-      options: this.processedInput.options,
-      _isInvokedByGlobalInstallation: true,
-    });
-    serverlessLocal.isLocallyInstalled = true;
-    if (!serverlessLocal._isInvokedByGlobalInstallation) {
-      // if we fallback to older version it may recognize "isInvokedByGlobalInstallation" instead
-      // of "_isInvokedByGlobalInstallation". Ensure to set it, in such case
-      serverlessLocal.isInvokedByGlobalInstallation = true;
-    }
-    this.invokedInstance = serverlessLocal;
-    await serverlessLocal.init();
-  }
-
-  async loadEnvVariables() {
-    const configurationInput = this.configurationInput;
-    if (this.configurationInput == null) return;
-    await conditionallyLoadDotenv(this.processedInput.options, configurationInput);
-  }
-
   async run() {
-    if (this._isInvokedByGlobalInstallation) {
-      // TODO: Remove with next major
-      // Ensure to have resolve-input populated with right result
-      const commandsSchema = require('./cli/commands-schema/resolve-final')(
-        this.pluginManager.externalPlugins,
-        {
-          providerName: this.service.provider.name,
-          configuration: this.configurationInput,
-        }
-      );
-      resolveCliInput.clear();
-      const { commands, options, isHelpRequest } = resolveCliInput(commandsSchema);
-      this.processedInput.commands = this.pluginManager.cliCommands = commands;
-      this.processedInput.options = options;
-      Object.assign(clear(this.pluginManager.cliOptions), options);
-      if (options.version) {
-        require('./cli/render-version')();
-        return;
-      }
-      if (
-        !this.isConfigurationInputResolved &&
-        this.serviceDir &&
-        !_.get(this.configurationInput, 'provider.variableSyntax')
-      ) {
-        // We're in a local fallback from other version which may not have a new variables engine
-        // (or have it incomplete). Therefore resolve variables with a new resolver
-        const resolveVariablesMeta = require('./configuration/variables/resolve-meta');
-        const isPropertyResolved = require('./configuration/variables/is-property-resolved');
-        const resolveVariables = require('./configuration/variables/resolve');
-        const eventuallyReportVariableResolutionErrors = require('./configuration/variables/eventually-report-resolution-errors');
-        const resolveProviderName = require('./configuration/resolve-provider-name');
-        const filterSupportedOptions = require('./cli/filter-supported-options');
-
-        const variablesMeta = resolveVariablesMeta(this.configurationInput);
-        // IIFE for maintanance convinience
-        await (async () => {
-          if (!variablesMeta.size) return;
-          const configurationPath = path.resolve(this.serviceDir, this.configurationFilename);
-          if (
-            eventuallyReportVariableResolutionErrors(
-              configurationPath,
-              this.configurationInput,
-              variablesMeta
-            )
-          ) {
-            return;
-          }
-
-          for (const coreProperty of [
-            'app',
-            'disabledDeprecations',
-            'org',
-            'provider\0name',
-            'useDotenv',
-            'variablesResolutionMode',
-          ]) {
-            if (!isPropertyResolved(variablesMeta, coreProperty)) return;
-          }
-          const providerName = resolveProviderName(this.configurationInput);
-          const resolverConfiguration = {
-            serviceDir: this.serviceDir,
-            configuration: this.configurationInput,
-            variablesMeta,
-            sources: {
-              env: require('./configuration/variables/sources/env'),
-              file: require('./configuration/variables/sources/file'),
-              opt: require('./configuration/variables/sources/opt'),
-              self: require('./configuration/variables/sources/self'),
-              strToBool: require('./configuration/variables/sources/str-to-bool'),
-              sls: require('./configuration/variables/sources/instance-dependent/get-sls')(this),
-            },
-            options: filterSupportedOptions(options, {
-              commandSchema: resolveCliInput.commandSchema,
-              providerName,
-            }),
-            propertyPathsToResolve: isHelpRequest ? new Set(['plugins']) : null,
-          };
-          if (providerName === 'aws') {
-            Object.assign(resolverConfiguration.sources, {
-              cf: require('./configuration/variables/sources/instance-dependent/get-cf')(this),
-              s3: require('./configuration/variables/sources/instance-dependent/get-s3')(this),
-              ssm: require('./configuration/variables/sources/instance-dependent/get-ssm')(this),
-              aws: require('./configuration/variables/sources/instance-dependent/get-aws')(this),
-            });
-          }
-          if (this.configurationInput.org && this.pluginManager.dashboardPlugin) {
-            for (const [sourceName, sourceConfig] of Object.entries(
-              this.pluginManager.dashboardPlugin.configurationVariablesSources
-            )) {
-              resolverConfiguration.sources[sourceName] = sourceConfig;
-            }
-          }
-          resolverConfiguration.fulfilledSources = new Set(
-            Object.keys(resolverConfiguration.sources)
-          );
-          if (!(this.configurationInput.variablesResolutionMode >= 20210326)) {
-            // New resolver, resolves just recognized CLI options. Therefore we cannot assume
-            // we have full "opt" source data if user didn't explicitly switch to new resolver
-            resolverConfiguration.fulfilledSources.delete('opt');
-          }
-
-          const resolverExternalPluginSources = require('../lib/configuration/variables/sources/resolve-external-plugin-sources');
-          resolverExternalPluginSources(
-            this.configurationInput,
-            resolverConfiguration,
-            this.pluginManager.externalPlugins
-          );
-          await resolveVariables(resolverConfiguration);
-          if (!variablesMeta.size) {
-            this.isConfigurationInputResolved = true;
-            return;
-          }
-          eventuallyReportVariableResolutionErrors(
-            configurationPath,
-            this.configurationInput,
-            variablesMeta
-          );
-        })();
-      }
-    }
-
-    // Ensure to pick eventual variable resolution that happens after all plugins are loaded
     if (this.configurationInput) this.service.reloadServiceFileParam();
 
-    if (this.cli.displayHelp(this.processedInput)) {
-      return;
-    }
     this.cli.suppressLogIfPrintCommand(this.processedInput);
     // make sure the command exists before doing anything else
     this.pluginManager.validateCommand(this.processedInput.commands);
@@ -479,16 +231,6 @@ class Serverless {
   logDeprecation(code, message) {
     return this._logDeprecation(`EXT_${ensureString(code)}`, ensureString(message));
   }
-
-  // If this instance is initialized by older version of the Framework,
-  // it may set "isInvokedByGlobalInstallation" directly.
-  // This fallback ensures it ends at "_isInvokedByGlobalInstallation"
-  set isInvokedByGlobalInstallation(value) {
-    this._isInvokedByGlobalInstallation = value;
-  }
-  get isInvokedByGlobalInstallation() {
-    return this._isInvokedByGlobalInstallation;
-  }
 }
 
 module.exports = Serverless;
diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 8aeaa89a3a7..2b71a7a63ba 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -5,12 +5,8 @@ const config = require('@serverless/utils/config');
 const _ = require('lodash');
 const ServerlessError = require('../serverless-error');
 const resolveCliInput = require('../cli/resolve-input');
-const getCommandSuggestion = require('../utils/getCommandSuggestion');
 const renderCommandHelp = require('../cli/render-help/command');
-const { storeLocally: storeTelemetryLocally, send: sendTelemetry } = require('../utils/telemetry');
-const generateTelemetryPayload = require('../utils/telemetry/generatePayload');
 const processBackendNotificationRequest = require('../utils/processBackendNotificationRequest');
-const isTelemetryDisabled = require('../utils/telemetry/areDisabled');
 const tokenizeException = require('../utils/tokenize-exception');
 const getRequire = require('../utils/get-require');
 const { legacy, log, getPluginWriters } = require('@serverless/utils/log');
@@ -548,31 +544,12 @@ class PluginManager {
 
         if (!isNotContainer && isNotEntrypoint) return current.commands[name];
 
-        // if user is using a top level command properly, but sub commands are not
-        if (this.serverless.cli.loadedCommands[commandOrAlias[0]]) {
-          const errorMessage = [`"${name}" is not a valid sub command. Run "serverless `];
-          for (let i = 0; commandOrAlias[i] !== name; i++) {
-            errorMessage.push(`${commandOrAlias[i]}`);
-            if (commandOrAlias[i + 1] !== name) {
-              errorMessage.push(' ');
-            }
-          }
-          errorMessage.push('" to see a more helpful error message for this command.');
-          throw new ServerlessError(errorMessage.join(''), 'SUBCOMMAND_NOT_FOUND');
-        }
-
-        // top level command isn't valid. give a suggestion
-        const commandName = commandOrAlias.slice(0, index + 1).join(' ');
-        const suggestedCommand = getCommandSuggestion(
-          commandName,
-          this.serverless.cli.loadedCommands
-        );
-        // TODO: Remove with next major (functionality is replicated in main script)
-        const errorMessage = [
-          `Serverless command "${commandName}" not found. Did you mean "${suggestedCommand}"?`,
-          ' Run "serverless help" for a list of all available commands.',
-        ].join('');
-        throw new ServerlessError(errorMessage, 'COMMAND_NOT_FOUND');
+        // Invalid command, can happen only when Framework is used programmatically,
+        // as otherwise command is validated in main script
+        throw new new ServerlessError(
+          `Unrecognized command "${commandsArray.join(' ')}"`,
+          'UNRECOGNIZED COMMAND'
+        )();
       },
       { commands: this.commands }
     );
@@ -617,7 +594,6 @@ class PluginManager {
     this.convertShortcutsIntoOptions(command);
     this.validateServerlessConfigDependency(command);
     this.assignDefaultOptions(command);
-    this.validateOptions(command);
 
     const { lifecycleEventsData, hooksLength } = this.getLifecycleEventsData(command);
 
@@ -684,24 +660,6 @@ class PluginManager {
 
     let deferredBackendNotificationRequest;
 
-    // TODO: Remove this logic with `v3.0.0` along with removal of `isTelemetryReportedExternally`
-    // After we are ensured that local fallback from `v3` will always fall back to `v3` local installation
-    if (!this.serverless.isTelemetryReportedExternally && !isTelemetryDisabled) {
-      storeTelemetryLocally(
-        generateTelemetryPayload({
-          ...resolveCliInput(),
-          serviceDir: this.serverless.serviceDir,
-          configuration: this.serverless.configurationInput,
-          serverless: this.serverless,
-        })
-      );
-      if (commandsArray.join(' ') === 'deploy') {
-        deferredBackendNotificationRequest = sendTelemetry({
-          serverlessExecutionSpan: this.serverless.onExitPromise,
-        });
-      }
-    }
-
     try {
       await this.invoke(commandsArray);
     } catch (commandException) {
@@ -761,37 +719,6 @@ class PluginManager {
     }
   }
 
-  validateOptions(command) {
-    // TODO: Remove with next major, as it's already handled externally
-    if (command.options) {
-      Object.entries(command.options).forEach(([key, value]) => {
-        if (value.required && (this.cliOptions[key] === true || !this.cliOptions[key])) {
-          let requiredThings = `the --${key} option`;
-
-          if (value.shortcut) {
-            requiredThings += ` / -${value.shortcut} shortcut`;
-          }
-          let errorMessage = `This command requires ${requiredThings}.`;
-
-          if (value.usage) {
-            errorMessage = `${errorMessage} Usage: ${value.usage}`;
-          }
-
-          throw new ServerlessError(errorMessage, 'MISSING_REQUIRED_CLI_OPTION');
-        }
-
-        if (
-          _.isPlainObject(value.customValidation) &&
-          value.customValidation.regularExpression instanceof RegExp &&
-          typeof value.customValidation.errorMessage === 'string' &&
-          !value.customValidation.regularExpression.test(this.cliOptions[key])
-        ) {
-          throw new ServerlessError(value.customValidation.errorMessage, 'INVALID_CLI_OPTION');
-        }
-      });
-    }
-  }
-
   convertShortcutsIntoOptions(command) {
     if (command.options) {
       Object.entries(command.options).forEach(([optionKey, optionObject]) => {
diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index db35c9a3806..7efc160db75 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -7,6 +7,7 @@ const semver = require('semver');
 const { legacy, log } = require('@serverless/utils/log');
 const resolveCliInput = require('../cli/resolve-input');
 const currentVersion = require('../../package').version;
+const isLocallyInstalled = require('../cli/is-locally-installed');
 
 class Service {
   constructor(serverless, data) {
@@ -142,7 +143,7 @@ class Service {
       );
       ymlVersion = null;
     }
-    if (!this.isLocallyInstalled && !ymlVersion && !semver.parse(version).prerelease.length) {
+    if (!isLocallyInstalled && !ymlVersion && !semver.parse(version).prerelease.length) {
       log.info(
         'To ensure safe major version upgrades ensure "frameworkVersion" setting in ' +
           'service configuration ' +
diff --git a/lib/cli/conditionally-load-dotenv.js b/lib/cli/conditionally-load-dotenv.js
index 3f596bc977a..92444d65664 100644
--- a/lib/cli/conditionally-load-dotenv.js
+++ b/lib/cli/conditionally-load-dotenv.js
@@ -1,19 +1,11 @@
-// TODO: Remove with next major release
-
 'use strict';
 
 const _ = require('lodash');
-const memoizee = require('memoizee');
 
-module.exports = memoizee(
-  async (options, configuration) => {
-    const stage = options.stage || _.get(configuration, 'provider.stage', 'dev');
-    if (configuration.useDotenv) {
-      require('./load-dotenv')(stage);
-      return;
-    }
-  },
-  {
-    length: 0 /* Intentionally no "promise: true" as rejection means critical non-retryable error */,
+module.exports = async (options, configuration) => {
+  const stage = options.stage || _.get(configuration, 'provider.stage', 'dev');
+  if (configuration.useDotenv) {
+    require('./load-dotenv')(stage);
+    return;
   }
-);
+};
diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 32268d165a5..e9af337938b 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -1,26 +1,21 @@
 'use strict';
 
-const path = require('path');
 const isObject = require('type/object/is');
 const chalk = require('chalk');
 const stripAnsi = require('strip-ansi');
-const _ = require('lodash');
 const sfeVersion = require('@serverless/dashboard-plugin/package.json').version;
 const { platformClientVersion } = require('@serverless/dashboard-plugin');
 const { getDashboardProvidersUrl } = require('@serverless/dashboard-plugin/lib/dashboard');
-const { style, writeText, legacy, log } = require('@serverless/utils/log');
+const { style, writeText, legacy } = require('@serverless/utils/log');
 const slsVersion = require('./../../package').version;
-const { logWarning } = require('../classes/Error');
 const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
 const tokenizeException = require('../utils/tokenize-exception');
 const logDeprecation = require('../utils/logDeprecation');
-const isThisLocallyInstalled = require('./is-locally-installed');
+const isLocallyInstalled = require('./is-locally-installed');
 const isTelemetryDisabled = require('../utils/telemetry/areDisabled');
 const { storeLocally: storeTelemetryLocally, send: sendTelemetry } = require('../utils/telemetry');
 const generateTelemetryPayload = require('../utils/telemetry/generatePayload');
 const resolveErrorLocation = require('../utils/telemetry/resolve-error-location');
-const resolveInput = require('./resolve-input');
-const localServerlessPath = require('./local-serverless-path');
 
 const writeMessage = (title, message) => {
   let line = '';
@@ -43,72 +38,15 @@ const isErrorCodeNormative = RegExp.prototype.test.bind(/^[A-Z][A-Z0-9]*(?:_[A-Z
 
 module.exports = async (exception, options = {}) => {
   if (!isObject(options)) options = {};
-  // Due to the fact that the handler can be invoked via fallback, we need to support both `serverless`
-  // and `isLocallyInstalled` + `isInvokedByGlobalInstallation` properties
-  // TODO: Support for these properties should be removed with next major
+
   const {
     isUncaughtException,
-    isLocallyInstalled: passedIsLocallyInstalled,
-    isInvokedByGlobalInstallation: passedIsInvokedByGlobalInstallation,
     serverless,
     hasTelemetryBeenReported,
     commandUsage,
     variableSourcesInConfig,
   } = options;
-  let { command, options: cliOptions, commandSchema, serviceDir, configuration } = options;
-
-  const isLocallyInstalled = serverless ? serverless.isLocallyInstalled : passedIsLocallyInstalled;
-  const isInvokedByGlobalInstallation = serverless
-    ? serverless.isInvokedByGlobalInstallation
-    : passedIsInvokedByGlobalInstallation;
-
-  // If provided serverless instance is a local fallback, and we're not in context of it
-  // Pass error handling to this local fallback implementation
-  if (isInvokedByGlobalInstallation && !isThisLocallyInstalled) {
-    const localErrorHandlerData = (() => {
-      try {
-        return {
-          handle: require(path.resolve(localServerlessPath, 'lib/cli/handle-error')),
-          options: {
-            serverless,
-            isLocallyInstalled,
-            isUncaughtException,
-            command,
-            options: cliOptions,
-            commandSchema,
-            serviceDir,
-            configuration,
-            hasTelemetryBeenReported,
-            commandUsage,
-            variableSourcesInConfig,
-          },
-        };
-      } catch {
-        try {
-          // Ugly mock of serverless below is used to ensure that Framework version will be logged with `(local)` suffix
-          return {
-            handle: require(path.resolve(localServerlessPath, 'lib/classes/Error')).logError,
-            options: {
-              serverless: serverless || { isLocallyInstalled },
-              forceExit: isUncaughtException,
-            },
-          };
-        } catch {
-          // Corner case of local installation being removed during command processing.
-          // It can happen e.g. during "plugin uninstall" command, where "serverless" originally
-          // installed a as peer dependency was removed
-          logWarning('Could not resolve path to locally installed error handler');
-          log.debug('Could not resolve path to locally installed error handler');
-          return null;
-        }
-      }
-    })();
-
-    if (_.get(localErrorHandlerData, 'handle')) {
-      localErrorHandlerData.handle(exception, localErrorHandlerData.options);
-      return;
-    }
-  }
+  const { command, options: cliOptions, commandSchema, serviceDir, configuration } = options;
 
   const exceptionTokens = tokenizeException(exception);
   const isUserError = !isUncaughtException && exceptionTokens.isUserError;
@@ -134,12 +72,19 @@ module.exports = async (exception, options = {}) => {
   const nodeVersion = process.version.replace(/^[v|V]/, '');
   const installationModePostfix = (() => {
     if (isStandaloneExecutable) return ' (standalone)';
-    if (isLocallyInstalled != null) return isLocallyInstalled ? ' (local)' : '';
-    return isThisLocallyInstalled ? ' (local)' : '';
+    return isLocallyInstalled ? ' (local)' : '';
+  })();
+  const globalInstallationPostfix = (() => {
+    if (EvalError.$serverlessInitInstallationVersion) {
+      return ` ${EvalError.$serverlessInitInstallationVersion}v (global)`;
+    }
+    return '';
   })();
 
   const detailsTextTokens = [
-    `Environment: ${platform}, node ${nodeVersion}, framework ${slsVersion}${installationModePostfix}, plugin ${sfeVersion}, SDK ${platformClientVersion}`,
+    `Environment: ${platform}, node ${nodeVersion}, ` +
+      `framework ${slsVersion}${installationModePostfix}${globalInstallationPostfix}, ` +
+      `plugin ${sfeVersion}, SDK ${platformClientVersion}`,
   ];
 
   if (serverless && serverless.service.provider.name === 'aws') {
@@ -202,26 +147,7 @@ module.exports = async (exception, options = {}) => {
 
   await logDeprecation.printSummary();
 
-  if (
-    !isTelemetryDisabled &&
-    hasTelemetryBeenReported === false &&
-    (serverless ? serverless.isTelemetryReportedExternally : true)
-  ) {
-    if (command == null) {
-      // We're in local fallback and older global didn't pass CLI command data, resolve it here
-      if (serverless) {
-        configuration = serverless.configurationInput;
-        serviceDir = serverless.serviceDir;
-      }
-      const commandsSchema = configuration
-        ? require('./commands-schema/resolve-final')(serverless.pluginManager.externalPlugins, {
-            providerName: serverless.service.provider.name,
-            configuration,
-          })
-        : require('./commands-schema/aws-service');
-      ({ command, options: cliOptions, commandSchema } = resolveInput(commandsSchema));
-    }
-
+  if (!isTelemetryDisabled && hasTelemetryBeenReported === false) {
     if (commandSchema) {
       // Report only for recognized commands
       const telemetryPayload = generateTelemetryPayload({
diff --git a/lib/cli/interactive-setup/deploy.js b/lib/cli/interactive-setup/deploy.js
index f821a29c352..837aae7e400 100644
--- a/lib/cli/interactive-setup/deploy.js
+++ b/lib/cli/interactive-setup/deploy.js
@@ -154,15 +154,11 @@ module.exports = {
       serviceDir,
       configurationFilename,
       isConfigurationResolved: true,
-      hasResolvedCommandsExternally: true,
-      isTelemetryReportedExternally: true,
       commands: ['deploy'],
       options: {},
     });
 
-    serverless.isLocallyInstalled = true;
     await serverless.init();
-    delete serverless.isLocallyInstalled;
     await serverless.run();
     context.serverless = serverless;
 
diff --git a/lib/cli/render-version.js b/lib/cli/render-version.js
index 5a21d2b5d69..14a3b29f64f 100644
--- a/lib/cli/render-version.js
+++ b/lib/cli/render-version.js
@@ -6,11 +6,9 @@ const { version } = require('../../package');
 const spawn = require('child-process-ext/spawn');
 const { version: dashboardPluginVersion } = require('@serverless/dashboard-plugin/package');
 const { platformClientVersion } = require('@serverless/dashboard-plugin');
-const { legacy, log, writeText } = require('@serverless/utils/log');
+const { legacy, writeText } = require('@serverless/utils/log');
 const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
 const localServerlessPath = require('./local-serverless-path');
-const chalk = require('chalk');
-const ServerlessError = require('../serverless-error');
 
 const serverlessPath = path.resolve(__dirname, '../..');
 
@@ -35,44 +33,19 @@ const resolveTencentCliVersion = async () => {
 };
 
 module.exports = async () => {
-  if (localServerlessPath) {
-    // If the version is already local, do not try to fallback for version resolution to avoid falling into the loop
-    // TODO: Remove local version fallback with next major (when its moved to the top of the process)
-    const isLocal = serverlessPath === localServerlessPath;
-    if (!isLocal) {
-      // Attempt to resolve version with local Serverless instance
-      legacy.write(
-        `Serverless: ${chalk.yellow(
-          'Running "serverless" installed locally (in service node_modules)'
-        )}\n`
-      );
-      log.notice('Running "serverless" from node_modules');
-      log.notice();
-
-      try {
-        try {
-          require(path.resolve(localServerlessPath, 'bin/serverless.js'));
-        } catch {
-          // Pass and attempt to use `bin/serverless` that was used by older version of the Framework
-          require(path.resolve(localServerlessPath, 'bin/serverless'));
-        }
-      } catch {
-        // This is just a fallback as for most (all?) versions it shouldn't happen
-        throw new ServerlessError(
-          'Could not resolve path to locally installed serverless.',
-          'INVALID_LOCAL_SERVERLESS_PATH'
-        );
-      }
-      return;
-    }
-  }
-
-  const installationModePostfix = await (async () => {
+  const installationModePostfix = (() => {
     if (isStandaloneExecutable) return ' (standalone)';
     if (serverlessPath === localServerlessPath) return ' (local)';
     return '';
   })();
 
+  const globalInstallationPostfix = (() => {
+    if (EvalError.$serverlessInitInstallationVersion) {
+      return ` ${EvalError.$serverlessInitInstallationVersion}v (global)`;
+    }
+    return '';
+  })();
+
   const tencentCliVersion = await resolveTencentCliVersion();
   legacy.write(
     `${
@@ -82,7 +55,7 @@ module.exports = async () => {
     }${tencentCliVersion ? `Tencent CLI: ${tencentCliVersion}\n` : ''}`
   );
   writeText(
-    `Framework Core: ${version}${installationModePostfix}`,
+    `Framework Core: ${version}${installationModePostfix}${globalInstallationPostfix}`,
     `Plugin: ${dashboardPluginVersion}`,
     `SDK: ${platformClientVersion}\n${tencentCliVersion ? `Tencent CLI: ${tencentCliVersion}` : ''}`
   );
diff --git a/lib/configSchema.js b/lib/configSchema.js
index 67877275467..ec109837870 100644
--- a/lib/configSchema.js
+++ b/lib/configSchema.js
@@ -33,7 +33,6 @@ const schema = {
         },
       ],
     },
-    enableLocalInstallationFallback: { type: 'boolean' },
     frameworkVersion: { type: 'string' },
     functions: {
       type: 'object',
diff --git a/lib/plugins/config.js b/lib/plugins/config.js
index b00977e21d1..2ebc54f15ea 100644
--- a/lib/plugins/config.js
+++ b/lib/plugins/config.js
@@ -6,6 +6,7 @@ const cliCommandsSchema = require('../cli/commands-schema');
 const isNpmPackageWritable = require('../utils/npmPackage/isWritable');
 const isNpmGlobalPackage = require('../utils/npmPackage/isGlobal');
 const renderCommandHelp = require('../cli/render-help/command');
+const isLocallyInstalled = require('../cli/is-locally-installed');
 const { legacy, log } = require('@serverless/utils/log');
 
 // class wide constants
@@ -67,7 +68,7 @@ class Config {
         log.notice.skip('Auto update is already turned on');
         return;
       }
-      if (this.serverless.isLocallyInstalled) {
+      if (isLocallyInstalled) {
         throw new ServerlessError(noSupportErrorMessage, 'AUTO_UPDATE_NOT_SUPPORTED');
       }
       if (this.serverless.isStandaloneExecutable) {
diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index 397e7d0450e..adaa1fb03e8 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -1,7 +1,6 @@
 'use strict';
 
 module.exports = [
-  require('./interactiveCli'),
   require('./config.js'),
   require('./create/create.js'),
   require('./install.js'),
@@ -16,8 +15,6 @@ module.exports = [
   require('./rollback.js'),
   require('./slstats.js'),
   require('./plugin/plugin.js'),
-  require('./plugin/install.js'),
-  require('./plugin/uninstall.js'),
   require('./plugin/list.js'),
   require('./plugin/search.js'),
   require('./aws/configCredentials.js'),
diff --git a/lib/plugins/interactiveCli/index.js b/lib/plugins/interactiveCli/index.js
deleted file mode 100644
index 57f32179e00..00000000000
--- a/lib/plugins/interactiveCli/index.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// TODO: Remove with next major release
-
-'use strict';
-
-const ServerlessError = require('../../serverless-error');
-const cliCommandsSchema = require('../../cli/commands-schema');
-
-module.exports = class InteractiveCli {
-  constructor(serverless) {
-    this.serverless = serverless;
-
-    this.commands = {
-      interactiveCli: {
-        ...cliCommandsSchema.get(''),
-        isHidden: true,
-      },
-    };
-  }
-
-  asyncInit() {
-    /*
-     * The majority of setup is done here to allow other plugins to modify
-     * this.commands.interactiveCli.options before deciding if the CLI
-     * is in interactive mode or not.
-     */
-
-    if (!process.stdin.isTTY) return;
-
-    const { processedInput } = this.serverless;
-    if (processedInput.commands.length) return;
-    const usedOptions = new Set(Object.keys(processedInput.options));
-    const supportedOptions = new Set(Object.keys(this.commands.interactiveCli.options));
-    // --help-interactive should trigger help which is not handled from scope of this command
-    supportedOptions.delete('help-interactive');
-    // --help should trigger general help, and this command should not be considered
-    supportedOptions.delete('help');
-    // Normally this option is handled by main CLI script, still if locally installed Framework
-    // is invokved by old version which does not have such handling yet, we need below to prevent
-    // interactive CLI to jump in
-    supportedOptions.delete('version');
-
-    for (const opt of supportedOptions) usedOptions.delete(opt);
-
-    if (usedOptions.size) return;
-
-    if (this.serverless._isInvokedByGlobalInstallation) {
-      throw new ServerlessError(
-        "Outdated global installation of 'serverless'. Please upgrade. " +
-          "It's needed to ensure desired interactive CLI experience"
-      );
-    }
-    throw new Error(
-      'Unexpected interactive CLI fallback (please report at ' +
-        'https://github.com/serverless/serverless/issues/new' +
-        '?assignees=&labels=&template=bug_report.md'
-    );
-  }
-};
diff --git a/lib/plugins/plugin/install.js b/lib/plugins/plugin/install.js
deleted file mode 100644
index 0942184bc7c..00000000000
--- a/lib/plugins/plugin/install.js
+++ /dev/null
@@ -1,229 +0,0 @@
-// TODO: Remove in v3
-
-'use strict';
-
-const BbPromise = require('bluebird');
-const childProcess = BbPromise.promisifyAll(require('child_process'));
-const fsp = require('fs').promises;
-const fse = require('fs-extra');
-const path = require('path');
-const _ = require('lodash');
-const isPlainObject = require('type/plain-object/is');
-const yaml = require('js-yaml');
-const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
-const { legacy, log, progress, style } = require('@serverless/utils/log');
-const ServerlessError = require('../../serverless-error');
-const cliCommandsSchema = require('../../cli/commands-schema');
-const yamlAstParser = require('../../utils/yamlAstParser');
-const fileExists = require('../../utils/fs/fileExists');
-const pluginUtils = require('./lib/utils');
-const npmCommandDeferred = require('../../utils/npm-command-deferred');
-
-const mainProgress = progress.get('main');
-
-const requestManualUpdate = (serverlessFilePath) => {
-  legacy.log(`
-  Can't automatically add plugin into "${path.basename(serverlessFilePath)}" file.
-  Please make it manually.
-`);
-  log.notice();
-  log.notice.skip(
-    `Can't automatically add plugin into "${path.basename(
-      serverlessFilePath
-    )}" file. Please add it manually.`
-  );
-};
-
-class PluginInstall {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    Object.assign(this, pluginUtils);
-
-    this.commands = {
-      plugin: {
-        commands: {
-          install: {
-            ...cliCommandsSchema.get('plugin install'),
-          },
-        },
-      },
-    };
-    this.hooks = {
-      'plugin:install:install': async () => BbPromise.bind(this).then(this.install),
-    };
-  }
-
-  async install() {
-    const pluginInfo = pluginUtils.getPluginInfo(this.options.name);
-    this.options.pluginName = pluginInfo[0];
-    this.options.pluginVersion = pluginInfo[1] || 'latest';
-
-    return BbPromise.bind(this)
-      .then(this.validate)
-      .then(this.getPlugins)
-      .then((plugins) => {
-        const plugin = plugins.find((item) => item.name === this.options.pluginName);
-        if (!plugin) {
-          legacy.log('Plugin not found in serverless registry, continuing to install');
-        }
-        return BbPromise.bind(this)
-          .then(this.pluginInstall)
-          .then(this.addPluginToServerlessFile)
-          .then(this.installPeerDependencies)
-          .then(() => {
-            const message = [
-              'Successfully installed',
-              ` "${this.options.pluginName}@${this.options.pluginVersion}"`,
-            ].join('');
-            legacy.log(message);
-            log.notice();
-            log.notice.success(
-              `Plugin "${this.options.pluginName}${
-                this.options.pluginVersion === 'latest' ? '' : `@${this.options.pluginVersion}`
-              }" installed  ${style.aside(
-                `(${Math.floor(
-                  (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
-                )}s)`
-              )}`
-            );
-          });
-      });
-  }
-
-  async pluginInstall() {
-    const serviceDir = this.serverless.serviceDir;
-    const packageJsonFilePath = path.join(serviceDir, 'package.json');
-
-    return fileExists(packageJsonFilePath)
-      .then((exists) => {
-        // check if package.json is already present. Otherwise create one
-        if (!exists) {
-          mainProgress.notice('Creating an empty package.json file', { isMainEvent: true });
-          legacy.log('Creating an empty package.json file in your service directory');
-
-          const packageJsonFileContent = {
-            name: this.serverless.service.service,
-            description: '',
-            version: '0.1.0',
-            dependencies: {},
-            devDependencies: {},
-          };
-          return fse.writeJson(packageJsonFilePath, packageJsonFileContent);
-        }
-        return BbPromise.resolve();
-      })
-      .then(() => {
-        // install the package through npm
-        const pluginFullName = `${this.options.pluginName}@${this.options.pluginVersion}`;
-        const message = [
-          `Installing plugin "${pluginFullName}"`,
-          ' (this might take a few seconds...)',
-        ].join('');
-        legacy.log(message);
-        mainProgress.notice(
-          `Installing plugin "${this.options.pluginName}${
-            this.options.pluginVersion === 'latest' ? '' : `@${this.options.pluginVersion}`
-          }"`,
-          { isMainEvent: true }
-        );
-        return this.npmInstall(pluginFullName);
-      });
-  }
-
-  async addPluginToServerlessFile() {
-    const serverlessFilePath = this.getServerlessFilePath();
-    const fileExtension = path.extname(serverlessFilePath);
-    if (fileExtension === '.js' || fileExtension === '.ts') {
-      requestManualUpdate(serverlessFilePath);
-      return;
-    }
-
-    const checkIsArrayPluginsObject = (pluginsObject) =>
-      pluginsObject == null || Array.isArray(pluginsObject);
-    // pluginsObject type determined based on the value loaded during the serverless init.
-    if (_.last(serverlessFilePath.split('.')) === 'json') {
-      const serverlessFileObj = await fse.readJson(serverlessFilePath);
-      const newServerlessFileObj = serverlessFileObj;
-      const isArrayPluginsObject = checkIsArrayPluginsObject(newServerlessFileObj.plugins);
-      // null modules property is not supported
-      let plugins = isArrayPluginsObject
-        ? newServerlessFileObj.plugins || []
-        : newServerlessFileObj.plugins.modules;
-
-      if (plugins == null) {
-        throw new ServerlessError(
-          'plugins modules property must be present',
-          'PLUGINS_MODULES_MISSING'
-        );
-      }
-
-      plugins.push(this.options.pluginName);
-      plugins = _.sortedUniq(plugins);
-
-      if (isArrayPluginsObject) {
-        newServerlessFileObj.plugins = plugins;
-      } else {
-        newServerlessFileObj.plugins.modules = plugins;
-      }
-
-      await fse.writeJson(serverlessFilePath, newServerlessFileObj);
-      return;
-    }
-
-    const serverlessFileObj = yaml.load(await fsp.readFile(serverlessFilePath, 'utf8'), {
-      filename: serverlessFilePath,
-      schema: cloudformationSchema,
-    });
-    if (serverlessFileObj.plugins != null) {
-      // Plugins section can be behind veriables, opt-out in such case
-      if (isPlainObject(serverlessFileObj.plugins)) {
-        if (
-          serverlessFileObj.plugins.modules != null &&
-          !Array.isArray(serverlessFileObj.plugins.modules)
-        ) {
-          requestManualUpdate(serverlessFilePath);
-          return;
-        }
-      } else if (!Array.isArray(serverlessFileObj.plugins)) {
-        requestManualUpdate(serverlessFilePath);
-        return;
-      }
-    }
-    await yamlAstParser.addNewArrayItem(
-      serverlessFilePath,
-      checkIsArrayPluginsObject(serverlessFileObj.plugins) ? 'plugins' : 'plugins.modules',
-      this.options.pluginName
-    );
-  }
-
-  async installPeerDependencies() {
-    const pluginPackageJsonFilePath = path.join(
-      this.serverless.serviceDir,
-      'node_modules',
-      this.options.pluginName,
-      'package.json'
-    );
-    return fse.readJson(pluginPackageJsonFilePath).then((pluginPackageJson) => {
-      if (pluginPackageJson.peerDependencies) {
-        const pluginsArray = [];
-        Object.entries(pluginPackageJson.peerDependencies).forEach(([k, v]) => {
-          pluginsArray.push(`${k}@"${v}"`);
-        });
-        return BbPromise.map(pluginsArray, this.npmInstall);
-      }
-      return BbPromise.resolve();
-    });
-  }
-
-  async npmInstall(name) {
-    return npmCommandDeferred.then(({ command, args }) =>
-      childProcess.execAsync(`${command} ${args.join(' ')} install --save-dev ${name}`, {
-        stdio: 'ignore',
-      })
-    );
-  }
-}
-
-module.exports = PluginInstall;
diff --git a/lib/plugins/plugin/lib/utils.js b/lib/plugins/plugin/lib/utils.js
index 5256cb2cc2c..201b1c4f3c6 100644
--- a/lib/plugins/plugin/lib/utils.js
+++ b/lib/plugins/plugin/lib/utils.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const path = require('path');
 const fetch = require('node-fetch');
 const BbPromise = require('bluebird');
 const HttpsProxyAgent = require('https-proxy-agent');
@@ -8,30 +7,8 @@ const url = require('url');
 const chalk = require('chalk');
 const _ = require('lodash');
 const { legacy, log, writeText, style } = require('@serverless/utils/log');
-const ServerlessError = require('../../../serverless-error');
 
 module.exports = {
-  async validate() {
-    if (!this.serverless.serviceDir) {
-      throw new ServerlessError(
-        'This command can only be run inside a service directory',
-        'MISSING_SERVICE_DIRECTORY'
-      );
-    }
-
-    return BbPromise.resolve();
-  },
-
-  getServerlessFilePath() {
-    if (this.serverless.configurationFilename) {
-      return path.resolve(this.serverless.serviceDir, this.serverless.configurationFilename);
-    }
-    throw new ServerlessError(
-      'Could not find any serverless service definition file.',
-      'MISSING_SERVICE_CONFIGURATION_FILE'
-    );
-  },
-
   async getPlugins() {
     const endpoint = 'https://raw.githubusercontent.com/serverless/plugins/master/plugins.json';
 
@@ -56,17 +33,6 @@ module.exports = {
       .then((json) => json);
   },
 
-  getPluginInfo(name) {
-    let pluginInfo;
-    if (name.startsWith('@')) {
-      pluginInfo = name.slice(1).split('@', 2);
-      pluginInfo[0] = `@${pluginInfo[0]}`;
-    } else {
-      pluginInfo = name.split('@', 2);
-    }
-    return pluginInfo;
-  },
-
   async display(plugins) {
     let message = '';
     if (plugins && plugins.length) {
diff --git a/lib/plugins/plugin/uninstall.js b/lib/plugins/plugin/uninstall.js
deleted file mode 100644
index 8c4193d69ef..00000000000
--- a/lib/plugins/plugin/uninstall.js
+++ /dev/null
@@ -1,179 +0,0 @@
-// TODO: Remove in v3
-
-'use strict';
-
-const BbPromise = require('bluebird');
-const childProcess = BbPromise.promisifyAll(require('child_process'));
-const fsp = require('fs').promises;
-const fse = require('fs-extra');
-const path = require('path');
-const _ = require('lodash');
-const isPlainObject = require('type/plain-object/is');
-const yaml = require('js-yaml');
-const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
-const { legacy, log, progress, style } = require('@serverless/utils/log');
-const cliCommandsSchema = require('../../cli/commands-schema');
-const yamlAstParser = require('../../utils/yamlAstParser');
-const pluginUtils = require('./lib/utils');
-
-const mainProgress = progress.get('main');
-
-const requestManualUpdate = (serverlessFilePath) => {
-  legacy.log(`
-  Can't automatically remove plugin from "${path.basename(serverlessFilePath)}" file.
-  Please make it manually.
-`);
-  log.notice();
-  log.notice.skip(
-    `Can't automatically remove plugin from "${path.basename(
-      serverlessFilePath
-    )}" file. Please make it manually.`
-  );
-};
-
-class PluginUninstall {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    Object.assign(this, pluginUtils);
-
-    this.commands = {
-      plugin: {
-        commands: {
-          uninstall: {
-            ...cliCommandsSchema.get('plugin uninstall'),
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'plugin:uninstall:uninstall': async () => BbPromise.bind(this).then(this.uninstall),
-    };
-  }
-
-  async uninstall() {
-    const pluginInfo = pluginUtils.getPluginInfo(this.options.name);
-    this.options.pluginName = pluginInfo[0];
-
-    return BbPromise.bind(this)
-      .then(this.validate)
-      .then(this.getPlugins)
-      .then((plugins) => {
-        const plugin = plugins.find((item) => item.name === this.options.pluginName);
-        if (!plugin) {
-          legacy.log('Plugin not found in serverless registry, continuing to uninstall');
-        }
-        return BbPromise.bind(this)
-          .then(this.uninstallPeerDependencies)
-          .then(this.pluginUninstall)
-          .then(this.removePluginFromServerlessFile)
-          .then(() => {
-            legacy.log(`Successfully uninstalled "${this.options.pluginName}"`);
-            log.notice();
-            log.notice.success(
-              `Plugin "${this.options.pluginName}" uninstalled ${style.aside(
-                `(${Math.floor(
-                  (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
-                )}s)`
-              )}`
-            );
-            return BbPromise.resolve();
-          });
-      });
-  }
-
-  async pluginUninstall() {
-    legacy.log(
-      `Uninstalling plugin "${this.options.pluginName}" (this might take a few seconds...)`
-    );
-    mainProgress.notice(`Uninstalling plugin "${this.options.pluginName}"`, { isMainEvent: true });
-    return this.npmUninstall(this.options.pluginName);
-  }
-
-  async removePluginFromServerlessFile() {
-    const serverlessFilePath = this.getServerlessFilePath();
-    const fileExtension = path.extname(serverlessFilePath);
-    if (fileExtension === '.js' || fileExtension === '.ts') {
-      requestManualUpdate(serverlessFilePath);
-      return;
-    }
-
-    if (_.last(serverlessFilePath.split('.')) === 'json') {
-      const serverlessFileObj = await fse.readJson(serverlessFilePath);
-      const isArrayPluginsObject = Array.isArray(serverlessFileObj.plugins);
-      const plugins = isArrayPluginsObject
-        ? serverlessFileObj.plugins
-        : serverlessFileObj.plugins && serverlessFileObj.plugins.modules;
-
-      if (plugins) {
-        _.pull(plugins, this.options.pluginName);
-        if (!plugins.length) {
-          if (isArrayPluginsObject) {
-            delete serverlessFileObj.plugins;
-          } else {
-            delete serverlessFileObj.plugins.modules;
-          }
-        }
-        await fse.writeJson(serverlessFilePath, serverlessFileObj);
-      }
-      return;
-    }
-
-    const serverlessFileObj = yaml.load(await fsp.readFile(serverlessFilePath, 'utf8'), {
-      filename: serverlessFilePath,
-      schema: cloudformationSchema,
-    });
-    if (serverlessFileObj.plugins != null) {
-      // Plugins section can be behind veriables, opt-out in such case
-      if (isPlainObject(serverlessFileObj.plugins)) {
-        if (
-          serverlessFileObj.plugins.modules != null &&
-          !Array.isArray(serverlessFileObj.plugins.modules)
-        ) {
-          requestManualUpdate(serverlessFilePath);
-          return;
-        }
-      } else if (!Array.isArray(serverlessFileObj.plugins)) {
-        requestManualUpdate(serverlessFilePath);
-        return;
-      }
-    }
-    await yamlAstParser.removeExistingArrayItem(
-      serverlessFilePath,
-      Array.isArray(serverlessFileObj.plugins) ? 'plugins' : 'plugins.modules',
-      this.options.pluginName
-    );
-  }
-
-  async uninstallPeerDependencies() {
-    const pluginPackageJsonFilePath = path.join(
-      this.serverless.serviceDir,
-      'node_modules',
-      this.options.pluginName,
-      'package.json'
-    );
-    return fse
-      .readJson(pluginPackageJsonFilePath)
-      .then((pluginPackageJson) => {
-        if (pluginPackageJson.peerDependencies) {
-          const pluginsArray = [];
-          Object.keys(pluginPackageJson.peerDependencies).forEach((k) => {
-            pluginsArray.push(k);
-          });
-          return BbPromise.map(pluginsArray, this.npmUninstall);
-        }
-        return BbPromise.resolve();
-      })
-      .catch(() => BbPromise.resolve());
-  }
-
-  async npmUninstall(name) {
-    return childProcess.execAsync(`npm uninstall --save-dev ${name}`, {
-      stdio: 'ignore',
-    });
-  }
-}
-
-module.exports = PluginUninstall;
diff --git a/lib/utils/eventuallyUpdate.js b/lib/utils/eventuallyUpdate.js
index 96986922690..88de96c99c8 100644
--- a/lib/utils/eventuallyUpdate.js
+++ b/lib/utils/eventuallyUpdate.js
@@ -18,6 +18,7 @@ const currentVersion = require('../../package.json').version;
 const standaloneUtils = require('./standalone');
 const isNpmGlobalPackage = require('./npmPackage/isGlobal');
 const isNpmPackageWritable = require('./npmPackage/isWritable');
+const isLocallyInstalled = require('../cli/is-locally-installed');
 
 const pipeline = promisify(stream.pipeline);
 
@@ -91,7 +92,7 @@ const standaloneUpdate = async (serverless, { newVersion, abortHandler }) => {
 
 module.exports = async (serverless) => {
   if (!serverless.onExitPromise) return; // Not intended for programmatic Serverless instances
-  if (serverless.isLocallyInstalled) return;
+  if (isLocallyInstalled) return;
   if (serverless.isStandaloneExecutable) {
     if (process.platform === 'win32') return;
   } else if (!isNpmGlobalPackage()) {
diff --git a/lib/utils/getCommandSuggestion.js b/lib/utils/getCommandSuggestion.js
deleted file mode 100644
index 67c3af8b660..00000000000
--- a/lib/utils/getCommandSuggestion.js
+++ /dev/null
@@ -1,37 +0,0 @@
-'use strict';
-
-const _ = require('lodash');
-const { distance: getDistance } = require('fastest-levenshtein');
-
-const getCollectCommandWords = (commandObject, commandWordsArray) => {
-  let wordsArray =
-    Array.isArray(commandWordsArray) && commandWordsArray.length ? commandWordsArray : [];
-  Object.entries(commandObject).forEach(([commandChildName, commandChildObject]) => {
-    wordsArray.push(commandChildName);
-    if (commandChildObject.commands) {
-      wordsArray = getCollectCommandWords(commandChildObject.commands, wordsArray);
-    }
-  });
-  return _.uniq(wordsArray);
-};
-
-const getCommandSuggestion = (inputCommand, allCommandsObject) => {
-  let suggestion;
-  const commandWordsArray = getCollectCommandWords(allCommandsObject);
-  let minValue = 0;
-  commandWordsArray.forEach((correctCommand) => {
-    const distance = getDistance(inputCommand, correctCommand);
-    if (minValue === 0) {
-      suggestion = correctCommand;
-      minValue = distance;
-    }
-
-    if (minValue > distance) {
-      suggestion = correctCommand;
-      minValue = distance;
-    }
-  });
-  return suggestion;
-};
-
-module.exports = getCommandSuggestion;
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index f2e89103fb4..dd8d19a5258 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -11,9 +11,7 @@ const isStandalone = require('../isStandaloneExecutable');
 const { getConfigurationValidationResult } = require('../../classes/ConfigSchemaHandler');
 const { triggeredDeprecations } = require('../logDeprecation');
 const isNpmGlobal = require('../npmPackage/isGlobal');
-const localServerlessPath = require('../../cli/local-serverless-path');
-const isThisLocallyInstalled = require('../../cli/is-locally-installed');
-const getRequire = require('../../utils/get-require');
+const isLocallyInstalled = require('../../cli/is-locally-installed');
 const ci = require('ci-info');
 const AWS = require('aws-sdk');
 
@@ -182,49 +180,10 @@ module.exports = ({
     return userConfig.get('userId');
   })();
 
-  const isLocallyInstalled = (() => {
-    if (serverless) {
-      return serverless.isLocallyInstalled;
-    }
-
-    return isThisLocallyInstalled;
-  })();
-
   const usedVersions = (() => {
-    if (!isLocallyInstalled || isThisLocallyInstalled) {
-      return {
-        'serverless': require('../../../package').version,
-        '@serverless/dashboard-plugin': require('@serverless/dashboard-plugin/package').version,
-      };
-    }
-    try {
-      require.resolve(path.resolve(localServerlessPath, 'package.json'));
-    } catch {
-      // Corner case of local installation being removed during command processing.
-      // It can happen e.g. during "plugin uninstall" command, where "serverless" originally
-      // installed a as peer dependency was removed
-      return {
-        'serverless': require('../../../package').version,
-        '@serverless/dashboard-plugin': require('@serverless/dashboard-plugin/package').version,
-      };
-    }
     return {
-      'serverless': require(path.resolve(localServerlessPath, 'package.json')).version,
-      // Since v2.42.0 it's "@serverless/dashboard-plugin"
-      '@serverless/dashboard-plugin': (() => {
-        try {
-          return getRequire(localServerlessPath)('@serverless/dashboard-plugin/package').version;
-        } catch {
-          return undefined;
-        }
-      })(),
-      '@serverless/enterprise-plugin': (() => {
-        try {
-          return getRequire(localServerlessPath)('@serverless/enterprise-plugin/package').version;
-        } catch {
-          return undefined;
-        }
-      })(),
+      'serverless': require('../../../package').version,
+      '@serverless/dashboard-plugin': require('@serverless/dashboard-plugin/package').version,
     };
   })();
 
@@ -251,7 +210,7 @@ module.exports = ({
       if (!isLocallyInstalled) {
         return isNpmGlobal() ? 'global:npm' : 'global:other';
       }
-      if (serverless && serverless.isInvokedByGlobalInstallation) return 'local:fallback';
+      if (EvalError.$serverlessInitInstallationVersion) return 'local:fallback';
       return 'local:direct';
     })(),
     isAutoUpdateEnabled: Boolean(userConfig.get('autoUpdate.enabled')),
diff --git a/package.json b/package.json
index f971e05af01..decb923c66b 100644
--- a/package.json
+++ b/package.json
@@ -68,6 +68,7 @@
     "semver": "^7.3.5",
     "signal-exit": "^3.0.6",
     "strip-ansi": "^6.0.1",
+    "supports-color": "^8.1.1",
     "tar": "^6.1.11",
     "timers-ext": "^0.1.7",
     "type": "^2.5.0",
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 41893ce709c..a526ae79cfa 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -68,11 +68,7 @@ require('signal-exit/signals').forEach((signal) => {
     const isOtherSigintListener = Boolean(process.listenerCount(signal));
     if (!hasTelemetryBeenReported) {
       hasTelemetryBeenReported = true;
-      if (
-        commandSchema &&
-        !isTelemetryDisabled &&
-        (serverless ? serverless.isTelemetryReportedExternally : true)
-      ) {
+      if (commandSchema && !isTelemetryDisabled) {
         const telemetryPayload = generateTelemetryPayload({
           command,
           options,
@@ -589,8 +585,6 @@ const processSpanPromise = (async () => {
       configurationFilename,
       isConfigurationResolved:
         commands[0] === 'plugin' || Boolean(variablesMeta && !variablesMeta.size),
-      hasResolvedCommandsExternally: true,
-      isTelemetryReportedExternally: true,
       commands,
       options,
     });
@@ -599,43 +593,27 @@ const processSpanPromise = (async () => {
       serverless.onExitPromise = processSpanPromise;
       serverless.invocationId = uuid.v4();
       await serverless.init();
-      if (serverless.invokedInstance) {
-        // Local (in service) installation was found and initialized internally,
-        // From now on refer to it only
-        serverless.invokedInstance.invocationId = serverless.invocationId;
-        serverless = serverless.invokedInstance;
-      }
 
       // IIFE for maintanance convenience
       await (async () => {
         if (!configuration) return;
-        let hasFinalCommandSchema = null;
+        let hasFinalCommandSchema = false;
         if (configuration.plugins) {
           // After plugins are loaded, re-resolve CLI command and options schema as plugin
           // might have defined extra commands and options
 
-          // TODO: Remove "serverless.pluginManager.externalPlugins" check with next major
-          if (serverless.pluginManager.externalPlugins) {
-            if (serverless.pluginManager.externalPlugins.size) {
-              const commandsSchema = require('../lib/cli/commands-schema/resolve-final')(
-                serverless.pluginManager.externalPlugins,
-                { providerName: providerName || 'aws', configuration }
-              );
-              resolveInput.clear();
-              ({ command, commands, options, isHelpRequest, commandSchema } =
-                resolveInput(commandsSchema));
-              serverless.processedInput.commands = serverless.pluginManager.cliCommands = commands;
-              serverless.processedInput.options = options;
-              Object.assign(clear(serverless.pluginManager.cliOptions), options);
-              hasFinalCommandSchema = true;
-            }
-          } else {
-            // Invocation fallen back to old Framework version, where we do not have easily
-            // accessible info on loaded plugins
-            // 1. Skip further variables resolution
-            variablesMeta = null;
-            // 2. Avoid command validation
-            hasFinalCommandSchema = false;
+          if (serverless.pluginManager.externalPlugins.size) {
+            const commandsSchema = require('../lib/cli/commands-schema/resolve-final')(
+              serverless.pluginManager.externalPlugins,
+              { providerName: providerName || 'aws', configuration }
+            );
+            resolveInput.clear();
+            ({ command, commands, options, isHelpRequest, commandSchema } =
+              resolveInput(commandsSchema));
+            serverless.processedInput.commands = serverless.pluginManager.cliCommands = commands;
+            serverless.processedInput.options = options;
+            Object.assign(clear(serverless.pluginManager.cliOptions), options);
+            hasFinalCommandSchema = true;
           }
         }
         if (!providerName && !hasFinalCommandSchema) {
@@ -645,7 +623,7 @@ const processSpanPromise = (async () => {
             require('../lib/cli/commands-schema/aws-service')
           ));
         }
-        if (hasFinalCommandSchema == null) hasFinalCommandSchema = true;
+        hasFinalCommandSchema = true;
 
         // Validate result command and options
         if (hasFinalCommandSchema) require('../lib/cli/ensure-supported-command')(configuration);
@@ -853,7 +831,7 @@ const processSpanPromise = (async () => {
       if (!hasTelemetryBeenReported) {
         hasTelemetryBeenReported = true;
 
-        if (!isTelemetryDisabled && !isHelpRequest && serverless.isTelemetryReportedExternally) {
+        if (!isTelemetryDisabled && !isHelpRequest) {
           storeTelemetryLocally({
             ...generateTelemetryPayload({
               command,
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/_setup.js b/test/fixtures/programmatic/locallyInstalledServerless/_setup.js
index ab4eaee96e2..79685ec05d9 100644
--- a/test/fixtures/programmatic/locallyInstalledServerless/_setup.js
+++ b/test/fixtures/programmatic/locallyInstalledServerless/_setup.js
@@ -4,7 +4,7 @@ const fs = require('fs');
 const path = require('path');
 
 const fixturePath = path.resolve(__dirname, 'node_modules/serverless');
-const fixtureModulePath = path.resolve(fixturePath, 'lib/Serverless.js');
+const fixtureModulePath = path.resolve(fixturePath, 'bin/serverless.js');
 
 module.exports = (originalFixturePath) => {
   const content = fs.readFileSync(fixtureModulePath);
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/bin/serverless.js b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/bin/serverless.js
new file mode 100644
index 00000000000..8b3d1a27b9f
--- /dev/null
+++ b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/bin/serverless.js
@@ -0,0 +1,4 @@
+'use strict';
+
+// eslint-disable-next-line no-undef
+require($SERVERLESS_PATH);
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/Serverless.js b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/Serverless.js
index 71f0a4ae1e6..ad9a93a7c16 100644
--- a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/Serverless.js
+++ b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/Serverless.js
@@ -1,31 +1 @@
 'use strict';
-
-// eslint-disable-next-line no-undef
-const SERVERLESS_PATH = $SERVERLESS_PATH;
-
-const Serverless = require(SERVERLESS_PATH);
-
-class LocalServerless extends Serverless {
-  constructor(config) {
-    super(config);
-    this.isLocalStub = true;
-  }
-  eventuallyFallbackToLocal() {
-    this.isLocallyInstalled = true;
-    return Promise.resolve();
-  }
-  // TODO: Can be removed with next major
-  async run() {
-    const cachedValue = this._isInvokedByGlobalInstallation;
-    // Temporary patch as local fallback triggers re-resolution of CLI input
-    // which originally is pre-generated by `runServerless`, therefore breaking test setup
-    this._isInvokedByGlobalInstallation = false;
-    const promise = super.run();
-    this._isInvokedByGlobalInstallation = cachedValue;
-    return promise;
-  }
-};
-
-LocalServerless.SERVERLESS_PATH = SERVERLESS_PATH;
-
-module.exports = LocalServerless;
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/commands-schema.js b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/commands-schema.js
deleted file mode 100644
index 91fd86eb0ba..00000000000
--- a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/commands-schema.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-const path = require('path');
-
-module.exports = require(path.resolve(require('../../').SERVERLESS_PATH, 'lib/cli/commands-schema'));
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/resolve-configuration-path.js b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/resolve-configuration-path.js
deleted file mode 100644
index 3aa0d60cb8c..00000000000
--- a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/resolve-configuration-path.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-const path = require('path');
-
-module.exports = require(path.resolve(require('../..').SERVERLESS_PATH, 'lib/cli/resolve-configuration-path'));
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/resolve-input.js b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/resolve-input.js
deleted file mode 100644
index f7907d4db55..00000000000
--- a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/resolve-input.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-const path = require('path');
-
-module.exports = require(path.resolve(require('../..').SERVERLESS_PATH, 'lib/cli/resolve-input'));
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/configuration/read.js b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/configuration/read.js
deleted file mode 100644
index f0c2a10a275..00000000000
--- a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/configuration/read.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-const path = require('path');
-
-module.exports = require(path.resolve(require('../..').SERVERLESS_PATH, 'lib/configuration/read'));
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/configuration/variables.js b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/configuration/variables.js
deleted file mode 100644
index 01bb118433f..00000000000
--- a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/configuration/variables.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-const path = require('path');
-
-module.exports = require(path.resolve(require('../..').SERVERLESS_PATH, 'lib/configuration/variables'));
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/utils/analytics/areDisabled.js b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/utils/analytics/areDisabled.js
deleted file mode 100644
index 96911ec718f..00000000000
--- a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/utils/analytics/areDisabled.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// Patch to ensure that runServerless won't crash on enforcing disabling of analytics
-
-'use strict';
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/node_modules/@serverless/dashboard-plugin/package.json b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/node_modules/@serverless/dashboard-plugin/package.json
deleted file mode 100644
index a5a5ef45e86..00000000000
--- a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/node_modules/@serverless/dashboard-plugin/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "version": "4.0.0-local"
-}
diff --git a/test/unit/lib/Serverless.test.js b/test/unit/lib/Serverless.test.js
index f83d9a0f07c..fd8e06293b1 100644
--- a/test/unit/lib/Serverless.test.js
+++ b/test/unit/lib/Serverless.test.js
@@ -8,9 +8,6 @@ const { expect } = chai;
 
 const Serverless = require('../../../lib/Serverless');
 const semverRegex = require('semver-regex');
-const path = require('path');
-const sinon = require('sinon');
-const BbPromise = require('bluebird');
 
 const YamlParser = require('../../../lib/classes/YamlParser');
 const PluginManager = require('../../../lib/classes/PluginManager');
@@ -19,10 +16,7 @@ const Service = require('../../../lib/classes/Service');
 const ConfigSchemaHandler = require('../../../lib/classes/ConfigSchemaHandler');
 const CLI = require('../../../lib/classes/CLI');
 const ServerlessError = require('../../../lib/serverless-error');
-const conditionallyLoadDotenv = require('../../../lib/cli/conditionally-load-dotenv');
 const runServerless = require('../../utils/run-serverless');
-const fixtures = require('../../fixtures/programmatic');
-const fsp = require('fs').promises;
 
 describe('Serverless', () => {
   let serverless;
@@ -32,18 +26,6 @@ describe('Serverless', () => {
   });
 
   describe('#constructor()', () => {
-    it('should set the correct config if a config object is passed', () => {
-      const configObj = { some: 'config', commands: [], options: {} };
-      const serverlessWithConfig = new Serverless(configObj);
-
-      expect(serverlessWithConfig.config.some).to.equal('config');
-    });
-
-    it('should set an empty config object if no config object passed', () => {
-      expect(Object.keys(serverless.config)).to.include('serverless');
-      expect(Object.keys(serverless.config)).to.include('serverlessPath');
-    });
-
     it('should set an empty providers object', () => {
       expect(serverless.providers).to.deep.equal({});
     });
@@ -138,60 +120,6 @@ describe('Serverless', () => {
       }));
   });
 
-  describe('#run()', () => {
-    let displayHelpStub;
-    let validateCommandStub;
-    let populateServiceStub;
-    let runStub;
-
-    beforeEach(() => {
-      serverless.cli = new CLI(serverless);
-      serverless.processedInput = { commands: [], options: {} };
-      // setup default stubs
-      displayHelpStub = sinon.stub(serverless.cli, 'displayHelp').returns(false);
-      validateCommandStub = sinon.stub(serverless.pluginManager, 'validateCommand').returns();
-      populateServiceStub = sinon.stub(serverless.variables, 'populateService').resolves();
-      runStub = sinon.stub(serverless.pluginManager, 'run').resolves();
-    });
-
-    afterEach(() => {
-      serverless.cli.displayHelp.restore();
-      serverless.pluginManager.validateCommand.restore();
-      serverless.variables.populateService.restore();
-      serverless.pluginManager.run.restore();
-    });
-
-    it('should resolve if the stats logging call throws an error / is rejected', () => {
-      return serverless.run().then(() => {
-        expect(displayHelpStub.calledOnce).to.equal(true);
-        expect(validateCommandStub.calledOnce).to.equal(true);
-        expect(populateServiceStub.calledOnce).to.equal(true);
-        expect(runStub.calledOnce).to.equal(true);
-        return BbPromise.resolve();
-      });
-    });
-
-    it('should resolve if help is displayed or no commands are entered', () => {
-      // overwrite displayHelpStub
-      displayHelpStub.returns(true);
-
-      return serverless.run().then(() => {
-        expect(displayHelpStub.calledOnce).to.equal(true);
-        expect(validateCommandStub.calledOnce).to.equal(false);
-        expect(populateServiceStub.calledOnce).to.equal(false);
-        expect(runStub.calledOnce).to.equal(false);
-      });
-    });
-
-    it('should run all the needed functions', () =>
-      serverless.run().then(() => {
-        expect(displayHelpStub.calledOnce).to.equal(true);
-        expect(validateCommandStub.calledOnce).to.equal(true);
-        expect(populateServiceStub.calledOnce).to.equal(true);
-        expect(runStub.calledOnce).to.equal(true);
-      }));
-  });
-
   describe('#setProvider()', () => {
     class ProviderMock {}
 
@@ -228,136 +156,6 @@ describe('Serverless', () => {
 });
 
 describe('test/unit/lib/Serverless.test.js', () => {
-  describe('When local version available', () => {
-    describe('When running global version', () => {
-      it('Should fallback to local version when it is found and "enableLocalInstallationFallback" is not set', () =>
-        runServerless({
-          fixture: 'locallyInstalledServerless',
-          command: 'print',
-          modulesCacheStub: {},
-        }).then(({ serverless }) => {
-          expect(Array.from(serverless.triggeredDeprecations)).to.deep.equal([]);
-          expect(serverless._isInvokedByGlobalInstallation).to.be.true;
-          expect(serverless.isLocallyInstalled).to.be.true;
-          expect(serverless.isLocalStub).to.be.true;
-        }));
-
-      it('Should report deprecation notice when "enableLocalInstallationFallback" is set', async () =>
-        expect(
-          runServerless({
-            fixture: 'locallyInstalledServerless',
-            configExt: { enableLocalInstallationFallback: false },
-            command: 'print',
-            modulesCacheStub: {},
-          })
-        ).to.eventually.be.rejected.and.have.property(
-          'code',
-          'REJECTED_DEPRECATION_DISABLE_LOCAL_INSTALLATION_FALLBACK_SETTING'
-        ));
-
-      it('Should not fallback to local when "enableLocalInstallationFallback" set to false', async () => {
-        const { serverless } = await runServerless({
-          fixture: 'locallyInstalledServerless',
-          configExt: {
-            disabledDeprecations: 'DISABLE_LOCAL_INSTALLATION_FALLBACK_SETTING',
-            enableLocalInstallationFallback: false,
-          },
-          command: 'print',
-          modulesCacheStub: {},
-        });
-        expect(serverless.invokedInstance).to.not.exist;
-      });
-
-      it('Should fallback to local version when "enableLocalInstallationFallback" set to true', () =>
-        runServerless({
-          fixture: 'locallyInstalledServerless',
-          configExt: {
-            disabledDeprecations: 'DISABLE_LOCAL_INSTALLATION_FALLBACK_SETTING',
-            enableLocalInstallationFallback: true,
-          },
-          command: 'print',
-          modulesCacheStub: {},
-        }).then(({ serverless }) => {
-          expect(Array.from(serverless.triggeredDeprecations)).to.deep.equal([
-            'DISABLE_LOCAL_INSTALLATION_FALLBACK_SETTING',
-          ]);
-          expect(serverless._isInvokedByGlobalInstallation).to.be.true;
-          expect(serverless.isLocallyInstalled).to.be.true;
-          expect(serverless.isLocalStub).to.be.true;
-        }));
-    });
-
-    describe('When running local version', () => {
-      it('Should run without notice', () =>
-        fixtures.setup('locallyInstalledServerless').then(({ servicePath: serviceDir }) =>
-          runServerless({
-            serverlessDir: path.resolve(serviceDir, 'node_modules/serverless'),
-            cwd: serviceDir,
-            command: 'print',
-          }).then(({ serverless }) => {
-            expect(Array.from(serverless.triggeredDeprecations)).to.not.include(
-              'DISABLE_LOCAL_INSTALLATION_FALLBACK_SETTING'
-            );
-            expect(serverless._isInvokedByGlobalInstallation).to.be.false;
-            expect(serverless.isLocallyInstalled).to.be.true;
-            expect(serverless.isLocalStub).to.be.true;
-          })
-        ));
-    });
-  });
-
-  describe('When local version not available', () => {
-    it('Should run without notice', () =>
-      runServerless({ fixture: 'aws', command: 'print', modulesCacheStub: {} }).then(
-        ({ serverless }) => {
-          expect(Array.from(serverless.triggeredDeprecations)).to.deep.equal([]);
-          expect(serverless._isInvokedByGlobalInstallation).to.be.false;
-          expect(serverless.isLocallyInstalled).to.be.false;
-          expect(serverless.isLocalStub).to.not.exist;
-        }
-      ));
-  });
-
-  describe('When .env file is available', () => {
-    let serviceDir;
-
-    before(async () => {
-      serviceDir = (
-        await fixtures.setup('function', {
-          configExt: {
-            useDotenv: true,
-            custom: {
-              fromDefaultEnv: '${env:DEFAULT_ENV_VARIABLE}',
-              fromStageEnv: "${env:STAGE_ENV_VARIABLE, 'not-found'}",
-              fromDefaultExpandedEnv: '${env:DEFAULT_ENV_VARIABLE_EXPANDED}',
-            },
-          },
-        })
-      ).servicePath;
-
-      const defaultFileContent = `
-        DEFAULT_ENV_VARIABLE=valuefromdefault
-        DEFAULT_ENV_VARIABLE_EXPANDED=$DEFAULT_ENV_VARIABLE/expanded
-      `;
-      await fsp.writeFile(path.join(serviceDir, '.env'), defaultFileContent);
-      conditionallyLoadDotenv.clear();
-    });
-
-    it('Should load environment variables from default .env file if no matching stage', async () => {
-      const result = await runServerless({
-        cwd: serviceDir,
-        command: 'package',
-        shouldUseLegacyVariablesResolver: true,
-      });
-
-      expect(result.serverless.service.custom.fromDefaultEnv).to.equal('valuefromdefault');
-      expect(result.serverless.service.custom.fromDefaultExpandedEnv).to.equal(
-        'valuefromdefault/expanded'
-      );
-      expect(result.serverless.service.custom.fromStageEnv).to.equal('not-found');
-    });
-  });
-
   describe('Legacy API interface', () => {
     let serverless;
 
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
index 3403d01c909..62d099dece6 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/PluginManager.test.js
@@ -1127,14 +1127,6 @@ describe('PluginManager', () => {
         ServerlessError
       );
     });
-
-    it('should throw on entrypoints', () => {
-      pluginManager.addPlugin(EntrypointPluginMock);
-
-      expect(() => pluginManager.validateCommand(['myep', 'mysubep'])).to.throw(
-        /command ".*" not found/
-      );
-    });
   });
 
   describe('#assignDefaultOptions()', () => {
@@ -1274,82 +1266,6 @@ describe('PluginManager', () => {
     });
   });
 
-  describe('#validateOptions()', () => {
-    it('should throw an error if a required option is not set', () => {
-      pluginManager.commands = {
-        foo: {
-          options: {
-            baz: {
-              shortcut: 'b',
-              required: true,
-            },
-          },
-        },
-        bar: {
-          options: {
-            baz: {
-              required: true,
-            },
-          },
-        },
-      };
-
-      const foo = pluginManager.commands.foo;
-      const bar = pluginManager.commands.bar;
-
-      expect(() => {
-        pluginManager.validateOptions(foo);
-      }).to.throw(Error);
-      expect(() => {
-        pluginManager.validateOptions(bar);
-      }).to.throw(Error);
-    });
-
-    it('should throw an error if a customValidation is not met', () => {
-      pluginManager.setCliOptions({ bar: 'dev' });
-
-      pluginManager.commands = {
-        foo: {
-          options: {
-            bar: {
-              customValidation: {
-                regularExpression: /^[0-9]+$/,
-                errorMessage: 'Custom Error Message',
-              },
-            },
-          },
-        },
-      };
-      const command = pluginManager.commands.foo;
-
-      expect(() => {
-        pluginManager.validateOptions(command);
-      }).to.throw(Error);
-    });
-
-    it('should succeeds if a custom regex matches in a plain commands object', () => {
-      pluginManager.setCliOptions({ bar: 100 });
-
-      pluginManager.commands = {
-        foo: {
-          options: {
-            bar: {
-              customValidation: {
-                regularExpression: /^[0-9]+$/,
-                errorMessage: 'Custom Error Message',
-              },
-            },
-          },
-        },
-      };
-      const commandsArray = ['foo'];
-
-      expect(() => {
-        pluginManager.validateOptions(commandsArray);
-      }).to.not.throw(Error);
-    });
-  });
-
   describe('#run()', () => {
     it('should throw an error when the given command is not available', () => {
       pluginManager.addPlugin(SynchronousPluginMock);
@@ -1601,34 +1517,6 @@ describe('PluginManager', () => {
         },
       };
     });
-
-    it('should give a suggestion for an unknown command', (done) => {
-      try {
-        pluginManager.getCommand(['creet']);
-        done('Test failed. Expected an error to be thrown');
-      } catch (error) {
-        expect(error.name).to.eql('ServerlessError');
-        expect(error.message).to.eql(
-          'Serverless command "creet" not found. ' +
-            'Did you mean "create"? Run "serverless help" for a list of all available commands.'
-        );
-        done();
-      }
-    });
-
-    it('should not give a suggestion for valid top level command', (done) => {
-      try {
-        pluginManager.getCommand(['deploy', 'function-misspelled']);
-        done('Test failed. Expected an error to be thrown');
-      } catch (error) {
-        expect(error.name).to.eql('ServerlessError');
-        expect(error.message).to.eql(
-          '"function-misspelled" is not a valid sub command. ' +
-            'Run "serverless deploy" to see a more helpful error message for this command.'
-        );
-        done();
-      }
-    });
   });
 
   describe('#spawn()', () => {
diff --git a/test/unit/lib/cli/conditionally-load-dotenv.test.js b/test/unit/lib/cli/conditionally-load-dotenv.test.js
index 47c5cefd098..550e7519bc0 100644
--- a/test/unit/lib/cli/conditionally-load-dotenv.test.js
+++ b/test/unit/lib/cli/conditionally-load-dotenv.test.js
@@ -22,7 +22,6 @@ describe('test/unit/lib/cli/conditionally-load-dotenv.test.js', () => {
   });
 
   beforeEach(() => {
-    conditionallyLoadDotenv.clear();
     ({ restoreEnv } = overrideEnv());
   });
   afterEach(() => {
diff --git a/test/unit/lib/cli/handle-error.test.js b/test/unit/lib/cli/handle-error.test.js
index 029cdfe1745..5bc91146181 100644
--- a/test/unit/lib/cli/handle-error.test.js
+++ b/test/unit/lib/cli/handle-error.test.js
@@ -38,17 +38,6 @@ describe('test/unit/lib/cli/handle-error.test.js', () => {
       const output = await observeOutput(() => handleError(new ServerlessError('Test error')));
       expect(output).to.have.string('(standalone)');
     });
-  } else {
-    it('should support `isLocallyInstalled` option', async () => {
-      const output = await observeOutput(() =>
-        handleError(new ServerlessError('Test error'), { isLocallyInstalled: false })
-      );
-      expect(output).to.not.have.string('(local)');
-      const output2 = await observeOutput(() =>
-        handleError(new ServerlessError('Test error'), { isLocallyInstalled: true })
-      );
-      expect(output2).to.have.string('(local)');
-    });
   }
 
   it('should handle non-error objects', async () => {
diff --git a/test/unit/lib/configuration/variables/sources/instance-dependent/get-aws.test.js b/test/unit/lib/configuration/variables/sources/instance-dependent/get-aws.test.js
index 3664f0613ea..945585f6381 100644
--- a/test/unit/lib/configuration/variables/sources/instance-dependent/get-aws.test.js
+++ b/test/unit/lib/configuration/variables/sources/instance-dependent/get-aws.test.js
@@ -38,7 +38,6 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-a
       serviceDir: process.cwd(),
       configurationFilename: 'serverless.yml',
       isConfigurationResolved: true,
-      hasResolvedCommandsExternally: true,
       commands: ['package'],
       options: {},
     });
diff --git a/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js b/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js
index 4be233a7e0e..5999d4a54d2 100644
--- a/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js
+++ b/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js
@@ -38,7 +38,6 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
       serviceDir: process.cwd(),
       configurationFilename: 'serverless.yml',
       isConfigurationResolved: true,
-      hasResolvedCommandsExternally: true,
       commands: ['package'],
       options: {},
     });
diff --git a/test/unit/lib/plugins/plugin/install.test.js b/test/unit/lib/plugins/plugin/install.test.js
deleted file mode 100644
index ca78ad5723b..00000000000
--- a/test/unit/lib/plugins/plugin/install.test.js
+++ /dev/null
@@ -1,561 +0,0 @@
-'use strict';
-
-const chai = require('chai');
-const sinon = require('sinon');
-const BbPromise = require('bluebird');
-const yaml = require('js-yaml');
-const path = require('path');
-const childProcess = BbPromise.promisifyAll(require('child_process'));
-const fs = require('fs');
-const fse = require('fs-extra');
-const PluginInstall = require('../../../../../lib/plugins/plugin/install');
-const Serverless = require('../../../../../lib/Serverless');
-const CLI = require('../../../../../lib/classes/CLI');
-const { expect } = require('chai');
-const { getTmpDirPath } = require('../../../../utils/fs');
-
-chai.use(require('chai-as-promised'));
-
-describe('PluginInstall', () => {
-  let pluginInstall;
-  let serverless;
-  let serverlessErrorStub;
-  const plugins = [
-    {
-      name: '@scope/serverless-plugin-1',
-      description: 'Scoped Serverless Plugin 1',
-      githubUrl: 'https://github.com/serverless/serverless-plugin-1',
-    },
-    {
-      name: 'serverless-plugin-1',
-      description: 'Serverless Plugin 1',
-      githubUrl: 'https://github.com/serverless/serverless-plugin-1',
-    },
-    {
-      name: 'serverless-plugin-2',
-      description: 'Serverless Plugin 2',
-      githubUrl: 'https://github.com/serverless/serverless-plugin-2',
-    },
-    {
-      name: 'serverless-existing-plugin',
-      description: 'Serverless Existing plugin',
-      githubUrl: 'https://github.com/serverless/serverless-existing-plugin',
-    },
-  ];
-
-  beforeEach(() => {
-    serverless = new Serverless({ commands: [], options: {} });
-    serverless.cli = new CLI(serverless);
-    const options = {};
-    pluginInstall = new PluginInstall(serverless, options);
-    serverlessErrorStub = sinon.stub(serverless.classes, 'Error').throws();
-  });
-
-  afterEach(() => {
-    serverless.classes.Error.restore();
-  });
-
-  describe('#constructor()', () => {
-    let installStub;
-
-    beforeEach(() => {
-      installStub = sinon.stub(pluginInstall, 'install').returns(BbPromise.resolve());
-    });
-
-    afterEach(() => {
-      pluginInstall.install.restore();
-    });
-
-    it('should have the sub-command "install"', () => {
-      expect(pluginInstall.commands.plugin.commands.install).to.not.equal(undefined);
-    });
-
-    it('should have the lifecycle event "install" for the "install" sub-command', () => {
-      expect(pluginInstall.commands.plugin.commands.install.lifecycleEvents).to.deep.equal([
-        'install',
-      ]);
-    });
-
-    it('should have a required option "name" for the "install" sub-command', () => {
-      // eslint-disable-next-line no-unused-expressions
-      expect(pluginInstall.commands.plugin.commands.install.options.name.required).to.be.true;
-    });
-
-    it('should have a "plugin:install:install" hook', () => {
-      expect(pluginInstall.hooks['plugin:install:install']).to.not.equal(undefined);
-    });
-
-    it('should run promise chain in order for "plugin:install:install" hook', () =>
-      pluginInstall.hooks['plugin:install:install']().then(() => {
-        expect(installStub.calledOnce).to.equal(true);
-      }));
-  });
-
-  describe('#install()', () => {
-    let serviceDir;
-    let serverlessYmlFilePath;
-    let pluginInstallStub;
-    let validateStub;
-    let getPluginsStub;
-    let savedCwd;
-    let addPluginToServerlessFileStub;
-    let installPeerDependenciesStub;
-
-    beforeEach(() => {
-      serviceDir = getTmpDirPath();
-      pluginInstall.serverless.serviceDir = serviceDir;
-      fse.ensureDirSync(serviceDir);
-      serverlessYmlFilePath = path.join(serviceDir, 'serverless.yml');
-      validateStub = sinon.stub(pluginInstall, 'validate').returns(BbPromise.resolve());
-      pluginInstallStub = sinon.stub(pluginInstall, 'pluginInstall').returns(BbPromise.resolve());
-      addPluginToServerlessFileStub = sinon
-        .stub(pluginInstall, 'addPluginToServerlessFile')
-        .returns(BbPromise.resolve());
-      installPeerDependenciesStub = sinon
-        .stub(pluginInstall, 'installPeerDependencies')
-        .returns(BbPromise.resolve());
-      getPluginsStub = sinon.stub(pluginInstall, 'getPlugins').returns(BbPromise.resolve(plugins));
-      // save the cwd so that we can restore it later
-      savedCwd = process.cwd();
-      process.chdir(serviceDir);
-    });
-
-    afterEach(() => {
-      pluginInstall.validate.restore();
-      pluginInstall.getPlugins.restore();
-      pluginInstall.pluginInstall.restore();
-      pluginInstall.addPluginToServerlessFile.restore();
-      pluginInstall.installPeerDependencies.restore();
-      process.chdir(savedCwd);
-    });
-
-    it('should install the plugin if it can be found in the registry', () => {
-      // serverless.yml
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-      pluginInstall.options.name = 'serverless-plugin-1';
-
-      return expect(pluginInstall.install()).to.be.fulfilled.then(() => {
-        expect(validateStub.calledOnce).to.equal(true);
-        expect(getPluginsStub.calledOnce).to.equal(true);
-        expect(pluginInstallStub.calledOnce).to.equal(true);
-        expect(serverlessErrorStub.calledOnce).to.equal(false);
-        expect(addPluginToServerlessFileStub.calledOnce).to.equal(true);
-        expect(installPeerDependenciesStub.calledOnce).to.equal(true);
-      });
-    });
-
-    it('should install a scoped plugin if it can be found in the registry', () => {
-      // serverless.yml
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-      pluginInstall.options.name = '@scope/serverless-plugin-1';
-
-      return expect(pluginInstall.install()).to.be.fulfilled.then(() => {
-        expect(validateStub.calledOnce).to.equal(true);
-        expect(getPluginsStub.calledOnce).to.equal(true);
-        expect(pluginInstallStub.calledOnce).to.equal(true);
-        expect(serverlessErrorStub.calledOnce).to.equal(false);
-        expect(addPluginToServerlessFileStub.calledOnce).to.equal(true);
-        expect(installPeerDependenciesStub.calledOnce).to.equal(true);
-      });
-    });
-
-    it('should install the plugin even if it can not be found in the registry', () => {
-      // serverless.yml
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-      pluginInstall.options.name = 'serverless-not-in-registry-plugin';
-      return expect(pluginInstall.install()).to.be.fulfilled.then(() => {
-        expect(validateStub.calledOnce).to.equal(true);
-        expect(getPluginsStub.calledOnce).to.equal(true);
-        expect(pluginInstallStub.calledOnce).to.equal(true);
-        expect(serverlessErrorStub.calledOnce).to.equal(false);
-        expect(addPluginToServerlessFileStub.calledOnce).to.equal(true);
-        expect(installPeerDependenciesStub.calledOnce).to.equal(true);
-      });
-    });
-
-    it('should apply the latest version if you can not get the version from name option', () => {
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-      pluginInstall.options.name = 'serverless-plugin-1';
-      return expect(pluginInstall.install()).to.be.fulfilled.then(() => {
-        expect(pluginInstall.options.pluginName).to.be.equal('serverless-plugin-1');
-        expect(pluginInstall.options.pluginVersion).to.be.equal('latest');
-      });
-    });
-
-    it(
-      'should apply the latest version if you can not get the ' +
-        'version from name option even if scoped',
-      () => {
-        const serverlessYml = {
-          service: 'plugin-service',
-          provider: 'aws',
-        };
-        serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-        pluginInstall.options.name = '@scope/serverless-plugin-1';
-        return expect(pluginInstall.install()).to.be.fulfilled.then(() => {
-          expect(pluginInstall.options.pluginName).to.be.equal('@scope/serverless-plugin-1');
-          expect(pluginInstall.options.pluginVersion).to.be.equal('latest');
-        });
-      }
-    );
-
-    it('should apply the specified version if you can get the version from name option', () => {
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-      pluginInstall.options.name = 'serverless-plugin-1@1.0.0';
-      return expect(pluginInstall.install()).to.be.fulfilled.then(() => {
-        expect(pluginInstall.options.pluginName).to.be.equal('serverless-plugin-1');
-        expect(pluginInstall.options.pluginVersion).to.be.equal('1.0.0');
-      });
-    });
-  });
-
-  describe('#pluginInstall()', () => {
-    let serviceDir;
-    let packageJsonFilePath;
-    let npmInstallStub;
-    let savedCwd;
-
-    beforeEach(() => {
-      pluginInstall.options.pluginName = 'serverless-plugin-1';
-      pluginInstall.options.pluginVersion = 'latest';
-      serviceDir = getTmpDirPath();
-      pluginInstall.serverless.serviceDir = serviceDir;
-      fse.ensureDirSync(serviceDir);
-      packageJsonFilePath = path.join(serviceDir, 'package.json');
-      npmInstallStub = sinon.stub(childProcess, 'execAsync').callsFake(() => {
-        const packageJson = serverless.utils.readFileSync(packageJsonFilePath, 'utf8');
-        packageJson.devDependencies = {
-          'serverless-plugin-1': 'latest',
-        };
-        serverless.utils.writeFileSync(packageJsonFilePath, packageJson);
-        return BbPromise.resolve();
-      });
-
-      // save the cwd so that we can restore it later
-      savedCwd = process.cwd();
-      process.chdir(serviceDir);
-    });
-
-    afterEach(() => {
-      childProcess.execAsync.restore();
-      process.chdir(savedCwd);
-    });
-
-    it('npmI', () => {
-      const packageJson = {
-        name: 'test-service',
-        description: '',
-        version: '0.1.0',
-        dependencies: {},
-        devDependencies: {},
-      };
-
-      serverless.utils.writeFileSync(packageJsonFilePath, packageJson);
-
-      return expect(pluginInstall.pluginInstall()).to.be.fulfilled.then(() =>
-        Promise.all([
-          expect(
-            npmInstallStub.calledWithExactly('npm  install --save-dev serverless-plugin-1@latest', {
-              stdio: 'ignore',
-            })
-          ).to.equal(true),
-          expect(serverlessErrorStub.calledOnce).to.equal(false),
-        ])
-      );
-    });
-
-    it('should generate a package.json file in the service directory if not present', () =>
-      expect(pluginInstall.pluginInstall()).to.be.fulfilled.then(() => {
-        expect(
-          npmInstallStub.calledWithExactly('npm  install --save-dev serverless-plugin-1@latest', {
-            stdio: 'ignore',
-          })
-        ).to.equal(true);
-        expect(fs.existsSync(packageJsonFilePath)).to.equal(true);
-      }));
-  });
-
-  describe('#addPluginToServerlessFile()', () => {
-    let serviceDir;
-    let serverlessYmlFilePath;
-
-    beforeEach(() => {
-      serviceDir = getTmpDirPath();
-      pluginInstall.serverless.serviceDir = pluginInstall.serverless.serviceDir = serviceDir;
-      pluginInstall.serverless.configurationFilename = 'serverless.yml';
-      serverlessYmlFilePath = path.join(serviceDir, 'serverless.yml');
-    });
-
-    it('should add the plugin to the service file if plugins array is not present', () => {
-      // serverless.yml
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-        // no plugins array here
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-      pluginInstall.options.pluginName = 'serverless-plugin-1';
-
-      return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
-        expect(serverless.utils.readFileSync(serverlessYmlFilePath, 'utf8')).to.deep.equal(
-          Object.assign({}, serverlessYml, {
-            plugins: ['serverless-plugin-1'],
-          })
-        );
-      });
-    });
-
-    it('should push the plugin to the service files plugin array if present', () => {
-      // serverless.yml
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-        plugins: ['serverless-existing-plugin'], // one plugin was already added
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-      pluginInstall.options.pluginName = 'serverless-plugin-1';
-
-      return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
-        expect(serverless.utils.readFileSync(serverlessYmlFilePath, 'utf8')).to.deep.equal(
-          Object.assign({}, serverlessYml, {
-            plugins: ['serverless-existing-plugin', 'serverless-plugin-1'],
-          })
-        );
-      });
-    });
-
-    it('should add the plugin to serverless file path for a .yaml file', () => {
-      const serverlessYamlFilePath = path.join(serviceDir, 'serverless.yaml');
-      pluginInstall.serverless.configurationFilename = 'serverless.yaml';
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-      };
-      serverless.utils.writeFileSync(serverlessYamlFilePath, yaml.dump(serverlessYml));
-      pluginInstall.options.pluginName = 'serverless-plugin-1';
-      return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
-        expect(serverless.utils.readFileSync(serverlessYamlFilePath, 'utf8')).to.deep.equal(
-          Object.assign({}, serverlessYml, { plugins: ['serverless-plugin-1'] })
-        );
-      });
-    });
-
-    it('should add the plugin to serverless file path for a .json file', () => {
-      const serverlessJsonFilePath = path.join(serviceDir, 'serverless.json');
-      pluginInstall.serverless.configurationFilename = 'serverless.json';
-      const serverlessJson = {
-        service: 'plugin-service',
-        provider: 'aws',
-      };
-      serverless.utils.writeFileSync(serverlessJsonFilePath, serverlessJson);
-      pluginInstall.options.pluginName = 'serverless-plugin-1';
-      return expect(pluginInstall.addPluginToServerlessFile())
-        .to.be.fulfilled.then(() => {
-          expect(serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8')).to.deep.equal(
-            Object.assign({}, serverlessJson, { plugins: ['serverless-plugin-1'] })
-          );
-        })
-        .then(() => {
-          pluginInstall.options.pluginName = 'serverless-plugin-2';
-          return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
-            expect(serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8')).to.deep.equal(
-              Object.assign({}, serverlessJson, {
-                plugins: ['serverless-plugin-1', 'serverless-plugin-2'],
-              })
-            );
-          });
-        });
-    });
-
-    it('should not modify serverless .js file', async () => {
-      const serverlessJsFilePath = path.join(serviceDir, 'serverless.js');
-      pluginInstall.serverless.configurationFilename = 'serverless.js';
-      const serverlessJson = {
-        service: 'plugin-service',
-        provider: 'aws',
-        plugins: [],
-      };
-      serverless.utils.writeFileSync(
-        serverlessJsFilePath,
-        `module.exports = ${JSON.stringify(serverlessJson)};`
-      );
-      pluginInstall.options.pluginName = 'serverless-plugin-1';
-      await pluginInstall.addPluginToServerlessFile();
-      // use require to load serverless.js
-      // eslint-disable-next-line global-require
-      expect(require(serverlessJsFilePath).plugins).to.be.deep.equal([]);
-    });
-
-    it('should not modify serverless .ts file', () => {
-      const serverlessTsFilePath = path.join(serviceDir, 'serverless.ts');
-      pluginInstall.serverless.configurationFilename = 'serverless.ts';
-      const serverlessJson = {
-        service: 'plugin-service',
-        provider: 'aws',
-        plugins: [],
-      };
-      serverless.utils.writeFileSync(
-        serverlessTsFilePath,
-        `module.exports = ${JSON.stringify(serverlessJson)};`
-      );
-      pluginInstall.options.pluginName = 'serverless-plugin-1';
-      return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
-        // use require to load serverless.js
-        // eslint-disable-next-line global-require
-        expect(require(serverlessTsFilePath).plugins).to.be.deep.equal([]);
-      });
-    });
-
-    describe('if plugins object is not array', () => {
-      it('should add the plugin to the service file', () => {
-        // serverless.yml
-        const serverlessYml = {
-          service: 'plugin-service',
-          provider: 'aws',
-          plugins: {
-            localPath: 'test',
-            modules: [],
-          },
-        };
-        serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-        pluginInstall.options.pluginName = 'serverless-plugin-1';
-
-        return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
-          expect(serverless.utils.readFileSync(serverlessYmlFilePath, 'utf8')).to.deep.equal(
-            Object.assign({}, serverlessYml, {
-              plugins: {
-                localPath: 'test',
-                modules: [pluginInstall.options.pluginName],
-              },
-            })
-          );
-        });
-      });
-
-      it('should add the plugin to serverless file path for a .json file', () => {
-        const serverlessJsonFilePath = path.join(serviceDir, 'serverless.json');
-        pluginInstall.serverless.configurationFilename = 'serverless.json';
-        const serverlessJson = {
-          service: 'plugin-service',
-          provider: 'aws',
-          plugins: {
-            localPath: 'test',
-            modules: [],
-          },
-        };
-        serverless.utils.writeFileSync(serverlessJsonFilePath, serverlessJson);
-        pluginInstall.options.pluginName = 'serverless-plugin-1';
-        return expect(pluginInstall.addPluginToServerlessFile())
-          .to.be.fulfilled.then(() => {
-            expect(serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8')).to.deep.equal(
-              Object.assign({}, serverlessJson, {
-                plugins: {
-                  localPath: 'test',
-                  modules: [pluginInstall.options.pluginName],
-                },
-              })
-            );
-          })
-          .then(() => {
-            pluginInstall.options.pluginName = 'serverless-plugin-2';
-            return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
-              expect(serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8')).to.deep.equal(
-                Object.assign({}, serverlessJson, {
-                  plugins: {
-                    localPath: 'test',
-                    modules: ['serverless-plugin-1', 'serverless-plugin-2'],
-                  },
-                })
-              );
-            });
-          });
-      });
-    });
-  });
-
-  describe('#installPeerDependencies()', () => {
-    let serviceDir;
-    let servicePackageJsonFilePath;
-    let pluginPath;
-    let pluginPackageJsonFilePath;
-    let pluginName;
-    let npmInstallStub;
-    let savedCwd;
-
-    beforeEach(() => {
-      pluginName = 'some-plugin';
-      pluginInstall.options.pluginName = pluginName;
-      serviceDir = getTmpDirPath();
-      fse.ensureDirSync(serviceDir);
-      pluginInstall.serverless.serviceDir = serviceDir;
-      servicePackageJsonFilePath = path.join(serviceDir, 'package.json');
-      fse.writeJsonSync(servicePackageJsonFilePath, {
-        devDependencies: {},
-      });
-      pluginPath = path.join(serviceDir, 'node_modules', pluginName);
-      fse.ensureDirSync(pluginPath);
-      pluginPackageJsonFilePath = path.join(pluginPath, 'package.json');
-      npmInstallStub = sinon.stub(childProcess, 'execAsync').returns(BbPromise.resolve());
-      savedCwd = process.cwd();
-      process.chdir(serviceDir);
-    });
-
-    afterEach(() => {
-      childProcess.execAsync.restore();
-      process.chdir(savedCwd);
-    });
-
-    it('should install peerDependencies if an installed plugin has ones', () => {
-      fse.writeJsonSync(pluginPackageJsonFilePath, {
-        peerDependencies: {
-          'some-package': '*',
-        },
-      });
-      return expect(pluginInstall.installPeerDependencies()).to.be.fulfilled.then(() => {
-        expect(
-          npmInstallStub.calledWithExactly('npm  install --save-dev some-package@"*"', {
-            stdio: 'ignore',
-          })
-        ).to.equal(true);
-      });
-    });
-
-    it('should not install peerDependencies if an installed plugin does not have ones', () => {
-      fse.writeJsonSync(pluginPackageJsonFilePath, {});
-      return expect(pluginInstall.installPeerDependencies()).to.be.fulfilled.then(() => {
-        expect(fse.readJsonSync(servicePackageJsonFilePath)).to.be.deep.equal({
-          devDependencies: {},
-        });
-        expect(npmInstallStub.calledWithExactly('npm  install', { stdio: 'ignore' })).to.equal(
-          false
-        );
-      });
-    });
-  });
-});
diff --git a/test/unit/lib/plugins/plugin/lib/utils.test.js b/test/unit/lib/plugins/plugin/lib/utils.test.js
index 3ee389f4fd4..ebf9f1948b7 100644
--- a/test/unit/lib/plugins/plugin/lib/utils.test.js
+++ b/test/unit/lib/plugins/plugin/lib/utils.test.js
@@ -5,7 +5,7 @@ const sinon = require('sinon');
 const BbPromise = require('bluebird');
 const proxyquire = require('proxyquire');
 const chalk = require('chalk');
-const PluginInstall = require('../../../../../../lib/plugins/plugin/install');
+const PluginList = require('../../../../../../lib/plugins/plugin/list');
 const Serverless = require('../../../../../../lib/Serverless');
 const CLI = require('../../../../../../lib/classes/CLI');
 const { expect } = require('chai');
@@ -37,14 +37,7 @@ describe('PluginUtils', () => {
     serverless = new Serverless({ commands: [], options: {} });
     serverless.cli = new CLI(serverless);
     const options = {};
-    pluginUtils = new PluginInstall(serverless, options);
-  });
-
-  describe('#getServerlessFilePath()', () => {
-    it('should reject if no configuration file exists', () =>
-      expect(pluginUtils.getServerlessFilePath.bind(pluginUtils)).to.throw(
-        'Could not find any serverless service definition file.'
-      ));
+    pluginUtils = new PluginList(serverless, options);
   });
 
   describe('#getPlugins()', () => {
@@ -73,23 +66,6 @@ describe('PluginUtils', () => {
     });
   });
 
-  describe('#getPluginInfo()', () => {
-    it('should return the plugins name', () => {
-      expect(pluginUtils.getPluginInfo('some-plugin')).to.deep.equal(['some-plugin']);
-    });
-
-    it('should return the plugins name and version', () => {
-      expect(pluginUtils.getPluginInfo('some-plugin@0.1.0')).to.deep.equal([
-        'some-plugin',
-        '0.1.0',
-      ]);
-    });
-
-    it('should support scoped names', () => {
-      expect(pluginUtils.getPluginInfo('@acme/some-plugin')).to.deep.equal(['@acme/some-plugin']);
-    });
-  });
-
   describe('#display()', () => {
     it('should display the plugins if present', () => {
       let expectedMessage = '';
diff --git a/test/unit/lib/plugins/plugin/uninstall.test.js b/test/unit/lib/plugins/plugin/uninstall.test.js
deleted file mode 100644
index bede83767ca..00000000000
--- a/test/unit/lib/plugins/plugin/uninstall.test.js
+++ /dev/null
@@ -1,522 +0,0 @@
-'use strict';
-
-const chai = require('chai');
-const sinon = require('sinon');
-const BbPromise = require('bluebird');
-const yaml = require('js-yaml');
-const path = require('path');
-const childProcess = BbPromise.promisifyAll(require('child_process'));
-const fse = require('fs-extra');
-const PluginUninstall = require('../../../../../lib/plugins/plugin/uninstall');
-const Serverless = require('../../../../../lib/Serverless');
-const CLI = require('../../../../../lib/classes/CLI');
-const { expect } = require('chai');
-const { getTmpDirPath } = require('../../../../utils/fs');
-
-chai.use(require('chai-as-promised'));
-
-describe('PluginUninstall', () => {
-  let pluginUninstall;
-  let serverless;
-  let serverlessErrorStub;
-
-  const plugins = [
-    {
-      name: 'serverless-plugin-1',
-      description: 'Serverless Plugin 1',
-      githubUrl: 'https://github.com/serverless/serverless-plugin-1',
-    },
-    {
-      name: 'serverless-plugin-2',
-      description: 'Serverless Plugin 2',
-      githubUrl: 'https://github.com/serverless/serverless-plugin-2',
-    },
-    {
-      name: 'serverless-existing-plugin',
-      description: 'Serverless Existing plugin',
-      githubUrl: 'https://github.com/serverless/serverless-existing-plugin',
-    },
-  ];
-
-  beforeEach(() => {
-    serverless = new Serverless({ commands: [], options: {} });
-    serverless.cli = new CLI(serverless);
-    const options = {};
-    pluginUninstall = new PluginUninstall(serverless, options);
-    serverlessErrorStub = sinon.stub(serverless.classes, 'Error').throws();
-  });
-
-  afterEach(() => {
-    serverless.classes.Error.restore();
-  });
-
-  describe('#constructor()', () => {
-    let uninstallStub;
-
-    beforeEach(() => {
-      uninstallStub = sinon.stub(pluginUninstall, 'uninstall').returns(BbPromise.resolve());
-    });
-
-    afterEach(() => {
-      pluginUninstall.uninstall.restore();
-    });
-
-    it('should have the sub-command "uninstall"', () => {
-      expect(pluginUninstall.commands.plugin.commands.uninstall).to.not.equal(undefined);
-    });
-
-    it('should have the lifecycle event "uninstall" for the "uninstall" sub-command', () => {
-      expect(pluginUninstall.commands.plugin.commands.uninstall.lifecycleEvents).to.deep.equal([
-        'uninstall',
-      ]);
-    });
-
-    it('should have a required option "name" for the "uninstall" sub-command', () => {
-      // eslint-disable-next-line no-unused-expressions
-      expect(pluginUninstall.commands.plugin.commands.uninstall.options.name.required).to.be.true;
-    });
-
-    it('should have a "plugin:uninstall:uninstall" hook', () => {
-      expect(pluginUninstall.hooks['plugin:uninstall:uninstall']).to.not.equal(undefined);
-    });
-
-    it('should run promise chain in order for "plugin:uninstall:uninstall" hook', () =>
-      expect(pluginUninstall.hooks['plugin:uninstall:uninstall']()).to.be.fulfilled.then(() => {
-        expect(uninstallStub.calledOnce).to.equal(true);
-      }));
-  });
-
-  describe('#uninstall()', () => {
-    let serviceDir;
-    let serverlessYmlFilePath;
-    let pluginUninstallStub;
-    let validateStub;
-    let getPluginsStub;
-    let savedCwd;
-    let removePluginFromServerlessFileStub;
-    let uninstallPeerDependenciesStub;
-
-    beforeEach(() => {
-      serviceDir = getTmpDirPath();
-      pluginUninstall.serverless.serviceDir = serviceDir;
-      fse.ensureDirSync(serviceDir);
-      serverlessYmlFilePath = path.join(serviceDir, 'serverless.yml');
-      validateStub = sinon.stub(pluginUninstall, 'validate').returns(BbPromise.resolve());
-      pluginUninstallStub = sinon
-        .stub(pluginUninstall, 'pluginUninstall')
-        .returns(BbPromise.resolve());
-      removePluginFromServerlessFileStub = sinon
-        .stub(pluginUninstall, 'removePluginFromServerlessFile')
-        .returns(BbPromise.resolve());
-      uninstallPeerDependenciesStub = sinon
-        .stub(pluginUninstall, 'uninstallPeerDependencies')
-        .returns(BbPromise.resolve());
-      getPluginsStub = sinon
-        .stub(pluginUninstall, 'getPlugins')
-        .returns(BbPromise.resolve(plugins));
-      // save the cwd so that we can restore it later
-      savedCwd = process.cwd();
-      process.chdir(serviceDir);
-    });
-
-    afterEach(() => {
-      pluginUninstall.validate.restore();
-      pluginUninstall.getPlugins.restore();
-      pluginUninstall.pluginUninstall.restore();
-      pluginUninstall.removePluginFromServerlessFile.restore();
-      pluginUninstall.uninstallPeerDependencies.restore();
-      process.chdir(savedCwd);
-    });
-
-    it('should uninstall the plugin if it can be found in the registry', () => {
-      // serverless.yml
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-      pluginUninstall.options.name = 'serverless-plugin-1';
-
-      return expect(pluginUninstall.uninstall()).to.be.fulfilled.then(() => {
-        expect(validateStub.calledOnce).to.equal(true);
-        expect(getPluginsStub.calledOnce).to.equal(true);
-        expect(pluginUninstallStub.calledOnce).to.equal(true);
-        expect(serverlessErrorStub.calledOnce).to.equal(false);
-        expect(removePluginFromServerlessFileStub.calledOnce).to.equal(true);
-        expect(uninstallPeerDependenciesStub.calledOnce).to.equal(true);
-      });
-    });
-
-    it('should uninstall the plugin even if it can not be found in the registry', () => {
-      // serverless.yml
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-      pluginUninstall.options.name = 'serverless-not-in-registry-plugin';
-
-      return expect(pluginUninstall.uninstall()).to.be.fulfilled.then(() => {
-        expect(validateStub.calledOnce).to.equal(true);
-        expect(getPluginsStub.calledOnce).to.equal(true);
-        expect(pluginUninstallStub.calledOnce).to.equal(true);
-        expect(serverlessErrorStub.calledOnce).to.equal(false);
-        expect(removePluginFromServerlessFileStub.calledOnce).to.equal(true);
-        expect(uninstallPeerDependenciesStub.calledOnce).to.equal(true);
-      });
-    });
-
-    it('should drop the version if specify', () => {
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-      pluginUninstall.options.name = 'serverless-plugin-1@1.0';
-      return expect(pluginUninstall.uninstall()).to.be.fulfilled.then(() => {
-        expect(pluginUninstall.options.pluginName).to.be.equal('serverless-plugin-1');
-      });
-    });
-  });
-
-  describe('#pluginUninstall()', () => {
-    let serviceDir;
-    let packageJsonFilePath;
-    let npmUninstallStub;
-    let savedCwd;
-
-    beforeEach(() => {
-      pluginUninstall.options.pluginName = 'serverless-plugin-1';
-      serviceDir = getTmpDirPath();
-      pluginUninstall.serverless.serviceDir = serviceDir;
-      fse.ensureDirSync(serviceDir);
-      packageJsonFilePath = path.join(serviceDir, 'package.json');
-      npmUninstallStub = sinon.stub(childProcess, 'execAsync').returns(BbPromise.resolve());
-      // save the cwd so that we can restore it later
-      savedCwd = process.cwd();
-      process.chdir(serviceDir);
-    });
-
-    afterEach(() => {
-      childProcess.execAsync.restore();
-      process.chdir(savedCwd);
-    });
-
-    it('should uninstall the plugin if it has not been uninstalled yet', () => {
-      const packageJson = {
-        name: 'test-service',
-        description: '',
-        version: '0.1.0',
-        dependencies: {},
-        devDependencies: {
-          'serverless-plugin-1': '^1.0.0',
-        },
-      };
-
-      serverless.utils.writeFileSync(packageJsonFilePath, packageJson);
-
-      return expect(pluginUninstall.pluginUninstall()).to.be.fulfilled.then(() => {
-        expect(
-          npmUninstallStub.calledWithExactly('npm uninstall --save-dev serverless-plugin-1', {
-            stdio: 'ignore',
-          })
-        ).to.equal(true);
-        expect(serverlessErrorStub.calledOnce).to.equal(false);
-      });
-    });
-  });
-
-  describe('#removePluginFromServerlessFile()', () => {
-    let serviceDir;
-    let serverlessYmlFilePath;
-
-    beforeEach(() => {
-      serviceDir = getTmpDirPath();
-      pluginUninstall.serverless.serviceDir = pluginUninstall.serverless.serviceDir = serviceDir;
-      pluginUninstall.serverless.configurationFilename = 'serverless.yml';
-      serverlessYmlFilePath = path.join(serviceDir, 'serverless.yml');
-    });
-
-    it('should only remove the given plugin from the service', () => {
-      // serverless.yml
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-        plugins: ['serverless-existing-plugin', 'serverless-plugin-1'],
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-      pluginUninstall.options.pluginName = 'serverless-plugin-1';
-
-      return expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-        expect(serverless.utils.readFileSync(serverlessYmlFilePath, 'utf8').plugins).to.deep.equal([
-          'serverless-existing-plugin',
-        ]);
-      });
-    });
-
-    it('should remove the plugin from the service if it is the only one', () => {
-      // serverless.yml
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-        plugins: ['serverless-plugin-1'],
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-      pluginUninstall.options.pluginName = 'serverless-plugin-1';
-
-      return expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-        expect(serverless.utils.readFileSync(serverlessYmlFilePath, 'utf8')).to.not.have.property(
-          'plugins'
-        );
-      });
-    });
-
-    it('should remove the plugin from serverless file path for a .yaml file', () => {
-      const serverlessYamlFilePath = path.join(serviceDir, 'serverless.yaml');
-      pluginUninstall.serverless.configurationFilename = 'serverless.yaml';
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-        plugins: ['serverless-plugin-1'],
-      };
-      serverless.utils.writeFileSync(serverlessYamlFilePath, yaml.dump(serverlessYml));
-      pluginUninstall.options.pluginName = 'serverless-plugin-1';
-      return expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-        expect(serverless.utils.readFileSync(serverlessYamlFilePath, 'utf8')).to.not.have.property(
-          'plugins'
-        );
-      });
-    });
-
-    it('should remove the plugin from serverless file path for a .json file', () => {
-      const serverlessJsonFilePath = path.join(serviceDir, 'serverless.json');
-      pluginUninstall.serverless.configurationFilename = 'serverless.json';
-      const serverlessJson = {
-        service: 'plugin-service',
-        provider: 'aws',
-        plugins: ['serverless-plugin-1', 'serverless-plugin-2'],
-      };
-      serverless.utils.writeFileSync(serverlessJsonFilePath, serverlessJson);
-      pluginUninstall.options.pluginName = 'serverless-plugin-1';
-      return expect(pluginUninstall.removePluginFromServerlessFile())
-        .to.be.fulfilled.then(() => {
-          expect(
-            serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8').plugins
-          ).to.deep.equal(['serverless-plugin-2']);
-          pluginUninstall.options.pluginName = 'serverless-plugin-2';
-        })
-        .then(() =>
-          expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-            expect(
-              serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8')
-            ).to.not.have.property('plugins');
-          })
-        )
-        .then(() =>
-          expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-            expect(
-              serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8')
-            ).to.not.have.property('plugins');
-          })
-        );
-    });
-
-    it('should not modify serverless .js file', () => {
-      const serverlessJsFilePath = path.join(serviceDir, 'serverless.js');
-      pluginUninstall.serverless.configurationFilename = 'serverless.js';
-      const serverlessJson = {
-        service: 'plugin-service',
-        provider: 'aws',
-        plugins: ['serverless-plugin-1', 'serverless-plugin-2'],
-      };
-      serverless.utils.writeFileSync(
-        serverlessJsFilePath,
-        `module.exports = ${JSON.stringify(serverlessJson)};`
-      );
-      pluginUninstall.options.pluginName = 'serverless-plugin-1';
-      return expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-        // use require to load serverless.js
-        // eslint-disable-next-line global-require
-        expect(require(serverlessJsFilePath).plugins).to.be.deep.equal(serverlessJson.plugins);
-      });
-    });
-
-    it('should not modify serverless .ts file', () => {
-      const serverlessTsFilePath = path.join(serviceDir, 'serverless.ts');
-      pluginUninstall.serverless.configurationFilename = 'serverless.ts';
-      const serverlessJson = {
-        service: 'plugin-service',
-        provider: 'aws',
-        plugins: ['serverless-plugin-1', 'serverless-plugin-2'],
-      };
-      serverless.utils.writeFileSync(
-        serverlessTsFilePath,
-        `module.exports = ${JSON.stringify(serverlessJson)};`
-      );
-      pluginUninstall.options.pluginName = 'serverless-plugin-1';
-      return expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-        // use require to load serverless.js
-        // eslint-disable-next-line global-require
-        expect(require(serverlessTsFilePath).plugins).to.be.deep.equal(serverlessJson.plugins);
-      });
-    });
-
-    describe('if plugins object is not array', () => {
-      it('should only remove the given plugin from the service', () => {
-        // serverless.yml
-        const serverlessYml = {
-          service: 'plugin-service',
-          provider: 'aws',
-          plugins: {
-            localPath: 'test',
-            modules: ['serverless-existing-plugin', 'serverless-plugin-1'],
-          },
-        };
-        serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-        pluginUninstall.options.pluginName = 'serverless-plugin-1';
-
-        return expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-          expect(
-            serverless.utils.readFileSync(serverlessYmlFilePath, 'utf8').plugins
-          ).to.deep.equal({
-            localPath: 'test',
-            modules: ['serverless-existing-plugin'],
-          });
-        });
-      });
-
-      it('should remove the plugin from the service if it is the only one', () => {
-        // serverless.yml
-        const serverlessYml = {
-          service: 'plugin-service',
-          provider: 'aws',
-          plugins: {
-            localPath: 'test',
-            modules: ['serverless-plugin-1'],
-          },
-        };
-        serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-        pluginUninstall.options.pluginName = 'serverless-plugin-1';
-
-        return expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-          expect(
-            serverless.utils.readFileSync(serverlessYmlFilePath, 'utf8').plugins
-          ).to.deep.equal({
-            localPath: 'test',
-          });
-        });
-      });
-
-      it('should remove the plugin from serverless file path for a .json file', () => {
-        const serverlessJsonFilePath = path.join(serviceDir, 'serverless.json');
-        pluginUninstall.serverless.configurationFilename = 'serverless.json';
-        const serverlessJson = {
-          service: 'plugin-service',
-          provider: 'aws',
-          plugins: {
-            localPath: 'test',
-            modules: ['serverless-plugin-1', 'serverless-plugin-2'],
-          },
-        };
-        serverless.utils.writeFileSync(serverlessJsonFilePath, serverlessJson);
-        pluginUninstall.options.pluginName = 'serverless-plugin-1';
-        return expect(pluginUninstall.removePluginFromServerlessFile())
-          .to.be.fulfilled.then(() => {
-            expect(
-              serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8').plugins
-            ).to.deep.equal({
-              localPath: 'test',
-              modules: ['serverless-plugin-2'],
-            });
-            pluginUninstall.options.pluginName = 'serverless-plugin-2';
-          })
-          .then(() =>
-            expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-              expect(
-                serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8').plugins
-              ).to.deep.equal({
-                localPath: 'test',
-              });
-            })
-          )
-          .then(() =>
-            expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-              expect(
-                serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8').plugins
-              ).to.deep.equal({
-                localPath: 'test',
-              });
-            })
-          );
-      });
-    });
-  });
-
-  describe('#uninstallPeerDependencies()', () => {
-    let serviceDir;
-    let pluginPath;
-    let pluginPackageJsonFilePath;
-    let pluginName;
-    let npmUninstallStub;
-    let savedCwd;
-
-    beforeEach(() => {
-      pluginName = 'some-plugin';
-      pluginUninstall.options.pluginName = pluginName;
-      serviceDir = getTmpDirPath();
-      pluginUninstall.serverless.serviceDir = serviceDir;
-      pluginPath = path.join(serviceDir, 'node_modules', pluginName);
-      fse.ensureDirSync(pluginPath);
-      pluginPackageJsonFilePath = path.join(pluginPath, 'package.json');
-      npmUninstallStub = sinon.stub(childProcess, 'execAsync').returns(BbPromise.resolve());
-      savedCwd = process.cwd();
-      process.chdir(serviceDir);
-    });
-
-    afterEach(() => {
-      childProcess.execAsync.restore();
-      process.chdir(savedCwd);
-    });
-
-    it('should uninstall peerDependencies if an installed plugin has ones', () => {
-      fse.writeJsonSync(pluginPackageJsonFilePath, {
-        peerDependencies: {
-          'some-plugin': '*',
-        },
-      });
-      return expect(pluginUninstall.uninstallPeerDependencies()).to.be.fulfilled.then(() => {
-        expect(
-          npmUninstallStub.calledWithExactly(`npm uninstall --save-dev ${pluginName}`, {
-            stdio: 'ignore',
-          })
-        ).to.equal(true);
-      });
-    });
-
-    it('should not uninstall peerDependencies if an installed plugin does not have ones', () => {
-      fse.writeJsonSync(pluginPackageJsonFilePath, {});
-      return expect(pluginUninstall.uninstallPeerDependencies()).to.be.fulfilled.then(() => {
-        expect(
-          npmUninstallStub.calledWithExactly(`npm uninstall --save-dev ${pluginName}`, {
-            stdio: 'ignore',
-          })
-        ).to.equal(false);
-      });
-    });
-
-    it('should do nothing if an uninstalled plugin does not have package.json', () =>
-      expect(pluginUninstall.uninstallPeerDependencies()).to.be.fulfilled.then(() => {
-        expect(
-          npmUninstallStub.calledWithExactly(`npm uninstall --save-dev ${pluginName}`, {
-            stdio: 'ignore',
-          })
-        ).to.equal(false);
-      }));
-  });
-});
diff --git a/test/unit/lib/utils/getCommandSuggestion.test.js b/test/unit/lib/utils/getCommandSuggestion.test.js
deleted file mode 100644
index 38ddaa02cfd..00000000000
--- a/test/unit/lib/utils/getCommandSuggestion.test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-'use strict';
-
-const expect = require('chai').expect;
-const getCommandSuggestion = require('../../../../lib/utils/getCommandSuggestion');
-const Serverless = require('../../../../lib/Serverless');
-
-describe('#getCommandSuggestion', () => {
-  let serverless;
-
-  before(() => {
-    serverless = new Serverless({ commands: ['print'], options: {}, serviceDir: null });
-    return serverless.init();
-  });
-
-  it('should return "package" as a suggested command if you input "pekage"', () => {
-    const suggestedCommand = getCommandSuggestion('pekage', serverless.cli.loadedCommands);
-    expect(suggestedCommand).to.be.equal('package');
-  });
-
-  it('should return "deploy" as a suggested command if you input "deploi"', () => {
-    const suggestedCommand = getCommandSuggestion('deploi', serverless.cli.loadedCommands);
-    expect(suggestedCommand).to.be.equal('deploy');
-  });
-
-  it('should return "invoke" as a suggested command if you input "lnvoke"', () => {
-    const suggestedCommand = getCommandSuggestion('lnvoke', serverless.cli.loadedCommands);
-    expect(suggestedCommand).to.be.equal('invoke');
-  });
-});
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index b485180911b..839e69af18b 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -5,7 +5,6 @@ const path = require('path');
 const fsp = require('fs').promises;
 const os = require('os');
 const overrideEnv = require('process-utils/override-env');
-const overrideCwd = require('process-utils/override-cwd');
 const proxyquire = require('proxyquire');
 
 const commandsSchema = require('../../../../../lib/cli/commands-schema');
@@ -229,74 +228,6 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
     });
   });
 
-  it('Should recognize local fallback', async () => {
-    const {
-      serverless,
-      fixtureData: { servicePath: serviceDir },
-    } = await runServerless({
-      fixture: 'locallyInstalledServerless',
-      command: 'print',
-      modulesCacheStub: {},
-    });
-    const payload = overrideCwd(serviceDir, () =>
-      getGeneratePayload()({
-        command: 'print',
-        options: {},
-        commandSchema: commandsSchema.get('print'),
-        serviceDir: serverless.serviceDir,
-        configuration: serverless.configurationInput,
-        serverless,
-      })
-    );
-
-    expect(payload).to.have.property('frameworkLocalUserId');
-    delete payload.frameworkLocalUserId;
-    expect(payload).to.have.property('firstLocalInstallationTimestamp');
-    delete payload.firstLocalInstallationTimestamp;
-    expect(payload).to.have.property('timestamp');
-    delete payload.timestamp;
-    expect(payload).to.have.property('dashboard');
-    delete payload.dashboard;
-    expect(payload).to.have.property('timezone');
-    delete payload.timezone;
-    expect(payload).to.have.property('ciName');
-    delete payload.ciName;
-    expect(payload).to.have.property('commandDurationMs');
-    delete payload.commandDurationMs;
-    expect(payload).to.deep.equal({
-      cliName: 'serverless',
-      isTtyTerminal: true,
-      command: 'print',
-      commandOptionNames: [],
-      isConfigValid: null,
-      config: {
-        configValidationMode: 'error',
-        provider: {
-          name: 'aws',
-          runtime: 'nodejs12.x',
-          stage: 'dev',
-          region: 'us-east-1',
-        },
-        plugins: [],
-        functions: [],
-        resources: { general: [] },
-        variableSources: [],
-        paramsCount: 0,
-      },
-      isAutoUpdateEnabled: false,
-      notificationsMode: 'on',
-      npmDependencies: [],
-      triggeredDeprecations: [],
-      installationType: 'local:fallback',
-      hasLocalCredentials: false,
-      versions: {
-        'serverless': '2.0.0-local',
-        '@serverless/dashboard-plugin': '4.0.0-local',
-        '@serverless/enterprise-plugin': undefined,
-      },
-    });
-  });
-
   it('Should resolve service-agnostic payload', async () => {
     const payload = getGeneratePayload()({
       command: 'config',
diff --git a/test/unit/scripts/serverless.test.js b/test/unit/scripts/serverless.test.js
index c9487e5b641..5cd9556f2d2 100644
--- a/test/unit/scripts/serverless.test.js
+++ b/test/unit/scripts/serverless.test.js
@@ -9,6 +9,7 @@ const stripAnsi = require('strip-ansi');
 const { version } = require('../../../package');
 const programmaticFixturesEngine = require('../../fixtures/programmatic');
 
+const serverlessBinPath = path.resolve(__dirname, '../../../bin/serverless.js');
 const serverlessPath = path.resolve(__dirname, '../../../scripts/serverless.js');
 const programmaticFixturesPath = path.resolve(__dirname, '../../fixtures/programmatic');
 const cliFixturesPath = path.resolve(__dirname, '../../fixtures/cli');
@@ -69,7 +70,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
   it('should handle local serverless installation', async () => {
     const output = String(
       (
-        await spawn('node', [serverlessPath, '--help'], {
+        await spawn('node', [serverlessBinPath, '--help'], {
           cwd: (await programmaticFixturesEngine.setup('locallyInstalledServerless')).servicePath,
         })
       ).stderrBuffer

From 79820d619105679894b9f0f33117bbd7c13f5608 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 14 Jan 2022 15:27:44 +0100
Subject: [PATCH 0902/1101] feat(CLI): Deprecate recognition of `projectDir`
 configuration setting

---
 docs/deprecations.md   | 10 ++++++++++
 lib/classes/Service.js |  7 +++++++
 2 files changed, 17 insertions(+)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 1f978219a6f..17caf813563 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -36,6 +36,16 @@ Note:
 - The `serverless.yml` setting is ineffective for deprecations reported before the configuration is read.
 - `SLS_DEPRECATION_DISABLE` and `disabledDeprecations` remain respected, and no errors will be thrown for mentioned deprecation codes.
 
+<a name="PROJECT_DIR"><div>&nbsp;</div></a>
+
+## Property `projectDir`
+
+Deprecation code: `PROJECT_DIR`
+
+Starting with v4.0.0, Serverless will no longer recognize `projectDir`, as supported configuration property. Drop it to avoid validation errors
+
+Learn more about configuration validation here: http://slss.io/configuration-validation
+
 <a name="CLI_OPTIONS_SCHEMA_V3"><div>&nbsp;</div></a>
 
 ## CLI Options extensions, `type` requirement
diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index 7efc160db75..7bf133b02d6 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -281,6 +281,13 @@ class Service {
 
     await this.serverless.configSchemaHandler.validateConfig(userConfig);
 
+    if (userConfig.projectDir != null) {
+      this.serverless._logDeprecation(
+        'PROJECT_DIR',
+        'The "projectDir" option is no longer used and is ignored. ' +
+          'You can safely remove it from the configuration'
+      );
+    }
     return this;
   }
 

From 731b3ba1e14dc5be5ba99b72127bfb6327d2918b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 14 Jan 2022 17:26:32 +0100
Subject: [PATCH 0903/1101] feat(Variables): Remove old variables resolver

BREAKING CHANGE:
Old variables resolver is permanently removed. Any resolution error as approached with current resolver is assumed as final (there's no longer fallback to old resolver)
---
 docs/deprecations.md                          |   10 +
 docs/providers/aws/guide/serverless.yml.md    |    2 -
 docs/providers/aws/guide/variables.md         |   46 +-
 lib/Serverless.js                             |   35 +-
 lib/classes/ConfigSchemaHandler/index.js      |    5 +-
 lib/classes/PluginManager.js                  |   56 -
 lib/classes/PromiseTracker.js                 |  127 --
 lib/classes/Service.js                        |   11 +-
 lib/classes/Variables.js                      | 1020 -----------------
 lib/configSchema.js                           |    1 -
 .../eventually-report-resolution-errors.js    |   33 +-
 lib/configuration/variables/sources/file.js   |   20 -
 .../sources/instance-dependent/get-ssm.js     |   68 +-
 lib/plugins/print.js                          |   53 +-
 package.json                                  |    1 -
 scripts/serverless.js                         |  180 +--
 test/fixtures/cli/variables/serverless.yml    |    2 -
 test/integration/plugin-install.test.js       |    2 +-
 test/unit/lib/Serverless.test.js              |    2 +-
 test/unit/lib/classes/PluginManager.test.js   |  130 ---
 test/unit/lib/classes/PromiseTracker.test.js  |   98 --
 ...ventually-report-resolution-errors.test.js |   33 +-
 .../variables/sources/file.test.js            |   21 -
 .../instance-dependent/get-ssm.test.js        |  393 +++----
 test/unit/scripts/serverless.test.js          |    6 +-
 25 files changed, 209 insertions(+), 2146 deletions(-)
 delete mode 100644 lib/classes/PromiseTracker.js
 delete mode 100644 lib/classes/Variables.js
 delete mode 100644 test/unit/lib/classes/PromiseTracker.test.js

diff --git a/docs/deprecations.md b/docs/deprecations.md
index 17caf813563..bfbb8c6ffaf 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -36,6 +36,16 @@ Note:
 - The `serverless.yml` setting is ineffective for deprecations reported before the configuration is read.
 - `SLS_DEPRECATION_DISABLE` and `disabledDeprecations` remain respected, and no errors will be thrown for mentioned deprecation codes.
 
+<a name="VARIABLES_RESOLUTION_MODE"><div>&nbsp;</div></a>
+
+## Property `variablesResolutionMode`
+
+Deprecation code: `VARIABLES_RESOLUTION_MODE`
+
+Starting with v4.0.0, Serverless will no longer recognize `variablesResolutionMode`, as supported configuration property. Drop it to avoid validation errors
+
+Learn more about configuration validation here: http://slss.io/configuration-validation
+
 <a name="PROJECT_DIR"><div>&nbsp;</div></a>
 
 ## Property `projectDir`
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 4a934f2a218..bfe2eede099 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -24,8 +24,6 @@ service: myService
 frameworkVersion: '3'
 configValidationMode: warn # Modes for config validation. `error` throws an exception, `warn` logs error to console, `off` disables validation at all. The default is warn.
 useDotenv: false # If set to 'true', environment variables will be automatically loaded from .env files
-variablesResolutionMode: null # To crash on variable resolution errors (as coming from new resolver), set this value to "20210326"
-unresolvedVariablesNotificationMode: warn # If set to 'error', references to variables that cannot be resolved will result in an error being thrown (applies to legacy resolver)
 deprecationNotificationMode: warn:summary # 'warn' reports deprecations on the go, 'error' will result with an exception being thrown on first approached deprecation
 
 disabledDeprecations: # Disable deprecation logs by their codes. Default is empty.
diff --git a/docs/providers/aws/guide/variables.md b/docs/providers/aws/guide/variables.md
index ca2ec07900d..ced6e845fd5 100644
--- a/docs/providers/aws/guide/variables.md
+++ b/docs/providers/aws/guide/variables.md
@@ -18,9 +18,6 @@ Variables allow users to dynamically replace config values in `serverless.yml` c
 
 They are especially useful when providing secrets for your service to use and when you are working with multiple stages.
 
-If `unresolvedVariablesNotificationMode` is set to `error`, references to variables that cannot be resolved will result in an error being thrown.
-This will become the default behaviour in the next major version.
-
 ## Syntax
 
 To use variables, you will need to reference values enclosed in `${}` brackets.
@@ -288,13 +285,10 @@ Buckets from all regions can be used without any additional specification due to
 
 ## Reference Variables using the SSM Parameter Store
 
-_Note: Ensure to add `variablesResolutionMode: 20210326` to your service configuration, to enable complete support for "ssm" variables resolution._
-
 You can reference SSM Parameters as the source of your variables with the `ssm:/path/to/param` syntax. For example:
 
 ```yml
 service: ${ssm:/path/to/service/id}-service
-variablesResolutionMode: 20210326
 provider:
   name: aws
 functions:
@@ -309,7 +303,6 @@ You can also reference SSM Parameters in another region with the `ssm(REGION):/p
 
 ```yml
 service: ${ssm(us-west-2):/path/to/service/id}-service
-variablesResolutionMode: 20210326
 provider:
   name: aws
 functions:
@@ -347,7 +340,7 @@ The region used by the Serverless CLI. The `${aws:region}` variable is a shortcu
 
 ### Resolution of non plain string types
 
-New variable resolver, ensures that automatically other types as `SecureString` and `StringList` are resolved into expected forms.
+Other types as `SecureString` and `StringList` are automatically resolved into expected forms.
 
 #### Auto decrypting of `SecureString` type parameters.
 
@@ -361,7 +354,6 @@ Variables in [AWS Secrets Manager](https://aws.amazon.com/secrets-manager/) can
 
 ```yml
 service: new-service
-variablesResolutionMode: 20210326
 provider: aws
 functions:
   hello:
@@ -391,7 +383,6 @@ variables will be resolved like
 
 ```yml
 service: new-service
-variablesResolutionMode: 20210326
 provider: aws
 functions:
   hello:
@@ -412,7 +403,6 @@ Same `StringList` type parameters are automatically detected and resolved to arr
 
 ```yml
 service: new-service
-variablesResolutionMode: 20210326
 provider: aws
 functions:
   hello:
@@ -522,11 +512,7 @@ functions:
 
 ### Exporting a function
 
-#### With a new variables resolver
-
-_Note: works only with `variablesResolutionMode: 20210326` set in service configuration_
-
-With a new variables resolver (_which will be the only used resolver in v3 of a Framework_) functions receives an object, with following properties:
+Function receives an object, with following properties:
 
 - `options` - An object referencing resolved CLI params as passed to the command
 - `resolveVariable(variableString)` - Async function which resolves provided variable string. String should be passed without wrapping (`${` and `}`) braces. Example valid values:
@@ -539,7 +525,7 @@ Resolver function can be either _sync_ or _async_. Still both `resolveConfigurat
 Example on how to obtain some Serverless Framework configuration values:
 
 ```js
-// config.js (when relying on new variables resolver)
+// config.js
 module.exports = async ({ options, resolveVariable }) => {
   const stage = await resolveVariable('sls:stage');
   const region = await resolveVariable('opt:region, self:provider.region, "us-east-1"');
@@ -553,32 +539,6 @@ module.exports = async ({ options, resolveVariable }) => {
 }
 ```
 
-#### With a legacy (deprecated) resolver
-
-In old legacy resolver (deprecated, but still default in v2) function receives a reference to the Serverless object containing your configuration.
-
-_**Notice:** Configuration is yet in unresolved state, so any properties configured with variables may still be presented with variables in it_
-
-```js
-// config.js (when relying on legacy resolver)
-module.exports = (serverless) => {
-  serverless.cli.consoleLog('You can access Serverless config at serverless.configrationInput');
-
-  return {
-    property1: 'some value',
-    property2: 'some other value',
-  };
-};
-```
-
-```yml
-# serverless.yml
-service: new-service
-provider: aws
-
-custom: ${file(./config.js)}
-```
-
 You can also return an object and reference a specific property. Just make sure you are returning a valid object and referencing a valid property:
 
 ```yml
diff --git a/lib/Serverless.js b/lib/Serverless.js
index 433e6f1ec5a..c589b6144ef 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -8,14 +8,12 @@ const ensureArray = require('type/array/ensure');
 const ensureIterable = require('type/iterable/ensure');
 const isPlainObject = require('type/plain-object/is');
 const ensurePlainObject = require('type/plain-object/ensure');
-const { legacy, log } = require('@serverless/utils/log');
 const CLI = require('./classes/CLI');
 const Config = require('./classes/Config');
 const YamlParser = require('./classes/YamlParser');
 const PluginManager = require('./classes/PluginManager');
 const Utils = require('./classes/Utils');
 const Service = require('./classes/Service');
-const Variables = require('./classes/Variables');
 const ConfigSchemaHandler = require('./classes/ConfigSchemaHandler');
 const ServerlessError = require('./serverless-error');
 const version = require('./../package.json').version;
@@ -81,7 +79,6 @@ class Serverless {
         Error: ServerlessError,
         errorCode: 'INVALID_NON_OBJECT_CONFIGURATION',
       });
-      this.isConfigurationInputResolved = Boolean(config.isConfigurationResolved);
     }
 
     const commands = ensureArray(config.commands);
@@ -97,7 +94,10 @@ class Serverless {
     this.yamlParser = new YamlParser(this);
     this.utils = new Utils(this);
     this.service = new Service(this);
-    this.variables = new Variables(this);
+
+    // Old variables resolver is dropped, yet some plugins access service properties through
+    // `variables` class. Below patch ensures those plugins won't get broken
+    this.variables = { service: this.service };
     this.pluginManager = new PluginManager(this);
     this.configSchemaHandler = new ConfigSchemaHandler(this);
 
@@ -108,7 +108,6 @@ class Serverless {
     this.classes.YamlParser = YamlParser;
     this.classes.Utils = Utils;
     this.classes.Service = Service;
-    this.classes.Variables = Variables;
     this.classes.Error = ServerlessError;
     this.classes.PluginManager = PluginManager;
     this.classes.ConfigSchemaHandler = ConfigSchemaHandler;
@@ -148,30 +147,8 @@ class Serverless {
     // make sure the command exists before doing anything else
     this.pluginManager.validateCommand(this.processedInput.commands);
 
-    if (!this.isConfigurationInputResolved) {
-      // populate variables after --help, otherwise help may fail to print
-      // (https://github.com/serverless/serverless/issues/2041)
-      await this.variables.populateService(this.pluginManager.cliOptions);
-    } else {
-      // Some plugins resolve additional variables on their own by running `variables.populateObject`
-      // e.g. https://github.com/serverless-operations/serverless-step-functions/blob/016da8db78f1972ba80d37941c34c8fd038fd8ca/lib/yamlParser.js#L26
-      // and that requires `variableSyntax` and `options` initizalization which is guaranteed by
-      // `variables.populateService`. Below lines ensure they're set
-      this.variables.loadVariableSyntax();
-      this.variables.options = this.pluginManager.cliOptions;
-      log
-        .get('variables')
-        .debug(
-          'Skipping variables resolution with old resolver ' +
-            '(new resolver reported no more variables to resolve)'
-        );
-      if (process.env.SLS_DEBUG) {
-        legacy.log(
-          'Skipping variables resolution with old resolver ' +
-            '(new resolver reported no more variables to resolve)'
-        );
-      }
-    }
+    // Some plugins acccess `options` through `this.variables`
+    this.variables.options = this.pluginManager.cliOptions;
 
     if (resolveCliInput().commands[0] !== 'plugin') {
       // merge arrays after variables have been populated
diff --git a/lib/classes/ConfigSchemaHandler/index.js b/lib/classes/ConfigSchemaHandler/index.js
index 8c305dc07a4..f9de5081b8b 100644
--- a/lib/classes/ConfigSchemaHandler/index.js
+++ b/lib/classes/ConfigSchemaHandler/index.js
@@ -252,9 +252,8 @@ class ConfigSchemaHandler {
     if (options.resources) this.schema.properties.resources = options.resources;
     if (options.layers) this.schema.properties.layers = options.layers;
 
-    // In case provider implementers do not set stage or variableSyntax options,
-    // then they are set here. The framework internally sets these options in
-    // Service class.
+    // In case provider implementers do not set stage then it is set here.
+    // The framework internally sets these options in Service class.
     if (!this.schema.properties.provider.properties.stage) {
       addPropertiesToSchema(this.schema.properties.provider, {
         properties: { stage: { type: 'string' } },
diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 2b71a7a63ba..6b93f5526d2 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -115,7 +115,6 @@ class PluginManager {
 
     this.loadCommands(pluginInstance);
     this.loadHooks(pluginInstance);
-    this.loadVariableResolvers(pluginInstance);
 
     this.plugins.push(pluginInstance);
 
@@ -395,61 +394,6 @@ class PluginManager {
     }
   }
 
-  loadVariableResolvers(pluginInstance) {
-    const pluginName = pluginInstance.constructor.name;
-    for (const [variablePrefix, resolverOrOptions] of Object.entries(
-      pluginInstance.variableResolvers || {}
-    )) {
-      let options = resolverOrOptions;
-      if (!options) {
-        legacy.log(
-          `Warning! Ignoring falsy variableResolver for ${variablePrefix} in ${pluginName}.`
-        );
-        log.warning(`Ignoring falsy variableResolver for ${variablePrefix} in ${pluginName}.`);
-        continue;
-      }
-      if (typeof resolverOrOptions === 'function') {
-        options = {
-          resolver: resolverOrOptions,
-        };
-      }
-      if (!_.isObject(options)) {
-        throw new ServerlessError(
-          `Custom variable resolver {${variablePrefix}: ${JSON.stringify(
-            options
-          )}} defined by ${pluginName} isn't an object`,
-          'CUSTOM_LEGACY_VARIABLES_RESOLVER_INVALID_FORMAT'
-        );
-      } else if (!variablePrefix.match(/[0-9a-zA-Z_-]+/)) {
-        throw new ServerlessError(
-          `Custom variable resolver prefix ${variablePrefix} defined by ${pluginName} ` +
-            'may only contain alphanumeric characters, hyphens or underscores.',
-          'CUSTOM_LEGACY_VARIABLES_RESOLVER_INVALID_PREFIX'
-        );
-      }
-      if (typeof options.resolver !== 'function') {
-        throw new ServerlessError(
-          `Custom variable resolver for ${variablePrefix} defined by ${pluginName} ` +
-            `specifies a resolver that isn't a function: ${options.resolver}`,
-          'CUSTOM_LEGACY_VARIABLES_RESOLVER_INVALID_FORMAT'
-        );
-      }
-      if (options.isDisabledAtPrepopulation && typeof options.serviceName !== 'string') {
-        throw new ServerlessError(
-          `Custom variable resolver for ${variablePrefix} defined by ${pluginName} ` +
-            "specifies isDisabledAtPrepopulation but doesn't provide a string for a name",
-          'CUSTOM_LEGACY_VARIABLES_RESOLVER_INVALID_CONFIGURATION'
-        );
-      }
-      this.serverless.variables.variableResolvers.push({
-        regex: new RegExp(`^${variablePrefix}:`),
-        resolver: options.resolver.bind(this.serverless.variables),
-        isDisabledAtPrepopulation: options.isDisabledAtPrepopulation || false,
-        serviceName: options.serviceName || null,
-      });
-    }
-  }
-
   getCommands() {
     const result = {};
 
diff --git a/lib/classes/PromiseTracker.js b/lib/classes/PromiseTracker.js
deleted file mode 100644
index e86537fe777..00000000000
--- a/lib/classes/PromiseTracker.js
+++ /dev/null
@@ -1,127 +0,0 @@
-'use strict';
-
-const logInfo = require('./Error').logInfo;
-const { log } = require('@serverless/utils/log');
-
-const constants = {
-  pending: 'pending',
-  rejected: 'rejected',
-  resolved: 'resolved',
-};
-
-class PromiseTracker {
-  constructor() {
-    this.reset();
-  }
-  reset() {
-    this.promiseList = [];
-    this.promiseMap = {};
-    this.startTime = Date.now();
-    this.reported = false;
-  }
-  start() {
-    this.reset();
-    this.interval = setInterval(this.report.bind(this), 15000);
-  }
-  report() {
-    const delta = Date.now() - this.startTime;
-    const pending = this.getPending();
-    logInfo(
-      [
-        '############################################################################################',
-        `# ${delta}: ${this.getSettled().length} of ${this.getAll().length} promises have settled`,
-        `# ${delta}: ${pending.length} are taking longer than expected:`,
-      ]
-        .concat(pending.map((promise) => `# ${delta}:   ${promise.waitList}`))
-        .concat([
-          '# This can result from latent connections but may represent a cyclic variable dependency',
-          '##########################################################################################',
-        ])
-        .join('\n  ')
-    );
-    log.info(
-      [
-        '############################################################################################',
-        `# ${delta}: ${this.getSettled().length} of ${this.getAll().length} promises have settled`,
-        `# ${delta}: ${pending.length} are taking longer than expected:`,
-      ]
-        .concat(pending.map((promise) => `# ${delta}:   ${promise.waitList}`))
-        .concat([
-          '# This can result from latent connections but may represent a cyclic variable dependency',
-          '##########################################################################################',
-        ])
-        .join('\n  ')
-    );
-    this.reported = true;
-  }
-  stop() {
-    clearInterval(this.interval);
-    if (this.reported) {
-      logInfo(
-        [
-          '############################################################################################',
-          `# Completed after ${Date.now() - this.startTime}ms`,
-          `# ${this.getAll().length} promises are in the following states:`,
-          `#   ${constants.resolved}: ${this.getResolved().length}`,
-          `#   ${constants.rejected}: ${this.getRejected().length}`,
-          `#   ${constants.pending}:  ${this.getPending().length}`,
-          '##########################################################################################',
-        ].join('\n  ')
-      );
-      log.info(
-        [
-          '############################################################################################',
-          `# Completed after ${Date.now() - this.startTime}ms`,
-          `# ${this.getAll().length} promises are in the following states:`,
-          `#   ${constants.resolved}: ${this.getResolved().length}`,
-          `#   ${constants.rejected}: ${this.getRejected().length}`,
-          `#   ${constants.pending}:  ${this.getPending().length}`,
-          '##########################################################################################',
-        ].join('\n  ')
-      );
-    }
-    this.reset();
-  }
-  add(variable, prms, specifier) {
-    const promise = prms;
-    promise.waitList = `${variable} waited on by: ${specifier}`;
-    promise.state = constants.pending;
-    promise.then(
-      // creates a promise with the following effects but that we otherwise ignore
-      () => {
-        promise.state = constants.resolved;
-      },
-      () => {
-        promise.state = constants.rejected;
-      }
-    );
-    this.promiseList.push(promise);
-    this.promiseMap[variable] = promise;
-    return promise;
-  }
-  contains(variable) {
-    return variable in this.promiseMap;
-  }
-  get(variable, specifier) {
-    const promise = this.promiseMap[variable];
-    promise.waitList += ` ${specifier}`;
-    return promise;
-  }
-  getPending() {
-    return this.promiseList.filter((p) => p.state === constants.pending);
-  }
-  getSettled() {
-    return this.promiseList.filter((p) => p.state !== constants.pending);
-  }
-  getResolved() {
-    return this.promiseList.filter((p) => p.state === constants.resolved);
-  }
-  getRejected() {
-    return this.promiseList.filter((p) => p.state === constants.rejected);
-  }
-  getAll() {
-    return this.promiseList;
-  }
-}
-
-module.exports = PromiseTracker;
diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index 7bf133b02d6..c411c1c750a 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -118,8 +118,6 @@ class Service {
     this.resources = configurationInput.resources;
     this.functions = configurationInput.functions || {};
     this.configValidationMode = configurationInput.configValidationMode || 'warn';
-    this.unresolvedVariablesNotificationMode =
-      configurationInput.unresolvedVariablesNotificationMode;
     if (this.provider.name === 'aws') {
       this.layers = configurationInput.layers || {};
     }
@@ -203,8 +201,6 @@ class Service {
     this.resources = configurationInput.resources;
     this.functions = configurationInput.functions || {};
     this.configValidationMode = configurationInput.configValidationMode || 'warn';
-    this.unresolvedVariablesNotificationMode =
-      configurationInput.unresolvedVariablesNotificationMode;
     if (this.provider.name === 'aws') {
       this.layers = configurationInput.layers || {};
     }
@@ -288,6 +284,13 @@ class Service {
           'You can safely remove it from the configuration'
       );
     }
+    if (userConfig.variablesResolutionMode != null) {
+      this.serverless._logDeprecation(
+        'VARIABLES_RESOLUTION_MODE',
+        'Starting with v3.0, the "variablesResolutionMode" option is now useless. ' +
+          'You can safely remove it from the configuration'
+      );
+    }
     return this;
   }
 
diff --git a/lib/classes/Variables.js b/lib/classes/Variables.js
deleted file mode 100644
index a23bc2c8bfa..00000000000
--- a/lib/classes/Variables.js
+++ /dev/null
@@ -1,1020 +0,0 @@
-'use strict';
-
-const _ = require('lodash');
-const BbPromise = require('bluebird');
-const os = require('os');
-const path = require('path');
-const replaceall = require('replaceall');
-
-const fse = require('fs-extra');
-const logWarning = require('./Error').logWarning;
-const PromiseTracker = require('./PromiseTracker');
-const ServerlessError = require('../serverless-error');
-const { log } = require('@serverless/utils/log');
-
-const resolvedValuesWeak = new WeakSet();
-
-// Used when resolving variables from a JS file
-const unsupportedJsTypes = new Set(['undefined', 'symbol', 'function']);
-
-/**
- * Maintainer's notes:
- *
- * This is a tricky class to modify and maintain.  A few rules on how it works...
- *
- * 0. The population of a service consists of pre-population, followed by population.  Pre-
- *   population consists of populating only those settings which are required for variable
- *   resolution.  Current examples include region and stage as they must be resolved to a
- *   concrete value before they can be used in the provider's `request` method (used by
- *   `getValueFromCf`, `getValueFromS3`, and `getValueFromSsm`) to resolve the associated values.
- *   Original issue: #4725
- * 1. All variable populations occur in generations.  Each of these generations resolves each
- *   present variable in the given object or property (i.e. terminal string properties and/or
- *   property parts) once.  This is to say that recursive resolutions should not be made.  This is
- *   because cyclic references are allowed [i.e. ${self:} and the like]) and doing so leads to
- *   dependency and dead-locking issues.  This leads to a problem with deep value population (i.e.
- *   populating ${self:foo.bar} when ${self:foo} has a value of {opt:bar}).  To pause that, one must
- *   pause population, noting the continued depth to traverse.  This motivated "deep" variables.
- *   Original issue #4687
- * 2. The resolution of variables can get very confusing if the same object is used multiple times.
- *   An example of this is the print command which *implicitly/invisibly* populates the
- *   serverless.yml and then *explicitly/visibly* renders the same file again, without the
- *   adornments that the framework's components make to the originally loaded service.  As a result,
- *   it is important to reset this object for each use.
- * 3. Note that despite some AWS code herein that this class is used in all plugins.  Obviously
- *   users avoid the AWS-specific variable types when targeting other clouds.
- */
-class Variables {
-  constructor(serverless) {
-    this.serverless = serverless;
-    this.service = this.serverless.service;
-    this.tracker = new PromiseTracker();
-
-    this.deep = [];
-    this.deepRefSyntax = RegExp(/(\${)?deep:\d+(\.[^}]+)*()}?/);
-    this.overwriteSyntax = RegExp(/\s*(?:,\s*)+/g);
-    this.fileRefSyntax = RegExp(/^file\(([^?%*:|"<>]+?)\)/g);
-    this.slsRefSyntax = RegExp(/^sls:/g);
-    this.envRefSyntax = RegExp(/^env:/g);
-    this.optRefSyntax = RegExp(/^opt:/g);
-    this.selfRefSyntax = RegExp(/^self:/g);
-    this.stringRefSyntax = RegExp(/(?:^('|").*?\1$)/g);
-    this.boolRefSyntax = RegExp(/(?:^(true|false)$)/g);
-    this.intRefSyntax = RegExp(/(?:^\d+$)/g);
-    this.s3RefSyntax = RegExp(/^(?:\${)?s3:(.+?)\/(.+)$/);
-    this.cfRefSyntax = RegExp(/^(?:\${)?cf(?:\.([a-zA-Z0-9-]+))?:(.+?)\.(.+)$/);
-    this.ssmRefSyntax = RegExp(
-      /^(?:\${)?ssm(?:\.([a-zA-Z0-9-]+))?:([a-zA-Z0-9_.\-/]+)[~]?(true|false|split)?/
-    );
-    this.strToBoolRefSyntax = RegExp(/^(?:\${)?strToBool\(([a-zA-Z0-9_.\-/]+)\)/);
-
-    this.variableResolvers = [
-      { regex: this.slsRefSyntax, resolver: this.getValueFromSls.bind(this) },
-      { regex: this.envRefSyntax, resolver: this.getValueFromEnv.bind(this) },
-      { regex: this.optRefSyntax, resolver: this.getValueFromOptions.bind(this) },
-      { regex: this.selfRefSyntax, resolver: this.getValueFromSelf.bind(this) },
-      { regex: this.fileRefSyntax, resolver: this.getValueFromFile.bind(this) },
-      {
-        regex: this.cfRefSyntax,
-        resolver: this.getValueFromCf.bind(this),
-        isDisabledAtPrepopulation: true,
-        serviceName: 'CloudFormation',
-      },
-      {
-        regex: this.s3RefSyntax,
-        resolver: this.getValueFromS3.bind(this),
-        isDisabledAtPrepopulation: true,
-        serviceName: 'S3',
-      },
-      { regex: this.stringRefSyntax, resolver: this.getValueFromString.bind(this) },
-      { regex: this.boolRefSyntax, resolver: this.getValueFromBool.bind(this) },
-      { regex: this.intRefSyntax, resolver: this.getValueFromInt.bind(this) },
-      {
-        regex: this.ssmRefSyntax,
-        resolver: this.getValueFromSsm.bind(this),
-        isDisabledAtPrepopulation: true,
-        serviceName: 'SSM',
-      },
-      {
-        regex: this.strToBoolRefSyntax,
-        resolver: this.getValueStrToBool.bind(this),
-      },
-      { regex: this.deepRefSyntax, resolver: this.getValueFromDeep.bind(this) },
-    ];
-  }
-
-  loadVariableSyntax() {
-    this.variableSyntax = RegExp(
-      this.service.provider.variableSyntax || '\\${([^{}:]+?(?:\\(|:)(?:[^:{}][^{}]*?)?)}',
-      'g'
-    );
-  }
-
-  initialCall(func) {
-    this.deep = [];
-    this.tracker.start();
-    return func().finally(() => {
-      this.tracker.stop();
-      this.deep = [];
-    });
-  }
-
-  // #############
-  // ## SERVICE ##
-  // #############
-  disableDependentServices(func) {
-    const dependencyMessage = (configValue, serviceName) =>
-      `Variable dependency failure: variable '${configValue}' references ${serviceName} but using that service requires a concrete value to be called.`;
-    // replace and then restore the methods for obtaining values from dependent services.  the
-    // replacement naturally rejects dependencies on these services that occur during pre-population.
-    // pre-population is, of course, the process of obtaining the required configuration for using
-    // these services.
-    for (const resolver of this.variableResolvers) {
-      if (resolver.isDisabledAtPrepopulation) {
-        // save original
-        resolver.original = resolver.resolver;
-        // knock out
-        resolver.resolver = (variableString) =>
-          BbPromise.reject(dependencyMessage(variableString, resolver.serviceName));
-      }
-    }
-    return func().finally(() => {
-      // restore
-      for (const resolver of this.variableResolvers) {
-        if (resolver.isDisabledAtPrepopulation) {
-          resolver.resolver = resolver.original;
-        }
-      }
-    });
-  }
-  prepopulateService() {
-    const provider = this.serverless.getProvider('aws');
-    if (provider) {
-      const requiredConfigs = [
-        Object.assign({ name: 'region' }, provider.getRegionSourceValue()),
-        Object.assign({ name: 'stage' }, provider.getStageSourceValue()),
-        {
-          name: 'profile',
-          value: this.service.provider.profile,
-          path: 'serverless.service.provider.profile',
-        },
-      ];
-      return this.disableDependentServices(() => {
-        const prepopulations = requiredConfigs.map((config) =>
-          this.populateValue(config.value, true) // populate
-            .then((populated) => Object.assign(config, { populated }))
-        );
-        return this.assignProperties(provider, prepopulations);
-      });
-    }
-    return BbPromise.resolve();
-  }
-  /**
-   * Populate all variables in the service, conveniently remove and restore the service attributes
-   * that confuse the population methods.
-   * @param processedOptions An options hive to use for ${opt:...} variables.
-   * @returns {Promise.<TResult>|*} A promise resolving to the populated service.
-   */
-  populateService(processedOptions) {
-    // #######################################################################
-    // ## KEEP SYNCHRONIZED WITH EQUIVALENT IN ~/lib/plugins/print/print.js ##
-    // #######################################################################
-    this.options = processedOptions || {};
-
-    this.loadVariableSyntax();
-    // store
-    const variableSyntaxProperty = this.service.provider.variableSyntax;
-    // remove
-    this.service.provider.variableSyntax = undefined; // otherwise matches itself
-    this.service.serverless = undefined;
-    return this.initialCall(() =>
-      this.prepopulateService()
-        .then(() =>
-          this.populateObjectImpl(this.service).finally(() => {
-            // restore
-            this.service.serverless = this.serverless;
-            this.service.provider.variableSyntax = variableSyntaxProperty;
-          })
-        )
-        .then(() => this.service)
-    );
-  }
-  // ############
-  // ## OBJECT ##
-  // ############
-  /**
-   * The declaration of a terminal property.  This declaration includes the path and value of the
-   * property.
-   * Example Input:
-   * {
-   *   foo: {
-   *     bar: 'baz'
-   *   }
-   * }
-   * Example Result:
-   * [
-   *   {
-   *     path: ['foo', 'bar']
-   *     value: 'baz
-   *   }
-   * ]
-   * @typedef {Object} TerminalProperty
-   * @property {String[]} path The path to the terminal property
-   * @property {Date|RegEx|String} The value of the terminal property
-   */
-  /**
-   * Generate an array of objects noting the terminal properties of the given root object and their
-   * paths
-   * @param root The object to generate a terminal property path/value set for
-   * @param initCurrent The current part of the given root that terminal properties are being sought
-   * within
-   * @param [context] An array containing the path to the current object root (intended for internal
-   * use)
-   * @param [results] An array of current results (intended for internal use)
-   * @returns {TerminalProperty[]} The terminal properties of the given root object, with the path
-   * and value of each
-   */
-  getProperties(root, initAtRoot, initCurrent, initContext, initResults) {
-    const processedMap = new WeakMap();
-    return (function self(atRoot, current, context, results) {
-      if (processedMap.has(current)) return processedMap.get(current);
-      if (!context) context = [];
-      if (!results) results = [];
-      if (_.isObject(current)) processedMap.set(current, results);
-      const addContext = (value, key) => self(false, value, context.concat(key), results);
-      if (Array.isArray(current)) {
-        current.map(addContext);
-      } else if (
-        _.isObject(current) &&
-        !_.isDate(current) &&
-        !_.isRegExp(current) &&
-        typeof current !== 'function'
-      ) {
-        if (atRoot || current !== root) {
-          _.mapValues(current, addContext);
-        }
-      } else {
-        results.push({ path: context, value: current });
-      }
-      return results;
-    })(initAtRoot, initCurrent, initContext, initResults);
-  }
-
-  /**
-   * @typedef {TerminalProperty} TerminalPropertyPopulated
-   * @property {Object} populated The populated value of the value at the path
-   */
-  /**
-   * Populate the given terminal properties, returning promises to do so
-   * @param properties The terminal properties to populate
-   * @returns {Promise<TerminalPropertyPopulated[]>[]} The promises that will resolve to the
-   * populated values of the given terminal properties
-   */
-  populateVariables(properties) {
-    const variables = properties.filter(
-      (property) => typeof property.value === 'string' && property.value.match(this.variableSyntax)
-    );
-    return variables.map((variable) =>
-      this.populateValue(variable.value, false).then((populated) =>
-        Object.assign({}, variable, { populated })
-      )
-    );
-  }
-  /**
-   * Assign the populated values back to the target object
-   * @param target The object to which the given populated terminal properties should be applied
-   * @param populations The fully populated terminal properties
-   * @returns {Promise<number>} resolving with the number of changes that were applied to the given
-   * target
-   */
-  assignProperties(target, populations) {
-    return BbPromise.all(populations).then((results) =>
-      results.forEach((result) => {
-        if (result.value !== result.populated) {
-          const pathArray = Array.isArray(result.path) ? result.path : result.path.split('.');
-          let obj = target;
-          for (const property of pathArray.slice(0, -1)) obj = obj[property];
-          obj[_.last(pathArray)] = result.populated;
-        }
-      })
-    );
-  }
-  /**
-   * Populate the variables in the given object.
-   * @param objectToPopulate The object to populate variables within.
-   * @returns {Promise.<TResult>|*} A promise resolving to the in-place populated object.
-   */
-  populateObject(objectToPopulate) {
-    return this.initialCall(() => this.populateObjectImpl(objectToPopulate));
-  }
-  populateObjectImpl(objectToPopulate) {
-    const leaves = this.getProperties(objectToPopulate, true, objectToPopulate);
-    const populations = this.populateVariables(leaves);
-    if (populations.length === 0) {
-      return BbPromise.resolve(objectToPopulate);
-    }
-    return this.assignProperties(objectToPopulate, populations).then(() =>
-      this.populateObjectImpl(objectToPopulate)
-    );
-  }
-  // ##############
-  // ## PROPERTY ##
-  // ##############
-  /**
-   * Standard logic for cleaning a variable
-   * Example: cleanVariable('${opt:foo}') => 'opt:foo'
-   * @param match The variable match instance variable part
-   * @returns {string} The cleaned variable match
-   */
-  cleanVariable(match) {
-    let cleaned = match.replace(this.variableSyntax, (context, contents) => contents.trim());
-    if (!cleaned.match(/".*"|'.*'/)) {
-      cleaned = cleaned.replace(/\s/g, '');
-    }
-    return cleaned;
-  }
-  /**
-   * @typedef {Object} MatchResult
-   * @property {String} match The original property value that matched the variable syntax
-   * @property {String} variable The cleaned variable string that specifies the origin for the
-   * property value
-   */
-  /**
-   * Get matches against the configured variable syntax
-   * @param property The property value to attempt extracting matches from
-   * @returns {Object|String|MatchResult[]} The given property or the identified matches
-   */
-  getMatches(property) {
-    if (typeof property !== 'string') {
-      return property;
-    }
-    const matches = property.match(this.variableSyntax);
-    if (!matches || !matches.length) {
-      return property;
-    }
-    return matches.map((match) => ({
-      match,
-      variable: this.cleanVariable(match),
-    }));
-  }
-  /**
-   * Populate the given matches, returning an array of Promises which will resolve to the populated
-   * values of the given matches
-   * @param {MatchResult[]} matches The matches to populate
-   * @returns {Promise[]} Promises for the eventual populated values of the given matches
-   */
-  populateMatches(matches, property) {
-    return matches.map((match) => this.splitAndGet(match, property));
-  }
-  /**
-   * Render the given matches and their associated results to the given value
-   * @param value The value into which to render the given results
-   * @param matches The matches on the given value where the results are to be rendered
-   * @param results The results that are to be rendered to the given value
-   * @returns {*} The populated value with the given results rendered according to the given matches
-   */
-  renderMatches(value, matches, results) {
-    let result = value;
-    for (let i = 0; i < matches.length; i += 1) {
-      this.handleUnresolved(matches[i].variable, results[i]);
-      result = this.populateVariable(result, matches[i].match, results[i]);
-    }
-    return result;
-  }
-  /**
-   * Populate the given value, recursively if root is true
-   * @param valueToPopulate The value to populate variables within
-   * @param root Whether the caller is the root populator and thereby whether to recursively
-   * populate
-   * @returns {PromiseLike<T>} A promise that resolves to the populated value, recursively if root
-   * is true
-   */
-  populateValue(valueToPopulate, root) {
-    const property = valueToPopulate;
-    const matches = this.getMatches(property);
-    if (!Array.isArray(matches)) {
-      return BbPromise.resolve(property);
-    }
-    const populations = this.populateMatches(matches, valueToPopulate);
-    return BbPromise.all(populations)
-      .then((results) => this.renderMatches(property, matches, results))
-      .then((result) => {
-        if (root && matches.length) {
-          return this.populateValue(result, root);
-        }
-        return result;
-      });
-  }
-  /**
-   * Populate variables in the given property.
-   * @param propertyToPopulate The property to populate (replace variables with their values).
-   * @returns {Promise.<TResult>|*} A promise resolving to the populated result.
-   */
-  populateProperty(propertyToPopulate) {
-    return this.initialCall(() => this.populateValue(propertyToPopulate, true));
-  }
-
-  /**
-   * Split the cleaned variable string containing one or more comma delimited variables and get a
-   * final value for the entirety of the string
-   * @param match The regex match containing both the variable string to split and get a final
-   * value for as well as the originally matched string
-   * @param property The original property string the given variable was extracted from
-   * @returns {Promise} A promise resolving to the final value of the given variable
-   */
-  splitAndGet(match, property) {
-    const parts = this.splitByComma(match.variable);
-    if (parts.length > 1) {
-      return this.overwrite(parts, match.match, property);
-    }
-    return this.getValueFromSource(parts[0], property);
-  }
-  /**
-   * Populate a given property, given the matched string to replace and the value to replace the
-   * matched string with.
-   * @param propertyParam The property to replace the matched string with the value.
-   * @param matchedString The string in the given property that was matched and is to be replaced.
-   * @param valueToPopulate The value to replace the given matched string in the property with.
-   * @returns {Promise.<TResult>|*} A promise resolving to the property populated with the given
-   *  value for all instances of the given matched string.
-   */
-  populateVariable(propertyParam, matchedString, valueToPopulate) {
-    let property = propertyParam;
-    if (property === matchedString) {
-      // total replacement
-      property = valueToPopulate;
-    } else if (typeof valueToPopulate === 'string') {
-      // partial replacement, string
-      property = replaceall(matchedString, valueToPopulate, property);
-    } else if (_.isNumber(valueToPopulate)) {
-      // partial replacement, number
-      property = replaceall(matchedString, String(valueToPopulate), property);
-    } else {
-      const errorMessage = [
-        'Trying to populate non string value into',
-        ` a string for variable ${matchedString}.`,
-        ' Please make sure the value of the property is a string.',
-      ].join('');
-      throw new ServerlessError(errorMessage, 'INVALID_NON_STRING_VARIABLE_RESOLUTION_RESULT');
-    }
-    return property;
-  }
-  // ###############
-  // ## VARIABLES ##
-  // ###############
-  /**
-   * Split a given string by whitespace padded commas excluding those within single or double quoted
-   * strings.
-   * @param string The string to split by comma.
-   */
-  splitByComma(string) {
-    const quotedWordSyntax = RegExp(/(?:('|").*?\1)/g);
-    const input = string.trim();
-    const stringMatches = [];
-    let match = quotedWordSyntax.exec(input);
-    while (match) {
-      stringMatches.push({
-        start: match.index,
-        end: quotedWordSyntax.lastIndex,
-      });
-      match = quotedWordSyntax.exec(input);
-    }
-    const commaReplacements = [];
-    const contained =
-      (
-        commaMatch // curry the current commaMatch
-      ) =>
-      (
-        stringMatch // check whether stringMatch containing the commaMatch
-      ) =>
-        stringMatch.start < commaMatch.index && this.overwriteSyntax.lastIndex < stringMatch.end;
-    match = this.overwriteSyntax.exec(input);
-    while (match) {
-      const matchContained = contained(match);
-      const containedBy = stringMatches.find(matchContained);
-      if (!containedBy) {
-        // if uncontained, this comma represents a splitting location
-        commaReplacements.push({
-          start: match.index,
-          end: this.overwriteSyntax.lastIndex,
-        });
-      }
-      match = this.overwriteSyntax.exec(input);
-    }
-    let prior = 0;
-    const results = [];
-    commaReplacements.forEach((replacement) => {
-      results.push(input.slice(prior, replacement.start));
-      prior = replacement.end;
-    });
-    results.push(input.slice(prior));
-    return results;
-  }
-  /**
-   * Resolve the given variable string that expresses a series of fallback values in case the
-   * initial values are not valid, resolving each variable and resolving to the first valid value.
-   * @param variableStrings The overwrite variables to populate and choose from.
-   * @param variableMatch The original string from which the variables were extracted.
-   * @returns {Promise.<TResult>|*} A promise resolving to the first validly populating variable
-   *  in the given variable strings string.
-   */
-  overwrite(variableStrings, variableMatch, propertyString) {
-    // A sentinel to rid rejected Promises, so any of resolved value can be used as fallback.
-    const FAIL_TOKEN = {};
-    const variableValues = variableStrings.map((variableString) =>
-      this.getValueFromSource(variableString, propertyString).catch(() => FAIL_TOKEN)
-    );
-
-    const validValue = (value) =>
-      value !== null &&
-      typeof value !== 'undefined' &&
-      (Array.isArray(value) || !(typeof value === 'object' && !Object.keys(value).length));
-
-    return BbPromise.all(variableValues)
-      .then((values) => values.filter((v) => v !== FAIL_TOKEN))
-      .then((values) => {
-        let deepPropertyString = variableMatch;
-        let deepProperties = 0;
-        values.forEach((value, index) => {
-          if (typeof value === 'string' && value.match(this.variableSyntax)) {
-            deepProperties += 1;
-            const deepVariable = this.makeDeepVariable(value);
-            deepPropertyString = deepPropertyString.replace(
-              variableStrings[index],
-              this.cleanVariable(deepVariable)
-            );
-          }
-        });
-        return deepProperties > 0
-          ? BbPromise.resolve(deepPropertyString) // return deep variable replacement of original
-          : BbPromise.resolve(values.find(validValue)); // resolve first valid value, else undefined
-      });
-  }
-  /**
-   * Given any variable string, return the value it should be populated with.
-   * @param variableString The variable string to retrieve a value for.
-   * @returns {Promise.<TResult>|*} A promise resolving to the given variables value.
-   */
-  getValueFromSource(variableString, propertyString) {
-    let ret;
-    if (this.tracker.contains(variableString)) {
-      ret = this.tracker.get(variableString, propertyString);
-    } else {
-      for (const { regex, resolver } of this.variableResolvers) {
-        if (variableString.match(regex)) {
-          ret = resolver(variableString);
-          break;
-        }
-      }
-      if (!ret) {
-        const errorMessage = (() => {
-          if (variableString.startsWith('aws:') || variableString.startsWith('sls:')) {
-            return [
-              `Cannot resolve "${variableString.slice(
-                0,
-                variableString.indexOf(':') + 1
-              )}*" variable sources with old variables resolver.`,
-              'Set "variablesResolutionMode: 20210326" in your service config to ' +
-                'unconditionally switch to the new resolver',
-            ].join('\n');
-          }
-          return [
-            `Invalid variable reference syntax for variable ${variableString}.`,
-            ' You can only reference env vars, options, & files.',
-            ' You can check our docs for more info.',
-          ].join('');
-        })();
-        ret = BbPromise.reject(
-          new ServerlessError(errorMessage, 'INVALID_VARIABLE_REFERENCE_SYNTAX')
-        );
-      }
-      ret = this.tracker.add(variableString, ret, propertyString);
-    }
-    return ret.then((resolvedValue) => {
-      if (!Array.isArray(resolvedValue) && !_.isPlainObject(resolvedValue)) return resolvedValue;
-      if (resolvedValuesWeak.has(resolvedValue)) {
-        try {
-          return _.cloneDeep(resolvedValue);
-        } catch (error) {
-          return resolvedValue;
-        }
-      }
-      resolvedValuesWeak.add(resolvedValue);
-      return resolvedValue;
-    });
-  }
-
-  getValueFromSls(variableString) {
-    let valueToPopulate = {};
-    const requestedSlsVar = variableString.split(':')[1];
-    if (requestedSlsVar === 'instanceId') {
-      valueToPopulate = this.serverless.instanceId;
-    }
-    return BbPromise.resolve(valueToPopulate);
-  }
-
-  getValueFromEnv(variableString) {
-    const requestedEnvVar = variableString.split(':')[1];
-    let valueToPopulate;
-    if (requestedEnvVar !== '' || '' in process.env) {
-      valueToPopulate = process.env[requestedEnvVar];
-    } else {
-      valueToPopulate = process.env;
-    }
-    return BbPromise.resolve(valueToPopulate);
-  }
-
-  getValueFromString(variableString) {
-    const valueToPopulate = variableString.replace(/^['"]|['"]$/g, '');
-    return BbPromise.resolve(valueToPopulate);
-  }
-
-  getValueFromBool(variableString) {
-    const valueToPopulate = variableString === 'true';
-    return BbPromise.resolve(valueToPopulate);
-  }
-
-  getValueFromInt(variableString) {
-    const valueToPopulate = parseInt(variableString, 10);
-    return BbPromise.resolve(valueToPopulate);
-  }
-
-  getValueFromOptions(variableString) {
-    const requestedOption = variableString.split(':')[1];
-    let valueToPopulate;
-    if (requestedOption !== '' || '' in this.options) {
-      valueToPopulate = this.options[requestedOption];
-    } else {
-      valueToPopulate = this.options;
-    }
-    return BbPromise.resolve(valueToPopulate);
-  }
-
-  getValueFromSelf(variableString) {
-    const selfServiceRex = /self:service\./;
-    let variable = variableString;
-    // ###################################################################
-    // ## KEEP SYNCHRONIZED WITH EQUIVALENT IN ~/lib/classes/Service.js ##
-    // ##   there, see `loadServiceFileParam`                           ##
-    // ###################################################################
-    // The loaded service is altered during load in ~/lib/classes/Service (see loadServiceFileParam)
-    // Account for these so that user's reference to their file populate properly
-    if (variable === 'self:service.name') {
-      variable = 'self:service';
-    } else if (variable.match(selfServiceRex)) {
-      variable = variable.replace(selfServiceRex, 'self:serviceObject.');
-    } else if (variable === 'self:provider') {
-      variable = 'self:provider.name';
-    }
-    const valueToPopulate = this.service;
-    const deepProperties = variable
-      .split(':')[1]
-      .split('.')
-      .filter((property) => property);
-    return this.getDeeperValue(deepProperties, valueToPopulate);
-  }
-
-  getValueFromFile(variableString) {
-    const matchedFileRefString = variableString.match(this.fileRefSyntax)[0];
-    const referencedFileRelativePath = matchedFileRefString
-      .replace(this.fileRefSyntax, (match, varName) => varName.trim())
-      .replace('~', os.homedir());
-
-    let referencedFileFullPath = path.isAbsolute(referencedFileRelativePath)
-      ? referencedFileRelativePath
-      : path.join(this.serverless.serviceDir, referencedFileRelativePath);
-
-    // Get real path to handle potential symlinks (but don't fatal error)
-    referencedFileFullPath = fse.existsSync(referencedFileFullPath)
-      ? fse.realpathSync(referencedFileFullPath)
-      : referencedFileFullPath;
-
-    let fileExtension = referencedFileRelativePath.split('.');
-    fileExtension = fileExtension[fileExtension.length - 1];
-    // Validate file exists
-    if (!this.serverless.utils.fileExistsSync(referencedFileFullPath)) {
-      return BbPromise.resolve(undefined);
-    }
-
-    let valueToPopulate;
-
-    // Process JS files
-    if (fileExtension === 'js') {
-      const jsFile = require(referencedFileFullPath);
-      const variableArray = variableString.split(':');
-      let returnValue;
-      if (variableArray[1]) {
-        let jsModule = variableArray[1];
-        jsModule = jsModule.split('.')[0];
-        returnValue = jsFile[jsModule];
-      } else {
-        returnValue = jsFile;
-      }
-
-      if (typeof returnValue === 'function') {
-        valueToPopulate = returnValue.call(jsFile, this.serverless);
-      } else {
-        valueToPopulate = returnValue;
-      }
-
-      return BbPromise.resolve(valueToPopulate).then((valueToPopulateResolved) => {
-        let deepProperties = variableString.replace(matchedFileRefString, '');
-        deepProperties = deepProperties.slice(1).split('.');
-        deepProperties.splice(0, 1);
-        return this.getDeeperValue(deepProperties, valueToPopulateResolved).then(
-          (deepValueToPopulateResolved) => {
-            if (unsupportedJsTypes.has(typeof deepValueToPopulateResolved)) {
-              const errorMessage = [
-                'Invalid variable syntax when referencing',
-                ` file "${referencedFileRelativePath}".`,
-                ' Check if your javascript is returning the correct data.',
-              ].join('');
-              return BbPromise.reject(
-                new ServerlessError(errorMessage, 'INVALID_FILE_VARIABLE_SYNTAX')
-              );
-            }
-            return BbPromise.resolve(deepValueToPopulateResolved);
-          }
-        );
-      });
-    }
-
-    // Process everything except JS
-    if (fileExtension !== 'js') {
-      valueToPopulate = this.serverless.utils.readFileSync(referencedFileFullPath);
-      if (matchedFileRefString !== variableString) {
-        let deepProperties = variableString.replace(matchedFileRefString, '');
-        if (deepProperties.substring(0, 1) !== ':') {
-          const errorMessage = [
-            'Invalid variable syntax when referencing',
-            ` file "${referencedFileRelativePath}" sub properties`,
-            ' Please use ":" to reference sub properties.',
-          ].join('');
-          return BbPromise.reject(
-            new ServerlessError(errorMessage, 'INVALID_FILE_VARIABLE_SYNTAX')
-          );
-        }
-        deepProperties = deepProperties.slice(1).split('.');
-        return this.getDeeperValue(deepProperties, valueToPopulate);
-      }
-    }
-    return BbPromise.resolve(valueToPopulate);
-  }
-
-  buildOptions(regionSuffix) {
-    const options = { useCache: true };
-    if (regionSuffix) {
-      options.region = regionSuffix;
-    }
-    return options;
-  }
-
-  getValueFromCf(variableString) {
-    const groups = variableString.match(this.cfRefSyntax);
-    const regionSuffix = groups[1];
-    const stackName = groups[2];
-    const outputLogicalId = groups[3];
-    return this.serverless
-      .getProvider('aws')
-      .request(
-        'CloudFormation',
-        'describeStacks',
-        { StackName: stackName },
-        this.buildOptions(regionSuffix)
-      )
-      .then((result) => {
-        const outputs = result.Stacks[0].Outputs;
-        const output = outputs.find((x) => x.OutputKey === outputLogicalId);
-
-        if (!output) {
-          const errorMessage = [
-            'Trying to request a non exported variable from CloudFormation.',
-            ` Stack name: "${stackName}"`,
-            ` Requested variable: "${outputLogicalId}".`,
-          ].join('');
-          return BbPromise.reject(new ServerlessError(errorMessage, 'INVALID_CF_VARIABLE'));
-        }
-        return BbPromise.resolve(output.OutputValue);
-      });
-  }
-
-  getValueFromS3(variableString) {
-    const groups = variableString.match(this.s3RefSyntax);
-    const bucket = groups[1];
-    const key = groups[2];
-    return this.serverless
-      .getProvider('aws')
-      .request(
-        'S3',
-        'getObject',
-        {
-          Bucket: bucket,
-          Key: key,
-        },
-        { useCache: true }
-      ) // Use request cache
-      .then((response) => BbPromise.resolve(response.Body.toString()))
-      .catch((err) => {
-        const errorMessage = `Error getting value for ${variableString}. ${err.message}`;
-        return BbPromise.reject(new ServerlessError(errorMessage, 'INVALID_S3_VARIABLE'));
-      });
-  }
-
-  getValueFromSsm(variableString) {
-    const groups = variableString.match(this.ssmRefSyntax);
-    const regionSuffix = groups[1];
-    const param = groups[2];
-    const decrypt = groups[3] === 'true';
-    const split = groups[3] === 'split';
-    return this.serverless
-      .getProvider('aws')
-      .request(
-        'SSM',
-        'getParameter',
-        {
-          Name: param,
-          WithDecryption: decrypt,
-        },
-        this.buildOptions(regionSuffix)
-      ) // Use request cache
-      .then(
-        (response) => {
-          const plainText = response.Parameter.Value;
-          const type = response.Parameter.Type;
-          // Only if Secrets Manager. Parameter Store does not support JSON.
-          // We cannot parse StringList types, so don't try
-          if (type !== 'StringList' && param.startsWith('/aws/reference/secretsmanager')) {
-            try {
-              return JSON.parse(plainText);
-            } catch {
-              // return as plain text if value is not JSON
-            }
-          }
-          if (split) {
-            if (type === 'StringList') return plainText.split(',');
-
-            logWarning(
-              `Cannot split SSM parameter '${param}' of type '${type}'. Must be 'StringList'.`
-            );
-            log.warning(
-              `Cannot split SSM parameter '${param}' of type '${type}'. Must be 'StringList'.`
-            );
-          }
-          return plainText;
-        },
-        (err) => {
-          if (!err.providerError || err.providerError.statusCode !== 400) {
-            throw new ServerlessError(err.message, 'INVALID_SSM_VARIABLE');
-          }
-        }
-      );
-  }
-
-  getValueStrToBool(variableString) {
-    return BbPromise.try(() => {
-      if (typeof variableString === 'string') {
-        const groups = variableString.match(this.strToBoolRefSyntax);
-        const param = groups[1].trim();
-        if (/^(true|false|0|1)$/.test(param)) {
-          if (param === 'false' || param === '0') {
-            return false;
-          }
-          // truthy or non-empty strings
-          return true;
-        }
-        throw new ServerlessError(
-          'Unexpected strToBool input; expected either "true", "false", "0", or "1".',
-          'INVALID_STR_TO_BOOL_SOURCE_VALUE'
-        );
-      }
-      // Cast non-string inputs
-      return Boolean(variableString);
-    });
-  }
-
-  getDeepIndex(variableString) {
-    const deepIndexReplace = RegExp(/^deep:|(\.[^}]+)*$/g);
-    return variableString.replace(deepIndexReplace, '');
-  }
-  getVariableFromDeep(variableString) {
-    const index = this.getDeepIndex(variableString);
-    return this.deep[index];
-  }
-  getValueFromDeep(variableString) {
-    const deepPrefixReplace = RegExp(/(?:^deep:)\d+\.?/g);
-    const variable = this.getVariableFromDeep(variableString);
-    const deepRef = variableString.replace(deepPrefixReplace, '');
-    let ret = this.populateValue(variable);
-    if (deepRef.length) {
-      // if there is a deep reference remaining
-      ret = ret.then((result) => {
-        if (typeof result === 'string' && result.match(this.variableSyntax)) {
-          const deepVariable = this.makeDeepVariable(result);
-          return BbPromise.resolve(this.appendDeepVariable(deepVariable, deepRef));
-        }
-        return this.getDeeperValue(deepRef.split('.'), result);
-      });
-    }
-    return ret;
-  }
-
-  makeDeepVariable(variable) {
-    let index = this.deep.findIndex((item) => variable === item);
-    if (index < 0) {
-      index = this.deep.push(variable) - 1;
-    }
-    const variableContainer = variable.match(this.variableSyntax)[0];
-    const variableString = this.cleanVariable(variableContainer).replace(/\s/g, '');
-    return variableContainer.replace(/\s/g, '').replace(variableString, `deep:${index}`);
-  }
-  appendDeepVariable(variable, subProperty) {
-    const variableString = this.cleanVariable(variable);
-    return variable.replace(variableString, `${variableString}.${subProperty}`);
-  }
-
-  /**
-   * Get a value that is within the given valueToPopulate.  The deepProperties specify what value
-   * to retrieve from the given valueToPopulate.  The trouble is that anywhere along this chain a
-   * variable can be discovered.  If this occurs, to avoid cyclic dependencies, the resolution of
-   * the deep value from the given valueToPopulate must be halted.  The discovered variable is thus
-   * set aside into a "deep variable" (see makeDeepVariable).  The indexing into the given
-   * valueToPopulate is then resolved with a replacement ${deep:${index}.${remaining.properties}}
-   * variable (e.g. ${deep:1.foo}).  This pauses the population for continuation during the next
-   * generation of evaluation (see getValueFromDeep)
-   * @param deepProperties The "path" of properties to follow in obtaining the deeper value
-   * @param valueToPopulate The value from which to obtain the deeper value
-   * @returns {Promise} A promise resolving to the deeper value or to a `deep` variable that
-   * will later resolve to the deeper value
-   */
-  getDeeperValue(deepProperties, valueToPopulate) {
-    return BbPromise.reduce(
-      deepProperties,
-      (reducedValueParam, subProperty) => {
-        let reducedValue = reducedValueParam;
-        if (typeof reducedValue === 'string' && reducedValue.match(this.deepRefSyntax)) {
-          // build mode
-          reducedValue = this.appendDeepVariable(reducedValue, subProperty);
-        } else {
-          // get mode
-          if (reducedValue == null) {
-            reducedValue = {};
-          } else if (subProperty !== '' || '' in reducedValue) {
-            reducedValue = reducedValue[subProperty];
-          }
-          if (typeof reducedValue === 'string' && reducedValue.match(this.variableSyntax)) {
-            reducedValue = this.makeDeepVariable(reducedValue);
-          }
-        }
-        return BbPromise.resolve(reducedValue);
-      },
-      valueToPopulate
-    );
-  }
-
-  handleUnresolved(variableString, valueToPopulate) {
-    const isValueEmpty =
-      valueToPopulate === null ||
-      typeof valueToPopulate === 'undefined' ||
-      (typeof valueToPopulate === 'object' &&
-        !Array.isArray(valueToPopulate) &&
-        !Object.keys(valueToPopulate).length);
-
-    if (!isValueEmpty) {
-      return;
-    }
-
-    let varType;
-
-    if (variableString.match(this.envRefSyntax)) {
-      varType = 'environment variable';
-    } else if (variableString.match(this.optRefSyntax)) {
-      varType = 'option';
-    } else if (variableString.match(this.selfRefSyntax)) {
-      varType = 'service attribute';
-    } else if (variableString.match(this.fileRefSyntax)) {
-      varType = 'file';
-    } else if (variableString.match(this.ssmRefSyntax)) {
-      varType = 'SSM parameter';
-    }
-
-    if (!varType) {
-      return;
-    }
-
-    if (this.service.unresolvedVariablesNotificationMode === 'error') {
-      throw new ServerlessError(
-        `A valid ${varType} to satisfy the declaration '${variableString}' could not be found.`,
-        'UNRESOLVED_CONFIG_VARIABLE'
-      );
-    }
-
-    logWarning(
-      `A valid ${varType} to satisfy the declaration '${variableString}' could not be found.`
-    );
-    log.warning(
-      `A valid ${varType} to satisfy the declaration '${variableString}' could not be found.`
-    );
-  }
-}
-
-module.exports = Variables;
diff --git a/lib/configSchema.js b/lib/configSchema.js
index ec109837870..ce6b5232563 100644
--- a/lib/configSchema.js
+++ b/lib/configSchema.js
@@ -124,7 +124,6 @@ const schema = {
       additionalProperties: false,
     },
     service: { $ref: '#/definitions/serviceName' },
-    unresolvedVariablesNotificationMode: { enum: ['error', 'warn'] },
     useDotenv: { const: true },
     variablesResolutionMode: { type: 'string', enum: ['20210219', '20210326'] },
   },
diff --git a/lib/configuration/variables/eventually-report-resolution-errors.js b/lib/configuration/variables/eventually-report-resolution-errors.js
index ead279da64a..4506ac1db88 100644
--- a/lib/configuration/variables/eventually-report-resolution-errors.js
+++ b/lib/configuration/variables/eventually-report-resolution-errors.js
@@ -4,7 +4,6 @@ const path = require('path');
 const { log, legacy } = require('@serverless/utils/log');
 const ServerlessError = require('../../serverless-error');
 const resolveCliInput = require('../../cli/resolve-input');
-const logDeprecation = require('../../utils/logDeprecation');
 
 module.exports = (configurationPath, configuration, variablesMeta) => {
   const resolutionErrors = new Set(
@@ -23,28 +22,16 @@ module.exports = (configurationPath, configuration, variablesMeta) => {
       'Resolution of service configuration failed when resolving variables: ' +
         `${Array.from(resolutionErrors, (error) => `\n  - ${error.message}`)}\n`
     );
-  } else {
-    if (configuration.variablesResolutionMode) {
-      throw new ServerlessError(
-        `Cannot resolve ${path.basename(
-          configurationPath
-        )}: Variables resolution errored with:${Array.from(
-          resolutionErrors,
-          (error) => `\n  - ${error.message}`
-        )}`,
-        'VARIABLES_RESOLUTION_ERROR'
-      );
-    }
-    logDeprecation(
-      'NEW_VARIABLES_RESOLVER',
-      'Variables resolver reports following resolution errors:' +
-        `${Array.from(resolutionErrors, (error) => `\n  - ${error.message}`)}\n` +
-        'From a next major this will be communicated with a thrown error.\n' +
-        'Set "variablesResolutionMode: 20210326" in your service config, ' +
-        'to adapt to new behavior now',
-      { serviceConfig: configuration }
-    );
+    return true;
   }
 
-  return true;
+  throw new ServerlessError(
+    `Cannot resolve ${path.basename(
+      configurationPath
+    )}: Variables resolution errored with:${Array.from(
+      resolutionErrors,
+      (error) => `\n  - ${error.message}`
+    )}`,
+    'VARIABLES_RESOLUTION_ERROR'
+  );
 };
diff --git a/lib/configuration/variables/sources/file.js b/lib/configuration/variables/sources/file.js
index ed0c285cda6..b9e952f55c4 100644
--- a/lib/configuration/variables/sources/file.js
+++ b/lib/configuration/variables/sources/file.js
@@ -106,16 +106,6 @@ module.exports = {
             );
           }
           if (isPlainFunction(result)) {
-            if (!(await resolveConfigurationProperty(['variablesResolutionMode']))) {
-              throw new ServerlessError(
-                `Cannot parse "${path.basename(
-                  filePath
-                )}": Approached a JS function resolver, confirm it's updated to work with a ` +
-                  'new parser by setting "variablesResolutionMode: 20210326" in service config. ' +
-                  'Falling back to old resolver',
-                'NOT_SUPPORTED_JS_FUNCTION_SOURCE'
-              );
-            }
             try {
               isResolvedByFunction = true;
               return await result({ options, resolveConfigurationProperty, resolveVariable });
@@ -161,16 +151,6 @@ module.exports = {
       result = result[propertyKey];
       if (result == null) return { value: null };
       if (!isResolvedByFunction && isPlainFunction(result)) {
-        if (!(await resolveConfigurationProperty(['variablesResolutionMode']))) {
-          throw new ServerlessError(
-            `Cannot resolve "${address}" out of "${path.basename(
-              filePath
-            )}": Approached a JS function resolver, confirm it's updated to work with a ` +
-              'new parser by setting "variablesResolutionMode: 20210326" in service config. ' +
-              'Falling back to old resolver',
-            'FILE_CONTENT_RESOLUTION_ERROR'
-          );
-        }
         isResolvedByFunction = true;
         try {
           result = await result({ options, resolveConfigurationProperty, resolveVariable });
diff --git a/lib/configuration/variables/sources/instance-dependent/get-ssm.js b/lib/configuration/variables/sources/instance-dependent/get-ssm.js
index 0bb84013e47..89cc31dfd3b 100644
--- a/lib/configuration/variables/sources/instance-dependent/get-ssm.js
+++ b/lib/configuration/variables/sources/instance-dependent/get-ssm.js
@@ -2,12 +2,11 @@
 
 const ensureString = require('type/string/ensure');
 const ServerlessError = require('../../../../serverless-error');
-const logDeprecation = require('../../../../utils/logDeprecation');
 const _ = require('lodash');
 
 module.exports = (serverlessInstance) => {
   return {
-    resolve: async ({ address, params, resolveConfigurationProperty }) => {
+    resolve: async ({ address, params }) => {
       // ssm(region = null):param-path
       if (!address) {
         throw new ServerlessError(
@@ -25,31 +24,6 @@ module.exports = (serverlessInstance) => {
       _.pull(params, 'raw', 'noDecrypt');
       const region = params && params[0];
 
-      // TODO: Remove legacy instruction separator handling with next major
-      let legacyShouldEnforceDecrypt = false;
-      let legacyShouldEnforceSplit = false;
-      const shouldEnforceModernResolver =
-        (await resolveConfigurationProperty(['variablesResolutionMode'])) >= 20210326;
-      if (!shouldEnforceModernResolver) {
-        const legacyInstructionSeparator = address.lastIndexOf('~');
-        if (legacyInstructionSeparator !== -1) {
-          const instruction = address.slice(legacyInstructionSeparator + 1);
-          address = address.slice(0, legacyInstructionSeparator);
-          if (instruction === 'true') legacyShouldEnforceDecrypt = true;
-          else if (instruction === 'split') legacyShouldEnforceSplit = true;
-          logDeprecation(
-            'NEW_VARIABLES_RESOLVER',
-            'Syntax for referencing SSM parameters was upgraded with ' +
-              'automatic type detection ' +
-              'and there\'s no need to add "~true" or "~split" postfixes to variable references.\n' +
-              'Drop those postfixes and set "variablesResolutionMode: 20210326" in your ' +
-              'service config to adapt to a new behavior.\n' +
-              'Starting with next major release, ' +
-              'this will be communicated with a thrown error.\n',
-            { serviceConfig: serverlessInstance.configurationInput }
-          );
-        }
-      }
       const result = await (async () => {
         try {
           return await serverlessInstance.getProvider('aws').request(
@@ -71,54 +45,14 @@ module.exports = (serverlessInstance) => {
       if (!result) return { value: null };
       switch (result.Parameter.Type) {
         case 'String':
-          if (!shouldEnforceModernResolver && legacyShouldEnforceSplit) {
-            throw new ServerlessError(
-              'Unexpected "ssm" variable "~split" instruction for non "StringList" value type. ' +
-                "Please remove the postfix as it'll break the resolution in next major version." +
-                'Falling back to old resolver',
-              'NOT_COMPLIANT_LEGACY_SSM_INSTRUCTION'
-            );
-          }
           return { value: result.Parameter.Value };
         case 'StringList':
-          if (!shouldEnforceModernResolver && !shouldReturnRawValue && !legacyShouldEnforceSplit) {
-            throw new ServerlessError(
-              'Unexpected "ssm" variable with no "~split" instruction ' +
-                'for "StringList" value type. ' +
-                'Set "variablesResolutionMode: 20210326" in service config ' +
-                'to automatically split result string and adapt to new bahavior. ' +
-                'Falling back to old resolver',
-              'NOT_COMPLIANT_LEGACY_SSM_INSTRUCTION'
-            );
-          }
           return {
             value: shouldReturnRawValue
               ? result.Parameter.Value
               : result.Parameter.Value.split(','),
           };
         case 'SecureString':
-          if (!shouldEnforceModernResolver) {
-            if (!legacyShouldEnforceDecrypt) {
-              throw new ServerlessError(
-                'Unexpected "ssm" variable with no "~true" instruction ' +
-                  'for "SecureString" value type. ' +
-                  'Set "variablesResolutionMode: 20210326" in service config ' +
-                  'to automatically decrypt result string and adapt to new bahavior. ' +
-                  'Falling back to old resolver',
-                'NOT_COMPLIANT_LEGACY_SSM_INSTRUCTION'
-              );
-            }
-            if (!address.startsWith('/aws/reference/secretsmanager') && !shouldReturnRawValue) {
-              throw new ServerlessError(
-                'Unexpected "ssm" variable with "SecureString" value for ' +
-                  'non AWS Secrets manager param. ' +
-                  'Set "variablesResolutionMode: 20210326" in service config ' +
-                  'to automatically parse result string and adapt to new bahavior. ' +
-                  'Falling back to old resolver',
-                'NOT_COMPLIANT_LEGACY_SSM_INSTRUCTION'
-              );
-            }
-          }
           if (shouldReturnRawValue || !result.Parameter.Value.startsWith('{')) {
             return { value: result.Parameter.Value };
           }
diff --git a/lib/plugins/print.js b/lib/plugins/print.js
index fe27a09b0ce..3f474d8b500 100644
--- a/lib/plugins/print.js
+++ b/lib/plugins/print.js
@@ -24,59 +24,8 @@ class Print {
     };
   }
 
-  adorn(serviceConfig) {
-    // service object treatment
-    this.cache.serviceService = serviceConfig.service;
-    if (_.isObject(this.cache.serviceService)) {
-      serviceConfig.service = serviceConfig.service.name;
-      serviceConfig.serviceObject = this.cache.serviceService;
-    }
-    // provider treatment and defaults
-    this.cache.serviceProvider = serviceConfig.provider;
-    if (typeof this.cache.serviceProvider === 'string') {
-      serviceConfig.provider = { name: this.cache.serviceProvider };
-    }
-    const serviceProvider = this.serverless.service.provider;
-    serviceConfig.provider = _.merge(
-      {
-        stage: serviceProvider.stage,
-        region: serviceProvider.region,
-        variableSyntax: serviceProvider.variableSyntax,
-      },
-      serviceConfig.provider
-    );
-  }
-  strip(serviceConfig) {
-    if (_.isObject(this.cache.serviceService)) {
-      serviceConfig.service = this.cache.serviceService;
-      delete serviceConfig.serviceObject;
-    }
-    if (typeof this.cache.serviceProvider === 'string') {
-      serviceConfig.provider = this.cache.serviceProvider;
-    } else {
-      // is object
-      if (!this.cache.serviceProvider.stage) {
-        delete serviceConfig.provider.stage;
-      }
-      if (!this.cache.serviceProvider.region) {
-        delete serviceConfig.provider.region;
-      }
-      if (this.cache.serviceProvider.variableSyntax) {
-        serviceConfig.provider.variableSyntax = this.cache.serviceProvider.variableSyntax;
-      }
-    }
-  }
   async print() {
-    const svc = this.serverless.configurationInput;
-    const service = svc;
-    this.adorn(service);
-    // Need to delete variableSyntax to avoid self-matching errors
-    this.serverless.variables.loadVariableSyntax();
-    delete service.provider.variableSyntax; // cached by adorn, restored by strip
-    this.serverless.variables.service = service;
-    const populated = await this.serverless.variables.populateObject(service);
-    let conf = populated;
-    this.strip(conf);
+    let conf = this.serverless.configurationInput;
 
     // dig into the object
     if (this.options.path) {
diff --git a/package.json b/package.json
index decb923c66b..b2469b6b804 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,6 @@
     "path2": "^0.1.0",
     "process-utils": "^4.0.0",
     "promise-queue": "^2.2.5",
-    "replaceall": "^0.1.6",
     "require-from-string": "^2.0.2",
     "semver": "^7.3.5",
     "signal-exit": "^3.0.6",
diff --git a/scripts/serverless.js b/scripts/serverless.js
index a526ae79cfa..38dbbc64a30 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -163,31 +163,18 @@ const processSpanPromise = (async () => {
     let resolverConfiguration;
     let isInteractiveSetup;
 
-    const ensureResolvedProperty = (propertyPath, { shouldSilentlyReturnIfLegacyMode } = {}) => {
+    const ensureResolvedProperty = (propertyPath) => {
       if (isPropertyResolved(variablesMeta, propertyPath)) return true;
       variablesMeta = null;
       if (isHelpRequest) return false;
       const humanizedPropertyPath = humanizePropertyPathKeys(propertyPath.split('\0'));
-      if (!shouldSilentlyReturnIfLegacyMode || configuration.variablesResolutionMode) {
-        throw new ServerlessError(
-          `Cannot resolve ${path.basename(
-            configurationPath
-          )}: "${humanizedPropertyPath}" property is not accessible ` +
-            '(configured behind variables which cannot be resolved at this stage)',
-          'INACCESSIBLE_CONFIGURATION_PROPERTY'
-        );
-      }
-      logDeprecation(
-        'NEW_VARIABLES_RESOLVER',
-        `"${humanizedPropertyPath}" is not accessible ` +
-          '(configured behind variables which cannot be resolved at this stage).\n' +
-          'In the next major version ' +
-          'this will result in an error.\n' +
-          'Set "variablesResolutionMode: 20210326" in your service config ' +
-          'to opt in to this behavior now',
-        { serviceConfig: configuration }
+      throw new ServerlessError(
+        `Cannot resolve ${path.basename(
+          configurationPath
+        )}: "${humanizedPropertyPath}" property is not accessible ` +
+          '(configured behind variables which cannot be resolved at this stage)',
+        'INACCESSIBLE_CONFIGURATION_PROPERTY'
       );
-      return false;
     };
 
     if (!commandSchema || commandSchema.serviceDependencyMode) {
@@ -230,30 +217,6 @@ const processSpanPromise = (async () => {
 
         // IIFE for maintanance convenience
         await (async () => {
-          if (_.get(configuration.provider, 'variableSyntax')) {
-            // Request to rely on old variables resolver explictly
-            // abort (fallback to legacy internal resolution)
-            if (isHelpRequest) return;
-            if (configuration.variablesResolutionMode) {
-              throw new ServerlessError(
-                `Cannot resolve ${path.basename(
-                  configurationPath
-                )}: "variableSyntax" is not supported with the new variables resolver. ` +
-                  'Please drop this setting',
-                'UNSUPPORTED_VARIABLE_SYNTAX_CONFIGURATION'
-              );
-            }
-            logDeprecation(
-              'NEW_VARIABLES_RESOLVER',
-              'Serverless Framework was enhanced with a new variables resolver ' +
-                'which ignores the "provider.variableSyntax" setting. ' +
-                "In the next major version it will be the only resolver that's used. " +
-                'Remove the "provider.variableSyntax" setting to prepare to the next major version.',
-              { serviceConfig: configuration }
-            );
-            return;
-          }
-
           const resolveVariablesMeta = require('../lib/configuration/variables/resolve-meta');
 
           variablesMeta = resolveVariablesMeta(configuration);
@@ -270,9 +233,6 @@ const processSpanPromise = (async () => {
             return;
           }
 
-          // "variablesResolutionMode" must not be configured with variables as it influences
-          // variable resolution choices
-          if (!ensureResolvedProperty('variablesResolutionMode')) return;
           if (!ensureResolvedProperty('disabledDeprecations')) return;
           if (!ensureResolvedProperty('deprecationNotificationMode')) return;
 
@@ -486,12 +446,10 @@ const processSpanPromise = (async () => {
           if (!ensureResolvedProperty('app')) return;
           if (!ensureResolvedProperty('org')) return;
           if (!ensureResolvedProperty('tenant')) return;
-          if (!ensureResolvedProperty('service', { shouldSilentlyReturnIfLegacyMode: true })) {
-            return;
-          }
+          if (!ensureResolvedProperty('service')) return;
           if (configuration.org) {
             // Dashboard requires AWS region to be resolved upfront
-            ensureResolvedProperty('provider\0region', { shouldSilentlyReturnIfLegacyMode: true });
+            ensureResolvedProperty('provider\0region');
           }
         })();
 
@@ -635,18 +593,10 @@ const processSpanPromise = (async () => {
           // Ensure properties which are crucial to some variable source resolvers
           // are actually resolved.
           if (
-            !ensureResolvedProperty('provider\0credentials', {
-              shouldSilentlyReturnIfLegacyMode: true,
-            }) ||
-            !ensureResolvedProperty('provider\0deploymentBucket\0serverSideEncryption', {
-              shouldSilentlyReturnIfLegacyMode: true,
-            }) ||
-            !ensureResolvedProperty('provider\0profile', {
-              shouldSilentlyReturnIfLegacyMode: true,
-            }) ||
-            !ensureResolvedProperty('provider\0region', {
-              shouldSilentlyReturnIfLegacyMode: true,
-            })
+            !ensureResolvedProperty('provider\0credentials') ||
+            !ensureResolvedProperty('provider\0deploymentBucket\0serverSideEncryption') ||
+            !ensureResolvedProperty('provider\0profile') ||
+            !ensureResolvedProperty('provider\0region')
           ) {
             return;
           }
@@ -657,11 +607,7 @@ const processSpanPromise = (async () => {
             providerName,
           });
         }
-        if (configuration.variablesResolutionMode >= 20210326) {
-          // New resolver, resolves just recognized CLI options. Therefore we cannot assume
-          // we have full "opt" source data if user didn't explicitly switch to new resolver
-          resolverConfiguration.fulfilledSources.add('opt');
-        }
+        resolverConfiguration.fulfilledSources.add('opt');
 
         // Register serverless instance and AWS provider specific variable sources
         resolverConfiguration.sources.sls =
@@ -712,10 +658,7 @@ const processSpanPromise = (async () => {
 
         // Having all source resolvers configured, resolve variables
         await resolveVariables(resolverConfiguration);
-        if (!variablesMeta.size) {
-          serverless.isConfigurationInputResolved = true;
-          return;
-        }
+        if (!variablesMeta.size) return;
         if (
           eventuallyReportVariableResolutionErrors(configurationPath, configuration, variablesMeta)
         ) {
@@ -729,92 +672,23 @@ const processSpanPromise = (async () => {
         const unresolvedSources =
           require('../lib/configuration/variables/resolve-unresolved-source-types')(variablesMeta);
         const recognizedSourceNames = new Set(Object.keys(resolverConfiguration.sources));
-        if (!(configuration.variablesResolutionMode >= 20210326)) {
-          const legacyCfVarPropertyPaths = new Set();
-          const legacySsmVarPropertyPaths = new Set();
-          for (const [sourceType, propertyPaths] of unresolvedSources) {
-            if (sourceType.startsWith('cf.')) {
-              for (const propertyPath of propertyPaths) legacyCfVarPropertyPaths.add(propertyPath);
-              unresolvedSources.delete(sourceType);
-            }
-            if (sourceType.startsWith('ssm.')) {
-              for (const propertyPath of propertyPaths) legacySsmVarPropertyPaths.add(propertyPath);
-              unresolvedSources.delete(sourceType);
-            }
-            if (sourceType === 'output') {
-              logDeprecation(
-                'NEW_VARIABLES_RESOLVER',
-                '"param" and "output" variables can only be used in ' +
-                  'services deployed with Serverless Dashboard (with "org" setting configured).\n' +
-                  'In the next major release ' +
-                  'this will result in an error.\n',
-                { serviceConfig: configuration }
-              );
-              unresolvedSources.delete(sourceType);
-            }
-          }
-          if (legacyCfVarPropertyPaths.size) {
-            logDeprecation(
-              'NEW_VARIABLES_RESOLVER',
-              'Syntax for referencing CF outputs was upgraded to ' +
-                '"${cf(<region>):stackName.outputName}" (while  ' +
-                '"${cf.<region>:stackName.outputName}" is now deprecated, ' +
-                'as not supported by new variables resolver).\n' +
-                'Please upgrade to use new form instead.' +
-                'In the next major release ' +
-                'this will result in an error.\n',
-              { serviceConfig: configuration }
-            );
-          }
-          if (legacySsmVarPropertyPaths.size) {
-            logDeprecation(
-              'NEW_VARIABLES_RESOLVER',
-              'Syntax for referencing SSM parameters was upgraded to ' +
-                '"${ssm(<region>):parameter-path}" (while  ' +
-                '"${ssm.<region>:parameter-path}" is now deprecated, ' +
-                'as not supported by new variables resolver).\n' +
-                'Please upgrade to use the new form instead.' +
-                'In the next major release ' +
-                'this will result in an error.\n',
-              { serviceConfig: configuration }
-            );
-          }
 
-          const unrecognizedSourceNames = Array.from(unresolvedSources.keys()).filter(
-            (sourceName) => !recognizedSourceNames.has(sourceName)
-          );
-          if (unrecognizedSourceNames.length) {
-            logDeprecation(
-              'NEW_VARIABLES_RESOLVER',
-              `Unrecognized configuration variable sources: "${unrecognizedSourceNames.join(
-                '", "'
-              )}".\n` +
-                'In the next major version this will result in an error.\n' +
-                'Set "variablesResolutionMode: 20210326" in your service config ' +
-                'to adapt to the new behavior now',
-              { serviceConfig: configuration }
-            );
-          }
-        } else {
-          const unrecognizedSourceNames = Array.from(unresolvedSources.keys()).filter(
-            (sourceName) => !recognizedSourceNames.has(sourceName)
-          );
+        const unrecognizedSourceNames = Array.from(unresolvedSources.keys()).filter(
+          (sourceName) => !recognizedSourceNames.has(sourceName)
+        );
 
-          if (unrecognizedSourceNames.includes('output')) {
-            throw new ServerlessError(
-              '"Cannot resolve configuration: ' +
-                '"param" and "output" variables can only be used in ' +
-                'services deployed with Serverless Dashboard (with "org" setting configured)',
-              'DASHBOARD_VARIABLE_SOURCES_MISUSE'
-            );
-          }
+        if (unrecognizedSourceNames.includes('output')) {
           throw new ServerlessError(
-            `Unrecognized configuration variable sources: "${unrecognizedSourceNames.join(
-              '", "'
-            )}"`,
-            'UNRECOGNIZED_VARIABLE_SOURCES'
+            '"Cannot resolve configuration: ' +
+              '"output" variable can only be used in ' +
+              'services deployed with Serverless Dashboard (with "org" setting configured)',
+            'DASHBOARD_VARIABLE_SOURCES_MISUSE'
           );
         }
+        throw new ServerlessError(
+          `Unrecognized configuration variable sources: "${unrecognizedSourceNames.join('", "')}"`,
+          'UNRECOGNIZED_VARIABLE_SOURCES'
+        );
       })();
 
       if (isHelpRequest && serverless.pluginManager.externalPlugins) {
diff --git a/test/fixtures/cli/variables/serverless.yml b/test/fixtures/cli/variables/serverless.yml
index 19fd0867ead..ee73048e73d 100644
--- a/test/fixtures/cli/variables/serverless.yml
+++ b/test/fixtures/cli/variables/serverless.yml
@@ -1,8 +1,6 @@
 service: service
 configValidationMode: error
 
-variablesResolutionMode: 20210326
-
 provider:
   name: aws
   runtime: nodejs12.x
diff --git a/test/integration/plugin-install.test.js b/test/integration/plugin-install.test.js
index 5498723c7b1..c3991cb1870 100644
--- a/test/integration/plugin-install.test.js
+++ b/test/integration/plugin-install.test.js
@@ -15,7 +15,7 @@ describe('test/integration/plugin-install.test.js', function () {
     serviceDir = (
       await fixturesEngine.setup('function', {
         // Unresolved variables should not block "plugin install" command
-        configExt: { variablesResolutionMode: '20210326', custom: { foo: '${foo:bar}' } },
+        configExt: { custom: { foo: '${foo:bar}' } },
       })
     ).servicePath;
     await spawn(serverlessExec, ['plugin', 'install', '-n', 'serverless-offline'], {
diff --git a/test/unit/lib/Serverless.test.js b/test/unit/lib/Serverless.test.js
index fd8e06293b1..e408c6466f3 100644
--- a/test/unit/lib/Serverless.test.js
+++ b/test/unit/lib/Serverless.test.js
@@ -167,7 +167,7 @@ describe('test/unit/lib/Serverless.test.js', () => {
     });
 
     it('Ensure that instance is setup', async () => {
-      expect(serverless.variables).to.have.property('variableSyntax');
+      expect(serverless.variables).to.have.property('service');
     });
 
     it('Ensure config.servicePath', async () => {
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
index 62d099dece6..1295c6f5b3e 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/PluginManager.test.js
@@ -959,136 +959,6 @@ describe('PluginManager', () => {
     });
   });
 
-  describe('#loadVariableResolvers()', () => {
-    it('should load the plugin variable resolvers with short sytnax', () => {
-      class VariableResolverPlugin {
-        getTestVariable() {
-          return Promise.resolve('testVariable');
-        }
-        constructor() {
-          this.variableResolvers = {
-            test: this.getTestVariable,
-          };
-        }
-      }
-      pluginManager.serverless.variables = {
-        variableResolvers: [],
-      };
-      const pluginInstance = new VariableResolverPlugin();
-      pluginManager.loadVariableResolvers(pluginInstance);
-
-      expect('test:asdfsd').to.match(pluginManager.serverless.variables.variableResolvers[0].regex);
-      expect(
-        pluginManager.serverless.variables.variableResolvers[0].isDisabledAtPrepopulation
-      ).to.equal(false);
-      expect(pluginManager.serverless.variables.variableResolvers[0].serviceName).to.equal(null);
-      expect(typeof pluginManager.serverless.variables.variableResolvers[0].resolver).to.equal(
-        'function'
-      );
-    });
-
-    it('should load the plugin variable resolvers with long syntax', () => {
-      class VariableResolverPlugin {
-        getTestVariable() {
-          return Promise.resolve('testVariable');
-        }
-        constructor() {
-          this.variableResolvers = {
-            test: this.getTestVariable,
-          };
-        }
-      }
-      pluginManager.serverless.variables = {
-        variableResolvers: [],
-      };
-      const pluginInstance = new VariableResolverPlugin();
-      pluginManager.loadVariableResolvers(pluginInstance);
-
-      expect('test:asdfsd').to.match(pluginManager.serverless.variables.variableResolvers[0].regex);
-      expect(
-        pluginManager.serverless.variables.variableResolvers[0].isDisabledAtPrepopulation
-      ).to.equal(false);
-      expect(pluginManager.serverless.variables.variableResolvers[0].serviceName).to.equal(null);
-      expect(typeof pluginManager.serverless.variables.variableResolvers[0].resolver).to.equal(
-        'function'
-      );
-    });
-
-    it('should validate the plugin variable resolvers function', () => {
-      class VariableResolverPlugin {
-        getTestVariable() {
-          return Promise.resolve('testVariable');
-        }
-        constructor() {
-          this.variableResolvers = {
-            test: { resolver: 'not a function' },
-          };
-        }
-      }
-      pluginManager.serverless.variables = {
-        variableResolvers: [],
-      };
-      const pluginInstance = new VariableResolverPlugin();
-      expect(() => pluginManager.loadVariableResolvers(pluginInstance)).to.throw(
-        "Custom variable resolver for test defined by VariableResolverPlugin specifies a resolver that isn't a function: not a function"
-      );
-    });
-
-    it('should load the plugin variable resolvers name if necessary', () => {
-      class VariableResolverPlugin {
-        getTestVariable() {
-          return Promise.resolve('testVariable');
-        }
-        constructor() {
-          this.variableResolvers = {
-            test: {
-              resolver: this.getTestVariable,
-              serviceName: 'test',
-              isDisabledAtPrepopulation: true,
-            },
-          };
-        }
-      }
-      pluginManager.serverless.variables = {
-        variableResolvers: [],
-      };
-      const pluginInstance = new VariableResolverPlugin();
-      pluginManager.loadVariableResolvers(pluginInstance);
-
-      expect('test:asdfsd').to.match(pluginManager.serverless.variables.variableResolvers[0].regex);
-      expect(
-        pluginManager.serverless.variables.variableResolvers[0].isDisabledAtPrepopulation
-      ).to.equal(true);
-      expect(pluginManager.serverless.variables.variableResolvers[0].serviceName).to.equal('test');
-      expect(typeof pluginManager.serverless.variables.variableResolvers[0].resolver).to.equal(
-        'function'
-      );
-    });
-
-    it('should validate the plugin variable resolvers name if necessary', () => {
-      class VariableResolverPlugin {
-        getTestVariable() {
-          return Promise.resolve('testVariable');
-        }
-        constructor() {
-          this.variableResolvers = {
-            test: {
-              resolver: this.getTestVariable,
-              isDisabledAtPrepopulation: true,
-            },
-          };
-        }
-      }
-      pluginManager.serverless.variables = {
-        variableResolvers: [],
-      };
-      const pluginInstance = new VariableResolverPlugin();
-      expect(() => pluginManager.loadVariableResolvers(pluginInstance)).to.throw(
-        /Custom variable resolver for test defined by VariableResolverPlugin specifies isDisabledAtPrepopulation but doesn't provide a string for a name/
-      );
-    });
-  });
-
   describe('#getPlugins()', () => {
     beforeEach(() => {
       mockRequire('ServicePluginMock1', ServicePluginMock1);
diff --git a/test/unit/lib/classes/PromiseTracker.test.js b/test/unit/lib/classes/PromiseTracker.test.js
deleted file mode 100644
index e82702db8a7..00000000000
--- a/test/unit/lib/classes/PromiseTracker.test.js
+++ /dev/null
@@ -1,98 +0,0 @@
-'use strict';
-
-/* eslint-disable no-unused-expressions */
-
-const BbPromise = require('bluebird');
-const chai = require('chai');
-
-const PromiseTracker = require('../../../../lib/classes/PromiseTracker');
-
-chai.use(require('chai-as-promised'));
-
-const expect = chai.expect;
-
-/**
- * Mostly this class is tested by its use in peer ~/lib/classes/Variables.js
- *
- * Mostly, I'm creating coverage but if errors are discovered, coverage for the specific cases
- * can be created here.
- */
-describe('PromiseTracker', () => {
-  let promiseTracker;
-  beforeEach(() => {
-    promiseTracker = new PromiseTracker();
-  });
-  it('logs a warning without throwing', () => {
-    promiseTracker.add('foo', BbPromise.resolve(), '${foo:}');
-    promiseTracker.add('foo', BbPromise.delay(10), '${foo:}');
-    promiseTracker.report(); // shouldn't throw
-    return Promise.all(promiseTracker.getAll());
-  });
-  it('reports no promises when none have been added', () => {
-    expect(promiseTracker.getAll()).to.be.an('array').that.is.empty;
-    expect(promiseTracker.getPending()).to.be.an('array').that.is.empty;
-    expect(promiseTracker.getSettled()).to.be.an('array').that.is.empty;
-    expect(promiseTracker.getResolved()).to.be.an('array').that.is.empty;
-    expect(promiseTracker.getRejected()).to.be.an('array').that.is.empty;
-  });
-  it('reports the correct number of added promise statuses', () => {
-    let resolve;
-    const pending = new BbPromise((rslv) => {
-      resolve = rslv;
-    });
-    const resolved = BbPromise.resolve();
-    const rejected = BbPromise.reject('reason');
-    promiseTracker.add('pending', pending, '${pending:}');
-    promiseTracker.add('resolved', resolved, '${resolved:}');
-    promiseTracker.add('rejected', rejected, '${rejected:}');
-    resolved.state = 'resolved';
-    rejected.state = 'rejected';
-    return BbPromise.delay(1)
-      .then(() => {
-        const pendings = promiseTracker.getPending();
-        expect(pendings).to.be.an.instanceof(Array);
-        expect(pendings.length).to.equal(1);
-        expect(pendings[0]).to.equal(pending);
-        const settleds = promiseTracker.getSettled();
-        expect(settleds).to.be.an.instanceof(Array);
-        expect(settleds.length).to.equal(2);
-        expect(settleds).to.include(resolved);
-        expect(settleds).to.include(rejected);
-        const resolveds = promiseTracker.getResolved();
-        expect(resolveds).to.be.an.instanceof(Array);
-        expect(resolveds.length).to.equal(1);
-        expect(resolveds).to.include(resolved);
-        const rejecteds = promiseTracker.getRejected();
-        expect(rejecteds).to.be.an.instanceof(Array);
-        expect(rejecteds.length).to.equal(1);
-        expect(rejecteds).to.include(rejected);
-      })
-      .then(() => {
-        resolve();
-      });
-  });
-  it('reports and then clears tracked promises when stopped after reporting.', () => {
-    let resolve;
-    const pending = new BbPromise((rslv) => {
-      resolve = rslv;
-    });
-    const resolved = BbPromise.resolve();
-    const rejected = BbPromise.reject('reason');
-    promiseTracker.add('pending', pending, '${pending:}');
-    promiseTracker.add('resolved', resolved, '${resolved:}');
-    promiseTracker.add('rejected', rejected, '${rejected:}');
-    resolved.state = 'resolved';
-    rejected.state = 'rejected';
-    promiseTracker.reported = true;
-    return BbPromise.delay(1).then(() => {
-      const all = promiseTracker.getAll();
-      expect(all).to.be.an.instanceof(Array);
-      expect(all.length).to.equal(3);
-      promiseTracker.stop();
-      const stopped = promiseTracker.getAll();
-      expect(stopped).to.be.an.instanceof(Array);
-      expect(stopped.length).to.equal(0);
-      resolve();
-    });
-  });
-});
diff --git a/test/unit/lib/configuration/variables/eventually-report-resolution-errors.test.js b/test/unit/lib/configuration/variables/eventually-report-resolution-errors.test.js
index 081c57a3a39..101fd5fb3d6 100644
--- a/test/unit/lib/configuration/variables/eventually-report-resolution-errors.test.js
+++ b/test/unit/lib/configuration/variables/eventually-report-resolution-errors.test.js
@@ -3,7 +3,6 @@
 const { expect } = require('chai');
 
 const overrideArgv = require('process-utils/override-argv');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const ServerlessError = require('../../../../../lib/serverless-error');
 const resolveCliInput = require('../../../../../lib/cli/resolve-input');
 const resolveMeta = require('../../../../../lib/configuration/variables/resolve-meta');
@@ -23,39 +22,9 @@ describe('test/unit/lib/configuration/variables/eventually-report-resolution-err
   });
 
   describe('On errors', () => {
-    it('should log errors with help command', () => {
+    it('should throw error in regular circumstances', () => {
       const configuration = { foo: '${foo:raz' };
       const variablesMeta = resolveMeta(configuration);
-      let stdoutData = '';
-      overrideArgv({ args: ['serverless', '--help'] }, () =>
-        overrideStdoutWrite(
-          (data) => (stdoutData += data),
-          () =>
-            expect(
-              eventuallyReportResolutionErrors(process.cwd(), configuration, variablesMeta)
-            ).to.equal(true)
-        )
-      );
-
-      expect(stdoutData).to.include('Resolution of service configuration failed');
-    });
-
-    it('should log deprecation with no "variablesResolutionMode" set', () => {
-      const configuration = { foo: '${foo:raz' };
-      const variablesMeta = resolveMeta(configuration);
-      overrideArgv(
-        { args: ['serverless', 'foo'] },
-        () => () =>
-          expect(() =>
-            eventuallyReportResolutionErrors(process.cwd(), configuration, variablesMeta)
-          )
-            .to.throw(ServerlessError)
-            .with.property('code', 'REJECTED_DEPRECATION_VARIABLES_RESOLUTION_ERROR')
-      );
-    });
-    it('should throw with no "variablesResolutionMode" set', () => {
-      const configuration = { foo: '${foo:raz', variablesResolutionMode: 20210326 };
-      const variablesMeta = resolveMeta(configuration);
       overrideArgv({ args: ['serverless', 'foo'] }, () =>
         expect(() => eventuallyReportResolutionErrors(process.cwd(), configuration, variablesMeta))
           .to.throw(ServerlessError)
diff --git a/test/unit/lib/configuration/variables/sources/file.test.js b/test/unit/lib/configuration/variables/sources/file.test.js
index c43fa942229..c911f5ff9fe 100644
--- a/test/unit/lib/configuration/variables/sources/file.test.js
+++ b/test/unit/lib/configuration/variables/sources/file.test.js
@@ -18,7 +18,6 @@ describe('test/unit/lib/configuration/variables/sources/file.test.js', () => {
       json: '${file(file.json)}',
       tfstate: '${file(file.tfstate)}',
       js: '${file(file.js)}',
-      variablesResolutionMode: '20210326',
       jsFunction: '${file(file-function.js)}',
       jsPropertyFunction: '${file(file-property-function.js):property}',
       jsPropertyFunctionProperty: '${file(file-property-function.js):property.result}',
@@ -202,26 +201,6 @@ describe('test/unit/lib/configuration/variables/sources/file.test.js', () => {
       'MISSING_VARIABLE_RESULT'
     ));
 
-  it('should not support function resolvers in "js" file sources not confirmed to work with new resolver', async () => {
-    configuration = {
-      jsFunction: '${file(file-function.js)}',
-      jsPropertyFunction: '${file(file-property-function.js):property}',
-    };
-    variablesMeta = resolveMeta(configuration);
-    await resolve({
-      serviceDir,
-      configuration,
-      variablesMeta,
-      sources: { file: fileSource },
-      options: {},
-      fulfilledSources: new Set(['file']),
-    });
-    expect(variablesMeta.get('jsFunction').error.code).to.equal('VARIABLE_RESOLUTION_ERROR');
-    expect(variablesMeta.get('jsPropertyFunction').error.code).to.equal(
-      'VARIABLE_RESOLUTION_ERROR'
-    );
-  });
-
   it('should support reaching out beyond service directory', async () => {
     configuration = {
       yml: '${file(../file.yml)}',
diff --git a/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js b/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js
index 46e38ce37b0..19a9040e0e9 100644
--- a/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js
+++ b/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js
@@ -14,274 +14,153 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
   let variablesMeta;
   let serverlessInstance;
 
-  describe('modern', () => {
-    before(async () => {
-      configuration = {
-        service: 'foo',
-        variablesResolutionMode: '20210326',
-        provider: { name: 'aws' },
-        custom: {
-          existing: '${ssm:existing}',
-          existingInRegion: '${ssm(eu-west-1):existing}',
-          existingList: '${ssm:existingList}',
-          existingListRaw: '${ssm(raw):existingList}',
-          secretManager: '${ssm:/aws/reference/secretsmanager/existing}',
-          existingEncrypted: '${ssm:/secret/existing}',
-          encryptedWithSkipDecrypt: '${ssm(noDecrypt):/secret/existing}',
-          encryptedWithSkipDecryptAndRegion: '${ssm(noDecrypt, eu-west-1):/secret/existing}',
-          existingEncryptedDirect: '${ssm:/secret/direct}',
-          existingEncryptedRaw: '${ssm(raw):/aws/reference/secretsmanager/existing}',
-          notExisting: '${ssm:notExisting, null}',
-          missingAddress: '${ssm:}',
-          nonStringAddress: '${ssm:${self:custom.someObject}}',
-          someObject: {},
+  before(async () => {
+    configuration = {
+      service: 'foo',
+      provider: { name: 'aws' },
+      custom: {
+        existing: '${ssm:existing}',
+        existingInRegion: '${ssm(eu-west-1):existing}',
+        existingList: '${ssm:existingList}',
+        existingListRaw: '${ssm(raw):existingList}',
+        secretManager: '${ssm:/aws/reference/secretsmanager/existing}',
+        existingEncrypted: '${ssm:/secret/existing}',
+        encryptedWithSkipDecrypt: '${ssm(noDecrypt):/secret/existing}',
+        encryptedWithSkipDecryptAndRegion: '${ssm(noDecrypt, eu-west-1):/secret/existing}',
+        existingEncryptedDirect: '${ssm:/secret/direct}',
+        existingEncryptedRaw: '${ssm(raw):/aws/reference/secretsmanager/existing}',
+        notExisting: '${ssm:notExisting, null}',
+        missingAddress: '${ssm:}',
+        nonStringAddress: '${ssm:${self:custom.someObject}}',
+        someObject: {},
+      },
+    };
+    variablesMeta = resolveMeta(configuration);
+
+    serverlessInstance = {
+      getProvider: () => ({
+        request: async (name, method, { Name, WithDecryption }, { region }) => {
+          if (!allowedRegionTypes.has(typeof region)) throw new Error('Invalid region value');
+          if (Name === 'existing') {
+            return { Parameter: { Type: 'String', Value: region || 'value' } };
+          }
+          if (Name === 'existingList') {
+            return { Parameter: { Type: 'StringList', Value: 'one,two,three' } };
+          }
+          if (Name === '/secret/existing' || Name === '/aws/reference/secretsmanager/existing') {
+            return {
+              Parameter: {
+                Type: 'SecureString',
+                Value: WithDecryption ? '{"someSecret":"someValue"}' : 'ENCRYPTED',
+              },
+            };
+          }
+          if (Name === '/secret/direct') {
+            return {
+              Parameter: {
+                Type: 'SecureString',
+                Value: WithDecryption ? '12345678901234567890' : 'ENCRYPTED',
+              },
+            };
+          }
+          if (Name === 'notExisting') {
+            throw Object.assign(
+              new Error(
+                'ParameterNotFound: An error occurred ' +
+                  '(ParameterNotFound) when referencing Secrets Manager'
+              ),
+              {
+                code: 'AWS_S_S_M_GET_PARAMETER_PARAMETER_NOT_FOUND',
+              }
+            );
+          }
+          throw new Error('Unexpected call');
         },
-      };
-      variablesMeta = resolveMeta(configuration);
+      }),
+    };
 
-      serverlessInstance = {
-        getProvider: () => ({
-          request: async (name, method, { Name, WithDecryption }, { region }) => {
-            if (!allowedRegionTypes.has(typeof region)) throw new Error('Invalid region value');
-            if (Name === 'existing') {
-              return { Parameter: { Type: 'String', Value: region || 'value' } };
-            }
-            if (Name === 'existingList') {
-              return { Parameter: { Type: 'StringList', Value: 'one,two,three' } };
-            }
-            if (Name === '/secret/existing' || Name === '/aws/reference/secretsmanager/existing') {
-              return {
-                Parameter: {
-                  Type: 'SecureString',
-                  Value: WithDecryption ? '{"someSecret":"someValue"}' : 'ENCRYPTED',
-                },
-              };
-            }
-            if (Name === '/secret/direct') {
-              return {
-                Parameter: {
-                  Type: 'SecureString',
-                  Value: WithDecryption ? '12345678901234567890' : 'ENCRYPTED',
-                },
-              };
-            }
-            if (Name === 'notExisting') {
-              throw Object.assign(
-                new Error(
-                  'ParameterNotFound: An error occurred ' +
-                    '(ParameterNotFound) when referencing Secrets Manager'
-                ),
-                {
-                  code: 'AWS_S_S_M_GET_PARAMETER_PARAMETER_NOT_FOUND',
-                }
-              );
-            }
-            throw new Error('Unexpected call');
-          },
-        }),
-      };
-
-      await resolve({
-        serviceDir: process.cwd(),
-        configuration,
-        variablesMeta,
-        sources: { self: selfSource, ssm: getSsmSource(serverlessInstance) },
-        options: {},
-        fulfilledSources: new Set(['cf', 'self']),
-      });
-    });
-
-    it('should resolve existing string param', () => {
-      if (variablesMeta.get('custom\0existing')) throw variablesMeta.get('custom\0existing').error;
-      expect(configuration.custom.existing).to.equal('value');
-    });
-
-    it('should resolve existing string list param', () => {
-      if (variablesMeta.get('custom\0existingList')) {
-        throw variablesMeta.get('custom\0existingList').error;
-      }
-      expect(configuration.custom.existingList).to.deep.equal(['one', 'two', 'three']);
-    });
-    it('should support "raw" output for list param', () => {
-      if (variablesMeta.get('custom\0existingListRaw')) {
-        throw variablesMeta.get('custom\0existingListRaw').error;
-      }
-      expect(configuration.custom.existingListRaw).to.equal('one,two,three');
+    await resolve({
+      serviceDir: process.cwd(),
+      configuration,
+      variablesMeta,
+      sources: { self: selfSource, ssm: getSsmSource(serverlessInstance) },
+      options: {},
+      fulfilledSources: new Set(['cf', 'self']),
     });
-
-    it('should resolve existing encrypted AWS secret manager data', () => {
-      if (variablesMeta.get('custom\0secretManager')) {
-        throw variablesMeta.get('custom\0secretManager').error;
-      }
-      expect(configuration.custom.secretManager).to.deep.equal({ someSecret: 'someValue' });
-    });
-
-    it('should resolve existing encrypted data', () => {
-      if (variablesMeta.get('custom\0existingEncrypted')) {
-        throw variablesMeta.get('custom\0existingEncrypted').error;
-      }
-      if (variablesMeta.get('custom\0existingDirect')) {
-        throw variablesMeta.get('custom\0existingDirect').error;
-      }
-      if (variablesMeta.get('custom\0encryptedWithSkipDecrypt')) {
-        throw variablesMeta.get('custom\0encryptedWithSkipDecrypt').error;
-      }
-      if (variablesMeta.get('custom\0encryptedWithSkipDecryptAndRegion')) {
-        throw variablesMeta.get('custom\0encryptedWithSkipDecrypt').error;
-      }
-      expect(configuration.custom.existingEncrypted).to.deep.equal({ someSecret: 'someValue' });
-      expect(configuration.custom.existingEncryptedDirect).to.equal('12345678901234567890');
-      expect(configuration.custom.encryptedWithSkipDecrypt).to.equal('ENCRYPTED');
-      expect(configuration.custom.encryptedWithSkipDecryptAndRegion).to.equal('ENCRYPTED');
-    });
-
-    it('should support "raw" output for decrypted data', () => {
-      if (variablesMeta.get('custom\0existingEncryptedRaw')) {
-        throw variablesMeta.get('custom\0existingEncryptedRaw').error;
-      }
-      expect(configuration.custom.existingEncryptedRaw).to.equal('{"someSecret":"someValue"}');
-    });
-
-    it('should resolve existing output in specific region', () => {
-      if (variablesMeta.get('custom\0existingInRegion')) {
-        throw variablesMeta.get('custom\0existingInRegion').error;
-      }
-      expect(configuration.custom.existingInRegion).to.equal('eu-west-1');
-    });
-
-    it('should resolve null on missing param', () => {
-      if (variablesMeta.get('custom\0notExisting')) {
-        throw variablesMeta.get('custom\0notExisting').error;
-      }
-      expect(configuration.custom.notExisting).to.equal(null);
-    });
-
-    it('should report with an error missing address', () =>
-      expect(variablesMeta.get('custom\0missingAddress').error.code).to.equal(
-        'VARIABLE_RESOLUTION_ERROR'
-      ));
-
-    it('should report with an error a non-string address', () =>
-      expect(variablesMeta.get('custom\0nonStringAddress').error.code).to.equal(
-        'VARIABLE_RESOLUTION_ERROR'
-      ));
   });
 
-  describe('legacy', () => {
-    before(async () => {
-      configuration = {
-        service: 'foo',
-        provider: { name: 'aws' },
-        custom: {
-          existing: '${ssm:existing}',
-          existingWithSplit: '${ssm:existing~split}',
-          existingWithUnrecognized: '${ssm:existing~other}',
-          existingList: '${ssm:existingList}',
-          existingListWithSplit: '${ssm:existingList~split}',
-          secretManager: '${ssm:/aws/reference/secretsmanager/existing}',
-          secretManagerWithDecrypt: '${ssm:/aws/reference/secretsmanager/existing~true}',
-          encyptedWithDecrypt: '${ssm:/secret/existing~true}',
-          encyptedRawWithDecrypt: '${ssm(raw):/secret/existing~true}',
-        },
-      };
-      variablesMeta = resolveMeta(configuration);
-
-      serverlessInstance = {
-        getProvider: () => ({
-          request: async (name, method, { Name }, { region }) => {
-            if (!allowedRegionTypes.has(typeof region)) throw new Error('Invalid region value');
-            if (Name === 'existing') {
-              return { Parameter: { Type: 'String', Value: region || 'value' } };
-            }
-            if (Name === 'existingList') {
-              return { Parameter: { Type: 'StringList', Value: 'one,two,three' } };
-            }
-            if (Name === '/secret/existing' || Name === '/aws/reference/secretsmanager/existing') {
-              return { Parameter: { Type: 'SecureString', Value: '{"someSecret":"someValue"}' } };
-            }
-            if (Name === 'notExisting') {
-              throw Object.assign(
-                new Error(
-                  'ParameterNotFound: An error occurred ' +
-                    '(ParameterNotFound) when referencing Secrets Manager'
-                ),
-                {
-                  code: 'ParameterNotFound',
-                }
-              );
-            }
-            throw new Error('Unexpected call');
-          },
-        }),
-      };
-
-      await resolve({
-        serviceDir: process.cwd(),
-        configuration,
-        variablesMeta,
-        sources: { self: selfSource, ssm: getSsmSource(serverlessInstance) },
-        options: {},
-        fulfilledSources: new Set(['cf', 'self']),
-      });
-    });
-
-    it('should resolve existing string param', () => {
-      if (variablesMeta.get('custom\0existing')) throw variablesMeta.get('custom\0existing').error;
-      expect(configuration.custom.existing).to.equal('value');
-    });
+  it('should resolve existing string param', () => {
+    if (variablesMeta.get('custom\0existing')) throw variablesMeta.get('custom\0existing').error;
+    expect(configuration.custom.existing).to.equal('value');
+  });
 
-    it('should abort if string param has "split" instruction', () => {
-      expect(variablesMeta.get('custom\0existingWithSplit').error.code).to.equal(
-        'VARIABLE_RESOLUTION_ERROR'
-      );
-    });
+  it('should resolve existing string list param', () => {
+    if (variablesMeta.get('custom\0existingList')) {
+      throw variablesMeta.get('custom\0existingList').error;
+    }
+    expect(configuration.custom.existingList).to.deep.equal(['one', 'two', 'three']);
+  });
+  it('should support "raw" output for list param', () => {
+    if (variablesMeta.get('custom\0existingListRaw')) {
+      throw variablesMeta.get('custom\0existingListRaw').error;
+    }
+    expect(configuration.custom.existingListRaw).to.equal('one,two,three');
+  });
 
-    it('should abort if string list param misses "split" instruction', () => {
-      expect(variablesMeta.get('custom\0existingList').error.code).to.equal(
-        'VARIABLE_RESOLUTION_ERROR'
-      );
-    });
+  it('should resolve existing encrypted AWS secret manager data', () => {
+    if (variablesMeta.get('custom\0secretManager')) {
+      throw variablesMeta.get('custom\0secretManager').error;
+    }
+    expect(configuration.custom.secretManager).to.deep.equal({ someSecret: 'someValue' });
+  });
 
-    it('should ignore unrecognized legacy instructions', () => {
-      if (variablesMeta.get('custom\0existingWithUnrecognized')) {
-        throw variablesMeta.get('custom\0existing').error;
-      }
-      expect(configuration.custom.existingWithUnrecognized).to.equal('value');
-    });
+  it('should resolve existing encrypted data', () => {
+    if (variablesMeta.get('custom\0existingEncrypted')) {
+      throw variablesMeta.get('custom\0existingEncrypted').error;
+    }
+    if (variablesMeta.get('custom\0existingDirect')) {
+      throw variablesMeta.get('custom\0existingDirect').error;
+    }
+    if (variablesMeta.get('custom\0encryptedWithSkipDecrypt')) {
+      throw variablesMeta.get('custom\0encryptedWithSkipDecrypt').error;
+    }
+    if (variablesMeta.get('custom\0encryptedWithSkipDecryptAndRegion')) {
+      throw variablesMeta.get('custom\0encryptedWithSkipDecrypt').error;
+    }
+    expect(configuration.custom.existingEncrypted).to.deep.equal({ someSecret: 'someValue' });
+    expect(configuration.custom.existingEncryptedDirect).to.equal('12345678901234567890');
+    expect(configuration.custom.encryptedWithSkipDecrypt).to.equal('ENCRYPTED');
+    expect(configuration.custom.encryptedWithSkipDecryptAndRegion).to.equal('ENCRYPTED');
+  });
 
-    it('should resolve existing string list param', () => {
-      if (variablesMeta.get('custom\0existingListWithSplit')) {
-        throw variablesMeta.get('custom\0existingListWithSplit').error;
-      }
-      expect(configuration.custom.existingListWithSplit).to.deep.equal(['one', 'two', 'three']);
-    });
+  it('should support "raw" output for decrypted data', () => {
+    if (variablesMeta.get('custom\0existingEncryptedRaw')) {
+      throw variablesMeta.get('custom\0existingEncryptedRaw').error;
+    }
+    expect(configuration.custom.existingEncryptedRaw).to.equal('{"someSecret":"someValue"}');
+  });
 
-    it('should abort if encrypted param misses "true" instruction', () => {
-      expect(variablesMeta.get('custom\0secretManager').error.code).to.equal(
-        'VARIABLE_RESOLUTION_ERROR'
-      );
-    });
+  it('should resolve existing output in specific region', () => {
+    if (variablesMeta.get('custom\0existingInRegion')) {
+      throw variablesMeta.get('custom\0existingInRegion').error;
+    }
+    expect(configuration.custom.existingInRegion).to.equal('eu-west-1');
+  });
 
-    it('should resolve existing encrypted data', () => {
-      if (variablesMeta.get('custom\0secretManagerWithDecrypt')) {
-        throw variablesMeta.get('custom\0secretManagerWithDecrypt').error;
-      }
-      expect(configuration.custom.secretManagerWithDecrypt).to.deep.equal({
-        someSecret: 'someValue',
-      });
-    });
+  it('should resolve null on missing param', () => {
+    if (variablesMeta.get('custom\0notExisting')) {
+      throw variablesMeta.get('custom\0notExisting').error;
+    }
+    expect(configuration.custom.notExisting).to.equal(null);
+  });
 
-    it('should abort if encrypted param is not AWS Secretn manager param', () => {
-      expect(variablesMeta.get('custom\0encyptedWithDecrypt').error.code).to.equal(
-        'VARIABLE_RESOLUTION_ERROR'
-      );
-    });
+  it('should report with an error missing address', () =>
+    expect(variablesMeta.get('custom\0missingAddress').error.code).to.equal(
+      'VARIABLE_RESOLUTION_ERROR'
+    ));
 
-    it('should resolve encrypted param that\'s not AWS Secret manager param with "raw" instruction', () => {
-      if (variablesMeta.get('custom\0encyptedRawWithDecrypt')) {
-        throw variablesMeta.get('custom\0encyptedRawWithDecrypt').error;
-      }
-      expect(configuration.custom.encyptedRawWithDecrypt).to.equal('{"someSecret":"someValue"}');
-    });
-  });
+  it('should report with an error a non-string address', () =>
+    expect(variablesMeta.get('custom\0nonStringAddress').error.code).to.equal(
+      'VARIABLE_RESOLUTION_ERROR'
+    ));
 });
diff --git a/test/unit/scripts/serverless.test.js b/test/unit/scripts/serverless.test.js
index 5cd9556f2d2..27e2f5ab6ce 100644
--- a/test/unit/scripts/serverless.test.js
+++ b/test/unit/scripts/serverless.test.js
@@ -118,7 +118,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
       await spawn('node', [serverlessPath, 'print'], {
         cwd: (
           await programmaticFixturesEngine.setup('aws', {
-            configExt: { variablesResolutionMode: '20210326', provider: '${foo:bar}' },
+            configExt: { provider: '${foo:bar}' },
           })
         ).servicePath,
       });
@@ -134,7 +134,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
       await spawn('node', [serverlessPath, 'print'], {
         cwd: (
           await programmaticFixturesEngine.setup('aws', {
-            configExt: { variablesResolutionMode: '20210326', provider: { stage: '${foo:bar}' } },
+            configExt: { provider: { stage: '${foo:bar}' } },
           })
         ).servicePath,
       });
@@ -204,7 +204,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
       await spawn('node', [serverlessPath, 'print'], {
         cwd: (
           await programmaticFixturesEngine.setup('aws', {
-            configExt: { variablesResolutionMode: '20210326', plugins: '${foo:bar}' },
+            configExt: { plugins: '${foo:bar}' },
           })
         ).servicePath,
       });

From e61674f8dc2b367d2e215aa88b7e7360ac12eb1c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 17 Jan 2022 15:18:37 +0100
Subject: [PATCH 0904/1101] feat(Dashboard): Drop support for `tenant`

BREAKING CHANGE:
`tenant` configuration setting is no longer respected. Ensure to rely on `org` instead
---
 lib/classes/Service.js             | 1 -
 lib/cli/interactive-setup/utils.js | 2 +-
 scripts/serverless.js              | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index c411c1c750a..f0f3e4e54b7 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -103,7 +103,6 @@ class Service {
 
     // (dashboard plugin)
     this.app = configurationInput.app;
-    this.tenant = configurationInput.tenant;
     this.org = configurationInput.org;
 
     this.plugins = configurationInput.plugins;
diff --git a/lib/cli/interactive-setup/utils.js b/lib/cli/interactive-setup/utils.js
index 9a49f7ebbb7..be0bd3eab50 100644
--- a/lib/cli/interactive-setup/utils.js
+++ b/lib/cli/interactive-setup/utils.js
@@ -13,7 +13,7 @@ const fsp = require('fs').promises;
 const yamlExtensions = new Set(['.yml', '.yaml']);
 
 const appPattern = /^(?:#\s*)?app\s*:.+/m;
-const orgPattern = /^(?:#\s*)?(?:tenant|org)\s*:.+/m;
+const orgPattern = /^(?:#\s*)?(?:org)\s*:.+/m;
 
 const ServerlessError = require('../../serverless-error');
 const resolveStage = require('../../utils/resolve-stage');
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 38dbbc64a30..b8c35de5200 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -445,7 +445,6 @@ const processSpanPromise = (async () => {
           if (!ensureResolvedProperty('frameworkVersion')) return;
           if (!ensureResolvedProperty('app')) return;
           if (!ensureResolvedProperty('org')) return;
-          if (!ensureResolvedProperty('tenant')) return;
           if (!ensureResolvedProperty('service')) return;
           if (configuration.org) {
             // Dashboard requires AWS region to be resolved upfront

From e61124a7d4509bad6f8dd285807f18a6fd4f1f83 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 17 Jan 2022 16:09:50 +0100
Subject: [PATCH 0905/1101] refactor: Remove internal
 `suppressLogIfPrintCommand` method

---
 lib/Serverless.js                 |  1 -
 lib/classes/CLI.js                | 21 ---------
 test/unit/lib/classes/CLI.test.js | 72 -------------------------------
 3 files changed, 94 deletions(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index c589b6144ef..fcdc998395a 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -143,7 +143,6 @@ class Serverless {
   async run() {
     if (this.configurationInput) this.service.reloadServiceFileParam();
 
-    this.cli.suppressLogIfPrintCommand(this.processedInput);
     // make sure the command exists before doing anything else
     this.pluginManager.validateCommand(this.processedInput.commands);
 
diff --git a/lib/classes/CLI.js b/lib/classes/CLI.js
index d6214199959..521d22735fa 100644
--- a/lib/classes/CLI.js
+++ b/lib/classes/CLI.js
@@ -24,27 +24,6 @@ class CLI {
     this.loadedCommands = commands;
   }
 
-  suppressLogIfPrintCommand(processedInput) {
-    const commands = processedInput.commands;
-
-    // if "-help" or "-h" was entered
-    if (resolveCliInput().isHelpRequest) return;
-
-    // if "print" was NOT entered
-    if (commands.indexOf('print') === -1) {
-      return;
-    }
-
-    // if other command was combined with "print"
-    if (commands.length !== 1) {
-      return;
-    }
-
-    // Make "log" no-op to suppress warnings.
-    // But preserve "consoleLog" which "print" command use to print config.
-    this.log = function () {};
-  }
-
   displayHelp() {
     if (!resolveCliInput().isHelpRequest) return false;
     renderHelp(this.serverless.pluginManager.externalPlugins);
diff --git a/test/unit/lib/classes/CLI.test.js b/test/unit/lib/classes/CLI.test.js
index 6053c189583..d19feac59b8 100644
--- a/test/unit/lib/classes/CLI.test.js
+++ b/test/unit/lib/classes/CLI.test.js
@@ -1,11 +1,8 @@
 'use strict';
 
 const chai = require('chai');
-const sinon = require('sinon');
 const CLI = require('../../../../lib/classes/CLI');
-const overrideArgv = require('process-utils/override-argv');
 const Serverless = require('../../../../lib/Serverless');
-const resolveInput = require('../../../../lib/cli/resolve-input');
 
 const { expect } = chai;
 chai.use(require('sinon-chai'));
@@ -44,73 +41,4 @@ describe('CLI', () => {
       expect(cli.loadedPlugins[0]).to.equal(pluginMock);
     });
   });
-
-  describe('#suppressLogIfPrintCommand()', () => {
-    let logStub;
-    let consoleLogStub;
-
-    beforeEach(() => {
-      logStub = sinon.stub();
-      consoleLogStub = sinon.stub();
-    });
-
-    it('should do nothing when no command is given', () => {
-      cli = new CLI(serverless);
-      cli.log = logStub;
-      cli.consoleLog = consoleLogStub;
-
-      cli.suppressLogIfPrintCommand({ commands: [], options: {} });
-      cli.log('logged');
-      cli.consoleLog('logged');
-
-      expect(logStub.calledOnce).to.equal(true);
-      expect(consoleLogStub.calledOnce).to.equal(true);
-    });
-
-    it('should do nothing when "print" is given with "--help"', () => {
-      cli = new CLI(serverless);
-      cli.log = logStub;
-      cli.consoleLog = consoleLogStub;
-
-      resolveInput.clear();
-      overrideArgv({ args: ['serverless', '--help'] }, () =>
-        cli.suppressLogIfPrintCommand({
-          commands: ['print'],
-          options: { help: true },
-        })
-      );
-      resolveInput.clear();
-      cli.log('logged');
-      cli.consoleLog('logged');
-
-      expect(logStub.calledOnce).to.equal(true);
-      expect(consoleLogStub.calledOnce).to.equal(true);
-    });
-
-    it('should do nothing when "print" is combined with other command.', () => {
-      cli = new CLI(serverless);
-      cli.log = logStub;
-      cli.consoleLog = consoleLogStub;
-
-      cli.suppressLogIfPrintCommand({ commands: ['other', 'print'], options: {} });
-      cli.log('logged');
-      cli.consoleLog('logged');
-
-      expect(logStub.calledOnce).to.equal(true);
-      expect(consoleLogStub.calledOnce).to.equal(true);
-    });
-
-    it('should suppress log when "print" is given', () => {
-      cli = new CLI(serverless);
-      cli.log = logStub;
-      cli.consoleLog = consoleLogStub;
-
-      cli.suppressLogIfPrintCommand({ commands: ['print'], options: {} });
-      cli.log('NOT LOGGED');
-      cli.consoleLog('logged');
-
-      expect(logStub.calledOnce).to.equal(false);
-      expect(consoleLogStub.calledOnce).to.equal(true);
-    });
-  });
 });

From fd1669ea7a783f624c1bdbf297d87141eae551d8 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Mon, 17 Jan 2022 13:10:28 +0100
Subject: [PATCH 0906/1101] docs: Updates for the v3 release

---
 docs/deprecations.md                      |  4 +-
 docs/environment-variables.md             |  4 +-
 docs/providers/aws/events/event-bridge.md |  2 +-
 docs/providers/aws/guide/variables.md     | 70 ++++-------------------
 4 files changed, 17 insertions(+), 63 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index bfbb8c6ffaf..4b46a2d87e4 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -398,7 +398,7 @@ In context of v2 you may adapt old variables resolver so errors on unresolved va
 
 Deprecation code: `PROVIDER_IAM_SETTINGS`
 
-_Note: Originally support for old IAM settings was scheduled to be dropped with new major release. It's no longer the case. If you see this deprecation notice please upgrade to latest version of Serverless Framework_
+_Note: Originally, support for the legacy IAM settings format was scheduled to be dropped in v3. However, it's no longer the case. If you see this deprecation notice please upgrade to the latest version of Serverless Framework v2._
 
 All IAM-related settings of _provider_ including `iamRoleStatements`, `iamManagedPolicies`, `role` and `cfnRole` are also now supported at `iam` property. Refer to the [IAM Guide](/framework/docs/providers/aws/guide/iam.md).
 
@@ -568,7 +568,7 @@ Deprecation code: `AWS_FUNCTION_DESTINATIONS_ASYNC_CONFIG`
 
 Deprecation code: `AWS_HTTP_API_VERSION`
 
-Default HTTP API Payload version will be switched to 2.0 with next major release (For more details see [payload format documentation](https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html#http-api-develop-integrations-lambda.proxy-format))
+Default HTTP API Payload version will be switched to 2.0 with v3 (For more details see [payload format documentation](https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html#http-api-develop-integrations-lambda.proxy-format)).
 
 Configure `httpApi.payload` explicitly to ensure seamless migration.
 
diff --git a/docs/environment-variables.md b/docs/environment-variables.md
index 1f3ded726dc..c375a1b706d 100644
--- a/docs/environment-variables.md
+++ b/docs/environment-variables.md
@@ -6,13 +6,13 @@ layout: Doc
 
 # Resolution of environment variables
 
-To automatically load environment variables from `.env` files (with the help of [dotenv](https://www.npmjs.com/package/dotenv) package) please set `useDotenv` property in `serverless.yml` as below:
+To automatically load environment variables from `.env` files (with the help of the [dotenv](https://www.npmjs.com/package/dotenv) package), set `useDotenv: true` in `serverless.yml`:
 
 ```yaml
 useDotenv: true
 ```
 
-Having that `.env` files will also be excluded from the package in order to avoid uploading sensitive data as a part of a package by mistake. Starting with the next major version, `.env` files will be loaded by default and `useDotenv` setting will be ignored.
+With that option enabled, `.env` files will also be excluded from the package in order to avoid uploading sensitive data as a part of a package by mistake.
 
 ## Support for `.env` files
 
diff --git a/docs/providers/aws/events/event-bridge.md b/docs/providers/aws/events/event-bridge.md
index 8c9c2fb7feb..ad23168ff35 100644
--- a/docs/providers/aws/events/event-bridge.md
+++ b/docs/providers/aws/events/event-bridge.md
@@ -16,7 +16,7 @@ layout: Doc
 
 The [EventBridge](https://aws.amazon.com/eventbridge/) makes it possible to connect applications using data from external sources (e.g. own applications, SaaS) or AWS services. The `eventBridge` event types helps setting up AWS Lambda functions to react to events coming in via the EventBridge.
 
-_Note_: Prior to `2.27.0` version of the Framework, `eventBridge` resources were provisioned with Custom Resources. With `2.27.0` an optional support for native CloudFormation was introduced and can be turned on by setting `provider.eventBridge.useCloudFormation` property to `true`. It is recommended to migrate to native CloudFormation as it will become a default with next major version. It also adds the ability to define `eventBus` with CF intrinsic functions as values.
+_Note_: Prior to `2.27.0` version of the Framework, `eventBridge` resources were provisioned with Custom Resources. With `2.27.0` an optional support for native CloudFormation was introduced and can be turned on by setting `provider.eventBridge.useCloudFormation: true`. It is recommended to migrate to native CloudFormation as it will become a default with v3. It also adds the ability to define `eventBus` with CF intrinsic functions as values.
 
 ## Setting up a scheduled event
 
diff --git a/docs/providers/aws/guide/variables.md b/docs/providers/aws/guide/variables.md
index ced6e845fd5..012c370fc4f 100644
--- a/docs/providers/aws/guide/variables.md
+++ b/docs/providers/aws/guide/variables.md
@@ -512,7 +512,9 @@ functions:
 
 ### Exporting a function
 
-Function receives an object, with following properties:
+_Note: the method described below works by default in Serverless v3, but it requires the `variablesResolutionMode: 20210326` option in v2._
+
+A variable resolver function receives an object with the following properties:
 
 - `options` - An object referencing resolved CLI params as passed to the command
 - `resolveVariable(variableString)` - Async function which resolves provided variable string. String should be passed without wrapping (`${` and `}`) braces. Example valid values:
@@ -520,91 +522,43 @@ Function receives an object, with following properties:
   - `env:SOME_ENV_VAR, null` (end with `, null`, if missing value at the variable source should be resolved with `null`, and not with a thrown error)
 - `resolveConfigurationProperty([key1, key2, ...keyN])` - Async function which resolves specific service configuration property. It returns a fully resolved value of configuration property. If circular reference is detected resolution will be rejected.
 
-Resolver function can be either _sync_ or _async_. Still both `resolveConfigurationProperty` and `resolveVariable` utils provided to it are _async_, so if there's an intention to rely on it naturally resolver function should be _async_.
+The resolver function can either be _sync_ or _async_. Note that both `resolveConfigurationProperty` and `resolveVariable` functions are async: if these functions are called, the resolver function must be async.
 
-Example on how to obtain some Serverless Framework configuration values:
+Here is an example of a resolver function:
 
 ```js
 // config.js
 module.exports = async ({ options, resolveVariable }) => {
+  // We can resolve other variables via `resolveVariable`
   const stage = await resolveVariable('sls:stage');
   const region = await resolveVariable('opt:region, self:provider.region, "us-east-1"');
   ...
 
   // Resolver may return any JSON value (null, boolean, string, number, array or plain object)
   return {
-    prop1: someValue // if we want to directly access this value, variable should be constructed as ${file(./config):prop1}
-    prop2: someOther value
+    prop1: 'someValue',
+    prop2: 'someOther value'
   }
 }
 ```
 
-You can also return an object and reference a specific property. Just make sure you are returning a valid object and referencing a valid property:
+It is possible to reference the resolver's returned value:
 
 ```yml
 # serverless.yml
 service: new-service
-provider: aws
-functions:
-  scheduledFunction:
-    handler: handler.scheduledFunction
-    events:
-      - schedule: ${file(./myCustomFile.js):schedule.ten}
-```
 
-```js
-// myCustomFile.js
-module.exports.schedule = () => {
-  // Code that generates dynamic data
-  return {
-    ten: 'rate(10 minutes)',
-    twenty: 'rate(20 minutes)',
-    thirty: 'rate(30 minutes)',
-  };
-};
+custom: ${file(./config.js)}
 ```
 
-If your use case requires handling dynamic/async data sources (ie. DynamoDB, API calls...etc), you can also return a Promise that would be resolved as the value of the variable:
+Or a single property (if the resolver returned an object):
 
 ```yml
 # serverless.yml
 service: new-service
-provider: aws
-functions:
-  scheduledFunction:
-    handler: handler.scheduledFunction
-    events:
-      - schedule: ${file(./myCustomFile.js):promised}
-```
 
-```js
-// myCustomFile.js
-module.exports.promised = () => {
-  // Async code that fetches the rate config...
-  return Promise.resolve('rate(10 minutes)');
-};
-```
-
-For example, in such helper you could call AWS SDK to get account details:
-
-```js
-// myCustomFile.js
-const { STS } = require('aws-sdk');
-const sts = new STS();
-
-module.exports.getAccountId = async () => {
-  // Checking AWS user details
-  const { Account } = await sts.getCallerIdentity().promise();
-  return Account;
-};
-```
-
-```yml
-# serverless.yml
-service: new-service
-provider: aws
 custom:
-  accountId: ${file(./myCustomFile.js):getAccountId}
+  foo: ${file(./config.js):prop1}
 ```
 
 ## Multiple Configuration Files

From 1cb6a2ff2d992239b54b1c298edea353a0b16882 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Wed, 19 Jan 2022 12:41:12 +0100
Subject: [PATCH 0907/1101] refactor: Remove `legacy` logs

---
 .github/ISSUE_TEMPLATE/bug-report.yml         |   2 +-
 commands/plugin-install.js                    |   9 +-
 commands/plugin-uninstall.js                  |   9 +-
 lib/aws/request.js                            |  17 +--
 lib/classes/ConfigSchemaHandler/index.js      |  48 +--------
 lib/classes/Error.js                          |  31 ------
 lib/classes/PluginManager.js                  |  25 +----
 lib/classes/Service.js                        |  14 +--
 lib/cli/handle-error.js                       |  56 +---------
 lib/cli/interactive-setup/aws-credentials.js  |  32 +-----
 lib/cli/interactive-setup/dashboard-login.js  |   6 --
 .../interactive-setup/dashboard-set-org.js    |  24 +----
 lib/cli/interactive-setup/deploy.js           | 100 +-----------------
 lib/cli/interactive-setup/index.js            |   3 +-
 lib/cli/interactive-setup/service.js          |  24 +----
 lib/cli/interactive-setup/utils.js            |   6 +-
 lib/cli/render-help/command.js                |   9 +-
 lib/cli/render-help/general.js                |  73 +------------
 lib/cli/render-help/generate-command-usage.js |  13 +--
 lib/cli/render-help/interactive-setup.js      |  11 +-
 lib/cli/render-help/options.js                |  13 +--
 lib/cli/render-version.js                     |   9 +-
 .../eventually-report-resolution-errors.js    |   7 +-
 lib/plugins/aws/configCredentials.js          |   4 +-
 lib/plugins/aws/customResources/index.js      |   3 +-
 lib/plugins/aws/deploy/lib/checkForChanges.js |  10 +-
 lib/plugins/aws/deploy/lib/cleanupS3Bucket.js |   3 +-
 lib/plugins/aws/deploy/lib/createStack.js     |   4 +-
 .../deploy/lib/ensure-valid-bucket-exists.js  |   7 +-
 .../aws/deploy/lib/extendedValidate.js        |   9 +-
 lib/plugins/aws/deploy/lib/uploadArtifacts.js |   8 +-
 .../aws/deploy/lib/validateTemplate.js        |   2 -
 lib/plugins/aws/deployFunction.js             |  12 +--
 lib/plugins/aws/deployList.js                 |  20 +---
 lib/plugins/aws/info/display.js               |  66 +-----------
 lib/plugins/aws/invokeLocal/index.js          |  35 +-----
 .../aws/lib/checkIfEcrRepositoryExists.js     |   7 +-
 lib/plugins/aws/lib/monitorStack.js           |  35 +-----
 lib/plugins/aws/lib/updateStack.js            |   4 +-
 lib/plugins/aws/metrics.js                    |  14 +--
 .../lib/hack/disassociateUsagePlan.js         |   3 +-
 .../compile/events/apiGateway/lib/validate.js |  10 +-
 .../aws/package/compile/events/cloudFront.js  |  16 +--
 .../aws/package/compile/events/httpApi.js     |  13 ---
 lib/plugins/aws/package/compile/functions.js  |   8 +-
 lib/plugins/aws/package/compile/layers.js     |   3 +-
 lib/plugins/aws/provider.js                   |  15 +--
 lib/plugins/aws/remove/lib/bucket.js          |   6 +-
 lib/plugins/aws/remove/lib/ecr.js             |   3 -
 lib/plugins/aws/remove/lib/stack.js           |   2 -
 lib/plugins/aws/rollback.js                   |   8 +-
 lib/plugins/aws/rollbackFunction.js           |   6 +-
 lib/plugins/config.js                         |  10 +-
 lib/plugins/create/create.js                  |  21 +---
 lib/plugins/install.js                        |   3 +-
 lib/plugins/package/lib/packageService.js     |   4 +-
 lib/plugins/package/lib/zipService.js         |   3 +-
 lib/plugins/package/package.js                |   2 -
 lib/plugins/plugin/lib/utils.js               |  17 +--
 lib/plugins/plugin/search.js                  |   5 +-
 lib/plugins/print.js                          |   3 +-
 lib/plugins/slstats.js                        |   4 +-
 lib/plugins/standalone.js                     |   6 +-
 lib/utils/downloadTemplateFromRepo.js         |   7 +-
 lib/utils/eventuallyUpdate.js                 |  17 +--
 lib/utils/logDeprecation.js                   |  52 +--------
 lib/utils/npmPackage/isWritable.js            |   6 +-
 lib/utils/openBrowser.js                      |   9 +-
 .../processBackendNotificationRequest.js      |   4 +-
 lib/utils/telemetry/index.js                  |  13 +--
 lib/utils/yamlAstParser.js                    |   5 +-
 scripts/serverless.js                         |  10 +-
 test/unit/lib/aws/request.test.js             |   2 -
 test/unit/lib/plugins/aws/provider.test.js    |  20 ----
 .../unit/lib/plugins/plugin/lib/utils.test.js |  31 ++----
 test/utils/integration.js                     |   1 -
 76 files changed, 101 insertions(+), 1031 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 49217c4ff9a..f8185afb5ff 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -60,7 +60,7 @@ body:
     attributes:
       label: Command output
       description: |
-        COMPLETE command output. Ensure SLS_DEBUG=* env var for verbose debug output
+        COMPLETE command output.
 
         If not applicable, fill with "N/A"
       render: shell
diff --git a/commands/plugin-install.js b/commands/plugin-install.js
index be1eb3756c2..f68bb4cb23f 100644
--- a/commands/plugin-install.js
+++ b/commands/plugin-install.js
@@ -8,7 +8,7 @@ const _ = require('lodash');
 const isPlainObject = require('type/plain-object/is');
 const yaml = require('js-yaml');
 const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
-const { legacy, log, progress, style } = require('@serverless/utils/log');
+const { log, progress, style } = require('@serverless/utils/log');
 const ServerlessError = require('../lib/serverless-error');
 const yamlAstParser = require('../lib/utils/yamlAstParser');
 const npmCommandDeferred = require('../lib/utils/npm-command-deferred');
@@ -37,7 +37,6 @@ module.exports = async ({ configuration, serviceDir, configurationFilename, opti
   await installPlugin(context);
   await addPluginToServerlessFile(context);
 
-  legacy.log(`Successfully installed "${pluginName}@${pluginVersion}"`);
   log.notice();
   log.notice.success(
     `Plugin "${pluginName}${
@@ -48,7 +47,6 @@ module.exports = async ({ configuration, serviceDir, configurationFilename, opti
 
 const installPlugin = async ({ serviceDir, pluginName, pluginVersion }) => {
   const pluginFullName = `${pluginName}@${pluginVersion}`;
-  legacy.log(`Installing plugin "${pluginFullName}" (this might take a few seconds...)`);
   await npmInstall(pluginFullName, { serviceDir });
 };
 
@@ -128,17 +126,12 @@ const npmInstall = async (name, { serviceDir }) => {
       shell: true,
     });
   } catch (error) {
-    legacy.write(error.stderrBuffer);
     log.error(String(error.stderrBuffer));
     throw error;
   }
 };
 
 const requestManualUpdate = (configurationFilePath) => {
-  legacy.log(`
-  Can't automatically add plugin into "${path.basename(configurationFilePath)}" file.
-  Please make it manually.
-`);
   log.notice();
   log.notice.skip(
     `Can't automatically add plugin into "${path.basename(
diff --git a/commands/plugin-uninstall.js b/commands/plugin-uninstall.js
index a56e422bcd0..996d8179061 100644
--- a/commands/plugin-uninstall.js
+++ b/commands/plugin-uninstall.js
@@ -8,7 +8,7 @@ const _ = require('lodash');
 const isPlainObject = require('type/plain-object/is');
 const yaml = require('js-yaml');
 const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
-const { legacy, log, progress, style } = require('@serverless/utils/log');
+const { log, progress, style } = require('@serverless/utils/log');
 const yamlAstParser = require('../lib/utils/yamlAstParser');
 const npmCommandDeferred = require('../lib/utils/npm-command-deferred');
 const {
@@ -32,7 +32,6 @@ module.exports = async ({ configuration, serviceDir, configurationFilename, opti
   await uninstallPlugin(context);
   await removePluginFromServerlessFile(context);
 
-  legacy.log(`Successfully uninstalled "${pluginName}"`);
   log.notice();
   log.notice.success(
     `Plugin "${pluginName}" uninstalled ${style.aside(
@@ -42,7 +41,6 @@ module.exports = async ({ configuration, serviceDir, configurationFilename, opti
 };
 
 const uninstallPlugin = async ({ serviceDir, pluginName }) => {
-  legacy.log(`Uninstalling plugin "${pluginName}" (this might take a few seconds...)`);
   await npmUninstall(pluginName, { serviceDir });
 };
 
@@ -108,17 +106,12 @@ const npmUninstall = async (name, { serviceDir }) => {
       stdio: 'pipe',
     });
   } catch (error) {
-    legacy.write(error.stderrBuffer);
     log.error(String(error.stderrBuffer));
     throw error;
   }
 };
 
 const requestManualUpdate = (configurationFilePath) => {
-  legacy.log(`
-  Can't automatically remove plugin from "${path.basename(configurationFilePath)}" file.
-  Please do it manually.
-`);
   log.notice();
   log.notice.skip(
     `Can't automatically remove plugin from "${path.basename(
diff --git a/lib/aws/request.js b/lib/aws/request.js
index c7a102a3f8d..a1da3c4cb3e 100644
--- a/lib/aws/request.js
+++ b/lib/aws/request.js
@@ -5,7 +5,7 @@ const memoize = require('memoizee');
 const PromiseQueue = require('promise-queue');
 const sdk = require('aws-sdk');
 const ServerlessError = require('../../lib/serverless-error');
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 const HttpsProxyAgent = require('https-proxy-agent');
 const url = require('url');
 const https = require('https');
@@ -20,7 +20,6 @@ const chalk = require('chalk');
 const awsLog = log.get('aws');
 sdk.config.logger = {
   log: (...args) => {
-    if (process.env.SLS_DEBUG) legacy.log(...args);
     awsLog.debug(...args);
   },
 };
@@ -96,7 +95,6 @@ const shouldS3Accelerate = (method, params) => {
     params &&
     params.isS3TransferAccelerationEnabled
   ) {
-    legacy.log('Using S3 Transfer Acceleration Endpoint...');
     log.notice('Using S3 Transfer Acceleration Endpoint...');
     return true;
   }
@@ -171,14 +169,6 @@ async function awsRequest(service, method, ...args) {
             `Try ${nextTryNum} of ${MAX_RETRIES}`,
           ].join(' ')
         );
-        legacy.log(
-          [
-            `Recoverable error occurred (${e.message}), sleeping for ~${Math.round(
-              backOff / 1000
-            )} seconds.`,
-            `Try ${nextTryNum} of ${MAX_RETRIES}`,
-          ].join(' ')
-        );
         await wait(backOff);
         return persistentRequest(f, nextTryNum);
       }
@@ -222,9 +212,12 @@ async function awsRequest(service, method, ...args) {
           if (typeof err.code === 'number') return `HTTP_${err.code}_ERROR`;
           return normalizeErrorCodePostfix(err.code);
         })();
+        if (err.stack) {
+          log.debug(`${err.stack}\n${'-'.repeat(100)}`);
+        }
         throw Object.assign(
           new ServerlessError(
-            process.env.SLS_DEBUG && err.stack ? `${err.stack}\n${'-'.repeat(100)}` : message,
+            message,
             `AWS_${normalizeErrorCodePostfix(service.name)}_${normalizeErrorCodePostfix(
               method
             )}_${providerErrorCodeExtension}`
diff --git a/lib/classes/ConfigSchemaHandler/index.js b/lib/classes/ConfigSchemaHandler/index.js
index f9de5081b8b..a9f48454eeb 100644
--- a/lib/classes/ConfigSchemaHandler/index.js
+++ b/lib/classes/ConfigSchemaHandler/index.js
@@ -6,11 +6,10 @@ const schema = require('../../configSchema');
 const ServerlessError = require('../../serverless-error');
 const normalizeAjvErrors = require('./normalizeAjvErrors');
 const resolveAjvValidate = require('./resolveAjvValidate');
-const { legacy, log, style } = require('@serverless/utils/log');
+const { log, style } = require('@serverless/utils/log');
 
 const FUNCTION_NAME_PATTERN = '^[a-zA-Z0-9-_]+$';
 const ERROR_PREFIX = 'Configuration error';
-const WARNING_PREFIX = 'Configuration warning';
 
 const normalizeSchemaObject = (object, instanceSchema) => {
   for (const [key, value] of Object.entries(object)) {
@@ -79,31 +78,6 @@ class ConfigSchemaHandler {
     if (!this.schema.properties.provider.properties.name) {
       configurationValidationResults.set(this.serverless.configurationInput, false);
       if (this.serverless.service.configValidationMode !== 'off') {
-        legacy.log(
-          `${WARNING_PREFIX}: Unrecognized provider '${this.serverless.service.provider.name}'`,
-          'Serverless',
-          { color: 'orange' }
-        );
-        legacy.log(' ');
-        legacy.log(
-          "You're relying on provider plugin which doesn't " +
-            'provide a validation schema for its config.',
-          'Serverless',
-          { color: 'orange' }
-        );
-        legacy.log(
-          'Please report the issue at its bug tracker linking: ' +
-            'https://www.serverless.com/framework/docs/providers/aws/guide/plugins#extending-validation-schema',
-          'Serverless',
-          { color: 'orange' }
-        );
-        legacy.log(
-          'You may turn off this message with "configValidationMode: off" setting',
-          'Serverless',
-          { color: 'orange' }
-        );
-        legacy.log(' ');
-
         log.warning(
           [
             `You're relying on provider "${this.serverless.service.provider.name}" defined by a plugin which doesn't provide a validation schema for its config.`,
@@ -147,26 +121,6 @@ class ConfigSchemaHandler {
           'INVALID_NON_SCHEMA_COMPLIANT_CONFIGURATION'
         );
       } else {
-        if (messages.length === 1) {
-          legacy.log(`${WARNING_PREFIX} ${messages[0]}`, 'Serverless', {
-            color: 'orange',
-          });
-        } else {
-          legacy.log(`${WARNING_PREFIX}:`, 'Serverless', {
-            color: 'orange',
-          });
-          for (const message of messages) {
-            legacy.log(`  ${message}`, 'Serverless', { color: 'orange' });
-          }
-        }
-        legacy.log(' ');
-        legacy.log(
-          'Learn more about configuration validation here: http://slss.io/configuration-validation',
-          'Serverless',
-          { color: 'orange' }
-        );
-        legacy.log(' ');
-
         log.notice();
         log.warning(
           [
diff --git a/lib/classes/Error.js b/lib/classes/Error.js
index a1785ae8e07..73d52a3e479 100644
--- a/lib/classes/Error.js
+++ b/lib/classes/Error.js
@@ -1,39 +1,8 @@
 'use strict';
 
-const chalk = require('chalk');
 const ServerlessError = require('../serverless-error');
-const { legacy } = require('@serverless/utils/log');
-
-const writeMessage = (title, message) => {
-  let line = '';
-  while (line.length < 56 - title.length) {
-    line = `${line}-`;
-  }
-
-  legacy.consoleLog(' ');
-  legacy.consoleLog(chalk.yellow(` ${title} ${line}`));
-  legacy.consoleLog(' ');
-
-  if (message) {
-    legacy.consoleLog(`  ${message.split('\n').join('\n  ')}`);
-  }
-
-  legacy.consoleLog(' ');
-};
 
 module.exports.ServerlessError = ServerlessError;
 
 // Deprecated - use ServerlessError instead
 module.exports.SError = ServerlessError;
-
-module.exports.logWarning = (message) => {
-  if (process.env.SLS_WARNING_DISABLE) {
-    return;
-  }
-
-  writeMessage('Serverless Warning', message);
-};
-
-module.exports.logInfo = (message) => {
-  writeMessage('Serverless Information', message);
-};
diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 6b93f5526d2..ac9a0f9a24f 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -9,7 +9,7 @@ const renderCommandHelp = require('../cli/render-help/command');
 const processBackendNotificationRequest = require('../utils/processBackendNotificationRequest');
 const tokenizeException = require('../utils/tokenize-exception');
 const getRequire = require('../utils/get-require');
-const { legacy, log, getPluginWriters } = require('@serverless/utils/log');
+const { log, getPluginWriters } = require('@serverless/utils/log');
 
 const mergeCommands = (target, source) => {
   if (!target) return source;
@@ -325,7 +325,6 @@ class PluginManager {
 
   loadCommand(pluginName, details, key, isEntryPoint) {
     const commandIsEntryPoint = details.type === 'entrypoint' || isEntryPoint;
-    if (process.env.SLS_DEBUG && !commandIsEntryPoint) legacy.log(`Load command ${key}`);
     log.get('lifecycle:command:register').debug(key);
     // Check if there is already an alias for the same path as the command
     const aliasCommand = this.getAliasCommandTarget(key.split(':'));
@@ -341,9 +340,6 @@ class PluginManager {
     );
     // Handle command aliases
     (details.aliases || []).forEach((alias) => {
-      if (process.env.SLS_DEBUG) {
-        legacy.log(`  -> @${alias}`);
-      }
       log.get('lifecycle:command:register').debug(`  -> @${alias}`);
       this.createCommandAlias(alias, key);
     });
@@ -374,10 +370,6 @@ class PluginManager {
         const baseEvent = event.replace(/^(?:after:|before:)/, '');
         if (this.deprecatedEvents[baseEvent]) {
           const redirectedEvent = this.deprecatedEvents[baseEvent];
-          if (process.env.SLS_DEBUG) {
-            legacy.log(`WARNING: Plugin ${pluginName} uses deprecated hook ${event},
-                     use ${redirectedEvent} hook instead`);
-          }
           log.info(
             `Plugin "${pluginName}" uses deprecated hook "${event}". Use "${redirectedEvent}" hook instead.`
           );
@@ -548,13 +540,6 @@ class PluginManager {
           !hooksLength ? ' (noop due to no registered hooks)' : ''
         }`
       );
-    if (process.env.SLS_DEBUG) {
-      legacy.log(`Invoke ${commandsArray.join(':')}`);
-      if (hooksLength === 0) {
-        const warningMessage = 'Warning: The command you entered did not catch on any hooks';
-        legacy.log(warningMessage);
-      }
-    }
 
     try {
       for (const {
@@ -567,9 +552,6 @@ class PluginManager {
       }
     } catch (error) {
       if (error instanceof TerminateHookChain) {
-        if (process.env.SLS_DEBUG) {
-          legacy.log(`Terminate ${commandsArray.join(':')}`);
-        }
         log.debug(`Terminate ${commandsArray.join(':')}`);
         return;
       }
@@ -611,11 +593,6 @@ class PluginManager {
         for (const { hook } of this.hooks.error || []) await hook(commandException);
       } catch (errorHookException) {
         const errorHookExceptionMeta = tokenizeException(errorHookException);
-        legacy.log(
-          `Warning: "error" hook crashed with: ${
-            errorHookExceptionMeta.stack || errorHookExceptionMeta.message
-          }`
-        );
         log.warning(
           `The "error" hook crashed with:\n${
             errorHookExceptionMeta.stack || errorHookExceptionMeta.message
diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index f0f3e4e54b7..19aa5242b47 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -1,10 +1,10 @@
 'use strict';
 
-const { ServerlessError, logWarning } = require('./Error');
+const { ServerlessError } = require('./Error');
 const util = require('util');
 const _ = require('lodash');
 const semver = require('semver');
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 const resolveCliInput = require('../cli/resolve-input');
 const currentVersion = require('../../package').version;
 const isLocallyInstalled = require('../cli/is-locally-installed');
@@ -132,9 +132,6 @@ class Service {
           'INVALID_FRAMEWORK_VERSION'
         );
       }
-      logWarning(
-        'Configured "frameworkVersion" does not represent a valid semver version range, version validation is skipped'
-      );
       log.warning(
         'Configured "frameworkVersion" does not represent a valid semver version range, version validation is skipped'
       );
@@ -146,13 +143,6 @@ class Service {
           'service configuration ' +
           `(recommended setup: "frameworkVersion: ^${currentVersion}")\n`
       );
-      if (process.env.SLS_DEBUG) {
-        legacy.log(
-          'To ensure safe major version upgrades ensure "frameworkVersion" setting in ' +
-            'service configuration ' +
-            `(recommended setup: "frameworkVersion: ^${currentVersion}")\n`
-        );
-      }
     }
     if (
       ymlVersion &&
diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index e9af337938b..10a4c6f4919 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -1,12 +1,11 @@
 'use strict';
 
 const isObject = require('type/object/is');
-const chalk = require('chalk');
 const stripAnsi = require('strip-ansi');
 const sfeVersion = require('@serverless/dashboard-plugin/package.json').version;
 const { platformClientVersion } = require('@serverless/dashboard-plugin');
 const { getDashboardProvidersUrl } = require('@serverless/dashboard-plugin/lib/dashboard');
-const { style, writeText, legacy } = require('@serverless/utils/log');
+const { style, writeText } = require('@serverless/utils/log');
 const slsVersion = require('./../../package').version;
 const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
 const tokenizeException = require('../utils/tokenize-exception');
@@ -17,23 +16,6 @@ const { storeLocally: storeTelemetryLocally, send: sendTelemetry } = require('..
 const generateTelemetryPayload = require('../utils/telemetry/generatePayload');
 const resolveErrorLocation = require('../utils/telemetry/resolve-error-location');
 
-const writeMessage = (title, message) => {
-  let line = '';
-  while (line.length < 56 - title.length) {
-    line = `${line}-`;
-  }
-
-  legacy.consoleLog(' ');
-  legacy.consoleLog(chalk.yellow(` ${title} ${line}`));
-  legacy.consoleLog(' ');
-
-  if (message) {
-    legacy.consoleLog(`  ${message.split('\n').join('\n  ')}`);
-  }
-
-  legacy.consoleLog(' ');
-};
-
 const isErrorCodeNormative = RegExp.prototype.test.bind(/^[A-Z][A-Z0-9]*(?:_[A-Z0-9]+)*$/);
 
 module.exports = async (exception, options = {}) => {
@@ -51,23 +33,6 @@ module.exports = async (exception, options = {}) => {
   const exceptionTokens = tokenizeException(exception);
   const isUserError = !isUncaughtException && exceptionTokens.isUserError;
 
-  writeMessage(
-    exceptionTokens.title,
-    exceptionTokens.stack && (!isUserError || process.env.SLS_DEBUG)
-      ? exceptionTokens.stack
-      : exceptionTokens.message
-  );
-
-  if (!isUserError && !process.env.SLS_DEBUG) {
-    const debugInfo = [
-      '    ',
-      ' For debugging logs, run again after setting the',
-      ' "SLS_DEBUG=*" environment variable.',
-    ].join('');
-    legacy.consoleLog(chalk.red(debugInfo));
-    legacy.consoleLog(' ');
-  }
-
   const platform = process.platform;
   const nodeVersion = process.version.replace(/^[v|V]/, '');
   const installationModePostfix = (() => {
@@ -126,25 +91,6 @@ module.exports = async (exception, options = {}) => {
     );
   writeText(null, style.error('Error:'), errorMsg);
 
-  legacy.consoleLog(chalk.yellow('  Get Support --------------------------------------------'));
-  legacy.consoleLog(`${chalk.yellow('     Docs:          ')}docs.serverless.com`);
-  legacy.consoleLog(
-    `${chalk.yellow('     Bugs:          ')}github.com/serverless/serverless/issues`
-  );
-  legacy.consoleLog(`${chalk.yellow('     Issues:        ')}forum.serverless.com`);
-
-  legacy.consoleLog(' ');
-  legacy.consoleLog(chalk.yellow('  Your Environment Information ---------------------------'));
-  legacy.consoleLog(chalk.yellow(`     Operating System:          ${platform}`));
-  legacy.consoleLog(chalk.yellow(`     Node Version:              ${nodeVersion}`));
-
-  legacy.consoleLog(
-    chalk.yellow(`     Framework Version:         ${slsVersion}${installationModePostfix}`)
-  );
-  legacy.consoleLog(chalk.yellow(`     Plugin Version:            ${sfeVersion}`));
-  legacy.consoleLog(chalk.yellow(`     SDK Version:               ${platformClientVersion}`));
-  legacy.consoleLog(' ');
-
   await logDeprecation.printSummary();
 
   if (!isTelemetryDisabled && hasTelemetryBeenReported === false) {
diff --git a/lib/cli/interactive-setup/aws-credentials.js b/lib/cli/interactive-setup/aws-credentials.js
index ee4e572dfdd..b0ae2827232 100644
--- a/lib/cli/interactive-setup/aws-credentials.js
+++ b/lib/cli/interactive-setup/aws-credentials.js
@@ -1,7 +1,6 @@
 'use strict';
 
-const chalk = require('chalk');
-const { legacy, log, style, progress } = require('@serverless/utils/log');
+const { log, style, progress } = require('@serverless/utils/log');
 const _ = require('lodash');
 const inquirer = require('@serverless/utils/inquirer');
 const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-history');
@@ -158,10 +157,6 @@ const credentialsSetupChoice = async (context, providers) => {
 
 const steps = {
   writeOnSetupSkip: () => {
-    legacy.write(`\nYou can setup your AWS account later. More details available here:
-
-  http://slss.io/aws-creds-setup\n`);
-
     log.notice();
     log.notice.skip(
       `You can setup your AWS account later. More details available here: ${style.link(
@@ -194,13 +189,6 @@ const steps = {
     const accessKeyId = await awsAccessKeyIdInput(context);
     const secretAccessKey = await awsSecretAccessKeyInput(context);
     await awsCredentials.saveFileProfiles(new Map([['default', { accessKeyId, secretAccessKey }]]));
-    legacy.write(
-      `\n${chalk.green(
-        `AWS credentials saved on your machine at ${chalk.bold(
-          process.platform === 'win32' ? '%userprofile%\\.aws\\credentials' : '~/.aws/credentials'
-        )}. Go there to change them at any time.`
-      )}\n`
-    );
     log.notice();
     log.notice.success(
       `AWS credentials saved on your machine at "${
@@ -211,9 +199,7 @@ const steps = {
   handleProviderCreation: async ({ configuration: { org: orgName }, stepHistory }) => {
     const providersUrl = `https://app.serverless.com/${orgName}/settings/providers?source=cli&providerId=new&provider=aws`;
     openBrowser(providersUrl);
-    legacy.write('To learn more about providers, visit: http://slss.io/add-providers-dashboard\n');
     log.notice('To learn more about providers, visit: http://slss.io/add-providers-dashboard');
-    legacy.write('\nWaiting for creation of AWS Access Role provider...\n');
 
     const providerProgress = progress.get('provider');
     providerProgress.notice('Waiting for creation of AWS Access Role provider');
@@ -285,14 +271,10 @@ const steps = {
 
     log.notice();
     if (maybeEvent) {
-      legacy.write(`\n${chalk.green('AWS Access Role provider was successfully created')}\n`);
       log.notice.success('AWS Access Role provider was successfully created');
       return maybeEvent.data.object.provider_uid;
     }
 
-    legacy.write(
-      '\nSkipping credentials provider setup. You can still setup credentials provider later.\n'
-    );
     log.notice.skip(
       'Skipping credentials provider setup. You can still setup credentials provider later.'
     );
@@ -310,7 +292,6 @@ const steps = {
       orgUid = await getOrgUidByName(org);
     } catch (err) {
       if (err.code === 'DASHBOARD_UNAVAILABLE') {
-        legacy.write(`\n${chalk.yellow(err.message)}\n`);
         log.error();
         log.error(err.message);
         return false;
@@ -322,11 +303,6 @@ const steps = {
       return true;
     } catch (err) {
       if (err.statusCode && err.statusCode >= 500) {
-        legacy.write(
-          `\n${chalk.yellow(
-            'Serverless Dashboard is currently unavailable, please try again later'
-          )}\n`
-        );
         log.error();
         log.error('Serverless Dashboard is currently unavailable, please try again later');
         return false;
@@ -368,7 +344,6 @@ module.exports = {
         providers = await getProviders(orgName);
       } catch (err) {
         if (err.code === 'DASHBOARD_UNAVAILABLE') {
-          legacy.write(`\n${chalk.yellow(err.message)}\n`);
           log.error();
           log.error(err.message);
           return false;
@@ -406,7 +381,6 @@ module.exports = {
         providers = await getProviders(context.configuration.org);
       } catch (err) {
         if (err.code === 'DASHBOARD_UNAVAILABLE') {
-          legacy.write(`\n${chalk.yellow(err.message)}\n`);
           log.error();
           log.error(err.message);
           return;
@@ -434,7 +408,6 @@ module.exports = {
         return;
       } catch (err) {
         if (err.code === 'DASHBOARD_UNAVAILABLE') {
-          legacy.write(`\n${chalk.yellow(err.message)}\n`);
           log.error();
           log.error(err.message);
           return;
@@ -459,9 +432,6 @@ module.exports = {
     });
 
     if (linked) {
-      legacy.write(
-        `\n${chalk.green('Selected provider was successfully linked to your service')}\n`
-      );
       log.notice();
       log.notice.success('Selected provider was successfully linked to your service');
     }
diff --git a/lib/cli/interactive-setup/dashboard-login.js b/lib/cli/interactive-setup/dashboard-login.js
index b862cfe3b02..424082fd39b 100644
--- a/lib/cli/interactive-setup/dashboard-login.js
+++ b/lib/cli/interactive-setup/dashboard-login.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const _ = require('lodash');
-const { legacy } = require('@serverless/utils/log');
 const { ServerlessSDK } = require('@serverless/platform-client');
 const login = require('@serverless/dashboard-plugin/lib/login');
 const configUtils = require('@serverless/utils/config');
@@ -70,11 +69,6 @@ module.exports = {
   },
   async run(context) {
     const isOrgProvided = context.options.org || context.configuration.org;
-    if (!isOrgProvided) {
-      legacy.write(
-        'Enable Serverless Dashboard to get enhanced monitoring, logs and secrets management: https://serverless.com/monitoring\n\n'
-      );
-    }
 
     if (
       context.initial.isInServiceContext &&
diff --git a/lib/cli/interactive-setup/dashboard-set-org.js b/lib/cli/interactive-setup/dashboard-set-org.js
index e46b55bc783..b5b48e2d8fc 100644
--- a/lib/cli/interactive-setup/dashboard-set-org.js
+++ b/lib/cli/interactive-setup/dashboard-set-org.js
@@ -2,7 +2,7 @@
 
 const _ = require('lodash');
 const chalk = require('chalk');
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 const accountUtils = require('@serverless/utils/account');
 const configUtils = require('@serverless/utils/config');
 const { ServerlessSDK } = require('@serverless/platform-client');
@@ -16,9 +16,6 @@ const {
 const isValidAppName = RegExp.prototype.test.bind(/^[a-z0-9](?:[a-z0-9-]{0,126}[a-z0-9])?$/);
 
 const orgUpdateConfirm = async (stepHistory) => {
-  legacy.write(
-    "Service has monitoring enabled, but it is configured with the 'org' to which you do not have access\n\n"
-  );
   log.notice(
     'Service has monitoring enabled, but it is configured with the "org" to which you do not have access'
   );
@@ -33,7 +30,6 @@ const orgUpdateConfirm = async (stepHistory) => {
 };
 
 const appUpdateConfirm = async (appName, orgName, stepHistory) => {
-  legacy.write('The "app" used in this Service does not yet exist in your Organization.\n\n');
   log.notice('The "app" used in this Service does not yet exist in your Organization.');
   log.notice();
 
@@ -192,11 +188,6 @@ const steps = {
         return;
       }
     }
-    legacy.write(
-      `\n${chalk.green('Your project has been setup with org ')}${chalk.white.bold(
-        orgName
-      )}${chalk.green(' and app ')}${chalk.white.bold(appName)}\n`
-    );
     log.notice();
     log.notice.success(`Your project has been setup with org "${orgName}" and app "${appName}"`);
     await writeOrgAndApp(orgName, appName, context);
@@ -292,11 +283,6 @@ module.exports = {
           };
         }
         if (options.app) {
-          legacy.write(
-            chalk.red(
-              "\nPassed value for `--app` doesn't seem to correspond to chosen organization.\n"
-            )
-          );
           log.error();
           log.error('Passed value for "--app" doesn\'t seem to correspond to chosen organization.');
         }
@@ -322,19 +308,11 @@ module.exports = {
       };
     } else if (orgName) {
       if (options.org) {
-        legacy.write(
-          chalk.red(
-            "\nPassed value for `--org` doesn't seem to correspond to account with which you're logged in with.\n"
-          )
-        );
         log.error();
         log.error(
           'Passed value for "--org" doesn\'t seem to correspond to account with which you\'re logged in with.'
         );
       } else {
-        legacy.write(
-          chalk.red(`\nConfigured org '${orgName}' is not available in your account.\n`)
-        );
         log.error();
         log.error(`Configured org "${orgName}" is not available in your account.`);
       }
diff --git a/lib/cli/interactive-setup/deploy.js b/lib/cli/interactive-setup/deploy.js
index 837aae7e400..57443b69f70 100644
--- a/lib/cli/interactive-setup/deploy.js
+++ b/lib/cli/interactive-setup/deploy.js
@@ -1,22 +1,14 @@
 'use strict';
 
 const Serverless = require('../../Serverless');
-const chalk = require('chalk');
-const { legacy, writeText, style } = require('@serverless/utils/log');
+const { writeText, style } = require('@serverless/utils/log');
 const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-history');
 const { doesServiceInstanceHaveLinkedProvider } = require('./utils');
 const _ = require('lodash');
-const { getDashboardInteractUrl } = require('@serverless/dashboard-plugin/lib/dashboard');
 const AWS = require('aws-sdk');
 const isAuthenticated = require('@serverless/dashboard-plugin/lib/isAuthenticated');
 
-const printMessage = ({
-  serviceName,
-  hasBeenDeployed,
-  dashboardPlugin,
-  isConfiguredWithDashboard,
-  initialContext,
-}) => {
+const printMessage = () => {
   writeText(
     null,
     style.aside('What next?'),
@@ -27,76 +19,6 @@ const printMessage = ({
     `serverless invoke    ${style.aside('Invoke deployed functions')}`,
     `serverless --help    ${style.aside('Discover more commands')}`
   );
-
-  const projectInformationSuffix = initialContext.isInServiceContext
-    ? ''
-    : `${chalk.green(' and available in ')}${chalk.white.bold(`./${serviceName}`)}`;
-
-  if (isConfiguredWithDashboard) {
-    if (hasBeenDeployed) {
-      legacy.write(
-        [
-          `\n${chalk.green('Your project is live')}${projectInformationSuffix}`,
-          `\n  Run ${chalk.bold('serverless info')} in the project directory`,
-          '    View your endpoints and services',
-          `\n  Open ${chalk.bold(getDashboardInteractUrl(dashboardPlugin))}`,
-          '    Invoke your functions and view logs in the dashboard',
-          `\n  Run ${chalk.bold('serverless deploy')} in the project directory`,
-          "    Redeploy your service after you've updated your service code or configuration\n\n",
-        ].join('\n')
-      );
-
-      return;
-    }
-
-    legacy.write(
-      [
-        `\n${chalk.green('Your project is ready for deployment')}${projectInformationSuffix}`,
-        `\n  Run ${chalk.bold('serverless deploy')} in the project directory`,
-        '    Deploy your newly created service',
-        `\n  Run ${chalk.bold('serverless info')} in the project directory after deployment`,
-        '    View your endpoints and services',
-        '\n  Open Serverless Dashboard after deployment',
-        '    Invoke your functions and view logs in the dashboard\n\n',
-      ].join('\n')
-    );
-    return;
-  }
-
-  if (hasBeenDeployed) {
-    legacy.write(
-      [
-        `\n${chalk.green('Your project is live')}${projectInformationSuffix}`,
-        `\n  Run ${chalk.bold('serverless info')} in the project directory`,
-        '    View your endpoints and services',
-        `\n  Run ${chalk.bold('serverless deploy')} in the directory`,
-        "    Redeploy your service after you've updated your service code or configuration",
-        `\n  Run ${chalk.bold('serverless invoke')} and ${chalk.bold(
-          'serverless logs'
-        )} in the project directory`,
-        '    Invoke your functions directly and view the logs',
-        `\n  Run ${chalk.bold('serverless')} in the project directory`,
-        '    Add metrics, alerts, and a log explorer, by enabling the dashboard functionality\n\n',
-      ].join('\n')
-    );
-    return;
-  }
-
-  legacy.write(
-    [
-      `\n${chalk.green('Your project is ready for deployment')}${projectInformationSuffix}`,
-      `\n  Run ${chalk.bold('serverless deploy')} in the project directory`,
-      '    Deploy your newly created service',
-      `\n  Run ${chalk.bold('serverless info')} in the project directory after deployment`,
-      '    View your endpoints and services',
-      `\n  Run ${chalk.bold('serverless invoke')} and ${chalk.bold(
-        'serverless logs'
-      )} in the project directory after deployment`,
-      '    Invoke your functions directly and view the logs',
-      `\n  Run ${chalk.bold('serverless')} in the project directory`,
-      '    Add metrics, alerts, and a log explorer, by enabling the dashboard functionality\n\n',
-    ].join('\n')
-  );
 };
 
 module.exports = {
@@ -131,8 +53,7 @@ module.exports = {
     return false;
   },
   async run(context) {
-    const { initial, configuration, configurationFilename, serviceDir, stepHistory } = context;
-    const serviceName = configuration.service;
+    const { configuration, configurationFilename, serviceDir, stepHistory } = context;
     const shouldDeploy = await promptWithHistory({
       name: 'shouldDeploy',
       message: 'Do you want to deploy your project?',
@@ -140,12 +61,7 @@ module.exports = {
       type: 'confirm',
     });
     if (!shouldDeploy) {
-      printMessage({
-        initialContext: initial,
-        serviceName,
-        hasBeenDeployed: false,
-        isConfiguredWithDashboard: Boolean(configuration.org),
-      });
+      printMessage();
       return;
     }
 
@@ -162,13 +78,7 @@ module.exports = {
     await serverless.run();
     context.serverless = serverless;
 
-    printMessage({
-      initialContext: initial,
-      serviceName,
-      hasBeenDeployed: true,
-      isConfiguredWithDashboard: Boolean(configuration.org),
-      dashboardPlugin: serverless.pluginManager.dashboardPlugin,
-    });
+    printMessage();
   },
   configuredQuestions: ['shouldDeploy'],
 };
diff --git a/lib/cli/interactive-setup/index.js b/lib/cli/interactive-setup/index.js
index 2c12edcda86..697a3214b75 100644
--- a/lib/cli/interactive-setup/index.js
+++ b/lib/cli/interactive-setup/index.js
@@ -2,7 +2,7 @@
 
 const inquirer = require('@serverless/utils/inquirer');
 const { StepHistory } = require('@serverless/utils/telemetry');
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 const { resolveInitialContext } = require('./utils');
 
 const steps = {
@@ -49,7 +49,6 @@ module.exports = async (context) => {
       timestamp: Date.now(),
     });
     if (stepData) {
-      legacy.write('\n');
       log.notice();
       context.stepHistory = new StepHistory();
       context.history.set(stepName, context.stepHistory);
diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index fe50c860cee..d93822c3df8 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -1,11 +1,10 @@
 'use strict';
 
 const { join } = require('path');
-const chalk = require('chalk');
 const fsp = require('fs').promises;
 const spawn = require('child-process-ext/spawn');
 const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-history');
-const { legacy, log, progress } = require('@serverless/utils/log');
+const { log, progress } = require('@serverless/utils/log');
 const resolveConfigurationPath = require('../resolve-configuration-path');
 const readConfiguration = require('../../configuration/read');
 const resolveVariables = require('../../configuration/variables');
@@ -163,11 +162,10 @@ module.exports = {
       });
       projectDir = join(workingDir, projectName);
       const templateUrl = context.options['template-url'];
-      legacy.write(`\nDownloading template from provided url: ${templateUrl}...\n`);
       const downloadProgress = progress.get('template-download');
       downloadProgress.notice(`Downloading template from provided url: ${templateUrl}`);
       try {
-        await downloadTemplateFromRepo(templateUrl, null, projectName, { silent: true });
+        await downloadTemplateFromRepo(templateUrl, null, projectName);
       } catch (err) {
         if (err.constructor.name !== 'ServerlessError') throw err;
 
@@ -184,10 +182,6 @@ module.exports = {
       } else {
         projectType = await projectTypeChoice(context.stepHistory);
         if (projectType === 'other') {
-          legacy.write(
-            '\nRun “serverless create --help” to view available templates and create a new project ' +
-              'from one of those templates.\n'
-          );
           log.notice();
           log.notice(
             'Run "serverless create --help" to view available templates and create a new project ' +
@@ -204,11 +198,10 @@ module.exports = {
       });
       projectDir = join(workingDir, projectName);
       const templateUrl = `https://github.com/serverless/examples/tree/v3/${projectType}`;
-      legacy.write(`\nDownloading "${projectType}" template...\n`);
       const downloadProgress = progress.get('template-download');
       downloadProgress.notice(`Downloading "${projectType}" template`);
       try {
-        await downloadTemplateFromRepo(templateUrl, projectType, projectName, { silent: true });
+        await downloadTemplateFromRepo(templateUrl, projectType, projectName);
       } catch (err) {
         if (err.code === 'ENOENT' && context.options.template) {
           throw new ServerlessError(
@@ -236,7 +229,6 @@ module.exports = {
     }
 
     if (hasPackageJson) {
-      legacy.write(`\nInstalling dependencies with "npm" in "${projectName}" folder\n`);
       const installProgress = progress.get('npm-install');
       installProgress.notice(`Installing dependencies with "npm" in "${projectName}" folder`);
       const { command, args } = await npmCommandDeferred;
@@ -244,11 +236,6 @@ module.exports = {
         await spawn(command, [...args, 'install'], { cwd: projectDir });
       } catch (err) {
         if (err.code === 'ENOENT') {
-          legacy.write(
-            `\n${chalk.yellow(
-              'Cannot install dependencies as "npm" installation could not be found. Please install npm and run "npm install" in directory of created service.'
-            )}\n`
-          );
           log.warning();
           log.warning(
             'Cannot install dependencies as "npm" installation could not be found. Please install npm and run "npm install" in directory of created service.'
@@ -270,11 +257,6 @@ module.exports = {
       // pass
     }
 
-    legacy.write(
-      `\n${chalk.green(
-        `Project successfully created in ${chalk.white.bold(projectName)} folder`
-      )}\n`
-    );
     log.notice();
     log.notice.success(`Project successfully created in ${projectName} folder`);
     context.serviceDir = projectDir;
diff --git a/lib/cli/interactive-setup/utils.js b/lib/cli/interactive-setup/utils.js
index be0bd3eab50..54d5a8a0d7a 100644
--- a/lib/cli/interactive-setup/utils.js
+++ b/lib/cli/interactive-setup/utils.js
@@ -3,7 +3,7 @@
 const path = require('path');
 const memoizee = require('memoizee');
 const inquirer = require('@serverless/utils/inquirer');
-const { log, legacy } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 const resolveProviderCredentials = require('@serverless/dashboard-plugin/lib/resolveProviderCredentials');
 const isAuthenticated = require('@serverless/dashboard-plugin/lib/isAuthenticated');
 const hasLocalCredentials = require('../../aws/has-local-credentials');
@@ -73,10 +73,6 @@ module.exports = {
     })();
 
     if (!ymlString) {
-      legacy.write(
-        'Add the following settings to your serverless configuration file:\n\n' +
-          `org: ${orgName}\napp: ${appName}\n`
-      );
       log.notice(
         'Add the following settings to your serverless configuration file:\n\n' +
           `org: ${orgName}\napp: ${appName}`
diff --git a/lib/cli/render-help/command.js b/lib/cli/render-help/command.js
index 8d06e024c7e..58bdbc3fcbe 100644
--- a/lib/cli/render-help/command.js
+++ b/lib/cli/render-help/command.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { legacy, writeText } = require('@serverless/utils/log');
+const { writeText } = require('@serverless/utils/log');
 const resolveInput = require('../resolve-input');
 const renderOptionsHelp = require('./options');
 
@@ -11,16 +11,13 @@ module.exports = (commandName) => {
   const commandSchema = commandsSchema.get(commandName);
 
   if (commandSchema) {
-    legacy.write(`${generateCommandUsage(commandName, commandSchema)}\n`);
-    writeText(generateCommandUsage(commandName, commandSchema, { isModern: true }));
+    writeText(generateCommandUsage(commandName, commandSchema));
   }
   for (const [subCommandName, subCommandSchema] of commandsSchema) {
     if (!subCommandName.startsWith(`${commandName} `)) continue;
-    legacy.write(`${generateCommandUsage(subCommandName, subCommandSchema)}\n`);
-    writeText(generateCommandUsage(subCommandName, subCommandSchema, { isModern: true }));
+    writeText(generateCommandUsage(subCommandName, subCommandSchema));
   }
   if (commandSchema) renderOptionsHelp(Object.assign({}, commandSchema.options));
 
-  legacy.consoleLog('');
   writeText();
 };
diff --git a/lib/cli/render-help/general.js b/lib/cli/render-help/general.js
index 2ff73499084..b7471a00525 100644
--- a/lib/cli/render-help/general.js
+++ b/lib/cli/render-help/general.js
@@ -1,7 +1,6 @@
 'use strict';
 
-const chalk = require('chalk');
-const { legacy, writeText, style } = require('@serverless/utils/log');
+const { writeText, style } = require('@serverless/utils/log');
 const { version } = require('../../../package');
 const globalOptions = require('../commands-schema/common-options/global');
 const resolveInput = require('../resolve-input');
@@ -45,7 +44,7 @@ module.exports = (loadedPlugins) => {
   if (mainCommands.size) {
     writeText(null, style.aside('Main commands'));
     for (const [commandName, commandSchema] of mainCommands) {
-      writeText(generateCommandUsage(commandName, commandSchema, { isModern: true }));
+      writeText(generateCommandUsage(commandName, commandSchema));
     }
     writeText(null, style.aside('Other commands'));
   } else {
@@ -64,7 +63,7 @@ module.exports = (loadedPlugins) => {
     }
     if (commandSchema.groupName === 'main') continue;
 
-    writeText(generateCommandUsage(commandName, commandSchema, { isModern: true }));
+    writeText(generateCommandUsage(commandName, commandSchema));
   }
 
   if (loadedPlugins.size) {
@@ -72,74 +71,10 @@ module.exports = (loadedPlugins) => {
       for (const [plugin, pluginCommandsSchema] of extensionCommandsSchema) {
         writeText(null, style.aside(plugin.constructor.name));
         for (const [commandName, commandSchema] of pluginCommandsSchema) {
-          writeText(generateCommandUsage(commandName, commandSchema, { isModern: true }));
+          writeText(generateCommandUsage(commandName, commandSchema));
         }
       }
     }
   }
   writeText();
-
-  const lines = [
-    '',
-    chalk.yellow.underline('Commands'),
-    chalk.dim('* You can run commands with "serverless" or the shortcut "sls"'),
-    chalk.dim('* Pass "--no-color" to disable CLI colors'),
-    chalk.dim('* Pass "--help" after any <command> for contextual help'),
-    '',
-    chalk.yellow.underline('Interactive Quickstart'),
-    chalk.dim(
-      `* Run serverless (or shortcut sls) without any arguments to initialize an interactive setup
-  of functionalities related to given service or current environment`
-    ),
-    chalk.dim('* Pass "--help-interactive" for contextual help on interactive CLI options'),
-    '',
-    chalk.yellow.underline('Serverless Components'),
-    chalk.dim(
-      '* Run serverless (or shortcut sls) in context of a component service to initialize a components CLI'
-    ),
-    chalk.dim('* Pass "--help-components" for contextual help on Serverless Components'),
-    '',
-    chalk.yellow.underline('Framework'),
-    chalk.dim('* Documentation: http://slss.io/docs'),
-    '',
-    chalk.yellow.underline('Environment Variables'),
-    chalk.dim('* Set SLS_DEBUG=* to see debugging logs'),
-    chalk.dim('* Set SLS_WARNING_DISABLE=* to hide warnings from the output'),
-    chalk.dim('* Set SLS_DEPRECATION_DISABLE=* to disable deprecation logs'),
-    chalk.dim(
-      "* Set SLS_MAX_CONCURRENT_ARTIFACTS_UPLOADS to control the maximum S3 upload SDK requests that are sent in parallel during the deployment of the service's artifacts. The default is 3. Note: increasing this too high might, actually, downgrade the overall upload speed"
-    ),
-    '',
-    chalk.yellow.underline('General Commands'),
-    '',
-  ];
-
-  for (const [commandName, commandSchema] of allCommands) {
-    if (commandSchema.isExtension) continue;
-    lines.push(generateCommandUsage(commandName, commandSchema));
-  }
-
-  lines.push('');
-
-  if (loadedPlugins.size) {
-    // print all the installed plugins
-    lines.push(
-      chalk.yellow.underline('Plugins'),
-      Array.from(loadedPlugins, (plugin) => plugin.constructor.name).join(', ')
-    );
-
-    if (extensionCommandsSchema.size) {
-      lines.push('', chalk.yellow.underline('Commands by plugin'), '');
-
-      for (const [plugin, pluginCommandsSchema] of extensionCommandsSchema) {
-        lines.push(plugin.constructor.name);
-        for (const [commandName, commandSchema] of pluginCommandsSchema) {
-          lines.push(generateCommandUsage(commandName, commandSchema));
-        }
-        lines.push('');
-      }
-    }
-  }
-
-  legacy.write(`${lines.join('\n')}\n`);
 };
diff --git a/lib/cli/render-help/generate-command-usage.js b/lib/cli/render-help/generate-command-usage.js
index abc568ec76b..e0f6691286b 100644
--- a/lib/cli/render-help/generate-command-usage.js
+++ b/lib/cli/render-help/generate-command-usage.js
@@ -1,17 +1,12 @@
 'use strict';
 
-const chalk = require('chalk');
 const { style } = require('@serverless/utils/log');
 
-module.exports = (commandName, commandSchema, options = {}) => {
+module.exports = (commandName, commandSchema) => {
   const indentFillLength = 30;
 
   const usage = commandSchema.usage;
-  if (options.isModern) {
-    return `${commandName} ${' '.repeat(
-      Math.max(indentFillLength - commandName.length, 0)
-    )} ${style.aside(usage)}`;
-  }
-  const dots = '.'.repeat(Math.max(indentFillLength - commandName.length, 0));
-  return `${chalk.yellow(commandName)} ${chalk.dim(dots)} ${usage}`;
+  return `${commandName} ${' '.repeat(
+    Math.max(indentFillLength - commandName.length, 0)
+  )} ${style.aside(usage)}`;
 };
diff --git a/lib/cli/render-help/interactive-setup.js b/lib/cli/render-help/interactive-setup.js
index 74cc290498a..6e8d16d981f 100644
--- a/lib/cli/render-help/interactive-setup.js
+++ b/lib/cli/render-help/interactive-setup.js
@@ -1,7 +1,6 @@
 'use strict';
 
-const chalk = require('chalk');
-const { legacy, writeText, style } = require('@serverless/utils/log');
+const { writeText, style } = require('@serverless/utils/log');
 const commmandSchema = require('../commands-schema/no-service').get('');
 const renderOptions = require('./options');
 
@@ -13,13 +12,5 @@ module.exports = () => {
     style.aside('Options')
   );
 
-  legacy.write(`${chalk.yellow.underline('Interactive CLI')}\n`);
-  legacy.write(
-    `${chalk.yellow(
-      `Run serverless (or shortcut sls) a subcommand to initialize an interactive setup of
-functionalities related to given service or current environment`
-    )}\n`
-  );
-
   renderOptions(commmandSchema.options);
 };
diff --git a/lib/cli/render-help/options.js b/lib/cli/render-help/options.js
index 2aef8873346..bd04ce5b4e3 100644
--- a/lib/cli/render-help/options.js
+++ b/lib/cli/render-help/options.js
@@ -1,9 +1,8 @@
 'use strict';
 
-const chalk = require('chalk');
-const { legacy, writeText, style } = require('@serverless/utils/log');
+const { writeText, style } = require('@serverless/utils/log');
 
-module.exports = (commandOptions, options = {}) => {
+module.exports = (commandOptions) => {
   const indentFillLength = 40;
 
   for (const [option, optionsObject] of Object.entries(commandOptions)) {
@@ -37,14 +36,6 @@ module.exports = (commandOptions, options = {}) => {
 
     if (optionsObject.required) requiredInfo = ' (required)';
 
-    if (!options.shouldWriteModernOnly) {
-      const legacyOptionsUsage = optionsObject.usage
-        ? chalk.dim(legacyOptionsIndentFill) + optionsObject.usage
-        : '';
-      const legacyOutput = `    --${option}${shortcutInfo}${requiredInfo} ${legacyOptionsUsage}`;
-      legacy.write(`${chalk.yellow(legacyOutput)}\n`);
-    }
-
     const optionsUsage = optionsObject.usage
       ? optionsIndentFill + style.aside(optionsObject.usage)
       : '';
diff --git a/lib/cli/render-version.js b/lib/cli/render-version.js
index 14a3b29f64f..24fb9a43c5e 100644
--- a/lib/cli/render-version.js
+++ b/lib/cli/render-version.js
@@ -6,9 +6,9 @@ const { version } = require('../../package');
 const spawn = require('child-process-ext/spawn');
 const { version: dashboardPluginVersion } = require('@serverless/dashboard-plugin/package');
 const { platformClientVersion } = require('@serverless/dashboard-plugin');
-const { legacy, writeText } = require('@serverless/utils/log');
 const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
 const localServerlessPath = require('./local-serverless-path');
+const { writeText } = require('@serverless/utils/log');
 
 const serverlessPath = path.resolve(__dirname, '../..');
 
@@ -47,13 +47,6 @@ module.exports = async () => {
   })();
 
   const tencentCliVersion = await resolveTencentCliVersion();
-  legacy.write(
-    `${
-      `Framework Core: ${version}${installationModePostfix}\n` +
-      `Plugin: ${dashboardPluginVersion}\n` +
-      `SDK: ${platformClientVersion}\n`
-    }${tencentCliVersion ? `Tencent CLI: ${tencentCliVersion}\n` : ''}`
-  );
   writeText(
     `Framework Core: ${version}${installationModePostfix}${globalInstallationPostfix}`,
     `Plugin: ${dashboardPluginVersion}`,
diff --git a/lib/configuration/variables/eventually-report-resolution-errors.js b/lib/configuration/variables/eventually-report-resolution-errors.js
index 4506ac1db88..c43da0c0d1d 100644
--- a/lib/configuration/variables/eventually-report-resolution-errors.js
+++ b/lib/configuration/variables/eventually-report-resolution-errors.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const { log, legacy } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 const ServerlessError = require('../../serverless-error');
 const resolveCliInput = require('../../cli/resolve-input');
 
@@ -13,11 +13,6 @@ module.exports = (configurationPath, configuration, variablesMeta) => {
   if (!resolutionErrors.size) return false;
 
   if (resolveCliInput().isHelpRequest) {
-    legacy.log(
-      'Resolution of service configuration failed when resolving variables: ' +
-        `${Array.from(resolutionErrors, (error) => `\n  - ${error.message}`)}\n`,
-      { color: 'orange' }
-    );
     log.warning(
       'Resolution of service configuration failed when resolving variables: ' +
         `${Array.from(resolutionErrors, (error) => `\n  - ${error.message}`)}\n`
diff --git a/lib/plugins/aws/configCredentials.js b/lib/plugins/aws/configCredentials.js
index 600a53a3ae1..d26b8b9704c 100644
--- a/lib/plugins/aws/configCredentials.js
+++ b/lib/plugins/aws/configCredentials.js
@@ -4,7 +4,7 @@ const os = require('os');
 const credentials = require('./utils/credentials');
 const ServerlessError = require('../../serverless-error');
 const cliCommandsSchema = require('../../cli/commands-schema');
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 
 class AwsConfigCredentials {
   constructor(serverless, options) {
@@ -52,8 +52,6 @@ class AwsConfigCredentials {
       );
     }
 
-    legacy.log('Setting up AWS...');
-
     const profiles = await credentials.resolveFileProfiles();
     if (profiles.has(this.options.profile)) {
       // Only update the profile if the overwrite flag was set
diff --git a/lib/plugins/aws/customResources/index.js b/lib/plugins/aws/customResources/index.js
index 160184f7952..d3645451d68 100644
--- a/lib/plugins/aws/customResources/index.js
+++ b/lib/plugins/aws/customResources/index.js
@@ -5,12 +5,11 @@ const path = require('path');
 const crypto = require('crypto');
 const BbPromise = require('bluebird');
 const fse = require('fs-extra');
-const { log, legacy } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 const generateZip = require('./generateZip');
 const ServerlessError = require('../../../serverless-error');
 
 const prepareCustomResourcePackage = _.memoize(async (zipFilePath) => {
-  legacy.log('Generating custom CloudFormation resources...');
   log.info('Generating custom CloudFormation resources');
   return BbPromise.all([generateZip(), fse.mkdirs(path.dirname(zipFilePath))])
     .then(([cachedZipFilePath]) => fse.copy(cachedZipFilePath, zipFilePath))
diff --git a/lib/plugins/aws/deploy/lib/checkForChanges.js b/lib/plugins/aws/deploy/lib/checkForChanges.js
index ff18219863a..5ab30af9b06 100644
--- a/lib/plugins/aws/deploy/lib/checkForChanges.js
+++ b/lib/plugins/aws/deploy/lib/checkForChanges.js
@@ -8,7 +8,7 @@ const BbPromise = require('bluebird');
 const _ = require('lodash');
 const normalizeFiles = require('../../lib/normalizeFiles');
 const ServerlessError = require('../../../../serverless-error');
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 
 module.exports = {
   async checkForChanges() {
@@ -108,11 +108,6 @@ module.exports = {
 
     return BbPromise.all(getFunctionResults).then((results) => {
       if (couldNotAccessFunction) {
-        legacy.log(
-          'WARNING: Not authorized to perform: lambda:GetFunction for at least one of the lambda functions. Deployment will not be skipped even if service files did not change.',
-          'Serverless',
-          { color: 'orange' }
-        );
         log.warning(
           'Not authorized to perform: lambda:GetFunction for at least one of the lambda functions. Deployment will not be skipped even if service files did not change.'
         );
@@ -185,9 +180,6 @@ module.exports = {
 
         if (!changedAfterDeploy && _.isEqual(remoteHashes.sort(), localHashes.sort())) {
           this.serverless.service.provider.shouldNotDeploy = true;
-
-          const message = ['Service files not changed. Skipping deployment...'].join('');
-          legacy.log(message, 'Serverless', { color: 'orange' });
         }
       });
     }
diff --git a/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js b/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
index f7e6d8dd3bd..02bea0437d8 100644
--- a/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
+++ b/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
@@ -3,7 +3,7 @@
 const _ = require('lodash');
 const findAndGroupDeployments = require('../../utils/findAndGroupDeployments');
 const getS3ObjectsFromStacks = require('../../utils/getS3ObjectsFromStacks');
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 
 module.exports = {
   async getObjectsToRemove() {
@@ -29,7 +29,6 @@ module.exports = {
 
   async removeObjects(objectsToRemove) {
     if (!objectsToRemove || !objectsToRemove.length) return;
-    legacy.log('Removing old service artifacts from S3...');
     await this.provider.request('S3', 'deleteObjects', {
       Bucket: this.bucketName,
       Delete: { Objects: objectsToRemove },
diff --git a/lib/plugins/aws/deploy/lib/createStack.js b/lib/plugins/aws/deploy/lib/createStack.js
index c64783c4c5a..cea65f63bb3 100644
--- a/lib/plugins/aws/deploy/lib/createStack.js
+++ b/lib/plugins/aws/deploy/lib/createStack.js
@@ -2,13 +2,12 @@
 
 const BbPromise = require('bluebird');
 const ServerlessError = require('../../../../serverless-error');
-const { legacy, progress, log } = require('@serverless/utils/log');
+const { progress, log } = require('@serverless/utils/log');
 const isChangeSetWithoutChanges = require('../../utils/is-change-set-without-changes');
 
 module.exports = {
   async create() {
     // Note: using three dots instead of ellipsis to support non uni-code consoles.
-    legacy.log('Creating Stack...');
     progress.get('main').notice('Creating CloudFormation stack', { isMainEvent: true });
     const stackName = this.provider.naming.getStackName();
     const changeSetName = this.provider.naming.getStackChangeSetName();
@@ -74,7 +73,6 @@ module.exports = {
               );
 
               if (!isAlreadyAccelerated) {
-                legacy.log('Not using S3 Transfer Acceleration (1st deploy)');
                 log.info('Not using S3 Transfer Acceleration (1st deploy)');
                 this.provider.disableTransferAccelerationForCurrentDeploy();
               }
diff --git a/lib/plugins/aws/deploy/lib/ensure-valid-bucket-exists.js b/lib/plugins/aws/deploy/lib/ensure-valid-bucket-exists.js
index 56aba8165ee..cc2372a21b4 100644
--- a/lib/plugins/aws/deploy/lib/ensure-valid-bucket-exists.js
+++ b/lib/plugins/aws/deploy/lib/ensure-valid-bucket-exists.js
@@ -1,14 +1,12 @@
 'use strict';
 
 const ServerlessError = require('../../../../serverless-error');
-const { log, legacy, progress } = require('@serverless/utils/log');
+const { log, progress } = require('@serverless/utils/log');
 
 const mainProgress = progress.get('main');
 
 module.exports = {
   async ensureValidBucketExists() {
-    legacy.log('Ensuring that deployment bucket exists');
-
     // Ensure to set bucket name if it can be resolved
     // Result of this operation will determine how further validation will be performed
     try {
@@ -62,9 +60,6 @@ module.exports = {
       return;
     }
 
-    legacy.log(
-      'Deployment bucket not found. Updating stack to include deployment bucket definition.'
-    );
     log.info(
       'Deployment bucket not found. Updating stack to include deployment bucket definition.'
     );
diff --git a/lib/plugins/aws/deploy/lib/extendedValidate.js b/lib/plugins/aws/deploy/lib/extendedValidate.js
index b601d066714..98221e57f91 100644
--- a/lib/plugins/aws/deploy/lib/extendedValidate.js
+++ b/lib/plugins/aws/deploy/lib/extendedValidate.js
@@ -4,7 +4,7 @@ const path = require('path');
 const _ = require('lodash');
 const findReferences = require('../../utils/findReferences');
 const ServerlessError = require('../../../../serverless-error');
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 
 module.exports = {
   extendedValidate() {
@@ -46,13 +46,6 @@ module.exports = {
         if (functionObject.timeout > 30 && functionObject.events) {
           functionObject.events.forEach((event) => {
             if (Object.keys(event)[0] === 'http' && !event.http.async) {
-              legacy.log(
-                [
-                  `WARNING: Function ${functionName} has timeout of ${functionObject.timeout} `,
-                  "seconds, however, it's attached to API Gateway so it's automatically ",
-                  'limited to 30 seconds.',
-                ].join('')
-              );
               log.warning(
                 [
                   `Function ${functionName} has timeout of ${functionObject.timeout} `,
diff --git a/lib/plugins/aws/deploy/lib/uploadArtifacts.js b/lib/plugins/aws/deploy/lib/uploadArtifacts.js
index ec02a2b7836..2a3bfaf0c01 100644
--- a/lib/plugins/aws/deploy/lib/uploadArtifacts.js
+++ b/lib/plugins/aws/deploy/lib/uploadArtifacts.js
@@ -10,7 +10,7 @@ const filesize = require('filesize');
 const normalizeFiles = require('../../lib/normalizeFiles');
 const getLambdaLayerArtifactPath = require('../../utils/getLambdaLayerArtifactPath');
 const ServerlessError = require('../../../../serverless-error');
-const { legacy, progress, log } = require('@serverless/utils/log');
+const { progress, log } = require('@serverless/utils/log');
 
 const MAX_CONCURRENT_ARTIFACTS_UPLOADS =
   Number(process.env.SLS_MAX_CONCURRENT_ARTIFACTS_UPLOADS) || 3;
@@ -45,7 +45,6 @@ module.exports = {
   },
 
   async uploadCloudFormationFile() {
-    legacy.log('Uploading CloudFormation file to S3...');
     log.info('Uploading CloudFormation file to S3');
 
     const compiledTemplateFileName = this.provider.naming.getCompiledTemplateS3Suffix();
@@ -156,7 +155,6 @@ module.exports = {
       .map((name) => {
         const layerObject = this.serverless.service.getLayer(name);
         if (layerObject.artifactAlreadyUploaded) {
-          legacy.log(`Skip uploading ${name}`);
           log.info(`Skipped uploading ${name}`);
           return null;
         }
@@ -171,8 +169,6 @@ module.exports = {
   },
 
   async uploadFunctionsAndLayers() {
-    legacy.log('Uploading artifacts...');
-
     const artifactFilePaths = [
       ...(await this.getFunctionArtifactFilePaths()),
       ...this.getLayerArtifactFilePaths(),
@@ -184,7 +180,6 @@ module.exports = {
     const limitedUpload = limit(MAX_CONCURRENT_ARTIFACTS_UPLOADS, async (artifactFilePath) => {
       const stats = await this.getFileStats(artifactFilePath);
       const fileName = path.basename(artifactFilePath);
-      legacy.log(`Uploading service ${fileName} file to S3 (${filesize(stats.size)})...`);
       log.info(`Uploading service ${fileName} file to S3 (${filesize(stats.size)})`);
       if (shouldReportDetailedProgress) {
         progress
@@ -212,7 +207,6 @@ module.exports = {
     );
 
     if (this.serverless.utils.fileExistsSync(artifactFilePath)) {
-      legacy.log('Uploading custom CloudFormation resources...');
       log.info('Uploading custom CloudFormation resources');
       await this.uploadZipFile(artifactFilePath);
     }
diff --git a/lib/plugins/aws/deploy/lib/validateTemplate.js b/lib/plugins/aws/deploy/lib/validateTemplate.js
index 9731adfd5af..08bc6ca1219 100644
--- a/lib/plugins/aws/deploy/lib/validateTemplate.js
+++ b/lib/plugins/aws/deploy/lib/validateTemplate.js
@@ -2,7 +2,6 @@
 
 const getS3EndpointForRegion = require('../../utils/getS3EndpointForRegion');
 const ServerlessError = require('../../../../serverless-error');
-const { legacy } = require('@serverless/utils/log');
 
 module.exports = {
   async validateTemplate() {
@@ -10,7 +9,6 @@ module.exports = {
     const artifactDirectoryName = this.serverless.service.package.artifactDirectoryName;
     const compiledTemplateFileName = this.provider.naming.getCompiledTemplateS3Suffix();
     const s3Endpoint = getS3EndpointForRegion(this.provider.getRegion());
-    legacy.log('Validating template...');
     const params = {
       TemplateURL: `https://${s3Endpoint}/${bucketName}/${artifactDirectoryName}/${compiledTemplateFileName}`,
     };
diff --git a/lib/plugins/aws/deployFunction.js b/lib/plugins/aws/deployFunction.js
index 9324f7fc015..1822669b53a 100644
--- a/lib/plugins/aws/deployFunction.js
+++ b/lib/plugins/aws/deployFunction.js
@@ -8,7 +8,7 @@ const wait = require('timers-ext/promise/sleep');
 const validate = require('./lib/validate');
 const filesize = require('../../utils/filesize');
 const ServerlessError = require('../../serverless-error');
-const { log, style, legacy, progress } = require('@serverless/utils/log');
+const { log, style, progress } = require('@serverless/utils/log');
 
 const mainProgress = progress.get('main');
 
@@ -171,7 +171,6 @@ class AwsDeployFunction {
           'DEPLOY_FUNCTION_ENSURE_STATE_TIMED_OUT'
         );
       }
-      legacy.log(`Retrying ensure function state for function: ${this.options.function}.`);
       log.info(`Retrying ensure function state for function: ${this.options.function}.`);
       await wait(500);
       await callWithRetry();
@@ -196,9 +195,6 @@ class AwsDeployFunction {
               'DEPLOY_FUNCTION_CONFIGURATION_UPDATE_TIMED_OUT'
             );
           }
-          legacy.log(
-            `Retrying configuration update for function: ${this.options.function}. Reason: ${err.message}`
-          );
           log.info(
             `Retrying configuration update for function: ${this.options.function}. Reason: ${err.message}`
           );
@@ -210,7 +206,6 @@ class AwsDeployFunction {
       }
     };
     await callWithRetry();
-    legacy.log(`Successfully updated function: ${this.options.function}`);
   }
 
   async updateFunctionConfiguration() {
@@ -389,7 +384,6 @@ class AwsDeployFunction {
     }
 
     if (!Object.keys(_.omit(params, 'FunctionName')).length) {
-      legacy.log('Configuration did not change. Skipping function configuration update.');
       if (this.options['update-config']) log.notice();
       log.notice.skip(
         `Configuration did not change. Configuration update skipped. ${style.aside(
@@ -433,7 +427,6 @@ class AwsDeployFunction {
             )}s)`
           )}`
         );
-        legacy.log('Image did not change. Skipping function deployment.');
         return;
       }
       params.ImageUri = functionImageUri;
@@ -453,7 +446,6 @@ class AwsDeployFunction {
       const localHash = crypto.createHash('sha256').update(data).digest('base64');
 
       if (remoteHash === localHash && !this.options.force) {
-        legacy.log('Code not changed. Skipping function deployment.');
         log.notice();
         log.notice.skip(
           `Code did not change. Function deployment skipped. ${style.aside(
@@ -468,7 +460,6 @@ class AwsDeployFunction {
       params.ZipFile = data;
 
       const stats = fs.statSync(artifactFilePath);
-      legacy.log(`Uploading function: ${this.options.function} (${filesize(stats.size)})...`);
       mainProgress.notice(`Uploading ${style.aside(`(${filesize(stats.size)})`)}`, {
         isMainEvent: true,
       });
@@ -477,7 +468,6 @@ class AwsDeployFunction {
     mainProgress.notice('Deploying', { isMainEvent: true });
     await this.provider.request('Lambda', 'updateFunctionCode', params);
     this.shouldEnsureFunctionState = true;
-    legacy.log(`Successfully deployed function: ${this.options.function}`);
     log.notice();
     log.notice.success(
       `Function code deployed ${style.aside(
diff --git a/lib/plugins/aws/deployList.js b/lib/plugins/aws/deployList.js
index 6d378cd8ed8..b3d740950f4 100644
--- a/lib/plugins/aws/deployList.js
+++ b/lib/plugins/aws/deployList.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { legacy, log, writeText } = require('@serverless/utils/log');
+const { log, writeText } = require('@serverless/utils/log');
 const validate = require('./lib/validate');
 const findAndGroupDeployments = require('./utils/findAndGroupDeployments');
 const setBucketName = require('./lib/setBucketName');
@@ -39,9 +39,6 @@ class AwsDeployList {
     const deployments = findAndGroupDeployments(response, prefix, service, stage);
 
     if (deployments.length === 0) {
-      legacy.log("Couldn't find any existing deployments.");
-      legacy.log('Please verify that stage and region are correct.');
-
       log.notice();
       log.notice.skip(
         "No deployments found, if that's unexpected ensure that stage and region are correct"
@@ -49,9 +46,7 @@ class AwsDeployList {
       return;
     }
 
-    legacy.log('Listing deployments:');
     deployments.forEach((deployment) => {
-      legacy.log('-------------');
       const match = deployment[0].directory.match(directoryRegex);
       const date = new Date(Date.parse(match[2]));
       writeText(
@@ -65,12 +60,8 @@ class AwsDeployList {
         `Timestamp: ${match[1]}`,
         'Files:'
       );
-      legacy.log(`Timestamp: ${match[1]}`);
-      legacy.log(`Datetime: ${match[2]}`);
-      legacy.log('Files:');
       deployment.forEach((entry) => {
         writeText(`  - ${entry.file}`);
-        legacy.log(`- ${entry.file}`);
       });
     });
   }
@@ -125,27 +116,18 @@ class AwsDeployList {
   }
 
   displayFunctions(funcs) {
-    legacy.log('Listing functions and their last 5 versions:');
-    legacy.log('-------------');
-
     funcs.forEach((func) => {
-      let message = '';
-
       let name = func.Versions[0].FunctionName;
       name = name.replace(`${this.serverless.service.service}-`, '');
       name = name.replace(`${this.provider.getStage()}-`, '');
 
       writeText(name);
-      message += `${name}: `;
       const versionsLength = func.Versions.length;
       const versions = func.Versions.map((funcEntry) => funcEntry.Version).slice(
         Math.max(0, func.Versions.length - 5)
       );
       if (versionsLength < 6) writeText(`  All versions: ${versions.join(', ')}`);
       else writeText(`  Last 5 versions: ${versions.join(', ')}`);
-
-      message += versions.join(', ');
-      legacy.log(message);
     });
   }
 }
diff --git a/lib/plugins/aws/info/display.js b/lib/plugins/aws/info/display.js
index 62ff5399efa..6d1f84b3905 100644
--- a/lib/plugins/aws/info/display.js
+++ b/lib/plugins/aws/info/display.js
@@ -1,68 +1,38 @@
 'use strict';
 
-const chalk = require('chalk');
 const filesize = require('../../../utils/filesize');
-const { legacy, isVerboseMode, style } = require('@serverless/utils/log');
+const { isVerboseMode, style } = require('@serverless/utils/log');
 
 module.exports = {
   displayServiceInfo() {
-    const info = this.gatheredData.info;
-
-    let message = '';
-    message += `${chalk.yellow.underline('Service Information')}\n`;
-    message += `${chalk.yellow('service:')} ${info.service}\n`;
-    message += `${chalk.yellow('stage:')} ${info.stage}\n`;
-    message += `${chalk.yellow('region:')} ${info.region}\n`;
-    message += `${chalk.yellow('stack:')} ${info.stack}\n`;
-    message += `${chalk.yellow('resources:')} ${info.resourceCount}`;
-
-    if (info.resourceCount >= 450) {
-      message += `\n${chalk.red('WARNING:')}\n`;
-      message += `  You have ${info.resourceCount} resources in your service.\n`;
-      message += '  CloudFormation has a hard limit of 500 resources in a service.\n';
-      message += '  For advice on avoiding this limit, check out this link: http://bit.ly/2IiYB38.';
-    }
-
-    legacy.consoleLog(message);
     if (this.serverless.processedInput.commands.join(' ') === 'info') {
       this.serverless.serviceOutputs.set('service', this.serverless.service.service);
       this.serverless.serviceOutputs.set('stage', this.provider.getStage());
       this.serverless.serviceOutputs.set('region', this.provider.getRegion());
       this.serverless.serviceOutputs.set('stack', this.provider.naming.getStackName());
     }
-
-    return message;
   },
 
   displayApiKeys() {
     const conceal = this.options.conceal;
     const info = this.gatheredData.info;
-    let apiKeysMessage = `${chalk.yellow('api keys:')}`;
 
     if (info.apiKeys && info.apiKeys.length > 0) {
       const outputSectionItems = [];
       info.apiKeys.forEach((apiKeyInfo) => {
         const description = apiKeyInfo.description ? ` - ${apiKeyInfo.description}` : '';
         if (conceal) {
-          apiKeysMessage += `\n  ${apiKeyInfo.name}${description}`;
           outputSectionItems.push(`${apiKeyInfo.name}${description}`);
         } else {
-          apiKeysMessage += `\n  ${apiKeyInfo.name}: ${apiKeyInfo.value}${description}`;
           outputSectionItems.push(`${apiKeyInfo.name}: ${apiKeyInfo.value}${description}`);
         }
       });
       this.serverless.serviceOutputs.set('api keys', outputSectionItems);
-    } else {
-      apiKeysMessage += '\n  None';
     }
-
-    legacy.consoleLog(apiKeysMessage);
-    return apiKeysMessage;
   },
 
   displayEndpoints() {
     const info = this.gatheredData.info;
-    let endpointsMessage = `${chalk.yellow('endpoints:')}`;
     const outputSectionItems = [];
 
     if (info.endpoints && info.endpoints.length) {
@@ -89,7 +59,6 @@ module.exports = {
                         .filter((p) => p !== '')
                         .join('/')}`
                     : '';
-                endpointsMessage += `\n  ${method} - ${endpoint}${path}`;
                 outputSectionItems.push(`${method} - ${endpoint}${path}`);
               }
             });
@@ -102,9 +71,6 @@ module.exports = {
           for (const functionData of Object.values(this.serverless.service.functions)) {
             for (const event of functionData.events) {
               if (!event.httpApi) continue;
-              endpointsMessage += `\n  ${event.resolvedMethod} - ${endpoint}${
-                event.resolvedPath || ''
-              }`;
               outputSectionItems.push(
                 `${event.resolvedMethod} - ${endpoint}${event.resolvedPath || ''}`
               );
@@ -112,14 +78,12 @@ module.exports = {
           }
         } else {
           // if the endpoint is not of type http(s) (e.g. wss) we just display
-          endpointsMessage += `\n  ${endpoint}`;
           outputSectionItems.push(endpoint);
         }
       });
     }
 
     if (info.cloudFront) {
-      endpointsMessage += `\n  CloudFront - ${info.cloudFront}`;
       outputSectionItems.push(`CloudFront - ${info.cloudFront}`);
     }
 
@@ -128,18 +92,14 @@ module.exports = {
     } else if (outputSectionItems.length) {
       this.serverless.serviceOutputs.set('endpoint', outputSectionItems[0]);
     }
-    legacy.consoleLog(endpointsMessage);
-    return endpointsMessage;
   },
 
   displayFunctions() {
     const info = this.gatheredData.info;
-    let functionsMessage = `${chalk.yellow('functions:')}`;
 
     if (info.functions && info.functions.length > 0) {
       const outputSectionItems = [];
       info.functions.forEach((f) => {
-        functionsMessage += `\n  ${f.name}: ${f.deployedName}`;
         outputSectionItems.push(
           `${f.name}: ${f.deployedName}${
             f.artifactSize ? style.aside(` (${filesize(f.artifactSize)})`) : ''
@@ -147,44 +107,22 @@ module.exports = {
         );
       });
       this.serverless.serviceOutputs.set('functions', outputSectionItems);
-    } else {
-      functionsMessage += '\n  None';
     }
-
-    legacy.consoleLog(functionsMessage);
-    return functionsMessage;
   },
 
   displayLayers() {
     const info = this.gatheredData.info;
-    let layersMessage = `${chalk.yellow('layers:')}`;
 
     if (info.layers && info.layers.length > 0) {
       const outputSectionItems = [];
       info.layers.forEach((l) => {
-        layersMessage += `\n  ${l.name}: ${l.arn}`;
         outputSectionItems.push(`${l.name}: ${l.arn}`);
       });
       this.serverless.serviceOutputs.set('layers', outputSectionItems);
-    } else {
-      layersMessage += '\n  None';
     }
-
-    legacy.consoleLog(layersMessage);
-    return layersMessage;
   },
 
   displayStackOutputs() {
-    let message = '';
-    if (this.options.verbose) {
-      message = `${chalk.yellow.underline('\nStack Outputs\n')}`;
-      this.gatheredData.outputs.forEach((output) => {
-        message += `${chalk.yellow(output.OutputKey)}: ${output.OutputValue}\n`;
-      });
-
-      legacy.consoleLog(message);
-    }
-
     if (isVerboseMode && this.gatheredData.outputs.length) {
       const outputSectionItems = [];
       this.gatheredData.outputs.forEach((output) => {
@@ -193,7 +131,5 @@ module.exports = {
 
       this.serverless.serviceOutputs.set('\nStack Outputs', outputSectionItems);
     }
-
-    return message;
   },
 };
diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invokeLocal/index.js
index 5dc93e04c7e..36713ad0e2f 100644
--- a/lib/plugins/aws/invokeLocal/index.js
+++ b/lib/plugins/aws/invokeLocal/index.js
@@ -7,7 +7,6 @@ const fse = require('fs-extra');
 const path = require('path');
 const stripAnsi = require('strip-ansi');
 const validate = require('../lib/validate');
-const chalk = require('chalk');
 const stdin = require('get-stdin');
 const spawnExt = require('child-process-ext/spawn');
 const { spawn } = require('child_process');
@@ -24,7 +23,7 @@ const isStandalone = require('../../../utils/isStandaloneExecutable');
 const ensureArtifact = require('../../../utils/ensureArtifact');
 const resolveCfImportValue = require('../utils/resolveCfImportValue');
 const resolveCfRefValue = require('../utils/resolveCfRefValue');
-const { legacy, writeText, progress, log } = require('@serverless/utils/log');
+const { writeText, progress, log } = require('@serverless/utils/log');
 
 const cachePath = path.join(cachedir('serverless'), 'invokeLocal');
 
@@ -315,7 +314,6 @@ class AwsInvokeLocal {
   async pullDockerImage() {
     const runtime = this.getRuntime();
 
-    legacy.log('Downloading base Docker image...');
     dockerProgress.notice('Downloading base Docker image');
     return spawnExt('docker', [
       'pull',
@@ -345,7 +343,6 @@ class AwsInvokeLocal {
               if (exists) {
                 return layerArtifactContentPath;
               }
-              legacy.log(`Unzipping ${layer.Ref}...`);
               layerProgress.notice(`Unzipping ${layer.Ref}`);
               await decompress(targetLayer.package.artifact, layerArtifactContentPath);
               return layerArtifactContentPath;
@@ -362,7 +359,6 @@ class AwsInvokeLocal {
           if (!exists) {
             const cacheExists = await dirExists(layerContentsCachePath);
             if (!cacheExists) {
-              legacy.log(`Downloading layer ${layer}...`);
               layerProgress.notice(`Downloading layer ${layer}`);
               await ensureDir(path.join(layerContentsCachePath));
 
@@ -416,14 +412,12 @@ class AwsInvokeLocal {
     ]);
 
     dockerProgress.notice('Writing Dockerfile');
-    legacy.log('Writing Dockerfile...');
     await Promise.all([
       fsp.writeFile(dockerfilePath, dockerFileContent),
       fsp.writeFile(dockerfileCachePath, dockerFileContent),
     ]);
 
     dockerProgress.notice('Building Docker image');
-    legacy.log('Building Docker image...');
     try {
       await spawnExt('docker', [
         'build',
@@ -436,7 +430,6 @@ class AwsInvokeLocal {
       return imageName;
     } catch (err) {
       if (err.stdBuffer) {
-        legacy.consoleLog(err.stdBuffer.toString().trimRight());
         log.info(stripAnsi(err.stdBuffer.toString().trimRight()));
       }
       throw new ServerlessError(
@@ -546,13 +539,11 @@ class AwsInvokeLocal {
     try {
       const { stdBuffer } = await spawnExt('docker', dockerArgs);
       if (stdBuffer) {
-        legacy.consoleLog(stdBuffer.toString().trimRight());
         writeText(stripAnsi(stdBuffer.toString().trimRight()));
       }
       return imageName;
     } catch (err) {
       if (err.stdBuffer) {
-        legacy.consoleLog(err.stdBuffer.toString().trimRight());
         writeText(stripAnsi(err.stdBuffer.toString().trimRight()));
       }
       throw new ServerlessError(
@@ -606,11 +597,9 @@ class AwsInvokeLocal {
         { shell: true }
       );
       python.stdout.on('data', (buf) => {
-        legacy.consoleLog(buf.toString());
         writeText(buf.toString());
       });
       python.stderr.on('data', (buf) => {
-        legacy.consoleLog(buf.toString());
         writeText(buf.toString());
       });
       python.on('close', () => resolve());
@@ -643,19 +632,14 @@ class AwsInvokeLocal {
         { shell: true }
       );
 
-      legacy.log(
-        'In order to get human-readable output, please implement "toString()" method of your "ApiGatewayResponse" object.'
-      );
       log.warning(
         'In order to get human-readable output, please implement "toString()" method of your "ApiGatewayResponse" object.'
       );
 
       java.stdout.on('data', (buf) => {
-        legacy.consoleLog(buf.toString());
         writeText(buf.toString());
       });
       java.stderr.on('data', (buf) => {
-        legacy.consoleLog(buf.toString());
         writeText(buf.toString());
       });
       java.on('close', () => resolve());
@@ -709,10 +693,7 @@ class AwsInvokeLocal {
           shell: true,
         });
 
-        legacy.log('Building Java bridge, first invocation might take a bit longer.');
-
         mvn.stderr.on('data', (buf) => {
-          legacy.consoleLog(`mvn(stderr) - ${buf.toString()}`);
           log.info(`mvn(stderr) - ${buf.toString()}`);
         });
         const chunk = [];
@@ -731,15 +712,6 @@ class AwsInvokeLocal {
           if (code === 0) {
             resolve(this.callJavaBridge(artifactPath, className, handlerName, input));
           } else if (!isRejected) {
-            if (process.env.SLS_DEBUG) {
-              chunk
-                .map((elem) => elem.toString())
-                .join('')
-                .split(/\n/)
-                .forEach((line) => {
-                  legacy.consoleLog(`mvn(stdout) - ${line}`);
-                });
-            }
             chunk
               .map((elem) => elem.toString())
               .join('')
@@ -779,11 +751,9 @@ class AwsInvokeLocal {
         shell: true,
       });
       ruby.stdout.on('data', (buf) => {
-        legacy.consoleLog(buf.toString());
         writeText(buf.toString());
       });
       ruby.stderr.on('data', (buf) => {
-        legacy.consoleLog(buf.toString());
         writeText(buf.toString());
       });
       ruby.on('close', () => resolve());
@@ -818,7 +788,6 @@ class AwsInvokeLocal {
       const handlersContainer = require(pathToHandler);
       lambda = handlersContainer[handlerName];
     } catch (error) {
-      legacy.consoleLog(chalk.red(inspect(error)));
       log.error(inspect(error));
       throw new ServerlessError(
         `Exception encountered when loading ${pathToHandler}`,
@@ -847,7 +816,6 @@ class AwsInvokeLocal {
         };
       }
 
-      legacy.consoleLog(chalk.red(JSON.stringify(errorResult, null, 4)));
       writeText(JSON.stringify(errorResult, null, 4));
       process.exitCode = 1;
     }
@@ -881,7 +849,6 @@ class AwsInvokeLocal {
         }
       }
 
-      legacy.consoleLog(JSON.stringify(result, null, 4));
       writeText(JSON.stringify(result, null, 4));
     }
 
diff --git a/lib/plugins/aws/lib/checkIfEcrRepositoryExists.js b/lib/plugins/aws/lib/checkIfEcrRepositoryExists.js
index bcbffb350d6..0253a87984e 100644
--- a/lib/plugins/aws/lib/checkIfEcrRepositoryExists.js
+++ b/lib/plugins/aws/lib/checkIfEcrRepositoryExists.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 
 module.exports = {
   async checkIfEcrRepositoryExists() {
@@ -18,11 +18,6 @@ module.exports = {
       }
       if (err.providerError && err.providerError.code === 'AccessDeniedException') {
         if (this.serverless.service.provider.ecr && this.serverless.service.provider.ecr.images) {
-          legacy.log(
-            'WARNING: Could not access ECR repository due to denied access, but there are images defined in "provider.ecr". ECR repository removal will be skipped.',
-            'Serverless',
-            { color: 'orange' }
-          );
           log.warning(
             'Could not access ECR repository due to denied access, but there are images defined in "provider.ecr". ECR repository removal will be skipped.'
           );
diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js
index 2255d12478c..336e7fd946c 100644
--- a/lib/plugins/aws/lib/monitorStack.js
+++ b/lib/plugins/aws/lib/monitorStack.js
@@ -1,11 +1,9 @@
 'use strict';
 
 const BbPromise = require('bluebird');
-const chalk = require('chalk');
 const wait = require('timers-ext/promise/sleep');
-const identity = require('ext/function/identity');
 const ServerlessError = require('../../../serverless-error');
-const { log, legacy, style, progress } = require('@serverless/utils/log');
+const { log, style, progress } = require('@serverless/utils/log');
 const getMonitoringFrequency = require('../utils/get-monitoring-frequency');
 
 const mainProgress = progress.get('main');
@@ -84,20 +82,6 @@ module.exports = {
                     `  ${eventStatus} - ${event.ResourceType} - ${event.LogicalResourceId}`
                   )
                 );
-                if (this.options.verbose) {
-                  const decorator = (() => {
-                    if (eventStatus && eventStatus.endsWith('FAILED')) return chalk.red;
-                    if (eventStatus && eventStatus.endsWith('PROGRESS')) return chalk.yellow;
-                    if (eventStatus && eventStatus.endsWith('COMPLETE')) return chalk.green;
-                    return identity;
-                  })();
-                  let eventLog = `CloudFormation - ${decorator(eventStatus)} - `;
-                  eventLog += `${event.ResourceType} - `;
-                  eventLog += `${event.LogicalResourceId}`;
-                  legacy.consoleLog(eventLog);
-                } else {
-                  legacy.write(chalk.yellow('.'));
-                }
 
                 if (
                   event.ResourceType !== 'AWS::CloudFormation::Stack' &&
@@ -129,11 +113,6 @@ module.exports = {
                     (stackStatus.endsWith('ROLLBACK_COMPLETE') ||
                       ['DELETE_FAILED', 'DELETE_COMPLETE'].includes(stackStatus))))
               ) {
-                // empty console.log for a prettier output
-                if (!this.options.verbose) legacy.consoleLog('');
-                legacy.log('Operation failed!');
-                legacy.log(`View the full error output: ${stackUrl}`);
-
                 const decoratedErrorMessage = `${stackLatestError.ResourceStatus}: ${
                   stackLatestError.LogicalResourceId
                 } ${style.aside(`(${stackLatestError.ResourceType})`)}\n${
@@ -174,9 +153,6 @@ module.exports = {
             },
             (e) => {
               if (action === 'delete' && e.message.includes('does not exist')) {
-                // empty console.log for a prettier output
-                if (!this.options.verbose) legacy.consoleLog('');
-                legacy.log(`Stack ${action} finished...`);
                 stackStatus = 'DELETE_COMPLETE';
                 return;
               }
@@ -207,13 +183,6 @@ module.exports = {
 
     // Monitor stack creation/update/removal
 
-    legacy.log(`Checking Stack ${action} progress...`);
-
-    return this.checkStackProgress(action, cfData, stackUrl, options, {}).then((stackStatus) => {
-      // empty console.log for a prettier output
-      if (!this.options.verbose) legacy.consoleLog('');
-      legacy.log(`Stack ${action} finished...`);
-      return stackStatus;
-    });
+    return this.checkStackProgress(action, cfData, stackUrl, options, {});
   },
 };
diff --git a/lib/plugins/aws/lib/updateStack.js b/lib/plugins/aws/lib/updateStack.js
index f12c7940a20..2b1b8685f4f 100644
--- a/lib/plugins/aws/lib/updateStack.js
+++ b/lib/plugins/aws/lib/updateStack.js
@@ -2,13 +2,12 @@
 
 const BbPromise = require('bluebird');
 const getS3EndpointForRegion = require('../utils/getS3EndpointForRegion');
-const { log, legacy, progress } = require('@serverless/utils/log');
+const { log, progress } = require('@serverless/utils/log');
 const isChangeSetWithoutChanges = require('../utils/is-change-set-without-changes');
 
 module.exports = {
   async createFallback() {
     this.createLater = false;
-    legacy.log('Creating Stack...');
     progress.get('main').notice('Creating CloudFormation stack', { isMainEvent: true });
 
     const stackName = this.provider.naming.getStackName();
@@ -56,7 +55,6 @@ module.exports = {
     const s3Endpoint = getS3EndpointForRegion(this.provider.getRegion());
     const templateUrl = `https://${s3Endpoint}/${this.bucketName}/${this.serverless.service.package.artifactDirectoryName}/${compiledTemplateFileName}`;
 
-    legacy.log('Updating Stack...');
     const stackName = this.provider.naming.getStackName();
     const changeSetName = this.provider.naming.getStackChangeSetName();
 
diff --git a/lib/plugins/aws/metrics.js b/lib/plugins/aws/metrics.js
index bf402b4b433..aaeed29e88e 100644
--- a/lib/plugins/aws/metrics.js
+++ b/lib/plugins/aws/metrics.js
@@ -1,11 +1,10 @@
 'use strict';
 
 const BbPromise = require('bluebird');
-const chalk = require('chalk');
 const _ = require('lodash');
 const dayjs = require('dayjs');
 const validate = require('./lib/validate');
-const { legacy, writeText, style } = require('@serverless/utils/log');
+const { writeText, style } = require('@serverless/utils/log');
 
 const LocalizedFormat = require('dayjs/plugin/localizedFormat');
 
@@ -100,20 +99,16 @@ class AwsMetrics {
   }
 
   showMetrics(metrics) {
-    let message = '';
     const modernMessageTokens = [];
 
     if (this.options.function) {
-      message += `${chalk.yellow.underline(this.options.function)}\n`;
       modernMessageTokens.push(this.options.function);
     } else {
-      message += `${chalk.yellow.underline('Service wide metrics')}\n`;
       modernMessageTokens.push('Service wide metrics');
     }
 
     const formattedStartTime = dayjs(this.options.startTime).format('LLL');
     const formattedEndTime = dayjs(this.options.endTime).format('LLL');
-    message += `${formattedStartTime} - ${formattedEndTime}\n\n`;
     modernMessageTokens.push(`${formattedStartTime} - ${formattedEndTime}\n`);
 
     if (metrics && metrics.length > 0) {
@@ -129,11 +124,6 @@ class AwsMetrics {
       const errorsCount = _.sumBy(getDatapointsByLabel('Errors'), 'Sum');
       const durationAverage = _.meanBy(getDatapointsByLabel('Duration'), 'Average') || 0;
 
-      // display the data
-      message += `${chalk.yellow('Invocations:', invocationsCount, '\n')}`;
-      message += `${chalk.yellow('Throttles:', throttlesCount, '\n')}`;
-      message += `${chalk.yellow('Errors:', errorsCount, '\n')}`;
-      message += `${chalk.yellow('Duration (avg.):', `${Number(durationAverage.toFixed(2))}ms`)}`;
       modernMessageTokens.push(
         `${style.aside('invocations')}: ${invocationsCount}`,
         `${style.aside('throttles')}: ${throttlesCount}`,
@@ -141,11 +131,9 @@ class AwsMetrics {
         `${style.aside('duration (avg.)')}: ${Number(durationAverage.toFixed(2))}ms`
       );
     } else {
-      message += `${chalk.yellow('There are no metrics to show for these options')}`;
       modernMessageTokens.push('There are no metrics to show for these options');
     }
 
-    legacy.consoleLog(message);
     writeText(modernMessageTokens);
   }
 }
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.js
index 96073240226..08e73331087 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.js
@@ -2,14 +2,13 @@
 
 const BbPromise = require('bluebird');
 const _ = require('lodash');
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 
 module.exports = {
   async disassociateUsagePlan() {
     const apiKeys = _.get(this.serverless.service.provider.apiGateway, 'apiKeys');
 
     if (apiKeys && apiKeys.length) {
-      legacy.log('Removing usage plan association...');
       log.info('Removing usage plan association');
       const stackName = `${this.provider.naming.getStackName()}`;
       return BbPromise.all([
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
index 13c21c3a976..0a1bbefc24a 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
@@ -4,7 +4,7 @@ const _ = require('lodash');
 const awsArnRegExs = require('../../../../../utils/arnRegularExpressions');
 const resolveLambdaTarget = require('../../../../../utils/resolveLambdaTarget');
 const ServerlessError = require('../../../../../../../serverless-error');
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 
 const NOT_FOUND = -1;
 const DEFAULT_STATUS_CODES = {
@@ -156,7 +156,6 @@ module.exports = {
                   ' Serverless will remove this configuration automatically',
                   ' before deployment.',
                 ].join('');
-                legacy.log(`Warning! ${requestWarningMessage}`);
                 log.warning(requestWarningMessage);
                 for (const key of keys) {
                   if (!allowedKeys.includes(key)) {
@@ -172,13 +171,6 @@ module.exports = {
               }
             }
             if (http.response) {
-              legacy.log(
-                [
-                  `Warning! You're using the ${http.integration} in combination with response`,
-                  ` configuration in your function "${functionName}".`,
-                  ' Serverless will remove this configuration automatically before deployment.',
-                ].join('')
-              );
               log.warning(
                 [
                   `You're using the ${http.integration} in combination with response`,
diff --git a/lib/plugins/aws/package/compile/events/cloudFront.js b/lib/plugins/aws/package/compile/events/cloudFront.js
index 78ddee1f729..ee6a734e4ee 100644
--- a/lib/plugins/aws/package/compile/events/cloudFront.js
+++ b/lib/plugins/aws/package/compile/events/cloudFront.js
@@ -2,9 +2,8 @@
 
 const _ = require('lodash');
 const url = require('url');
-const chalk = require('chalk');
 const ServerlessError = require('../../../../../serverless-error');
-const { legacy, log, style } = require('@serverless/utils/log');
+const { log, style } = require('@serverless/utils/log');
 
 const originLimits = { maxTimeout: 30, maxMemorySize: 10240 };
 const viewerLimits = { maxTimeout: 5, maxMemorySize: 128 };
@@ -199,7 +198,6 @@ class AwsCompileCloudFrontEvents {
           "Don't forget to manually remove your Lambda@Edge functions ",
           'once the CloudFront distribution removal is successfully propagated!',
         ].join('');
-        legacy.log(message, 'Serverless', { color: 'orange' });
         log.warning(message);
       }
     }
@@ -462,10 +460,6 @@ class AwsCompileCloudFrontEvents {
     });
 
     unusedUserDefinedCachePolicies.forEach((unusedUserDefinedCachePolicy) => {
-      legacy.log(
-        `WARNING: provider.cloudFront.cachePolicies.${unusedUserDefinedCachePolicy} ` +
-          'not used by any cloudFront event configuration'
-      );
       log.warning(
         `Setting "provider.cloudFront.cachePolicies.${unusedUserDefinedCachePolicy}" is not used by any cloudFront event configuration.`
       );
@@ -570,14 +564,6 @@ class AwsCompileCloudFrontEvents {
       Object.assign(Resources, lambdaInvokePermissions);
 
       if (!Resources.IamRoleLambdaExecution) {
-        legacy.log(
-          chalk.magenta('Remember to add required lambda@edge permissions to your execution role.')
-        );
-        legacy.log(
-          chalk.magenta(
-            'https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/lambda-edge-permissions.html'
-          )
-        );
         log.notice(
           `Remember to add required lambda@edge permissions to your execution role. Documentation: ${style.link(
             'https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/lambda-edge-permissions.html'
diff --git a/lib/plugins/aws/package/compile/events/httpApi.js b/lib/plugins/aws/package/compile/events/httpApi.js
index 1e7a0cfe0bf..7b0f118565c 100644
--- a/lib/plugins/aws/package/compile/events/httpApi.js
+++ b/lib/plugins/aws/package/compile/events/httpApi.js
@@ -6,7 +6,6 @@ const memoizee = require('memoizee');
 const memoizeeMethods = require('memoizee/methods');
 const { log } = require('@serverless/utils/log');
 const ServerlessError = require('../../../../../serverless-error');
-const { logWarning } = require('../../../../../classes/Error');
 const resolveLambdaTarget = require('../../../utils/resolveLambdaTarget');
 
 const allowedMethods = new Set(['ANY', 'GET', 'POST', 'PUT', 'PATCH', 'OPTIONS', 'HEAD', 'DELETE']);
@@ -597,12 +596,6 @@ Object.defineProperties(
           Number(functionData.timeout) || Number(this.serverless.service.provider.timeout) || 6;
 
         if (functionTimeout > 30) {
-          logWarning(
-            `Function (${functionName}) timeout setting (${functionTimeout}) is greater than ` +
-              'maximum allowed timeout for HTTP API endpoint (30s). ' +
-              'This may introduce a situation where endpoint times out ' +
-              'for a succesful lambda invocation.'
-          );
           log.warning(
             `Function (${functionName}) timeout setting (${functionTimeout}) is greater than ` +
               'maximum allowed timeout for HTTP API endpoint (30s). ' +
@@ -610,12 +603,6 @@ Object.defineProperties(
               'for a succesful lambda invocation.'
           );
         } else if (functionTimeout === 30) {
-          logWarning(
-            `Function (${functionName}) timeout setting (${functionTimeout}) may not provide ` +
-              'enough room to process an HTTP API request (of which timeout is limited to 30s). ' +
-              'This may introduce a situation where endpoint times out ' +
-              'for a succesful lambda invocation.'
-          );
           log.warning(
             `Function (${functionName}) timeout setting (${functionTimeout}) may not provide ` +
               'enough room to process an HTTP API request (of which timeout is limited to 30s). ' +
diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index dbda0bcb4fe..40316b8f4d7 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -10,7 +10,7 @@ const ServerlessError = require('../../../../serverless-error');
 const deepSortObjectByKey = require('../../../../utils/deepSortObjectByKey');
 const getHashForFilePath = require('../lib/getHashForFilePath');
 const parseS3URI = require('../../utils/parse-s3-uri');
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 
 class AwsCompileFunctions {
   constructor(serverless, options) {
@@ -95,9 +95,6 @@ class AwsCompileFunctions {
 
     const s3Object = parseS3URI(artifactFilePath);
     if (!s3Object) return;
-    if (process.env.SLS_DEBUG) {
-      legacy.log(`Downloading ${s3Object.Key} from bucket ${s3Object.Bucket}`);
-    }
     log.info(`Downloading ${s3Object.Key} from bucket ${s3Object.Bucket}`);
     await new Promise((resolve, reject) => {
       const tmpDir = this.serverless.utils.getTmpDirPath();
@@ -726,9 +723,6 @@ function extractLayerConfigurationsFromFunction(functionProperties, cfTemplate)
 
       if (!configuration) {
         log.info(`Could not find reference to layer: ${potentialLocalLayerObject.Ref}.`);
-        if (process.env.SLS_DEBUG) {
-          legacy.log(`Could not find reference to layer: ${potentialLocalLayerObject.Ref}.`);
-        }
         return;
       }
 
diff --git a/lib/plugins/aws/package/compile/layers.js b/lib/plugins/aws/package/compile/layers.js
index c96530051c5..ae7e9683588 100644
--- a/lib/plugins/aws/package/compile/layers.js
+++ b/lib/plugins/aws/package/compile/layers.js
@@ -6,7 +6,7 @@ const _ = require('lodash');
 const path = require('path');
 const fsAsync = BbPromise.promisifyAll(require('fs'));
 const getLambdaLayerArtifactPath = require('../../utils/getLambdaLayerArtifactPath');
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 
 class AwsCompileLayers {
   constructor(serverless, options) {
@@ -152,7 +152,6 @@ class AwsCompileLayers {
         layerResource.Properties.Content.S3Key = lastS3Key.OutputValue;
         const layerObject = this.serverless.service.getLayer(layerName);
         layerObject.artifactAlreadyUploaded = true;
-        legacy.log(`Layer ${layerName} is already uploaded.`);
         log.info(`Layer ${layerName} is already uploaded.`);
       },
       (e) => {
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 1c7ab3b3344..af4be8f8e6a 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -17,7 +17,7 @@ const awsRequest = require('../../aws/request');
 const { cfValue } = require('../../utils/aws-schema-get-cf-value');
 const reportDeprecatedProperties = require('../../utils/report-deprecated-properties');
 const deepSortObjectByKey = require('../../utils/deepSortObjectByKey');
-const { progress, legacy, log } = require('@serverless/utils/log');
+const { progress, log } = require('@serverless/utils/log');
 
 const isLambdaArn = RegExp.prototype.test.bind(/^arn:[^:]+:lambda:/);
 const isEcrUri = RegExp.prototype.test.bind(
@@ -1467,11 +1467,7 @@ class AwsProvider {
    * @prop [options.region] - Specify when to request to different region
    */
   async request(service, method, params, options) {
-    // Emit a warning for misuses of the old signature including stage and region
     // TODO: Determine calling module and log that
-    if (process.env.SLS_DEBUG && options != null && !_.isObject(options)) {
-      legacy.log('WARNING: Inappropriate call of provider.request()');
-    }
     const requestOptions = _.isObject(options) ? options : {};
     const shouldCache = _.get(requestOptions, 'useCache', false);
     // Copy is required as the credentials may be modified during the request
@@ -1831,7 +1827,6 @@ class AwsProvider {
     const pushDockerArgs = ['push', remoteTag];
     try {
       const { stdBuffer: pushDockerStdBuffer } = await spawnExt('docker', pushDockerArgs);
-      legacy.write(pushDockerStdBuffer);
       if (pushDockerStdBuffer) {
         log.info(pushDockerStdBuffer.toString().trimRight());
       }
@@ -1910,14 +1905,8 @@ Object.defineProperties(
         ];
         try {
           const { stdBuffer } = await spawnExt('docker', dockerArgs);
-          legacy.log('Login to Docker succeeded!');
           log.info('Login to Docker succeeded!');
           if (stdBuffer.includes('password will be stored unencrypted')) {
-            legacy.log(
-              'WARNING: Docker authentication token will be stored unencrypted in docker config. Configure Docker credential helper to remove this warning.',
-              'Serverless',
-              { color: 'orange' }
-            );
             log.warning(
               'Docker authentication token will be stored unencrypted in docker config. Configure Docker credential helper to remove this warning.'
             );
@@ -2023,7 +2012,6 @@ Object.defineProperties(
           imageProgress.notice(`Building image "${imageName}"`);
           try {
             const { stdBuffer: buildDockerStdBuffer } = await spawnExt('docker', buildDockerArgs);
-            legacy.write(buildDockerStdBuffer);
             if (buildDockerStdBuffer) {
               log.info(buildDockerStdBuffer.toString().trimRight());
             }
@@ -2040,7 +2028,6 @@ Object.defineProperties(
           const tagDockerArgs = ['tag', localTag, remoteTag];
           try {
             const { stdBuffer: tagDockerStdBuffer } = await spawnExt('docker', tagDockerArgs);
-            legacy.write(tagDockerStdBuffer);
             if (tagDockerStdBuffer) {
               log.info(tagDockerStdBuffer.toString().trimRight());
             }
diff --git a/lib/plugins/aws/remove/lib/bucket.js b/lib/plugins/aws/remove/lib/bucket.js
index 1055d42871b..aa0cc52a77e 100644
--- a/lib/plugins/aws/remove/lib/bucket.js
+++ b/lib/plugins/aws/remove/lib/bucket.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 
 module.exports = {
   async setServerlessDeploymentBucketName() {
@@ -22,7 +22,6 @@ module.exports = {
   async listObjectsV2() {
     this.objectsInBucket = [];
 
-    legacy.log('Getting all objects in S3 bucket...');
     const serviceStage = `${this.serverless.service.service}/${this.provider.getStage()}`;
 
     const result = await this.provider.request('S3', 'listObjectsV2', {
@@ -42,7 +41,6 @@ module.exports = {
   async listObjectVersions() {
     this.objectsInBucket = [];
 
-    legacy.log('Getting all objects in S3 bucket...');
     const serviceStage = `${this.serverless.service.service}/${this.provider.getStage()}`;
 
     const result = await this.provider.request('S3', 'listObjectVersions', {
@@ -79,7 +77,6 @@ module.exports = {
   },
 
   async deleteObjects() {
-    legacy.log('Removing objects in S3 bucket...');
     if (this.objectsInBucket.length) {
       await this.provider.request('S3', 'deleteObjects', {
         Bucket: this.bucketName,
@@ -96,7 +93,6 @@ module.exports = {
       await this.listObjects();
       await this.deleteObjects();
     } else {
-      legacy.log('S3 bucket not found. Skipping S3 bucket objects removal');
       log.info('S3 bucket not found. Skipping S3 bucket objects removal');
     }
   },
diff --git a/lib/plugins/aws/remove/lib/ecr.js b/lib/plugins/aws/remove/lib/ecr.js
index a0fe71bbc97..ff44da63816 100644
--- a/lib/plugins/aws/remove/lib/ecr.js
+++ b/lib/plugins/aws/remove/lib/ecr.js
@@ -1,10 +1,7 @@
 'use strict';
 
-const { legacy } = require('@serverless/utils/log');
-
 module.exports = {
   async removeEcrRepository() {
-    legacy.log('Removing ECR repository...');
     const registryId = await this.provider.getAccountId();
     const repositoryName = this.provider.naming.getEcrRepositoryName();
     const params = {
diff --git a/lib/plugins/aws/remove/lib/stack.js b/lib/plugins/aws/remove/lib/stack.js
index 6722aeac264..c3baa80d1a2 100644
--- a/lib/plugins/aws/remove/lib/stack.js
+++ b/lib/plugins/aws/remove/lib/stack.js
@@ -1,11 +1,9 @@
 'use strict';
 
 const BbPromise = require('bluebird');
-const { legacy } = require('@serverless/utils/log');
 
 module.exports = {
   async remove() {
-    legacy.log('Removing Stack...');
     const stackName = this.provider.naming.getStackName();
     const params = {
       StackName: stackName,
diff --git a/lib/plugins/aws/rollback.js b/lib/plugins/aws/rollback.js
index 5eb228329a0..fcd4236bbc4 100644
--- a/lib/plugins/aws/rollback.js
+++ b/lib/plugins/aws/rollback.js
@@ -8,7 +8,7 @@ const getCreateChangeSetParams = require('./lib/get-create-change-set-params');
 const getExecuteChangeSetParams = require('./lib/get-execute-change-set-params');
 const findAndGroupDeployments = require('./utils/findAndGroupDeployments');
 const ServerlessError = require('../../serverless-error');
-const { style, log, progress, legacy } = require('@serverless/utils/log');
+const { style, log, progress } = require('@serverless/utils/log');
 
 const mainProgress = progress.get('main');
 
@@ -34,12 +34,6 @@ class AwsRollback {
 
       'rollback:rollback': async () => {
         if (!this.options.timestamp) {
-          legacy.log(
-            [
-              'Use a timestamp from the deploy list below to rollback to a specific version.',
-              'Run `sls rollback -t YourTimeStampHere`',
-            ].join('\n')
-          );
           log.notice(
             'Select a timestamp from the deploy list below and run "sls rollback -t <timestamp>" to rollback your service to a specific version.'
           );
diff --git a/lib/plugins/aws/rollbackFunction.js b/lib/plugins/aws/rollbackFunction.js
index a6fe8072214..8040128a593 100644
--- a/lib/plugins/aws/rollbackFunction.js
+++ b/lib/plugins/aws/rollbackFunction.js
@@ -4,7 +4,7 @@ const BbPromise = require('bluebird');
 const ServerlessError = require('../../serverless-error');
 const validate = require('./lib/validate');
 const fetch = require('node-fetch');
-const { style, log, progress, legacy } = require('@serverless/utils/log');
+const { style, log, progress } = require('@serverless/utils/log');
 
 const mainProgress = progress.get('main');
 
@@ -33,7 +33,6 @@ class AwsRollbackFunction {
     // versions need to be string so that AWS understands it
     funcVersion = String(this.options['function-version']);
 
-    legacy.log(`Rolling back function "${funcName}" to version "${funcVersion}"...`);
     log.notice();
     log.notice(`Rolling back function ${funcName} to version "${funcVersion}"`);
     log.info(); // Ensure gap between verbose logging
@@ -76,8 +75,6 @@ class AwsRollbackFunction {
   async restoreFunction(zipBuffer) {
     const funcName = this.options.function;
 
-    legacy.log('Restoring function...');
-
     const funcObj = this.serverless.service.getFunction(funcName);
 
     const params = {
@@ -96,7 +93,6 @@ class AwsRollbackFunction {
           )}s)`
         )}`
       );
-      legacy.log(`Successfully rolled back function "${this.options.function}"`);
     });
   }
 }
diff --git a/lib/plugins/config.js b/lib/plugins/config.js
index 2ebc54f15ea..9fe8fb7716f 100644
--- a/lib/plugins/config.js
+++ b/lib/plugins/config.js
@@ -7,7 +7,7 @@ const isNpmPackageWritable = require('../utils/npmPackage/isWritable');
 const isNpmGlobalPackage = require('../utils/npmPackage/isGlobal');
 const renderCommandHelp = require('../cli/render-help/command');
 const isLocallyInstalled = require('../cli/is-locally-installed');
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 
 // class wide constants
 const validProviders = new Set(['aws']);
@@ -64,7 +64,6 @@ class Config {
     }
     if (this.options.autoupdate) {
       if (config.get('autoUpdate.enabled')) {
-        legacy.log('Auto update is already turned on');
         log.notice.skip('Auto update is already turned on');
         return;
       }
@@ -88,22 +87,15 @@ class Config {
       }
       config.set('autoUpdate.enabled', true);
 
-      legacy.log(
-        'Auto update successfully turned on (Turn off at any time with "serverless config --no-autoupdate")'
-      );
       log.notice.success(
         'Auto update successfully turned on (Turn off at any time with "serverless config --no-autoupdate")'
       );
     } else {
       if (!config.get('autoUpdate.enabled')) {
-        legacy.log('Auto update is already turned off');
         log.notice.skip('Auto update is already turned off');
         return;
       }
       config.set('autoUpdate.enabled', false);
-      legacy.log(
-        'Auto update successfully turned off (Turn on at any time with "serverless config --autoupdate")'
-      );
       log.notice.success(
         'Auto update successfully turned off (Turn on at any time with "serverless config --autoupdate")'
       );
diff --git a/lib/plugins/create/create.js b/lib/plugins/create/create.js
index 507db09a5d1..f4200a2261a 100644
--- a/lib/plugins/create/create.js
+++ b/lib/plugins/create/create.js
@@ -14,7 +14,7 @@ const download = require('../../utils/downloadTemplateFromRepo');
 const renameService = require('../../utils/renameService').renameService;
 const copyDirContentsSync = require('../../utils/fs/copyDirContentsSync');
 const dirExistsSync = require('../../utils/fs/dirExistsSync');
-const { legacy, progress, log, style } = require('@serverless/utils/log');
+const { progress, log, style } = require('@serverless/utils/log');
 
 const handleServiceCreationError = (error) => {
   if (error.code !== 'EACCESS') throw error;
@@ -45,8 +45,6 @@ class Create {
   }
 
   async create() {
-    legacy.log('Generating boilerplate...');
-
     if ('template' in this.options) {
       return this.createFromTemplate();
     } else if ('template-url' in this.options) {
@@ -59,16 +57,6 @@ class Create {
           this.options.path
         )
         .then((serviceName) => {
-          const message = [
-            `Successfully installed "${serviceName}" `,
-            `${
-              this.options.name && this.options.name !== serviceName
-                ? `as "${this.options.name}"`
-                : ''
-            }`,
-          ].join('');
-
-          legacy.log(message);
           log.notice();
           log.notice.success(
             `Project successfully created in "${
@@ -147,8 +135,6 @@ class Create {
         throw new ServerlessError(errorMessage, 'TARGET_FOLDER_ALREADY_EXISTS');
       }
 
-      legacy.log(`Generating boilerplate in "${newPath}"`);
-
       fse.mkdirsSync(newPath);
       process.chdir(newPath);
     } else {
@@ -192,12 +178,7 @@ class Create {
           }" template`
         );
 
-        legacy.log(`Successfully generated boilerplate for template: "${this.options.template}"`);
-
         if (!(boilerplatePath || serviceName) && notPlugin) {
-          legacy.log(
-            'NOTE: Please update the "service" property in serverless.yml with your service name'
-          );
           log.notice();
           log.notice(
             style.aside(
diff --git a/lib/plugins/install.js b/lib/plugins/install.js
index 1a7da4b2df7..55305ea5eb8 100644
--- a/lib/plugins/install.js
+++ b/lib/plugins/install.js
@@ -4,7 +4,7 @@ const BbPromise = require('bluebird');
 
 const cliCommandsSchema = require('../cli/commands-schema');
 const download = require('../utils/downloadTemplateFromRepo');
-const { legacy, log, progress, style } = require('@serverless/utils/log');
+const { log, progress, style } = require('@serverless/utils/log');
 
 class Install {
   constructor(serverless, options) {
@@ -36,7 +36,6 @@ class Install {
       }`,
     ].join('');
 
-    legacy.log(message);
     log.notice();
     log.notice.success(
       `${message} ${style.aside(`(${Math.floor((Date.now() - commandRunStartTime) / 1000)}s)`)}`
diff --git a/lib/plugins/package/lib/packageService.js b/lib/plugins/package/lib/packageService.js
index 33e4a81deff..6f5fa5512ac 100644
--- a/lib/plugins/package/lib/packageService.js
+++ b/lib/plugins/package/lib/packageService.js
@@ -7,7 +7,7 @@ const _ = require('lodash');
 const micromatch = require('micromatch');
 const ServerlessError = require('../../../serverless-error');
 const parseS3URI = require('../../aws/utils/parse-s3-uri');
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 
 module.exports = {
   defaultExcludes: [
@@ -70,7 +70,6 @@ module.exports = {
   },
 
   async packageService() {
-    legacy.log('Packaging service...');
     let shouldPackageService = false;
     const allFunctions = this.serverless.service.getAllFunctions();
     let packagePromises = allFunctions.map(async (functionName) => {
@@ -78,7 +77,6 @@ module.exports = {
       if (functionObject.image) return;
       functionObject.package = functionObject.package || {};
       if (functionObject.package.disable) {
-        legacy.log(`Packaging disabled for function: "${functionName}"`);
         log.info(`Packaging disabled for function: "${functionName}"`);
         return;
       }
diff --git a/lib/plugins/package/lib/zipService.js b/lib/plugins/package/lib/zipService.js
index 967ca9252a1..94ecfa8c85c 100644
--- a/lib/plugins/package/lib/zipService.js
+++ b/lib/plugins/package/lib/zipService.js
@@ -10,7 +10,7 @@ const childProcess = BbPromise.promisifyAll(require('child_process'));
 const globby = require('globby');
 const _ = require('lodash');
 const ServerlessError = require('../../../serverless-error');
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 
 const excludeNodeDevDependenciesMemoized = _.memoize(excludeNodeDevDependencies);
 
@@ -33,7 +33,6 @@ module.exports = {
     }
 
     if (excludeDevDependencies) {
-      legacy.log('Excluding development dependencies...');
       if (params.contextName) {
         log.info(`Excluding development dependencies for ${params.contextName}`);
       } else {
diff --git a/lib/plugins/package/package.js b/lib/plugins/package/package.js
index 327533cd287..6352ec60312 100644
--- a/lib/plugins/package/package.js
+++ b/lib/plugins/package/package.js
@@ -6,7 +6,6 @@ const ServerlessError = require('../../serverless-error');
 const cliCommandsSchema = require('../../cli/commands-schema');
 const zipService = require('./lib/zipService');
 const packageService = require('./lib/packageService');
-const { legacy } = require('@serverless/utils/log');
 
 class Package {
   constructor(serverless, options) {
@@ -58,7 +57,6 @@ class Package {
 
       'package:function:package': async () => {
         if (this.options.function) {
-          legacy.log(`Packaging function: ${this.options.function}...`);
           return BbPromise.resolve(this.packageFunction(this.options.function));
         }
         return BbPromise.reject(
diff --git a/lib/plugins/plugin/lib/utils.js b/lib/plugins/plugin/lib/utils.js
index 201b1c4f3c6..ee8d00d5430 100644
--- a/lib/plugins/plugin/lib/utils.js
+++ b/lib/plugins/plugin/lib/utils.js
@@ -4,9 +4,8 @@ const fetch = require('node-fetch');
 const BbPromise = require('bluebird');
 const HttpsProxyAgent = require('https-proxy-agent');
 const url = require('url');
-const chalk = require('chalk');
 const _ = require('lodash');
-const { legacy, log, writeText, style } = require('@serverless/utils/log');
+const { log, writeText, style } = require('@serverless/utils/log');
 
 module.exports = {
   async getPlugins() {
@@ -34,22 +33,12 @@ module.exports = {
   },
 
   async display(plugins) {
-    let message = '';
     if (plugins && plugins.length) {
       // order plugins by name
       const orderedPlugins = _.orderBy(plugins, ['name'], ['asc']);
       orderedPlugins.forEach((plugin) => {
-        message += `${chalk.yellow.underline(plugin.name)} - ${plugin.description}\n`;
         writeText(`${style.title(plugin.name)} ${style.aside(plugin.description)}`);
       });
-      // remove last two newlines for a prettier output
-      message = message.slice(0, -2);
-      legacy.consoleLog(message);
-      legacy.consoleLog(`
-To install a plugin run 'serverless plugin install --name plugin-name-here'
-
-It will be automatically downloaded and added to your package.json and serverless.yml file
-      `);
       writeText(
         null,
         'Install a plugin by running:',
@@ -58,11 +47,9 @@ It will be automatically downloaded and added to your package.json and serverles
         'It will be automatically downloaded and added to package.json and serverless.yml'
       );
     } else {
-      message = 'There are no plugins available to display';
-      legacy.consoleLog(message);
       log.notice.skip('There are no plugins available to display');
     }
 
-    return BbPromise.resolve(message);
+    return BbPromise.resolve();
   },
 };
diff --git a/lib/plugins/plugin/search.js b/lib/plugins/plugin/search.js
index 3dd1fa616f2..46bff0910fe 100644
--- a/lib/plugins/plugin/search.js
+++ b/lib/plugins/plugin/search.js
@@ -1,8 +1,7 @@
 'use strict';
 
 const BbPromise = require('bluebird');
-const chalk = require('chalk');
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 const cliCommandsSchema = require('../../cli/commands-schema');
 const pluginUtils = require('./lib/utils');
 
@@ -42,8 +41,6 @@ class PluginSearch {
         // print a message with the search result
         const pluginCount = filteredPlugins.length;
         const query = this.options.query;
-        const message = `${pluginCount} plugin(s) found for your search query "${query}"\n`;
-        legacy.consoleLog(chalk.yellow(message));
         log.notice(`${pluginCount} plugin(s) found matching "${query}":`);
         log.notice();
 
diff --git a/lib/plugins/print.js b/lib/plugins/print.js
index 3f474d8b500..3d30338a435 100644
--- a/lib/plugins/print.js
+++ b/lib/plugins/print.js
@@ -6,7 +6,7 @@ const jc = require('json-cycle');
 const yaml = require('js-yaml');
 const ServerlessError = require('../serverless-error');
 const cliCommandsSchema = require('../cli/commands-schema');
-const { writeText, legacy } = require('@serverless/utils/log');
+const { writeText } = require('@serverless/utils/log');
 
 class Print {
   constructor(serverless, options) {
@@ -76,7 +76,6 @@ class Print {
       throw new ServerlessError('Format must be "yaml", "json" or "text"', 'PRINT_INVALID_FORMAT');
     }
 
-    legacy.consoleLog(out);
     writeText(out);
   }
 }
diff --git a/lib/plugins/slstats.js b/lib/plugins/slstats.js
index 22eea6c9508..b7447447185 100644
--- a/lib/plugins/slstats.js
+++ b/lib/plugins/slstats.js
@@ -2,7 +2,7 @@
 
 const config = require('@serverless/utils/config');
 const cliCommandsSchema = require('../cli/commands-schema');
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 
 class SlStats {
   constructor(serverless, options) {
@@ -26,12 +26,10 @@ class SlStats {
     if (enableStats) {
       // set .serverlessrc config
       config.set('trackingDisabled', false);
-      legacy.log('Stats successfully enabled');
       log.notice.success('Stats successfully enabled');
     } else if (disabledStats) {
       // set .serverlessrc config
       config.set('trackingDisabled', true);
-      legacy.log('Stats successfully disabled');
       log.notice.success('Stats successfully disabled');
     }
   }
diff --git a/lib/plugins/standalone.js b/lib/plugins/standalone.js
index 6aed4fbdca5..7da77899d84 100644
--- a/lib/plugins/standalone.js
+++ b/lib/plugins/standalone.js
@@ -8,7 +8,7 @@ const stream = require('stream');
 const { promisify } = require('util');
 const fse = require('fs-extra');
 const fetch = require('node-fetch');
-const { legacy, log, progress, style } = require('@serverless/utils/log');
+const { log, progress, style } = require('@serverless/utils/log');
 const currentVersion = require('../../package').version;
 const ServerlessError = require('../serverless-error');
 const standaloneUtils = require('../utils/standalone');
@@ -46,7 +46,6 @@ module.exports = class Standalone {
     const tagName = await standaloneUtils.resolveLatestTag();
     const latestVersion = tagName.slice(1);
     if (latestVersion === currentVersion) {
-      legacy.log('Already at latest version');
       log.notice();
       log.notice.skip(
         `Already at latest version ${style.aside(
@@ -73,7 +72,6 @@ module.exports = class Standalone {
         'CANNOT_UPGRADE_MAJOR'
       );
     }
-    legacy.log('Downloading new version...');
     mainProgress.notice('Downloading latest standalone version', { isMainEvent: true });
     const executableUrl = standaloneUtils.resolveUrl(tagName);
     const standaloneResponse = await fetch(executableUrl);
@@ -88,7 +86,6 @@ module.exports = class Standalone {
     await pipeline(standaloneResponse.body, fs.createWriteStream(BINARY_TMP_PATH));
     await fsp.rename(BINARY_TMP_PATH, BINARY_PATH);
     await fsp.chmod(BINARY_PATH, 0o755);
-    legacy.log(`Successfully upgraded to ${tagName}`);
     log.notice();
     log.notice.success(
       `Successfully upgraded to ${tagName} ${style.aside(
@@ -100,7 +97,6 @@ module.exports = class Standalone {
   async uninstall() {
     mainProgress.notice('Uninstalling standalone binary', { isMainEvent: true });
     await fse.remove(path.dirname(BINARY_PATH));
-    legacy.log('Uninstalled');
     log.notice();
     log.notice.success(
       `Standalone binary uninstalled ${style.aside(
diff --git a/lib/utils/downloadTemplateFromRepo.js b/lib/utils/downloadTemplateFromRepo.js
index e4f626786aa..3d4e02c9caa 100644
--- a/lib/utils/downloadTemplateFromRepo.js
+++ b/lib/utils/downloadTemplateFromRepo.js
@@ -13,7 +13,6 @@ const renameService = require('./renameService').renameService;
 const ServerlessError = require('../serverless-error');
 const copyDirContentsSync = require('./fs/copyDirContentsSync');
 const dirExistsSync = require('./fs/dirExistsSync');
-const { legacy } = require('@serverless/utils/log');
 
 /**
  * Returns directory path
@@ -264,7 +263,7 @@ async function parseRepoURL(inputUrl) {
  * @param {string} [path]
  * @returns {Promise}
  */
-async function downloadTemplateFromRepo(inputUrl, templateName, downloadPath, options = {}) {
+async function downloadTemplateFromRepo(inputUrl, templateName, downloadPath) {
   return parseRepoURL(inputUrl).then((repoInformation) => {
     let serviceName;
     let dirName;
@@ -290,10 +289,6 @@ async function downloadTemplateFromRepo(inputUrl, templateName, downloadPath, op
       throw new ServerlessError(errorMessage, 'TARGET_FOLDER_ALREADY_EXISTS');
     }
 
-    if (!options.silent) {
-      legacy.log(`Downloading and installing "${serviceName}"...`);
-    }
-
     if (isPlainGitURL(inputUrl)) {
       return spawn('git', ['clone', inputUrl, downloadServicePath]).then(() => {
         if (renamed) renameService(dirName, serviceDir);
diff --git a/lib/utils/eventuallyUpdate.js b/lib/utils/eventuallyUpdate.js
index 88de96c99c8..fcff7a9c2c1 100644
--- a/lib/utils/eventuallyUpdate.js
+++ b/lib/utils/eventuallyUpdate.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const _ = require('lodash');
-const { format } = require('util');
 const path = require('path');
 const os = require('os');
 const stream = require('stream');
@@ -24,7 +23,7 @@ const pipeline = promisify(stream.pipeline);
 
 const npmInstallationDir = path.resolve(__dirname, '../../');
 const serverlessTmpDir = path.resolve(os.tmpdir(), 'tmpdirs-serverless');
-const { legacy, log, style } = require('@serverless/utils/log');
+const { log, style } = require('@serverless/utils/log');
 
 const CHECK_INTERVAL = 1000 * 60 * 30; // 30 minutes
 
@@ -32,9 +31,6 @@ const npmUpdate = async (serverless, { newVersion, tarballUrl, abortHandler }) =
   const npmPackageRoot = await isNpmPackageWritable();
 
   if (!npmPackageRoot) {
-    legacy.log(`Auto update error: No write access to ${npmInstallationDir}`, 'Serverless', {
-      color: 'orange',
-    });
     log.warning(`Auto update error: No write access to ${npmInstallationDir}`);
     return null;
   }
@@ -60,9 +56,6 @@ const npmUpdate = async (serverless, { newVersion, tarballUrl, abortHandler }) =
     };
   } catch (error) {
     if (!abortHandler.isAborted) {
-      if (process.env.SLS_DEBUG) {
-        legacy.log(format('Auto update: Could not update npm installation: %O', error));
-      }
       log.info('Auto update: Could not update npm installation: %O', error);
     }
     return null;
@@ -81,9 +74,6 @@ const standaloneUpdate = async (serverless, { newVersion, abortHandler }) => {
     return () => fsp.rename(tempStandalonePath, standaloneUtils.path);
   } catch (error) {
     if (!abortHandler.isAborted) {
-      if (process.env.SLS_DEBUG) {
-        legacy.log(format('Auto update: Could not update npm installation: %O', error));
-      }
       log.info('Auto update: Could not update npm installation: %O', error);
     }
     return null;
@@ -121,9 +111,6 @@ module.exports = async (serverless) => {
       versionRequest = await versionsRequest;
     } catch (error) {
       if (!abortHandler.isAborted) {
-        if (process.env.SLS_DEBUG) {
-          legacy.log(format('Auto update: Could not resolve version info from npm: %O', error));
-        }
         log.debug('Auto update: Could not resolve version info from npm: %O', error);
       }
       return null;
@@ -131,7 +118,6 @@ module.exports = async (serverless) => {
     try {
       return JSON.parse(versionRequest.body);
     } catch (error) {
-      legacy.log(format('Auto update: Unexpected response from npm: %s', versionRequest.body));
       log.debug('Auto update: Unexpected response from npm: %s', versionRequest.body);
       return null;
     }
@@ -167,7 +153,6 @@ module.exports = async (serverless) => {
     if (!updateTask) return;
     serverless.onExitPromise.then(async () => {
       await updateTask();
-      legacy.log(`Sucessfully updated to v${latestVersion}`);
       log.notice(style.aside(`Successfully updated to v${latestVersion}`));
     });
   }
diff --git a/lib/utils/logDeprecation.js b/lib/utils/logDeprecation.js
index 906990e1430..cbee9b755e8 100644
--- a/lib/utils/logDeprecation.js
+++ b/lib/utils/logDeprecation.js
@@ -3,13 +3,12 @@
 const path = require('path');
 const fse = require('fs-extra');
 const fsp = require('fs').promises;
-const chalk = require('chalk');
 const weakMemoizee = require('memoizee/weak');
 const _ = require('lodash');
 const resolveTmpdir = require('process-utils/tmpdir');
 const ServerlessError = require('../serverless-error');
 const safeMoveFile = require('./fs/safeMoveFile');
-const { style, legacy, log } = require('@serverless/utils/log');
+const { style, log } = require('@serverless/utils/log');
 const healthStatusFilename = require('./health-status-filename');
 
 const disabledDeprecationCodesByEnv = extractCodes(process.env.SLS_DEPRECATION_DISABLE);
@@ -55,29 +54,12 @@ const resolveMode = (serviceConfig) => {
   }
 };
 
-function writeDeprecation(code, message, { onlyLegacy } = {}) {
-  const prefix = 'Serverless: ';
+function writeDeprecation(code, message) {
   const messageLines = message.split('\n');
-  const modernLogsMessageLines = [...messageLines];
-  const followingLinesPrefix = ' '.repeat(prefix.length);
-  for (let i = 1; i < messageLines.length; ++i) {
-    messageLines[i] = followingLinesPrefix + messageLines[i];
-  }
-  message = messageLines.join('\n');
-  legacy.write(`Serverless: ${chalk.keyword('orange')(`Deprecation warning: ${message}`)}\n`);
   if (!code.startsWith('EXT_')) {
-    modernLogsMessageLines.push(
-      `More Info: https://www.serverless.com/framework/docs/deprecations/#${code}`
-    );
-    legacy.write(
-      `            ${chalk.keyword('orange')(
-        `More Info: https://www.serverless.com/framework/docs/deprecations/#${code}`
-      )}\n`
-    );
-  }
-  if (!onlyLegacy) {
-    log.warning(modernLogsMessageLines.join('\n'));
+    messageLines.push(`More Info: https://www.serverless.com/framework/docs/deprecations/#${code}`);
   }
+  log.warning(messageLines.join('\n'));
 }
 
 module.exports = (code, message, { serviceConfig } = {}) => {
@@ -117,14 +99,6 @@ module.exports = (code, message, { serviceConfig } = {}) => {
 module.exports.triggeredDeprecations = triggeredDeprecations;
 module.exports.defaultMode = 'warn:summary';
 
-module.exports.flushBuffered = () => {
-  try {
-    for (const { code, message } of bufferedDeprecations) writeDeprecation(code, message);
-  } finally {
-    bufferedDeprecations.length = 0;
-  }
-};
-
 module.exports.printSummary = async () => {
   if (!bufferedDeprecations.length) {
     try {
@@ -171,24 +145,6 @@ module.exports.printSummary = async () => {
       fsp.writeFile(tmpHealthStatusFilename, healthStatus.join('\n')),
     ]);
     await safeMoveFile(tmpHealthStatusFilename, healthStatusFilename);
-
-    if (bufferedDeprecations.length === 1) {
-      const { code, message } = bufferedDeprecations[0];
-      writeDeprecation(code, message, { onlyLegacy: true });
-      return;
-    }
-    const prefix = 'Serverless: ';
-    legacy.write(`${prefix}${chalk.bold.keyword('orange')('Deprecation warnings:')}\n\n`);
-    for (const { code, message } of bufferedDeprecations) {
-      const messageLines = chalk.bold(message).split('\n');
-      if (!code.startsWith('EXT_')) {
-        messageLines.push(
-          `More Info: https://www.serverless.com/framework/docs/deprecations/#${code}`
-        );
-      }
-
-      legacy.write(chalk.keyword('orange')(`${messageLines.join('\n')}\n\n`));
-    }
   } finally {
     bufferedDeprecations.length = 0;
   }
diff --git a/lib/utils/npmPackage/isWritable.js b/lib/utils/npmPackage/isWritable.js
index 4fb18ebdfaf..8fe800cdec1 100644
--- a/lib/utils/npmPackage/isWritable.js
+++ b/lib/utils/npmPackage/isWritable.js
@@ -1,9 +1,8 @@
 'use strict';
 
-const { format } = require('util');
 const path = require('path');
 const fsp = require('fs').promises;
-const { log, legacy } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 
 const npmPackageRoot = path.resolve(__dirname, '../../../');
 
@@ -13,9 +12,6 @@ module.exports = async () => {
     await fsp.utimes(npmPackageRoot, String(stats.atimeMs / 1000), String(stats.mtimeMs / 1000));
     return true;
   } catch (error) {
-    if (process.env.SLS_DEBUG) {
-      legacy.log(format('Auto update: file access error: %O', error));
-    }
     log.info('Auto update: file access error: %O', error);
     return false;
   }
diff --git a/lib/utils/openBrowser.js b/lib/utils/openBrowser.js
index ba8f043e788..6bfde4c04c4 100644
--- a/lib/utils/openBrowser.js
+++ b/lib/utils/openBrowser.js
@@ -3,12 +3,10 @@
 /* eslint-disable no-console */
 
 const open = require('open');
-const chalk = require('chalk');
 const isDockerContainer = require('is-docker');
-const { legacy, log, style } = require('@serverless/utils/log');
+const { log, style } = require('@serverless/utils/log');
 
 module.exports = function openBrowser(url) {
-  legacy.write(`\nIf your browser does not open automatically, please open the URL: ${url}\n\n`);
   log.notice();
   log.notice(
     style.aside(`If your browser does not open automatically, please open this URL: ${url}`)
@@ -19,11 +17,6 @@ module.exports = function openBrowser(url) {
   if (process.platform === 'darwin' && browser === 'open') browser = undefined;
   open(url).then((subprocess) =>
     subprocess.on('error', (err) => {
-      if (process.env.SLS_DEBUG) {
-        legacy.write(
-          `Serverless: ${chalk.red(`Opening of browser window errored with ${err.stack}`)}\n`
-        );
-      }
       log.info(`Opening of browser window errored with ${err.stack}`);
     })
   );
diff --git a/lib/utils/processBackendNotificationRequest.js b/lib/utils/processBackendNotificationRequest.js
index 1f68714d982..df71764419e 100644
--- a/lib/utils/processBackendNotificationRequest.js
+++ b/lib/utils/processBackendNotificationRequest.js
@@ -1,7 +1,6 @@
 'use strict';
 
-const chalk = require('chalk');
-const { legacy, log, style } = require('@serverless/utils/log');
+const { log, style } = require('@serverless/utils/log');
 
 const processBackendNotificationRequest = require('@serverless/utils/process-backend-notification-request');
 
@@ -9,7 +8,6 @@ module.exports = (notifications) => {
   const notification = processBackendNotificationRequest(notifications);
   if (!notification) return;
 
-  legacy.write(`\n${chalk.gray(notification.message)}\n`);
   log.notice();
   log.notice(style.aside(notification.message));
 };
diff --git a/lib/utils/telemetry/index.js b/lib/utils/telemetry/index.js
index d1b48b8f54f..c56c413f77b 100644
--- a/lib/utils/telemetry/index.js
+++ b/lib/utils/telemetry/index.js
@@ -1,14 +1,13 @@
 'use strict';
 
 const { join } = require('path');
-const { format } = require('util');
 const ensurePlainObject = require('type/plain-object/ensure');
 const { v1: uuid } = require('uuid');
 const fetch = require('node-fetch');
 const fse = require('fs-extra');
 const fsp = require('fs').promises;
 const telemetryUrl = require('@serverless/utils/analytics-and-notfications-url');
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 const isTelemetryDisabled = require('./areDisabled');
 const cacheDirPath = require('./cache-path');
 
@@ -25,7 +24,6 @@ let serverlessRunEndTime;
 const logError = (type, error) => {
   telemetryLog.debug('User stats error: %s: %O', type, error);
   if (!process.env.SLS_STATS_DEBUG) return;
-  legacy.log(format('User stats error: %s: %O', type, error));
 };
 
 const markServerlessRunEnd = () => (serverlessRunEndTime = Date.now());
@@ -47,15 +45,6 @@ const processResponseBody = async (response, ids, startTime) => {
       endTime - serverlessRunEndTime,
       endTime - startTime
     );
-    if (process.env.SLS_STATS_DEBUG) {
-      legacy.log(
-        format(
-          'Stats request prevented process from exiting for %dms (request time: %dms)',
-          endTime - serverlessRunEndTime,
-          endTime - startTime
-        )
-      );
-    }
   }
   return result;
 };
diff --git a/lib/utils/yamlAstParser.js b/lib/utils/yamlAstParser.js
index fbbd3619fd5..1baa2ae59ba 100644
--- a/lib/utils/yamlAstParser.js
+++ b/lib/utils/yamlAstParser.js
@@ -5,7 +5,7 @@ const BbPromise = require('bluebird');
 const fs = BbPromise.promisifyAll(require('fs'));
 const _ = require('lodash');
 const os = require('os');
-const { legacy, log } = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 
 const findKeyChain = (astContent) => {
   let content = astContent;
@@ -24,9 +24,6 @@ const parseAST = (ymlAstContent, astObject) => {
   if (ymlAstContent.mappings && Array.isArray(ymlAstContent.mappings)) {
     ymlAstContent.mappings.forEach((v) => {
       if (!v.value) {
-        legacy.log(`Your serverless.yml has an invalid value with key: "${v.key.value}"`, {
-          color: 'red',
-        });
         log.error(`Your serverless.yml has an invalid value with key: "${v.key.value}"`);
         return;
       }
diff --git a/scripts/serverless.js b/scripts/serverless.js
index b8c35de5200..35e16cf5c9e 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -10,7 +10,7 @@ require('graceful-fs').gracefulify(require('fs'));
 
 // Setup log writing
 require('@serverless/utils/log-reporters/node');
-const { legacy, log, progress } = require('@serverless/utils/log');
+const { log, progress } = require('@serverless/utils/log');
 
 const handleError = require('../lib/cli/handle-error');
 const {
@@ -740,14 +740,6 @@ const processSpanPromise = (async () => {
       } catch (dashboardErrorHandlerError) {
         const tokenizeException = require('../lib/utils/tokenize-exception');
         const exceptionTokens = tokenizeException(dashboardErrorHandlerError);
-        legacy.log(
-          `Publication to Serverless Dashboard errored with:\n${' '.repeat('Serverless: '.length)}${
-            exceptionTokens.isUserError || !exceptionTokens.stack
-              ? exceptionTokens.message
-              : exceptionTokens.stack
-          }`,
-          { color: 'orange' }
-        );
         log.warning(
           `Publication to Serverless Dashboard errored with:\n${' '.repeat('Serverless: '.length)}${
             exceptionTokens.isUserError || !exceptionTokens.stack
diff --git a/test/unit/lib/aws/request.test.js b/test/unit/lib/aws/request.test.js
index 39e381e8660..2cca7960fde 100644
--- a/test/unit/lib/aws/request.test.js
+++ b/test/unit/lib/aws/request.test.js
@@ -14,7 +14,6 @@ describe('#request', () => {
   it('should enable aws logging when debug log is enabled', () => {
     const configStub = sinon.stub();
     overrideEnv(() => {
-      process.env.SLS_DEBUG = true;
       proxyquire('../../../../lib/aws/request', {
         'aws-sdk': { config: configStub },
       });
@@ -40,7 +39,6 @@ describe('#request', () => {
     });
 
     it('should produce a meaningful error when no supported credentials are provided', async () => {
-      process.env.SLS_DEBUG = true;
       const awsRequest = require('../../../../lib/aws/request');
       return expect(
         awsRequest(
diff --git a/test/unit/lib/plugins/aws/provider.test.js b/test/unit/lib/plugins/aws/provider.test.js
index e6f4a8376b1..f2d2a889709 100644
--- a/test/unit/lib/plugins/aws/provider.test.js
+++ b/test/unit/lib/plugins/aws/provider.test.js
@@ -166,10 +166,8 @@ describe('AwsProvider', () => {
   describe('#request()', () => {
     let awsRequestStub;
     let awsProviderProxied;
-    let logStub;
 
     beforeEach(() => {
-      logStub = sinon.stub();
       awsRequestStub = sinon.stub().resolves();
       awsRequestStub.memoized = sinon.stub().resolves();
       const AwsProviderProxyquired = proxyquire
@@ -177,9 +175,6 @@ describe('AwsProvider', () => {
         .load('../../../../../lib/plugins/aws/provider.js', {
           '../../aws/request': awsRequestStub,
           '@serverless/utils/log': {
-            legacy: {
-              log: logStub,
-            },
             log: {
               debug: sinon.stub(),
             },
@@ -222,21 +217,6 @@ describe('AwsProvider', () => {
           expect(awsRequestStub.memoized).to.have.been.calledTwice;
         });
     });
-
-    it('should detect incompatible legacy use of aws request and print a debug warning', () => {
-      // Enable debug log
-      process.env.SLS_DEBUG = true;
-      return awsProviderProxied
-        .request('S3', 'getObject', {}, 'incompatible string option')
-        .then(() => {
-          expect(logStub).to.have.been.calledWith(
-            'WARNING: Inappropriate call of provider.request()'
-          );
-        })
-        .finally(() => {
-          process.env.SLS_DEBUG = false;
-        });
-    });
   });
 
   describe('#getServerlessDeploymentBucketName()', () => {
diff --git a/test/unit/lib/plugins/plugin/lib/utils.test.js b/test/unit/lib/plugins/plugin/lib/utils.test.js
index ebf9f1948b7..14820aabf7b 100644
--- a/test/unit/lib/plugins/plugin/lib/utils.test.js
+++ b/test/unit/lib/plugins/plugin/lib/utils.test.js
@@ -4,11 +4,11 @@ const chai = require('chai');
 const sinon = require('sinon');
 const BbPromise = require('bluebird');
 const proxyquire = require('proxyquire');
-const chalk = require('chalk');
 const PluginList = require('../../../../../../lib/plugins/plugin/list');
 const Serverless = require('../../../../../../lib/Serverless');
 const CLI = require('../../../../../../lib/classes/CLI');
 const { expect } = require('chai');
+const observeOutput = require('@serverless/test/observe-output');
 
 chai.use(require('chai-as-promised'));
 
@@ -67,26 +67,17 @@ describe('PluginUtils', () => {
   });
 
   describe('#display()', () => {
-    it('should display the plugins if present', () => {
+    it('should display the plugins if present', async () => {
+      const output = await observeOutput(() => pluginUtils.display(plugins));
       let expectedMessage = '';
-      expectedMessage += `${chalk.yellow.underline('serverless-existing-plugin')}`;
-      expectedMessage += ' - Serverless Existing plugin\n';
-      expectedMessage += `${chalk.yellow.underline('serverless-plugin-1')}`;
-      expectedMessage += ' - Serverless Plugin 1\n';
-      expectedMessage += `${chalk.yellow.underline('serverless-plugin-2')}`;
-      expectedMessage += ' - Serverless Plugin 2\n';
-      expectedMessage = expectedMessage.slice(0, -2);
-      return expect(pluginUtils.display(plugins)).to.be.fulfilled.then((message) => {
-        expect(message).to.equal(expectedMessage);
-      });
-    });
-
-    it('should print a message when no plugins are available to display', () => {
-      const expectedMessage = 'There are no plugins available to display';
-
-      return pluginUtils.display([]).then((message) => {
-        expect(message).to.equal(expectedMessage);
-      });
+      expectedMessage += 'serverless-existing-plugin Serverless Existing plugin\n';
+      expectedMessage += 'serverless-plugin-1 Serverless Plugin 1\n';
+      expectedMessage += 'serverless-plugin-2 Serverless Plugin 2\n\n';
+      expectedMessage += 'Install a plugin by running:\n';
+      expectedMessage += '  serverless plugin install --name ...\n\n';
+      expectedMessage +=
+        'It will be automatically downloaded and added to package.json and serverless.yml\n';
+      expect(output).to.equal(expectedMessage);
     });
   });
 });
diff --git a/test/utils/integration.js b/test/utils/integration.js
index 7b4cb308dc7..7f0f966e91b 100644
--- a/test/utils/integration.js
+++ b/test/utils/integration.js
@@ -14,7 +14,6 @@ const { load: loadYaml } = require('js-yaml');
 const serverlessExec = require('../serverlessBinary');
 
 const env = resolveAwsEnv();
-env.SLS_DEBUG = '1';
 
 async function resolveServiceName(cwd) {
   const configContent = await (async () => {

From 6a845604057a3c115a7d7d32ff0ed20e9e3bd311 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 20 Jan 2022 12:44:07 +0100
Subject: [PATCH 0908/1101] refactor(CLI): Move var declaration

---
 scripts/serverless.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index 35e16cf5c9e..4b2b6bab32c 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -36,10 +36,6 @@ let hasTelemetryBeenReported = false;
 // to properly handle e.g. `SIGINT` interrupt
 const keepAliveTimer = setTimeout(() => {}, 60 * 60 * 1000);
 
-// Names of the commands which are configured independently in root `commands` folder
-// and not in Serverless class internals
-const notIntegratedCommands = new Set(['doctor', 'plugin install', 'plugin uninstall']);
-
 process.once('uncaughtException', (error) => {
   clearTimeout(keepAliveTimer);
   progress.clear();
@@ -476,6 +472,9 @@ const processSpanPromise = (async () => {
 
     const configurationFilename = configuration && configurationPath.slice(serviceDir.length + 1);
 
+    // Names of the commands which are configured independently in root `commands` folder
+    // and not in Serverless class internals
+    const notIntegratedCommands = new Set(['doctor', 'plugin install', 'plugin uninstall']);
     const isStandaloneCommand = notIntegratedCommands.has(command);
 
     if (!isHelpRequest && (isInteractiveSetup || isStandaloneCommand)) {

From e142254056fcfdc94d0642618df72e885bdf07b3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 20 Jan 2022 12:48:00 +0100
Subject: [PATCH 0909/1101] refactor(CLI): Seclude uncaught exception handling

---
 lib/cli/handle-error.js                | 12 ++----------
 scripts/serverless.js                  |  4 +++-
 test/unit/lib/cli/handle-error.test.js | 10 ----------
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 10a4c6f4919..e6fd0fad166 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -20,18 +20,11 @@ const isErrorCodeNormative = RegExp.prototype.test.bind(/^[A-Z][A-Z0-9]*(?:_[A-Z
 
 module.exports = async (exception, options = {}) => {
   if (!isObject(options)) options = {};
-
-  const {
-    isUncaughtException,
-    serverless,
-    hasTelemetryBeenReported,
-    commandUsage,
-    variableSourcesInConfig,
-  } = options;
+  const { serverless, hasTelemetryBeenReported, commandUsage, variableSourcesInConfig } = options;
   const { command, options: cliOptions, commandSchema, serviceDir, configuration } = options;
 
   const exceptionTokens = tokenizeException(exception);
-  const isUserError = !isUncaughtException && exceptionTokens.isUserError;
+  const isUserError = exceptionTokens.isUserError;
 
   const platform = process.platform;
   const nodeVersion = process.version.replace(/^[v|V]/, '');
@@ -120,5 +113,4 @@ module.exports = async (exception, options = {}) => {
   }
 
   process.exitCode = 1;
-  if (isUncaughtException) process.exit();
 };
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 4b2b6bab32c..a1c36d9cf81 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -41,8 +41,8 @@ process.once('uncaughtException', (error) => {
   progress.clear();
   const cachedHasTelemetryBeenReported = hasTelemetryBeenReported;
   hasTelemetryBeenReported = true;
+  log.error('Uncaught exception');
   handleError(error, {
-    isUncaughtException: true,
     command,
     options,
     commandSchema,
@@ -52,6 +52,8 @@ process.once('uncaughtException', (error) => {
     hasTelemetryBeenReported: cachedHasTelemetryBeenReported,
     commandUsage,
     variableSourcesInConfig,
+  }).then(() => {
+    process.exit();
   });
 });
 
diff --git a/test/unit/lib/cli/handle-error.test.js b/test/unit/lib/cli/handle-error.test.js
index 5bc91146181..a1658c720f5 100644
--- a/test/unit/lib/cli/handle-error.test.js
+++ b/test/unit/lib/cli/handle-error.test.js
@@ -23,16 +23,6 @@ describe('test/unit/lib/cli/handle-error.test.js', () => {
     expect(output).to.have.string('SDK');
   });
 
-  it('should support `isUncaughtException` option', async () => {
-    const processExitStub = sinon.stub(process, 'exit').returns();
-    try {
-      await handleError(new ServerlessError('Test error'), { isUncaughtException: true });
-      expect(processExitStub.called).to.be.true;
-    } finally {
-      processExitStub.restore();
-    }
-  });
-
   if (isStandaloneExecutable) {
     it('should report standalone installation', async () => {
       const output = await observeOutput(() => handleError(new ServerlessError('Test error')));

From 350ef1257a8573dc81b2aa10fedec471e089908b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 20 Jan 2022 13:22:37 +0100
Subject: [PATCH 0910/1101] refactor(CLI): Extend `processSpanPromise` span

---
 scripts/serverless.js | 110 +++++++++++++++++++++---------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index a1c36d9cf81..530f0cab6b7 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -57,66 +57,66 @@ process.once('uncaughtException', (error) => {
   });
 });
 
-require('signal-exit/signals').forEach((signal) => {
-  process.once(signal, () => {
-    clearTimeout(keepAliveTimer);
-    progress.clear();
-    // If there's another listener (e.g. we're in deamon context or reading stdin input)
-    // then let the other listener decide how process will exit
-    const isOtherSigintListener = Boolean(process.listenerCount(signal));
-    if (!hasTelemetryBeenReported) {
-      hasTelemetryBeenReported = true;
-      if (commandSchema && !isTelemetryDisabled) {
-        const telemetryPayload = generateTelemetryPayload({
-          command,
-          options,
-          commandSchema,
-          serviceDir,
-          configuration,
-          serverless,
-          commandUsage,
-          variableSources: variableSourcesInConfig,
-        });
-        storeTelemetryLocally({
-          ...telemetryPayload,
-          outcome: 'interrupt',
-          interruptSignal: signal,
-        });
-      }
-    }
-
-    if (isOtherSigintListener) return;
-    // Follow recommendation from signal-exit:
-    // https://github.com/tapjs/signal-exit/blob/654117d6c9035ff6a805db4d4acf1f0c820fcb21/index.js#L97-L98
-    if (process.platform === 'win32' && signal === 'SIGHUP') signal = 'SIGINT';
-    process.kill(process.pid, signal);
-  });
-});
-
-const humanizePropertyPathKeys = require('../lib/configuration/variables/humanize-property-path-keys');
-const processBackendNotificationRequest = require('../lib/utils/processBackendNotificationRequest');
-const logDeprecation = require('../lib/utils/logDeprecation');
-
-const rewriteDeployFunctionParam = () => {
-  const isParamName = RegExp.prototype.test.bind(require('../lib/cli/param-reg-exp'));
-
-  const args = process.argv.slice(2);
-  const firstParamIndex = args.findIndex(isParamName);
-  const commands = args.slice(0, firstParamIndex === -1 ? Infinity : firstParamIndex);
-  if (commands.join(' ') !== 'deploy') return;
-  if (!args.includes('-f') && !args.includes('--function')) return;
-  logDeprecation(
-    'CLI_DEPLOY_FUNCTION_OPTION_V3',
-    'Starting with v4.0.0, `--function` or `-f` option for `deploy` command will no longer be supported. In order to deploy a single function, please use `deploy function` command instead.'
-  );
-  process.argv.splice(3, 0, 'function');
-};
-
 const processSpanPromise = (async () => {
   try {
     const wait = require('timers-ext/promise/sleep');
     await wait(); // Ensure access to "processSpanPromise"
 
+    require('signal-exit/signals').forEach((signal) => {
+      process.once(signal, () => {
+        clearTimeout(keepAliveTimer);
+        progress.clear();
+        // If there's another listener (e.g. we're in deamon context or reading stdin input)
+        // then let the other listener decide how process will exit
+        const isOtherSigintListener = Boolean(process.listenerCount(signal));
+        if (!hasTelemetryBeenReported) {
+          hasTelemetryBeenReported = true;
+          if (commandSchema && !isTelemetryDisabled) {
+            const telemetryPayload = generateTelemetryPayload({
+              command,
+              options,
+              commandSchema,
+              serviceDir,
+              configuration,
+              serverless,
+              commandUsage,
+              variableSources: variableSourcesInConfig,
+            });
+            storeTelemetryLocally({
+              ...telemetryPayload,
+              outcome: 'interrupt',
+              interruptSignal: signal,
+            });
+          }
+        }
+
+        if (isOtherSigintListener) return;
+        // Follow recommendation from signal-exit:
+        // https://github.com/tapjs/signal-exit/blob/654117d6c9035ff6a805db4d4acf1f0c820fcb21/index.js#L97-L98
+        if (process.platform === 'win32' && signal === 'SIGHUP') signal = 'SIGINT';
+        process.kill(process.pid, signal);
+      });
+    });
+
+    const humanizePropertyPathKeys = require('../lib/configuration/variables/humanize-property-path-keys');
+    const processBackendNotificationRequest = require('../lib/utils/processBackendNotificationRequest');
+    const logDeprecation = require('../lib/utils/logDeprecation');
+
+    const rewriteDeployFunctionParam = () => {
+      const isParamName = RegExp.prototype.test.bind(require('../lib/cli/param-reg-exp'));
+
+      const args = process.argv.slice(2);
+      const firstParamIndex = args.findIndex(isParamName);
+      const commands = args.slice(0, firstParamIndex === -1 ? Infinity : firstParamIndex);
+      if (commands.join(' ') !== 'deploy') return;
+      if (!args.includes('-f') && !args.includes('--function')) return;
+      logDeprecation(
+        'CLI_DEPLOY_FUNCTION_OPTION_V3',
+        'Starting with v4.0.0, `--function` or `-f` option for `deploy` command will no longer be supported. In order to deploy a single function, please use `deploy function` command instead.'
+      );
+      process.argv.splice(3, 0, 'function');
+    };
+
     rewriteDeployFunctionParam();
 
     const resolveInput = require('../lib/cli/resolve-input');

From f51f9a5fb932b625088d1e4915156afa3673a5cd Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 20 Jan 2022 13:25:37 +0100
Subject: [PATCH 0911/1101] refactor(CLI): Simplify deploy function args patch

---
 scripts/serverless.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index 530f0cab6b7..937b4947920 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -102,7 +102,8 @@ const processSpanPromise = (async () => {
     const processBackendNotificationRequest = require('../lib/utils/processBackendNotificationRequest');
     const logDeprecation = require('../lib/utils/logDeprecation');
 
-    const rewriteDeployFunctionParam = () => {
+    (() => {
+      // Rewrite eventual `sls deploy -f` into `sls deploy function -f`
       const isParamName = RegExp.prototype.test.bind(require('../lib/cli/param-reg-exp'));
 
       const args = process.argv.slice(2);
@@ -115,9 +116,7 @@ const processSpanPromise = (async () => {
         'Starting with v4.0.0, `--function` or `-f` option for `deploy` command will no longer be supported. In order to deploy a single function, please use `deploy function` command instead.'
       );
       process.argv.splice(3, 0, 'function');
-    };
-
-    rewriteDeployFunctionParam();
+    })();
 
     const resolveInput = require('../lib/cli/resolve-input');
 

From 6b26a7d360d7daf367f45ceef8b75ef53260f301 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 20 Jan 2022 14:01:34 +0100
Subject: [PATCH 0912/1101] refactor(CLI): Unify finalization of a process
 handling

---
 lib/cli/handle-error.js                |  38 +-----
 scripts/serverless.js                  | 164 ++++++++-----------------
 test/unit/lib/cli/handle-error.test.js |  86 ++-----------
 3 files changed, 65 insertions(+), 223 deletions(-)

diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index e6fd0fad166..fdf1c8b0985 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -9,19 +9,14 @@ const { style, writeText } = require('@serverless/utils/log');
 const slsVersion = require('./../../package').version;
 const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
 const tokenizeException = require('../utils/tokenize-exception');
-const logDeprecation = require('../utils/logDeprecation');
 const isLocallyInstalled = require('./is-locally-installed');
-const isTelemetryDisabled = require('../utils/telemetry/areDisabled');
-const { storeLocally: storeTelemetryLocally, send: sendTelemetry } = require('../utils/telemetry');
-const generateTelemetryPayload = require('../utils/telemetry/generatePayload');
 const resolveErrorLocation = require('../utils/telemetry/resolve-error-location');
 
 const isErrorCodeNormative = RegExp.prototype.test.bind(/^[A-Z][A-Z0-9]*(?:_[A-Z0-9]+)*$/);
 
 module.exports = async (exception, options = {}) => {
   if (!isObject(options)) options = {};
-  const { serverless, hasTelemetryBeenReported, commandUsage, variableSourcesInConfig } = options;
-  const { command, options: cliOptions, commandSchema, serviceDir, configuration } = options;
+  const { serverless } = options;
 
   const exceptionTokens = tokenizeException(exception);
   const isUserError = exceptionTokens.isUserError;
@@ -84,33 +79,12 @@ module.exports = async (exception, options = {}) => {
     );
   writeText(null, style.error('Error:'), errorMsg);
 
-  await logDeprecation.printSummary();
-
-  if (!isTelemetryDisabled && hasTelemetryBeenReported === false) {
-    if (commandSchema) {
-      // Report only for recognized commands
-      const telemetryPayload = generateTelemetryPayload({
-        command,
-        options: cliOptions,
-        commandSchema,
-        serviceDir,
-        configuration,
-        serverless,
-        commandUsage,
-        variableSources: variableSourcesInConfig,
-      });
-      const failureReason = {
-        kind: isUserError ? 'user' : 'programmer',
-        code: exception.code,
-      };
+  process.exitCode = 1;
 
-      if (!isUserError || !exception.code || !isErrorCodeNormative(exception.code)) {
-        failureReason.location = resolveErrorLocation(exceptionTokens);
-      }
-      storeTelemetryLocally({ ...telemetryPayload, failureReason, outcome: 'failure' });
-      await sendTelemetry();
-    }
+  const failureReason = { kind: isUserError ? 'user' : 'programmer', code: exception.code };
+  if (!isUserError || !exception.code || !isErrorCodeNormative(exception.code)) {
+    failureReason.location = resolveErrorLocation(exceptionTokens);
   }
 
-  process.exitCode = 1;
+  return { telemetryData: { failureReason, outcome: 'failure' } };
 };
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 937b4947920..b16f5cb9853 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -19,8 +19,10 @@ const {
 } = require('../lib/utils/telemetry');
 const generateTelemetryPayload = require('../lib/utils/telemetry/generatePayload');
 const isTelemetryDisabled = require('../lib/utils/telemetry/areDisabled');
+const logDeprecation = require('../lib/utils/logDeprecation');
 
 let command;
+let isHelpRequest;
 let options;
 let commandSchema;
 let serviceDir = null;
@@ -29,67 +31,66 @@ let serverless;
 const commandUsage = {};
 const variableSourcesInConfig = new Set();
 
-let hasTelemetryBeenReported = false;
-
 // Inquirer async operations do not keep node process alive
 // We need to issue a keep alive timer so process does not die
 // to properly handle e.g. `SIGINT` interrupt
 const keepAliveTimer = setTimeout(() => {}, 60 * 60 * 1000);
 
-process.once('uncaughtException', (error) => {
+let processSpanPromise;
+let hasBeenFinalized = false;
+const finalize = async ({ error, shouldBeSync, telemetryData, shouldSendTelemetry } = {}) => {
+  if (hasBeenFinalized) {
+    if (error) {
+      // Programmer error in finalize handling, ensure to expose
+      process.nextTick(() => {
+        throw error;
+      });
+    }
+    return null;
+  }
+  hasBeenFinalized = true;
   clearTimeout(keepAliveTimer);
   progress.clear();
-  const cachedHasTelemetryBeenReported = hasTelemetryBeenReported;
-  hasTelemetryBeenReported = true;
-  log.error('Uncaught exception');
-  handleError(error, {
-    command,
-    options,
-    commandSchema,
-    serviceDir,
-    configuration,
-    serverless,
-    hasTelemetryBeenReported: cachedHasTelemetryBeenReported,
-    commandUsage,
-    variableSourcesInConfig,
-  }).then(() => {
-    process.exit();
+  if (error) ({ telemetryData } = await handleError(error, { serverless }));
+  if (!shouldBeSync) await logDeprecation.printSummary();
+  if (isTelemetryDisabled || !commandSchema) return null;
+  if (!error && isHelpRequest) return null;
+  storeTelemetryLocally({
+    ...generateTelemetryPayload({
+      command,
+      options,
+      commandSchema,
+      serviceDir,
+      configuration,
+      serverless,
+      commandUsage,
+      variableSources: variableSourcesInConfig,
+    }),
+    ...telemetryData,
   });
+  if (!error && !shouldSendTelemetry) return null;
+  return sendTelemetry({ serverlessExecutionSpan: processSpanPromise });
+};
+
+process.once('uncaughtException', (error) => {
+  log.error('Uncaught exception');
+  finalize({ error }).then(() => process.exit());
 });
 
-const processSpanPromise = (async () => {
+processSpanPromise = (async () => {
   try {
     const wait = require('timers-ext/promise/sleep');
     await wait(); // Ensure access to "processSpanPromise"
 
     require('signal-exit/signals').forEach((signal) => {
       process.once(signal, () => {
-        clearTimeout(keepAliveTimer);
-        progress.clear();
         // If there's another listener (e.g. we're in deamon context or reading stdin input)
         // then let the other listener decide how process will exit
         const isOtherSigintListener = Boolean(process.listenerCount(signal));
-        if (!hasTelemetryBeenReported) {
-          hasTelemetryBeenReported = true;
-          if (commandSchema && !isTelemetryDisabled) {
-            const telemetryPayload = generateTelemetryPayload({
-              command,
-              options,
-              commandSchema,
-              serviceDir,
-              configuration,
-              serverless,
-              commandUsage,
-              variableSources: variableSourcesInConfig,
-            });
-            storeTelemetryLocally({
-              ...telemetryPayload,
-              outcome: 'interrupt',
-              interruptSignal: signal,
-            });
-          }
-        }
-
+        finalize({
+          shouldBeSync: true,
+          telemetryData: { outcome: 'interrupt', interruptSignal: signal },
+        });
         if (isOtherSigintListener) return;
         // Follow recommendation from signal-exit:
         // https://github.com/tapjs/signal-exit/blob/654117d6c9035ff6a805db4d4acf1f0c820fcb21/index.js#L97-L98
@@ -100,7 +101,6 @@ const processSpanPromise = (async () => {
 
     const humanizePropertyPathKeys = require('../lib/configuration/variables/humanize-property-path-keys');
     const processBackendNotificationRequest = require('../lib/utils/processBackendNotificationRequest');
-    const logDeprecation = require('../lib/utils/logDeprecation');
 
     (() => {
       // Rewrite eventual `sls deploy -f` into `sls deploy function -f`
@@ -121,7 +121,6 @@ const processSpanPromise = (async () => {
     const resolveInput = require('../lib/cli/resolve-input');
 
     let commands;
-    let isHelpRequest;
     // Parse args against schemas of commands which do not require to be run in service context
     ({ command, commands, options, isHelpRequest, commandSchema } = resolveInput(
       require('../lib/cli/commands-schema/no-service')
@@ -130,7 +129,7 @@ const processSpanPromise = (async () => {
     // If version number request, show it and abort
     if (options.version) {
       await require('../lib/cli/render-version')();
-      await logDeprecation.printSummary();
+      await finalize();
       return;
     }
 
@@ -510,29 +509,7 @@ const processSpanPromise = (async () => {
         });
       }
 
-      progress.clear();
-
-      await logDeprecation.printSummary();
-
-      if (!hasTelemetryBeenReported) {
-        hasTelemetryBeenReported = true;
-        if (!isTelemetryDisabled) {
-          storeTelemetryLocally({
-            ...generateTelemetryPayload({
-              command,
-              options,
-              commandSchema,
-              serviceDir,
-              configuration,
-              commandUsage,
-              variableSources: variableSourcesInConfig,
-              serverless,
-            }),
-            outcome: 'success',
-          });
-          await sendTelemetry({ serverlessExecutionSpan: processSpanPromise });
-        }
-      }
+      await finalize({ telemetryData: { outcome: 'success', shouldSendTelemetry: true } });
       return;
     }
 
@@ -697,36 +674,12 @@ const processSpanPromise = (async () => {
         // Run command
         await serverless.run();
       }
-      progress.clear();
 
-      await logDeprecation.printSummary();
-
-      if (!hasTelemetryBeenReported) {
-        hasTelemetryBeenReported = true;
-
-        if (!isTelemetryDisabled && !isHelpRequest) {
-          storeTelemetryLocally({
-            ...generateTelemetryPayload({
-              command,
-              options,
-              commandSchema,
-              serviceDir,
-              configuration,
-              serverless,
-              variableSources: variableSourcesInConfig,
-            }),
-            outcome: 'success',
-          });
-          let backendNotificationRequest;
-          if (commands.join(' ') === 'deploy') {
-            backendNotificationRequest = await sendTelemetry({
-              serverlessExecutionSpan: processSpanPromise,
-            });
-          }
-          if (backendNotificationRequest) {
-            await processBackendNotificationRequest(backendNotificationRequest);
-          }
-        }
+      const backendNotificationRequest = await finalize({
+        telemetryData: { outcome: 'success', shouldSendTelemetry: commands.join(' ') === 'deploy' },
+      });
+      if (backendNotificationRequest) {
+        await processBackendNotificationRequest(backendNotificationRequest);
       }
     } catch (error) {
       // If Dashboard Plugin, capture error
@@ -751,21 +704,6 @@ const processSpanPromise = (async () => {
       throw error;
     }
   } catch (error) {
-    progress.clear();
-    const cachedHasTelemetryBeenReported = hasTelemetryBeenReported;
-    hasTelemetryBeenReported = true;
-    handleError(error, {
-      command,
-      options,
-      commandSchema,
-      serviceDir,
-      configuration,
-      serverless,
-      hasTelemetryBeenReported: cachedHasTelemetryBeenReported,
-      commandUsage,
-      variableSources: variableSourcesInConfig,
-    });
-  } finally {
-    clearTimeout(keepAliveTimer);
+    await finalize({ error });
   }
 })();
diff --git a/test/unit/lib/cli/handle-error.test.js b/test/unit/lib/cli/handle-error.test.js
index a1658c720f5..cef4d2222f0 100644
--- a/test/unit/lib/cli/handle-error.test.js
+++ b/test/unit/lib/cli/handle-error.test.js
@@ -7,7 +7,6 @@ const observeOutput = require('@serverless/test/observe-output');
 const handleError = require('../../../../lib/cli/handle-error');
 const isStandaloneExecutable = require('../../../../lib/utils/isStandaloneExecutable');
 const ServerlessError = require('../../../../lib/serverless-error');
-const proxyquire = require('proxyquire');
 
 chai.use(require('sinon-chai'));
 
@@ -36,91 +35,22 @@ describe('test/unit/lib/cli/handle-error.test.js', () => {
   });
 
   describe('with mocked telemetry', () => {
-    const generateTelemetryPayloadStub = sinon.stub().returns({});
-    const storeTelemetryLocallyStub = sinon.stub();
-    const sendTelemetryStub = sinon.stub();
-    const resolveInputStub = sinon.stub().returns({ commandSchema: {} });
-
-    const handleErrorWithMocks = proxyquire('../../../../lib/cli/handle-error', {
-      './resolve-input': resolveInputStub,
-      '../utils/telemetry/areDisabled': false,
-      '../utils/telemetry/generatePayload': generateTelemetryPayloadStub,
-      '../utils/telemetry/index': {
-        send: sendTelemetryStub,
-        storeLocally: storeTelemetryLocallyStub,
-      },
-    });
-
     beforeEach(() => {
       sinon.resetHistory();
     });
 
-    it('should record telemetry only if `hasTelemetryBeenReported` is `false`', async () => {
-      await handleErrorWithMocks(new ServerlessError('Test error', 'ERR_CODE'), {
-        hasTelemetryBeenReported: false,
-      });
-      expect(generateTelemetryPayloadStub).to.be.calledOnce;
-      expect(storeTelemetryLocallyStub).to.be.calledOnce;
-      expect(sendTelemetryStub).to.be.calledOnce;
-      expect(storeTelemetryLocallyStub.getCall(0).args[0]).to.deep.equal({
-        outcome: 'failure',
-        failureReason: {
-          code: 'ERR_CODE',
-          kind: 'user',
-        },
-      });
-    });
-
     it('should add `location` to `failureReason` in telemetry if error code missing', async () => {
-      await handleErrorWithMocks(new ServerlessError('Test error'), {
-        hasTelemetryBeenReported: false,
-      });
-      expect(generateTelemetryPayloadStub).to.be.calledOnce;
-      expect(storeTelemetryLocallyStub).to.be.calledOnce;
-      expect(sendTelemetryStub).to.be.calledOnce;
-      expect(storeTelemetryLocallyStub.getCall(0).args[0].failureReason).to.have.property(
-        'location'
-      );
+      const {
+        telemetryData: { failureReason },
+      } = await handleError(new ServerlessError('Test error'), {});
+      expect(failureReason).to.have.property('location');
     });
 
     it('should add `location` to `failureReason` in telemetry for non-user errors', async () => {
-      await handleErrorWithMocks(new Error('Test error'), {
-        hasTelemetryBeenReported: false,
-      });
-      expect(generateTelemetryPayloadStub).to.be.calledOnce;
-      expect(storeTelemetryLocallyStub).to.be.calledOnce;
-      expect(sendTelemetryStub).to.be.calledOnce;
-      expect(storeTelemetryLocallyStub.getCall(0).args[0].failureReason).to.have.property(
-        'location'
-      );
-    });
-
-    it('should not record telemetry if `hasTelemetryBeenReported` is `true`', async () => {
-      await handleErrorWithMocks(new ServerlessError('Test error'), {
-        hasTelemetryBeenReported: true,
-      });
-      expect(generateTelemetryPayloadStub).not.to.be.called;
-      expect(storeTelemetryLocallyStub).not.to.be.called;
-      expect(sendTelemetryStub).not.to.be.called;
-    });
-
-    it('should not record telemetry if `hasTelemetryBeenReported` is not passed', async () => {
-      await handleErrorWithMocks(new ServerlessError('Test error'));
-      expect(generateTelemetryPayloadStub).not.to.be.called;
-      expect(storeTelemetryLocallyStub).not.to.be.called;
-      expect(sendTelemetryStub).not.to.be.called;
-    });
-
-    it('should not record telemetry if `commandSchema` was not resolved', async () => {
-      // Ensure that `commandSchema` is not included in result of `resolveInput`
-      resolveInputStub.returns({});
-
-      await handleErrorWithMocks(new ServerlessError('Test error'), {
-        hasTelemetryBeenReported: false,
-      });
-      expect(generateTelemetryPayloadStub).not.to.be.called;
-      expect(storeTelemetryLocallyStub).not.to.be.called;
-      expect(sendTelemetryStub).not.to.be.called;
+      const {
+        telemetryData: { failureReason },
+      } = await handleError(new Error('Test error'), {});
+      expect(failureReason).to.have.property('location');
     });
   });
 });

From f103cbeffb1a0ea31bca759ccb8a1bf8abf2cec5 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 20 Jan 2022 14:14:11 +0100
Subject: [PATCH 0913/1101] refactor(CLI): Comment typo

---
 scripts/serverless.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/serverless.js b/scripts/serverless.js
index b16f5cb9853..5d41bfc64cf 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -211,7 +211,7 @@ processSpanPromise = (async () => {
           ));
         }
 
-        // IIFE for maintanance convenience
+        // IIFE for maintenance convenience
         await (async () => {
           const resolveVariablesMeta = require('../lib/configuration/variables/resolve-meta');
 

From 73b18860408ca95b504b0c962dcb6feea14f9acb Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 20 Jan 2022 18:35:21 +0100
Subject: [PATCH 0914/1101] refactor: Adapt to rename in
 `@serverless/dashboard-plugin`

---
 lib/cli/interactive-setup/aws-credentials.js  |  4 +--
 .../interactive-setup/dashboard-set-org.js    |  2 +-
 lib/cli/interactive-setup/deploy.js           |  2 +-
 lib/cli/interactive-setup/utils.js            |  4 +--
 .../interactive-setup/aws-credentials.test.js | 36 +++++++++----------
 .../dashboard-set-org.test.js                 |  2 +-
 .../lib/cli/interactive-setup/deploy.test.js  |  2 +-
 .../lib/cli/interactive-setup/utils.test.js   | 10 +++---
 8 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/lib/cli/interactive-setup/aws-credentials.js b/lib/cli/interactive-setup/aws-credentials.js
index b0ae2827232..bb1b4a60bfa 100644
--- a/lib/cli/interactive-setup/aws-credentials.js
+++ b/lib/cli/interactive-setup/aws-credentials.js
@@ -16,8 +16,8 @@ const resolveRegion = require('../../utils/resolve-region');
 
 const isValidAwsAccessKeyId = RegExp.prototype.test.bind(/^[A-Z0-9]{10,}$/);
 const isValidAwsSecretAccessKey = RegExp.prototype.test.bind(/^[a-zA-Z0-9/+]{10,}$/);
-const { getPlatformClientWithAccessKey } = require('@serverless/dashboard-plugin/lib/clientUtils');
-const isAuthenticated = require('@serverless/dashboard-plugin/lib/isAuthenticated');
+const { getPlatformClientWithAccessKey } = require('@serverless/dashboard-plugin/lib/client-utils');
+const isAuthenticated = require('@serverless/dashboard-plugin/lib/is-authenticated');
 
 const CREDENTIALS_SETUP_CHOICE = {
   LOCAL: '_local_',
diff --git a/lib/cli/interactive-setup/dashboard-set-org.js b/lib/cli/interactive-setup/dashboard-set-org.js
index b5b48e2d8fc..7d8906ff0ed 100644
--- a/lib/cli/interactive-setup/dashboard-set-org.js
+++ b/lib/cli/interactive-setup/dashboard-set-org.js
@@ -11,7 +11,7 @@ const { writeOrgAndApp, showOnboardingWelcome } = require('./utils');
 const {
   getPlatformClientWithAccessKey,
   getOrCreateAccessKeyForOrg,
-} = require('@serverless/dashboard-plugin/lib/clientUtils');
+} = require('@serverless/dashboard-plugin/lib/client-utils');
 
 const isValidAppName = RegExp.prototype.test.bind(/^[a-z0-9](?:[a-z0-9-]{0,126}[a-z0-9])?$/);
 
diff --git a/lib/cli/interactive-setup/deploy.js b/lib/cli/interactive-setup/deploy.js
index 57443b69f70..986973a1eb4 100644
--- a/lib/cli/interactive-setup/deploy.js
+++ b/lib/cli/interactive-setup/deploy.js
@@ -6,7 +6,7 @@ const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-histor
 const { doesServiceInstanceHaveLinkedProvider } = require('./utils');
 const _ = require('lodash');
 const AWS = require('aws-sdk');
-const isAuthenticated = require('@serverless/dashboard-plugin/lib/isAuthenticated');
+const isAuthenticated = require('@serverless/dashboard-plugin/lib/is-authenticated');
 
 const printMessage = () => {
   writeText(
diff --git a/lib/cli/interactive-setup/utils.js b/lib/cli/interactive-setup/utils.js
index 54d5a8a0d7a..a415eb96f94 100644
--- a/lib/cli/interactive-setup/utils.js
+++ b/lib/cli/interactive-setup/utils.js
@@ -4,8 +4,8 @@ const path = require('path');
 const memoizee = require('memoizee');
 const inquirer = require('@serverless/utils/inquirer');
 const { log } = require('@serverless/utils/log');
-const resolveProviderCredentials = require('@serverless/dashboard-plugin/lib/resolveProviderCredentials');
-const isAuthenticated = require('@serverless/dashboard-plugin/lib/isAuthenticated');
+const resolveProviderCredentials = require('@serverless/dashboard-plugin/lib/resolve-provider-credentials');
+const isAuthenticated = require('@serverless/dashboard-plugin/lib/is-authenticated');
 const hasLocalCredentials = require('../../aws/has-local-credentials');
 
 const fsp = require('fs').promises;
diff --git a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
index ab73d811787..d2c1007fb98 100644
--- a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
+++ b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
@@ -34,7 +34,7 @@ const step = proxyquire('../../../../../lib/cli/interactive-setup/aws-credential
   '../../utils/openBrowser': async (url) => {
     openBrowserUrls.push(url);
   },
-  '@serverless/dashboard-plugin/lib/clientUtils': {
+  '@serverless/dashboard-plugin/lib/client-utils': {
     getPlatformClientWithAccessKey: async () => mockedSdk,
   },
 });
@@ -90,10 +90,10 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       },
     };
     const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
-      '@serverless/dashboard-plugin/lib/clientUtils': {
+      '@serverless/dashboard-plugin/lib/client-utils': {
         getPlatformClientWithAccessKey: async () => internalMockedSdk,
       },
-      '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
+      '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
     });
 
     const context = {
@@ -126,10 +126,10 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       },
     };
     const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
-      '@serverless/dashboard-plugin/lib/clientUtils': {
+      '@serverless/dashboard-plugin/lib/client-utils': {
         getPlatformClientWithAccessKey: async () => internalMockedSdk,
       },
-      '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
+      '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
       './utils': {
         doesServiceInstanceHaveLinkedProvider: () => true,
       },
@@ -172,10 +172,10 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       },
     };
     const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
-      '@serverless/dashboard-plugin/lib/clientUtils': {
+      '@serverless/dashboard-plugin/lib/client-utils': {
         getPlatformClientWithAccessKey: async () => internalMockedSdk,
       },
-      '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
+      '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
       './utils': {
         doesServiceInstanceHaveLinkedProvider: () => false,
       },
@@ -207,10 +207,10 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       },
     };
     const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
-      '@serverless/dashboard-plugin/lib/clientUtils': {
+      '@serverless/dashboard-plugin/lib/client-utils': {
         getPlatformClientWithAccessKey: async () => internalMockedSdk,
       },
-      '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
+      '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
     });
 
     expect(
@@ -445,11 +445,11 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         createProviderLink: mockedCreateProviderLink,
       };
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
-        '@serverless/dashboard-plugin/lib/clientUtils': {
+        '@serverless/dashboard-plugin/lib/client-utils': {
           getPlatformClientWithAccessKey: async () => internalMockedSdk,
         },
         '../../utils/openBrowser': mockedOpenBrowser,
-        '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
+        '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
       });
 
       configureInquirerStub(inquirer, {
@@ -515,11 +515,11 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         createProviderLink: mockedCreateProviderLink,
       };
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
-        '@serverless/dashboard-plugin/lib/clientUtils': {
+        '@serverless/dashboard-plugin/lib/client-utils': {
           getPlatformClientWithAccessKey: async () => internalMockedSdk,
         },
         '../../utils/openBrowser': mockedOpenBrowser,
-        '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
+        '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
       });
 
       configureInquirerStub(inquirer, {
@@ -566,7 +566,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         },
       };
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
-        '@serverless/dashboard-plugin/lib/clientUtils': {
+        '@serverless/dashboard-plugin/lib/client-utils': {
           getPlatformClientWithAccessKey: async () => internalMockedSdk,
         },
         '../../utils/openBrowser': mockedOpenBrowser,
@@ -620,7 +620,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         createProviderLink: mockedCreateProviderLink,
       };
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
-        '@serverless/dashboard-plugin/lib/clientUtils': {
+        '@serverless/dashboard-plugin/lib/client-utils': {
           getPlatformClientWithAccessKey: async () => internalMockedSdk,
         },
       });
@@ -681,7 +681,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         createProviderLink: mockedCreateProviderLink,
       };
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
-        '@serverless/dashboard-plugin/lib/clientUtils': {
+        '@serverless/dashboard-plugin/lib/client-utils': {
           getPlatformClientWithAccessKey: async () => internalMockedSdk,
         },
       });
@@ -725,10 +725,10 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         },
       };
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
-        '@serverless/dashboard-plugin/lib/clientUtils': {
+        '@serverless/dashboard-plugin/lib/client-utils': {
           getPlatformClientWithAccessKey: async () => internalMockedSdk,
         },
-        '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
+        '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
       });
 
       await mockedStep.run({
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
index 491311be90e..890ae637ea4 100644
--- a/test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js
+++ b/test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js
@@ -98,7 +98,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       '@serverless/platform-client': {
         ServerlessSDK: ServerlessSDKMock,
       },
-      '@serverless/dashboard-plugin/lib/clientUtils': {
+      '@serverless/dashboard-plugin/lib/client-utils': {
         getPlatformClientWithAccessKey: async () => new ServerlessSDKMock(),
         getOrCreateAccessKeyForOrg: async () => 'accessKey',
       },
diff --git a/test/unit/lib/cli/interactive-setup/deploy.test.js b/test/unit/lib/cli/interactive-setup/deploy.test.js
index 8d26082e397..63b07ddaefc 100644
--- a/test/unit/lib/cli/interactive-setup/deploy.test.js
+++ b/test/unit/lib/cli/interactive-setup/deploy.test.js
@@ -53,7 +53,7 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
 
   it('Should be applied if service instance has a linked provider', async () => {
     const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/deploy', {
-      '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
+      '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
       './utils': {
         doesServiceInstanceHaveLinkedProvider: () => true,
       },
diff --git a/test/unit/lib/cli/interactive-setup/utils.test.js b/test/unit/lib/cli/interactive-setup/utils.test.js
index 7c9a9657c49..b079c1814a1 100644
--- a/test/unit/lib/cli/interactive-setup/utils.test.js
+++ b/test/unit/lib/cli/interactive-setup/utils.test.js
@@ -21,7 +21,7 @@ describe('test/unit/lib/cli/interactive-setup/utils.test.js', () => {
       const { doesServiceInstanceHaveLinkedProvider } = proxyquire(
         '../../../../../lib/cli/interactive-setup/utils',
         {
-          '@serverless/dashboard-plugin/lib/resolveProviderCredentials': () => {
+          '@serverless/dashboard-plugin/lib/resolve-provider-credentials': () => {
             return {
               accessKeyId: 'someaccess',
               secretAccessKey: 'somesecret',
@@ -37,7 +37,7 @@ describe('test/unit/lib/cli/interactive-setup/utils.test.js', () => {
       const { doesServiceInstanceHaveLinkedProvider } = proxyquire(
         '../../../../../lib/cli/interactive-setup/utils',
         {
-          '@serverless/dashboard-plugin/lib/resolveProviderCredentials': () => {
+          '@serverless/dashboard-plugin/lib/resolve-provider-credentials': () => {
             return null;
           },
         }
@@ -49,7 +49,7 @@ describe('test/unit/lib/cli/interactive-setup/utils.test.js', () => {
       const { doesServiceInstanceHaveLinkedProvider } = proxyquire(
         '../../../../../lib/cli/interactive-setup/utils',
         {
-          '@serverless/dashboard-plugin/lib/resolveProviderCredentials': () => {
+          '@serverless/dashboard-plugin/lib/resolve-provider-credentials': () => {
             const err = new Error('Error');
             err.statusCode = 500;
             throw err;
@@ -73,7 +73,7 @@ describe('test/unit/lib/cli/interactive-setup/utils.test.js', () => {
       const { resolveInitialContext } = proxyquire(
         '../../../../../lib/cli/interactive-setup/utils',
         {
-          '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
+          '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
           '../../aws/has-local-credentials': () => true,
         }
       );
@@ -91,7 +91,7 @@ describe('test/unit/lib/cli/interactive-setup/utils.test.js', () => {
       const { resolveInitialContext } = proxyquire(
         '../../../../../lib/cli/interactive-setup/utils',
         {
-          '@serverless/dashboard-plugin/lib/isAuthenticated': () => true,
+          '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
           '../../aws/has-local-credentials': () => true,
         }
       );

From ab005b7b51684970914671a8cde0fa32629a5dc3 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Fri, 7 Jan 2022 15:23:41 +0100
Subject: [PATCH 0915/1101] docs: Split the YAML reference in multiple sections

---
 docs/providers/aws/guide/serverless.yml.md | 1191 +++++++++++++++-----
 1 file changed, 879 insertions(+), 312 deletions(-)

diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index bfe2eede099..ae7cf9d3d03 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -16,113 +16,268 @@ layout: Doc
 
 Here is a list of all available properties in `serverless.yml` when the provider is set to `aws`.
 
+## Root properties
+
 ```yml
 # serverless.yml
 
-service: myService
+# Service name
+service: myservice
 
+# Framework version constraint (semver constraint): '3', '^2.33'
 frameworkVersion: '3'
-configValidationMode: warn # Modes for config validation. `error` throws an exception, `warn` logs error to console, `off` disables validation at all. The default is warn.
-useDotenv: false # If set to 'true', environment variables will be automatically loaded from .env files
-deprecationNotificationMode: warn:summary # 'warn' reports deprecations on the go, 'error' will result with an exception being thrown on first approached deprecation
 
-disabledDeprecations: # Disable deprecation logs by their codes. Default is empty.
+# Configuration validation: 'error' (fatal error), 'warn' (logged to the output) or 'off' (default: warn)
+# See https://www.serverless.com/framework/docs/configuration-validation
+configValidationMode: error
+# Load environment variables from .env files (default: false)
+# See https://www.serverless.com/framework/docs/environment-variables
+useDotenv: true
+# 'warn' reports deprecations on the go, 'error' will result with an exception being thrown on first approached deprecation
+deprecationNotificationMode: warn:summary
+# Disable deprecations by their codes (default: empty)
+# See https://www.serverless.com/framework/docs/deprecations
+disabledDeprecations:
   - DEP_CODE_1 # Deprecation code to disable
   - '*' # Disable all deprecation messages
+```
+
+### Parameters
+
+Learn more about stage parameters in the [Parameters documentation](../../../guides/parameters.md).
+
+```yml
+# serverless.yml
+
+# Stage parameters
+params:
+  # Values for the "prod" stage
+  prod:
+    my-parameter: foo
+  # Values for the "dev" stage
+  dev:
+    my-parameter: bar
+```
+
+## Provider
+
+### General settings
+
+```yml
+# serverless.yml
 
 provider:
   name: aws
+  # Default stage (default: dev)
+  stage: dev
+  # Default region (default: us-east-1)
+  region: us-east-1
+  # The AWS profile to use to deploy (default: "default" profile)
+  profile: production
+  # Use a custom name for the CloudFormation stack
+  stackName: custom-stack-name
+  # Optional CloudFormation tags to apply to APIs and functions
+  tags:
+    foo: bar
+    baz: qux
+  # Optional CloudFormation tags to apply to the stack
+  stackTags:
+    key: value
+  # List of existing Amazon SNS topics in the same region where notifications about stack events are sent.
+  notificationArns:
+    - 'arn:aws:sns:us-east-1:XXXXXX:mytopic'
+  stackParameters:
+    - ParameterKey: 'Keyname'
+      ParameterValue: 'Value'
+  # Disable automatic rollback by CloudFormation on failure. To be used for non-production environments.
+  disableRollback: true
+  rollbackConfiguration:
+    MonitoringTimeInMinutes: 20
+    RollbackTriggers:
+      - Arn: arn:aws:cloudwatch:us-east-1:000000000000:alarm:health
+        Type: AWS::CloudWatch::Alarm
+      - Arn: arn:aws:cloudwatch:us-east-1:000000000000:alarm:latency
+        Type: AWS::CloudWatch::Alarm
+  tracing:
+    # Can only be true if API Gateway is inside a stack.
+    apiGateway: true
+    # Optional, can be true (true equals 'Active'), 'Active' or 'PassThrough'
+    lambda: true
+```
+
+### General function settings
+
+Some function settings can be defined for all functions inside the `provider` key:
+
+```yml
+# serverless.yml
+
+provider:
   runtime: nodejs14.x
-  stage: dev # Default stage to be used. Default is "dev"
-  region: us-east-1 # Default region to be used. Default is "us-east-1"
-  stackName: custom-stack-name # Use a custom name for the CloudFormation stack
-  apiName: custom-api-name # Use a custom name for the API Gateway API
-  websocketsApiName: custom-websockets-api-name # Use a custom name for the websockets API
-  websocketsApiRouteSelectionExpression: $request.body.route # custom route selection expression
-  profile: production # The default profile to use with this service
-  memorySize: 512 # Overwrite the default memory size. Default is 1024
-  timeout: 10 # The default is 6 seconds. Note: API Gateway current maximum is 30 seconds
-  logRetentionInDays: 14 # Set the default RetentionInDays for a CloudWatch LogGroup
-  kmsKeyArn: arn:aws:kms:us-east-1:XXXXXX:key/some-hash # KMS key arn which will be used for encryption for all functions
+  # Default memory size for functions (default: 1024MB)
+  memorySize: 512
+  # Default timeout for functions (default: 6 seconds)
+  # Note: API Gateway has a maximum timeout of 30 seconds
+  timeout: 10
+  # Function environment variables
+  environment:
+    APP_ENV_VARIABLE: FOOBAR
+  # Duration for CloudWatch log retention (default: forever)
+  logRetentionInDays: 14
+  # KMS key ARN to use for encryption for all functions
+  kmsKeyArn: arn:aws:kms:us-east-1:XXXXXX:key/some-hash
+  # Version of hashing algorithm used by Serverless Framework for function packaging
+  lambdaHashingVersion: 20201221
+  # Use function versioning (enabled by default)
+  versionFunctions: false
+  # Processor architecture: 'x86_64' or 'arm64' via Graviton2 (default: x86_64)
+  architecture: x86_64
+```
+
+### Deployment bucket
+
+Serverless Framework needs a S3 bucket to store artifacts for deploying. That bucket is automatically created and managed by Serverless, but you can configure it explicitly if needed:
+
+```yaml
+provider:
+  # The S3 prefix under which deployed artifacts are stored (default: serverless)
+  deploymentPrefix: serverless
+  # Configure the S3 bucket used by Serverless Framework to deploy code packages to Lambda
   deploymentBucket:
-    blockPublicAccess: true # Prevents public access via ACLs or bucket policies. Default is false
-    skipPolicySetup: false # Prevents creation of default bucket policy when framework creates the deployment bucket. Default is false
-    name: com.serverless.${self:provider.region}.deploys # Deployment bucket name. Default is generated by the framework
-    maxPreviousDeploymentArtifacts: 5 # On every deployment the framework prunes the bucket to remove artifacts older than this limit. The default is 5
-    versioning: false # enable bucket versioning. Default is false
-    serverSideEncryption: AES256 # server-side encryption method
-    sseKMSKeyId: arn:aws:kms:us-east-1:xxxxxxxxxxxx:key/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa # when using server-side encryption
-    sseCustomerAlgorithim: AES256 # when using server-side encryption and custom keys
-    sseCustomerKey: string # when using server-side encryption and custom keys
-    sseCustomerKeyMD5: md5sum # when using server-side encryption and custom keys
-    tags: # Tags that will be added to each of the deployment resources
+    # Name of an existing bucket to use (default: created by serverless)
+    name: com.serverless.${self:provider.region}.deploys
+    # On deployment, serverless prunes artifacts older than this limit (default: 5)
+    maxPreviousDeploymentArtifacts: 10
+    # Prevents public access via ACLs or bucket policies (default: false)
+    # Note: the deployment bucket is not public by default. These are additional ACLs.
+    blockPublicAccess: true
+    # Skip the creation of a default bucket policy when the deployment bucket is created (default: false)
+    skipPolicySetup: true
+    # Enable bucket versioning (default: false)
+    versioning: true
+    # Server-side encryption method
+    serverSideEncryption: AES256
+    # For server-side encryption
+    sseKMSKeyId: arn:aws:kms:us-east-1:xxxxxxxxxxxx:key/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
+    # For server-side encryption with custom keys
+    sseCustomerAlgorithim: AES256
+    sseCustomerKey: string
+    sseCustomerKeyMD5: md5sum
+    # Tags that will be added to each of the deployment resources
+    tags:
       key1: value1
       key2: value2
-  deploymentPrefix: serverless # The S3 prefix under which deployed artifacts should be stored. Default is serverless
-  lambdaHashingVersion: 20201221 # optional, version of hashing algorithm that should be used by the framework
-  ecr:
-    scanOnPush: true
-    images: # Definitions of images that later can be referenced by key in `function.image`
-      baseimage:
-        uri: 000000000000.dkr.ecr.us-east-1.amazonaws.com/test-image@sha256:6bb600b4d6e1d7cf521097177d111111ea373edb91984a505333be8ac9455d38 # Image uri of existing Docker image in ECR
-      anotherimage:
-        path: ./image/ # Path to Docker context that will be used when building that image locally
-        file: Dockerfile.dev # Name of Dockerfile that should be used when building image locally. Equal to 'Dockerfile' by default
-        buildArgs:
-          STAGE: ${opt:stage}
-        cacheFrom:
-          - my-image:latest
-  cloudFront:
-    cachePolicies:
-      myCachePolicy1: # used as a reference in function.events[].cloudfront.cachePolicy.name
-        DefaultTTL: 60
-        MinTTL: 30
-        MaxTTL: 3600
-        Comment: my brand new cloudfront cache policy # optional
-        ParametersInCacheKeyAndForwardedToOrigin:
-          CookiesConfig:
-            CookieBehavior: whitelist # Possible values are 'none', 'whitelist', 'allExcept' and 'all'
-            Cookies:
-              - my-public-cookie
-          EnableAcceptEncodingBrotli: true # optional
-          EnableAcceptEncodingGzip: true
-          HeadersConfig:
-            HeaderBehavior: whitelist # Possible values are 'none' and 'whitelist'
-            Headers:
-              - authorization
-              - content-type
-          QueryStringsConfig:
-            QueryStringBehavior: allExcept # Possible values are 'none', 'whitelist', 'allExcept' and 'all'
-            QueryStrings:
-              - not-cached-query-string
-  versionFunctions: false # Optional function versioning
-  architecture: x86_64 # Default instruction set architecture for Lambda functions (for ARM, AWS Graviton2 processor based, set it to 'arm64')
-  environment: # Service wide environment variables
-    serviceEnvVar: 123456789
-  endpointType: regional # Optional endpoint configuration for API Gateway REST API. Default is Edge.
-  apiGateway: # Optional API Gateway global config
-    restApiId: xxxxxxxxxx # REST API resource ID. Default is generated by the framework
-    restApiRootResourceId: xxxxxxxxxx # Root resource ID, represent as / path
-    restApiResources: # List of existing resources that were created in the REST API. This is required or the stack will be conflicted
-      '/users': xxxxxxxxxx
-      '/users/create': xxxxxxxxxx
-    websocketApiId: # Websocket API resource ID. Default is generated by the framework
-    apiKeySourceType: HEADER # Source of API key for usage plan. HEADER or AUTHORIZER.
-    apiKeys: # List of API keys to be used by your service API Gateway REST API
+```
+
+### API Gateway v2 HTTP API
+
+The `httpApi` settings apply to [API Gateway v2 HTTP APIs](../events/http-api.md):
+
+```yml
+provider:
+  httpApi:
+    # Attach to an externally created HTTP API via its ID:
+    id: xxxx
+    # Set a custom name for the API Gateway API (default: ${sls:stage}-${self:service})
+    name: dev-my-service
+    # Payload format version (note: use quotes in YAML: '1.0' or '2.0') (default: '2.0')
+    payload: '2.0'
+    # Disable the default 'execute-api' HTTP endpoint (default: false)
+    # Useful when using a custom domain.
+    disableDefaultEndpoint: true
+    # Enable detailed CloudWatch metrics (default: false)
+    metrics: true
+    # Enable CORS HTTP headers with default settings (allow all)
+    # Can be fine-tuned with specific options
+    cors: true
+    authorizers:
+      # JWT API authorizer
+      someJwtAuthorizer:
+        identitySource: $request.header.Authorization
+        issuerUrl: https://cognito-idp.us-east-1.amazonaws.com/us-east-1_xxxxx
+        audience:
+          - xxxx
+          - xxxx
+      # Custom Lambda request authorizer
+      someCustomLambdaAuthorizer:
+        # Should be set to 'request' for custom Lambda authorizers
+        type: request
+        # Mutually exclusive with `functionArn`
+        functionName: authorizerFunc
+        # Mutually exclusive with `functionName`
+        functionArn: arn:aws:lambda:us-east-1:11111111111:function:external-authorizer
+        # Optional. Custom name for created authorizer
+        name: customAuthorizerName
+        # Optional. Time to live for cached authorizer results, accepts values from 0 (no caching) to 3600 (1 hour)
+        # When set to non-zero value, 'identitySource' must be defined as well
+        resultTtlInSeconds: 300
+        # Set if authorizer function will return authorization responses in simple format (default: false)
+        enableSimpleResponses: true
+        # Version of payload that will be sent to authorizer function (default: '2.0')
+        payloadVersion: '2.0'
+        # Optional. One or more mapping expressions of the request parameters in form of e.g `$request.header.Auth`.
+        # Specified values are verified to be non-empty and not null by authorizer.
+        # It is a required property when `resultTtlInSeconds` is non-zero as `identitySource` is additionally
+        # used as cache key for authorizer responses caching.
+        identitySource:
+          - $request.header.Auth
+          - $request.header.Authorization
+        # Optional. Applicable only when using externally defined authorizer functions
+        # to prevent creation of permission resource
+        managedExternally: true
+```
+
+### API Gateway v1 REST API
+
+The `apiGateway` settings apply to [API Gateway v1 REST APIs](../events/apigateway.md) and [websocket APIs](../events/websocket.md):
+
+```yml
+provider:
+  # Use a custom name for the API Gateway API
+  apiName: custom-api-name
+  # Endpoint type for API Gateway REST API: edge or regional (default: edge)
+  endpointType: regional
+  # Use a custom name for the websockets API
+  websocketsApiName: custom-websockets-api-name
+  # custom route selection expression
+  websocketsApiRouteSelectionExpression: $request.body.route
+  # Optional API Gateway REST API global config
+  apiGateway:
+    # Attach to an externally created REST API via its ID:
+    restApiId: xxxx
+    # Root resource ID, represent as / path
+    restApiRootResourceId: xxxx
+    # List of existing resources that were created in the REST API. This is required or the stack will be conflicted
+    restApiResources:
+      '/users': xxxx
+      '/users/create': xxxx
+    # Attach to an externally created Websocket API via its ID:
+    websocketApiId: xxxx
+    # Disable the default 'execute-api' HTTP endpoint (default: false)
+    disableDefaultEndpoint: true
+    # Source of API key for usage plan: HEADER or AUTHORIZER
+    apiKeySourceType: HEADER
+    # List of API keys for the REST API
+    apiKeys:
       - myFirstKey
         value: myFirstKeyValue
         description: myFirstKeyDescription
         customerId: myFirstKeyCustomerId
-        enabled: true # Optional, true by default, can be used to disable API key without deleting the resource
-      - ${opt:stage}-myFirstKey
+        # Can be used to disable the API key without removing it (default: true)
+        enabled: false
+      - ${sls:stage}-myFirstKey
       - ${env:MY_API_KEY} # you can hide it in a serverless variable
-    minimumCompressionSize: 1024 # Compress response when larger than specified size in bytes (must be between 0 and 10485760)
-    description: Some Description # Optional description for the API Gateway stage deployment
-    disableDefaultEndpoint: true # Optional disable the default 'execute-api' endpoint
-    binaryMediaTypes: # Optional binary media types the API might return
+    # Compress response when larger than specified size in bytes (must be between 0 and 10485760)
+    minimumCompressionSize: 1024
+    # Description for the API Gateway stage deployment
+    description: Some description
+    # Optional binary media types the API might return
+    binaryMediaTypes:
       - '*/*'
-    metrics:  false # Optional detailed Cloud Watch Metrics
-    shouldStartNameWithService: false # Use `${service}-${stage}` naming for API Gateway. Will be `true` by default in next major version.
+    # Optional detailed Cloud Watch Metrics
+    metrics: false
+    # Use `${service}-${stage}` naming for API Gateway. Will be `true` by default in v3.
+    shouldStartNameWithService: false
     resourcePolicy:
       - Effect: Allow
         Principal: '*'
@@ -133,7 +288,8 @@ provider:
           IpAddress:
             aws:SourceIp:
               - '123.123.123.123'
-    usagePlan: # Optional usage plan configuration
+    # Optional usage plan configuration
+    usagePlan:
       quota:
         limit: 5000
         offset: 2
@@ -142,84 +298,154 @@ provider:
         burstLimit: 200
         rateLimit: 100
     request:
-      schemas: # Optional request schema validation models that can be reused in `http` events. It is always defined for `application/json` content type
+      # Request schema validation models that can be reused in `http` events
+      # It is always defined for `application/json` content type
+      schemas:
         global-model:
-          name: GlobalModel # Optional: Name of the API Gateway model
-          description: "A global model that can be referenced in functions" # Optional: Description of the API Gateway model
-          schema: ${file(schema.json)}  # Valid JSON Schema
+          # JSON Schema
+          schema: ${file(schema.json)}
+          # Optional: Name of the API Gateway model
+          name: GlobalModel
+          # Optional: Description of the API Gateway model
+          description: "A global model that can be referenced in functions"
+```
+
+### ALB
+
+Configure [Application Load Balancer](../events/alb.md):
+
+```yml
+provider:
   alb:
-    targetGroupPrefix: xxxxxxxxxx # Optional prefix to prepend when generating names for target groups
+    # Optional prefix to prepend when generating names for target groups
+    targetGroupPrefix: xxxx
     authorizers:
       myFirstAuth:
         type: 'cognito'
-        userPoolArn: 'arn:aws:cognito-idp:us-east-1:123412341234:userpool/us-east-1_123412341', # required
-        userPoolClientId: '1h57kf5cpq17m0eml12EXAMPLE', # required
-        userPoolDomain: 'your-test-domain' # required
-        onUnauthenticatedRequest: 'deny' # If set to 'allow' this allows the request to be forwarded to the target when user is not authenticated. When omitted it defaults 'deny' which makes a HTTP 401 Unauthorized error be returned. Alternatively configure to 'authenticate' to redirect request to IdP authorization endpoint.
-        requestExtraParams: # optional. The query parameters (up to 10) to include in the redirect request to the authorization endpoint
-          prompt: 'login'
+        # Required
+        userPoolArn: 'arn:aws:cognito-idp:us-east-1:123412341234:userpool/us-east-1_123412341'
+        # Required
+        userPoolClientId: '1h57kf5cpq17m0eml12EXAMPLE'
+        # Required
+        userPoolDomain: your-test-domain
+        # If set to 'allow' this allows the request to be forwarded to the target when user is not authenticated.
+        # When omitted it defaults 'deny' which makes a HTTP 401 Unauthorized error be returned.
+        # Alternatively configure to 'authenticate' to redirect request to IdP authorization endpoint.
+        onUnauthenticatedRequest: deny
+        # optional. The query parameters (up to 10) to include in the redirect request to the authorization endpoint
+        requestExtraParams:
+          prompt: login
           redirect: false
-        scope: 'first_name age' # Can be a combination of any system-reserved scopes or custom scopes associated with the client. The default is openid
-        sessionCookieName: '🍪' # The name of the cookie used to maintain session information. The default is AWSELBAuthSessionCookie
-        sessionTimeout: 7000 # The maximum duration of the authentication session, in seconds. The default is 604800 seconds (7 days).
+        # Combination of any system-reserved scopes or custom scopes associated with the client (default: openid)
+        scope: 'first_name age'
+        # Name of the cookie used to maintain session information (default: AWSELBAuthSessionCookie)
+        sessionCookieName: '🍪'
+        # Maximum duration of the authentication session in seconds (default: 604800 seconds/7 days)
+        sessionTimeout: 7000
       mySecondAuth:
-        type: 'oidc'
-        authorizationEndpoint: 'https://example.com', # required. The authorization endpoint of the IdP. Must be a full URL, including the HTTPS protocol, the domain, and the path
-        clientId: 'i-am-client', # required
-        clientSecret: 'i-am-secret', # if creating a rule this is required. If modifying a rule, this can be omitted if you set useExistingClientSecret to true (as below)
-        useExistingClientSecret: true # only required if clientSecret is omitted
-        issuer: 'https://www.iamscam.com', # required. The OIDC issuer identifier of the IdP. This must be a full URL, including the HTTPS protocol, the domain, and the path
-        tokenEndpoint: 'http://somewhere.org', # required
-        userInfoEndpoint: 'https://another-example.com' # required
-        onUnauthenticatedRequest: 'deny' # If set to 'allow' this allows the request to be forwarded to the target when user is not authenticated. Omit or set to 'deny' (default) to make a HTTP 401 Unauthorized error be returned instead. Alternatively configure to 'authenticate' to redirect request to IdP authorization endpoint.
+        type: oidc
+        # Required. The authorization endpoint of the IdP.
+        # Must be a full URL, including the HTTPS protocol, the domain, and the path
+        authorizationEndpoint: 'https://example.com'
+        # Required
+        clientId: i-am-client
+        # If creating a rule this is required
+        # If modifying a rule, this can be omitted if you set useExistingClientSecret to true (as below)
+        clientSecret: i-am-secret
+        # Only required if clientSecret is omitted
+        useExistingClientSecret: true
+        # Required. The OIDC issuer identifier of the IdP
+        # This must be a full URL, including the HTTPS protocol, the domain, and the path
+        issuer: 'https://www.iamscam.com'
+        # Required
+        tokenEndpoint: 'http://somewhere.org'
+        # Required
+        userInfoEndpoint: 'https://another-example.com'
+        # If set to 'allow' this allows the request to be forwarded to the target when user is not authenticated.
+        # Omit or set to 'deny' (default) to make a HTTP 401 Unauthorized error be returned instead.
+        # Alternatively configure to 'authenticate' to redirect request to IdP authorization endpoint.
+        onUnauthenticatedRequest: 'deny'
         requestExtraParams:
-          prompt: 'login'
+          prompt: login
           redirect: false
-        scope: 'first_name age'
+        scope: first_name age
         sessionCookieName: '🍪'
         sessionTimeout: 7000
-  httpApi:
-    id: 'my-id' # If we want to attach to externally created HTTP API its id should be provided here
-    name: 'dev-my-service' # Use custom name for the API Gateway API, default is ${sls:stage}-${self:service}
-    payload: '2.0' # Specify payload format version for Lambda integration ('1.0' or '2.0'), default is '2.0'
-    disableDefaultEndpoint: false # Specify whether clients can invoke your API by using the default `execute-api` endpoint
-    metrics: true # Enable detailed metrics
-    cors: true # Implies default behavior, can be fine tuned with specific options
-    authorizers:
-      # JWT authorizer to back HTTP API endpoints
-      someJwtAuthorizer:
-        identitySource: $request.header.Authorization
-        issuerUrl: https://cognito-idp.us-east-1.amazonaws.com/us-east-1_xxxxx
-        audience:
-          - xxxx
-          - xxxx
-      # Custom Lambda request authorizer to back HTTP API endpoints
-      someCustomLambdaAuthorizer:
-        type: request # Should be set to `request` for custom Lambda authorizers.
-        functionName: authorizerFunc # Mutually exclusive with `functionArn`
-        functionArn: arn:aws:lambda:us-east-1:11111111111:function:external-authorizer # Mutually exclusive with `functionName`
-        name: customAuthorizerName # Optional. Custom name for created authorizer
-        resultTtlInSeconds: 300 # Optional. Time to live for cached authorizer results, accepts values from 0 (no caching) to 3600 (1 hour). When set to non-zero value, `identitySource` must be defined as well.
-        enableSimpleResponses: true # Optional. Flag that specifies if authorizer function will return authorization responses in simple format. Defaults to `false`.
-        payloadVersion: '2.0' # Optional. Version of payload that will be sent to authorizer function. Defaults to `'2.0'`.
-        identitySource: # Optional. One or more mapping expressions of the request parameters in form of e.g `$request.header.Auth`. Specified values are verified to be non-empty and not null by authorizer. It is a required property when `resultTtlInSeconds` is non-zero as `identitySource` is additionally used as cache key for authorizer responses caching.
-          - $request.header.Auth
-          - $request.header.Authorization
-        managedExternally: true # Optional. Applicable only when using externally defined authorizer functions to prevent creation of permission resource
-  stackTags: # Optional CF stack tags
-    key: value
+```
+
+### Docker image deployments in ECR
+
+Configure [deployment via Docker images](./functions.md#referencing-container-image-as-a-target):
+
+```yaml
+provider:
+  ecr:
+    scanOnPush: true
+    # Definitions of images that later can be referenced by key in `function.image`
+    images:
+      baseimage:
+        # URI of an existing Docker image in ECR
+        uri: 000000000000.dkr.ecr.us-east-1.amazonaws.com/test-image@sha256:6bb600b4d6e1d7cf521097177d111111ea373edb91984a505333be8ac9455d38
+      anotherimage:
+        # Path to the Docker context that will be used when building that image locally (default: '.')
+        path: ./image/
+        # Dockerfile that will be used when building the image locally (default: 'Dockerfile')
+        file: Dockerfile.dev
+        buildArgs:
+          STAGE: ${sls:stage}
+        cacheFrom:
+          - my-image:latest
+```
+
+### CloudFront
+
+Configure the CloudFront distribution used for [CloudFront Lambda@Edge events](../events/cloudfront.md):
+
+```yml
+provider:
+  cloudFront:
+    cachePolicies:
+      # Used as a reference in function.events[].cloudfront.cachePolicy.name
+      myCachePolicy1:
+        DefaultTTL: 60
+        MinTTL: 30
+        MaxTTL: 3600
+        Comment: my brand new cloudfront cache policy # optional
+        ParametersInCacheKeyAndForwardedToOrigin:
+          CookiesConfig:
+            # Possible values are 'none', 'whitelist', 'allExcept' and 'all'
+            CookieBehavior: whitelist
+            Cookies:
+              - my-public-cookie
+          EnableAcceptEncodingBrotli: true # optional
+          EnableAcceptEncodingGzip: true
+          HeadersConfig:
+            # Possible values are 'none' and 'whitelist'
+            HeaderBehavior: whitelist
+            Headers:
+              - authorization
+              - content-type
+          QueryStringsConfig:
+            # Possible values are 'none', 'whitelist', 'allExcept' and 'all'
+            QueryStringBehavior: allExcept
+            QueryStrings:
+              - not-cached-query-string
+```
+
+### IAM permissions
+
+Configure IAM roles and permissions applied to Lambda functions ([complete documentation](./iam.md)):
+
+```yml
+provider:
   iam:
-    # Overwrite the default IAM role which is used for all functions
+    # Instruct Serverless to use an existing IAM role for all Lambda functions
     role: arn:aws:iam::XXXXXX:role/role
-    # .. OR configure logical role
+    # OR configure the role that will be created by Serverless (simplest):
     role:
-      name: your-custom-name-role # Optional custom name for default IAM role
-      path: /your-custom-path/ # Optional custom path for default IAM role
-      managedPolicies: # Optional IAM Managed Policies, which allows to include the policies into IAM Role
-        - arn:aws:iam:*****:policy/some-managed-policy
-      permissionsBoundary: arn:aws:iam::XXXXXX:policy/policy # ARN of an Permissions Boundary for the role.
-      statements: # IAM role statements so that services can be accessed in the AWS account
-        - Effect: 'Allow'
+      # Add statements to the IAM role to give permissions to Lambda functions
+      statements:
+        - Effect: Allow
           Action:
             - 's3:ListBucket'
           Resource:
@@ -227,10 +453,23 @@ provider:
               - ''
               - - 'arn:aws:s3:::'
                 - Ref: ServerlessDeploymentBucket
+      # Optional custom name for default IAM role
+      name: your-custom-name-role
+      # Optional custom path for default IAM role
+      path: /your-custom-path/
+      # Optional IAM Managed Policies to include into the IAM Role
+      managedPolicies:
+        - arn:aws:iam:*****:policy/some-managed-policy
+      # ARN of a Permissions Boundary for the role
+      permissionsBoundary: arn:aws:iam::XXXXXX:policy/policy
+      # CloudFormation tags
       tags:
         key: value
-    deploymentRole: arn:aws:iam::XXXXXX:role/role # ARN of an IAM role for CloudFormation service. If specified, CloudFormation uses the role's credentials
-  stackPolicy: # Optional CF stack policy. The example below allows updates to all resources except deleting/replacing EC2 instances (use with caution!)
+    # ARN of an IAM role for CloudFormation service. If specified, CloudFormation uses the role's credentials
+    deploymentRole: arn:aws:iam::XXXXXX:role/role
+  # Optional CF stack policy to restrict which resources can be updated/deleted on deployment
+  # The example below allows updating all resources in the service except deleting/replacing EC2 instances (use with caution!)
+  stackPolicy:
     - Effect: Allow
       Principal: '*'
       Action: 'Update:*'
@@ -245,181 +484,342 @@ provider:
         StringEquals:
           ResourceType:
             - AWS::EC2::Instance
-  vpc: # Optional VPC. But if you use VPC then both subproperties (securityGroupIds and subnetIds) are required
+```
+
+### VPC
+
+Configure the Lambda functions to run inside a VPC ([complete documentation](./functions.md#vpc-configuration)):
+
+```yml
+provider:
+  # Optional VPC settings
+  # If you use VPC then both securityGroupIds and subnetIds are required
+  vpc:
     securityGroupIds:
       - securityGroupId1
       - securityGroupId2
     subnetIds:
       - subnetId1
       - subnetId2
-  notificationArns: # List of existing Amazon SNS topics in the same region where notifications about stack events are sent.
-    - 'arn:aws:sns:us-east-1:XXXXXX:mytopic'
-  stackParameters:
-    - ParameterKey: 'Keyname'
-      ParameterValue: 'Value'
-  disableRollback: true # To be used for non-production environment
-  rollbackConfiguration:
-    MonitoringTimeInMinutes: 20
-    RollbackTriggers:
-      - Arn: arn:aws:cloudwatch:us-east-1:000000000000:alarm:health
-        Type: AWS::CloudWatch::Alarm
-      - Arn: arn:aws:cloudwatch:us-east-1:000000000000:alarm:latency
-        Type: AWS::CloudWatch::Alarm
-  tags: # Optional service wide function tags
-    foo: bar
-    baz: qux
-  tracing:
-    apiGateway: true # Can only be true if API Gateway is inside a stack.
-    lambda: true # Optional, can be true (true equals 'Active'), 'Active' or 'PassThrough'
+```
+
+### Logs
+
+Configure logs for the deployed resources:
+
+```yml
+provider:
   logs:
-    restApi: # Optional configuration which specifies if API Gateway logs are used. This can either be set to `true` to use defaults, or configured via subproperties. Can only be configured if API Gateway is inside a stack.
-      accessLogging: true # Optional configuration which enables or disables access logging. Defaults to true.
-      format: 'requestId: $context.requestId' # Optional configuration which specifies the log format to use for access logging.
-      executionLogging: true # Optional configuration which enables or disables execution logging. Defaults to true.
-      level: INFO # Optional configuration which specifies the log level to use for execution logging. May be set to either INFO or ERROR.
-      fullExecutionData: true # Optional configuration which specifies whether or not to log full requests/responses for execution logging. Defaults to true.
-      role: arn:aws:iam::123456:role # Existing IAM role for ApiGateway to use when managing CloudWatch Logs. If 'role' is not configured, a new role is automatically created.
-      roleManagedExternally: false # Specifies whether the ApiGateway CloudWatch Logs role setting is not managed by Serverless. Defaults to false.
-    websocket: # Optional configuration which specifies if Websocket logs are used. This can either be set to `true` to use defaults, or configured via subproperties.
-      level: INFO # Optional configuration which specifies the log level to use for execution logging. May be set to either INFO or ERROR.
-    httpApi: # Optional configuration which specifies if HTTP API logs are used. This can either be set to `true` (to use defaults as below) or specific log format configuration can be provided
+    # Enable HTTP API logs
+    # This can either be set to `httpApi: true` to use defaults, or configured via subproperties
+    # Can only be configured if the API is created by Serverless Framework
+    httpApi:
       format: '{ "requestId":"$context.requestId", "ip": "$context.identity.sourceIp", "requestTime":"$context.requestTime", "httpMethod":"$context.httpMethod","routeKey":"$context.routeKey", "status":"$context.status","protocol":"$context.protocol", "responseLength":"$context.responseLength" }'
 
-    frameworkLambda: true # Optional, whether to write CloudWatch logs for custom resource lambdas as added by the framework
-  s3: # If you need to configure the bucket itself, you'll need to add s3 resources to the provider configuration
-    bucketOne: # Eventual additional properties in camel case
-    # Supported properties are the same ones as supported by CF resource for S3 bucket: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html
+    # Enable REST API logs
+    # This can either be set to `restApi: true` to use defaults, or configured via subproperties
+    # Can only be configured if the API is created by Serverless Framework
+    restApi:
+      # Enables HTTP access logs (default: true)
+      accessLogging: true
+      # Log format to use for access logs
+      format: 'requestId: $context.requestId'
+      # Enable execution logging (default: true)
+      executionLogging: true
+      # Log level to use for execution logging: INFO or ERROR
+      level: INFO
+      # Log full requests/responses for execution logging (default: true)
+      fullExecutionData: true
+      # Existing IAM role to use for API Gateway when writing CloudWatch Logs (default: automatically created)
+      role: arn:aws:iam::123456:role
+      # Whether the API Gateway CloudWatch Logs role setting is not managed by Serverless (default: false)
+      roleManagedExternally: false
+
+    # Enable Websocket API logs
+    # This can either be set to `websocket: true` to use defaults, or configured via subproperties.
+    websocket:
+      # Log level to use for execution logging: INFO or ERROR.
+      level: INFO
+
+    # Optional, whether to write CloudWatch logs for custom resource lambdas as added by the framework
+    frameworkLambda: true
+```
+
+### S3 buckets
+
+Configure the S3 buckets created for [S3 Lambda events](../events/s3.md):
+
+```yml
+provider:
+  # If you need to configure the bucket itself, you'll need to add s3 resources to the provider configuration
+  s3:
+    # Eventual additional properties in camel case
+    bucketOne:
+      # Supported properties are the same ones as supported by CF resource for S3 bucket
+      # See https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html
       name: my-custom-bucket-name
       versioningConfiguration:
         Status: Enabled
+```
 
-params: # Stage parameters
-  prod: # Values for the "prod" stage
-    my-parameter: foo
-  dev: # Values for the "dev" stage
-    my-parameter: bar
+## Package
+
+The `serverless package` or `serverless deploy` commands [package the code of all functions into zip files](./packaging.md).
+These zip files are then used for deployments.
+
+```yml
+# serverless.yml
 
-package: # Optional deployment packaging configuration
-  patterns: # Specify the directories and files which should be included in the deployment package
+# Optional deployment packaging configuration
+package:
+  # Directories and files to include in the deployed package
+  patterns:
     - src/**
     - handler.js
     - '!.git/**'
     - '!.travis.yml'
-  excludeDevDependencies: false # Config if Serverless should automatically exclude dev dependencies in the deployment package. Defaults to true
-  artifact: path/to/my-artifact.zip # Own package that should be used. You must provide this file.
-  individually: true # Enables individual packaging for each function. If true you must provide package for each function. Defaults to false
+  # Package each function as an individual artifact (default: false)
+  individually: true
+  # Explicitly set the package artifact to deploy (overrides native packaging behavior)
+  artifact: path/to/my-artifact.zip
+  # Automatically exclude NPM dev dependencies from the deployed package (default: true)
+  excludeDevDependencies: false
+```
+
+## Functions
+
+Configure the Lambda functions to deploy ([complete documentation](./functions.md)):
+
+```yml
+# serverless.yml
 
 functions:
-  usersCreate: # A Function
-    handler: users.create # The file and module for this specific function. Cannot be used when `image` is defined.
-    image: baseimage # Image to be used by function, cannot be used when `handler` is defined. It can be configured as concrete uri of Docker image in ECR or as a reference to image defined in `provider.ecr.images`
-    architecture: x86_64 # Instruction set architecture of a Lambda function (for ARM, AWS Graviton2 processor based, set it to 'arm64')
-    name: ${sls:stage}-lambdaName # optional, Deployed Lambda name
-    description: My function # The description of your function.
-    memorySize: 512 # memorySize for this specific function.
-    reservedConcurrency: 5 # optional, reserved concurrency limit for this function. By default, AWS uses account concurrency limit
-    provisionedConcurrency: 3 # optional, Count of provisioned lambda instances
-    runtime: nodejs12.x # Runtime for this specific function. Overrides the default which is set on the provider level
-    timeout: 10 # Timeout for this specific function.  Overrides the default set above.
-    role: arn:aws:iam::XXXXXX:role/role # IAM role which will be used for this function
-    onError: arn:aws:sns:us-east-1:XXXXXX:sns-topic # Optional SNS topic / SQS arn (Ref, Fn::GetAtt and Fn::ImportValue are supported as well) which will be used for the DeadLetterConfig
-    kmsKeyArn: arn:aws:kms:us-east-1:XXXXXX:key/some-hash # Optional KMS key arn which will be used for encryption (overwrites the one defined on the provider level)
-    disableLogs: false # Disables creation of CloudWatch Log Group
-    environment: # Function level environment variables
-      functionEnvVar: 12345678
+  # A function
+  hello:
+    # The file and module for this specific function. Cannot be used with 'image'.
+    handler: users.create
+    # Container image to use. Cannot be used with 'handler'.
+    # Can be the URI of an image in ECR, or the name of an image defined in 'provider.ecr.images'
+    image: baseimage
+    runtime: nodejs14.x
+    # Memory size (default: 1024MB)
+    memorySize: 512
+    # Timeout (default: 6 seconds)
+    # Note: API Gateway has a maximum timeout of 30 seconds
+    timeout: 10
+    # Function environment variables
+    environment:
+      APP_ENV_VARIABLE: FOOBAR
+    # Override the Lambda function name
+    name: ${sls:stage}-lambdaName
+    description: My function
+    # Processor architecture: 'x86_64' or 'arm64' via Graviton2 (default: x86_64)
+    architecture: x86_64
+    # Reserve a maximum number of concurrent instances (default: account limit)
+    reservedConcurrency: 5
+    # Provision a minimum number of concurrent instances (default: 0)
+    provisionedConcurrency: 3
+    # Override the IAM role to use for this function
+    role: arn:aws:iam::XXXXXX:role/role
+    # SNS topic or SQS ARN to use for the DeadLetterConfig (failed executions)
+    onError: arn:aws:sns:us-east-1:XXXXXX:sns-topic
+    # KMS key ARN to use for encryption for this function
+    kmsKeyArn: arn:aws:kms:us-east-1:XXXXXX:key/some-hash
+    # Disable the creation of the CloudWatch log group
+    disableLogs: false
     tags: # Function specific tags
       foo: bar
-    vpc: # Optional VPC. If you use VPC then both subproperties (securityGroupIds and subnetIds) are required. Can be set to ~ to specify no VPC.
+    # VPC settings for this function
+    # If you use VPC then both subproperties (securityGroupIds and subnetIds) are required
+    # Can be set to '~' to disable the use of a VPC
+    vpc:
       securityGroupIds:
         - securityGroupId1
         - securityGroupId2
       subnetIds:
         - subnetId1
         - subnetId2
+    # Packaging rules specific to this function
     package:
-      patterns: # Specify the directories and files which should be included in the deployment package for this specific function.
+      # Directories and files to include in the deployed package
+      patterns:
         - src/**
         - handler.js
         - '!.git/**'
         - '!.travis.yml'
-      artifact: path/to/my-artifact.zip # Own package that should be use for this specific function. You must provide this file.
-      individually: true # Enables individual packaging for specific function. If true you must provide package for each function. Defaults to false
-    layers: # An optional list Lambda Layers to use
-      - arn:aws:lambda:region:XXXXXX:layer:LayerName:Y # Layer Version ARN
-    tracing: Active # optional, can be 'Active' or 'PassThrough' (overwrites the one defined on the provider level)
-    condition: SomeCondition # optional, adds 'Condition' clause
-    dependsOn: # optional, appends these additional resources to the 'DependsOn' list
+      # Explicitly set the package artifact to deploy (overrides native packaging behavior)
+      artifact: path/to/my-artifact.zip
+      # Package this function as an individual artifact (default: false)
+      individually: true
+    # ARN of Lambda layers to use
+    layers:
+      - arn:aws:lambda:region:XXXXXX:layer:LayerName:Y
+    # Overrides the provider setting. Can be 'Active' or 'PassThrough'
+    tracing: Active
+    # Conditionally deploy the function
+    condition: SomeCondition
+    # CloudFormation 'DependsOn' option
+    dependsOn:
       - MyThing
       - MyOtherThing
-    destinations: # optional, destinations for async invocations
-      onSuccess: functionName # function name or ARN of a target (externally managed lambda, EventBridge event bus, SQS queue or SNS topic)
-      onFailure: xxx:xxx:target # function name or ARN of a target (externally managed lambda, EventBridge event bus, SQS queue or SNS topic)
+    # Lambda destination settings
+    destinations:
+      # Function name or ARN of target (EventBridge/SQS/SNS topic)
+      onSuccess: functionName
+      # Function name or ARN of target (EventBridge/SQS/SNS topic)
+      onFailure: xxx:xxx:target
+    # Mount an EFS filesystem
     fileSystemConfig:
-      arn: arn:aws:elasticfilesystem:us-east-1:111111111111:access-point/fsap-a1a1a1a1a1a1a1a1a # ARN of EFS Access Point
-      localMountPath: /mnt/example # path under which EFS will be mounted and accessible by Lambda function
-    events: # The Events that trigger this Function
-      - httpApi: # HTTP API endpoint (API Gateway v2)
+      # ARN of EFS Access Point
+      arn: arn:aws:elasticfilesystem:us-east-1:11111111:access-point/fsap-a1a1a1
+      # Path under which EFS will be mounted and accessible in Lambda
+      localMountPath: /mnt/example
+```
+
+## Lambda events
+
+Reference of [Lambda events](./events.md) that trigger functions:
+
+### API Gateway v2 HTTP API
+
+[API Gateway v2 HTTP API events](../events/http-api.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
+      # HTTP API endpoint (API Gateway v2)
+      - httpApi:
           method: GET
           path: /some-get-path/{param}
           authorizer: # Optional
-            name: someJwtAuthorizer # References by name authorizer defined in provider.httpApi.authorizers section
+            # Name of an authorizer defined in 'provider.httpApi.authorizers'
+            name: someJwtAuthorizer
             scopes: # Optional
               - user.id
               - user.email
-      - http: # REST API endpoint (API Gateway v1)
-          path: users/create # Path for this endpoint
-          method: get # HTTP method for this endpoint
-          cors: true # Turn on CORS for this endpoint, but don't forget to return the right header in your response
-          private: true # Requires clients to add API keys values in the `x-api-key` header of their request
-          authorizer: # An AWS API Gateway custom authorizer function
-            name: authorizerFunc # The name of the authorizer function (must be in this service)
-            arn: xxx:xxx:Lambda-Name # Can be used instead of name to reference a function outside of service
+```
+
+### API Gateway v1 REST API
+
+[API Gateway v1 REST API events](../events/apigateway.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
+      # REST API endpoint (API Gateway v1)
+      - http:
+          # Path for this endpoint
+          path: users/create
+          # HTTP method for this endpoint
+          method: get
+          # Enable CORS. Don't forget to return the right header in your response
+          cors: true
+          # Requires clients to add API keys values in the `x-api-key` header of their request
+          private: true
+          # An AWS API Gateway custom authorizer function
+          authorizer:
+            # Name of the authorizer function (must be in this service)
+            name: authorizerFunc
+            # Can be used instead of a name to reference a function outside of service
+            arn: xxx:xxx:Lambda-Name
             resultTtlInSeconds: 0
             identitySource: method.request.header.Authorization
             identityValidationExpression: someRegex
-            type: token # token or request. Determines input to the authorizer function, called with the auth token or the entire request event. Defaults to token
-          request: # configure method request and integration request settings
-            uri: http://url/{paramName} # Define http endpoint URL and map path parameters for HTTP and HTTP_PROXY requests
-            parameters: # Optional request parameter configuration
+            # Input of the authorizer function: auth token ('token') or the entire request event ('request') (default: token)
+            type: token
+          # Configure method request and integration request settings
+          request:
+            # HTTP endpoint URL and map path parameters for HTTP and HTTP_PROXY requests
+            uri: http://url/{paramName}
+            # Optional request parameter configuration
+            parameters:
               paths:
                 paramName: true # mark path parameter as required
               headers:
-                headerName: true # mark header required
-                custom-header: # Optional add a new header to the request
+                headerName: true # mark header as required
+                custom-header:
                   required: true
-                  mappedValue: context.requestId # map the header to a static value or integration request variable
+                  # Map the header to a static value or integration request variable
+                  mappedValue: context.requestId
               querystrings:
                 paramName: true # mark query string
-            schema: # Optional request schema validation; mapped by content type
-              application/json: ${file(create_request.json)} # define the valid JSON Schema for a content-type
-            template: # Optional custom request mapping templates that overwrite default templates
+            # Request schema validation mapped by content type
+            schema:
+              # Define the valid JSON Schema for this content-type
+              application/json: ${file(create_request.json)}
+              application/json+abc:
+                # Name of the API Gateway model
+                name: ModelName
+                description: 'Some description'
+                schema: ${file(model_schema.json)}
+            # Custom request mapping templates that overwrite default templates
+            template:
               application/json: '{ "httpMethod" : "$context.httpMethod" }'
-            passThrough: NEVER # Optional define pass through behavior when content-type does not match any of the specified mapping templates
-            schemas: # Optional request schema validation, mapped by content type
-              application/json:
-                name: ModelName  # Optional: Name of the API Gateway model
-                description: "Some description" # Optional: Description of the API Gateway model
-                schema: ${file(model_schema.json)} # Schema for selected content type
+            # Optional define pass through behavior when content-type does not match any of the specified mapping templates
+            passThrough: NEVER
+```
+
+### Websocket API
+
+[API Gateway websocket events](../events/websocket.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - websocket:
           route: $connect
-          routeResponseSelectionExpression: $default # optional, setting this enables callbacks on websocket requests for two-way communication
+          # Optional, setting this enables callbacks on websocket requests for two-way communication
+          routeResponseSelectionExpression: $default
           authorizer:
-            # name: auth    NOTE: you can either use "name" or arn" properties
+            # Use either "name" or arn" properties
+            name: auth
             arn: arn:aws:lambda:us-east-1:1234567890:function:auth
             identitySource:
               - 'route.request.header.Auth'
               - 'route.request.querystring.Auth'
+```
+
+### S3
+
+[S3 events](../events/s3.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - s3:
           bucket: photos
           event: s3:ObjectCreated:*
           rules:
             - prefix: uploads/
             - suffix: .jpg
-          existing: true # optional, if you're using an existing Bucket
+          # Set to 'true' when using an existing bucket
+          # Else the bucket will be automatically created
+          existing: true
+```
+
+### Schedule
+
+[Schedule events](../events/schedule.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - schedule:
           name: my scheduled event
           description: a description of my scheduled event's purpose
-          rate: rate(10 minutes) # Can also be an array of rate/cron expressions
+          # Can also be an array of rate/cron expressions
+          rate: rate(10 minutes)
+          # (default: true)
           enabled: false
           # Note, you can use only one of input, inputPath, or inputTransformer
           input:
@@ -432,6 +832,17 @@ functions:
             inputPathsMap:
               eventTime: '$.time'
             inputTemplate: '{"time": <eventTime>, "key1": "value1"}'
+```
+
+### SNS
+
+[SNS events](../events/sns.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - sns:
           topicName: aggregate
           displayName: Data aggregation pipeline
@@ -440,48 +851,127 @@ functions:
               - dog
               - cat
           redrivePolicy:
-              # (1) ARN
-              deadLetterTargetArn: arn:aws:sqs:us-east-1:11111111111:myDLQ
-              # (2) Ref (resource defined in same CF stack)
-              deadLetterTargetRef: myDLQ
-              # (3) Import (resource defined in outer CF stack)
-              deadLetterTargetImport:
-                arn: MyShared-DLQArn
-                url: MyShared-DLQUrl
+            # (1) ARN
+            deadLetterTargetArn: arn:aws:sqs:us-east-1:11111111111:myDLQ
+            # (2) Ref (resource defined in same CF stack)
+            deadLetterTargetRef: myDLQ
+            # (3) Import (resource defined in outer CF stack)
+            deadLetterTargetImport:
+              arn: MyShared-DLQArn
+              url: MyShared-DLQUrl
+```
+
+### SQS
+
+[SQS events](../events/sqs.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - sqs:
           arn: arn:aws:sqs:region:XXXXXX:myQueue
+          # Optional
           batchSize: 10
-          maximumBatchingWindow: 10 # optional, minimum is 0 and the maximum is 300 (seconds)
-          enabled: true
+          # Optional, minimum is 0 and the maximum is 300 (seconds)
+          maximumBatchingWindow: 10
+          # (default: true)
+          enabled: false
+          functionResponseType: ReportBatchItemFailures
           filterPatterns:
-            - a: [ 1, 2 ]
+            - a: [1, 2]
+```
+
+### Streams
+
+[Stream events](../events/streams.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - stream:
           arn: arn:aws:kinesis:region:XXXXXX:stream/foo
           batchSize: 100
           maximumRecordAgeInSeconds: 120
           startingPosition: LATEST
-          enabled: true
+          # (default: true)
+          enabled: false
           functionResponseType: ReportBatchItemFailures
           filterPatterns:
-            - partitionKey: [ 1 ]
+            - partitionKey: [1]
+```
+
+### MSK
+
+[MSK events](../events/msk.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - msk:
-          arn: arn:aws:kafka:us-east-1:111111111111:cluster/ClusterName/a1a1a1a1a1a1a1a1a # ARN of MSK Cluster
-          topic: kafkaTopic # name of Kafka topic to consume from
-          batchSize: 100 # optional, must be in 1-10000 range
-          startingPosition: LATEST # optional, can be set to LATEST or TRIM_HORIZON
-          enabled: true # optional, true by default, can be used to disable event without deleting resource
+          # ARN of MSK Cluster
+          arn: arn:aws:kafka:us-east-1:111111111:cluster/ClusterName/a1a1a1a1a
+          # name of Kafka topic to consume from
+          topic: kafkaTopic
+          # Optional, must be in 1-10000 range
+          batchSize: 100
+          # Optional, can be set to LATEST or TRIM_HORIZON
+          startingPosition: LATEST
+          # (default: true)
+          enabled: false
+```
+
+### Alexa
+
+[Alexa Skill events](../events/alexa-skill.md) and [Alexa Smart Home events](../events/alexa-smart-home.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - alexaSkill:
           appId: amzn1.ask.skill.xx-xx-xx-xx
-          enabled: true
+          # (default: true)
+          enabled: false
       - alexaSmartHome:
           appId: amzn1.ask.skill.xx-xx-xx-xx
-          enabled: true
+          # (default: true)
+          enabled: false
+```
+
+### IOT
+
+[IoT events](../events/iot.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - iot:
           name: myIoTEvent
           description: An IoT event
-          enabled: true
           sql: "SELECT * FROM 'some_topic'"
           sqlVersion: beta
+          # (default: true)
+          enabled: false
+```
+
+### CloudWatch
+
+[CloudWatch events](../events/cloudwatch-event.md) and [CloudWatch logs events](../events/cloudwatch-log.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - cloudwatchEvent:
           event:
             source:
@@ -505,19 +995,44 @@ functions:
       - cloudwatchLog:
           logGroup: '/aws/lambda/hello'
           filter: '{$.userIdentity.type = Root}'
+```
+
+### Cognito
+
+[Cognito User Pool events](../events/cognito-user-pool.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - cognitoUserPool:
           pool: MyUserPool
           trigger: PreSignUp
-          existing: true # optional, if you're referencing an existing User Pool
-          forceDeploy: true # optional, for forcing deployment of triggers on existing User Pools
+          # Optional, if you're referencing an existing User Pool
+          existing: true
+          # Optional, for forcing deployment of triggers on existing User Pools
+          forceDeploy: true
+```
+
+### ALB
+
+[Application Load Balancer events](../events/alb.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - alb:
-          listenerArn: arn:aws:elasticloadbalancing:us-east-1:12345:listener/app/my-load-balancer/50dc6c495c0c9188/
+          listenerArn: arn:aws:elasticloadbalancing:us-east-1:12345:listener/app/my-load-balancer/50dcc0c9188/
           priority: 1
           targetGroupName: helloTargetGroup # optional
           conditions:
             host: example.com
             path: /hello
-          healthCheck: # optional, can also be set using a boolean value
+          # Optional, can also be set using a boolean value
+          healthCheck:
             path: / # optional
             intervalSeconds: 35 # optional
             timeoutSeconds: 30 # optional
@@ -525,15 +1040,28 @@ functions:
             unhealthyThresholdCount: 5 # optional
             matcher: # optional
               httpCode: '200'
+```
+
+### EventBridge
+
+[EventBridge events](../events/event-bridge.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
+      # Use the default AWS event bus
       - eventBridge:
-          # using the default AWS event bus
           schedule: rate(10 minutes)
-          # creating an event bus
+      # Create a custom event bus
+      - eventBridge:
           eventBus: custom-saas-events
           pattern:
             source:
               - saas.external
-          # re-using an existing event bus
+      # Re-use an existing event bus
+      - eventBridge:
           eventBus: arn:aws:events:us-east-1:12345:event-bus/custom-private-events
           pattern:
             source:
@@ -542,7 +1070,8 @@ functions:
             inputPathsMap:
               eventTime: '$.time'
             inputTemplate: '{"time": <eventTime>, "key1": "value1"}'
-          # using `inputs`
+      # Using 'inputs'
+      - eventBridge:
           pattern:
             source:
               - 'aws.ec2'
@@ -556,7 +1085,8 @@ functions:
             key2: value2
             stageParams:
               stage: dev
-          # using `inputPath`
+      # Using 'inputPath'
+      - eventBridge:
           pattern:
             source:
               - 'aws.ec2'
@@ -566,7 +1096,8 @@ functions:
               state:
                 - pending
           inputPath: '$.stageVariables'
-          # using `inputTransformer`
+      # Using 'inputTransformer'
+      - eventBridge:
           pattern:
             source:
               - 'aws.ec2'
@@ -582,41 +1113,75 @@ functions:
           retryPolicy:
             maximumEventAge: 3600
             maximumRetryAttempts: 3
-          deadLetterQueueArn:
-            Fn::GetAtt:
-              - QueueName
-              - Arn
+          deadLetterQueueArn: !GetAtt QueueName.Arn
+```
+
+### CloudFront
+
+[CloudFront Lambda@Edge events](../events/cloudfront.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - cloudFront:
           eventType: viewer-response
           includeBody: true
           pathPattern: /docs*
           cachePolicy:
-            # Note, you can use only one of name or id
-            name: myCachePolicy1 # Refers to a Cache Policy defined in provider.cloudFront.cachePolicies
-            id: 658327ea-f89d-4fab-a63d-7e88639e58f6 # Refers to any external Cache Policy id
+            # Use either name or id
+            # Refers to a Cache Policy defined in 'provider.cloudFront.cachePolicies'
+            name: myCachePolicy1
+            # Refers to any external Cache Policy ID
+            id: 658327ea-f89d-4fab-a63d-7e88639e58f6
           origin:
             DomainName: serverless.com
             OriginPath: /framework
             CustomOriginConfig:
               OriginProtocolPolicy: match-viewer
-      - s3: bucketOne
+```
+
+## Function layers
+
+Deploy [Lambda function layers](./layers.md):
+
+```yml
+# serverless.yml
 
 layers:
-  hello: # A Lambda layer
-    path: layer-dir # required, path to layer contents on disk
-    name: ${sls:stage}-layerName # optional, Deployed Lambda layer name
-    description: Description of what the lambda layer does # optional, Description to publish to AWS
-    compatibleRuntimes: # optional, a list of runtimes this layer is compatible with
+  # A Lambda layer
+  hello:
+    # required, path to layer contents on disk
+    path: layer-dir
+    # optional, Deployed Lambda layer name
+    name: ${sls:stage}-layerName
+    # optional, Description to publish to AWS
+    description: Description of what the lambda layer does
+    # optional, a list of runtimes this layer is compatible with
+    compatibleRuntimes:
       - python3.8
-    compatibleArchitectures: # optional, a list of architectures this layer is compatible with
+    # optional, a list of architectures this layer is compatible with
+    compatibleArchitectures:
       - x86_64
       - arm64
-    licenseInfo: GPLv3 # optional, a string specifying license information
-    allowedAccounts: # optional, a list of AWS account IDs allowed to access this layer.
+    # optional, a string specifying license information
+    licenseInfo: GPLv3
+    # optional, a list of AWS account IDs allowed to access this layer.
+    allowedAccounts:
       - '*'
-    retain: false # optional, false by default. If true, layer versions are not deleted as new ones are created
+    # optional, false by default. If true, layer versions are not deleted as new ones are created
+    retain: false
+```
+
+## AWS Resources
+
+[Customize the CloudFormation template](./services.md#serverlessyml), for example to deploy extra CloudFormation resource:
 
-# The "Resources" your "Functions" use.  Raw AWS CloudFormation goes in here.
+```yml
+# serverless.yml
+
+# Insert raw CloudFormation (resources, outputs…) in the deployed template
 resources:
   Resources:
     usersTable:
@@ -632,6 +1197,7 @@ resources:
         ProvisionedThroughput:
           ReadCapacityUnits: 1
           WriteCapacityUnits: 1
+
   extensions:
     # override Properties or other attributes of Framework-created resources.
     # See https://serverless.com/framework/docs/providers/aws/guide/resources#override-aws-cloudformation-resource for more details
@@ -643,8 +1209,9 @@ resources:
   Outputs:
     UsersTableArn:
       Description: The ARN for the User's Table
-      Value:
-        'Fn::GetAtt': [usersTable, Arn]
+      Value: !GetAtt usersTable.Arn
       Export:
-        Name: ${self:service}:${opt:stage}:UsersTableArn # see Fn::ImportValue to use in other services and http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/outputs-section-structure.html for documentation on use.
+        # see Fn::ImportValue to use in other services
+        # and http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/outputs-section-structure.html for documentation on use.
+        Name: ${self:service}:${sls:stage}:UsersTableArn
 ```

From f11e8a647343b7c63c6380b6ad7a96da6df543eb Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Tue, 18 Jan 2022 10:53:07 +0100
Subject: [PATCH 0916/1101] docs: Switch to `npm i` instead of broken `npm
 update`

See https://github.com/npm/cli/issues/3175 why `npm update` is broken.
---
 docs/cn/getting-started.md  |  2 +-
 docs/getting-started.md     | 12 +++++++++---
 docs/guides/upgrading-v3.md | 10 +++-------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/docs/cn/getting-started.md b/docs/cn/getting-started.md
index d589e680aa0..836f5242f0c 100644
--- a/docs/cn/getting-started.md
+++ b/docs/cn/getting-started.md
@@ -60,7 +60,7 @@ $ choco upgrade serverless
 npm install -g serverless
 
 # 或者更新 serverless cli 到最新版本
-npm update -g serverless
+npm install -g serverless
 ```
 
 如果你的环境中还没有安装 Node 8 或者更高的版本，那么你需要首先安装 [Node.js](https://nodejs.org/zh-cn/download/)
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 05566dddd38..2b6a2eb47c9 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -42,10 +42,10 @@ To install the latest version, run this command in your terminal:
 curl -o- -L https://slss.io/install | bash
 ```
 
-To install an specific version you may set a VERSION variable, for example:
+To install a specific version, you may set a VERSION variable, for example:
 
 ```bash
-curl -o- -L https://slss.io/install | VERSION=2.21.1 bash
+curl -o- -L https://slss.io/install | VERSION=2.72.2 bash
 ```
 
 Then, open another terminal window to run the `serverless` program.
@@ -63,7 +63,10 @@ choco install serverless
 If `serverless` was installed via NPM, upgrade it via:
 
 ```bash
-npm update -g serverless
+npm install -g serverless
+
+# You can also specify a major version:
+npm install -g serverless@2
 ```
 
 If you installed `serverless` as a standalone binary, read the following section instead.
@@ -74,6 +77,9 @@ On MacOS/Linux, run:
 
 ```bash
 serverless upgrade
+
+# You can also restrict the upgrade to the latest v2 version:
+curl -o- -L https://slss.io/install | VERSION=2.72.2 bash
 ```
 
 On Windows, run:
diff --git a/docs/guides/upgrading-v3.md b/docs/guides/upgrading-v3.md
index 60156b1d9e8..14ba28a9d9b 100644
--- a/docs/guides/upgrading-v3.md
+++ b/docs/guides/upgrading-v3.md
@@ -17,13 +17,11 @@ Serverless Framework v3 contains a few breaking changes that may impact some pro
 
 This guide helps users upgrade from Serverless Framework v2 to v3.
 
-**Note:** Serverless Framework v3 isn't released yet. However, this guide helps to prepare to v3, or upgrade to the [v3 beta version](https://www.serverless.com/blog/serverless-framework-v3-beta).
-
 ## Am I impacted by breaking changes?
 
 Serverless Framework v2 signals any deprecated feature via a deprecation warning. The simplest way to upgrade to v3 is to:
 
-1. Upgrade Serverless Framework to the latest v2 version
+1. [Upgrade Serverless Framework](../getting-started.md#upgrade) to the latest v2 version
 2. Run `serverless` commands in the project to see if there are any deprecation warnings
 
 Projects that do not have any deprecations can be immediately upgraded to v3. Projects that have deprecation warnings should first solve these deprecations, then upgrade to v3.
@@ -36,16 +34,14 @@ That being said, some plugins need to be updated to be installable with v3. In m
 
 ## Upgrading to v3
 
-First, upgrade to the latest v2 version and make sure that you do not see any deprecation warning.
+First, [upgrade to the latest v2 version](../getting-started.md#upgrade) and make sure that you do not get any deprecation warning when running `serverless` commands.
 
 Then, to upgrade to Serverless Framework v3, run:
 
 ```bash
-npm update -g serverless
+npm install -g serverless
 ```
 
-**Note:** v3 is currently available as beta version. [Read the blog post](https://www.serverless.com/blog/serverless-framework-v3-beta) to upgrade to v3 beta until the stable version is released.
-
 If you [installed `serverless` as a standalone binary](../getting-started.md#install-as-a-standalone-binary), run the following command instead:
 
 - MacOS/Linux standalone binary: `serverless upgrade --major`

From 59812ce1d314bccc380f3849197bca3109792b2b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 21 Jan 2022 15:30:09 +0100
Subject: [PATCH 0917/1101] docs: Unify naming convention

---
 .../{custom-domain-HTTPS.md => custom-domain-https.md}            | 0
 .../{PGSQL-template.md => pgsql-template.md}                      | 0
 docs/providers/spotinst/guide/{IAM-roles.md => iam-roles.md}      | 0
 docs/providers/tencent/events/{CMQ.md => cmq.md}                  | 0
 docs/providers/tencent/events/{COS.md => cos.md}                  | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename docs/cn/providers/tencent/components/high-level-components/{custom-domain-HTTPS.md => custom-domain-https.md} (100%)
 rename docs/cn/providers/tencent/components/high-level-components/{PGSQL-template.md => pgsql-template.md} (100%)
 rename docs/providers/spotinst/guide/{IAM-roles.md => iam-roles.md} (100%)
 rename docs/providers/tencent/events/{CMQ.md => cmq.md} (100%)
 rename docs/providers/tencent/events/{COS.md => cos.md} (100%)

diff --git a/docs/cn/providers/tencent/components/high-level-components/custom-domain-HTTPS.md b/docs/cn/providers/tencent/components/high-level-components/custom-domain-https.md
similarity index 100%
rename from docs/cn/providers/tencent/components/high-level-components/custom-domain-HTTPS.md
rename to docs/cn/providers/tencent/components/high-level-components/custom-domain-https.md
diff --git a/docs/cn/providers/tencent/components/high-level-components/PGSQL-template.md b/docs/cn/providers/tencent/components/high-level-components/pgsql-template.md
similarity index 100%
rename from docs/cn/providers/tencent/components/high-level-components/PGSQL-template.md
rename to docs/cn/providers/tencent/components/high-level-components/pgsql-template.md
diff --git a/docs/providers/spotinst/guide/IAM-roles.md b/docs/providers/spotinst/guide/iam-roles.md
similarity index 100%
rename from docs/providers/spotinst/guide/IAM-roles.md
rename to docs/providers/spotinst/guide/iam-roles.md
diff --git a/docs/providers/tencent/events/CMQ.md b/docs/providers/tencent/events/cmq.md
similarity index 100%
rename from docs/providers/tencent/events/CMQ.md
rename to docs/providers/tencent/events/cmq.md
diff --git a/docs/providers/tencent/events/COS.md b/docs/providers/tencent/events/cos.md
similarity index 100%
rename from docs/providers/tencent/events/COS.md
rename to docs/providers/tencent/events/cos.md

From fc0eb5aebc135edc95e345cb30a719b21a14b331 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 21 Jan 2022 15:37:19 +0100
Subject: [PATCH 0918/1101] refactor(Templates): Unify file naming convention

---
 .../src/functions/hello/handler.ts            |  6 +++---
 .../src/functions/hello/index.ts              | 16 ++++++++--------
 .../libs/{apiGateway.ts => api-gateway.ts}    |  0
 ...handlerResolver.ts => handler-resolver.ts} |  0
 .../google-nodejs-typescript/index.ts         |  4 ++--
 .../src/functions/config.ts                   |  8 ++++----
 .../{eventHello => event-hello}/config.ts     |  2 +-
 .../src/functions/event-hello/handler.ts      | 11 +++++++++++
 .../src/functions/eventHello/handler.ts       | 13 -------------
 .../{httpHello => http-hello}/config.ts       |  2 +-
 .../src/functions/http-hello/handler.ts       | 17 +++++++++++++++++
 .../src/functions/httpHello/handler.ts        | 19 -------------------
 .../{errorHandler.ts => error-handler.ts}     |  0
 .../plugins/aws/customResources/index.test.js |  2 +-
 test/unit/lib/plugins/create/create.test.js   |  2 +-
 15 files changed, 49 insertions(+), 53 deletions(-)
 rename lib/plugins/create/templates/aws-nodejs-typescript/src/libs/{apiGateway.ts => api-gateway.ts} (100%)
 rename lib/plugins/create/templates/aws-nodejs-typescript/src/libs/{handlerResolver.ts => handler-resolver.ts} (100%)
 rename lib/plugins/create/templates/google-nodejs-typescript/src/functions/{eventHello => event-hello}/config.ts (95%)
 create mode 100644 lib/plugins/create/templates/google-nodejs-typescript/src/functions/event-hello/handler.ts
 delete mode 100644 lib/plugins/create/templates/google-nodejs-typescript/src/functions/eventHello/handler.ts
 rename lib/plugins/create/templates/google-nodejs-typescript/src/functions/{httpHello => http-hello}/config.ts (76%)
 create mode 100644 lib/plugins/create/templates/google-nodejs-typescript/src/functions/http-hello/handler.ts
 delete mode 100644 lib/plugins/create/templates/google-nodejs-typescript/src/functions/httpHello/handler.ts
 rename lib/plugins/create/templates/google-nodejs-typescript/src/libs/{errorHandler.ts => error-handler.ts} (100%)

diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/handler.ts b/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/handler.ts
index 2879ed490a1..1236d25bd8d 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/handler.ts
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/handler.ts
@@ -1,5 +1,5 @@
-import type { ValidatedEventAPIGatewayProxyEvent } from '@libs/apiGateway';
-import { formatJSONResponse } from '@libs/apiGateway';
+import type { ValidatedEventAPIGatewayProxyEvent } from '@libs/api-gateway';
+import { formatJSONResponse } from '@libs/api-gateway';
 import { middyfy } from '@libs/lambda';
 
 import schema from './schema';
@@ -9,6 +9,6 @@ const hello: ValidatedEventAPIGatewayProxyEvent<typeof schema> = async (event) =
     message: `Hello ${event.body.name}, welcome to the exciting Serverless world!`,
     event,
   });
-}
+};
 
 export const main = middyfy(hello);
diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/index.ts b/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/index.ts
index 3206215d22f..d9f4d47c4c9 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/index.ts
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/index.ts
@@ -1,5 +1,5 @@
 import schema from './schema';
-import { handlerPath } from '@libs/handlerResolver';
+import { handlerPath } from '@libs/handler-resolver';
 
 export default {
   handler: `${handlerPath(__dirname)}/handler.main`,
@@ -10,10 +10,10 @@ export default {
         path: 'hello',
         request: {
           schemas: {
-            'application/json': schema
-          }
-        }
-      }
-    }
-  ]
-}
+            'application/json': schema,
+          },
+        },
+      },
+    },
+  ],
+};
diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/src/libs/apiGateway.ts b/lib/plugins/create/templates/aws-nodejs-typescript/src/libs/api-gateway.ts
similarity index 100%
rename from lib/plugins/create/templates/aws-nodejs-typescript/src/libs/apiGateway.ts
rename to lib/plugins/create/templates/aws-nodejs-typescript/src/libs/api-gateway.ts
diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/src/libs/handlerResolver.ts b/lib/plugins/create/templates/aws-nodejs-typescript/src/libs/handler-resolver.ts
similarity index 100%
rename from lib/plugins/create/templates/aws-nodejs-typescript/src/libs/handlerResolver.ts
rename to lib/plugins/create/templates/aws-nodejs-typescript/src/libs/handler-resolver.ts
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/index.ts b/lib/plugins/create/templates/google-nodejs-typescript/index.ts
index bd3737f6265..6337c4c6436 100644
--- a/lib/plugins/create/templates/google-nodejs-typescript/index.ts
+++ b/lib/plugins/create/templates/google-nodejs-typescript/index.ts
@@ -1,2 +1,2 @@
-export { eventHello } from '@functions/eventHello/handler';
-export { httpHello } from '@functions/httpHello/handler';
+export { eventHello } from '@functions/event-hello/handler';
+export { httpHello } from '@functions/http-hello/handler';
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/config.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/config.ts
index 7a37073912b..5e9561e86a7 100644
--- a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/config.ts
+++ b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/config.ts
@@ -1,7 +1,7 @@
-// import { eventHello } from './eventHello/config';
-import { httpHello } from './httpHello/config';
+// import { eventHello } from './event-hello/config';
+import { httpHello } from './http-hello/config';
 
 export const functions = {
-  // eventHello, // cf ./eventHello/config.ts
-  httpHello
+  // eventHello, // cf ./event-hello/config.ts
+  httpHello,
 };
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/eventHello/config.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/event-hello/config.ts
similarity index 95%
rename from lib/plugins/create/templates/google-nodejs-typescript/src/functions/eventHello/config.ts
rename to lib/plugins/create/templates/google-nodejs-typescript/src/functions/event-hello/config.ts
index bc9210534b5..bf2bbf49dd0 100644
--- a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/eventHello/config.ts
+++ b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/event-hello/config.ts
@@ -4,7 +4,7 @@
 // 3. Uncomment the eventHello import and declaration in src/functions/config.ts
 
 export const eventHello = {
-  handler: 'eventHello',
+  handler: 'event-hello',
   events: [
     {
       event: {
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/event-hello/handler.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/event-hello/handler.ts
new file mode 100644
index 00000000000..96a3539b931
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/event-hello/handler.ts
@@ -0,0 +1,11 @@
+import { logger } from '@libs/logs';
+import { eventErrorHandler } from '@libs/error-handler';
+
+type Event = {
+  message: string;
+};
+
+export const eventHello = eventErrorHandler(async (event: Event): Promise<void> => {
+  const { message } = event;
+  logger.log({ message });
+});
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/eventHello/handler.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/eventHello/handler.ts
deleted file mode 100644
index 220596dbb05..00000000000
--- a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/eventHello/handler.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { logger } from '@libs/logs';
-import { eventErrorHandler } from '@libs/errorHandler';
-
-type Event = {
-  message: string;
-};
-
-export const eventHello = eventErrorHandler(
-  async (event: Event): Promise<void> => {
-    const { message } = event;
-    logger.log({ message });
-  }
-);
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/httpHello/config.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/http-hello/config.ts
similarity index 76%
rename from lib/plugins/create/templates/google-nodejs-typescript/src/functions/httpHello/config.ts
rename to lib/plugins/create/templates/google-nodejs-typescript/src/functions/http-hello/config.ts
index f1b484b3f38..7f9e13f84a7 100644
--- a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/httpHello/config.ts
+++ b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/http-hello/config.ts
@@ -1,5 +1,5 @@
 export const httpHello = {
-  handler: 'httpHello',
+  handler: 'http-hello',
   events: [
     {
       http: 'hello',
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/http-hello/handler.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/http-hello/handler.ts
new file mode 100644
index 00000000000..1b33124b567
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/http-hello/handler.ts
@@ -0,0 +1,17 @@
+import type { Request as ExpressRequest, Response } from 'express';
+import { logger } from '@libs/logs';
+import { httpErrorHandler } from '@libs/error-handler';
+
+type Body = {
+  message: string;
+};
+type Request = ExpressRequest<Record<string, string>, void, Body>;
+
+export const httpHello = httpErrorHandler(async (req: Request, res: Response): Promise<void> => {
+  const {
+    body: { message },
+  } = req;
+  logger.log({ message });
+
+  res.status(200).send();
+});
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/httpHello/handler.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/httpHello/handler.ts
deleted file mode 100644
index 0be9467a44a..00000000000
--- a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/httpHello/handler.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import type { Request as ExpressRequest, Response } from 'express';
-import { logger } from '@libs/logs';
-import { httpErrorHandler } from '@libs/errorHandler';
-
-type Body = {
-  message: string;
-};
-type Request = ExpressRequest<Record<string, string>, void, Body>;
-
-export const httpHello = httpErrorHandler(
-  async (req: Request, res: Response): Promise<void> => {
-    const {
-      body: { message },
-    } = req;
-    logger.log({ message });
-
-    res.status(200).send();
-  }
-);
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/libs/errorHandler.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/libs/error-handler.ts
similarity index 100%
rename from lib/plugins/create/templates/google-nodejs-typescript/src/libs/errorHandler.ts
rename to lib/plugins/create/templates/google-nodejs-typescript/src/libs/error-handler.ts
diff --git a/test/unit/lib/plugins/aws/customResources/index.test.js b/test/unit/lib/plugins/aws/customResources/index.test.js
index 4825b876ce9..68a6eb1ebe8 100644
--- a/test/unit/lib/plugins/aws/customResources/index.test.js
+++ b/test/unit/lib/plugins/aws/customResources/index.test.js
@@ -123,7 +123,7 @@ describe('#addCustomResourceToService()', () => {
             S3Key: 'artifact-dir-name/custom-resources.zip',
           },
           FunctionName: `${serviceName}-dev-custom-resource-existing-cup`,
-          Handler: 'cognitoUserPool/handler.handler',
+          Handler: 'cognito-user-pool/handler.handler',
           MemorySize: 1024,
           Role: {
             'Fn::GetAtt': ['IamRoleCustomResourcesLambdaExecution', 'Arn'],
diff --git a/test/unit/lib/plugins/create/create.test.js b/test/unit/lib/plugins/create/create.test.js
index 7ad58864300..fd5a3437ed6 100644
--- a/test/unit/lib/plugins/create/create.test.js
+++ b/test/unit/lib/plugins/create/create.test.js
@@ -179,7 +179,7 @@ describe('Create', () => {
         expect(dirContent).to.include(path.join('src', 'functions', 'hello', 'mock.json'));
         expect(dirContent).to.include(path.join('src', 'functions', 'hello', 'schema.ts'));
         expect(dirContent).to.include(path.join('src', 'functions', 'index.ts'));
-        expect(dirContent).to.include(path.join('src', 'libs', 'apiGateway.ts'));
+        expect(dirContent).to.include(path.join('src', 'libs', 'api-gateway.ts'));
         expect(dirContent).to.include(path.join('src', 'libs', 'lambda.ts'));
         expect(dirContent).to.include('tsconfig.json');
         expect(dirContent).to.include('tsconfig.paths.json');

From 227191f59b14cfa88d31f9f89fbb08ba7b2c11ae Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 21 Jan 2022 16:04:01 +0100
Subject: [PATCH 0919/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6lugins?=
 =?UTF-8?q?/aws/customResources/resources/cognitoUserPool`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugins/aws/customResources/index.js                        | 2 +-
 .../resources/{cognitoUserPool => cognito-user-pool}/handler.js | 0
 .../{cognitoUserPool => cognito-user-pool}/lib/permissions.js   | 0
 .../{cognitoUserPool => cognito-user-pool}/lib/userPool.js      | 0
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/customResources/resources/{cognitoUserPool => cognito-user-pool}/handler.js (100%)
 rename lib/plugins/aws/customResources/resources/{cognitoUserPool => cognito-user-pool}/lib/permissions.js (100%)
 rename lib/plugins/aws/customResources/resources/{cognitoUserPool => cognito-user-pool}/lib/userPool.js (100%)

diff --git a/lib/plugins/aws/customResources/index.js b/lib/plugins/aws/customResources/index.js
index d3645451d68..1752de51fad 100644
--- a/lib/plugins/aws/customResources/index.js
+++ b/lib/plugins/aws/customResources/index.js
@@ -42,7 +42,7 @@ async function addCustomResourceToService(awsProvider, resourceName, iamRoleStat
       awsProvider.naming.getCustomResourceS3HandlerFunctionLogicalId();
   } else if (resourceName === 'cognitoUserPool') {
     functionName = awsProvider.naming.getCustomResourceCognitoUserPoolHandlerFunctionName();
-    Handler = 'cognitoUserPool/handler.handler';
+    Handler = 'cognito-user-pool/handler.handler';
     customResourceFunctionLogicalId =
       awsProvider.naming.getCustomResourceCognitoUserPoolHandlerFunctionLogicalId();
   } else if (resourceName === 'eventBridge') {
diff --git a/lib/plugins/aws/customResources/resources/cognitoUserPool/handler.js b/lib/plugins/aws/customResources/resources/cognito-user-pool/handler.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/cognitoUserPool/handler.js
rename to lib/plugins/aws/customResources/resources/cognito-user-pool/handler.js
diff --git a/lib/plugins/aws/customResources/resources/cognitoUserPool/lib/permissions.js b/lib/plugins/aws/customResources/resources/cognito-user-pool/lib/permissions.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/cognitoUserPool/lib/permissions.js
rename to lib/plugins/aws/customResources/resources/cognito-user-pool/lib/permissions.js
diff --git a/lib/plugins/aws/customResources/resources/cognitoUserPool/lib/userPool.js b/lib/plugins/aws/customResources/resources/cognito-user-pool/lib/userPool.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/cognitoUserPool/lib/userPool.js
rename to lib/plugins/aws/customResources/resources/cognito-user-pool/lib/userPool.js

From 8da00202f26e1886de4c7204dc87e32675bcc2f3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 21 Jan 2022 16:04:03 +0100
Subject: [PATCH 0920/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6esourc?=
 =?UTF-8?q?es/resources/cognito-user-pool/lib/userPool.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aws/customResources/resources/cognito-user-pool/handler.js  | 2 +-
 .../cognito-user-pool/lib/{userPool.js => user-pool.js}         | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/customResources/resources/cognito-user-pool/lib/{userPool.js => user-pool.js} (100%)

diff --git a/lib/plugins/aws/customResources/resources/cognito-user-pool/handler.js b/lib/plugins/aws/customResources/resources/cognito-user-pool/handler.js
index 56d45ad7795..f2c390b0035 100644
--- a/lib/plugins/aws/customResources/resources/cognito-user-pool/handler.js
+++ b/lib/plugins/aws/customResources/resources/cognito-user-pool/handler.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const { addPermission, removePermission } = require('./lib/permissions');
-const { updateConfiguration, removeConfiguration, findUserPoolByName } = require('./lib/userPool');
+const { updateConfiguration, removeConfiguration, findUserPoolByName } = require('./lib/user-pool');
 const { getEnvironment, getLambdaArn, handlerWrapper } = require('../utils');
 
 async function handler(event, context) {
diff --git a/lib/plugins/aws/customResources/resources/cognito-user-pool/lib/userPool.js b/lib/plugins/aws/customResources/resources/cognito-user-pool/lib/user-pool.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/cognito-user-pool/lib/userPool.js
rename to lib/plugins/aws/customResources/resources/cognito-user-pool/lib/user-pool.js

From 5cc98ca67666d3e09cb0911a46dc22a5c9dcff0f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 21 Jan 2022 16:04:04 +0100
Subject: [PATCH 0921/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6s/cust?=
 =?UTF-8?q?omResources/resources/apiGatewayCloudWatchRole`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugins/aws/customResources/index.js                        | 2 +-
 .../handler.js                                                  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/customResources/resources/{apiGatewayCloudWatchRole => api-gateway-cloud-watch-role}/handler.js (100%)

diff --git a/lib/plugins/aws/customResources/index.js b/lib/plugins/aws/customResources/index.js
index 1752de51fad..d565adb37ea 100644
--- a/lib/plugins/aws/customResources/index.js
+++ b/lib/plugins/aws/customResources/index.js
@@ -53,7 +53,7 @@ async function addCustomResourceToService(awsProvider, resourceName, iamRoleStat
   } else if (resourceName === 'apiGatewayCloudWatchRole') {
     functionName =
       awsProvider.naming.getCustomResourceApiGatewayAccountCloudWatchRoleHandlerFunctionName();
-    Handler = 'apiGatewayCloudWatchRole/handler.handler';
+    Handler = 'api-gateway-cloud-watch-role/handler.handler';
     customResourceFunctionLogicalId =
       awsProvider.naming.getCustomResourceApiGatewayAccountCloudWatchRoleHandlerFunctionLogicalId();
   } else {
diff --git a/lib/plugins/aws/customResources/resources/apiGatewayCloudWatchRole/handler.js b/lib/plugins/aws/customResources/resources/api-gateway-cloud-watch-role/handler.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/apiGatewayCloudWatchRole/handler.js
rename to lib/plugins/aws/customResources/resources/api-gateway-cloud-watch-role/handler.js

From a55a48fdec2c2b09fac93b02c2083f3779c10a0d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 21 Jan 2022 16:04:05 +0100
Subject: [PATCH 0922/1101] refactor: Rename
 `lib/plugins/aws/customResources/resources/eventBridge`

---
 lib/plugins/aws/customResources/index.js                        | 2 +-
 .../resources/{eventBridge => event-bridge}/handler.js          | 0
 .../resources/{eventBridge => event-bridge}/lib/eventBridge.js  | 0
 .../resources/{eventBridge => event-bridge}/lib/permissions.js  | 0
 .../resources/{eventBridge => event-bridge}/lib/utils.js        | 0
 test/unit/lib/plugins/aws/customResources/index.test.js         | 2 +-
 .../lib/plugins/aws/customResources/test/eventBridge.test.js    | 2 +-
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/plugins/aws/customResources/resources/{eventBridge => event-bridge}/handler.js (100%)
 rename lib/plugins/aws/customResources/resources/{eventBridge => event-bridge}/lib/eventBridge.js (100%)
 rename lib/plugins/aws/customResources/resources/{eventBridge => event-bridge}/lib/permissions.js (100%)
 rename lib/plugins/aws/customResources/resources/{eventBridge => event-bridge}/lib/utils.js (100%)

diff --git a/lib/plugins/aws/customResources/index.js b/lib/plugins/aws/customResources/index.js
index d565adb37ea..a17a3cb52df 100644
--- a/lib/plugins/aws/customResources/index.js
+++ b/lib/plugins/aws/customResources/index.js
@@ -47,7 +47,7 @@ async function addCustomResourceToService(awsProvider, resourceName, iamRoleStat
       awsProvider.naming.getCustomResourceCognitoUserPoolHandlerFunctionLogicalId();
   } else if (resourceName === 'eventBridge') {
     functionName = awsProvider.naming.getCustomResourceEventBridgeHandlerFunctionName();
-    Handler = 'eventBridge/handler.handler';
+    Handler = 'event-bridge/handler.handler';
     customResourceFunctionLogicalId =
       awsProvider.naming.getCustomResourceEventBridgeHandlerFunctionLogicalId();
   } else if (resourceName === 'apiGatewayCloudWatchRole') {
diff --git a/lib/plugins/aws/customResources/resources/eventBridge/handler.js b/lib/plugins/aws/customResources/resources/event-bridge/handler.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/eventBridge/handler.js
rename to lib/plugins/aws/customResources/resources/event-bridge/handler.js
diff --git a/lib/plugins/aws/customResources/resources/eventBridge/lib/eventBridge.js b/lib/plugins/aws/customResources/resources/event-bridge/lib/eventBridge.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/eventBridge/lib/eventBridge.js
rename to lib/plugins/aws/customResources/resources/event-bridge/lib/eventBridge.js
diff --git a/lib/plugins/aws/customResources/resources/eventBridge/lib/permissions.js b/lib/plugins/aws/customResources/resources/event-bridge/lib/permissions.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/eventBridge/lib/permissions.js
rename to lib/plugins/aws/customResources/resources/event-bridge/lib/permissions.js
diff --git a/lib/plugins/aws/customResources/resources/eventBridge/lib/utils.js b/lib/plugins/aws/customResources/resources/event-bridge/lib/utils.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/eventBridge/lib/utils.js
rename to lib/plugins/aws/customResources/resources/event-bridge/lib/utils.js
diff --git a/test/unit/lib/plugins/aws/customResources/index.test.js b/test/unit/lib/plugins/aws/customResources/index.test.js
index 68a6eb1ebe8..e47c07866f3 100644
--- a/test/unit/lib/plugins/aws/customResources/index.test.js
+++ b/test/unit/lib/plugins/aws/customResources/index.test.js
@@ -142,7 +142,7 @@ describe('#addCustomResourceToService()', () => {
             S3Key: 'artifact-dir-name/custom-resources.zip',
           },
           FunctionName: `${serviceName}-dev-custom-resource-event-bridge`,
-          Handler: 'eventBridge/handler.handler',
+          Handler: 'event-bridge/handler.handler',
           MemorySize: 1024,
           Role: {
             'Fn::GetAtt': ['IamRoleCustomResourcesLambdaExecution', 'Arn'],
diff --git a/test/unit/lib/plugins/aws/customResources/test/eventBridge.test.js b/test/unit/lib/plugins/aws/customResources/test/eventBridge.test.js
index d537e75bb4f..7860239c408 100644
--- a/test/unit/lib/plugins/aws/customResources/test/eventBridge.test.js
+++ b/test/unit/lib/plugins/aws/customResources/test/eventBridge.test.js
@@ -3,7 +3,7 @@
 const { expect } = require('chai');
 const {
   getEventBusTargetId,
-} = require('../../../../../../../lib/plugins/aws/customResources/resources/eventBridge/lib/utils');
+} = require('../../../../../../../lib/plugins/aws/customResources/resources/event-bridge/lib/utils');
 
 describe('#getEventBusTargetId()', () => {
   const assertions = [

From c6300fbc244362e815930192bd894fb6ecf0349e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 21 Jan 2022 16:04:06 +0100
Subject: [PATCH 0923/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6mResou?=
 =?UTF-8?q?rces/resources/event-bridge/lib/eventBridge.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aws/customResources/resources/event-bridge/handler.js       | 2 +-
 .../event-bridge/lib/{eventBridge.js => event-bridge.js}        | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/customResources/resources/event-bridge/lib/{eventBridge.js => event-bridge.js} (100%)

diff --git a/lib/plugins/aws/customResources/resources/event-bridge/handler.js b/lib/plugins/aws/customResources/resources/event-bridge/handler.js
index abdb2f10612..d6002a31f46 100644
--- a/lib/plugins/aws/customResources/resources/event-bridge/handler.js
+++ b/lib/plugins/aws/customResources/resources/event-bridge/handler.js
@@ -8,7 +8,7 @@ const {
   updateTargetConfiguration,
   removeRuleConfiguration,
   removeTargetConfiguration,
-} = require('./lib/eventBridge');
+} = require('./lib/event-bridge');
 const { getEnvironment, getLambdaArn, handlerWrapper } = require('../utils');
 
 async function handler(event, context) {
diff --git a/lib/plugins/aws/customResources/resources/event-bridge/lib/eventBridge.js b/lib/plugins/aws/customResources/resources/event-bridge/lib/event-bridge.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/event-bridge/lib/eventBridge.js
rename to lib/plugins/aws/customResources/resources/event-bridge/lib/event-bridge.js

From a24d12163d7a0ed96e3504c61efd9e0e7205f98a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:13:21 +0100
Subject: [PATCH 0924/1101] test: Rename `test/mochaPatch.js`

---
 package.json                           | 2 +-
 test/{mochaPatch.js => mocha-patch.js} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename test/{mochaPatch.js => mocha-patch.js} (100%)

diff --git a/package.json b/package.json
index b2469b6b804..896f8207963 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
   ],
   "mocha": {
     "require": [
-      "./test/mochaPatch",
+      "./test/mocha-patch",
       "@serverless/test/setup/log",
       "@serverless/test/setup/mock-homedir",
       "@serverless/test/setup/mock-cwd",
diff --git a/test/mochaPatch.js b/test/mocha-patch.js
similarity index 100%
rename from test/mochaPatch.js
rename to test/mocha-patch.js

From f1b96f1e1acfd52e5c238f234c126379fdb7185e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:14:59 +0100
Subject: [PATCH 0925/1101] test: Rename `test/serverlessBinary.js`

---
 test/integration/curated-plugins-python.test.js    | 2 +-
 test/integration/curated-plugins.test.js           | 2 +-
 test/integration/plugin-install.test.js            | 2 +-
 test/integrationBasic.test.js                      | 2 +-
 test/integrationPackage/cloudformation.tests.js    | 2 +-
 test/integrationPackage/lambda-files.tests.js      | 2 +-
 test/{serverlessBinary.js => serverless-binary.js} | 0
 test/unit/lib/classes/PluginManager.test.js        | 2 +-
 test/utils/integration.js                          | 2 +-
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename test/{serverlessBinary.js => serverless-binary.js} (100%)

diff --git a/test/integration/curated-plugins-python.test.js b/test/integration/curated-plugins-python.test.js
index c4e5b03fb7e..adc829ff295 100644
--- a/test/integration/curated-plugins-python.test.js
+++ b/test/integration/curated-plugins-python.test.js
@@ -6,7 +6,7 @@ const spawn = require('child-process-ext/spawn');
 const fixturesEngine = require('../fixtures/programmatic');
 const { listZipFiles } = require('../utils/fs');
 
-const serverlessExec = require('../serverlessBinary');
+const serverlessExec = require('../serverless-binary');
 
 describe('test/integration/curated-plugins-python.test.js', function () {
   this.timeout(1000 * 60 * 10); // Involves time-taking npm install
diff --git a/test/integration/curated-plugins.test.js b/test/integration/curated-plugins.test.js
index 2b426877c95..e9e54b53688 100644
--- a/test/integration/curated-plugins.test.js
+++ b/test/integration/curated-plugins.test.js
@@ -9,7 +9,7 @@ const AdmZip = require('adm-zip');
 const { deployService, removeService } = require('../utils/integration');
 const fixturesEngine = require('../fixtures/programmatic');
 
-const serverlessExec = require('../serverlessBinary');
+const serverlessExec = require('../serverless-binary');
 
 describe('test/integration/curated-plugins.test.js', function () {
   this.timeout(1000 * 60 * 10); // Involves time-taking npm install
diff --git a/test/integration/plugin-install.test.js b/test/integration/plugin-install.test.js
index c3991cb1870..8286de8c711 100644
--- a/test/integration/plugin-install.test.js
+++ b/test/integration/plugin-install.test.js
@@ -5,7 +5,7 @@ const fsp = require('fs').promises;
 const spawn = require('child-process-ext/spawn');
 const fixturesEngine = require('../fixtures/programmatic');
 
-const serverlessExec = require('../serverlessBinary');
+const serverlessExec = require('../serverless-binary');
 
 describe('test/integration/plugin-install.test.js', function () {
   this.timeout(1000 * 60 * 10); // Involves time-taking npm install
diff --git a/test/integrationBasic.test.js b/test/integrationBasic.test.js
index f18c4442f00..62989207aa7 100644
--- a/test/integrationBasic.test.js
+++ b/test/integrationBasic.test.js
@@ -12,7 +12,7 @@ const hasFailed = require('@serverless/test/has-failed');
 const awsRequest = require('@serverless/test/aws-request');
 const { getTmpDirPath } = require('./utils/fs');
 
-const serverlessExec = require('./serverlessBinary');
+const serverlessExec = require('./serverless-binary');
 
 describe('Service Lifecyle Integration Test', function () {
   this.timeout(1000 * 60 * 10); // Involves time-taking deploys
diff --git a/test/integrationPackage/cloudformation.tests.js b/test/integrationPackage/cloudformation.tests.js
index 7726636d577..6b2f608fa89 100644
--- a/test/integrationPackage/cloudformation.tests.js
+++ b/test/integrationPackage/cloudformation.tests.js
@@ -5,7 +5,7 @@ const path = require('path');
 const { expect } = require('chai');
 const fse = require('fs-extra');
 const { execSync } = require('../utils/childProcess');
-const serverlessExec = require('../serverlessBinary');
+const serverlessExec = require('../serverless-binary');
 const { getTmpDirPath } = require('../utils/fs');
 
 const fixturePaths = {
diff --git a/test/integrationPackage/lambda-files.tests.js b/test/integrationPackage/lambda-files.tests.js
index 5c737e85189..9d63898998e 100644
--- a/test/integrationPackage/lambda-files.tests.js
+++ b/test/integrationPackage/lambda-files.tests.js
@@ -5,7 +5,7 @@ const { expect } = require('chai');
 const fs = require('fs').promises;
 const fse = require('fs-extra');
 const spawn = require('child-process-ext/spawn');
-const serverlessExec = require('../serverlessBinary');
+const serverlessExec = require('../serverless-binary');
 const { getTmpDirPath, listZipFiles } = require('../utils/fs');
 
 const fixturePaths = {
diff --git a/test/serverlessBinary.js b/test/serverless-binary.js
similarity index 100%
rename from test/serverlessBinary.js
rename to test/serverless-binary.js
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
index 1295c6f5b3e..eea77d7b61a 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/PluginManager.test.js
@@ -1566,7 +1566,7 @@ describe('PluginManager', () => {
 
     let serverlessInstance;
     let env;
-    const serverlessExec = require('../../../serverlessBinary');
+    const serverlessExec = require('../../../serverless-binary');
 
     before(() => {
       env = resolveAwsEnv();
diff --git a/test/utils/integration.js b/test/utils/integration.js
index 7f0f966e91b..4a657acdeab 100644
--- a/test/utils/integration.js
+++ b/test/utils/integration.js
@@ -11,7 +11,7 @@ const logFetch = require('log').get('fetch');
 const resolveAwsEnv = require('@serverless/test/resolve-aws-env');
 const { load: loadYaml } = require('js-yaml');
 
-const serverlessExec = require('../serverlessBinary');
+const serverlessExec = require('../serverless-binary');
 
 const env = resolveAwsEnv();
 

From b4c204ff6bc5aa45419b7314896e44e10f5a46d2 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:16:48 +0100
Subject: [PATCH 0926/1101] test: Rename fixture `cli/configSyntaxError`

---
 .prettierignore                                             | 2 +-
 .../serverless.yml                                          | 0
 test/unit/scripts/serverless.test.js                        | 6 +++---
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename test/fixtures/cli/{configSyntaxError => config-syntax-error}/serverless.yml (100%)

diff --git a/.prettierignore b/.prettierignore
index 222fbdbebe5..9a695cf4754 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,6 +1,6 @@
 /.nyc_output
 /coverage
-/test/fixtures/cli/configSyntaxError/serverless.yml
+/test/fixtures/cli/config-syntax-error/serverless.yml
 /test/unit/lib/configuration/variables/sources/fixture/invalid.json
 /test/unit/lib/configuration/variables/sources/fixture/invalid.yml
 !/test/fixtures/programmatic/locallyInstalledServerless/node_modules/**
diff --git a/test/fixtures/cli/configSyntaxError/serverless.yml b/test/fixtures/cli/config-syntax-error/serverless.yml
similarity index 100%
rename from test/fixtures/cli/configSyntaxError/serverless.yml
rename to test/fixtures/cli/config-syntax-error/serverless.yml
diff --git a/test/unit/scripts/serverless.test.js b/test/unit/scripts/serverless.test.js
index 27e2f5ab6ce..85f24a1712a 100644
--- a/test/unit/scripts/serverless.test.js
+++ b/test/unit/scripts/serverless.test.js
@@ -24,7 +24,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
     const output = String(
       (
         await spawn('node', [serverlessPath, '--help'], {
-          cwd: path.resolve(cliFixturesPath, 'configSyntaxError'),
+          cwd: path.resolve(cliFixturesPath, 'config-syntax-error'),
         })
       ).stdoutBuffer
     );
@@ -34,7 +34,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
   it('should report with an error invalid configuration', async () => {
     try {
       await spawn('node', [serverlessPath, 'print'], {
-        cwd: path.resolve(cliFixturesPath, 'configSyntaxError'),
+        cwd: path.resolve(cliFixturesPath, 'config-syntax-error'),
       });
       throw new Error('Unexpected');
     } catch (error) {
@@ -82,7 +82,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
     const output = String(
       (
         await spawn('node', [serverlessPath, 'plugin', 'list'], {
-          cwd: path.resolve(cliFixturesPath, 'configSyntaxError'),
+          cwd: path.resolve(cliFixturesPath, 'config-syntax-error'),
         })
       ).stdoutBuffer
     );

From f356ec7d2e06c17d6860ec647071d198253102d7 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:18:09 +0100
Subject: [PATCH 0927/1101] test: Rename fixture `cli/configTypeJs`

---
 test/fixtures/cli/{configTypeJs => config-type-js}/serverless.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/fixtures/cli/{configTypeJs => config-type-js}/serverless.js (100%)

diff --git a/test/fixtures/cli/configTypeJs/serverless.js b/test/fixtures/cli/config-type-js/serverless.js
similarity index 100%
rename from test/fixtures/cli/configTypeJs/serverless.js
rename to test/fixtures/cli/config-type-js/serverless.js

From 5b86ffc953d815c66baf3e560e6b00fde38afca9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:18:43 +0100
Subject: [PATCH 0928/1101] test: Rename fixture `cli/configTypeJsDeferred`

---
 .../serverless.js                                                 | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/fixtures/cli/{configTypeJsDeferred => config-type-js-deferred}/serverless.js (100%)

diff --git a/test/fixtures/cli/configTypeJsDeferred/serverless.js b/test/fixtures/cli/config-type-js-deferred/serverless.js
similarity index 100%
rename from test/fixtures/cli/configTypeJsDeferred/serverless.js
rename to test/fixtures/cli/config-type-js-deferred/serverless.js

From 1488b6290b4339f19931ef1e9843826fd474f776 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:19:27 +0100
Subject: [PATCH 0929/1101] test: Rename fixture `cli/configTypeJson`

---
 .../cli/{configTypeJson => config-type-json}/serverless.json      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/fixtures/cli/{configTypeJson => config-type-json}/serverless.json (100%)

diff --git a/test/fixtures/cli/configTypeJson/serverless.json b/test/fixtures/cli/config-type-json/serverless.json
similarity index 100%
rename from test/fixtures/cli/configTypeJson/serverless.json
rename to test/fixtures/cli/config-type-json/serverless.json

From db339174b601e739f169faa17c7aac535d4926d9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:20:07 +0100
Subject: [PATCH 0930/1101] test: Rename fixture `cli/configTypeNonObject`

---
 .../serverless.json                                               | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/fixtures/cli/{configTypeNonObject => config-type-non-object}/serverless.json (100%)

diff --git a/test/fixtures/cli/configTypeNonObject/serverless.json b/test/fixtures/cli/config-type-non-object/serverless.json
similarity index 100%
rename from test/fixtures/cli/configTypeNonObject/serverless.json
rename to test/fixtures/cli/config-type-non-object/serverless.json

From 3a410e34ca6fdfb0583f5c4476a0f545cb0a1038 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:20:34 +0100
Subject: [PATCH 0931/1101] test: Rename fixture `cli/configTypeYaml`

---
 .../cli/{configTypeYaml => config-type-yaml}/serverless.yaml      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/fixtures/cli/{configTypeYaml => config-type-yaml}/serverless.yaml (100%)

diff --git a/test/fixtures/cli/configTypeYaml/serverless.yaml b/test/fixtures/cli/config-type-yaml/serverless.yaml
similarity index 100%
rename from test/fixtures/cli/configTypeYaml/serverless.yaml
rename to test/fixtures/cli/config-type-yaml/serverless.yaml

From 99a92b6bc49210debe3ff5ab10c099389ecd8f85 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:21:11 +0100
Subject: [PATCH 0932/1101] test: Rename fixture `cli/configTypeYml`

---
 .../cli/{configTypeYml => config-type-yml}/serverless.yml         | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/fixtures/cli/{configTypeYml => config-type-yml}/serverless.yml (100%)

diff --git a/test/fixtures/cli/configTypeYml/serverless.yml b/test/fixtures/cli/config-type-yml/serverless.yml
similarity index 100%
rename from test/fixtures/cli/configTypeYml/serverless.yml
rename to test/fixtures/cli/config-type-yml/serverless.yml

From cd1aabeede6735a9b2941f3dd6be469924f7f6a0 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:21:52 +0100
Subject: [PATCH 0933/1101] test: Rename fixture `cli/configTypeYmlAndJson`

---
 .../serverless.json                                               | 0
 .../serverless.yml                                                | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename test/fixtures/cli/{configTypeYmlAndJson => config-type-yml-and-json}/serverless.json (100%)
 rename test/fixtures/cli/{configTypeYmlAndJson => config-type-yml-and-json}/serverless.yml (100%)

diff --git a/test/fixtures/cli/configTypeYmlAndJson/serverless.json b/test/fixtures/cli/config-type-yml-and-json/serverless.json
similarity index 100%
rename from test/fixtures/cli/configTypeYmlAndJson/serverless.json
rename to test/fixtures/cli/config-type-yml-and-json/serverless.json
diff --git a/test/fixtures/cli/configTypeYmlAndJson/serverless.yml b/test/fixtures/cli/config-type-yml-and-json/serverless.yml
similarity index 100%
rename from test/fixtures/cli/configTypeYmlAndJson/serverless.yml
rename to test/fixtures/cli/config-type-yml-and-json/serverless.yml

From 6bdbac5a06b478e02563aa81e0ad0c20e57b5d2c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:22:21 +0100
Subject: [PATCH 0934/1101] test: Rename fixture `cli/serverlessTs`

---
 test/fixtures/cli/{serverlessTs => serverless-ts}/serverless.ts | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/fixtures/cli/{serverlessTs => serverless-ts}/serverless.ts (100%)

diff --git a/test/fixtures/cli/serverlessTs/serverless.ts b/test/fixtures/cli/serverless-ts/serverless.ts
similarity index 100%
rename from test/fixtures/cli/serverlessTs/serverless.ts
rename to test/fixtures/cli/serverless-ts/serverless.ts

From 23da3142b6bdbdc6f8e290afe376eff01e6f7eb2 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:22:57 +0100
Subject: [PATCH 0935/1101] test: Rename fixture `cli/uncaughtException`

---
 .../cli/{uncaughtException => uncaught-exception}/plugin.js     | 0
 .../{uncaughtException => uncaught-exception}/serverless.yml    | 0
 test/unit/scripts/serverless.test.js                            | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename test/fixtures/cli/{uncaughtException => uncaught-exception}/plugin.js (100%)
 rename test/fixtures/cli/{uncaughtException => uncaught-exception}/serverless.yml (100%)

diff --git a/test/fixtures/cli/uncaughtException/plugin.js b/test/fixtures/cli/uncaught-exception/plugin.js
similarity index 100%
rename from test/fixtures/cli/uncaughtException/plugin.js
rename to test/fixtures/cli/uncaught-exception/plugin.js
diff --git a/test/fixtures/cli/uncaughtException/serverless.yml b/test/fixtures/cli/uncaught-exception/serverless.yml
similarity index 100%
rename from test/fixtures/cli/uncaughtException/serverless.yml
rename to test/fixtures/cli/uncaught-exception/serverless.yml
diff --git a/test/unit/scripts/serverless.test.js b/test/unit/scripts/serverless.test.js
index 85f24a1712a..e0d72dd1a51 100644
--- a/test/unit/scripts/serverless.test.js
+++ b/test/unit/scripts/serverless.test.js
@@ -58,7 +58,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
   it('should handle uncaught exceptions', async () => {
     try {
       await spawn('node', [serverlessPath, 'print'], {
-        cwd: path.resolve(cliFixturesPath, 'uncaughtException'),
+        cwd: path.resolve(cliFixturesPath, 'uncaught-exception'),
       });
       throw new Error('Unexpected');
     } catch (error) {

From 05a3b18ca687bfeeb11679c84e5e6e6a0b4d1c85 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:24:08 +0100
Subject: [PATCH 0936/1101] test: Rename fixture
 `programmatic/apiGatewayExtended`

---
 .../{apiGatewayExtended => api-gateway-extended}/core.js        | 0
 .../{apiGatewayExtended => api-gateway-extended}/helper.js      | 0
 .../{apiGatewayExtended => api-gateway-extended}/serverless.yml | 0
 test/integration/aws/apiGateway.test.js                         | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename test/fixtures/programmatic/{apiGatewayExtended => api-gateway-extended}/core.js (100%)
 rename test/fixtures/programmatic/{apiGatewayExtended => api-gateway-extended}/helper.js (100%)
 rename test/fixtures/programmatic/{apiGatewayExtended => api-gateway-extended}/serverless.yml (100%)

diff --git a/test/fixtures/programmatic/apiGatewayExtended/core.js b/test/fixtures/programmatic/api-gateway-extended/core.js
similarity index 100%
rename from test/fixtures/programmatic/apiGatewayExtended/core.js
rename to test/fixtures/programmatic/api-gateway-extended/core.js
diff --git a/test/fixtures/programmatic/apiGatewayExtended/helper.js b/test/fixtures/programmatic/api-gateway-extended/helper.js
similarity index 100%
rename from test/fixtures/programmatic/apiGatewayExtended/helper.js
rename to test/fixtures/programmatic/api-gateway-extended/helper.js
diff --git a/test/fixtures/programmatic/apiGatewayExtended/serverless.yml b/test/fixtures/programmatic/api-gateway-extended/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/apiGatewayExtended/serverless.yml
rename to test/fixtures/programmatic/api-gateway-extended/serverless.yml
diff --git a/test/integration/aws/apiGateway.test.js b/test/integration/aws/apiGateway.test.js
index f57eeeba8cc..6b9d8da13a4 100644
--- a/test/integration/aws/apiGateway.test.js
+++ b/test/integration/aws/apiGateway.test.js
@@ -28,7 +28,7 @@ describe('AWS - API Gateway Integration Test', function () {
   };
 
   before(async () => {
-    const serviceData = await fixtures.setup('apiGatewayExtended');
+    const serviceData = await fixtures.setup('api-gateway-extended');
     ({ servicePath: serviceDir, updateConfig } = serviceData);
     serviceName = serviceData.serviceConfig.service;
     apiKey = `${serviceName}-api-key-1`;

From 8533f6a68fda10281feb494eebab254e9270e9ae Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:24:58 +0100
Subject: [PATCH 0937/1101] test: Rename fixture `programmatic/apiGateway`

---
 .../programmatic/{apiGateway => api-gateway}/index.js     | 0
 .../{apiGateway => api-gateway}/serverless.yml            | 0
 test/integration/aws/apiGatewayExternal.test.js           | 2 +-
 test/unit/lib/plugins/aws/customResources/index.test.js   | 4 ++--
 test/unit/lib/plugins/aws/info/display.test.js            | 2 +-
 .../package/compile/events/apiGateway/lib/apiKeys.test.js | 2 +-
 .../events/apiGateway/lib/hack/updateStage.test.js        | 4 ++--
 .../compile/events/apiGateway/lib/method/index.test.js    | 6 +++---
 .../apiGateway/lib/method/requestParameters.test.js       | 2 +-
 .../package/compile/events/apiGateway/lib/restApi.test.js | 8 ++++----
 .../compile/events/apiGateway/lib/stage/index.test.js     | 6 +++---
 .../compile/events/apiGateway/lib/usagePlan.test.js       | 8 ++++----
 .../compile/events/apiGateway/lib/validate.test.js        | 4 ++--
 .../aws/package/lib/addExportNameForOutputs.test.js       | 2 +-
 14 files changed, 25 insertions(+), 25 deletions(-)
 rename test/fixtures/programmatic/{apiGateway => api-gateway}/index.js (100%)
 rename test/fixtures/programmatic/{apiGateway => api-gateway}/serverless.yml (100%)

diff --git a/test/fixtures/programmatic/apiGateway/index.js b/test/fixtures/programmatic/api-gateway/index.js
similarity index 100%
rename from test/fixtures/programmatic/apiGateway/index.js
rename to test/fixtures/programmatic/api-gateway/index.js
diff --git a/test/fixtures/programmatic/apiGateway/serverless.yml b/test/fixtures/programmatic/api-gateway/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/apiGateway/serverless.yml
rename to test/fixtures/programmatic/api-gateway/serverless.yml
diff --git a/test/integration/aws/apiGatewayExternal.test.js b/test/integration/aws/apiGatewayExternal.test.js
index b2eee078edc..989b6245e2f 100644
--- a/test/integration/aws/apiGatewayExternal.test.js
+++ b/test/integration/aws/apiGatewayExternal.test.js
@@ -27,7 +27,7 @@ describe('AWS - API Gateway with External REST API Integration Test', function (
   };
 
   before(async () => {
-    const serviceData = await fixtures.setup('apiGateway');
+    const serviceData = await fixtures.setup('api-gateway');
     ({ servicePath: serviceDir, updateConfig } = serviceData);
     const serviceName = serviceData.serviceConfig.service;
     const externalRestApiName = `${stage}-${serviceName}-ext-api`;
diff --git a/test/unit/lib/plugins/aws/customResources/index.test.js b/test/unit/lib/plugins/aws/customResources/index.test.js
index e47c07866f3..6142e34bcc1 100644
--- a/test/unit/lib/plugins/aws/customResources/index.test.js
+++ b/test/unit/lib/plugins/aws/customResources/index.test.js
@@ -354,7 +354,7 @@ describe('#addCustomResourceToService()', () => {
 describe('test/unit/lib/plugins/aws/customResources/index.test.js', () => {
   it('correctly takes stage from cli into account when constructing apiGatewayCloudWatchRole resource', async () => {
     const { cfTemplate } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       command: 'package',
       options: { stage: 'testing' },
       configExt: {
@@ -373,7 +373,7 @@ describe('test/unit/lib/plugins/aws/customResources/index.test.js', () => {
 
   it('correctly takes stage from config into account when constructing apiGatewayCloudWatchRole resource', async () => {
     const { cfTemplate } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       command: 'package',
       configExt: {
         provider: {
diff --git a/test/unit/lib/plugins/aws/info/display.test.js b/test/unit/lib/plugins/aws/info/display.test.js
index b5212a0bb56..8e42db590ee 100644
--- a/test/unit/lib/plugins/aws/info/display.test.js
+++ b/test/unit/lib/plugins/aws/info/display.test.js
@@ -14,7 +14,7 @@ describe('test/unit/lib/plugins/aws/info/display.test.js', () => {
         serviceConfig: { service: serviceName },
       },
     } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       command: 'info',
       awsRequestStubMap: {
         APIGateway: {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js
index 80ffabc9507..d2950029ead 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js
@@ -166,7 +166,7 @@ describe('lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js'
 
   before(async () => {
     const { awsNaming, cfTemplate, serverless } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       command: 'package',
       configExt: {
         provider: {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
index 2bfe99b2d1f..af6741ed766 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
@@ -758,7 +758,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/u
     const tagResourceStub = sinon.stub();
     const untagResourceStub = sinon.stub();
     await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       command: 'deploy',
       configExt: {
         provider: {
@@ -815,7 +815,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/u
   });
 
   it('should correctly resolve `apiId` during deployment', async () => {
-    const { serviceConfig, servicePath, updateConfig } = await fixtures.setup('apiGateway');
+    const { serviceConfig, servicePath, updateConfig } = await fixtures.setup('api-gateway');
     const getDeploymentsStub = sinon.stub().returns({ items: [{ id: 'deployment-id' }] });
     const stage = 'dev';
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js
index b1bba8056b8..5e4cf1844db 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js
@@ -1748,7 +1748,7 @@ describe('#compileMethods v2()', () => {
         awsNaming,
         cfTemplate: { Resources: cfResources },
       } = await runServerless({
-        fixture: 'apiGateway',
+        fixture: 'api-gateway',
         configExt: {
           functions: {
             foo: {
@@ -1779,7 +1779,7 @@ describe('#compileMethods v2()', () => {
         awsNaming,
         cfTemplate: { Resources: cfResources },
       } = await runServerless({
-        fixture: 'apiGateway',
+        fixture: 'api-gateway',
         configExt: {
           functions: {
             foo: {
@@ -1823,7 +1823,7 @@ describe('#compileMethods v2()', () => {
       cfTemplate: { Resources: cfResources },
     } = await runServerless({
       command: 'package',
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
     });
     const FooApiGatewayMethodConfig = cfResources[awsNaming.getMethodLogicalId('Foo', 'GET')];
     const OtherApiGatewayMethodConfig =
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/requestParameters.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/requestParameters.test.js
index 763e251214b..600cd5cf0ea 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/requestParameters.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/requestParameters.test.js
@@ -13,7 +13,7 @@ describe('ApiGatewayEvents', () => {
     let naming;
     before(() =>
       runServerless({
-        fixture: 'apiGateway',
+        fixture: 'api-gateway',
         configExt: {
           functions: {
             foo: {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
index d7fa225f42c..44356c9decc 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
@@ -167,7 +167,7 @@ describe('#compileRestApi()', () => {
 describe('lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js', () => {
   it('should not disable the default execute-api endpoint by default', async () => {
     const { cfTemplate } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       command: 'package',
     });
     const resource = cfTemplate.Resources.ApiGatewayRestApi;
@@ -177,7 +177,7 @@ describe('lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js'
 
   it('should support `provider.apiGateway.disableDefaultEndpoint`', async () => {
     const { cfTemplate } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       command: 'package',
       configExt: {
         provider: {
@@ -194,7 +194,7 @@ describe('lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js'
 
   it('should support `provider.apiGateway.resourcePolicy[].Principal.AWS with Fn::If`', async () => {
     const { cfTemplate } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       command: 'package',
       configExt: {
         provider: {
@@ -224,7 +224,7 @@ describe('lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js'
 
   it('should support `provider.apiGateway.minimumCompressionSize to be set to 0`', async () => {
     const { cfTemplate } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       command: 'package',
       configExt: {
         provider: {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js
index 678f2576440..0103a40d564 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js
@@ -320,7 +320,7 @@ describe('#compileStage()', () => {
 describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js', () => {
   it('should not create LogGroup if `accessLogging` set to false', async () => {
     const { cfTemplate, awsNaming } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       command: 'package',
       configExt: {
         provider: {
@@ -338,7 +338,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/
 
   it('should create LogGroup with `logs.restApi` set to `true`', async () => {
     const { cfTemplate, awsNaming, serverless } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       command: 'package',
       configExt: {
         provider: {
@@ -359,7 +359,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/
 
   it('should create LogGroup with default setting for `accessLogging`', async () => {
     const { cfTemplate, awsNaming, serverless } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       command: 'package',
       configExt: {
         provider: {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js
index e9d0d82bee2..091c5855a1a 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js
@@ -330,7 +330,7 @@ describe('UsagePlan', () => {
   it('Should have values for throttle', async () => {
     serverlessConfigurationExtension.provider.apiGateway = { usagePlan: { throttle } };
     const { cfTemplate } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       configExt: serverlessConfigurationExtension,
       command: 'package',
     });
@@ -346,7 +346,7 @@ describe('UsagePlan', () => {
   it('Should have values for quota', async () => {
     serverlessConfigurationExtension.provider.apiGateway = { usagePlan: { quota } };
     const { cfTemplate } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       configExt: serverlessConfigurationExtension,
       command: 'package',
     });
@@ -359,7 +359,7 @@ describe('UsagePlan', () => {
   it('Should have values for throttle and not quota', async () => {
     serverlessConfigurationExtension.provider.apiGateway = { usagePlan: { throttle } };
     const { cfTemplate } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       configExt: serverlessConfigurationExtension,
       command: 'package',
     });
@@ -377,7 +377,7 @@ describe('UsagePlan', () => {
   it('Should have values for quota and throttle', async () => {
     serverlessConfigurationExtension.provider.apiGateway = { usagePlan: { throttle, quota } };
     const { cfTemplate } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       configExt: serverlessConfigurationExtension,
       command: 'package',
     });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
index 15c5f3d530d..0f4424020b9 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
@@ -1597,7 +1597,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/valida
   it('Should error when using external API Gateway and enabling tracing', async () => {
     await expect(
       runServerless({
-        fixture: 'apiGateway',
+        fixture: 'api-gateway',
         command: 'package',
         configExt: {
           provider: {
@@ -1617,7 +1617,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/valida
   it('Should error when using external API Gateway and enabling logs', async () => {
     await expect(
       runServerless({
-        fixture: 'apiGateway',
+        fixture: 'api-gateway',
         command: 'package',
         configExt: {
           provider: {
diff --git a/test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js b/test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js
index fa5e724a297..277aea04c20 100644
--- a/test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js
@@ -10,7 +10,7 @@ describe('test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js'
   let service;
   before(async () => {
     const result = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       command: 'package',
       configExt: {
         resources: {

From 4bf951546c7e120c1bcceb535b2bb5c5fcc58b80 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:25:55 +0100
Subject: [PATCH 0938/1101] test: Rename fixture `programmatic/checkForChanges`

---
 .../artifact.zip                              | Bin
 .../fn-individually.js}                       |   0
 .../fn.js}                                    |   0
 .../serverless.yml                            |   2 +-
 .../aws/deploy/lib/checkForChanges.test.js    |  36 +++++++++---------
 5 files changed, 19 insertions(+), 19 deletions(-)
 rename test/fixtures/programmatic/{checkForChanges => check-for-changes}/artifact.zip (100%)
 rename test/fixtures/programmatic/{checkForChanges/fn.js => check-for-changes/fn-individually.js} (100%)
 rename test/fixtures/programmatic/{checkForChanges/fnIndividually.js => check-for-changes/fn.js} (100%)
 rename test/fixtures/programmatic/{checkForChanges => check-for-changes}/serverless.yml (86%)

diff --git a/test/fixtures/programmatic/checkForChanges/artifact.zip b/test/fixtures/programmatic/check-for-changes/artifact.zip
similarity index 100%
rename from test/fixtures/programmatic/checkForChanges/artifact.zip
rename to test/fixtures/programmatic/check-for-changes/artifact.zip
diff --git a/test/fixtures/programmatic/checkForChanges/fn.js b/test/fixtures/programmatic/check-for-changes/fn-individually.js
similarity index 100%
rename from test/fixtures/programmatic/checkForChanges/fn.js
rename to test/fixtures/programmatic/check-for-changes/fn-individually.js
diff --git a/test/fixtures/programmatic/checkForChanges/fnIndividually.js b/test/fixtures/programmatic/check-for-changes/fn.js
similarity index 100%
rename from test/fixtures/programmatic/checkForChanges/fnIndividually.js
rename to test/fixtures/programmatic/check-for-changes/fn.js
diff --git a/test/fixtures/programmatic/checkForChanges/serverless.yml b/test/fixtures/programmatic/check-for-changes/serverless.yml
similarity index 86%
rename from test/fixtures/programmatic/checkForChanges/serverless.yml
rename to test/fixtures/programmatic/check-for-changes/serverless.yml
index db9e2271e89..dcef99ca5c6 100644
--- a/test/fixtures/programmatic/checkForChanges/serverless.yml
+++ b/test/fixtures/programmatic/check-for-changes/serverless.yml
@@ -13,6 +13,6 @@ functions:
   fn2:
     handler: fn.handler
   fnIndividually:
-    handler: fnIndividually.handler
+    handler: fn-individually.handler
     package:
       patterns: '!fn.js'
diff --git a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
index a061e0878bc..a58ecdee6a7 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
@@ -682,7 +682,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
 
     let serverless;
     await runServerless({
-      fixture: 'checkForChanges',
+      fixture: 'check-for-changes',
       command: 'deploy',
       lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
       env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
@@ -718,7 +718,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
 
     let serverless;
     await runServerless({
-      fixture: 'checkForChanges',
+      fixture: 'check-for-changes',
       command: 'deploy',
       options: { force: true },
       lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
@@ -775,7 +775,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
 
     let serverless;
     await runServerless({
-      fixture: 'checkForChanges',
+      fixture: 'check-for-changes',
       command: 'deploy',
       lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
       env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
@@ -806,7 +806,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
 
     let serverless;
     await runServerless({
-      fixture: 'checkForChanges',
+      fixture: 'check-for-changes',
       command: 'deploy',
       lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
       env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
@@ -836,7 +836,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
     const {
       fixtureData: { updateConfig, servicePath: serviceDir },
     } = await runServerless({
-      fixture: 'checkForChanges',
+      fixture: 'check-for-changes',
       command: 'package',
     });
 
@@ -874,7 +874,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
 
     let serverless;
     await runServerless({
-      fixture: 'checkForChanges',
+      fixture: 'check-for-changes',
       command: 'deploy',
       lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
       env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
@@ -903,7 +903,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
 
     let serverless;
     await runServerless({
-      fixture: 'checkForChanges',
+      fixture: 'check-for-changes',
       command: 'deploy',
       configExt: {
         package: { individually: true },
@@ -936,7 +936,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
 
     let serverless;
     await runServerless({
-      fixture: 'checkForChanges',
+      fixture: 'check-for-changes',
       command: 'deploy',
       configExt: {
         package: { individually: true },
@@ -970,7 +970,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
 
     let serverless;
     await runServerless({
-      fixture: 'checkForChanges',
+      fixture: 'check-for-changes',
       command: 'deploy',
       configExt: {
         package: { artifact: 'artifact.zip' },
@@ -1077,7 +1077,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
 
     return expect(
       runServerless({
-        fixture: 'checkForChanges',
+        fixture: 'check-for-changes',
         command: 'deploy',
         lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
         env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
@@ -1101,7 +1101,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
 
     return expect(
       runServerless({
-        fixture: 'checkForChanges',
+        fixture: 'check-for-changes',
         command: 'deploy',
         lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
         env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
@@ -1124,7 +1124,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
       const deleteStub = sandbox.stub();
       let serverless;
       await runServerless({
-        fixture: 'checkForChanges',
+        fixture: 'check-for-changes',
         command: 'deploy',
         configExt: {
           functions: { fn1: { events: [{ cloudwatchLog: 'someLogGroupName' }] } },
@@ -1194,7 +1194,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
       const deleteStub = sandbox.stub();
       let serverless;
       await runServerless({
-        fixture: 'checkForChanges',
+        fixture: 'check-for-changes',
         command: 'deploy',
         configExt: {
           functions: { fn1: { events: [{ cloudwatchLog: 'someLogGroupName' }] } },
@@ -1260,7 +1260,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
       const deleteStub = sandbox.stub();
       let serverless;
       const promise = runServerless({
-        fixture: 'checkForChanges',
+        fixture: 'check-for-changes',
         command: 'deploy',
         configExt: {
           functions: {
@@ -1337,7 +1337,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
       const deleteStub = sandbox.stub();
       let serverless;
       const { awsNaming } = await runServerless({
-        fixture: 'checkForChanges',
+        fixture: 'check-for-changes',
         command: 'deploy',
         configExt: {
           functions: { fn1: { events: [{ cloudwatchLog: 'someLogGroupName' }] } },
@@ -1413,7 +1413,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
       const deleteStub = sandbox.stub();
       let serverless;
       const { awsNaming } = await runServerless({
-        fixture: 'checkForChanges',
+        fixture: 'check-for-changes',
         command: 'deploy',
         configExt: {
           functions: {
@@ -1514,7 +1514,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
       const deleteStub = sandbox.stub();
       let serverless;
       const { awsNaming } = await runServerless({
-        fixture: 'checkForChanges',
+        fixture: 'check-for-changes',
         command: 'deploy',
         configExt: {
           functions: {
@@ -1615,7 +1615,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
       const deleteStub = sandbox.stub();
       let serverless;
       await runServerless({
-        fixture: 'checkForChanges',
+        fixture: 'check-for-changes',
         command: 'deploy',
         configExt: {
           functions: { fn1: { events: [{ cloudwatchLog: 'someLogGroupName' }] } },

From 7e2881e9fe91d0018142e7821879fb08358daf59 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:28:40 +0100
Subject: [PATCH 0939/1101] test: Rename fixture
 `programmatic/congnitoUserPool`

---
 .../programmatic/{cognitoUserPool => cognito-user-pool}/core.js | 0
 .../{cognitoUserPool => cognito-user-pool}/serverless.yml       | 0
 .../{cognitoUserPool => cognito-user-pool}/utils.js             | 0
 test/integration/aws/cognitoUserPool.test.js                    | 2 +-
 .../plugins/aws/package/compile/events/cognitoUserPool.test.js  | 2 +-
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename test/fixtures/programmatic/{cognitoUserPool => cognito-user-pool}/core.js (100%)
 rename test/fixtures/programmatic/{cognitoUserPool => cognito-user-pool}/serverless.yml (100%)
 rename test/fixtures/programmatic/{cognitoUserPool => cognito-user-pool}/utils.js (100%)

diff --git a/test/fixtures/programmatic/cognitoUserPool/core.js b/test/fixtures/programmatic/cognito-user-pool/core.js
similarity index 100%
rename from test/fixtures/programmatic/cognitoUserPool/core.js
rename to test/fixtures/programmatic/cognito-user-pool/core.js
diff --git a/test/fixtures/programmatic/cognitoUserPool/serverless.yml b/test/fixtures/programmatic/cognito-user-pool/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/cognitoUserPool/serverless.yml
rename to test/fixtures/programmatic/cognito-user-pool/serverless.yml
diff --git a/test/fixtures/programmatic/cognitoUserPool/utils.js b/test/fixtures/programmatic/cognito-user-pool/utils.js
similarity index 100%
rename from test/fixtures/programmatic/cognitoUserPool/utils.js
rename to test/fixtures/programmatic/cognito-user-pool/utils.js
diff --git a/test/integration/aws/cognitoUserPool.test.js b/test/integration/aws/cognitoUserPool.test.js
index 137505881c7..bbf98d230e0 100644
--- a/test/integration/aws/cognitoUserPool.test.js
+++ b/test/integration/aws/cognitoUserPool.test.js
@@ -30,7 +30,7 @@ describe('AWS - Cognito User Pool Integration Test', function () {
   const stage = 'dev';
 
   before(async () => {
-    const serviceData = await fixtures.setup('cognitoUserPool');
+    const serviceData = await fixtures.setup('cognito-user-pool');
     ({ servicePath: serviceDir } = serviceData);
     const serviceName = serviceData.serviceConfig.service;
     stackName = `${serviceName}-${stage}`;
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js b/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
index f29e3e0dec7..238eca478aa 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
@@ -348,7 +348,7 @@ describe('AwsCompileCognitoUserPoolEvents', () => {
 
     it('should support `forceDeploy` setting', async () => {
       const result = await runServerless({
-        fixture: 'cognitoUserPool',
+        fixture: 'cognito-user-pool',
         configExt: {
           functions: {
             existingSimple: {

From d6c118d24e444ea50d4e9572b93a3e9599de5de3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:29:24 +0100
Subject: [PATCH 0940/1101] test: Rename fixture `programmatic/configInvalid`

---
 .../{configInvalid => config-invalid}/serverless.yml            | 0
 test/unit/scripts/serverless.test.js                            | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename test/fixtures/programmatic/{configInvalid => config-invalid}/serverless.yml (100%)

diff --git a/test/fixtures/programmatic/configInvalid/serverless.yml b/test/fixtures/programmatic/config-invalid/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/configInvalid/serverless.yml
rename to test/fixtures/programmatic/config-invalid/serverless.yml
diff --git a/test/unit/scripts/serverless.test.js b/test/unit/scripts/serverless.test.js
index e0d72dd1a51..70813905a2c 100644
--- a/test/unit/scripts/serverless.test.js
+++ b/test/unit/scripts/serverless.test.js
@@ -219,7 +219,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
     const output = String(
       (
         await spawn('node', [serverlessPath, '--help'], {
-          cwd: path.resolve(programmaticFixturesPath, 'configInvalid'),
+          cwd: path.resolve(programmaticFixturesPath, 'config-invalid'),
         })
       ).stdoutBuffer
     );

From aaba49b540bbd1c69f1f23537db0d16f2f705585 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:31:12 +0100
Subject: [PATCH 0941/1101] test: Rename fixture
 `programmatic/configSchemaExtensionsError

---
 .../serverless.yml                             |  0
 ...st-plugin-with-colliding-custom-property.js |  0
 ...n-with-colliding-function-event-property.js |  0
 ...est-plugin-with-colliding-function-event.js |  0
 ...-plugin-with-colliding-function-property.js |  0
 ...-colliding-provider-property-in-function.js |  0
 ...-colliding-provider-property-in-provider.js |  0
 ...plugin-with-colliding-top-level-property.js |  0
 ...-complex-event-without-object-definition.js |  0
 ...est-plugin-with-non-existing-event-error.js |  0
 .../classes/ConfigSchemaHandler/index.test.js  | 18 +++++++++---------
 11 files changed, 9 insertions(+), 9 deletions(-)
 rename test/fixtures/programmatic/{configSchemaExtensionsError => config-schema-extensions-error}/serverless.yml (100%)
 rename test/fixtures/programmatic/{configSchemaExtensionsError => config-schema-extensions-error}/test-plugin-with-colliding-custom-property.js (100%)
 rename test/fixtures/programmatic/{configSchemaExtensionsError => config-schema-extensions-error}/test-plugin-with-colliding-function-event-property.js (100%)
 rename test/fixtures/programmatic/{configSchemaExtensionsError => config-schema-extensions-error}/test-plugin-with-colliding-function-event.js (100%)
 rename test/fixtures/programmatic/{configSchemaExtensionsError => config-schema-extensions-error}/test-plugin-with-colliding-function-property.js (100%)
 rename test/fixtures/programmatic/{configSchemaExtensionsError => config-schema-extensions-error}/test-plugin-with-colliding-provider-property-in-function.js (100%)
 rename test/fixtures/programmatic/{configSchemaExtensionsError => config-schema-extensions-error}/test-plugin-with-colliding-provider-property-in-provider.js (100%)
 rename test/fixtures/programmatic/{configSchemaExtensionsError => config-schema-extensions-error}/test-plugin-with-colliding-top-level-property.js (100%)
 rename test/fixtures/programmatic/{configSchemaExtensionsError => config-schema-extensions-error}/test-plugin-with-complex-event-without-object-definition.js (100%)
 rename test/fixtures/programmatic/{configSchemaExtensionsError => config-schema-extensions-error}/test-plugin-with-non-existing-event-error.js (100%)

diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/serverless.yml b/test/fixtures/programmatic/config-schema-extensions-error/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensionsError/serverless.yml
rename to test/fixtures/programmatic/config-schema-extensions-error/serverless.yml
diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-custom-property.js b/test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-custom-property.js
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-custom-property.js
rename to test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-custom-property.js
diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-function-event-property.js b/test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-function-event-property.js
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-function-event-property.js
rename to test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-function-event-property.js
diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-function-event.js b/test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-function-event.js
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-function-event.js
rename to test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-function-event.js
diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-function-property.js b/test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-function-property.js
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-function-property.js
rename to test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-function-property.js
diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-provider-property-in-function.js b/test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-provider-property-in-function.js
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-provider-property-in-function.js
rename to test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-provider-property-in-function.js
diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-provider-property-in-provider.js b/test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-provider-property-in-provider.js
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-provider-property-in-provider.js
rename to test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-provider-property-in-provider.js
diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-top-level-property.js b/test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-top-level-property.js
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-top-level-property.js
rename to test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-top-level-property.js
diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-complex-event-without-object-definition.js b/test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-complex-event-without-object-definition.js
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-complex-event-without-object-definition.js
rename to test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-complex-event-without-object-definition.js
diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-non-existing-event-error.js b/test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-non-existing-event-error.js
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-non-existing-event-error.js
rename to test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-non-existing-event-error.js
diff --git a/test/unit/lib/classes/ConfigSchemaHandler/index.test.js b/test/unit/lib/classes/ConfigSchemaHandler/index.test.js
index 75896d41417..fd2792a02d4 100644
--- a/test/unit/lib/classes/ConfigSchemaHandler/index.test.js
+++ b/test/unit/lib/classes/ConfigSchemaHandler/index.test.js
@@ -118,7 +118,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
     it('should throw when defineFunctionEvent is used with an already defined event', async () => {
       await expect(
         runServerless({
-          fixture: 'configSchemaExtensionsError',
+          fixture: 'config-schema-extensions-error',
           command: 'info',
           configExt: {
             plugins: ['./test-plugin-with-colliding-function-event'],
@@ -182,7 +182,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
     it('should throw when defineFunctionEventProperties is used on non existing event name', async () => {
       await expect(
         runServerless({
-          fixture: 'configSchemaExtensionsError',
+          fixture: 'config-schema-extensions-error',
           command: 'info',
           configExt: {
             plugins: ['./test-plugin-with-non-existing-event-error'],
@@ -194,7 +194,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
     it('should throw when defineFunctionEventProperties is used on event without object definition', async () => {
       await expect(
         runServerless({
-          fixture: 'configSchemaExtensionsError',
+          fixture: 'config-schema-extensions-error',
           command: 'info',
           configExt: {
             plugins: ['./test-plugin-with-complex-event-without-object-definition'],
@@ -206,7 +206,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
     it('should throw when defineFunctionEventProperties is used with an already defined property', async () => {
       await expect(
         runServerless({
-          fixture: 'configSchemaExtensionsError',
+          fixture: 'config-schema-extensions-error',
           command: 'info',
           configExt: {
             plugins: ['./test-plugin-with-colliding-function-event-property'],
@@ -242,7 +242,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
     it('should throw when defineFunctionProperties is used with an already defined property', async () => {
       await expect(
         runServerless({
-          fixture: 'configSchemaExtensionsError',
+          fixture: 'config-schema-extensions-error',
           command: 'info',
           configExt: {
             plugins: ['./test-plugin-with-colliding-function-property'],
@@ -272,7 +272,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
     it('should throw when defineCustomProperties is used with an already defined property', async () => {
       await expect(
         runServerless({
-          fixture: 'configSchemaExtensionsError',
+          fixture: 'config-schema-extensions-error',
           command: 'info',
           configExt: {
             plugins: ['./test-plugin-with-colliding-custom-property'],
@@ -301,7 +301,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
     it('should throw when defineTopLevelProperty is used with an already defined property', async () => {
       await expect(
         runServerless({
-          fixture: 'configSchemaExtensionsError',
+          fixture: 'config-schema-extensions-error',
           command: 'info',
           configExt: {
             plugins: ['./test-plugin-with-colliding-top-level-property'],
@@ -343,7 +343,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
     it('should throw when defineProvider is used with an already defined property in provider', async () => {
       await expect(
         runServerless({
-          fixture: 'configSchemaExtensionsError',
+          fixture: 'config-schema-extensions-error',
           command: 'info',
           configExt: {
             plugins: ['./test-plugin-with-colliding-provider-property-in-provider'],
@@ -355,7 +355,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
     it('should throw when defineProvider is used with an already defined property in function', async () => {
       await expect(
         runServerless({
-          fixture: 'configSchemaExtensionsError',
+          fixture: 'config-schema-extensions-error',
           command: 'info',
           configExt: {
             plugins: ['./test-plugin-with-colliding-provider-property-in-function'],

From 55b92071fbb75e7a5018793f88a464330d0ae63e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:32:32 +0100
Subject: [PATCH 0942/1101] test: Rename fixture
 `programmatic/configSchemaExtensions`

---
 .../serverless.yml                            |  0
 .../test-plugin.js                            |  0
 .../classes/ConfigSchemaHandler/index.test.js | 26 +++++++++----------
 test/unit/lib/configSchema.test.js            |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename test/fixtures/programmatic/{configSchemaExtensions => config-schema-extensions}/serverless.yml (100%)
 rename test/fixtures/programmatic/{configSchemaExtensions => config-schema-extensions}/test-plugin.js (100%)

diff --git a/test/fixtures/programmatic/configSchemaExtensions/serverless.yml b/test/fixtures/programmatic/config-schema-extensions/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensions/serverless.yml
rename to test/fixtures/programmatic/config-schema-extensions/serverless.yml
diff --git a/test/fixtures/programmatic/configSchemaExtensions/test-plugin.js b/test/fixtures/programmatic/config-schema-extensions/test-plugin.js
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensions/test-plugin.js
rename to test/fixtures/programmatic/config-schema-extensions/test-plugin.js
diff --git a/test/unit/lib/classes/ConfigSchemaHandler/index.test.js b/test/unit/lib/classes/ConfigSchemaHandler/index.test.js
index fd2792a02d4..3b0b7c20587 100644
--- a/test/unit/lib/classes/ConfigSchemaHandler/index.test.js
+++ b/test/unit/lib/classes/ConfigSchemaHandler/index.test.js
@@ -15,7 +15,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
   describe('#constructor', () => {
     it('should freeze parts of schema for service', () => {
       return runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       }).then((serverless) => {
         expect(() => {
@@ -26,7 +26,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
 
     it('should freeze parts of schema for plugins', () => {
       return runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       }).then((serverless) => {
         expect(() => {
@@ -37,7 +37,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
 
     it('should freeze parts of schema for resources', () => {
       return runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       }).then((serverless) => {
         expect(() => {
@@ -48,7 +48,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
 
     it('should freeze parts of schema for package', () => {
       return runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       }).then((serverless) => {
         expect(() => {
@@ -61,7 +61,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
 
     it('should freeze parts of schema for layers', () => {
       return runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       }).then((serverless) => {
         expect(() => {
@@ -74,7 +74,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
   describe('#validateConfig', () => {
     it('should run without errors for valid config', async () => {
       const { serverless } = await runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       });
       expect(getConfigurationValidationResult(serverless.configurationInput)).to.be.true;
@@ -84,7 +84,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
   describe('#defineFunctionEvent', () => {
     it('should extend schema with defineFunctionEvent method', () => {
       return runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       }).then((serverless) => {
         const expectedPieceOfSchema = {
@@ -131,7 +131,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
   describe('#defineFunctionEventProperties', () => {
     it('should extend schema with defineFunctionEventProperties method', async () => {
       const serverless = await runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       });
 
@@ -153,7 +153,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
 
     it('should extend schema with defineFunctionEventProperties method on complex event schema', async () => {
       const serverless = await runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       });
 
@@ -219,7 +219,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
   describe('#defineFunctionProperties', () => {
     it('should extend schema with defineFunctionProperties method', () => {
       return runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       }).then((serverless) => {
         const actualFunctionProperties =
@@ -255,7 +255,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
   describe('#defineCustomProperties', () => {
     it('should extend schema with defineCustomProperties method', () => {
       return runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       }).then((serverless) => {
         const someCustomStringProp = {
@@ -285,7 +285,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
   describe('#defineTopLevelProperty', () => {
     it('should extend schema with defineTopLevelProperty method', () => {
       return runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       }).then((serverless) => {
         const expectedAppPropSchema = {
@@ -314,7 +314,7 @@ describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
   describe('#defineProvider', () => {
     it('should extend schema with defineProvider method', () => {
       return runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       }).then((serverless) => {
         const providerPieceOfSchema = {
diff --git a/test/unit/lib/configSchema.test.js b/test/unit/lib/configSchema.test.js
index e431e1d53eb..43b62d71edd 100644
--- a/test/unit/lib/configSchema.test.js
+++ b/test/unit/lib/configSchema.test.js
@@ -88,7 +88,7 @@ describe('test/unit/lib/configSchema.test.js', () => {
     const passOrFail = someCase.isValid ? 'pass' : 'fail';
     it(`should ${passOrFail} validation for ${someCase.description}`, () =>
       runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         configExt: someCase.mutation,
         command: 'info',
       }).then(

From 439b2ab6cb559c8003fe21af30ad205d85314214 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:33:19 +0100
Subject: [PATCH 0943/1101] test: Rename fixture `programmatic/customProvider`

---
 .../customProvider.js => custom-provider/custom-provider.js}  | 0
 .../{customProvider => custom-provider}/serverless.yml        | 2 +-
 test/unit/lib/utils/telemetry/generatePayload.test.js         | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename test/fixtures/programmatic/{customProvider/customProvider.js => custom-provider/custom-provider.js} (100%)
 rename test/fixtures/programmatic/{customProvider => custom-provider}/serverless.yml (91%)

diff --git a/test/fixtures/programmatic/customProvider/customProvider.js b/test/fixtures/programmatic/custom-provider/custom-provider.js
similarity index 100%
rename from test/fixtures/programmatic/customProvider/customProvider.js
rename to test/fixtures/programmatic/custom-provider/custom-provider.js
diff --git a/test/fixtures/programmatic/customProvider/serverless.yml b/test/fixtures/programmatic/custom-provider/serverless.yml
similarity index 91%
rename from test/fixtures/programmatic/customProvider/serverless.yml
rename to test/fixtures/programmatic/custom-provider/serverless.yml
index a30812b4a62..78d5790c007 100644
--- a/test/fixtures/programmatic/customProvider/serverless.yml
+++ b/test/fixtures/programmatic/custom-provider/serverless.yml
@@ -7,7 +7,7 @@ provider:
   runtime: foo
 
 plugins:
-  - ./customProvider
+  - ./custom-provider
 
 functions:
   someFunction:
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index 839e69af18b..5a38740e0b6 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -169,7 +169,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
 
   it('Should resolve payload for custom provider service', async () => {
     const { serverless } = await runServerless({
-      fixture: 'customProvider',
+      fixture: 'custom-provider',
       command: 'print',
     });
     const payload = getGeneratePayload()({
@@ -209,7 +209,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
           stage: 'dev',
           region: undefined,
         },
-        plugins: ['./customProvider'],
+        plugins: ['./custom-provider'],
         functions: [
           { runtime: 'foo', events: [{ type: 'someEvent' }] },
           { runtime: 'bar', events: [] },

From 9bdfd88457bd3d1859e831fa8b76f730b6f0eead Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:34:02 +0100
Subject: [PATCH 0944/1101] test: Rename fixture `programmatic/eventBridge`

---
 .../programmatic/{eventBridge => event-bridge}/core.js        | 0
 .../programmatic/{eventBridge => event-bridge}/serverless.yml | 0
 .../programmatic/{eventBridge => event-bridge}/utils.js       | 0
 test/integration/aws/eventBridge.test.js                      | 4 ++--
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename test/fixtures/programmatic/{eventBridge => event-bridge}/core.js (100%)
 rename test/fixtures/programmatic/{eventBridge => event-bridge}/serverless.yml (100%)
 rename test/fixtures/programmatic/{eventBridge => event-bridge}/utils.js (100%)

diff --git a/test/fixtures/programmatic/eventBridge/core.js b/test/fixtures/programmatic/event-bridge/core.js
similarity index 100%
rename from test/fixtures/programmatic/eventBridge/core.js
rename to test/fixtures/programmatic/event-bridge/core.js
diff --git a/test/fixtures/programmatic/eventBridge/serverless.yml b/test/fixtures/programmatic/event-bridge/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/eventBridge/serverless.yml
rename to test/fixtures/programmatic/event-bridge/serverless.yml
diff --git a/test/fixtures/programmatic/eventBridge/utils.js b/test/fixtures/programmatic/event-bridge/utils.js
similarity index 100%
rename from test/fixtures/programmatic/eventBridge/utils.js
rename to test/fixtures/programmatic/event-bridge/utils.js
diff --git a/test/integration/aws/eventBridge.test.js b/test/integration/aws/eventBridge.test.js
index dc0f3697b53..a5056c5539f 100644
--- a/test/integration/aws/eventBridge.test.js
+++ b/test/integration/aws/eventBridge.test.js
@@ -34,7 +34,7 @@ describe('AWS - Event Bridge Integration Test', () => {
     ];
 
     before(async () => {
-      const serviceData = await fixtures.setup('eventBridge');
+      const serviceData = await fixtures.setup('event-bridge');
       ({ servicePath: serviceDir } = serviceData);
       serviceName = serviceData.serviceConfig.service;
 
@@ -173,7 +173,7 @@ describe('AWS - Event Bridge Integration Test', () => {
     ];
 
     before(async () => {
-      const serviceData = await fixtures.setup('eventBridge');
+      const serviceData = await fixtures.setup('event-bridge');
       ({ servicePath: serviceDir } = serviceData);
       serviceName = serviceData.serviceConfig.service;
 

From 186c1a0e49ee6761ab9bf8f94f34c22aa339919d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:35:50 +0100
Subject: [PATCH 0945/1101] test: Rename fixture
 `programmatic/functionActivemq`

---
 .../{functionActivemq => function-active-mq}/core.js            | 0
 .../{functionActivemq => function-active-mq}/package.json       | 0
 .../{functionActivemq => function-active-mq}/serverless.yml     | 0
 test/integration/aws/infra-dependent/activemq.test.js           | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename test/fixtures/programmatic/{functionActivemq => function-active-mq}/core.js (100%)
 rename test/fixtures/programmatic/{functionActivemq => function-active-mq}/package.json (100%)
 rename test/fixtures/programmatic/{functionActivemq => function-active-mq}/serverless.yml (100%)

diff --git a/test/fixtures/programmatic/functionActivemq/core.js b/test/fixtures/programmatic/function-active-mq/core.js
similarity index 100%
rename from test/fixtures/programmatic/functionActivemq/core.js
rename to test/fixtures/programmatic/function-active-mq/core.js
diff --git a/test/fixtures/programmatic/functionActivemq/package.json b/test/fixtures/programmatic/function-active-mq/package.json
similarity index 100%
rename from test/fixtures/programmatic/functionActivemq/package.json
rename to test/fixtures/programmatic/function-active-mq/package.json
diff --git a/test/fixtures/programmatic/functionActivemq/serverless.yml b/test/fixtures/programmatic/function-active-mq/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/functionActivemq/serverless.yml
rename to test/fixtures/programmatic/function-active-mq/serverless.yml
diff --git a/test/integration/aws/infra-dependent/activemq.test.js b/test/integration/aws/infra-dependent/activemq.test.js
index 22e8568a2a7..6a2723f64f1 100644
--- a/test/integration/aws/infra-dependent/activemq.test.js
+++ b/test/integration/aws/infra-dependent/activemq.test.js
@@ -45,7 +45,7 @@ describe.skip('AWS - Active MQ Integration Test', function () {
       endpoint.startsWith('stomp')
     );
 
-    const serviceData = await fixtures.setup('functionActivemq', {
+    const serviceData = await fixtures.setup('function-active-mq', {
       configExt: {
         functions: {
           producer: {

From ce7cfc94d4e1ed91b4cd3cff03a369c825f0c56e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:36:47 +0100
Subject: [PATCH 0946/1101] test: Rename fixture
 `programmatic/functionCloudFront`

---
 .../{functionCloudFront => function-cloud-front}/index.js         | 0
 .../{functionCloudFront => function-cloud-front}/serverless.yml   | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename test/fixtures/programmatic/{functionCloudFront => function-cloud-front}/index.js (100%)
 rename test/fixtures/programmatic/{functionCloudFront => function-cloud-front}/serverless.yml (100%)

diff --git a/test/fixtures/programmatic/functionCloudFront/index.js b/test/fixtures/programmatic/function-cloud-front/index.js
similarity index 100%
rename from test/fixtures/programmatic/functionCloudFront/index.js
rename to test/fixtures/programmatic/function-cloud-front/index.js
diff --git a/test/fixtures/programmatic/functionCloudFront/serverless.yml b/test/fixtures/programmatic/function-cloud-front/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/functionCloudFront/serverless.yml
rename to test/fixtures/programmatic/function-cloud-front/serverless.yml

From 87c95458a424ae969945e8b9a72bead84d28838e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:37:24 +0100
Subject: [PATCH 0947/1101] test: Rename fixture `programmatic/functionEfs`

---
 .../fixtures/programmatic/{functionEfs => function-efs}/core.js | 0
 .../programmatic/{functionEfs => function-efs}/serverless.yml   | 0
 test/integration/aws/infra-dependent/fileSystemConfig.test.js   | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename test/fixtures/programmatic/{functionEfs => function-efs}/core.js (100%)
 rename test/fixtures/programmatic/{functionEfs => function-efs}/serverless.yml (100%)

diff --git a/test/fixtures/programmatic/functionEfs/core.js b/test/fixtures/programmatic/function-efs/core.js
similarity index 100%
rename from test/fixtures/programmatic/functionEfs/core.js
rename to test/fixtures/programmatic/function-efs/core.js
diff --git a/test/fixtures/programmatic/functionEfs/serverless.yml b/test/fixtures/programmatic/function-efs/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/functionEfs/serverless.yml
rename to test/fixtures/programmatic/function-efs/serverless.yml
diff --git a/test/integration/aws/infra-dependent/fileSystemConfig.test.js b/test/integration/aws/infra-dependent/fileSystemConfig.test.js
index 2d89c4bdee7..dc17dd82302 100644
--- a/test/integration/aws/infra-dependent/fileSystemConfig.test.js
+++ b/test/integration/aws/infra-dependent/fileSystemConfig.test.js
@@ -41,7 +41,7 @@ describe('AWS - FileSystemConfig Integration Test', function () {
       arn: outputMap.get('EFSAccessPointARN'),
     };
 
-    const serviceData = await fixtures.setup('functionEfs', {
+    const serviceData = await fixtures.setup('function-efs', {
       configExt: {
         provider: {
           vpc: {

From d9b2601650ae29c1ffa294d22bf3d62a6f533526 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:37:50 +0100
Subject: [PATCH 0948/1101] test: Rename fixture `programmatic/functionLayers`

---
 .../extra-layers/test-layer-source-change}/index.js    |  0
 .../{functionLayers => function-layers}/index.js       |  0
 .../{functionLayers => function-layers}/serverless.yml |  8 ++++----
 .../testLayer => function-layers/test-layer}/index.js  |  0
 .../lib/plugins/aws/package/compile/functions.test.js  | 10 +++++-----
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename test/fixtures/programmatic/{functionLayers/extra_layers/testLayerSourceChange => function-layers/extra-layers/test-layer-source-change}/index.js (100%)
 rename test/fixtures/programmatic/{functionLayers => function-layers}/index.js (100%)
 rename test/fixtures/programmatic/{functionLayers => function-layers}/serverless.yml (90%)
 rename test/fixtures/programmatic/{functionLayers/testLayer => function-layers/test-layer}/index.js (100%)

diff --git a/test/fixtures/programmatic/functionLayers/extra_layers/testLayerSourceChange/index.js b/test/fixtures/programmatic/function-layers/extra-layers/test-layer-source-change/index.js
similarity index 100%
rename from test/fixtures/programmatic/functionLayers/extra_layers/testLayerSourceChange/index.js
rename to test/fixtures/programmatic/function-layers/extra-layers/test-layer-source-change/index.js
diff --git a/test/fixtures/programmatic/functionLayers/index.js b/test/fixtures/programmatic/function-layers/index.js
similarity index 100%
rename from test/fixtures/programmatic/functionLayers/index.js
rename to test/fixtures/programmatic/function-layers/index.js
diff --git a/test/fixtures/programmatic/functionLayers/serverless.yml b/test/fixtures/programmatic/function-layers/serverless.yml
similarity index 90%
rename from test/fixtures/programmatic/functionLayers/serverless.yml
rename to test/fixtures/programmatic/function-layers/serverless.yml
index 17cadeee56f..4bc10e2d2c5 100644
--- a/test/fixtures/programmatic/functionLayers/serverless.yml
+++ b/test/fixtures/programmatic/function-layers/serverless.yml
@@ -6,19 +6,19 @@ provider:
 layers:
   testLayer:
     name: default_test_layer
-    path: testLayer
+    path: test-layer
     description: 'test layer'
 
   TestLayerWithCapitals:
     name: capitalized_test_layer
-    path: testLayer
+    path: test-layer
 
   testLayerWithNoName:
-    path: testLayer
+    path: test-layer
 
 package:
   patterns:
-    - '!extra_layers/**'
+    - '!extra-layers/**'
 
 functions:
   layerFunc:
diff --git a/test/fixtures/programmatic/functionLayers/testLayer/index.js b/test/fixtures/programmatic/function-layers/test-layer/index.js
similarity index 100%
rename from test/fixtures/programmatic/functionLayers/testLayer/index.js
rename to test/fixtures/programmatic/function-layers/test-layer/index.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
index 0091ed88445..426d1340e25 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -2100,7 +2100,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
         };
 
         beforeEach(async () => {
-          const serviceData = await fixtures.setup('functionLayers', { configExt });
+          const serviceData = await fixtures.setup('function-layers', { configExt });
           ({ servicePath: serviceDir, updateConfig } = serviceData);
           const data = await runServerless({
             cwd: serviceDir,
@@ -2121,7 +2121,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
             firstCfTemplate.Outputs.LayerFuncLambdaFunctionQualifiedArn.Value.Ref;
 
           await updateConfig({
-            layers: { testLayer: { path: 'testLayer', description: 'Different description' } },
+            layers: { testLayer: { path: 'test-layer', description: 'Different description' } },
           });
 
           const data = await runServerless({
@@ -2244,9 +2244,9 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
           let backupLayer;
 
           beforeEach(async () => {
-            originalLayer = path.join(serviceDir, 'testLayer');
-            sourceChangeLayer = path.join(serviceDir, 'extra_layers', 'testLayerSourceChange');
-            backupLayer = path.join(serviceDir, 'extra_layers', 'testLayerBackup');
+            originalLayer = path.join(serviceDir, 'test-layer');
+            sourceChangeLayer = path.join(serviceDir, 'extra-layers', 'test-layer-source-change');
+            backupLayer = path.join(serviceDir, 'extra-layers', 'test-layer-backup');
 
             await fsp.rename(originalLayer, backupLayer);
             await fsp.rename(sourceChangeLayer, originalLayer);

From 97b6473b7808662537e87d6f68788354ee579d16 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:38:28 +0100
Subject: [PATCH 0949/1101] test: Rename fixture `programmatic/functionMsk`

---
 .../fixtures/programmatic/{functionMsk => function-msk}/core.js | 0
 .../programmatic/{functionMsk => function-msk}/package.json     | 0
 .../programmatic/{functionMsk => function-msk}/serverless.yml   | 0
 test/integration/aws/infra-dependent/msk.test.js                | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename test/fixtures/programmatic/{functionMsk => function-msk}/core.js (100%)
 rename test/fixtures/programmatic/{functionMsk => function-msk}/package.json (100%)
 rename test/fixtures/programmatic/{functionMsk => function-msk}/serverless.yml (100%)

diff --git a/test/fixtures/programmatic/functionMsk/core.js b/test/fixtures/programmatic/function-msk/core.js
similarity index 100%
rename from test/fixtures/programmatic/functionMsk/core.js
rename to test/fixtures/programmatic/function-msk/core.js
diff --git a/test/fixtures/programmatic/functionMsk/package.json b/test/fixtures/programmatic/function-msk/package.json
similarity index 100%
rename from test/fixtures/programmatic/functionMsk/package.json
rename to test/fixtures/programmatic/function-msk/package.json
diff --git a/test/fixtures/programmatic/functionMsk/serverless.yml b/test/fixtures/programmatic/function-msk/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/functionMsk/serverless.yml
rename to test/fixtures/programmatic/function-msk/serverless.yml
diff --git a/test/integration/aws/infra-dependent/msk.test.js b/test/integration/aws/infra-dependent/msk.test.js
index 3f31b8ef26d..8f2796c903a 100644
--- a/test/integration/aws/infra-dependent/msk.test.js
+++ b/test/integration/aws/infra-dependent/msk.test.js
@@ -35,7 +35,7 @@ describe('AWS - MSK Integration Test', function () {
     });
     const brokerUrls = getBootstrapBrokersResponse.BootstrapBrokerStringTls;
 
-    const serviceData = await fixtures.setup('functionMsk', {
+    const serviceData = await fixtures.setup('function-msk', {
       configExt: {
         functions: {
           producer: {

From 36911cfcb0b2377aa4143b64837fc71844fb9324 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:39:06 +0100
Subject: [PATCH 0950/1101] test: Rename fixture
 `programmatic/functionRabbitmq`

---
 .../{functionRabbitmq => function-rabbit-mq}/core.js            | 0
 .../{functionRabbitmq => function-rabbit-mq}/package.json       | 0
 .../{functionRabbitmq => function-rabbit-mq}/serverless.yml     | 0
 test/integration/aws/infra-dependent/rabbitmq.test.js           | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename test/fixtures/programmatic/{functionRabbitmq => function-rabbit-mq}/core.js (100%)
 rename test/fixtures/programmatic/{functionRabbitmq => function-rabbit-mq}/package.json (100%)
 rename test/fixtures/programmatic/{functionRabbitmq => function-rabbit-mq}/serverless.yml (100%)

diff --git a/test/fixtures/programmatic/functionRabbitmq/core.js b/test/fixtures/programmatic/function-rabbit-mq/core.js
similarity index 100%
rename from test/fixtures/programmatic/functionRabbitmq/core.js
rename to test/fixtures/programmatic/function-rabbit-mq/core.js
diff --git a/test/fixtures/programmatic/functionRabbitmq/package.json b/test/fixtures/programmatic/function-rabbit-mq/package.json
similarity index 100%
rename from test/fixtures/programmatic/functionRabbitmq/package.json
rename to test/fixtures/programmatic/function-rabbit-mq/package.json
diff --git a/test/fixtures/programmatic/functionRabbitmq/serverless.yml b/test/fixtures/programmatic/function-rabbit-mq/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/functionRabbitmq/serverless.yml
rename to test/fixtures/programmatic/function-rabbit-mq/serverless.yml
diff --git a/test/integration/aws/infra-dependent/rabbitmq.test.js b/test/integration/aws/infra-dependent/rabbitmq.test.js
index c482e1fd86d..af84cc2f1ef 100644
--- a/test/integration/aws/infra-dependent/rabbitmq.test.js
+++ b/test/integration/aws/infra-dependent/rabbitmq.test.js
@@ -45,7 +45,7 @@ describe.skip('AWS - RabbitMQ Integration Test', function () {
       endpoint.startsWith('amqp')
     );
 
-    const serviceData = await fixtures.setup('functionRabbitmq', {
+    const serviceData = await fixtures.setup('function-rabbit-mq', {
       configExt: {
         functions: {
           producer: {

From c8a6039d39d119eda522fbeb053d02f68e502733 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:41:10 +0100
Subject: [PATCH 0951/1101] test: Rename fixture `programmatic/httpApiCatchAll`

---
 .../{httpApiCatchAll => http-api-catch-all}/index.js            | 0
 .../{httpApiCatchAll => http-api-catch-all}/serverless.yml      | 0
 test/integration/aws/httpApi.test.js                            | 2 +-
 .../unit/lib/plugins/aws/package/compile/events/httpApi.test.js | 2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename test/fixtures/programmatic/{httpApiCatchAll => http-api-catch-all}/index.js (100%)
 rename test/fixtures/programmatic/{httpApiCatchAll => http-api-catch-all}/serverless.yml (100%)

diff --git a/test/fixtures/programmatic/httpApiCatchAll/index.js b/test/fixtures/programmatic/http-api-catch-all/index.js
similarity index 100%
rename from test/fixtures/programmatic/httpApiCatchAll/index.js
rename to test/fixtures/programmatic/http-api-catch-all/index.js
diff --git a/test/fixtures/programmatic/httpApiCatchAll/serverless.yml b/test/fixtures/programmatic/http-api-catch-all/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/httpApiCatchAll/serverless.yml
rename to test/fixtures/programmatic/http-api-catch-all/serverless.yml
diff --git a/test/integration/aws/httpApi.test.js b/test/integration/aws/httpApi.test.js
index f15eeaaee99..218b343aa01 100644
--- a/test/integration/aws/httpApi.test.js
+++ b/test/integration/aws/httpApi.test.js
@@ -246,7 +246,7 @@ describe('HTTP API Integration Test', function () {
 
   describe('Catch-all endpoints', () => {
     before(async () => {
-      const serviceData = await fixtures.setup('httpApiCatchAll');
+      const serviceData = await fixtures.setup('http-api-catch-all');
       ({ servicePath: serviceDir } = serviceData);
       const serviceName = serviceData.serviceConfig.service;
       stackName = `${serviceName}-${stage}`;
diff --git a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
index 2d6b6feeae1..5ec382947c0 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
@@ -380,7 +380,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       describe('With a catch-all route', () => {
         before(() =>
           runServerless({
-            fixture: 'httpApiCatchAll',
+            fixture: 'http-api-catch-all',
             configExt: {
               provider: {
                 httpApi: {

From 65dca4e2c4cb270b24617f6aed792a2e59050cc0 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:41:46 +0100
Subject: [PATCH 0952/1101] test: Rename fixture `programmatic/httpApiExport`

---
 .../{httpApiExport => http-api-export}/serverless.yml           | 0
 test/integration/aws/httpApi.test.js                            | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename test/fixtures/programmatic/{httpApiExport => http-api-export}/serverless.yml (100%)

diff --git a/test/fixtures/programmatic/httpApiExport/serverless.yml b/test/fixtures/programmatic/http-api-export/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/httpApiExport/serverless.yml
rename to test/fixtures/programmatic/http-api-export/serverless.yml
diff --git a/test/integration/aws/httpApi.test.js b/test/integration/aws/httpApi.test.js
index 218b343aa01..6bdee3ec24e 100644
--- a/test/integration/aws/httpApi.test.js
+++ b/test/integration/aws/httpApi.test.js
@@ -290,7 +290,7 @@ describe('HTTP API Integration Test', function () {
     let serviceName;
 
     before(async () => {
-      const exportServiceData = await fixtures.setup('httpApiExport');
+      const exportServiceData = await fixtures.setup('http-api-export');
       ({ servicePath: exportServicePath } = exportServiceData);
       const exportServiceName = exportServiceData.serviceConfig.service;
       await deployService(exportServicePath);

From 84626e385c5389b95bcb6e69c338f7d8cf6e3a26 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:42:59 +0100
Subject: [PATCH 0953/1101] test: Rename fixture `programmatic/httpApi`

---
 .../{httpApi => http-api}/authorizers.js      |  0
 .../{httpApi => http-api}/index.js            |  0
 .../{httpApi => http-api}/serverless.yml      |  0
 test/integration/aws/httpApi.test.js          |  4 +-
 test/unit/commands/doctor.test.js             |  2 +-
 .../package/compile/events/httpApi.test.js    | 44 +++++++++----------
 .../utils/telemetry/generatePayload.test.js   |  6 +--
 7 files changed, 28 insertions(+), 28 deletions(-)
 rename test/fixtures/programmatic/{httpApi => http-api}/authorizers.js (100%)
 rename test/fixtures/programmatic/{httpApi => http-api}/index.js (100%)
 rename test/fixtures/programmatic/{httpApi => http-api}/serverless.yml (100%)

diff --git a/test/fixtures/programmatic/httpApi/authorizers.js b/test/fixtures/programmatic/http-api/authorizers.js
similarity index 100%
rename from test/fixtures/programmatic/httpApi/authorizers.js
rename to test/fixtures/programmatic/http-api/authorizers.js
diff --git a/test/fixtures/programmatic/httpApi/index.js b/test/fixtures/programmatic/http-api/index.js
similarity index 100%
rename from test/fixtures/programmatic/httpApi/index.js
rename to test/fixtures/programmatic/http-api/index.js
diff --git a/test/fixtures/programmatic/httpApi/serverless.yml b/test/fixtures/programmatic/http-api/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/httpApi/serverless.yml
rename to test/fixtures/programmatic/http-api/serverless.yml
diff --git a/test/integration/aws/httpApi.test.js b/test/integration/aws/httpApi.test.js
index 6bdee3ec24e..7279ce9ff80 100644
--- a/test/integration/aws/httpApi.test.js
+++ b/test/integration/aws/httpApi.test.js
@@ -55,7 +55,7 @@ describe('HTTP API Integration Test', function () {
         ),
       ]);
 
-      const serviceData = await fixtures.setup('httpApi', {
+      const serviceData = await fixtures.setup('http-api', {
         configExt: {
           provider: {
             httpApi: {
@@ -301,7 +301,7 @@ describe('HTTP API Integration Test', function () {
       ).Stacks[0].Outputs[0].OutputValue;
       endpoint = (await awsRequest('ApiGatewayV2', 'getApi', { ApiId: httpApiId })).ApiEndpoint;
 
-      const serviceData = await fixtures.setup('httpApi', {
+      const serviceData = await fixtures.setup('http-api', {
         configExt: {
           provider: { httpApi: { id: httpApiId } },
         },
diff --git a/test/unit/commands/doctor.test.js b/test/unit/commands/doctor.test.js
index bc31d017989..d9f4958a1d9 100644
--- a/test/unit/commands/doctor.test.js
+++ b/test/unit/commands/doctor.test.js
@@ -16,7 +16,7 @@ describe('test/unit/commands/doctor.test.js', async () => {
   });
 
   it('should print health status after command which triggered deprecation', async () => {
-    const { servicePath: serviceDir } = await fixturesEngine.setup('httpApi', {
+    const { servicePath: serviceDir } = await fixturesEngine.setup('http-api', {
       configExt: {
         provider: {
           httpApi: {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
index 5ec382947c0..7216143ebde 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
@@ -27,7 +27,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
 
     before(() =>
       runServerless({
-        fixture: 'httpApi',
+        fixture: 'http-api',
         command: 'package',
         configExt: {
           functions: {
@@ -185,7 +185,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
 
     before(() =>
       runServerless({
-        fixture: 'httpApi',
+        fixture: 'http-api',
         configExt: {
           provider: {
             httpApi: {
@@ -307,7 +307,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       describe('Object configuration #1', () => {
         before(() =>
           runServerless({
-            fixture: 'httpApi',
+            fixture: 'http-api',
             configExt: {
               provider: {
                 httpApi: {
@@ -347,7 +347,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       describe('Object configuration #2', () => {
         before(() =>
           runServerless({
-            fixture: 'httpApi',
+            fixture: 'http-api',
             configExt: {
               provider: {
                 httpApi: {
@@ -408,7 +408,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
 
     before(async () => {
       const { awsNaming, cfTemplate } = await runServerless({
-        fixture: 'httpApi',
+        fixture: 'http-api',
         configExt: {
           provider: {
             httpApi: {
@@ -589,7 +589,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
 
     it('should correctly set `DependsOn` property on permission resource for functions with provisioned concurrency', async () => {
       const { awsNaming, cfTemplate } = await runServerless({
-        fixture: 'httpApi',
+        fixture: 'http-api',
         configExt: {
           provider: {
             httpApi: {
@@ -666,7 +666,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
     it('should throw when request authorizer does not have "functionName" and "functionArn" defined', async () => {
       await expect(
         runServerless({
-          fixture: 'httpApi',
+          fixture: 'http-api',
           configExt: {
             provider: {
               httpApi: {
@@ -702,7 +702,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
     it('should throw when request authorizer have both "functionName" and "functionArn" defined', async () => {
       await expect(
         runServerless({
-          fixture: 'httpApi',
+          fixture: 'http-api',
           configExt: {
             provider: {
               httpApi: {
@@ -740,7 +740,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
     it('should throw when request authorizer have both references "functionName" not defined in service', async () => {
       await expect(
         runServerless({
-          fixture: 'httpApi',
+          fixture: 'http-api',
           configExt: {
             provider: {
               httpApi: {
@@ -777,7 +777,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
     it('should throw when request authorizer has caching enabled but does not have "identitySource" defined', async () => {
       await expect(
         runServerless({
-          fixture: 'httpApi',
+          fixture: 'http-api',
           configExt: {
             provider: {
               httpApi: {
@@ -815,7 +815,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
     it('should throw when authorizer with `request` type does not have name or id configured', async () => {
       await expect(
         runServerless({
-          fixture: 'httpApi',
+          fixture: 'http-api',
           configExt: {
             functions: {
               foo: {
@@ -845,7 +845,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
     let naming;
     before(() =>
       runServerless({
-        fixture: 'httpApi',
+        fixture: 'http-api',
         configExt: {
           provider: {
             httpApi: {
@@ -907,7 +907,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
     it('should throw when authorizer with `jwt` type does not have name or id configured', async () => {
       await expect(
         runServerless({
-          fixture: 'httpApi',
+          fixture: 'http-api',
           configExt: {
             functions: {
               foo: {
@@ -935,7 +935,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
   describe('Authorizers: AWS_IAM', () => {
     it('should setup correct properties on an endpoint', async () => {
       const { awsNaming, cfTemplate } = await runServerless({
-        fixture: 'httpApi',
+        fixture: 'http-api',
         configExt: {
           functions: {
             foo: {
@@ -962,7 +962,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
     it('should throw when authorizer with `aws_iam` type receives additional properties', async () => {
       await expect(
         runServerless({
-          fixture: 'httpApi',
+          fixture: 'http-api',
           configExt: {
             functions: {
               foo: {
@@ -995,7 +995,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       let naming;
       before(async () => {
         const { awsNaming, cfTemplate } = await runServerless({
-          fixture: 'httpApi',
+          fixture: 'http-api',
           configExt: {
             provider: { httpApi: { id: apiId } },
             functions: {
@@ -1052,7 +1052,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       it('should not allow external authorizer without external httpApi', () => {
         return expect(
           runServerless({
-            fixture: 'httpApi',
+            fixture: 'http-api',
             configExt: {
               functions: {
                 foo: {
@@ -1088,7 +1088,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
     describe('correct configuration', () => {
       before(() =>
         runServerless({
-          fixture: 'httpApi',
+          fixture: 'http-api',
           configExt: { provider: { httpApi: { id: apiId } } },
           command: 'package',
         }).then(({ awsNaming, cfTemplate }) => {
@@ -1130,7 +1130,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       it('should not allow defined cors rules', () => {
         return expect(
           runServerless({
-            fixture: 'httpApi',
+            fixture: 'http-api',
             configExt: {
               provider: {
                 httpApi: {
@@ -1146,7 +1146,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       it('should not allow defined authorizers', () => {
         return expect(
           runServerless({
-            fixture: 'httpApi',
+            fixture: 'http-api',
             configExt: {
               provider: {
                 httpApi: {
@@ -1171,7 +1171,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       it('should not allow defined logs', () => {
         return expect(
           runServerless({
-            fixture: 'httpApi',
+            fixture: 'http-api',
             configExt: {
               provider: {
                 httpApi: {
@@ -1192,7 +1192,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
   it('should trigger a deprecation when `provider.httpApi.useProviderTags` is set', async () => {
     await expect(
       runServerless({
-        fixture: 'httpApi',
+        fixture: 'http-api',
         configExt: {
           provider: {
             httpApi: {
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
index 5a38740e0b6..2f4c2300c0c 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generatePayload.test.js
@@ -43,7 +43,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
   });
 
   it('Should resolve payload for AWS service', async () => {
-    const { servicePath: serviceDir } = await fixtures.setup('httpApi', {
+    const { servicePath: serviceDir } = await fixtures.setup('http-api', {
       configExt: {
         provider: {
           runtime: 'nodejs14.x',
@@ -595,7 +595,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
 
   it('Should correctly resolve projectId property', async () => {
     const { serverless } = await runServerless({
-      fixture: 'httpApi',
+      fixture: 'http-api',
       command: 'print',
       configExt: {
         service: 'to-ensure-unique-serivce-name',
@@ -616,7 +616,7 @@ describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
 
   it('Should correctly resolve `didCreateService` property', async () => {
     const { serverless } = await runServerless({
-      fixture: 'httpApi',
+      fixture: 'http-api',
       command: 'print',
       configExt: {
         service: 'to-ensure-unique-serivce-name',

From 04869f1d6fddc1b56b9c4038210e18095e5e39ff Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:44:30 +0100
Subject: [PATCH 0954/1101] test: Rename fixture
 `programmatic/iotFleetProvisioning`

---
 .../hook.js                                               | 0
 .../package.json                                          | 0
 .../register-device.js}                                   | 0
 .../serverless.yml                                        | 8 ++++----
 .../template.json                                         | 0
 test/integration/aws/iotFleetProvisioning.test.js         | 2 +-
 .../compile/events/iotFleetProvisioning/index.test.js     | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename test/fixtures/programmatic/{iotFleetProvisioning => iot-fleet-provisioning}/hook.js (100%)
 rename test/fixtures/programmatic/{iotFleetProvisioning => iot-fleet-provisioning}/package.json (100%)
 rename test/fixtures/programmatic/{iotFleetProvisioning/registerDevice.js => iot-fleet-provisioning/register-device.js} (100%)
 rename test/fixtures/programmatic/{iotFleetProvisioning => iot-fleet-provisioning}/serverless.yml (88%)
 rename test/fixtures/programmatic/{iotFleetProvisioning => iot-fleet-provisioning}/template.json (100%)

diff --git a/test/fixtures/programmatic/iotFleetProvisioning/hook.js b/test/fixtures/programmatic/iot-fleet-provisioning/hook.js
similarity index 100%
rename from test/fixtures/programmatic/iotFleetProvisioning/hook.js
rename to test/fixtures/programmatic/iot-fleet-provisioning/hook.js
diff --git a/test/fixtures/programmatic/iotFleetProvisioning/package.json b/test/fixtures/programmatic/iot-fleet-provisioning/package.json
similarity index 100%
rename from test/fixtures/programmatic/iotFleetProvisioning/package.json
rename to test/fixtures/programmatic/iot-fleet-provisioning/package.json
diff --git a/test/fixtures/programmatic/iotFleetProvisioning/registerDevice.js b/test/fixtures/programmatic/iot-fleet-provisioning/register-device.js
similarity index 100%
rename from test/fixtures/programmatic/iotFleetProvisioning/registerDevice.js
rename to test/fixtures/programmatic/iot-fleet-provisioning/register-device.js
diff --git a/test/fixtures/programmatic/iotFleetProvisioning/serverless.yml b/test/fixtures/programmatic/iot-fleet-provisioning/serverless.yml
similarity index 88%
rename from test/fixtures/programmatic/iotFleetProvisioning/serverless.yml
rename to test/fixtures/programmatic/iot-fleet-provisioning/serverless.yml
index 13579392b0a..2344917715c 100644
--- a/test/fixtures/programmatic/iotFleetProvisioning/serverless.yml
+++ b/test/fixtures/programmatic/iot-fleet-provisioning/serverless.yml
@@ -10,12 +10,12 @@ provider:
 
 functions:
   registerDevice:
-    handler: registerDevice.main
+    handler: register-device.main
     timeout: 30
     environment:
       TEMPLATE_NAME:
-        Ref: IotFleetProvisioningBasicIotProvisioningTemplate
-  iotFleetProvisioningBasic:
+        Ref: BasicIotProvisioningTemplate
+  basic:
     handler: hook.main
     events:
       - iotFleetProvisioning:
@@ -53,7 +53,7 @@ resources:
   Outputs:
     ProvisioningTemplateName:
       Value:
-        Ref: IotFleetProvisioningBasicIotProvisioningTemplate
+        Ref: BasicIotProvisioningTemplate
     IoTPolicyName:
       Value:
         Ref: IoTPolicy
diff --git a/test/fixtures/programmatic/iotFleetProvisioning/template.json b/test/fixtures/programmatic/iot-fleet-provisioning/template.json
similarity index 100%
rename from test/fixtures/programmatic/iotFleetProvisioning/template.json
rename to test/fixtures/programmatic/iot-fleet-provisioning/template.json
diff --git a/test/integration/aws/iotFleetProvisioning.test.js b/test/integration/aws/iotFleetProvisioning.test.js
index 437274f4b21..333927a355c 100644
--- a/test/integration/aws/iotFleetProvisioning.test.js
+++ b/test/integration/aws/iotFleetProvisioning.test.js
@@ -30,7 +30,7 @@ describe('test/integration/aws/iotFleetProvisioning.test.js', function () {
 
   before(async () => {
     let serviceConfig;
-    ({ serviceConfig, servicePath: serviceDir } = await fixtures.setup('iotFleetProvisioning'));
+    ({ serviceConfig, servicePath: serviceDir } = await fixtures.setup('iot-fleet-provisioning'));
     const serviceName = serviceConfig.service;
     stackName = `${serviceName}-${stage}`;
     await deployService(serviceDir);
diff --git a/test/unit/lib/plugins/aws/package/compile/events/iotFleetProvisioning/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/iotFleetProvisioning/index.test.js
index f81d67876b0..a5e29337fc8 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/iotFleetProvisioning/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/iotFleetProvisioning/index.test.js
@@ -2,7 +2,7 @@
 
 const chai = require('chai');
 const runServerless = require('../../../../../../../../utils/run-serverless');
-const templateBody = require('../../../../../../../../fixtures/programmatic/iotFleetProvisioning/template.json');
+const templateBody = require('../../../../../../../../fixtures/programmatic/iot-fleet-provisioning/template.json');
 
 chai.use(require('chai-as-promised'));
 

From 012011c4606c98ee6cf71b66ac78e47bebd7841d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:45:13 +0100
Subject: [PATCH 0955/1101] test: Rename fixture
 `programmatic/locallyInstalledServerless`

---
 .../_setup.js                                                   | 0
 .../node_modules/serverless/bin/serverless.js                   | 0
 .../node_modules/serverless/lib/Serverless.js                   | 0
 .../node_modules/serverless/package.json                        | 0
 .../serverless.yml                                              | 0
 test/unit/scripts/serverless.test.js                            | 2 +-
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename test/fixtures/programmatic/{locallyInstalledServerless => locally-installed-serverless}/_setup.js (100%)
 rename test/fixtures/programmatic/{locallyInstalledServerless => locally-installed-serverless}/node_modules/serverless/bin/serverless.js (100%)
 rename test/fixtures/programmatic/{locallyInstalledServerless => locally-installed-serverless}/node_modules/serverless/lib/Serverless.js (100%)
 rename test/fixtures/programmatic/{locallyInstalledServerless => locally-installed-serverless}/node_modules/serverless/package.json (100%)
 rename test/fixtures/programmatic/{locallyInstalledServerless => locally-installed-serverless}/serverless.yml (100%)

diff --git a/test/fixtures/programmatic/locallyInstalledServerless/_setup.js b/test/fixtures/programmatic/locally-installed-serverless/_setup.js
similarity index 100%
rename from test/fixtures/programmatic/locallyInstalledServerless/_setup.js
rename to test/fixtures/programmatic/locally-installed-serverless/_setup.js
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/bin/serverless.js b/test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/bin/serverless.js
similarity index 100%
rename from test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/bin/serverless.js
rename to test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/bin/serverless.js
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/Serverless.js b/test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/lib/Serverless.js
similarity index 100%
rename from test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/Serverless.js
rename to test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/lib/Serverless.js
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/package.json b/test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/package.json
similarity index 100%
rename from test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/package.json
rename to test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/package.json
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/serverless.yml b/test/fixtures/programmatic/locally-installed-serverless/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/locallyInstalledServerless/serverless.yml
rename to test/fixtures/programmatic/locally-installed-serverless/serverless.yml
diff --git a/test/unit/scripts/serverless.test.js b/test/unit/scripts/serverless.test.js
index 70813905a2c..2c21695417e 100644
--- a/test/unit/scripts/serverless.test.js
+++ b/test/unit/scripts/serverless.test.js
@@ -71,7 +71,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
     const output = String(
       (
         await spawn('node', [serverlessBinPath, '--help'], {
-          cwd: (await programmaticFixturesEngine.setup('locallyInstalledServerless')).servicePath,
+          cwd: (await programmaticFixturesEngine.setup('locally-installed-serverless')).servicePath,
         })
       ).stderrBuffer
     );

From 3bf0c8169ac8b078346264591282fcd2e7d1005d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:45:51 +0100
Subject: [PATCH 0956/1101] test: Rename fixture `programmatic/multiService`

---
 .../programmatic/{multiService => multi-service}/file.json      | 0
 .../{multiService/serviceA => multi-service/service-a}/index.js | 0
 .../serviceA => multi-service/service-a}/serverless.yml         | 0
 test/unit/scripts/serverless.test.js                            | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename test/fixtures/programmatic/{multiService => multi-service}/file.json (100%)
 rename test/fixtures/programmatic/{multiService/serviceA => multi-service/service-a}/index.js (100%)
 rename test/fixtures/programmatic/{multiService/serviceA => multi-service/service-a}/serverless.yml (100%)

diff --git a/test/fixtures/programmatic/multiService/file.json b/test/fixtures/programmatic/multi-service/file.json
similarity index 100%
rename from test/fixtures/programmatic/multiService/file.json
rename to test/fixtures/programmatic/multi-service/file.json
diff --git a/test/fixtures/programmatic/multiService/serviceA/index.js b/test/fixtures/programmatic/multi-service/service-a/index.js
similarity index 100%
rename from test/fixtures/programmatic/multiService/serviceA/index.js
rename to test/fixtures/programmatic/multi-service/service-a/index.js
diff --git a/test/fixtures/programmatic/multiService/serviceA/serverless.yml b/test/fixtures/programmatic/multi-service/service-a/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/multiService/serviceA/serverless.yml
rename to test/fixtures/programmatic/multi-service/service-a/serverless.yml
diff --git a/test/unit/scripts/serverless.test.js b/test/unit/scripts/serverless.test.js
index 2c21695417e..956db6cbd3e 100644
--- a/test/unit/scripts/serverless.test.js
+++ b/test/unit/scripts/serverless.test.js
@@ -106,7 +106,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
       String(
         (
           await spawn('node', [serverlessPath, 'print'], {
-            cwd: path.resolve(programmaticFixturesPath, 'multiService/serviceA'),
+            cwd: path.resolve(programmaticFixturesPath, 'multi-service/service-a'),
           })
         ).stdoutBuffer
       )

From 43d3207ad330a9f3a671b31cc95c819b4bd04432 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:46:57 +0100
Subject: [PATCH 0957/1101] test: Rename fixture
 `programmatic/packageArtifactInServerlessDir`

---
 .../my-own.zip                                      | Bin
 .../package-artifact-plugin.js                      |   0
 .../serverless.yml                                  |   0
 test/unit/lib/plugins/aws/deploy/index.test.js      |   2 +-
 .../plugins/aws/deploy/lib/checkForChanges.test.js  |   2 +-
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename test/fixtures/programmatic/{packageArtifactInServerlessDir => package-artifact-in-serverless-dir}/my-own.zip (100%)
 rename test/fixtures/programmatic/{packageArtifactInServerlessDir => package-artifact-in-serverless-dir}/package-artifact-plugin.js (100%)
 rename test/fixtures/programmatic/{packageArtifactInServerlessDir => package-artifact-in-serverless-dir}/serverless.yml (100%)

diff --git a/test/fixtures/programmatic/packageArtifactInServerlessDir/my-own.zip b/test/fixtures/programmatic/package-artifact-in-serverless-dir/my-own.zip
similarity index 100%
rename from test/fixtures/programmatic/packageArtifactInServerlessDir/my-own.zip
rename to test/fixtures/programmatic/package-artifact-in-serverless-dir/my-own.zip
diff --git a/test/fixtures/programmatic/packageArtifactInServerlessDir/package-artifact-plugin.js b/test/fixtures/programmatic/package-artifact-in-serverless-dir/package-artifact-plugin.js
similarity index 100%
rename from test/fixtures/programmatic/packageArtifactInServerlessDir/package-artifact-plugin.js
rename to test/fixtures/programmatic/package-artifact-in-serverless-dir/package-artifact-plugin.js
diff --git a/test/fixtures/programmatic/packageArtifactInServerlessDir/serverless.yml b/test/fixtures/programmatic/package-artifact-in-serverless-dir/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/packageArtifactInServerlessDir/serverless.yml
rename to test/fixtures/programmatic/package-artifact-in-serverless-dir/serverless.yml
diff --git a/test/unit/lib/plugins/aws/deploy/index.test.js b/test/unit/lib/plugins/aws/deploy/index.test.js
index 646761c1f90..2dfd4c3f02a 100644
--- a/test/unit/lib/plugins/aws/deploy/index.test.js
+++ b/test/unit/lib/plugins/aws/deploy/index.test.js
@@ -466,7 +466,7 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
     };
 
     const { serverless } = await runServerless({
-      fixture: 'packageArtifactInServerlessDir',
+      fixture: 'package-artifact-in-serverless-dir',
       command: 'deploy',
       awsRequestStubMap,
       configExt: {
diff --git a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
index a58ecdee6a7..f1be7e08b05 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
@@ -1001,7 +1001,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
     // TODO: Reconfigure to rely on generateMatchingListObjectsResponse and generateMatchingHeadObjectResponse utils
 
     const { serverless } = await runServerless({
-      fixture: 'packageArtifactInServerlessDir',
+      fixture: 'package-artifact-in-serverless-dir',
       command: 'deploy',
       configExt: {
         // runServerless by default makes this: `test-${fixtureName}-${TIME_BASED_HASH}`

From dcd6bea1b67d780e712c4aa88538a94d48a265fc Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:48:18 +0100
Subject: [PATCH 0958/1101] test: Rename fixture `programmatic/packageArtifact`

---
 .../absolute-artifact.zip}                    | Bin
 .../artifact-function.zip                     | Bin
 .../artifact.zip                              | Bin
 .../index.js                                  |   0
 .../serverless.yml                            |   0
 .../aws/deploy/lib/checkForChanges.test.js    |   2 +-
 .../aws/package/compile/functions.test.js     |   4 ++--
 .../package/lib/packageService.test.js        |  20 +++++++++---------
 8 files changed, 13 insertions(+), 13 deletions(-)
 rename test/fixtures/programmatic/{packageArtifact/absoluteArtifact.zip => package-artifact/absolute-artifact.zip} (100%)
 rename test/fixtures/programmatic/{packageArtifact => package-artifact}/artifact-function.zip (100%)
 rename test/fixtures/programmatic/{packageArtifact => package-artifact}/artifact.zip (100%)
 rename test/fixtures/programmatic/{packageArtifact => package-artifact}/index.js (100%)
 rename test/fixtures/programmatic/{packageArtifact => package-artifact}/serverless.yml (100%)

diff --git a/test/fixtures/programmatic/packageArtifact/absoluteArtifact.zip b/test/fixtures/programmatic/package-artifact/absolute-artifact.zip
similarity index 100%
rename from test/fixtures/programmatic/packageArtifact/absoluteArtifact.zip
rename to test/fixtures/programmatic/package-artifact/absolute-artifact.zip
diff --git a/test/fixtures/programmatic/packageArtifact/artifact-function.zip b/test/fixtures/programmatic/package-artifact/artifact-function.zip
similarity index 100%
rename from test/fixtures/programmatic/packageArtifact/artifact-function.zip
rename to test/fixtures/programmatic/package-artifact/artifact-function.zip
diff --git a/test/fixtures/programmatic/packageArtifact/artifact.zip b/test/fixtures/programmatic/package-artifact/artifact.zip
similarity index 100%
rename from test/fixtures/programmatic/packageArtifact/artifact.zip
rename to test/fixtures/programmatic/package-artifact/artifact.zip
diff --git a/test/fixtures/programmatic/packageArtifact/index.js b/test/fixtures/programmatic/package-artifact/index.js
similarity index 100%
rename from test/fixtures/programmatic/packageArtifact/index.js
rename to test/fixtures/programmatic/package-artifact/index.js
diff --git a/test/fixtures/programmatic/packageArtifact/serverless.yml b/test/fixtures/programmatic/package-artifact/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/packageArtifact/serverless.yml
rename to test/fixtures/programmatic/package-artifact/serverless.yml
diff --git a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
index f1be7e08b05..fa6bcec3fc4 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
@@ -564,7 +564,7 @@ describe('checkForChanges', () => {
 describe('checkForChanges #2', () => {
   it('Should recognize package.artifact', () =>
     runServerless({
-      fixture: 'packageArtifact',
+      fixture: 'package-artifact',
       command: 'deploy',
       env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
       lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index 426d1340e25..91de383bb04 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -1093,7 +1093,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       const imageSha = '6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38';
       const imageWithSha = `000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:${imageSha}`;
       const { awsNaming, cfTemplate, fixtureData } = await runServerless({
-        fixture: 'packageArtifact',
+        fixture: 'package-artifact',
         command: 'package',
         configExt: {
           provider: {
@@ -2322,7 +2322,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
   describe.skip('TODO: Download package artifact from S3 bucket', () => {
     before(async () => {
       await runServerless({
-        fixture: 'packageArtifact',
+        fixture: 'package-artifact',
         command: 'deploy',
         configExt: {
           package: { artifact: 'some s3 url' },
diff --git a/test/unit/lib/plugins/package/lib/packageService.test.js b/test/unit/lib/plugins/package/lib/packageService.test.js
index 0a2548e4a14..968dc968b26 100644
--- a/test/unit/lib/plugins/package/lib/packageService.test.js
+++ b/test/unit/lib/plugins/package/lib/packageService.test.js
@@ -307,8 +307,8 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
       });
 
       it('for function', async () => {
-        const { servicePath: serviceDir, updateConfig } = await fixtures.setup('packageArtifact');
-        const absoluteArtifactFilePath = path.join(serviceDir, 'absoluteArtifact.zip');
+        const { servicePath: serviceDir, updateConfig } = await fixtures.setup('package-artifact');
+        const absoluteArtifactFilePath = path.join(serviceDir, 'absolute-artifact.zip');
 
         await updateConfig({
           functions: {
@@ -328,14 +328,14 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
         });
 
         const callArgs = s3UploadStub.args.find((item) =>
-          item[0].Key.endsWith('absoluteArtifact.zip')
+          item[0].Key.endsWith('absolute-artifact.zip')
         );
         expect(callArgs[0].Body.path).to.equal(absoluteArtifactFilePath);
       });
 
       it('service-wide', async () => {
-        const { servicePath: serviceDir, updateConfig } = await fixtures.setup('packageArtifact');
-        const absoluteArtifactFilePath = path.join(serviceDir, 'absoluteArtifact.zip');
+        const { servicePath: serviceDir, updateConfig } = await fixtures.setup('package-artifact');
+        const absoluteArtifactFilePath = path.join(serviceDir, 'absolute-artifact.zip');
 
         await updateConfig({
           package: {
@@ -350,7 +350,7 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
         });
 
         const callArgs = s3UploadStub.args.find((item) =>
-          item[0].Key.endsWith('absoluteArtifact.zip')
+          item[0].Key.endsWith('absolute-artifact.zip')
         );
         expect(callArgs[0].Body.path).to.equal(absoluteArtifactFilePath);
       });
@@ -377,8 +377,8 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
       });
 
       it('for function', async () => {
-        const { servicePath: serviceDir, updateConfig } = await fixtures.setup('packageArtifact');
-        const absoluteArtifactFilePath = path.join(serviceDir, 'absoluteArtifact.zip');
+        const { servicePath: serviceDir, updateConfig } = await fixtures.setup('package-artifact');
+        const absoluteArtifactFilePath = path.join(serviceDir, 'absolute-artifact.zip');
         const zipContent = await fsp.readFile(absoluteArtifactFilePath);
 
         await updateConfig({
@@ -401,8 +401,8 @@ describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
       });
 
       it('service-wide', async () => {
-        const { servicePath: serviceDir, updateConfig } = await fixtures.setup('packageArtifact');
-        const absoluteArtifactFilePath = path.join(serviceDir, 'absoluteArtifact.zip');
+        const { servicePath: serviceDir, updateConfig } = await fixtures.setup('package-artifact');
+        const absoluteArtifactFilePath = path.join(serviceDir, 'absolute-artifact.zip');
         const zipContent = await fsp.readFile(absoluteArtifactFilePath);
 
         await updateConfig({

From 62c0d98a4e1d06e7401a6db7687e863997270004 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:52:12 +0100
Subject: [PATCH 0959/1101] test: Rename fixture
 `programmatic/provisionedConcurrency`

---
 .../{provisionedConcurrency => provisioned-concurrency}/core.js | 0
 .../serverless.yml                                              | 0
 test/integration/aws/provisionedConcurrency.test.js             | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename test/fixtures/programmatic/{provisionedConcurrency => provisioned-concurrency}/core.js (100%)
 rename test/fixtures/programmatic/{provisionedConcurrency => provisioned-concurrency}/serverless.yml (100%)

diff --git a/test/fixtures/programmatic/provisionedConcurrency/core.js b/test/fixtures/programmatic/provisioned-concurrency/core.js
similarity index 100%
rename from test/fixtures/programmatic/provisionedConcurrency/core.js
rename to test/fixtures/programmatic/provisioned-concurrency/core.js
diff --git a/test/fixtures/programmatic/provisionedConcurrency/serverless.yml b/test/fixtures/programmatic/provisioned-concurrency/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/provisionedConcurrency/serverless.yml
rename to test/fixtures/programmatic/provisioned-concurrency/serverless.yml
diff --git a/test/integration/aws/provisionedConcurrency.test.js b/test/integration/aws/provisionedConcurrency.test.js
index 7fdb1624799..c5d35f3857a 100644
--- a/test/integration/aws/provisionedConcurrency.test.js
+++ b/test/integration/aws/provisionedConcurrency.test.js
@@ -22,7 +22,7 @@ describe('AWS - Provisioned Concurrency Integration Test', function () {
   const stage = 'dev';
 
   before(async () => {
-    const serviceData = await fixtures.setup('provisionedConcurrency');
+    const serviceData = await fixtures.setup('provisioned-concurrency');
     ({ servicePath: serviceDir } = serviceData);
     const serviceName = serviceData.serviceConfig.service;
 

From 284b7af73f4cd05aae3234fd93bfccd80db6baa8 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 17:52:52 +0100
Subject: [PATCH 0960/1101] test: Rename fixture
 `programmatic/requestParameters`

---
 .../{requestParameters => request-parameters}/serverless.yml    | 0
 .../{requestParameters => request-parameters}/target.js         | 0
 .../compile/events/apiGateway/lib/requestValidator.test.js      | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename test/fixtures/programmatic/{requestParameters => request-parameters}/serverless.yml (100%)
 rename test/fixtures/programmatic/{requestParameters => request-parameters}/target.js (100%)

diff --git a/test/fixtures/programmatic/requestParameters/serverless.yml b/test/fixtures/programmatic/request-parameters/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/requestParameters/serverless.yml
rename to test/fixtures/programmatic/request-parameters/serverless.yml
diff --git a/test/fixtures/programmatic/requestParameters/target.js b/test/fixtures/programmatic/request-parameters/target.js
similarity index 100%
rename from test/fixtures/programmatic/requestParameters/target.js
rename to test/fixtures/programmatic/request-parameters/target.js
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
index 6a0b8e2fe03..133a50a6464 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
@@ -305,7 +305,7 @@ describe('#compileRequestValidators() - parameters', () => {
 
   before(async () => {
     const { cfTemplate, awsNaming } = await runServerless({
-      fixture: 'requestParameters',
+      fixture: 'request-parameters',
       command: 'package',
     });
     cfResources = cfTemplate.Resources;

From 089f4afba8674a8b8735c1b5942e1d37c1b4b2a6 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 18:07:20 +0100
Subject: [PATCH 0961/1101] test: Rename fixture `programmatic/requestSchema`

---
 .../dummy-schema.json}                               |  0
 .../{requestSchema => request-schema}/serverless.yml | 12 ++++++------
 .../{requestSchema => request-schema}/target.js      |  0
 .../events/apiGateway/lib/requestValidator.test.js   |  2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename test/fixtures/programmatic/{requestSchema/dummySchema.json => request-schema/dummy-schema.json} (100%)
 rename test/fixtures/programmatic/{requestSchema => request-schema}/serverless.yml (78%)
 rename test/fixtures/programmatic/{requestSchema => request-schema}/target.js (100%)

diff --git a/test/fixtures/programmatic/requestSchema/dummySchema.json b/test/fixtures/programmatic/request-schema/dummy-schema.json
similarity index 100%
rename from test/fixtures/programmatic/requestSchema/dummySchema.json
rename to test/fixtures/programmatic/request-schema/dummy-schema.json
diff --git a/test/fixtures/programmatic/requestSchema/serverless.yml b/test/fixtures/programmatic/request-schema/serverless.yml
similarity index 78%
rename from test/fixtures/programmatic/requestSchema/serverless.yml
rename to test/fixtures/programmatic/request-schema/serverless.yml
index b405608da1c..50858274661 100644
--- a/test/fixtures/programmatic/requestSchema/serverless.yml
+++ b/test/fixtures/programmatic/request-schema/serverless.yml
@@ -9,13 +9,13 @@ provider:
         test-model:
           name: 'TestModel'
           description: 'Test Description'
-          schema: '${file(dummySchema.json)}'
+          schema: '${file(dummy-schema.json)}'
         test-model-simple:
-          schema: '${file(dummySchema.json)}'
+          schema: '${file(dummy-schema.json)}'
         unused-model:
           name: 'UnusedModel'
           description: 'I should not be created'
-          schema: '${file(dummySchema.json)}'
+          schema: '${file(dummy-schema.json)}'
 
 functions:
   target:
@@ -38,7 +38,7 @@ functions:
           method: get
           request:
             schemas:
-              application/json: '${file(dummySchema.json)}'
+              application/json: '${file(dummy-schema.json)}'
       - http:
           path: test-direct-full
           method: get
@@ -47,11 +47,11 @@ functions:
               application/json:
                 name: TestMethodModel
                 description: 'Test Method Model Desc'
-                schema: '${file(dummySchema.json)}'
+                schema: '${file(dummy-schema.json)}'
       - http:
           path: test-multiple
           method: get
           request:
             schemas:
-              application/json: '${file(dummySchema.json)}'
+              application/json: '${file(dummy-schema.json)}'
               text/plain: 'foo'
diff --git a/test/fixtures/programmatic/requestSchema/target.js b/test/fixtures/programmatic/request-schema/target.js
similarity index 100%
rename from test/fixtures/programmatic/requestSchema/target.js
rename to test/fixtures/programmatic/request-schema/target.js
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
index 133a50a6464..f3b6098f6f0 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
@@ -14,7 +14,7 @@ describe('#compileRequestValidators() - schemas', () => {
 
   before(async () => {
     const { cfTemplate, awsNaming, serverless } = await runServerless({
-      fixture: 'requestSchema',
+      fixture: 'request-schema',
       command: 'package',
     });
     cfResources = cfTemplate.Resources;

From 32a210c2eeca35448715c1ddbcf6de1af561e08a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 21:05:50 +0100
Subject: [PATCH 0962/1101] test: Rename `test/integrationBasic.test.js`

---
 package.json                                                 | 2 +-
 test/{integrationBasic.test.js => integration-basic.test.js} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename test/{integrationBasic.test.js => integration-basic.test.js} (100%)

diff --git a/package.json b/package.json
index 896f8207963..f22321652df 100644
--- a/package.json
+++ b/package.json
@@ -196,7 +196,7 @@
     "coverage": "nyc npm test",
     "integration-test-cleanup": "node test/utils/awsCleanup.js",
     "integration-test-run-all": "mocha-isolated --pass-through-aws-creds --skip-fs-cleanup-check --max-workers=20 \"test/integration/**/*.test.js\"",
-    "integration-test-run-basic": "mocha test/integrationBasic.test.js",
+    "integration-test-run-basic": "mocha test/integration-basic.test.js",
     "integration-test-run-package": "mocha-isolated --skip-fs-cleanup-check test/integrationPackage/**/*.tests.js",
     "integration-test-setup": "node ./scripts/test/integration-setup/index.js",
     "integration-test-teardown": "node ./scripts/test/integration-teardown.js",
diff --git a/test/integrationBasic.test.js b/test/integration-basic.test.js
similarity index 100%
rename from test/integrationBasic.test.js
rename to test/integration-basic.test.js

From fe2a1fcae8c5fb9b64d33e46573676af1f4cc06a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 21:16:31 +0100
Subject: [PATCH 0963/1101] test: Rename `test/apiGateway.js`

---
 test/integration/aws/apiGatewayExternal.test.js | 2 +-
 test/utils/{apiGateway.js => api-gateway.js}    | 0
 test/utils/awsCleanup.js                        | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename test/utils/{apiGateway.js => api-gateway.js} (100%)

diff --git a/test/integration/aws/apiGatewayExternal.test.js b/test/integration/aws/apiGatewayExternal.test.js
index 989b6245e2f..f396df5d644 100644
--- a/test/integration/aws/apiGatewayExternal.test.js
+++ b/test/integration/aws/apiGatewayExternal.test.js
@@ -6,7 +6,7 @@ const awsRequest = require('@serverless/test/aws-request');
 const fixtures = require('../../fixtures/programmatic');
 
 const { deployService, removeService, fetch } = require('../../utils/integration');
-const { createRestApi, deleteRestApi, getResources } = require('../../utils/apiGateway');
+const { createRestApi, deleteRestApi, getResources } = require('../../utils/api-gateway');
 
 describe('AWS - API Gateway with External REST API Integration Test', function () {
   this.timeout(1000 * 60 * 10); // Involves time-taking deploys
diff --git a/test/utils/apiGateway.js b/test/utils/api-gateway.js
similarity index 100%
rename from test/utils/apiGateway.js
rename to test/utils/api-gateway.js
diff --git a/test/utils/awsCleanup.js b/test/utils/awsCleanup.js
index d2a7d264121..68a2f716e7e 100644
--- a/test/utils/awsCleanup.js
+++ b/test/utils/awsCleanup.js
@@ -5,7 +5,7 @@
 
 const { logger } = require('./misc');
 const { findStacks, deleteStack, listStackResources } = require('./cloudformation');
-const { findRestApis, deleteRestApi } = require('./apiGateway');
+const { findRestApis, deleteRestApi } = require('./api-gateway');
 const { deleteBucket } = require('./s3');
 const { findUserPools, deleteUserPoolById } = require('./cognito');
 

From 518a2276d78a054cfbf43c6f0664ab3270313938 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 21:18:12 +0100
Subject: [PATCH 0964/1101] test: Rename `test/utils/awsCleanup.js`

---
 package.json                                 | 2 +-
 test/utils/{awsCleanup.js => aws-cleanup.js} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename test/utils/{awsCleanup.js => aws-cleanup.js} (100%)

diff --git a/package.json b/package.json
index f22321652df..4fb838a4aa3 100644
--- a/package.json
+++ b/package.json
@@ -194,7 +194,7 @@
   "scripts": {
     "commitlint": "commitlint -f HEAD@{15}",
     "coverage": "nyc npm test",
-    "integration-test-cleanup": "node test/utils/awsCleanup.js",
+    "integration-test-cleanup": "node test/utils/aws-cleanup.js",
     "integration-test-run-all": "mocha-isolated --pass-through-aws-creds --skip-fs-cleanup-check --max-workers=20 \"test/integration/**/*.test.js\"",
     "integration-test-run-basic": "mocha test/integration-basic.test.js",
     "integration-test-run-package": "mocha-isolated --skip-fs-cleanup-check test/integrationPackage/**/*.tests.js",
diff --git a/test/utils/awsCleanup.js b/test/utils/aws-cleanup.js
similarity index 100%
rename from test/utils/awsCleanup.js
rename to test/utils/aws-cleanup.js

From d91f2a974d43a517d357f29109425a2e45da759a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 21:18:42 +0100
Subject: [PATCH 0965/1101] test: Rename `test/utils/childProcess.js`

---
 test/integrationPackage/cloudformation.tests.js  | 2 +-
 test/utils/{childProcess.js => child-process.js} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename test/utils/{childProcess.js => child-process.js} (100%)

diff --git a/test/integrationPackage/cloudformation.tests.js b/test/integrationPackage/cloudformation.tests.js
index 6b2f608fa89..164eaa478f8 100644
--- a/test/integrationPackage/cloudformation.tests.js
+++ b/test/integrationPackage/cloudformation.tests.js
@@ -4,7 +4,7 @@ const fs = require('fs');
 const path = require('path');
 const { expect } = require('chai');
 const fse = require('fs-extra');
-const { execSync } = require('../utils/childProcess');
+const { execSync } = require('../utils/child-process');
 const serverlessExec = require('../serverless-binary');
 const { getTmpDirPath } = require('../utils/fs');
 
diff --git a/test/utils/childProcess.js b/test/utils/child-process.js
similarity index 100%
rename from test/utils/childProcess.js
rename to test/utils/child-process.js

From 40d63a2e44170c5bee1e54eea6cfbfeb04ae63d8 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 21:19:04 +0100
Subject: [PATCH 0966/1101] test: Rename `test/utils/eventBridge.js`

---
 test/integration/aws/eventBridge.test.js       | 2 +-
 test/utils/{eventBridge.js => event-bridge.js} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename test/utils/{eventBridge.js => event-bridge.js} (100%)

diff --git a/test/integration/aws/eventBridge.test.js b/test/integration/aws/eventBridge.test.js
index a5056c5539f..e5c2f8c7a62 100644
--- a/test/integration/aws/eventBridge.test.js
+++ b/test/integration/aws/eventBridge.test.js
@@ -10,7 +10,7 @@ const {
   putEvents,
   deleteEventBus,
   describeEventBus,
-} = require('../../utils/eventBridge');
+} = require('../../utils/event-bridge');
 
 const { deployService, removeService, getMarkers } = require('../../utils/integration');
 
diff --git a/test/utils/eventBridge.js b/test/utils/event-bridge.js
similarity index 100%
rename from test/utils/eventBridge.js
rename to test/utils/event-bridge.js

From e34b3a77c3f0fd8f61400736f405721d47a7507e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Mon, 24 Jan 2022 21:21:07 +0100
Subject: [PATCH 0967/1101] test: Fix naming convention of integration test
 files

---
 .../{apiGatewayExternal.test.js => api-gateway-external.test.js}  | 0
 test/integration/aws/{apiGateway.test.js => api-gateway.test.js}  | 0
 .../aws/{cognitoUserPool.test.js => cognito-user-pool.test.js}    | 0
 .../integration/aws/{eventBridge.test.js => event-bridge.test.js} | 0
 test/integration/aws/{httpApi.test.js => http-api.test.js}        | 0
 .../aws/infra-dependent/{activemq.test.js => active-mq.test.js}   | 0
 .../{fileSystemConfig.test.js => file-system-config.test.js}      | 0
 .../aws/infra-dependent/{rabbitmq.test.js => rabbit-mq.test.js}   | 0
 ...otFleetProvisioning.test.js => iot-fleet-provisioning.test.js} | 0
 ...isionedConcurrency.test.js => provisioned-concurrency.test.js} | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 rename test/integration/aws/{apiGatewayExternal.test.js => api-gateway-external.test.js} (100%)
 rename test/integration/aws/{apiGateway.test.js => api-gateway.test.js} (100%)
 rename test/integration/aws/{cognitoUserPool.test.js => cognito-user-pool.test.js} (100%)
 rename test/integration/aws/{eventBridge.test.js => event-bridge.test.js} (100%)
 rename test/integration/aws/{httpApi.test.js => http-api.test.js} (100%)
 rename test/integration/aws/infra-dependent/{activemq.test.js => active-mq.test.js} (100%)
 rename test/integration/aws/infra-dependent/{fileSystemConfig.test.js => file-system-config.test.js} (100%)
 rename test/integration/aws/infra-dependent/{rabbitmq.test.js => rabbit-mq.test.js} (100%)
 rename test/integration/aws/{iotFleetProvisioning.test.js => iot-fleet-provisioning.test.js} (100%)
 rename test/integration/aws/{provisionedConcurrency.test.js => provisioned-concurrency.test.js} (100%)

diff --git a/test/integration/aws/apiGatewayExternal.test.js b/test/integration/aws/api-gateway-external.test.js
similarity index 100%
rename from test/integration/aws/apiGatewayExternal.test.js
rename to test/integration/aws/api-gateway-external.test.js
diff --git a/test/integration/aws/apiGateway.test.js b/test/integration/aws/api-gateway.test.js
similarity index 100%
rename from test/integration/aws/apiGateway.test.js
rename to test/integration/aws/api-gateway.test.js
diff --git a/test/integration/aws/cognitoUserPool.test.js b/test/integration/aws/cognito-user-pool.test.js
similarity index 100%
rename from test/integration/aws/cognitoUserPool.test.js
rename to test/integration/aws/cognito-user-pool.test.js
diff --git a/test/integration/aws/eventBridge.test.js b/test/integration/aws/event-bridge.test.js
similarity index 100%
rename from test/integration/aws/eventBridge.test.js
rename to test/integration/aws/event-bridge.test.js
diff --git a/test/integration/aws/httpApi.test.js b/test/integration/aws/http-api.test.js
similarity index 100%
rename from test/integration/aws/httpApi.test.js
rename to test/integration/aws/http-api.test.js
diff --git a/test/integration/aws/infra-dependent/activemq.test.js b/test/integration/aws/infra-dependent/active-mq.test.js
similarity index 100%
rename from test/integration/aws/infra-dependent/activemq.test.js
rename to test/integration/aws/infra-dependent/active-mq.test.js
diff --git a/test/integration/aws/infra-dependent/fileSystemConfig.test.js b/test/integration/aws/infra-dependent/file-system-config.test.js
similarity index 100%
rename from test/integration/aws/infra-dependent/fileSystemConfig.test.js
rename to test/integration/aws/infra-dependent/file-system-config.test.js
diff --git a/test/integration/aws/infra-dependent/rabbitmq.test.js b/test/integration/aws/infra-dependent/rabbit-mq.test.js
similarity index 100%
rename from test/integration/aws/infra-dependent/rabbitmq.test.js
rename to test/integration/aws/infra-dependent/rabbit-mq.test.js
diff --git a/test/integration/aws/iotFleetProvisioning.test.js b/test/integration/aws/iot-fleet-provisioning.test.js
similarity index 100%
rename from test/integration/aws/iotFleetProvisioning.test.js
rename to test/integration/aws/iot-fleet-provisioning.test.js
diff --git a/test/integration/aws/provisionedConcurrency.test.js b/test/integration/aws/provisioned-concurrency.test.js
similarity index 100%
rename from test/integration/aws/provisionedConcurrency.test.js
rename to test/integration/aws/provisioned-concurrency.test.js

From 728913707316a18609299d45e077731b3e1317e2 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 11:06:09 +0100
Subject: [PATCH 0968/1101] refactor: Rename `lib/Serverless.js`

---
 lib/cli/interactive-setup/deploy.js                       | 2 +-
 lib/{Serverless.js => serverless.js}                      | 0
 package.json                                              | 2 +-
 scripts/serverless.js                                     | 2 +-
 .../serverless/lib/{Serverless.js => serverless.js}       | 0
 .../node_modules/serverless/package.json                  | 2 +-
 test/unit/lib/classes/CLI.test.js                         | 2 +-
 test/unit/lib/classes/Config.test.js                      | 2 +-
 test/unit/lib/classes/PluginManager.test.js               | 2 +-
 test/unit/lib/classes/Utils.test.js                       | 2 +-
 test/unit/lib/classes/YamlParser.test.js                  | 2 +-
 test/unit/lib/cli/interactive-setup/deploy.test.js        | 8 ++++----
 test/unit/lib/cli/local-serverless-path.test.js           | 4 ++--
 .../variables/sources/instance-dependent/get-aws.test.js  | 2 +-
 .../variables/sources/instance-dependent/get-sls.test.js  | 2 +-
 test/unit/lib/plugins/aws/common/index.test.js            | 2 +-
 test/unit/lib/plugins/aws/common/lib/artifacts.test.js    | 2 +-
 .../lib/plugins/aws/common/lib/cleanupTempDir.test.js     | 2 +-
 test/unit/lib/plugins/aws/configCredentials.test.js       | 2 +-
 test/unit/lib/plugins/aws/customResources/index.test.js   | 2 +-
 .../lib/plugins/aws/deploy/lib/checkForChanges.test.js    | 2 +-
 .../lib/plugins/aws/deploy/lib/cleanupS3Bucket.test.js    | 2 +-
 .../lib/plugins/aws/deploy/lib/extendedValidate.test.js   | 2 +-
 .../lib/plugins/aws/deploy/lib/uploadArtifacts.test.js    | 2 +-
 .../lib/plugins/aws/deploy/lib/validateTemplate.test.js   | 2 +-
 test/unit/lib/plugins/aws/deployFunction.test.js          | 2 +-
 test/unit/lib/plugins/aws/deployList.test.js              | 2 +-
 test/unit/lib/plugins/aws/info/getApiKeyValues.test.js    | 2 +-
 test/unit/lib/plugins/aws/info/getResourceCount.test.js   | 2 +-
 test/unit/lib/plugins/aws/info/getStackInfo.test.js       | 2 +-
 test/unit/lib/plugins/aws/info/index.test.js              | 2 +-
 test/unit/lib/plugins/aws/invokeLocal/index.test.js       | 2 +-
 test/unit/lib/plugins/aws/lib/getServiceState.test.js     | 2 +-
 test/unit/lib/plugins/aws/lib/monitorStack.test.js        | 2 +-
 test/unit/lib/plugins/aws/lib/naming.test.js              | 2 +-
 test/unit/lib/plugins/aws/lib/setBucketName.test.js       | 2 +-
 test/unit/lib/plugins/aws/lib/validate.test.js            | 2 +-
 test/unit/lib/plugins/aws/logs.test.js                    | 2 +-
 test/unit/lib/plugins/aws/metrics.test.js                 | 2 +-
 .../package/compile/events/alb/lib/listenerRules.test.js  | 2 +-
 .../package/compile/events/alb/lib/permissions.test.js    | 2 +-
 .../package/compile/events/alb/lib/targetGroups.test.js   | 2 +-
 .../aws/package/compile/events/alb/lib/validate.test.js   | 2 +-
 .../plugins/aws/package/compile/events/alexaSkill.test.js | 2 +-
 .../aws/package/compile/events/alexaSmartHome.test.js     | 2 +-
 .../aws/package/compile/events/apiGateway/index.test.js   | 2 +-
 .../package/compile/events/apiGateway/lib/apiKeys.test.js | 2 +-
 .../compile/events/apiGateway/lib/authorizers.test.js     | 2 +-
 .../package/compile/events/apiGateway/lib/cors.test.js    | 2 +-
 .../compile/events/apiGateway/lib/deployment.test.js      | 2 +-
 .../apiGateway/lib/hack/disassociateUsagePlan.test.js     | 2 +-
 .../events/apiGateway/lib/hack/updateStage.test.js        | 2 +-
 .../compile/events/apiGateway/lib/method/index.test.js    | 2 +-
 .../compile/events/apiGateway/lib/permissions.test.js     | 2 +-
 .../compile/events/apiGateway/lib/resources.test.js       | 2 +-
 .../package/compile/events/apiGateway/lib/restApi.test.js | 2 +-
 .../compile/events/apiGateway/lib/stage/index.test.js     | 2 +-
 .../compile/events/apiGateway/lib/usagePlan.test.js       | 2 +-
 .../compile/events/apiGateway/lib/usagePlanKeys.test.js   | 2 +-
 .../compile/events/apiGateway/lib/validate.test.js        | 2 +-
 .../plugins/aws/package/compile/events/cloudFront.test.js | 2 +-
 .../aws/package/compile/events/cloudWatchEvent.test.js    | 2 +-
 .../aws/package/compile/events/cloudWatchLog.test.js      | 2 +-
 .../aws/package/compile/events/cognitoUserPool.test.js    | 2 +-
 .../lib/plugins/aws/package/compile/events/iot.test.js    | 2 +-
 .../plugins/aws/package/compile/events/s3/index.test.js   | 2 +-
 .../lib/plugins/aws/package/compile/events/sns.test.js    | 2 +-
 .../lib/plugins/aws/package/compile/events/stream.test.js | 2 +-
 .../aws/package/compile/events/websockets/index.test.js   | 2 +-
 .../compile/events/websockets/lib/authorizers.test.js     | 2 +-
 .../compile/events/websockets/lib/deployment.test.js      | 2 +-
 .../compile/events/websockets/lib/integrations.test.js    | 2 +-
 .../compile/events/websockets/lib/permissions.test.js     | 2 +-
 .../compile/events/websockets/lib/routeResponses.test.js  | 2 +-
 .../package/compile/events/websockets/lib/routes.test.js  | 2 +-
 .../package/compile/events/websockets/lib/stage.test.js   | 2 +-
 .../compile/events/websockets/lib/validate.test.js        | 2 +-
 .../lib/plugins/aws/package/compile/functions.test.js     | 2 +-
 test/unit/lib/plugins/aws/package/index.test.js           | 2 +-
 .../aws/package/lib/generateArtifactDirectoryName.test.js | 2 +-
 .../aws/package/lib/mergeCustomProviderResources.test.js  | 2 +-
 .../plugins/aws/package/lib/saveCompiledTemplate.test.js  | 2 +-
 .../lib/plugins/aws/package/lib/saveServiceState.test.js  | 2 +-
 test/unit/lib/plugins/aws/provider.test.js                | 2 +-
 test/unit/lib/plugins/aws/remove/lib/stack.test.js        | 2 +-
 test/unit/lib/plugins/aws/rollback.test.js                | 2 +-
 test/unit/lib/plugins/aws/rollbackFunction.test.js        | 2 +-
 test/unit/lib/plugins/create/create.test.js               | 2 +-
 test/unit/lib/plugins/deploy.test.js                      | 2 +-
 test/unit/lib/plugins/info.test.js                        | 2 +-
 test/unit/lib/plugins/install.test.js                     | 2 +-
 test/unit/lib/plugins/invoke.test.js                      | 2 +-
 test/unit/lib/plugins/metrics.test.js                     | 2 +-
 test/unit/lib/plugins/package/lib/zipService.test.js      | 2 +-
 test/unit/lib/plugins/package/package.test.js             | 2 +-
 test/unit/lib/plugins/plugin/lib/utils.test.js            | 2 +-
 test/unit/lib/plugins/plugin/list.test.js                 | 2 +-
 test/unit/lib/plugins/plugin/search.test.js               | 2 +-
 test/unit/lib/plugins/remove.test.js                      | 2 +-
 test/unit/lib/plugins/rollback.test.js                    | 2 +-
 test/unit/lib/plugins/slstats.test.js                     | 2 +-
 test/unit/lib/{Serverless.test.js => serverless.test.js}  | 4 ++--
 test/unit/lib/utils/fs/writeFile.test.js                  | 2 +-
 test/unit/lib/utils/fs/writeFileSync.test.js              | 2 +-
 test/unit/lib/utils/renameService.test.js                 | 2 +-
 105 files changed, 108 insertions(+), 108 deletions(-)
 rename lib/{Serverless.js => serverless.js} (100%)
 rename test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/lib/{Serverless.js => serverless.js} (100%)
 rename test/unit/lib/{Serverless.test.js => serverless.test.js} (98%)

diff --git a/lib/cli/interactive-setup/deploy.js b/lib/cli/interactive-setup/deploy.js
index 986973a1eb4..5f0d0f2a5b4 100644
--- a/lib/cli/interactive-setup/deploy.js
+++ b/lib/cli/interactive-setup/deploy.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const Serverless = require('../../Serverless');
+const Serverless = require('../../serverless');
 const { writeText, style } = require('@serverless/utils/log');
 const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-history');
 const { doesServiceInstanceHaveLinkedProvider } = require('./utils');
diff --git a/lib/Serverless.js b/lib/serverless.js
similarity index 100%
rename from lib/Serverless.js
rename to lib/serverless.js
diff --git a/package.json b/package.json
index 4fb838a4aa3..c0f3559efeb 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "apache-open-whisk",
     "iot"
   ],
-  "main": "lib/Serverless.js",
+  "main": "lib/serverless.js",
   "bin": {
     "serverless": "./bin/serverless.js",
     "sls": "./bin/serverless.js"
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 5d41bfc64cf..722f83ac443 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -147,7 +147,7 @@ processSpanPromise = (async () => {
     const uuid = require('uuid');
     const _ = require('lodash');
     const clear = require('ext/object/clear');
-    const Serverless = require('../lib/Serverless');
+    const Serverless = require('../lib/serverless');
     const resolveVariables = require('../lib/configuration/variables/resolve');
     const isPropertyResolved = require('../lib/configuration/variables/is-property-resolved');
     const eventuallyReportVariableResolutionErrors = require('../lib/configuration/variables/eventually-report-resolution-errors');
diff --git a/test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/lib/Serverless.js b/test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/lib/serverless.js
similarity index 100%
rename from test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/lib/Serverless.js
rename to test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/lib/serverless.js
diff --git a/test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/package.json b/test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/package.json
index 5a2c27f5e7f..27f17035532 100644
--- a/test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/package.json
+++ b/test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/package.json
@@ -1 +1 @@
-{ "main": "lib/Serverless.js", "version": "2.0.0-local" }
+{ "main": "lib/serverless.js", "version": "2.0.0-local" }
diff --git a/test/unit/lib/classes/CLI.test.js b/test/unit/lib/classes/CLI.test.js
index d19feac59b8..280a4dbd083 100644
--- a/test/unit/lib/classes/CLI.test.js
+++ b/test/unit/lib/classes/CLI.test.js
@@ -2,7 +2,7 @@
 
 const chai = require('chai');
 const CLI = require('../../../../lib/classes/CLI');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 
 const { expect } = chai;
 chai.use(require('sinon-chai'));
diff --git a/test/unit/lib/classes/Config.test.js b/test/unit/lib/classes/Config.test.js
index 114ca742885..0fafeaadbc0 100644
--- a/test/unit/lib/classes/Config.test.js
+++ b/test/unit/lib/classes/Config.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const Config = require('../../../../lib/classes/Config');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 
 const serverless = new Serverless({ commands: [], options: {} });
 
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
index eea77d7b61a..b294dbc3f92 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/PluginManager.test.js
@@ -8,7 +8,7 @@ const spawn = require('child-process-ext/spawn');
 const overrideArgv = require('process-utils/override-argv');
 const resolveAwsEnv = require('@serverless/test/resolve-env');
 const runServerless = require('../../../utils/run-serverless');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 const CLI = require('../../../../lib/classes/CLI');
 const resolveInput = require('../../../../lib/cli/resolve-input');
 const Create = require('../../../../lib/plugins/create/create');
diff --git a/test/unit/lib/classes/Utils.test.js b/test/unit/lib/classes/Utils.test.js
index c521d2f8994..c7401ed8dcc 100644
--- a/test/unit/lib/classes/Utils.test.js
+++ b/test/unit/lib/classes/Utils.test.js
@@ -4,7 +4,7 @@ const path = require('path');
 const os = require('os');
 const chai = require('chai');
 const fse = require('fs-extra');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 const Utils = require('../../../../lib/classes/Utils');
 const { expect } = require('chai');
 const { getTmpFilePath, getTmpDirPath } = require('../../../utils/fs');
diff --git a/test/unit/lib/classes/YamlParser.test.js b/test/unit/lib/classes/YamlParser.test.js
index 041f0d591b5..3c2f1de2f04 100644
--- a/test/unit/lib/classes/YamlParser.test.js
+++ b/test/unit/lib/classes/YamlParser.test.js
@@ -7,7 +7,7 @@
 const chai = require('chai');
 const yaml = require('js-yaml');
 const path = require('path');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 const { getTmpFilePath, getTmpDirPath } = require('../../../utils/fs');
 
 // Configure chai
diff --git a/test/unit/lib/cli/interactive-setup/deploy.test.js b/test/unit/lib/cli/interactive-setup/deploy.test.js
index 63b07ddaefc..6e5e28dbbdb 100644
--- a/test/unit/lib/cli/interactive-setup/deploy.test.js
+++ b/test/unit/lib/cli/interactive-setup/deploy.test.js
@@ -185,7 +185,7 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
       }
 
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/deploy', {
-        '../../Serverless': MockedServerless,
+        '../../serverless': MockedServerless,
         '@serverless/dashboard-plugin/lib/dashboard': {
           getDashboardInteractUrl: () => 'https://app.serverless-dev.com/path/to/dashboard',
         },
@@ -237,7 +237,7 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
       }
 
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/deploy', {
-        '../../Serverless': MockedServerless,
+        '../../serverless': MockedServerless,
         '@serverless/dashboard-plugin/lib/dashboard': {
           getDashboardInteractUrl: () => 'https://app.serverless-dev.com/path/to/dashboard',
         },
@@ -288,7 +288,7 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
       }
 
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/deploy', {
-        '../../Serverless': MockedServerless,
+        '../../serverless': MockedServerless,
       });
 
       configureInquirerStub(inquirer, {
@@ -334,7 +334,7 @@ describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
       }
 
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/deploy', {
-        '../../Serverless': MockedServerless,
+        '../../serverless': MockedServerless,
       });
 
       configureInquirerStub(inquirer, {
diff --git a/test/unit/lib/cli/local-serverless-path.test.js b/test/unit/lib/cli/local-serverless-path.test.js
index 1dc7d350346..b702b9478b9 100644
--- a/test/unit/lib/cli/local-serverless-path.test.js
+++ b/test/unit/lib/cli/local-serverless-path.test.js
@@ -22,10 +22,10 @@ describe('test/unit/lib/cli/local-serverless.test.js', () => {
     );
     await fse.ensureDir(path.resolve(tmpServerlessPath, 'lib'));
     await Promise.all([
-      fse.ensureFile(path.resolve(tmpServerlessPath, 'lib/Serverless.js')),
+      fse.ensureFile(path.resolve(tmpServerlessPath, 'lib/serverless.js')),
       fsp.writeFile(
         path.resolve(tmpServerlessPath, 'package.json'),
-        JSON.stringify({ main: 'lib/Serverless.js' })
+        JSON.stringify({ main: 'lib/serverless.js' })
       ),
     ]);
     expect(await fsp.realpath(require('../../../../lib/cli/local-serverless-path'))).to.equal(
diff --git a/test/unit/lib/configuration/variables/sources/instance-dependent/get-aws.test.js b/test/unit/lib/configuration/variables/sources/instance-dependent/get-aws.test.js
index 945585f6381..c3f58c2ee2f 100644
--- a/test/unit/lib/configuration/variables/sources/instance-dependent/get-aws.test.js
+++ b/test/unit/lib/configuration/variables/sources/instance-dependent/get-aws.test.js
@@ -7,7 +7,7 @@ const resolveMeta = require('../../../../../../../lib/configuration/variables/re
 const resolve = require('../../../../../../../lib/configuration/variables/resolve');
 const selfSource = require('../../../../../../../lib/configuration/variables/sources/self');
 const getAwsSource = require('../../../../../../../lib/configuration/variables/sources/instance-dependent/get-aws');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 
 describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-aws.test.js', () => {
   let configuration;
diff --git a/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js b/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js
index 5999d4a54d2..1bc6a271dab 100644
--- a/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js
+++ b/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js
@@ -7,7 +7,7 @@ const resolveMeta = require('../../../../../../../lib/configuration/variables/re
 const resolve = require('../../../../../../../lib/configuration/variables/resolve');
 const selfSource = require('../../../../../../../lib/configuration/variables/sources/self');
 const getSlsSource = require('../../../../../../../lib/configuration/variables/sources/instance-dependent/get-sls');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 
 describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js', () => {
   let configuration;
diff --git a/test/unit/lib/plugins/aws/common/index.test.js b/test/unit/lib/plugins/aws/common/index.test.js
index 899b1bd3e6f..f87bdcf747a 100644
--- a/test/unit/lib/plugins/aws/common/index.test.js
+++ b/test/unit/lib/plugins/aws/common/index.test.js
@@ -2,7 +2,7 @@
 
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
 const AwsCommon = require('../../../../../../lib/plugins/aws/common/index');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 const expect = require('chai').expect;
 const sinon = require('sinon');
 
diff --git a/test/unit/lib/plugins/aws/common/lib/artifacts.test.js b/test/unit/lib/plugins/aws/common/lib/artifacts.test.js
index 650606677ed..c94e78ba615 100644
--- a/test/unit/lib/plugins/aws/common/lib/artifacts.test.js
+++ b/test/unit/lib/plugins/aws/common/lib/artifacts.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const path = require('path');
 const fse = require('fs-extra');
 const AWSCommon = require('../../../../../../../lib/plugins/aws/common/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 const { getTmpDirPath } = require('../../../../../../utils/fs');
 
 describe('#moveArtifactsToPackage()', () => {
diff --git a/test/unit/lib/plugins/aws/common/lib/cleanupTempDir.test.js b/test/unit/lib/plugins/aws/common/lib/cleanupTempDir.test.js
index 9cba4b3e6d6..3165ec1d696 100644
--- a/test/unit/lib/plugins/aws/common/lib/cleanupTempDir.test.js
+++ b/test/unit/lib/plugins/aws/common/lib/cleanupTempDir.test.js
@@ -3,7 +3,7 @@
 const expect = require('chai').expect;
 const path = require('path');
 const Package = require('../../../../../../../lib/plugins/aws/common/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 const { getTmpDirPath } = require('../../../../../../utils/fs');
 
 describe('#cleanupTempDir()', () => {
diff --git a/test/unit/lib/plugins/aws/configCredentials.test.js b/test/unit/lib/plugins/aws/configCredentials.test.js
index ac63dd23c1f..eb165323f47 100644
--- a/test/unit/lib/plugins/aws/configCredentials.test.js
+++ b/test/unit/lib/plugins/aws/configCredentials.test.js
@@ -9,7 +9,7 @@ const fse = require('fs-extra');
 const os = require('os');
 const path = require('path');
 const AwsConfigCredentials = require('../../../../../lib/plugins/aws/configCredentials');
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 const runServerless = require('../../../../utils/run-serverless');
 
 const { expect } = chai;
diff --git a/test/unit/lib/plugins/aws/customResources/index.test.js b/test/unit/lib/plugins/aws/customResources/index.test.js
index 6142e34bcc1..15eced710c1 100644
--- a/test/unit/lib/plugins/aws/customResources/index.test.js
+++ b/test/unit/lib/plugins/aws/customResources/index.test.js
@@ -5,7 +5,7 @@
 const chai = require('chai');
 const BbPromise = require('bluebird');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 const CLI = require('../../../../../../lib/classes/CLI');
 const { createTmpDir } = require('../../../../../utils/fs');
 const {
diff --git a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
index fa6bcec3fc4..b3ff8ed3d17 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
@@ -12,7 +12,7 @@ const proxyquire = require('proxyquire');
 const normalizeFiles = require('../../../../../../../lib/plugins/aws/lib/normalizeFiles');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 const AwsDeploy = require('../../../../../../../lib/plugins/aws/deploy/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 const ServerlessError = require('../../../../../../../lib/serverless-error');
 const runServerless = require('../../../../../../utils/run-serverless');
 
diff --git a/test/unit/lib/plugins/aws/deploy/lib/cleanupS3Bucket.test.js b/test/unit/lib/plugins/aws/deploy/lib/cleanupS3Bucket.test.js
index 5c99eec2e35..decb6f9f8cd 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/cleanupS3Bucket.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/cleanupS3Bucket.test.js
@@ -6,7 +6,7 @@ const sinon = require('sinon');
 const chai = require('chai');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 const AwsDeploy = require('../../../../../../../lib/plugins/aws/deploy/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 
 chai.use(require('chai-as-promised'));
 chai.use(require('sinon-chai'));
diff --git a/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js b/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
index 51e1a3db24d..1e58be4638d 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
@@ -5,7 +5,7 @@ const sinon = require('sinon');
 const path = require('path');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 const AwsDeploy = require('../../../../../../../lib/plugins/aws/deploy/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 const { getTmpDirPath } = require('../../../../../../utils/fs');
 
 chai.use(require('sinon-chai'));
diff --git a/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js b/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js
index cf6810d32d3..99a48e57ca4 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js
@@ -11,7 +11,7 @@ const proxyquire = require('proxyquire');
 const normalizeFiles = require('../../../../../../../lib/plugins/aws/lib/normalizeFiles');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 const AwsDeploy = require('../../../../../../../lib/plugins/aws/deploy/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 const { getTmpDirPath, createTmpDir } = require('../../../../../../utils/fs');
 
 chai.use(require('chai-as-promised'));
diff --git a/test/unit/lib/plugins/aws/deploy/lib/validateTemplate.test.js b/test/unit/lib/plugins/aws/deploy/lib/validateTemplate.test.js
index 130a6eb8c01..0a165670f8d 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/validateTemplate.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/validateTemplate.test.js
@@ -6,7 +6,7 @@ const sinon = require('sinon');
 const chai = require('chai');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 const AwsDeploy = require('../../../../../../../lib/plugins/aws/deploy/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 
 // Configure chai
 chai.use(require('chai-as-promised'));
diff --git a/test/unit/lib/plugins/aws/deployFunction.test.js b/test/unit/lib/plugins/aws/deployFunction.test.js
index bab1d702abd..a1a34090f16 100644
--- a/test/unit/lib/plugins/aws/deployFunction.test.js
+++ b/test/unit/lib/plugins/aws/deployFunction.test.js
@@ -6,7 +6,7 @@ const path = require('path');
 const fs = require('fs');
 const proxyquire = require('proxyquire');
 const AwsProvider = require('../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 const runServerless = require('../../../../utils/run-serverless');
 const { getTmpDirPath } = require('../../../../utils/fs');
 
diff --git a/test/unit/lib/plugins/aws/deployList.test.js b/test/unit/lib/plugins/aws/deployList.test.js
index 5607df8dd56..c5034a99264 100644
--- a/test/unit/lib/plugins/aws/deployList.test.js
+++ b/test/unit/lib/plugins/aws/deployList.test.js
@@ -4,7 +4,7 @@ const sinon = require('sinon');
 const expect = require('chai').expect;
 const AwsDeployList = require('../../../../../lib/plugins/aws/deployList');
 const AwsProvider = require('../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 
 describe('AwsDeployList', () => {
   let serverless;
diff --git a/test/unit/lib/plugins/aws/info/getApiKeyValues.test.js b/test/unit/lib/plugins/aws/info/getApiKeyValues.test.js
index c986ab5e75b..137bd398d67 100644
--- a/test/unit/lib/plugins/aws/info/getApiKeyValues.test.js
+++ b/test/unit/lib/plugins/aws/info/getApiKeyValues.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const AwsInfo = require('../../../../../../lib/plugins/aws/info/index');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 
 describe('#getApiKeyValues()', () => {
   let serverless;
diff --git a/test/unit/lib/plugins/aws/info/getResourceCount.test.js b/test/unit/lib/plugins/aws/info/getResourceCount.test.js
index 2165a29da20..5e6e982ee09 100644
--- a/test/unit/lib/plugins/aws/info/getResourceCount.test.js
+++ b/test/unit/lib/plugins/aws/info/getResourceCount.test.js
@@ -6,7 +6,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const AwsInfo = require('../../../../../../lib/plugins/aws/info/index');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 
 describe('#getResourceCount()', () => {
   let serverless;
diff --git a/test/unit/lib/plugins/aws/info/getStackInfo.test.js b/test/unit/lib/plugins/aws/info/getStackInfo.test.js
index 4731e94fbec..eaa1e6c0604 100644
--- a/test/unit/lib/plugins/aws/info/getStackInfo.test.js
+++ b/test/unit/lib/plugins/aws/info/getStackInfo.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const AwsInfo = require('../../../../../../lib/plugins/aws/info/index');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 
 describe('#getStackInfo()', () => {
   let serverless;
diff --git a/test/unit/lib/plugins/aws/info/index.test.js b/test/unit/lib/plugins/aws/info/index.test.js
index d06f5f556fc..c053acd1772 100644
--- a/test/unit/lib/plugins/aws/info/index.test.js
+++ b/test/unit/lib/plugins/aws/info/index.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const AwsInfo = require('../../../../../../lib/plugins/aws/info/index');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 
 describe('AwsInfo', () => {
   let serverless;
diff --git a/test/unit/lib/plugins/aws/invokeLocal/index.test.js b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
index 6763dd684e8..ed3581fd982 100644
--- a/test/unit/lib/plugins/aws/invokeLocal/index.test.js
+++ b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
@@ -8,7 +8,7 @@ const fse = require('fs-extra');
 const proxyquire = require('proxyquire');
 const overrideEnv = require('process-utils/override-env');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 const CLI = require('../../../../../../lib/classes/CLI');
 const { getTmpDirPath } = require('../../../../../utils/fs');
 const skipWithNotice = require('@serverless/test/skip-with-notice');
diff --git a/test/unit/lib/plugins/aws/lib/getServiceState.test.js b/test/unit/lib/plugins/aws/lib/getServiceState.test.js
index c7c2c942b71..012216ecddb 100644
--- a/test/unit/lib/plugins/aws/lib/getServiceState.test.js
+++ b/test/unit/lib/plugins/aws/lib/getServiceState.test.js
@@ -3,7 +3,7 @@
 const path = require('path');
 const chai = require('chai');
 const sinon = require('sinon');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
 const getServiceState = require('../../../../../../lib/plugins/aws/lib/getServiceState');
 
diff --git a/test/unit/lib/plugins/aws/lib/monitorStack.test.js b/test/unit/lib/plugins/aws/lib/monitorStack.test.js
index f11936de19e..7f1cc5ecc19 100644
--- a/test/unit/lib/plugins/aws/lib/monitorStack.test.js
+++ b/test/unit/lib/plugins/aws/lib/monitorStack.test.js
@@ -2,7 +2,7 @@
 
 const chai = require('chai');
 const sinon = require('sinon');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
 const CLI = require('../../../../../../lib/classes/CLI');
 const monitorStack = require('../../../../../../lib/plugins/aws/lib/monitorStack');
diff --git a/test/unit/lib/plugins/aws/lib/naming.test.js b/test/unit/lib/plugins/aws/lib/naming.test.js
index 360e1108620..f72e3a433d5 100644
--- a/test/unit/lib/plugins/aws/lib/naming.test.js
+++ b/test/unit/lib/plugins/aws/lib/naming.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const _ = require('lodash');
 
 const SDK = require('../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 
 describe('#naming()', () => {
   let options;
diff --git a/test/unit/lib/plugins/aws/lib/setBucketName.test.js b/test/unit/lib/plugins/aws/lib/setBucketName.test.js
index 8a57df73f8d..1732bd6d829 100644
--- a/test/unit/lib/plugins/aws/lib/setBucketName.test.js
+++ b/test/unit/lib/plugins/aws/lib/setBucketName.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
 const AwsDeploy = require('../../../../../../lib/plugins/aws/deploy/index');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 
 describe('#setBucketName()', () => {
   let serverless;
diff --git a/test/unit/lib/plugins/aws/lib/validate.test.js b/test/unit/lib/plugins/aws/lib/validate.test.js
index 173a3a16c34..70db8932d4f 100644
--- a/test/unit/lib/plugins/aws/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/lib/validate.test.js
@@ -3,7 +3,7 @@
 const chai = require('chai');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
 const validate = require('../../../../../../lib/plugins/aws/lib/validate');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 const ServerlessError = require('../../../../../../lib/serverless-error');
 
 chai.use(require('chai-as-promised'));
diff --git a/test/unit/lib/plugins/aws/logs.test.js b/test/unit/lib/plugins/aws/logs.test.js
index ce282259a13..fafcbf490fc 100644
--- a/test/unit/lib/plugins/aws/logs.test.js
+++ b/test/unit/lib/plugins/aws/logs.test.js
@@ -5,7 +5,7 @@ const sinon = require('sinon');
 const proxyquire = require('proxyquire');
 const AwsProvider = require('../../../../../lib/plugins/aws/provider');
 const AwsLogs = require('../../../../../lib/plugins/aws/logs');
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 
 // Configure chai
 chai.use(require('chai-as-promised'));
diff --git a/test/unit/lib/plugins/aws/metrics.test.js b/test/unit/lib/plugins/aws/metrics.test.js
index 1de6eee99ce..a59393f2c33 100644
--- a/test/unit/lib/plugins/aws/metrics.test.js
+++ b/test/unit/lib/plugins/aws/metrics.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const AwsProvider = require('../../../../../lib/plugins/aws/provider');
 const AwsMetrics = require('../../../../../lib/plugins/aws/metrics');
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 const CLI = require('../../../../../lib/classes/CLI');
 const dayjs = require('dayjs');
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/listenerRules.test.js b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/listenerRules.test.js
index b60e7287a68..fd155d69b47 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/listenerRules.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/listenerRules.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileAlbEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/alb/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileListenerRules()', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/permissions.test.js b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/permissions.test.js
index cbafe6f3417..548e4bdf562 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/permissions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/permissions.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileAlbEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/alb/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compilePermissions()', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.test.js b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.test.js
index 742d7d981f8..d46f744b8a7 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileAlbEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/alb/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileTargetGroups()', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/validate.test.js b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/validate.test.js
index 535fca6f431..e6079bfaeb4 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/validate.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileAlbEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/alb/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#validate()', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alexaSkill.test.js b/test/unit/lib/plugins/aws/package/compile/events/alexaSkill.test.js
index d22d8b85547..d19c6f577a1 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/alexaSkill.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/alexaSkill.test.js
@@ -5,7 +5,7 @@
 const expect = require('chai').expect;
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
 const AwsCompileAlexaSkillEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/alexaSkill');
-const Serverless = require('../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../lib/serverless');
 
 describe('AwsCompileAlexaSkillEvents', () => {
   let serverless;
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alexaSmartHome.test.js b/test/unit/lib/plugins/aws/package/compile/events/alexaSmartHome.test.js
index 829af3611d1..a7af1ccdb0c 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/alexaSmartHome.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/alexaSmartHome.test.js
@@ -3,7 +3,7 @@
 const expect = require('chai').expect;
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
 const AwsCompileAlexaSmartHomeEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/alexaSmartHome');
-const Serverless = require('../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../lib/serverless');
 
 describe('AwsCompileAlexaSmartHomeEvents', () => {
   let serverless;
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js
index ad726600e93..43eba069a31 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const AwsProvider = require('../../../../../../../../../lib/plugins/aws/provider');
 const AwsCompileApigEvents = require('../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../lib/serverless');
 const validate = require('../../../../../../../../../lib/plugins/aws/lib/validate');
 const getServiceState = require('../../../../../../../../../lib/plugins/aws/lib/getServiceState');
 const updateStage = require('../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage');
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js
index d2950029ead..5b1a410b0a3 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 const runServerless = require('../../../../../../../../../utils/run-serverless');
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js
index 36163642cde..b4a1f58032f 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 const runServerless = require('../../../../../../../../../utils/run-serverless');
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/cors.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/cors.test.js
index 78420ce86e4..e6c9368fe69 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/cors.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/cors.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileCors()', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/deployment.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/deployment.test.js
index 1c0071c7cb3..523ab4f1e95 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/deployment.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/deployment.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileDeployment()', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.test.js
index 520883d060d..ad9487f6dc5 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const sinon = require('sinon');
-const Serverless = require('../../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../../lib/plugins/aws/provider');
 const disassociateUsagePlan = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan');
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
index af6741ed766..bbf6e339687 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
@@ -6,7 +6,7 @@
 const chai = require('chai');
 const sinon = require('sinon');
 const _ = require('lodash');
-const Serverless = require('../../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../../lib/plugins/aws/provider');
 const {
   updateStage,
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js
index 5e4cf1844db..afe3217e8de 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileApigEvents = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../../lib/plugins/aws/provider');
 const runServerless = require('../../../../../../../../../../utils/run-serverless');
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.test.js
index ad5f56a3a0f..8f73eafdc71 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#awsCompilePermissions()', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/resources.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/resources.test.js
index a158d814b3d..8e24b7ef049 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/resources.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/resources.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileResources()', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
index 44356c9decc..9660b91337c 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
@@ -2,7 +2,7 @@
 
 const chai = require('chai');
 const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 const runServerless = require('../../../../../../../../../utils/run-serverless');
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js
index 0103a40d564..18913824ec3 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js
@@ -6,7 +6,7 @@ const BbPromise = require('bluebird');
 const _ = require('lodash');
 const childProcess = BbPromise.promisifyAll(require('child_process'));
 const AwsCompileApigEvents = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway');
-const Serverless = require('../../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../../lib/plugins/aws/provider');
 const { createTmpDir } = require('../../../../../../../../../../utils/fs');
 const runServerless = require('../../../../../../../../../../utils/run-serverless');
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js
index 091c5855a1a..25bb7aa96ad 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 const runServerless = require('../../../../../../../../../utils/run-serverless');
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.test.js
index afc1c648fc9..d72827c97b5 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.test.js
@@ -3,7 +3,7 @@
 const _ = require('lodash');
 const expect = require('chai').expect;
 const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileUsagePlanKeys()', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
index 0f4424020b9..410d5f53c0a 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
@@ -4,7 +4,7 @@ const chai = require('chai');
 const sinon = require('sinon');
 const runServerless = require('../../../../../../../../../utils/run-serverless');
 const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 const ServerlessError = require('../../../../../../../../../../lib/serverless-error');
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
index 200b7a15fb0..ef03a91eb7a 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
@@ -3,7 +3,7 @@
 const chai = require('chai');
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
 const AwsCompileCloudFrontEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/cloudFront');
-const Serverless = require('../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../lib/serverless');
 const runServerless = require('../../../../../../../utils/run-serverless');
 
 chai.use(require('sinon-chai'));
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudWatchEvent.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloudWatchEvent.test.js
index 3197b288d56..11c81bf0fce 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudWatchEvent.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloudWatchEvent.test.js
@@ -3,7 +3,7 @@
 const expect = require('chai').expect;
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
 const AwsCompileCloudWatchEventEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/cloudWatchEvent');
-const Serverless = require('../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../lib/serverless');
 
 describe('awsCompileCloudWatchEventEvents', () => {
   let serverless;
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudWatchLog.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloudWatchLog.test.js
index 0a7e78a2d0a..a57cda56305 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudWatchLog.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloudWatchLog.test.js
@@ -3,7 +3,7 @@
 const expect = require('chai').expect;
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
 const AwsCompileCloudWatchLogEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/cloudWatchLog');
-const Serverless = require('../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../lib/serverless');
 
 describe('AwsCompileCloudWatchLogEvents', () => {
   let serverless;
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js b/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
index 238eca478aa..3eeb0144274 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
@@ -6,7 +6,7 @@ const sinon = require('sinon');
 const chai = require('chai');
 const proxyquire = require('proxyquire').noCallThru();
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../lib/serverless');
 const runServerless = require('../../../../../../../utils/run-serverless');
 
 const { expect } = chai;
diff --git a/test/unit/lib/plugins/aws/package/compile/events/iot.test.js b/test/unit/lib/plugins/aws/package/compile/events/iot.test.js
index 3ebb54ab5ea..1f65a8505b4 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/iot.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/iot.test.js
@@ -3,7 +3,7 @@
 const expect = require('chai').expect;
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
 const AwsCompileIoTEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/iot');
-const Serverless = require('../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../lib/serverless');
 
 describe('AwsCompileIoTEvents', () => {
   let serverless;
diff --git a/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
index 1a29816b14e..6e0beb23d4c 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
@@ -6,7 +6,7 @@ const sinon = require('sinon');
 const chai = require('chai');
 const proxyquire = require('proxyquire').noCallThru();
 const AwsProvider = require('../../../../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../lib/serverless');
 const runServerless = require('../../../../../../../../utils/run-serverless');
 
 const { expect } = chai;
diff --git a/test/unit/lib/plugins/aws/package/compile/events/sns.test.js b/test/unit/lib/plugins/aws/package/compile/events/sns.test.js
index 40693a3bd89..3527d95df4d 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/sns.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/sns.test.js
@@ -3,7 +3,7 @@
 const expect = require('chai').expect;
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
 const AwsCompileSNSEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/sns');
-const Serverless = require('../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../lib/serverless');
 
 describe('AwsCompileSNSEvents', () => {
   let serverless;
diff --git a/test/unit/lib/plugins/aws/package/compile/events/stream.test.js b/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
index 7459c8d18ea..0cad1d43c34 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
@@ -3,7 +3,7 @@
 const expect = require('chai').expect;
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
 const AwsCompileStreamEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/stream');
-const Serverless = require('../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../lib/serverless');
 const runServerless = require('../../../../../../../utils/run-serverless');
 
 describe('AwsCompileStreamEvents', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js
index ad6e74f0d8c..c02e3cf7a7b 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const AwsProvider = require('../../../../../../../../../lib/plugins/aws/provider');
 const AwsCompileWebsocketsEvents = require('../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
-const Serverless = require('../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../lib/serverless');
 const runServerless = require('../../../../../../../../utils/run-serverless');
 
 describe('AwsCompileWebsocketsEvents', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/authorizers.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/authorizers.test.js
index 0d1eacd2779..f112641be0e 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/authorizers.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/authorizers.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileWebsocketsEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileAuthorizers()', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/deployment.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/deployment.test.js
index 05443b93560..bee52bbcf7c 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/deployment.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/deployment.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileWebsocketsEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileDeployment()', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/integrations.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/integrations.test.js
index f7b577c0372..53e44a4d0b8 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/integrations.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/integrations.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileWebsocketsEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileIntegrations()', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/permissions.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/permissions.test.js
index 367d5a3f048..a795ebc5d3e 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/permissions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/permissions.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileWebsocketsEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compilePermissions()', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.test.js
index 3a921c58162..8c591aaf491 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileWebsocketsEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileRouteResponses()', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routes.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routes.test.js
index ddefee1bb95..69b2b094552 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routes.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routes.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileWebsocketsEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileRoutes()', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js
index b9686290b3e..5fdd6c37dbc 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js
@@ -8,7 +8,7 @@ const BbPromise = require('bluebird');
 const _ = require('lodash');
 const childProcess = BbPromise.promisifyAll(require('child_process'));
 const AwsCompileWebsocketsEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 const { createTmpDir } = require('../../../../../../../../../utils/fs');
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/validate.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/validate.test.js
index 41a9257e62b..48d5cd9c6c4 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/validate.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileWebsocketsEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 const runServerless = require('../../../../../../../../../utils/run-serverless');
 
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index 91de383bb04..59f21460249 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -9,7 +9,7 @@ const chai = require('chai');
 const sinon = require('sinon');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 const AwsCompileFunctions = require('../../../../../../../lib/plugins/aws/package/compile/functions');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 const runServerless = require('../../../../../../utils/run-serverless');
 const fixtures = require('../../../../../../fixtures/programmatic');
 const getHashForFilePath = require('../../../../../../../lib/plugins/aws/package/lib/getHashForFilePath');
diff --git a/test/unit/lib/plugins/aws/package/index.test.js b/test/unit/lib/plugins/aws/package/index.test.js
index 9358865ab83..1f21b55d1a2 100644
--- a/test/unit/lib/plugins/aws/package/index.test.js
+++ b/test/unit/lib/plugins/aws/package/index.test.js
@@ -2,7 +2,7 @@
 
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
 const AwsPackage = require('../../../../../../lib/plugins/aws/package/index');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 const CLI = require('../../../../../../lib/classes/CLI');
 const expect = require('chai').expect;
 const sinon = require('sinon');
diff --git a/test/unit/lib/plugins/aws/package/lib/generateArtifactDirectoryName.test.js b/test/unit/lib/plugins/aws/package/lib/generateArtifactDirectoryName.test.js
index f340fe43d55..1a3d47cd994 100644
--- a/test/unit/lib/plugins/aws/package/lib/generateArtifactDirectoryName.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/generateArtifactDirectoryName.test.js
@@ -3,7 +3,7 @@
 const expect = require('chai').expect;
 const AwsPackage = require('../../../../../../../lib/plugins/aws/package/index');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 
 describe('#generateArtifactDirectoryName()', () => {
   let serverless;
diff --git a/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js b/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
index 6f70246f41b..d47adba4307 100644
--- a/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
@@ -3,7 +3,7 @@
 const path = require('path');
 const expect = require('chai').expect;
 const AwsPackage = require('../../../../../../../lib/plugins/aws/package/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 const ServerlessError = require('../../../../../../../lib/serverless-error');
 
 describe('mergeCustomProviderResources', () => {
diff --git a/test/unit/lib/plugins/aws/package/lib/saveCompiledTemplate.test.js b/test/unit/lib/plugins/aws/package/lib/saveCompiledTemplate.test.js
index 493b262cb96..3cfedde920c 100644
--- a/test/unit/lib/plugins/aws/package/lib/saveCompiledTemplate.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/saveCompiledTemplate.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const path = require('path');
 const AwsPackage = require('../../../../../../../lib/plugins/aws/package/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 
 describe('#saveCompiledTemplate()', () => {
diff --git a/test/unit/lib/plugins/aws/package/lib/saveServiceState.test.js b/test/unit/lib/plugins/aws/package/lib/saveServiceState.test.js
index 5fa0b4e20ee..b466c077512 100644
--- a/test/unit/lib/plugins/aws/package/lib/saveServiceState.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/saveServiceState.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const path = require('path');
 const AwsPackage = require('../../../../../../../lib/plugins/aws/package/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 
 describe('#saveServiceState()', () => {
diff --git a/test/unit/lib/plugins/aws/provider.test.js b/test/unit/lib/plugins/aws/provider.test.js
index f2d2a889709..74fcd58c072 100644
--- a/test/unit/lib/plugins/aws/provider.test.js
+++ b/test/unit/lib/plugins/aws/provider.test.js
@@ -12,7 +12,7 @@ const sinon = require('sinon');
 const overrideEnv = require('process-utils/override-env');
 
 const AwsProvider = require('../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 const runServerless = require('../../../../utils/run-serverless');
 
 chai.use(require('chai-as-promised'));
diff --git a/test/unit/lib/plugins/aws/remove/lib/stack.test.js b/test/unit/lib/plugins/aws/remove/lib/stack.test.js
index c53bec98f9e..e3a06e9e52d 100644
--- a/test/unit/lib/plugins/aws/remove/lib/stack.test.js
+++ b/test/unit/lib/plugins/aws/remove/lib/stack.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 const AwsRemove = require('../../../../../../../lib/plugins/aws/remove/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 
 describe('removeStack', () => {
   const options = {
diff --git a/test/unit/lib/plugins/aws/rollback.test.js b/test/unit/lib/plugins/aws/rollback.test.js
index 1e4ce49ef50..57d5c473bb0 100644
--- a/test/unit/lib/plugins/aws/rollback.test.js
+++ b/test/unit/lib/plugins/aws/rollback.test.js
@@ -2,7 +2,7 @@
 
 const AwsProvider = require('../../../../../lib/plugins/aws/provider');
 const AwsRollback = require('../../../../../lib/plugins/aws/rollback');
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 const expect = require('chai').expect;
 const assert = require('chai').assert;
 const sinon = require('sinon');
diff --git a/test/unit/lib/plugins/aws/rollbackFunction.test.js b/test/unit/lib/plugins/aws/rollbackFunction.test.js
index 339e7518a95..f41280cb78f 100644
--- a/test/unit/lib/plugins/aws/rollbackFunction.test.js
+++ b/test/unit/lib/plugins/aws/rollbackFunction.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const sinon = require('sinon');
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 const AwsProvider = require('../../../../../lib/plugins/aws/provider');
 const CLI = require('../../../../../lib/classes/CLI');
 const proxyquire = require('proxyquire');
diff --git a/test/unit/lib/plugins/create/create.test.js b/test/unit/lib/plugins/create/create.test.js
index fd5a3437ed6..e39bef00397 100644
--- a/test/unit/lib/plugins/create/create.test.js
+++ b/test/unit/lib/plugins/create/create.test.js
@@ -5,7 +5,7 @@ const fs = require('fs');
 const path = require('path');
 const fse = require('fs-extra');
 const Create = require('../../../../../lib/plugins/create/create');
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 const sinon = require('sinon');
 const walkDirSync = require('../../../../../lib/utils/fs/walkDirSync');
 const download = require('../../../../../lib/utils/downloadTemplateFromRepo');
diff --git a/test/unit/lib/plugins/deploy.test.js b/test/unit/lib/plugins/deploy.test.js
index aa6b69627be..2e6c6bfcab1 100644
--- a/test/unit/lib/plugins/deploy.test.js
+++ b/test/unit/lib/plugins/deploy.test.js
@@ -3,7 +3,7 @@
 const BbPromise = require('bluebird');
 const chai = require('chai');
 const Deploy = require('../../../../lib/plugins/deploy');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 const sinon = require('sinon');
 
 // Configure chai
diff --git a/test/unit/lib/plugins/info.test.js b/test/unit/lib/plugins/info.test.js
index ff15634e2a0..97b67506c87 100644
--- a/test/unit/lib/plugins/info.test.js
+++ b/test/unit/lib/plugins/info.test.js
@@ -2,7 +2,7 @@
 
 const chai = require('chai');
 const Info = require('../../../../lib/plugins/info');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 
 const expect = chai.expect;
 chai.use(require('chai-as-promised'));
diff --git a/test/unit/lib/plugins/install.test.js b/test/unit/lib/plugins/install.test.js
index f5293f6510e..c956ee125cb 100644
--- a/test/unit/lib/plugins/install.test.js
+++ b/test/unit/lib/plugins/install.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const chai = require('chai');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 const Install = require('../../../../lib/plugins/install.js');
 const sinon = require('sinon');
 const download = require('../../../../lib/utils/downloadTemplateFromRepo');
diff --git a/test/unit/lib/plugins/invoke.test.js b/test/unit/lib/plugins/invoke.test.js
index 9afed54c409..4e802e28974 100644
--- a/test/unit/lib/plugins/invoke.test.js
+++ b/test/unit/lib/plugins/invoke.test.js
@@ -3,7 +3,7 @@
 const chai = require('chai');
 const overrideEnv = require('process-utils/override-env');
 const Invoke = require('../../../../lib/plugins/invoke');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 
 chai.use(require('chai-as-promised'));
 
diff --git a/test/unit/lib/plugins/metrics.test.js b/test/unit/lib/plugins/metrics.test.js
index a7155bf9c56..c5b14d53cda 100644
--- a/test/unit/lib/plugins/metrics.test.js
+++ b/test/unit/lib/plugins/metrics.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const Metrics = require('../../../../lib/plugins/metrics');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 
 describe('Metrics', () => {
   let metrics;
diff --git a/test/unit/lib/plugins/package/lib/zipService.test.js b/test/unit/lib/plugins/package/lib/zipService.test.js
index f2243faa31e..87ec28829db 100644
--- a/test/unit/lib/plugins/package/lib/zipService.test.js
+++ b/test/unit/lib/plugins/package/lib/zipService.test.js
@@ -13,7 +13,7 @@ const fs = BbPromise.promisifyAll(require('fs'));
 const childProcess = BbPromise.promisifyAll(require('child_process'));
 const sinon = require('sinon');
 const Package = require('../../../../../../lib/plugins/package/package');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 const { getTmpDirPath } = require('../../../../../utils/fs');
 
 // Configure chai
diff --git a/test/unit/lib/plugins/package/package.test.js b/test/unit/lib/plugins/package/package.test.js
index 175b319799e..03b5f74f1e2 100644
--- a/test/unit/lib/plugins/package/package.test.js
+++ b/test/unit/lib/plugins/package/package.test.js
@@ -2,7 +2,7 @@
 
 const chai = require('chai');
 const Package = require('../../../../../lib/plugins/package/package');
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 const sinon = require('sinon');
 
 // Configure chai
diff --git a/test/unit/lib/plugins/plugin/lib/utils.test.js b/test/unit/lib/plugins/plugin/lib/utils.test.js
index 14820aabf7b..c3c1da9bb13 100644
--- a/test/unit/lib/plugins/plugin/lib/utils.test.js
+++ b/test/unit/lib/plugins/plugin/lib/utils.test.js
@@ -5,7 +5,7 @@ const sinon = require('sinon');
 const BbPromise = require('bluebird');
 const proxyquire = require('proxyquire');
 const PluginList = require('../../../../../../lib/plugins/plugin/list');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 const CLI = require('../../../../../../lib/classes/CLI');
 const { expect } = require('chai');
 const observeOutput = require('@serverless/test/observe-output');
diff --git a/test/unit/lib/plugins/plugin/list.test.js b/test/unit/lib/plugins/plugin/list.test.js
index 3800db8a304..00d39d4144d 100644
--- a/test/unit/lib/plugins/plugin/list.test.js
+++ b/test/unit/lib/plugins/plugin/list.test.js
@@ -4,7 +4,7 @@ const chai = require('chai');
 const sinon = require('sinon');
 const BbPromise = require('bluebird');
 const PluginList = require('../../../../../lib/plugins/plugin/list');
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 const CLI = require('../../../../../lib/classes/CLI');
 chai.use(require('chai-as-promised'));
 const expect = require('chai').expect;
diff --git a/test/unit/lib/plugins/plugin/search.test.js b/test/unit/lib/plugins/plugin/search.test.js
index 4b0f6ff5441..ba43974b895 100644
--- a/test/unit/lib/plugins/plugin/search.test.js
+++ b/test/unit/lib/plugins/plugin/search.test.js
@@ -4,7 +4,7 @@ const chai = require('chai');
 const sinon = require('sinon');
 const BbPromise = require('bluebird');
 const PluginSearch = require('../../../../../lib/plugins/plugin/search');
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 const CLI = require('../../../../../lib/classes/CLI');
 chai.use(require('chai-as-promised'));
 const expect = require('chai').expect;
diff --git a/test/unit/lib/plugins/remove.test.js b/test/unit/lib/plugins/remove.test.js
index d7dd8a7176a..25ba1f1a542 100644
--- a/test/unit/lib/plugins/remove.test.js
+++ b/test/unit/lib/plugins/remove.test.js
@@ -2,7 +2,7 @@
 
 const chai = require('chai');
 const Remove = require('../../../../lib/plugins/remove');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 
 const expect = chai.expect;
 
diff --git a/test/unit/lib/plugins/rollback.test.js b/test/unit/lib/plugins/rollback.test.js
index d20fb3132f3..5157b8755d6 100644
--- a/test/unit/lib/plugins/rollback.test.js
+++ b/test/unit/lib/plugins/rollback.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const Rollback = require('../../../../lib/plugins/rollback');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 
 describe('Rollback', () => {
   let rollback;
diff --git a/test/unit/lib/plugins/slstats.test.js b/test/unit/lib/plugins/slstats.test.js
index 19402910777..4bcbb837bd3 100644
--- a/test/unit/lib/plugins/slstats.test.js
+++ b/test/unit/lib/plugins/slstats.test.js
@@ -3,7 +3,7 @@
 const expect = require('chai').expect;
 const sinon = require('sinon');
 const SlStats = require('../../../../lib/plugins/slstats');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 const config = require('@serverless/utils/config');
 
 describe('SlStats', () => {
diff --git a/test/unit/lib/Serverless.test.js b/test/unit/lib/serverless.test.js
similarity index 98%
rename from test/unit/lib/Serverless.test.js
rename to test/unit/lib/serverless.test.js
index e408c6466f3..e519d752a38 100644
--- a/test/unit/lib/Serverless.test.js
+++ b/test/unit/lib/serverless.test.js
@@ -6,7 +6,7 @@ chai.use(require('chai-as-promised'));
 
 const { expect } = chai;
 
-const Serverless = require('../../../lib/Serverless');
+const Serverless = require('../../../lib/serverless');
 const semverRegex = require('semver-regex');
 
 const YamlParser = require('../../../lib/classes/YamlParser');
@@ -155,7 +155,7 @@ describe('Serverless', () => {
   });
 });
 
-describe('test/unit/lib/Serverless.test.js', () => {
+describe('test/unit/lib/serverless.test.js', () => {
   describe('Legacy API interface', () => {
     let serverless;
 
diff --git a/test/unit/lib/utils/fs/writeFile.test.js b/test/unit/lib/utils/fs/writeFile.test.js
index d9e4f7535cf..034ff5fc9a2 100644
--- a/test/unit/lib/utils/fs/writeFile.test.js
+++ b/test/unit/lib/utils/fs/writeFile.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const fsp = require('fs').promises;
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 const chai = require('chai');
 const writeFile = require('../../../../../lib/utils/fs/writeFile');
 const readFile = require('../../../../../lib/utils/fs/readFile');
diff --git a/test/unit/lib/utils/fs/writeFileSync.test.js b/test/unit/lib/utils/fs/writeFileSync.test.js
index f0409567202..ba25440099b 100644
--- a/test/unit/lib/utils/fs/writeFileSync.test.js
+++ b/test/unit/lib/utils/fs/writeFileSync.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const fsp = require('fs').promises;
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 const writeFileSync = require('../../../../../lib/utils/fs/writeFileSync');
 const readFileSync = require('../../../../../lib/utils/fs/readFileSync');
 const { expect } = require('chai');
diff --git a/test/unit/lib/utils/renameService.test.js b/test/unit/lib/utils/renameService.test.js
index 9af5b2c9c44..826ef0ada67 100644
--- a/test/unit/lib/utils/renameService.test.js
+++ b/test/unit/lib/utils/renameService.test.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 const fse = require('fs-extra');
 const path = require('path');
 const { expect } = require('chai');

From 4a97648626c01a76fd2708da7e6accd59c31cb6b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 11:10:56 +0100
Subject: [PATCH 0969/1101] refactor: Rename `lib/classes/CLI.js`

---
 lib/classes/{CLI.js => cli.js}                          | 0
 lib/serverless.js                                       | 2 +-
 test/unit/lib/classes/PluginManager.test.js             | 2 +-
 test/unit/lib/classes/{CLI.test.js => cli.test.js}      | 2 +-
 test/unit/lib/plugins/aws/customResources/index.test.js | 2 +-
 test/unit/lib/plugins/aws/invokeLocal/index.test.js     | 2 +-
 test/unit/lib/plugins/aws/lib/monitorStack.test.js      | 2 +-
 test/unit/lib/plugins/aws/metrics.test.js               | 2 +-
 test/unit/lib/plugins/aws/package/index.test.js         | 2 +-
 test/unit/lib/plugins/aws/rollbackFunction.test.js      | 2 +-
 test/unit/lib/plugins/plugin/lib/utils.test.js          | 2 +-
 test/unit/lib/plugins/plugin/list.test.js               | 2 +-
 test/unit/lib/plugins/plugin/search.test.js             | 2 +-
 test/unit/lib/serverless.test.js                        | 2 +-
 14 files changed, 13 insertions(+), 13 deletions(-)
 rename lib/classes/{CLI.js => cli.js} (100%)
 rename test/unit/lib/classes/{CLI.test.js => cli.test.js} (95%)

diff --git a/lib/classes/CLI.js b/lib/classes/cli.js
similarity index 100%
rename from lib/classes/CLI.js
rename to lib/classes/cli.js
diff --git a/lib/serverless.js b/lib/serverless.js
index fcdc998395a..de3e3daf9de 100644
--- a/lib/serverless.js
+++ b/lib/serverless.js
@@ -8,7 +8,7 @@ const ensureArray = require('type/array/ensure');
 const ensureIterable = require('type/iterable/ensure');
 const isPlainObject = require('type/plain-object/is');
 const ensurePlainObject = require('type/plain-object/ensure');
-const CLI = require('./classes/CLI');
+const CLI = require('./classes/cli');
 const Config = require('./classes/Config');
 const YamlParser = require('./classes/YamlParser');
 const PluginManager = require('./classes/PluginManager');
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
index b294dbc3f92..f515a5f6256 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/PluginManager.test.js
@@ -9,7 +9,7 @@ const overrideArgv = require('process-utils/override-argv');
 const resolveAwsEnv = require('@serverless/test/resolve-env');
 const runServerless = require('../../../utils/run-serverless');
 const Serverless = require('../../../../lib/serverless');
-const CLI = require('../../../../lib/classes/CLI');
+const CLI = require('../../../../lib/classes/cli');
 const resolveInput = require('../../../../lib/cli/resolve-input');
 const Create = require('../../../../lib/plugins/create/create');
 const ServerlessError = require('../../../../lib/serverless-error');
diff --git a/test/unit/lib/classes/CLI.test.js b/test/unit/lib/classes/cli.test.js
similarity index 95%
rename from test/unit/lib/classes/CLI.test.js
rename to test/unit/lib/classes/cli.test.js
index 280a4dbd083..5ac76a806d5 100644
--- a/test/unit/lib/classes/CLI.test.js
+++ b/test/unit/lib/classes/cli.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const chai = require('chai');
-const CLI = require('../../../../lib/classes/CLI');
+const CLI = require('../../../../lib/classes/cli');
 const Serverless = require('../../../../lib/serverless');
 
 const { expect } = chai;
diff --git a/test/unit/lib/plugins/aws/customResources/index.test.js b/test/unit/lib/plugins/aws/customResources/index.test.js
index 15eced710c1..1a5cfe55531 100644
--- a/test/unit/lib/plugins/aws/customResources/index.test.js
+++ b/test/unit/lib/plugins/aws/customResources/index.test.js
@@ -6,7 +6,7 @@ const chai = require('chai');
 const BbPromise = require('bluebird');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
 const Serverless = require('../../../../../../lib/serverless');
-const CLI = require('../../../../../../lib/classes/CLI');
+const CLI = require('../../../../../../lib/classes/cli');
 const { createTmpDir } = require('../../../../../utils/fs');
 const {
   addCustomResourceToService,
diff --git a/test/unit/lib/plugins/aws/invokeLocal/index.test.js b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
index ed3581fd982..700af051bf7 100644
--- a/test/unit/lib/plugins/aws/invokeLocal/index.test.js
+++ b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
@@ -9,7 +9,7 @@ const proxyquire = require('proxyquire');
 const overrideEnv = require('process-utils/override-env');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
 const Serverless = require('../../../../../../lib/serverless');
-const CLI = require('../../../../../../lib/classes/CLI');
+const CLI = require('../../../../../../lib/classes/cli');
 const { getTmpDirPath } = require('../../../../../utils/fs');
 const skipWithNotice = require('@serverless/test/skip-with-notice');
 const runServerless = require('../../../../../utils/run-serverless');
diff --git a/test/unit/lib/plugins/aws/lib/monitorStack.test.js b/test/unit/lib/plugins/aws/lib/monitorStack.test.js
index 7f1cc5ecc19..ef16bfe2753 100644
--- a/test/unit/lib/plugins/aws/lib/monitorStack.test.js
+++ b/test/unit/lib/plugins/aws/lib/monitorStack.test.js
@@ -4,7 +4,7 @@ const chai = require('chai');
 const sinon = require('sinon');
 const Serverless = require('../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const CLI = require('../../../../../../lib/classes/CLI');
+const CLI = require('../../../../../../lib/classes/cli');
 const monitorStack = require('../../../../../../lib/plugins/aws/lib/monitorStack');
 
 chai.use(require('chai-as-promised'));
diff --git a/test/unit/lib/plugins/aws/metrics.test.js b/test/unit/lib/plugins/aws/metrics.test.js
index a59393f2c33..4e982c11676 100644
--- a/test/unit/lib/plugins/aws/metrics.test.js
+++ b/test/unit/lib/plugins/aws/metrics.test.js
@@ -5,7 +5,7 @@ const sinon = require('sinon');
 const AwsProvider = require('../../../../../lib/plugins/aws/provider');
 const AwsMetrics = require('../../../../../lib/plugins/aws/metrics');
 const Serverless = require('../../../../../lib/serverless');
-const CLI = require('../../../../../lib/classes/CLI');
+const CLI = require('../../../../../lib/classes/cli');
 const dayjs = require('dayjs');
 
 const LocalizedFormat = require('dayjs/plugin/localizedFormat');
diff --git a/test/unit/lib/plugins/aws/package/index.test.js b/test/unit/lib/plugins/aws/package/index.test.js
index 1f21b55d1a2..1109bcde540 100644
--- a/test/unit/lib/plugins/aws/package/index.test.js
+++ b/test/unit/lib/plugins/aws/package/index.test.js
@@ -3,7 +3,7 @@
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
 const AwsPackage = require('../../../../../../lib/plugins/aws/package/index');
 const Serverless = require('../../../../../../lib/serverless');
-const CLI = require('../../../../../../lib/classes/CLI');
+const CLI = require('../../../../../../lib/classes/cli');
 const expect = require('chai').expect;
 const sinon = require('sinon');
 const path = require('path');
diff --git a/test/unit/lib/plugins/aws/rollbackFunction.test.js b/test/unit/lib/plugins/aws/rollbackFunction.test.js
index f41280cb78f..0c44be38887 100644
--- a/test/unit/lib/plugins/aws/rollbackFunction.test.js
+++ b/test/unit/lib/plugins/aws/rollbackFunction.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const Serverless = require('../../../../../lib/serverless');
 const AwsProvider = require('../../../../../lib/plugins/aws/provider');
-const CLI = require('../../../../../lib/classes/CLI');
+const CLI = require('../../../../../lib/classes/cli');
 const proxyquire = require('proxyquire');
 
 describe('AwsRollbackFunction', () => {
diff --git a/test/unit/lib/plugins/plugin/lib/utils.test.js b/test/unit/lib/plugins/plugin/lib/utils.test.js
index c3c1da9bb13..4ba25dfd6e2 100644
--- a/test/unit/lib/plugins/plugin/lib/utils.test.js
+++ b/test/unit/lib/plugins/plugin/lib/utils.test.js
@@ -6,7 +6,7 @@ const BbPromise = require('bluebird');
 const proxyquire = require('proxyquire');
 const PluginList = require('../../../../../../lib/plugins/plugin/list');
 const Serverless = require('../../../../../../lib/serverless');
-const CLI = require('../../../../../../lib/classes/CLI');
+const CLI = require('../../../../../../lib/classes/cli');
 const { expect } = require('chai');
 const observeOutput = require('@serverless/test/observe-output');
 
diff --git a/test/unit/lib/plugins/plugin/list.test.js b/test/unit/lib/plugins/plugin/list.test.js
index 00d39d4144d..d65853a6762 100644
--- a/test/unit/lib/plugins/plugin/list.test.js
+++ b/test/unit/lib/plugins/plugin/list.test.js
@@ -5,7 +5,7 @@ const sinon = require('sinon');
 const BbPromise = require('bluebird');
 const PluginList = require('../../../../../lib/plugins/plugin/list');
 const Serverless = require('../../../../../lib/serverless');
-const CLI = require('../../../../../lib/classes/CLI');
+const CLI = require('../../../../../lib/classes/cli');
 chai.use(require('chai-as-promised'));
 const expect = require('chai').expect;
 
diff --git a/test/unit/lib/plugins/plugin/search.test.js b/test/unit/lib/plugins/plugin/search.test.js
index ba43974b895..8273275878a 100644
--- a/test/unit/lib/plugins/plugin/search.test.js
+++ b/test/unit/lib/plugins/plugin/search.test.js
@@ -5,7 +5,7 @@ const sinon = require('sinon');
 const BbPromise = require('bluebird');
 const PluginSearch = require('../../../../../lib/plugins/plugin/search');
 const Serverless = require('../../../../../lib/serverless');
-const CLI = require('../../../../../lib/classes/CLI');
+const CLI = require('../../../../../lib/classes/cli');
 chai.use(require('chai-as-promised'));
 const expect = require('chai').expect;
 
diff --git a/test/unit/lib/serverless.test.js b/test/unit/lib/serverless.test.js
index e519d752a38..3c861fc6f71 100644
--- a/test/unit/lib/serverless.test.js
+++ b/test/unit/lib/serverless.test.js
@@ -14,7 +14,7 @@ const PluginManager = require('../../../lib/classes/PluginManager');
 const Utils = require('../../../lib/classes/Utils');
 const Service = require('../../../lib/classes/Service');
 const ConfigSchemaHandler = require('../../../lib/classes/ConfigSchemaHandler');
-const CLI = require('../../../lib/classes/CLI');
+const CLI = require('../../../lib/classes/cli');
 const ServerlessError = require('../../../lib/serverless-error');
 const runServerless = require('../../utils/run-serverless');
 

From 63961a537fe2c069d4b894c507c376c359b98acc Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 11:11:59 +0100
Subject: [PATCH 0970/1101] refactor: Rename `lib/classes/Config.js`

---
 lib/classes/{Config.js => config.js}                     | 0
 lib/serverless.js                                        | 2 +-
 test/unit/lib/classes/{Config.test.js => config.test.js} | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/classes/{Config.js => config.js} (100%)
 rename test/unit/lib/classes/{Config.test.js => config.test.js} (94%)

diff --git a/lib/classes/Config.js b/lib/classes/config.js
similarity index 100%
rename from lib/classes/Config.js
rename to lib/classes/config.js
diff --git a/lib/serverless.js b/lib/serverless.js
index de3e3daf9de..c5fe13d95cc 100644
--- a/lib/serverless.js
+++ b/lib/serverless.js
@@ -9,7 +9,7 @@ const ensureIterable = require('type/iterable/ensure');
 const isPlainObject = require('type/plain-object/is');
 const ensurePlainObject = require('type/plain-object/ensure');
 const CLI = require('./classes/cli');
-const Config = require('./classes/Config');
+const Config = require('./classes/config');
 const YamlParser = require('./classes/YamlParser');
 const PluginManager = require('./classes/PluginManager');
 const Utils = require('./classes/Utils');
diff --git a/test/unit/lib/classes/Config.test.js b/test/unit/lib/classes/config.test.js
similarity index 94%
rename from test/unit/lib/classes/Config.test.js
rename to test/unit/lib/classes/config.test.js
index 0fafeaadbc0..af2be027f67 100644
--- a/test/unit/lib/classes/Config.test.js
+++ b/test/unit/lib/classes/config.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const Config = require('../../../../lib/classes/Config');
+const Config = require('../../../../lib/classes/config');
 const Serverless = require('../../../../lib/serverless');
 
 const serverless = new Serverless({ commands: [], options: {} });

From b587edfc6f6beb4f03b3e9de7d50dc0a004e80c0 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 11:14:50 +0100
Subject: [PATCH 0971/1101] refactor: Remove `lib/classes/Error.js`

---
 lib/classes/Error.js   | 8 --------
 lib/classes/Service.js | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 lib/classes/Error.js

diff --git a/lib/classes/Error.js b/lib/classes/Error.js
deleted file mode 100644
index 73d52a3e479..00000000000
--- a/lib/classes/Error.js
+++ /dev/null
@@ -1,8 +0,0 @@
-'use strict';
-
-const ServerlessError = require('../serverless-error');
-
-module.exports.ServerlessError = ServerlessError;
-
-// Deprecated - use ServerlessError instead
-module.exports.SError = ServerlessError;
diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index 19aa5242b47..5180514c5ca 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { ServerlessError } = require('./Error');
+const ServerlessError = require('../serverless-error');
 const util = require('util');
 const _ = require('lodash');
 const semver = require('semver');

From bd7dece8cee853379cab3ce76812abe35690da92 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 11:31:57 +0100
Subject: [PATCH 0972/1101] refactor: Rename `lib/classes/Service.js`

---
 lib/classes/{Service.js => service.js}                     | 0
 lib/plugins/aws/lib/naming.js                              | 2 +-
 lib/serverless.js                                          | 2 +-
 test/unit/lib/classes/{Service.test.js => service.test.js} | 0
 test/unit/lib/serverless.test.js                           | 2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/classes/{Service.js => service.js} (100%)
 rename test/unit/lib/classes/{Service.test.js => service.test.js} (100%)

diff --git a/lib/classes/Service.js b/lib/classes/service.js
similarity index 100%
rename from lib/classes/Service.js
rename to lib/classes/service.js
diff --git a/lib/plugins/aws/lib/naming.js b/lib/plugins/aws/lib/naming.js
index 0fad307f649..d6fdd19c666 100644
--- a/lib/plugins/aws/lib/naming.js
+++ b/lib/plugins/aws/lib/naming.js
@@ -143,7 +143,7 @@ module.exports = {
   extractAuthorizerNameFromArn(functionArn) {
     const splitArn = functionArn.split(':');
     // TODO the following two lines assumes default function naming?  Is there a better way?
-    // TODO (see ~/lib/classes/Service.js:~155)
+    // TODO (see ~/lib/classes/service.js:~155)
     const splitName = splitArn[splitArn.length - 1].split('-');
     return splitName[splitName.length - 1];
   },
diff --git a/lib/serverless.js b/lib/serverless.js
index c5fe13d95cc..a66eb37be88 100644
--- a/lib/serverless.js
+++ b/lib/serverless.js
@@ -13,7 +13,7 @@ const Config = require('./classes/config');
 const YamlParser = require('./classes/YamlParser');
 const PluginManager = require('./classes/PluginManager');
 const Utils = require('./classes/Utils');
-const Service = require('./classes/Service');
+const Service = require('./classes/service');
 const ConfigSchemaHandler = require('./classes/ConfigSchemaHandler');
 const ServerlessError = require('./serverless-error');
 const version = require('./../package.json').version;
diff --git a/test/unit/lib/classes/Service.test.js b/test/unit/lib/classes/service.test.js
similarity index 100%
rename from test/unit/lib/classes/Service.test.js
rename to test/unit/lib/classes/service.test.js
diff --git a/test/unit/lib/serverless.test.js b/test/unit/lib/serverless.test.js
index 3c861fc6f71..86e883ae5bf 100644
--- a/test/unit/lib/serverless.test.js
+++ b/test/unit/lib/serverless.test.js
@@ -12,7 +12,7 @@ const semverRegex = require('semver-regex');
 const YamlParser = require('../../../lib/classes/YamlParser');
 const PluginManager = require('../../../lib/classes/PluginManager');
 const Utils = require('../../../lib/classes/Utils');
-const Service = require('../../../lib/classes/Service');
+const Service = require('../../../lib/classes/service');
 const ConfigSchemaHandler = require('../../../lib/classes/ConfigSchemaHandler');
 const CLI = require('../../../lib/classes/cli');
 const ServerlessError = require('../../../lib/serverless-error');

From 391acb1a74bd6d01049819acbdc788e5535b8c79 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:13:01 +0100
Subject: [PATCH 0973/1101] refactor: Rename `lib/classes/Utils.js`

---
 lib/classes/{Utils.js => utils.js}                     | 0
 lib/serverless.js                                      | 2 +-
 test/unit/lib/classes/{Utils.test.js => utils.test.js} | 2 +-
 test/unit/lib/serverless.test.js                       | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/classes/{Utils.js => utils.js} (100%)
 rename test/unit/lib/classes/{Utils.test.js => utils.test.js} (99%)

diff --git a/lib/classes/Utils.js b/lib/classes/utils.js
similarity index 100%
rename from lib/classes/Utils.js
rename to lib/classes/utils.js
diff --git a/lib/serverless.js b/lib/serverless.js
index a66eb37be88..3bcd8399335 100644
--- a/lib/serverless.js
+++ b/lib/serverless.js
@@ -12,7 +12,7 @@ const CLI = require('./classes/cli');
 const Config = require('./classes/config');
 const YamlParser = require('./classes/YamlParser');
 const PluginManager = require('./classes/PluginManager');
-const Utils = require('./classes/Utils');
+const Utils = require('./classes/utils');
 const Service = require('./classes/service');
 const ConfigSchemaHandler = require('./classes/ConfigSchemaHandler');
 const ServerlessError = require('./serverless-error');
diff --git a/test/unit/lib/classes/Utils.test.js b/test/unit/lib/classes/utils.test.js
similarity index 99%
rename from test/unit/lib/classes/Utils.test.js
rename to test/unit/lib/classes/utils.test.js
index c7401ed8dcc..29f43bdbd7f 100644
--- a/test/unit/lib/classes/Utils.test.js
+++ b/test/unit/lib/classes/utils.test.js
@@ -5,7 +5,7 @@ const os = require('os');
 const chai = require('chai');
 const fse = require('fs-extra');
 const Serverless = require('../../../../lib/serverless');
-const Utils = require('../../../../lib/classes/Utils');
+const Utils = require('../../../../lib/classes/utils');
 const { expect } = require('chai');
 const { getTmpFilePath, getTmpDirPath } = require('../../../utils/fs');
 
diff --git a/test/unit/lib/serverless.test.js b/test/unit/lib/serverless.test.js
index 86e883ae5bf..00a5d1569b8 100644
--- a/test/unit/lib/serverless.test.js
+++ b/test/unit/lib/serverless.test.js
@@ -11,7 +11,7 @@ const semverRegex = require('semver-regex');
 
 const YamlParser = require('../../../lib/classes/YamlParser');
 const PluginManager = require('../../../lib/classes/PluginManager');
-const Utils = require('../../../lib/classes/Utils');
+const Utils = require('../../../lib/classes/utils');
 const Service = require('../../../lib/classes/service');
 const ConfigSchemaHandler = require('../../../lib/classes/ConfigSchemaHandler');
 const CLI = require('../../../lib/classes/cli');

From 7207f5dce86f462f650f6515745f18925cb5bdaa Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:19:27 +0100
Subject: [PATCH 0974/1101] refactor: Rename
 `lib/plugins/aws/invokeLocal/runtimeWrappers`

---
 lib/plugins/aws/invokeLocal/.gitignore                    | 8 ++++----
 lib/plugins/aws/invokeLocal/index.js                      | 6 +++---
 .../{runtimeWrappers => runtime-wrappers}/invoke.py       | 0
 .../{runtimeWrappers => runtime-wrappers}/invoke.rb       | 0
 .../java/MANIFEST.mf                                      | 0
 .../{runtimeWrappers => runtime-wrappers}/java/pom.xml    | 0
 .../java/src/main/java/com/serverless/Context.java        | 0
 .../java/src/main/java/com/serverless/InvokeBridge.java   | 0
 .../java/src/main/java/com/serverless/LambdaLogger.java   | 0
 .../main/java/com/serverless/mapper/AbstractMapper.java   | 0
 .../java/com/serverless/mapper/DefaultEventMapper.java    | 0
 .../main/java/com/serverless/mapper/DefaultMapper.java    | 0
 .../main/java/com/serverless/mapper/HashMapWrapper.java   | 0
 .../java/src/main/java/com/serverless/mapper/Mapper.java  | 0
 .../main/java/com/serverless/mapper/MapperFactory.java    | 0
 .../main/java/com/serverless/mapper/S3EventMapper.java    | 0
 .../test/java/com/serverless/AbstractRequestHandler.java  | 0
 .../test/java/com/serverless/ConcreteRequestHandler.java  | 0
 .../java/com/serverless/InvokeBridgeInheritanceTest.java  | 0
 .../src/test/java/com/serverless/InvokeBridgeTest.java    | 0
 .../java/src/test/java/com/serverless/RequestHandler.java | 0
 .../RequestHandlerAPIGatewayProxyRequestEvent.java        | 0
 .../serverless/RequestHandlerAPIGatewayV2HTTPEvent.java   | 0
 .../RequestHandlerAPIGatewayV2WebSocketEvent.java         | 0
 ...RequestHandlerApplicationLoadBalancerRequestEvent.java | 0
 .../com/serverless/RequestHandlerCloudFrontEvent.java     | 0
 .../com/serverless/RequestHandlerCloudWatchLogsEvent.java | 0
 .../com/serverless/RequestHandlerCodeCommitEvent.java     | 0
 .../java/com/serverless/RequestHandlerCognitoEvent.java   | 0
 .../java/com/serverless/RequestHandlerConfigEvent.java    | 0
 .../java/com/serverless/RequestHandlerDynamodbEvent.java  | 0
 .../java/com/serverless/RequestHandlerIoTButtonEvent.java | 0
 .../java/com/serverless/RequestHandlerKinesisEvent.java   | 0
 .../serverless/RequestHandlerKinesisFirehoseEvent.java    | 0
 .../test/java/com/serverless/RequestHandlerLexEvent.java  | 0
 .../test/java/com/serverless/RequestHandlerS3Event.java   | 0
 .../test/java/com/serverless/RequestHandlerSNSEvent.java  | 0
 .../test/java/com/serverless/RequestHandlerSQSEvent.java  | 0
 .../java/com/serverless/RequestHandlerScheduledEvent.java | 0
 .../test/java/com/serverless/RequestStreamHandler.java    | 0
 .../test/resources/api-gateway-proxy-request-event.json   | 0
 .../src/test/resources/api-gateway-v2-http-event.json     | 0
 .../test/resources/api-gateway-v2-websocket-event.json    | 0
 .../application-load-balancer-request-event.json          | 0
 .../java/src/test/resources/cloud-front-event.json        | 0
 .../test/resources/cloud-watch-logs-event-decoded.json    | 0
 .../java/src/test/resources/cloud-watch-logs-event.json   | 0
 .../java/src/test/resources/code-commit-event.json        | 0
 .../java/src/test/resources/cognito-event.json            | 0
 .../java/src/test/resources/config-event.json             | 0
 .../java/src/test/resources/dynamo-event.json             | 0
 .../java/src/test/resources/iot-button-event.json         | 0
 .../java/src/test/resources/kinesis-event.json            | 0
 .../java/src/test/resources/kinesis-firehose-event.json   | 0
 .../java/src/test/resources/lex-event.json                | 0
 .../java/src/test/resources/s3-event.json                 | 0
 .../java/src/test/resources/scheduled-event.json          | 0
 .../java/src/test/resources/sns-event.json                | 0
 .../java/src/test/resources/sqs-event.json                | 0
 .../java/src/test/resources/test.json                     | 0
 scripts/pkg/config.js                                     | 2 +-
 61 files changed, 8 insertions(+), 8 deletions(-)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/invoke.py (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/invoke.rb (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/MANIFEST.mf (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/pom.xml (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/main/java/com/serverless/Context.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/main/java/com/serverless/InvokeBridge.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/main/java/com/serverless/LambdaLogger.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/main/java/com/serverless/mapper/AbstractMapper.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/main/java/com/serverless/mapper/DefaultEventMapper.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/main/java/com/serverless/mapper/DefaultMapper.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/main/java/com/serverless/mapper/HashMapWrapper.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/main/java/com/serverless/mapper/Mapper.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/main/java/com/serverless/mapper/MapperFactory.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/main/java/com/serverless/mapper/S3EventMapper.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/AbstractRequestHandler.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/ConcreteRequestHandler.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/InvokeBridgeInheritanceTest.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/InvokeBridgeTest.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/RequestHandler.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/RequestHandlerAPIGatewayProxyRequestEvent.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2HTTPEvent.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2WebSocketEvent.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/RequestHandlerApplicationLoadBalancerRequestEvent.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/RequestHandlerCloudFrontEvent.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/RequestHandlerCloudWatchLogsEvent.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/RequestHandlerCodeCommitEvent.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/RequestHandlerCognitoEvent.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/RequestHandlerConfigEvent.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/RequestHandlerDynamodbEvent.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/RequestHandlerIoTButtonEvent.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/RequestHandlerKinesisEvent.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/RequestHandlerKinesisFirehoseEvent.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/RequestHandlerLexEvent.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/RequestHandlerS3Event.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/RequestHandlerSNSEvent.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/RequestHandlerSQSEvent.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/RequestHandlerScheduledEvent.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/java/com/serverless/RequestStreamHandler.java (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/resources/api-gateway-proxy-request-event.json (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/resources/api-gateway-v2-http-event.json (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/resources/api-gateway-v2-websocket-event.json (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/resources/application-load-balancer-request-event.json (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/resources/cloud-front-event.json (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/resources/cloud-watch-logs-event-decoded.json (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/resources/cloud-watch-logs-event.json (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/resources/code-commit-event.json (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/resources/cognito-event.json (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/resources/config-event.json (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/resources/dynamo-event.json (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/resources/iot-button-event.json (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/resources/kinesis-event.json (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/resources/kinesis-firehose-event.json (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/resources/lex-event.json (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/resources/s3-event.json (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/resources/scheduled-event.json (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/resources/sns-event.json (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/resources/sqs-event.json (100%)
 rename lib/plugins/aws/invokeLocal/{runtimeWrappers => runtime-wrappers}/java/src/test/resources/test.json (100%)

diff --git a/lib/plugins/aws/invokeLocal/.gitignore b/lib/plugins/aws/invokeLocal/.gitignore
index 4a2ef9ce0f7..3d0f114e1c1 100644
--- a/lib/plugins/aws/invokeLocal/.gitignore
+++ b/lib/plugins/aws/invokeLocal/.gitignore
@@ -1,5 +1,5 @@
 *.pyc
-runtimeWrappers/java/target
-runtimeWrappers/java/.project
-runtimeWrappers/java/.settings
-runtimeWrappers/java/.classpath
+runtime-wrappers/java/target
+runtime-wrappers/java/.project
+runtime-wrappers/java/.settings
+runtime-wrappers/java/.classpath
diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invokeLocal/index.js
index 36713ad0e2f..2768504b3bb 100644
--- a/lib/plugins/aws/invokeLocal/index.js
+++ b/lib/plugins/aws/invokeLocal/index.js
@@ -32,8 +32,8 @@ const dockerProgress = progress.get('invokeLocalDocker');
 
 const ensureRuntimeWrappers = isStandalone
   ? async () =>
-      ensureArtifact('runtimeWrappers/validationFile', async (runtimeCachePath) => {
-        await fse.copy(path.resolve(__dirname, 'runtimeWrappers'), runtimeCachePath);
+      ensureArtifact('runtime-wrappers/validationFile', async (runtimeCachePath) => {
+        await fse.copy(path.resolve(__dirname, 'runtime-wrappers'), runtimeCachePath);
         return fse.ensureFile(path.resolve(runtimeCachePath, 'validationFile'));
       })
   : () => __dirname;
@@ -61,7 +61,7 @@ class AwsInvokeLocal {
 
   async resolveRuntimeWrapperPath(filename) {
     const artifactsPath = await ensureRuntimeWrappers();
-    return path.resolve(artifactsPath, 'runtimeWrappers', filename);
+    return path.resolve(artifactsPath, 'runtime-wrappers', filename);
   }
 
   async validateFile(filePath, key) {
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/invoke.py b/lib/plugins/aws/invokeLocal/runtime-wrappers/invoke.py
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/invoke.py
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/invoke.py
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/invoke.rb b/lib/plugins/aws/invokeLocal/runtime-wrappers/invoke.rb
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/invoke.rb
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/invoke.rb
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/MANIFEST.mf b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/MANIFEST.mf
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/MANIFEST.mf
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/MANIFEST.mf
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/pom.xml b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/pom.xml
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/pom.xml
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/pom.xml
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/Context.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/Context.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/Context.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/Context.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/InvokeBridge.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/InvokeBridge.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/InvokeBridge.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/InvokeBridge.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/LambdaLogger.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/LambdaLogger.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/LambdaLogger.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/LambdaLogger.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/AbstractMapper.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/AbstractMapper.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/AbstractMapper.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/AbstractMapper.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/DefaultEventMapper.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/DefaultEventMapper.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/DefaultEventMapper.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/DefaultEventMapper.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/DefaultMapper.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/DefaultMapper.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/DefaultMapper.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/DefaultMapper.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/HashMapWrapper.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/HashMapWrapper.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/HashMapWrapper.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/HashMapWrapper.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/Mapper.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/Mapper.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/Mapper.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/Mapper.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/MapperFactory.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/MapperFactory.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/MapperFactory.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/MapperFactory.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/S3EventMapper.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/S3EventMapper.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/S3EventMapper.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/S3EventMapper.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/AbstractRequestHandler.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/AbstractRequestHandler.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/AbstractRequestHandler.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/AbstractRequestHandler.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/ConcreteRequestHandler.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/ConcreteRequestHandler.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/ConcreteRequestHandler.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/ConcreteRequestHandler.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/InvokeBridgeInheritanceTest.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/InvokeBridgeInheritanceTest.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/InvokeBridgeInheritanceTest.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/InvokeBridgeInheritanceTest.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/InvokeBridgeTest.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/InvokeBridgeTest.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/InvokeBridgeTest.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/InvokeBridgeTest.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandler.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandler.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandler.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandler.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayProxyRequestEvent.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayProxyRequestEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayProxyRequestEvent.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayProxyRequestEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2HTTPEvent.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2HTTPEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2HTTPEvent.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2HTTPEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2WebSocketEvent.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2WebSocketEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2WebSocketEvent.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2WebSocketEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerApplicationLoadBalancerRequestEvent.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerApplicationLoadBalancerRequestEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerApplicationLoadBalancerRequestEvent.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerApplicationLoadBalancerRequestEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerCloudFrontEvent.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCloudFrontEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerCloudFrontEvent.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCloudFrontEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerCloudWatchLogsEvent.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCloudWatchLogsEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerCloudWatchLogsEvent.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCloudWatchLogsEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerCodeCommitEvent.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCodeCommitEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerCodeCommitEvent.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCodeCommitEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerCognitoEvent.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCognitoEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerCognitoEvent.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCognitoEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerConfigEvent.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerConfigEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerConfigEvent.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerConfigEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerDynamodbEvent.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerDynamodbEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerDynamodbEvent.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerDynamodbEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerIoTButtonEvent.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerIoTButtonEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerIoTButtonEvent.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerIoTButtonEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerKinesisEvent.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerKinesisEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerKinesisEvent.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerKinesisEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerKinesisFirehoseEvent.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerKinesisFirehoseEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerKinesisFirehoseEvent.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerKinesisFirehoseEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerLexEvent.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerLexEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerLexEvent.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerLexEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerS3Event.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerS3Event.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerS3Event.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerS3Event.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerSNSEvent.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerSNSEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerSNSEvent.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerSNSEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerSQSEvent.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerSQSEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerSQSEvent.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerSQSEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerScheduledEvent.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerScheduledEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerScheduledEvent.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerScheduledEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestStreamHandler.java b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestStreamHandler.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestStreamHandler.java
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestStreamHandler.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/api-gateway-proxy-request-event.json b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/api-gateway-proxy-request-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/api-gateway-proxy-request-event.json
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/api-gateway-proxy-request-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/api-gateway-v2-http-event.json b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/api-gateway-v2-http-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/api-gateway-v2-http-event.json
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/api-gateway-v2-http-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/api-gateway-v2-websocket-event.json b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/api-gateway-v2-websocket-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/api-gateway-v2-websocket-event.json
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/api-gateway-v2-websocket-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/application-load-balancer-request-event.json b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/application-load-balancer-request-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/application-load-balancer-request-event.json
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/application-load-balancer-request-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/cloud-front-event.json b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/cloud-front-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/cloud-front-event.json
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/cloud-front-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/cloud-watch-logs-event-decoded.json b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/cloud-watch-logs-event-decoded.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/cloud-watch-logs-event-decoded.json
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/cloud-watch-logs-event-decoded.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/cloud-watch-logs-event.json b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/cloud-watch-logs-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/cloud-watch-logs-event.json
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/cloud-watch-logs-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/code-commit-event.json b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/code-commit-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/code-commit-event.json
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/code-commit-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/cognito-event.json b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/cognito-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/cognito-event.json
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/cognito-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/config-event.json b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/config-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/config-event.json
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/config-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/dynamo-event.json b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/dynamo-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/dynamo-event.json
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/dynamo-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/iot-button-event.json b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/iot-button-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/iot-button-event.json
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/iot-button-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/kinesis-event.json b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/kinesis-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/kinesis-event.json
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/kinesis-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/kinesis-firehose-event.json b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/kinesis-firehose-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/kinesis-firehose-event.json
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/kinesis-firehose-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/lex-event.json b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/lex-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/lex-event.json
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/lex-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/s3-event.json b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/s3-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/s3-event.json
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/s3-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/scheduled-event.json b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/scheduled-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/scheduled-event.json
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/scheduled-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/sns-event.json b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/sns-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/sns-event.json
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/sns-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/sqs-event.json b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/sqs-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/sqs-event.json
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/sqs-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/test.json b/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/test.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/test.json
rename to lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/test.json
diff --git a/scripts/pkg/config.js b/scripts/pkg/config.js
index 8109e4bf875..d4445856c7a 100644
--- a/scripts/pkg/config.js
+++ b/scripts/pkg/config.js
@@ -14,7 +14,7 @@ module.exports = {
     // Service templates
     '../../lib/plugins/create/templates',
     // Local invocation artifacts
-    '../../lib/plugins/aws/invokeLocal/runtimeWrappers',
+    '../../lib/plugins/aws/invokeLocal/runtime-wrappers',
     // Dashboard policies
     '../../node_modules/@serverless/dashboard-plugin/lib/safeguards/policies',
     // Dashboard wrappers

From d3d55dfcfc9494b24d569555bd18250dceb00aa4 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:22:04 +0100
Subject: [PATCH 0975/1101] refactor: Rename `lib/plugins/aws/invokeLocal`

---
 lib/plugins/aws/{invokeLocal => invoke-local}/.gitignore      | 0
 lib/plugins/aws/{invokeLocal => invoke-local}/index.js        | 0
 .../{invokeLocal => invoke-local}/runtime-wrappers/invoke.py  | 0
 .../{invokeLocal => invoke-local}/runtime-wrappers/invoke.rb  | 0
 .../runtime-wrappers/java/MANIFEST.mf                         | 0
 .../runtime-wrappers/java/pom.xml                             | 0
 .../java/src/main/java/com/serverless/Context.java            | 0
 .../java/src/main/java/com/serverless/InvokeBridge.java       | 0
 .../java/src/main/java/com/serverless/LambdaLogger.java       | 0
 .../src/main/java/com/serverless/mapper/AbstractMapper.java   | 0
 .../main/java/com/serverless/mapper/DefaultEventMapper.java   | 0
 .../src/main/java/com/serverless/mapper/DefaultMapper.java    | 0
 .../src/main/java/com/serverless/mapper/HashMapWrapper.java   | 0
 .../java/src/main/java/com/serverless/mapper/Mapper.java      | 0
 .../src/main/java/com/serverless/mapper/MapperFactory.java    | 0
 .../src/main/java/com/serverless/mapper/S3EventMapper.java    | 0
 .../src/test/java/com/serverless/AbstractRequestHandler.java  | 0
 .../src/test/java/com/serverless/ConcreteRequestHandler.java  | 0
 .../test/java/com/serverless/InvokeBridgeInheritanceTest.java | 0
 .../java/src/test/java/com/serverless/InvokeBridgeTest.java   | 0
 .../java/src/test/java/com/serverless/RequestHandler.java     | 0
 .../serverless/RequestHandlerAPIGatewayProxyRequestEvent.java | 0
 .../com/serverless/RequestHandlerAPIGatewayV2HTTPEvent.java   | 0
 .../serverless/RequestHandlerAPIGatewayV2WebSocketEvent.java  | 0
 .../RequestHandlerApplicationLoadBalancerRequestEvent.java    | 0
 .../java/com/serverless/RequestHandlerCloudFrontEvent.java    | 0
 .../com/serverless/RequestHandlerCloudWatchLogsEvent.java     | 0
 .../java/com/serverless/RequestHandlerCodeCommitEvent.java    | 0
 .../test/java/com/serverless/RequestHandlerCognitoEvent.java  | 0
 .../test/java/com/serverless/RequestHandlerConfigEvent.java   | 0
 .../test/java/com/serverless/RequestHandlerDynamodbEvent.java | 0
 .../java/com/serverless/RequestHandlerIoTButtonEvent.java     | 0
 .../test/java/com/serverless/RequestHandlerKinesisEvent.java  | 0
 .../com/serverless/RequestHandlerKinesisFirehoseEvent.java    | 0
 .../src/test/java/com/serverless/RequestHandlerLexEvent.java  | 0
 .../src/test/java/com/serverless/RequestHandlerS3Event.java   | 0
 .../src/test/java/com/serverless/RequestHandlerSNSEvent.java  | 0
 .../src/test/java/com/serverless/RequestHandlerSQSEvent.java  | 0
 .../java/com/serverless/RequestHandlerScheduledEvent.java     | 0
 .../src/test/java/com/serverless/RequestStreamHandler.java    | 0
 .../src/test/resources/api-gateway-proxy-request-event.json   | 0
 .../java/src/test/resources/api-gateway-v2-http-event.json    | 0
 .../src/test/resources/api-gateway-v2-websocket-event.json    | 0
 .../resources/application-load-balancer-request-event.json    | 0
 .../java/src/test/resources/cloud-front-event.json            | 0
 .../src/test/resources/cloud-watch-logs-event-decoded.json    | 0
 .../java/src/test/resources/cloud-watch-logs-event.json       | 0
 .../java/src/test/resources/code-commit-event.json            | 0
 .../java/src/test/resources/cognito-event.json                | 0
 .../java/src/test/resources/config-event.json                 | 0
 .../java/src/test/resources/dynamo-event.json                 | 0
 .../java/src/test/resources/iot-button-event.json             | 0
 .../java/src/test/resources/kinesis-event.json                | 0
 .../java/src/test/resources/kinesis-firehose-event.json       | 0
 .../runtime-wrappers/java/src/test/resources/lex-event.json   | 0
 .../runtime-wrappers/java/src/test/resources/s3-event.json    | 0
 .../java/src/test/resources/scheduled-event.json              | 0
 .../runtime-wrappers/java/src/test/resources/sns-event.json   | 0
 .../runtime-wrappers/java/src/test/resources/sqs-event.json   | 0
 .../runtime-wrappers/java/src/test/resources/test.json        | 0
 lib/plugins/index.js                                          | 2 +-
 scripts/pkg/config.js                                         | 2 +-
 .../plugins/aws/{invokeLocal => invoke-local}/index.test.js   | 4 ++--
 63 files changed, 4 insertions(+), 4 deletions(-)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/.gitignore (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/index.js (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/invoke.py (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/invoke.rb (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/MANIFEST.mf (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/pom.xml (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/main/java/com/serverless/Context.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/main/java/com/serverless/InvokeBridge.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/main/java/com/serverless/LambdaLogger.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/main/java/com/serverless/mapper/AbstractMapper.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/main/java/com/serverless/mapper/DefaultEventMapper.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/main/java/com/serverless/mapper/DefaultMapper.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/main/java/com/serverless/mapper/HashMapWrapper.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/main/java/com/serverless/mapper/Mapper.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/main/java/com/serverless/mapper/MapperFactory.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/main/java/com/serverless/mapper/S3EventMapper.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/AbstractRequestHandler.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/ConcreteRequestHandler.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/InvokeBridgeInheritanceTest.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/InvokeBridgeTest.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/RequestHandler.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayProxyRequestEvent.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2HTTPEvent.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2WebSocketEvent.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerApplicationLoadBalancerRequestEvent.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCloudFrontEvent.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCloudWatchLogsEvent.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCodeCommitEvent.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCognitoEvent.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerConfigEvent.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerDynamodbEvent.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerIoTButtonEvent.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerKinesisEvent.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerKinesisFirehoseEvent.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerLexEvent.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerS3Event.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerSNSEvent.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerSQSEvent.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerScheduledEvent.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/java/com/serverless/RequestStreamHandler.java (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/resources/api-gateway-proxy-request-event.json (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/resources/api-gateway-v2-http-event.json (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/resources/api-gateway-v2-websocket-event.json (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/resources/application-load-balancer-request-event.json (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/resources/cloud-front-event.json (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/resources/cloud-watch-logs-event-decoded.json (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/resources/cloud-watch-logs-event.json (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/resources/code-commit-event.json (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/resources/cognito-event.json (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/resources/config-event.json (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/resources/dynamo-event.json (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/resources/iot-button-event.json (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/resources/kinesis-event.json (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/resources/kinesis-firehose-event.json (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/resources/lex-event.json (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/resources/s3-event.json (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/resources/scheduled-event.json (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/resources/sns-event.json (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/resources/sqs-event.json (100%)
 rename lib/plugins/aws/{invokeLocal => invoke-local}/runtime-wrappers/java/src/test/resources/test.json (100%)
 rename test/unit/lib/plugins/aws/{invokeLocal => invoke-local}/index.test.js (99%)

diff --git a/lib/plugins/aws/invokeLocal/.gitignore b/lib/plugins/aws/invoke-local/.gitignore
similarity index 100%
rename from lib/plugins/aws/invokeLocal/.gitignore
rename to lib/plugins/aws/invoke-local/.gitignore
diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invoke-local/index.js
similarity index 100%
rename from lib/plugins/aws/invokeLocal/index.js
rename to lib/plugins/aws/invoke-local/index.js
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/invoke.py b/lib/plugins/aws/invoke-local/runtime-wrappers/invoke.py
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/invoke.py
rename to lib/plugins/aws/invoke-local/runtime-wrappers/invoke.py
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/invoke.rb b/lib/plugins/aws/invoke-local/runtime-wrappers/invoke.rb
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/invoke.rb
rename to lib/plugins/aws/invoke-local/runtime-wrappers/invoke.rb
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/MANIFEST.mf b/lib/plugins/aws/invoke-local/runtime-wrappers/java/MANIFEST.mf
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/MANIFEST.mf
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/MANIFEST.mf
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/pom.xml b/lib/plugins/aws/invoke-local/runtime-wrappers/java/pom.xml
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/pom.xml
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/pom.xml
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/Context.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/Context.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/Context.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/Context.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/InvokeBridge.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/InvokeBridge.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/InvokeBridge.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/InvokeBridge.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/LambdaLogger.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/LambdaLogger.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/LambdaLogger.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/LambdaLogger.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/AbstractMapper.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/AbstractMapper.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/AbstractMapper.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/AbstractMapper.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/DefaultEventMapper.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/DefaultEventMapper.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/DefaultEventMapper.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/DefaultEventMapper.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/DefaultMapper.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/DefaultMapper.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/DefaultMapper.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/DefaultMapper.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/HashMapWrapper.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/HashMapWrapper.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/HashMapWrapper.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/HashMapWrapper.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/Mapper.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/Mapper.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/Mapper.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/Mapper.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/MapperFactory.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/MapperFactory.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/MapperFactory.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/MapperFactory.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/S3EventMapper.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/S3EventMapper.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/main/java/com/serverless/mapper/S3EventMapper.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/S3EventMapper.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/AbstractRequestHandler.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/AbstractRequestHandler.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/AbstractRequestHandler.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/AbstractRequestHandler.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/ConcreteRequestHandler.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/ConcreteRequestHandler.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/ConcreteRequestHandler.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/ConcreteRequestHandler.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/InvokeBridgeInheritanceTest.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/InvokeBridgeInheritanceTest.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/InvokeBridgeInheritanceTest.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/InvokeBridgeInheritanceTest.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/InvokeBridgeTest.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/InvokeBridgeTest.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/InvokeBridgeTest.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/InvokeBridgeTest.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandler.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandler.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandler.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandler.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayProxyRequestEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayProxyRequestEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayProxyRequestEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayProxyRequestEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2HTTPEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2HTTPEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2HTTPEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2HTTPEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2WebSocketEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2WebSocketEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2WebSocketEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2WebSocketEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerApplicationLoadBalancerRequestEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerApplicationLoadBalancerRequestEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerApplicationLoadBalancerRequestEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerApplicationLoadBalancerRequestEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCloudFrontEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCloudFrontEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCloudFrontEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCloudFrontEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCloudWatchLogsEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCloudWatchLogsEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCloudWatchLogsEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCloudWatchLogsEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCodeCommitEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCodeCommitEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCodeCommitEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCodeCommitEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCognitoEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCognitoEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCognitoEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCognitoEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerConfigEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerConfigEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerConfigEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerConfigEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerDynamodbEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerDynamodbEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerDynamodbEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerDynamodbEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerIoTButtonEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerIoTButtonEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerIoTButtonEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerIoTButtonEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerKinesisEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerKinesisEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerKinesisEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerKinesisEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerKinesisFirehoseEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerKinesisFirehoseEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerKinesisFirehoseEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerKinesisFirehoseEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerLexEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerLexEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerLexEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerLexEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerS3Event.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerS3Event.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerS3Event.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerS3Event.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerSNSEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerSNSEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerSNSEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerSNSEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerSQSEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerSQSEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerSQSEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerSQSEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerScheduledEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerScheduledEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerScheduledEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerScheduledEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestStreamHandler.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestStreamHandler.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/java/com/serverless/RequestStreamHandler.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestStreamHandler.java
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/api-gateway-proxy-request-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/api-gateway-proxy-request-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/api-gateway-proxy-request-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/api-gateway-proxy-request-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/api-gateway-v2-http-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/api-gateway-v2-http-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/api-gateway-v2-http-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/api-gateway-v2-http-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/api-gateway-v2-websocket-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/api-gateway-v2-websocket-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/api-gateway-v2-websocket-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/api-gateway-v2-websocket-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/application-load-balancer-request-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/application-load-balancer-request-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/application-load-balancer-request-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/application-load-balancer-request-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/cloud-front-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/cloud-front-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/cloud-front-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/cloud-front-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/cloud-watch-logs-event-decoded.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/cloud-watch-logs-event-decoded.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/cloud-watch-logs-event-decoded.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/cloud-watch-logs-event-decoded.json
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/cloud-watch-logs-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/cloud-watch-logs-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/cloud-watch-logs-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/cloud-watch-logs-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/code-commit-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/code-commit-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/code-commit-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/code-commit-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/cognito-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/cognito-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/cognito-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/cognito-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/config-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/config-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/config-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/config-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/dynamo-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/dynamo-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/dynamo-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/dynamo-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/iot-button-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/iot-button-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/iot-button-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/iot-button-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/kinesis-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/kinesis-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/kinesis-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/kinesis-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/kinesis-firehose-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/kinesis-firehose-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/kinesis-firehose-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/kinesis-firehose-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/lex-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/lex-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/lex-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/lex-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/s3-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/s3-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/s3-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/s3-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/scheduled-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/scheduled-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/scheduled-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/scheduled-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/sns-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/sns-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/sns-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/sns-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/sqs-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/sqs-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/sqs-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/sqs-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/test.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/test.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtime-wrappers/java/src/test/resources/test.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/test.json
diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index adaa1fb03e8..8d83d216c5c 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -55,6 +55,6 @@ module.exports = [
   require('./aws/package/compile/events/httpApi'),
   require('./aws/deployFunction.js'),
   require('./aws/deployList.js'),
-  require('./aws/invokeLocal/index.js'),
+  require('./aws/invoke-local/index.js'),
   require('./standalone'),
 ];
diff --git a/scripts/pkg/config.js b/scripts/pkg/config.js
index d4445856c7a..304b828fb95 100644
--- a/scripts/pkg/config.js
+++ b/scripts/pkg/config.js
@@ -14,7 +14,7 @@ module.exports = {
     // Service templates
     '../../lib/plugins/create/templates',
     // Local invocation artifacts
-    '../../lib/plugins/aws/invokeLocal/runtime-wrappers',
+    '../../lib/plugins/aws/invoke-local/runtime-wrappers',
     // Dashboard policies
     '../../node_modules/@serverless/dashboard-plugin/lib/safeguards/policies',
     // Dashboard wrappers
diff --git a/test/unit/lib/plugins/aws/invokeLocal/index.test.js b/test/unit/lib/plugins/aws/invoke-local/index.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/invokeLocal/index.test.js
rename to test/unit/lib/plugins/aws/invoke-local/index.test.js
index 700af051bf7..7ae051e6ddd 100644
--- a/test/unit/lib/plugins/aws/invokeLocal/index.test.js
+++ b/test/unit/lib/plugins/aws/invoke-local/index.test.js
@@ -60,7 +60,7 @@ describe('AwsInvokeLocal', () => {
     });
 
     stdinStub = sinon.stub().resolves('');
-    AwsInvokeLocal = proxyquire('../../../../../../lib/plugins/aws/invokeLocal/index', {
+    AwsInvokeLocal = proxyquire('../../../../../../lib/plugins/aws/invoke-local/index', {
       'get-stdin': stdinStub,
       'child-process-ext/spawn': spawnExtStub,
     });
@@ -498,7 +498,7 @@ describe('AwsInvokeLocal', () => {
   describe('#callJavaBridge()', () => {
     let invokeLocalSpawnStubbed;
     beforeEach(() => {
-      AwsInvokeLocal = proxyquire('../../../../../../lib/plugins/aws/invokeLocal/index', {
+      AwsInvokeLocal = proxyquire('../../../../../../lib/plugins/aws/invoke-local/index', {
         'get-stdin': stdinStub,
         'child-process-ext/spawn': spawnExtStub,
         'child_process': {

From 1f3039673266a4bd88188ef4c8aa728c8cfeb6c8 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:30:12 +0100
Subject: [PATCH 0976/1101] refactor: Rename `lib/plugins/aws/customResources`

---
 .../aws/{customResources => custom-resources}/generateZip.js  | 0
 .../aws/{customResources => custom-resources}/index.js        | 0
 .../{customResources => custom-resources}/resources/README.md | 0
 .../resources/api-gateway-cloud-watch-role/handler.js         | 0
 .../resources/cognito-user-pool/handler.js                    | 0
 .../resources/cognito-user-pool/lib/permissions.js            | 0
 .../resources/cognito-user-pool/lib/user-pool.js              | 0
 .../resources/event-bridge/handler.js                         | 0
 .../resources/event-bridge/lib/event-bridge.js                | 0
 .../resources/event-bridge/lib/permissions.js                 | 0
 .../resources/event-bridge/lib/utils.js                       | 0
 .../resources/s3/handler.js                                   | 0
 .../resources/s3/lib/bucket.js                                | 0
 .../resources/s3/lib/permissions.js                           | 0
 .../{customResources => custom-resources}/resources/utils.js  | 0
 lib/plugins/aws/package/compile/events/cognitoUserPool.js     | 2 +-
 lib/plugins/aws/package/compile/events/eventBridge/index.js   | 2 +-
 .../compile/events/lib/ensureApiGatewayCloudWatchRole.js      | 2 +-
 lib/plugins/aws/package/compile/events/s3/index.js            | 2 +-
 package.json                                                  | 2 +-
 scripts/pkg/config.js                                         | 2 +-
 .../{customResources => custom-resources}/generateZip.test.js | 4 ++--
 .../aws/{customResources => custom-resources}/index.test.js   | 2 +-
 .../test/eventBridge.test.js                                  | 2 +-
 .../{customResources => custom-resources}/test/utils.test.js  | 2 +-
 .../aws/package/compile/events/cognitoUserPool.test.js        | 2 +-
 .../compile/events/lib/ensureApiGatewayCloudWatchRole.test.js | 2 +-
 .../lib/plugins/aws/package/compile/events/s3/index.test.js   | 2 +-
 28 files changed, 14 insertions(+), 14 deletions(-)
 rename lib/plugins/aws/{customResources => custom-resources}/generateZip.js (100%)
 rename lib/plugins/aws/{customResources => custom-resources}/index.js (100%)
 rename lib/plugins/aws/{customResources => custom-resources}/resources/README.md (100%)
 rename lib/plugins/aws/{customResources => custom-resources}/resources/api-gateway-cloud-watch-role/handler.js (100%)
 rename lib/plugins/aws/{customResources => custom-resources}/resources/cognito-user-pool/handler.js (100%)
 rename lib/plugins/aws/{customResources => custom-resources}/resources/cognito-user-pool/lib/permissions.js (100%)
 rename lib/plugins/aws/{customResources => custom-resources}/resources/cognito-user-pool/lib/user-pool.js (100%)
 rename lib/plugins/aws/{customResources => custom-resources}/resources/event-bridge/handler.js (100%)
 rename lib/plugins/aws/{customResources => custom-resources}/resources/event-bridge/lib/event-bridge.js (100%)
 rename lib/plugins/aws/{customResources => custom-resources}/resources/event-bridge/lib/permissions.js (100%)
 rename lib/plugins/aws/{customResources => custom-resources}/resources/event-bridge/lib/utils.js (100%)
 rename lib/plugins/aws/{customResources => custom-resources}/resources/s3/handler.js (100%)
 rename lib/plugins/aws/{customResources => custom-resources}/resources/s3/lib/bucket.js (100%)
 rename lib/plugins/aws/{customResources => custom-resources}/resources/s3/lib/permissions.js (100%)
 rename lib/plugins/aws/{customResources => custom-resources}/resources/utils.js (100%)
 rename test/unit/lib/plugins/aws/{customResources => custom-resources}/generateZip.test.js (86%)
 rename test/unit/lib/plugins/aws/{customResources => custom-resources}/index.test.js (99%)
 rename test/unit/lib/plugins/aws/{customResources => custom-resources}/test/eventBridge.test.js (85%)
 rename test/unit/lib/plugins/aws/{customResources => custom-resources}/test/utils.test.js (97%)

diff --git a/lib/plugins/aws/customResources/generateZip.js b/lib/plugins/aws/custom-resources/generateZip.js
similarity index 100%
rename from lib/plugins/aws/customResources/generateZip.js
rename to lib/plugins/aws/custom-resources/generateZip.js
diff --git a/lib/plugins/aws/customResources/index.js b/lib/plugins/aws/custom-resources/index.js
similarity index 100%
rename from lib/plugins/aws/customResources/index.js
rename to lib/plugins/aws/custom-resources/index.js
diff --git a/lib/plugins/aws/customResources/resources/README.md b/lib/plugins/aws/custom-resources/resources/README.md
similarity index 100%
rename from lib/plugins/aws/customResources/resources/README.md
rename to lib/plugins/aws/custom-resources/resources/README.md
diff --git a/lib/plugins/aws/customResources/resources/api-gateway-cloud-watch-role/handler.js b/lib/plugins/aws/custom-resources/resources/api-gateway-cloud-watch-role/handler.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/api-gateway-cloud-watch-role/handler.js
rename to lib/plugins/aws/custom-resources/resources/api-gateway-cloud-watch-role/handler.js
diff --git a/lib/plugins/aws/customResources/resources/cognito-user-pool/handler.js b/lib/plugins/aws/custom-resources/resources/cognito-user-pool/handler.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/cognito-user-pool/handler.js
rename to lib/plugins/aws/custom-resources/resources/cognito-user-pool/handler.js
diff --git a/lib/plugins/aws/customResources/resources/cognito-user-pool/lib/permissions.js b/lib/plugins/aws/custom-resources/resources/cognito-user-pool/lib/permissions.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/cognito-user-pool/lib/permissions.js
rename to lib/plugins/aws/custom-resources/resources/cognito-user-pool/lib/permissions.js
diff --git a/lib/plugins/aws/customResources/resources/cognito-user-pool/lib/user-pool.js b/lib/plugins/aws/custom-resources/resources/cognito-user-pool/lib/user-pool.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/cognito-user-pool/lib/user-pool.js
rename to lib/plugins/aws/custom-resources/resources/cognito-user-pool/lib/user-pool.js
diff --git a/lib/plugins/aws/customResources/resources/event-bridge/handler.js b/lib/plugins/aws/custom-resources/resources/event-bridge/handler.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/event-bridge/handler.js
rename to lib/plugins/aws/custom-resources/resources/event-bridge/handler.js
diff --git a/lib/plugins/aws/customResources/resources/event-bridge/lib/event-bridge.js b/lib/plugins/aws/custom-resources/resources/event-bridge/lib/event-bridge.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/event-bridge/lib/event-bridge.js
rename to lib/plugins/aws/custom-resources/resources/event-bridge/lib/event-bridge.js
diff --git a/lib/plugins/aws/customResources/resources/event-bridge/lib/permissions.js b/lib/plugins/aws/custom-resources/resources/event-bridge/lib/permissions.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/event-bridge/lib/permissions.js
rename to lib/plugins/aws/custom-resources/resources/event-bridge/lib/permissions.js
diff --git a/lib/plugins/aws/customResources/resources/event-bridge/lib/utils.js b/lib/plugins/aws/custom-resources/resources/event-bridge/lib/utils.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/event-bridge/lib/utils.js
rename to lib/plugins/aws/custom-resources/resources/event-bridge/lib/utils.js
diff --git a/lib/plugins/aws/customResources/resources/s3/handler.js b/lib/plugins/aws/custom-resources/resources/s3/handler.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/s3/handler.js
rename to lib/plugins/aws/custom-resources/resources/s3/handler.js
diff --git a/lib/plugins/aws/customResources/resources/s3/lib/bucket.js b/lib/plugins/aws/custom-resources/resources/s3/lib/bucket.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/s3/lib/bucket.js
rename to lib/plugins/aws/custom-resources/resources/s3/lib/bucket.js
diff --git a/lib/plugins/aws/customResources/resources/s3/lib/permissions.js b/lib/plugins/aws/custom-resources/resources/s3/lib/permissions.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/s3/lib/permissions.js
rename to lib/plugins/aws/custom-resources/resources/s3/lib/permissions.js
diff --git a/lib/plugins/aws/customResources/resources/utils.js b/lib/plugins/aws/custom-resources/resources/utils.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/utils.js
rename to lib/plugins/aws/custom-resources/resources/utils.js
diff --git a/lib/plugins/aws/package/compile/events/cognitoUserPool.js b/lib/plugins/aws/package/compile/events/cognitoUserPool.js
index 2b08bf74d67..736de405478 100644
--- a/lib/plugins/aws/package/compile/events/cognitoUserPool.js
+++ b/lib/plugins/aws/package/compile/events/cognitoUserPool.js
@@ -2,7 +2,7 @@
 
 const _ = require('lodash');
 const BbPromise = require('bluebird');
-const { addCustomResourceToService } = require('../../../customResources');
+const { addCustomResourceToService } = require('../../../custom-resources');
 const ServerlessError = require('../../../../../serverless-error');
 
 const validTriggerSources = [
diff --git a/lib/plugins/aws/package/compile/events/eventBridge/index.js b/lib/plugins/aws/package/compile/events/eventBridge/index.js
index 50dae1984d1..f08dee7d8f0 100644
--- a/lib/plugins/aws/package/compile/events/eventBridge/index.js
+++ b/lib/plugins/aws/package/compile/events/eventBridge/index.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const { addCustomResourceToService } = require('../../../../customResources');
+const { addCustomResourceToService } = require('../../../../custom-resources');
 const ServerlessError = require('../../../../../../serverless-error');
 const { makeAndHashRuleName, makeEventBusTargetId, makeRuleName } = require('./utils');
 
diff --git a/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.js b/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.js
index f1f166414ea..dedc3e7f489 100644
--- a/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.js
+++ b/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.js
@@ -2,7 +2,7 @@
 
 const { memoize } = require('lodash');
 const BbPromise = require('bluebird');
-const { addCustomResourceToService } = require('../../../../customResources');
+const { addCustomResourceToService } = require('../../../../custom-resources');
 
 module.exports = memoize(async (provider) =>
   BbPromise.try(() => {
diff --git a/lib/plugins/aws/package/compile/events/s3/index.js b/lib/plugins/aws/package/compile/events/s3/index.js
index 947102a9f2d..9bc389a4173 100644
--- a/lib/plugins/aws/package/compile/events/s3/index.js
+++ b/lib/plugins/aws/package/compile/events/s3/index.js
@@ -2,7 +2,7 @@
 
 const _ = require('lodash');
 const BbPromise = require('bluebird');
-const { addCustomResourceToService } = require('../../../../customResources');
+const { addCustomResourceToService } = require('../../../../custom-resources');
 const ServerlessError = require('../../../../../../serverless-error');
 
 class AwsCompileS3Events {
diff --git a/package.json b/package.json
index c0f3559efeb..1f2b6bebd8d 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
   "eslintIgnore": [
     "!/.github",
     "/lib/plugins/create/templates/**",
-    "/lib/plugins/aws/customResources/node_modules/**",
+    "/lib/plugins/aws/custom-resources/node_modules/**",
     "!/test/fixtures/programmatic/locallyInstalledServerless/node_modules/**"
   ],
   "mocha": {
diff --git a/scripts/pkg/config.js b/scripts/pkg/config.js
index 304b828fb95..91161c33abd 100644
--- a/scripts/pkg/config.js
+++ b/scripts/pkg/config.js
@@ -8,7 +8,7 @@ module.exports = {
     // Standalone commands
     '../../commands',
     // Custom resources
-    '../../lib/plugins/aws/customResources/resources',
+    '../../lib/plugins/aws/custom-resources/resources',
     // Basic CF templates
     '../../lib/plugins/aws/package/lib/*.json',
     // Service templates
diff --git a/test/unit/lib/plugins/aws/customResources/generateZip.test.js b/test/unit/lib/plugins/aws/custom-resources/generateZip.test.js
similarity index 86%
rename from test/unit/lib/plugins/aws/customResources/generateZip.test.js
rename to test/unit/lib/plugins/aws/custom-resources/generateZip.test.js
index da68d7b24e5..5063400f827 100644
--- a/test/unit/lib/plugins/aws/customResources/generateZip.test.js
+++ b/test/unit/lib/plugins/aws/custom-resources/generateZip.test.js
@@ -9,14 +9,14 @@ const { expect } = require('chai');
 // The directory that holds the files that generateZip zips up
 const resourcesDir = path.resolve(
   __dirname,
-  '../../../../../../lib/plugins/aws/customResources/resources/'
+  '../../../../../../lib/plugins/aws/custom-resources/resources/'
 );
 
 describe('test/unit/lib/plugins/aws/customResources/generateZip.test.js', () => {
   describe('when generating a zip file', () => {
     it('should generate a zip file with the contents of the resources directory', async () => {
       const zipFilePath = await requireUncached(async () =>
-        require('../../../../../../lib/plugins/aws/customResources/generateZip')()
+        require('../../../../../../lib/plugins/aws/custom-resources/generateZip')()
       );
 
       // List the files in the zip to make sure it is valid
diff --git a/test/unit/lib/plugins/aws/customResources/index.test.js b/test/unit/lib/plugins/aws/custom-resources/index.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/customResources/index.test.js
rename to test/unit/lib/plugins/aws/custom-resources/index.test.js
index 1a5cfe55531..343e2e67220 100644
--- a/test/unit/lib/plugins/aws/customResources/index.test.js
+++ b/test/unit/lib/plugins/aws/custom-resources/index.test.js
@@ -10,7 +10,7 @@ const CLI = require('../../../../../../lib/classes/cli');
 const { createTmpDir } = require('../../../../../utils/fs');
 const {
   addCustomResourceToService,
-} = require('../../../../../../lib/plugins/aws/customResources/index.js');
+} = require('../../../../../../lib/plugins/aws/custom-resources/index.js');
 const runServerless = require('../../../../../utils/run-serverless');
 
 const expect = chai.expect;
diff --git a/test/unit/lib/plugins/aws/customResources/test/eventBridge.test.js b/test/unit/lib/plugins/aws/custom-resources/test/eventBridge.test.js
similarity index 85%
rename from test/unit/lib/plugins/aws/customResources/test/eventBridge.test.js
rename to test/unit/lib/plugins/aws/custom-resources/test/eventBridge.test.js
index 7860239c408..a514e3a7f77 100644
--- a/test/unit/lib/plugins/aws/customResources/test/eventBridge.test.js
+++ b/test/unit/lib/plugins/aws/custom-resources/test/eventBridge.test.js
@@ -3,7 +3,7 @@
 const { expect } = require('chai');
 const {
   getEventBusTargetId,
-} = require('../../../../../../../lib/plugins/aws/customResources/resources/event-bridge/lib/utils');
+} = require('../../../../../../../lib/plugins/aws/custom-resources/resources/event-bridge/lib/utils');
 
 describe('#getEventBusTargetId()', () => {
   const assertions = [
diff --git a/test/unit/lib/plugins/aws/customResources/test/utils.test.js b/test/unit/lib/plugins/aws/custom-resources/test/utils.test.js
similarity index 97%
rename from test/unit/lib/plugins/aws/customResources/test/utils.test.js
rename to test/unit/lib/plugins/aws/custom-resources/test/utils.test.js
index 82c40e72bd9..17b2f95b9de 100644
--- a/test/unit/lib/plugins/aws/customResources/test/utils.test.js
+++ b/test/unit/lib/plugins/aws/custom-resources/test/utils.test.js
@@ -4,7 +4,7 @@ const { expect } = require('chai');
 const {
   getLambdaArn,
   getEnvironment,
-} = require('../../../../../../../lib/plugins/aws/customResources/resources/utils');
+} = require('../../../../../../../lib/plugins/aws/custom-resources/resources/utils');
 
 describe('#getLambdaArn()', () => {
   it('should return the Lambda arn', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js b/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
index 3eeb0144274..b74f1334933 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
@@ -23,7 +23,7 @@ describe('AwsCompileCognitoUserPoolEvents', () => {
     const AwsCompileCognitoUserPoolEvents = proxyquire(
       '../../../../../../../../lib/plugins/aws/package/compile/events/cognitoUserPool',
       {
-        '../../../customResources': {
+        '../../../custom-resources': {
           addCustomResourceToService: addCustomResourceToServiceStub,
         },
       }
diff --git a/test/unit/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.test.js b/test/unit/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.test.js
index cb8b4f3b383..cea46e9e6b8 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.test.js
@@ -20,7 +20,7 @@ describe('ensureApiGatewayCloudWatchRole', () => {
     ensureApiGatewayCloudWatchRole = proxyquire(
       '../../../../../../../../../lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole',
       {
-        '../../../../customResources': {
+        '../../../../custom-resources': {
           addCustomResourceToService: addCustomResourceToServiceStub,
         },
       }
diff --git a/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
index 6e0beb23d4c..fdbc4763b4a 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
@@ -23,7 +23,7 @@ describe('AwsCompileS3Events', () => {
     const AwsCompileS3Events = proxyquire(
       '../../../../../../../../../lib/plugins/aws/package/compile/events/s3/index',
       {
-        '../../../../customResources': {
+        '../../../../custom-resources': {
           addCustomResourceToService: addCustomResourceToServiceStub,
         },
       }

From 57642f73ba628e2fd0d5990c270c7e733b92bdb1 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:31:34 +0100
Subject: [PATCH 0977/1101] refactor: Rename `lib/configSchema.js`

---
 lib/classes/ConfigSchemaHandler/index.js                      | 2 +-
 lib/{configSchema.js => config-schema.js}                     | 0
 test/unit/lib/{configSchema.test.js => config-schema.test.js} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/{configSchema.js => config-schema.js} (100%)
 rename test/unit/lib/{configSchema.test.js => config-schema.test.js} (100%)

diff --git a/lib/classes/ConfigSchemaHandler/index.js b/lib/classes/ConfigSchemaHandler/index.js
index a9f48454eeb..d57dc56d315 100644
--- a/lib/classes/ConfigSchemaHandler/index.js
+++ b/lib/classes/ConfigSchemaHandler/index.js
@@ -2,7 +2,7 @@
 
 const _ = require('lodash');
 const ensurePlainObject = require('type/plain-object/ensure');
-const schema = require('../../configSchema');
+const schema = require('../../config-schema');
 const ServerlessError = require('../../serverless-error');
 const normalizeAjvErrors = require('./normalizeAjvErrors');
 const resolveAjvValidate = require('./resolveAjvValidate');
diff --git a/lib/configSchema.js b/lib/config-schema.js
similarity index 100%
rename from lib/configSchema.js
rename to lib/config-schema.js
diff --git a/test/unit/lib/configSchema.test.js b/test/unit/lib/config-schema.test.js
similarity index 100%
rename from test/unit/lib/configSchema.test.js
rename to test/unit/lib/config-schema.test.js

From 4ffb3a7173eb89d01338b1f65c10aa7ebc22c8d7 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:31:36 +0100
Subject: [PATCH 0978/1101] refactor: Rename `lib/classes/PluginManager.js`

---
 lib/classes/{PluginManager.js => plugin-manager.js}             | 0
 lib/serverless.js                                               | 2 +-
 .../classes/{PluginManager.test.js => plugin-manager.test.js}   | 2 +-
 test/unit/lib/serverless.test.js                                | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/classes/{PluginManager.js => plugin-manager.js} (100%)
 rename test/unit/lib/classes/{PluginManager.test.js => plugin-manager.test.js} (99%)

diff --git a/lib/classes/PluginManager.js b/lib/classes/plugin-manager.js
similarity index 100%
rename from lib/classes/PluginManager.js
rename to lib/classes/plugin-manager.js
diff --git a/lib/serverless.js b/lib/serverless.js
index 3bcd8399335..7717bdacc00 100644
--- a/lib/serverless.js
+++ b/lib/serverless.js
@@ -11,7 +11,7 @@ const ensurePlainObject = require('type/plain-object/ensure');
 const CLI = require('./classes/cli');
 const Config = require('./classes/config');
 const YamlParser = require('./classes/YamlParser');
-const PluginManager = require('./classes/PluginManager');
+const PluginManager = require('./classes/plugin-manager');
 const Utils = require('./classes/utils');
 const Service = require('./classes/service');
 const ConfigSchemaHandler = require('./classes/ConfigSchemaHandler');
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/plugin-manager.test.js
similarity index 99%
rename from test/unit/lib/classes/PluginManager.test.js
rename to test/unit/lib/classes/plugin-manager.test.js
index f515a5f6256..1cedf773731 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/plugin-manager.test.js
@@ -415,7 +415,7 @@ describe('PluginManager', () => {
 
   let restoreEnv;
   let serviceDir;
-  const PluginManager = proxyquire('../../../../lib/classes/PluginManager', {
+  const PluginManager = proxyquire('../../../../lib/classes/plugin-manager', {
     '../utils/get-require': (directory) => {
       const resultRequire = require('module').createRequire(path.resolve(directory, 'req'));
       resultRequire.resolve = (pluginPath) => resolveStub(directory, pluginPath);
diff --git a/test/unit/lib/serverless.test.js b/test/unit/lib/serverless.test.js
index 00a5d1569b8..f903f7f27bc 100644
--- a/test/unit/lib/serverless.test.js
+++ b/test/unit/lib/serverless.test.js
@@ -10,7 +10,7 @@ const Serverless = require('../../../lib/serverless');
 const semverRegex = require('semver-regex');
 
 const YamlParser = require('../../../lib/classes/YamlParser');
-const PluginManager = require('../../../lib/classes/PluginManager');
+const PluginManager = require('../../../lib/classes/plugin-manager');
 const Utils = require('../../../lib/classes/utils');
 const Service = require('../../../lib/classes/service');
 const ConfigSchemaHandler = require('../../../lib/classes/ConfigSchemaHandler');

From 6d67ec2a0073e41f6bc4dc2fd438da5de7b3f15f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:31:38 +0100
Subject: [PATCH 0979/1101] refactor: Rename `lib/classes/YamlParser.js`

---
 lib/classes/{YamlParser.js => yaml-parser.js}                   | 0
 lib/serverless.js                                               | 2 +-
 .../lib/classes/{YamlParser.test.js => yaml-parser.test.js}     | 0
 test/unit/lib/serverless.test.js                                | 2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/classes/{YamlParser.js => yaml-parser.js} (100%)
 rename test/unit/lib/classes/{YamlParser.test.js => yaml-parser.test.js} (100%)

diff --git a/lib/classes/YamlParser.js b/lib/classes/yaml-parser.js
similarity index 100%
rename from lib/classes/YamlParser.js
rename to lib/classes/yaml-parser.js
diff --git a/lib/serverless.js b/lib/serverless.js
index 7717bdacc00..592f62070c9 100644
--- a/lib/serverless.js
+++ b/lib/serverless.js
@@ -10,7 +10,7 @@ const isPlainObject = require('type/plain-object/is');
 const ensurePlainObject = require('type/plain-object/ensure');
 const CLI = require('./classes/cli');
 const Config = require('./classes/config');
-const YamlParser = require('./classes/YamlParser');
+const YamlParser = require('./classes/yaml-parser');
 const PluginManager = require('./classes/plugin-manager');
 const Utils = require('./classes/utils');
 const Service = require('./classes/service');
diff --git a/test/unit/lib/classes/YamlParser.test.js b/test/unit/lib/classes/yaml-parser.test.js
similarity index 100%
rename from test/unit/lib/classes/YamlParser.test.js
rename to test/unit/lib/classes/yaml-parser.test.js
diff --git a/test/unit/lib/serverless.test.js b/test/unit/lib/serverless.test.js
index f903f7f27bc..6c0eefe68f9 100644
--- a/test/unit/lib/serverless.test.js
+++ b/test/unit/lib/serverless.test.js
@@ -9,7 +9,7 @@ const { expect } = chai;
 const Serverless = require('../../../lib/serverless');
 const semverRegex = require('semver-regex');
 
-const YamlParser = require('../../../lib/classes/YamlParser');
+const YamlParser = require('../../../lib/classes/yaml-parser');
 const PluginManager = require('../../../lib/classes/plugin-manager');
 const Utils = require('../../../lib/classes/utils');
 const Service = require('../../../lib/classes/service');

From 78184571b69eaae25c273c9063aafb9150623ac3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:31:41 +0100
Subject: [PATCH 0980/1101] refactor: Rename `lib/classes/ConfigSchemaHandler`

---
 .../{ConfigSchemaHandler => config-schema-handler}/index.js     | 0
 .../normalizeAjvErrors.js                                       | 0
 .../regexpKeyword.js                                            | 0
 .../resolveAjvValidate.js                                       | 0
 lib/serverless.js                                               | 2 +-
 lib/utils/telemetry/generatePayload.js                          | 2 +-
 .../index.test.js                                               | 2 +-
 .../normalizeAjvErrors.test.js                                  | 2 +-
 .../resolveAjvValidate.test.js                                  | 2 +-
 test/unit/lib/serverless.test.js                                | 2 +-
 10 files changed, 6 insertions(+), 6 deletions(-)
 rename lib/classes/{ConfigSchemaHandler => config-schema-handler}/index.js (100%)
 rename lib/classes/{ConfigSchemaHandler => config-schema-handler}/normalizeAjvErrors.js (100%)
 rename lib/classes/{ConfigSchemaHandler => config-schema-handler}/regexpKeyword.js (100%)
 rename lib/classes/{ConfigSchemaHandler => config-schema-handler}/resolveAjvValidate.js (100%)
 rename test/unit/lib/classes/{ConfigSchemaHandler => config-schema-handler}/index.test.js (99%)
 rename test/unit/lib/classes/{ConfigSchemaHandler => config-schema-handler}/normalizeAjvErrors.test.js (99%)
 rename test/unit/lib/classes/{ConfigSchemaHandler => config-schema-handler}/resolveAjvValidate.test.js (94%)

diff --git a/lib/classes/ConfigSchemaHandler/index.js b/lib/classes/config-schema-handler/index.js
similarity index 100%
rename from lib/classes/ConfigSchemaHandler/index.js
rename to lib/classes/config-schema-handler/index.js
diff --git a/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.js b/lib/classes/config-schema-handler/normalizeAjvErrors.js
similarity index 100%
rename from lib/classes/ConfigSchemaHandler/normalizeAjvErrors.js
rename to lib/classes/config-schema-handler/normalizeAjvErrors.js
diff --git a/lib/classes/ConfigSchemaHandler/regexpKeyword.js b/lib/classes/config-schema-handler/regexpKeyword.js
similarity index 100%
rename from lib/classes/ConfigSchemaHandler/regexpKeyword.js
rename to lib/classes/config-schema-handler/regexpKeyword.js
diff --git a/lib/classes/ConfigSchemaHandler/resolveAjvValidate.js b/lib/classes/config-schema-handler/resolveAjvValidate.js
similarity index 100%
rename from lib/classes/ConfigSchemaHandler/resolveAjvValidate.js
rename to lib/classes/config-schema-handler/resolveAjvValidate.js
diff --git a/lib/serverless.js b/lib/serverless.js
index 592f62070c9..17af7a48313 100644
--- a/lib/serverless.js
+++ b/lib/serverless.js
@@ -14,7 +14,7 @@ const YamlParser = require('./classes/yaml-parser');
 const PluginManager = require('./classes/plugin-manager');
 const Utils = require('./classes/utils');
 const Service = require('./classes/service');
-const ConfigSchemaHandler = require('./classes/ConfigSchemaHandler');
+const ConfigSchemaHandler = require('./classes/config-schema-handler');
 const ServerlessError = require('./serverless-error');
 const version = require('./../package.json').version;
 const isStandaloneExecutable = require('./utils/isStandaloneExecutable');
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index dd8d19a5258..2acd99f6b86 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -8,7 +8,7 @@ const isObject = require('type/object/is');
 const userConfig = require('@serverless/utils/config');
 const getNotificationsMode = require('@serverless/utils/get-notifications-mode');
 const isStandalone = require('../isStandaloneExecutable');
-const { getConfigurationValidationResult } = require('../../classes/ConfigSchemaHandler');
+const { getConfigurationValidationResult } = require('../../classes/config-schema-handler');
 const { triggeredDeprecations } = require('../logDeprecation');
 const isNpmGlobal = require('../npmPackage/isGlobal');
 const isLocallyInstalled = require('../../cli/is-locally-installed');
diff --git a/test/unit/lib/classes/ConfigSchemaHandler/index.test.js b/test/unit/lib/classes/config-schema-handler/index.test.js
similarity index 99%
rename from test/unit/lib/classes/ConfigSchemaHandler/index.test.js
rename to test/unit/lib/classes/config-schema-handler/index.test.js
index 3b0b7c20587..2519a7eb62f 100644
--- a/test/unit/lib/classes/ConfigSchemaHandler/index.test.js
+++ b/test/unit/lib/classes/config-schema-handler/index.test.js
@@ -4,7 +4,7 @@ const chai = require('chai');
 const runServerless = require('../../../../utils/run-serverless');
 const {
   getConfigurationValidationResult,
-} = require('../../../../../lib/classes/ConfigSchemaHandler');
+} = require('../../../../../lib/classes/config-schema-handler');
 
 chai.use(require('chai-as-promised'));
 
diff --git a/test/unit/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.test.js b/test/unit/lib/classes/config-schema-handler/normalizeAjvErrors.test.js
similarity index 99%
rename from test/unit/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.test.js
rename to test/unit/lib/classes/config-schema-handler/normalizeAjvErrors.test.js
index ecca1c5e2b0..048b95302c2 100644
--- a/test/unit/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.test.js
+++ b/test/unit/lib/classes/config-schema-handler/normalizeAjvErrors.test.js
@@ -4,7 +4,7 @@ const { expect } = require('chai');
 
 const Ajv = require('ajv').default;
 const memoize = require('memoizee');
-const normalizeAjvErrors = require('../../../../../lib/classes/ConfigSchemaHandler/normalizeAjvErrors');
+const normalizeAjvErrors = require('../../../../../lib/classes/config-schema-handler/normalizeAjvErrors');
 
 describe('#normalizeAjvErrors', () => {
   const resolveAjv = memoize(
diff --git a/test/unit/lib/classes/ConfigSchemaHandler/resolveAjvValidate.test.js b/test/unit/lib/classes/config-schema-handler/resolveAjvValidate.test.js
similarity index 94%
rename from test/unit/lib/classes/ConfigSchemaHandler/resolveAjvValidate.test.js
rename to test/unit/lib/classes/config-schema-handler/resolveAjvValidate.test.js
index 87f697caa83..d2bbcce6848 100644
--- a/test/unit/lib/classes/ConfigSchemaHandler/resolveAjvValidate.test.js
+++ b/test/unit/lib/classes/config-schema-handler/resolveAjvValidate.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const chai = require('chai');
-const resolveAjvValidate = require('../../../../../lib/classes/ConfigSchemaHandler/resolveAjvValidate');
+const resolveAjvValidate = require('../../../../../lib/classes/config-schema-handler/resolveAjvValidate');
 const objectHash = require('object-hash');
 const deepSortObjectByKey = require('../../../../../lib/utils/deepSortObjectByKey');
 const path = require('path');
diff --git a/test/unit/lib/serverless.test.js b/test/unit/lib/serverless.test.js
index 6c0eefe68f9..38d550d8612 100644
--- a/test/unit/lib/serverless.test.js
+++ b/test/unit/lib/serverless.test.js
@@ -13,7 +13,7 @@ const YamlParser = require('../../../lib/classes/yaml-parser');
 const PluginManager = require('../../../lib/classes/plugin-manager');
 const Utils = require('../../../lib/classes/utils');
 const Service = require('../../../lib/classes/service');
-const ConfigSchemaHandler = require('../../../lib/classes/ConfigSchemaHandler');
+const ConfigSchemaHandler = require('../../../lib/classes/config-schema-handler');
 const CLI = require('../../../lib/classes/cli');
 const ServerlessError = require('../../../lib/serverless-error');
 const runServerless = require('../../utils/run-serverless');

From 7dacfdf9958d79eff49fa8a643e7ac03b452a5c2 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:31:43 +0100
Subject: [PATCH 0981/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6/class?=
 =?UTF-8?q?es/config-schema-handler/normalizeAjvErrors.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/classes/config-schema-handler/index.js                      | 2 +-
 .../{normalizeAjvErrors.js => normalize-ajv-errors.js}          | 0
 ...{normalizeAjvErrors.test.js => normalize-ajv-errors.test.js} | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/classes/config-schema-handler/{normalizeAjvErrors.js => normalize-ajv-errors.js} (100%)
 rename test/unit/lib/classes/config-schema-handler/{normalizeAjvErrors.test.js => normalize-ajv-errors.test.js} (99%)

diff --git a/lib/classes/config-schema-handler/index.js b/lib/classes/config-schema-handler/index.js
index d57dc56d315..c466a6abe1d 100644
--- a/lib/classes/config-schema-handler/index.js
+++ b/lib/classes/config-schema-handler/index.js
@@ -4,7 +4,7 @@ const _ = require('lodash');
 const ensurePlainObject = require('type/plain-object/ensure');
 const schema = require('../../config-schema');
 const ServerlessError = require('../../serverless-error');
-const normalizeAjvErrors = require('./normalizeAjvErrors');
+const normalizeAjvErrors = require('./normalize-ajv-errors');
 const resolveAjvValidate = require('./resolveAjvValidate');
 const { log, style } = require('@serverless/utils/log');
 
diff --git a/lib/classes/config-schema-handler/normalizeAjvErrors.js b/lib/classes/config-schema-handler/normalize-ajv-errors.js
similarity index 100%
rename from lib/classes/config-schema-handler/normalizeAjvErrors.js
rename to lib/classes/config-schema-handler/normalize-ajv-errors.js
diff --git a/test/unit/lib/classes/config-schema-handler/normalizeAjvErrors.test.js b/test/unit/lib/classes/config-schema-handler/normalize-ajv-errors.test.js
similarity index 99%
rename from test/unit/lib/classes/config-schema-handler/normalizeAjvErrors.test.js
rename to test/unit/lib/classes/config-schema-handler/normalize-ajv-errors.test.js
index 048b95302c2..ebcbfc0a909 100644
--- a/test/unit/lib/classes/config-schema-handler/normalizeAjvErrors.test.js
+++ b/test/unit/lib/classes/config-schema-handler/normalize-ajv-errors.test.js
@@ -4,7 +4,7 @@ const { expect } = require('chai');
 
 const Ajv = require('ajv').default;
 const memoize = require('memoizee');
-const normalizeAjvErrors = require('../../../../../lib/classes/config-schema-handler/normalizeAjvErrors');
+const normalizeAjvErrors = require('../../../../../lib/classes/config-schema-handler/normalize-ajv-errors');
 
 describe('#normalizeAjvErrors', () => {
   const resolveAjv = memoize(

From 8dbcc90495a08a8cd234fc68be95415a89e2164b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:31:44 +0100
Subject: [PATCH 0982/1101] refactor: Rename
 `lib/classes/config-schema-handler/regexpKeyword.js`

---
 .../{regexpKeyword.js => regexp-keyword.js}                     | 0
 lib/classes/config-schema-handler/resolveAjvValidate.js         | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/classes/config-schema-handler/{regexpKeyword.js => regexp-keyword.js} (100%)

diff --git a/lib/classes/config-schema-handler/regexpKeyword.js b/lib/classes/config-schema-handler/regexp-keyword.js
similarity index 100%
rename from lib/classes/config-schema-handler/regexpKeyword.js
rename to lib/classes/config-schema-handler/regexp-keyword.js
diff --git a/lib/classes/config-schema-handler/resolveAjvValidate.js b/lib/classes/config-schema-handler/resolveAjvValidate.js
index 60eafb2855a..27bef7df364 100644
--- a/lib/classes/config-schema-handler/resolveAjvValidate.js
+++ b/lib/classes/config-schema-handler/resolveAjvValidate.js
@@ -44,7 +44,7 @@ const getValidate = async (schema) => {
     // Ensure AJV related packages work well when there are mutliple AJV installations around
     // See: https://github.com/ajv-validator/ajv/issues/1390#issuecomment-763138202
     ajv.opts.code.formats = Ajv._`require("ajv-formats/dist/formats").fullFormats`;
-    ajv.addKeyword(require('./regexpKeyword'));
+    ajv.addKeyword(require('./regexp-keyword'));
     const validate = ajv.compile(schema);
     const moduleCode = standaloneCode(ajv, validate);
     await fs.promises.writeFile(cachePath, moduleCode);

From d0c93f9d35be4a1e445f4440b2f32cb04f4ee59e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:31:46 +0100
Subject: [PATCH 0983/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6/class?=
 =?UTF-8?q?es/config-schema-handler/resolveAjvValidate.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/classes/config-schema-handler/index.js                      | 2 +-
 .../{resolveAjvValidate.js => resolve-ajv-validate.js}          | 0
 ...{resolveAjvValidate.test.js => resolve-ajv-validate.test.js} | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/classes/config-schema-handler/{resolveAjvValidate.js => resolve-ajv-validate.js} (100%)
 rename test/unit/lib/classes/config-schema-handler/{resolveAjvValidate.test.js => resolve-ajv-validate.test.js} (97%)

diff --git a/lib/classes/config-schema-handler/index.js b/lib/classes/config-schema-handler/index.js
index c466a6abe1d..b8dc0080fab 100644
--- a/lib/classes/config-schema-handler/index.js
+++ b/lib/classes/config-schema-handler/index.js
@@ -5,7 +5,7 @@ const ensurePlainObject = require('type/plain-object/ensure');
 const schema = require('../../config-schema');
 const ServerlessError = require('../../serverless-error');
 const normalizeAjvErrors = require('./normalize-ajv-errors');
-const resolveAjvValidate = require('./resolveAjvValidate');
+const resolveAjvValidate = require('./resolve-ajv-validate');
 const { log, style } = require('@serverless/utils/log');
 
 const FUNCTION_NAME_PATTERN = '^[a-zA-Z0-9-_]+$';
diff --git a/lib/classes/config-schema-handler/resolveAjvValidate.js b/lib/classes/config-schema-handler/resolve-ajv-validate.js
similarity index 100%
rename from lib/classes/config-schema-handler/resolveAjvValidate.js
rename to lib/classes/config-schema-handler/resolve-ajv-validate.js
diff --git a/test/unit/lib/classes/config-schema-handler/resolveAjvValidate.test.js b/test/unit/lib/classes/config-schema-handler/resolve-ajv-validate.test.js
similarity index 97%
rename from test/unit/lib/classes/config-schema-handler/resolveAjvValidate.test.js
rename to test/unit/lib/classes/config-schema-handler/resolve-ajv-validate.test.js
index d2bbcce6848..07d3ca2f3ad 100644
--- a/test/unit/lib/classes/config-schema-handler/resolveAjvValidate.test.js
+++ b/test/unit/lib/classes/config-schema-handler/resolve-ajv-validate.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const chai = require('chai');
-const resolveAjvValidate = require('../../../../../lib/classes/config-schema-handler/resolveAjvValidate');
+const resolveAjvValidate = require('../../../../../lib/classes/config-schema-handler/resolve-ajv-validate');
 const objectHash = require('object-hash');
 const deepSortObjectByKey = require('../../../../../lib/utils/deepSortObjectByKey');
 const path = require('path');

From 96202a7838dfa67b56616786180d09bacaaa326b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:31:48 +0100
Subject: [PATCH 0984/1101] refactor: Rename `lib/utils/awsSdkPatch.js`

---
 lib/plugins/aws/provider.js                    | 2 +-
 lib/utils/{awsSdkPatch.js => aws-sdk-patch.js} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/utils/{awsSdkPatch.js => aws-sdk-patch.js} (100%)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index af4be8f8e6a..f2abfabacfd 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -248,7 +248,7 @@ class AwsProvider {
     if (this.serverless.service.provider.name === 'aws') {
       // Below ideally should be in hooks.initialize, but variables resolution depend on this
       this.serverless.service.provider.region = this.getRegion();
-      require('../../utils/awsSdkPatch');
+      require('../../utils/aws-sdk-patch');
       serverless.configSchemaHandler.defineProvider('aws', {
         definitions: {
           awsAccountId: {
diff --git a/lib/utils/awsSdkPatch.js b/lib/utils/aws-sdk-patch.js
similarity index 100%
rename from lib/utils/awsSdkPatch.js
rename to lib/utils/aws-sdk-patch.js

From cab3e58839978744babc85648040d06769574ec6 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:31:50 +0100
Subject: [PATCH 0985/1101] refactor: Rename `lib/utils/createFromTemplate.js`

---
 lib/plugins/create/create.js                                    | 2 +-
 lib/utils/{createFromTemplate.js => create-from-template.js}    | 0
 ...{createFromTemplate.test.js => create-from-template.test.js} | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/utils/{createFromTemplate.js => create-from-template.js} (100%)
 rename test/unit/lib/utils/{createFromTemplate.test.js => create-from-template.test.js} (96%)

diff --git a/lib/plugins/create/create.js b/lib/plugins/create/create.js
index f4200a2261a..032e01d7ce1 100644
--- a/lib/plugins/create/create.js
+++ b/lib/plugins/create/create.js
@@ -7,7 +7,7 @@ const untildify = require('untildify');
 
 const ServerlessError = require('../../serverless-error');
 const cliCommandsSchema = require('../../cli/commands-schema');
-const createFromTemplate = require('../../utils/createFromTemplate');
+const createFromTemplate = require('../../utils/create-from-template');
 const recommendedTemplatesList = require('../../templates/recommended-list');
 const humanReadableTemplatesList = require('../../templates/recommended-list/human-readable');
 const download = require('../../utils/downloadTemplateFromRepo');
diff --git a/lib/utils/createFromTemplate.js b/lib/utils/create-from-template.js
similarity index 100%
rename from lib/utils/createFromTemplate.js
rename to lib/utils/create-from-template.js
diff --git a/test/unit/lib/utils/createFromTemplate.test.js b/test/unit/lib/utils/create-from-template.test.js
similarity index 96%
rename from test/unit/lib/utils/createFromTemplate.test.js
rename to test/unit/lib/utils/create-from-template.test.js
index 36e57912ab6..efd098eb1e4 100644
--- a/test/unit/lib/utils/createFromTemplate.test.js
+++ b/test/unit/lib/utils/create-from-template.test.js
@@ -4,7 +4,7 @@ const path = require('path');
 const chai = require('chai');
 const { existsSync, outputJsonSync, readFileSync } = require('fs-extra');
 const { load: yamlParse } = require('js-yaml');
-const installTemplate = require('../../../../lib/utils/createFromTemplate');
+const installTemplate = require('../../../../lib/utils/create-from-template');
 const { getTmpDirPath } = require('../../../utils/fs');
 
 chai.use(require('chai-as-promised'));

From 5c1f615ff48b7fd553120d8ab054a1155cdd2400 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:31:52 +0100
Subject: [PATCH 0986/1101] refactor: Rename `lib/utils/deepSortObjectByKey.js`

---
 lib/aws/request.js                                              | 2 +-
 lib/classes/config-schema-handler/resolve-ajv-validate.js       | 2 +-
 lib/plugins/aws/lib/normalizeFiles.js                           | 2 +-
 lib/plugins/aws/package/compile/functions.js                    | 2 +-
 lib/plugins/aws/provider.js                                     | 2 +-
 .../{deepSortObjectByKey.js => deep-sort-object-by-key.js}      | 0
 .../classes/config-schema-handler/resolve-ajv-validate.test.js  | 2 +-
 ...pSortObjectByKey.test.js => deep-sort-object-by-key.test.js} | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename lib/utils/{deepSortObjectByKey.js => deep-sort-object-by-key.js} (100%)
 rename test/unit/lib/utils/{deepSortObjectByKey.test.js => deep-sort-object-by-key.test.js} (95%)

diff --git a/lib/aws/request.js b/lib/aws/request.js
index a1da3c4cb3e..e07c4289548 100644
--- a/lib/aws/request.js
+++ b/lib/aws/request.js
@@ -10,7 +10,7 @@ const HttpsProxyAgent = require('https-proxy-agent');
 const url = require('url');
 const https = require('https');
 const fs = require('fs');
-const deepSortObjectByKey = require('../../lib/utils/deepSortObjectByKey');
+const deepSortObjectByKey = require('../utils/deep-sort-object-by-key');
 const ensureString = require('type/string/ensure');
 const isObject = require('type/object/is');
 const wait = require('timers-ext/promise/sleep');
diff --git a/lib/classes/config-schema-handler/resolve-ajv-validate.js b/lib/classes/config-schema-handler/resolve-ajv-validate.js
index 27bef7df364..8d6d4c60b21 100644
--- a/lib/classes/config-schema-handler/resolve-ajv-validate.js
+++ b/lib/classes/config-schema-handler/resolve-ajv-validate.js
@@ -7,7 +7,7 @@ const os = require('os');
 const standaloneCode = require('ajv/dist/standalone').default;
 const fs = require('fs');
 const requireFromString = require('require-from-string');
-const deepSortObjectByKey = require('../../utils/deepSortObjectByKey');
+const deepSortObjectByKey = require('../../utils/deep-sort-object-by-key');
 const ensureExists = require('../../utils/ensureExists');
 
 const getCacheDir = () => {
diff --git a/lib/plugins/aws/lib/normalizeFiles.js b/lib/plugins/aws/lib/normalizeFiles.js
index 600ebbe02c5..06973fc1ffe 100644
--- a/lib/plugins/aws/lib/normalizeFiles.js
+++ b/lib/plugins/aws/lib/normalizeFiles.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const deepSortObjectByKey = require('../../../utils/deepSortObjectByKey');
+const deepSortObjectByKey = require('../../../utils/deep-sort-object-by-key');
 const _ = require('lodash');
 
 module.exports = {
diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index 40316b8f4d7..8d3573e8b5c 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -7,7 +7,7 @@ const fs = require('fs');
 const _ = require('lodash');
 const path = require('path');
 const ServerlessError = require('../../../../serverless-error');
-const deepSortObjectByKey = require('../../../../utils/deepSortObjectByKey');
+const deepSortObjectByKey = require('../../../../utils/deep-sort-object-by-key');
 const getHashForFilePath = require('../lib/getHashForFilePath');
 const parseS3URI = require('../../utils/parse-s3-uri');
 const { log } = require('@serverless/utils/log');
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index f2abfabacfd..0e7ec508796 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -16,7 +16,7 @@ const ServerlessError = require('../../serverless-error');
 const awsRequest = require('../../aws/request');
 const { cfValue } = require('../../utils/aws-schema-get-cf-value');
 const reportDeprecatedProperties = require('../../utils/report-deprecated-properties');
-const deepSortObjectByKey = require('../../utils/deepSortObjectByKey');
+const deepSortObjectByKey = require('../../utils/deep-sort-object-by-key');
 const { progress, log } = require('@serverless/utils/log');
 
 const isLambdaArn = RegExp.prototype.test.bind(/^arn:[^:]+:lambda:/);
diff --git a/lib/utils/deepSortObjectByKey.js b/lib/utils/deep-sort-object-by-key.js
similarity index 100%
rename from lib/utils/deepSortObjectByKey.js
rename to lib/utils/deep-sort-object-by-key.js
diff --git a/test/unit/lib/classes/config-schema-handler/resolve-ajv-validate.test.js b/test/unit/lib/classes/config-schema-handler/resolve-ajv-validate.test.js
index 07d3ca2f3ad..aead0166d1e 100644
--- a/test/unit/lib/classes/config-schema-handler/resolve-ajv-validate.test.js
+++ b/test/unit/lib/classes/config-schema-handler/resolve-ajv-validate.test.js
@@ -3,7 +3,7 @@
 const chai = require('chai');
 const resolveAjvValidate = require('../../../../../lib/classes/config-schema-handler/resolve-ajv-validate');
 const objectHash = require('object-hash');
-const deepSortObjectByKey = require('../../../../../lib/utils/deepSortObjectByKey');
+const deepSortObjectByKey = require('../../../../../lib/utils/deep-sort-object-by-key');
 const path = require('path');
 const os = require('os');
 const fsp = require('fs').promises;
diff --git a/test/unit/lib/utils/deepSortObjectByKey.test.js b/test/unit/lib/utils/deep-sort-object-by-key.test.js
similarity index 95%
rename from test/unit/lib/utils/deepSortObjectByKey.test.js
rename to test/unit/lib/utils/deep-sort-object-by-key.test.js
index 4bdeb8e73ff..7ffba12374b 100644
--- a/test/unit/lib/utils/deepSortObjectByKey.test.js
+++ b/test/unit/lib/utils/deep-sort-object-by-key.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const deepSortObjectByKey = require('../../../../lib/utils/deepSortObjectByKey');
+const deepSortObjectByKey = require('../../../../lib/utils/deep-sort-object-by-key');
 
 describe('deepSortObjectByKey', () => {
   it('handles plain object', () => {

From a93a1511b7eea27b756777ffc1a519f999e8b666 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:31:54 +0100
Subject: [PATCH 0987/1101] refactor: Rename
 `lib/utils/downloadTemplateFromRepo.js`

---
 lib/cli/interactive-setup/service.js          |  2 +-
 lib/plugins/create/create.js                  |  2 +-
 lib/plugins/install.js                        |  2 +-
 ...Repo.js => download-template-from-repo.js} |  0
 .../lib/cli/interactive-setup/service.test.js | 20 +++++++++----------
 test/unit/lib/plugins/create/create.test.js   |  2 +-
 test/unit/lib/plugins/install.test.js         |  2 +-
 ...js => download-template-from-repo.test.js} |  2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)
 rename lib/utils/{downloadTemplateFromRepo.js => download-template-from-repo.js} (100%)
 rename test/unit/lib/utils/{downloadTemplateFromRepo.test.js => download-template-from-repo.test.js} (99%)

diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
index d93822c3df8..a2b517df419 100644
--- a/lib/cli/interactive-setup/service.js
+++ b/lib/cli/interactive-setup/service.js
@@ -11,7 +11,7 @@ const resolveVariables = require('../../configuration/variables');
 const createFromLocalTemplate = require('../../utils/create-from-local-template');
 const npmCommandDeferred = require('../../utils/npm-command-deferred');
 const ServerlessError = require('../../serverless-error');
-const { downloadTemplateFromRepo } = require('../../utils/downloadTemplateFromRepo');
+const { downloadTemplateFromRepo } = require('../../utils/download-template-from-repo');
 
 const isValidServiceName = RegExp.prototype.test.bind(/^[a-zA-Z][a-zA-Z0-9-]{0,100}$/);
 
diff --git a/lib/plugins/create/create.js b/lib/plugins/create/create.js
index 032e01d7ce1..5388e52cb4e 100644
--- a/lib/plugins/create/create.js
+++ b/lib/plugins/create/create.js
@@ -10,7 +10,7 @@ const cliCommandsSchema = require('../../cli/commands-schema');
 const createFromTemplate = require('../../utils/create-from-template');
 const recommendedTemplatesList = require('../../templates/recommended-list');
 const humanReadableTemplatesList = require('../../templates/recommended-list/human-readable');
-const download = require('../../utils/downloadTemplateFromRepo');
+const download = require('../../utils/download-template-from-repo');
 const renameService = require('../../utils/renameService').renameService;
 const copyDirContentsSync = require('../../utils/fs/copyDirContentsSync');
 const dirExistsSync = require('../../utils/fs/dirExistsSync');
diff --git a/lib/plugins/install.js b/lib/plugins/install.js
index 55305ea5eb8..c2a35837331 100644
--- a/lib/plugins/install.js
+++ b/lib/plugins/install.js
@@ -3,7 +3,7 @@
 const BbPromise = require('bluebird');
 
 const cliCommandsSchema = require('../cli/commands-schema');
-const download = require('../utils/downloadTemplateFromRepo');
+const download = require('../utils/download-template-from-repo');
 const { log, progress, style } = require('@serverless/utils/log');
 
 class Install {
diff --git a/lib/utils/downloadTemplateFromRepo.js b/lib/utils/download-template-from-repo.js
similarity index 100%
rename from lib/utils/downloadTemplateFromRepo.js
rename to lib/utils/download-template-from-repo.js
diff --git a/test/unit/lib/cli/interactive-setup/service.test.js b/test/unit/lib/cli/interactive-setup/service.test.js
index abf1cfd5f76..8738b13be3c 100644
--- a/test/unit/lib/cli/interactive-setup/service.test.js
+++ b/test/unit/lib/cli/interactive-setup/service.test.js
@@ -78,7 +78,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
     it('Should create project at not existing directory', async () => {
       const downloadTemplateFromRepoStub = sinon.stub();
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
-        '../../utils/downloadTemplateFromRepo': {
+        '../../utils/download-template-from-repo': {
           downloadTemplateFromRepo: downloadTemplateFromRepoStub.callsFake(
             async (templateUrl, projectType, projectName) => {
               await fsp.mkdir(projectName);
@@ -118,7 +118,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
     it('Should remove `serverless.template.yml` if its a part of the template', async () => {
       const downloadTemplateFromRepoStub = sinon.stub();
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
-        '../../utils/downloadTemplateFromRepo': {
+        '../../utils/download-template-from-repo': {
           downloadTemplateFromRepo: downloadTemplateFromRepoStub.callsFake(
             async (templateUrl, projectType, projectName) => {
               await fsp.mkdir(projectName);
@@ -165,7 +165,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       const spawnStub = sinon.stub();
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
         'child-process-ext/spawn': spawnStub,
-        '../../utils/downloadTemplateFromRepo': {
+        '../../utils/download-template-from-repo': {
           downloadTemplateFromRepo: downloadTemplateFromRepoStub.callsFake(
             async (templateUrl, projectType, projectName) => {
               await fsp.mkdir(projectName);
@@ -211,7 +211,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       const downloadTemplateFromRepoStub = sinon.stub();
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
         'child-process-ext/spawn': sinon.stub().rejects({ message: 'Error message' }),
-        '../../utils/downloadTemplateFromRepo': {
+        '../../utils/download-template-from-repo': {
           downloadTemplateFromRepo: downloadTemplateFromRepoStub.callsFake(
             async (templateUrl, projectType, projectName) => {
               await fsp.mkdir(projectName);
@@ -266,7 +266,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
 
     it('Should create project at not existing directory with provided `name`', async () => {
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
-        '../../utils/downloadTemplateFromRepo': {
+        '../../utils/download-template-from-repo': {
           downloadTemplateFromRepo: sinon
             .stub()
             .callsFake(async (templateUrl, projectType, projectName) => {
@@ -299,7 +299,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
     it('Should create project at not existing directory with provided template', async () => {
       const downloadTemplateFromRepoStub = sinon.stub();
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
-        '../../utils/downloadTemplateFromRepo': {
+        '../../utils/download-template-from-repo': {
           downloadTemplateFromRepo: downloadTemplateFromRepoStub.callsFake(
             async (templateUrl, projectType, projectName) => {
               const serverlessYmlContent = `
@@ -336,7 +336,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
       const providedTemplateUrl = 'https://github.com/serverless/examples/tree/v3/test-template';
       const downloadTemplateFromRepoStub = sinon.stub();
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
-        '../../utils/downloadTemplateFromRepo': {
+        '../../utils/download-template-from-repo': {
           downloadTemplateFromRepo: downloadTemplateFromRepoStub.callsFake(
             async (templateUrl, projectType, projectName) => {
               const serverlessYmlContent = `
@@ -374,7 +374,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
 
     it('Should throw an error when template cannot be downloaded', async () => {
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
-        '../../utils/downloadTemplateFromRepo': {
+        '../../utils/download-template-from-repo': {
           downloadTemplateFromRepo: sinon.stub().callsFake(async () => {
             throw new ServerlessError();
           }),
@@ -400,7 +400,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
 
     it('Should throw an error when provided template cannot be found', async () => {
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
-        '../../utils/downloadTemplateFromRepo': {
+        '../../utils/download-template-from-repo': {
           downloadTemplateFromRepo: sinon.stub().rejects({ code: 'ENOENT' }),
         },
       });
@@ -419,7 +419,7 @@ describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
 
     it('Should throw an error when template provided with url cannot be found', async () => {
       const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
-        '../../utils/downloadTemplateFromRepo': {
+        '../../utils/download-template-from-repo': {
           downloadTemplateFromRepo: sinon.stub().callsFake(async () => {
             throw new ServerlessError();
           }),
diff --git a/test/unit/lib/plugins/create/create.test.js b/test/unit/lib/plugins/create/create.test.js
index e39bef00397..86eb6ecaeab 100644
--- a/test/unit/lib/plugins/create/create.test.js
+++ b/test/unit/lib/plugins/create/create.test.js
@@ -8,7 +8,7 @@ const Create = require('../../../../../lib/plugins/create/create');
 const Serverless = require('../../../../../lib/serverless');
 const sinon = require('sinon');
 const walkDirSync = require('../../../../../lib/utils/fs/walkDirSync');
-const download = require('../../../../../lib/utils/downloadTemplateFromRepo');
+const download = require('../../../../../lib/utils/download-template-from-repo');
 const { getTmpDirPath } = require('../../../../utils/fs');
 
 chai.use(require('chai-as-promised'));
diff --git a/test/unit/lib/plugins/install.test.js b/test/unit/lib/plugins/install.test.js
index c956ee125cb..a9956cd9ef0 100644
--- a/test/unit/lib/plugins/install.test.js
+++ b/test/unit/lib/plugins/install.test.js
@@ -4,7 +4,7 @@ const chai = require('chai');
 const Serverless = require('../../../../lib/serverless');
 const Install = require('../../../../lib/plugins/install.js');
 const sinon = require('sinon');
-const download = require('../../../../lib/utils/downloadTemplateFromRepo');
+const download = require('../../../../lib/utils/download-template-from-repo');
 const fse = require('fs-extra');
 const path = require('path');
 const { getTmpDirPath } = require('../../../utils/fs');
diff --git a/test/unit/lib/utils/downloadTemplateFromRepo.test.js b/test/unit/lib/utils/download-template-from-repo.test.js
similarity index 99%
rename from test/unit/lib/utils/downloadTemplateFromRepo.test.js
rename to test/unit/lib/utils/download-template-from-repo.test.js
index 007cbd1a146..5f77445a941 100644
--- a/test/unit/lib/utils/downloadTemplateFromRepo.test.js
+++ b/test/unit/lib/utils/download-template-from-repo.test.js
@@ -48,7 +48,7 @@ describe('downloadTemplateFromRepo', () => {
     downloadStub = sinon.stub().resolves();
 
     const downloadTemplateFromRepoModule = proxyquire(
-      '../../../../lib/utils/downloadTemplateFromRepo',
+      '../../../../lib/utils/download-template-from-repo',
       {
         'node-fetch': (url) => {
           if (url.indexOf('mybitbucket.server.ltd') > -1) {

From b7e5f55bf73d0fe7d4b074a24d213c6431fa77ce Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:31:56 +0100
Subject: [PATCH 0988/1101] refactor: Rename `lib/utils/ensureArtifact.js`

---
 lib/plugins/aws/custom-resources/generateZip.js                 | 2 +-
 lib/plugins/aws/invoke-local/index.js                           | 2 +-
 lib/utils/{ensureArtifact.js => ensure-artifact.js}             | 0
 test/mocha-patch.js                                             | 2 +-
 .../{getEnsureArtifact.test.js => ensure-artifact.test.js}      | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename lib/utils/{ensureArtifact.js => ensure-artifact.js} (100%)
 rename test/unit/lib/utils/{getEnsureArtifact.test.js => ensure-artifact.test.js} (94%)

diff --git a/lib/plugins/aws/custom-resources/generateZip.js b/lib/plugins/aws/custom-resources/generateZip.js
index d4b05ccf291..a4ca10ab3b3 100644
--- a/lib/plugins/aws/custom-resources/generateZip.js
+++ b/lib/plugins/aws/custom-resources/generateZip.js
@@ -4,7 +4,7 @@ const path = require('path');
 const fse = require('fs-extra');
 const getTmpDirPath = require('../../../utils/fs/getTmpDirPath');
 const createZipFile = require('../../../utils/fs/createZipFile');
-const ensureArtifact = require('../../../utils/ensureArtifact');
+const ensureArtifact = require('../../../utils/ensure-artifact');
 const safeMoveFile = require('../../../utils/fs/safeMoveFile');
 
 const srcDirPath = path.join(__dirname, 'resources');
diff --git a/lib/plugins/aws/invoke-local/index.js b/lib/plugins/aws/invoke-local/index.js
index 2768504b3bb..31252a9224b 100644
--- a/lib/plugins/aws/invoke-local/index.js
+++ b/lib/plugins/aws/invoke-local/index.js
@@ -20,7 +20,7 @@ const ServerlessError = require('../../../serverless-error');
 const dirExists = require('../../../utils/fs/dirExists');
 const fileExists = require('../../../utils/fs/fileExists');
 const isStandalone = require('../../../utils/isStandaloneExecutable');
-const ensureArtifact = require('../../../utils/ensureArtifact');
+const ensureArtifact = require('../../../utils/ensure-artifact');
 const resolveCfImportValue = require('../utils/resolveCfImportValue');
 const resolveCfRefValue = require('../utils/resolveCfRefValue');
 const { writeText, progress, log } = require('@serverless/utils/log');
diff --git a/lib/utils/ensureArtifact.js b/lib/utils/ensure-artifact.js
similarity index 100%
rename from lib/utils/ensureArtifact.js
rename to lib/utils/ensure-artifact.js
diff --git a/test/mocha-patch.js b/test/mocha-patch.js
index bd251202277..992ee2cb617 100644
--- a/test/mocha-patch.js
+++ b/test/mocha-patch.js
@@ -45,7 +45,7 @@ patchCallback('mkdir');
 patchCallback('open');
 patchCallback('readFile');
 
-const ensureArtifact = require('../lib/utils/ensureArtifact');
+const ensureArtifact = require('../lib/utils/ensure-artifact');
 
 const localServerlessPathModulePath = require.resolve('../lib/cli/local-serverless-path');
 const resolveInput = require('../lib/cli/resolve-input');
diff --git a/test/unit/lib/utils/getEnsureArtifact.test.js b/test/unit/lib/utils/ensure-artifact.test.js
similarity index 94%
rename from test/unit/lib/utils/getEnsureArtifact.test.js
rename to test/unit/lib/utils/ensure-artifact.test.js
index 5391cb02983..6e70ae184fd 100644
--- a/test/unit/lib/utils/getEnsureArtifact.test.js
+++ b/test/unit/lib/utils/ensure-artifact.test.js
@@ -2,7 +2,7 @@
 
 const { expect } = require('chai');
 
-const ensureArtifact = require('../../../../lib/utils/ensureArtifact');
+const ensureArtifact = require('../../../../lib/utils/ensure-artifact');
 
 const path = require('path');
 const fsp = require('fs').promises;

From 4bb6ff4e237ddd57269775eb12303c30b495f625 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:31:58 +0100
Subject: [PATCH 0989/1101] refactor: Rename `lib/utils/ensureExists.js`

---
 lib/classes/config-schema-handler/resolve-ajv-validate.js       | 2 +-
 lib/utils/ensure-artifact.js                                    | 2 +-
 lib/utils/{ensureExists.js => ensure-exists.js}                 | 0
 .../lib/utils/{ensureExists.test.js => ensure-exists.test.js}   | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/utils/{ensureExists.js => ensure-exists.js} (100%)
 rename test/unit/lib/utils/{ensureExists.test.js => ensure-exists.test.js} (94%)

diff --git a/lib/classes/config-schema-handler/resolve-ajv-validate.js b/lib/classes/config-schema-handler/resolve-ajv-validate.js
index 8d6d4c60b21..4a5a6423186 100644
--- a/lib/classes/config-schema-handler/resolve-ajv-validate.js
+++ b/lib/classes/config-schema-handler/resolve-ajv-validate.js
@@ -8,7 +8,7 @@ const standaloneCode = require('ajv/dist/standalone').default;
 const fs = require('fs');
 const requireFromString = require('require-from-string');
 const deepSortObjectByKey = require('../../utils/deep-sort-object-by-key');
-const ensureExists = require('../../utils/ensureExists');
+const ensureExists = require('../../utils/ensure-exists');
 
 const getCacheDir = () => {
   return path.resolve(
diff --git a/lib/utils/ensure-artifact.js b/lib/utils/ensure-artifact.js
index f8f2bfe2887..f73686bf85c 100644
--- a/lib/utils/ensure-artifact.js
+++ b/lib/utils/ensure-artifact.js
@@ -2,7 +2,7 @@
 
 const memoizee = require('memoizee');
 const { version } = require('../../package');
-const ensureExists = require('./ensureExists');
+const ensureExists = require('./ensure-exists');
 const path = require('path');
 const os = require('os');
 
diff --git a/lib/utils/ensureExists.js b/lib/utils/ensure-exists.js
similarity index 100%
rename from lib/utils/ensureExists.js
rename to lib/utils/ensure-exists.js
diff --git a/test/unit/lib/utils/ensureExists.test.js b/test/unit/lib/utils/ensure-exists.test.js
similarity index 94%
rename from test/unit/lib/utils/ensureExists.test.js
rename to test/unit/lib/utils/ensure-exists.test.js
index 40bb57499c1..b1bc6b471fa 100644
--- a/test/unit/lib/utils/ensureExists.test.js
+++ b/test/unit/lib/utils/ensure-exists.test.js
@@ -3,7 +3,7 @@
 const chai = require('chai');
 const sinon = require('sinon');
 
-const ensureExists = require('../../../../lib/utils/ensureExists');
+const ensureExists = require('../../../../lib/utils/ensure-exists');
 const { getTmpDirPath } = require('../../../utils/fs');
 
 const path = require('path');

From d8a36fba4cd17a2c2b5d9fbbf0fbaff32237121e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:31:59 +0100
Subject: [PATCH 0990/1101] refactor: Rename `lib/utils/eventuallyUpdate.js`

---
 lib/serverless.js                                       | 2 +-
 lib/utils/{eventuallyUpdate.js => eventually-update.js} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/utils/{eventuallyUpdate.js => eventually-update.js} (100%)

diff --git a/lib/serverless.js b/lib/serverless.js
index 17af7a48313..2770f923252 100644
--- a/lib/serverless.js
+++ b/lib/serverless.js
@@ -19,7 +19,7 @@ const ServerlessError = require('./serverless-error');
 const version = require('./../package.json').version;
 const isStandaloneExecutable = require('./utils/isStandaloneExecutable');
 const logDeprecation = require('./utils/logDeprecation');
-const eventuallyUpdate = require('./utils/eventuallyUpdate');
+const eventuallyUpdate = require('./utils/eventually-update');
 const commmandsSchema = require('./cli/commands-schema');
 const resolveCliInput = require('./cli/resolve-input');
 
diff --git a/lib/utils/eventuallyUpdate.js b/lib/utils/eventually-update.js
similarity index 100%
rename from lib/utils/eventuallyUpdate.js
rename to lib/utils/eventually-update.js

From ed0ad9edcb7ad853408e7ec85cff32fd2c85e1cf Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:00 +0100
Subject: [PATCH 0991/1101] refactor: Rename `lib/utils/getFrameworkId.js`

---
 lib/utils/{getFrameworkId.js => get-framework-id.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename lib/utils/{getFrameworkId.js => get-framework-id.js} (100%)

diff --git a/lib/utils/getFrameworkId.js b/lib/utils/get-framework-id.js
similarity index 100%
rename from lib/utils/getFrameworkId.js
rename to lib/utils/get-framework-id.js

From cca54df714700a3f13e02f1462b46ba0c9499771 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:02 +0100
Subject: [PATCH 0992/1101] refactor: Rename `lib/utils/getServerlessDir.js`

---
 lib/utils/{getServerlessDir.js => get-serverless-dir.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename lib/utils/{getServerlessDir.js => get-serverless-dir.js} (100%)

diff --git a/lib/utils/getServerlessDir.js b/lib/utils/get-serverless-dir.js
similarity index 100%
rename from lib/utils/getServerlessDir.js
rename to lib/utils/get-serverless-dir.js

From aed6673d680cfc158fc680cdf2e53f6281b95d6e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:03 +0100
Subject: [PATCH 0993/1101] refactor: Rename
 `lib/utils/isStandaloneExecutable.js`

---
 bin/serverless.js                                               | 2 +-
 lib/cli/commands-schema/no-service.js                           | 2 +-
 lib/cli/handle-error.js                                         | 2 +-
 lib/cli/render-version.js                                       | 2 +-
 lib/plugins/aws/invoke-local/index.js                           | 2 +-
 lib/serverless.js                                               | 2 +-
 .../{isStandaloneExecutable.js => is-standalone-executable.js}  | 0
 lib/utils/telemetry/generatePayload.js                          | 2 +-
 scripts/postinstall.js                                          | 2 +-
 test/unit/lib/cli/handle-error.test.js                          | 2 +-
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename lib/utils/{isStandaloneExecutable.js => is-standalone-executable.js} (100%)

diff --git a/bin/serverless.js b/bin/serverless.js
index abf8c0bc3a8..57c58f7e4ba 100755
--- a/bin/serverless.js
+++ b/bin/serverless.js
@@ -25,7 +25,7 @@ if (nodeVersion < minimumSupportedVersion) {
 }
 
 if (isMainModule) {
-  if (require('../lib/utils/isStandaloneExecutable')) {
+  if (require('../lib/utils/is-standalone-executable')) {
     require('../lib/utils/standalone-patch');
     if (process.argv[2] === 'binary-postinstall' && process.argv.length === 3) {
       require('../scripts/postinstall');
diff --git a/lib/cli/commands-schema/no-service.js b/lib/cli/commands-schema/no-service.js
index de07e6bd1dc..f5d271b6861 100644
--- a/lib/cli/commands-schema/no-service.js
+++ b/lib/cli/commands-schema/no-service.js
@@ -232,7 +232,7 @@ commands.set('slstats', {
 });
 
 (() => {
-  const isHidden = !require('../../utils/isStandaloneExecutable') || process.platform === 'win32';
+  const isHidden = !require('../../utils/is-standalone-executable') || process.platform === 'win32';
   const noSupportNotice =
     "It's applicable only in context of a standalone executable instance " +
     'in non Windows environment.';
diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index fdf1c8b0985..1d686e8ec2e 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -7,7 +7,7 @@ const { platformClientVersion } = require('@serverless/dashboard-plugin');
 const { getDashboardProvidersUrl } = require('@serverless/dashboard-plugin/lib/dashboard');
 const { style, writeText } = require('@serverless/utils/log');
 const slsVersion = require('./../../package').version;
-const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
+const isStandaloneExecutable = require('../utils/is-standalone-executable');
 const tokenizeException = require('../utils/tokenize-exception');
 const isLocallyInstalled = require('./is-locally-installed');
 const resolveErrorLocation = require('../utils/telemetry/resolve-error-location');
diff --git a/lib/cli/render-version.js b/lib/cli/render-version.js
index 24fb9a43c5e..5b86dd2e100 100644
--- a/lib/cli/render-version.js
+++ b/lib/cli/render-version.js
@@ -6,7 +6,7 @@ const { version } = require('../../package');
 const spawn = require('child-process-ext/spawn');
 const { version: dashboardPluginVersion } = require('@serverless/dashboard-plugin/package');
 const { platformClientVersion } = require('@serverless/dashboard-plugin');
-const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
+const isStandaloneExecutable = require('../utils/is-standalone-executable');
 const localServerlessPath = require('./local-serverless-path');
 const { writeText } = require('@serverless/utils/log');
 
diff --git a/lib/plugins/aws/invoke-local/index.js b/lib/plugins/aws/invoke-local/index.js
index 31252a9224b..10b2869f879 100644
--- a/lib/plugins/aws/invoke-local/index.js
+++ b/lib/plugins/aws/invoke-local/index.js
@@ -19,7 +19,7 @@ const { v4: uuidv4 } = require('uuid');
 const ServerlessError = require('../../../serverless-error');
 const dirExists = require('../../../utils/fs/dirExists');
 const fileExists = require('../../../utils/fs/fileExists');
-const isStandalone = require('../../../utils/isStandaloneExecutable');
+const isStandalone = require('../../../utils/is-standalone-executable');
 const ensureArtifact = require('../../../utils/ensure-artifact');
 const resolveCfImportValue = require('../utils/resolveCfImportValue');
 const resolveCfRefValue = require('../utils/resolveCfRefValue');
diff --git a/lib/serverless.js b/lib/serverless.js
index 2770f923252..54f495c9aec 100644
--- a/lib/serverless.js
+++ b/lib/serverless.js
@@ -17,7 +17,7 @@ const Service = require('./classes/service');
 const ConfigSchemaHandler = require('./classes/config-schema-handler');
 const ServerlessError = require('./serverless-error');
 const version = require('./../package.json').version;
-const isStandaloneExecutable = require('./utils/isStandaloneExecutable');
+const isStandaloneExecutable = require('./utils/is-standalone-executable');
 const logDeprecation = require('./utils/logDeprecation');
 const eventuallyUpdate = require('./utils/eventually-update');
 const commmandsSchema = require('./cli/commands-schema');
diff --git a/lib/utils/isStandaloneExecutable.js b/lib/utils/is-standalone-executable.js
similarity index 100%
rename from lib/utils/isStandaloneExecutable.js
rename to lib/utils/is-standalone-executable.js
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index 2acd99f6b86..8cda62c0ecc 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -7,7 +7,7 @@ const isPlainObject = require('type/plain-object/is');
 const isObject = require('type/object/is');
 const userConfig = require('@serverless/utils/config');
 const getNotificationsMode = require('@serverless/utils/get-notifications-mode');
-const isStandalone = require('../isStandaloneExecutable');
+const isStandalone = require('../is-standalone-executable');
 const { getConfigurationValidationResult } = require('../../classes/config-schema-handler');
 const { triggeredDeprecations } = require('../logDeprecation');
 const isNpmGlobal = require('../npmPackage/isGlobal');
diff --git a/scripts/postinstall.js b/scripts/postinstall.js
index d8094db81a3..ca33e5a53af 100755
--- a/scripts/postinstall.js
+++ b/scripts/postinstall.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const chalk = require('chalk');
-const isStandaloneExecutable = require('../lib/utils/isStandaloneExecutable');
+const isStandaloneExecutable = require('../lib/utils/is-standalone-executable');
 
 const isWindows = process.platform === 'win32';
 
diff --git a/test/unit/lib/cli/handle-error.test.js b/test/unit/lib/cli/handle-error.test.js
index cef4d2222f0..47cb01b9d4a 100644
--- a/test/unit/lib/cli/handle-error.test.js
+++ b/test/unit/lib/cli/handle-error.test.js
@@ -5,7 +5,7 @@ const sinon = require('sinon');
 
 const observeOutput = require('@serverless/test/observe-output');
 const handleError = require('../../../../lib/cli/handle-error');
-const isStandaloneExecutable = require('../../../../lib/utils/isStandaloneExecutable');
+const isStandaloneExecutable = require('../../../../lib/utils/is-standalone-executable');
 const ServerlessError = require('../../../../lib/serverless-error');
 
 chai.use(require('sinon-chai'));

From 2cf86e4ee90f325e3af741dd7c1fd2292062381b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:05 +0100
Subject: [PATCH 0994/1101] refactor: Rename `lib/utils/logDeprecation.js`

---
 lib/cli/commands-schema/resolve-final.js                      | 2 +-
 .../variables/sources/resolve-external-plugin-sources.js      | 2 +-
 lib/serverless.js                                             | 2 +-
 lib/utils/{logDeprecation.js => log-deprecation.js}           | 0
 lib/utils/report-deprecated-properties.js                     | 2 +-
 lib/utils/telemetry/generatePayload.js                        | 2 +-
 scripts/serverless.js                                         | 2 +-
 test/unit/lib/cli/ensure-supported-command.test.js            | 2 +-
 test/unit/lib/cli/resolve-input.test.js                       | 2 +-
 .../utils/{logDeprecation.test.js => log-deprecation.test.js} | 4 ++--
 10 files changed, 10 insertions(+), 10 deletions(-)
 rename lib/utils/{logDeprecation.js => log-deprecation.js} (100%)
 rename test/unit/lib/utils/{logDeprecation.test.js => log-deprecation.test.js} (90%)

diff --git a/lib/cli/commands-schema/resolve-final.js b/lib/cli/commands-schema/resolve-final.js
index 6f46d89beb5..feb8819838b 100644
--- a/lib/cli/commands-schema/resolve-final.js
+++ b/lib/cli/commands-schema/resolve-final.js
@@ -8,7 +8,7 @@ const serviceCommands = require('./service');
 const awsServiceCommands = require('./aws-service');
 const serviceOptions = require('./common-options/service');
 const awsServiceOptions = require('./common-options/aws-service');
-const logDeprecation = require('../../utils/logDeprecation');
+const logDeprecation = require('../../utils/log-deprecation');
 
 module.exports = (loadedPlugins, { providerName, configuration }) => {
   const commands = new Map(providerName === 'aws' ? awsServiceCommands : serviceCommands);
diff --git a/lib/configuration/variables/sources/resolve-external-plugin-sources.js b/lib/configuration/variables/sources/resolve-external-plugin-sources.js
index c6b08f5d80c..816c7cf31d0 100644
--- a/lib/configuration/variables/sources/resolve-external-plugin-sources.js
+++ b/lib/configuration/variables/sources/resolve-external-plugin-sources.js
@@ -3,7 +3,7 @@
 const ensurePlainObject = require('type/plain-object/ensure');
 const ensurePlainFunction = require('type/plain-function/ensure');
 const ServerlessError = require('../../../serverless-error');
-const logDeprecation = require('../../../utils/logDeprecation');
+const logDeprecation = require('../../../utils/log-deprecation');
 
 module.exports = (configuration, resolverConfiguration, externalPlugins) => {
   for (const externalPlugin of externalPlugins) {
diff --git a/lib/serverless.js b/lib/serverless.js
index 54f495c9aec..09f1522883f 100644
--- a/lib/serverless.js
+++ b/lib/serverless.js
@@ -18,7 +18,7 @@ const ConfigSchemaHandler = require('./classes/config-schema-handler');
 const ServerlessError = require('./serverless-error');
 const version = require('./../package.json').version;
 const isStandaloneExecutable = require('./utils/is-standalone-executable');
-const logDeprecation = require('./utils/logDeprecation');
+const logDeprecation = require('./utils/log-deprecation');
 const eventuallyUpdate = require('./utils/eventually-update');
 const commmandsSchema = require('./cli/commands-schema');
 const resolveCliInput = require('./cli/resolve-input');
diff --git a/lib/utils/logDeprecation.js b/lib/utils/log-deprecation.js
similarity index 100%
rename from lib/utils/logDeprecation.js
rename to lib/utils/log-deprecation.js
diff --git a/lib/utils/report-deprecated-properties.js b/lib/utils/report-deprecated-properties.js
index 3c3625c10c3..08370d906d0 100644
--- a/lib/utils/report-deprecated-properties.js
+++ b/lib/utils/report-deprecated-properties.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const logDeprecation = require('./logDeprecation');
+const logDeprecation = require('./log-deprecation');
 
 const getMessage = (props, serviceConfig) => {
   const warnings = [];
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index 8cda62c0ecc..874098c4fb4 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -9,7 +9,7 @@ const userConfig = require('@serverless/utils/config');
 const getNotificationsMode = require('@serverless/utils/get-notifications-mode');
 const isStandalone = require('../is-standalone-executable');
 const { getConfigurationValidationResult } = require('../../classes/config-schema-handler');
-const { triggeredDeprecations } = require('../logDeprecation');
+const { triggeredDeprecations } = require('../log-deprecation');
 const isNpmGlobal = require('../npmPackage/isGlobal');
 const isLocallyInstalled = require('../../cli/is-locally-installed');
 const ci = require('ci-info');
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 722f83ac443..d0afb8c6615 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -19,7 +19,7 @@ const {
 } = require('../lib/utils/telemetry');
 const generateTelemetryPayload = require('../lib/utils/telemetry/generatePayload');
 const isTelemetryDisabled = require('../lib/utils/telemetry/areDisabled');
-const logDeprecation = require('../lib/utils/logDeprecation');
+const logDeprecation = require('../lib/utils/log-deprecation');
 
 let command;
 let isHelpRequest;
diff --git a/test/unit/lib/cli/ensure-supported-command.test.js b/test/unit/lib/cli/ensure-supported-command.test.js
index 5003bc1ba57..a58132dc796 100644
--- a/test/unit/lib/cli/ensure-supported-command.test.js
+++ b/test/unit/lib/cli/ensure-supported-command.test.js
@@ -4,7 +4,7 @@ const { expect } = require('chai');
 const overrideArgv = require('process-utils/override-argv');
 const ServerlessError = require('../../../../lib/serverless-error');
 const resolveInput = require('../../../../lib/cli/resolve-input');
-const { triggeredDeprecations } = require('../../../../lib/utils/logDeprecation');
+const { triggeredDeprecations } = require('../../../../lib/utils/log-deprecation');
 const ensureSupportedCommand = require('../../../../lib/cli/ensure-supported-command');
 
 describe('test/unit/lib/cli/ensure-supported-command.test.js', () => {
diff --git a/test/unit/lib/cli/resolve-input.test.js b/test/unit/lib/cli/resolve-input.test.js
index 37c50633355..4fc5bf661c5 100644
--- a/test/unit/lib/cli/resolve-input.test.js
+++ b/test/unit/lib/cli/resolve-input.test.js
@@ -10,7 +10,7 @@ describe('test/unit/lib/cli/resolve-input.test.js', () => {
     let data;
     before(() => {
       resolveInput.clear();
-      delete require.cache[require.resolve('../../../../lib/utils/logDeprecation')];
+      delete require.cache[require.resolve('../../../../lib/utils/log-deprecation')];
       process.env.SLS_DEPRECATION_DISABLE = 'CLI_OPTIONS_BEFORE_COMMAND';
       data = overrideArgv(
         {
diff --git a/test/unit/lib/utils/logDeprecation.test.js b/test/unit/lib/utils/log-deprecation.test.js
similarity index 90%
rename from test/unit/lib/utils/logDeprecation.test.js
rename to test/unit/lib/utils/log-deprecation.test.js
index abfdf5022eb..b90a9738cf2 100644
--- a/test/unit/lib/utils/logDeprecation.test.js
+++ b/test/unit/lib/utils/log-deprecation.test.js
@@ -9,7 +9,7 @@ describe('test/unit/lib/utils/logDeprecation.test.js', () => {
   let restoreEnv;
 
   beforeEach(() => {
-    delete require.cache[require.resolve('../../../../lib/utils/logDeprecation')];
+    delete require.cache[require.resolve('../../../../lib/utils/log-deprecation')];
     ({ restoreEnv } = overrideEnv({
       whitelist: ['APPDATA', 'HOME', 'PATH', 'TEMP', 'TMP', 'TMPDIR', 'USERPROFILE'],
     }));
@@ -21,7 +21,7 @@ describe('test/unit/lib/utils/logDeprecation.test.js', () => {
   });
 
   it('should throw on deprecation if error notifications mode set in service config', () => {
-    const logDeprecation = require('../../../../lib/utils/logDeprecation');
+    const logDeprecation = require('../../../../lib/utils/log-deprecation');
     expect(() =>
       logDeprecation('CODE1', 'Start using deprecation log', {
         serviceConfig: { deprecationNotificationMode: 'error' },

From 2bcc8f3b47a126c1cf1ce996e058b1eab99d3af3 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:07 +0100
Subject: [PATCH 0995/1101] refactor: Rename `lib/utils/openBrowser.js`

---
 lib/cli/interactive-setup/aws-credentials.js              | 2 +-
 lib/utils/{openBrowser.js => open-browser.js}             | 0
 .../lib/cli/interactive-setup/aws-credentials.test.js     | 8 ++++----
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename lib/utils/{openBrowser.js => open-browser.js} (100%)

diff --git a/lib/cli/interactive-setup/aws-credentials.js b/lib/cli/interactive-setup/aws-credentials.js
index bb1b4a60bfa..46507508d84 100644
--- a/lib/cli/interactive-setup/aws-credentials.js
+++ b/lib/cli/interactive-setup/aws-credentials.js
@@ -9,7 +9,7 @@ const AWS = require('aws-sdk');
 
 const awsCredentials = require('../../plugins/aws/utils/credentials');
 const { confirm, doesServiceInstanceHaveLinkedProvider } = require('./utils');
-const openBrowser = require('../../utils/openBrowser');
+const openBrowser = require('../../utils/open-browser');
 const ServerlessError = require('../../serverless-error');
 const resolveStage = require('../../utils/resolve-stage');
 const resolveRegion = require('../../utils/resolve-region');
diff --git a/lib/utils/openBrowser.js b/lib/utils/open-browser.js
similarity index 100%
rename from lib/utils/openBrowser.js
rename to lib/utils/open-browser.js
diff --git a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
index d2c1007fb98..d353cefc031 100644
--- a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
+++ b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
@@ -31,7 +31,7 @@ const mockedSdk = {
 };
 
 const step = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
-  '../../utils/openBrowser': async (url) => {
+  '../../utils/open-browser': async (url) => {
     openBrowserUrls.push(url);
   },
   '@serverless/dashboard-plugin/lib/client-utils': {
@@ -448,7 +448,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         '@serverless/dashboard-plugin/lib/client-utils': {
           getPlatformClientWithAccessKey: async () => internalMockedSdk,
         },
-        '../../utils/openBrowser': mockedOpenBrowser,
+        '../../utils/open-browser': mockedOpenBrowser,
         '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
       });
 
@@ -518,7 +518,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         '@serverless/dashboard-plugin/lib/client-utils': {
           getPlatformClientWithAccessKey: async () => internalMockedSdk,
         },
-        '../../utils/openBrowser': mockedOpenBrowser,
+        '../../utils/open-browser': mockedOpenBrowser,
         '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
       });
 
@@ -569,7 +569,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
         '@serverless/dashboard-plugin/lib/client-utils': {
           getPlatformClientWithAccessKey: async () => internalMockedSdk,
         },
-        '../../utils/openBrowser': mockedOpenBrowser,
+        '../../utils/open-browser': mockedOpenBrowser,
       });
 
       configureInquirerStub(inquirer, {

From 1c2f53dcbf55acde4057fce91d065386def2bdba Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:08 +0100
Subject: [PATCH 0996/1101] refactor: Rename
 `lib/utils/processBackendNotificationRequest.js`

---
 lib/classes/plugin-manager.js                                   | 2 +-
 ...cationRequest.js => process-backend-notification-request.js} | 0
 scripts/serverless.js                                           | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/utils/{processBackendNotificationRequest.js => process-backend-notification-request.js} (100%)

diff --git a/lib/classes/plugin-manager.js b/lib/classes/plugin-manager.js
index ac9a0f9a24f..31e3acd5ebf 100644
--- a/lib/classes/plugin-manager.js
+++ b/lib/classes/plugin-manager.js
@@ -6,7 +6,7 @@ const _ = require('lodash');
 const ServerlessError = require('../serverless-error');
 const resolveCliInput = require('../cli/resolve-input');
 const renderCommandHelp = require('../cli/render-help/command');
-const processBackendNotificationRequest = require('../utils/processBackendNotificationRequest');
+const processBackendNotificationRequest = require('../utils/process-backend-notification-request');
 const tokenizeException = require('../utils/tokenize-exception');
 const getRequire = require('../utils/get-require');
 const { log, getPluginWriters } = require('@serverless/utils/log');
diff --git a/lib/utils/processBackendNotificationRequest.js b/lib/utils/process-backend-notification-request.js
similarity index 100%
rename from lib/utils/processBackendNotificationRequest.js
rename to lib/utils/process-backend-notification-request.js
diff --git a/scripts/serverless.js b/scripts/serverless.js
index d0afb8c6615..9093e075c18 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -100,7 +100,7 @@ processSpanPromise = (async () => {
     });
 
     const humanizePropertyPathKeys = require('../lib/configuration/variables/humanize-property-path-keys');
-    const processBackendNotificationRequest = require('../lib/utils/processBackendNotificationRequest');
+    const processBackendNotificationRequest = require('../lib/utils/process-backend-notification-request');
 
     (() => {
       // Rewrite eventual `sls deploy -f` into `sls deploy function -f`

From 49a6af94ce9440cbbe066d2a8a8f1eeda630dfe5 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:10 +0100
Subject: [PATCH 0997/1101] refactor: Rename `lib/utils/renameService.js`

---
 lib/plugins/create/create.js                                    | 2 +-
 lib/utils/create-from-local-template.js                         | 2 +-
 lib/utils/create-from-template.js                               | 2 +-
 lib/utils/download-template-from-repo.js                        | 2 +-
 lib/utils/{renameService.js => rename-service.js}               | 0
 .../lib/utils/{renameService.test.js => rename-service.test.js} | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename lib/utils/{renameService.js => rename-service.js} (100%)
 rename test/unit/lib/utils/{renameService.test.js => rename-service.test.js} (99%)

diff --git a/lib/plugins/create/create.js b/lib/plugins/create/create.js
index 5388e52cb4e..afafd532c6e 100644
--- a/lib/plugins/create/create.js
+++ b/lib/plugins/create/create.js
@@ -11,7 +11,7 @@ const createFromTemplate = require('../../utils/create-from-template');
 const recommendedTemplatesList = require('../../templates/recommended-list');
 const humanReadableTemplatesList = require('../../templates/recommended-list/human-readable');
 const download = require('../../utils/download-template-from-repo');
-const renameService = require('../../utils/renameService').renameService;
+const renameService = require('../../utils/rename-service').renameService;
 const copyDirContentsSync = require('../../utils/fs/copyDirContentsSync');
 const dirExistsSync = require('../../utils/fs/dirExistsSync');
 const { progress, log, style } = require('@serverless/utils/log');
diff --git a/lib/utils/create-from-local-template.js b/lib/utils/create-from-local-template.js
index d0b8e0a2374..e931b931551 100644
--- a/lib/utils/create-from-local-template.js
+++ b/lib/utils/create-from-local-template.js
@@ -3,7 +3,7 @@
 const untildify = require('untildify');
 const fsp = require('fs').promises;
 const fse = require('fs-extra');
-const { renameService } = require('./renameService');
+const { renameService } = require('./rename-service');
 
 const ServerlessError = require('../serverless-error');
 
diff --git a/lib/utils/create-from-template.js b/lib/utils/create-from-template.js
index ddc8d28b9ca..0142806493b 100644
--- a/lib/utils/create-from-template.js
+++ b/lib/utils/create-from-template.js
@@ -3,7 +3,7 @@
 const { basename, join } = require('path');
 const BbPromise = require('bluebird');
 const { copy, readFile } = require('fs-extra');
-const { renameService } = require('./renameService');
+const { renameService } = require('./rename-service');
 
 const serverlessPath = join(__dirname, '../../');
 
diff --git a/lib/utils/download-template-from-repo.js b/lib/utils/download-template-from-repo.js
index 3d4e02c9caa..3248ab7624d 100644
--- a/lib/utils/download-template-from-repo.js
+++ b/lib/utils/download-template-from-repo.js
@@ -9,7 +9,7 @@ const fse = require('fs-extra');
 const qs = require('querystring');
 const fetch = require('node-fetch');
 const spawn = require('child-process-ext/spawn');
-const renameService = require('./renameService').renameService;
+const renameService = require('./rename-service').renameService;
 const ServerlessError = require('../serverless-error');
 const copyDirContentsSync = require('./fs/copyDirContentsSync');
 const dirExistsSync = require('./fs/dirExistsSync');
diff --git a/lib/utils/renameService.js b/lib/utils/rename-service.js
similarity index 100%
rename from lib/utils/renameService.js
rename to lib/utils/rename-service.js
diff --git a/test/unit/lib/utils/renameService.test.js b/test/unit/lib/utils/rename-service.test.js
similarity index 99%
rename from test/unit/lib/utils/renameService.test.js
rename to test/unit/lib/utils/rename-service.test.js
index 826ef0ada67..71cc0a59832 100644
--- a/test/unit/lib/utils/renameService.test.js
+++ b/test/unit/lib/utils/rename-service.test.js
@@ -6,7 +6,7 @@ const path = require('path');
 const { expect } = require('chai');
 const { getTmpDirPath } = require('../../../utils/fs');
 
-const { renameService } = require('../../../../lib/utils/renameService');
+const { renameService } = require('../../../../lib/utils/rename-service');
 
 describe('renameService', () => {
   let serverless;

From e3cea12a814e36876e37ceca9686db7687b9ef9a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:12 +0100
Subject: [PATCH 0998/1101] refactor: Rename `lib/utils/yamlAstParser.js`

---
 commands/plugin-install.js                                      | 2 +-
 commands/plugin-uninstall.js                                    | 2 +-
 lib/utils/{yamlAstParser.js => yaml-ast-parser.js}              | 0
 .../utils/{yamlAstParser.test.js => yaml-ast-parser.test.js}    | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/utils/{yamlAstParser.js => yaml-ast-parser.js} (100%)
 rename test/unit/lib/utils/{yamlAstParser.test.js => yaml-ast-parser.test.js} (99%)

diff --git a/commands/plugin-install.js b/commands/plugin-install.js
index f68bb4cb23f..d49e26e13f2 100644
--- a/commands/plugin-install.js
+++ b/commands/plugin-install.js
@@ -10,7 +10,7 @@ const yaml = require('js-yaml');
 const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
 const { log, progress, style } = require('@serverless/utils/log');
 const ServerlessError = require('../lib/serverless-error');
-const yamlAstParser = require('../lib/utils/yamlAstParser');
+const yamlAstParser = require('../lib/utils/yaml-ast-parser');
 const npmCommandDeferred = require('../lib/utils/npm-command-deferred');
 const {
   getPluginInfo,
diff --git a/commands/plugin-uninstall.js b/commands/plugin-uninstall.js
index 996d8179061..1f47b60f10e 100644
--- a/commands/plugin-uninstall.js
+++ b/commands/plugin-uninstall.js
@@ -9,7 +9,7 @@ const isPlainObject = require('type/plain-object/is');
 const yaml = require('js-yaml');
 const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
 const { log, progress, style } = require('@serverless/utils/log');
-const yamlAstParser = require('../lib/utils/yamlAstParser');
+const yamlAstParser = require('../lib/utils/yaml-ast-parser');
 const npmCommandDeferred = require('../lib/utils/npm-command-deferred');
 const {
   getPluginInfo,
diff --git a/lib/utils/yamlAstParser.js b/lib/utils/yaml-ast-parser.js
similarity index 100%
rename from lib/utils/yamlAstParser.js
rename to lib/utils/yaml-ast-parser.js
diff --git a/test/unit/lib/utils/yamlAstParser.test.js b/test/unit/lib/utils/yaml-ast-parser.test.js
similarity index 99%
rename from test/unit/lib/utils/yamlAstParser.test.js
rename to test/unit/lib/utils/yaml-ast-parser.test.js
index d6a09011767..dd78917678b 100644
--- a/test/unit/lib/utils/yamlAstParser.test.js
+++ b/test/unit/lib/utils/yaml-ast-parser.test.js
@@ -4,7 +4,7 @@ const path = require('path');
 const chai = require('chai');
 const writeFileSync = require('../../../../lib/utils/fs/writeFileSync');
 const readFileSync = require('../../../../lib/utils/fs/readFileSync');
-const yamlAstParser = require('../../../../lib/utils/yamlAstParser');
+const yamlAstParser = require('../../../../lib/utils/yaml-ast-parser');
 const chaiAsPromised = require('chai-as-promised');
 const { getTmpDirPath } = require('../../../utils/fs');
 

From 58e22ec54ab5a9047b1f67939017c900d4538736 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:15 +0100
Subject: [PATCH 0999/1101] refactor: Rename
 `lib/utils/fs/copyDirContentsSync.js`

---
 lib/classes/utils.js                                            | 2 +-
 lib/plugins/create/create.js                                    | 2 +-
 lib/utils/download-template-from-repo.js                        | 2 +-
 .../fs/{copyDirContentsSync.js => copy-dir-contents-sync.js}    | 0
 ...pyDirContentsSync.test.js => copy-dir-contents-sync.test.js} | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename lib/utils/fs/{copyDirContentsSync.js => copy-dir-contents-sync.js} (100%)
 rename test/unit/lib/utils/fs/{copyDirContentsSync.test.js => copy-dir-contents-sync.test.js} (99%)

diff --git a/lib/classes/utils.js b/lib/classes/utils.js
index fdf04817583..1f03d7c634e 100644
--- a/lib/classes/utils.js
+++ b/lib/classes/utils.js
@@ -8,7 +8,7 @@ const BbPromise = require('bluebird');
 const fse = require('fs-extra');
 const fileExistsSync = require('../utils/fs/fileExistsSync');
 const writeFileSync = require('../utils/fs/writeFileSync');
-const copyDirContentsSync = require('../utils/fs/copyDirContentsSync');
+const copyDirContentsSync = require('../utils/fs/copy-dir-contents-sync');
 const readFileSync = require('../utils/fs/readFileSync');
 const readFile = require('../utils/fs/readFile');
 const walkDirSync = require('../utils/fs/walkDirSync');
diff --git a/lib/plugins/create/create.js b/lib/plugins/create/create.js
index afafd532c6e..e133267c4a1 100644
--- a/lib/plugins/create/create.js
+++ b/lib/plugins/create/create.js
@@ -12,7 +12,7 @@ const recommendedTemplatesList = require('../../templates/recommended-list');
 const humanReadableTemplatesList = require('../../templates/recommended-list/human-readable');
 const download = require('../../utils/download-template-from-repo');
 const renameService = require('../../utils/rename-service').renameService;
-const copyDirContentsSync = require('../../utils/fs/copyDirContentsSync');
+const copyDirContentsSync = require('../../utils/fs/copy-dir-contents-sync');
 const dirExistsSync = require('../../utils/fs/dirExistsSync');
 const { progress, log, style } = require('@serverless/utils/log');
 
diff --git a/lib/utils/download-template-from-repo.js b/lib/utils/download-template-from-repo.js
index 3248ab7624d..b227acc1d08 100644
--- a/lib/utils/download-template-from-repo.js
+++ b/lib/utils/download-template-from-repo.js
@@ -11,7 +11,7 @@ const fetch = require('node-fetch');
 const spawn = require('child-process-ext/spawn');
 const renameService = require('./rename-service').renameService;
 const ServerlessError = require('../serverless-error');
-const copyDirContentsSync = require('./fs/copyDirContentsSync');
+const copyDirContentsSync = require('./fs/copy-dir-contents-sync');
 const dirExistsSync = require('./fs/dirExistsSync');
 
 /**
diff --git a/lib/utils/fs/copyDirContentsSync.js b/lib/utils/fs/copy-dir-contents-sync.js
similarity index 100%
rename from lib/utils/fs/copyDirContentsSync.js
rename to lib/utils/fs/copy-dir-contents-sync.js
diff --git a/test/unit/lib/utils/fs/copyDirContentsSync.test.js b/test/unit/lib/utils/fs/copy-dir-contents-sync.test.js
similarity index 99%
rename from test/unit/lib/utils/fs/copyDirContentsSync.test.js
rename to test/unit/lib/utils/fs/copy-dir-contents-sync.test.js
index 491b919829a..1d52b9e4a3e 100644
--- a/test/unit/lib/utils/fs/copyDirContentsSync.test.js
+++ b/test/unit/lib/utils/fs/copy-dir-contents-sync.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const fs = require('fs');
 const fse = require('fs-extra');
 const path = require('path');
-const copyDirContentsSync = require('../../../../../lib/utils/fs/copyDirContentsSync');
+const copyDirContentsSync = require('../../../../../lib/utils/fs/copy-dir-contents-sync');
 const fileExistsSync = require('../../../../../lib/utils/fs/fileExistsSync');
 const writeFileSync = require('../../../../../lib/utils/fs/writeFileSync');
 const skipOnDisabledSymlinksInWindows = require('@serverless/test/skip-on-disabled-symlinks-in-windows');

From 7fd6176d720e7a997d83c28e4a2fe08ef5400d56 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:17 +0100
Subject: [PATCH 1000/1101] refactor: Rename `lib/utils/fs/createZipFile.js`

---
 lib/plugins/aws/custom-resources/generateZip.js                 | 2 +-
 lib/utils/fs/{createZipFile.js => create-zip-file.js}           | 0
 .../utils/fs/{createZipFile.test.js => create-zip-file.test.js} | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/utils/fs/{createZipFile.js => create-zip-file.js} (100%)
 rename test/unit/lib/utils/fs/{createZipFile.test.js => create-zip-file.test.js} (98%)

diff --git a/lib/plugins/aws/custom-resources/generateZip.js b/lib/plugins/aws/custom-resources/generateZip.js
index a4ca10ab3b3..5236f286e2d 100644
--- a/lib/plugins/aws/custom-resources/generateZip.js
+++ b/lib/plugins/aws/custom-resources/generateZip.js
@@ -3,7 +3,7 @@
 const path = require('path');
 const fse = require('fs-extra');
 const getTmpDirPath = require('../../../utils/fs/getTmpDirPath');
-const createZipFile = require('../../../utils/fs/createZipFile');
+const createZipFile = require('../../../utils/fs/create-zip-file');
 const ensureArtifact = require('../../../utils/ensure-artifact');
 const safeMoveFile = require('../../../utils/fs/safeMoveFile');
 
diff --git a/lib/utils/fs/createZipFile.js b/lib/utils/fs/create-zip-file.js
similarity index 100%
rename from lib/utils/fs/createZipFile.js
rename to lib/utils/fs/create-zip-file.js
diff --git a/test/unit/lib/utils/fs/createZipFile.test.js b/test/unit/lib/utils/fs/create-zip-file.test.js
similarity index 98%
rename from test/unit/lib/utils/fs/createZipFile.test.js
rename to test/unit/lib/utils/fs/create-zip-file.test.js
index 0432557daaf..6c46139d49f 100644
--- a/test/unit/lib/utils/fs/createZipFile.test.js
+++ b/test/unit/lib/utils/fs/create-zip-file.test.js
@@ -2,7 +2,7 @@
 
 const path = require('path');
 const chai = require('chai');
-const createZipFile = require('../../../../../lib/utils/fs/createZipFile');
+const createZipFile = require('../../../../../lib/utils/fs/create-zip-file');
 const { createTmpFile, listZipFiles } = require('../../../../utils/fs');
 
 // Configure chai

From 470b1e96cda04648b54810e4242e9b07b14ca6b7 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:18 +0100
Subject: [PATCH 1001/1101] refactor: Rename `lib/utils/fs/dirExists.js`

---
 lib/plugins/aws/invoke-local/index.js        | 2 +-
 lib/utils/fs/{dirExists.js => dir-exists.js} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/utils/fs/{dirExists.js => dir-exists.js} (100%)

diff --git a/lib/plugins/aws/invoke-local/index.js b/lib/plugins/aws/invoke-local/index.js
index 10b2869f879..e2973a71009 100644
--- a/lib/plugins/aws/invoke-local/index.js
+++ b/lib/plugins/aws/invoke-local/index.js
@@ -17,7 +17,7 @@ const cachedir = require('cachedir');
 const decompress = require('decompress');
 const { v4: uuidv4 } = require('uuid');
 const ServerlessError = require('../../../serverless-error');
-const dirExists = require('../../../utils/fs/dirExists');
+const dirExists = require('../../../utils/fs/dir-exists');
 const fileExists = require('../../../utils/fs/fileExists');
 const isStandalone = require('../../../utils/is-standalone-executable');
 const ensureArtifact = require('../../../utils/ensure-artifact');
diff --git a/lib/utils/fs/dirExists.js b/lib/utils/fs/dir-exists.js
similarity index 100%
rename from lib/utils/fs/dirExists.js
rename to lib/utils/fs/dir-exists.js

From a8029b101446fc8acdc9acd4c75297765e7b09a8 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:20 +0100
Subject: [PATCH 1002/1101] refactor: Rename `lib/utils/fs/dirExistsSync.js`

---
 lib/classes/utils.js                                  | 2 +-
 lib/plugins/create/create.js                          | 2 +-
 lib/utils/download-template-from-repo.js              | 2 +-
 lib/utils/fs/{dirExistsSync.js => dir-exists-sync.js} | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/utils/fs/{dirExistsSync.js => dir-exists-sync.js} (100%)

diff --git a/lib/classes/utils.js b/lib/classes/utils.js
index 1f03d7c634e..9b0f4151272 100644
--- a/lib/classes/utils.js
+++ b/lib/classes/utils.js
@@ -12,7 +12,7 @@ const copyDirContentsSync = require('../utils/fs/copy-dir-contents-sync');
 const readFileSync = require('../utils/fs/readFileSync');
 const readFile = require('../utils/fs/readFile');
 const walkDirSync = require('../utils/fs/walkDirSync');
-const dirExistsSync = require('../utils/fs/dirExistsSync');
+const dirExistsSync = require('../utils/fs/dir-exists-sync');
 const version = require('../../package.json').version;
 
 class Utils {
diff --git a/lib/plugins/create/create.js b/lib/plugins/create/create.js
index e133267c4a1..398351fcd9c 100644
--- a/lib/plugins/create/create.js
+++ b/lib/plugins/create/create.js
@@ -13,7 +13,7 @@ const humanReadableTemplatesList = require('../../templates/recommended-list/hum
 const download = require('../../utils/download-template-from-repo');
 const renameService = require('../../utils/rename-service').renameService;
 const copyDirContentsSync = require('../../utils/fs/copy-dir-contents-sync');
-const dirExistsSync = require('../../utils/fs/dirExistsSync');
+const dirExistsSync = require('../../utils/fs/dir-exists-sync');
 const { progress, log, style } = require('@serverless/utils/log');
 
 const handleServiceCreationError = (error) => {
diff --git a/lib/utils/download-template-from-repo.js b/lib/utils/download-template-from-repo.js
index b227acc1d08..67353b198be 100644
--- a/lib/utils/download-template-from-repo.js
+++ b/lib/utils/download-template-from-repo.js
@@ -12,7 +12,7 @@ const spawn = require('child-process-ext/spawn');
 const renameService = require('./rename-service').renameService;
 const ServerlessError = require('../serverless-error');
 const copyDirContentsSync = require('./fs/copy-dir-contents-sync');
-const dirExistsSync = require('./fs/dirExistsSync');
+const dirExistsSync = require('./fs/dir-exists-sync');
 
 /**
  * Returns directory path
diff --git a/lib/utils/fs/dirExistsSync.js b/lib/utils/fs/dir-exists-sync.js
similarity index 100%
rename from lib/utils/fs/dirExistsSync.js
rename to lib/utils/fs/dir-exists-sync.js

From 61527a35e89f0be4e65ecfc67f23ed7b02ecefaa Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:22 +0100
Subject: [PATCH 1003/1101] refactor: Rename `lib/utils/fs/fileExists.js`

---
 lib/cli/resolve-configuration-path.js                           | 2 +-
 lib/plugins/aws/invoke-local/index.js                           | 2 +-
 lib/utils/fs/{fileExists.js => file-exists.js}                  | 0
 .../lib/utils/fs/{fileExists.test.js => file-exists.test.js}    | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/utils/fs/{fileExists.js => file-exists.js} (100%)
 rename test/unit/lib/utils/fs/{fileExists.test.js => file-exists.test.js} (88%)

diff --git a/lib/cli/resolve-configuration-path.js b/lib/cli/resolve-configuration-path.js
index 234231e7328..492a64d89dd 100644
--- a/lib/cli/resolve-configuration-path.js
+++ b/lib/cli/resolve-configuration-path.js
@@ -5,7 +5,7 @@ const ensureString = require('type/string/ensure');
 const path = require('path');
 const fsp = require('fs').promises;
 const ServerlessError = require('../serverless-error');
-const fileExists = require('../utils/fs/fileExists');
+const fileExists = require('../utils/fs/file-exists');
 const resolveInput = require('./resolve-input');
 
 const supportedExtensions = new Set(['yml', 'yaml', 'json', 'js', 'ts']);
diff --git a/lib/plugins/aws/invoke-local/index.js b/lib/plugins/aws/invoke-local/index.js
index e2973a71009..97ce41fa366 100644
--- a/lib/plugins/aws/invoke-local/index.js
+++ b/lib/plugins/aws/invoke-local/index.js
@@ -18,7 +18,7 @@ const decompress = require('decompress');
 const { v4: uuidv4 } = require('uuid');
 const ServerlessError = require('../../../serverless-error');
 const dirExists = require('../../../utils/fs/dir-exists');
-const fileExists = require('../../../utils/fs/fileExists');
+const fileExists = require('../../../utils/fs/file-exists');
 const isStandalone = require('../../../utils/is-standalone-executable');
 const ensureArtifact = require('../../../utils/ensure-artifact');
 const resolveCfImportValue = require('../utils/resolveCfImportValue');
diff --git a/lib/utils/fs/fileExists.js b/lib/utils/fs/file-exists.js
similarity index 100%
rename from lib/utils/fs/fileExists.js
rename to lib/utils/fs/file-exists.js
diff --git a/test/unit/lib/utils/fs/fileExists.test.js b/test/unit/lib/utils/fs/file-exists.test.js
similarity index 88%
rename from test/unit/lib/utils/fs/fileExists.test.js
rename to test/unit/lib/utils/fs/file-exists.test.js
index 7e7f3b5c6cf..bc7823a2737 100644
--- a/test/unit/lib/utils/fs/fileExists.test.js
+++ b/test/unit/lib/utils/fs/file-exists.test.js
@@ -2,7 +2,7 @@
 
 const path = require('path');
 const chai = require('chai');
-const fileExists = require('../../../../../lib/utils/fs/fileExists');
+const fileExists = require('../../../../../lib/utils/fs/file-exists');
 
 // Configure chai
 chai.use(require('chai-as-promised'));

From b3966191b13711f7defc1842c59d7d42f2190e6a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:24 +0100
Subject: [PATCH 1004/1101] refactor: Rename `lib/utils/fs/fileExistsSync.js`

---
 lib/classes/utils.js                                            | 2 +-
 lib/utils/fs/{fileExistsSync.js => file-exists-sync.js}         | 0
 lib/utils/rename-service.js                                     | 2 +-
 test/unit/lib/utils/fs/copy-dir-contents-sync.test.js           | 2 +-
 .../fs/{fileExistsSync.test.js => file-exists-sync.test.js}     | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename lib/utils/fs/{fileExistsSync.js => file-exists-sync.js} (100%)
 rename test/unit/lib/utils/fs/{fileExistsSync.test.js => file-exists-sync.test.js} (99%)

diff --git a/lib/classes/utils.js b/lib/classes/utils.js
index 9b0f4151272..c7c295650ee 100644
--- a/lib/classes/utils.js
+++ b/lib/classes/utils.js
@@ -6,7 +6,7 @@ const fs = require('fs');
 const path = require('path');
 const BbPromise = require('bluebird');
 const fse = require('fs-extra');
-const fileExistsSync = require('../utils/fs/fileExistsSync');
+const fileExistsSync = require('../utils/fs/file-exists-sync');
 const writeFileSync = require('../utils/fs/writeFileSync');
 const copyDirContentsSync = require('../utils/fs/copy-dir-contents-sync');
 const readFileSync = require('../utils/fs/readFileSync');
diff --git a/lib/utils/fs/fileExistsSync.js b/lib/utils/fs/file-exists-sync.js
similarity index 100%
rename from lib/utils/fs/fileExistsSync.js
rename to lib/utils/fs/file-exists-sync.js
diff --git a/lib/utils/rename-service.js b/lib/utils/rename-service.js
index a48ed24dce4..09a1c5ed065 100644
--- a/lib/utils/rename-service.js
+++ b/lib/utils/rename-service.js
@@ -3,7 +3,7 @@
 const path = require('path');
 const fse = require('fs-extra');
 
-const fileExistsSync = require('./fs/fileExistsSync');
+const fileExistsSync = require('./fs/file-exists-sync');
 const readFileSync = require('./fs/readFileSync');
 const writeFileSync = require('./fs/writeFileSync');
 const ServerlessError = require('../serverless-error');
diff --git a/test/unit/lib/utils/fs/copy-dir-contents-sync.test.js b/test/unit/lib/utils/fs/copy-dir-contents-sync.test.js
index 1d52b9e4a3e..bc4b42c1029 100644
--- a/test/unit/lib/utils/fs/copy-dir-contents-sync.test.js
+++ b/test/unit/lib/utils/fs/copy-dir-contents-sync.test.js
@@ -5,7 +5,7 @@ const fs = require('fs');
 const fse = require('fs-extra');
 const path = require('path');
 const copyDirContentsSync = require('../../../../../lib/utils/fs/copy-dir-contents-sync');
-const fileExistsSync = require('../../../../../lib/utils/fs/fileExistsSync');
+const fileExistsSync = require('../../../../../lib/utils/fs/file-exists-sync');
 const writeFileSync = require('../../../../../lib/utils/fs/writeFileSync');
 const skipOnDisabledSymlinksInWindows = require('@serverless/test/skip-on-disabled-symlinks-in-windows');
 
diff --git a/test/unit/lib/utils/fs/fileExistsSync.test.js b/test/unit/lib/utils/fs/file-exists-sync.test.js
similarity index 99%
rename from test/unit/lib/utils/fs/fileExistsSync.test.js
rename to test/unit/lib/utils/fs/file-exists-sync.test.js
index 989146dd9b1..7a0c554a9c5 100644
--- a/test/unit/lib/utils/fs/fileExistsSync.test.js
+++ b/test/unit/lib/utils/fs/file-exists-sync.test.js
@@ -4,7 +4,7 @@ const path = require('path');
 const expect = require('chai').expect;
 const fse = require('fs-extra');
 const skipOnDisabledSymlinksInWindows = require('@serverless/test/skip-on-disabled-symlinks-in-windows');
-const fileExistsSync = require('../../../../../lib/utils/fs/fileExistsSync');
+const fileExistsSync = require('../../../../../lib/utils/fs/file-exists-sync');
 
 describe('#fileExistsSync()', () => {
   describe('When reading a file', () => {

From 363ff185610f39002cc9bd583901ad8e360b7053 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:26 +0100
Subject: [PATCH 1005/1101] refactor: Rename `lib/utils/fs/getTmpDirPath.js`

---
 lib/plugins/aws/custom-resources/generateZip.js                 | 2 +-
 lib/utils/fs/{getTmpDirPath.js => get-tmp-dir-path.js}          | 0
 .../fs/{getTmpDirPath.test.js => get-tmp-dir-path.test.js}      | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/utils/fs/{getTmpDirPath.js => get-tmp-dir-path.js} (100%)
 rename test/unit/lib/utils/fs/{getTmpDirPath.test.js => get-tmp-dir-path.test.js} (75%)

diff --git a/lib/plugins/aws/custom-resources/generateZip.js b/lib/plugins/aws/custom-resources/generateZip.js
index 5236f286e2d..c8f68d976f2 100644
--- a/lib/plugins/aws/custom-resources/generateZip.js
+++ b/lib/plugins/aws/custom-resources/generateZip.js
@@ -2,7 +2,7 @@
 
 const path = require('path');
 const fse = require('fs-extra');
-const getTmpDirPath = require('../../../utils/fs/getTmpDirPath');
+const getTmpDirPath = require('../../../utils/fs/get-tmp-dir-path');
 const createZipFile = require('../../../utils/fs/create-zip-file');
 const ensureArtifact = require('../../../utils/ensure-artifact');
 const safeMoveFile = require('../../../utils/fs/safeMoveFile');
diff --git a/lib/utils/fs/getTmpDirPath.js b/lib/utils/fs/get-tmp-dir-path.js
similarity index 100%
rename from lib/utils/fs/getTmpDirPath.js
rename to lib/utils/fs/get-tmp-dir-path.js
diff --git a/test/unit/lib/utils/fs/getTmpDirPath.test.js b/test/unit/lib/utils/fs/get-tmp-dir-path.test.js
similarity index 75%
rename from test/unit/lib/utils/fs/getTmpDirPath.test.js
rename to test/unit/lib/utils/fs/get-tmp-dir-path.test.js
index 7ca06638d10..929b52b7404 100644
--- a/test/unit/lib/utils/fs/getTmpDirPath.test.js
+++ b/test/unit/lib/utils/fs/get-tmp-dir-path.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const getTmpDirPath = require('../../../../../lib/utils/fs/getTmpDirPath');
+const getTmpDirPath = require('../../../../../lib/utils/fs/get-tmp-dir-path');
 
 describe('#getTmpDirPath()', () => {
   it('should return a scoped tmp dir path', () => {

From 5d099f7e39167340e1b53ef0c86589a6ef7de70f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:28 +0100
Subject: [PATCH 1006/1101] refactor: Rename `lib/utils/fs/readFile.js`

---
 lib/classes/utils.js                                           | 2 +-
 lib/utils/fs/{readFile.js => read-file.js}                     | 0
 test/unit/lib/utils/fs/{readFile.test.js => read-file.test.js} | 2 +-
 test/unit/lib/utils/fs/writeFile.test.js                       | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/utils/fs/{readFile.js => read-file.js} (100%)
 rename test/unit/lib/utils/fs/{readFile.test.js => read-file.test.js} (95%)

diff --git a/lib/classes/utils.js b/lib/classes/utils.js
index c7c295650ee..72ccf72e6de 100644
--- a/lib/classes/utils.js
+++ b/lib/classes/utils.js
@@ -10,7 +10,7 @@ const fileExistsSync = require('../utils/fs/file-exists-sync');
 const writeFileSync = require('../utils/fs/writeFileSync');
 const copyDirContentsSync = require('../utils/fs/copy-dir-contents-sync');
 const readFileSync = require('../utils/fs/readFileSync');
-const readFile = require('../utils/fs/readFile');
+const readFile = require('../utils/fs/read-file');
 const walkDirSync = require('../utils/fs/walkDirSync');
 const dirExistsSync = require('../utils/fs/dir-exists-sync');
 const version = require('../../package.json').version;
diff --git a/lib/utils/fs/readFile.js b/lib/utils/fs/read-file.js
similarity index 100%
rename from lib/utils/fs/readFile.js
rename to lib/utils/fs/read-file.js
diff --git a/test/unit/lib/utils/fs/readFile.test.js b/test/unit/lib/utils/fs/read-file.test.js
similarity index 95%
rename from test/unit/lib/utils/fs/readFile.test.js
rename to test/unit/lib/utils/fs/read-file.test.js
index 428a9a5daf3..7f32d650dde 100644
--- a/test/unit/lib/utils/fs/readFile.test.js
+++ b/test/unit/lib/utils/fs/read-file.test.js
@@ -2,7 +2,7 @@
 
 const chai = require('chai');
 const writeFile = require('../../../../../lib/utils/fs/writeFile');
-const readFile = require('../../../../../lib/utils/fs/readFile');
+const readFile = require('../../../../../lib/utils/fs/read-file');
 const { getTmpFilePath } = require('../../../../utils/fs');
 
 // Configure chai
diff --git a/test/unit/lib/utils/fs/writeFile.test.js b/test/unit/lib/utils/fs/writeFile.test.js
index 034ff5fc9a2..b04895b0fd9 100644
--- a/test/unit/lib/utils/fs/writeFile.test.js
+++ b/test/unit/lib/utils/fs/writeFile.test.js
@@ -4,7 +4,7 @@ const fsp = require('fs').promises;
 const Serverless = require('../../../../../lib/serverless');
 const chai = require('chai');
 const writeFile = require('../../../../../lib/utils/fs/writeFile');
-const readFile = require('../../../../../lib/utils/fs/readFile');
+const readFile = require('../../../../../lib/utils/fs/read-file');
 const { getTmpFilePath } = require('../../../../utils/fs');
 
 // Configure chai

From c284f4a90c0401ca04fdb07108363095c23732f0 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:31 +0100
Subject: [PATCH 1007/1101] refactor: Rename `lib/utils/fs/readFileSync.js`

---
 lib/classes/utils.js                                            | 2 +-
 lib/utils/fs/{readFileSync.js => read-file-sync.js}             | 0
 lib/utils/rename-service.js                                     | 2 +-
 test/unit/lib/utils/download-template-from-repo.test.js         | 2 +-
 .../utils/fs/{readFileSync.test.js => read-file-sync.test.js}   | 2 +-
 test/unit/lib/utils/fs/writeFileSync.test.js                    | 2 +-
 test/unit/lib/utils/yaml-ast-parser.test.js                     | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename lib/utils/fs/{readFileSync.js => read-file-sync.js} (100%)
 rename test/unit/lib/utils/fs/{readFileSync.test.js => read-file-sync.test.js} (94%)

diff --git a/lib/classes/utils.js b/lib/classes/utils.js
index 72ccf72e6de..4a861e3353a 100644
--- a/lib/classes/utils.js
+++ b/lib/classes/utils.js
@@ -9,7 +9,7 @@ const fse = require('fs-extra');
 const fileExistsSync = require('../utils/fs/file-exists-sync');
 const writeFileSync = require('../utils/fs/writeFileSync');
 const copyDirContentsSync = require('../utils/fs/copy-dir-contents-sync');
-const readFileSync = require('../utils/fs/readFileSync');
+const readFileSync = require('../utils/fs/read-file-sync');
 const readFile = require('../utils/fs/read-file');
 const walkDirSync = require('../utils/fs/walkDirSync');
 const dirExistsSync = require('../utils/fs/dir-exists-sync');
diff --git a/lib/utils/fs/readFileSync.js b/lib/utils/fs/read-file-sync.js
similarity index 100%
rename from lib/utils/fs/readFileSync.js
rename to lib/utils/fs/read-file-sync.js
diff --git a/lib/utils/rename-service.js b/lib/utils/rename-service.js
index 09a1c5ed065..2708e798b81 100644
--- a/lib/utils/rename-service.js
+++ b/lib/utils/rename-service.js
@@ -4,7 +4,7 @@ const path = require('path');
 const fse = require('fs-extra');
 
 const fileExistsSync = require('./fs/file-exists-sync');
-const readFileSync = require('./fs/readFileSync');
+const readFileSync = require('./fs/read-file-sync');
 const writeFileSync = require('./fs/writeFileSync');
 const ServerlessError = require('../serverless-error');
 
diff --git a/test/unit/lib/utils/download-template-from-repo.test.js b/test/unit/lib/utils/download-template-from-repo.test.js
index 5f77445a941..242ce0a35cb 100644
--- a/test/unit/lib/utils/download-template-from-repo.test.js
+++ b/test/unit/lib/utils/download-template-from-repo.test.js
@@ -12,7 +12,7 @@ const { expect } = chai;
 const { getTmpDirPath } = require('../../../utils/fs');
 
 const writeFileSync = require('../../../../lib/utils/fs/writeFileSync');
-const readFileSync = require('../../../../lib/utils/fs/readFileSync');
+const readFileSync = require('../../../../lib/utils/fs/read-file-sync');
 
 chai.use(require('chai-as-promised'));
 
diff --git a/test/unit/lib/utils/fs/readFileSync.test.js b/test/unit/lib/utils/fs/read-file-sync.test.js
similarity index 94%
rename from test/unit/lib/utils/fs/readFileSync.test.js
rename to test/unit/lib/utils/fs/read-file-sync.test.js
index a98cc2977c8..c91ad472ab2 100644
--- a/test/unit/lib/utils/fs/readFileSync.test.js
+++ b/test/unit/lib/utils/fs/read-file-sync.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const writeFileSync = require('../../../../../lib/utils/fs/writeFileSync');
-const readFileSync = require('../../../../../lib/utils/fs/readFileSync');
+const readFileSync = require('../../../../../lib/utils/fs/read-file-sync');
 const { getTmpFilePath } = require('../../../../utils/fs');
 
 describe('#readFileSync()', () => {
diff --git a/test/unit/lib/utils/fs/writeFileSync.test.js b/test/unit/lib/utils/fs/writeFileSync.test.js
index ba25440099b..7f869e7ea0a 100644
--- a/test/unit/lib/utils/fs/writeFileSync.test.js
+++ b/test/unit/lib/utils/fs/writeFileSync.test.js
@@ -3,7 +3,7 @@
 const fsp = require('fs').promises;
 const Serverless = require('../../../../../lib/serverless');
 const writeFileSync = require('../../../../../lib/utils/fs/writeFileSync');
-const readFileSync = require('../../../../../lib/utils/fs/readFileSync');
+const readFileSync = require('../../../../../lib/utils/fs/read-file-sync');
 const { expect } = require('chai');
 const { getTmpFilePath } = require('../../../../utils/fs');
 
diff --git a/test/unit/lib/utils/yaml-ast-parser.test.js b/test/unit/lib/utils/yaml-ast-parser.test.js
index dd78917678b..bf9cc385fba 100644
--- a/test/unit/lib/utils/yaml-ast-parser.test.js
+++ b/test/unit/lib/utils/yaml-ast-parser.test.js
@@ -3,7 +3,7 @@
 const path = require('path');
 const chai = require('chai');
 const writeFileSync = require('../../../../lib/utils/fs/writeFileSync');
-const readFileSync = require('../../../../lib/utils/fs/readFileSync');
+const readFileSync = require('../../../../lib/utils/fs/read-file-sync');
 const yamlAstParser = require('../../../../lib/utils/yaml-ast-parser');
 const chaiAsPromised = require('chai-as-promised');
 const { getTmpDirPath } = require('../../../utils/fs');

From ab5ad10fd8aa084bc56cccf2812de0548c5f0168 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:33 +0100
Subject: [PATCH 1008/1101] refactor: Rename `lib/utils/fs/safeMoveFile.js`

---
 lib/cli/run-serverless-tencent.js                               | 2 +-
 lib/plugins/aws/custom-resources/generateZip.js                 | 2 +-
 lib/utils/fs/{safeMoveFile.js => safe-move-file.js}             | 0
 lib/utils/log-deprecation.js                                    | 2 +-
 .../utils/fs/{safeMoveFile.test.js => safe-move-file.test.js}   | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename lib/utils/fs/{safeMoveFile.js => safe-move-file.js} (100%)
 rename test/unit/lib/utils/fs/{safeMoveFile.test.js => safe-move-file.test.js} (98%)

diff --git a/lib/cli/run-serverless-tencent.js b/lib/cli/run-serverless-tencent.js
index ab7f0b91578..c6edc52b2a4 100644
--- a/lib/cli/run-serverless-tencent.js
+++ b/lib/cli/run-serverless-tencent.js
@@ -107,7 +107,7 @@ module.exports = async () => {
       const fs = require('fs');
       const fse = require('fs-extra');
       const got = require('got');
-      const safeMoveFile = require('../utils/fs/safeMoveFile');
+      const safeMoveFile = require('../utils/fs/safe-move-file');
 
       const pipeline = promisify(stream.pipeline);
 
diff --git a/lib/plugins/aws/custom-resources/generateZip.js b/lib/plugins/aws/custom-resources/generateZip.js
index c8f68d976f2..5ad19e3fa2c 100644
--- a/lib/plugins/aws/custom-resources/generateZip.js
+++ b/lib/plugins/aws/custom-resources/generateZip.js
@@ -5,7 +5,7 @@ const fse = require('fs-extra');
 const getTmpDirPath = require('../../../utils/fs/get-tmp-dir-path');
 const createZipFile = require('../../../utils/fs/create-zip-file');
 const ensureArtifact = require('../../../utils/ensure-artifact');
-const safeMoveFile = require('../../../utils/fs/safeMoveFile');
+const safeMoveFile = require('../../../utils/fs/safe-move-file');
 
 const srcDirPath = path.join(__dirname, 'resources');
 
diff --git a/lib/utils/fs/safeMoveFile.js b/lib/utils/fs/safe-move-file.js
similarity index 100%
rename from lib/utils/fs/safeMoveFile.js
rename to lib/utils/fs/safe-move-file.js
diff --git a/lib/utils/log-deprecation.js b/lib/utils/log-deprecation.js
index cbee9b755e8..3551682946d 100644
--- a/lib/utils/log-deprecation.js
+++ b/lib/utils/log-deprecation.js
@@ -7,7 +7,7 @@ const weakMemoizee = require('memoizee/weak');
 const _ = require('lodash');
 const resolveTmpdir = require('process-utils/tmpdir');
 const ServerlessError = require('../serverless-error');
-const safeMoveFile = require('./fs/safeMoveFile');
+const safeMoveFile = require('./fs/safe-move-file');
 const { style, log } = require('@serverless/utils/log');
 const healthStatusFilename = require('./health-status-filename');
 
diff --git a/test/unit/lib/utils/fs/safeMoveFile.test.js b/test/unit/lib/utils/fs/safe-move-file.test.js
similarity index 98%
rename from test/unit/lib/utils/fs/safeMoveFile.test.js
rename to test/unit/lib/utils/fs/safe-move-file.test.js
index 430a03fdd02..0f498870cc8 100644
--- a/test/unit/lib/utils/fs/safeMoveFile.test.js
+++ b/test/unit/lib/utils/fs/safe-move-file.test.js
@@ -9,7 +9,7 @@ const { expect } = require('chai');
 const fsp = require('fs').promises;
 const fs = require('fs');
 const sinonChai = require('sinon-chai');
-const safeMoveFile = require('../../../../../lib/utils/fs/safeMoveFile');
+const safeMoveFile = require('../../../../../lib/utils/fs/safe-move-file');
 
 chai.use(sinonChai);
 

From 241f2cdf4ca88e32a4e5a0c7b46f2a3c2883b672 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:35 +0100
Subject: [PATCH 1009/1101] refactor: Rename `lib/utils/fs/walkDirSync.js`

---
 lib/classes/utils.js                                            | 2 +-
 lib/utils/fs/create-zip-file.js                                 | 2 +-
 lib/utils/fs/{walkDirSync.js => walk-dir-sync.js}               | 0
 test/unit/lib/plugins/create/create.test.js                     | 2 +-
 .../lib/utils/fs/{walkDirSync.test.js => walk-dir-sync.test.js} | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename lib/utils/fs/{walkDirSync.js => walk-dir-sync.js} (100%)
 rename test/unit/lib/utils/fs/{walkDirSync.test.js => walk-dir-sync.test.js} (95%)

diff --git a/lib/classes/utils.js b/lib/classes/utils.js
index 4a861e3353a..ef7fcf7055e 100644
--- a/lib/classes/utils.js
+++ b/lib/classes/utils.js
@@ -11,7 +11,7 @@ const writeFileSync = require('../utils/fs/writeFileSync');
 const copyDirContentsSync = require('../utils/fs/copy-dir-contents-sync');
 const readFileSync = require('../utils/fs/read-file-sync');
 const readFile = require('../utils/fs/read-file');
-const walkDirSync = require('../utils/fs/walkDirSync');
+const walkDirSync = require('../utils/fs/walk-dir-sync');
 const dirExistsSync = require('../utils/fs/dir-exists-sync');
 const version = require('../../package.json').version;
 
diff --git a/lib/utils/fs/create-zip-file.js b/lib/utils/fs/create-zip-file.js
index 8630a00474f..aeb466526da 100644
--- a/lib/utils/fs/create-zip-file.js
+++ b/lib/utils/fs/create-zip-file.js
@@ -4,7 +4,7 @@ const fs = require('fs');
 const path = require('path');
 const archiver = require('archiver');
 const BbPromise = require('bluebird');
-const walkDirSync = require('../fs/walkDirSync');
+const walkDirSync = require('./walk-dir-sync');
 
 async function createZipFile(srcDirPath, outputFilePath) {
   const files = walkDirSync(srcDirPath).map((file) => ({
diff --git a/lib/utils/fs/walkDirSync.js b/lib/utils/fs/walk-dir-sync.js
similarity index 100%
rename from lib/utils/fs/walkDirSync.js
rename to lib/utils/fs/walk-dir-sync.js
diff --git a/test/unit/lib/plugins/create/create.test.js b/test/unit/lib/plugins/create/create.test.js
index 86eb6ecaeab..38be9dcbb74 100644
--- a/test/unit/lib/plugins/create/create.test.js
+++ b/test/unit/lib/plugins/create/create.test.js
@@ -7,7 +7,7 @@ const fse = require('fs-extra');
 const Create = require('../../../../../lib/plugins/create/create');
 const Serverless = require('../../../../../lib/serverless');
 const sinon = require('sinon');
-const walkDirSync = require('../../../../../lib/utils/fs/walkDirSync');
+const walkDirSync = require('../../../../../lib/utils/fs/walk-dir-sync');
 const download = require('../../../../../lib/utils/download-template-from-repo');
 const { getTmpDirPath } = require('../../../../utils/fs');
 
diff --git a/test/unit/lib/utils/fs/walkDirSync.test.js b/test/unit/lib/utils/fs/walk-dir-sync.test.js
similarity index 95%
rename from test/unit/lib/utils/fs/walkDirSync.test.js
rename to test/unit/lib/utils/fs/walk-dir-sync.test.js
index e6bcbf2ec80..a95ae0df47e 100644
--- a/test/unit/lib/utils/fs/walkDirSync.test.js
+++ b/test/unit/lib/utils/fs/walk-dir-sync.test.js
@@ -3,7 +3,7 @@
 const fs = require('fs');
 const path = require('path');
 const writeFileSync = require('../../../../../lib/utils/fs/writeFileSync');
-const walkDirSync = require('../../../../../lib/utils/fs/walkDirSync');
+const walkDirSync = require('../../../../../lib/utils/fs/walk-dir-sync');
 const { expect } = require('chai');
 const { getTmpDirPath } = require('../../../../utils/fs');
 const skipOnDisabledSymlinksInWindows = require('@serverless/test/skip-on-disabled-symlinks-in-windows');

From 8723cd30260f0e0c0df3097a69dcd6806b6a01de Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:37 +0100
Subject: [PATCH 1010/1101] refactor: Rename `lib/utils/fs/writeFile.js`

---
 lib/utils/fs/{writeFile.js => write-file.js}                    | 0
 test/unit/lib/utils/fs/read-file.test.js                        | 2 +-
 .../unit/lib/utils/fs/{writeFile.test.js => write-file.test.js} | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/utils/fs/{writeFile.js => write-file.js} (100%)
 rename test/unit/lib/utils/fs/{writeFile.test.js => write-file.test.js} (96%)

diff --git a/lib/utils/fs/writeFile.js b/lib/utils/fs/write-file.js
similarity index 100%
rename from lib/utils/fs/writeFile.js
rename to lib/utils/fs/write-file.js
diff --git a/test/unit/lib/utils/fs/read-file.test.js b/test/unit/lib/utils/fs/read-file.test.js
index 7f32d650dde..45c306abf6a 100644
--- a/test/unit/lib/utils/fs/read-file.test.js
+++ b/test/unit/lib/utils/fs/read-file.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const chai = require('chai');
-const writeFile = require('../../../../../lib/utils/fs/writeFile');
+const writeFile = require('../../../../../lib/utils/fs/write-file');
 const readFile = require('../../../../../lib/utils/fs/read-file');
 const { getTmpFilePath } = require('../../../../utils/fs');
 
diff --git a/test/unit/lib/utils/fs/writeFile.test.js b/test/unit/lib/utils/fs/write-file.test.js
similarity index 96%
rename from test/unit/lib/utils/fs/writeFile.test.js
rename to test/unit/lib/utils/fs/write-file.test.js
index b04895b0fd9..7f3a0f0d308 100644
--- a/test/unit/lib/utils/fs/writeFile.test.js
+++ b/test/unit/lib/utils/fs/write-file.test.js
@@ -3,7 +3,7 @@
 const fsp = require('fs').promises;
 const Serverless = require('../../../../../lib/serverless');
 const chai = require('chai');
-const writeFile = require('../../../../../lib/utils/fs/writeFile');
+const writeFile = require('../../../../../lib/utils/fs/write-file');
 const readFile = require('../../../../../lib/utils/fs/read-file');
 const { getTmpFilePath } = require('../../../../utils/fs');
 

From 8292f31c476b5e834bfd887c0594a65e99546246 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 12:32:40 +0100
Subject: [PATCH 1011/1101] refactor: Rename `lib/utils/fs/writeFileSync.js`

---
 lib/classes/utils.js                                            | 2 +-
 lib/utils/fs/{writeFileSync.js => write-file-sync.js}           | 0
 lib/utils/rename-service.js                                     | 2 +-
 test/unit/lib/utils/download-template-from-repo.test.js         | 2 +-
 test/unit/lib/utils/fs/copy-dir-contents-sync.test.js           | 2 +-
 test/unit/lib/utils/fs/read-file-sync.test.js                   | 2 +-
 test/unit/lib/utils/fs/walk-dir-sync.test.js                    | 2 +-
 .../utils/fs/{writeFileSync.test.js => write-file-sync.test.js} | 2 +-
 test/unit/lib/utils/yaml-ast-parser.test.js                     | 2 +-
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename lib/utils/fs/{writeFileSync.js => write-file-sync.js} (100%)
 rename test/unit/lib/utils/fs/{writeFileSync.test.js => write-file-sync.test.js} (99%)

diff --git a/lib/classes/utils.js b/lib/classes/utils.js
index ef7fcf7055e..288530fecc1 100644
--- a/lib/classes/utils.js
+++ b/lib/classes/utils.js
@@ -7,7 +7,7 @@ const path = require('path');
 const BbPromise = require('bluebird');
 const fse = require('fs-extra');
 const fileExistsSync = require('../utils/fs/file-exists-sync');
-const writeFileSync = require('../utils/fs/writeFileSync');
+const writeFileSync = require('../utils/fs/write-file-sync');
 const copyDirContentsSync = require('../utils/fs/copy-dir-contents-sync');
 const readFileSync = require('../utils/fs/read-file-sync');
 const readFile = require('../utils/fs/read-file');
diff --git a/lib/utils/fs/writeFileSync.js b/lib/utils/fs/write-file-sync.js
similarity index 100%
rename from lib/utils/fs/writeFileSync.js
rename to lib/utils/fs/write-file-sync.js
diff --git a/lib/utils/rename-service.js b/lib/utils/rename-service.js
index 2708e798b81..564202291d1 100644
--- a/lib/utils/rename-service.js
+++ b/lib/utils/rename-service.js
@@ -5,7 +5,7 @@ const fse = require('fs-extra');
 
 const fileExistsSync = require('./fs/file-exists-sync');
 const readFileSync = require('./fs/read-file-sync');
-const writeFileSync = require('./fs/writeFileSync');
+const writeFileSync = require('./fs/write-file-sync');
 const ServerlessError = require('../serverless-error');
 
 function renameYmlService(name, ymlServiceFile) {
diff --git a/test/unit/lib/utils/download-template-from-repo.test.js b/test/unit/lib/utils/download-template-from-repo.test.js
index 242ce0a35cb..a334b304969 100644
--- a/test/unit/lib/utils/download-template-from-repo.test.js
+++ b/test/unit/lib/utils/download-template-from-repo.test.js
@@ -11,7 +11,7 @@ const chai = require('chai');
 const { expect } = chai;
 const { getTmpDirPath } = require('../../../utils/fs');
 
-const writeFileSync = require('../../../../lib/utils/fs/writeFileSync');
+const writeFileSync = require('../../../../lib/utils/fs/write-file-sync');
 const readFileSync = require('../../../../lib/utils/fs/read-file-sync');
 
 chai.use(require('chai-as-promised'));
diff --git a/test/unit/lib/utils/fs/copy-dir-contents-sync.test.js b/test/unit/lib/utils/fs/copy-dir-contents-sync.test.js
index bc4b42c1029..86676cd9e27 100644
--- a/test/unit/lib/utils/fs/copy-dir-contents-sync.test.js
+++ b/test/unit/lib/utils/fs/copy-dir-contents-sync.test.js
@@ -6,7 +6,7 @@ const fse = require('fs-extra');
 const path = require('path');
 const copyDirContentsSync = require('../../../../../lib/utils/fs/copy-dir-contents-sync');
 const fileExistsSync = require('../../../../../lib/utils/fs/file-exists-sync');
-const writeFileSync = require('../../../../../lib/utils/fs/writeFileSync');
+const writeFileSync = require('../../../../../lib/utils/fs/write-file-sync');
 const skipOnDisabledSymlinksInWindows = require('@serverless/test/skip-on-disabled-symlinks-in-windows');
 
 describe('#copyDirContentsSync()', () => {
diff --git a/test/unit/lib/utils/fs/read-file-sync.test.js b/test/unit/lib/utils/fs/read-file-sync.test.js
index c91ad472ab2..2f447f993c4 100644
--- a/test/unit/lib/utils/fs/read-file-sync.test.js
+++ b/test/unit/lib/utils/fs/read-file-sync.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const writeFileSync = require('../../../../../lib/utils/fs/writeFileSync');
+const writeFileSync = require('../../../../../lib/utils/fs/write-file-sync');
 const readFileSync = require('../../../../../lib/utils/fs/read-file-sync');
 const { getTmpFilePath } = require('../../../../utils/fs');
 
diff --git a/test/unit/lib/utils/fs/walk-dir-sync.test.js b/test/unit/lib/utils/fs/walk-dir-sync.test.js
index a95ae0df47e..8bc9ac52d4e 100644
--- a/test/unit/lib/utils/fs/walk-dir-sync.test.js
+++ b/test/unit/lib/utils/fs/walk-dir-sync.test.js
@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const path = require('path');
-const writeFileSync = require('../../../../../lib/utils/fs/writeFileSync');
+const writeFileSync = require('../../../../../lib/utils/fs/write-file-sync');
 const walkDirSync = require('../../../../../lib/utils/fs/walk-dir-sync');
 const { expect } = require('chai');
 const { getTmpDirPath } = require('../../../../utils/fs');
diff --git a/test/unit/lib/utils/fs/writeFileSync.test.js b/test/unit/lib/utils/fs/write-file-sync.test.js
similarity index 99%
rename from test/unit/lib/utils/fs/writeFileSync.test.js
rename to test/unit/lib/utils/fs/write-file-sync.test.js
index 7f869e7ea0a..9edb3099638 100644
--- a/test/unit/lib/utils/fs/writeFileSync.test.js
+++ b/test/unit/lib/utils/fs/write-file-sync.test.js
@@ -2,7 +2,7 @@
 
 const fsp = require('fs').promises;
 const Serverless = require('../../../../../lib/serverless');
-const writeFileSync = require('../../../../../lib/utils/fs/writeFileSync');
+const writeFileSync = require('../../../../../lib/utils/fs/write-file-sync');
 const readFileSync = require('../../../../../lib/utils/fs/read-file-sync');
 const { expect } = require('chai');
 const { getTmpFilePath } = require('../../../../utils/fs');
diff --git a/test/unit/lib/utils/yaml-ast-parser.test.js b/test/unit/lib/utils/yaml-ast-parser.test.js
index bf9cc385fba..1dd1d0b5cf8 100644
--- a/test/unit/lib/utils/yaml-ast-parser.test.js
+++ b/test/unit/lib/utils/yaml-ast-parser.test.js
@@ -2,7 +2,7 @@
 
 const path = require('path');
 const chai = require('chai');
-const writeFileSync = require('../../../../lib/utils/fs/writeFileSync');
+const writeFileSync = require('../../../../lib/utils/fs/write-file-sync');
 const readFileSync = require('../../../../lib/utils/fs/read-file-sync');
 const yamlAstParser = require('../../../../lib/utils/yaml-ast-parser');
 const chaiAsPromised = require('chai-as-promised');

From 4d181187219f014391cfb9c02e73462813c3c495 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:00:34 +0100
Subject: [PATCH 1012/1101] refactor: Rename `lib/utils/npmPackage`

---
 lib/plugins/config.js                               | 4 ++--
 lib/utils/eventually-update.js                      | 4 ++--
 lib/utils/{npmPackage => npm-package}/isGlobal.js   | 0
 lib/utils/{npmPackage => npm-package}/isWritable.js | 0
 lib/utils/telemetry/generatePayload.js              | 2 +-
 scripts/postinstall.js                              | 2 +-
 test/unit/lib/plugins/config.test.js                | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename lib/utils/{npmPackage => npm-package}/isGlobal.js (100%)
 rename lib/utils/{npmPackage => npm-package}/isWritable.js (100%)

diff --git a/lib/plugins/config.js b/lib/plugins/config.js
index 9fe8fb7716f..275131969ca 100644
--- a/lib/plugins/config.js
+++ b/lib/plugins/config.js
@@ -3,8 +3,8 @@
 const config = require('@serverless/utils/config');
 const ServerlessError = require('../serverless-error');
 const cliCommandsSchema = require('../cli/commands-schema');
-const isNpmPackageWritable = require('../utils/npmPackage/isWritable');
-const isNpmGlobalPackage = require('../utils/npmPackage/isGlobal');
+const isNpmPackageWritable = require('../utils/npm-package/isWritable');
+const isNpmGlobalPackage = require('../utils/npm-package/isGlobal');
 const renderCommandHelp = require('../cli/render-help/command');
 const isLocallyInstalled = require('../cli/is-locally-installed');
 const { log } = require('@serverless/utils/log');
diff --git a/lib/utils/eventually-update.js b/lib/utils/eventually-update.js
index fcff7a9c2c1..cdcfba4235d 100644
--- a/lib/utils/eventually-update.js
+++ b/lib/utils/eventually-update.js
@@ -15,8 +15,8 @@ const semver = require('semver');
 const userConfig = require('@serverless/utils/config');
 const currentVersion = require('../../package.json').version;
 const standaloneUtils = require('./standalone');
-const isNpmGlobalPackage = require('./npmPackage/isGlobal');
-const isNpmPackageWritable = require('./npmPackage/isWritable');
+const isNpmGlobalPackage = require('./npm-package/isGlobal');
+const isNpmPackageWritable = require('./npm-package/isWritable');
 const isLocallyInstalled = require('../cli/is-locally-installed');
 
 const pipeline = promisify(stream.pipeline);
diff --git a/lib/utils/npmPackage/isGlobal.js b/lib/utils/npm-package/isGlobal.js
similarity index 100%
rename from lib/utils/npmPackage/isGlobal.js
rename to lib/utils/npm-package/isGlobal.js
diff --git a/lib/utils/npmPackage/isWritable.js b/lib/utils/npm-package/isWritable.js
similarity index 100%
rename from lib/utils/npmPackage/isWritable.js
rename to lib/utils/npm-package/isWritable.js
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index 874098c4fb4..4f16b89afe9 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -10,7 +10,7 @@ const getNotificationsMode = require('@serverless/utils/get-notifications-mode')
 const isStandalone = require('../is-standalone-executable');
 const { getConfigurationValidationResult } = require('../../classes/config-schema-handler');
 const { triggeredDeprecations } = require('../log-deprecation');
-const isNpmGlobal = require('../npmPackage/isGlobal');
+const isNpmGlobal = require('../npm-package/isGlobal');
 const isLocallyInstalled = require('../../cli/is-locally-installed');
 const ci = require('ci-info');
 const AWS = require('aws-sdk');
diff --git a/scripts/postinstall.js b/scripts/postinstall.js
index ca33e5a53af..5796d965e57 100755
--- a/scripts/postinstall.js
+++ b/scripts/postinstall.js
@@ -7,7 +7,7 @@ const isWindows = process.platform === 'win32';
 
 const truthyStr = (val) => val && !['0', 'false', 'f', 'n', 'no'].includes(val.toLowerCase());
 const { CI, ADBLOCK, SILENT } = process.env;
-const isNpmGlobalPackage = require('../lib/utils/npmPackage/isGlobal');
+const isNpmGlobalPackage = require('../lib/utils/npm-package/isGlobal');
 
 if (!truthyStr(CI) && !truthyStr(ADBLOCK) && !truthyStr(SILENT)) {
   const messageTokens = ['Serverless Framework successfully installed!'];
diff --git a/test/unit/lib/plugins/config.test.js b/test/unit/lib/plugins/config.test.js
index d8e22f9a3cf..13f4d24ffdf 100644
--- a/test/unit/lib/plugins/config.test.js
+++ b/test/unit/lib/plugins/config.test.js
@@ -22,8 +22,8 @@ describe('Config', () => {
       command: 'config',
       options: { autoupdate: true },
       modulesCacheStub: {
-        './lib/utils/npmPackage/isGlobal.js': async () => true,
-        './lib/utils/npmPackage/isWritable.js': async () => true,
+        './lib/utils/npm-package/isGlobal.js': async () => true,
+        './lib/utils/npm-package/isWritable.js': async () => true,
       },
     });
     expect(config.get('autoUpdate.enabled')).to.be.true;

From d899d4187dd88da5da7c3751973fa94da93e0306 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:00:35 +0100
Subject: [PATCH 1013/1101] refactor: Rename
 `lib/utils/npm-package/isGlobal.js`

---
 lib/plugins/config.js                               | 2 +-
 lib/utils/eventually-update.js                      | 2 +-
 lib/utils/npm-package/{isGlobal.js => is-global.js} | 0
 lib/utils/telemetry/generatePayload.js              | 2 +-
 scripts/postinstall.js                              | 2 +-
 test/unit/lib/plugins/config.test.js                | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename lib/utils/npm-package/{isGlobal.js => is-global.js} (100%)

diff --git a/lib/plugins/config.js b/lib/plugins/config.js
index 275131969ca..1f72278b502 100644
--- a/lib/plugins/config.js
+++ b/lib/plugins/config.js
@@ -4,7 +4,7 @@ const config = require('@serverless/utils/config');
 const ServerlessError = require('../serverless-error');
 const cliCommandsSchema = require('../cli/commands-schema');
 const isNpmPackageWritable = require('../utils/npm-package/isWritable');
-const isNpmGlobalPackage = require('../utils/npm-package/isGlobal');
+const isNpmGlobalPackage = require('../utils/npm-package/is-global');
 const renderCommandHelp = require('../cli/render-help/command');
 const isLocallyInstalled = require('../cli/is-locally-installed');
 const { log } = require('@serverless/utils/log');
diff --git a/lib/utils/eventually-update.js b/lib/utils/eventually-update.js
index cdcfba4235d..05bcd303630 100644
--- a/lib/utils/eventually-update.js
+++ b/lib/utils/eventually-update.js
@@ -15,7 +15,7 @@ const semver = require('semver');
 const userConfig = require('@serverless/utils/config');
 const currentVersion = require('../../package.json').version;
 const standaloneUtils = require('./standalone');
-const isNpmGlobalPackage = require('./npm-package/isGlobal');
+const isNpmGlobalPackage = require('./npm-package/is-global');
 const isNpmPackageWritable = require('./npm-package/isWritable');
 const isLocallyInstalled = require('../cli/is-locally-installed');
 
diff --git a/lib/utils/npm-package/isGlobal.js b/lib/utils/npm-package/is-global.js
similarity index 100%
rename from lib/utils/npm-package/isGlobal.js
rename to lib/utils/npm-package/is-global.js
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
index 4f16b89afe9..ffc35bebda6 100644
--- a/lib/utils/telemetry/generatePayload.js
+++ b/lib/utils/telemetry/generatePayload.js
@@ -10,7 +10,7 @@ const getNotificationsMode = require('@serverless/utils/get-notifications-mode')
 const isStandalone = require('../is-standalone-executable');
 const { getConfigurationValidationResult } = require('../../classes/config-schema-handler');
 const { triggeredDeprecations } = require('../log-deprecation');
-const isNpmGlobal = require('../npm-package/isGlobal');
+const isNpmGlobal = require('../npm-package/is-global');
 const isLocallyInstalled = require('../../cli/is-locally-installed');
 const ci = require('ci-info');
 const AWS = require('aws-sdk');
diff --git a/scripts/postinstall.js b/scripts/postinstall.js
index 5796d965e57..38ce6f2e5a3 100755
--- a/scripts/postinstall.js
+++ b/scripts/postinstall.js
@@ -7,7 +7,7 @@ const isWindows = process.platform === 'win32';
 
 const truthyStr = (val) => val && !['0', 'false', 'f', 'n', 'no'].includes(val.toLowerCase());
 const { CI, ADBLOCK, SILENT } = process.env;
-const isNpmGlobalPackage = require('../lib/utils/npm-package/isGlobal');
+const isNpmGlobalPackage = require('../lib/utils/npm-package/is-global');
 
 if (!truthyStr(CI) && !truthyStr(ADBLOCK) && !truthyStr(SILENT)) {
   const messageTokens = ['Serverless Framework successfully installed!'];
diff --git a/test/unit/lib/plugins/config.test.js b/test/unit/lib/plugins/config.test.js
index 13f4d24ffdf..b0fca1532f9 100644
--- a/test/unit/lib/plugins/config.test.js
+++ b/test/unit/lib/plugins/config.test.js
@@ -22,7 +22,7 @@ describe('Config', () => {
       command: 'config',
       options: { autoupdate: true },
       modulesCacheStub: {
-        './lib/utils/npm-package/isGlobal.js': async () => true,
+        './lib/utils/npm-package/is-global.js': async () => true,
         './lib/utils/npm-package/isWritable.js': async () => true,
       },
     });

From 87863b6efe61286c8d23edacef7aac1ac21eb311 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:00:37 +0100
Subject: [PATCH 1014/1101] refactor: Rename
 `lib/utils/npm-package/isWritable.js`

---
 lib/plugins/config.js                                   | 2 +-
 lib/utils/eventually-update.js                          | 2 +-
 lib/utils/npm-package/{isWritable.js => is-writable.js} | 0
 test/unit/lib/plugins/config.test.js                    | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/utils/npm-package/{isWritable.js => is-writable.js} (100%)

diff --git a/lib/plugins/config.js b/lib/plugins/config.js
index 1f72278b502..f1e11d19176 100644
--- a/lib/plugins/config.js
+++ b/lib/plugins/config.js
@@ -3,7 +3,7 @@
 const config = require('@serverless/utils/config');
 const ServerlessError = require('../serverless-error');
 const cliCommandsSchema = require('../cli/commands-schema');
-const isNpmPackageWritable = require('../utils/npm-package/isWritable');
+const isNpmPackageWritable = require('../utils/npm-package/is-writable');
 const isNpmGlobalPackage = require('../utils/npm-package/is-global');
 const renderCommandHelp = require('../cli/render-help/command');
 const isLocallyInstalled = require('../cli/is-locally-installed');
diff --git a/lib/utils/eventually-update.js b/lib/utils/eventually-update.js
index 05bcd303630..12dcb196e27 100644
--- a/lib/utils/eventually-update.js
+++ b/lib/utils/eventually-update.js
@@ -16,7 +16,7 @@ const userConfig = require('@serverless/utils/config');
 const currentVersion = require('../../package.json').version;
 const standaloneUtils = require('./standalone');
 const isNpmGlobalPackage = require('./npm-package/is-global');
-const isNpmPackageWritable = require('./npm-package/isWritable');
+const isNpmPackageWritable = require('./npm-package/is-writable');
 const isLocallyInstalled = require('../cli/is-locally-installed');
 
 const pipeline = promisify(stream.pipeline);
diff --git a/lib/utils/npm-package/isWritable.js b/lib/utils/npm-package/is-writable.js
similarity index 100%
rename from lib/utils/npm-package/isWritable.js
rename to lib/utils/npm-package/is-writable.js
diff --git a/test/unit/lib/plugins/config.test.js b/test/unit/lib/plugins/config.test.js
index b0fca1532f9..62958ad44d3 100644
--- a/test/unit/lib/plugins/config.test.js
+++ b/test/unit/lib/plugins/config.test.js
@@ -23,7 +23,7 @@ describe('Config', () => {
       options: { autoupdate: true },
       modulesCacheStub: {
         './lib/utils/npm-package/is-global.js': async () => true,
-        './lib/utils/npm-package/isWritable.js': async () => true,
+        './lib/utils/npm-package/is-writable.js': async () => true,
       },
     });
     expect(config.get('autoUpdate.enabled')).to.be.true;

From c3e08ca342cde60a6041e3df99c2779b47cf192d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:00:38 +0100
Subject: [PATCH 1015/1101] refactor: Rename
 `lib/utils/telemetry/areDisabled.js`

---
 lib/utils/telemetry/{areDisabled.js => are-disabled.js} | 0
 lib/utils/telemetry/index.js                            | 2 +-
 scripts/serverless.js                                   | 2 +-
 test/unit/lib/utils/telemetry/index.test.js             | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/utils/telemetry/{areDisabled.js => are-disabled.js} (100%)

diff --git a/lib/utils/telemetry/areDisabled.js b/lib/utils/telemetry/are-disabled.js
similarity index 100%
rename from lib/utils/telemetry/areDisabled.js
rename to lib/utils/telemetry/are-disabled.js
diff --git a/lib/utils/telemetry/index.js b/lib/utils/telemetry/index.js
index c56c413f77b..f8940423052 100644
--- a/lib/utils/telemetry/index.js
+++ b/lib/utils/telemetry/index.js
@@ -8,7 +8,7 @@ const fse = require('fs-extra');
 const fsp = require('fs').promises;
 const telemetryUrl = require('@serverless/utils/analytics-and-notfications-url');
 const { log } = require('@serverless/utils/log');
-const isTelemetryDisabled = require('./areDisabled');
+const isTelemetryDisabled = require('./are-disabled');
 const cacheDirPath = require('./cache-path');
 
 const telemetryLog = log.get('telemetry');
diff --git a/scripts/serverless.js b/scripts/serverless.js
index 9093e075c18..e017ca42287 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -18,7 +18,7 @@ const {
   send: sendTelemetry,
 } = require('../lib/utils/telemetry');
 const generateTelemetryPayload = require('../lib/utils/telemetry/generatePayload');
-const isTelemetryDisabled = require('../lib/utils/telemetry/areDisabled');
+const isTelemetryDisabled = require('../lib/utils/telemetry/are-disabled');
 const logDeprecation = require('../lib/utils/log-deprecation');
 
 let command;
diff --git a/test/unit/lib/utils/telemetry/index.test.js b/test/unit/lib/utils/telemetry/index.test.js
index f715455ef53..50b4bc36477 100644
--- a/test/unit/lib/utils/telemetry/index.test.js
+++ b/test/unit/lib/utils/telemetry/index.test.js
@@ -26,7 +26,7 @@ describe('test/unit/lib/utils/telemetry/index.test.js', () => {
   before(() => {
     ({ storeLocally, send } = proxyquire('../../../../../lib/utils/telemetry/index.js', {
       '@serverless/utils/analytics-and-notfications-url': telemetryUrl,
-      './areDisabled': false,
+      './are-disabled': false,
       'node-fetch': async (url, options) => {
         usedUrl = url;
         usedOptions = options;

From e9c3502e2ad02c802c5942c12e023fecdf378662 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:00:40 +0100
Subject: [PATCH 1016/1101] refactor: Rename
 `lib/utils/telemetry/generatePayload.js`

---
 lib/utils/telemetry/{generatePayload.js => generate-payload.js} | 0
 scripts/serverless.js                                           | 2 +-
 test/unit/lib/plugins/aws/provider.test.js                      | 2 +-
 .../{generatePayload.test.js => generate-payload.test.js}       | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/utils/telemetry/{generatePayload.js => generate-payload.js} (100%)
 rename test/unit/lib/utils/telemetry/{generatePayload.test.js => generate-payload.test.js} (99%)

diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generate-payload.js
similarity index 100%
rename from lib/utils/telemetry/generatePayload.js
rename to lib/utils/telemetry/generate-payload.js
diff --git a/scripts/serverless.js b/scripts/serverless.js
index e017ca42287..bb39fb8ae61 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -17,7 +17,7 @@ const {
   storeLocally: storeTelemetryLocally,
   send: sendTelemetry,
 } = require('../lib/utils/telemetry');
-const generateTelemetryPayload = require('../lib/utils/telemetry/generatePayload');
+const generateTelemetryPayload = require('../lib/utils/telemetry/generate-payload');
 const isTelemetryDisabled = require('../lib/utils/telemetry/are-disabled');
 const logDeprecation = require('../lib/utils/log-deprecation');
 
diff --git a/test/unit/lib/plugins/aws/provider.test.js b/test/unit/lib/plugins/aws/provider.test.js
index 74fcd58c072..7c9691eaf68 100644
--- a/test/unit/lib/plugins/aws/provider.test.js
+++ b/test/unit/lib/plugins/aws/provider.test.js
@@ -1233,7 +1233,7 @@ aws_secret_access_key = CUSTOMSECRET
       });
       const modulesCacheStub = {
         'child-process-ext/spawn': spawnExtStub,
-        './lib/utils/telemetry/generatePayload.js': () => ({}),
+        './lib/utils/telemetry/generate-payload.js': () => ({}),
       };
 
       beforeEach(() => {
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generate-payload.test.js
similarity index 99%
rename from test/unit/lib/utils/telemetry/generatePayload.test.js
rename to test/unit/lib/utils/telemetry/generate-payload.test.js
index 2f4c2300c0c..b818def9a0c 100644
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ b/test/unit/lib/utils/telemetry/generate-payload.test.js
@@ -17,7 +17,7 @@ const versions = {
 };
 
 const getGeneratePayload = () =>
-  proxyquire('../../../../../lib/utils/telemetry/generatePayload', {
+  proxyquire('../../../../../lib/utils/telemetry/generate-payload', {
     '@serverless/utils/get-notifications-mode': () => 'on',
   });
 

From 9e2edc2d9f538dae6666d3ba36dc282493876add Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:00:42 +0100
Subject: [PATCH 1017/1101] refactor: Rename
 `lib/plugins/aws/configCredentials.js`

---
 lib/plugins/aws/{configCredentials.js => config-credentials.js} | 0
 lib/plugins/index.js                                            | 2 +-
 .../{configCredentials.test.js => config-credentials.test.js}   | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/plugins/aws/{configCredentials.js => config-credentials.js} (100%)
 rename test/unit/lib/plugins/aws/{configCredentials.test.js => config-credentials.test.js} (99%)

diff --git a/lib/plugins/aws/configCredentials.js b/lib/plugins/aws/config-credentials.js
similarity index 100%
rename from lib/plugins/aws/configCredentials.js
rename to lib/plugins/aws/config-credentials.js
diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index 8d83d216c5c..b64daf6af47 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -17,7 +17,7 @@ module.exports = [
   require('./plugin/plugin.js'),
   require('./plugin/list.js'),
   require('./plugin/search.js'),
-  require('./aws/configCredentials.js'),
+  require('./aws/config-credentials.js'),
   require('./aws/provider.js'),
   require('./aws/common/index.js'),
   require('./aws/package/index.js'),
diff --git a/test/unit/lib/plugins/aws/configCredentials.test.js b/test/unit/lib/plugins/aws/config-credentials.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/configCredentials.test.js
rename to test/unit/lib/plugins/aws/config-credentials.test.js
index eb165323f47..b04d8986885 100644
--- a/test/unit/lib/plugins/aws/configCredentials.test.js
+++ b/test/unit/lib/plugins/aws/config-credentials.test.js
@@ -8,7 +8,7 @@ const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const os = require('os');
 const path = require('path');
-const AwsConfigCredentials = require('../../../../../lib/plugins/aws/configCredentials');
+const AwsConfigCredentials = require('../../../../../lib/plugins/aws/config-credentials');
 const Serverless = require('../../../../../lib/serverless');
 const runServerless = require('../../../../utils/run-serverless');
 

From 39fd2aee15c11dec72173c53e14826f04f941e64 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:00:45 +0100
Subject: [PATCH 1018/1101] refactor: Rename
 `lib/plugins/aws/deployFunction.js`

---
 lib/plugins/aws/{deployFunction.js => deploy-function.js}       | 0
 lib/plugins/index.js                                            | 2 +-
 .../aws/{deployFunction.test.js => deploy-function.test.js}     | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/plugins/aws/{deployFunction.js => deploy-function.js} (100%)
 rename test/unit/lib/plugins/aws/{deployFunction.test.js => deploy-function.test.js} (99%)

diff --git a/lib/plugins/aws/deployFunction.js b/lib/plugins/aws/deploy-function.js
similarity index 100%
rename from lib/plugins/aws/deployFunction.js
rename to lib/plugins/aws/deploy-function.js
diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index b64daf6af47..272f3f827f2 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -53,7 +53,7 @@ module.exports = [
   require('./aws/package/compile/events/sqs.js'),
   require('./aws/package/compile/events/cloudFront.js'),
   require('./aws/package/compile/events/httpApi'),
-  require('./aws/deployFunction.js'),
+  require('./aws/deploy-function.js'),
   require('./aws/deployList.js'),
   require('./aws/invoke-local/index.js'),
   require('./standalone'),
diff --git a/test/unit/lib/plugins/aws/deployFunction.test.js b/test/unit/lib/plugins/aws/deploy-function.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/deployFunction.test.js
rename to test/unit/lib/plugins/aws/deploy-function.test.js
index a1a34090f16..bbc678f9d98 100644
--- a/test/unit/lib/plugins/aws/deployFunction.test.js
+++ b/test/unit/lib/plugins/aws/deploy-function.test.js
@@ -62,7 +62,7 @@ describe('AwsDeployFunction', () => {
       },
       digest: sinon.stub(),
     };
-    AwsDeployFunction = proxyquire('../../../../../lib/plugins/aws/deployFunction', {
+    AwsDeployFunction = proxyquire('../../../../../lib/plugins/aws/deploy-function', {
       crypto: cryptoStub,
     });
     awsDeployFunction = new AwsDeployFunction(serverless, options);

From 85acd6036eeb1f3684470f835c8611e4190dc9ff Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:00:47 +0100
Subject: [PATCH 1019/1101] refactor: Rename `lib/plugins/aws/deployList.js`

---
 lib/plugins/aws/{deployList.js => deploy-list.js}               | 0
 lib/plugins/index.js                                            | 2 +-
 .../lib/plugins/aws/{deployList.test.js => deploy-list.test.js} | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/plugins/aws/{deployList.js => deploy-list.js} (100%)
 rename test/unit/lib/plugins/aws/{deployList.test.js => deploy-list.test.js} (99%)

diff --git a/lib/plugins/aws/deployList.js b/lib/plugins/aws/deploy-list.js
similarity index 100%
rename from lib/plugins/aws/deployList.js
rename to lib/plugins/aws/deploy-list.js
diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index 272f3f827f2..c1eb0f97513 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -54,7 +54,7 @@ module.exports = [
   require('./aws/package/compile/events/cloudFront.js'),
   require('./aws/package/compile/events/httpApi'),
   require('./aws/deploy-function.js'),
-  require('./aws/deployList.js'),
+  require('./aws/deploy-list.js'),
   require('./aws/invoke-local/index.js'),
   require('./standalone'),
 ];
diff --git a/test/unit/lib/plugins/aws/deployList.test.js b/test/unit/lib/plugins/aws/deploy-list.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/deployList.test.js
rename to test/unit/lib/plugins/aws/deploy-list.test.js
index c5034a99264..b56ad0f0903 100644
--- a/test/unit/lib/plugins/aws/deployList.test.js
+++ b/test/unit/lib/plugins/aws/deploy-list.test.js
@@ -2,7 +2,7 @@
 
 const sinon = require('sinon');
 const expect = require('chai').expect;
-const AwsDeployList = require('../../../../../lib/plugins/aws/deployList');
+const AwsDeployList = require('../../../../../lib/plugins/aws/deploy-list');
 const AwsProvider = require('../../../../../lib/plugins/aws/provider');
 const Serverless = require('../../../../../lib/serverless');
 

From aec7b687b8805d3a4dbd540e5e4b081b20ee1979 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:00:49 +0100
Subject: [PATCH 1020/1101] refactor: Rename
 `lib/plugins/aws/rollbackFunction.js`

---
 lib/plugins/aws/{rollbackFunction.js => rollback-function.js}   | 0
 lib/plugins/index.js                                            | 2 +-
 .../aws/{rollbackFunction.test.js => rollback-function.test.js} | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/plugins/aws/{rollbackFunction.js => rollback-function.js} (100%)
 rename test/unit/lib/plugins/aws/{rollbackFunction.test.js => rollback-function.test.js} (99%)

diff --git a/lib/plugins/aws/rollbackFunction.js b/lib/plugins/aws/rollback-function.js
similarity index 100%
rename from lib/plugins/aws/rollbackFunction.js
rename to lib/plugins/aws/rollback-function.js
diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index c1eb0f97513..c3b31ae540e 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -28,7 +28,7 @@ module.exports = [
   require('./aws/metrics.js'),
   require('./aws/remove/index.js'),
   require('./aws/rollback.js'),
-  require('./aws/rollbackFunction.js'),
+  require('./aws/rollback-function.js'),
   require('./aws/package/compile/layers.js'),
   require('./aws/package/compile/functions.js'),
   require('./aws/package/compile/events/schedule.js'),
diff --git a/test/unit/lib/plugins/aws/rollbackFunction.test.js b/test/unit/lib/plugins/aws/rollback-function.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/rollbackFunction.test.js
rename to test/unit/lib/plugins/aws/rollback-function.test.js
index 0c44be38887..4c244d27338 100644
--- a/test/unit/lib/plugins/aws/rollbackFunction.test.js
+++ b/test/unit/lib/plugins/aws/rollback-function.test.js
@@ -15,7 +15,7 @@ describe('AwsRollbackFunction', () => {
 
   beforeEach(() => {
     fetchStub = sinon.stub().resolves({ buffer: () => {} });
-    AwsRollbackFunction = proxyquire('../../../../../lib/plugins/aws/rollbackFunction.js', {
+    AwsRollbackFunction = proxyquire('../../../../../lib/plugins/aws/rollback-function.js', {
       'node-fetch': fetchStub,
     });
     serverless = new Serverless({ commands: [], options: {} });

From 6e129b28ceb9bc7264c78902dd61a12527767490 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:00:51 +0100
Subject: [PATCH 1021/1101] refactor: Rename
 `lib/plugins/aws/custom-resources/generateZip.js`

---
 .../aws/custom-resources/{generateZip.js => generate-zip.js}    | 0
 lib/plugins/aws/custom-resources/index.js                       | 2 +-
 .../{generateZip.test.js => generate-zip.test.js}               | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/plugins/aws/custom-resources/{generateZip.js => generate-zip.js} (100%)
 rename test/unit/lib/plugins/aws/custom-resources/{generateZip.test.js => generate-zip.test.js} (98%)

diff --git a/lib/plugins/aws/custom-resources/generateZip.js b/lib/plugins/aws/custom-resources/generate-zip.js
similarity index 100%
rename from lib/plugins/aws/custom-resources/generateZip.js
rename to lib/plugins/aws/custom-resources/generate-zip.js
diff --git a/lib/plugins/aws/custom-resources/index.js b/lib/plugins/aws/custom-resources/index.js
index a17a3cb52df..c394d0b12f5 100644
--- a/lib/plugins/aws/custom-resources/index.js
+++ b/lib/plugins/aws/custom-resources/index.js
@@ -6,7 +6,7 @@ const crypto = require('crypto');
 const BbPromise = require('bluebird');
 const fse = require('fs-extra');
 const { log } = require('@serverless/utils/log');
-const generateZip = require('./generateZip');
+const generateZip = require('./generate-zip');
 const ServerlessError = require('../../../serverless-error');
 
 const prepareCustomResourcePackage = _.memoize(async (zipFilePath) => {
diff --git a/test/unit/lib/plugins/aws/custom-resources/generateZip.test.js b/test/unit/lib/plugins/aws/custom-resources/generate-zip.test.js
similarity index 98%
rename from test/unit/lib/plugins/aws/custom-resources/generateZip.test.js
rename to test/unit/lib/plugins/aws/custom-resources/generate-zip.test.js
index 5063400f827..274c295f7ed 100644
--- a/test/unit/lib/plugins/aws/custom-resources/generateZip.test.js
+++ b/test/unit/lib/plugins/aws/custom-resources/generate-zip.test.js
@@ -16,7 +16,7 @@ describe('test/unit/lib/plugins/aws/customResources/generateZip.test.js', () =>
   describe('when generating a zip file', () => {
     it('should generate a zip file with the contents of the resources directory', async () => {
       const zipFilePath = await requireUncached(async () =>
-        require('../../../../../../lib/plugins/aws/custom-resources/generateZip')()
+        require('../../../../../../lib/plugins/aws/custom-resources/generate-zip')()
       );
 
       // List the files in the zip to make sure it is valid

From a1239ebffe0101cb183312c5410aa08eb071bd58 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:00:53 +0100
Subject: [PATCH 1022/1101] refactor: Rename
 `lib/plugins/aws/info/getApiKeyValues.js`

---
 .../aws/info/{getApiKeyValues.js => get-api-key-values.js}      | 0
 lib/plugins/aws/info/index.js                                   | 2 +-
 .../{getApiKeyValues.test.js => get-api-key-values.test.js}     | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/info/{getApiKeyValues.js => get-api-key-values.js} (100%)
 rename test/unit/lib/plugins/aws/info/{getApiKeyValues.test.js => get-api-key-values.test.js} (100%)

diff --git a/lib/plugins/aws/info/getApiKeyValues.js b/lib/plugins/aws/info/get-api-key-values.js
similarity index 100%
rename from lib/plugins/aws/info/getApiKeyValues.js
rename to lib/plugins/aws/info/get-api-key-values.js
diff --git a/lib/plugins/aws/info/index.js b/lib/plugins/aws/info/index.js
index 53a8486fe6c..4d7b6bd3917 100644
--- a/lib/plugins/aws/info/index.js
+++ b/lib/plugins/aws/info/index.js
@@ -6,7 +6,7 @@ const writeServiceOutputs = require('../../../cli/write-service-outputs');
 const validate = require('../lib/validate');
 const getStackInfo = require('./getStackInfo');
 const getResourceCount = require('./getResourceCount');
-const getApiKeyValues = require('./getApiKeyValues');
+const getApiKeyValues = require('./get-api-key-values');
 const display = require('./display');
 const { log } = require('@serverless/utils/log');
 
diff --git a/test/unit/lib/plugins/aws/info/getApiKeyValues.test.js b/test/unit/lib/plugins/aws/info/get-api-key-values.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/info/getApiKeyValues.test.js
rename to test/unit/lib/plugins/aws/info/get-api-key-values.test.js

From 5596746455850977a26c4f150b63970b7e89a154 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:00:56 +0100
Subject: [PATCH 1023/1101] refactor: Rename
 `lib/plugins/aws/info/getResourceCount.js`

---
 .../aws/info/{getResourceCount.js => get-resource-count.js}     | 0
 lib/plugins/aws/info/index.js                                   | 2 +-
 .../{getResourceCount.test.js => get-resource-count.test.js}    | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/info/{getResourceCount.js => get-resource-count.js} (100%)
 rename test/unit/lib/plugins/aws/info/{getResourceCount.test.js => get-resource-count.test.js} (100%)

diff --git a/lib/plugins/aws/info/getResourceCount.js b/lib/plugins/aws/info/get-resource-count.js
similarity index 100%
rename from lib/plugins/aws/info/getResourceCount.js
rename to lib/plugins/aws/info/get-resource-count.js
diff --git a/lib/plugins/aws/info/index.js b/lib/plugins/aws/info/index.js
index 4d7b6bd3917..2d275513bbf 100644
--- a/lib/plugins/aws/info/index.js
+++ b/lib/plugins/aws/info/index.js
@@ -5,7 +5,7 @@ const { progress, style } = require('@serverless/utils/log');
 const writeServiceOutputs = require('../../../cli/write-service-outputs');
 const validate = require('../lib/validate');
 const getStackInfo = require('./getStackInfo');
-const getResourceCount = require('./getResourceCount');
+const getResourceCount = require('./get-resource-count');
 const getApiKeyValues = require('./get-api-key-values');
 const display = require('./display');
 const { log } = require('@serverless/utils/log');
diff --git a/test/unit/lib/plugins/aws/info/getResourceCount.test.js b/test/unit/lib/plugins/aws/info/get-resource-count.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/info/getResourceCount.test.js
rename to test/unit/lib/plugins/aws/info/get-resource-count.test.js

From 390bea11f5b65bd51244fb985ac197e33117401c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:00:58 +0100
Subject: [PATCH 1024/1101] refactor: Rename
 `lib/plugins/aws/info/getStackInfo.js`

---
 lib/plugins/aws/info/{getStackInfo.js => get-stack-info.js}     | 0
 lib/plugins/aws/info/index.js                                   | 2 +-
 .../aws/info/{getStackInfo.test.js => get-stack-info.test.js}   | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/info/{getStackInfo.js => get-stack-info.js} (100%)
 rename test/unit/lib/plugins/aws/info/{getStackInfo.test.js => get-stack-info.test.js} (100%)

diff --git a/lib/plugins/aws/info/getStackInfo.js b/lib/plugins/aws/info/get-stack-info.js
similarity index 100%
rename from lib/plugins/aws/info/getStackInfo.js
rename to lib/plugins/aws/info/get-stack-info.js
diff --git a/lib/plugins/aws/info/index.js b/lib/plugins/aws/info/index.js
index 2d275513bbf..58b28e07abb 100644
--- a/lib/plugins/aws/info/index.js
+++ b/lib/plugins/aws/info/index.js
@@ -4,7 +4,7 @@ const BbPromise = require('bluebird');
 const { progress, style } = require('@serverless/utils/log');
 const writeServiceOutputs = require('../../../cli/write-service-outputs');
 const validate = require('../lib/validate');
-const getStackInfo = require('./getStackInfo');
+const getStackInfo = require('./get-stack-info');
 const getResourceCount = require('./get-resource-count');
 const getApiKeyValues = require('./get-api-key-values');
 const display = require('./display');
diff --git a/test/unit/lib/plugins/aws/info/getStackInfo.test.js b/test/unit/lib/plugins/aws/info/get-stack-info.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/info/getStackInfo.test.js
rename to test/unit/lib/plugins/aws/info/get-stack-info.test.js

From bece3d2947fd1cbde7b1589152700ef53e9a553b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:00:59 +0100
Subject: [PATCH 1025/1101] refactor: Rename
 `lib/plugins/aws/lib/checkIfEcrRepositoryExists.js`

---
 ...EcrRepositoryExists.js => check-if-ecr-repository-exists.js} | 0
 lib/plugins/aws/remove/index.js                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/lib/{checkIfEcrRepositoryExists.js => check-if-ecr-repository-exists.js} (100%)

diff --git a/lib/plugins/aws/lib/checkIfEcrRepositoryExists.js b/lib/plugins/aws/lib/check-if-ecr-repository-exists.js
similarity index 100%
rename from lib/plugins/aws/lib/checkIfEcrRepositoryExists.js
rename to lib/plugins/aws/lib/check-if-ecr-repository-exists.js
diff --git a/lib/plugins/aws/remove/index.js b/lib/plugins/aws/remove/index.js
index 43658933041..d1527fd652a 100644
--- a/lib/plugins/aws/remove/index.js
+++ b/lib/plugins/aws/remove/index.js
@@ -6,7 +6,7 @@ const checkIfBucketExists = require('../lib/check-if-bucket-exists');
 const emptyS3Bucket = require('./lib/bucket');
 const removeStack = require('./lib/stack');
 const removeEcrRepository = require('./lib/ecr');
-const checkIfEcrRepositoryExists = require('../lib/checkIfEcrRepositoryExists');
+const checkIfEcrRepositoryExists = require('../lib/check-if-ecr-repository-exists');
 const { log, style, progress } = require('@serverless/utils/log');
 
 const mainProgress = progress.get('main');

From 76727ad0a5372bbf0b22bbcd01492dbc78310dea Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:01:01 +0100
Subject: [PATCH 1026/1101] refactor: Rename
 `lib/plugins/aws/lib/getServiceState.js`

---
 .../aws/lib/{getServiceState.js => get-service-state.js}        | 0
 lib/plugins/aws/package/compile/events/apiGateway/index.js      | 2 +-
 .../lib/{getServiceState.test.js => get-service-state.test.js}  | 2 +-
 .../plugins/aws/package/compile/events/apiGateway/index.test.js | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/plugins/aws/lib/{getServiceState.js => get-service-state.js} (100%)
 rename test/unit/lib/plugins/aws/lib/{getServiceState.test.js => get-service-state.test.js} (98%)

diff --git a/lib/plugins/aws/lib/getServiceState.js b/lib/plugins/aws/lib/get-service-state.js
similarity index 100%
rename from lib/plugins/aws/lib/getServiceState.js
rename to lib/plugins/aws/lib/get-service-state.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/index.js b/lib/plugins/aws/package/compile/events/apiGateway/index.js
index bd8a26e480a..34150e9d124 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/index.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/index.js
@@ -260,7 +260,7 @@ class AwsCompileApigEvents {
 
       // TODO should be removed once AWS fixes the CloudFormation problems using a separate Stage
       'after:deploy:deploy': async () => {
-        const getServiceState = require('../../../../lib/getServiceState').getServiceState;
+        const getServiceState = require('../../../../lib/get-service-state').getServiceState;
 
         const state = getServiceState.call(this);
         const updateStage = require('./lib/hack/updateStage').updateStage;
diff --git a/test/unit/lib/plugins/aws/lib/getServiceState.test.js b/test/unit/lib/plugins/aws/lib/get-service-state.test.js
similarity index 98%
rename from test/unit/lib/plugins/aws/lib/getServiceState.test.js
rename to test/unit/lib/plugins/aws/lib/get-service-state.test.js
index 012216ecddb..1d9789e238e 100644
--- a/test/unit/lib/plugins/aws/lib/getServiceState.test.js
+++ b/test/unit/lib/plugins/aws/lib/get-service-state.test.js
@@ -5,7 +5,7 @@ const chai = require('chai');
 const sinon = require('sinon');
 const Serverless = require('../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const getServiceState = require('../../../../../../lib/plugins/aws/lib/getServiceState');
+const getServiceState = require('../../../../../../lib/plugins/aws/lib/get-service-state');
 
 const expect = chai.expect;
 chai.use(require('sinon-chai'));
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js
index 43eba069a31..8a7a877e25a 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js
@@ -6,7 +6,7 @@ const AwsProvider = require('../../../../../../../../../lib/plugins/aws/provider
 const AwsCompileApigEvents = require('../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
 const Serverless = require('../../../../../../../../../lib/serverless');
 const validate = require('../../../../../../../../../lib/plugins/aws/lib/validate');
-const getServiceState = require('../../../../../../../../../lib/plugins/aws/lib/getServiceState');
+const getServiceState = require('../../../../../../../../../lib/plugins/aws/lib/get-service-state');
 const updateStage = require('../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage');
 const disassociateUsagePlan = require('../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan');
 

From 333464514b16793f57b2add35839b87aa18f4e48 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:01:03 +0100
Subject: [PATCH 1027/1101] refactor: Rename
 `lib/plugins/aws/lib/monitorStack.js`

---
 lib/plugins/aws/deploy/index.js                                 | 2 +-
 lib/plugins/aws/lib/{monitorStack.js => monitor-stack.js}       | 0
 lib/plugins/aws/remove/index.js                                 | 2 +-
 lib/plugins/aws/rollback.js                                     | 2 +-
 .../aws/lib/{monitorStack.test.js => monitor-stack.test.js}     | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename lib/plugins/aws/lib/{monitorStack.js => monitor-stack.js} (100%)
 rename test/unit/lib/plugins/aws/lib/{monitorStack.test.js => monitor-stack.test.js} (99%)

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index bba41727230..c07588b0ac5 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -5,7 +5,7 @@ const writeServiceOutputs = require('../../../cli/write-service-outputs');
 const extendedValidate = require('./lib/extendedValidate');
 const setBucketName = require('../lib/setBucketName');
 const checkForChanges = require('./lib/checkForChanges');
-const monitorStack = require('../lib/monitorStack');
+const monitorStack = require('../lib/monitor-stack');
 const checkIfBucketExists = require('../lib/check-if-bucket-exists');
 const getCreateChangeSetParams = require('../lib/get-create-change-set-params');
 const getExecuteChangeSetParams = require('../lib/get-execute-change-set-params');
diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitor-stack.js
similarity index 100%
rename from lib/plugins/aws/lib/monitorStack.js
rename to lib/plugins/aws/lib/monitor-stack.js
diff --git a/lib/plugins/aws/remove/index.js b/lib/plugins/aws/remove/index.js
index d1527fd652a..a6962c703f8 100644
--- a/lib/plugins/aws/remove/index.js
+++ b/lib/plugins/aws/remove/index.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const validate = require('../lib/validate');
-const monitorStack = require('../lib/monitorStack');
+const monitorStack = require('../lib/monitor-stack');
 const checkIfBucketExists = require('../lib/check-if-bucket-exists');
 const emptyS3Bucket = require('./lib/bucket');
 const removeStack = require('./lib/stack');
diff --git a/lib/plugins/aws/rollback.js b/lib/plugins/aws/rollback.js
index fcd4236bbc4..fe8c51912a4 100644
--- a/lib/plugins/aws/rollback.js
+++ b/lib/plugins/aws/rollback.js
@@ -2,7 +2,7 @@
 const validate = require('./lib/validate');
 const setBucketName = require('./lib/setBucketName');
 const updateStack = require('./lib/updateStack');
-const monitorStack = require('./lib/monitorStack');
+const monitorStack = require('./lib/monitor-stack');
 const waitForChangeSetCreation = require('./lib/wait-for-change-set-creation');
 const getCreateChangeSetParams = require('./lib/get-create-change-set-params');
 const getExecuteChangeSetParams = require('./lib/get-execute-change-set-params');
diff --git a/test/unit/lib/plugins/aws/lib/monitorStack.test.js b/test/unit/lib/plugins/aws/lib/monitor-stack.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/lib/monitorStack.test.js
rename to test/unit/lib/plugins/aws/lib/monitor-stack.test.js
index ef16bfe2753..490ee3f3fdb 100644
--- a/test/unit/lib/plugins/aws/lib/monitorStack.test.js
+++ b/test/unit/lib/plugins/aws/lib/monitor-stack.test.js
@@ -5,7 +5,7 @@ const sinon = require('sinon');
 const Serverless = require('../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
 const CLI = require('../../../../../../lib/classes/cli');
-const monitorStack = require('../../../../../../lib/plugins/aws/lib/monitorStack');
+const monitorStack = require('../../../../../../lib/plugins/aws/lib/monitor-stack');
 
 chai.use(require('chai-as-promised'));
 

From 1b7d19b0d3156c6745abbf0fb9af4c6233a73c09 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:01:06 +0100
Subject: [PATCH 1028/1101] refactor: Rename
 `lib/plugins/aws/lib/setBucketName.js`

---
 lib/plugins/aws/deploy-list.js                                  | 2 +-
 lib/plugins/aws/deploy/index.js                                 | 2 +-
 lib/plugins/aws/lib/{setBucketName.js => set-bucket-name.js}    | 0
 lib/plugins/aws/rollback.js                                     | 2 +-
 .../aws/lib/{setBucketName.test.js => set-bucket-name.test.js}  | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/plugins/aws/lib/{setBucketName.js => set-bucket-name.js} (100%)
 rename test/unit/lib/plugins/aws/lib/{setBucketName.test.js => set-bucket-name.test.js} (100%)

diff --git a/lib/plugins/aws/deploy-list.js b/lib/plugins/aws/deploy-list.js
index b3d740950f4..ffc1be51679 100644
--- a/lib/plugins/aws/deploy-list.js
+++ b/lib/plugins/aws/deploy-list.js
@@ -3,7 +3,7 @@
 const { log, writeText } = require('@serverless/utils/log');
 const validate = require('./lib/validate');
 const findAndGroupDeployments = require('./utils/findAndGroupDeployments');
-const setBucketName = require('./lib/setBucketName');
+const setBucketName = require('./lib/set-bucket-name');
 
 class AwsDeployList {
   constructor(serverless, options) {
diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index c07588b0ac5..e6f416a0d3c 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -3,7 +3,7 @@
 const _ = require('lodash');
 const writeServiceOutputs = require('../../../cli/write-service-outputs');
 const extendedValidate = require('./lib/extendedValidate');
-const setBucketName = require('../lib/setBucketName');
+const setBucketName = require('../lib/set-bucket-name');
 const checkForChanges = require('./lib/checkForChanges');
 const monitorStack = require('../lib/monitor-stack');
 const checkIfBucketExists = require('../lib/check-if-bucket-exists');
diff --git a/lib/plugins/aws/lib/setBucketName.js b/lib/plugins/aws/lib/set-bucket-name.js
similarity index 100%
rename from lib/plugins/aws/lib/setBucketName.js
rename to lib/plugins/aws/lib/set-bucket-name.js
diff --git a/lib/plugins/aws/rollback.js b/lib/plugins/aws/rollback.js
index fe8c51912a4..0b007b64bc6 100644
--- a/lib/plugins/aws/rollback.js
+++ b/lib/plugins/aws/rollback.js
@@ -1,6 +1,6 @@
 'use strict';
 const validate = require('./lib/validate');
-const setBucketName = require('./lib/setBucketName');
+const setBucketName = require('./lib/set-bucket-name');
 const updateStack = require('./lib/updateStack');
 const monitorStack = require('./lib/monitor-stack');
 const waitForChangeSetCreation = require('./lib/wait-for-change-set-creation');
diff --git a/test/unit/lib/plugins/aws/lib/setBucketName.test.js b/test/unit/lib/plugins/aws/lib/set-bucket-name.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/lib/setBucketName.test.js
rename to test/unit/lib/plugins/aws/lib/set-bucket-name.test.js

From 44430c9b4b8b2bad3e539a0eea262e0e79c2a5f1 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:01:08 +0100
Subject: [PATCH 1029/1101] refactor: Rename
 `lib/plugins/aws/lib/normalizeFiles.js`

---
 lib/plugins/aws/deploy/lib/checkForChanges.js                   | 2 +-
 lib/plugins/aws/deploy/lib/uploadArtifacts.js                   | 2 +-
 lib/plugins/aws/lib/{normalizeFiles.js => normalize-files.js}   | 0
 test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js    | 2 +-
 test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js    | 2 +-
 .../aws/lib/{normalizeFiles.test.js => normalize-files.test.js} | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename lib/plugins/aws/lib/{normalizeFiles.js => normalize-files.js} (100%)
 rename test/unit/lib/plugins/aws/lib/{normalizeFiles.test.js => normalize-files.test.js} (99%)

diff --git a/lib/plugins/aws/deploy/lib/checkForChanges.js b/lib/plugins/aws/deploy/lib/checkForChanges.js
index 5ab30af9b06..a3dc20b546c 100644
--- a/lib/plugins/aws/deploy/lib/checkForChanges.js
+++ b/lib/plugins/aws/deploy/lib/checkForChanges.js
@@ -6,7 +6,7 @@ const crypto = require('crypto');
 const globby = require('globby');
 const BbPromise = require('bluebird');
 const _ = require('lodash');
-const normalizeFiles = require('../../lib/normalizeFiles');
+const normalizeFiles = require('../../lib/normalize-files');
 const ServerlessError = require('../../../../serverless-error');
 const { log } = require('@serverless/utils/log');
 
diff --git a/lib/plugins/aws/deploy/lib/uploadArtifacts.js b/lib/plugins/aws/deploy/lib/uploadArtifacts.js
index 2a3bfaf0c01..80819357bdc 100644
--- a/lib/plugins/aws/deploy/lib/uploadArtifacts.js
+++ b/lib/plugins/aws/deploy/lib/uploadArtifacts.js
@@ -7,7 +7,7 @@ const path = require('path');
 const crypto = require('crypto');
 const limit = require('ext/promise/limit').bind(Promise);
 const filesize = require('filesize');
-const normalizeFiles = require('../../lib/normalizeFiles');
+const normalizeFiles = require('../../lib/normalize-files');
 const getLambdaLayerArtifactPath = require('../../utils/getLambdaLayerArtifactPath');
 const ServerlessError = require('../../../../serverless-error');
 const { progress, log } = require('@serverless/utils/log');
diff --git a/lib/plugins/aws/lib/normalizeFiles.js b/lib/plugins/aws/lib/normalize-files.js
similarity index 100%
rename from lib/plugins/aws/lib/normalizeFiles.js
rename to lib/plugins/aws/lib/normalize-files.js
diff --git a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
index b3ff8ed3d17..931dfc5ebd7 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
@@ -9,7 +9,7 @@ const globby = require('globby');
 const sandbox = require('sinon');
 const chai = require('chai');
 const proxyquire = require('proxyquire');
-const normalizeFiles = require('../../../../../../../lib/plugins/aws/lib/normalizeFiles');
+const normalizeFiles = require('../../../../../../../lib/plugins/aws/lib/normalize-files');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 const AwsDeploy = require('../../../../../../../lib/plugins/aws/deploy/index');
 const Serverless = require('../../../../../../../lib/serverless');
diff --git a/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js b/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js
index 99a48e57ca4..f332a73556f 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js
@@ -8,7 +8,7 @@ const fse = require('fs-extra');
 const path = require('path');
 const chai = require('chai');
 const proxyquire = require('proxyquire');
-const normalizeFiles = require('../../../../../../../lib/plugins/aws/lib/normalizeFiles');
+const normalizeFiles = require('../../../../../../../lib/plugins/aws/lib/normalize-files');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 const AwsDeploy = require('../../../../../../../lib/plugins/aws/deploy/index');
 const Serverless = require('../../../../../../../lib/serverless');
diff --git a/test/unit/lib/plugins/aws/lib/normalizeFiles.test.js b/test/unit/lib/plugins/aws/lib/normalize-files.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/lib/normalizeFiles.test.js
rename to test/unit/lib/plugins/aws/lib/normalize-files.test.js
index 0d9ea475eec..cd3baaba6db 100644
--- a/test/unit/lib/plugins/aws/lib/normalizeFiles.test.js
+++ b/test/unit/lib/plugins/aws/lib/normalize-files.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const normalizeFiles = require('../../../../../../lib/plugins/aws/lib/normalizeFiles');
+const normalizeFiles = require('../../../../../../lib/plugins/aws/lib/normalize-files');
 
 describe('normalizeFiles', () => {
   describe('#normalizeCloudFormationTemplate()', () => {

From 5f604bb62d325f96a26f4275b3f9a19be7f3ddc6 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:01:09 +0100
Subject: [PATCH 1030/1101] refactor: Rename
 `lib/plugins/aws/lib/updateStack.js`

---
 lib/plugins/aws/deploy/index.js                         | 2 +-
 lib/plugins/aws/lib/{updateStack.js => update-stack.js} | 0
 lib/plugins/aws/rollback.js                             | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/plugins/aws/lib/{updateStack.js => update-stack.js} (100%)

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index e6f416a0d3c..db18bcab2cf 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -14,7 +14,7 @@ const createStack = require('./lib/createStack');
 const cleanupS3Bucket = require('./lib/cleanupS3Bucket');
 const uploadArtifacts = require('./lib/uploadArtifacts');
 const validateTemplate = require('./lib/validateTemplate');
-const updateStack = require('../lib/updateStack');
+const updateStack = require('../lib/update-stack');
 const ensureValidBucketExists = require('./lib/ensure-valid-bucket-exists');
 const path = require('path');
 const { style, log, progress, writeText } = require('@serverless/utils/log');
diff --git a/lib/plugins/aws/lib/updateStack.js b/lib/plugins/aws/lib/update-stack.js
similarity index 100%
rename from lib/plugins/aws/lib/updateStack.js
rename to lib/plugins/aws/lib/update-stack.js
diff --git a/lib/plugins/aws/rollback.js b/lib/plugins/aws/rollback.js
index 0b007b64bc6..7b7a6ecc309 100644
--- a/lib/plugins/aws/rollback.js
+++ b/lib/plugins/aws/rollback.js
@@ -1,7 +1,7 @@
 'use strict';
 const validate = require('./lib/validate');
 const setBucketName = require('./lib/set-bucket-name');
-const updateStack = require('./lib/updateStack');
+const updateStack = require('./lib/update-stack');
 const monitorStack = require('./lib/monitor-stack');
 const waitForChangeSetCreation = require('./lib/wait-for-change-set-creation');
 const getCreateChangeSetParams = require('./lib/get-create-change-set-params');

From 975450d4d7c5f831db000b12bf4da3b4379da93c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:01:10 +0100
Subject: [PATCH 1031/1101] refactor: Rename
 `lib/plugins/aws/utils/arnRegularExpressions.js`

---
 .../aws/package/compile/events/apiGateway/lib/authorizers.js    | 2 +-
 .../compile/events/apiGateway/lib/method/authorization.js       | 2 +-
 .../aws/package/compile/events/apiGateway/lib/permissions.js    | 2 +-
 .../aws/package/compile/events/apiGateway/lib/validate.js       | 2 +-
 .../{arnRegularExpressions.js => arn-regular-expressions.js}    | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename lib/plugins/aws/utils/{arnRegularExpressions.js => arn-regular-expressions.js} (100%)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.js
index c0406332886..8977dc3413d 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const awsArnRegExs = require('../../../../../utils/arnRegularExpressions');
+const awsArnRegExs = require('../../../../../utils/arn-regular-expressions');
 
 module.exports = {
   compileAuthorizers() {
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/method/authorization.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/method/authorization.js
index f6d102bcc05..debe4360997 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/method/authorization.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/method/authorization.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const awsArnRegExs = require('../../../../../../utils/arnRegularExpressions');
+const awsArnRegExs = require('../../../../../../utils/arn-regular-expressions');
 
 module.exports = {
   getMethodAuthorization(http) {
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.js
index 7e62e244be0..25ae063be15 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const awsArnRegExs = require('../../../../../utils/arnRegularExpressions');
+const awsArnRegExs = require('../../../../../utils/arn-regular-expressions');
 
 module.exports = {
   compilePermissions() {
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
index 0a1bbefc24a..dc4a2a5894c 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const awsArnRegExs = require('../../../../../utils/arnRegularExpressions');
+const awsArnRegExs = require('../../../../../utils/arn-regular-expressions');
 const resolveLambdaTarget = require('../../../../../utils/resolveLambdaTarget');
 const ServerlessError = require('../../../../../../../serverless-error');
 const { log } = require('@serverless/utils/log');
diff --git a/lib/plugins/aws/utils/arnRegularExpressions.js b/lib/plugins/aws/utils/arn-regular-expressions.js
similarity index 100%
rename from lib/plugins/aws/utils/arnRegularExpressions.js
rename to lib/plugins/aws/utils/arn-regular-expressions.js

From 8a2a56c90ca33d0be7a6536a99e3a82a6fb78ad8 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:01:13 +0100
Subject: [PATCH 1032/1101] refactor: Rename
 `lib/plugins/aws/utils/findAndGroupDeployments.js`

---
 lib/plugins/aws/deploy-list.js                                  | 2 +-
 lib/plugins/aws/deploy/lib/cleanupS3Bucket.js                   | 2 +-
 lib/plugins/aws/rollback.js                                     | 2 +-
 ...findAndGroupDeployments.js => find-and-group-deployments.js} | 0
 ...upDeployments.test.js => find-and-group-deployments.test.js} | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename lib/plugins/aws/utils/{findAndGroupDeployments.js => find-and-group-deployments.js} (100%)
 rename test/unit/lib/plugins/aws/utils/{findAndGroupDeployments.test.js => find-and-group-deployments.test.js} (98%)

diff --git a/lib/plugins/aws/deploy-list.js b/lib/plugins/aws/deploy-list.js
index ffc1be51679..3ac6899b691 100644
--- a/lib/plugins/aws/deploy-list.js
+++ b/lib/plugins/aws/deploy-list.js
@@ -2,7 +2,7 @@
 
 const { log, writeText } = require('@serverless/utils/log');
 const validate = require('./lib/validate');
-const findAndGroupDeployments = require('./utils/findAndGroupDeployments');
+const findAndGroupDeployments = require('./utils/find-and-group-deployments');
 const setBucketName = require('./lib/set-bucket-name');
 
 class AwsDeployList {
diff --git a/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js b/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
index 02bea0437d8..da47b4bf720 100644
--- a/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
+++ b/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const findAndGroupDeployments = require('../../utils/findAndGroupDeployments');
+const findAndGroupDeployments = require('../../utils/find-and-group-deployments');
 const getS3ObjectsFromStacks = require('../../utils/getS3ObjectsFromStacks');
 const { log } = require('@serverless/utils/log');
 
diff --git a/lib/plugins/aws/rollback.js b/lib/plugins/aws/rollback.js
index 7b7a6ecc309..53d5c2f99b3 100644
--- a/lib/plugins/aws/rollback.js
+++ b/lib/plugins/aws/rollback.js
@@ -6,7 +6,7 @@ const monitorStack = require('./lib/monitor-stack');
 const waitForChangeSetCreation = require('./lib/wait-for-change-set-creation');
 const getCreateChangeSetParams = require('./lib/get-create-change-set-params');
 const getExecuteChangeSetParams = require('./lib/get-execute-change-set-params');
-const findAndGroupDeployments = require('./utils/findAndGroupDeployments');
+const findAndGroupDeployments = require('./utils/find-and-group-deployments');
 const ServerlessError = require('../../serverless-error');
 const { style, log, progress } = require('@serverless/utils/log');
 
diff --git a/lib/plugins/aws/utils/findAndGroupDeployments.js b/lib/plugins/aws/utils/find-and-group-deployments.js
similarity index 100%
rename from lib/plugins/aws/utils/findAndGroupDeployments.js
rename to lib/plugins/aws/utils/find-and-group-deployments.js
diff --git a/test/unit/lib/plugins/aws/utils/findAndGroupDeployments.test.js b/test/unit/lib/plugins/aws/utils/find-and-group-deployments.test.js
similarity index 98%
rename from test/unit/lib/plugins/aws/utils/findAndGroupDeployments.test.js
rename to test/unit/lib/plugins/aws/utils/find-and-group-deployments.test.js
index 52e60f243a6..493fff36f81 100644
--- a/test/unit/lib/plugins/aws/utils/findAndGroupDeployments.test.js
+++ b/test/unit/lib/plugins/aws/utils/find-and-group-deployments.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const findAndGroupDeployments = require('../../../../../../lib/plugins/aws/utils/findAndGroupDeployments');
+const findAndGroupDeployments = require('../../../../../../lib/plugins/aws/utils/find-and-group-deployments');
 
 describe('#findAndGroupDeployments()', () => {
   it('should return an empty result in case no S3 objects are provided', () => {

From 945937b7c9dbc2c7e3a1566586876dd184d02b37 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:01:15 +0100
Subject: [PATCH 1033/1101] refactor: Rename
 `lib/plugins/aws/utils/findReferences.js`

---
 lib/plugins/aws/deploy/lib/extendedValidate.js                  | 2 +-
 lib/plugins/aws/package/lib/saveServiceState.js                 | 2 +-
 lib/plugins/aws/utils/{findReferences.js => find-references.js} | 0
 .../utils/{findReferences.test.js => find-references.test.js}   | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/plugins/aws/utils/{findReferences.js => find-references.js} (100%)
 rename test/unit/lib/plugins/aws/utils/{findReferences.test.js => find-references.test.js} (98%)

diff --git a/lib/plugins/aws/deploy/lib/extendedValidate.js b/lib/plugins/aws/deploy/lib/extendedValidate.js
index 98221e57f91..0cd56854418 100644
--- a/lib/plugins/aws/deploy/lib/extendedValidate.js
+++ b/lib/plugins/aws/deploy/lib/extendedValidate.js
@@ -2,7 +2,7 @@
 
 const path = require('path');
 const _ = require('lodash');
-const findReferences = require('../../utils/findReferences');
+const findReferences = require('../../utils/find-references');
 const ServerlessError = require('../../../../serverless-error');
 const { log } = require('@serverless/utils/log');
 
diff --git a/lib/plugins/aws/package/lib/saveServiceState.js b/lib/plugins/aws/package/lib/saveServiceState.js
index 754695682aa..7783f7dae3a 100644
--- a/lib/plugins/aws/package/lib/saveServiceState.js
+++ b/lib/plugins/aws/package/lib/saveServiceState.js
@@ -2,7 +2,7 @@
 
 const path = require('path');
 const _ = require('lodash');
-const findReferences = require('../../utils/findReferences');
+const findReferences = require('../../utils/find-references');
 
 module.exports = {
   saveServiceState() {
diff --git a/lib/plugins/aws/utils/findReferences.js b/lib/plugins/aws/utils/find-references.js
similarity index 100%
rename from lib/plugins/aws/utils/findReferences.js
rename to lib/plugins/aws/utils/find-references.js
diff --git a/test/unit/lib/plugins/aws/utils/findReferences.test.js b/test/unit/lib/plugins/aws/utils/find-references.test.js
similarity index 98%
rename from test/unit/lib/plugins/aws/utils/findReferences.test.js
rename to test/unit/lib/plugins/aws/utils/find-references.test.js
index 00d79d061cb..2711b3f6463 100644
--- a/test/unit/lib/plugins/aws/utils/findReferences.test.js
+++ b/test/unit/lib/plugins/aws/utils/find-references.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const findReferences = require('../../../../../../lib/plugins/aws/utils/findReferences');
+const findReferences = require('../../../../../../lib/plugins/aws/utils/find-references');
 
 describe('#findReferences()', () => {
   it('should succeed on invalid input', () => {

From d2f7d1985477ebc9ff804a64323d6e63915931f9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:01:17 +0100
Subject: [PATCH 1034/1101] refactor: Rename
 `lib/plugins/aws/utils/formatLambdaLogEvent.js`

---
 lib/plugins/aws/invoke.js                                       | 2 +-
 lib/plugins/aws/logs.js                                         | 2 +-
 .../{formatLambdaLogEvent.js => format-lambda-log-event.js}     | 0
 ...atLambdaLogEvent.test.js => format-lambda-log-event.test.js} | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/plugins/aws/utils/{formatLambdaLogEvent.js => format-lambda-log-event.js} (100%)
 rename test/unit/lib/plugins/aws/utils/{formatLambdaLogEvent.test.js => format-lambda-log-event.test.js} (98%)

diff --git a/lib/plugins/aws/invoke.js b/lib/plugins/aws/invoke.js
index a26efe8da89..43c86b2a5ff 100644
--- a/lib/plugins/aws/invoke.js
+++ b/lib/plugins/aws/invoke.js
@@ -3,7 +3,7 @@
 const path = require('path');
 const validate = require('./lib/validate');
 const stdin = require('get-stdin');
-const formatLambdaLogEvent = require('./utils/formatLambdaLogEvent');
+const formatLambdaLogEvent = require('./utils/format-lambda-log-event');
 const ServerlessError = require('../../serverless-error');
 const { writeText, style } = require('@serverless/utils/log');
 
diff --git a/lib/plugins/aws/logs.js b/lib/plugins/aws/logs.js
index 91133627ac8..bd56aacf56e 100644
--- a/lib/plugins/aws/logs.js
+++ b/lib/plugins/aws/logs.js
@@ -6,7 +6,7 @@ const utc = require('dayjs/plugin/utc');
 const wait = require('timers-ext/promise/sleep');
 const { writeText } = require('@serverless/utils/log');
 const validate = require('./lib/validate');
-const formatLambdaLogEvent = require('./utils/formatLambdaLogEvent');
+const formatLambdaLogEvent = require('./utils/format-lambda-log-event');
 const ServerlessError = require('../../serverless-error');
 
 dayjs.extend(utc);
diff --git a/lib/plugins/aws/utils/formatLambdaLogEvent.js b/lib/plugins/aws/utils/format-lambda-log-event.js
similarity index 100%
rename from lib/plugins/aws/utils/formatLambdaLogEvent.js
rename to lib/plugins/aws/utils/format-lambda-log-event.js
diff --git a/test/unit/lib/plugins/aws/utils/formatLambdaLogEvent.test.js b/test/unit/lib/plugins/aws/utils/format-lambda-log-event.test.js
similarity index 98%
rename from test/unit/lib/plugins/aws/utils/formatLambdaLogEvent.test.js
rename to test/unit/lib/plugins/aws/utils/format-lambda-log-event.test.js
index 7f260302426..c97d40132ae 100644
--- a/test/unit/lib/plugins/aws/utils/formatLambdaLogEvent.test.js
+++ b/test/unit/lib/plugins/aws/utils/format-lambda-log-event.test.js
@@ -3,7 +3,7 @@
 const expect = require('chai').expect;
 const dayjs = require('dayjs');
 const { style } = require('@serverless/utils/log');
-const formatLambdaLogEvent = require('../../../../../../lib/plugins/aws/utils/formatLambdaLogEvent');
+const formatLambdaLogEvent = require('../../../../../../lib/plugins/aws/utils/format-lambda-log-event');
 
 describe('#formatLambdaLogEvent()', () => {
   it('should format invocation report', () => {

From 6c6e3a6b233ad8d8da0fbf20adaa84e7cf5298fe Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:01:18 +0100
Subject: [PATCH 1035/1101] refactor: Rename
 `lib/plugins/aws/utils/getLambdaLayerArtifactPath.js`

---
 lib/plugins/aws/deploy/lib/uploadArtifacts.js                   | 2 +-
 lib/plugins/aws/package/compile/layers.js                       | 2 +-
 ...daLayerArtifactPath.js => get-lambda-layer-artifact-path.js} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/plugins/aws/utils/{getLambdaLayerArtifactPath.js => get-lambda-layer-artifact-path.js} (100%)

diff --git a/lib/plugins/aws/deploy/lib/uploadArtifacts.js b/lib/plugins/aws/deploy/lib/uploadArtifacts.js
index 80819357bdc..fa91e962169 100644
--- a/lib/plugins/aws/deploy/lib/uploadArtifacts.js
+++ b/lib/plugins/aws/deploy/lib/uploadArtifacts.js
@@ -8,7 +8,7 @@ const crypto = require('crypto');
 const limit = require('ext/promise/limit').bind(Promise);
 const filesize = require('filesize');
 const normalizeFiles = require('../../lib/normalize-files');
-const getLambdaLayerArtifactPath = require('../../utils/getLambdaLayerArtifactPath');
+const getLambdaLayerArtifactPath = require('../../utils/get-lambda-layer-artifact-path');
 const ServerlessError = require('../../../../serverless-error');
 const { progress, log } = require('@serverless/utils/log');
 
diff --git a/lib/plugins/aws/package/compile/layers.js b/lib/plugins/aws/package/compile/layers.js
index ae7e9683588..226cdb14427 100644
--- a/lib/plugins/aws/package/compile/layers.js
+++ b/lib/plugins/aws/package/compile/layers.js
@@ -5,7 +5,7 @@ const BbPromise = require('bluebird');
 const _ = require('lodash');
 const path = require('path');
 const fsAsync = BbPromise.promisifyAll(require('fs'));
-const getLambdaLayerArtifactPath = require('../../utils/getLambdaLayerArtifactPath');
+const getLambdaLayerArtifactPath = require('../../utils/get-lambda-layer-artifact-path');
 const { log } = require('@serverless/utils/log');
 
 class AwsCompileLayers {
diff --git a/lib/plugins/aws/utils/getLambdaLayerArtifactPath.js b/lib/plugins/aws/utils/get-lambda-layer-artifact-path.js
similarity index 100%
rename from lib/plugins/aws/utils/getLambdaLayerArtifactPath.js
rename to lib/plugins/aws/utils/get-lambda-layer-artifact-path.js

From 93c75896626023c61b0c423c54feb14c933dafa4 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:01:21 +0100
Subject: [PATCH 1036/1101] refactor: Rename
 `lib/plugins/aws/utils/getS3ObjectsFromStacks.js`

---
 lib/plugins/aws/deploy/lib/cleanupS3Bucket.js                   | 2 +-
 ...{getS3ObjectsFromStacks.js => get-s3-objects-from-stacks.js} | 0
 ...ctsFromStacks.test.js => get-s3-objects-from-stacks.test.js} | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/plugins/aws/utils/{getS3ObjectsFromStacks.js => get-s3-objects-from-stacks.js} (100%)
 rename test/unit/lib/plugins/aws/utils/{getS3ObjectsFromStacks.test.js => get-s3-objects-from-stacks.test.js} (97%)

diff --git a/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js b/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
index da47b4bf720..67a0e2dd869 100644
--- a/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
+++ b/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
@@ -2,7 +2,7 @@
 
 const _ = require('lodash');
 const findAndGroupDeployments = require('../../utils/find-and-group-deployments');
-const getS3ObjectsFromStacks = require('../../utils/getS3ObjectsFromStacks');
+const getS3ObjectsFromStacks = require('../../utils/get-s3-objects-from-stacks');
 const { log } = require('@serverless/utils/log');
 
 module.exports = {
diff --git a/lib/plugins/aws/utils/getS3ObjectsFromStacks.js b/lib/plugins/aws/utils/get-s3-objects-from-stacks.js
similarity index 100%
rename from lib/plugins/aws/utils/getS3ObjectsFromStacks.js
rename to lib/plugins/aws/utils/get-s3-objects-from-stacks.js
diff --git a/test/unit/lib/plugins/aws/utils/getS3ObjectsFromStacks.test.js b/test/unit/lib/plugins/aws/utils/get-s3-objects-from-stacks.test.js
similarity index 97%
rename from test/unit/lib/plugins/aws/utils/getS3ObjectsFromStacks.test.js
rename to test/unit/lib/plugins/aws/utils/get-s3-objects-from-stacks.test.js
index 6cf20f71ef6..dd04f628f5f 100644
--- a/test/unit/lib/plugins/aws/utils/getS3ObjectsFromStacks.test.js
+++ b/test/unit/lib/plugins/aws/utils/get-s3-objects-from-stacks.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const getS3ObjectsFromStacks = require('../../../../../../lib/plugins/aws/utils/getS3ObjectsFromStacks');
+const getS3ObjectsFromStacks = require('../../../../../../lib/plugins/aws/utils/get-s3-objects-from-stacks');
 
 describe('#getS3ObjectsFromStacks()', () => {
   it('should return an empty result in case no stacks are provided', () => {

From ecb4681a6173fa1f42d0fc5057d8c18ddc6690f1 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:01:23 +0100
Subject: [PATCH 1037/1101] refactor: Rename
 `lib/plugins/aws/utils/getS3EndpointForRegion.js`

---
 lib/plugins/aws/deploy/lib/validateTemplate.js                  | 2 +-
 lib/plugins/aws/lib/update-stack.js                             | 2 +-
 lib/plugins/aws/provider.js                                     | 2 +-
 ...{getS3EndpointForRegion.js => get-s3-endpoint-for-region.js} | 0
 ...ointForRegion.test.js => get-s3-endpoint-for-region.test.js} | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename lib/plugins/aws/utils/{getS3EndpointForRegion.js => get-s3-endpoint-for-region.js} (100%)
 rename test/unit/lib/plugins/aws/utils/{getS3EndpointForRegion.test.js => get-s3-endpoint-for-region.test.js} (96%)

diff --git a/lib/plugins/aws/deploy/lib/validateTemplate.js b/lib/plugins/aws/deploy/lib/validateTemplate.js
index 08bc6ca1219..405f4a9c49c 100644
--- a/lib/plugins/aws/deploy/lib/validateTemplate.js
+++ b/lib/plugins/aws/deploy/lib/validateTemplate.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const getS3EndpointForRegion = require('../../utils/getS3EndpointForRegion');
+const getS3EndpointForRegion = require('../../utils/get-s3-endpoint-for-region');
 const ServerlessError = require('../../../../serverless-error');
 
 module.exports = {
diff --git a/lib/plugins/aws/lib/update-stack.js b/lib/plugins/aws/lib/update-stack.js
index 2b1b8685f4f..68a5ecce60e 100644
--- a/lib/plugins/aws/lib/update-stack.js
+++ b/lib/plugins/aws/lib/update-stack.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const BbPromise = require('bluebird');
-const getS3EndpointForRegion = require('../utils/getS3EndpointForRegion');
+const getS3EndpointForRegion = require('../utils/get-s3-endpoint-for-region');
 const { log, progress } = require('@serverless/utils/log');
 const isChangeSetWithoutChanges = require('../utils/is-change-set-without-changes');
 
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 0e7ec508796..e9b6aac1050 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -5,7 +5,7 @@ const BbPromise = require('bluebird');
 const _ = require('lodash');
 const naming = require('./lib/naming.js');
 const fsp = require('fs').promises;
-const getS3EndpointForRegion = require('./utils/getS3EndpointForRegion');
+const getS3EndpointForRegion = require('./utils/get-s3-endpoint-for-region');
 const memoizeeMethods = require('memoizee/methods');
 const readline = require('readline');
 const { ALB_LISTENER_REGEXP } = require('./package/compile/events/alb/lib/validate');
diff --git a/lib/plugins/aws/utils/getS3EndpointForRegion.js b/lib/plugins/aws/utils/get-s3-endpoint-for-region.js
similarity index 100%
rename from lib/plugins/aws/utils/getS3EndpointForRegion.js
rename to lib/plugins/aws/utils/get-s3-endpoint-for-region.js
diff --git a/test/unit/lib/plugins/aws/utils/getS3EndpointForRegion.test.js b/test/unit/lib/plugins/aws/utils/get-s3-endpoint-for-region.test.js
similarity index 96%
rename from test/unit/lib/plugins/aws/utils/getS3EndpointForRegion.test.js
rename to test/unit/lib/plugins/aws/utils/get-s3-endpoint-for-region.test.js
index 0405e142570..84736a9aeb1 100644
--- a/test/unit/lib/plugins/aws/utils/getS3EndpointForRegion.test.js
+++ b/test/unit/lib/plugins/aws/utils/get-s3-endpoint-for-region.test.js
@@ -1,6 +1,6 @@
 'use strict';
 const expect = require('chai').expect;
-const getS3EndpointForRegion = require('../../../../../../lib/plugins/aws/utils/getS3EndpointForRegion');
+const getS3EndpointForRegion = require('../../../../../../lib/plugins/aws/utils/get-s3-endpoint-for-region');
 
 describe('getS3EndpointForRegion', () => {
   it('should return standard endpoint for us-east-1', () => {

From 7e5107cda9846756546d9709a5ce6617fa33e318 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:01:25 +0100
Subject: [PATCH 1038/1101] refactor: Rename
 `lib/plugins/aws/utils/resolveCfImportValue.js`

---
 lib/plugins/aws/info/get-stack-info.js                          | 2 +-
 lib/plugins/aws/invoke-local/index.js                           | 2 +-
 .../{resolveCfImportValue.js => resolve-cf-import-value.js}     | 0
 ...lveCfImportValue.test.js => resolve-cf-import-value.test.js} | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/plugins/aws/utils/{resolveCfImportValue.js => resolve-cf-import-value.js} (100%)
 rename test/unit/lib/plugins/aws/utils/{resolveCfImportValue.test.js => resolve-cf-import-value.test.js} (94%)

diff --git a/lib/plugins/aws/info/get-stack-info.js b/lib/plugins/aws/info/get-stack-info.js
index 8cdf9e57337..186e6005c0a 100644
--- a/lib/plugins/aws/info/get-stack-info.js
+++ b/lib/plugins/aws/info/get-stack-info.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const BbPromise = require('bluebird');
-const resolveCfImportValue = require('../utils/resolveCfImportValue');
+const resolveCfImportValue = require('../utils/resolve-cf-import-value');
 const ServerlessError = require('../../../serverless-error');
 
 module.exports = {
diff --git a/lib/plugins/aws/invoke-local/index.js b/lib/plugins/aws/invoke-local/index.js
index 97ce41fa366..559fc5274af 100644
--- a/lib/plugins/aws/invoke-local/index.js
+++ b/lib/plugins/aws/invoke-local/index.js
@@ -21,7 +21,7 @@ const dirExists = require('../../../utils/fs/dir-exists');
 const fileExists = require('../../../utils/fs/file-exists');
 const isStandalone = require('../../../utils/is-standalone-executable');
 const ensureArtifact = require('../../../utils/ensure-artifact');
-const resolveCfImportValue = require('../utils/resolveCfImportValue');
+const resolveCfImportValue = require('../utils/resolve-cf-import-value');
 const resolveCfRefValue = require('../utils/resolveCfRefValue');
 const { writeText, progress, log } = require('@serverless/utils/log');
 
diff --git a/lib/plugins/aws/utils/resolveCfImportValue.js b/lib/plugins/aws/utils/resolve-cf-import-value.js
similarity index 100%
rename from lib/plugins/aws/utils/resolveCfImportValue.js
rename to lib/plugins/aws/utils/resolve-cf-import-value.js
diff --git a/test/unit/lib/plugins/aws/utils/resolveCfImportValue.test.js b/test/unit/lib/plugins/aws/utils/resolve-cf-import-value.test.js
similarity index 94%
rename from test/unit/lib/plugins/aws/utils/resolveCfImportValue.test.js
rename to test/unit/lib/plugins/aws/utils/resolve-cf-import-value.test.js
index 0389c768286..eb87ca71acd 100644
--- a/test/unit/lib/plugins/aws/utils/resolveCfImportValue.test.js
+++ b/test/unit/lib/plugins/aws/utils/resolve-cf-import-value.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const BbPromise = require('bluebird');
-const resolveCfImportValue = require('../../../../../../lib/plugins/aws/utils/resolveCfImportValue');
+const resolveCfImportValue = require('../../../../../../lib/plugins/aws/utils/resolve-cf-import-value');
 
 describe('#resolveCfImportValue', () => {
   it('should return matching exported value if found', () => {

From 7ae35f2bc39e815e8b14e18bdf5a39002268bee8 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:01:27 +0100
Subject: [PATCH 1039/1101] refactor: Rename
 `lib/plugins/aws/utils/resolveCfRefValue.js`

---
 lib/plugins/aws/invoke-local/index.js                           | 2 +-
 .../aws/utils/{resolveCfRefValue.js => resolve-cf-ref-value.js} | 0
 .../{resolveCfRefValue.test.js => resolve-cf-ref-value.test.js} | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/plugins/aws/utils/{resolveCfRefValue.js => resolve-cf-ref-value.js} (100%)
 rename test/unit/lib/plugins/aws/utils/{resolveCfRefValue.test.js => resolve-cf-ref-value.test.js} (96%)

diff --git a/lib/plugins/aws/invoke-local/index.js b/lib/plugins/aws/invoke-local/index.js
index 559fc5274af..52c4f4aa947 100644
--- a/lib/plugins/aws/invoke-local/index.js
+++ b/lib/plugins/aws/invoke-local/index.js
@@ -22,7 +22,7 @@ const fileExists = require('../../../utils/fs/file-exists');
 const isStandalone = require('../../../utils/is-standalone-executable');
 const ensureArtifact = require('../../../utils/ensure-artifact');
 const resolveCfImportValue = require('../utils/resolve-cf-import-value');
-const resolveCfRefValue = require('../utils/resolveCfRefValue');
+const resolveCfRefValue = require('../utils/resolve-cf-ref-value');
 const { writeText, progress, log } = require('@serverless/utils/log');
 
 const cachePath = path.join(cachedir('serverless'), 'invokeLocal');
diff --git a/lib/plugins/aws/utils/resolveCfRefValue.js b/lib/plugins/aws/utils/resolve-cf-ref-value.js
similarity index 100%
rename from lib/plugins/aws/utils/resolveCfRefValue.js
rename to lib/plugins/aws/utils/resolve-cf-ref-value.js
diff --git a/test/unit/lib/plugins/aws/utils/resolveCfRefValue.test.js b/test/unit/lib/plugins/aws/utils/resolve-cf-ref-value.test.js
similarity index 96%
rename from test/unit/lib/plugins/aws/utils/resolveCfRefValue.test.js
rename to test/unit/lib/plugins/aws/utils/resolve-cf-ref-value.test.js
index 073f24c2764..c001af1dc64 100644
--- a/test/unit/lib/plugins/aws/utils/resolveCfRefValue.test.js
+++ b/test/unit/lib/plugins/aws/utils/resolve-cf-ref-value.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const BbPromise = require('bluebird');
-const resolveCfRefValue = require('../../../../../../lib/plugins/aws/utils/resolveCfRefValue');
+const resolveCfRefValue = require('../../../../../../lib/plugins/aws/utils/resolve-cf-ref-value');
 
 describe('#resolveCfRefValue', () => {
   it('should return matching exported value if found', () => {

From fd513050de087fba1a2548526532c549386c5184 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:01:29 +0100
Subject: [PATCH 1040/1101] refactor: Rename
 `lib/plugins/aws/utils/resolveLambdaTarget.js`

---
 lib/plugins/aws/package/compile/events/alb/lib/permissions.js   | 2 +-
 lib/plugins/aws/package/compile/events/alb/lib/targetGroups.js  | 2 +-
 .../aws/package/compile/events/apiGateway/lib/validate.js       | 2 +-
 lib/plugins/aws/package/compile/events/httpApi.js               | 2 +-
 lib/plugins/aws/package/compile/events/sqs.js                   | 2 +-
 lib/plugins/aws/package/compile/events/stream.js                | 2 +-
 .../utils/{resolveLambdaTarget.js => resolve-lambda-target.js}  | 0
 ...esolveLambdaTarget.test.js => resolve-lambda-target.test.js} | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename lib/plugins/aws/utils/{resolveLambdaTarget.js => resolve-lambda-target.js} (100%)
 rename test/unit/lib/plugins/aws/utils/{resolveLambdaTarget.test.js => resolve-lambda-target.test.js} (95%)

diff --git a/lib/plugins/aws/package/compile/events/alb/lib/permissions.js b/lib/plugins/aws/package/compile/events/alb/lib/permissions.js
index c823c306c76..9d98d0402d3 100644
--- a/lib/plugins/aws/package/compile/events/alb/lib/permissions.js
+++ b/lib/plugins/aws/package/compile/events/alb/lib/permissions.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const resolveLambdaTarget = require('../../../../../utils/resolveLambdaTarget');
+const resolveLambdaTarget = require('../../../../../utils/resolve-lambda-target');
 
 module.exports = {
   compilePermissions() {
diff --git a/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.js b/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.js
index 9fc9fda1aed..b5d295e088f 100644
--- a/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.js
+++ b/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const resolveLambdaTarget = require('../../../../../utils/resolveLambdaTarget');
+const resolveLambdaTarget = require('../../../../../utils/resolve-lambda-target');
 
 const healthCheckDefaults = {
   HealthCheckEnabled: false,
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
index dc4a2a5894c..a5ed5c3b92b 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
@@ -2,7 +2,7 @@
 
 const _ = require('lodash');
 const awsArnRegExs = require('../../../../../utils/arn-regular-expressions');
-const resolveLambdaTarget = require('../../../../../utils/resolveLambdaTarget');
+const resolveLambdaTarget = require('../../../../../utils/resolve-lambda-target');
 const ServerlessError = require('../../../../../../../serverless-error');
 const { log } = require('@serverless/utils/log');
 
diff --git a/lib/plugins/aws/package/compile/events/httpApi.js b/lib/plugins/aws/package/compile/events/httpApi.js
index 7b0f118565c..f6e631e2a43 100644
--- a/lib/plugins/aws/package/compile/events/httpApi.js
+++ b/lib/plugins/aws/package/compile/events/httpApi.js
@@ -6,7 +6,7 @@ const memoizee = require('memoizee');
 const memoizeeMethods = require('memoizee/methods');
 const { log } = require('@serverless/utils/log');
 const ServerlessError = require('../../../../../serverless-error');
-const resolveLambdaTarget = require('../../../utils/resolveLambdaTarget');
+const resolveLambdaTarget = require('../../../utils/resolve-lambda-target');
 
 const allowedMethods = new Set(['ANY', 'GET', 'POST', 'PUT', 'PATCH', 'OPTIONS', 'HEAD', 'DELETE']);
 const methodPattern = new RegExp(`^(?:\\*|${Array.from(allowedMethods).join('|')})$`, 'i');
diff --git a/lib/plugins/aws/package/compile/events/sqs.js b/lib/plugins/aws/package/compile/events/sqs.js
index 4461fcda788..4048630d899 100644
--- a/lib/plugins/aws/package/compile/events/sqs.js
+++ b/lib/plugins/aws/package/compile/events/sqs.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const resolveLambdaTarget = require('../../../utils/resolveLambdaTarget');
+const resolveLambdaTarget = require('../../../utils/resolve-lambda-target');
 
 class AwsCompileSQSEvents {
   constructor(serverless) {
diff --git a/lib/plugins/aws/package/compile/events/stream.js b/lib/plugins/aws/package/compile/events/stream.js
index 191cb9f3f9b..876b4b700b8 100644
--- a/lib/plugins/aws/package/compile/events/stream.js
+++ b/lib/plugins/aws/package/compile/events/stream.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const resolveLambdaTarget = require('../../../utils/resolveLambdaTarget');
+const resolveLambdaTarget = require('../../../utils/resolve-lambda-target');
 
 class AwsCompileStreamEvents {
   constructor(serverless) {
diff --git a/lib/plugins/aws/utils/resolveLambdaTarget.js b/lib/plugins/aws/utils/resolve-lambda-target.js
similarity index 100%
rename from lib/plugins/aws/utils/resolveLambdaTarget.js
rename to lib/plugins/aws/utils/resolve-lambda-target.js
diff --git a/test/unit/lib/plugins/aws/utils/resolveLambdaTarget.test.js b/test/unit/lib/plugins/aws/utils/resolve-lambda-target.test.js
similarity index 95%
rename from test/unit/lib/plugins/aws/utils/resolveLambdaTarget.test.js
rename to test/unit/lib/plugins/aws/utils/resolve-lambda-target.test.js
index 3342089e0ab..ec78d053cbf 100644
--- a/test/unit/lib/plugins/aws/utils/resolveLambdaTarget.test.js
+++ b/test/unit/lib/plugins/aws/utils/resolve-lambda-target.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const resolveLambdaTarget = require('../../../../../../lib/plugins/aws/utils/resolveLambdaTarget');
+const resolveLambdaTarget = require('../../../../../../lib/plugins/aws/utils/resolve-lambda-target');
 
 describe('#resolveLambdaTarget', () => {
   it('should return a reference to Lambda Arn when provisionnedConcurrency is not set', () => {

From 115dfcd4bcadc8b847ecf8784952e6c07355ebcc Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:01:32 +0100
Subject: [PATCH 1041/1101] refactor: Rename
 `lib/plugins/package/lib/packageService.js`

---
 .../package/lib/{packageService.js => package-service.js}       | 0
 lib/plugins/package/package.js                                  | 2 +-
 .../lib/{packageService.test.js => package-service.test.js}     | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/package/lib/{packageService.js => package-service.js} (100%)
 rename test/unit/lib/plugins/package/lib/{packageService.test.js => package-service.test.js} (100%)

diff --git a/lib/plugins/package/lib/packageService.js b/lib/plugins/package/lib/package-service.js
similarity index 100%
rename from lib/plugins/package/lib/packageService.js
rename to lib/plugins/package/lib/package-service.js
diff --git a/lib/plugins/package/package.js b/lib/plugins/package/package.js
index 6352ec60312..e77a2a2da7b 100644
--- a/lib/plugins/package/package.js
+++ b/lib/plugins/package/package.js
@@ -5,7 +5,7 @@ const path = require('path');
 const ServerlessError = require('../../serverless-error');
 const cliCommandsSchema = require('../../cli/commands-schema');
 const zipService = require('./lib/zipService');
-const packageService = require('./lib/packageService');
+const packageService = require('./lib/package-service');
 
 class Package {
   constructor(serverless, options) {
diff --git a/test/unit/lib/plugins/package/lib/packageService.test.js b/test/unit/lib/plugins/package/lib/package-service.test.js
similarity index 100%
rename from test/unit/lib/plugins/package/lib/packageService.test.js
rename to test/unit/lib/plugins/package/lib/package-service.test.js

From 7624d8b0ca75fe84e3007f8598183c3e93c1f852 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:01:34 +0100
Subject: [PATCH 1042/1101] refactor: Rename
 `lib/plugins/package/lib/zipService.js`

---
 lib/plugins/package/lib/{zipService.js => zip-service.js}       | 0
 lib/plugins/package/package.js                                  | 2 +-
 .../package/lib/{zipService.test.js => zip-service.test.js}     | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/package/lib/{zipService.js => zip-service.js} (100%)
 rename test/unit/lib/plugins/package/lib/{zipService.test.js => zip-service.test.js} (100%)

diff --git a/lib/plugins/package/lib/zipService.js b/lib/plugins/package/lib/zip-service.js
similarity index 100%
rename from lib/plugins/package/lib/zipService.js
rename to lib/plugins/package/lib/zip-service.js
diff --git a/lib/plugins/package/package.js b/lib/plugins/package/package.js
index e77a2a2da7b..ca14258cc5d 100644
--- a/lib/plugins/package/package.js
+++ b/lib/plugins/package/package.js
@@ -4,7 +4,7 @@ const BbPromise = require('bluebird');
 const path = require('path');
 const ServerlessError = require('../../serverless-error');
 const cliCommandsSchema = require('../../cli/commands-schema');
-const zipService = require('./lib/zipService');
+const zipService = require('./lib/zip-service');
 const packageService = require('./lib/package-service');
 
 class Package {
diff --git a/test/unit/lib/plugins/package/lib/zipService.test.js b/test/unit/lib/plugins/package/lib/zip-service.test.js
similarity index 100%
rename from test/unit/lib/plugins/package/lib/zipService.test.js
rename to test/unit/lib/plugins/package/lib/zip-service.test.js

From a18199f6c6e679d7205c4f0faddc9ecb82ccf5f9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:01:36 +0100
Subject: [PATCH 1043/1101] refactor: Rename
 `lib/plugins/aws/common/lib/cleanupTempDir.js`

---
 lib/plugins/aws/common/index.js                                 | 2 +-
 .../aws/common/lib/{cleanupTempDir.js => cleanup-temp-dir.js}   | 0
 .../lib/{cleanupTempDir.test.js => cleanup-temp-dir.test.js}    | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/common/lib/{cleanupTempDir.js => cleanup-temp-dir.js} (100%)
 rename test/unit/lib/plugins/aws/common/lib/{cleanupTempDir.test.js => cleanup-temp-dir.test.js} (100%)

diff --git a/lib/plugins/aws/common/index.js b/lib/plugins/aws/common/index.js
index 53ed1d805cc..927c7f6eab9 100644
--- a/lib/plugins/aws/common/index.js
+++ b/lib/plugins/aws/common/index.js
@@ -7,7 +7,7 @@
  */
 
 const validate = require('../lib/validate');
-const cleanupTempDir = require('./lib/cleanupTempDir');
+const cleanupTempDir = require('./lib/cleanup-temp-dir');
 const artifacts = require('./lib/artifacts');
 
 class AwsCommon {
diff --git a/lib/plugins/aws/common/lib/cleanupTempDir.js b/lib/plugins/aws/common/lib/cleanup-temp-dir.js
similarity index 100%
rename from lib/plugins/aws/common/lib/cleanupTempDir.js
rename to lib/plugins/aws/common/lib/cleanup-temp-dir.js
diff --git a/test/unit/lib/plugins/aws/common/lib/cleanupTempDir.test.js b/test/unit/lib/plugins/aws/common/lib/cleanup-temp-dir.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/common/lib/cleanupTempDir.test.js
rename to test/unit/lib/plugins/aws/common/lib/cleanup-temp-dir.test.js

From 892e50cfaaa25eb4a1ff5ba661257577709e46eb Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:24:05 +0100
Subject: [PATCH 1044/1101] refactor: Rename
 `lib/plugins/aws/deploy/lib/checkForChanges.js`

---
 lib/plugins/aws/deploy/index.js                                 | 2 +-
 .../aws/deploy/lib/{checkForChanges.js => check-for-changes.js} | 0
 .../lib/{checkForChanges.test.js => check-for-changes.test.js}  | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/plugins/aws/deploy/lib/{checkForChanges.js => check-for-changes.js} (100%)
 rename test/unit/lib/plugins/aws/deploy/lib/{checkForChanges.test.js => check-for-changes.test.js} (99%)

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index db18bcab2cf..03247de3f2a 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -4,7 +4,7 @@ const _ = require('lodash');
 const writeServiceOutputs = require('../../../cli/write-service-outputs');
 const extendedValidate = require('./lib/extendedValidate');
 const setBucketName = require('../lib/set-bucket-name');
-const checkForChanges = require('./lib/checkForChanges');
+const checkForChanges = require('./lib/check-for-changes');
 const monitorStack = require('../lib/monitor-stack');
 const checkIfBucketExists = require('../lib/check-if-bucket-exists');
 const getCreateChangeSetParams = require('../lib/get-create-change-set-params');
diff --git a/lib/plugins/aws/deploy/lib/checkForChanges.js b/lib/plugins/aws/deploy/lib/check-for-changes.js
similarity index 100%
rename from lib/plugins/aws/deploy/lib/checkForChanges.js
rename to lib/plugins/aws/deploy/lib/check-for-changes.js
diff --git a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js b/test/unit/lib/plugins/aws/deploy/lib/check-for-changes.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
rename to test/unit/lib/plugins/aws/deploy/lib/check-for-changes.test.js
index 931dfc5ebd7..34ace24e1b7 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/check-for-changes.test.js
@@ -54,7 +54,7 @@ describe('checkForChanges', () => {
       digest: sandbox.stub(),
     };
     const checkForChanges = proxyquire(
-      '../../../../../../../lib/plugins/aws/deploy/lib/checkForChanges.js',
+      '../../../../../../../lib/plugins/aws/deploy/lib/check-for-changes.js',
       {
         crypto: cryptoStub,
       }

From 48fbaedd1b5f947ff2b22b6ff065c4304b563fb9 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:24:07 +0100
Subject: [PATCH 1045/1101] refactor: Rename
 `lib/plugins/aws/deploy/lib/createStack.js`

---
 lib/plugins/aws/deploy/index.js                                | 2 +-
 lib/plugins/aws/deploy/lib/{createStack.js => create-stack.js} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/deploy/lib/{createStack.js => create-stack.js} (100%)

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index 03247de3f2a..c66c84d6faa 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -10,7 +10,7 @@ const checkIfBucketExists = require('../lib/check-if-bucket-exists');
 const getCreateChangeSetParams = require('../lib/get-create-change-set-params');
 const getExecuteChangeSetParams = require('../lib/get-execute-change-set-params');
 const waitForChangeSetCreation = require('../lib/wait-for-change-set-creation');
-const createStack = require('./lib/createStack');
+const createStack = require('./lib/create-stack');
 const cleanupS3Bucket = require('./lib/cleanupS3Bucket');
 const uploadArtifacts = require('./lib/uploadArtifacts');
 const validateTemplate = require('./lib/validateTemplate');
diff --git a/lib/plugins/aws/deploy/lib/createStack.js b/lib/plugins/aws/deploy/lib/create-stack.js
similarity index 100%
rename from lib/plugins/aws/deploy/lib/createStack.js
rename to lib/plugins/aws/deploy/lib/create-stack.js

From c3e42d6c57f48c5d1cee553227283d0be14b377d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:24:09 +0100
Subject: [PATCH 1046/1101] refactor: Rename
 `lib/plugins/aws/deploy/lib/cleanupS3Bucket.js`

---
 lib/plugins/aws/deploy/index.js                                 | 2 +-
 .../aws/deploy/lib/{cleanupS3Bucket.js => cleanup-s3-bucket.js} | 0
 .../lib/{cleanupS3Bucket.test.js => cleanup-s3-bucket.test.js}  | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/deploy/lib/{cleanupS3Bucket.js => cleanup-s3-bucket.js} (100%)
 rename test/unit/lib/plugins/aws/deploy/lib/{cleanupS3Bucket.test.js => cleanup-s3-bucket.test.js} (100%)

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index c66c84d6faa..e927a88cd39 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -11,7 +11,7 @@ const getCreateChangeSetParams = require('../lib/get-create-change-set-params');
 const getExecuteChangeSetParams = require('../lib/get-execute-change-set-params');
 const waitForChangeSetCreation = require('../lib/wait-for-change-set-creation');
 const createStack = require('./lib/create-stack');
-const cleanupS3Bucket = require('./lib/cleanupS3Bucket');
+const cleanupS3Bucket = require('./lib/cleanup-s3-bucket');
 const uploadArtifacts = require('./lib/uploadArtifacts');
 const validateTemplate = require('./lib/validateTemplate');
 const updateStack = require('../lib/update-stack');
diff --git a/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js b/lib/plugins/aws/deploy/lib/cleanup-s3-bucket.js
similarity index 100%
rename from lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
rename to lib/plugins/aws/deploy/lib/cleanup-s3-bucket.js
diff --git a/test/unit/lib/plugins/aws/deploy/lib/cleanupS3Bucket.test.js b/test/unit/lib/plugins/aws/deploy/lib/cleanup-s3-bucket.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/deploy/lib/cleanupS3Bucket.test.js
rename to test/unit/lib/plugins/aws/deploy/lib/cleanup-s3-bucket.test.js

From ae7bfcfa3f1c12de012043026e76174f2b25e7af Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:24:12 +0100
Subject: [PATCH 1047/1101] refactor: Rename
 `lib/plugins/aws/deploy/lib/extendedValidate.js`

---
 lib/plugins/aws/deploy/index.js                                 | 2 +-
 .../deploy/lib/{extendedValidate.js => extended-validate.js}    | 0
 .../lib/{extendedValidate.test.js => extended-validate.test.js} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/deploy/lib/{extendedValidate.js => extended-validate.js} (100%)
 rename test/unit/lib/plugins/aws/deploy/lib/{extendedValidate.test.js => extended-validate.test.js} (100%)

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index e927a88cd39..1a6cad5d552 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -2,7 +2,7 @@
 
 const _ = require('lodash');
 const writeServiceOutputs = require('../../../cli/write-service-outputs');
-const extendedValidate = require('./lib/extendedValidate');
+const extendedValidate = require('./lib/extended-validate');
 const setBucketName = require('../lib/set-bucket-name');
 const checkForChanges = require('./lib/check-for-changes');
 const monitorStack = require('../lib/monitor-stack');
diff --git a/lib/plugins/aws/deploy/lib/extendedValidate.js b/lib/plugins/aws/deploy/lib/extended-validate.js
similarity index 100%
rename from lib/plugins/aws/deploy/lib/extendedValidate.js
rename to lib/plugins/aws/deploy/lib/extended-validate.js
diff --git a/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js b/test/unit/lib/plugins/aws/deploy/lib/extended-validate.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
rename to test/unit/lib/plugins/aws/deploy/lib/extended-validate.test.js

From d1b72ebd197008205d4236ac9d79df7c95bef399 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:24:14 +0100
Subject: [PATCH 1048/1101] refactor: Rename
 `lib/plugins/aws/deploy/lib/validateTemplate.js`

---
 lib/plugins/aws/deploy/index.js                                 | 2 +-
 .../deploy/lib/{validateTemplate.js => validate-template.js}    | 0
 .../lib/{validateTemplate.test.js => validate-template.test.js} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/deploy/lib/{validateTemplate.js => validate-template.js} (100%)
 rename test/unit/lib/plugins/aws/deploy/lib/{validateTemplate.test.js => validate-template.test.js} (100%)

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index 1a6cad5d552..90704cd94f7 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -13,7 +13,7 @@ const waitForChangeSetCreation = require('../lib/wait-for-change-set-creation');
 const createStack = require('./lib/create-stack');
 const cleanupS3Bucket = require('./lib/cleanup-s3-bucket');
 const uploadArtifacts = require('./lib/uploadArtifacts');
-const validateTemplate = require('./lib/validateTemplate');
+const validateTemplate = require('./lib/validate-template');
 const updateStack = require('../lib/update-stack');
 const ensureValidBucketExists = require('./lib/ensure-valid-bucket-exists');
 const path = require('path');
diff --git a/lib/plugins/aws/deploy/lib/validateTemplate.js b/lib/plugins/aws/deploy/lib/validate-template.js
similarity index 100%
rename from lib/plugins/aws/deploy/lib/validateTemplate.js
rename to lib/plugins/aws/deploy/lib/validate-template.js
diff --git a/test/unit/lib/plugins/aws/deploy/lib/validateTemplate.test.js b/test/unit/lib/plugins/aws/deploy/lib/validate-template.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/deploy/lib/validateTemplate.test.js
rename to test/unit/lib/plugins/aws/deploy/lib/validate-template.test.js

From 9c8bca0adf2bafdd7a7e41fd08c0ef4149e01f1e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:24:16 +0100
Subject: [PATCH 1049/1101] refactor: Rename
 `lib/plugins/aws/deploy/lib/uploadArtifacts.js`

---
 lib/plugins/aws/deploy/index.js                                 | 2 +-
 .../aws/deploy/lib/{uploadArtifacts.js => upload-artifacts.js}  | 0
 .../lib/{uploadArtifacts.test.js => upload-artifacts.test.js}   | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/plugins/aws/deploy/lib/{uploadArtifacts.js => upload-artifacts.js} (100%)
 rename test/unit/lib/plugins/aws/deploy/lib/{uploadArtifacts.test.js => upload-artifacts.test.js} (99%)

diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index 90704cd94f7..d0b0eaf2f5e 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -12,7 +12,7 @@ const getExecuteChangeSetParams = require('../lib/get-execute-change-set-params'
 const waitForChangeSetCreation = require('../lib/wait-for-change-set-creation');
 const createStack = require('./lib/create-stack');
 const cleanupS3Bucket = require('./lib/cleanup-s3-bucket');
-const uploadArtifacts = require('./lib/uploadArtifacts');
+const uploadArtifacts = require('./lib/upload-artifacts');
 const validateTemplate = require('./lib/validate-template');
 const updateStack = require('../lib/update-stack');
 const ensureValidBucketExists = require('./lib/ensure-valid-bucket-exists');
diff --git a/lib/plugins/aws/deploy/lib/uploadArtifacts.js b/lib/plugins/aws/deploy/lib/upload-artifacts.js
similarity index 100%
rename from lib/plugins/aws/deploy/lib/uploadArtifacts.js
rename to lib/plugins/aws/deploy/lib/upload-artifacts.js
diff --git a/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js b/test/unit/lib/plugins/aws/deploy/lib/upload-artifacts.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js
rename to test/unit/lib/plugins/aws/deploy/lib/upload-artifacts.test.js
index f332a73556f..549df306bab 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/upload-artifacts.test.js
@@ -54,7 +54,7 @@ describe('uploadArtifacts', () => {
       digest: sinon.stub(),
     };
     const uploadArtifacts = proxyquire(
-      '../../../../../../../lib/plugins/aws/deploy/lib/uploadArtifacts.js',
+      '../../../../../../../lib/plugins/aws/deploy/lib/upload-artifacts.js',
       {
         crypto: cryptoStub,
       }

From 971c5d355bd97f35126794efaf0c9f2595b8202d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:24:18 +0100
Subject: [PATCH 1050/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6b/plug?=
 =?UTF-8?q?ins/aws/package/lib/addExportNameForOutputs.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugins/aws/package/index.js                                | 2 +-
 ...ddExportNameForOutputs.js => add-export-name-for-outputs.js} | 0
 ...meForOutputs.test.js => add-export-name-for-outputs.test.js} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/package/lib/{addExportNameForOutputs.js => add-export-name-for-outputs.js} (100%)
 rename test/unit/lib/plugins/aws/package/lib/{addExportNameForOutputs.test.js => add-export-name-for-outputs.test.js} (100%)

diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
index 4f703fe05ca..b52c9c1a80c 100644
--- a/lib/plugins/aws/package/index.js
+++ b/lib/plugins/aws/package/index.js
@@ -8,7 +8,7 @@ const generateCoreTemplate = require('./lib/generateCoreTemplate');
 const saveServiceState = require('./lib/saveServiceState');
 const saveCompiledTemplate = require('./lib/saveCompiledTemplate');
 const mergeIamTemplates = require('./lib/mergeIamTemplates');
-const addExportNameForOutputs = require('./lib/addExportNameForOutputs');
+const addExportNameForOutputs = require('./lib/add-export-name-for-outputs');
 const { log, style, progress } = require('@serverless/utils/log');
 
 const mainProgress = progress.get('main');
diff --git a/lib/plugins/aws/package/lib/addExportNameForOutputs.js b/lib/plugins/aws/package/lib/add-export-name-for-outputs.js
similarity index 100%
rename from lib/plugins/aws/package/lib/addExportNameForOutputs.js
rename to lib/plugins/aws/package/lib/add-export-name-for-outputs.js
diff --git a/test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js b/test/unit/lib/plugins/aws/package/lib/add-export-name-for-outputs.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js
rename to test/unit/lib/plugins/aws/package/lib/add-export-name-for-outputs.test.js

From ecd0d5da2ae6085358fbeb1c156bfa8ce33f95e6 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:24:21 +0100
Subject: [PATCH 1051/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6ins/aw?=
 =?UTF-8?q?s/package/lib/generateArtifactDirectoryName.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugins/aws/package/index.js                                | 2 +-
 ...factDirectoryName.js => generate-artifact-directory-name.js} | 0
 ...oryName.test.js => generate-artifact-directory-name.test.js} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/package/lib/{generateArtifactDirectoryName.js => generate-artifact-directory-name.js} (100%)
 rename test/unit/lib/plugins/aws/package/lib/{generateArtifactDirectoryName.test.js => generate-artifact-directory-name.test.js} (100%)

diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
index b52c9c1a80c..0076ba649ef 100644
--- a/lib/plugins/aws/package/index.js
+++ b/lib/plugins/aws/package/index.js
@@ -3,7 +3,7 @@
 const path = require('path');
 const mergeCustomProviderResources = require('./lib/mergeCustomProviderResources');
 const stripNullPropsFromTemplateResources = require('./lib/stripNullPropsFromTemplateResources');
-const generateArtifactDirectoryName = require('./lib/generateArtifactDirectoryName');
+const generateArtifactDirectoryName = require('./lib/generate-artifact-directory-name');
 const generateCoreTemplate = require('./lib/generateCoreTemplate');
 const saveServiceState = require('./lib/saveServiceState');
 const saveCompiledTemplate = require('./lib/saveCompiledTemplate');
diff --git a/lib/plugins/aws/package/lib/generateArtifactDirectoryName.js b/lib/plugins/aws/package/lib/generate-artifact-directory-name.js
similarity index 100%
rename from lib/plugins/aws/package/lib/generateArtifactDirectoryName.js
rename to lib/plugins/aws/package/lib/generate-artifact-directory-name.js
diff --git a/test/unit/lib/plugins/aws/package/lib/generateArtifactDirectoryName.test.js b/test/unit/lib/plugins/aws/package/lib/generate-artifact-directory-name.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/lib/generateArtifactDirectoryName.test.js
rename to test/unit/lib/plugins/aws/package/lib/generate-artifact-directory-name.test.js

From c1cc41f27211eef0a81ad2ed6d3241ac4e9462ec Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:24:23 +0100
Subject: [PATCH 1052/1101] refactor: Rename
 `lib/plugins/aws/package/lib/generateCoreTemplate.js`

---
 lib/plugins/aws/package/index.js                                | 2 +-
 .../lib/{generateCoreTemplate.js => generate-core-template.js}  | 0
 ...erateCoreTemplate.test.js => generate-core-template.test.js} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/package/lib/{generateCoreTemplate.js => generate-core-template.js} (100%)
 rename test/unit/lib/plugins/aws/package/lib/{generateCoreTemplate.test.js => generate-core-template.test.js} (100%)

diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
index 0076ba649ef..d345e972865 100644
--- a/lib/plugins/aws/package/index.js
+++ b/lib/plugins/aws/package/index.js
@@ -4,7 +4,7 @@ const path = require('path');
 const mergeCustomProviderResources = require('./lib/mergeCustomProviderResources');
 const stripNullPropsFromTemplateResources = require('./lib/stripNullPropsFromTemplateResources');
 const generateArtifactDirectoryName = require('./lib/generate-artifact-directory-name');
-const generateCoreTemplate = require('./lib/generateCoreTemplate');
+const generateCoreTemplate = require('./lib/generate-core-template');
 const saveServiceState = require('./lib/saveServiceState');
 const saveCompiledTemplate = require('./lib/saveCompiledTemplate');
 const mergeIamTemplates = require('./lib/mergeIamTemplates');
diff --git a/lib/plugins/aws/package/lib/generateCoreTemplate.js b/lib/plugins/aws/package/lib/generate-core-template.js
similarity index 100%
rename from lib/plugins/aws/package/lib/generateCoreTemplate.js
rename to lib/plugins/aws/package/lib/generate-core-template.js
diff --git a/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js b/test/unit/lib/plugins/aws/package/lib/generate-core-template.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js
rename to test/unit/lib/plugins/aws/package/lib/generate-core-template.test.js

From fbb2e71cab079337bf724cf2c02723019f838c7c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:24:25 +0100
Subject: [PATCH 1053/1101] refactor: Rename
 `lib/plugins/aws/package/lib/getHashForFilePath.js`

---
 lib/plugins/aws/package/compile/functions.js                    | 2 +-
 .../lib/{getHashForFilePath.js => get-hash-for-file-path.js}    | 0
 test/unit/lib/plugins/aws/package/compile/functions.test.js     | 2 +-
 ...etHashForFilePath.test.js => get-hash-for-file-path.test.js} | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/plugins/aws/package/lib/{getHashForFilePath.js => get-hash-for-file-path.js} (100%)
 rename test/unit/lib/plugins/aws/package/lib/{getHashForFilePath.test.js => get-hash-for-file-path.test.js} (94%)

diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index 8d3573e8b5c..757cc76c23d 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -8,7 +8,7 @@ const _ = require('lodash');
 const path = require('path');
 const ServerlessError = require('../../../../serverless-error');
 const deepSortObjectByKey = require('../../../../utils/deep-sort-object-by-key');
-const getHashForFilePath = require('../lib/getHashForFilePath');
+const getHashForFilePath = require('../lib/get-hash-for-file-path');
 const parseS3URI = require('../../utils/parse-s3-uri');
 const { log } = require('@serverless/utils/log');
 
diff --git a/lib/plugins/aws/package/lib/getHashForFilePath.js b/lib/plugins/aws/package/lib/get-hash-for-file-path.js
similarity index 100%
rename from lib/plugins/aws/package/lib/getHashForFilePath.js
rename to lib/plugins/aws/package/lib/get-hash-for-file-path.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
index 59f21460249..1377df9c659 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -12,7 +12,7 @@ const AwsCompileFunctions = require('../../../../../../../lib/plugins/aws/packag
 const Serverless = require('../../../../../../../lib/serverless');
 const runServerless = require('../../../../../../utils/run-serverless');
 const fixtures = require('../../../../../../fixtures/programmatic');
-const getHashForFilePath = require('../../../../../../../lib/plugins/aws/package/lib/getHashForFilePath');
+const getHashForFilePath = require('../../../../../../../lib/plugins/aws/package/lib/get-hash-for-file-path');
 
 const { getTmpDirPath, createTmpFile } = require('../../../../../../utils/fs');
 
diff --git a/test/unit/lib/plugins/aws/package/lib/getHashForFilePath.test.js b/test/unit/lib/plugins/aws/package/lib/get-hash-for-file-path.test.js
similarity index 94%
rename from test/unit/lib/plugins/aws/package/lib/getHashForFilePath.test.js
rename to test/unit/lib/plugins/aws/package/lib/get-hash-for-file-path.test.js
index cabb160c998..3bf62e74ba5 100644
--- a/test/unit/lib/plugins/aws/package/lib/getHashForFilePath.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/get-hash-for-file-path.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const chai = require('chai');
-const getHashForFilePath = require('../../../../../../../lib/plugins/aws/package/lib/getHashForFilePath');
+const getHashForFilePath = require('../../../../../../../lib/plugins/aws/package/lib/get-hash-for-file-path');
 const fsp = require('fs').promises;
 const path = require('path');
 

From 2e6c2941eae3dd438ed88e08945fb7a4046f193f Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:24:27 +0100
Subject: [PATCH 1054/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6gins/a?=
 =?UTF-8?q?ws/package/lib/mergeCustomProviderResources.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugins/aws/package/index.js                                | 2 +-
 ...mProviderResources.js => merge-custom-provider-resources.js} | 0
 ...esources.test.js => merge-custom-provider-resources.test.js} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/package/lib/{mergeCustomProviderResources.js => merge-custom-provider-resources.js} (100%)
 rename test/unit/lib/plugins/aws/package/lib/{mergeCustomProviderResources.test.js => merge-custom-provider-resources.test.js} (100%)

diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
index d345e972865..7be68b21c11 100644
--- a/lib/plugins/aws/package/index.js
+++ b/lib/plugins/aws/package/index.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const mergeCustomProviderResources = require('./lib/mergeCustomProviderResources');
+const mergeCustomProviderResources = require('./lib/merge-custom-provider-resources');
 const stripNullPropsFromTemplateResources = require('./lib/stripNullPropsFromTemplateResources');
 const generateArtifactDirectoryName = require('./lib/generate-artifact-directory-name');
 const generateCoreTemplate = require('./lib/generate-core-template');
diff --git a/lib/plugins/aws/package/lib/mergeCustomProviderResources.js b/lib/plugins/aws/package/lib/merge-custom-provider-resources.js
similarity index 100%
rename from lib/plugins/aws/package/lib/mergeCustomProviderResources.js
rename to lib/plugins/aws/package/lib/merge-custom-provider-resources.js
diff --git a/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js b/test/unit/lib/plugins/aws/package/lib/merge-custom-provider-resources.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
rename to test/unit/lib/plugins/aws/package/lib/merge-custom-provider-resources.test.js

From 4f47c63ef2d20beeee418c4a0dac7c600d38e23a Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:24:30 +0100
Subject: [PATCH 1055/1101] refactor: Rename
 `lib/plugins/aws/package/lib/mergeIamTemplates.js`

---
 lib/plugins/aws/package/index.js                                | 2 +-
 .../lib/{mergeIamTemplates.js => merge-iam-templates.js}        | 0
 .../{mergeIamTemplates.test.js => merge-iam-templates.test.js}  | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/package/lib/{mergeIamTemplates.js => merge-iam-templates.js} (100%)
 rename test/unit/lib/plugins/aws/package/lib/{mergeIamTemplates.test.js => merge-iam-templates.test.js} (100%)

diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
index 7be68b21c11..25b8d9eed5b 100644
--- a/lib/plugins/aws/package/index.js
+++ b/lib/plugins/aws/package/index.js
@@ -7,7 +7,7 @@ const generateArtifactDirectoryName = require('./lib/generate-artifact-directory
 const generateCoreTemplate = require('./lib/generate-core-template');
 const saveServiceState = require('./lib/saveServiceState');
 const saveCompiledTemplate = require('./lib/saveCompiledTemplate');
-const mergeIamTemplates = require('./lib/mergeIamTemplates');
+const mergeIamTemplates = require('./lib/merge-iam-templates');
 const addExportNameForOutputs = require('./lib/add-export-name-for-outputs');
 const { log, style, progress } = require('@serverless/utils/log');
 
diff --git a/lib/plugins/aws/package/lib/mergeIamTemplates.js b/lib/plugins/aws/package/lib/merge-iam-templates.js
similarity index 100%
rename from lib/plugins/aws/package/lib/mergeIamTemplates.js
rename to lib/plugins/aws/package/lib/merge-iam-templates.js
diff --git a/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js b/test/unit/lib/plugins/aws/package/lib/merge-iam-templates.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
rename to test/unit/lib/plugins/aws/package/lib/merge-iam-templates.test.js

From 9f9cac8f607bdc9157f2e708eb86b9643639a7a6 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:24:32 +0100
Subject: [PATCH 1056/1101] refactor: Rename
 `lib/plugins/aws/package/lib/saveServiceState.js`

---
 lib/plugins/aws/package/index.js                                | 2 +-
 .../package/lib/{saveServiceState.js => save-service-state.js}  | 0
 .../{saveServiceState.test.js => save-service-state.test.js}    | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/package/lib/{saveServiceState.js => save-service-state.js} (100%)
 rename test/unit/lib/plugins/aws/package/lib/{saveServiceState.test.js => save-service-state.test.js} (100%)

diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
index 25b8d9eed5b..8345bccc7b7 100644
--- a/lib/plugins/aws/package/index.js
+++ b/lib/plugins/aws/package/index.js
@@ -5,7 +5,7 @@ const mergeCustomProviderResources = require('./lib/merge-custom-provider-resour
 const stripNullPropsFromTemplateResources = require('./lib/stripNullPropsFromTemplateResources');
 const generateArtifactDirectoryName = require('./lib/generate-artifact-directory-name');
 const generateCoreTemplate = require('./lib/generate-core-template');
-const saveServiceState = require('./lib/saveServiceState');
+const saveServiceState = require('./lib/save-service-state');
 const saveCompiledTemplate = require('./lib/saveCompiledTemplate');
 const mergeIamTemplates = require('./lib/merge-iam-templates');
 const addExportNameForOutputs = require('./lib/add-export-name-for-outputs');
diff --git a/lib/plugins/aws/package/lib/saveServiceState.js b/lib/plugins/aws/package/lib/save-service-state.js
similarity index 100%
rename from lib/plugins/aws/package/lib/saveServiceState.js
rename to lib/plugins/aws/package/lib/save-service-state.js
diff --git a/test/unit/lib/plugins/aws/package/lib/saveServiceState.test.js b/test/unit/lib/plugins/aws/package/lib/save-service-state.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/lib/saveServiceState.test.js
rename to test/unit/lib/plugins/aws/package/lib/save-service-state.test.js

From 75879f866f4be1e60df5e36f872cd031d71b2f19 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:24:34 +0100
Subject: [PATCH 1057/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6s/pack?=
 =?UTF-8?q?age/lib/stripNullPropsFromTemplateResources.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugins/aws/package/index.js                                | 2 +-
 ...Resources.js => strip-null-props-from-template-resources.js} | 0
 ...test.js => strip-null-props-from-template-resources.test.js} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/package/lib/{stripNullPropsFromTemplateResources.js => strip-null-props-from-template-resources.js} (100%)
 rename test/unit/lib/plugins/aws/package/lib/{stripNullPropsFromTemplateResources.test.js => strip-null-props-from-template-resources.test.js} (100%)

diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
index 8345bccc7b7..68601fb2349 100644
--- a/lib/plugins/aws/package/index.js
+++ b/lib/plugins/aws/package/index.js
@@ -2,7 +2,7 @@
 
 const path = require('path');
 const mergeCustomProviderResources = require('./lib/merge-custom-provider-resources');
-const stripNullPropsFromTemplateResources = require('./lib/stripNullPropsFromTemplateResources');
+const stripNullPropsFromTemplateResources = require('./lib/strip-null-props-from-template-resources');
 const generateArtifactDirectoryName = require('./lib/generate-artifact-directory-name');
 const generateCoreTemplate = require('./lib/generate-core-template');
 const saveServiceState = require('./lib/save-service-state');
diff --git a/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.js b/lib/plugins/aws/package/lib/strip-null-props-from-template-resources.js
similarity index 100%
rename from lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.js
rename to lib/plugins/aws/package/lib/strip-null-props-from-template-resources.js
diff --git a/test/unit/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.test.js b/test/unit/lib/plugins/aws/package/lib/strip-null-props-from-template-resources.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.test.js
rename to test/unit/lib/plugins/aws/package/lib/strip-null-props-from-template-resources.test.js

From e80d0ddb305371fb3526b03236bfe237cba5a90c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:24:36 +0100
Subject: [PATCH 1058/1101] refactor: Rename
 `lib/plugins/aws/package/lib/saveCompiledTemplate.js`

---
 lib/plugins/aws/package/index.js                                | 2 +-
 .../lib/{saveCompiledTemplate.js => save-compiled-template.js}  | 0
 ...eCompiledTemplate.test.js => save-compiled-template.test.js} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/package/lib/{saveCompiledTemplate.js => save-compiled-template.js} (100%)
 rename test/unit/lib/plugins/aws/package/lib/{saveCompiledTemplate.test.js => save-compiled-template.test.js} (100%)

diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
index 68601fb2349..f7fa251e9ea 100644
--- a/lib/plugins/aws/package/index.js
+++ b/lib/plugins/aws/package/index.js
@@ -6,7 +6,7 @@ const stripNullPropsFromTemplateResources = require('./lib/strip-null-props-from
 const generateArtifactDirectoryName = require('./lib/generate-artifact-directory-name');
 const generateCoreTemplate = require('./lib/generate-core-template');
 const saveServiceState = require('./lib/save-service-state');
-const saveCompiledTemplate = require('./lib/saveCompiledTemplate');
+const saveCompiledTemplate = require('./lib/save-compiled-template');
 const mergeIamTemplates = require('./lib/merge-iam-templates');
 const addExportNameForOutputs = require('./lib/add-export-name-for-outputs');
 const { log, style, progress } = require('@serverless/utils/log');
diff --git a/lib/plugins/aws/package/lib/saveCompiledTemplate.js b/lib/plugins/aws/package/lib/save-compiled-template.js
similarity index 100%
rename from lib/plugins/aws/package/lib/saveCompiledTemplate.js
rename to lib/plugins/aws/package/lib/save-compiled-template.js
diff --git a/test/unit/lib/plugins/aws/package/lib/saveCompiledTemplate.test.js b/test/unit/lib/plugins/aws/package/lib/save-compiled-template.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/lib/saveCompiledTemplate.test.js
rename to test/unit/lib/plugins/aws/package/lib/save-compiled-template.test.js

From 407ba0f954134916a51b0a6511c39903595b20ad Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:32:35 +0100
Subject: [PATCH 1059/1101] refactor: Rename
 `lib/plugins/aws/package/compile/events/alexaSkill.js`

---
 .../package/compile/events/{alexaSkill.js => alexa-skill.js}    | 0
 lib/plugins/index.js                                            | 2 +-
 .../compile/events/{alexaSkill.test.js => alexa-skill.test.js}  | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/plugins/aws/package/compile/events/{alexaSkill.js => alexa-skill.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/{alexaSkill.test.js => alexa-skill.test.js} (99%)

diff --git a/lib/plugins/aws/package/compile/events/alexaSkill.js b/lib/plugins/aws/package/compile/events/alexa-skill.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/alexaSkill.js
rename to lib/plugins/aws/package/compile/events/alexa-skill.js
diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index c3b31ae540e..bfa01ba1dec 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -42,7 +42,7 @@ module.exports = [
   require('./aws/package/compile/events/rabbitmq.js'),
   require('./aws/package/compile/events/msk/index.js'),
   require('./aws/package/compile/events/alb/index.js'),
-  require('./aws/package/compile/events/alexaSkill.js'),
+  require('./aws/package/compile/events/alexa-skill.js'),
   require('./aws/package/compile/events/alexaSmartHome.js'),
   require('./aws/package/compile/events/iot.js'),
   require('./aws/package/compile/events/iotFleetProvisioning.js'),
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alexaSkill.test.js b/test/unit/lib/plugins/aws/package/compile/events/alexa-skill.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/alexaSkill.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/alexa-skill.test.js
index d19c6f577a1..327177b2bde 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/alexaSkill.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/alexa-skill.test.js
@@ -4,7 +4,7 @@
 
 const expect = require('chai').expect;
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
-const AwsCompileAlexaSkillEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/alexaSkill');
+const AwsCompileAlexaSkillEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/alexa-skill');
 const Serverless = require('../../../../../../../../lib/serverless');
 
 describe('AwsCompileAlexaSkillEvents', () => {

From c31133c3f125f7c68c8e13c020ba03b06b7cc1ab Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:32:38 +0100
Subject: [PATCH 1060/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6plugin?=
 =?UTF-8?q?s/aws/package/compile/events/alexaSmartHome.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../compile/events/{alexaSmartHome.js => alexa-smart-home.js}   | 0
 lib/plugins/index.js                                            | 2 +-
 .../events/{alexaSmartHome.test.js => alexa-smart-home.test.js} | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/plugins/aws/package/compile/events/{alexaSmartHome.js => alexa-smart-home.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/{alexaSmartHome.test.js => alexa-smart-home.test.js} (99%)

diff --git a/lib/plugins/aws/package/compile/events/alexaSmartHome.js b/lib/plugins/aws/package/compile/events/alexa-smart-home.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/alexaSmartHome.js
rename to lib/plugins/aws/package/compile/events/alexa-smart-home.js
diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index bfa01ba1dec..a81213f7b37 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -43,7 +43,7 @@ module.exports = [
   require('./aws/package/compile/events/msk/index.js'),
   require('./aws/package/compile/events/alb/index.js'),
   require('./aws/package/compile/events/alexa-skill.js'),
-  require('./aws/package/compile/events/alexaSmartHome.js'),
+  require('./aws/package/compile/events/alexa-smart-home.js'),
   require('./aws/package/compile/events/iot.js'),
   require('./aws/package/compile/events/iotFleetProvisioning.js'),
   require('./aws/package/compile/events/cloudWatchEvent.js'),
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alexaSmartHome.test.js b/test/unit/lib/plugins/aws/package/compile/events/alexa-smart-home.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/alexaSmartHome.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/alexa-smart-home.test.js
index a7af1ccdb0c..853c51ba40f 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/alexaSmartHome.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/alexa-smart-home.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
-const AwsCompileAlexaSmartHomeEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/alexaSmartHome');
+const AwsCompileAlexaSmartHomeEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/alexa-smart-home');
 const Serverless = require('../../../../../../../../lib/serverless');
 
 describe('AwsCompileAlexaSmartHomeEvents', () => {

From 72d06c339c0caa3e399d53bb31a81d4cb94a28f0 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:32:40 +0100
Subject: [PATCH 1061/1101] refactor: Rename
 `lib/plugins/aws/package/compile/events/cloudFront.js`

---
 .../package/compile/events/{cloudFront.js => cloud-front.js}    | 0
 lib/plugins/index.js                                            | 2 +-
 .../compile/events/{cloudFront.test.js => cloud-front.test.js}  | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/plugins/aws/package/compile/events/{cloudFront.js => cloud-front.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/{cloudFront.test.js => cloud-front.test.js} (99%)

diff --git a/lib/plugins/aws/package/compile/events/cloudFront.js b/lib/plugins/aws/package/compile/events/cloud-front.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/cloudFront.js
rename to lib/plugins/aws/package/compile/events/cloud-front.js
diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index a81213f7b37..556589e3e3e 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -51,7 +51,7 @@ module.exports = [
   require('./aws/package/compile/events/cognitoUserPool.js'),
   require('./aws/package/compile/events/eventBridge/index.js'),
   require('./aws/package/compile/events/sqs.js'),
-  require('./aws/package/compile/events/cloudFront.js'),
+  require('./aws/package/compile/events/cloud-front.js'),
   require('./aws/package/compile/events/httpApi'),
   require('./aws/deploy-function.js'),
   require('./aws/deploy-list.js'),
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloud-front.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/cloud-front.test.js
index ef03a91eb7a..27b619faec7 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloud-front.test.js
@@ -2,7 +2,7 @@
 
 const chai = require('chai');
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
-const AwsCompileCloudFrontEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/cloudFront');
+const AwsCompileCloudFrontEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/cloud-front');
 const Serverless = require('../../../../../../../../lib/serverless');
 const runServerless = require('../../../../../../../utils/run-serverless');
 

From d2003106df6f3d79a3c5c6210e3ac68a958d6583 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:32:42 +0100
Subject: [PATCH 1062/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6lugins?=
 =?UTF-8?q?/aws/package/compile/events/cloudWatchEvent.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../compile/events/{cloudWatchEvent.js => cloud-watch-event.js} | 0
 lib/plugins/index.js                                            | 2 +-
 .../{cloudWatchEvent.test.js => cloud-watch-event.test.js}      | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/plugins/aws/package/compile/events/{cloudWatchEvent.js => cloud-watch-event.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/{cloudWatchEvent.test.js => cloud-watch-event.test.js} (99%)

diff --git a/lib/plugins/aws/package/compile/events/cloudWatchEvent.js b/lib/plugins/aws/package/compile/events/cloud-watch-event.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/cloudWatchEvent.js
rename to lib/plugins/aws/package/compile/events/cloud-watch-event.js
diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index 556589e3e3e..d42aacbb5c5 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -46,7 +46,7 @@ module.exports = [
   require('./aws/package/compile/events/alexa-smart-home.js'),
   require('./aws/package/compile/events/iot.js'),
   require('./aws/package/compile/events/iotFleetProvisioning.js'),
-  require('./aws/package/compile/events/cloudWatchEvent.js'),
+  require('./aws/package/compile/events/cloud-watch-event.js'),
   require('./aws/package/compile/events/cloudWatchLog.js'),
   require('./aws/package/compile/events/cognitoUserPool.js'),
   require('./aws/package/compile/events/eventBridge/index.js'),
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudWatchEvent.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloud-watch-event.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/cloudWatchEvent.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/cloud-watch-event.test.js
index 11c81bf0fce..42524032a1f 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudWatchEvent.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloud-watch-event.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
-const AwsCompileCloudWatchEventEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/cloudWatchEvent');
+const AwsCompileCloudWatchEventEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/cloud-watch-event');
 const Serverless = require('../../../../../../../../lib/serverless');
 
 describe('awsCompileCloudWatchEventEvents', () => {

From 6eddebe55d911bceb414b5ff10919a85d5918dc8 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:32:44 +0100
Subject: [PATCH 1063/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6/plugi?=
 =?UTF-8?q?ns/aws/package/compile/events/cloudWatchLog.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../compile/events/{cloudWatchLog.js => cloud-watch-log.js}     | 0
 lib/plugins/index.js                                            | 2 +-
 .../events/{cloudWatchLog.test.js => cloud-watch-log.test.js}   | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/plugins/aws/package/compile/events/{cloudWatchLog.js => cloud-watch-log.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/{cloudWatchLog.test.js => cloud-watch-log.test.js} (99%)

diff --git a/lib/plugins/aws/package/compile/events/cloudWatchLog.js b/lib/plugins/aws/package/compile/events/cloud-watch-log.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/cloudWatchLog.js
rename to lib/plugins/aws/package/compile/events/cloud-watch-log.js
diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index d42aacbb5c5..aebbae69e67 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -47,7 +47,7 @@ module.exports = [
   require('./aws/package/compile/events/iot.js'),
   require('./aws/package/compile/events/iotFleetProvisioning.js'),
   require('./aws/package/compile/events/cloud-watch-event.js'),
-  require('./aws/package/compile/events/cloudWatchLog.js'),
+  require('./aws/package/compile/events/cloud-watch-log.js'),
   require('./aws/package/compile/events/cognitoUserPool.js'),
   require('./aws/package/compile/events/eventBridge/index.js'),
   require('./aws/package/compile/events/sqs.js'),
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudWatchLog.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloud-watch-log.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/cloudWatchLog.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/cloud-watch-log.test.js
index a57cda56305..688d3870fb3 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudWatchLog.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloud-watch-log.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
-const AwsCompileCloudWatchLogEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/cloudWatchLog');
+const AwsCompileCloudWatchLogEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/cloud-watch-log');
 const Serverless = require('../../../../../../../../lib/serverless');
 
 describe('AwsCompileCloudWatchLogEvents', () => {

From 04f63183d6acad1253588fcde1da64e63a5785f1 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:32:46 +0100
Subject: [PATCH 1064/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6lugins?=
 =?UTF-8?q?/aws/package/compile/events/cognitoUserPool.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../compile/events/{cognitoUserPool.js => cognito-user-pool.js} | 0
 lib/plugins/index.js                                            | 2 +-
 .../{cognitoUserPool.test.js => cognito-user-pool.test.js}      | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/plugins/aws/package/compile/events/{cognitoUserPool.js => cognito-user-pool.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/{cognitoUserPool.test.js => cognito-user-pool.test.js} (99%)

diff --git a/lib/plugins/aws/package/compile/events/cognitoUserPool.js b/lib/plugins/aws/package/compile/events/cognito-user-pool.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/cognitoUserPool.js
rename to lib/plugins/aws/package/compile/events/cognito-user-pool.js
diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index aebbae69e67..079e6832dfd 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -48,7 +48,7 @@ module.exports = [
   require('./aws/package/compile/events/iotFleetProvisioning.js'),
   require('./aws/package/compile/events/cloud-watch-event.js'),
   require('./aws/package/compile/events/cloud-watch-log.js'),
-  require('./aws/package/compile/events/cognitoUserPool.js'),
+  require('./aws/package/compile/events/cognito-user-pool.js'),
   require('./aws/package/compile/events/eventBridge/index.js'),
   require('./aws/package/compile/events/sqs.js'),
   require('./aws/package/compile/events/cloud-front.js'),
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js b/test/unit/lib/plugins/aws/package/compile/events/cognito-user-pool.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/cognito-user-pool.test.js
index b74f1334933..81cc0684acf 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cognito-user-pool.test.js
@@ -21,7 +21,7 @@ describe('AwsCompileCognitoUserPoolEvents', () => {
   beforeEach(() => {
     addCustomResourceToServiceStub = sinon.stub().resolves();
     const AwsCompileCognitoUserPoolEvents = proxyquire(
-      '../../../../../../../../lib/plugins/aws/package/compile/events/cognitoUserPool',
+      '../../../../../../../../lib/plugins/aws/package/compile/events/cognito-user-pool',
       {
         '../../../custom-resources': {
           addCustomResourceToService: addCustomResourceToServiceStub,

From ebe4035e759455934c4847eeb4d910f1c26e5b9d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:33:17 +0100
Subject: [PATCH 1065/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6s/aws/?=
 =?UTF-8?q?package/compile/events/iotFleetProvisioning.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{iotFleetProvisioning.js => iot-fleet-provisioning.js}      | 0
 lib/plugins/index.js                                            | 2 +-
 .../index.test.js                                               | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/package/compile/events/{iotFleetProvisioning.js => iot-fleet-provisioning.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/{iotFleetProvisioning => iot-fleet-provisioning}/index.test.js (100%)

diff --git a/lib/plugins/aws/package/compile/events/iotFleetProvisioning.js b/lib/plugins/aws/package/compile/events/iot-fleet-provisioning.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/iotFleetProvisioning.js
rename to lib/plugins/aws/package/compile/events/iot-fleet-provisioning.js
diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index 079e6832dfd..6d10efc232d 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -45,7 +45,7 @@ module.exports = [
   require('./aws/package/compile/events/alexa-skill.js'),
   require('./aws/package/compile/events/alexa-smart-home.js'),
   require('./aws/package/compile/events/iot.js'),
-  require('./aws/package/compile/events/iotFleetProvisioning.js'),
+  require('./aws/package/compile/events/iot-fleet-provisioning.js'),
   require('./aws/package/compile/events/cloud-watch-event.js'),
   require('./aws/package/compile/events/cloud-watch-log.js'),
   require('./aws/package/compile/events/cognito-user-pool.js'),
diff --git a/test/unit/lib/plugins/aws/package/compile/events/iotFleetProvisioning/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/iot-fleet-provisioning/index.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/compile/events/iotFleetProvisioning/index.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/iot-fleet-provisioning/index.test.js

From 364e52ad7c2795f209c0e5e1ffea6972f8f6a560 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:37:44 +0100
Subject: [PATCH 1066/1101] refactor: Rename
 `lib/plugins/aws/package/compile/events/httpApi.js`

---
 .../aws/package/compile/events/{httpApi.js => http-api.js}      | 0
 lib/plugins/index.js                                            | 2 +-
 .../compile/events/{httpApi.test.js => http-api.test.js}        | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/package/compile/events/{httpApi.js => http-api.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/{httpApi.test.js => http-api.test.js} (100%)

diff --git a/lib/plugins/aws/package/compile/events/httpApi.js b/lib/plugins/aws/package/compile/events/http-api.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/httpApi.js
rename to lib/plugins/aws/package/compile/events/http-api.js
diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index 6d10efc232d..d8714ed0fe3 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -52,7 +52,7 @@ module.exports = [
   require('./aws/package/compile/events/eventBridge/index.js'),
   require('./aws/package/compile/events/sqs.js'),
   require('./aws/package/compile/events/cloud-front.js'),
-  require('./aws/package/compile/events/httpApi'),
+  require('./aws/package/compile/events/http-api'),
   require('./aws/deploy-function.js'),
   require('./aws/deploy-list.js'),
   require('./aws/invoke-local/index.js'),
diff --git a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/http-api.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/http-api.test.js

From f2a4f96f362eaee081d466b3f282738b72ba74fa Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:37:47 +0100
Subject: [PATCH 1067/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6compil?=
 =?UTF-8?q?e/events/lib/ensureApiGatewayCloudWatchRole.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugins/aws/package/compile/events/apiGateway/lib/stage.js  | 2 +-
 ...CloudWatchRole.js => ensure-api-gateway-cloud-watch-role.js} | 0
 lib/plugins/aws/package/compile/events/websockets/lib/stage.js  | 2 +-
 ...Role.test.js => ensure-api-gateway-cloud-watch-role.test.js} | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/plugins/aws/package/compile/events/lib/{ensureApiGatewayCloudWatchRole.js => ensure-api-gateway-cloud-watch-role.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/lib/{ensureApiGatewayCloudWatchRole.test.js => ensure-api-gateway-cloud-watch-role.test.js} (98%)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/stage.js b/lib/plugins/aws/package/compile/events/apiGateway/lib/stage.js
index b3eac580e77..6ce660efc52 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/stage.js
+++ b/lib/plugins/aws/package/compile/events/apiGateway/lib/stage.js
@@ -5,7 +5,7 @@
 // NOTE: --> Keep this file in sync with ./hack/updateStage.js
 
 const _ = require('lodash');
-const ensureApiGatewayCloudWatchRole = require('../../lib/ensureApiGatewayCloudWatchRole');
+const ensureApiGatewayCloudWatchRole = require('../../lib/ensure-api-gateway-cloud-watch-role');
 
 module.exports = {
   async compileStage() {
diff --git a/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.js b/lib/plugins/aws/package/compile/events/lib/ensure-api-gateway-cloud-watch-role.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.js
rename to lib/plugins/aws/package/compile/events/lib/ensure-api-gateway-cloud-watch-role.js
diff --git a/lib/plugins/aws/package/compile/events/websockets/lib/stage.js b/lib/plugins/aws/package/compile/events/websockets/lib/stage.js
index 24db29fcd66..837f1e09054 100644
--- a/lib/plugins/aws/package/compile/events/websockets/lib/stage.js
+++ b/lib/plugins/aws/package/compile/events/websockets/lib/stage.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const BbPromise = require('bluebird');
-const ensureApiGatewayCloudWatchRole = require('../../lib/ensureApiGatewayCloudWatchRole');
+const ensureApiGatewayCloudWatchRole = require('../../lib/ensure-api-gateway-cloud-watch-role');
 const ServerlessError = require('../../../../../../../serverless-error');
 
 const defaultLogLevel = 'INFO';
diff --git a/test/unit/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.test.js b/test/unit/lib/plugins/aws/package/compile/events/lib/ensure-api-gateway-cloud-watch-role.test.js
similarity index 98%
rename from test/unit/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/lib/ensure-api-gateway-cloud-watch-role.test.js
index cea46e9e6b8..0a57a4e3ca4 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/lib/ensure-api-gateway-cloud-watch-role.test.js
@@ -18,7 +18,7 @@ describe('ensureApiGatewayCloudWatchRole', () => {
   beforeEach(() => {
     addCustomResourceToServiceStub = sinon.stub().resolves();
     ensureApiGatewayCloudWatchRole = proxyquire(
-      '../../../../../../../../../lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole',
+      '../../../../../../../../../lib/plugins/aws/package/compile/events/lib/ensure-api-gateway-cloud-watch-role',
       {
         '../../../../custom-resources': {
           addCustomResourceToService: addCustomResourceToServiceStub,

From 6ee1a79cfbac8af886d2aabf1cf4c605195bc894 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:37:49 +0100
Subject: [PATCH 1068/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6packag?=
 =?UTF-8?q?e/compile/events/msk/getMskClusterNameToken.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...{getMskClusterNameToken.js => get-msk-cluster-name-token.js} | 0
 lib/plugins/aws/package/compile/events/msk/index.js             | 2 +-
 ...sterNameToken.test.js => get-msk-cluster-name-token.test.js} | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/plugins/aws/package/compile/events/msk/{getMskClusterNameToken.js => get-msk-cluster-name-token.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/msk/{getMskClusterNameToken.test.js => get-msk-cluster-name-token.test.js} (91%)

diff --git a/lib/plugins/aws/package/compile/events/msk/getMskClusterNameToken.js b/lib/plugins/aws/package/compile/events/msk/get-msk-cluster-name-token.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/msk/getMskClusterNameToken.js
rename to lib/plugins/aws/package/compile/events/msk/get-msk-cluster-name-token.js
diff --git a/lib/plugins/aws/package/compile/events/msk/index.js b/lib/plugins/aws/package/compile/events/msk/index.js
index 42afca5c406..66afe3553e3 100644
--- a/lib/plugins/aws/package/compile/events/msk/index.js
+++ b/lib/plugins/aws/package/compile/events/msk/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const getMskClusterNameToken = require('./getMskClusterNameToken');
+const getMskClusterNameToken = require('./get-msk-cluster-name-token');
 
 class AwsCompileMSKEvents {
   constructor(serverless) {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/msk/getMskClusterNameToken.test.js b/test/unit/lib/plugins/aws/package/compile/events/msk/get-msk-cluster-name-token.test.js
similarity index 91%
rename from test/unit/lib/plugins/aws/package/compile/events/msk/getMskClusterNameToken.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/msk/get-msk-cluster-name-token.test.js
index 92e7ec0bd10..af251f9aae4 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/msk/getMskClusterNameToken.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/msk/get-msk-cluster-name-token.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const chai = require('chai');
-const getMskClusterNameToken = require('../../../../../../../../../lib/plugins/aws/package/compile/events/msk/getMskClusterNameToken');
+const getMskClusterNameToken = require('../../../../../../../../../lib/plugins/aws/package/compile/events/msk/get-msk-cluster-name-token');
 
 const { expect } = chai;
 

From 72624b0b164cd31c3efd4279dd5e7d873e1bd74d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:37:50 +0100
Subject: [PATCH 1069/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6lugins?=
 =?UTF-8?q?/aws/package/compile/events/s3/configSchema.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../compile/events/s3/{configSchema.js => config-schema.js}     | 0
 lib/plugins/aws/provider.js                                     | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/package/compile/events/s3/{configSchema.js => config-schema.js} (100%)

diff --git a/lib/plugins/aws/package/compile/events/s3/configSchema.js b/lib/plugins/aws/package/compile/events/s3/config-schema.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/s3/configSchema.js
rename to lib/plugins/aws/package/compile/events/s3/config-schema.js
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index e9b6aac1050..865dba13014 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -1144,7 +1144,7 @@ class AwsProvider {
             runtime: { $ref: '#/definitions/awsLambdaRuntime' },
             s3: {
               type: 'object',
-              additionalProperties: require('./package/compile/events/s3/configSchema'),
+              additionalProperties: require('./package/compile/events/s3/config-schema'),
             },
             stage: { $ref: '#/definitions/stage' },
             stackName: {

From 0b542a125988e5d3d0f4c20d25fee14766d18a3c Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:37:53 +0100
Subject: [PATCH 1070/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6s/aws/?=
 =?UTF-8?q?package/compile/events/alb/lib/targetGroups.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugins/aws/package/compile/events/alb/index.js             | 2 +-
 .../events/alb/lib/{targetGroups.js => target-groups.js}        | 0
 .../alb/lib/{targetGroups.test.js => target-groups.test.js}     | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/package/compile/events/alb/lib/{targetGroups.js => target-groups.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/alb/lib/{targetGroups.test.js => target-groups.test.js} (100%)

diff --git a/lib/plugins/aws/package/compile/events/alb/index.js b/lib/plugins/aws/package/compile/events/alb/index.js
index 74a496b9250..72b431e78fe 100644
--- a/lib/plugins/aws/package/compile/events/alb/index.js
+++ b/lib/plugins/aws/package/compile/events/alb/index.js
@@ -3,7 +3,7 @@
 const BbPromise = require('bluebird');
 
 const validate = require('./lib/validate');
-const compileTargetGroups = require('./lib/targetGroups');
+const compileTargetGroups = require('./lib/target-groups');
 const compileListenerRules = require('./lib/listenerRules');
 const compilePermissions = require('./lib/permissions');
 
diff --git a/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.js b/lib/plugins/aws/package/compile/events/alb/lib/target-groups.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/alb/lib/targetGroups.js
rename to lib/plugins/aws/package/compile/events/alb/lib/target-groups.js
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.test.js b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/target-groups.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/alb/lib/target-groups.test.js

From 98e454e317148f993358e6fa66facb02d55ac644 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:37:55 +0100
Subject: [PATCH 1071/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6/aws/p?=
 =?UTF-8?q?ackage/compile/events/alb/lib/listenerRules.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugins/aws/package/compile/events/alb/index.js             | 2 +-
 .../events/alb/lib/{listenerRules.js => listener-rules.js}      | 0
 .../alb/lib/{listenerRules.test.js => listener-rules.test.js}   | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/package/compile/events/alb/lib/{listenerRules.js => listener-rules.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/alb/lib/{listenerRules.test.js => listener-rules.test.js} (100%)

diff --git a/lib/plugins/aws/package/compile/events/alb/index.js b/lib/plugins/aws/package/compile/events/alb/index.js
index 72b431e78fe..e9a395c78b6 100644
--- a/lib/plugins/aws/package/compile/events/alb/index.js
+++ b/lib/plugins/aws/package/compile/events/alb/index.js
@@ -4,7 +4,7 @@ const BbPromise = require('bluebird');
 
 const validate = require('./lib/validate');
 const compileTargetGroups = require('./lib/target-groups');
-const compileListenerRules = require('./lib/listenerRules');
+const compileListenerRules = require('./lib/listener-rules');
 const compilePermissions = require('./lib/permissions');
 
 function defineArray(schema) {
diff --git a/lib/plugins/aws/package/compile/events/alb/lib/listenerRules.js b/lib/plugins/aws/package/compile/events/alb/lib/listener-rules.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/alb/lib/listenerRules.js
rename to lib/plugins/aws/package/compile/events/alb/lib/listener-rules.js
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/listenerRules.test.js b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/listener-rules.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/compile/events/alb/lib/listenerRules.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/alb/lib/listener-rules.test.js

From cb3518ee507f792831ba5b4f70bd172df9bd74fa Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:37:57 +0100
Subject: [PATCH 1072/1101] refactor: Rename
 `lib/plugins/aws/package/compile/events/apiGateway`

---
 .../compile/events/{apiGateway => api-gateway}/index.js     | 0
 .../events/{apiGateway => api-gateway}/lib/apiKeys.js       | 0
 .../events/{apiGateway => api-gateway}/lib/authorizers.js   | 0
 .../compile/events/{apiGateway => api-gateway}/lib/cors.js  | 0
 .../events/{apiGateway => api-gateway}/lib/deployment.js    | 0
 .../events/{apiGateway => api-gateway}/lib/hack/README.md   | 0
 .../lib/hack/disassociateUsagePlan.js                       | 0
 .../{apiGateway => api-gateway}/lib/hack/updateStage.js     | 0
 .../{apiGateway => api-gateway}/lib/method/authorization.js | 0
 .../events/{apiGateway => api-gateway}/lib/method/index.js  | 0
 .../{apiGateway => api-gateway}/lib/method/integration.js   | 0
 .../{apiGateway => api-gateway}/lib/method/responses.js     | 0
 .../events/{apiGateway => api-gateway}/lib/permissions.js   | 0
 .../{apiGateway => api-gateway}/lib/requestValidator.js     | 0
 .../events/{apiGateway => api-gateway}/lib/resources.js     | 0
 .../events/{apiGateway => api-gateway}/lib/restApi.js       | 0
 .../compile/events/{apiGateway => api-gateway}/lib/stage.js | 0
 .../events/{apiGateway => api-gateway}/lib/usagePlan.js     | 0
 .../events/{apiGateway => api-gateway}/lib/usagePlanKeys.js | 0
 .../events/{apiGateway => api-gateway}/lib/validate.js      | 0
 lib/plugins/index.js                                        | 2 +-
 .../events/{apiGateway => api-gateway}/index.test.js        | 6 +++---
 .../events/{apiGateway => api-gateway}/lib/apiKeys.test.js  | 2 +-
 .../{apiGateway => api-gateway}/lib/authorizers.test.js     | 2 +-
 .../events/{apiGateway => api-gateway}/lib/cors.test.js     | 2 +-
 .../{apiGateway => api-gateway}/lib/deployment.test.js      | 2 +-
 .../lib/hack/disassociateUsagePlan.test.js                  | 2 +-
 .../lib/hack/updateStage.test.js                            | 2 +-
 .../{apiGateway => api-gateway}/lib/method/index.test.js    | 2 +-
 .../lib/method/requestParameters.test.js                    | 0
 .../{apiGateway => api-gateway}/lib/permissions.test.js     | 2 +-
 .../lib/requestValidator.test.js                            | 0
 .../{apiGateway => api-gateway}/lib/resources.test.js       | 2 +-
 .../events/{apiGateway => api-gateway}/lib/restApi.test.js  | 2 +-
 .../{apiGateway => api-gateway}/lib/stage/index.test.js     | 2 +-
 .../{apiGateway => api-gateway}/lib/usagePlan.test.js       | 2 +-
 .../{apiGateway => api-gateway}/lib/usagePlanKeys.test.js   | 2 +-
 .../events/{apiGateway => api-gateway}/lib/validate.test.js | 2 +-
 38 files changed, 18 insertions(+), 18 deletions(-)
 rename lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/index.js (100%)
 rename lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/apiKeys.js (100%)
 rename lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/authorizers.js (100%)
 rename lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/cors.js (100%)
 rename lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/deployment.js (100%)
 rename lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/hack/README.md (100%)
 rename lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/hack/disassociateUsagePlan.js (100%)
 rename lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/hack/updateStage.js (100%)
 rename lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/method/authorization.js (100%)
 rename lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/method/index.js (100%)
 rename lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/method/integration.js (100%)
 rename lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/method/responses.js (100%)
 rename lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/permissions.js (100%)
 rename lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/requestValidator.js (100%)
 rename lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/resources.js (100%)
 rename lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/restApi.js (100%)
 rename lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/stage.js (100%)
 rename lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/usagePlan.js (100%)
 rename lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/usagePlanKeys.js (100%)
 rename lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/validate.js (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/index.test.js (96%)
 rename test/unit/lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/apiKeys.test.js (99%)
 rename test/unit/lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/authorizers.test.js (99%)
 rename test/unit/lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/cors.test.js (99%)
 rename test/unit/lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/deployment.test.js (98%)
 rename test/unit/lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/hack/disassociateUsagePlan.test.js (97%)
 rename test/unit/lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/hack/updateStage.test.js (99%)
 rename test/unit/lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/method/index.test.js (99%)
 rename test/unit/lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/method/requestParameters.test.js (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/permissions.test.js (99%)
 rename test/unit/lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/requestValidator.test.js (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/resources.test.js (99%)
 rename test/unit/lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/restApi.test.js (99%)
 rename test/unit/lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/stage/index.test.js (99%)
 rename test/unit/lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/usagePlan.test.js (99%)
 rename test/unit/lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/usagePlanKeys.test.js (98%)
 rename test/unit/lib/plugins/aws/package/compile/events/{apiGateway => api-gateway}/lib/validate.test.js (99%)

diff --git a/lib/plugins/aws/package/compile/events/apiGateway/index.js b/lib/plugins/aws/package/compile/events/api-gateway/index.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/index.js
rename to lib/plugins/aws/package/compile/events/api-gateway/index.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/apiKeys.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/apiKeys.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/authorizers.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/authorizers.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/cors.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/cors.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/cors.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/cors.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/deployment.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/deployment.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/deployment.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/deployment.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/README.md b/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/README.md
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/hack/README.md
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/hack/README.md
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociateUsagePlan.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociateUsagePlan.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/updateStage.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/hack/updateStage.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/method/authorization.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/method/authorization.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/method/authorization.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/method/authorization.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/method/index.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/method/index.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/method/integration.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/method/integration.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/method/integration.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/method/integration.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/method/responses.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/method/responses.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/method/responses.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/method/responses.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/permissions.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/permissions.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/requestValidator.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/requestValidator.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/resources.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/resources.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/resources.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/resources.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/restApi.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/restApi.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/stage.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/stage.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/stage.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/stage.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/usagePlan.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/usagePlan.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/usagePlanKeys.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/usagePlanKeys.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/validate.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/validate.js
diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index d8714ed0fe3..d72064b12ee 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -33,7 +33,7 @@ module.exports = [
   require('./aws/package/compile/functions.js'),
   require('./aws/package/compile/events/schedule.js'),
   require('./aws/package/compile/events/s3/index.js'),
-  require('./aws/package/compile/events/apiGateway/index.js'),
+  require('./aws/package/compile/events/api-gateway/index.js'),
   require('./aws/package/compile/events/websockets/index.js'),
   require('./aws/package/compile/events/sns.js'),
   require('./aws/package/compile/events/stream.js'),
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/index.test.js
similarity index 96%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/index.test.js
index 8a7a877e25a..02a04370a7e 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/index.test.js
@@ -3,12 +3,12 @@
 const expect = require('chai').expect;
 const sinon = require('sinon');
 const AwsProvider = require('../../../../../../../../../lib/plugins/aws/provider');
-const AwsCompileApigEvents = require('../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
+const AwsCompileApigEvents = require('../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
 const Serverless = require('../../../../../../../../../lib/serverless');
 const validate = require('../../../../../../../../../lib/plugins/aws/lib/validate');
 const getServiceState = require('../../../../../../../../../lib/plugins/aws/lib/get-service-state');
-const updateStage = require('../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage');
-const disassociateUsagePlan = require('../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan');
+const updateStage = require('../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/lib/hack/updateStage');
+const disassociateUsagePlan = require('../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociateUsagePlan');
 
 describe('AwsCompileApigEvents', () => {
   let awsCompileApigEvents;
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/apiKeys.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/apiKeys.test.js
index 5b1a410b0a3..a4a7dbc1630 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/apiKeys.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
+const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
 const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 const runServerless = require('../../../../../../../../../utils/run-serverless');
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/authorizers.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/authorizers.test.js
index b4a1f58032f..18e531f3a25 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/authorizers.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
+const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
 const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/cors.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/cors.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/cors.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/cors.test.js
index e6c9368fe69..dcc3fee4900 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/cors.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/cors.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
+const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
 const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/deployment.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/deployment.test.js
similarity index 98%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/deployment.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/deployment.test.js
index 523ab4f1e95..491d1ea2703 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/deployment.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/deployment.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
+const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
 const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociateUsagePlan.test.js
similarity index 97%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociateUsagePlan.test.js
index ad9487f6dc5..02990b3a1cf 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociateUsagePlan.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const Serverless = require('../../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../../lib/plugins/aws/provider');
-const disassociateUsagePlan = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan');
+const disassociateUsagePlan = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociateUsagePlan');
 
 describe('#disassociateUsagePlan()', () => {
   let serverless;
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/updateStage.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/updateStage.test.js
index bbf6e339687..22fcf633433 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/updateStage.test.js
@@ -11,7 +11,7 @@ const AwsProvider = require('../../../../../../../../../../../lib/plugins/aws/pr
 const {
   updateStage,
   defaultApiGatewayLogLevel,
-} = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage');
+} = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/lib/hack/updateStage');
 const runServerless = require('../../../../../../../../../../utils/run-serverless');
 const fixtures = require('../../../../../../../../../../fixtures/programmatic');
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/method/index.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/method/index.test.js
index afe3217e8de..e767ee83a8e 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/method/index.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const AwsCompileApigEvents = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
+const AwsCompileApigEvents = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
 const Serverless = require('../../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../../lib/plugins/aws/provider');
 const runServerless = require('../../../../../../../../../../utils/run-serverless');
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/requestParameters.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/method/requestParameters.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/requestParameters.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/method/requestParameters.test.js
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/permissions.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/permissions.test.js
index 8f73eafdc71..903604eeff1 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/permissions.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
+const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
 const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/requestValidator.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/requestValidator.test.js
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/resources.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/resources.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/resources.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/resources.test.js
index 8e24b7ef049..4132561171d 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/resources.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/resources.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
+const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
 const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/restApi.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/restApi.test.js
index 9660b91337c..d369e48a3c5 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/restApi.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const chai = require('chai');
-const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
+const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
 const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 const runServerless = require('../../../../../../../../../utils/run-serverless');
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/stage/index.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/stage/index.test.js
index 18913824ec3..2aadb3f6387 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/stage/index.test.js
@@ -5,7 +5,7 @@ const sinon = require('sinon');
 const BbPromise = require('bluebird');
 const _ = require('lodash');
 const childProcess = BbPromise.promisifyAll(require('child_process'));
-const AwsCompileApigEvents = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway');
+const AwsCompileApigEvents = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway');
 const Serverless = require('../../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../../lib/plugins/aws/provider');
 const { createTmpDir } = require('../../../../../../../../../../utils/fs');
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/usagePlan.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/usagePlan.test.js
index 25bb7aa96ad..80b8aa68b62 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/usagePlan.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
+const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
 const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 const runServerless = require('../../../../../../../../../utils/run-serverless');
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/usagePlanKeys.test.js
similarity index 98%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/usagePlanKeys.test.js
index d72827c97b5..dae2d62ecda 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/usagePlanKeys.test.js
@@ -2,7 +2,7 @@
 
 const _ = require('lodash');
 const expect = require('chai').expect;
-const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
+const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
 const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/validate.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/validate.test.js
index 410d5f53c0a..f8c7abb51a7 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/validate.test.js
@@ -3,7 +3,7 @@
 const chai = require('chai');
 const sinon = require('sinon');
 const runServerless = require('../../../../../../../../../utils/run-serverless');
-const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
+const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
 const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 const ServerlessError = require('../../../../../../../../../../lib/serverless-error');

From 44f48f52071e34c43066561b50ca2f9d2cad7219 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:37:59 +0100
Subject: [PATCH 1073/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6ws/pac?=
 =?UTF-8?q?kage/compile/events/api-gateway/lib/apiKeys.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugins/aws/package/compile/events/api-gateway/index.js     | 2 +-
 .../compile/events/api-gateway/lib/{apiKeys.js => api-keys.js}  | 0
 .../api-gateway/lib/{apiKeys.test.js => api-keys.test.js}       | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/package/compile/events/api-gateway/lib/{apiKeys.js => api-keys.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/{apiKeys.test.js => api-keys.test.js} (100%)

diff --git a/lib/plugins/aws/package/compile/events/api-gateway/index.js b/lib/plugins/aws/package/compile/events/api-gateway/index.js
index 34150e9d124..d040e9c32e9 100644
--- a/lib/plugins/aws/package/compile/events/api-gateway/index.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/index.js
@@ -8,7 +8,7 @@ const memoize = require('memoizee');
 const validate = require('./lib/validate');
 const compileRestApi = require('./lib/restApi');
 const compileRequestValidators = require('./lib/requestValidator');
-const compileApiKeys = require('./lib/apiKeys');
+const compileApiKeys = require('./lib/api-keys');
 const compileUsagePlan = require('./lib/usagePlan');
 const compileUsagePlanKeys = require('./lib/usagePlanKeys');
 const compileResources = require('./lib/resources');
diff --git a/lib/plugins/aws/package/compile/events/api-gateway/lib/apiKeys.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/api-keys.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/api-gateway/lib/apiKeys.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/api-keys.js
diff --git a/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/apiKeys.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/api-keys.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/apiKeys.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/api-keys.test.js

From 897fdfc48e577987996a5f27a1d7c711bfb86f28 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:38:02 +0100
Subject: [PATCH 1074/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6e/comp?=
 =?UTF-8?q?ile/events/api-gateway/lib/requestValidator.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugins/aws/package/compile/events/api-gateway/index.js     | 2 +-
 .../lib/{requestValidator.js => request-validator.js}           | 0
 .../lib/{requestValidator.test.js => request-validator.test.js} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/package/compile/events/api-gateway/lib/{requestValidator.js => request-validator.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/{requestValidator.test.js => request-validator.test.js} (100%)

diff --git a/lib/plugins/aws/package/compile/events/api-gateway/index.js b/lib/plugins/aws/package/compile/events/api-gateway/index.js
index d040e9c32e9..f9a7809f92c 100644
--- a/lib/plugins/aws/package/compile/events/api-gateway/index.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/index.js
@@ -7,7 +7,7 @@ const memoize = require('memoizee');
 
 const validate = require('./lib/validate');
 const compileRestApi = require('./lib/restApi');
-const compileRequestValidators = require('./lib/requestValidator');
+const compileRequestValidators = require('./lib/request-validator');
 const compileApiKeys = require('./lib/api-keys');
 const compileUsagePlan = require('./lib/usagePlan');
 const compileUsagePlanKeys = require('./lib/usagePlanKeys');
diff --git a/lib/plugins/aws/package/compile/events/api-gateway/lib/requestValidator.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/request-validator.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/api-gateway/lib/requestValidator.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/request-validator.js
diff --git a/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/requestValidator.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/request-validator.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/requestValidator.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/request-validator.test.js

From 04158ea6791aa34fe4d3a7745becf13158ea2f46 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:38:04 +0100
Subject: [PATCH 1075/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6ws/pac?=
 =?UTF-8?q?kage/compile/events/api-gateway/lib/restApi.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugins/aws/package/compile/events/api-gateway/index.js     | 2 +-
 .../compile/events/api-gateway/lib/{restApi.js => rest-api.js}  | 0
 .../api-gateway/lib/{restApi.test.js => rest-api.test.js}       | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/package/compile/events/api-gateway/lib/{restApi.js => rest-api.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/{restApi.test.js => rest-api.test.js} (100%)

diff --git a/lib/plugins/aws/package/compile/events/api-gateway/index.js b/lib/plugins/aws/package/compile/events/api-gateway/index.js
index f9a7809f92c..d1110be8f73 100644
--- a/lib/plugins/aws/package/compile/events/api-gateway/index.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/index.js
@@ -6,7 +6,7 @@ const BbPromise = require('bluebird');
 const memoize = require('memoizee');
 
 const validate = require('./lib/validate');
-const compileRestApi = require('./lib/restApi');
+const compileRestApi = require('./lib/rest-api');
 const compileRequestValidators = require('./lib/request-validator');
 const compileApiKeys = require('./lib/api-keys');
 const compileUsagePlan = require('./lib/usagePlan');
diff --git a/lib/plugins/aws/package/compile/events/api-gateway/lib/restApi.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/rest-api.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/api-gateway/lib/restApi.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/rest-api.js
diff --git a/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/restApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/rest-api.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/restApi.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/rest-api.test.js

From 3ea83898b7c887afc8f46a1bf2f2f275b7219f7d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:38:06 +0100
Subject: [PATCH 1076/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6/packa?=
 =?UTF-8?q?ge/compile/events/api-gateway/lib/usagePlan.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugins/aws/package/compile/events/api-gateway/index.js     | 2 +-
 .../events/api-gateway/lib/{usagePlan.js => usage-plan.js}      | 0
 .../api-gateway/lib/{usagePlan.test.js => usage-plan.test.js}   | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/package/compile/events/api-gateway/lib/{usagePlan.js => usage-plan.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/{usagePlan.test.js => usage-plan.test.js} (100%)

diff --git a/lib/plugins/aws/package/compile/events/api-gateway/index.js b/lib/plugins/aws/package/compile/events/api-gateway/index.js
index d1110be8f73..a937349618f 100644
--- a/lib/plugins/aws/package/compile/events/api-gateway/index.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/index.js
@@ -9,7 +9,7 @@ const validate = require('./lib/validate');
 const compileRestApi = require('./lib/rest-api');
 const compileRequestValidators = require('./lib/request-validator');
 const compileApiKeys = require('./lib/api-keys');
-const compileUsagePlan = require('./lib/usagePlan');
+const compileUsagePlan = require('./lib/usage-plan');
 const compileUsagePlanKeys = require('./lib/usagePlanKeys');
 const compileResources = require('./lib/resources');
 const compileCors = require('./lib/cors');
diff --git a/lib/plugins/aws/package/compile/events/api-gateway/lib/usagePlan.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/usage-plan.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/api-gateway/lib/usagePlan.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/usage-plan.js
diff --git a/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/usagePlan.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/usage-plan.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/usagePlan.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/usage-plan.test.js

From 20b90cb2c64a141fccb393c6af3aad88b2e94778 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:38:08 +0100
Subject: [PATCH 1077/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6kage/c?=
 =?UTF-8?q?ompile/events/api-gateway/lib/usagePlanKeys.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugins/aws/package/compile/events/api-gateway/index.js     | 2 +-
 .../api-gateway/lib/{usagePlanKeys.js => usage-plan-keys.js}    | 0
 .../lib/{usagePlanKeys.test.js => usage-plan-keys.test.js}      | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/package/compile/events/api-gateway/lib/{usagePlanKeys.js => usage-plan-keys.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/{usagePlanKeys.test.js => usage-plan-keys.test.js} (100%)

diff --git a/lib/plugins/aws/package/compile/events/api-gateway/index.js b/lib/plugins/aws/package/compile/events/api-gateway/index.js
index a937349618f..1801f1e462b 100644
--- a/lib/plugins/aws/package/compile/events/api-gateway/index.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/index.js
@@ -10,7 +10,7 @@ const compileRestApi = require('./lib/rest-api');
 const compileRequestValidators = require('./lib/request-validator');
 const compileApiKeys = require('./lib/api-keys');
 const compileUsagePlan = require('./lib/usage-plan');
-const compileUsagePlanKeys = require('./lib/usagePlanKeys');
+const compileUsagePlanKeys = require('./lib/usage-plan-keys');
 const compileResources = require('./lib/resources');
 const compileCors = require('./lib/cors');
 const compileMethods = require('./lib/method/index');
diff --git a/lib/plugins/aws/package/compile/events/api-gateway/lib/usagePlanKeys.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/usage-plan-keys.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/api-gateway/lib/usagePlanKeys.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/usage-plan-keys.js
diff --git a/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/usagePlanKeys.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/usage-plan-keys.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/usagePlanKeys.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/usage-plan-keys.test.js

From bff4cc7b137d89149402898b0b0e68d4579ac87b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:38:11 +0100
Subject: [PATCH 1078/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6/event?=
 =?UTF-8?q?s/websockets/lib/pickWebsocketsTemplatePart.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aws/package/compile/events/websockets/lib/deployment.js     | 2 +-
 ...bsocketsTemplatePart.js => pick-websockets-template-part.js} | 0
 ...mplatePart.test.js => pick-websockets-template-part.test.js} | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/plugins/aws/package/compile/events/websockets/lib/{pickWebsocketsTemplatePart.js => pick-websockets-template-part.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/websockets/lib/{pickWebsocketsTemplatePart.test.js => pick-websockets-template-part.test.js} (98%)

diff --git a/lib/plugins/aws/package/compile/events/websockets/lib/deployment.js b/lib/plugins/aws/package/compile/events/websockets/lib/deployment.js
index 4b700fb7eeb..60cf98780e4 100644
--- a/lib/plugins/aws/package/compile/events/websockets/lib/deployment.js
+++ b/lib/plugins/aws/package/compile/events/websockets/lib/deployment.js
@@ -2,7 +2,7 @@
 
 const _ = require('lodash');
 const crypto = require('crypto');
-const pickWebsocketsTemplatePart = require('./pickWebsocketsTemplatePart');
+const pickWebsocketsTemplatePart = require('./pick-websockets-template-part');
 
 module.exports = {
   compileDeployment() {
diff --git a/lib/plugins/aws/package/compile/events/websockets/lib/pickWebsocketsTemplatePart.js b/lib/plugins/aws/package/compile/events/websockets/lib/pick-websockets-template-part.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/websockets/lib/pickWebsocketsTemplatePart.js
rename to lib/plugins/aws/package/compile/events/websockets/lib/pick-websockets-template-part.js
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/pickWebsocketsTemplatePart.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/pick-websockets-template-part.test.js
similarity index 98%
rename from test/unit/lib/plugins/aws/package/compile/events/websockets/lib/pickWebsocketsTemplatePart.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/websockets/lib/pick-websockets-template-part.test.js
index 23cf74cb564..551393ffc9b 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/pickWebsocketsTemplatePart.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/pick-websockets-template-part.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const pickWebsocketsTemplatePart = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/lib/pickWebsocketsTemplatePart');
+const pickWebsocketsTemplatePart = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/lib/pick-websockets-template-part');
 
 describe('#pickWebsocketsTemplatePart', () => {
   it('picks resources from a CloudFormation template related to WebsocketsApi', () => {

From bb70c636563d6d6ea2fae38d105376799351af78 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:38:13 +0100
Subject: [PATCH 1079/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6kage/c?=
 =?UTF-8?q?ompile/events/websockets/lib/routeResponses.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugins/aws/package/compile/events/websockets/index.js      | 2 +-
 .../websockets/lib/{routeResponses.js => route-responses.js}    | 0
 .../lib/{routeResponses.test.js => route-responses.test.js}     | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/package/compile/events/websockets/lib/{routeResponses.js => route-responses.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/websockets/lib/{routeResponses.test.js => route-responses.test.js} (100%)

diff --git a/lib/plugins/aws/package/compile/events/websockets/index.js b/lib/plugins/aws/package/compile/events/websockets/index.js
index 9379042566f..91c693d623e 100644
--- a/lib/plugins/aws/package/compile/events/websockets/index.js
+++ b/lib/plugins/aws/package/compile/events/websockets/index.js
@@ -5,7 +5,7 @@ const BbPromise = require('bluebird');
 const validate = require('./lib/validate');
 const compileApi = require('./lib/api');
 const compileIntegrations = require('./lib/integrations');
-const compileRouteResponses = require('./lib/routeResponses');
+const compileRouteResponses = require('./lib/route-responses');
 const compilePermissions = require('./lib/permissions');
 const compileRoutes = require('./lib/routes');
 const compileDeployment = require('./lib/deployment');
diff --git a/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.js b/lib/plugins/aws/package/compile/events/websockets/lib/route-responses.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.js
rename to lib/plugins/aws/package/compile/events/websockets/lib/route-responses.js
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/route-responses.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/websockets/lib/route-responses.test.js

From 93d1c290433d60ca0be21023a6c2ca2f409d8d1d Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:38:15 +0100
Subject: [PATCH 1080/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6events?=
 =?UTF-8?q?/api-gateway/lib/hack/disassociateUsagePlan.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugins/aws/package/compile/events/api-gateway/index.js     | 2 +-
 .../{disassociateUsagePlan.js => disassociate-usage-plan.js}    | 0
 .../aws/package/compile/events/api-gateway/index.test.js        | 2 +-
 ...sociateUsagePlan.test.js => disassociate-usage-plan.test.js} | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/plugins/aws/package/compile/events/api-gateway/lib/hack/{disassociateUsagePlan.js => disassociate-usage-plan.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/{disassociateUsagePlan.test.js => disassociate-usage-plan.test.js} (99%)

diff --git a/lib/plugins/aws/package/compile/events/api-gateway/index.js b/lib/plugins/aws/package/compile/events/api-gateway/index.js
index 1801f1e462b..fb97605899f 100644
--- a/lib/plugins/aws/package/compile/events/api-gateway/index.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/index.js
@@ -273,7 +273,7 @@ class AwsCompileApigEvents {
       'before:remove:remove': async () => {
         const globalValidate = require('../../../../lib/validate').validate;
         const disassociateUsagePlan =
-          require('./lib/hack/disassociateUsagePlan').disassociateUsagePlan;
+          require('./lib/hack/disassociate-usage-plan').disassociateUsagePlan;
 
         return BbPromise.bind(this).then(globalValidate).then(disassociateUsagePlan);
       },
diff --git a/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociateUsagePlan.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociate-usage-plan.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociateUsagePlan.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociate-usage-plan.js
diff --git a/test/unit/lib/plugins/aws/package/compile/events/api-gateway/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/index.test.js
index 02a04370a7e..859980b861f 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/api-gateway/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/index.test.js
@@ -8,7 +8,7 @@ const Serverless = require('../../../../../../../../../lib/serverless');
 const validate = require('../../../../../../../../../lib/plugins/aws/lib/validate');
 const getServiceState = require('../../../../../../../../../lib/plugins/aws/lib/get-service-state');
 const updateStage = require('../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/lib/hack/updateStage');
-const disassociateUsagePlan = require('../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociateUsagePlan');
+const disassociateUsagePlan = require('../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociate-usage-plan');
 
 describe('AwsCompileApigEvents', () => {
   let awsCompileApigEvents;
diff --git a/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociateUsagePlan.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociate-usage-plan.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociateUsagePlan.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociate-usage-plan.test.js
index 02990b3a1cf..3ed389c7514 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociateUsagePlan.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociate-usage-plan.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const Serverless = require('../../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../../lib/plugins/aws/provider');
-const disassociateUsagePlan = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociateUsagePlan');
+const disassociateUsagePlan = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociate-usage-plan');
 
 describe('#disassociateUsagePlan()', () => {
   let serverless;

From 3f8b1a16bde1240bb1c2790b56aa6be60acc9daf Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:38:17 +0100
Subject: [PATCH 1081/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6e/comp?=
 =?UTF-8?q?ile/events/api-gateway/lib/hack/updateStage.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugins/aws/package/compile/events/api-gateway/index.js     | 2 +-
 .../api-gateway/lib/hack/{updateStage.js => update-stage.js}    | 0
 .../aws/package/compile/events/api-gateway/index.test.js        | 2 +-
 .../lib/hack/{updateStage.test.js => update-stage.test.js}      | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/plugins/aws/package/compile/events/api-gateway/lib/hack/{updateStage.js => update-stage.js} (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/{updateStage.test.js => update-stage.test.js} (99%)

diff --git a/lib/plugins/aws/package/compile/events/api-gateway/index.js b/lib/plugins/aws/package/compile/events/api-gateway/index.js
index fb97605899f..ef7f73c2050 100644
--- a/lib/plugins/aws/package/compile/events/api-gateway/index.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/index.js
@@ -263,7 +263,7 @@ class AwsCompileApigEvents {
         const getServiceState = require('../../../../lib/get-service-state').getServiceState;
 
         const state = getServiceState.call(this);
-        const updateStage = require('./lib/hack/updateStage').updateStage;
+        const updateStage = require('./lib/hack/update-stage').updateStage;
 
         this.state = state;
         return updateStage.call(this);
diff --git a/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/updateStage.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/update-stage.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/api-gateway/lib/hack/updateStage.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/hack/update-stage.js
diff --git a/test/unit/lib/plugins/aws/package/compile/events/api-gateway/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/index.test.js
index 859980b861f..2d3fc12240b 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/api-gateway/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/index.test.js
@@ -7,7 +7,7 @@ const AwsCompileApigEvents = require('../../../../../../../../../lib/plugins/aws
 const Serverless = require('../../../../../../../../../lib/serverless');
 const validate = require('../../../../../../../../../lib/plugins/aws/lib/validate');
 const getServiceState = require('../../../../../../../../../lib/plugins/aws/lib/get-service-state');
-const updateStage = require('../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/lib/hack/updateStage');
+const updateStage = require('../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/lib/hack/update-stage');
 const disassociateUsagePlan = require('../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociate-usage-plan');
 
 describe('AwsCompileApigEvents', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/updateStage.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/update-stage.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/updateStage.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/update-stage.test.js
index 22fcf633433..f1a020d669e 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/updateStage.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/update-stage.test.js
@@ -11,7 +11,7 @@ const AwsProvider = require('../../../../../../../../../../../lib/plugins/aws/pr
 const {
   updateStage,
   defaultApiGatewayLogLevel,
-} = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/lib/hack/updateStage');
+} = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/lib/hack/update-stage');
 const runServerless = require('../../../../../../../../../../utils/run-serverless');
 const fixtures = require('../../../../../../../../../../fixtures/programmatic');
 

From 88b52ab9b0427177159b90d7f435e12bc2aa6ea6 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:47:10 +0100
Subject: [PATCH 1082/1101] test: Rename `test/integrationPackage`

---
 package.json                                        |   2 +-
 .../cloudformation.tests.js                         |   0
 .../fixtures/artifact/artifact.zip                  | Bin
 .../fixtures/artifact/handler.js                    |   0
 .../fixtures/artifact/serverless.yml                |   0
 .../fixtures/individually-function/handler.js       |   0
 .../fixtures/individually-function/handler2.js      |   0
 .../fixtures/individually-function/serverless.yml   |   0
 .../fixtures/individually/handler.js                |   0
 .../fixtures/individually/handler2.js               |   0
 .../fixtures/individually/serverless.yml            |   0
 .../fixtures/regular/handler.js                     |   0
 .../fixtures/regular/serverless.yml                 |   0
 .../lambda-files.tests.js                           |   0
 14 files changed, 1 insertion(+), 1 deletion(-)
 rename test/{integrationPackage => integration-package}/cloudformation.tests.js (100%)
 rename test/{integrationPackage => integration-package}/fixtures/artifact/artifact.zip (100%)
 rename test/{integrationPackage => integration-package}/fixtures/artifact/handler.js (100%)
 rename test/{integrationPackage => integration-package}/fixtures/artifact/serverless.yml (100%)
 rename test/{integrationPackage => integration-package}/fixtures/individually-function/handler.js (100%)
 rename test/{integrationPackage => integration-package}/fixtures/individually-function/handler2.js (100%)
 rename test/{integrationPackage => integration-package}/fixtures/individually-function/serverless.yml (100%)
 rename test/{integrationPackage => integration-package}/fixtures/individually/handler.js (100%)
 rename test/{integrationPackage => integration-package}/fixtures/individually/handler2.js (100%)
 rename test/{integrationPackage => integration-package}/fixtures/individually/serverless.yml (100%)
 rename test/{integrationPackage => integration-package}/fixtures/regular/handler.js (100%)
 rename test/{integrationPackage => integration-package}/fixtures/regular/serverless.yml (100%)
 rename test/{integrationPackage => integration-package}/lambda-files.tests.js (100%)

diff --git a/package.json b/package.json
index 1f2b6bebd8d..ccaf44a3c78 100644
--- a/package.json
+++ b/package.json
@@ -197,7 +197,7 @@
     "integration-test-cleanup": "node test/utils/aws-cleanup.js",
     "integration-test-run-all": "mocha-isolated --pass-through-aws-creds --skip-fs-cleanup-check --max-workers=20 \"test/integration/**/*.test.js\"",
     "integration-test-run-basic": "mocha test/integration-basic.test.js",
-    "integration-test-run-package": "mocha-isolated --skip-fs-cleanup-check test/integrationPackage/**/*.tests.js",
+    "integration-test-run-package": "mocha-isolated --skip-fs-cleanup-check test/integration-package/**/*.tests.js",
     "integration-test-setup": "node ./scripts/test/integration-setup/index.js",
     "integration-test-teardown": "node ./scripts/test/integration-teardown.js",
     "lint": "eslint .",
diff --git a/test/integrationPackage/cloudformation.tests.js b/test/integration-package/cloudformation.tests.js
similarity index 100%
rename from test/integrationPackage/cloudformation.tests.js
rename to test/integration-package/cloudformation.tests.js
diff --git a/test/integrationPackage/fixtures/artifact/artifact.zip b/test/integration-package/fixtures/artifact/artifact.zip
similarity index 100%
rename from test/integrationPackage/fixtures/artifact/artifact.zip
rename to test/integration-package/fixtures/artifact/artifact.zip
diff --git a/test/integrationPackage/fixtures/artifact/handler.js b/test/integration-package/fixtures/artifact/handler.js
similarity index 100%
rename from test/integrationPackage/fixtures/artifact/handler.js
rename to test/integration-package/fixtures/artifact/handler.js
diff --git a/test/integrationPackage/fixtures/artifact/serverless.yml b/test/integration-package/fixtures/artifact/serverless.yml
similarity index 100%
rename from test/integrationPackage/fixtures/artifact/serverless.yml
rename to test/integration-package/fixtures/artifact/serverless.yml
diff --git a/test/integrationPackage/fixtures/individually-function/handler.js b/test/integration-package/fixtures/individually-function/handler.js
similarity index 100%
rename from test/integrationPackage/fixtures/individually-function/handler.js
rename to test/integration-package/fixtures/individually-function/handler.js
diff --git a/test/integrationPackage/fixtures/individually-function/handler2.js b/test/integration-package/fixtures/individually-function/handler2.js
similarity index 100%
rename from test/integrationPackage/fixtures/individually-function/handler2.js
rename to test/integration-package/fixtures/individually-function/handler2.js
diff --git a/test/integrationPackage/fixtures/individually-function/serverless.yml b/test/integration-package/fixtures/individually-function/serverless.yml
similarity index 100%
rename from test/integrationPackage/fixtures/individually-function/serverless.yml
rename to test/integration-package/fixtures/individually-function/serverless.yml
diff --git a/test/integrationPackage/fixtures/individually/handler.js b/test/integration-package/fixtures/individually/handler.js
similarity index 100%
rename from test/integrationPackage/fixtures/individually/handler.js
rename to test/integration-package/fixtures/individually/handler.js
diff --git a/test/integrationPackage/fixtures/individually/handler2.js b/test/integration-package/fixtures/individually/handler2.js
similarity index 100%
rename from test/integrationPackage/fixtures/individually/handler2.js
rename to test/integration-package/fixtures/individually/handler2.js
diff --git a/test/integrationPackage/fixtures/individually/serverless.yml b/test/integration-package/fixtures/individually/serverless.yml
similarity index 100%
rename from test/integrationPackage/fixtures/individually/serverless.yml
rename to test/integration-package/fixtures/individually/serverless.yml
diff --git a/test/integrationPackage/fixtures/regular/handler.js b/test/integration-package/fixtures/regular/handler.js
similarity index 100%
rename from test/integrationPackage/fixtures/regular/handler.js
rename to test/integration-package/fixtures/regular/handler.js
diff --git a/test/integrationPackage/fixtures/regular/serverless.yml b/test/integration-package/fixtures/regular/serverless.yml
similarity index 100%
rename from test/integrationPackage/fixtures/regular/serverless.yml
rename to test/integration-package/fixtures/regular/serverless.yml
diff --git a/test/integrationPackage/lambda-files.tests.js b/test/integration-package/lambda-files.tests.js
similarity index 100%
rename from test/integrationPackage/lambda-files.tests.js
rename to test/integration-package/lambda-files.tests.js

From 358a1cf2c76fd3c005fb74995e43dad727c97fa0 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:52:37 +0100
Subject: [PATCH 1083/1101] refactor: Rename
 `lib/plugins/aws/package/compile/events/eventBridge`

---
 .../compile/events/{eventBridge => event-bridge}/index.js       | 0
 .../compile/events/{eventBridge => event-bridge}/utils.js       | 0
 lib/plugins/index.js                                            | 2 +-
 .../compile/events/{eventBridge => event-bridge}/index.test.js  | 0
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/plugins/aws/package/compile/events/{eventBridge => event-bridge}/index.js (100%)
 rename lib/plugins/aws/package/compile/events/{eventBridge => event-bridge}/utils.js (100%)
 rename test/unit/lib/plugins/aws/package/compile/events/{eventBridge => event-bridge}/index.test.js (100%)

diff --git a/lib/plugins/aws/package/compile/events/eventBridge/index.js b/lib/plugins/aws/package/compile/events/event-bridge/index.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/eventBridge/index.js
rename to lib/plugins/aws/package/compile/events/event-bridge/index.js
diff --git a/lib/plugins/aws/package/compile/events/eventBridge/utils.js b/lib/plugins/aws/package/compile/events/event-bridge/utils.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/eventBridge/utils.js
rename to lib/plugins/aws/package/compile/events/event-bridge/utils.js
diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index d72064b12ee..cef445cb550 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -49,7 +49,7 @@ module.exports = [
   require('./aws/package/compile/events/cloud-watch-event.js'),
   require('./aws/package/compile/events/cloud-watch-log.js'),
   require('./aws/package/compile/events/cognito-user-pool.js'),
-  require('./aws/package/compile/events/eventBridge/index.js'),
+  require('./aws/package/compile/events/event-bridge/index.js'),
   require('./aws/package/compile/events/sqs.js'),
   require('./aws/package/compile/events/cloud-front.js'),
   require('./aws/package/compile/events/http-api'),
diff --git a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/event-bridge/index.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/event-bridge/index.test.js

From 95e308dc880908960b41b5fe4950762ca6feb04e Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:55:52 +0100
Subject: [PATCH 1084/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6s/pack?=
 =?UTF-8?q?age/compile/events/alb/lib/healthCheck.test.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../events/alb/lib/{healthCheck.test.js => health-check.test.js}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/unit/lib/plugins/aws/package/compile/events/alb/lib/{healthCheck.test.js => health-check.test.js} (100%)

diff --git a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/healthCheck.test.js b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/health-check.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/compile/events/alb/lib/healthCheck.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/alb/lib/health-check.test.js

From c15004519b51b6799e617150ad77c09258715122 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Tue, 25 Jan 2022 13:57:04 +0100
Subject: [PATCH 1085/1101] =?UTF-8?q?refactor:=20Rename=20`=E2=80=A6nts/ap?=
 =?UTF-8?q?i-gateway/lib/method/requestParameters.test.js`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{requestParameters.test.js => request-parameters.test.js}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/method/{requestParameters.test.js => request-parameters.test.js} (100%)

diff --git a/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/method/requestParameters.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/method/request-parameters.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/method/requestParameters.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/method/request-parameters.test.js

From ad1faa3a1458dfc18628a54a844937adf4b24297 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 27 Jan 2022 15:31:26 +0100
Subject: [PATCH 1086/1101] chore: Bump dependencies

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index ccaf44a3c78..0c800b41e51 100644
--- a/package.json
+++ b/package.json
@@ -25,10 +25,10 @@
     "@serverless/dashboard-plugin": "^6.0.0",
     "@serverless/platform-client": "^4.3.0",
     "@serverless/utils": "^6.0.0",
-    "ajv": "^8.8.2",
+    "ajv": "^8.9.0",
     "ajv-formats": "^2.1.1",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.1062.0",
+    "aws-sdk": "^2.1064.0",
     "bluebird": "^3.7.2",
     "cachedir": "^2.3.0",
     "chalk": "^4.1.2",
@@ -80,7 +80,7 @@
     "@serverless/eslint-config": "^4.0.0",
     "@serverless/test": "^9.0.0",
     "adm-zip": "^0.5.9",
-    "chai": "^4.3.4",
+    "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
     "cos-nodejs-sdk-v5": "^2.11.6",
     "eslint": "^7.32.0",

From 16c29dab2343e2376130644099dbb64797660268 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 27 Jan 2022 15:31:43 +0100
Subject: [PATCH 1087/1101] chore: Release v3.0.0

---
 CHANGELOG.md | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++
 package.json |   2 +-
 2 files changed, 119 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6fcff08ec5..88e917a3390 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,124 @@
 
 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.
 
+## [3.0.0](https://github.com/serverless/serverless/compare/v2.72.2...v3.0.0) (2022-01-27)
+
+### ⚠ BREAKING CHANGES
+
+- **Variables:** Old variables resolver is permanently removed. Any resolution error as approached with current resolver is assumed as final (there's no longer fallback to old resolver)
+- **AWS Lambda:**
+  - Default lambda hashing algorithm was changed to `20201221`
+  - Runtimes `nodejs10.x`, `python2.7`, `ruby2.5` and `dotnetcore2.1` reached end of support on AWS and are no longer recognized in configuration.
+  - Default runtime has been changed from `nodejs12.x` to `nodejs14.x`
+  - Properties `service.awsKmsKeyArn` and `functions[].awsKmsKeyArn` are no longer supported. Use `provider.kmsKeyArn` and `functions[].kmsKeyArn` instead.
+- **CLI:**
+  - CLI params put before command tokens are no longer recgonized (e.g. `sls -f <function-name> deploy function` will no longer work). In all cases construct CLI args in `sls <command> <options>` order
+  - Unrecognized CLI options will no longer be supported and will result in an error.
+  - `enableLocalInstallationFallback` configuration property is no longer supported.
+  - Remove `studio` command schema
+  - The `--verbose` CLI flag does no longer support `-v` alias
+  - Opt-in tab-tab autocompletion feature is removed due to performance and security issues
+- **AWS API Gateway:**
+  - Enabling logs or tracing for imported API Gateway will now result in an error instead of warning
+  - For authorizers with `request` type and caching disabled (`resultTtlInSeconds: 0`), the `identitySource` will no longer be set to `method.request.header.Authorization` by default.
+  - Support for `usagePlan`, `resourcePolicy` and `apiKeys` on `provider` level is removed. Use `provider.apiGateway` level instead to set them.
+  - Support for `http.request.schema` has been removed and replaced with `http.request.schemas`.
+- **AWS HTTP API:** Tags from `provider.tags` are applied by default to HTTP API Gateway.
+- **AWS CloudFront:** Support for `MinTTL`, `MaxTTL`, `DefaultTTL` and `ForwardedValues` on `cloudfront.behavior` has been removed.
+- **AWS EventBridge:** By default, EventBridge resources now will be deployed using native CloudFormation resources instead of Custom Resources.
+- **AWS Alexa:** Support for simple `alexaSkill` event was removed and now `appId` is required for all `alexaSkill` events.- Serverless Components (`@serverless/components`) CLI is no longer integrated with Framework CLI.
+- **Dashboard:** `tenant` configuration setting is no longer respected. Ensure to rely on `org` instead
+- Serverless Components v1 (`@serverless/cli`) CLI is no longer integrated with Framework CLI.
+- Custom nested configuration paths will no longer be supported and such usage will result in an error.
+- Object notation is no longer supported for `service` property. Set name directly to `service`.
+- When creating `Serverless` class instance programatically, both `options` and `commands` have to be passed via `config` to the constructor.
+- Duplicate plugin definition in configuration will now result in an error instead of a warning.
+- Using `--aws-s3-accelerate` flag will result in an error instead of deprecation when custom S3 bucket is used.
+- Removed support for `provider.disableDefaultOutputExportNames`
+- Node.js versions lower than 12 is no longer supported
+- Lifecycle events marked as deprecated (in context of v1) are no longer evaluated
+
+### Features
+
+- **Variables:** Remove old variables resolver ([9bf6c16](https://github.com/serverless/serverless/commit/9bf6c16cb787ae48092d90bd7613d86a1c8ca075))
+- **Packaging:** Deprecate `package.include` and `package.exclude` ([aa4f9e3](https://github.com/serverless/serverless/commit/aa4f9e344e313f1ca64fa7af9475e6b84be8fb56))
+- **CLI:**
+  - Deprecate support for `deploy -f` alias ([09c9ea3](https://github.com/serverless/serverless/commit/09c9ea3a38afc30c1c15d21c926b8d06dfd81356))
+  - Deprecate missing options schema ([0db9c49](https://github.com/serverless/serverless/commit/0db9c49e2d435499e2b836b948e815b4a8839521))
+  - Deprecate recognition of `projectDir` configuration setting ([00fcd83](https://github.com/serverless/serverless/commit/00fcd83f49703188f3ddb0317afaa88fbece4801))
+  - Global `--debug` flag for debug logging ([3b4f267](https://github.com/serverless/serverless/commit/3b4f2677f8d83fd76a47bfac781bf1b81bfec924))
+  - Global `--verbose` flag for verbose logging ([2eef264](https://github.com/serverless/serverless/commit/2eef264bdca3dc7ae270aa09b974f23546425344))
+  - Register `-v` as global `--version` alias ([211db81](https://github.com/serverless/serverless/commit/211db8149cad519174490fbb5d2f1f42f859aabb))
+  - Remove `-v` alias for `--verbose` flag ([03b77c0](https://github.com/serverless/serverless/commit/03b77c0d2392e74f7d5caf76b9c01675d6d14023))
+  - Remove support for unrecognized cli options ([7c2b2ea](https://github.com/serverless/serverless/commit/7c2b2ea6a84c62fcb5c8830c16437376002b2a10))
+  - Simplify CLI args parsing to <command> <options> format ([8229812](https://github.com/serverless/serverless/commit/8229812e2bd1632efd9c8c8999236f6dff79171c))
+  - Support `serverless-tencent` CLI ([10db944](https://github.com/serverless/serverless/commit/10db944c73357014db20062c70ec666898505b0f))
+  - Do not decorate `cli.log` logs ([1f44227](https://github.com/serverless/serverless/commit/1f44227b7feeef30ca2ac151fffe219bde6a8461))
+  - Expose `sls doctor` command ([d403bfc](https://github.com/serverless/serverless/commit/d403bfc94eb13490d6a91d3352ae3b163caa6d68))
+  - Remove `studio` command schema ([7f1e7e1](https://github.com/serverless/serverless/commit/7f1e7e163b65580a2f0d10cad012f69605f32b18))
+  - Remove tab autocomplete feature ([519ce0c](https://github.com/serverless/serverless/commit/519ce0cb77056ba53be92968958f55f8eb7cc779))
+- **AWS Lambda:**
+  - Change default hashing algorithm ([775debf](https://github.com/serverless/serverless/commit/775debf5e2bebc51346853d99d109776f9856cee))
+  - Change default runtime to `nodejs14.x` ([30e99fb](https://github.com/serverless/serverless/commit/30e99fb92f72a968f8e1c9a1ddbbb81a6bdc5288))
+  - Remove support for `awsKmsKeyArn` setting ([6de37bf](https://github.com/serverless/serverless/commit/6de37bf3b7c14ca84a32188b377e92dfbd0af473))
+  - Remove support for obsolete runtimes ([23cfb63](https://github.com/serverless/serverless/commit/23cfb63cdf400ac4601f13571554f4d8fc5ee0cd))
+- **AWS HTTP API:**
+  - Always apply `provider.tags` to HTTP API ([b34d549](https://github.com/serverless/serverless/commit/b34d5497b6290635037f6d8f3b65451803ef6027))
+  - Deprecate `provider.httpApi.useProviderTags` ([fee410a](https://github.com/serverless/serverless/commit/fee410a445b088d4fb86074924604208043934c0))
+- **AWS API Gateway:**
+  - Change default identity source for authorizers ([1139255](https://github.com/serverless/serverless/commit/11392557d2800cdf226bd17bd32407f61a9dba52))
+  - Error on tracing or logs set for external API ([64ea6e5](https://github.com/serverless/serverless/commit/64ea6e59b5bbd1c807a948fd092c5792923e9559))
+  - Remove API specific settings from `provider` ([99941f0](https://github.com/serverless/serverless/commit/99941f0a5723aef0395ea0fb5b059e9ade8321b4))
+  - Remove support for `request.schema` ([b8019d8](https://github.com/serverless/serverless/commit/b8019d82ccabf732a75c2f97c958b84efb1e43ef))
+- **AWS CloudFront:** Remove support for deprecated `behavior` props ([c22277f](https://github.com/serverless/serverless/commit/c22277f69c327f271ea5cd51c98538c9b4eb7b1b))
+- **AWS EventBridge:** Change default deployment method to native CF ([46956f3](https://github.com/serverless/serverless/commit/46956f3e9f5dde9367669b0d9c1ca2dc454bfc8e))
+- **AWS IAM:** Deprecate IAM settings grouped directly at `provider` ([d7fd239](https://github.com/serverless/serverless/commit/d7fd23997f570c868437a5ea0187797403f8fe0a))
+- **Plugins:** Pass log writers to plugin constructor ([57079b7](https://github.com/serverless/serverless/commit/57079b78a671d7756c768f3136518f6a6f46d8ef))
+- **Config Schema:** Deprecate `warn` as a validation mode default ([6e27cc1](https://github.com/serverless/serverless/commit/6e27cc18c6c50fbd3311427e92c9e7f16055ae85))
+- **Standalone:** Upgrade `npm` to v8 ([6bfdc0c](https://github.com/serverless/serverless/commit/6bfdc0cda4b2009e4433f2fda45356c5d297c172))
+- **Dashboard:** Drop support for `tenant` ([9894875](https://github.com/serverless/serverless/commit/98948750e6cb856c62f1b4f4138a5157da07ae7e))
+- **AWS Alexa:** Remove support for alexaSkill without appId ([a9edd06](https://github.com/serverless/serverless/commit/a9edd063039a41fee1679827f7abe0e754036b45))
+- Disallow custom nested configuration path ([aeb9a57](https://github.com/serverless/serverless/commit/aeb9a57681cc3ff67c6dedbbf051b0c42d8ba6bb))
+- Error instead of warning when missing "commands" or "options" ([f86f691](https://github.com/serverless/serverless/commit/f86f69131678a3a9be13acaeba0b56b751e6ce57))
+- Remove `@serverless/cli` CLI integration ([396cfb9](https://github.com/serverless/serverless/commit/396cfb9621a5db211e2853b8105386103f9f097c))
+- Remove `@serverless/components` CLI integration ([3395395](https://github.com/serverless/serverless/commit/33953958ae354b240e6d949b889e376dcce09cc8))
+- Remove support for `provider.disableDefaultOutputExportNames` ([a9cd331](https://github.com/serverless/serverless/commit/a9cd3317b2e68b1b08c3f7388a2d4d459db1f2d7))
+- Remove support for Node v10 ([90f00b7](https://github.com/serverless/serverless/commit/90f00b7c02113932034f4e3ee3ef659b1ec0db02))
+- Remove support for object notation for `service` ([bccd188](https://github.com/serverless/serverless/commit/bccd188a0da7fe335b3e2b573f3ab19ccd0c49f8))
+- Restrict stage name with pattern ([c8c9f49](https://github.com/serverless/serverless/commit/c8c9f49fd239df723e3841fbfe22abdb90c02dae))
+- Simplify `logs` command output ([d4124a3](https://github.com/serverless/serverless/commit/d4124a3ca6d3895289ef605d4dc6e5eb0cd2e3df))
+- Support `params` configuration ([4675b57](https://github.com/serverless/serverless/commit/4675b57117e7d850a6015ab97c81938b9f374bf1))
+- Throw error on duplicated plugin definition ([d3aca0a](https://github.com/serverless/serverless/commit/d3aca0a7955c48b123720a887e6dd7300475fe03))
+- Throw for `--aws-s3-accelerate` when custom bucket used ([b7d48e5](https://github.com/serverless/serverless/commit/b7d48e59fdbe2a2056c6352d6ac33d4c43099e53))
+- Unconditionally fallback when local installation found ([137554c](https://github.com/serverless/serverless/commit/137554c9d35eb14bf3bba654673b99d343c0a7d1))
+
+### Maintenance Improvements
+
+- **AWS Deploy:** Use change sets in CF deployments ([e2c65a2](https://github.com/serverless/serverless/commit/e2c65a2230b9bf9fb78c7445b02d3ee4945ee1aa))
+- Adapt to rename in `@serverless/dashboard-plugin` ([88234a5](https://github.com/serverless/serverless/commit/88234a51233e74b3155427a5bf0a4022ec182c04))
+- **CLI Onboarding:** Download templates from v3 examples branch ([ded1b0e](https://github.com/serverless/serverless/commit/ded1b0e832c420871ffe37fedff0afe990d1d3e6))
+- **CLI:**
+  - Convert `isLocallyInstalled` to export result directly ([ad0bbb0](https://github.com/serverless/serverless/commit/ad0bbb0a9161bc823d1c542e6dbf993f436f6b5a))
+  - Export resolved local installation path directly ([fb3b39a](https://github.com/serverless/serverless/commit/fb3b39a5a9bd35e211600530a30fc5583deec0db))
+  - Improve post install log to reflect modern style ([843764b](https://github.com/serverless/serverless/commit/843764baf837f195ec8ee911f103c9f3817f9a10))
+  - Improve progress for CloudFormation updates ([14b1443](https://github.com/serverless/serverless/commit/14b14432730c77ca34d41000e9aaaad0c29ffb35))
+  - Seclude `paramRegExp` ([703e40f](https://github.com/serverless/serverless/commit/703e40f0d217d925560ba2c1d43b403bb61d335b))
+  - Seclude uncaught exception handling ([b4bd0d4](https://github.com/serverless/serverless/commit/b4bd0d437074a29a972ecdbdc3a026554657817e))
+  - Simplify deploy function args patch ([6527f8a](https://github.com/serverless/serverless/commit/6527f8a583e967a3b68b5cec1f72460cf307117a))
+  - Unify finalization of a process handling ([29357f4](https://github.com/serverless/serverless/commit/29357f4e182f102504e5ea841fb95915ccfe6821))
+  - Move `isLocalyInstalled` util to CLI context ([3dc8395](https://github.com/serverless/serverless/commit/3dc8395d88dfebf4742625ec054955c40a4e2499))
+- **Config Schema:** Do not rely on `ajv-keywords` ([#10490](https://github.com/serverless/serverless/issues/10490)) ([4a22a4e](https://github.com/serverless/serverless/commit/4a22a4e58cd8c10d6da34a094a0768b5caafbdb9))
+- **Telemetry:** Include `paramsCount` in telemetry ([dd721b0](https://github.com/serverless/serverless/commit/dd721b0a2038e4b7256593397b5db19833cef387))
+- Rely on `require.resolve` to detect wether module exist ([040be5f](https://github.com/serverless/serverless/commit/040be5fe7321e051bb6e5e1aa78458c17d2582bc))
+- Remove `legacy` logs ([a92ab91](https://github.com/serverless/serverless/commit/a92ab917128629e4e516d69976fdac1014cb5ebb))
+- Remove `lib/classes/Error.js` ([44391fa](https://github.com/serverless/serverless/commit/44391fac513c7941447d03bdeae95043590cc52c))
+- Remove evaluation of deprecated lifecycle events ([34bb51e](https://github.com/serverless/serverless/commit/34bb51e71d542e31a13cfb0f56443d57b6e0f89a))
+- Remove internal `suppressLogIfPrintCommand` method ([584286e](https://github.com/serverless/serverless/commit/584286ec7aba94ac96eb747361f79fafb7c0f32b))
+- Unify file naming convention
+- Replace `ncjsm/resolve` usage with native `createRequire` ([d18efc2](https://github.com/serverless/serverless/commit/d18efc2d43789dc11857d677851ba4b66e09a6a4))
+- Upgrade `@serverless/utils` to v6 ([74d9c70](https://github.com/serverless/serverless/commit/74d9c70f8abbfab1af4c6440ed93fd163145a597))
+- Upgrade `ajv` to `v8` along with related packages ([15cd724](https://github.com/serverless/serverless/commit/15cd724f723b55ca73cd0bb00d41d67307ffbed8))
+
 ### [2.72.2](https://github.com/serverless/serverless/compare/v2.72.1...v2.72.2) (2022-01-24)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 0c800b41e51..35eedca2e26 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.72.2",
+  "version": "3.0.0",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From 772a9bb86c4b9b4e65f5f834c39620359cfc7c7a Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 27 Jan 2022 18:49:21 +0100
Subject: [PATCH 1088/1101] refactor(CLI Onboarding): Minor wording adjustments

---
 lib/cli/interactive-setup/dashboard-set-org.js    | 4 +++-
 lib/cli/interactive-setup/deploy.js               | 2 +-
 test/unit/lib/cli/interactive-setup/index.test.js | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/cli/interactive-setup/dashboard-set-org.js b/lib/cli/interactive-setup/dashboard-set-org.js
index 7d8906ff0ed..ae17d924699 100644
--- a/lib/cli/interactive-setup/dashboard-set-org.js
+++ b/lib/cli/interactive-setup/dashboard-set-org.js
@@ -189,7 +189,9 @@ const steps = {
       }
     }
     log.notice();
-    log.notice.success(`Your project has been setup with org "${orgName}" and app "${appName}"`);
+    log.notice.success(
+      `Your project is ready to be deployed to Serverless Dashboard (org: "${orgName}", app: "${appName}")`
+    );
     await writeOrgAndApp(orgName, appName, context);
     return;
   },
diff --git a/lib/cli/interactive-setup/deploy.js b/lib/cli/interactive-setup/deploy.js
index 5f0d0f2a5b4..15ee21144dd 100644
--- a/lib/cli/interactive-setup/deploy.js
+++ b/lib/cli/interactive-setup/deploy.js
@@ -56,7 +56,7 @@ module.exports = {
     const { configuration, configurationFilename, serviceDir, stepHistory } = context;
     const shouldDeploy = await promptWithHistory({
       name: 'shouldDeploy',
-      message: 'Do you want to deploy your project?',
+      message: 'Do you want to deploy now?',
       stepHistory,
       type: 'confirm',
     });
diff --git a/test/unit/lib/cli/interactive-setup/index.test.js b/test/unit/lib/cli/interactive-setup/index.test.js
index a55d0267a4a..94e8df296cf 100644
--- a/test/unit/lib/cli/interactive-setup/index.test.js
+++ b/test/unit/lib/cli/interactive-setup/index.test.js
@@ -56,7 +56,7 @@ describe('test/unit/lib/cli/interactive-setup/index.test.js', () => {
       },
 
       // deploy
-      { instructionString: 'Do you want to deploy your project?', input: 'n' },
+      { instructionString: 'Do you want to deploy now?', input: 'n' },
     ];
     slsProcess.stdout.on('data', (data) => {
       output += data;

From e98d699e7800780e7d56340d778116e1b3b5b005 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Thu, 27 Jan 2022 18:24:35 +0100
Subject: [PATCH 1089/1101] fix: Report more meaningful strict schema mode
 error

---
 .../config-schema-handler/resolve-ajv-validate.js  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/classes/config-schema-handler/resolve-ajv-validate.js b/lib/classes/config-schema-handler/resolve-ajv-validate.js
index 4a5a6423186..e1092b1b162 100644
--- a/lib/classes/config-schema-handler/resolve-ajv-validate.js
+++ b/lib/classes/config-schema-handler/resolve-ajv-validate.js
@@ -9,6 +9,7 @@ const fs = require('fs');
 const requireFromString = require('require-from-string');
 const deepSortObjectByKey = require('../../utils/deep-sort-object-by-key');
 const ensureExists = require('../../utils/ensure-exists');
+const ServerlessError = require('../../serverless-error');
 
 const getCacheDir = () => {
   return path.resolve(
@@ -45,7 +46,18 @@ const getValidate = async (schema) => {
     // See: https://github.com/ajv-validator/ajv/issues/1390#issuecomment-763138202
     ajv.opts.code.formats = Ajv._`require("ajv-formats/dist/formats").fullFormats`;
     ajv.addKeyword(require('./regexp-keyword'));
-    const validate = ajv.compile(schema);
+    let validate;
+    try {
+      validate = ajv.compile(schema);
+    } catch (err) {
+      if (err.message && err.message.includes('strict mode')) {
+        throw new ServerlessError(
+          'At least one of the plugins defines a validation schema that is invalid. Try disabling plugins one by one to identify the problematic plugin and report it to the plugin maintainers.',
+          'SCHEMA_FAILS_STRICT_MODE'
+        );
+      }
+      throw err;
+    }
     const moduleCode = standaloneCode(ajv, validate);
     await fs.promises.writeFile(cachePath, moduleCode);
   };

From 464f99c1d0267d536684d67fdc908332f5a1817b Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 28 Jan 2022 10:43:14 +0100
Subject: [PATCH 1090/1101] docs: Add information about setting
 `frameworkVersion`

---
 docs/guides/upgrading-v3.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/guides/upgrading-v3.md b/docs/guides/upgrading-v3.md
index 14ba28a9d9b..d2be60d54fd 100644
--- a/docs/guides/upgrading-v3.md
+++ b/docs/guides/upgrading-v3.md
@@ -47,6 +47,14 @@ If you [installed `serverless` as a standalone binary](../getting-started.md#ins
 - MacOS/Linux standalone binary: `serverless upgrade --major`
 - Windows: `choco upgrade serverless`
 
+## Update `frameworkVersion` setting for v3
+
+In all projects that you want to upgrade to Serverless Framework v3, you need to make sure that `frameworkVersion` specified in project configuration allows v3 version. You can achieve it by setting it in the following manner:
+
+```yml
+frameworkVersion: '3'
+```
+
 ## Using v2 and v3 in different projects
 
 It is possible to use v3 in some projects and v2 in other projects. To achieve that, install the Serverless Framework locally via NPM (`npm i --save-dev serverless`).

From 88ac3d0586b3ed98ee0c1b7c618cbca095ee85d3 Mon Sep 17 00:00:00 2001
From: Paul Lessing <lessing.paul+github@gmail.com>
Date: Fri, 28 Jan 2022 14:01:40 +0000
Subject: [PATCH 1091/1101] fix(Templates): Update dependencies of
 `aws-nodejs-typescript` to v3

---
 .../create/templates/aws-nodejs-typescript/package.json       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/package.json b/lib/plugins/create/templates/aws-nodejs-typescript/package.json
index 52e6f538a56..8e082290f5d 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/package.json
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/package.json
@@ -14,12 +14,12 @@
     "@middy/http-json-body-parser": "^2.5.3"
   },
   "devDependencies": {
-    "@serverless/typescript": "^2.23.0",
+    "@serverless/typescript": "^3.0.0",
     "@types/aws-lambda": "^8.10.71",
     "@types/node": "^14.14.25",
     "esbuild": "^0.14.11",
     "json-schema-to-ts": "^1.5.0",
-    "serverless": "^2.23.0",
+    "serverless": "^3.0.0",
     "serverless-esbuild": "^1.23.3",
     "ts-node": "^10.4.0",
     "tsconfig-paths": "^3.9.0",

From bef426d4e0f58f45d26906bbb96d1e6116ad052e Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 28 Jan 2022 15:02:57 +0100
Subject: [PATCH 1092/1101] chore: Bump dependencies

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 35eedca2e26..b83df2426cb 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "ajv": "^8.9.0",
     "ajv-formats": "^2.1.1",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.1064.0",
+    "aws-sdk": "^2.1065.0",
     "bluebird": "^3.7.2",
     "cachedir": "^2.3.0",
     "chalk": "^4.1.2",

From 4cdaa52ac069b0d78160253218ff4a14191ca3ff Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Fri, 28 Jan 2022 15:08:20 +0100
Subject: [PATCH 1093/1101] chore: Release v3.0.1

---
 CHANGELOG.md | 14 ++++++++++++++
 package.json |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88e917a3390..e3d6285d427 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 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.
 
+### [3.0.1](https://github.com/serverless/serverless/compare/v3.0.0...v3.0.1) (2022-01-28)
+
+### Bug Fixes
+
+- Report more meaningful strict schema mode error ([#10574](https://github.com/serverless/serverless/pull/10574)) ([e98d699](https://github.com/serverless/serverless/commit/e98d699e7800780e7d56340d778116e1b3b5b005)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Maintenance Improvements
+
+- **CLI Onboarding:** Minor wording adjustments ([#10575](https://github.com/serverless/serverless/pull/10575)) ([772a9bb](https://github.com/serverless/serverless/commit/772a9bb86c4b9b4e65f5f834c39620359cfc7c7a)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Templates
+
+- Update dependencies of `aws-nodejs-typescript` to v3 ([#10582](https://github.com/serverless/serverless/pull/10582)) ([88ac3d0](https://github.com/serverless/serverless/commit/88ac3d0586b3ed98ee0c1b7c618cbca095ee85d3)) ([Paul Lessing](https://github.com/paullessing))
+
 ## [3.0.0](https://github.com/serverless/serverless/compare/v2.72.2...v3.0.0) (2022-01-27)
 
 ### ⚠ BREAKING CHANGES
diff --git a/package.json b/package.json
index b83df2426cb..bbeea593014 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",

From f77477e3cc6c0c13749af1352d28b88cbadbeb6b Mon Sep 17 00:00:00 2001
From: Jeremy Care <carejeremy@gmail.com>
Date: Fri, 28 Jan 2022 10:07:36 -0500
Subject: [PATCH 1094/1101] feat: Recognize `ap-southeast-3` AWS region
 (#10586)

---
 lib/plugins/aws/provider.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index 865dba13014..0c0de407da4 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -1107,6 +1107,7 @@ class AwsProvider {
                 'ap-south-1',
                 'ap-southeast-1',
                 'ap-southeast-2',
+                'ap-southeast-3',
                 'ca-central-1',
                 'cn-north-1',
                 'cn-northwest-1',

From 6f3cb208f685a66bcbeb66813c6e712870cd2c1b Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Fri, 28 Jan 2022 17:16:52 +0100
Subject: [PATCH 1095/1101] docs: Complete v3.0.0 changelog

---
 CHANGELOG.md | 152 +++++++++++++++++++++++++++------------------------
 1 file changed, 82 insertions(+), 70 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3d6285d427..5067688aca4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,8 +18,20 @@ All notable changes to this project will be documented in this file. See [standa
 
 ## [3.0.0](https://github.com/serverless/serverless/compare/v2.72.2...v3.0.0) (2022-01-27)
 
+We are excited to announce the release of Serverless Framework v3!
+
+This new major version brings **a cleaner and redesigned CLI experience** as well as a brand new feature: **stage parameters**.
+
+Read all about Serverless Framework v3 **[in the official blog post](https://www.serverless.com/blog/serverless-framework-v3-is-live)**.
+
+<a title="Serverless Framework v3 is live!" href="https://www.serverless.com/blog/serverless-framework-v3-is-live"><img src="https://assets-global.website-files.com/60acbb950c4d66d0ab3e2007/6193d4f3300e602de28a56e8_6193d008f4d92d593c0e6fb1_6193c1d7c81caf0fa82bbe65_terminal-light.gif" width="700"></a>
+
+---
+
 ### ⚠ BREAKING CHANGES
 
+Read the [**complete v3 Upgrade Guide**](https://www.serverless.com/framework/docs/guides/upgrading-v3).
+
 - **Variables:** Old variables resolver is permanently removed. Any resolution error as approached with current resolver is assumed as final (there's no longer fallback to old resolver)
 - **AWS Lambda:**
   - Default lambda hashing algorithm was changed to `20201221`
@@ -55,84 +67,84 @@ All notable changes to this project will be documented in this file. See [standa
 
 ### Features
 
-- **Variables:** Remove old variables resolver ([9bf6c16](https://github.com/serverless/serverless/commit/9bf6c16cb787ae48092d90bd7613d86a1c8ca075))
-- **Packaging:** Deprecate `package.include` and `package.exclude` ([aa4f9e3](https://github.com/serverless/serverless/commit/aa4f9e344e313f1ca64fa7af9475e6b84be8fb56))
+- **Variables:** Remove old variables resolver ([#10512](https://github.com/serverless/serverless/issues/10512)) ([9bf6c16](https://github.com/serverless/serverless/commit/9bf6c16cb787ae48092d90bd7613d86a1c8ca075)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Packaging:** Deprecate `package.include` and `package.exclude` ([#10348](https://github.com/serverless/serverless/issues/10348)) ([aa4f9e3](https://github.com/serverless/serverless/commit/aa4f9e344e313f1ca64fa7af9475e6b84be8fb56)) ([Mariusz Nowak](https://github.com/medikoo))
 - **CLI:**
-  - Deprecate support for `deploy -f` alias ([09c9ea3](https://github.com/serverless/serverless/commit/09c9ea3a38afc30c1c15d21c926b8d06dfd81356))
-  - Deprecate missing options schema ([0db9c49](https://github.com/serverless/serverless/commit/0db9c49e2d435499e2b836b948e815b4a8839521))
-  - Deprecate recognition of `projectDir` configuration setting ([00fcd83](https://github.com/serverless/serverless/commit/00fcd83f49703188f3ddb0317afaa88fbece4801))
-  - Global `--debug` flag for debug logging ([3b4f267](https://github.com/serverless/serverless/commit/3b4f2677f8d83fd76a47bfac781bf1b81bfec924))
-  - Global `--verbose` flag for verbose logging ([2eef264](https://github.com/serverless/serverless/commit/2eef264bdca3dc7ae270aa09b974f23546425344))
-  - Register `-v` as global `--version` alias ([211db81](https://github.com/serverless/serverless/commit/211db8149cad519174490fbb5d2f1f42f859aabb))
-  - Remove `-v` alias for `--verbose` flag ([03b77c0](https://github.com/serverless/serverless/commit/03b77c0d2392e74f7d5caf76b9c01675d6d14023))
-  - Remove support for unrecognized cli options ([7c2b2ea](https://github.com/serverless/serverless/commit/7c2b2ea6a84c62fcb5c8830c16437376002b2a10))
-  - Simplify CLI args parsing to <command> <options> format ([8229812](https://github.com/serverless/serverless/commit/8229812e2bd1632efd9c8c8999236f6dff79171c))
-  - Support `serverless-tencent` CLI ([10db944](https://github.com/serverless/serverless/commit/10db944c73357014db20062c70ec666898505b0f))
-  - Do not decorate `cli.log` logs ([1f44227](https://github.com/serverless/serverless/commit/1f44227b7feeef30ca2ac151fffe219bde6a8461))
-  - Expose `sls doctor` command ([d403bfc](https://github.com/serverless/serverless/commit/d403bfc94eb13490d6a91d3352ae3b163caa6d68))
-  - Remove `studio` command schema ([7f1e7e1](https://github.com/serverless/serverless/commit/7f1e7e163b65580a2f0d10cad012f69605f32b18))
-  - Remove tab autocomplete feature ([519ce0c](https://github.com/serverless/serverless/commit/519ce0cb77056ba53be92968958f55f8eb7cc779))
+  - Unconditionally fallback when local installation found ([#10503](https://github.com/serverless/serverless/issues/10503)) ([137554c](https://github.com/serverless/serverless/commit/137554c9d35eb14bf3bba654673b99d343c0a7d1)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Simplify `logs` command output ([#10203](https://github.com/serverless/serverless/issues/10203)) ([d4124a3](https://github.com/serverless/serverless/commit/d4124a3ca6d3895289ef605d4dc6e5eb0cd2e3df)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Deprecate support for `deploy -f` alias ([#10346](https://github.com/serverless/serverless/issues/10346)) ([09c9ea3](https://github.com/serverless/serverless/commit/09c9ea3a38afc30c1c15d21c926b8d06dfd81356)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Deprecate missing options schema ([#10394](https://github.com/serverless/serverless/issues/10394)) ([0db9c49](https://github.com/serverless/serverless/commit/0db9c49e2d435499e2b836b948e815b4a8839521)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Deprecate recognition of `projectDir` configuration setting ([#10511](https://github.com/serverless/serverless/issues/10511)) ([00fcd83](https://github.com/serverless/serverless/commit/00fcd83f49703188f3ddb0317afaa88fbece4801)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Global `--debug` flag for debug logging ([#10197](https://github.com/serverless/serverless/issues/10197)) ([3b4f267](https://github.com/serverless/serverless/commit/3b4f2677f8d83fd76a47bfac781bf1b81bfec924)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Global `--verbose` flag for verbose logging ([#10197](https://github.com/serverless/serverless/issues/10197)) ([2eef264](https://github.com/serverless/serverless/commit/2eef264bdca3dc7ae270aa09b974f23546425344)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Register `-v` as global `--version` alias ([#10332](https://github.com/serverless/serverless/issues/10332)) ([211db81](https://github.com/serverless/serverless/commit/211db8149cad519174490fbb5d2f1f42f859aabb)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Remove `-v` alias for `--verbose` flag ([#10153](https://github.com/serverless/serverless/issues/10153)) ([03b77c0](https://github.com/serverless/serverless/commit/03b77c0d2392e74f7d5caf76b9c01675d6d14023)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Remove support for unrecognized cli options ([#10172](https://github.com/serverless/serverless/issues/10172)) ([7c2b2ea](https://github.com/serverless/serverless/commit/7c2b2ea6a84c62fcb5c8830c16437376002b2a10)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Simplify CLI args parsing to `<command> <options>` format ([#10332](https://github.com/serverless/serverless/issues/10332)) ([8229812](https://github.com/serverless/serverless/commit/8229812e2bd1632efd9c8c8999236f6dff79171c)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Support `serverless-tencent` CLI ([#10305](https://github.com/serverless/serverless/issues/10305)) ([10db944](https://github.com/serverless/serverless/commit/10db944c73357014db20062c70ec666898505b0f)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Do not decorate `cli.log` logs ([#10196](https://github.com/serverless/serverless/issues/10196)) ([1f44227](https://github.com/serverless/serverless/commit/1f44227b7feeef30ca2ac151fffe219bde6a8461)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Expose `sls doctor` command ([#10504](https://github.com/serverless/serverless/issues/10504)) ([d403bfc](https://github.com/serverless/serverless/commit/d403bfc94eb13490d6a91d3352ae3b163caa6d68)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Remove `studio` command schema ([#10191](https://github.com/serverless/serverless/issues/10191)) ([7f1e7e1](https://github.com/serverless/serverless/commit/7f1e7e163b65580a2f0d10cad012f69605f32b18)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Remove tab autocomplete feature ([#10414](https://github.com/serverless/serverless/issues/10414)) ([519ce0c](https://github.com/serverless/serverless/commit/519ce0cb77056ba53be92968958f55f8eb7cc779)) ([Mariusz Nowak](https://github.com/medikoo))
 - **AWS Lambda:**
-  - Change default hashing algorithm ([775debf](https://github.com/serverless/serverless/commit/775debf5e2bebc51346853d99d109776f9856cee))
-  - Change default runtime to `nodejs14.x` ([30e99fb](https://github.com/serverless/serverless/commit/30e99fb92f72a968f8e1c9a1ddbbb81a6bdc5288))
-  - Remove support for `awsKmsKeyArn` setting ([6de37bf](https://github.com/serverless/serverless/commit/6de37bf3b7c14ca84a32188b377e92dfbd0af473))
-  - Remove support for obsolete runtimes ([23cfb63](https://github.com/serverless/serverless/commit/23cfb63cdf400ac4601f13571554f4d8fc5ee0cd))
+  - Change default hashing algorithm ([#10255](https://github.com/serverless/serverless/issues/10255)) ([775debf](https://github.com/serverless/serverless/commit/775debf5e2bebc51346853d99d109776f9856cee)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Change default runtime to `nodejs14.x` ([#10147](https://github.com/serverless/serverless/issues/10147)) ([30e99fb](https://github.com/serverless/serverless/commit/30e99fb92f72a968f8e1c9a1ddbbb81a6bdc5288)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Remove support for `awsKmsKeyArn` setting ([#10146](https://github.com/serverless/serverless/issues/10146)) ([6de37bf](https://github.com/serverless/serverless/commit/6de37bf3b7c14ca84a32188b377e92dfbd0af473)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Remove support for obsolete runtimes ([#10207](https://github.com/serverless/serverless/issues/10207)) ([23cfb63](https://github.com/serverless/serverless/commit/23cfb63cdf400ac4601f13571554f4d8fc5ee0cd)) ([Piotr Grzesik](https://github.com/pgrzesik))
 - **AWS HTTP API:**
-  - Always apply `provider.tags` to HTTP API ([b34d549](https://github.com/serverless/serverless/commit/b34d5497b6290635037f6d8f3b65451803ef6027))
-  - Deprecate `provider.httpApi.useProviderTags` ([fee410a](https://github.com/serverless/serverless/commit/fee410a445b088d4fb86074924604208043934c0))
+  - Always apply `provider.tags` to HTTP API ([#10141](https://github.com/serverless/serverless/issues/10141)) ([b34d549](https://github.com/serverless/serverless/commit/b34d5497b6290635037f6d8f3b65451803ef6027)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Deprecate `provider.httpApi.useProviderTags` ([#105](https://github.com/serverless/serverless/issues/105)) ([fee410a](https://github.com/serverless/serverless/commit/fee410a445b088d4fb86074924604208043934c0)) ([Piotr Grzesik](https://github.com/pgrzesik))
 - **AWS API Gateway:**
-  - Change default identity source for authorizers ([1139255](https://github.com/serverless/serverless/commit/11392557d2800cdf226bd17bd32407f61a9dba52))
-  - Error on tracing or logs set for external API ([64ea6e5](https://github.com/serverless/serverless/commit/64ea6e59b5bbd1c807a948fd092c5792923e9559))
-  - Remove API specific settings from `provider` ([99941f0](https://github.com/serverless/serverless/commit/99941f0a5723aef0395ea0fb5b059e9ade8321b4))
-  - Remove support for `request.schema` ([b8019d8](https://github.com/serverless/serverless/commit/b8019d82ccabf732a75c2f97c958b84efb1e43ef))
-- **AWS CloudFront:** Remove support for deprecated `behavior` props ([c22277f](https://github.com/serverless/serverless/commit/c22277f69c327f271ea5cd51c98538c9b4eb7b1b))
-- **AWS EventBridge:** Change default deployment method to native CF ([46956f3](https://github.com/serverless/serverless/commit/46956f3e9f5dde9367669b0d9c1ca2dc454bfc8e))
-- **AWS IAM:** Deprecate IAM settings grouped directly at `provider` ([d7fd239](https://github.com/serverless/serverless/commit/d7fd23997f570c868437a5ea0187797403f8fe0a))
-- **Plugins:** Pass log writers to plugin constructor ([57079b7](https://github.com/serverless/serverless/commit/57079b78a671d7756c768f3136518f6a6f46d8ef))
-- **Config Schema:** Deprecate `warn` as a validation mode default ([6e27cc1](https://github.com/serverless/serverless/commit/6e27cc18c6c50fbd3311427e92c9e7f16055ae85))
-- **Standalone:** Upgrade `npm` to v8 ([6bfdc0c](https://github.com/serverless/serverless/commit/6bfdc0cda4b2009e4433f2fda45356c5d297c172))
-- **Dashboard:** Drop support for `tenant` ([9894875](https://github.com/serverless/serverless/commit/98948750e6cb856c62f1b4f4138a5157da07ae7e))
-- **AWS Alexa:** Remove support for alexaSkill without appId ([a9edd06](https://github.com/serverless/serverless/commit/a9edd063039a41fee1679827f7abe0e754036b45))
-- Disallow custom nested configuration path ([aeb9a57](https://github.com/serverless/serverless/commit/aeb9a57681cc3ff67c6dedbbf051b0c42d8ba6bb))
-- Error instead of warning when missing "commands" or "options" ([f86f691](https://github.com/serverless/serverless/commit/f86f69131678a3a9be13acaeba0b56b751e6ce57))
-- Remove `@serverless/cli` CLI integration ([396cfb9](https://github.com/serverless/serverless/commit/396cfb9621a5db211e2853b8105386103f9f097c))
-- Remove `@serverless/components` CLI integration ([3395395](https://github.com/serverless/serverless/commit/33953958ae354b240e6d949b889e376dcce09cc8))
-- Remove support for `provider.disableDefaultOutputExportNames` ([a9cd331](https://github.com/serverless/serverless/commit/a9cd3317b2e68b1b08c3f7388a2d4d459db1f2d7))
-- Remove support for Node v10 ([90f00b7](https://github.com/serverless/serverless/commit/90f00b7c02113932034f4e3ee3ef659b1ec0db02))
-- Remove support for object notation for `service` ([bccd188](https://github.com/serverless/serverless/commit/bccd188a0da7fe335b3e2b573f3ab19ccd0c49f8))
-- Restrict stage name with pattern ([c8c9f49](https://github.com/serverless/serverless/commit/c8c9f49fd239df723e3841fbfe22abdb90c02dae))
-- Simplify `logs` command output ([d4124a3](https://github.com/serverless/serverless/commit/d4124a3ca6d3895289ef605d4dc6e5eb0cd2e3df))
-- Support `params` configuration ([4675b57](https://github.com/serverless/serverless/commit/4675b57117e7d850a6015ab97c81938b9f374bf1))
-- Throw error on duplicated plugin definition ([d3aca0a](https://github.com/serverless/serverless/commit/d3aca0a7955c48b123720a887e6dd7300475fe03))
-- Throw for `--aws-s3-accelerate` when custom bucket used ([b7d48e5](https://github.com/serverless/serverless/commit/b7d48e59fdbe2a2056c6352d6ac33d4c43099e53))
-- Unconditionally fallback when local installation found ([137554c](https://github.com/serverless/serverless/commit/137554c9d35eb14bf3bba654673b99d343c0a7d1))
+  - Change default identity source for authorizers ([#10168](https://github.com/serverless/serverless/issues/10168)) ([1139255](https://github.com/serverless/serverless/commit/11392557d2800cdf226bd17bd32407f61a9dba52)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Error on tracing or logs set for external API ([#10198](https://github.com/serverless/serverless/issues/10198)) ([64ea6e5](https://github.com/serverless/serverless/commit/64ea6e59b5bbd1c807a948fd092c5792923e9559)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Remove API specific settings from `provider` ([#10157](https://github.com/serverless/serverless/issues/10157)) ([99941f0](https://github.com/serverless/serverless/commit/99941f0a5723aef0395ea0fb5b059e9ade8321b4)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Remove support for `request.schema` ([#10143](https://github.com/serverless/serverless/issues/10143)) ([b8019d8](https://github.com/serverless/serverless/commit/b8019d82ccabf732a75c2f97c958b84efb1e43ef)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS CloudFront:** Remove support for deprecated `behavior` props ([#10149](https://github.com/serverless/serverless/issues/10149)) ([c22277f](https://github.com/serverless/serverless/commit/c22277f69c327f271ea5cd51c98538c9b4eb7b1b)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS EventBridge:** Change default deployment method to native CF ([#10164](https://github.com/serverless/serverless/issues/10164)) ([46956f3](https://github.com/serverless/serverless/commit/46956f3e9f5dde9367669b0d9c1ca2dc454bfc8e)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS IAM:** Deprecate IAM settings grouped directly at `provider` ([#10348](https://github.com/serverless/serverless/issues/10348)) ([d7fd239](https://github.com/serverless/serverless/commit/d7fd23997f570c868437a5ea0187797403f8fe0a)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **Plugins:** Pass log writers to plugin constructor ([#10140](https://github.com/serverless/serverless/issues/10140)) ([57079b7](https://github.com/serverless/serverless/commit/57079b78a671d7756c768f3136518f6a6f46d8ef)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Config Schema:** Deprecate `warn` as a validation mode default ([#10348](https://github.com/serverless/serverless/issues/10348)) ([6e27cc1](https://github.com/serverless/serverless/commit/6e27cc18c6c50fbd3311427e92c9e7f16055ae85)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Standalone:** Upgrade `npm` to v8 ([#10349](https://github.com/serverless/serverless/issues/10349)) ([6bfdc0c](https://github.com/serverless/serverless/commit/6bfdc0cda4b2009e4433f2fda45356c5d297c172)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Dashboard:** Drop support for `tenant` ([#10525](https://github.com/serverless/serverless/issues/10525)) ([9894875](https://github.com/serverless/serverless/commit/98948750e6cb856c62f1b4f4138a5157da07ae7e)) ([Mariusz Nowak](https://github.com/medikoo))
+- **AWS Alexa:** Remove support for alexaSkill without appId ([#10142](https://github.com/serverless/serverless/issues/10142)) ([a9edd06](https://github.com/serverless/serverless/commit/a9edd063039a41fee1679827f7abe0e754036b45)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Disallow custom nested configuration path ([#10205](https://github.com/serverless/serverless/issues/10205)) ([aeb9a57](https://github.com/serverless/serverless/commit/aeb9a57681cc3ff67c6dedbbf051b0c42d8ba6bb)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Error instead of warning when missing `commands` or `options` ([#10158](https://github.com/serverless/serverless/issues/10158)) ([f86f691](https://github.com/serverless/serverless/commit/f86f69131678a3a9be13acaeba0b56b751e6ce57)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Remove `@serverless/cli` CLI integration ([#10462](https://github.com/serverless/serverless/issues/10462)) ([396cfb9](https://github.com/serverless/serverless/commit/396cfb9621a5db211e2853b8105386103f9f097c)) ([Mariusz Nowak](https://github.com/medikoo))
+- Remove `@serverless/components` CLI integration ([#10327](https://github.com/serverless/serverless/issues/10327)) ([3395395](https://github.com/serverless/serverless/commit/33953958ae354b240e6d949b889e376dcce09cc8)) ([Mariusz Nowak](https://github.com/medikoo))
+- Remove support for `provider.disableDefaultOutputExportNames` ([#10148](https://github.com/serverless/serverless/issues/10148)) ([a9cd331](https://github.com/serverless/serverless/commit/a9cd3317b2e68b1b08c3f7388a2d4d459db1f2d7)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Remove support for Node v10 ([#10186](https://github.com/serverless/serverless/issues/10186)) ([90f00b7](https://github.com/serverless/serverless/commit/90f00b7c02113932034f4e3ee3ef659b1ec0db02)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Remove support for object notation for `service` ([#10156](https://github.com/serverless/serverless/issues/10156)) ([bccd188](https://github.com/serverless/serverless/commit/bccd188a0da7fe335b3e2b573f3ab19ccd0c49f8)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Restrict stage name with pattern ([c8c9f49](https://github.com/serverless/serverless/commit/c8c9f49fd239df723e3841fbfe22abdb90c02dae)) ([Mariusz Nowak](https://github.com/medikoo))
+- Support `params` configuration ([#10400](https://github.com/serverless/serverless/issues/10400)) ([4675b57](https://github.com/serverless/serverless/commit/4675b57117e7d850a6015ab97c81938b9f374bf1)) ([Mariusz Nowak](https://github.com/medikoo))
+- Throw error on duplicated plugin definition ([#10150](https://github.com/serverless/serverless/issues/10150)) ([d3aca0a](https://github.com/serverless/serverless/commit/d3aca0a7955c48b123720a887e6dd7300475fe03)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Throw for `--aws-s3-accelerate` when custom bucket used ([#10151](https://github.com/serverless/serverless/issues/10151)) ([b7d48e5](https://github.com/serverless/serverless/commit/b7d48e59fdbe2a2056c6352d6ac33d4c43099e53)) ([Piotr Grzesik](https://github.com/pgrzesik))
 
 ### Maintenance Improvements
 
-- **AWS Deploy:** Use change sets in CF deployments ([e2c65a2](https://github.com/serverless/serverless/commit/e2c65a2230b9bf9fb78c7445b02d3ee4945ee1aa))
-- Adapt to rename in `@serverless/dashboard-plugin` ([88234a5](https://github.com/serverless/serverless/commit/88234a51233e74b3155427a5bf0a4022ec182c04))
-- **CLI Onboarding:** Download templates from v3 examples branch ([ded1b0e](https://github.com/serverless/serverless/commit/ded1b0e832c420871ffe37fedff0afe990d1d3e6))
+- **AWS Deploy:** Use change sets in CF deployments ([#10390](https://github.com/serverless/serverless/issues/10390)) ([e2c65a2](https://github.com/serverless/serverless/commit/e2c65a2230b9bf9fb78c7445b02d3ee4945ee1aa)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI Onboarding:** Download templates from v3 examples branch ([#10482](https://github.com/serverless/serverless/issues/10482)) ([ded1b0e](https://github.com/serverless/serverless/commit/ded1b0e832c420871ffe37fedff0afe990d1d3e6)) ([Piotr Grzesik](https://github.com/pgrzesik))
 - **CLI:**
-  - Convert `isLocallyInstalled` to export result directly ([ad0bbb0](https://github.com/serverless/serverless/commit/ad0bbb0a9161bc823d1c542e6dbf993f436f6b5a))
-  - Export resolved local installation path directly ([fb3b39a](https://github.com/serverless/serverless/commit/fb3b39a5a9bd35e211600530a30fc5583deec0db))
-  - Improve post install log to reflect modern style ([843764b](https://github.com/serverless/serverless/commit/843764baf837f195ec8ee911f103c9f3817f9a10))
-  - Improve progress for CloudFormation updates ([14b1443](https://github.com/serverless/serverless/commit/14b14432730c77ca34d41000e9aaaad0c29ffb35))
-  - Seclude `paramRegExp` ([703e40f](https://github.com/serverless/serverless/commit/703e40f0d217d925560ba2c1d43b403bb61d335b))
-  - Seclude uncaught exception handling ([b4bd0d4](https://github.com/serverless/serverless/commit/b4bd0d437074a29a972ecdbdc3a026554657817e))
-  - Simplify deploy function args patch ([6527f8a](https://github.com/serverless/serverless/commit/6527f8a583e967a3b68b5cec1f72460cf307117a))
-  - Unify finalization of a process handling ([29357f4](https://github.com/serverless/serverless/commit/29357f4e182f102504e5ea841fb95915ccfe6821))
-  - Move `isLocalyInstalled` util to CLI context ([3dc8395](https://github.com/serverless/serverless/commit/3dc8395d88dfebf4742625ec054955c40a4e2499))
-- **Config Schema:** Do not rely on `ajv-keywords` ([#10490](https://github.com/serverless/serverless/issues/10490)) ([4a22a4e](https://github.com/serverless/serverless/commit/4a22a4e58cd8c10d6da34a094a0768b5caafbdb9))
-- **Telemetry:** Include `paramsCount` in telemetry ([dd721b0](https://github.com/serverless/serverless/commit/dd721b0a2038e4b7256593397b5db19833cef387))
-- Rely on `require.resolve` to detect wether module exist ([040be5f](https://github.com/serverless/serverless/commit/040be5fe7321e051bb6e5e1aa78458c17d2582bc))
-- Remove `legacy` logs ([a92ab91](https://github.com/serverless/serverless/commit/a92ab917128629e4e516d69976fdac1014cb5ebb))
-- Remove `lib/classes/Error.js` ([44391fa](https://github.com/serverless/serverless/commit/44391fac513c7941447d03bdeae95043590cc52c))
-- Remove evaluation of deprecated lifecycle events ([34bb51e](https://github.com/serverless/serverless/commit/34bb51e71d542e31a13cfb0f56443d57b6e0f89a))
-- Remove internal `suppressLogIfPrintCommand` method ([584286e](https://github.com/serverless/serverless/commit/584286ec7aba94ac96eb747361f79fafb7c0f32b))
-- Unify file naming convention
-- Replace `ncjsm/resolve` usage with native `createRequire` ([d18efc2](https://github.com/serverless/serverless/commit/d18efc2d43789dc11857d677851ba4b66e09a6a4))
-- Upgrade `@serverless/utils` to v6 ([74d9c70](https://github.com/serverless/serverless/commit/74d9c70f8abbfab1af4c6440ed93fd163145a597))
-- Upgrade `ajv` to `v8` along with related packages ([15cd724](https://github.com/serverless/serverless/commit/15cd724f723b55ca73cd0bb00d41d67307ffbed8))
+  - Convert `isLocallyInstalled` to export result directly ([#10503](https://github.com/serverless/serverless/issues/10503)) ([ad0bbb0](https://github.com/serverless/serverless/commit/ad0bbb0a9161bc823d1c542e6dbf993f436f6b5a)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Export resolved local installation path directly ([#10503](https://github.com/serverless/serverless/issues/10503)) ([fb3b39a](https://github.com/serverless/serverless/commit/fb3b39a5a9bd35e211600530a30fc5583deec0db)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Improve post install log to reflect modern style ([#10418](https://github.com/serverless/serverless/issues/10418)) ([843764b](https://github.com/serverless/serverless/commit/843764baf837f195ec8ee911f103c9f3817f9a10)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Improve progress for CloudFormation updates ([#10458](https://github.com/serverless/serverless/issues/10458)) ([14b1443](https://github.com/serverless/serverless/commit/14b14432730c77ca34d41000e9aaaad0c29ffb35)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Seclude `paramRegExp` ([#10346](https://github.com/serverless/serverless/issues/10346)) ([703e40f](https://github.com/serverless/serverless/commit/703e40f0d217d925560ba2c1d43b403bb61d335b)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Seclude uncaught exception handling ([#10542](https://github.com/serverless/serverless/issues/10542)) ([b4bd0d4](https://github.com/serverless/serverless/commit/b4bd0d437074a29a972ecdbdc3a026554657817e)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Unify finalization of a process handling ([#10542](https://github.com/serverless/serverless/issues/10542)) ([29357f4](https://github.com/serverless/serverless/commit/29357f4e182f102504e5ea841fb95915ccfe6821)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Move `isLocalyInstalled` util to CLI context ([#105](https://github.com/serverless/serverless/issues/105)) ([3dc8395](https://github.com/serverless/serverless/commit/3dc8395d88dfebf4742625ec054955c40a4e2499)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Config Schema:**
+  - Upgrade `ajv` to `v8` along with related packages ([#10440](https://github.com/serverless/serverless/issues/10440)) ([15cd724](https://github.com/serverless/serverless/commit/15cd724f723b55ca73cd0bb00d41d67307ffbed8)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Do not rely on `ajv-keywords` ([#10490](https://github.com/serverless/serverless/issues/10490)) ([#10490](https://github.com/serverless/serverless/issues/10490)) ([4a22a4e](https://github.com/serverless/serverless/commit/4a22a4e58cd8c10d6da34a094a0768b5caafbdb9)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **Telemetry:** Include `paramsCount` in telemetry ([#10460](https://github.com/serverless/serverless/issues/10460)) ([dd721b0](https://github.com/serverless/serverless/commit/dd721b0a2038e4b7256593397b5db19833cef387)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Rely on `require.resolve` to detect wether module exist ([#10503](https://github.com/serverless/serverless/issues/10503)) ([040be5f](https://github.com/serverless/serverless/commit/040be5fe7321e051bb6e5e1aa78458c17d2582bc)) ([Mariusz Nowak](https://github.com/medikoo))
+- Remove `legacy` logs ([#10527](https://github.com/serverless/serverless/issues/10527)) ([a92ab91](https://github.com/serverless/serverless/commit/a92ab917128629e4e516d69976fdac1014cb5ebb)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Remove `lib/classes/Error.js` ([#10563](https://github.com/serverless/serverless/issues/10563)) ([44391fa](https://github.com/serverless/serverless/commit/44391fac513c7941447d03bdeae95043590cc52c)) ([Mariusz Nowak](https://github.com/medikoo))
+- Remove evaluation of deprecated lifecycle events ([#10345](https://github.com/serverless/serverless/issues/10345)) ([34bb51e](https://github.com/serverless/serverless/commit/34bb51e71d542e31a13cfb0f56443d57b6e0f89a)) ([Mariusz Nowak](https://github.com/medikoo))
+- Remove internal `suppressLogIfPrintCommand` method ([#10526](https://github.com/serverless/serverless/issues/10526)) ([584286e](https://github.com/serverless/serverless/commit/584286ec7aba94ac96eb747361f79fafb7c0f32b)) ([Mariusz Nowak](https://github.com/medikoo))
+- Unify file naming convention ([#10563](https://github.com/serverless/serverless/issues/10563)) ([Mariusz Nowak](https://github.com/medikoo))
+- Replace `ncjsm/resolve` usage with native `createRequire` ([#10503](https://github.com/serverless/serverless/issues/10503)) ([d18efc2](https://github.com/serverless/serverless/commit/d18efc2d43789dc11857d677851ba4b66e09a6a4)) ([Mariusz Nowak](https://github.com/medikoo))
+- Adapt to rename in `@serverless/dashboard-plugin` ([#10543](https://github.com/serverless/serverless/issues/10543)) ([88234a5](https://github.com/serverless/serverless/commit/88234a51233e74b3155427a5bf0a4022ec182c04)) ([Mariusz Nowak](https://github.com/medikoo))
+- Upgrade `@serverless/utils` to v6 ([74d9c70](https://github.com/serverless/serverless/commit/74d9c70f8abbfab1af4c6440ed93fd163145a597)) ([Mariusz Nowak](https://github.com/medikoo))
 
 ### [2.72.2](https://github.com/serverless/serverless/compare/v2.72.1...v2.72.2) (2022-01-24)
 

From d341b6b99d61e44cbb00e18cbfd791e963890bfd Mon Sep 17 00:00:00 2001
From: Richard Hull <rm_hull@yahoo.co.uk>
Date: Sat, 29 Jan 2022 17:04:13 +0000
Subject: [PATCH 1096/1101] feat(AWS MSK): Support `maximumBatchingWindow`
 (#10580)

---
 docs/providers/aws/events/msk.md                       |  6 ++++--
 docs/providers/aws/guide/serverless.yml.md             |  2 ++
 lib/plugins/aws/package/compile/events/msk/index.js    | 10 ++++++++++
 test/integration/aws/infra-dependent/msk.test.js       |  2 ++
 .../aws/package/compile/events/msk/index.test.js       |  3 +++
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/docs/providers/aws/events/msk.md b/docs/providers/aws/events/msk.md
index d67121fb5bf..94bb5e0d05b 100644
--- a/docs/providers/aws/events/msk.md
+++ b/docs/providers/aws/events/msk.md
@@ -43,12 +43,13 @@ functions:
           topic: mytopic
 ```
 
-## Setting the BatchSize and StartingPosition
+## Setting the BatchSize, MaximumBatchingWindow and StartingPosition
 
 For the MSK event integration, you can set the `batchSize`, which effects how many messages can be processed in a single Lambda invocation. The default `batchSize` is 100, and the max `batchSize` is 10000.
+Likewise `maximumBatchingWindow` can be set to determine the amount of time the Lambda spends gathering records before invoking the function. The default is 0, but **if you set `batchSize` to more than 10, you must set `maximumBatchingWindow` to at least 1**. The maximum is 300.
 In addition, you can also configure `startingPosition`, which controls the position at which Lambda should start consuming messages from MSK topic. It supports two possible values, `TRIM_HORIZON` and `LATEST`, with `TRIM_HORIZON` being the default.
 
-In the following example, we specify that the `compute` function should have an `msk` event configured with `batchSize` of 1000 and `startingPosition` equal to `LATEST`.
+In the following example, we specify that the `compute` function should have an `msk` event configured with `batchSize` of 1000, `maximumBatchingWindow` to 30 seconds and `startingPosition` equal to `LATEST`.
 
 ```yml
 functions:
@@ -59,6 +60,7 @@ functions:
           arn: arn:aws:kafka:region:XXXXXX:cluster/MyCluster/xxxx-xxxxx-xxxx
           topic: mytopic
           batchSize: 1000
+          maximumBatchingWindow: 30
           startingPosition: LATEST
 ```
 
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index ae7cf9d3d03..7e1f565bf28 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -920,6 +920,8 @@ functions:
           topic: kafkaTopic
           # Optional, must be in 1-10000 range
           batchSize: 100
+          # Optional, minimum is 0 and the maximum is 300 (seconds)
+          maximumBatchingWindow: 30
           # Optional, can be set to LATEST or TRIM_HORIZON
           startingPosition: LATEST
           # (default: true)
diff --git a/lib/plugins/aws/package/compile/events/msk/index.js b/lib/plugins/aws/package/compile/events/msk/index.js
index 66afe3553e3..3a756f25131 100644
--- a/lib/plugins/aws/package/compile/events/msk/index.js
+++ b/lib/plugins/aws/package/compile/events/msk/index.js
@@ -26,6 +26,11 @@ class AwsCompileMSKEvents {
           minimum: 1,
           maximum: 10000,
         },
+        maximumBatchingWindow: {
+          type: 'number',
+          minimum: 0,
+          maximum: 300,
+        },
         enabled: {
           type: 'boolean',
         },
@@ -71,6 +76,7 @@ class AwsCompileMSKEvents {
           const eventSourceArn = event.msk.arn;
           const topic = event.msk.topic;
           const batchSize = event.msk.batchSize;
+          const maximumBatchingWindow = event.msk.maximumBatchingWindow;
           const enabled = event.msk.enabled;
           const startingPosition = event.msk.startingPosition || 'TRIM_HORIZON';
 
@@ -102,6 +108,10 @@ class AwsCompileMSKEvents {
             mskResource.Properties.BatchSize = batchSize;
           }
 
+          if (maximumBatchingWindow) {
+            mskResource.Properties.MaximumBatchingWindowInSeconds = maximumBatchingWindow;
+          }
+
           if (enabled != null) {
             mskResource.Properties.Enabled = enabled;
           }
diff --git a/test/integration/aws/infra-dependent/msk.test.js b/test/integration/aws/infra-dependent/msk.test.js
index 8f2796c903a..5f59978444e 100644
--- a/test/integration/aws/infra-dependent/msk.test.js
+++ b/test/integration/aws/infra-dependent/msk.test.js
@@ -54,6 +54,8 @@ describe('AWS - MSK Integration Test', function () {
                 msk: {
                   arn: outputMap.get('MSKCluster'),
                   topic: topicName,
+                  batchSize: 100,
+                  maximumBatchWindowingInSeconds: 3,
                 },
               },
             ],
diff --git a/test/unit/lib/plugins/aws/package/compile/events/msk/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/msk/index.test.js
index 2ec0e6ca35a..0f560d04bd2 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/msk/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/msk/index.test.js
@@ -13,6 +13,7 @@ describe('AwsCompileMSKEvents', () => {
   const enabled = false;
   const startingPosition = 'LATEST';
   const batchSize = 5000;
+  const maximumBatchingWindow = 10;
 
   describe('when there are msk events defined', () => {
     let minimalEventSourceMappingResource;
@@ -42,6 +43,7 @@ describe('AwsCompileMSKEvents', () => {
                     topic,
                     arn,
                     batchSize,
+                    maximumBatchingWindow,
                     enabled,
                     startingPosition,
                   },
@@ -102,6 +104,7 @@ describe('AwsCompileMSKEvents', () => {
     it('should correctly complie EventSourceMapping resource with all parameters', () => {
       expect(allParamsEventSourceMappingResource.Properties).to.deep.equal({
         BatchSize: batchSize,
+        MaximumBatchingWindowInSeconds: maximumBatchingWindow,
         Enabled: enabled,
         EventSourceArn: arn,
         StartingPosition: startingPosition,

From e90c114932362d79727800f0787237764ce767c3 Mon Sep 17 00:00:00 2001
From: Richard Hull <rm_hull@yahoo.co.uk>
Date: Sun, 30 Jan 2022 20:26:57 +0000
Subject: [PATCH 1097/1101] feat(AWS Kafka): Support `maximumBatchingWindow`

---
 docs/providers/aws/events/kafka.md            | 25 ++++++++++++++++
 docs/providers/aws/guide/serverless.yml.md    | 29 +++++++++++++++++++
 .../aws/package/compile/events/kafka.js       | 11 ++++++-
 .../aws/package/compile/events/kafka.test.js  |  3 ++
 4 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/docs/providers/aws/events/kafka.md b/docs/providers/aws/events/kafka.md
index 4128392402c..63e3df7320f 100644
--- a/docs/providers/aws/events/kafka.md
+++ b/docs/providers/aws/events/kafka.md
@@ -141,3 +141,28 @@ functions:
 ## IAM Permissions
 
 The Serverless Framework will automatically configure the most minimal set of IAM permissions for you. However you can still add additional permissions if you need to. Read the official [AWS documentation](https://docs.aws.amazon.com/lambda/latest/dg/kafka-smaa.html) for more information about IAM Permissions for Kafka events.
+
+## Setting the BatchSize, MaximumBatchingWindow and StartingPosition
+
+You can set the `batchSize`, which effects how many messages can be processed in a single Lambda invocation. The default `batchSize` is 100, and the max `batchSize` is 10000.
+Likewise `maximumBatchingWindow` can be set to determine the amount of time the Lambda spends gathering records before invoking the function. The default is 0, but **if you set `batchSize` to more than 10, you must set `maximumBatchingWindow` to at least 1**. The maximum is 300.
+In addition, you can also configure `startingPosition`, which controls the position at which Lambda should start consuming messages from the topic. It supports two possible values, `TRIM_HORIZON` and `LATEST`, with `TRIM_HORIZON` being the default.
+
+In the following example, we specify that the `compute` function should have a `kafka` event configured with `batchSize` of 1000, `maximumBatchingWindow` of 30 seconds and `startingPosition` equal to `LATEST`.
+
+```yml
+functions:
+  compute:
+    handler: handler.compute
+    events:
+      - kafka:
+          accessConfigurations:
+            saslScram512Auth: arn:aws:secretsmanager:us-east-1:01234567890:secret:MyBrokerSecretName
+          topic: MySelfManagedKafkaTopic
+          bootstrapServers:
+            - abc3.xyz.com:9092
+            - abc2.xyz.com:9092
+          batchSize: 1000
+          maximumBatchingWindow: 30
+          startingPosition: LATEST
+```
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 7e1f565bf28..49af1bf9968 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -928,6 +928,35 @@ functions:
           enabled: false
 ```
 
+### Kafka
+
+[Kakfa events](../events/kafka.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
+      - kafka:
+          # See main kafka documentation for various access configuration settings
+          accessConfigurations:
+            # ...
+          # An array of bootstrap server addresses
+          bootstrapServers:
+            - abc3.xyz.com:9092
+            - abc2.xyz.com:9092
+          # name of Kafka topic to consume from
+          topic: MySelfManagedKafkaTopic
+          # Optional, must be in 1-10000 range
+          batchSize: 100
+          # Optional, must be in 0-300 range (seconds)
+          maximumBatchingWindow: 30
+          # Optional, can be set to LATEST or TRIM_HORIZON
+          startingPosition: LATEST
+          # (default: true)
+          enabled: false
+```
+
 ### Alexa
 
 [Alexa Skill events](../events/alexa-skill.md) and [Alexa Smart Home events](../events/alexa-smart-home.md):
diff --git a/lib/plugins/aws/package/compile/events/kafka.js b/lib/plugins/aws/package/compile/events/kafka.js
index c5d4779815c..986e57eb791 100644
--- a/lib/plugins/aws/package/compile/events/kafka.js
+++ b/lib/plugins/aws/package/compile/events/kafka.js
@@ -67,6 +67,11 @@ class AwsCompileKafkaEvents {
           minimum: 1,
           maximum: 10000,
         },
+        maximumBatchingWindow: {
+          type: 'number',
+          minimum: 0,
+          maximum: 300,
+        },
         enabled: {
           type: 'boolean',
         },
@@ -149,7 +154,7 @@ class AwsCompileKafkaEvents {
         }
 
         hasKafkaEvent = true;
-        const { topic, batchSize, enabled } = event.kafka;
+        const { topic, batchSize, maximumBatchingWindow, enabled } = event.kafka;
         const startingPosition = event.kafka.startingPosition || 'TRIM_HORIZON';
 
         const kafkaEventLogicalId = this.provider.naming.getKafkaEventLogicalId(
@@ -231,6 +236,10 @@ class AwsCompileKafkaEvents {
           kafkaResource.Properties.BatchSize = batchSize;
         }
 
+        if (maximumBatchingWindow) {
+          kafkaResource.Properties.MaximumBatchingWindowInSeconds = maximumBatchingWindow;
+        }
+
         if (enabled != null) {
           kafkaResource.Properties.Enabled = enabled;
         }
diff --git a/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js b/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js
index 795aeda010a..87b2019f8c7 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js
@@ -19,6 +19,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
   const enabled = false;
   const startingPosition = 'LATEST';
   const batchSize = 5000;
+  const maximumBatchingWindow = 20;
 
   describe('when there are kafka events defined', () => {
     let minimalEventSourceMappingResource;
@@ -50,6 +51,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
                     bootstrapServers: ['abc.xyz:9092'],
                     accessConfigurations: { saslScram256Auth: saslScram256AuthArn },
                     batchSize,
+                    maximumBatchingWindow,
                     enabled,
                     startingPosition,
                   },
@@ -105,6 +107,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
     it('should correctly compile EventSourceMapping resource with all parameters', () => {
       expect(allParamsEventSourceMappingResource.Properties).to.deep.equal({
         BatchSize: batchSize,
+        MaximumBatchingWindowInSeconds: maximumBatchingWindow,
         Enabled: enabled,
         SelfManagedEventSource: {
           Endpoints: {

From 658dc28b8b1e087948482553be98b12bd5783c09 Mon Sep 17 00:00:00 2001
From: Richard Hull <rm_hull@yahoo.co.uk>
Date: Sun, 30 Jan 2022 20:29:43 +0000
Subject: [PATCH 1098/1101] feat(AWS ActiveMQ): Support `maximumBatchingWindow`

---
 docs/providers/aws/events/activemq.md         |  4 ++-
 docs/providers/aws/guide/serverless.yml.md    | 28 ++++++++++++++++++-
 .../aws/package/compile/events/activemq.js    | 12 +++++++-
 .../package/compile/events/activemq.test.js   |  3 ++
 4 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/docs/providers/aws/events/activemq.md b/docs/providers/aws/events/activemq.md
index d6b108dfa79..384e6b55107 100644
--- a/docs/providers/aws/events/activemq.md
+++ b/docs/providers/aws/events/activemq.md
@@ -54,9 +54,10 @@ functions:
           basicAuthArn: arn:aws:secretsmanager:us-east-1:01234567890:secret:MySecret
 ```
 
-## Specifying batch size
+## Specifying batch size and batch window
 
 You can also specify `batchSize` of number of items to retrieve in a single batch. If not specified, this will default to `100`.
+Likewise `maximumBatchingWindow` can be set to determine the amount of time the Lambda spends gathering records before invoking the function. The default is 0, but **if you set `batchSize` to more than 10, you must set `maximumBatchingWindow` to at least 1**. The maximum is 300.
 
 ```yml
 functions:
@@ -67,6 +68,7 @@ functions:
           arn: arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx
           queue: queue-name
           batchSize: 5000
+          maximumBatchingWindow: 30
           basicAuthArn: arn:aws:secretsmanager:us-east-1:01234567890:secret:MySecret
 ```
 
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index 49af1bf9968..fe15e996a6c 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -920,7 +920,33 @@ functions:
           topic: kafkaTopic
           # Optional, must be in 1-10000 range
           batchSize: 100
-          # Optional, minimum is 0 and the maximum is 300 (seconds)
+          # Optional, must be in 0-300 range (seconds)
+          maximumBatchingWindow: 30
+          # Optional, can be set to LATEST or TRIM_HORIZON
+          startingPosition: LATEST
+          # (default: true)
+          enabled: false
+```
+
+### ActiveMQ
+
+[ActiveMQ events](../events/activemq.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
+      - activemq:
+          # ARN of ActiveMQ Broker
+          arn: arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx
+          # Name of ActiveMQ queue consume from
+          queue: queue-name
+          # Secrets Manager ARN for basic auth credentials
+          basicAuthArn: arn:aws:secretsmanager:us-east-1:01234567890:secret:MySecret
+          # Optional, must be in 1-10000 range
+          batchSize: 100
+          # Optional, must be in 0-300 range (seconds)
           maximumBatchingWindow: 30
           # Optional, can be set to LATEST or TRIM_HORIZON
           startingPosition: LATEST
diff --git a/lib/plugins/aws/package/compile/events/activemq.js b/lib/plugins/aws/package/compile/events/activemq.js
index bae4741ae24..d23f415673d 100644
--- a/lib/plugins/aws/package/compile/events/activemq.js
+++ b/lib/plugins/aws/package/compile/events/activemq.js
@@ -34,6 +34,11 @@ class AwsCompileActiveMQEvents {
           minimum: 1,
           maximum: 10000,
         },
+        maximumBatchingWindow: {
+          type: 'number',
+          minimum: 0,
+          maximum: 300,
+        },
         enabled: {
           type: 'boolean',
         },
@@ -86,7 +91,8 @@ class AwsCompileActiveMQEvents {
         if (!event.activemq) return;
 
         hasMQEvent = true;
-        const { basicAuthArn, arn, batchSize, enabled, queue } = event.activemq;
+        const { basicAuthArn, arn, batchSize, maximumBatchingWindow, enabled, queue } =
+          event.activemq;
 
         const mqEventLogicalId = this.provider.naming.getActiveMQEventLogicalId(
           functionName,
@@ -117,6 +123,10 @@ class AwsCompileActiveMQEvents {
           mqResource.Properties.BatchSize = batchSize;
         }
 
+        if (maximumBatchingWindow) {
+          mqResource.Properties.MaximumBatchingWindowInSeconds = maximumBatchingWindow;
+        }
+
         if (enabled != null) {
           mqResource.Properties.Enabled = enabled;
         }
diff --git a/test/unit/lib/plugins/aws/package/compile/events/activemq.test.js b/test/unit/lib/plugins/aws/package/compile/events/activemq.test.js
index f3dd58d97b5..78dd2d27565 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/activemq.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/activemq.test.js
@@ -13,6 +13,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/activemq.test.js', ()
   const queue = 'TestingQueue';
   const enabled = false;
   const batchSize = 5000;
+  const maximumBatchingWindow = 20;
 
   describe('when there are activemq events defined', () => {
     let minimalEventSourceMappingResource;
@@ -44,6 +45,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/activemq.test.js', ()
                     arn: brokerArn,
                     basicAuthArn,
                     batchSize,
+                    maximumBatchingWindow,
                     enabled,
                   },
                 },
@@ -102,6 +104,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/activemq.test.js', ()
       expect(allParamsEventSourceMappingResource.Properties).to.deep.equal({
         EventSourceArn: brokerArn,
         BatchSize: batchSize,
+        MaximumBatchingWindowInSeconds: maximumBatchingWindow,
         Enabled: enabled,
         SourceAccessConfigurations: [
           {

From d6d094b01f0a5c186e90b623bfea3aa69f8792fe Mon Sep 17 00:00:00 2001
From: fargito <fr.farge96@gmail.com>
Date: Mon, 31 Jan 2022 12:01:40 +0100
Subject: [PATCH 1099/1101] docs(cli-output): remove v3 warning

---
 docs/guides/plugins/cli-output.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/guides/plugins/cli-output.md b/docs/guides/plugins/cli-output.md
index fe235e7c913..d7f32ac00f3 100644
--- a/docs/guides/plugins/cli-output.md
+++ b/docs/guides/plugins/cli-output.md
@@ -14,8 +14,6 @@ layout: Doc
 
 # CLI output in plugins
 
-**Warning:** the API documented on this page is available in Serverless Framework v3, which is not released yet. This documentation is published to help plugins upgrade to v3.
-
 Plugins can integrate and extend the CLI output of the Serverless Framework in different ways.
 
 ## Writing to the output

From d0554b738543221e0fe3d9c6fd83d30a15aae79f Mon Sep 17 00:00:00 2001
From: Richard Hull <rm_hull@yahoo.co.uk>
Date: Mon, 31 Jan 2022 12:41:29 +0000
Subject: [PATCH 1100/1101] feat(AWS RabbitMQ): Support `maximumBatchingWindow`

---
 docs/providers/aws/events/rabbitmq.md         |  4 ++-
 docs/providers/aws/guide/serverless.yml.md    | 26 +++++++++++++++++++
 .../aws/package/compile/events/rabbitmq.js    | 12 ++++++++-
 .../package/compile/events/rabbitmq.test.js   |  3 +++
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/docs/providers/aws/events/rabbitmq.md b/docs/providers/aws/events/rabbitmq.md
index 569d6d3a328..01a664f50b7 100644
--- a/docs/providers/aws/events/rabbitmq.md
+++ b/docs/providers/aws/events/rabbitmq.md
@@ -54,9 +54,10 @@ functions:
           basicAuthArn: arn:aws:secretsmanager:us-east-1:01234567890:secret:MySecret
 ```
 
-## Specifying batch size
+## Specifying batch size and batch window
 
 You can also specify `batchSize` of number of items to retrieve in a single batch. If not specified, this will default to `100`.
+Likewise `maximumBatchingWindow` can be set to determine the amount of time the Lambda spends gathering records before invoking the function. The default is 0, but **if you set `batchSize` to more than 10, you must set `maximumBatchingWindow` to at least 1**. The maximum is 300.
 
 ```yml
 functions:
@@ -67,6 +68,7 @@ functions:
           arn: arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx
           queue: queue-name
           batchSize: 5000
+          maximumBatchingWindow: 30
           basicAuthArn: arn:aws:secretsmanager:us-east-1:01234567890:secret:MySecret
 ```
 
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index fe15e996a6c..fce4c91ae10 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -983,6 +983,32 @@ functions:
           enabled: false
 ```
 
+### RabbitMQ
+
+[RabbitMQ events](../events/rabbitmq.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
+      - rabbitmq:
+          # ARN of RabbitMQ Broker
+          arn: arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx
+          # Name of RabbitMQ queue consume from
+          queue: queue-name
+          # Secrets Manager ARN for basic auth credentials
+          basicAuthArn: arn:aws:secretsmanager:us-east-1:01234567890:secret:MySecret
+          # Optional, must be in 1-10000 range
+          batchSize: 100
+          # Optional, must be in 0-300 range (seconds)
+          maximumBatchingWindow: 30
+          # Optional, can be set to LATEST or TRIM_HORIZON
+          startingPosition: LATEST
+          # (default: true)
+          enabled: false
+```
+
 ### Alexa
 
 [Alexa Skill events](../events/alexa-skill.md) and [Alexa Smart Home events](../events/alexa-smart-home.md):
diff --git a/lib/plugins/aws/package/compile/events/rabbitmq.js b/lib/plugins/aws/package/compile/events/rabbitmq.js
index a1ee60ff78a..9b5755b632c 100644
--- a/lib/plugins/aws/package/compile/events/rabbitmq.js
+++ b/lib/plugins/aws/package/compile/events/rabbitmq.js
@@ -34,6 +34,11 @@ class AwsCompileRabbitMQEvents {
           minimum: 1,
           maximum: 10000,
         },
+        maximumBatchingWindow: {
+          type: 'number',
+          minimum: 0,
+          maximum: 300,
+        },
         enabled: {
           type: 'boolean',
         },
@@ -86,7 +91,8 @@ class AwsCompileRabbitMQEvents {
         if (!event.rabbitmq) return;
 
         hasMQEvent = true;
-        const { basicAuthArn, arn, batchSize, enabled, queue } = event.rabbitmq;
+        const { basicAuthArn, arn, batchSize, maximumBatchingWindow, enabled, queue } =
+          event.rabbitmq;
 
         const mqEventLogicalId = this.provider.naming.getRabbitMQEventLogicalId(
           functionName,
@@ -117,6 +123,10 @@ class AwsCompileRabbitMQEvents {
           mqResource.Properties.BatchSize = batchSize;
         }
 
+        if (maximumBatchingWindow) {
+          mqResource.Properties.MaximumBatchingWindowInSeconds = maximumBatchingWindow;
+        }
+
         if (enabled != null) {
           mqResource.Properties.Enabled = enabled;
         }
diff --git a/test/unit/lib/plugins/aws/package/compile/events/rabbitmq.test.js b/test/unit/lib/plugins/aws/package/compile/events/rabbitmq.test.js
index fb061de6d40..b650f8c77c9 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/rabbitmq.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/rabbitmq.test.js
@@ -13,6 +13,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/rabbitmq.test.js', ()
   const queue = 'TestingQueue';
   const enabled = false;
   const batchSize = 5000;
+  const maximumBatchingWindow = 20;
 
   describe('when there are rabbitmq events defined', () => {
     let minimalEventSourceMappingResource;
@@ -44,6 +45,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/rabbitmq.test.js', ()
                     arn: brokerArn,
                     basicAuthArn,
                     batchSize,
+                    maximumBatchingWindow,
                     enabled,
                   },
                 },
@@ -102,6 +104,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/rabbitmq.test.js', ()
       expect(allParamsEventSourceMappingResource.Properties).to.deep.equal({
         EventSourceArn: brokerArn,
         BatchSize: batchSize,
+        MaximumBatchingWindowInSeconds: maximumBatchingWindow,
         Enabled: enabled,
         SourceAccessConfigurations: [
           {

From bf79934e9b43a0b2e8613ee29f9430fa22c41481 Mon Sep 17 00:00:00 2001
From: Piotr Grzesik <pj.grzesik@gmail.com>
Date: Sat, 29 Jan 2022 18:31:55 +0100
Subject: [PATCH 1101/1101] test: Fix `msk` integration test

---
 test/integration/aws/infra-dependent/msk.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/aws/infra-dependent/msk.test.js b/test/integration/aws/infra-dependent/msk.test.js
index 5f59978444e..399ad42719a 100644
--- a/test/integration/aws/infra-dependent/msk.test.js
+++ b/test/integration/aws/infra-dependent/msk.test.js
@@ -55,7 +55,7 @@ describe('AWS - MSK Integration Test', function () {
                   arn: outputMap.get('MSKCluster'),
                   topic: topicName,
                   batchSize: 100,
-                  maximumBatchWindowingInSeconds: 3,
+                  maximumBatchingWindow: 3,
                 },
               },
             ],