@hubspot/cli 4.0.2-beta.6 → 4.1.0

package/commands/accounts/list.js

@@ -12,6 +12,7 @@ const {
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
+const { getSandboxType } = require('../../lib/prompts/sandboxesPrompt');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.commands.accounts.subcommands.list';
@@ -57,7 +58,9 @@ const getPortalData = mappedPortalData => {
         portalData.push([portal.name, portal.portalId, portal.authType]);
       } else {
         portalData.push([
-          `↳ ${portal.name} [sandbox]`,
+          `↳ ${portal.name} [${getSandboxType(
+            portal.sandboxAccountType
+          )} sandbox]`,
           portal.portalId,
           portal.authType,
         ]);

package/commands/project/watch.js

@@ -5,6 +5,7 @@ const {
   ApiErrorContext,
 } = require('@hubspot/cli-lib/errorHandlers');
 const { logger } = require('@hubspot/cli-lib/logger');
+const { ERROR_TYPES } = require('@hubspot/cli-lib/lib/constants');
 const {
   addAccountOptions,
   addConfigOptions,
@@ -61,11 +62,15 @@ const handleUserInput = (accountId, projectName, currentBuildId) => {
         await cancelStagedBuild(accountId, projectName);
         process.exit(EXIT_CODES.SUCCESS);
       } catch (err) {
-        logApiErrorInstance(
-          err,
-          new ApiErrorContext({ accountId, projectName: projectName })
-        );
-        process.exit(EXIT_CODES.ERROR);
+        if (err.error.subCategory === ERROR_TYPES.BUILD_NOT_IN_PROGRESS) {
+          process.exit(EXIT_CODES.SUCCESS);
+        } else {
+          logApiErrorInstance(
+            err,
+            new ApiErrorContext({ accountId, projectName: projectName })
+          );
+          process.exit(EXIT_CODES.ERROR);
+        }
       }
     } else {
       process.exit(EXIT_CODES.SUCCESS);

package/commands/sandbox/create.js

@@ -124,6 +124,9 @@ exports.handler = async options => {
 
   let namePrompt;
 
+  logger.log(i18n(`${i18nKey}.sandboxLimitation`));
+  logger.log('');
+
   if (!name) {
     namePrompt = await createSandboxPrompt();
   }

package/commands/sandbox/delete.js

@@ -49,6 +49,9 @@ exports.handler = async options => {
     account: account || accountPrompt.account,
   });
 
+  const isDefaultAccount =
+    sandboxAccountId === getAccountId(config.defaultPortal);
+
   trackCommandUsage('sandbox-delete', null, sandboxAccountId);
 
   let parentAccountId;
@@ -91,6 +94,14 @@ exports.handler = async options => {
     })
   );
 
+  if (isDefaultAccount) {
+    logger.log(
+      i18n(`${i18nKey}.defaultAccountWarning`, {
+        account: account || accountPrompt.account,
+      })
+    );
+  }
+
   try {
     const { confirmSandboxDeletePrompt: confirmed } = await promptUser([
       {
@@ -107,9 +118,12 @@ exports.handler = async options => {
 
     await deleteSandbox(parentAccountId, sandboxAccountId);
 
+    const deleteKey = isDefaultAccount
+      ? `${i18nKey}.success.deleteDefault`
+      : `${i18nKey}.success.delete`;
     logger.log('');
     logger.success(
-      i18n(`${i18nKey}.success.delete`, {
+      i18n(deleteKey, {
         account: account || accountPrompt.account,
         sandboxHubId: sandboxAccountId,
       })
@@ -120,7 +134,7 @@ exports.handler = async options => {
       sandboxAccountId
     );
     if (promptDefaultAccount) {
-      await selectAndSetAsDefaultAccountPrompt(config);
+      await selectAndSetAsDefaultAccountPrompt(getConfig());
     }
     process.exit(EXIT_CODES.SUCCESS);
   } catch (err) {
@@ -149,7 +163,7 @@ exports.handler = async options => {
         sandboxAccountId
       );
       if (promptDefaultAccount) {
-        await selectAndSetAsDefaultAccountPrompt(config);
+        await selectAndSetAsDefaultAccountPrompt(getConfig());
       }
       process.exit(EXIT_CODES.SUCCESS);
     } else {

package/commands/secrets/addSecret.js

@@ -14,6 +14,7 @@ const {
   addUseEnvironmentOptions,
   getAccountId,
 } = require('../../lib/commonOpts');
+const { uiAccountDescription } = require('../../lib/ui');
 const { secretValuePrompt } = require('../../lib/prompts/secretPrompt');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
@@ -36,7 +37,7 @@ exports.handler = async options => {
     await addSecret(accountId, secretName, secretValue);
     logger.success(
       i18n(`${i18nKey}.success.add`, {
-        accountId,
+        accountIdentifier: uiAccountDescription(accountId),
         secretName,
       })
     );

package/commands/secrets/deleteSecret.js

@@ -7,6 +7,7 @@ const { deleteSecret } = require('@hubspot/cli-lib/api/secrets');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
+const { uiAccountDescription } = require('../../lib/ui');
 
 const {
   addConfigOptions,
@@ -33,7 +34,7 @@ exports.handler = async options => {
     await deleteSecret(accountId, secretName);
     logger.success(
       i18n(`${i18nKey}.success.delete`, {
-        accountId,
+        accountIdentifier: uiAccountDescription(accountId),
         secretName,
       })
     );

package/commands/secrets/listSecrets.js

@@ -7,6 +7,7 @@ const { fetchSecrets } = require('@hubspot/cli-lib/api/secrets');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
+const { uiAccountDescription } = require('../../lib/ui');
 
 const {
   addConfigOptions,
@@ -30,7 +31,7 @@ exports.handler = async options => {
   try {
     const { results } = await fetchSecrets(accountId);
     const groupLabel = i18n(`${i18nKey}.groupLabel`, {
-      accountId,
+      accountIdentifier: uiAccountDescription(accountId),
     });
     logger.group(groupLabel);
     results.forEach(secret => logger.log(secret));

package/commands/secrets/updateSecret.js

@@ -7,6 +7,7 @@ const { updateSecret } = require('@hubspot/cli-lib/api/secrets');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
+const { uiAccountDescription } = require('../../lib/ui');
 
 const {
   addConfigOptions,
@@ -36,10 +37,11 @@ exports.handler = async options => {
     await updateSecret(accountId, secretName, secretValue);
     logger.success(
       i18n(`${i18nKey}.success.update`, {
-        accountId,
+        accountIdentifier: uiAccountDescription(accountId),
         secretName,
       })
     );
+    logger.log(i18n(`${i18nKey}.success.updateReupload`));
   } catch (e) {
     logger.error(
       i18n(`${i18nKey}.errors.update`, {

package/commands/theme/marketplace-validate.js

@@ -1,9 +1,7 @@
-const fs = require('fs');
-const path = require('path');
+const Spinnies = require('spinnies');
+const chalk = require('chalk');
 
-const { getCwd } = require('@hubspot/cli-lib/path');
 const { logger } = require('@hubspot/cli-lib/logger');
-const { walk } = require('@hubspot/cli-lib');
 
 const {
   addConfigOptions,
@@ -14,17 +12,16 @@ const {
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const {
-  logValidatorResults,
-} = require('../../lib/validators/logValidatorResults');
-const {
-  applyAbsoluteValidators,
-} = require('../../lib/validators/applyValidators');
-const MARKETPLACE_VALIDATORS = require('../../lib/validators');
-const { VALIDATION_RESULT } = require('../../lib/validators/constants');
+  requestValidation,
+  getValidationStatus,
+  getValidationResults,
+} = require('@hubspot/cli-lib/api/marketplaceValidation');
+
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.commands.theme.subcommands.marketplaceValidate';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+const SLEEP_TIME = 2000;
 
 exports.command = 'marketplace-validate <src>';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -35,54 +32,101 @@ exports.handler = async options => {
   await loadAndValidateOptions(options);
 
   const accountId = getAccountId(options);
-  const absoluteSrcPath = path.resolve(getCwd(), src);
-  let stats;
+
+  trackCommandUsage('validate', null, accountId);
+
+  const spinnies = new Spinnies();
+
+  spinnies.add('marketplaceValidation', {
+    text: i18n(`${i18nKey}.logs.validatingTheme`, {
+      path: src,
+    }),
+  });
+
+  // Kick off validation
+  let requestResult;
+  const assetType = 'THEME';
+  const requestGroup = 'EXTERNAL_DEVELOPER';
   try {
-    stats = fs.statSync(absoluteSrcPath);
-    if (!stats.isDirectory()) {
-      logger.error(
-        i18n(`${i18nKey}.errors.invalidPath`, {
-          path: src,
-        })
-      );
-      return;
-    }
-  } catch (e) {
-    logger.error(
-      i18n(`${i18nKey}.errors.invalidPath`, {
-        path: src,
-      })
-    );
-    return;
+    requestResult = await requestValidation(accountId, {
+      path: src,
+      assetType,
+      requestGroup,
+    });
+  } catch (err) {
+    logger.debug(err);
+    process.exit(EXIT_CODES.ERROR);
+  }
+
+  // Poll till validation is finished
+  try {
+    const checkValidationStatus = async () => {
+      const validationStatus = await getValidationStatus(accountId, {
+        validationId: requestResult,
+      });
+
+      if (validationStatus === 'REQUESTED') {
+        await new Promise(resolve => setTimeout(resolve, SLEEP_TIME));
+        await checkValidationStatus();
+      }
+    };
+
+    await checkValidationStatus();
+
+    spinnies.remove('marketplaceValidation');
+  } catch (err) {
+    logger.debug(err);
+    process.exit(EXIT_CODES.ERROR);
   }
 
-  if (!options.json) {
-    logger.log(
-      i18n(`${i18nKey}.logs.validatingTheme`, {
-        path: src,
-      })
-    );
+  // Fetch the validation results
+  let validationResults;
+  try {
+    validationResults = await getValidationResults(accountId, {
+      validationId: requestResult,
+    });
+  } catch (err) {
+    logger.debug(err);
+    process.exit(EXIT_CODES.ERROR);
+  }
+
+  if (validationResults.errors.length) {
+    const { errors } = validationResults;
+
+    errors.forEach(err => {
+      logger.error(`${err.context}`);
+    });
+    process.exit(EXIT_CODES.ERROR);
   }
-  trackCommandUsage('validate', null, accountId);
 
-  const themeFiles = await walk(absoluteSrcPath);
-
-  applyAbsoluteValidators(
-    MARKETPLACE_VALIDATORS.theme,
-    absoluteSrcPath,
-    themeFiles,
-    accountId
-  ).then(groupedResults => {
-    logValidatorResults(groupedResults, { logAsJson: options.json });
-
-    if (
-      groupedResults
-        .flat()
-        .some(result => result.result === VALIDATION_RESULT.FATAL)
-    ) {
-      process.exit(EXIT_CODES.WARNING);
+  const displayResults = checks => {
+    if (checks) {
+      const { status, results } = checks;
+
+      if (status === 'FAIL') {
+        const failedValidations = results.filter(
+          test => test.status === 'FAIL'
+        );
+        failedValidations.forEach(val => {
+          logger.error(`${val.message}`);
+        });
+      }
+
+      if (status === 'PASS') {
+        logger.success(i18n(`${i18nKey}.results.noErrors`));
+      }
     }
-  });
+    return null;
+  };
+
+  logger.log(chalk.bold(i18n(`${i18nKey}.results.required`)));
+  displayResults(validationResults.results['REQUIRED']);
+  logger.log();
+  logger.log(chalk.bold(i18n(`${i18nKey}.results.recommended`)));
+  displayResults(validationResults.results['RECOMMENDED']);
+  logger.log();
+
+  process.exit();
 };
 
 exports.builder = yargs => {
@@ -90,12 +134,6 @@ exports.builder = yargs => {
   addAccountOptions(yargs, true);
   addUseEnvironmentOptions(yargs, true);
 
-  yargs.options({
-    json: {
-      describe: i18n(`${i18nKey}.options.json.describe`),
-      type: 'boolean',
-    },
-  });
   yargs.positional('src', {
     describe: i18n(`${i18nKey}.positionals.src.describe`),
     type: 'string',

package/lib/prompts/accountsPrompt.js

@@ -1,6 +1,7 @@
 const { updateDefaultAccount } = require('@hubspot/cli-lib/lib/config');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { mapAccountChoices } = require('./sandboxesPrompt');
 
 const i18nKey = 'cli.commands.accounts.subcommands.use';
 
@@ -12,10 +13,7 @@ const selectAccountFromConfig = async config => {
       name: 'default',
       pageSize: 20,
       message: i18n(`${i18nKey}.promptMessage`),
-      choices: config.portals.map(p => ({
-        name: `${p.name} (${p.portalId})`,
-        value: p.name || p.portalId,
-      })),
+      choices: mapAccountChoices(config.portals),
       default: config.defaultPortal,
     },
   ]);
@@ -31,10 +29,7 @@ const selectAndSetAsDefaultAccountPrompt = async config => {
       name: 'default',
       pageSize: 20,
       message: i18n(`${i18nKey}.promptMessage`),
-      choices: config.portals.map(p => ({
-        name: `${p.name} (${p.portalId})`,
-        value: p.name || p.portalId,
-      })),
+      choices: mapAccountChoices(config.portals),
       default: config.defaultPortal,
     },
   ]);

package/lib/prompts/sandboxesPrompt.js

@@ -3,6 +3,19 @@ const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.lib.prompts.sandboxesPrompt';
 
+const getSandboxType = type =>
+  type === 'DEVELOPER' ? 'development' : 'standard';
+
+const mapAccountChoices = portals =>
+  portals.map(p => {
+    const isSandbox = p.sandboxAccountType !== null;
+    const sandboxName = `[${getSandboxType(p.sandboxAccountType)} sandbox] `;
+    return {
+      name: `${p.name} ${isSandbox ? sandboxName : ''}(${p.portalId})`,
+      value: p.name || p.portalId,
+    };
+  });
+
 const createSandboxPrompt = () => {
   return promptUser([
     {
@@ -31,7 +44,7 @@ const deleteSandboxPrompt = (config, promptParentAccount = false) => {
       type: 'list',
       look: false,
       pageSize: 20,
-      choices: config.portals.map(p => p.name || p.portalId),
+      choices: mapAccountChoices(config.portals),
       default: config.defaultPortal,
     },
   ]);
@@ -40,4 +53,6 @@ const deleteSandboxPrompt = (config, promptParentAccount = false) => {
 module.exports = {
   createSandboxPrompt,
   deleteSandboxPrompt,
+  getSandboxType,
+  mapAccountChoices,
 };

package/lib/validators/__tests__/validatorTestUtils.js

@@ -1,36 +1,8 @@
 //HACK so we can keep this util file next to the tests that use it
 test.skip('skip', () => null);
 
-const THEME_PATH = '/path/to/a/theme';
 const MODULE_PATH = 'module/path';
 
-const makeFindError = baseKey => (errors, errorKey) =>
-  errors.find(error => error.key === `${baseKey}.${errorKey}`);
-
-const generateModulesList = numFiles => {
-  const files = [];
-  for (let i = 0; i < numFiles; i++) {
-    const base = `module-${i}.module`;
-    files.push(`${base}/meta.json`);
-    files.push(`${base}/fields.json`);
-    files.push(`${base}/module.html`);
-    files.push(`${base}/module.js`);
-  }
-  return files;
-};
-
-const generateTemplatesList = numFiles => {
-  const files = [];
-  for (let i = 0; i < numFiles; i++) {
-    files.push(`template-${i}.html`);
-  }
-  return files;
-};
-
 module.exports = {
-  generateModulesList,
-  generateTemplatesList,
-  makeFindError,
-  THEME_PATH,
   MODULE_PATH,
 };

package/lib/validators/applyValidators.js

@@ -1,19 +1,3 @@
-async function applyAbsoluteValidators(validators, absolutePath, ...args) {
-  return Promise.all(
-    validators.map(async Validator => {
-      Validator.setAbsolutePath(absolutePath);
-      const validationResult = await Validator.validate(...args);
-      Validator.clearAbsolutePath();
-
-      if (!validationResult.length) {
-        // Return a success obj so we can log the successes
-        return [Validator.getSuccess()];
-      }
-      return validationResult;
-    })
-  );
-}
-
 async function applyRelativeValidators(validators, relativePath, ...args) {
   return Promise.all(
     validators.map(async Validator => {
@@ -30,4 +14,4 @@ async function applyRelativeValidators(validators, relativePath, ...args) {
   );
 }
 
-module.exports = { applyAbsoluteValidators, applyRelativeValidators };
+module.exports = { applyRelativeValidators };

package/lib/validators/constants.js

@@ -4,11 +4,6 @@ const SUCCESS = 'SUCCESS';
 
 const VALIDATION_RESULT = { WARNING, FATAL, SUCCESS };
 const VALIDATOR_KEYS = {
-  themeDependency: 'themeDependency',
-  themeModule: 'themeModule',
-  section: 'section',
-  template: 'template',
-  themeConfig: 'themeConfig',
   module: 'module',
   moduleDependency: 'moduleDependency',
 };

package/lib/validators/index.js

@@ -1,20 +1,7 @@
-const ThemeConfigValidator = require('./marketplaceValidators/theme/ThemeConfigValidator');
-const SectionValidator = require('./marketplaceValidators/theme/SectionValidator');
-const TemplateValidator = require('./marketplaceValidators/theme/TemplateValidator');
-const ThemeModuleValidator = require('./marketplaceValidators/theme/ThemeModuleValidator');
-const ThemeDependencyValidator = require('./marketplaceValidators/theme/ThemeDependencyValidator');
-
 const ModuleValidator = require('./marketplaceValidators/module/ModuleValidator');
 const ModuleDependencyValidator = require('./marketplaceValidators/module/ModuleDependencyValidator');
 
 const MARKETPLACE_VALIDATORS = {
-  theme: [
-    ThemeConfigValidator,
-    SectionValidator,
-    TemplateValidator,
-    ThemeModuleValidator,
-    ThemeDependencyValidator,
-  ],
   module: [ModuleValidator, ModuleDependencyValidator],
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "4.0.2-beta.6",
+  "version": "4.1.0",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,8 +8,8 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "4.0.2-beta.6",
-    "@hubspot/serverless-dev-runtime": "4.0.2-beta.6",
+    "@hubspot/cli-lib": "4.1.0",
+    "@hubspot/serverless-dev-runtime": "4.1.0",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e738be958be36d5ec5aa4957483cd096bef13ef0"
+  "gitHead": "642e8486f6dad6d91b1e5854fc427239ca4d11bb"
 }

package/lib/validators/__tests__/AbsoluteValidator.js

@@ -1,28 +0,0 @@
-const AbsoluteValidator = require('../marketplaceValidators/AbsoluteValidator');
-const { VALIDATION_RESULT } = require('../constants');
-
-const Validator = new AbsoluteValidator({
-  name: 'Test validator',
-  key: 'validatorKey',
-});
-
-describe('validators/marketplaceValidators/AbsoluteValidator', () => {
-  it('getSuccess returns expected object', async () => {
-    const success = Validator.getSuccess();
-
-    expect(success.validatorKey).toBe('validatorKey');
-    expect(success.validatorName).toBe('Test validator');
-    expect(success.result).toBe(VALIDATION_RESULT.SUCCESS);
-  });
-
-  it('getError returns expected object', async () => {
-    const errorObj = { key: 'errorkey', getCopy: () => 'Some error copy' };
-    const success = Validator.getError(errorObj);
-
-    expect(success.validatorKey).toBe('validatorKey');
-    expect(success.validatorName).toBe('Test validator');
-    expect(success.error).toBe('Some error copy');
-    expect(success.result).toBe(VALIDATION_RESULT.FATAL);
-    expect(success.key).toBe('validatorKey.errorkey');
-  });
-});