@hubspot/cli 7.7.16-experimental.4 → 7.7.16-experimental.6

package/commands/app/install.d.ts

@@ -2,7 +2,7 @@ import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModul
 type InstallAppArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs & {
     appUid?: string;
     projectName?: string;
-    testAccountId?: number;
+    testAccountId: number;
 };
 declare const installAppCommand: YargsCommandModule<unknown, InstallAppArgs>;
 export default installAppCommand;

package/commands/app/install.js

@@ -8,18 +8,53 @@ const usageTracking_1 = require("../../lib/usageTracking");
 const en_1 = require("../../lang/en");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const yargsUtils_1 = require("../../lib/yargsUtils");
+const constants_1 = require("../../lib/constants");
 const logger_1 = require("../../lib/ui/logger");
 const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
 const errorHandlers_1 = require("../../lib/errorHandlers");
 const polling_1 = require("../../lib/polling");
-const command = 'install';
+const config_1 = require("../../lib/projects/config");
+const upload_1 = require("../../lib/projects/upload");
+const structure_1 = require("../../lib/projects/structure");
+const command = 'install <test-account-id>';
 const describe = undefined; // commands.app.subcommands.install.describe;
 async function handler(args) {
     const { derivedAccountId, appUid, projectName, testAccountId, formatOutputAsJson, } = args;
     (0, usageTracking_1.trackCommandUsage)('app-install', {}, derivedAccountId);
     const jsonOutput = {};
+    let targetProjectName = projectName;
+    let targetAppUid = appUid;
+    const { projectConfig, projectDir } = await (0, config_1.getProjectConfig)();
+    if (!targetProjectName) {
+        (0, config_1.validateProjectConfig)(projectConfig, projectDir);
+        targetProjectName = projectConfig?.name;
+    }
+    if (!targetProjectName) {
+        logger_1.uiLogger.error(en_1.commands.app.subcommands.install.errors.mustSpecifyProjectName);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    let isAppOauth = true;
+    if (!targetAppUid) {
+        const intermediateRepresentation = await (0, upload_1.handleTranslate)(projectDir, projectConfig, derivedAccountId, true, undefined);
+        if (intermediateRepresentation) {
+            Object.values(intermediateRepresentation.intermediateNodesIndexedByUid).forEach(node => {
+                if ((0, structure_1.isAppIRNode)(node)) {
+                    targetAppUid = node.uid;
+                    isAppOauth = node.config.auth.type === constants_1.APP_AUTH_TYPES.OAUTH;
+                }
+            });
+        }
+    }
+    if (!targetAppUid) {
+        logger_1.uiLogger.error(en_1.commands.app.subcommands.install.errors.noAppUidFound);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    if (!isAppOauth) {
+        logger_1.uiLogger.error(en_1.commands.app.subcommands.install.errors.appMustBeOauth);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     try {
-        const { data } = await (0, developerTestAccounts_1.installOauthAppIntoDeveloperTestAccount)(derivedAccountId, testAccountId, projectName, appUid);
+        const { data } = await (0, developerTestAccounts_1.installOauthAppIntoDeveloperTestAccount)(derivedAccountId, testAccountId, targetProjectName, targetAppUid);
         if (data?.authCodes.length > 0) {
             jsonOutput.authCode = data.authCodes[0].authCode;
         }
@@ -36,7 +71,7 @@ async function handler(args) {
     });
     let appInstallSucceeded = false;
     try {
-        await (0, polling_1.poll)(() => (0, developerTestAccounts_1.fetchDeveloperTestAccountOauthAppInstallStatus)(derivedAccountId, projectName, appUid), {
+        await (0, polling_1.poll)(() => (0, developerTestAccounts_1.fetchDeveloperTestAccountOauthAppInstallStatus)(derivedAccountId, targetProjectName, targetAppUid), {
             successStates: ['SUCCESS'],
             errorStates: [],
         });
@@ -60,11 +95,12 @@ async function handler(args) {
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 }
 function installAppBuilder(yargs) {
-    yargs.option('test-account-id', {
-        describe: en_1.commands.app.subcommands.install.options.testAccountId,
+    yargs.positional('test-account-id', {
+        describe: en_1.commands.app.subcommands.install.positionals.testAccountId,
+        required: true,
         type: 'number',
     });
-    yargs.positional('app-uid', {
+    yargs.option('app-uid', {
         describe: en_1.commands.app.subcommands.install.options.appUid,
         type: 'string',
     });
@@ -72,7 +108,7 @@ function installAppBuilder(yargs) {
         describe: en_1.commands.app.subcommands.install.options.projectName,
         type: 'string',
     });
-    yargs.example('install --app-uid=1234567890 --project-name=my-project', en_1.commands.app.subcommands.install.example);
+    yargs.example('install 1234567890 --app-uid=my-app-uid --project-name=my-project', en_1.commands.app.subcommands.install.example);
     return yargs;
 }
 const builder = (0, yargsUtils_1.makeYargsBuilder)(installAppBuilder, command, en_1.commands.app.subcommands.install.describe, {

package/commands/testAccount/create.js

@@ -92,8 +92,10 @@ async function handler(args) {
         await (0, polling_1.poll)(() => (0, developerTestAccounts_1.fetchDeveloperTestAccountGateSyncStatus)(derivedAccountId, testAccountId), {
             successStates: ['SUCCESS'],
             errorStates: [],
-        }, 5000 // 5 seconds
-        );
+        });
+        // HACK: The status endpoint sometimes returns an early success status.
+        // Sleep for an extra 2 seconds to make sure the sync is actually complete.
+        await new Promise(resolve => setTimeout(resolve, 2000));
         SpinniesManager_1.default.succeed('createTestAccount', {
             text: en_1.commands.testAccount.create.polling.success(testAccountConfig.accountName, testAccountId),
         });

package/lang/en.d.ts

@@ -1499,19 +1499,26 @@ ${string}`;
         readonly describe: "Commands for managing apps.";
         readonly subcommands: {
             readonly install: {
-                readonly describe: "Install an app.";
+                readonly describe: "Install an OAuth app into a test account.";
                 readonly options: {
                     readonly appUid: "The uid of the app to install";
-                    readonly projectName: "The name of the project to install the app to";
+                    readonly projectName: "The name of the project that contains the app";
+                };
+                readonly positionals: {
                     readonly testAccountId: "The id of the test account to install the app into";
                 };
+                readonly errors: {
+                    readonly mustSpecifyProjectName: `You must specify a project name. Use the ${string} flag to specify the project name or run this command from within a project directory.`;
+                    readonly noAppUidFound: `No app uid found. Please specify the app uid with the ${string} flag or run this command from within a project that contains an app.`;
+                    readonly appMustBeOauth: "This command only supports installing oauth apps. Please specify an app with oauth auth type.";
+                };
                 readonly polling: {
                     readonly start: "Installing app...";
                     readonly success: "App installed successfully";
                     readonly failure: "App installation failed";
                     readonly error: "Error installing app";
                 };
-                readonly example: "Install the app with uid 1234567890 from the project named \"my-project\" into the target account";
+                readonly example: "Install the app with uid my-app-uid from the project named \"my-project\" into the target account with id 1234567890";
             };
             readonly secret: {
                 readonly describe: "Commands for managing secrets.";

package/lang/en.js

@@ -1497,19 +1497,26 @@ exports.commands = {
         describe: 'Commands for managing apps.',
         subcommands: {
             install: {
-                describe: 'Install an app.',
+                describe: 'Install an OAuth app into a test account.',
                 options: {
                     appUid: 'The uid of the app to install',
-                    projectName: 'The name of the project to install the app to',
+                    projectName: 'The name of the project that contains the app',
+                },
+                positionals: {
                     testAccountId: 'The id of the test account to install the app into',
                 },
+                errors: {
+                    mustSpecifyProjectName: `You must specify a project name. Use the ${(0, ui_1.uiCommandReference)('--project-name')} flag to specify the project name or run this command from within a project directory.`,
+                    noAppUidFound: `No app uid found. Please specify the app uid with the ${(0, ui_1.uiCommandReference)('--app-uid')} flag or run this command from within a project that contains an app.`,
+                    appMustBeOauth: 'This command only supports installing oauth apps. Please specify an app with oauth auth type.',
+                },
                 polling: {
                     start: 'Installing app...',
                     success: 'App installed successfully',
                     failure: 'App installation failed',
                     error: 'Error installing app',
                 },
-                example: 'Install the app with uid 1234567890 from the project named "my-project" into the target account',
+                example: 'Install the app with uid my-app-uid from the project named "my-project" into the target account with id 1234567890',
             },
             secret: {
                 describe: 'Commands for managing secrets.',

package/lib/projects/structure.d.ts

@@ -1,5 +1,5 @@
 import { ComponentTypes, Component, GenericComponentConfig, PublicAppComponentConfig, PrivateAppComponentConfig, AppCardComponentConfig } from '../../types/Projects';
-import { IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types';
+import { IntermediateRepresentationNode, IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types';
 import { AppIRNode } from '../../types/ProjectComponents';
 export declare const CONFIG_FILES: {
     [k in ComponentTypes]: string;
@@ -15,4 +15,4 @@ export declare function getProjectComponentTypes(components: Array<Component>):
 export declare function getComponentUid(component?: Component | null): string | null;
 export declare function componentIsApp(component?: Component | null): component is Component<PublicAppComponentConfig | PrivateAppComponentConfig>;
 export declare function componentIsPublicApp(component?: Component | null): component is Component<PublicAppComponentConfig>;
-export declare function isAppIRNode(component: IntermediateRepresentationNodeLocalDev): component is AppIRNode;
+export declare function isAppIRNode(component: IntermediateRepresentationNodeLocalDev | IntermediateRepresentationNode): component is AppIRNode;

package/lib/projects/upload.d.ts

@@ -1,4 +1,5 @@
 import { FileResult } from 'tmp';
+import { IntermediateRepresentation } from '@hubspot/project-parsing-lib';
 import { ProjectConfig } from '../../types/Projects';
 type ProjectUploadCallbackFunction<T> = (accountId: number, projectConfig: ProjectConfig, tempFile: FileResult, buildId: number) => Promise<T>;
 type ProjectUploadResult<T> = {
@@ -20,5 +21,5 @@ type HandleProjectUploadArg<T> = {
 export declare function handleProjectUpload<T>({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage, forceCreate, isUploadCommand, sendIR, skipValidation, }: HandleProjectUploadArg<T>): Promise<ProjectUploadResult<T>>;
 export declare function validateSourceDirectory(srcDir: string, projectConfig: ProjectConfig): void;
 export declare function validateNoHSMetaMismatch(srcDir: string, projectConfig: ProjectConfig): Promise<void>;
-export declare function handleTranslate(projectDir: string, projectConfig: ProjectConfig, accountId: number, skipValidation: boolean, profile: string | undefined): Promise<unknown>;
+export declare function handleTranslate(projectDir: string, projectConfig: ProjectConfig, accountId: number, skipValidation: boolean, profile: string | undefined): Promise<IntermediateRepresentation | undefined>;
 export {};

package/lib/projects/upload.js

@@ -149,4 +149,5 @@ async function handleTranslate(projectDir, projectConfig, accountId, skipValidat
             (0, errorHandlers_1.logError)(e);
         }
     }
+    return undefined;
 }

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.7.16-experimental.4",
+    "version": "7.7.16-experimental.6",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
     "dependencies": {
-        "@hubspot/local-dev-lib": "3.11.0",
+        "@hubspot/local-dev-lib": "3.12.0",
         "@hubspot/project-parsing-lib": "0.5.0",
         "@hubspot/serverless-dev-runtime": "7.0.6",
         "@hubspot/theme-preview-dev-server": "0.0.10",