@hubspot/cli 6.1.1 → 6.2.1

package/lang/en.lyaml

@@ -183,8 +183,6 @@ en:
             noSamples: "Currently there are no samples available, please, try again later."
           info:
             sampleChosen: "You've chosen {{ sampleType }} sample written on {{ sampleLanguage }} language"
-          loading:
-            apiSamples: "Loading available API samples"
           success:
             sampleCreated: "Please, follow {{ filePath }}/README.md to find out how to run the sample"
         module:
@@ -335,7 +333,8 @@ en:
             notFunctionsFolder: "Specified path {{ functionPath }} is not a .functions folder."
           examples:
             default: "Build and deploy a new bundle for all functions within the myFunctionFolder.functions folder"
-          loading: "Building and deploying bundle for \"{{ functionPath }}\" on account \"{{ accountId }}\".\n"
+          loading: "Building and deploying bundle for \"{{ functionPath }}\" on {{ account }}"
+          loadingFailed: "Failed to build and deploy bundle for \"{{ functionPath }}\" on {{ account }}"
           positionals:
             path:
               describe: "Path to .functions folder"
@@ -1008,7 +1007,9 @@ en:
     localDev:
       confirmDefaultAccountIsTarget:
         declineDefaultAccountExplanation: "To develop on a different account, run {{ useCommand }} to change your default account, then re-run {{ devCommand }}."
-      checkIfAppDevloperAccount: "This project contains a public app. Local development of public apps is only supported on developer accounts and developer test accounts. Change your default account using {{ useCommand }}, or link a new account with {{ authCommand }}."
+      checkIfDefaultAccountIsSupported:
+        publicApp: "This project contains a public app. Local development of public apps is only supported on developer accounts and developer test accounts. Change your default account using {{ useCommand }}, or link a new account with {{ authCommand }}."
+        privateApp: "This project contains a private app. Local development of private apps is not supported in developer accounts. Change your default account using {{ useCommand }}, or link a new account with {{ authCommand }}."
       validateAccountOption:
         invalidPublicAppAccount: "This project contains a public app. The \"--account\" flag must point to a developer test account to develop this project locally. Alternatively, change your default account to an App Developer Account using {{ useCommand }} and run {{ devCommand }} to set up a new Developer Test Account."
         invalidPrivateAppAccount: "This project contains a private app. The account specified with the \"--account\" flag points to a developer account, which do not support the local development of private apps. Update the \"--account\" flag to point to a standard, sandbox, or developer test account, or change your default account by running {{ useCommand }}."
@@ -1401,23 +1402,12 @@ en:
           notSuperAdmin: "Couldn't run the sync because you are not a super admin in {{ account }}. Ask the account owner for super admin access to the sandbox."
           objectNotFound: "Couldn't sync the sandbox because {{#bold}}{{ account }}{{/bold}} may have been deleted through the UI. Run {{#bold}}hs sandbox delete{{/bold}} to remove this account from the config. "
     errorHandlers:
-      standardErrors:
+      index:
         errorOccurred: "Error: {{ error }}"
         errorContext: "Context: {{ context }}"
         errorCause: "Cause: {{ cause }}"
-        systemErrorOccurred: "A system error has occurred: {{ errorMessage }}"
-        genericErrorOccurred: "A {{ name }} has occurred."
-        unknownErrorOccurred: "An unknown error has occurred"
-      fileSystemErrors:
-        errorOccurred: "An error occurred while {{ fileAction }} {{ filepath }}."
-        errorExplanation: "This is the result of a system error: {{ errorMessage }}"
-      apiErrors:
-        verifyAccessKeyAndUserAccess:
-          fetchScopeDataError: "Error verifying access of scopeGroup {{ scopeGroup }}: {{ error }}"
-          portalMissingScope: "Your account does not have access to this action. Talk to an account admin to request it."
-          userMissingScope: "You don't have access to this action. Ask an account admin to change your permissions in Users & Teams settings."
-          genericMissingScope: "Your access key does not allow this action. Please generate a new access key by running `hs auth personalaccesskey`."
-      overrideErrors:
+        unknownErrorOccurred: "An unknown error has occurred."
+      suppressErrors:
         platformVersionErrors:
           header: "Platform version update required"
           unspecifiedPlatformVersion: "Projects with an {{#bold}}{{platformVersion}}{{/bold}} are no longer supported."
@@ -1427,3 +1417,9 @@ en:
           docsLink: "Projects platform versioning (BETA)"
           betaLink: "For more info, see {{ docsLink }}."
         missingScopeError: "Couldn't execute the {{ request }} because the access key for {{ accountName }} is missing required scopes. To update scopes, run {{ authCommand }}. Then deactivate the existing key and generate a new one that includes the missing scopes."
+    serverless:
+      verifyAccessKeyAndUserAccess:
+        fetchScopeDataError: "Error verifying access of scopeGroup {{ scopeGroup }}: {{ error }}"
+        portalMissingScope: "Your account does not have access to this action. Talk to an account admin to request it."
+        userMissingScope: "You don't have access to this action. Ask an account admin to change your permissions in Users & Teams settings."
+        genericMissingScope: "Your access key does not allow this action. Please generate a new access key by running `hs auth personalaccesskey`."

package/lib/LocalDevManager.js

@@ -34,7 +34,7 @@ const {
   uiLink,
   uiLine,
 } = require('./ui');
-const { logErrorInstance } = require('./errorHandlers/standardErrors');
+const { logError } = require('./errorHandlers/index');
 const { installPublicAppPrompt } = require('./prompts/installPublicAppPrompt');
 const {
   activeInstallConfirmationPrompt,
@@ -99,7 +99,7 @@ class LocalDevManager {
         await this.checkActivePublicAppInstalls();
         await this.checkPublicAppInstallation();
       } catch (e) {
-        logErrorInstance(e);
+        logError(e);
       }
     }
   }
@@ -109,7 +109,7 @@ class LocalDevManager {
       return;
     }
 
-    const portalPublicApps = await fetchPublicAppsForPortal(
+    const { data: portalPublicApps } = await fetchPublicAppsForPortal(
       this.targetProjectAccountId
     );
 
@@ -119,7 +119,7 @@ class LocalDevManager {
 
     // TODO: Update to account for new API with { data }
     const {
-      uniquePortalInstallCount,
+      data: { uniquePortalInstallCount },
     } = await fetchPublicAppProductionInstallCounts(
       activePublicAppData.id,
       this.targetProjectAccountId
@@ -264,14 +264,16 @@ class LocalDevManager {
     process.exit(EXIT_CODES.SUCCESS);
   }
 
-  getActiveAppInstallationData() {
-    return fetchAppInstallationData(
+  async getActiveAppInstallationData() {
+    const { data } = await fetchAppInstallationData(
       this.targetAccountId,
       this.projectId,
       this.activeApp.config.uid,
       this.activeApp.config.auth.requiredScopes,
       this.activeApp.config.auth.optionalScopes
     );
+
+    return data;
   }
 
   async checkPublicAppInstallation() {

package/lib/__tests__/downloadProjectPrompt.test.js

@@ -1,6 +1,6 @@
 jest.mock('@hubspot/local-dev-lib/api/projects', () => ({
   fetchProjects: jest.fn().mockResolvedValue({
-    results: [],
+    data: { results: [] },
   }),
 }));
 

package/lib/__tests__/projectLogsManager.test.js

@@ -50,24 +50,26 @@ describe('cli/lib/projectLogsManager', () => {
     getProjectConfig.mockResolvedValue(projectConfig);
     ensureProjectExists.mockResolvedValue(projectDetails);
     fetchProjectComponentsMetadata.mockResolvedValue({
-      topLevelComponentMetadata: [
-        {
-          type: {
-            name: 'PRIVATE_APP',
-          },
-          deployOutput: {
-            appId,
-          },
-          featureComponents: [
-            ...functions,
-            {
-              type: {
-                name: 'NOT_AN_APP_FUNCTION',
-              },
+      data: {
+        topLevelComponentMetadata: [
+          {
+            type: {
+              name: 'PRIVATE_APP',
             },
-          ],
-        },
-      ],
+            deployOutput: {
+              appId,
+            },
+            featureComponents: [
+              ...functions,
+              {
+                type: {
+                  name: 'NOT_AN_APP_FUNCTION',
+                },
+              },
+            ],
+          },
+        ],
+      },
     });
   });
 

package/lib/__tests__/serverlessLogs.test.js

@@ -71,14 +71,16 @@ describe('@hubspot/cli/lib/serverlessLogs', () => {
 
       const fetchLatest = jest.fn(() => {
         return Promise.resolve({
-          id: '1234',
-          executionTime: 510,
-          log: 'Log message',
-          error: null,
-          status: 'SUCCESS',
-          createdAt: 1620232011451,
-          memory: '70/128 MB',
-          duration: '53.40 ms',
+          data: {
+            id: '1234',
+            executionTime: 510,
+            log: 'Log message',
+            error: null,
+            status: 'SUCCESS',
+            createdAt: 1620232011451,
+            memory: '70/128 MB',
+            duration: '53.40 ms',
+          },
         });
       });
       const latestLogResponse = {
@@ -110,7 +112,9 @@ describe('@hubspot/cli/lib/serverlessLogs', () => {
           },
         },
       };
-      const tailCall = jest.fn(() => Promise.resolve(latestLogResponse));
+      const tailCall = jest.fn(() =>
+        Promise.resolve({ data: latestLogResponse })
+      );
 
       await tailLogs({
         accountId: ACCOUNT_ID,

package/lib/buildAccount.js

@@ -15,17 +15,14 @@ const { logger } = require('@hubspot/local-dev-lib/logger');
 const { i18n } = require('./lang');
 const { cliAccountNamePrompt } = require('./prompts/accountNamePrompt');
 const SpinniesManager = require('./ui/SpinniesManager');
-const {
-  debugErrorAndContext,
-  logErrorInstance,
-} = require('./errorHandlers/standardErrors');
+const { debugError, logError } = require('./errorHandlers/index');
 const {
   createDeveloperTestAccount,
-} = require('@hubspot/local-dev-lib/developerTestAccounts');
+} = require('@hubspot/local-dev-lib/api/developerTestAccounts');
 const {
   HUBSPOT_ACCOUNT_TYPES,
 } = require('@hubspot/local-dev-lib/constants/config');
-const { createSandbox } = require('@hubspot/local-dev-lib/sandboxes');
+const { createSandbox } = require('@hubspot/local-dev-lib/api/sandboxHubs');
 const { sandboxApiTypeMap, handleSandboxCreateError } = require('./sandboxes');
 const {
   handleDeveloperTestAccountCreateError,
@@ -134,10 +131,13 @@ async function buildNewAccount({
   try {
     if (isSandbox) {
       const sandboxApiType = sandboxApiTypeMap[accountType]; // API expects sandbox type as 1 or 2.
-      result = await createSandbox(accountId, name, sandboxApiType);
+
+      const { data } = await createSandbox(accountId, name, sandboxApiType);
+      result = { name, ...data };
       resultAccountId = result.sandbox.sandboxHubId;
     } else if (isDeveloperTestAccount) {
-      result = await createDeveloperTestAccount(accountId, name);
+      const { data } = await createDeveloperTestAccount(accountId, name);
+      result = data;
       resultAccountId = result.id;
     }
 
@@ -148,7 +148,7 @@ async function buildNewAccount({
       }),
     });
   } catch (err) {
-    debugErrorAndContext(err);
+    debugError(err);
 
     SpinniesManager.fail('buildNewAccount', {
       text: i18n(`${spinniesI18nKey}.fail`, {
@@ -181,7 +181,7 @@ async function buildNewAccount({
       force,
     });
   } catch (err) {
-    logErrorInstance(err);
+    logError(err);
     throw err;
   }
 

package/lib/developerTestAccounts.js

@@ -5,15 +5,15 @@ const { getAccountId, getConfig } = require('@hubspot/local-dev-lib/config');
 const { i18n } = require('./lang');
 const {
   fetchDeveloperTestAccounts,
-} = require('@hubspot/local-dev-lib/developerTestAccounts');
+} = require('@hubspot/local-dev-lib/api/developerTestAccounts');
 const {
   isMissingScopeError,
   isSpecifiedError,
-} = require('@hubspot/local-dev-lib/errors/apiErrors');
+} = require('@hubspot/local-dev-lib/errors/index');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { uiAccountDescription } = require('./ui');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
-const { logErrorInstance } = require('./errorHandlers/standardErrors');
+const { logError } = require('./errorHandlers/index');
 
 const getHasDevTestAccounts = appDeveloperAccountConfig => {
   const config = getConfig();
@@ -32,31 +32,31 @@ const getHasDevTestAccounts = appDeveloperAccountConfig => {
 
 const validateDevTestAccountUsageLimits = async accountConfig => {
   const accountId = getAccountId(accountConfig.portalId);
-  const response = await fetchDeveloperTestAccounts(accountId);
-  if (response) {
-    const limit = response.maxTestPortals;
-    const count = response.results.length;
-    if (count >= limit) {
-      const hasDevTestAccounts = getHasDevTestAccounts(accountConfig);
-      if (hasDevTestAccounts) {
-        throw new Error(
-          i18n('lib.developerTestAccount.create.failure.alreadyInConfig', {
-            accountName: accountConfig.name || accountId,
-            limit,
-          })
-        );
-      } else {
-        throw new Error(
-          i18n('lib.developerTestAccount.create.failure.limit', {
-            accountName: accountConfig.name || accountId,
-            limit,
-          })
-        );
-      }
+  const { data } = await fetchDeveloperTestAccounts(accountId);
+  if (!data) {
+    return null;
+  }
+  const limit = data.maxTestPortals;
+  const count = data.results.length;
+  if (count >= limit) {
+    const hasDevTestAccounts = getHasDevTestAccounts(accountConfig);
+    if (hasDevTestAccounts) {
+      throw new Error(
+        i18n('lib.developerTestAccount.create.failure.alreadyInConfig', {
+          accountName: accountConfig.name || accountId,
+          limit,
+        })
+      );
+    } else {
+      throw new Error(
+        i18n('lib.developerTestAccount.create.failure.limit', {
+          accountName: accountConfig.name || accountId,
+          limit,
+        })
+      );
     }
-    return response;
   }
-  return null;
+  return data;
 };
 
 function handleDeveloperTestAccountCreateError({
@@ -94,7 +94,7 @@ function handleDeveloperTestAccountCreateError({
     );
     logger.log('');
   } else {
-    logErrorInstance(err);
+    logError(err);
   }
   throw err;
 }

package/lib/errorHandlers/index.js

@@ -0,0 +1,101 @@
+const { logger } = require('@hubspot/local-dev-lib/logger');
+const {
+  isHubSpotHttpError,
+  isSystemError,
+  isFileSystemError,
+  isValidationError,
+  isMissingScopeError,
+} = require('@hubspot/local-dev-lib/errors/index');
+const { shouldSuppressError } = require('./suppressError');
+const { i18n } = require('../lang');
+const util = require('util');
+const { isAxiosError } = require('axios');
+
+const i18nKey = 'lib.errorHandlers.index';
+
+function logError(error, context = {}) {
+  debugError(error, context);
+
+  if (
+    shouldSuppressError(error, context) ||
+    shouldSuppressError(error, error.context)
+  ) {
+    return;
+  }
+
+  if (isHubSpotHttpError(error) && context) {
+    error.updateContext(context);
+  }
+
+  if (isHubSpotHttpError(error) || isFileSystemError(error)) {
+    if (isValidationError(error) || isMissingScopeError(error)) {
+      logger.error(error.formattedValidationErrors());
+    } else {
+      logger.error(error.message);
+    }
+  } else if (isSystemError(error)) {
+    logger.error(error.message);
+  } else if (error.message || error.reason) {
+    const message = [];
+
+    [error.message, error.reason].forEach(msg => {
+      if (msg) {
+        message.push(msg);
+      }
+    });
+    logger.error(message.join(' '));
+  } else {
+    // Unknown errors
+    logger.error(i18n(`${i18nKey}.unknownErrorOccurred`));
+  }
+}
+
+/**
+ * Logs (debug) the error and context objects.
+ *
+ * @param {Error}  error
+ * @param {ApiErrorContext} context
+ */
+function debugError(error, context = {}) {
+  if (isHubSpotHttpError(error)) {
+    logger.debug(error.toString());
+  } else {
+    logger.debug(i18n(`${i18nKey}.errorOccurred`, { error }));
+  }
+
+  if (error.cause) {
+    logger.debug(
+      i18n(`${i18nKey}.errorCause`, {
+        cause: isAxiosError(error.cause)
+          ? error.cause
+          : util.inspect(error.cause, false, null, true),
+      })
+    );
+  }
+  if (context) {
+    logger.debug(
+      i18n(`${i18nKey}.errorContext`, {
+        context: util.inspect(context, false, null, true),
+      })
+    );
+  }
+}
+
+class ApiErrorContext {
+  constructor(props = {}) {
+    /** @type {number} */
+    this.accountId = props.accountId;
+    /** @type {string} */
+    this.request = props.request || '';
+    /** @type {string} */
+    this.payload = props.payload || '';
+    /** @type {string} */
+    this.projectName = props.projectName || '';
+  }
+}
+
+module.exports = {
+  logError,
+  debugError,
+  ApiErrorContext,
+};

package/lib/errorHandlers/{overrideErrors.js → suppressError.js}

@@ -1,7 +1,7 @@
 const {
   isSpecifiedError,
   isMissingScopeError,
-} = require('@hubspot/local-dev-lib/errors/apiErrors');
+} = require('@hubspot/local-dev-lib/errors/index');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { PLATFORM_VERSION_ERROR_TYPES } = require('../constants');
 const { i18n } = require('../lang');
@@ -12,7 +12,7 @@ const {
   uiCommandReference,
 } = require('../ui');
 
-const i18nKey = 'lib.errorHandlers.overrideErrors';
+const i18nKey = 'lib.errorHandlers.suppressErrors';
 
 function createPlatformVersionError(err, subCategory) {
   let translationKey = 'unspecifiedPlatformVersion';
@@ -58,7 +58,7 @@ function createPlatformVersionError(err, subCategory) {
   uiLine();
 }
 
-function overrideErrors(err, context) {
+function shouldSuppressError(err, context = {}) {
   if (isMissingScopeError(err)) {
     logger.error(
       i18n(`${i18nKey}.missingScopeError`, {
@@ -78,7 +78,7 @@ function overrideErrors(err, context) {
     })
   ) {
     createPlatformVersionError(
-      err,
+      err.data,
       PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_NOT_SPECIFIED
     );
     return true;
@@ -90,7 +90,7 @@ function overrideErrors(err, context) {
     })
   ) {
     createPlatformVersionError(
-      err,
+      err.data,
       PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_RETIRED
     );
     return true;
@@ -103,7 +103,7 @@ function overrideErrors(err, context) {
     })
   ) {
     createPlatformVersionError(
-      err,
+      err.data,
       PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_SPECIFIED_DOES_NOT_EXIST
     );
     return true;
@@ -112,5 +112,5 @@ function overrideErrors(err, context) {
 }
 
 module.exports = {
-  overrideErrors,
+  shouldSuppressError,
 };

package/lib/hasFeature.js

@@ -0,0 +1,15 @@
+const {
+  fetchEnabledFeatures,
+} = require('@hubspot/local-dev-lib/api/localDevAuth');
+
+const hasFeature = async (accountId, feature) => {
+  const {
+    data: { enabledFeatures },
+  } = await fetchEnabledFeatures(accountId);
+
+  return enabledFeatures[feature];
+};
+
+module.exports = {
+  hasFeature,
+};

package/lib/localDev.js

@@ -6,7 +6,7 @@ const {
 const {
   isMissingScopeError,
   isSpecifiedError,
-} = require('@hubspot/local-dev-lib/errors/apiErrors');
+} = require('@hubspot/local-dev-lib/errors/index');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { getAccountConfig, getEnv } = require('@hubspot/local-dev-lib/config');
 const { createProject } = require('@hubspot/local-dev-lib/api/projects');
@@ -28,7 +28,6 @@ const { syncSandbox } = require('./sandboxSync');
 const {
   validateDevTestAccountUsageLimits,
 } = require('./developerTestAccounts');
-const { logErrorInstance } = require('./errorHandlers/standardErrors');
 const { uiCommandReference, uiLine, uiAccountDescription } = require('./ui');
 const SpinniesManager = require('./ui/SpinniesManager');
 const { i18n } = require('./lang');
@@ -47,10 +46,7 @@ const {
   PROJECT_BUILD_TEXT,
   PROJECT_DEPLOY_TEXT,
 } = require('./constants');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('./errorHandlers/apiErrors');
+const { logError, ApiErrorContext } = require('./errorHandlers/index');
 const {
   PERSONAL_ACCESS_KEY_AUTH_METHOD,
 } = require('@hubspot/local-dev-lib/constants/auth');
@@ -82,11 +78,25 @@ const confirmDefaultAccountIsTarget = async accountConfig => {
   }
 };
 
-// Confirm the default account is a developer account if developing public apps
-const checkIfAppDeveloperAccount = accountConfig => {
-  if (!isAppDeveloperAccount(accountConfig)) {
+// Confirm the default account is supported for the type of apps being developed
+const checkIfDefaultAccountIsSupported = (accountConfig, hasPublicApps) => {
+  if (
+    hasPublicApps &&
+    !(
+      isAppDeveloperAccount(accountConfig) ||
+      isDeveloperTestAccount(accountConfig)
+    )
+  ) {
     logger.error(
-      i18n(`${i18nKey}.checkIfAppDevloperAccount`, {
+      i18n(`${i18nKey}.checkIfDefaultAccountIsSupported.publicApp`, {
+        useCommand: uiCommandReference('hs accounts use'),
+        authCommand: uiCommandReference('hs auth'),
+      })
+    );
+    process.exit(EXIT_CODES.SUCCESS);
+  } else if (!hasPublicApps && isAppDeveloperAccount(accountConfig)) {
+    logger.error(
+      i18n(`${i18nKey}.checkIfDefaultAccountIsSupported.privateApp`, {
         useCommand: uiCommandReference('hs accounts use'),
         authCommand: uiCommandReference('hs auth'),
       })
@@ -111,7 +121,7 @@ const checkIfParentAccountIsAuthed = accountConfig => {
 };
 
 // Confirm the default account is a developer account if developing public apps
-const validateAccountOption = (accountConfig, hasPublicApps) => {
+const checkIfAccountFlagIsSupported = (accountConfig, hasPublicApps) => {
   if (hasPublicApps) {
     if (!isDeveloperTestAccount) {
       logger.error(
@@ -184,7 +194,7 @@ const createSandboxForLocalDev = async (accountId, accountConfig, env) => {
         })
       );
     } else {
-      logErrorInstance(err);
+      logError(err);
     }
     process.exit(EXIT_CODES.ERROR);
   }
@@ -223,7 +233,7 @@ const createSandboxForLocalDev = async (accountId, accountConfig, env) => {
     });
     return targetAccountId;
   } catch (err) {
-    logErrorInstance(err);
+    logError(err);
     process.exit(EXIT_CODES.ERROR);
   }
 };
@@ -262,7 +272,7 @@ const createDeveloperTestAccountForLocalDev = async (
         })
       );
     } else {
-      logErrorInstance(err);
+      logError(err);
     }
     process.exit(EXIT_CODES.ERROR);
   }
@@ -288,7 +298,7 @@ const createDeveloperTestAccountForLocalDev = async (
 
     return result.id;
   } catch (err) {
-    logErrorInstance(err);
+    logError(err);
     process.exit(EXIT_CODES.ERROR);
   }
 };
@@ -367,7 +377,10 @@ const createNewProjectForLocalDev = async (
     });
 
     try {
-      const project = await createProject(targetAccountId, projectConfig.name);
+      const { data: project } = await createProject(
+        targetAccountId,
+        projectConfig.name
+      );
       SpinniesManager.succeed('createProject', {
         text: i18n(`${i18nKey}.createNewProjectForLocalDev.createdProject`, {
           accountIdentifier: uiAccountDescription(targetAccountId),
@@ -420,7 +433,7 @@ const createInitialBuildForNewProject = async (
       );
       logger.log();
     } else {
-      logApiErrorInstance(
+      logError(
         initialUploadResult.uploadError,
         new ApiErrorContext({
           accountId: targetAccountId,
@@ -465,8 +478,8 @@ const getAccountHomeUrl = accountId => {
 
 module.exports = {
   confirmDefaultAccountIsTarget,
-  checkIfAppDeveloperAccount,
-  validateAccountOption,
+  checkIfDefaultAccountIsSupported,
+  checkIfAccountFlagIsSupported,
   suggestRecommendedNestedAccount,
   createSandboxForLocalDev,
   createDeveloperTestAccountForLocalDev,