@hubspot/cli 7.7.35-experimental.0 → 7.8.0-beta.0

package/commands/secret/deleteSecret.js

@@ -1,15 +1,14 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { deleteSecret, fetchSecrets } from '@hubspot/local-dev-lib/api/secrets';
 import { secretListPrompt } from '../../lib/prompts/secretPrompt.js';
 import { confirmPrompt } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { ApiErrorContext, logError } from '../../lib/errorHandlers/index.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
-import { uiAccountDescription } from '../../lib/ui/index.js';
-import { i18n } from '../../lib/lang.js';
+import { commands } from './../../lang/en.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'delete [name]';
-const describe = i18n(`commands.secret.subcommands.delete.describe`);
+const describe = commands.secret.subcommands.delete.describe;
 async function handler(args) {
     const { name, derivedAccountId, force } = args;
     let secretName = name;
@@ -17,36 +16,27 @@ async function handler(args) {
     try {
         const { data: { results: secrets }, } = await fetchSecrets(derivedAccountId);
         if (secretName && !secrets.includes(secretName)) {
-            logger.error(i18n(`commands.secret.subcommands.delete.errors.noSecret`, {
-                secretName,
-            }));
+            uiLogger.error(commands.secret.subcommands.delete.errors.noSecret(secretName));
             process.exit(EXIT_CODES.ERROR);
         }
         if (!secretName) {
-            const { secretToModify } = await secretListPrompt(secrets, i18n(`commands.secret.subcommands.delete.selectSecret`));
+            const { secretToModify } = await secretListPrompt(secrets, commands.secret.subcommands.delete.selectSecret);
             secretName = secretToModify;
         }
         const confirmDelete = force ||
-            (await confirmPrompt(i18n(`commands.secret.subcommands.delete.confirmDelete`, {
-                secretName,
-            }), {
+            (await confirmPrompt(commands.secret.subcommands.delete.confirmDelete(secretName), {
                 defaultAnswer: false,
             }));
         if (!confirmDelete) {
-            logger.success(i18n(`commands.secret.subcommands.delete.deleteCanceled`));
+            uiLogger.success(commands.secret.subcommands.delete.deleteCanceled);
             process.exit(EXIT_CODES.SUCCESS);
         }
         await deleteSecret(derivedAccountId, secretName);
-        logger.success(i18n(`commands.secret.subcommands.delete.success.delete`, {
-            accountIdentifier: uiAccountDescription(derivedAccountId),
-            secretName,
-        }));
+        uiLogger.success(commands.secret.subcommands.delete.success.delete(secretName, derivedAccountId));
     }
     catch (err) {
         if (secretName) {
-            logger.error(i18n(`commands.secret.subcommands.delete.errors.delete`, {
-                secretName,
-            }));
+            uiLogger.error(commands.secret.subcommands.delete.errors.delete(secretName));
         }
         logError(err, new ApiErrorContext({
             request: 'delete a secret',
@@ -57,7 +47,7 @@ async function handler(args) {
 function deleteSecretBuilder(yargs) {
     yargs
         .positional('name', {
-        describe: i18n(`commands.secret.subcommands.delete.positionals.name.describe`),
+        describe: commands.secret.subcommands.delete.positionals.name.describe,
         type: 'string',
     })
         .options('force', {

package/commands/secret/listSecret.js

@@ -1,26 +1,24 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { fetchSecrets } from '@hubspot/local-dev-lib/api/secrets';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { uiAccountDescription } from '../../lib/ui/index.js';
-import { i18n } from '../../lib/lang.js';
+import { commands } from '../../lang/en.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'list';
-const describe = i18n(`commands.secret.subcommands.list.describe`);
+const describe = commands.secret.subcommands.list.describe;
 async function handler(args) {
     const { derivedAccountId } = args;
     trackCommandUsage('secrets-list', {}, derivedAccountId);
     try {
         const { data: { results }, } = await fetchSecrets(derivedAccountId);
-        const groupLabel = i18n(`commands.secret.subcommands.list.groupLabel`, {
-            accountIdentifier: uiAccountDescription(derivedAccountId),
-        });
-        logger.group(groupLabel);
-        results.forEach(secret => logger.log(secret));
-        logger.groupEnd();
+        const groupLabel = commands.secret.subcommands.list.groupLabel(uiAccountDescription(derivedAccountId));
+        uiLogger.group(groupLabel);
+        results.forEach(secret => uiLogger.log(secret));
+        uiLogger.groupEnd();
     }
     catch (err) {
-        logger.error(i18n(`commands.secret.subcommands.list.errors.list`));
+        uiLogger.error(commands.secret.subcommands.list.errors.list);
         logError(err, new ApiErrorContext({
             request: 'add secret',
             accountId: derivedAccountId,

package/commands/secret/updateSecret.js

@@ -1,14 +1,13 @@
 import { updateSecret, fetchSecrets } from '@hubspot/local-dev-lib/api/secrets';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { ApiErrorContext, logError } from '../../lib/errorHandlers/index.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
-import { uiAccountDescription } from '../../lib/ui/index.js';
 import { secretValuePrompt, secretListPrompt, } from '../../lib/prompts/secretPrompt.js';
-import { i18n } from '../../lib/lang.js';
+import { commands } from '../../lang/en.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'update [name]';
-const describe = i18n(`commands.secret.subcommands.update.describe`);
+const describe = commands.secret.subcommands.update.describe;
 async function handler(args) {
     const { name, derivedAccountId } = args;
     let secretName = name;
@@ -16,27 +15,20 @@ async function handler(args) {
     try {
         const { data: { results: secrets }, } = await fetchSecrets(derivedAccountId);
         if (secretName && !secrets.includes(secretName)) {
-            logger.error(i18n(`commands.secret.subcommands.update.errors.noSecret`, {
-                secretName,
-            }));
+            uiLogger.error(commands.secret.subcommands.update.errors.noSecret(secretName));
             process.exit(EXIT_CODES.ERROR);
         }
         if (!secretName) {
-            const { secretToModify } = await secretListPrompt(secrets, i18n(`commands.secret.subcommands.update.selectSecret`));
+            const { secretToModify } = await secretListPrompt(secrets, commands.secret.subcommands.update.selectSecret);
             secretName = secretToModify;
         }
         const { secretValue } = await secretValuePrompt();
         await updateSecret(derivedAccountId, secretName, secretValue);
-        logger.success(i18n(`commands.secret.subcommands.update.success.update`, {
-            accountIdentifier: uiAccountDescription(derivedAccountId),
-            secretName,
-        }));
-        logger.log(i18n(`commands.secret.subcommands.update.success.updateExplanation`));
+        uiLogger.success(commands.secret.subcommands.update.success.update(secretName, derivedAccountId));
+        uiLogger.log(commands.secret.subcommands.update.success.updateExplanation);
     }
     catch (err) {
-        logger.error(i18n(`commands.secret.subcommands.update.errors.update`, {
-            secretName: secretName || '',
-        }));
+        uiLogger.error(commands.secret.subcommands.update.errors.update(secretName || ''));
         logError(err, new ApiErrorContext({
             request: 'update secret',
             accountId: derivedAccountId,
@@ -45,7 +37,7 @@ async function handler(args) {
 }
 function updateSecretBuilder(yargs) {
     yargs.positional('name', {
-        describe: i18n(`commands.secret.subcommands.update.positionals.name.describe`),
+        describe: commands.secret.subcommands.update.positionals.name.describe,
         type: 'string',
     });
     return yargs;

package/commands/secret.js

@@ -2,10 +2,10 @@ import addSecretCommand from './secret/addSecret.js';
 import listSecretCommand from './secret/listSecret.js';
 import deleteSecretCommand from './secret/deleteSecret.js';
 import updateSecretCommand from './secret/updateSecret.js';
-import { i18n } from '../lib/lang.js';
+import { commands } from '../lang/en.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 const command = ['secret', 'secrets'];
-const describe = i18n(`commands.secret.describe`);
+const describe = commands.secret.describe;
 function secretBuilder(yargs) {
     yargs
         .command(listSecretCommand)

package/commands/testAccount/__tests__/delete.test.js

@@ -1,12 +1,12 @@
 import yargs from 'yargs';
-import { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, addTestingOptions, } from '../../../lib/commonOpts.js';
+import { addConfigOptions, addUseEnvironmentOptions, addTestingOptions, } from '../../../lib/commonOpts.js';
 import testAccountDeleteCommand from '../delete.js';
 vi.mock('../../../lib/commonOpts');
 describe('commands/testAccount/delete', () => {
     const yargsMock = yargs;
     describe('command', () => {
         it('should have the correct command structure', () => {
-            expect(testAccountDeleteCommand.command).toEqual('delete <test-account-id>');
+            expect(testAccountDeleteCommand.command).toEqual('delete [test-account]');
         });
     });
     describe('describe', () => {
@@ -20,8 +20,6 @@ describe('commands/testAccount/delete', () => {
             expect(yargsMock.example).toHaveBeenCalledTimes(1);
             expect(addTestingOptions).toHaveBeenCalledTimes(1);
             expect(addTestingOptions).toHaveBeenCalledWith(yargsMock);
-            expect(addAccountOptions).toHaveBeenCalledTimes(1);
-            expect(addAccountOptions).toHaveBeenCalledWith(yargsMock);
             expect(addConfigOptions).toHaveBeenCalledTimes(1);
             expect(addConfigOptions).toHaveBeenCalledWith(yargsMock);
             expect(addUseEnvironmentOptions).toHaveBeenCalledTimes(1);

package/commands/testAccount/delete.d.ts

@@ -1,6 +1,7 @@
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, TestingArgs, YargsCommandModule } from '../../types/Yargs.js';
-type DeleteTestAccountArgs = CommonArgs & AccountArgs & ConfigArgs & TestingArgs & EnvironmentArgs & {
-    testAccountId: number;
+import { CommonArgs, ConfigArgs, EnvironmentArgs, TestingArgs, YargsCommandModule } from '../../types/Yargs.js';
+type DeleteTestAccountArgs = CommonArgs & ConfigArgs & TestingArgs & EnvironmentArgs & {
+    testAccount?: string | number;
+    force?: boolean;
 };
 declare const deleteTestAccountCommand: YargsCommandModule<unknown, DeleteTestAccountArgs>;
 export default deleteTestAccountCommand;

package/commands/testAccount/delete.js

@@ -1,39 +1,180 @@
-import { deleteDeveloperTestAccount } from '@hubspot/local-dev-lib/api/developerTestAccounts';
+import { fetchDeveloperTestAccounts, deleteDeveloperTestAccount, } from '@hubspot/local-dev-lib/api/developerTestAccounts';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
-const command = 'delete <test-account-id>';
+import { deleteAccount, getAccountConfig, getAccountId, getConfigPath, loadConfig, updateDefaultAccount, } from '@hubspot/local-dev-lib/config';
+import { promptUser } from '../../lib/prompts/promptUtils.js';
+import { debugError } from '../../lib/errorHandlers/index.js';
+const command = 'delete [test-account]';
 const describe = commands.testAccount.delete.describe;
-async function handler(args) {
-    const { derivedAccountId, testAccountId } = args;
-    trackCommandUsage('test-account-delete', {}, derivedAccountId);
+async function getAccountPromptOptions(derivedAccountId) {
     try {
-        await deleteDeveloperTestAccount(derivedAccountId, testAccountId, true);
-        uiLogger.success(commands.testAccount.delete.success.testAccountDeleted(testAccountId));
+        const { data } = await fetchDeveloperTestAccounts(derivedAccountId);
+        return data.results.map(testAccount => ({
+            name: `${testAccount.accountName} (${testAccount.id})`,
+            value: testAccount.id,
+        }));
     }
     catch (err) {
-        uiLogger.error(commands.testAccount.delete.errors.failedToDelete);
+        uiLogger.error(commands.testAccount.delete.errors.failedToFetchTestAccounts);
+        throw err;
+    }
+}
+async function accountToDeleteSelectionPrompt(derivedAccountId) {
+    const accountData = await getAccountPromptOptions(derivedAccountId);
+    if (accountData.length === 0) {
+        uiLogger.error(commands.testAccount.delete.errors.noAccountsToDelete(derivedAccountId));
+        process.exit(EXIT_CODES.ERROR);
+    }
+    const { testAccountToDelete } = await promptUser([
+        {
+            type: 'list',
+            name: 'testAccountToDelete',
+            pageSize: 20,
+            message: commands.testAccount.delete.prompts.selectTestAccounts,
+            choices: accountData,
+        },
+    ]);
+    return testAccountToDelete;
+}
+async function confirmDeletion() {
+    const { shouldDelete } = await promptUser([
+        {
+            type: 'confirm',
+            name: 'shouldDelete',
+            message: commands.testAccount.delete.prompts.confirmDeletion,
+        },
+    ]);
+    return shouldDelete;
+}
+async function deleteTestAccountInHubSpot(derivedAccountId, accountId) {
+    try {
+        await deleteDeveloperTestAccount(derivedAccountId, accountId, true);
+        uiLogger.success(commands.testAccount.delete.success.testAccountDeletedFromHubSpot(accountId));
+    }
+    catch (e) {
+        debugError(e);
+        uiLogger.error(commands.testAccount.delete.errors.failedToDelete(accountId));
+    }
+}
+async function deleteTestAccountFromConfig(testAccountId, parentAccountName, account) {
+    try {
+        // If the account isn't in the local config then it wasn't auth'd on the local machine
+        if (account && account.name && account.accountType) {
+            // If the deleted test account was the default account, replace the default account with the parent account
+            loadConfig(getConfigPath()); // Get updated version of the config
+            const defaultAccountId = getAccountId(); // We need to get the current default accountId before delete the test account
+            await deleteAccount(account.name);
+            uiLogger.success(commands.testAccount.delete.success.testAccountDeletedFromConfig(testAccountId));
+            if (testAccountId === defaultAccountId) {
+                updateDefaultAccount(parentAccountName);
+                uiLogger.info(commands.testAccount.delete.info.replaceDefaultAccount(testAccountId, parentAccountName));
+            }
+        }
+    }
+    catch (e) {
+        debugError(e);
+        uiLogger.error(commands.testAccount.delete.errors.failedToDeleteFromConfig(testAccountId));
+    }
+}
+async function validateTestAccountConfigs(testAccountId) {
+    if (!testAccountId) {
+        uiLogger.error(commands.testAccount.delete.errors.testAccountNotFound(testAccountId));
+        process.exit(EXIT_CODES.ERROR);
+    }
+    const testAccountConfig = getAccountConfig(testAccountId);
+    if (!testAccountConfig) {
+        uiLogger.error(commands.testAccount.delete.errors.testAccountNotFound(testAccountId));
         process.exit(EXIT_CODES.ERROR);
     }
+    const parentAccountConfig = getAccountConfig(testAccountConfig.parentAccountId);
+    if (!parentAccountConfig) {
+        uiLogger.error(commands.testAccount.delete.errors.parentAccountNotFound(testAccountId));
+        process.exit(EXIT_CODES.ERROR);
+    }
+    const parentAccountName = parentAccountConfig.name;
+    return { testAccountConfig, parentAccountName };
+}
+async function handler(args) {
+    const { derivedAccountId, testAccount, force } = args;
+    trackCommandUsage('test-account-delete', {}, derivedAccountId);
+    let testAccountIdToDelete = 0;
+    // See if the account exists
+    if (testAccount) {
+        const accountId = getAccountId(testAccount);
+        await validateTestAccountConfigs(accountId);
+        if (accountId) {
+            testAccountIdToDelete = accountId;
+        }
+    }
+    // Prompt for selection when name or id aren't provided
+    if (!testAccountIdToDelete) {
+        try {
+            testAccountIdToDelete =
+                await accountToDeleteSelectionPrompt(derivedAccountId);
+        }
+        catch (err) {
+            debugError(err);
+            uiLogger.error(commands.testAccount.delete.errors.failedToSelectAccount);
+            process.exit(EXIT_CODES.ERROR);
+        }
+    }
+    const { testAccountConfig, parentAccountName } = await validateTestAccountConfigs(testAccountIdToDelete);
+    // If --force, don't prompt user; else confirm deletion
+    let shouldDeleteAccount;
+    if (force) {
+        shouldDeleteAccount = true;
+    }
+    else {
+        shouldDeleteAccount = await confirmDeletion();
+    }
+    if (shouldDeleteAccount) {
+        const parentAccountId = testAccountConfig.parentAccountId;
+        await deleteTestAccountInHubSpot(parentAccountId, testAccountIdToDelete);
+        await deleteTestAccountFromConfig(testAccountIdToDelete, parentAccountName, testAccountConfig);
+    }
+    else {
+        uiLogger.info(commands.testAccount.delete.info.deletionCanceled);
+    }
     process.exit(EXIT_CODES.SUCCESS);
 }
 function deleteTestAccountBuilder(yargs) {
-    yargs.positional('test-account-id', {
-        type: 'number',
-        description: commands.testAccount.delete.positionals.testAccountId,
-        required: true,
+    yargs.positional('test-account', {
+        type: 'string',
+        description: commands.testAccount.delete.options.id,
+        required: false,
+    });
+    yargs.option('force', {
+        describe: commands.upload.options.force,
+        type: 'boolean',
+        default: false,
     });
     yargs.example([
-        ['$0 delete 1234567890', commands.testAccount.delete.example(1234567890)],
+        [
+            '$0 test-account delete 12345678',
+            commands.testAccount.delete.examples.withPositionalID(12345678),
+        ],
+        [
+            '$0 test-account delete my-test-account',
+            commands.testAccount.delete.examples.withPositionalName('my-test-account'),
+        ],
+        [
+            '$0 test-account delete --test-account=12345678',
+            commands.testAccount.delete.examples.withID(12345678),
+        ],
+        [
+            '$0 test-account delete --test-account=my-test-account',
+            commands.testAccount.delete.examples.withName('my-test-account'),
+        ],
+        ['$0 test-account delete', commands.testAccount.delete.examples.withoutId],
     ]);
     return yargs;
 }
 const builder = makeYargsBuilder(deleteTestAccountBuilder, command, describe, {
     useGlobalOptions: true,
     useEnvironmentOptions: true,
-    useAccountOptions: true,
     useConfigOptions: true,
     useTestingOptions: true,
 });

package/commands/testAccount/importData.d.ts

@@ -1,6 +1,6 @@
 import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs.js';
 export declare const command = "import-data";
-export declare const describe: undefined;
+export declare const describe: "Import data into the CRM";
 type CrmImportDataArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     filePath: string | undefined;
     skipConfirm: boolean | undefined;

package/commands/testAccount/importData.js

@@ -8,7 +8,7 @@ import { handleImportData, handleTargetTestAccountSelectionFlow, } from '../../l
 import { confirmImportDataPrompt } from '../../lib/prompts/confirmImportDataPrompt.js';
 import { commands } from '../../lang/en.js';
 export const command = 'import-data';
-export const describe = undefined; // commands.testAccount.subcommands.importData.describe;
+export const describe = commands.testAccount.subcommands.importData.describe;
 async function handler(args) {
     const { derivedAccountId, userProvidedAccount, filePath: providedFilePath, skipConfirm, } = args;
     trackCommandUsage('crm-import-data', {}, derivedAccountId);

package/commands/testAccount.js

@@ -5,7 +5,7 @@ import deleteTestAccountCommand from './testAccount/delete.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { commands } from '../lang/en.js';
 const command = ['test-account', 'test-accounts'];
-const describe = undefined; //commands.testAccount.describe;
+const describe = commands.testAccount.describe;
 function testAccountBuilder(yargs) {
     yargs
         .command(createTestAccountCommand)