@hubspot/cli 7.0.1 → 7.0.2-beta.0

package/lib/sandboxes.js

@@ -1,43 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { i18n } = require('./lang');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { getSandboxUsageLimits, } = require('@hubspot/local-dev-lib/api/sandboxHubs');
-const { fetchTypes } = require('@hubspot/local-dev-lib/api/sandboxSync');
-const { getAccountId, getEnv, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
-const { promptUser } = require('./prompts/promptUtils');
-const { isDevelopmentSandbox } = require('./accountTypes');
-const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
-const { HUBSPOT_ACCOUNT_TYPES, } = require('@hubspot/local-dev-lib/constants/config');
-const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
-const { uiAccountDescription } = require('./ui');
-const { isMissingScopeError, isSpecifiedError, } = require('@hubspot/local-dev-lib/errors/index');
-const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
-const { logError } = require('./errorHandlers/index');
-const syncTypes = {
+exports.SANDBOX_API_TYPE_MAP = exports.SANDBOX_TYPE_MAP = exports.SYNC_TYPES = void 0;
+exports.getSandboxTypeAsString = getSandboxTypeAsString;
+exports.getAvailableSyncTypes = getAvailableSyncTypes;
+exports.validateSandboxUsageLimits = validateSandboxUsageLimits;
+exports.handleSandboxCreateError = handleSandboxCreateError;
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const sandboxHubs_1 = require("@hubspot/local-dev-lib/api/sandboxHubs");
+const sandboxSync_1 = require("@hubspot/local-dev-lib/api/sandboxSync");
+const config_1 = require("@hubspot/local-dev-lib/config");
+const urls_1 = require("@hubspot/local-dev-lib/urls");
+const config_2 = require("@hubspot/local-dev-lib/constants/config");
+const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
+const index_1 = require("@hubspot/local-dev-lib/errors/index");
+const lang_1 = require("./lang");
+const ui_1 = require("./ui");
+const index_2 = require("./errorHandlers/index");
+const i18nKey = 'lib.sandbox';
+exports.SYNC_TYPES = {
     OBJECT_RECORDS: 'object-records',
 };
-const sandboxTypeMap = {
-    dev: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
-    developer: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
-    development: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
-    standard: HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX,
+exports.SANDBOX_TYPE_MAP = {
+    dev: config_2.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
+    developer: config_2.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
+    development: config_2.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
+    standard: config_2.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX,
 };
-const sandboxApiTypeMap = {
-    [HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX]: 1,
-    [HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX]: 2,
+exports.SANDBOX_API_TYPE_MAP = {
+    [config_2.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX]: 1,
+    [config_2.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX]: 2,
 };
-const getSandboxTypeAsString = accountType => {
-    if (accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
+function getSandboxTypeAsString(accountType) {
+    if (accountType === config_2.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
         return 'development'; // Only place we're using this specific name
     }
     return 'standard';
-};
+}
 function getHasSandboxesByType(parentAccountConfig, type) {
-    const id = getAccountIdentifier(parentAccountConfig);
-    const parentPortalId = getAccountId(id);
-    const accountsList = getConfigAccounts();
+    const id = (0, getAccountIdentifier_1.getAccountIdentifier)(parentAccountConfig);
+    const parentPortalId = (0, config_1.getAccountId)(id);
+    const accountsList = (0, config_1.getConfigAccounts)() || [];
     for (const portal of accountsList) {
         if ((portal.parentAccountId !== null ||
             portal.parentAccountId !== undefined) &&
@@ -49,79 +51,45 @@ function getHasSandboxesByType(parentAccountConfig, type) {
     }
     return false;
 }
-function getSandboxLimit(error) {
-    // Error context should contain a limit property with a list of one number. That number is the current limit
-    const limit = error.context && error.context.limit && error.context.limit[0];
-    return limit ? parseInt(limit, 10) : 1; // Default to 1
-}
 // Fetches available sync types for a given sandbox portal
 async function getAvailableSyncTypes(parentAccountConfig, config) {
-    const parentId = getAccountIdentifier(parentAccountConfig);
-    const parentPortalId = getAccountId(parentId);
-    const id = getAccountIdentifier(config);
-    const portalId = getAccountId(id);
-    const { data: { results: syncTypes }, } = await fetchTypes(parentPortalId, portalId);
+    const parentId = (0, getAccountIdentifier_1.getAccountIdentifier)(parentAccountConfig);
+    const parentPortalId = (0, config_1.getAccountId)(parentId);
+    const id = (0, getAccountIdentifier_1.getAccountIdentifier)(config);
+    const portalId = (0, config_1.getAccountId)(id);
+    if (!parentPortalId || !portalId) {
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.sync.failure.syncTypeFetch`));
+    }
+    const { data: { results: syncTypes }, } = await (0, sandboxSync_1.fetchTypes)(parentPortalId, portalId);
     if (!syncTypes) {
-        throw new Error('Unable to fetch available sandbox sync types. Please try again.');
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.sync.failure.syncTypeFetch`));
     }
     return syncTypes.map(t => ({ type: t.name }));
 }
-/**
- * @param {Object} accountConfig - Account config of sandbox portal
- * @param {Array} availableSyncTasks - Array of available sync tasks
- * @param {Boolean} skipPrompt - Option to skip contact records prompt and return all available sync tasks
- * @returns {Array} Adjusted available sync task items
- */
-const getSyncTypesWithContactRecordsPrompt = async (accountConfig, syncTasks, skipPrompt = false) => {
-    // TODO: remove this entire helper once hs sandbox sync is fully deprecated
-    const isDevSandbox = isDevelopmentSandbox(accountConfig);
-    if (isDevSandbox) {
-        // Disable dev sandbox from syncing contacts
-        return syncTasks.filter(t => t.type !== syncTypes.OBJECT_RECORDS);
+async function validateSandboxUsageLimits(accountConfig, sandboxType, env) {
+    const id = (0, getAccountIdentifier_1.getAccountIdentifier)(accountConfig);
+    const accountId = (0, config_1.getAccountId)(id);
+    if (!accountId) {
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.create.failure.usageLimitFetch`));
     }
-    if (syncTasks &&
-        syncTasks.some(t => t.type === syncTypes.OBJECT_RECORDS) &&
-        !skipPrompt) {
-        const { contactRecordsSyncPrompt } = await promptUser([
-            {
-                name: 'contactRecordsSyncPrompt',
-                type: 'confirm',
-                message: i18n('lib.sandbox.sync.confirm.syncContactRecords.standard'),
-            },
-        ]);
-        if (!contactRecordsSyncPrompt) {
-            return syncTasks.filter(t => t.type !== syncTypes.OBJECT_RECORDS);
-        }
-    }
-    return syncTasks;
-};
-/**
- * @param {Object} accountConfig - Account config of sandbox portal
- * @param {String} sandboxType - Sandbox type for limit validation
- * @param {String} env - Environment
- * @returns {null}
- */
-const validateSandboxUsageLimits = async (accountConfig, sandboxType, env) => {
-    const id = getAccountIdentifier(accountConfig);
-    const accountId = getAccountId(id);
-    const { data: { usage }, } = await getSandboxUsageLimits(accountId);
+    const { data: { usage }, } = await (0, sandboxHubs_1.getSandboxUsageLimits)(accountId);
     if (!usage) {
-        throw new Error('Unable to fetch sandbox usage limits. Please try again.');
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.create.failure.usageLimitFetch`));
     }
-    if (sandboxType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
+    if (sandboxType === config_2.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
         if (usage['DEVELOPER'].available === 0) {
             const devSandboxLimit = usage['DEVELOPER'].limit;
             const plural = devSandboxLimit !== 1;
-            const hasDevelopmentSandboxes = getHasSandboxesByType(accountConfig, HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX);
+            const hasDevelopmentSandboxes = getHasSandboxesByType(accountConfig, config_2.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX);
             if (hasDevelopmentSandboxes) {
-                throw new Error(i18n(`lib.sandbox.create.failure.alreadyInConfig.developer.${plural ? 'other' : 'one'}`, {
+                throw new Error((0, lang_1.i18n)(`${i18nKey}.create.failure.alreadyInConfig.developer.${plural ? 'other' : 'one'}`, {
                     accountName: accountConfig.name || accountId,
                     limit: devSandboxLimit,
                 }));
             }
             else {
-                const baseUrl = getHubSpotWebsiteOrigin(env);
-                throw new Error(i18n(`lib.sandbox.create.failure.limit.developer.${plural ? 'other' : 'one'}`, {
+                const baseUrl = (0, urls_1.getHubSpotWebsiteOrigin)(env);
+                throw new Error((0, lang_1.i18n)(`${i18nKey}.create.failure.limit.developer.${plural ? 'other' : 'one'}`, {
                     accountName: accountConfig.name || accountId,
                     limit: devSandboxLimit,
                     link: `${baseUrl}/sandboxes-developer/${accountId}/development`,
@@ -129,20 +97,20 @@ const validateSandboxUsageLimits = async (accountConfig, sandboxType, env) => {
             }
         }
     }
-    if (sandboxType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX) {
+    if (sandboxType === config_2.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX) {
         if (usage['STANDARD'].available === 0) {
             const standardSandboxLimit = usage['STANDARD'].limit;
             const plural = standardSandboxLimit !== 1;
-            const hasStandardSandboxes = getHasSandboxesByType(accountConfig, HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX);
+            const hasStandardSandboxes = getHasSandboxesByType(accountConfig, config_2.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX);
             if (hasStandardSandboxes) {
-                throw new Error(i18n(`lib.sandbox.create.failure.alreadyInConfig.standard.${plural ? 'other' : 'one'}`, {
+                throw new Error((0, lang_1.i18n)(`${i18nKey}.create.failure.alreadyInConfig.standard.${plural ? 'other' : 'one'}`, {
                     accountName: accountConfig.name || accountId,
                     limit: standardSandboxLimit,
                 }));
             }
             else {
-                const baseUrl = getHubSpotWebsiteOrigin(env);
-                throw new Error(i18n(`lib.sandbox.create.failure.limit.standard.${plural ? 'other' : 'one'}`, {
+                const baseUrl = (0, urls_1.getHubSpotWebsiteOrigin)(env);
+                throw new Error((0, lang_1.i18n)(`${i18nKey}.create.failure.limit.standard.${plural ? 'other' : 'one'}`, {
                     accountName: accountConfig.name || accountId,
                     limit: standardSandboxLimit,
                     link: `${baseUrl}/sandboxes-developer/${accountId}/standard`,
@@ -150,112 +118,46 @@ const validateSandboxUsageLimits = async (accountConfig, sandboxType, env) => {
             }
         }
     }
-};
-function handleSandboxCreateError({ err, env, accountId, name, accountConfig, }) {
-    if (isMissingScopeError(err)) {
-        logger.error(i18n('lib.sandboxes.create.failure.scopes.message', {
-            accountName: uiAccountDescription(accountId),
+}
+function handleSandboxCreateError(err, env, name, accountId) {
+    if ((0, index_1.isMissingScopeError)(err)) {
+        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.create.failure.scopes.message`, {
+            accountName: (0, ui_1.uiAccountDescription)(accountId),
         }));
-        const websiteOrigin = getHubSpotWebsiteOrigin(env);
+        const websiteOrigin = (0, urls_1.getHubSpotWebsiteOrigin)(env);
         const url = `${websiteOrigin}/personal-access-key/${accountId}`;
-        logger.info(i18n('lib.sandboxes.create.failure.scopes.instructions', {
-            accountName: uiAccountDescription(accountId),
+        logger_1.logger.info((0, lang_1.i18n)(`${i18nKey}.create.failure.scopes.instructions`, {
+            accountName: (0, ui_1.uiAccountDescription)(accountId),
             url,
         }));
     }
-    else if (isSpecifiedError(err, {
+    else if ((0, index_1.isSpecifiedError)(err, {
         statusCode: 403,
         category: 'BANNED',
         subCategory: 'SandboxErrors.USER_ACCESS_NOT_ALLOWED',
     })) {
-        logger.log('');
-        logger.error(i18n('lib.sandboxes.create.failure.invalidUser', {
+        logger_1.logger.log('');
+        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.create.failure.invalidUser`, {
             accountName: name,
-            parentAccountName: uiAccountDescription(accountId),
+            parentAccountName: (0, ui_1.uiAccountDescription)(accountId),
         }));
-        logger.log('');
+        logger_1.logger.log('');
     }
-    else if (isSpecifiedError(err, {
+    else if ((0, index_1.isSpecifiedError)(err, {
         statusCode: 403,
         category: 'BANNED',
         subCategory: 'SandboxErrors.DEVELOPMENT_SANDBOX_ACCESS_NOT_ALLOWED',
     })) {
-        logger.log('');
-        logger.error(i18n('lib.sandboxes.create.failure.403Gating', {
+        logger_1.logger.log('');
+        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.create.failure.403Gating`, {
             accountName: name,
-            parentAccountName: uiAccountDescription(accountId),
+            parentAccountName: (0, ui_1.uiAccountDescription)(accountId),
             accountId,
         }));
-        logger.log('');
-    }
-    else if (isSpecifiedError(err, {
-        statusCode: 400,
-        category: 'VALIDATION_ERROR',
-        subCategory: 'SandboxErrors.NUM_DEVELOPMENT_SANDBOXES_LIMIT_EXCEEDED_ERROR',
-    }) &&
-        err.error &&
-        err.error.message) {
-        logger.log('');
-        const devSandboxLimit = getSandboxLimit(err.error);
-        const plural = devSandboxLimit !== 1;
-        const hasDevelopmentSandboxes = getHasSandboxesByType(accountConfig, HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX);
-        if (hasDevelopmentSandboxes) {
-            logger.error(i18n(`lib.sandboxes.create.failure.alreadyInConfig.developer.${plural ? 'other' : 'one'}`, {
-                accountName: uiAccountDescription(accountId),
-                limit: devSandboxLimit,
-            }));
-        }
-        else {
-            const baseUrl = getHubSpotWebsiteOrigin(getValidEnv(getEnv(accountId)));
-            logger.error(i18n(`lib.sandboxes.create.failure.limit.developer.${plural ? 'other' : 'one'}`, {
-                accountName: uiAccountDescription(accountId),
-                limit: devSandboxLimit,
-                link: `${baseUrl}/sandboxes-developer/${accountId}/development`,
-            }));
-        }
-        logger.log('');
-    }
-    else if (isSpecifiedError(err, {
-        statusCode: 400,
-        category: 'VALIDATION_ERROR',
-        subCategory: 'SandboxErrors.NUM_STANDARD_SANDBOXES_LIMIT_EXCEEDED_ERROR',
-    }) &&
-        err.error &&
-        err.error.message) {
-        logger.log('');
-        const standardSandboxLimit = getSandboxLimit(err.error);
-        const plural = standardSandboxLimit !== 1;
-        const hasStandardSandboxes = getHasSandboxesByType(accountConfig, HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX);
-        if (hasStandardSandboxes) {
-            logger.error(i18n(`lib.sandboxes.create.failure.alreadyInConfig.standard.${plural ? 'other' : 'one'}`, {
-                accountName: uiAccountDescription(accountId),
-                limit: standardSandboxLimit,
-            }));
-        }
-        else {
-            const baseUrl = getHubSpotWebsiteOrigin(getValidEnv(getEnv(accountId)));
-            logger.error(i18n(`lib.sandboxes.create.failure.limit.standard.${plural ? 'other' : 'one'}`, {
-                accountName: uiAccountDescription(accountId),
-                limit: standardSandboxLimit,
-                link: `${baseUrl}/sandboxes-developer/${accountId}/standard`,
-            }));
-        }
-        logger.log('');
+        logger_1.logger.log('');
     }
     else {
-        logError(err);
+        (0, index_2.logError)(err);
     }
     throw err;
 }
-module.exports = {
-    sandboxTypeMap,
-    sandboxApiTypeMap,
-    syncTypes,
-    getSandboxTypeAsString,
-    getHasSandboxesByType,
-    getSandboxLimit,
-    validateSandboxUsageLimits,
-    getAvailableSyncTypes,
-    getSyncTypesWithContactRecordsPrompt,
-    handleSandboxCreateError,
-};

package/lib/serverlessLogs.d.ts

@@ -1 +1,4 @@
-export {};
+import { HubSpotPromise } from '@hubspot/local-dev-lib/types/Http';
+import { FunctionLog, GetFunctionLogsResponse } from '@hubspot/local-dev-lib/types/Functions';
+export declare function tailLogs(accountId: number, name: string, fetchLatest: () => HubSpotPromise<FunctionLog>, tailCall: (after?: string) => HubSpotPromise<GetFunctionLogsResponse>, compact?: boolean): Promise<void>;
+export declare function outputBuildLog(buildLogUrl: string): Promise<string>;

package/lib/serverlessLogs.js

@@ -1,89 +1,97 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const https = require('https');
-const SpinniesManager = require('./ui/SpinniesManager');
-const { handleExit, handleKeypress } = require('./process');
-const chalk = require('chalk');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { outputLogs } = require('./ui/serverlessFunctionLogs');
-const { logError, ApiErrorContext } = require('./errorHandlers/index');
-const { EXIT_CODES } = require('./enums/exitCodes');
-const { isHubSpotHttpError, isMissingScopeError, } = require('@hubspot/local-dev-lib/errors/index');
-const { SCOPE_GROUPS, PERSONAL_ACCESS_KEY_AUTH_METHOD, } = require('@hubspot/local-dev-lib/constants/auth');
-const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
-const { fetchScopeData } = require('@hubspot/local-dev-lib/api/localDevAuth');
-const { i18n } = require('./lang');
+exports.tailLogs = tailLogs;
+exports.outputBuildLog = outputBuildLog;
+const https_1 = __importDefault(require("https"));
+const chalk_1 = __importDefault(require("chalk"));
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const index_1 = require("@hubspot/local-dev-lib/errors/index");
+const auth_1 = require("@hubspot/local-dev-lib/constants/auth");
+const config_1 = require("@hubspot/local-dev-lib/config");
+const localDevAuth_1 = require("@hubspot/local-dev-lib/api/localDevAuth");
+const serverlessFunctionLogs_1 = require("./ui/serverlessFunctionLogs");
+const index_2 = require("./errorHandlers/index");
+const SpinniesManager_1 = __importDefault(require("./ui/SpinniesManager"));
+const process_1 = require("./process");
+const exitCodes_1 = require("./enums/exitCodes");
+const lang_1 = require("./lang");
 const TAIL_DELAY = 5000;
-const base64EncodeString = valueToEncode => {
+function base64EncodeString(valueToEncode) {
     if (typeof valueToEncode !== 'string') {
         return valueToEncode;
     }
     const stringBuffer = Buffer.from(valueToEncode);
     return encodeURIComponent(stringBuffer.toString('base64'));
-};
-const handleUserInput = () => {
+}
+function handleUserInput() {
     const onTerminate = async () => {
-        SpinniesManager.remove('tailLogs');
-        SpinniesManager.remove('stopMessage');
-        process.exit(EXIT_CODES.SUCCESS);
+        SpinniesManager_1.default.remove('tailLogs');
+        SpinniesManager_1.default.remove('stopMessage');
+        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     };
-    handleExit(onTerminate);
-    handleKeypress(key => {
+    (0, process_1.handleExit)(onTerminate);
+    (0, process_1.handleKeypress)(key => {
         if ((key.ctrl && key.name == 'c') || key.name === 'q') {
             onTerminate();
         }
     });
-};
+}
 async function verifyAccessKeyAndUserAccess(accountId, scopeGroup) {
-    const accountConfig = getAccountConfig(accountId);
+    const accountConfig = (0, config_1.getAccountConfig)(accountId);
+    if (!accountConfig) {
+        return;
+    }
     // TODO[JOE]: Update this i18n key
     const i18nKey = 'lib.serverless';
     const { authType } = accountConfig;
-    if (authType !== PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
+    if (authType !== auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
         return;
     }
     let scopesData;
     try {
-        scopesData = await fetchScopeData(accountId, scopeGroup);
+        const resp = await (0, localDevAuth_1.fetchScopeData)(accountId, scopeGroup);
+        scopesData = resp.data;
     }
     catch (e) {
-        logger.debug(i18n(`${i18nKey}.verifyAccessKeyAndUserAccess.fetchScopeDataError`, {
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.verifyAccessKeyAndUserAccess.fetchScopeDataError`, {
             scopeGroup,
-            error: e,
         }));
+        logger_1.logger.debug(e);
         return;
     }
     const { portalScopesInGroup, userScopesInGroup } = scopesData;
     if (!portalScopesInGroup.length) {
-        logger.error(i18n(`${i18nKey}.verifyAccessKeyAndUserAccess.portalMissingScope`));
+        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.verifyAccessKeyAndUserAccess.portalMissingScope`));
         return;
     }
     if (!portalScopesInGroup.every(s => userScopesInGroup.includes(s))) {
-        logger.error(i18n(`${i18nKey}.verifyAccessKeyAndUserAccess.userMissingScope`));
+        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.verifyAccessKeyAndUserAccess.userMissingScope`));
     }
     else {
-        logger.error(i18n(`${i18nKey}.verifyAccessKeyAndUserAccess.genericMissingScope`));
+        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.verifyAccessKeyAndUserAccess.genericMissingScope`));
     }
 }
-const tailLogs = async ({ accountId, compact, fetchLatest, tailCall, name, }) => {
-    let initialAfter;
+async function tailLogs(accountId, name, fetchLatest, tailCall, compact = false) {
+    let initialAfter = '';
     try {
         const { data: latestLog } = await fetchLatest();
         initialAfter = latestLog && base64EncodeString(latestLog.id);
     }
     catch (e) {
         // A 404 means no latest log exists(never executed)
-        if (isHubSpotHttpError(e) && e.status !== 404) {
-            if (isMissingScopeError(e)) {
-                await verifyAccessKeyAndUserAccess(accountId, SCOPE_GROUPS.CMS_FUNCTIONS);
+        if ((0, index_1.isHubSpotHttpError)(e) && e.status !== 404) {
+            if ((0, index_1.isMissingScopeError)(e)) {
+                await verifyAccessKeyAndUserAccess(accountId, auth_1.SCOPE_GROUPS.CMS_FUNCTIONS);
             }
             else {
-                await logError(e, new ApiErrorContext({ accountId }));
+                await (0, index_2.logError)(e, new index_2.ApiErrorContext({ accountId }));
             }
         }
     }
-    const tail = async (after) => {
+    async function tail(after) {
         let latestLog;
         let nextAfter;
         try {
@@ -92,41 +100,41 @@ const tailLogs = async ({ accountId, compact, fetchLatest, tailCall, name, }) =>
             nextAfter = latestLog.paging.next.after;
         }
         catch (e) {
-            if (isHubSpotHttpError(e) && e.status !== 404) {
-                logError(e, new ApiErrorContext({
+            if ((0, index_1.isHubSpotHttpError)(e) && e.status !== 404) {
+                (0, index_2.logError)(e, new index_2.ApiErrorContext({
                     accountId,
                 }));
             }
-            process.exit(EXIT_CODES.SUCCESS);
+            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
         }
         if (latestLog && latestLog.results.length) {
-            outputLogs(latestLog, {
+            (0, serverlessFunctionLogs_1.outputLogs)(latestLog, {
                 compact,
             });
         }
         setTimeout(async () => {
             await tail(nextAfter);
         }, TAIL_DELAY);
-    };
-    SpinniesManager.init();
-    SpinniesManager.add('tailLogs', {
+    }
+    SpinniesManager_1.default.init();
+    SpinniesManager_1.default.add('tailLogs', {
         text: `Following logs for ${name}`,
     });
-    SpinniesManager.add('stopMessage', {
-        text: `> Press ${chalk.bold('q')} to stop following`,
+    SpinniesManager_1.default.add('stopMessage', {
+        text: `> Press ${chalk_1.default.bold('q')} to stop following`,
         status: 'non-spinnable',
     });
     handleUserInput();
     await tail(initialAfter);
-};
-const outputBuildLog = async (buildLogUrl) => {
+}
+async function outputBuildLog(buildLogUrl) {
     if (!buildLogUrl) {
-        logger.debug('Unable to display build output. No build log URL was provided.');
-        return;
+        logger_1.logger.debug('Unable to display build output. No build log URL was provided.');
+        return '';
     }
     return new Promise(resolve => {
         try {
-            https
+            https_1.default
                 .get(buildLogUrl, response => {
                 if (response.statusCode === 404) {
                     resolve('');
@@ -136,21 +144,17 @@ const outputBuildLog = async (buildLogUrl) => {
                     data += chunk;
                 });
                 response.on('end', () => {
-                    logger.log(data);
+                    logger_1.logger.log(data);
                     resolve(data);
                 });
             })
                 .on('error', () => {
-                logger.error('The build log could not be retrieved.');
+                logger_1.logger.error('The build log could not be retrieved.');
             });
         }
         catch (e) {
-            logger.error('The build log could not be retrieved.');
+            logger_1.logger.error('The build log could not be retrieved.');
             resolve('');
         }
     });
-};
-module.exports = {
-    outputBuildLog,
-    tailLogs,
-};
+}

package/lib/ui/serverlessFunctionLogs.d.ts

@@ -1 +1,9 @@
+import { FunctionLog, GetFunctionLogsResponse } from '@hubspot/local-dev-lib/types/Functions';
+type Options = {
+    compact?: boolean;
+    insertions?: {
+        header?: string;
+    };
+};
+export declare function outputLogs(logsResp: GetFunctionLogsResponse | FunctionLog, options: Options): void;
 export {};

package/lib/ui/serverlessFunctionLogs.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.outputLogs = outputLogs;
 const moment_1 = __importDefault(require("moment"));
 const chalk_1 = __importDefault(require("chalk"));
 const logger_1 = require("@hubspot/local-dev-lib/logger");
@@ -90,6 +91,3 @@ function processLogs(logsResp, options) {
 function outputLogs(logsResp, options) {
     logger_1.logger.log(processLogs(logsResp, options));
 }
-module.exports = {
-    outputLogs,
-};

package/lib/validation.d.ts

@@ -3,6 +3,8 @@ import { CmsPublishMode } from '@hubspot/local-dev-lib/types/Files';
 export declare function validateAccount(options: Arguments<{
     account?: string;
     accountId?: string;
+    derivedAccountId?: number;
+    providedAccountId?: string;
 }>): Promise<boolean>;
 export declare function validateCmsPublishMode(options: Arguments<{
     cmsPublishMode?: CmsPublishMode;

package/lib/validation.js

@@ -50,21 +50,18 @@ const path_1 = require("@hubspot/local-dev-lib/path");
 const commonOpts_1 = require("./commonOpts");
 const index_1 = require("./errorHandlers/index");
 async function validateAccount(options) {
-    const accountId = (0, commonOpts_1.getAccountId)(options);
-    const { accountId: accountIdOption, account: accountOption } = options;
+    const { derivedAccountId, providedAccountId } = options;
+    const accountId = (0, config_1.getAccountId)(derivedAccountId);
     if (!accountId) {
-        if (accountOption) {
-            logger_1.logger.error(`The account "${accountOption}" could not be found in the config`);
-        }
-        else if (accountIdOption) {
-            logger_1.logger.error(`The account "${accountIdOption}" could not be found in the config`);
+        if (providedAccountId) {
+            logger_1.logger.error(`The account "${providedAccountId}" could not be found in the config`);
         }
         else {
             logger_1.logger.error('An account needs to be supplied either via "--account" or through setting a "defaultPortal"');
         }
         return false;
     }
-    if (accountOption && (0, config_1.loadConfigFromEnvironment)()) {
+    if (providedAccountId && (0, config_1.loadConfigFromEnvironment)()) {
         throw new Error('Cannot specify an account when environment variables are supplied. Please unset the environment variables or do not use the "--account" flag.');
     }
     const accountConfig = (0, config_1.getAccountConfig)(accountId);