@hubspot/cli 5.1.1 → 5.1.2

package/commands/accounts/clean.js

@@ -1,7 +1,7 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
   accessTokenForPersonalAccessKey,
-} = require('@hubspot/cli-lib/personalAccessKey');
+} = require('@hubspot/local-dev-lib/personalAccessKey');
 
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
@@ -20,7 +20,7 @@ const SpinniesManager = require('../../lib/SpinniesManager');
 const { getConfig, deleteAccount } = require('@hubspot/local-dev-lib/config');
 const {
   isSpecifiedHubSpotAuthError,
-} = require('../../lib/errorHandlers/apiErrors');
+} = require('@hubspot/local-dev-lib/errors/apiErrors');
 
 const i18nKey = 'cli.commands.accounts.subcommands.clean';
 
@@ -58,12 +58,12 @@ exports.handler = async options => {
     } catch (error) {
       if (
         isSpecifiedHubSpotAuthError(error, {
-          statusCode: 401,
+          status: 401,
           category: 'INVALID_AUTHENTICATION',
           subCategory: 'LocalDevAuthErrorType.PORTAL_NOT_ACTIVE',
         }) ||
         isSpecifiedHubSpotAuthError(error, {
-          statusCode: 404,
+          status: 404,
           category: 'INVALID_AUTHENTICATION',
           subCategory: 'LocalDevAuthErrorType.INVALID_PORTAL_ID',
         })

package/commands/accounts/info.js

@@ -1,6 +1,6 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
-const { getAccessToken } = require('@hubspot/cli-lib/personalAccessKey.js');
+const { getAccessToken } = require('@hubspot/local-dev-lib/personalAccessKey');
 const {
   getAccountId,
   addAccountOptions,

package/commands/auth.js

@@ -8,8 +8,9 @@ const {
 } = require('@hubspot/cli-lib/lib/constants');
 const { i18n } = require('../lib/lang');
 const {
-  updateConfigWithPersonalAccessKey,
-} = require('@hubspot/cli-lib/personalAccessKey');
+  getAccessToken,
+  updateConfigWithAccessToken,
+} = require('@hubspot/local-dev-lib/personalAccessKey');
 const {
   updateAccountConfig,
   writeConfig,
@@ -17,7 +18,10 @@ const {
   getConfigPath,
   loadConfig,
 } = require('@hubspot/local-dev-lib/config');
-const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text');
+const {
+  commaSeparatedValues,
+  toKebabCase,
+} = require('@hubspot/local-dev-lib/text');
 const { promptUser } = require('../lib/prompts/promptUtils');
 const {
   personalAccessKeyPrompt,
@@ -40,6 +44,7 @@ const { trackAuthAction, trackCommandUsage } = require('../lib/usageTracking');
 const { authenticateWithOauth } = require('../lib/oauth');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const { uiFeatureHighlight } = require('../lib/ui');
+const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
 
 const i18nKey = 'cli.commands.auth';
 
@@ -85,6 +90,8 @@ exports.handler = async options => {
   let updatedConfig;
   let validName;
   let successAuthMethod;
+  let token;
+  let defaultName;
 
   switch (authType) {
     case OAUTH_AUTH_METHOD.value:
@@ -97,7 +104,19 @@ exports.handler = async options => {
       break;
     case PERSONAL_ACCESS_KEY_AUTH_METHOD.value:
       configData = await personalAccessKeyPrompt({ env, account });
-      updatedConfig = await updateConfigWithPersonalAccessKey(configData);
+
+      try {
+        token = await getAccessToken(configData.personalAccessKey, env);
+        defaultName = toKebabCase(token.hubName);
+
+        updatedConfig = await updateConfigWithAccessToken(
+          token,
+          configData.personalAccessKey,
+          env
+        );
+      } catch (e) {
+        logErrorInstance(e);
+      }
 
       if (!updatedConfig) {
         break;
@@ -106,7 +125,7 @@ exports.handler = async options => {
       validName = updatedConfig.name;
 
       if (!validName) {
-        const { name: namePrompt } = await enterAccountNamePrompt();
+        const { name: namePrompt } = await enterAccountNamePrompt(defaultName);
         validName = namePrompt;
       }
 

package/commands/fetch.js

@@ -1,4 +1,4 @@
-const { downloadFileOrFolder } = require('@hubspot/cli-lib/fileMapper');
+const { downloadFileOrFolder } = require('@hubspot/local-dev-lib/fileMapper');
 const { logger } = require('@hubspot/cli-lib/logger');
 
 const {
@@ -17,6 +17,22 @@ const { i18n } = require('../lib/lang');
 
 const i18nKey = 'cli.commands.fetch';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
+const { buildLogCallbacks } = require('../lib/logCallbacks');
+const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
+
+const fileMapperLogCallbacks = buildLogCallbacks({
+  skippedExisting: `${i18nKey}.fileMapperLogCallbacks.skippedExisting`,
+  wroteFolder: `${i18nKey}.fileMapperLogCallbacks.wroteFolder`,
+  completedFetch: {
+    key: `${i18nKey}.fileMapperLogCallbacks.completedFetch`,
+    logger: logger.success,
+  },
+  folderFetch: `${i18nKey}.fileMapperLogCallbacks.folderFetch`,
+  completedFolderFetch: {
+    key: `${i18nKey}.fileMapperLogCallbacks.completedFolderFetch`,
+    logger: logger.success,
+  },
+});
 
 exports.command = 'fetch <src> [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -40,14 +56,20 @@ exports.handler = async options => {
 
   trackCommandUsage('fetch', { mode }, accountId);
 
-  // Fetch and write file/folder.
-  downloadFileOrFolder({
-    accountId,
-    src,
-    dest: resolveLocalPath(dest),
-    mode,
-    options,
-  });
+  try {
+    // Fetch and write file/folder.
+    await downloadFileOrFolder(
+      accountId,
+      src,
+      resolveLocalPath(dest),
+      mode,
+      options,
+      fileMapperLogCallbacks
+    );
+  } catch (err) {
+    logErrorInstance(err);
+    process.exit(EXIT_CODES.ERROR);
+  }
 };
 
 exports.builder = yargs => {

package/commands/filemanager/fetch.js

@@ -1,6 +1,7 @@
-const { downloadFileOrFolder } = require('@hubspot/cli-lib/fileManager');
+const { downloadFileOrFolder } = require('@hubspot/local-dev-lib/fileManager');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { resolveLocalPath } = require('../../lib/filesystem');
+const { buildLogCallbacks } = require('../../lib/logCallbacks');
 
 const {
   addConfigOptions,
@@ -14,12 +15,27 @@ const { i18n } = require('../../lib/lang');
 
 const i18nKey = 'cli.commands.filemanager.subcommands.fetch';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
+
+const downloadLogCallbacks = buildLogCallbacks({
+  skippedExisting: `${i18nKey}.downloadLogCallbacks.skippedExisting`,
+  fetchFolderStarted: `${i18nKey}.downloadLogCallbacks.fetchFolderStarted`,
+  fetchFolderSuccess: {
+    key: `${i18nKey}.downloadLogCallbacks.fetchFolderSuccess`,
+    logger: logger.success,
+  },
+  fetchFileStarted: `${i18nKey}.downloadLogCallbacks.fetchFileStarted`,
+  fetchFileSuccess: {
+    key: `${i18nKey}.downloadLogCallbacks.fetchFileSuccess`,
+    logger: logger.success,
+  },
+});
 
 exports.command = 'fetch <src> [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
-  let { src, dest } = options;
+  let { src, dest, includeArchived } = options;
 
   await loadAndValidateOptions(options);
 
@@ -34,8 +50,20 @@ exports.handler = async options => {
 
   trackCommandUsage('filemanager-fetch', null, accountId);
 
-  // Fetch and write file/folder.
-  await downloadFileOrFolder(accountId, src, dest, options);
+  try {
+    // Fetch and write file/folder.
+    await downloadFileOrFolder(
+      accountId,
+      src,
+      dest,
+      false,
+      includeArchived || false,
+      downloadLogCallbacks
+    );
+  } catch (err) {
+    logErrorInstance(err);
+    process.exit(EXIT_CODES.ERROR);
+  }
 };
 
 exports.builder = yargs => {

package/commands/filemanager/upload.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 
-const { uploadFolder } = require('@hubspot/cli-lib/fileManager');
+const { uploadFolder } = require('@hubspot/local-dev-lib/fileManager');
 const { uploadFile } = require('@hubspot/cli-lib/api/fileManager');
 const { getCwd, convertToUnixPath } = require('@hubspot/local-dev-lib/path');
 const { logger } = require('@hubspot/cli-lib/logger');
@@ -25,6 +25,11 @@ const { i18n } = require('../../lib/lang');
 
 const i18nKey = 'cli.commands.filemanager.subcommands.upload';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+const { buildLogCallbacks } = require('../../lib/logCallbacks');
+
+const uploadLogCallbacks = buildLogCallbacks({
+  uploadSuccess: `${i18nKey}.uploadLogCallbacks.uploadSuccess`,
+});
 
 exports.command = 'upload <src> <dest>';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -121,7 +126,7 @@ exports.handler = async options => {
         src,
       })
     );
-    uploadFolder(accountId, absoluteSrcPath, dest)
+    uploadFolder(accountId, absoluteSrcPath, dest, uploadLogCallbacks)
       .then(() => {
         logger.success(
           i18n(`${i18nKey}.success.uploadComplete`, {

package/commands/init.js

@@ -24,9 +24,11 @@ const {
 const { i18n } = require('../lib/lang');
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
-  updateConfigWithPersonalAccessKey,
-} = require('@hubspot/cli-lib/personalAccessKey');
+  getAccessToken,
+  updateConfigWithAccessToken,
+} = require('@hubspot/local-dev-lib/personalAccessKey');
 const { getCwd } = require('@hubspot/local-dev-lib/path');
+const { toKebabCase } = require('@hubspot/local-dev-lib/text');
 const { trackCommandUsage, trackAuthAction } = require('../lib/usageTracking');
 const { setLogLevel, addTestingOptions } = require('../lib/commonOpts');
 const { promptUser } = require('../lib/prompts/promptUtils');
@@ -51,14 +53,25 @@ const TRACKING_STATUS = {
 };
 
 const personalAccessKeyConfigCreationFlow = async (env, account) => {
-  const configData = await personalAccessKeyPrompt({ env, account });
-  const { name } = await enterAccountNamePrompt();
-  const accountConfig = {
-    ...configData,
-    name,
-  };
+  const { personalAccessKey } = await personalAccessKeyPrompt({ env, account });
+  let updatedConfig;
+
+  try {
+    const token = await getAccessToken(personalAccessKey, env);
+    const defaultName = toKebabCase(token.hubName);
+    const { name } = await enterAccountNamePrompt(defaultName);
 
-  return updateConfigWithPersonalAccessKey(accountConfig, true);
+    updatedConfig = updateConfigWithAccessToken(
+      token,
+      personalAccessKey,
+      env,
+      name,
+      true
+    );
+  } catch (e) {
+    logErrorInstance(e);
+  }
+  return updatedConfig;
 };
 
 const oauthConfigCreationFlow = async env => {

package/commands/upload.js

@@ -1,7 +1,9 @@
 const fs = require('fs');
 const path = require('path');
 const { uploadFolder, hasUploadErrors } = require('@hubspot/cli-lib');
-const { getFileMapperQueryValues } = require('@hubspot/cli-lib/fileMapper');
+const {
+  getFileMapperQueryValues,
+} = require('@hubspot/local-dev-lib/fileMapper');
 const { upload, deleteFile } = require('@hubspot/cli-lib/api/fileMapper');
 const {
   getCwd,
@@ -155,7 +157,7 @@ exports.handler = async options => {
       accountId,
       absoluteSrcPath,
       normalizedDest,
-      getFileMapperQueryValues({ mode, options })
+      getFileMapperQueryValues(mode, options)
     )
       .then(() => {
         logger.success(

package/lang/en.lyaml

@@ -274,6 +274,12 @@ en:
             describe: "Local directory you would like the files to be placed in, relative to your current working directory"
           src:
             describe: "Path in HubSpot Design Tools"
+        fileMapperLogCallbacks:
+          skippedExisting: 'Skipped existing "{{ filepath }}"'
+          wroteFolder: 'Wrote folder "{{ filepath }}"'
+          completedFetch: 'Completed fetch of file "{{ src }}"{{ version }} to "{{ dest }}" from the Design Manager'
+          folderFetch: 'Fetched "{{ src }}" from account {{ accountId }} from the Design Manager successfully'
+          completedFolderFetch: 'Completed fetch of folder "{{ src }}"{{ version }} to "{{ dest }}" from the Design Manager'
       filemanager:
         describe: "Commands for working with the File Manager."
         subcommands:
@@ -289,6 +295,12 @@ en:
                 describe: "Path in HubSpot Design Tools"
               src:
                 describe: "Path to the local directory you would like the files to be placed, relative to your current working directory. If omitted, this argument will default to your current working directory"
+            downloadLogCallbacks:
+              skippedExisting: "Skipped existing {{ filepath }}"
+              fetchFolderStarted: 'Fetching folder from "{{ src }}" to "{{ dest }}" in the File Manager of account {{ accountId }}'
+              fetchFolderSuccess: "Completed fetch of folder \"{{ src }}\" to \"{{ dest }}\" from the File Manager"
+              fetchFileStarted: "Fetching file from \"{{ src }}\" to \"{{ dest }}\" in the File Manager of account {{ accountId }}"
+              fetchFileSuccess: "Completed fetch of file \"{{ src }}\" to \"{{ dest }}\" from the File Manager"
           upload:
             describe: "Upload a folder or file from your computer to the HubSpot File Manager"
             errors:
@@ -307,6 +319,8 @@ en:
             success:
               upload: "Uploaded file from \"{{ src }}\" to \"{{ dest }}\" in the File Manager of account {{ accountId }}"
               uploadComplete: "Uploading files to \"{{ dest }}\" in the File Manager is complete"
+            uploadLogCallbacks:
+             uploadSuccess: 'Uploaded file "{{ file }}" to "{{ destPath }}"'
       functions:
         describe: "Commands for working with functions."
         subcommands:
@@ -1296,8 +1310,8 @@ en:
             404: "The {{ messageDetail }} was not found."
             429: "The {{ messageDetail }} surpassed the rate limit. Retry in one minute."
             503: "The {{ messageDetail }} could not be handled at this time. Please try again or visit https://help.hubspot.com/ to submit a ticket or contact HubSpot Support if the issue persists."
-            500generic: "The {{ messageDetail }} failed due to a server error. Please try again or visit https://help.hubspot.com/ to submit a ticket or contact HubSpot Support if the issue persists."
-            400generic: "The {{ messageDetail }} failed due to a client error."
+            500Generic: "The {{ messageDetail }} failed due to a server error. Please try again or visit https://help.hubspot.com/ to submit a ticket or contact HubSpot Support if the issue persists."
+            400Generic: "The {{ messageDetail }} failed due to a client error."
             generic: "The {{ messageDetail }} failed."
           verifyAccessKeyAndUserAccess:
             fetchScopeDataError: "Error verifying access of scopeGroup {{ scopeGroup }}: {{ error }}"

package/lib/__tests__/validation.js

@@ -2,7 +2,7 @@ const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { getOauthManager } = require('@hubspot/cli-lib/oauth');
 const {
   accessTokenForPersonalAccessKey,
-} = require('@hubspot/cli-lib/personalAccessKey');
+} = require('@hubspot/local-dev-lib/personalAccessKey');
 
 const { getAccountId } = require('../commonOpts');
 const { validateAccount } = require('../validation');
@@ -11,7 +11,7 @@ jest.mock('@hubspot/cli-lib');
 jest.mock('@hubspot/local-dev-lib/config');
 jest.mock('@hubspot/cli-lib/logger');
 jest.mock('@hubspot/cli-lib/oauth');
-jest.mock('@hubspot/cli-lib/personalAccessKey');
+jest.mock('@hubspot/local-dev-lib/personalAccessKey');
 jest.mock('../commonOpts');
 
 describe('validation', () => {

package/lib/logCallbacks.js

@@ -4,7 +4,13 @@ const { i18n } = require('./lang');
 function buildLogCallbacks(logData) {
   const callbacksObject = {};
   for (let key in logData) {
-    callbacksObject[key] = () => logger.log(i18n(logData[key]));
+    if (typeof logData[key] === 'string') {
+      callbacksObject[key] = interpolationData =>
+        logger.log(i18n(logData[key], interpolationData));
+    } else {
+      callbacksObject[key] = interpolationData =>
+        logData[key].logger(i18n(logData[key].key, interpolationData));
+    }
   }
   return callbacksObject;
 }

package/lib/sandboxes.js

@@ -3,8 +3,9 @@ const { i18n } = require('./lang');
 const { handleExit, handleKeypress } = require('./process');
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
-  updateConfigWithPersonalAccessKey,
-} = require('@hubspot/cli-lib/personalAccessKey');
+  getAccessToken,
+  updateConfigWithAccessToken,
+} = require('@hubspot/local-dev-lib/personalAccessKey');
 const { EXIT_CODES } = require('./enums/exitCodes');
 const { enterAccountNamePrompt } = require('./prompts/enterAccountNamePrompt');
 const {
@@ -25,6 +26,7 @@ const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const {
   personalAccessKeyPrompt,
 } = require('./prompts/personalAccessKeyPrompt');
+const { logErrorInstance } = require('./errorHandlers/standardErrors');
 
 const STANDARD_SANDBOX = 'standard';
 const DEVELOPER_SANDBOX = 'developer';
@@ -234,14 +236,28 @@ const validateSandboxUsageLimits = async (accountConfig, sandboxType, env) => {
  * @returns {String} validName saved into config
  */
 const saveSandboxToConfig = async (env, result, force = false) => {
-  let configData = { env, personalAccessKey: result.personalAccessKey };
-  if (!result.personalAccessKey) {
-    configData = await personalAccessKeyPrompt({
+  let personalAccessKey = result.personalAccessKey;
+  if (personalAccessKey) {
+    const configData = await personalAccessKeyPrompt({
       env,
       account: result.sandbox.sandboxHubId,
     });
+    personalAccessKey = configData.personalAccessKey;
   }
-  const updatedConfig = await updateConfigWithPersonalAccessKey(configData);
+
+  let updatedConfig;
+
+  try {
+    const token = await getAccessToken(personalAccessKey, env);
+    updatedConfig = await updateConfigWithAccessToken(
+      token,
+      personalAccessKey,
+      env
+    );
+  } catch (e) {
+    logErrorInstance(e);
+  }
+
   if (!updatedConfig) {
     throw new Error('Failed to update config with personal access key.');
   }
@@ -316,6 +332,7 @@ function pollSyncTaskStatus(
   const mergeTasks = {
     'lead-flows': 'forms', // lead-flows are a subset of forms. We combine these in the UI as a single item, so we want to merge here for consistency.
   };
+  const ignoreTasks = ['gates'];
   let progressCounter = {};
   let pollInterval;
   // Handle manual exit for return key and ctrl+c
@@ -352,7 +369,11 @@ function pollSyncTaskStatus(
         for (const task of taskResult.tasks) {
           // For each sync task, show a progress bar and increment bar each time we run this interval until status is 'COMPLETE'
           const taskType = task.type;
-          if (!progressBar.get(taskType) && !mergeTasks[taskType]) {
+          if (
+            !progressBar.get(taskType) &&
+            !mergeTasks[taskType] &&
+            !ignoreTasks.includes(taskType)
+          ) {
             // skip creation of lead-flows bar because we're combining lead-flows into the forms bar, otherwise create a bar instance for the type
             progressCounter[taskType] = 0;
             progressBar.create(taskType, 100, 0, {

package/lib/validation.js

@@ -17,13 +17,14 @@ const { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
 const { getOauthManager } = require('@hubspot/cli-lib/oauth');
 const {
   accessTokenForPersonalAccessKey,
-} = require('@hubspot/cli-lib/personalAccessKey');
+} = require('@hubspot/local-dev-lib/personalAccessKey');
 const { getCwd, getExt } = require('@hubspot/local-dev-lib/path');
 const { getAccountId, getMode, setLogLevel } = require('./commonOpts');
 const { logDebugInfo } = require('./debugInfo');
 const fs = require('fs');
 const path = require('path');
 const { EXIT_CODES } = require('./enums/exitCodes');
+const { logErrorInstance } = require('./errorHandlers/standardErrors');
 
 async function loadAndValidateOptions(options, shouldValidateAccount = true) {
   setLogLevel(options);
@@ -151,7 +152,7 @@ async function validateAccount(options) {
         return false;
       }
     } catch (e) {
-      logger.error(e.message);
+      logErrorInstance(e);
       return false;
     }
   } else if (!apiKey) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.1.1",
+  "version": "5.1.2",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,10 +8,10 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "^8.0.0",
-    "@hubspot/local-dev-lib": "^0.1.0",
-    "@hubspot/serverless-dev-runtime": "5.1.1",
-    "@hubspot/ui-extensions-dev-server": "0.8.4",
+    "@hubspot/cli-lib": "^8.0.2",
+    "@hubspot/local-dev-lib": "^0.2.1",
+    "@hubspot/serverless-dev-runtime": "5.1.2",
+    "@hubspot/ui-extensions-dev-server": "0.8.6",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.0.1",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "dffb3b8e056a73a46ee38bfa5ae4e02d1df003e3"
+  "gitHead": "16ae446c55bb019fe01eb15944d80577a654aa02"
 }