@hubspot/cli 4.1.7-beta.1 → 4.1.7

package/commands/module/marketplace-validate.js

@@ -1,4 +1,4 @@
-const { logger } = require('@hubspot/cli-lib/logger');
+const Spinnies = require('spinnies');
 
 const {
   addConfigOptions,
@@ -9,17 +9,15 @@ const {
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const {
-  logValidatorResults,
-} = require('../../lib/validators/logValidatorResults');
-const {
-  applyRelativeValidators,
-} = require('../../lib/validators/applyValidators');
-const MARKETPLACE_VALIDATORS = require('../../lib/validators');
-const { VALIDATION_RESULT } = require('../../lib/validators/constants');
+  kickOffValidation,
+  pollForValidationFinish,
+  fetchValidationResults,
+  processValidationErrors,
+  displayValidationResults,
+} = require('../../lib/marketplace-validate');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.commands.module.subcommands.marketplaceValidate';
-const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 exports.command = 'marketplace-validate <src>';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -31,31 +29,29 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  if (!options.json) {
-    logger.log(
-      i18n(`${i18nKey}.logs.validatingModule`, {
-        path: src,
-      })
-    );
-  }
   trackCommandUsage('validate', null, accountId);
 
-  applyRelativeValidators(
-    MARKETPLACE_VALIDATORS.module,
-    src,
-    src,
-    accountId
-  ).then(groupedResults => {
-    logValidatorResults(groupedResults, { logAsJson: options.json });
-
-    if (
-      groupedResults
-        .flat()
-        .some(result => result.result === VALIDATION_RESULT.FATAL)
-    ) {
-      process.exit(EXIT_CODES.WARNING);
-    }
+  const spinnies = new Spinnies();
+  spinnies.add('marketplaceValidation', {
+    text: i18n(`${i18nKey}.logs.validatingModule`, {
+      path: src,
+    }),
   });
+
+  const assetType = 'MODULE';
+  const validationId = await kickOffValidation(accountId, assetType, src);
+  await pollForValidationFinish(accountId, validationId);
+
+  spinnies.remove('marketplaceValidation');
+
+  const validationResults = await fetchValidationResults(
+    accountId,
+    validationId
+  );
+  processValidationErrors(validationResults);
+  displayValidationResults(i18nKey, validationResults);
+
+  process.exit();
 };
 
 exports.builder = yargs => {
@@ -63,12 +59,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/commands/sandbox/delete.js

@@ -18,6 +18,7 @@ const { getConfig, getEnv } = require('@hubspot/cli-lib');
 const { deleteSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
 const {
   removeSandboxAccountFromConfig,
+  updateDefaultAccount,
 } = require('@hubspot/cli-lib/lib/config');
 const {
   selectAndSetAsDefaultAccountPrompt,
@@ -38,13 +39,26 @@ exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async options => {
   await loadAndValidateOptions(options, false);
 
-  const { account } = options;
+  const { account, force } = options;
   const config = getConfig();
 
   let accountPrompt;
   if (!account) {
-    accountPrompt = await deleteSandboxPrompt(config);
+    if (!force) {
+      accountPrompt = await deleteSandboxPrompt(config);
+    } else {
+      // Account is required, throw error if force flag is present and no account is specified
+      logger.log('');
+      logger.error(i18n(`${i18nKey}.failure.noAccount`));
+      process.exit(EXIT_CODES.ERROR);
+    }
+    if (!accountPrompt) {
+      logger.log('');
+      logger.error(i18n(`${i18nKey}.failure.noSandboxAccounts`));
+      process.exit(EXIT_CODES.ERROR);
+    }
   }
+
   const sandboxAccountId = getAccountId({
     account: account || accountPrompt.account,
   });
@@ -54,31 +68,36 @@ exports.handler = async options => {
 
   trackCommandUsage('sandbox-delete', null, sandboxAccountId);
 
+  const baseUrl = getHubSpotWebsiteOrigin(
+    getEnv(sandboxAccountId) === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD
+  );
+
   let parentAccountId;
   for (const portal of config.portals) {
     if (portal.portalId === sandboxAccountId) {
       if (portal.parentAccountId) {
         parentAccountId = portal.parentAccountId;
-      } else {
+      } else if (!force) {
         const parentAccountPrompt = await deleteSandboxPrompt(config, true);
         parentAccountId = getAccountId({
           account: parentAccountPrompt.account,
         });
+      } else {
+        logger.error(i18n(`${i18nKey}.failure.noParentAccount`));
+        process.exit(EXIT_CODES.ERROR);
       }
     }
   }
 
+  const url = `${baseUrl}/sandboxes/${parentAccountId}`;
+  const command = `hs auth ${
+    getEnv(sandboxAccountId) === 'qa' ? '--qa' : ''
+  } --account=${parentAccountId}`;
+
   if (!getAccountId({ account: parentAccountId })) {
-    const baseUrl = getHubSpotWebsiteOrigin(
-      getEnv(sandboxAccountId) === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD
-    );
-    const url = `${baseUrl}/sandboxes/${parentAccountId}`;
-    const command = `hs auth ${
-      getEnv(sandboxAccountId) === 'qa' ? '--qa' : ''
-    } --account=${parentAccountId}`;
     logger.log('');
     logger.error(
-      i18n(`${i18nKey}.noParentPortalAvailable`, {
+      i18n(`${i18nKey}.failure.noParentPortalAvailable`, {
         parentAccountId,
         url,
         command,
@@ -103,17 +122,19 @@ exports.handler = async options => {
   }
 
   try {
-    const { confirmSandboxDeletePrompt: confirmed } = await promptUser([
-      {
-        name: 'confirmSandboxDeletePrompt',
-        type: 'confirm',
-        message: i18n(`${i18nKey}.confirm`, {
-          account: account || accountPrompt.account,
-        }),
-      },
-    ]);
-    if (!confirmed) {
-      process.exit(EXIT_CODES.SUCCESS);
+    if (!force) {
+      const { confirmSandboxDeletePrompt: confirmed } = await promptUser([
+        {
+          name: 'confirmSandboxDeletePrompt',
+          type: 'confirm',
+          message: i18n(`${i18nKey}.confirm`, {
+            account: account || accountPrompt.account,
+          }),
+        },
+      ]);
+      if (!confirmed) {
+        process.exit(EXIT_CODES.SUCCESS);
+      }
     }
 
     await deleteSandbox(parentAccountId, sandboxAccountId);
@@ -133,8 +154,11 @@ exports.handler = async options => {
     const promptDefaultAccount = removeSandboxAccountFromConfig(
       sandboxAccountId
     );
-    if (promptDefaultAccount) {
+    if (promptDefaultAccount && !force) {
       await selectAndSetAsDefaultAccountPrompt(getConfig());
+    } else {
+      // If force is specified, skip prompt and set the parent account id as the default account
+      updateDefaultAccount(parentAccountId);
     }
     process.exit(EXIT_CODES.SUCCESS);
   } catch (err) {
@@ -156,7 +180,7 @@ exports.handler = async options => {
     ) {
       logger.log('');
       logger.warn(
-        i18n(`${i18nKey}.objectNotFound`, {
+        i18n(`${i18nKey}.failure.objectNotFound`, {
           account: account || accountPrompt.account,
         })
       );
@@ -165,8 +189,11 @@ exports.handler = async options => {
       const promptDefaultAccount = removeSandboxAccountFromConfig(
         sandboxAccountId
       );
-      if (promptDefaultAccount) {
+      if (promptDefaultAccount && !force) {
         await selectAndSetAsDefaultAccountPrompt(getConfig());
+      } else {
+        // If force is specified, skip prompt and set the parent account id as the default account
+        updateDefaultAccount(parentAccountId);
       }
       process.exit(EXIT_CODES.SUCCESS);
     } else {
@@ -181,6 +208,11 @@ exports.builder = yargs => {
     describe: i18n(`${i18nKey}.options.account.describe`),
     type: 'string',
   });
+  yargs.option('f', {
+    type: 'boolean',
+    alias: 'force',
+    describe: i18n(`${i18nKey}.examples.force`),
+  });
 
   yargs.example([
     [

package/commands/theme/marketplace-validate.js

@@ -1,7 +1,4 @@
 const Spinnies = require('spinnies');
-const chalk = require('chalk');
-
-const { logger } = require('@hubspot/cli-lib/logger');
 
 const {
   addConfigOptions,
@@ -12,16 +9,15 @@ const {
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const {
-  requestValidation,
-  getValidationStatus,
-  getValidationResults,
-} = require('@hubspot/cli-lib/api/marketplaceValidation');
-
+  kickOffValidation,
+  pollForValidationFinish,
+  fetchValidationResults,
+  processValidationErrors,
+  displayValidationResults,
+} = require('../../lib/marketplace-validate');
 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`);
@@ -36,130 +32,24 @@ exports.handler = async options => {
   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 {
-    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);
-  }
-
-  // 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);
-  }
-
-  const displayResults = checks => {
-    const displayFileInfo = (file, line) => {
-      if (file) {
-        logger.log(
-          i18n(`${i18nKey}.results.warnings.file`, {
-            file,
-          })
-        );
-      }
-      if (line) {
-        logger.log(
-          i18n(`${i18nKey}.results.warnings.lineNumber`, {
-            line,
-          })
-        );
-      }
-      return null;
-    };
-
-    if (checks) {
-      const { status, results } = checks;
-
-      if (status === 'FAIL') {
-        const failedValidations = results.filter(
-          test => test.status === 'FAIL'
-        );
-        const warningValidations = results.filter(
-          test => test.status === 'WARN'
-        );
-
-        failedValidations.forEach(val => {
-          logger.error(`${val.message}`);
-          displayFileInfo(val.file, val.line);
-        });
-
-        warningValidations.forEach(val => {
-          logger.warn(`${val.message}`);
-          displayFileInfo(val.file, val.line);
-        });
-      }
-
-      if (status === 'PASS') {
-        logger.success(i18n(`${i18nKey}.results.noErrors`));
+  const validationId = await kickOffValidation(accountId, assetType, src);
+  await pollForValidationFinish(accountId, validationId);
 
-        results.forEach(test => {
-          if (test.status === 'WARN') {
-            logger.warn(`${test.message}`);
-            displayFileInfo(test.file, test.line);
-          }
-        });
-      }
-    }
-    return null;
-  };
+  spinnies.remove('marketplaceValidation');
 
-  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();
+  const validationResults = await fetchValidationResults(
+    accountId,
+    validationId
+  );
+  processValidationErrors(validationResults);
+  displayValidationResults(i18nKey, validationResults);
 
   process.exit();
 };

package/lib/marketplace-validate.js

@@ -0,0 +1,137 @@
+const chalk = require('chalk');
+
+const { logger } = require('@hubspot/cli-lib/logger');
+const {
+  requestValidation,
+  getValidationStatus,
+  getValidationResults,
+} = require('@hubspot/cli-lib/api/marketplaceValidation');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { EXIT_CODES } = require('./enums/exitCodes');
+
+const SLEEP_TIME = 2000;
+
+const kickOffValidation = async (accountId, assetType, src) => {
+  const requestGroup = 'EXTERNAL_DEVELOPER';
+  try {
+    const requestResult = await requestValidation(accountId, {
+      path: src,
+      assetType,
+      requestGroup,
+    });
+    return requestResult;
+  } catch (err) {
+    logger.debug(err);
+    process.exit(EXIT_CODES.ERROR);
+  }
+};
+
+const pollForValidationFinish = async (accountId, validationId) => {
+  try {
+    const checkValidationStatus = async () => {
+      const validationStatus = await getValidationStatus(accountId, {
+        validationId,
+      });
+
+      if (validationStatus === 'REQUESTED') {
+        await new Promise(resolve => setTimeout(resolve, SLEEP_TIME));
+        await checkValidationStatus();
+      }
+    };
+    await checkValidationStatus();
+  } catch (err) {
+    logger.debug(err);
+    process.exit(EXIT_CODES.ERROR);
+  }
+};
+
+const fetchValidationResults = async (accountId, validationId) => {
+  try {
+    const validationResults = await getValidationResults(accountId, {
+      validationId,
+    });
+    return validationResults;
+  } catch (err) {
+    logger.debug(err);
+    process.exit(EXIT_CODES.ERROR);
+  }
+};
+
+const processValidationErrors = validationResults => {
+  if (validationResults.errors.length) {
+    const { errors } = validationResults;
+
+    errors.forEach(err => {
+      logger.error(`${err.context}`);
+    });
+    process.exit(EXIT_CODES.ERROR);
+  }
+};
+
+const displayValidationResults = (i18nKey, validationResults) => {
+  const displayResults = checks => {
+    const displayFileInfo = (file, line) => {
+      if (file) {
+        logger.log(
+          i18n(`${i18nKey}.results.warnings.file`, {
+            file,
+          })
+        );
+      }
+      if (line) {
+        logger.log(
+          i18n(`${i18nKey}.results.warnings.lineNumber`, {
+            line,
+          })
+        );
+      }
+      return null;
+    };
+
+    if (checks) {
+      const { status, results } = checks;
+
+      if (status === 'FAIL') {
+        const failedValidations = results.filter(
+          test => test.status === 'FAIL'
+        );
+        const warningValidations = results.filter(
+          test => test.status === 'WARN'
+        );
+        failedValidations.forEach(val => {
+          logger.error(`${val.message}`);
+          displayFileInfo(val.file, val.line);
+        });
+        warningValidations.forEach(val => {
+          logger.warn(`${val.message}`);
+          displayFileInfo(val.file, val.line);
+        });
+      }
+      if (status === 'PASS') {
+        logger.success(i18n(`${i18nKey}.results.noErrors`));
+
+        results.forEach(test => {
+          if (test.status === 'WARN') {
+            logger.warn(`${test.message}`);
+            displayFileInfo(test.file, test.line);
+          }
+        });
+      }
+    }
+    return null;
+  };
+
+  Object.keys(validationResults.results).forEach(type => {
+    logger.log(chalk.bold(i18n(`${i18nKey}.results.${type.toLowerCase()}`)));
+    displayResults(validationResults.results[type]);
+    logger.log();
+  });
+};
+
+module.exports = {
+  kickOffValidation,
+  pollForValidationFinish,
+  fetchValidationResults,
+  processValidationErrors,
+  displayValidationResults,
+};

package/lib/prompts/accountsPrompt.js

@@ -49,4 +49,5 @@ const selectAndSetAsDefaultAccountPrompt = async config => {
 module.exports = {
   selectAndSetAsDefaultAccountPrompt,
   selectAccountFromConfig,
+  mapAccountChoices,
 };

package/lib/prompts/sandboxesPrompt.js

@@ -15,6 +15,18 @@ const mapSandboxAccountChoices = portals =>
       };
     });
 
+const mapNonSandboxAccountChoices = portals =>
+  portals
+    .filter(
+      p => p.sandboxAccountType === null || p.sandboxAccountType === undefined
+    )
+    .map(p => {
+      return {
+        name: `${p.name} (${p.portalId})`,
+        value: p.name || p.portalId,
+      };
+    });
+
 const createSandboxPrompt = () => {
   return promptUser([
     {
@@ -32,6 +44,12 @@ const createSandboxPrompt = () => {
 };
 
 const deleteSandboxPrompt = (config, promptParentAccount = false) => {
+  const choices = promptParentAccount
+    ? mapNonSandboxAccountChoices(config.portals)
+    : mapSandboxAccountChoices(config.portals);
+  if (!choices.length) {
+    return undefined;
+  }
   return promptUser([
     {
       name: 'account',
@@ -43,7 +61,7 @@ const deleteSandboxPrompt = (config, promptParentAccount = false) => {
       type: 'list',
       look: false,
       pageSize: 20,
-      choices: mapSandboxAccountChoices(config.portals),
+      choices,
       default: config.defaultPortal,
     },
   ]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "4.1.7-beta.1",
+  "version": "4.1.7",
   "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.1.7-beta.1",
-    "@hubspot/serverless-dev-runtime": "4.1.7-beta.1",
+    "@hubspot/cli-lib": "4.1.7",
+    "@hubspot/serverless-dev-runtime": "4.1.7",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "cli-progress": "^3.11.2",
@@ -38,5 +38,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f97135fb4b7a43bbe9915191a70f38d509ba1b26"
+  "gitHead": "ef2292568ec8308feb0c5841e4d3dd25a64d1050"
 }

package/lib/validators/__tests__/ModuleDependencyValidator.js

@@ -1,79 +0,0 @@
-const marketplace = require('@hubspot/cli-lib/api/marketplace');
-const path = require('path');
-
-const ModuleDependencyValidator = require('../marketplaceValidators/module/ModuleDependencyValidator');
-const { VALIDATION_RESULT } = require('../constants');
-const { MODULE_PATH } = require('./validatorTestUtils');
-
-jest.mock('@hubspot/cli-lib/api/marketplace');
-
-const getMockDependencyResult = (customPaths = []) => {
-  const result = {
-    dependencies: [...customPaths],
-  };
-  return Promise.resolve(result);
-};
-
-describe('validators/marketplaceValidators/module/ModuleDependencyValidator', () => {
-  beforeEach(() => {
-    ModuleDependencyValidator.setRelativePath(MODULE_PATH);
-  });
-
-  describe('isExternalDep', () => {
-    beforeEach(() => {
-      ModuleDependencyValidator.setRelativePath(MODULE_PATH);
-    });
-
-    it('returns true if dep is external to the provided absolute path', () => {
-      const isExternal = ModuleDependencyValidator.isExternalDep(
-        MODULE_PATH,
-        'SomeOtherFolder/In/The/DesignManager.css'
-      );
-      expect(isExternal).toBe(true);
-    });
-
-    it('returns false if dep is not external to the provided absolute path', () => {
-      const isExternal = ModuleDependencyValidator.isExternalDep(
-        MODULE_PATH,
-        `${path.parse(MODULE_PATH).dir}/Internal/Folder/style.css`
-      );
-      expect(isExternal).toBe(false);
-    });
-  });
-
-  describe('validate', () => {
-    it('returns error if any referenced path is absolute', async () => {
-      marketplace.fetchModuleDependencies.mockReturnValue(
-        getMockDependencyResult(['/absolute/path'])
-      );
-      const validationErrors = await ModuleDependencyValidator.validate(
-        MODULE_PATH
-      );
-
-      expect(validationErrors.length).toBe(1);
-      expect(validationErrors[0].result).toBe(VALIDATION_RESULT.FATAL);
-    });
-
-    it('returns error if any referenced path is external to the theme', async () => {
-      marketplace.fetchModuleDependencies.mockReturnValue(
-        getMockDependencyResult(['../../external/file-3.js'])
-      );
-      const validationErrors = await ModuleDependencyValidator.validate(
-        MODULE_PATH
-      );
-
-      expect(validationErrors.length).toBe(1);
-      expect(validationErrors[0].result).toBe(VALIDATION_RESULT.FATAL);
-    });
-
-    it('returns no errors if paths are relative and internal', async () => {
-      marketplace.fetchModuleDependencies.mockReturnValue(
-        getMockDependencyResult(['module/style.css', 'module/another/test.js'])
-      );
-      const validationErrors = await ModuleDependencyValidator.validate(
-        MODULE_PATH
-      );
-      expect(validationErrors.length).toBe(0);
-    });
-  });
-});

package/lib/validators/__tests__/ModuleValidator.js

@@ -1,51 +0,0 @@
-const ModuleValidator = require('../marketplaceValidators/module/ModuleValidator');
-const { VALIDATION_RESULT } = require('../constants');
-const { MODULE_PATH } = require('./validatorTestUtils');
-const marketplace = require('@hubspot/cli-lib/api/marketplace');
-
-jest.mock('@hubspot/cli-lib/api/marketplace');
-
-describe('validators/marketplaceValidators/module/ModuleValidator', () => {
-  beforeEach(() => {
-    ModuleValidator.setRelativePath(MODULE_PATH);
-  });
-
-  it('returns error if module meta.json file has invalid json', async () => {
-    marketplace.fetchModuleMeta.mockReturnValue(
-      Promise.resolve({ source: '{} bad json }' })
-    );
-
-    const validationErrors = await ModuleValidator.validate(MODULE_PATH);
-    expect(validationErrors.length).toBe(1);
-    expect(validationErrors[0].result).toBe(VALIDATION_RESULT.FATAL);
-  });
-
-  it('returns error if module meta.json file is missing a label field', async () => {
-    marketplace.fetchModuleMeta.mockReturnValue(
-      Promise.resolve({ source: '{ "icon": "woo" }' })
-    );
-
-    const validationErrors = await ModuleValidator.validate(MODULE_PATH);
-    expect(validationErrors.length).toBe(1);
-    expect(validationErrors[0].result).toBe(VALIDATION_RESULT.FATAL);
-  });
-
-  it('returns error if module meta.json file is missing an icon field', async () => {
-    marketplace.fetchModuleMeta.mockReturnValue(
-      Promise.resolve({ source: '{ "label": "yay" }' })
-    );
-
-    const validationErrors = await ModuleValidator.validate(MODULE_PATH);
-    expect(validationErrors.length).toBe(1);
-    expect(validationErrors[0].result).toBe(VALIDATION_RESULT.FATAL);
-  });
-
-  it('returns no error if module meta.json file exists and has all required fields', async () => {
-    marketplace.fetchModuleMeta.mockReturnValue(
-      Promise.resolve({ source: '{ "label": "yay", "icon": "woo" }' })
-    );
-
-    const validationErrors = await ModuleValidator.validate(MODULE_PATH);
-    expect(validationErrors.length).toBe(0);
-  });
-});

package/lib/validators/__tests__/RelativeValidator.js

@@ -1,28 +0,0 @@
-const RelativeValidator = require('../marketplaceValidators/RelativeValidator');
-const { VALIDATION_RESULT } = require('../constants');
-
-const Validator = new RelativeValidator({
-  name: 'Test validator',
-  key: 'validatorKey',
-});
-
-describe('validators/marketplaceValidators/RelativeValidator', () => {
-  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');
-  });
-});

package/lib/validators/__tests__/validatorTestUtils.js

@@ -1,8 +0,0 @@
-//HACK so we can keep this util file next to the tests that use it
-test.skip('skip', () => null);
-
-const MODULE_PATH = 'module/path';
-
-module.exports = {
-  MODULE_PATH,
-};

package/lib/validators/applyValidators.js

@@ -1,17 +0,0 @@
-async function applyRelativeValidators(validators, relativePath, ...args) {
-  return Promise.all(
-    validators.map(async Validator => {
-      Validator.setRelativePath(relativePath);
-      const validationResult = await Validator.validate(...args);
-      Validator.clearRelativePath();
-
-      if (!validationResult.length) {
-        // Return a success obj so we can log the successes
-        return [Validator.getSuccess()];
-      }
-      return validationResult;
-    })
-  );
-}
-
-module.exports = { applyRelativeValidators };

package/lib/validators/constants.js

@@ -1,11 +0,0 @@
-const WARNING = 'WARNING';
-const FATAL = 'FATAL';
-const SUCCESS = 'SUCCESS';
-
-const VALIDATION_RESULT = { WARNING, FATAL, SUCCESS };
-const VALIDATOR_KEYS = {
-  module: 'module',
-  moduleDependency: 'moduleDependency',
-};
-
-module.exports = { VALIDATOR_KEYS, VALIDATION_RESULT };

package/lib/validators/index.js

@@ -1,8 +0,0 @@
-const ModuleValidator = require('./marketplaceValidators/module/ModuleValidator');
-const ModuleDependencyValidator = require('./marketplaceValidators/module/ModuleDependencyValidator');
-
-const MARKETPLACE_VALIDATORS = {
-  module: [ModuleValidator, ModuleDependencyValidator],
-};
-
-module.exports = MARKETPLACE_VALIDATORS;

package/lib/validators/logValidatorResults.js

@@ -1,59 +0,0 @@
-const chalk = require('chalk');
-const { logger } = require('@hubspot/cli-lib/logger');
-const { VALIDATION_RESULT } = require('./constants');
-
-function logResultsAsJson(groupedResults) {
-  let success = true;
-  const resultObj = groupedResults.reduce((acc, resultList) => {
-    resultList.forEach(result => {
-      if (!acc[result.validatorKey]) {
-        if (success && result.result !== VALIDATION_RESULT.SUCCESS) {
-          success = false;
-        }
-        acc[result.validatorKey] = [];
-      }
-      const {
-        validatorName: __omit1, // eslint-disable-line no-unused-vars
-        validatorKey: __omit2, // eslint-disable-line no-unused-vars
-        ...resultWithOmittedValues
-      } = result;
-      acc[result.validatorKey].push(resultWithOmittedValues);
-    });
-    return acc;
-  }, {});
-  const result = {
-    success,
-    results: resultObj,
-  };
-  // Use stdout here b/c console.log will truncate long strings
-  process.stdout.write(JSON.stringify(result) + '\n');
-}
-
-function logValidatorResults(groupedResults, { logAsJson = false } = {}) {
-  if (logAsJson) {
-    return logResultsAsJson(groupedResults);
-  }
-  groupedResults.forEach(results => {
-    logger.log(chalk.bold(`${results[0].validatorName} validation results:`));
-    logger.group();
-    results.forEach(({ error, result }) => {
-      switch (result) {
-        case VALIDATION_RESULT.WARNING:
-          logger.warn(error);
-          break;
-        case VALIDATION_RESULT.FATAL:
-          logger.error(error);
-          break;
-        case VALIDATION_RESULT.SUCCESS:
-          logger.success('No errors');
-          break;
-        default:
-          logger.log(error);
-      }
-    });
-    logger.log('\n');
-    logger.groupEnd();
-  });
-}
-
-module.exports = { logValidatorResults };

package/lib/validators/marketplaceValidators/RelativeValidator.js

@@ -1,46 +0,0 @@
-const { VALIDATION_RESULT } = require('../constants');
-
-class RelativeValidator {
-  constructor({ name, key }) {
-    this.name = name;
-    this.key = key;
-  }
-
-  clearRelativePath() {
-    this._relativePath = null;
-  }
-
-  setRelativePath(path) {
-    this._relativePath = path;
-  }
-
-  getRelativePath() {
-    return this._relativePath;
-  }
-
-  getSuccess() {
-    return {
-      validatorKey: this.key,
-      validatorName: this.name,
-      result: VALIDATION_RESULT.SUCCESS,
-    };
-  }
-
-  getError(errorObj, file, extraContext = {}) {
-    const relativeFilePath = this.getRelativePath();
-    const context = {
-      filePath: relativeFilePath,
-      ...extraContext,
-    };
-    return {
-      validatorKey: this.key,
-      validatorName: this.name,
-      error: errorObj.getCopy(context),
-      result: errorObj.severity || VALIDATION_RESULT.FATAL,
-      key: `${this.key}.${errorObj.key}`,
-      context,
-    };
-  }
-}
-
-module.exports = RelativeValidator;

package/lib/validators/marketplaceValidators/module/ModuleDependencyValidator.js

@@ -1,101 +0,0 @@
-const path = require('path');
-
-const { logger } = require('@hubspot/cli-lib/logger');
-const { HUBSPOT_FOLDER } = require('@hubspot/cli-lib/lib/constants');
-const { fetchModuleDependencies } = require('@hubspot/cli-lib/api/marketplace');
-const { isRelativePath } = require('@hubspot/cli-lib/path');
-
-const RelativeValidator = require('../RelativeValidator');
-const { VALIDATOR_KEYS } = require('../../constants');
-
-class ModuleDependencyValidator extends RelativeValidator {
-  constructor(options) {
-    super(options);
-
-    this.errors = {
-      FAILED_TO_FETCH_DEPS: {
-        key: 'failedDepFetch',
-        getCopy: ({ filePath }) =>
-          `Internal Error. Failed to fetch dependencies for ${filePath}. Please try again`,
-      },
-      EXTERNAL_DEPENDENCY: {
-        key: 'externalDependency',
-        getCopy: ({ filePath, referencedFilePath }) =>
-          `External dependency. ${filePath} references a file (${referencedFilePath}) that is outside of the module's immediate folder.`,
-      },
-      ABSOLUTE_DEPENDENCY_PATH: {
-        key: 'absoluteDependencyPath',
-        getCopy: ({ filePath, referencedFilePath }) =>
-          `Relative path required. ${filePath} references a file (${referencedFilePath}) using an absolute path`,
-      },
-    };
-  }
-
-  failedToFetchDependencies(err, relativePath, validationErrors) {
-    logger.debug(
-      `Failed to fetch dependencies for ${relativePath}: `,
-      err.error
-    );
-
-    validationErrors.push(
-      this.getError(this.errors.FAILED_TO_FETCH_DEPS, relativePath)
-    );
-  }
-
-  async getAllDependenciesByPath(relativePath, accountId, validationErrors) {
-    let deps = [];
-    const file_deps = await fetchModuleDependencies(
-      accountId,
-      relativePath
-    ).catch(err => {
-      this.failedToFetchDependencies(err, relativePath, validationErrors);
-      return null;
-    });
-    if (file_deps) {
-      deps = file_deps.dependencies || [];
-    }
-    return deps;
-  }
-
-  isExternalDep(relPath, relativeDepPath) {
-    const moduleDir = path.parse(relPath).dir;
-    const depDir = path.parse(relativeDepPath).dir;
-    return !depDir.startsWith(moduleDir);
-  }
-
-  // Validates:
-  // - Module does not contain external dependencies
-  // - All paths are either @hubspot or relative
-  async validate(relativePath, accountId) {
-    let validationErrors = [];
-
-    const dependencyData = await this.getAllDependenciesByPath(
-      relativePath,
-      accountId,
-      validationErrors
-    );
-    dependencyData.forEach(dependency => {
-      if (!dependency.startsWith(HUBSPOT_FOLDER)) {
-        if (!isRelativePath(dependency)) {
-          validationErrors.push(
-            this.getError(this.errors.ABSOLUTE_DEPENDENCY_PATH, relativePath, {
-              referencedFilePath: dependency,
-            })
-          );
-        } else if (this.isExternalDep(relativePath, dependency)) {
-          validationErrors.push(
-            this.getError(this.errors.EXTERNAL_DEPENDENCY, relativePath, {
-              referencedFilePath: dependency,
-            })
-          );
-        }
-      }
-    });
-    return validationErrors;
-  }
-}
-
-module.exports = new ModuleDependencyValidator({
-  name: 'Module dependency',
-  key: VALIDATOR_KEYS.moduleDependency,
-});

package/lib/validators/marketplaceValidators/module/ModuleValidator.js

@@ -1,102 +0,0 @@
-const { logger } = require('@hubspot/cli-lib/logger');
-const { fetchModuleMeta } = require('@hubspot/cli-lib/api/marketplace');
-const RelativeValidator = require('../RelativeValidator');
-const { VALIDATOR_KEYS } = require('../../constants');
-
-class ModuleValidator extends RelativeValidator {
-  constructor(options) {
-    super(options);
-
-    this.errors = {
-      FAILED_TO_FETCH_META_JSON: {
-        key: 'failedMetaFetch',
-        getCopy: ({ filePath }) =>
-          `Internal error. Failed to fetch meta.json for ${filePath}. Please try again.`,
-      },
-      MISSING_META_JSON: {
-        key: 'missingMetaJSON',
-        getCopy: ({ filePath }) =>
-          `Module ${filePath} is missing the meta.json file`,
-      },
-      INVALID_META_JSON: {
-        key: 'invalidMetaJSON',
-        getCopy: ({ filePath }) =>
-          `Module ${filePath} has invalid json in the meta.json file`,
-      },
-      MISSING_LABEL: {
-        key: 'missingLabel',
-        getCopy: ({ filePath }) =>
-          `Missing required property for ${filePath}. The meta.json file is missing the "label" property`,
-      },
-      MISSING_ICON: {
-        key: 'missingIcon',
-        getCopy: ({ filePath }) =>
-          `Missing required property for ${filePath}. The meta.json file is missing the "icon" property`,
-      },
-    };
-  }
-  failedToFetchDependencies(err, relativePath, validationErrors) {
-    logger.debug(
-      `Failed to fetch dependencies for ${relativePath}: `,
-      err.error
-    );
-    validationErrors.push(
-      this.getError(this.errors.FAILED_TO_FETCH_META_JSON, relativePath)
-    );
-  }
-
-  async getModuleMetaByPath(relativePath, accountId, validationErrors) {
-    const moduleMeta = await fetchModuleMeta(accountId, relativePath).catch(
-      err => {
-        this.failedToFetchDependencies(err, relativePath, validationErrors);
-        return null;
-      }
-    );
-    return moduleMeta;
-  }
-
-  // Validates:
-  // - Module folder contains a meta.json file
-  // - Module meta.json file contains valid json
-  // - Module meta.json file has a "label" field
-  // - Module meta.json file has an "icon" field
-  async validate(relativePath, accountId) {
-    let validationErrors = [];
-    const metaJSONFile = await this.getModuleMetaByPath(
-      relativePath,
-      accountId,
-      validationErrors
-    );
-    if (!metaJSONFile) {
-      validationErrors.push(
-        this.getError(this.errors.MISSING_META_JSON, relativePath)
-      );
-    }
-    let metaJSON;
-    try {
-      metaJSON = JSON.parse(metaJSONFile.source);
-    } catch (err) {
-      validationErrors.push(
-        this.getError(this.errors.INVALID_META_JSON, relativePath)
-      );
-    }
-    if (metaJSON) {
-      if (!metaJSON.label) {
-        validationErrors.push(
-          this.getError(this.errors.MISSING_LABEL, relativePath)
-        );
-      }
-      if (!metaJSON.icon) {
-        validationErrors.push(
-          this.getError(this.errors.MISSING_ICON, relativePath)
-        );
-      }
-    }
-    return validationErrors;
-  }
-}
-
-module.exports = new ModuleValidator({
-  name: 'Module',
-  key: VALIDATOR_KEYS.module,
-});