fix(CLI): Ensure help output with missing provider.name

serverless · Apr 6, 2021 · dae9058 · dae9058
1 parent e91f164
commit dae9058
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/lib/configuration/resolve-provider-name.js b/lib/configuration/resolve-provider-name.js
@@ -3,13 +3,19 @@
 const ensureString = require('type/string/ensure');
 const isObject = require('type/object/is');
 const ServerlessError = require('../serverless-error');
+const resolveCliInput = require('../cli/resolve-input');
 
 module.exports = (configuration) => {
-  return ensureString(
-    isObject(configuration.provider) ? configuration.provider.name : configuration.provider,
-    {
-      Error: ServerlessError,
-      errorMessage: 'Invalid service configuration: "provider.name" property is missing',
-    }
-  );
+  try {
+    return ensureString(
+      isObject(configuration.provider) ? configuration.provider.name : configuration.provider,
+      {
+        Error: ServerlessError,
+        errorMessage: 'Invalid service configuration: "provider.name" property is missing',
+      }
+    );
+  } catch (error) {
+    if (resolveCliInput().isHelpRequest) return null;
+    throw error;
+  }
 };
diff --git a/scripts/serverless.js b/scripts/serverless.js
@@ -178,6 +178,10 @@ const processSpanPromise = (async () => {
 
           if (isPropertyResolved(variablesMeta, 'provider\0name')) {
             providerName = resolveProviderName(configuration);
+            if (providerName == null) {
+              variablesMeta = null;
+              return;
+            }
           }
           if (!commandSchema && providerName === 'aws') {
             // If command was not recognized in first resolution phase
@@ -224,6 +228,10 @@ const processSpanPromise = (async () => {
 
             if (!providerName && isPropertyResolved(variablesMeta, 'provider\0name')) {
               providerName = resolveProviderName(configuration);
+              if (providerName == null) {
+                variablesMeta = null;
+                return;
+              }
               if (!commandSchema && providerName === 'aws') {
                 // If command was not recognized in previous resolution phases
                 // Parse args again also against schemas of commands which work in context of an AWS
@@ -296,6 +304,10 @@ const processSpanPromise = (async () => {
           if (!providerName) {
             if (!ensureResolvedProperty('provider\0name')) return;
             providerName = resolveProviderName(configuration);
+            if (providerName == null) {
+              variablesMeta = null;
+              return;
+            }
             if (!commandSchema && providerName === 'aws') {
               resolveInput.clear();
               ({ command, commands, options, isHelpRequest, commandSchema } = resolveInput(