refactor: replace inherited error and exit utils in command.addons (#…

…3346)

Co-authored-by: ehmicky <ehmicky@users.noreply.github.com>

src/commands/addons/auth.js

@@ -1,6 +1,6 @@
 const { prepareAddonCommand, ADDON_VALIDATION } = require('../../utils/addons/prepare')
 const Command = require('../../utils/command')
-const { log } = require('../../utils/command-helpers')
+const { log, exit } = require('../../utils/command-helpers')
 const openBrowser = require('../../utils/open-browser')
 
 class AddonsAuthCommand extends Command {
@@ -25,7 +25,7 @@ class AddonsAuthCommand extends Command {
     log(addon.auth_url)
     log()
     await openBrowser({ url: addon.auth_url })
-    this.exit()
+    exit()
   }
 }
 AddonsAuthCommand.aliases = ['addon:auth']

src/commands/addons/config.js

@@ -9,7 +9,7 @@ const generatePrompts = require('../../utils/addons/prompts')
 const render = require('../../utils/addons/render')
 const { requiredConfigValues, missingConfigValues, updateConfigValues } = require('../../utils/addons/validation')
 const Command = require('../../utils/command')
-const { log } = require('../../utils/command-helpers')
+const { log, error } = require('../../utils/command-helpers')
 const { parseRawFlags } = require('../../utils/parse-raw-flags')
 
 class AddonsConfigCommand extends Command {
@@ -132,13 +132,12 @@ class AddonsConfigCommand extends Command {
         siteId,
         instanceId: addon.id,
         api,
-        error: this.error,
       })
     }
   }
 }
 
-const update = async function ({ addonName, currentConfig, newConfig, siteId, instanceId, api, error }) {
+const update = async function ({ addonName, currentConfig, newConfig, siteId, instanceId, api }) {
   const codeDiff = diffValues(currentConfig, newConfig)
   if (!codeDiff) {
     log('No changes, exiting early')

src/commands/addons/create.js

@@ -7,10 +7,10 @@ const generatePrompts = require('../../utils/addons/prompts')
 const render = require('../../utils/addons/render')
 const { requiredConfigValues, missingConfigValues, updateConfigValues } = require('../../utils/addons/validation')
 const Command = require('../../utils/command')
-const { log } = require('../../utils/command-helpers')
+const { log, error } = require('../../utils/command-helpers')
 const { parseRawFlags } = require('../../utils/parse-raw-flags')
 
-const createAddon = async ({ api, siteId, addonName, config, siteData, error }) => {
+const createAddon = async ({ api, siteId, addonName, config, siteData }) => {
   try {
     const response = await api.createServiceInstance({
       siteId,
@@ -38,7 +38,7 @@ class AddonsCreateCommand extends Command {
       validation: ADDON_VALIDATION.NOT_EXISTS,
     })
 
-    const { error, netlify } = this
+    const { netlify } = this
     const { api, site } = netlify
     const siteId = site.id
 
@@ -71,7 +71,7 @@ class AddonsCreateCommand extends Command {
           return false
         }
 
-        await createAddon({ api, siteId, addonName, config: newConfig, siteData, error })
+        await createAddon({ api, siteId, addonName, config: newConfig, siteData })
 
         return false
       }
@@ -104,7 +104,7 @@ class AddonsCreateCommand extends Command {
       }
     }
 
-    await createAddon({ api, siteId, addonName, config: configValues, siteData, error })
+    await createAddon({ api, siteId, addonName, config: configValues, siteData })
   }
 }
 

src/commands/addons/delete.js

@@ -3,7 +3,7 @@ const inquirer = require('inquirer')
 
 const { prepareAddonCommand, ADDON_VALIDATION } = require('../../utils/addons/prepare')
 const Command = require('../../utils/command')
-const { log } = require('../../utils/command-helpers')
+const { log, exit, error } = require('../../utils/command-helpers')
 const { parseRawFlags } = require('../../utils/parse-raw-flags')
 
 class AddonsDeleteCommand extends Command {
@@ -26,7 +26,7 @@ class AddonsDeleteCommand extends Command {
         default: false,
       })
       if (!wantsToDelete) {
-        this.exit()
+        exit()
       }
     }
 
@@ -37,8 +37,8 @@ class AddonsDeleteCommand extends Command {
         instanceId: addon.id,
       })
       log(`Addon "${addonName}" deleted`)
-    } catch (error) {
-      this.error(error.message)
+    } catch (error_) {
+      error(error_.message)
     }
   }
 }