From dc9f1809d1ec6830a6682e7946cb4dfc1c898c72 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Thu, 21 Jan 2021 17:58:24 +0100
Subject: [PATCH] refactor: Rely on external isHelpRequest CLI util

---
 lib/classes/CLI.js     | 20 --------------------
 lib/classes/Service.js |  3 ++-
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/lib/classes/CLI.js b/lib/classes/CLI.js
index 665ab56ca..9546d654d 100644
--- a/lib/classes/CLI.js
+++ b/lib/classes/CLI.js
@@ -7,8 +7,6 @@ const chalk = require('chalk');
 const getCommandSuggestion = require('../utils/getCommandSuggestion');
 const resolveCliInput = require('../utils/resolveCliInput');
 
-const helpCommandNames = new Set(['help', 'version']);
-
 class CLI {
   constructor(serverless, inputArray) {
     this.serverless = serverless;
@@ -63,24 +61,6 @@ class CLI {
     this.log = function () {};
   }
 
-  isHelpRequest(processedInput) {
-    const commands = processedInput.commands;
-    const options = processedInput.options;
-
-    if (options.help || options.h) return true;
-
-    switch (commands.length) {
-      case 0:
-        if (options.version || options.v) return true;
-        if (options['help-interactive']) return true;
-        return false;
-      case 1:
-        return helpCommandNames.has(commands[0]);
-      default:
-        return false;
-    }
-  }
-
   displayHelp(processedInput) {
     const commands = processedInput.commands;
     const options = processedInput.options;
diff --git a/lib/classes/Service.js b/lib/classes/Service.js
index 7b7147aec..8163fd95d 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/Service.js
@@ -4,6 +4,7 @@ const { ServerlessError, logWarning } = require('./Error');
 const path = require('path');
 const _ = require('lodash');
 const semver = require('semver');
+const isHelpRequest = require('../cli/is-help-request');
 const currentVersion = require('../../package').version;
 
 class Service {
@@ -45,7 +46,7 @@ class Service {
     try {
       this.loadServiceFileParam();
     } catch (error) {
-      if (this.serverless.cli.isHelpRequest(this.serverless.processedInput)) return;
+      if (isHelpRequest()) return;
       throw error;
     }
   }