@hubspot/cli 6.4.0 → 7.0.0-beta.0

package/commands/project/upload.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const chalk = require('chalk');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { uiBetaTag, uiCommandReference } = require('../../lib/ui');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { loadAndValidateOptions } = require('../../lib/validation');
-const { ensureProjectExists, getProjectConfig, handleProjectUpload, logFeedbackMessage, validateProjectConfig, pollProjectBuildAndDeploy, displayWarnLogs, } = require('../../lib/projects');
+const { ensureProjectExists, getProjectConfig, logFeedbackMessage, validateProjectConfig, } = require('../../lib/projects');
+const { handleProjectUpload } = require('../../lib/projects/upload');
+const { displayWarnLogs, pollProjectBuildAndDeploy, } = require('../../lib/projects/buildAndDeploy');
 const { i18n } = require('../../lib/lang');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
@@ -15,23 +16,21 @@ const { PROJECT_ERROR_TYPES } = require('../../lib/constants');
 const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const i18nKey = 'commands.project.subcommands.upload';
-exports.command = 'upload [path] [--forceCreate] [--message]';
+exports.command = 'upload';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
-    const { forceCreate, path: projectPath, message } = options;
-    const accountId = getAccountId(options);
-    const accountConfig = getAccountConfig(accountId);
+    const { forceCreate, message, derivedAccountId } = options;
+    const accountConfig = getAccountConfig(derivedAccountId);
     const accountType = accountConfig && accountConfig.accountType;
-    trackCommandUsage('project-upload', { type: accountType }, accountId);
-    const { projectConfig, projectDir } = await getProjectConfig(projectPath);
+    trackCommandUsage('project-upload', { type: accountType }, derivedAccountId);
+    const { projectConfig, projectDir } = await getProjectConfig();
     validateProjectConfig(projectConfig, projectDir);
-    await ensureProjectExists(accountId, projectConfig.name, {
+    await ensureProjectExists(derivedAccountId, projectConfig.name, {
         forceCreate,
         uploadCommand: true,
     });
     try {
-        const result = await handleProjectUpload(accountId, projectConfig, projectDir, pollProjectBuildAndDeploy, message);
+        const result = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, pollProjectBuildAndDeploy, message);
         if (result.uploadError) {
             if (isSpecifiedError(result.uploadError, {
                 subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
@@ -42,7 +41,7 @@ exports.handler = async (options) => {
             }
             else {
                 logError(result.uploadError, new ApiErrorContext({
-                    accountId,
+                    accountId: derivedAccountId,
                     request: 'project upload',
                 }));
             }
@@ -56,34 +55,33 @@ exports.handler = async (options) => {
                 deployCommand: uiCommandReference(`hs project deploy --build=${result.buildId}`),
             }));
             logFeedbackMessage(result.buildId);
-            await displayWarnLogs(accountId, projectConfig.name, result.buildId);
+            await displayWarnLogs(derivedAccountId, projectConfig.name, result.buildId);
             process.exit(EXIT_CODES.SUCCESS);
         }
     }
     catch (e) {
-        logError(e, new ApiErrorContext({ accountId, request: 'project upload' }));
+        logError(e, new ApiErrorContext({
+            accountId: derivedAccountId,
+            request: 'project upload',
+        }));
         process.exit(EXIT_CODES.ERROR);
     }
 };
 exports.builder = yargs => {
-    yargs.positional('path', {
-        describe: i18n(`${i18nKey}.positionals.path.describe`),
-        type: 'string',
+    yargs.options({
+        'force-create': {
+            describe: i18n(`${i18nKey}.options.forceCreate.describe`),
+            type: 'boolean',
+            default: false,
+        },
+        message: {
+            alias: 'm',
+            describe: i18n(`${i18nKey}.options.message.describe`),
+            type: 'string',
+            default: '',
+        },
     });
-    yargs.option('forceCreate', {
-        describe: i18n(`${i18nKey}.options.forceCreate.describe`),
-        type: 'boolean',
-        default: false,
-    });
-    yargs.option('message', {
-        alias: 'm',
-        describe: i18n(`${i18nKey}.options.message.describe`),
-        type: 'string',
-        default: '',
-    });
-    yargs.example([
-        ['$0 project upload myProjectFolder', i18n(`${i18nKey}.examples.default`)],
-    ]);
+    yargs.example([['$0 project upload', i18n(`${i18nKey}.examples.default`)]]);
     addConfigOptions(yargs);
     addAccountOptions(yargs);
     addUseEnvironmentOptions(yargs);

package/commands/project/watch.js

@@ -2,24 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { i18n } = require('../../lib/lang');
-const { createWatcher } = require('../../lib/projectsWatch');
+const { createWatcher } = require('../../lib/projects/watch');
 const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { PROJECT_ERROR_TYPES } = require('../../lib/constants');
-const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { uiBetaTag } = require('../../lib/ui');
-const { ensureProjectExists, getProjectConfig, handleProjectUpload, pollBuildStatus, pollDeployStatus, validateProjectConfig, logFeedbackMessage, } = require('../../lib/projects');
+const { ensureProjectExists, getProjectConfig, validateProjectConfig, logFeedbackMessage, } = require('../../lib/projects');
+const { handleProjectUpload } = require('../../lib/projects/upload');
+const { pollBuildStatus, pollDeployStatus, } = require('../../lib/projects/buildAndDeploy');
 const { cancelStagedBuild, fetchProjectBuilds, } = require('@hubspot/local-dev-lib/api/projects');
 const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { handleKeypress, handleExit } = require('../../lib/process');
 const i18nKey = 'commands.project.subcommands.watch';
-exports.command = 'watch [path]';
+exports.command = 'watch';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 const handleBuildStatus = async (accountId, projectName, buildId) => {
-    const { isAutoDeployEnabled, deployStatusTaskLocator, } = await pollBuildStatus(accountId, projectName, buildId);
+    const { isAutoDeployEnabled, deployStatusTaskLocator } = await pollBuildStatus(accountId, projectName, buildId);
     if (isAutoDeployEnabled && deployStatusTaskLocator) {
         await pollDeployStatus(accountId, projectName, deployStatusTaskLocator.id, buildId);
     }
@@ -57,22 +58,20 @@ const handleUserInput = (accountId, projectName, currentBuildId) => {
     });
 };
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
-    const { initialUpload, path: projectPath } = options;
-    const accountId = getAccountId(options);
-    trackCommandUsage('project-watch', null, accountId);
-    const { projectConfig, projectDir } = await getProjectConfig(projectPath);
+    const { initialUpload, derivedAccountId } = options;
+    trackCommandUsage('project-watch', null, derivedAccountId);
+    const { projectConfig, projectDir } = await getProjectConfig();
     validateProjectConfig(projectConfig, projectDir);
-    await ensureProjectExists(accountId, projectConfig.name);
+    await ensureProjectExists(derivedAccountId, projectConfig.name);
     try {
-        const { data: { results: builds }, } = await fetchProjectBuilds(accountId, projectConfig.name, options);
+        const { data: { results: builds }, } = await fetchProjectBuilds(derivedAccountId, projectConfig.name, options);
         const hasNoBuilds = !builds || !builds.length;
         const startWatching = async () => {
-            await createWatcher(accountId, projectConfig, projectDir, handleBuildStatus, handleUserInput);
+            await createWatcher(derivedAccountId, projectConfig, projectDir, handleBuildStatus, handleUserInput);
         };
         // Upload all files if no build exists for this project yet
         if (initialUpload || hasNoBuilds) {
-            const result = await handleProjectUpload(accountId, projectConfig, projectDir, startWatching);
+            const result = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, startWatching);
             if (result.uploadError) {
                 if (isSpecifiedError(result.uploadError, {
                     subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
@@ -83,7 +82,7 @@ exports.handler = async (options) => {
                 }
                 else {
                     logError(result.uploadError, new ApiErrorContext({
-                        accountId,
+                        accountId: derivedAccountId,
                         request: 'project upload',
                     }));
                 }
@@ -95,22 +94,16 @@ exports.handler = async (options) => {
         }
     }
     catch (e) {
-        logError(e, new ApiErrorContext({ accountId }));
+        logError(e, new ApiErrorContext({ accountId: derivedAccountId }));
     }
 };
 exports.builder = yargs => {
-    yargs.positional('path', {
-        describe: i18n(`${i18nKey}.positionals.path.describe`),
-        type: 'string',
-    });
     yargs.option('initial-upload', {
         alias: 'i',
         describe: i18n(`${i18nKey}.options.initialUpload.describe`),
         type: 'boolean',
     });
-    yargs.example([
-        ['$0 project watch myProjectFolder', i18n(`${i18nKey}.examples.default`)],
-    ]);
+    yargs.example([['$0 project watch', i18n(`${i18nKey}.examples.default`)]]);
     addConfigOptions(yargs);
     addAccountOptions(yargs);
     addUseEnvironmentOptions(yargs);

package/commands/project.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
+const { addGlobalOptions } = require('../lib/commonOpts');
 const { i18n } = require('../lib/lang');
 const { uiBetaTag } = require('../lib/ui');
 const deploy = require('./project/deploy');
@@ -18,11 +18,10 @@ const migrateApp = require('./project/migrateApp');
 const cloneApp = require('./project/cloneApp');
 const installDeps = require('./project/installDeps');
 const i18nKey = 'commands.project';
-exports.command = 'project';
+exports.command = ['project', 'projects'];
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 exports.builder = yargs => {
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
+    addGlobalOptions(yargs);
     yargs
         .command(create)
         .command(add)

package/commands/remove.js

@@ -4,37 +4,38 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const { deleteFile } = require('@hubspot/local-dev-lib/api/fileMapper');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError, ApiErrorContext } = require('../lib/errorHandlers/index');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../lib/commonOpts');
-const { loadAndValidateOptions } = require('../lib/validation');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, addGlobalOptions, } = require('../lib/commonOpts');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { i18n } = require('../lib/lang');
 const i18nKey = 'commands.remove';
 exports.command = 'remove <path>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { path: hsPath } = options;
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('remove', null, accountId);
+    const { path: hsPath, derivedAccountId } = options;
+    trackCommandUsage('remove', null, derivedAccountId);
     try {
-        await deleteFile(accountId, hsPath);
-        logger.log(i18n(`${i18nKey}.deleted`, { accountId, path: hsPath }));
+        await deleteFile(derivedAccountId, hsPath);
+        logger.log(i18n(`${i18nKey}.deleted`, { accountId: derivedAccountId, path: hsPath }));
     }
     catch (error) {
-        logger.error(i18n(`${i18nKey}.errors.deleteFailed`, { accountId, path: hsPath }));
+        logger.error(i18n(`${i18nKey}.errors.deleteFailed`, {
+            accountId: derivedAccountId,
+            path: hsPath,
+        }));
         logError(error, new ApiErrorContext({
-            accountId,
+            accountId: derivedAccountId,
             request: hsPath,
         }));
     }
 };
 exports.builder = yargs => {
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addUseEnvironmentOptions(yargs);
     yargs.positional('path', {
         describe: i18n(`${i18nKey}.positionals.path.describe`),
         type: 'string',
     });
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    addUseEnvironmentOptions(yargs);
+    addGlobalOptions(yargs);
     return yargs;
 };

package/commands/sandbox/create.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, addTestingOptions, } = require('../../lib/commonOpts');
-const { loadAndValidateOptions } = require('../../lib/validation');
+const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, addTestingOptions, } = require('../../lib/commonOpts');
 const { i18n } = require('../../lib/lang');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { getAccountConfig, getEnv } = require('@hubspot/local-dev-lib/config');
@@ -21,15 +20,13 @@ const { HUBSPOT_ACCOUNT_TYPES, HUBSPOT_ACCOUNT_TYPE_STRINGS, } = require('@hubsp
 const { buildNewAccount } = require('../../lib/buildAccount');
 const { hubspotAccountNamePrompt, } = require('../../lib/prompts/accountNamePrompt');
 const i18nKey = 'commands.sandbox.subcommands.create';
-exports.command = 'create [--name] [--type]';
+exports.command = 'create';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
-    const { name, type, force } = options;
-    const accountId = getAccountId(options);
-    const accountConfig = getAccountConfig(accountId);
-    const env = getValidEnv(getEnv(accountId));
-    trackCommandUsage('sandbox-create', null, accountId);
+    const { name, type, force, derivedAccountId } = options;
+    const accountConfig = getAccountConfig(derivedAccountId);
+    const env = getValidEnv(getEnv(derivedAccountId));
+    trackCommandUsage('sandbox-create', null, derivedAccountId);
     // Default account is not a production portal
     if (accountConfig.accountType &&
         accountConfig.accountType !== HUBSPOT_ACCOUNT_TYPES.STANDARD) {
@@ -60,12 +57,12 @@ exports.handler = async (options) => {
     catch (err) {
         if (isMissingScopeError(err)) {
             logger.error(i18n('lib.sandbox.create.failure.scopes.message', {
-                accountName: accountConfig.name || accountId,
+                accountName: accountConfig.name || derivedAccountId,
             }));
             const websiteOrigin = getHubSpotWebsiteOrigin(env);
-            const url = `${websiteOrigin}/personal-access-key/${accountId}`;
+            const url = `${websiteOrigin}/personal-access-key/${derivedAccountId}`;
             logger.info(i18n('lib.sandbox.create.failure.scopes.instructions', {
-                accountName: accountConfig.name || accountId,
+                accountName: accountConfig.name || derivedAccountId,
                 url,
             }));
         }
@@ -144,10 +141,10 @@ exports.handler = async (options) => {
     }
 };
 exports.builder = yargs => {
-    yargs.option('f', {
+    yargs.option('force', {
         type: 'boolean',
-        alias: 'force',
-        describe: i18n(`${i18nKey}.examples.force`),
+        alias: 'f',
+        describe: i18n(`${i18nKey}.options.force.describe`),
     });
     yargs.option('name', {
         describe: i18n(`${i18nKey}.options.name.describe`),

package/commands/sandbox/delete.js

@@ -4,31 +4,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, getAccountId, addTestingOptions, } = require('../../lib/commonOpts');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { logError, debugError } = require('../../lib/errorHandlers/index');
 const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
 const { deleteSandbox } = require('@hubspot/local-dev-lib/api/sandboxHubs');
 const { i18n } = require('../../lib/lang');
 const { deleteSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
-const { getConfig, getEnv, removeSandboxAccountFromConfig, updateDefaultAccount, } = require('@hubspot/local-dev-lib/config');
+const { getEnv, removeSandboxAccountFromConfig, updateDefaultAccount, getConfigDefaultAccount, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
+const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { selectAccountFromConfig } = require('../../lib/prompts/accountsPrompt');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { promptUser } = require('../../lib/prompts/promptUtils');
+const { uiAccountDescription, uiBetaTag } = require('../../lib/ui');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
-const { uiAccountDescription, uiBetaTag } = require('../../lib/ui');
 const i18nKey = 'commands.sandbox.subcommands.delete';
-exports.command = 'delete [--account]';
+exports.command = 'delete';
 exports.describe = exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options, false);
-    const { account, force } = options;
-    const config = getConfig();
+    const { providedAccountId, force } = options;
     trackCommandUsage('sandbox-delete', null);
     let accountPrompt;
-    if (!account) {
+    if (!providedAccountId) {
         if (!force) {
-            accountPrompt = await deleteSandboxPrompt(config);
+            accountPrompt = await deleteSandboxPrompt();
         }
         else {
             // Account is required, throw error if force flag is present and no account is specified
@@ -43,18 +41,19 @@ exports.handler = async (options) => {
         }
     }
     const sandboxAccountId = getAccountId({
-        account: account || accountPrompt.account,
+        account: providedAccountId || accountPrompt.account,
     });
-    const isDefaultAccount = sandboxAccountId === getAccountId(config.defaultPortal);
+    const isDefaultAccount = sandboxAccountId === getAccountId(getConfigDefaultAccount());
     const baseUrl = getHubSpotWebsiteOrigin(getValidEnv(getEnv(sandboxAccountId)));
     let parentAccountId;
-    for (const portal of config.portals) {
-        if (portal.portalId === sandboxAccountId) {
+    const accountsList = getConfigAccounts();
+    for (const portal of accountsList) {
+        if (getAccountIdentifier(portal) === sandboxAccountId) {
             if (portal.parentAccountId) {
                 parentAccountId = portal.parentAccountId;
             }
             else if (!force) {
-                const parentAccountPrompt = await deleteSandboxPrompt(config, true);
+                const parentAccountPrompt = await deleteSandboxPrompt(true);
                 parentAccountId = getAccountId({
                     account: parentAccountPrompt.account,
                 });
@@ -107,13 +106,13 @@ exports.handler = async (options) => {
             : `${i18nKey}.success.delete`;
         logger.log('');
         logger.success(i18n(deleteKey, {
-            account: account || accountPrompt.account,
+            account: providedAccountId || accountPrompt.account,
             sandboxHubId: sandboxAccountId,
         }));
         logger.log('');
         const promptDefaultAccount = removeSandboxAccountFromConfig(sandboxAccountId);
         if (promptDefaultAccount && !force) {
-            const newDefaultAccount = await selectAccountFromConfig(getConfig());
+            const newDefaultAccount = await selectAccountFromConfig();
             updateDefaultAccount(newDefaultAccount);
         }
         else {
@@ -156,7 +155,7 @@ exports.handler = async (options) => {
             logger.log('');
             const promptDefaultAccount = removeSandboxAccountFromConfig(sandboxAccountId);
             if (promptDefaultAccount && !force) {
-                const newDefaultAccount = await selectAccountFromConfig(getConfig());
+                const newDefaultAccount = await selectAccountFromConfig();
                 updateDefaultAccount(newDefaultAccount);
             }
             else {
@@ -176,10 +175,10 @@ exports.builder = yargs => {
         describe: i18n(`${i18nKey}.options.account.describe`),
         type: 'string',
     });
-    yargs.option('f', {
+    yargs.option('force', {
         type: 'boolean',
-        alias: 'force',
-        describe: i18n(`${i18nKey}.examples.force`),
+        alias: 'f',
+        describe: i18n(`${i18nKey}.options.force.describe`),
     });
     yargs.example([
         [

package/commands/sandbox.js

@@ -1,20 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
+const { addGlobalOptions } = require('../lib/commonOpts');
 const { i18n } = require('../lib/lang');
 const { uiBetaTag } = require('../lib/ui');
 const create = require('./sandbox/create');
 const del = require('./sandbox/delete');
 const i18nKey = 'commands.sandbox';
-exports.command = 'sandbox';
+exports.command = ['sandbox', 'sandboxes'];
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 exports.builder = yargs => {
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    yargs
-        .command(create)
-        .command(del)
-        .demandCommand(1, '');
+    addGlobalOptions(yargs);
+    yargs.command(create).command(del).demandCommand(1, '');
     return yargs;
 };

package/commands/{secrets → secret}/addSecret.js

@@ -1,28 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const secrets_1 = require("@hubspot/local-dev-lib/api/secrets");
+const ui_1 = require("../../lib/ui");
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { addSecret } = require('@hubspot/local-dev-lib/api/secrets');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { uiAccountDescription } = require('../../lib/ui');
-const { secretValuePrompt } = require('../../lib/prompts/secretPrompt');
+const { secretValuePrompt, secretNamePrompt, } = require('../../lib/prompts/secretPrompt');
 const { i18n } = require('../../lib/lang');
-const i18nKey = 'commands.secrets.subcommands.add';
-exports.command = 'add <name>';
+const i18nKey = 'commands.secret.subcommands.add';
+exports.command = 'add [name]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { name: secretName } = options;
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('secrets-add', null, accountId);
+    const { name, derivedAccountId } = options;
+    let secretName = name;
+    trackCommandUsage('secrets-add', null, derivedAccountId);
     try {
+        if (!secretName) {
+            const { secretName: name } = await secretNamePrompt();
+            secretName = name;
+        }
+        const { data: { results: secrets }, } = await (0, secrets_1.fetchSecrets)(derivedAccountId);
+        if (secrets.includes(secretName)) {
+            logger.error(i18n(`${i18nKey}.errors.alreadyExists`, {
+                secretName,
+                command: (0, ui_1.uiCommandReference)('hs secret update'),
+            }));
+            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        }
         const { secretValue } = await secretValuePrompt();
-        await addSecret(accountId, secretName, secretValue);
+        await addSecret(derivedAccountId, secretName, secretValue);
         logger.success(i18n(`${i18nKey}.success.add`, {
-            accountIdentifier: uiAccountDescription(accountId),
+            accountIdentifier: uiAccountDescription(derivedAccountId),
             secretName,
         }));
     }
@@ -32,7 +45,7 @@ exports.handler = async (options) => {
         }));
         logError(err, new ApiErrorContext({
             request: 'add secret',
-            accountId,
+            accountId: derivedAccountId,
         }));
     }
 };

package/commands/secret/deleteSecret.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// @ts-nocheck
+const secretPrompt_1 = require("../../lib/prompts/secretPrompt");
+const promptUtils_1 = require("../../lib/prompts/promptUtils");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const { logger } = require('@hubspot/local-dev-lib/logger');
+const { ApiErrorContext, logError } = require('../../lib/errorHandlers/index');
+const { deleteSecret, fetchSecrets, } = require('@hubspot/local-dev-lib/api/secrets');
+const { trackCommandUsage } = require('../../lib/usageTracking');
+const { uiAccountDescription } = require('../../lib/ui');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { i18n } = require('../../lib/lang');
+const i18nKey = 'commands.secret.subcommands.delete';
+exports.command = 'delete [name]';
+exports.describe = i18n(`${i18nKey}.describe`);
+exports.handler = async (options) => {
+    const { name, derivedAccountId, force } = options;
+    let secretName = name;
+    trackCommandUsage('secrets-delete', null, derivedAccountId);
+    try {
+        const { data: { results: secrets }, } = await fetchSecrets(derivedAccountId);
+        if (secretName && !secrets.includes(secretName)) {
+            logger.error(i18n(`${i18nKey}.errors.noSecret`, { secretName }));
+            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        }
+        if (!secretName) {
+            const { secretToModify } = await (0, secretPrompt_1.secretListPrompt)(secrets, i18n(`${i18nKey}.selectSecret`));
+            secretName = secretToModify;
+        }
+        const confirmDelete = force ||
+            (await (0, promptUtils_1.confirmPrompt)(i18n(`${i18nKey}.confirmDelete`, { secretName }), {
+                defaultAnswer: false,
+            }));
+        if (!confirmDelete) {
+            logger.success(i18n(`${i18nKey}.deleteCanceled`));
+            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        }
+        await deleteSecret(derivedAccountId, secretName);
+        logger.success(i18n(`${i18nKey}.success.delete`, {
+            accountIdentifier: uiAccountDescription(derivedAccountId),
+            secretName,
+        }));
+    }
+    catch (err) {
+        if (secretName) {
+            logger.error(i18n(`${i18nKey}.errors.delete`, {
+                secretName,
+            }));
+        }
+        logError(err, new ApiErrorContext({
+            request: 'delete a secret',
+            accountId: derivedAccountId,
+        }));
+    }
+};
+exports.builder = yargs => {
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    addUseEnvironmentOptions(yargs);
+    yargs
+        .positional('name', {
+        describe: i18n(`${i18nKey}.positionals.name.describe`),
+        type: 'string',
+    })
+        .options('force', {
+        describe: 'Force the deletion',
+        type: 'boolean',
+    });
+    return yargs;
+};

package/commands/{secrets → secret}/listSecrets.js

@@ -4,22 +4,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { fetchSecrets } = require('@hubspot/local-dev-lib/api/secrets');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { uiAccountDescription } = require('../../lib/ui');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { i18n } = require('../../lib/lang');
-const i18nKey = 'commands.secrets.subcommands.list';
+const i18nKey = 'commands.secret.subcommands.list';
 exports.command = 'list';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('secrets-list', null, accountId);
+    const { derivedAccountId } = options;
+    trackCommandUsage('secrets-list', null, derivedAccountId);
     try {
-        const { data: { results }, } = await fetchSecrets(accountId);
+        const { data: { results }, } = await fetchSecrets(derivedAccountId);
         const groupLabel = i18n(`${i18nKey}.groupLabel`, {
-            accountIdentifier: uiAccountDescription(accountId),
+            accountIdentifier: uiAccountDescription(derivedAccountId),
         });
         logger.group(groupLabel);
         results.forEach(secret => logger.log(secret));
@@ -29,7 +27,7 @@ exports.handler = async (options) => {
         logger.error(i18n(`${i18nKey}.errors.list`));
         logError(err, new ApiErrorContext({
             request: 'add secret',
-            accountId,
+            accountId: derivedAccountId,
         }));
     }
 };