@hubspot/cli 5.2.1-beta.1 → 5.2.1-beta.10

package/lib/projects.js

@@ -17,6 +17,7 @@ const {
   PROJECT_DEPLOY_TEXT,
   PROJECT_CONFIG_FILE,
   PROJECT_TASK_TYPES,
+  PROJECT_ERROR_TYPES,
 } = require('./constants');
 const {
   createProject,
@@ -47,7 +48,7 @@ const {
 } = require('./errorHandlers/apiErrors');
 const { HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH } = require('./constants');
 
-const i18nKey = 'cli.lib.projects';
+const i18nKey = 'lib.projects';
 
 const SPINNER_STATUS = {
   SPINNING: 'spinning',
@@ -252,7 +253,7 @@ const ensureProjectExists = async (
     const project = withPolling
       ? await pollFetchProject(accountId, projectName)
       : await fetchProject(accountId, projectName);
-    return !!project;
+    return { projectExists: !!project, project };
   } catch (err) {
     if (isSpecifiedError(err, { statusCode: 404 })) {
       let shouldCreateProject = forceCreate;
@@ -273,14 +274,14 @@ const ensureProjectExists = async (
 
       if (shouldCreateProject) {
         try {
-          await createProject(accountId, projectName);
+          const project = await createProject(accountId, projectName);
           logger.success(
             i18n(`${i18nKey}.ensureProjectExists.createSuccess`, {
               projectName,
               accountIdentifier,
             })
           );
-          return true;
+          return { projectExists: true, project };
         } catch (err) {
           return logApiErrorInstance(
             err,
@@ -296,7 +297,7 @@ const ensureProjectExists = async (
             })
           );
         }
-        return false;
+        return { projectExists: false };
       }
     }
     if (
@@ -698,9 +699,51 @@ const makePollTaskStatusFunc = ({
 
     return new Promise((resolve, reject) => {
       const pollInterval = setInterval(async () => {
-        const taskStatus = await statusFn(accountId, taskName, taskId).catch(
-          reject
-        );
+        let taskStatus;
+        try {
+          taskStatus = await statusFn(accountId, taskName, taskId);
+        } catch (e) {
+          logApiErrorInstance(
+            e,
+            new ApiErrorContext({
+              accountId,
+              projectName: taskName,
+            })
+          );
+          return reject(
+            new Error(
+              i18n(
+                `${i18nKey}.makePollTaskStatusFunc.errorFetchingTaskStatus`,
+                {
+                  taskType:
+                    statusText.TYPE_KEY === PROJECT_BUILD_TEXT.TYPE_KEY
+                      ? 'build'
+                      : 'deploy',
+                }
+              )
+            )
+          );
+        }
+
+        if (
+          !taskStatus ||
+          !taskStatus.status ||
+          !taskStatus[statusText.SUBTASK_KEY]
+        ) {
+          return reject(
+            new Error(
+              i18n(
+                `${i18nKey}.makePollTaskStatusFunc.errorFetchingTaskStatus`,
+                {
+                  taskType:
+                    statusText.TYPE_KEY === PROJECT_BUILD_TEXT.TYPE_KEY
+                      ? 'build'
+                      : 'deploy',
+                }
+              )
+            )
+          );
+        }
 
         const { status, [statusText.SUBTASK_KEY]: subTaskStatus } = taskStatus;
 
@@ -772,7 +815,9 @@ const makePollTaskStatusFunc = ({
                 const displayErrors = failedSubtasks.filter(
                   subtask =>
                     subtask.standardError.subCategory !==
-                    'BuildPipelineErrorType.DEPENDENT_SUBBUILD_FAILED'
+                      PROJECT_ERROR_TYPES.SUBBUILD_FAILED &&
+                    subtask.standardError.subCategory !==
+                      PROJECT_ERROR_TYPES.SUBDEPLOY_FAILED
                 );
 
                 displayErrors.forEach(subTask => {
@@ -859,7 +904,7 @@ const createProjectComponent = async (
   name,
   projectComponentsVersion
 ) => {
-  const i18nKey = 'cli.commands.project.subcommands.add';
+  const i18nKey = 'commands.project.subcommands.add';
   let componentName = name;
 
   const configInfo = await getProjectConfig();
@@ -893,9 +938,17 @@ const displayWarnLogs = async (
   let result;
 
   if (isDeploy) {
-    result = await fetchDeployWarnLogs(accountId, projectName, taskId);
+    try {
+      result = await fetchDeployWarnLogs(accountId, projectName, taskId);
+    } catch (e) {
+      logApiErrorInstance(e);
+    }
   } else {
-    result = await fetchBuildWarnLogs(accountId, projectName, taskId);
+    try {
+      result = await fetchBuildWarnLogs(accountId, projectName, taskId);
+    } catch (e) {
+      logApiErrorInstance(e);
+    }
   }
 
   if (result && result.logs.length) {

package/lib/projectsWatch.js

@@ -20,7 +20,7 @@ const {
 const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { PROJECT_ERROR_TYPES } = require('./constants');
 
-const i18nKey = 'cli.commands.project.subcommands.watch';
+const i18nKey = 'commands.project.subcommands.watch';
 
 const queue = new PQueue({
   concurrency: 10,

package/lib/prompts/accountNamePrompt.js

@@ -0,0 +1,81 @@
+const { accountNameExistsInConfig } = require('@hubspot/local-dev-lib/config');
+const { STRING_WITH_NO_SPACES_REGEX } = require('../regex');
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('../lang');
+const {
+  HUBSPOT_ACCOUNT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/config');
+
+const i18nKey = 'lib.prompts.accountNamePrompt';
+
+const getCliAccountNamePromptConfig = defaultName => ({
+  name: 'name',
+  message: i18n(`${i18nKey}.enterAccountName`),
+  default: defaultName,
+  validate(val) {
+    if (typeof val !== 'string') {
+      return i18n(`${i18nKey}.errors.invalidName`);
+    } else if (!val.length) {
+      return i18n(`${i18nKey}.errors.nameRequired`);
+    } else if (!STRING_WITH_NO_SPACES_REGEX.test(val)) {
+      return i18n(`${i18nKey}.errors.spacesInName`);
+    }
+    return accountNameExistsInConfig(val)
+      ? i18n(`${i18nKey}.errors.accountNameExists`, { name: val })
+      : true;
+  },
+});
+
+const cliAccountNamePrompt = defaultName => {
+  return promptUser(getCliAccountNamePromptConfig(defaultName));
+};
+
+const hubspotAccountNamePrompt = ({ accountType, currentPortalCount = 0 }) => {
+  const isDevelopmentSandbox =
+    accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX;
+  const isSandbox =
+    accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX ||
+    isDevelopmentSandbox;
+  const isDeveloperTestAccount =
+    accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST;
+
+  let promptMessageString;
+  let defaultName;
+  if (isSandbox) {
+    promptMessageString = isDevelopmentSandbox
+      ? i18n(`${i18nKey}.enterDevelopmentSandboxName`)
+      : i18n(`${i18nKey}.enterStandardSandboxName`);
+    defaultName = i18n(`${i18nKey}.sandboxDefaultName`, {
+      sandboxType: isDevelopmentSandbox ? 'development' : 'standard',
+    });
+  } else if (isDeveloperTestAccount) {
+    promptMessageString = i18n(`${i18nKey}.enterDeveloperTestAccountName`);
+    defaultName = i18n(`${i18nKey}.developerTestAccountDefaultName`, {
+      count: currentPortalCount + 1,
+    });
+  }
+
+  return promptUser([
+    {
+      name: 'name',
+      message: promptMessageString,
+      validate(val) {
+        if (typeof val !== 'string') {
+          return i18n(`${i18nKey}.errors.invalidName`);
+        } else if (!val.length) {
+          return i18n(`${i18nKey}.errors.nameRequired`);
+        }
+        return accountNameExistsInConfig(val)
+          ? i18n(`${i18nKey}.errors.accountNameExists`, { name: val })
+          : true;
+      },
+      default: defaultName,
+    },
+  ]);
+};
+
+module.exports = {
+  getCliAccountNamePromptConfig,
+  cliAccountNamePrompt,
+  hubspotAccountNamePrompt,
+};

package/lib/prompts/accountsPrompt.js

@@ -9,7 +9,7 @@ const mapAccountChoices = portals =>
     value: p.name || p.portalId,
   }));
 
-const i18nKey = 'cli.commands.accounts.subcommands.use';
+const i18nKey = 'commands.accounts.subcommands.use';
 
 const selectAccountFromConfig = async (config, prompt) => {
   const { default: selectedDefault } = await promptUser([

package/lib/prompts/activeInstallConfirmationPrompt.js

@@ -0,0 +1,20 @@
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('../lang');
+
+const i18nKey = 'lib.prompts.activeInstallConfirmationPrompt';
+
+const activeInstallConfirmationPrompt = async () => {
+  const { proceed } = await promptUser([
+    {
+      name: 'proceed',
+      message: i18n(`${i18nKey}.message`),
+      type: 'confirm',
+      default: false,
+    },
+  ]);
+  return proceed;
+};
+
+module.exports = {
+  activeInstallConfirmationPrompt,
+};

package/lib/prompts/buildIdPrompt.js

@@ -1,7 +1,7 @@
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 
-const i18nKey = 'cli.lib.prompts.buildIdPrompt';
+const i18nKey = 'lib.prompts.buildIdPrompt';
 
 const buildIdPrompt = (latestBuildId, deployedBuildId, projectName) => {
   return promptUser({

package/lib/prompts/cleanUploadPrompt.js

@@ -1,7 +1,7 @@
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 
-const i18nKey = 'cli.lib.prompts.cleanUploadPrompt';
+const i18nKey = 'lib.prompts.cleanUploadPrompt';
 
 const cleanUploadPrompt = async (accountId, filePath) => {
   const promptAnswer = await promptUser([

package/lib/prompts/cmsFieldPrompt.js

@@ -3,7 +3,7 @@ const fs = require('fs');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const escapeRegExp = require('@hubspot/local-dev-lib/escapeRegExp');
-const i18nKey = 'cli.lib.prompts.uploadPrompt';
+const i18nKey = 'lib.prompts.uploadPrompt';
 const FIELDS_FILES = ['fields.json', 'fields.js', 'fields.cjs', 'fields.mjs'];
 
 const fieldsJsPrompt = async (filePath, projectDir, skipFiles = []) => {

package/lib/prompts/createApiSamplePrompt.js

@@ -1,7 +1,7 @@
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 
-const i18nKey = 'cli.lib.prompts.createApiSamplePrompt';
+const i18nKey = 'lib.prompts.createApiSamplePrompt';
 
 const getSampleTypesPrompt = choices => ({
   type: 'rawlist',

package/lib/prompts/createFunctionPrompt.js

@@ -3,7 +3,7 @@ const { i18n } = require('../lang');
 
 const { STRING_WITH_NO_SPACES_REGEX } = require('../regex');
 
-const i18nKey = 'cli.lib.prompts.createFunctionPrompt';
+const i18nKey = 'lib.prompts.createFunctionPrompt';
 
 const FUNCTIONS_FOLDER_PROMPT = {
   name: 'functionsFolder',

package/lib/prompts/createModulePrompt.js

@@ -1,7 +1,7 @@
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 
-const i18nKey = 'cli.lib.prompts.createModulePrompt';
+const i18nKey = 'lib.prompts.createModulePrompt';
 
 const MODULE_LABEL_PROMPT = {
   name: 'moduleLabel',

package/lib/prompts/createProjectPrompt.js

@@ -1,5 +1,10 @@
+const fs = require('fs');
 const path = require('path');
-const { getCwd } = require('@hubspot/local-dev-lib/path');
+const {
+  getCwd,
+  sanitizeFileName,
+  isValidPath,
+} = require('@hubspot/local-dev-lib/path');
 const { PROJECT_COMPONENT_TYPES } = require('../../lib/constants');
 const { promptUser } = require('./promptUtils');
 const { fetchFileFromRepository } = require('@hubspot/local-dev-lib/github');
@@ -11,7 +16,7 @@ const {
   DEFAULT_PROJECT_TEMPLATE_BRANCH,
 } = require('../constants');
 
-const i18nKey = 'cli.lib.prompts.createProjectPrompt';
+const i18nKey = 'lib.prompts.createProjectPrompt';
 
 const PROJECT_PROPERTIES = ['name', 'label', 'path', 'insertPath'];
 
@@ -48,11 +53,18 @@ const createTemplateOptions = async (templateSource, githubRef) => {
   return config[PROJECT_COMPONENT_TYPES.PROJECTS];
 };
 
-const createProjectPrompt = async (githubRef, promptOptions = {}) => {
-  const projectTemplates = await createTemplateOptions(
-    promptOptions.templateSource,
-    githubRef
-  );
+const createProjectPrompt = async (
+  githubRef,
+  promptOptions = {},
+  skipTemplatePrompt = false
+) => {
+  let projectTemplates = [];
+  if (!skipTemplatePrompt) {
+    projectTemplates = await createTemplateOptions(
+      promptOptions.templateSource,
+      githubRef
+    );
+  }
 
   return promptUser([
     {
@@ -71,12 +83,21 @@ const createProjectPrompt = async (githubRef, promptOptions = {}) => {
       message: i18n(`${i18nKey}.enterLocation`),
       when: !promptOptions.location,
       default: answers => {
-        return path.resolve(getCwd(), answers.name || promptOptions.name);
+        const projectName = sanitizeFileName(
+          answers.name || promptOptions.name
+        );
+        return path.resolve(getCwd(), projectName);
       },
       validate: input => {
         if (!input) {
           return i18n(`${i18nKey}.errors.locationRequired`);
         }
+        if (fs.existsSync(input)) {
+          return i18n(`${i18nKey}.errors.invalidLocation`);
+        }
+        if (!isValidPath(input)) {
+          return i18n(`${i18nKey}.errors.invalidCharacters`);
+        }
         return true;
       },
     },
@@ -91,8 +112,9 @@ const createProjectPrompt = async (githubRef, promptOptions = {}) => {
           : i18n(`${i18nKey}.selectTemplate`);
       },
       when:
-        !promptOptions.template ||
-        !projectTemplates.find(t => t.name === promptOptions.template),
+        !skipTemplatePrompt &&
+        (!promptOptions.template ||
+          !projectTemplates.find(t => t.name === promptOptions.template)),
       type: 'list',
       choices: projectTemplates.map(template => {
         return {

package/lib/prompts/createTemplatePrompt.js

@@ -1,7 +1,7 @@
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 
-const i18nKey = 'cli.lib.prompts.createTemplatePrompt';
+const i18nKey = 'lib.prompts.createTemplatePrompt';
 
 const TEMPLATE_TYPE_PROMPT = {
   type: 'list',

package/lib/prompts/downloadProjectPrompt.js

@@ -8,11 +8,9 @@ const {
 const { EXIT_CODES } = require('../enums/exitCodes');
 const { i18n } = require('../lang');
 
-const i18nKey = 'cli.lib.prompts.downloadProjectPrompt';
-
-const createProjectsList = async () => {
-  const accountId = getAccountId();
+const i18nKey = 'lib.prompts.downloadProjectPrompt';
 
+const createProjectsList = async accountId => {
   try {
     const projects = await fetchProjects(accountId);
     return projects.results;
@@ -23,7 +21,8 @@ const createProjectsList = async () => {
 };
 
 const downloadProjectPrompt = async (promptOptions = {}) => {
-  const projectsList = await createProjectsList();
+  const accountId = getAccountId(promptOptions.account);
+  const projectsList = await createProjectsList(accountId);
 
   return promptUser([
     {
@@ -33,7 +32,7 @@ const downloadProjectPrompt = async (promptOptions = {}) => {
           !projectsList.find(p => p.name === promptOptions.name)
           ? i18n(`${i18nKey}.errors.projectNotFound`, {
               projectName: promptOptions.project,
-              accountId: getAccountId(),
+              accountId,
             })
           : i18n(`${i18nKey}.selectProject`);
       },

package/lib/prompts/feedbackPrompt.js

@@ -2,7 +2,7 @@ const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const { FEEDBACK_OPTIONS } = require('../constants');
 
-const i18nKey = 'cli.lib.prompts.feedbackPrompt';
+const i18nKey = 'lib.prompts.feedbackPrompt';
 
 const feedbackTypePrompt = bypassPrompt => {
   return promptUser([

package/lib/prompts/folderOverwritePrompt.js

@@ -1,7 +1,7 @@
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 
-const i18nKey = 'cli.lib.prompts.folderOverwritePrompt';
+const i18nKey = 'lib.prompts.folderOverwritePrompt';
 
 const folderOverwritePrompt = folderName => {
   return promptUser({

package/lib/prompts/installPublicAppPrompt.js

@@ -0,0 +1,42 @@
+const open = require('open');
+const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
+const { logger } = require('@hubspot/local-dev-lib/logger');
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('../lang');
+const { EXIT_CODES } = require('../enums/exitCodes');
+
+const i18nKey = 'lib.prompts.installPublicAppPrompt';
+
+const installPublicAppPrompt = async (
+  env,
+  targetAccountId,
+  clientId,
+  scopes,
+  redirectUrls
+) => {
+  logger.log('');
+  logger.log(i18n(`${i18nKey}.explanation`));
+
+  const { shouldOpenBrowser } = await promptUser({
+    name: 'shouldOpenBrowser',
+    type: 'confirm',
+    message: i18n(`${i18nKey}.prompt`),
+  });
+
+  if (!shouldOpenBrowser) {
+    logger.log(i18n(`${i18nKey}.decline`));
+    process.exit(EXIT_CODES.SUCCESS);
+  }
+
+  const websiteOrigin = getHubSpotWebsiteOrigin(env);
+
+  const url =
+    `${websiteOrigin}/oauth/${targetAccountId}/authorize` +
+    `?client_id=${encodeURIComponent(clientId)}` +
+    `&scope=${encodeURIComponent(scopes.join(' '))}` +
+    `&redirect_uri=${encodeURIComponent(redirectUrls[0])}`;
+
+  open(url);
+};
+
+module.exports = { installPublicAppPrompt };

package/lib/prompts/personalAccessKeyPrompt.js

@@ -7,12 +7,12 @@ const { deleteEmptyConfigFile } = require('@hubspot/local-dev-lib/config');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { promptUser } = require('./promptUtils');
-const { accountNamePrompt } = require('./enterAccountNamePrompt');
+const { getCliAccountNamePromptConfig } = require('./accountNamePrompt');
 const { i18n } = require('../lang');
 const { uiInfoSection } = require('../ui');
 const { EXIT_CODES } = require('../enums/exitCodes');
 
-const i18nKey = 'cli.lib.prompts.personalAccessKeyPrompt';
+const i18nKey = 'lib.prompts.personalAccessKeyPrompt';
 
 /**
  * Displays notification to user that we are about to open the browser,
@@ -124,7 +124,7 @@ const SCOPES = {
 };
 
 const OAUTH_FLOW = [
-  accountNamePrompt(),
+  getCliAccountNamePromptConfig(),
   ACCOUNT_ID,
   CLIENT_ID,
   CLIENT_SECRET,

package/lib/prompts/previewPrompt.js

@@ -3,7 +3,7 @@ const { getCwd } = require('@hubspot/local-dev-lib/path');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 
-const i18nKey = 'cli.lib.prompts.previewPrompt';
+const i18nKey = 'lib.prompts.previewPrompt';
 
 const previewPrompt = (promptOptions = {}) => {
   return promptUser([
@@ -34,6 +34,24 @@ const previewPrompt = (promptOptions = {}) => {
   ]);
 };
 
+const previewProjectPrompt = async themeComponents => {
+  return promptUser([
+    {
+      name: 'themeComponentPath',
+      message: i18n(`${i18nKey}.themeProjectSelect`),
+      type: 'list',
+      choices: themeComponents.map(t => {
+        const themeName = path.basename(t.path);
+        return {
+          name: themeName,
+          value: t.path,
+        };
+      }),
+    },
+  ]);
+};
+
 module.exports = {
   previewPrompt,
+  previewProjectPrompt,
 };

package/lib/prompts/projectAddPrompt.js

@@ -4,7 +4,7 @@ const { i18n } = require('../lang');
 const { HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH } = require('../constants');
 const { PROJECT_COMPONENT_TYPES } = require('../constants');
 
-const i18nKey = 'cli.lib.prompts.projectAddPrompt';
+const i18nKey = 'lib.prompts.projectAddPrompt';
 
 const createTypeOptions = async projectComponentsVersion => {
   const config = await fetchFileFromRepository(

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -13,7 +13,7 @@ const {
   fetchDeveloperTestAccounts,
 } = require('@hubspot/local-dev-lib/developerTestAccounts');
 
-const i18nKey = 'cli.lib.prompts.projectDevTargetAccountPrompt';
+const i18nKey = 'lib.prompts.projectDevTargetAccountPrompt';
 
 const mapNestedAccount = accountConfig => ({
   name: uiAccountDescription(accountConfig.portalId, false),
@@ -24,6 +24,12 @@ const mapNestedAccount = accountConfig => ({
   },
 });
 
+const getNonConfigDeveloperTestAccountName = account => {
+  return `${account.accountName} [${
+    HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST]
+  }] (${account.id})`;
+};
+
 const selectSandboxTargetAccountPrompt = async (
   accounts,
   defaultAccountConfig
@@ -94,9 +100,11 @@ const selectDeveloperTestTargetAccountPrompt = async (
 ) => {
   const defaultAccountId = getAccountId(defaultAccountConfig.name);
   let choices = [];
-  let devTestAccountUsage = undefined;
+  let devTestAccountsResponse = undefined;
   try {
-    devTestAccountUsage = await fetchDeveloperTestAccounts(defaultAccountId);
+    devTestAccountsResponse = await fetchDeveloperTestAccounts(
+      defaultAccountId
+    );
   } catch (err) {
     logger.debug('Unable to fetch developer test account usage limits: ', err);
   }
@@ -110,17 +118,37 @@ const selectDeveloperTestTargetAccountPrompt = async (
     );
   let disabledMessage = false;
   if (
-    devTestAccountUsage &&
-    devTestAccountUsage.results.length >= devTestAccountUsage.maxTestPortals
+    devTestAccountsResponse &&
+    devTestAccountsResponse.results.length >=
+      devTestAccountsResponse.maxTestPortals
   ) {
     disabledMessage = i18n(`${i18nKey}.developerTestAccountLimit`, {
       authCommand: uiCommandReference('hs auth'),
-      limit: devTestAccountUsage.maxTestPortals,
+      limit: devTestAccountsResponse.maxTestPortals,
+    });
+  }
+
+  let devTestAccountsNotInConfig = [];
+  if (devTestAccountsResponse && devTestAccountsResponse.results) {
+    const inConfigIds = devTestAccounts.map(d => d.portalId);
+    devTestAccountsResponse.results.forEach(acct => {
+      if (inConfigIds.indexOf(acct.id) < 0) {
+        devTestAccountsNotInConfig.push({
+          name: getNonConfigDeveloperTestAccountName(acct),
+          value: {
+            targetAccountId: acct.id,
+            createdNestedAccount: false,
+            parentAccountId: defaultAccountId,
+            notInConfigAccount: acct,
+          },
+        });
+      }
     });
   }
 
   choices = [
     ...devTestAccounts.map(mapNestedAccount),
+    ...devTestAccountsNotInConfig,
     {
       name: i18n(`${i18nKey}.createNewDeveloperTestAccountOption`),
       value: {
@@ -172,8 +200,22 @@ const confirmDefaultAccountPrompt = async (accountName, accountType) => {
   return useDefaultAccount;
 };
 
+const confirmUseExistingDeveloperTestAccountPrompt = async account => {
+  const { confirmUseExistingDeveloperTestAccount } = await promptUser([
+    {
+      name: 'confirmUseExistingDeveloperTestAccount',
+      type: 'confirm',
+      message: i18n(`${i18nKey}.confirmUseExistingDeveloperTestAccount`, {
+        accountName: getNonConfigDeveloperTestAccountName(account),
+      }),
+    },
+  ]);
+  return confirmUseExistingDeveloperTestAccount;
+};
+
 module.exports = {
   selectSandboxTargetAccountPrompt,
   selectDeveloperTestTargetAccountPrompt,
   confirmDefaultAccountPrompt,
+  confirmUseExistingDeveloperTestAccountPrompt,
 };