@hubspot/cli 4.0.1-beta.1 → 4.0.1-beta.2

package/commands/accounts/info.js

@@ -0,0 +1,53 @@
+const { logger } = require('@hubspot/cli-lib/logger');
+const { getAccountConfig } = require('@hubspot/cli-lib/lib/config');
+const { getAccessToken } = require('@hubspot/cli-lib/personalAccessKey.js');
+const {
+  getAccountId,
+  addAccountOptions,
+  addConfigOptions,
+} = require('../../lib/commonOpts');
+const { loadAndValidateOptions } = require('../../lib/validation');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.commands.accounts.subcommands.info';
+exports.describe = i18n(`${i18nKey}.describe`);
+
+exports.command = 'info [--account]';
+
+exports.handler = async options => {
+  await loadAndValidateOptions(options);
+
+  let accountId = getAccountId(options);
+  const config = getAccountConfig(accountId);
+
+  // check if the provided account is using a personal access key, if not, show an error
+  if (config.authType === 'personalaccesskey') {
+    const { name, personalAccessKey, env } = config;
+
+    const response = await getAccessToken(personalAccessKey, env, accountId);
+
+    let scopeGroups = response.scopeGroups.join('\n');
+
+    logger.log(i18n(`${i18nKey}.name`, { name }));
+    logger.log(i18n(`${i18nKey}.accountId`, { accountId }));
+    logger.log(i18n(`${i18nKey}.scopeGroups`, { scopeGroups }));
+  } else {
+    logger.log(i18n(`${i18nKey}.errors.notUsingPersonalAccessKey`));
+  }
+};
+
+exports.builder = yargs => {
+  addConfigOptions(yargs, true);
+  addAccountOptions(yargs, true);
+
+  yargs.example([
+    ['$0 accounts info', i18n(`${i18nKey}.examples.default`)],
+    [
+      '$0 accounts info --account=MyAccount',
+      i18n(`${i18nKey}.examples.nameBased`),
+    ],
+    ['$0 accounts info --account=1234567', i18n(`${i18nKey}.examples.idBased`)],
+  ]);
+
+  return yargs;
+};

package/commands/accounts/list.js

@@ -19,6 +19,54 @@ const i18nKey = 'cli.commands.accounts.subcommands.list';
 exports.command = 'list';
 exports.describe = i18n(`${i18nKey}.describe`);
 
+const sortAndMapPortals = portals => {
+  const mappedPortalData = {};
+  portals
+    .sort((a, b) => {
+      if (a.sandboxAccountType === null && b.sandboxAccountType !== null) {
+        return -1;
+      }
+      if (a.sandboxAccountType !== null && b.sandboxAccountType === null) {
+        return 1;
+      }
+      return 0;
+    })
+    .forEach(portal => {
+      if (
+        portal.sandboxAccountType !== undefined &&
+        portal.sandboxAccountType === null
+      ) {
+        mappedPortalData[portal.portalId] = [portal];
+      } else if (portal.sandboxAccountType && portal.parentAccountId) {
+        mappedPortalData[portal.parentAccountId] = [
+          ...(mappedPortalData[portal.parentAccountId] || []),
+          portal,
+        ];
+      } else {
+        mappedPortalData[portal.portalId] = [portal];
+      }
+    });
+  return mappedPortalData;
+};
+
+const getPortalData = mappedPortalData => {
+  const portalData = [];
+  Object.values(mappedPortalData).forEach(set => {
+    set.forEach((portal, i) => {
+      if (i === 0) {
+        portalData.push([portal.name, portal.portalId, portal.authType]);
+      } else {
+        portalData.push([
+          `↳ ${portal.name} [sandbox]`,
+          portal.portalId,
+          portal.authType,
+        ]);
+      }
+    });
+  });
+  return portalData;
+};
+
 exports.handler = async options => {
   await loadAndValidateOptions(options);
 
@@ -28,9 +76,8 @@ exports.handler = async options => {
 
   const config = getConfig();
   const configPath = getConfigPath();
-  const portalData = config.portals.map(portal => {
-    return [portal.name, portal.portalId, portal.authType];
-  });
+  const mappedPortalData = sortAndMapPortals(config.portals);
+  const portalData = getPortalData(mappedPortalData);
   portalData.unshift(
     getTableHeader([
       i18n(`${i18nKey}.labels.name`),

package/commands/accounts.js

@@ -3,6 +3,7 @@ const { i18n } = require('@hubspot/cli-lib/lib/lang');
 const list = require('./accounts/list');
 const rename = require('./accounts/rename');
 const use = require('./accounts/use');
+const info = require('./accounts/info');
 
 const i18nKey = 'cli.commands.accounts';
 
@@ -20,6 +21,7 @@ exports.builder = yargs => {
     })
     .command(rename)
     .command(use)
+    .command(info)
     .demandCommand(1, '');
 
   return yargs;

package/commands/sandbox/create.js

@@ -157,6 +157,8 @@ exports.handler = async options => {
           url,
         })
       );
+    } else {
+      logger.error(err.error.message);
     }
     process.exit(EXIT_CODES.ERROR);
   }

package/commands/sandbox/delete.js

@@ -0,0 +1,41 @@
+const {
+  addAccountOptions,
+  addConfigOptions,
+  addUseEnvironmentOptions,
+} = require('../../lib/commonOpts');
+const { logger } = require('@hubspot/cli-lib/logger');
+
+const { loadAndValidateOptions } = require('../../lib/validation');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.commands.sandbox.subcommands.delete';
+
+exports.command = 'delete';
+exports.describe = i18n(`${i18nKey}.describe`);
+
+exports.handler = async options => {
+  await loadAndValidateOptions(options);
+
+  logger.log('');
+  logger.log(i18n(`${i18nKey}.temporaryMessage`));
+};
+
+exports.builder = yargs => {
+  yargs.option('account', {
+    describe: i18n(`${i18nKey}.options.account.describe`),
+    type: 'string',
+  });
+
+  yargs.example([
+    [
+      '$0 sandbox delete --account=MySandboxAccount',
+      i18n(`${i18nKey}.examples.default`),
+    ],
+  ]);
+
+  addConfigOptions(yargs, true);
+  addAccountOptions(yargs, true);
+  addUseEnvironmentOptions(yargs, true);
+
+  return yargs;
+};

package/commands/sandbox.js

@@ -1,5 +1,6 @@
 const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
 const create = require('./sandbox/create');
+const del = require('./sandbox/delete');
 
 // const i18nKey = 'cli.commands.sandbox';
 
@@ -10,7 +11,10 @@ exports.builder = yargs => {
   addConfigOptions(yargs, true);
   addAccountOptions(yargs, true);
 
-  yargs.command(create).demandCommand(1, '');
+  yargs
+    .command(create)
+    .command(del)
+    .demandCommand(1, '');
 
   return yargs;
 };

package/lib/projects.js

@@ -449,6 +449,14 @@ const makePollTaskStatusFunc = ({
                   } with the following error ---`
                 );
                 logger.error(subTask.errorMessage);
+
+                // Log nested errors
+                if (subTask.standardError && subTask.standardError.errors) {
+                  logger.log();
+                  subTask.standardError.errors.forEach(error => {
+                    logger.log(error.message);
+                  });
+                }
               });
             }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "4.0.1-beta.1",
+  "version": "4.0.1-beta.2",
   "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.1-beta.1",
-    "@hubspot/serverless-dev-runtime": "4.0.1-beta.1",
+    "@hubspot/cli-lib": "4.0.1-beta.2",
+    "@hubspot/serverless-dev-runtime": "4.0.1-beta.2",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "eb69a779b705cb7cd43f2c2930fb09f2121283b1"
+  "gitHead": "c8b5dbfe4753fc1b71c038801d5f641313712e71"
 }