@forge/cli 0.0.0-experimental-819498d → 0.0.0-experimental-3b4aabe

package/out/autocomplete/autocomplete-config.json

@@ -32,9 +32,6 @@
       "--environment": {
         "requireUserArg": true
       },
-      "--non-interactive": {
-        "requireUserArg": false
-      },
       "--help": {
         "requireUserArg": false
       }
@@ -102,17 +99,6 @@
       "--token": {
         "requireUserArg": true
       },
-      "--non-interactive": {
-        "requireUserArg": false
-      },
-      "--help": {
-        "requireUserArg": false
-      }
-    },
-    "login:ci": {
-      "--verbose": {
-        "requireUserArg": false
-      },
       "--help": {
         "requireUserArg": false
       }
@@ -148,6 +134,14 @@
         "requireUserArg": false
       }
     },
+    "providers": {
+      "--verbose": {
+        "requireUserArg": false
+      },
+      "--help": {
+        "requireUserArg": false
+      }
+    },
     "register": {
       "--verbose": {
         "requireUserArg": false
@@ -183,26 +177,25 @@
         "requireUserArg": false
       }
     },
-    "variables:list": {
+    "variables": {
       "--verbose": {
         "requireUserArg": false
       },
-      "--environment": {
-        "requireUserArg": true
-      },
       "--help": {
         "requireUserArg": false
       }
     },
-    "variables:set": {
+    "variables:list": {
       "--verbose": {
         "requireUserArg": false
       },
-      "--encrypt": {
+      "--help": {
+        "requireUserArg": false
+      }
+    },
+    "variables:set": {
+      "--verbose": {
         "requireUserArg": false
-      },
-      "--environment": {
-        "requireUserArg": true
       },
       "--help": {
         "requireUserArg": false
@@ -212,9 +205,6 @@
       "--verbose": {
         "requireUserArg": false
       },
-      "--environment": {
-        "requireUserArg": true
-      },
       "--help": {
         "requireUserArg": false
       }

package/out/bin/cli.js

@@ -3,6 +3,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 require("../autocomplete");
 const command_line_1 = require("../command-line");
-const cli_prerequisites_1 = require("../command-line/cli-prerequisites");
-cli_prerequisites_1.checkNodeVersion();
 command_line_1.main();

package/out/bin/postinstall.js

@@ -10,7 +10,7 @@ const isSupportedShell_1 = require("../autocomplete/isSupportedShell");
 const unique_machine_id_1 = require("../command-line/unique-machine-id");
 const cached_config_service_1 = require("../service/cached-config-service");
 const ui = new cli_shared_1.CommandLineUI(() => true);
-const cachedConf = new cli_shared_1.CachedConf(unique_machine_id_1.FORGE_CLI_PACKAGE);
+const cachedConf = cli_shared_1.CachedConf.getCache(unique_machine_id_1.FORGE_CLI_PACKAGE);
 const configService = new cached_config_service_1.CachedConfigService(cachedConf);
 const analyticsClientReporter = new analytics_client_1.AnalyticsClientReporter(new local_file_storage_1.LocalFileStorage(), ui, configService);
 const cliDetails = version_info_1.getCLIDetails();

package/out/command-line/anon-user-id.js

@@ -7,15 +7,11 @@ const cli_shared_1 = require("@forge/cli-shared");
 const ANON_ID_CACHE_KEY = 'anonId';
 function getAnonId(createNew = false) {
     const cachedConf = cli_shared_1.CachedConf.getCache('@forge/cli');
-    const storedAnonId = cachedConf.get(ANON_ID_CACHE_KEY);
-    if (storedAnonId) {
-        return storedAnonId;
-    }
-    if (!createNew) {
-        return undefined;
-    }
-    const generatedAnonId = uuid_1.default();
-    cachedConf.set(ANON_ID_CACHE_KEY, generatedAnonId);
-    return generatedAnonId;
+    return cachedConf.cached(ANON_ID_CACHE_KEY, () => {
+        if (!createNew) {
+            return undefined;
+        }
+        return uuid_1.default();
+    });
 }
 exports.getAnonId = getAnonId;

package/out/command-line/command.d.ts

@@ -4,6 +4,7 @@ import { PersonalApiCredentialsValidated } from '@forge/cli-shared';
 import { UI } from '@forge/cli-shared';
 import { CLIDetails } from '@forge/cli-shared';
 import { PreCommandController } from './controller/pre-command-controller';
+import { StubController } from './controller/stubController';
 declare type PreconditionCallback = (...args: any[]) => any;
 declare type ActionResult = Promise<{
     creds?: PersonalApiCredentialsValidated;
@@ -38,9 +39,12 @@ export declare class Command {
     private requiresAnalyticsConsent;
     private requiredOptionFlags;
     private preconditionFn;
+    private options;
+    private commands;
     constructor(ui: UI, analyticsClient: AnalyticsClientReporter, preCommandController: PreCommandController, cliDetails: CLIDetails | undefined, cmd?: commander.Command, expectsArguments?: boolean, analyticsName?: string | undefined);
     version(str: string, flags?: string): this;
-    command(name: string): Command;
+    command(name: string, opts?: commander.CommandOptions): Command;
+    deprecatedCommand(oldName: string, newName: string, stubController: StubController): void;
     getAnalyticsName(): string | undefined;
     deprecate(newCommand: string): this;
     description(desc: string): this;
@@ -55,6 +59,8 @@ export declare class Command {
     exitOverride: (listener: (err: any) => void) => this;
     getDefinedCommands(): commander.Command[];
     getDefinedOptions(): commander.Option[];
+    getCmdName(): string;
+    getCommands(): Command[];
     environmentOption(): this;
     siteAndProductOption(): this;
     requireNoAuthentication(): this;

package/out/command-line/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/command-line/command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/command-line/command.ts"],"names":[],"mappings":"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"}

package/out/command-line/command.js

@@ -36,6 +36,8 @@ class Command {
         this.requiresAnalyticsConsent = true;
         this.requiredOptionFlags = [];
         this.preconditionFn = [];
+        this.options = [];
+        this.commands = [];
         this.exitOverride = (listener) => {
             this.cmd.exitOverride((err) => listener(err));
             return this;
@@ -104,22 +106,32 @@ class Command {
     }
     version(str, flags) {
         this.cmd.version(str, flags);
+        flags = flags || '-V, --version';
+        const versionOption = new commander_1.Option(flags, 'output the version number');
+        this.options.push(versionOption);
         return this;
     }
-    command(name) {
+    command(name, opts) {
         const cmd = this.cmd
-            .command(name)
+            .command(name, opts)
             .allowUnknownOption(false)
-            .allowExcessArguments(false)
-            .option('--verbose', cli_shared_3.Text.optionVerbose);
+            .allowExcessArguments(false);
         const trimmedName = name.trim();
         const expectsArguments = trimmedName.endsWith(']') || trimmedName.endsWith('>');
         const subCommand = new Command(this.ui, this.analyticsClient, this.preCommandController, this.cliDetails, cmd, expectsArguments, Command.concatenateNames(this.analyticsName, cmd.name()));
+        subCommand.option('--verbose', cli_shared_3.Text.optionVerbose);
         subCommand.exitOverride((err) => {
             throw new WrapperError(err, subCommand.cmd.name());
         });
+        this.commands.push(subCommand);
         return subCommand;
     }
+    deprecatedCommand(oldName, newName, stubController) {
+        this.command(oldName, { hidden: true })
+            .requireNoAuthentication()
+            .requireNoAnalyticsConsent()
+            .action(() => stubController.run({ oldName, newName }));
+    }
     getAnalyticsName() {
         return this.analyticsName;
     }
@@ -133,6 +145,14 @@ class Command {
     }
     option(flags, description, fn, defaultValue) {
         this.cmd.option(flags, description, fn, defaultValue);
+        const option = new commander_1.Option(flags, description);
+        if (typeof fn === 'function') {
+            option.default(defaultValue).argParser(fn);
+        }
+        else {
+            option.default(fn);
+        }
+        this.options.push(option);
         return this;
     }
     precondition(fn) {
@@ -182,10 +202,16 @@ class Command {
         return this.cmd.commands;
     }
     getDefinedOptions() {
-        return this.cmd.options;
+        return this.options;
+    }
+    getCmdName() {
+        return this.cmd.name();
+    }
+    getCommands() {
+        return this.commands;
     }
     environmentOption() {
-        this.cmd.option('-e, --environment [environment]', cli_shared_3.Text.env.option(cli_shared_2.DEFAULT_ENVIRONMENT_OPTION, cli_shared_2.VALID_ENVIRONMENT_OPTIONS));
+        this.option('-e, --environment [environment]', cli_shared_3.Text.env.option(cli_shared_2.DEFAULT_ENVIRONMENT_OPTION, cli_shared_2.VALID_ENVIRONMENT_OPTIONS));
         this.precondition(() => {
             this.cmd.opts().environment = environment_1.checkEnvironmentOption(this.cmd.opts().environment || cli_shared_2.DEFAULT_ENVIRONMENT_OPTION);
             return { appEnv: this.cmd.opts().environment };
@@ -193,8 +219,8 @@ class Command {
         return this;
     }
     siteAndProductOption() {
-        this.cmd.option('-s, --site [site]', cli_shared_3.Text.optionSite);
-        this.cmd.option('-p, --product [product]', cli_shared_3.Text.optionProduct(cli_shared_2.SUPPORTED_PRODUCTS));
+        this.option('-s, --site [site]', cli_shared_3.Text.optionSite);
+        this.option('-p, --product [product]', cli_shared_3.Text.optionProduct(cli_shared_2.SUPPORTED_PRODUCTS));
         this.precondition(() => {
             return this.validateContext();
         });
@@ -283,7 +309,11 @@ class Command {
         const { command: lastCommand, index: lastCommandIndex } = this.findLastValidCommand(argv);
         const badLastArg = argv[lastCommandIndex + 1];
         const suggestionService = new command_suggestion_service_1.default();
-        const suggestions = suggestionService.getSuggestions(badLastArg, lastCommand.commands.map((cmd) => cmd.name()));
+        const suggestions = suggestionService.getSuggestions(badLastArg, lastCommand.commands
+            .filter((cmd) => {
+            return cmd._hidden !== true;
+        })
+            .map((cmd) => cmd.name()));
         errorMessage.push(cli_shared_3.Text.invalidCmd(argv.slice(2, lastCommandIndex + 2).join(' ')));
         if (suggestions.length) {
             errorMessage.push(`Did you mean:`);

package/out/command-line/controller/deploy-controller.d.ts

@@ -2,6 +2,7 @@ import { AppConfigProvider, ConfigFile, HiddenError } from '@forge/cli-shared';
 import { LintService } from '../../service/lint-service';
 import { DeployView } from '../view/deploy-view';
 import { InstallationService } from '../../service/installation-service';
+import { MigrationKeysService } from '../../service/migration-keys-service';
 import { ResourcePackagingService } from '../../service/resource-packaging-service';
 import { ErrorWithAnalytics } from '../command';
 import { PackageUploadDeployCommand } from '../../deploy';
@@ -15,18 +16,28 @@ export declare class DeployLintFailureError extends HiddenError implements Error
     constructor(scopes: string[]);
     getAttributes(): Record<string, string[]>;
 }
+export declare class InvalidConnectKeyError extends HiddenError implements ErrorWithAnalytics {
+    private readonly reason;
+    constructor(reason: string);
+    getAttributes(): Record<string, string>;
+}
 export declare class DeployController {
     private readonly appConfigProvider;
     private readonly configFile;
     private readonly lintService;
     private readonly installationsService;
+    private readonly migrationKeysService;
     private readonly deployView;
     private readonly packageUploadDeployCommand;
     private readonly resourcePackagingService;
-    constructor(appConfigProvider: AppConfigProvider, configFile: ConfigFile, lintService: LintService, installationsService: InstallationService, deployView: DeployView, packageUploadDeployCommand: PackageUploadDeployCommand, resourcePackagingService: ResourcePackagingService);
+    constructor(appConfigProvider: AppConfigProvider, configFile: ConfigFile, lintService: LintService, installationsService: InstallationService, migrationKeysService: MigrationKeysService, deployView: DeployView, packageUploadDeployCommand: PackageUploadDeployCommand, resourcePackagingService: ResourcePackagingService);
+    private isMpacProductionApp;
+    private connectKeyDeleted;
+    private connectKeyChanged;
+    private validateConnectKeyChange;
     private verifyPreDeployment;
     private verifyPostDeployment;
-    run({ environment, verify }: DeployOptions): Promise<DeploymentResult>;
+    run({ environment, verify }: DeployOptions): Promise<DeploymentResult | void>;
 }
 export {};
 //# sourceMappingURL=deploy-controller.d.ts.map

package/out/command-line/controller/deploy-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/deploy-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,UAAU,aAAa;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,qBAAa,sBAAuB,SAAQ,WAAY,YAAW,kBAAkB;IACvE,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM,EAAE;IAItC,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;CAKjD;AAED,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,0BAA0B;IAC3C,OAAO,CAAC,QAAQ,CAAC,wBAAwB;gBANxB,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,oBAAoB,EAAE,mBAAmB,EACzC,UAAU,EAAE,UAAU,EACtB,0BAA0B,EAAE,0BAA0B,EACtD,wBAAwB,EAAE,wBAAwB;YAGvD,mBAAmB;YAkBnB,oBAAoB;IAOrB,GAAG,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAmCpF"}
+{"version":3,"file":"deploy-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/deploy-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,WAAW,EAAQ,MAAM,mBAAmB,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAA+B,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AACzG,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,UAAU,aAAa;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,qBAAa,sBAAuB,SAAQ,WAAY,YAAW,kBAAkB;IACvE,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM,EAAE;IAItC,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;CAKjD;AAED,qBAAa,sBAAuB,SAAQ,WAAY,YAAW,kBAAkB;IACvE,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAGpC,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;CAK/C;AAED,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,0BAA0B;IAC3C,OAAO,CAAC,QAAQ,CAAC,wBAAwB;gBAPxB,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,oBAAoB,EAAE,mBAAmB,EACzC,oBAAoB,EAAE,oBAAoB,EAC1C,UAAU,EAAE,UAAU,EACtB,0BAA0B,EAAE,0BAA0B,EACtD,wBAAwB,EAAE,wBAAwB;IAGrE,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,iBAAiB;YAGX,wBAAwB;YAwBxB,mBAAmB;YAiBnB,oBAAoB;IAOrB,GAAG,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;CAsD3F"}

package/out/command-line/controller/deploy-controller.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeployController = exports.DeployLintFailureError = void 0;
+exports.DeployController = exports.InvalidConnectKeyError = exports.DeployLintFailureError = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
 class DeployLintFailureError extends cli_shared_1.HiddenError {
     constructor(scopes) {
@@ -14,19 +14,62 @@ class DeployLintFailureError extends cli_shared_1.HiddenError {
     }
 }
 exports.DeployLintFailureError = DeployLintFailureError;
+class InvalidConnectKeyError extends cli_shared_1.HiddenError {
+    constructor(reason) {
+        super();
+        this.reason = reason;
+    }
+    getAttributes() {
+        return {
+            reason: this.reason
+        };
+    }
+}
+exports.InvalidConnectKeyError = InvalidConnectKeyError;
 class DeployController {
-    constructor(appConfigProvider, configFile, lintService, installationsService, deployView, packageUploadDeployCommand, resourcePackagingService) {
+    constructor(appConfigProvider, configFile, lintService, installationsService, migrationKeysService, deployView, packageUploadDeployCommand, resourcePackagingService) {
         this.appConfigProvider = appConfigProvider;
         this.configFile = configFile;
         this.lintService = lintService;
         this.installationsService = installationsService;
+        this.migrationKeysService = migrationKeysService;
         this.deployView = deployView;
         this.packageUploadDeployCommand = packageUploadDeployCommand;
         this.resourcePackagingService = resourcePackagingService;
     }
+    isMpacProductionApp(mpacAppKey, environment) {
+        return !!(mpacAppKey && environment === 'production');
+    }
+    connectKeyDeleted(connectKey, comparisonKey) {
+        return !!(!connectKey && comparisonKey);
+    }
+    connectKeyChanged(connectKey, comparisonKey) {
+        return !!(comparisonKey && connectKey && connectKey !== comparisonKey);
+    }
+    async validateConnectKeyChange(environment, keys) {
+        const { migrationKeys, mpacAppKey } = keys;
+        const connectKey = await this.configFile.getConnectKey();
+        const migrationKey = (migrationKeys === null || migrationKeys === void 0 ? void 0 : migrationKeys.confluence) || (migrationKeys === null || migrationKeys === void 0 ? void 0 : migrationKeys.jira);
+        const isMpacApp = this.isMpacProductionApp(mpacAppKey, environment);
+        if (this.connectKeyDeleted(connectKey, migrationKey)) {
+            this.deployView.displayConnectKeyDeleteWarning(environment);
+            const proceed = await this.deployView.promptToContinueDeletingConnectKey();
+            return { proceed, connectKeyDeleted: proceed, connectKeyChanged: false };
+        }
+        else if (isMpacApp && this.connectKeyChanged(connectKey, mpacAppKey)) {
+            this.deployView.displayMPACAppConnectKeyChangeError(mpacAppKey, connectKey);
+            throw new InvalidConnectKeyError(cli_shared_1.Text.deploy.connectKeyChange.mpacAppConnectKeyChangeAnalyticsError);
+        }
+        else if (!isMpacApp && this.connectKeyChanged(connectKey, migrationKey)) {
+            this.deployView.displayConnectKeyChangeWarning(environment, migrationKey, connectKey);
+            const proceed = await this.deployView.promptToContinueChangingConnectKey();
+            return { proceed, connectKeyChanged: proceed, connectKeyDeleted: false };
+        }
+        return { proceed: true, connectKeyChanged: false, connectKeyDeleted: false };
+    }
     async verifyPreDeployment(environment) {
         this.deployView.displayLintRunning();
-        const { lintResults } = await this.lintService.run(environment, { fix: false });
+        const { lintResults } = await this.lintService.run(environment, { fix: false }, this.deployView.getLogger());
         const problemCount = this.lintService.problemCount(lintResults);
         if (problemCount.errors) {
             this.deployView.displayLintErrors(lintResults);
@@ -48,10 +91,19 @@ class DeployController {
     }
     async run({ environment, verify }) {
         this.deployView.displayStart(environment);
+        let hasConnectKeyChanged = false;
+        let hasConnectKeyDeleted = false;
         if (verify) {
             await this.verifyPreDeployment(environment);
+            const keys = await this.migrationKeysService.getMigrationKeysForAppEnvironment(environment);
+            const { proceed, connectKeyChanged, connectKeyDeleted } = await this.validateConnectKeyChange(environment, keys);
+            if (!proceed) {
+                return;
+            }
+            hasConnectKeyChanged = connectKeyChanged;
+            hasConnectKeyDeleted = connectKeyDeleted;
         }
-        const { name, id } = await this.appConfigProvider();
+        const { id } = await this.appConfigProvider();
         const handlers = await this.configFile.getAppHandlers();
         const resources = await this.configFile.getResources();
         const archives = await this.resourcePackagingService.zipResources(resources);
@@ -67,10 +119,20 @@ class DeployController {
                 throw err;
             }
         }
-        const analytics = await this.deployView.reportDeploymentProgress(id, name, environment, hasProdInstallations, () => this.packageUploadDeployCommand.execute({ handlers, environmentKey: environment, archives }));
+        const analytics = await this.deployView.reportDeploymentProgress(id, environment, hasProdInstallations, () => this.packageUploadDeployCommand.execute({ handlers, environmentKey: environment, archives }));
         if (verify) {
             await this.verifyPostDeployment(environment);
         }
+        try {
+            analytics.analytics.egressPermissionList = await this.configFile.getEgressPermissions();
+            analytics.analytics.connectKey = hasConnectKeyChanged
+                ? { action: 'changed', value: await this.configFile.getConnectKey() }
+                : hasConnectKeyDeleted
+                    ? { action: 'deleted' }
+                    : {};
+        }
+        catch (e) {
+        }
         return analytics;
     }
 }

package/out/command-line/controller/install-controller.d.ts

@@ -9,6 +9,7 @@ interface InstallViewProps {
     site?: URL;
     product?: string;
     upgrade: boolean;
+    nonInteractive?: boolean;
     confirmScopes: boolean;
 }
 export declare class NoDeploymentError extends Error {
@@ -28,7 +29,7 @@ export declare class InstallController {
     private promptForSite;
     private promptForUpgrade;
     private getUniqueInstallationProductsFromScopes;
-    run({ environment, site, product, upgrade, confirmScopes }: InstallViewProps): Promise<void>;
+    run({ environment, site, product, upgrade, confirmScopes, nonInteractive }: InstallViewProps): Promise<void>;
 }
 export {};
 //# sourceMappingURL=install-controller.d.ts.map

package/out/command-line/controller/install-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/install-controller.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,iBAAiB,EACjB,UAAU,EAEV,EAAE,EAQH,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,qBAAqB,EAAsB,MAAM,sCAAsC,CAAC;AACjG,OAAO,EAAE,mBAAmB,EAA2C,MAAM,oCAAoC,CAAC;AAClH,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,UAAU,gBAAgB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;CACxB;AAkBD,qBAAa,iBAAkB,SAAQ,KAAK;gBAC9B,WAAW,EAAE,MAAM;CAGhC;AAgBD,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW;gBALX,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,EAAE,EACN,qBAAqB,EAAE,qBAAqB,EAC5C,mBAAmB,EAAE,mBAAmB,EACxC,WAAW,EAAE,WAAW;YAG7B,cAAc;YAmBd,gBAAgB;YAqChB,gBAAgB;YAKhB,aAAa;YAWb,gBAAgB;IAoB9B,OAAO,CAAC,uCAAuC;IAalC,GAAG,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;CA6E1G"}
+{"version":3,"file":"install-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/install-controller.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,iBAAiB,EACjB,UAAU,EAEV,EAAE,EASH,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,UAAU,gBAAgB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;CACxB;AAiBD,qBAAa,iBAAkB,SAAQ,KAAK;gBAC9B,WAAW,EAAE,MAAM;CAGhC;AAQD,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW;gBALX,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,EAAE,EACN,qBAAqB,EAAE,qBAAqB,EAC5C,mBAAmB,EAAE,mBAAmB,EACxC,WAAW,EAAE,WAAW;YAG7B,cAAc;YAmBd,gBAAgB;YAsChB,gBAAgB;YAKhB,aAAa;YAWb,gBAAgB;IAoB9B,OAAO,CAAC,uCAAuC;IAalC,GAAG,CAAC,EACf,WAAW,EACX,IAAI,EACJ,OAAO,EACP,OAAO,EACP,aAAa,EACb,cAAc,EACf,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;CAuFpC"}

package/out/command-line/controller/install-controller.js

@@ -8,12 +8,6 @@ class NoDeploymentError extends Error {
     }
 }
 exports.NoDeploymentError = NoDeploymentError;
-const isInstallationResult = (result) => {
-    return !!result.installationId;
-};
-const isAlreadyUpgradedResult = (result) => {
-    return result.alreadyUpdated === true;
-};
 class InstallController {
     constructor(appConfigProvider, configFile, ui, installAppSiteCommand, installationService, installView) {
         this.appConfigProvider = appConfigProvider;
@@ -39,30 +33,26 @@ class InstallController {
             }
         }
     }
-    async installOrUpgrade(upgrade, environment, site, product, name, appId, text) {
+    async installOrUpgrade(upgrade, environment, site, product, appId, text) {
         return this.ui.displayProgress(async () => {
             if (upgrade) {
-                return await this.installationService.upgradeInstallation(site, product, environment, appId);
+                const isAlreadyUpdated = await this.installationService.upgradeInstallation(site, product, environment, appId);
+                return isAlreadyUpdated;
             }
             else {
-                return await this.installAppSiteCommand.execute({
+                await this.installAppSiteCommand.execute({
                     environmentKey: environment,
                     site,
                     product
                 });
+                return false;
             }
-        }, text.cmd.start(name, cli_shared_1.environmentToOption(environment)), (result) => {
-            if (result.alreadyUpdated) {
+        }, text.cmd.start(cli_shared_1.environmentToOption(environment)), (alreadyUpdated) => {
+            if (alreadyUpdated) {
                 return cli_shared_1.Text.upgrade.alreadyUpdated.spinner;
             }
-            else if (isInstallationResult(result)) {
-                return text.cmd.end(false);
-            }
             else {
-                return {
-                    successful: false,
-                    message: cli_shared_1.Text.upgrade.cmd.error
-                };
+                return text.cmd.end(false);
             }
         });
     }
@@ -79,7 +69,7 @@ class InstallController {
         return cli_shared_1.validateSite(trySite);
     }
     async promptForUpgrade(siteOption, productOption, environmentOption) {
-        const { installations } = await this.installationService.listNonIdentityAppInstallations({
+        const { installations } = await this.installationService.listNonTechnicalAppInstallations({
             site: siteOption === null || siteOption === void 0 ? void 0 : siteOption.host,
             product: productOption,
             environment: environmentOption
@@ -105,10 +95,11 @@ class InstallController {
         });
         return products.size > 0 ? Array.from(products) : undefined;
     }
-    async run({ environment, site, product, upgrade, confirmScopes }) {
-        const { name, id } = await this.appConfigProvider();
+    async run({ environment, site, product, upgrade, confirmScopes, nonInteractive }) {
+        var _a;
+        const { id } = await this.appConfigProvider();
         const text = upgrade ? cli_shared_1.Text.upgrade : cli_shared_1.Text.install;
-        if (upgrade) {
+        if (upgrade && (!site || !product)) {
             const upgradeResult = await this.promptForUpgrade(site, product, environment);
             environment = upgradeResult.environment;
             site = upgradeResult.site;
@@ -120,27 +111,32 @@ class InstallController {
         if (cli_shared_1.isSecureSite(site)) {
             await this.securityPrompt(site);
         }
-        const environmentScopes = await this.installationService.getScopes(id, environment);
-        if (!environmentScopes || environmentScopes.length === 0) {
+        const environmentPermissions = await this.installationService.getAppEnvironmentPermissions(id, environment);
+        if (!(environmentPermissions === null || environmentPermissions === void 0 ? void 0 : environmentPermissions.scopes) || environmentPermissions.scopes.length === 0) {
             this.ui.error(new NoDeploymentError(environment), { pad: false });
             return;
         }
-        const { permissions } = await this.configFile.readConfig();
-        const manifestScopes = permissions === null || permissions === void 0 ? void 0 : permissions.scopes;
-        const scopesConfirmationResult = await this.installView.promptForScopesConfirmation(environmentScopes, manifestScopes, environment, confirmScopes, text);
+        const { scopes: environmentScopes } = environmentPermissions;
+        const [{ permissions }, manifestEgressEntries] = await Promise.all([
+            this.configFile.readConfig(),
+            this.configFile.getEgressPermissions()
+        ]);
+        const manifestEgressAddresses = cli_shared_1.flatMap(manifestEgressEntries, ({ domains }) => domains !== null && domains !== void 0 ? domains : []);
+        const manifestScopes = (_a = permissions === null || permissions === void 0 ? void 0 : permissions.scopes) !== null && _a !== void 0 ? _a : [];
+        const scopesConfirmationResult = await this.installView.promptForPermissionsConfirmation(environmentPermissions, manifestScopes, manifestEgressAddresses, environment, confirmScopes, !!nonInteractive, text);
         if (!scopesConfirmationResult)
             return;
-        const installationInfo = await this.installOrUpgrade(upgrade, environment, site, product, name, id, text);
-        if (isAlreadyUpgradedResult(installationInfo)) {
-            this.ui.info(cli_shared_1.Text.upgrade.alreadyUpdated.banner(name, environment, cli_shared_1.environmentToOption, product, site.host));
+        const isAlreadyUpdated = await this.installOrUpgrade(upgrade, environment, site, product, id, text);
+        if (isAlreadyUpdated) {
+            this.ui.info(cli_shared_1.Text.upgrade.alreadyUpdated.banner(environment, cli_shared_1.environmentToOption, product, site.host));
         }
         else {
             this.ui.emptyLine();
-            this.ui.info(text.success.banner(name, environment, cli_shared_1.environmentToOption, product, site.host));
+            this.ui.info(text.success.banner(environment, cli_shared_1.environmentToOption, product, site.host));
             const uniqueProductsFromScopes = this.getUniqueInstallationProductsFromScopes(environmentScopes);
             if (!uniqueProductsFromScopes || uniqueProductsFromScopes.length <= 1)
                 return;
-            const { installations } = await this.installationService.listNonIdentityAppInstallations({
+            const { installations } = await this.installationService.listNonTechnicalAppInstallations({
                 site: site.host,
                 environment
             });

package/out/command-line/controller/lint-controller.js

@@ -8,7 +8,7 @@ class LintController {
     }
     async run(environment, fix) {
         !fix && this.lintView.showBlurb();
-        const runResult = await this.lintService.run(environment, { fix });
+        const runResult = await this.lintService.run(environment, { fix }, this.lintView.getLogger());
         if (runResult === null || runResult === void 0 ? void 0 : runResult.fixResults) {
             this.lintView.reportFixResult(runResult.fixResults);
         }

package/out/command-line/controller/pre-command-controller.js

@@ -18,7 +18,7 @@ class PreCommandController {
         this.settingsView = settingsView;
     }
     async runChecks(strict) {
-        const report = await this.service.run(strict);
+        const report = await this.service.run(strict, this.view.getLogger());
         if (this.service.hasErrors(report)) {
             this.view.reportErrors(report);
             throw new PreCommandValidationError();

package/out/command-line/controller/prerequisites-controller.d.ts

@@ -0,0 +1,11 @@
+import { CLIDetails, FeatureFlagReader, Logger } from '@forge/cli-shared';
+export declare class PrerequisitesController {
+    private readonly logger;
+    private readonly featureFlags;
+    private readonly cliDetails;
+    constructor(logger: Logger, featureFlags: FeatureFlagReader, cliDetails: CLIDetails | undefined);
+    check(): Promise<void>;
+    private checkNodeVersion;
+    private checkCustomWarning;
+}
+//# sourceMappingURL=prerequisites-controller.d.ts.map

package/out/command-line/controller/prerequisites-controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prerequisites-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/prerequisites-controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAe,iBAAiB,EAAE,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAI7F,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAFV,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,iBAAiB,EAC/B,UAAU,EAAE,UAAU,GAAG,SAAS;IAG/C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B,OAAO,CAAC,gBAAgB;YAcV,kBAAkB;CAMjC"}