@forge/cli 0.0.0-experimental-819498d → 0.0.0-experimental-a9f00a0

package/out/command-line/command.js

@@ -6,11 +6,9 @@ const commander_1 = tslib_1.__importStar(require("commander"));
 const semver_1 = tslib_1.__importDefault(require("semver"));
 const cli_shared_1 = require("@forge/cli-shared");
 const cli_shared_2 = require("@forge/cli-shared");
-const cli_shared_3 = require("@forge/cli-shared");
 const environment_1 = require("./environment");
-const cli_shared_4 = require("@forge/cli-shared");
+const cli_shared_3 = require("@forge/cli-shared");
 const version_info_1 = require("./version-info");
-const anon_user_id_1 = require("./anon-user-id");
 const errors_1 = require("./errors");
 const command_suggestion_service_1 = tslib_1.__importDefault(require("../service/command-suggestion-service"));
 class WrapperError extends commander_1.CommanderError {
@@ -32,30 +30,30 @@ class Command {
         this.cliDetails = cliDetails;
         this.expectsArguments = expectsArguments;
         this.analyticsName = analyticsName;
-        this.requiresAuthentication = true;
         this.requiresAnalyticsConsent = true;
         this.requiredOptionFlags = [];
         this.preconditionFn = [];
+        this.options = [];
+        this.commands = [];
         this.exitOverride = (listener) => {
             this.cmd.exitOverride((err) => listener(err));
             return this;
         };
         this.actionProcessor = async (cb, ...args) => {
-            var _a, _b, _c;
+            var _a;
             if (this.newCommand) {
-                this.ui.error(new Error(cli_shared_3.Text.deprecate(this.newCommand)));
+                this.ui.error(new Error(cli_shared_2.Text.deprecate(this.newCommand)));
             }
             const cmdName = this.cmd.name();
-            let cred = anon_user_id_1.getAnonId(true);
             let attributes = {};
             try {
                 if (!this.expectsArguments && args.length > 2) {
-                    throw new cli_shared_3.ValidationError(cli_shared_3.Text.extraArguments(cmdName));
+                    throw new cli_shared_2.ValidationError(cli_shared_2.Text.extraArguments(cmdName));
                 }
                 const [options] = args;
                 if (options === null || options === void 0 ? void 0 : options.nonInteractive) {
                     if (!this.satisfiesNonInteractiveOptions(options)) {
-                        throw new cli_shared_3.ValidationError(cli_shared_3.Text.nonInteractive.error.missingRequiredOption(cmdName, this.requiredOptionFlags));
+                        throw new cli_shared_2.ValidationError(cli_shared_2.Text.nonInteractive.error.missingRequiredOption(cmdName, this.requiredOptionFlags));
                     }
                 }
                 if (this.requiresAnalyticsConsent) {
@@ -67,30 +65,20 @@ class Command {
                 }
                 const preconditionCheckAttributes = await this.checkPreconditions(...args);
                 attributes = Object.assign(Object.assign({}, attributes), preconditionCheckAttributes);
-                const actualCred = await this.checkAuthentication();
-                if (actualCred) {
-                    cred = actualCred;
-                }
                 const result = await cb(...args);
                 if (result) {
                     attributes = Object.assign(Object.assign({}, attributes), result.analytics);
-                    if (result.creds) {
-                        cred = result.creds;
-                    }
                 }
-                this.analyticsClient.reportSuccess((_b = this.analyticsName) !== null && _b !== void 0 ? _b : cmdName, cred, attributes);
             }
             catch (e) {
                 if (isErrorWithAnalytics(e)) {
                     attributes = Object.assign(Object.assign({}, e.getAttributes()), attributes);
                 }
                 if (e instanceof errors_1.DeferredErrors) {
-                    e.getErrors().forEach((error) => { var _a; return this.analyticsClient.reportFailure((_a = this.analyticsName) !== null && _a !== void 0 ? _a : cmdName, cred, attributes, error); });
                     process.exit(1);
                 }
                 else {
-                    this.analyticsClient.reportFailure((_c = this.analyticsName) !== null && _c !== void 0 ? _c : cmdName, cred, attributes, e);
-                    cli_shared_4.exitOnError(this.ui)(e);
+                    cli_shared_3.exitOnError(this.ui)(e);
                 }
             }
         };
@@ -104,22 +92,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_2.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 +131,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) {
@@ -149,7 +155,7 @@ class Command {
     }
     nonInteractiveOption(...args) {
         this.requiredOptionFlags = args;
-        this.cmd.option('--non-interactive', cli_shared_3.Text.nonInteractive.description);
+        this.cmd.option('--non-interactive', cli_shared_2.Text.nonInteractive.description);
         return this;
     }
     action(fn) {
@@ -175,33 +181,38 @@ class Command {
                 this.unknownCommand(argv);
                 return;
             }
-            return cli_shared_4.exitOnError(this.ui)(err);
+            return cli_shared_3.exitOnError(this.ui)(err);
         }
     }
     getDefinedCommands() {
         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_2.Text.env.option(cli_shared_1.DEFAULT_ENVIRONMENT_OPTION, cli_shared_1.VALID_ENVIRONMENT_OPTIONS));
         this.precondition(() => {
-            this.cmd.opts().environment = environment_1.checkEnvironmentOption(this.cmd.opts().environment || cli_shared_2.DEFAULT_ENVIRONMENT_OPTION);
+            this.cmd.opts().environment = environment_1.checkEnvironmentOption(this.cmd.opts().environment || cli_shared_1.DEFAULT_ENVIRONMENT_OPTION);
             return { appEnv: this.cmd.opts().environment };
         });
         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_2.Text.optionSite);
+        this.option('-p, --product [product]', cli_shared_2.Text.optionProduct(cli_shared_1.SUPPORTED_PRODUCTS));
         this.precondition(() => {
             return this.validateContext();
         });
         return this;
     }
     requireNoAuthentication() {
-        this.requiresAuthentication = false;
         return this;
     }
     requireNoAnalyticsConsent() {
@@ -225,13 +236,6 @@ class Command {
         }
         return attributes;
     }
-    async checkAuthentication() {
-        if (this.requiresAuthentication) {
-            const credentialsGetter = cli_shared_1.getCredentialsStoreProvider(this.ui);
-            return credentialsGetter.getCredentials();
-        }
-        return undefined;
-    }
     checkVersion() {
         if (!this.cliDetails ||
             !this.cliDetails.latest ||
@@ -240,7 +244,7 @@ class Command {
             return;
         }
         if (semver_1.default.gt(this.cliDetails.latest, this.cliDetails.version)) {
-            this.ui.warn(cli_shared_3.Text.error.outdatedCLIVersion(this.cliDetails.version, this.cliDetails.latest));
+            this.ui.warn(cli_shared_2.Text.error.outdatedCLIVersion(this.cliDetails.version, this.cliDetails.latest));
         }
         else if (semver_1.default.gt(this.cliDetails.version, this.cliDetails.latest)) {
             version_info_1.clearVersionCache(this.cliDetails.name);
@@ -248,9 +252,9 @@ class Command {
     }
     async validateContext() {
         if (this.cmd.opts().product) {
-            const capitalizedProduct = cli_shared_2.capitalizeProduct(this.cmd.opts().product);
-            if (!cli_shared_2.isSuppportedProduct(capitalizedProduct)) {
-                throw new cli_shared_3.ValidationError(cli_shared_3.Text.error.invalidProduct);
+            const capitalizedProduct = cli_shared_1.capitalizeProduct(this.cmd.opts().product);
+            if (!cli_shared_1.isSuppportedProduct(capitalizedProduct)) {
+                throw new cli_shared_2.ValidationError(cli_shared_2.Text.error.invalidProduct);
             }
             this.cmd.opts().product = capitalizedProduct;
         }
@@ -258,7 +262,7 @@ class Command {
         if (this.cmd.opts().site) {
             trySite = this.cmd.opts().site;
         }
-        this.cmd.opts().site = trySite ? cli_shared_2.validateSite(trySite) : undefined;
+        this.cmd.opts().site = trySite ? cli_shared_1.validateSite(trySite) : undefined;
         return { product: this.cmd.opts().product };
     }
     findLastValidCommand(argv) {
@@ -283,17 +287,21 @@ 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()));
-        errorMessage.push(cli_shared_3.Text.invalidCmd(argv.slice(2, lastCommandIndex + 2).join(' ')));
+        const suggestions = suggestionService.getSuggestions(badLastArg, lastCommand.commands
+            .filter((cmd) => {
+            return cmd._hidden !== true;
+        })
+            .map((cmd) => cmd.name()));
+        errorMessage.push(cli_shared_2.Text.invalidCmd(argv.slice(2, lastCommandIndex + 2).join(' ')));
         if (suggestions.length) {
             errorMessage.push(`Did you mean:`);
             const suggestionsPrefixed = suggestions.map((suggestion) => [...argv.slice(2, lastCommandIndex + 1), suggestion].join(' '));
             errorMessage.push(suggestionsPrefixed.join('\n'));
-            errorMessage.push(cli_shared_3.Text.invalidCmdHelp);
+            errorMessage.push(cli_shared_2.Text.invalidCmdHelp);
             this.ui.info(errorMessage.join('\n\n'));
         }
         else {
-            errorMessage.push(cli_shared_3.Text.invalidCmdHelp);
+            errorMessage.push(cli_shared_2.Text.invalidCmdHelp);
             this.ui.error(new Error(errorMessage.join(' ')));
         }
     }
@@ -318,18 +326,6 @@ class Command {
 }
 exports.Command = Command;
 Command.reportHelp = async (cmd, cmdError) => {
-    try {
-        let cred = anon_user_id_1.getAnonId(true);
-        try {
-            const credentialsGetter = cli_shared_1.getCredentialsStoreProvider(cmd.ui);
-            cred = await credentialsGetter.getCredentials();
-        }
-        catch (noTokenError) {
-        }
-        cmd.analyticsClient.reportSuccess('help', cred, { command: cmdError.getCommandName() });
-    }
-    catch (err) {
-    }
     return;
 };
 Command.isError = (cmdError) => {

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"}