@forge/cli 0.0.0-experimental-e8bfa83 → 0.0.0-experimental-c3effe3

package/out/command-line/dependency-injection.js

@@ -11,17 +11,23 @@ const delete_environment_variable_1 = require("../environment-variables/delete-e
 const graphql_client_1 = require("../environment-variables/graphql-client");
 const list_environment_variables_1 = require("../environment-variables/list-environment-variables");
 const set_environment_variable_1 = require("../environment-variables/set-environment-variable");
-const graphql_client_2 = require("../installations/graphql-client");
+const graphql_client_2 = require("../migration-keys/graphql-client");
+const configure_provider_1 = require("../providers/configure-provider");
+const graphql_client_3 = require("../providers/graphql-client");
+const graphql_client_4 = require("../installations/graphql-client");
 const install_app_site_1 = require("../installations/install-app-site");
 const uninstall_app_1 = require("../installations/uninstall-app");
+const cached_config_service_1 = require("../service/cached-config-service");
 const docker_service_1 = require("../service/docker-service");
 const installation_service_1 = require("../service/installation-service");
 const lint_service_1 = require("../service/lint-service");
 const lite_lint_service_1 = require("../service/lite-lint-service");
+const port_finding_service_1 = require("../service/port-finding-service");
 const resource_packaging_service_1 = require("../service/resource-packaging-service");
 const resources_uploader_service_1 = require("../service/resources-uploader-service");
 const tunnel_analytics_service_1 = require("../service/tunnel-analytics-service");
 const tunnel_service_1 = require("../service/tunnel-service");
+const migration_keys_service_1 = require("../service/migration-keys-service");
 const local_file_storage_1 = require("../storage/local-file-storage");
 const get_webtrigger_url_1 = require("../webtrigger/get-webtrigger-url");
 const worker_info_1 = require("../workers/worker-info");
@@ -33,16 +39,25 @@ const feedback_controller_1 = require("./controller/feedback-controller");
 const install_controller_1 = require("./controller/install-controller");
 const lint_controller_1 = require("./controller/lint-controller");
 const pre_command_controller_1 = require("./controller/pre-command-controller");
+const settings_controller_1 = require("./controller/settings-controller");
 const tunnel_controller_1 = require("./controller/tunnel-controller");
+const unique_machine_id_1 = require("./unique-machine-id");
+const analytics_settings_view_1 = require("./view/analytics-settings-view");
 const deploy_view_1 = require("./view/deploy-view");
 const install_view_1 = require("./view/install-view");
 const lint_view_1 = require("./view/lint-view");
 const lite_lint_view_1 = require("./view/lite-lint-view");
+const settings_view_1 = require("./view/settings-view");
 const tunnel_view_1 = require("./view/tunnel-view");
+const graphql_client_5 = require("../webtrigger/graphql-client");
+const stubController_1 = require("./controller/stubController");
+const prerequisites_controller_1 = require("./controller/prerequisites-controller");
 exports.getDependencies = async (cliDetails) => {
     let cmd;
     const ui = new cli_shared_1.CommandLineUI(() => cmd.verbose);
-    const analyticsClientReporter = new analytics_client_1.AnalyticsClientReporter(new local_file_storage_1.LocalFileStorage(), ui);
+    const cachedConf = cli_shared_1.CachedConf.getCache(unique_machine_id_1.FORGE_CLI_PACKAGE);
+    const cachedConfigService = new cached_config_service_1.CachedConfigService(cachedConf);
+    const analyticsClientReporter = new analytics_client_1.AnalyticsClientReporter(new local_file_storage_1.LocalFileStorage(), ui, cachedConfigService);
     const workerInfo = worker_info_1.getWorkerInfo(cliDetails);
     const workersStarter = new workers_starter_1.WorkersStarter(workerInfo);
     const fileReader = new cli_shared_1.FileSystemReader();
@@ -51,15 +66,17 @@ exports.getDependencies = async (cliDetails) => {
     const appConfigReader = cli_shared_1.configFileReaderForSection(cli_shared_1.appConfigKey, cli_shared_1.appConfigShape, configFile);
     const assertiveAppConfigReader = cli_shared_1.assertiveAppConfigProvider(appConfigReader);
     const appConfigWriter = cli_shared_1.configFileWriterForSection(cli_shared_1.appConfigKey, cli_shared_1.appConfigShape, configFile);
+    const settingsView = new settings_view_1.SettingsView(ui);
+    const settingsController = new settings_controller_1.SettingsController(settingsView, cachedConfigService);
     const liteLintView = new lite_lint_view_1.LiteLintView(ui);
     const liteLintService = new lite_lint_service_1.LiteLintService();
-    const preCommandController = new pre_command_controller_1.PreCommandController(liteLintService, liteLintView, configFile);
+    const analyticsSettingsView = new analytics_settings_view_1.AnalyticsSettingsView(ui);
+    const preCommandController = new pre_command_controller_1.PreCommandController(liteLintService, liteLintView, configFile, cachedConfigService, analyticsSettingsView, settingsView);
     cmd = new command_1.Command(ui, analyticsClientReporter, preCommandController, cliDetails);
     const graphqlGateway = cli_shared_1.getGraphqlGateway();
     const tokenStore = cli_shared_1.getCredentialsStoreProvider(ui);
-    const authenticator = cli_shared_1.ContainerTokenAuthenticator.isAvailable()
-        ? new cli_shared_1.ContainerTokenAuthenticator()
-        : new cli_shared_1.PersonalTokenAuthenticator(tokenStore);
+    const authenticator = new cli_shared_1.PersonalTokenAuthenticator(tokenStore);
+    const featureFlagService = new cli_shared_1.FeatureFlagService(ui, cliDetails, tokenStore, appConfigReader);
     const createGraphQLClient = (auth) => {
         const minimalGraphQLRunner = new cli_shared_1.MinimalGraphQLRunner(auth, graphqlGateway, cliDetails);
         const graphQLRunner = new cli_shared_1.DebuggingGraphqlRunner(minimalGraphQLRunner, graphqlGateway, ui);
@@ -71,28 +88,32 @@ exports.getDependencies = async (cliDetails) => {
     const zipAccessor = new cli_shared_1.UnzipperZipAccessor();
     const loginCommand = new cli_shared_1.LoginCommand(createGraphQLClient, tokenStore, ui);
     const logoutCommand = new cli_shared_1.LogoutCommand(tokenStore);
-    const containerTokenClient = new cli_shared_1.ContainerTokenCreatingGraphqlClient(graphQLClient);
-    const createContainerTokenCommand = new cli_shared_1.CreateContainerTokenCommand(containerTokenClient, assertiveAppConfigReader);
-    const downloader = new cli_shared_1.BitbucketTemplateDownloader();
-    const extractor = new cli_shared_1.BitbucketTemplateExtractor(zipAccessor);
+    const downloader = new cli_shared_1.TemplateServiceDownloader();
+    const extractor = new cli_shared_1.ZipTemplateExtractor(zipAccessor);
+    const lister = new cli_shared_1.TemplateServiceLister();
     const createAppGraphQLClient = new cli_shared_1.CreateAppGraphQLClient(graphQLClient);
-    const registerAppCommand = new cli_shared_1.RegisterAppCommand(createAppGraphQLClient, appConfigReader, appConfigWriter, ui);
-    const templater = new cli_shared_1.BitbucketTemplater(downloader, extractor, ui);
+    const registerAppCommand = new cli_shared_1.RegisterAppCommand(createAppGraphQLClient, appConfigWriter, ui);
+    const templater = new cli_shared_1.ComposableTemplater(downloader, extractor, lister, ui);
     const npmInstaller = new cli_shared_1.NpmInstaller(ui);
     const createAppCommand = new cli_shared_1.CreateAppCommand(templater, registerAppCommand, npmInstaller);
     const environmentVariablesClient = new graphql_client_1.GraphqlClient(graphQLClient);
     const setEnvironmentVariableCommand = new set_environment_variable_1.SetEnvironmentVariableCommand(environmentVariablesClient, assertiveAppConfigReader);
     const deleteEnvironmentVariableCommand = new delete_environment_variable_1.DeleteEnvironmentVariableCommand(environmentVariablesClient, assertiveAppConfigReader);
     const listEnvironmentVariablesCommand = new list_environment_variables_1.ListEnvironmentVariablesCommand(environmentVariablesClient, assertiveAppConfigReader);
+    const providerClient = new graphql_client_3.GraphqlClient(graphQLClient);
+    const configureProviderCommand = new configure_provider_1.ConfigureProviderCommand(providerClient, assertiveAppConfigReader);
+    const migrationKeysClient = new graphql_client_2.GraphqlClient(graphQLClient);
+    const migrationKeysService = new migration_keys_service_1.MigrationKeysService(migrationKeysClient, assertiveAppConfigReader);
     const appEnvironmentClient = new cli_shared_1.AppEnvironmentsGraphqlClient(graphQLClient);
     const globalEdgeFetchClient = { fetch: node_fetch_1.default };
     const globalEdgeClient = new cli_shared_1.GlobalEdgeHttpClient(globalEdgeFetchClient);
     const logsClient = new cli_shared_1.LogsGraphQLClient(graphQLClient);
     const viewAppLogsCommand = new cli_shared_1.ViewAppLogsCommand(assertiveAppConfigReader, appEnvironmentClient, globalEdgeClient, logsClient);
-    const installationsClient = new graphql_client_2.InstallationsGraphqlClient(graphQLClient);
+    const installationsClient = new graphql_client_4.InstallationsGraphqlClient(graphQLClient, cli_shared_1.pause);
     const installAppSiteCommand = new install_app_site_1.InstallAppSiteCommand(assertiveAppConfigReader, installationsClient);
     const uninstallAppCommand = new uninstall_app_1.UninstallAppCommand(assertiveAppConfigReader, installationsClient);
     const deployMonitorClient = new deploy_1.DeployMonitorGraphqlClient(graphQLClient);
+    const webTriggerGraphqlClient = new graphql_client_5.WebTriggerGraphQLClient(graphQLClient);
     const archiverFactory = () => new deploy_1.ZipArchiver();
     const uploaderArtifactClient = new deploy_1.ArtifactGraphQLClient(graphQLClient);
     const triggerDeployClient = new deploy_1.TriggerDeployGraphQLClient(graphQLClient);
@@ -100,25 +121,29 @@ exports.getDependencies = async (cliDetails) => {
     const archiveUploader = new deploy_1.AppArchiveUploader(assertiveAppConfigReader, uploaderArtifactClient, fileUploader, ui, new resources_uploader_service_1.ResourcesUploaderService(fileReader));
     const deployer = new deploy_1.ArtifactDeployer(assertiveAppConfigReader, triggerDeployClient, deployMonitorClient, cli_shared_1.pause, ui);
     const packageUploadDeployCommand = new deploy_1.PackageUploadDeployCommand(appPackager, archiveUploader, deployer);
-    const getWebTriggerURLCommand = new get_webtrigger_url_1.GetWebTriggerURLCommand(assertiveAppConfigReader, installationsClient, appEnvironmentClient, globalEdgeClient);
+    const getWebTriggerURLCommand = new get_webtrigger_url_1.GetWebTriggerURLCommand(assertiveAppConfigReader, installationsClient, appEnvironmentClient, webTriggerGraphqlClient);
     const autocompleteController = new autocomplete_controller_1.AutocompleteController(ui);
     const installationsService = new installation_service_1.InstallationService(assertiveAppConfigReader, installationsClient, installationsClient);
     const installView = new install_view_1.InstallView(ui);
-    const installController = new install_controller_1.InstallController(assertiveAppConfigReader, ui, installAppSiteCommand, installationsService, installView);
+    const installController = new install_controller_1.InstallController(assertiveAppConfigReader, configFile, ui, installAppSiteCommand, installationsService, installView);
     const feedbackController = new feedback_controller_1.FeedbackController(ui, feedbackPostClient);
     const lintService = new lint_service_1.LintService(configFile, fileReader);
     const lintView = new lint_view_1.LintView(ui);
     const lintController = new lint_controller_1.LintController(lintService, lintView);
     const deployView = new deploy_view_1.DeployView(ui);
     const bridgeScriptService = new cli_shared_1.BridgeScriptService();
-    const resourcePackagingService = new resource_packaging_service_1.ResourcePackagingService(archiverFactory, fileReader, process.cwd(), bridgeScriptService);
-    const deployController = new deploy_controller_1.DeployController(assertiveAppConfigReader, configFile, lintService, installationsService, deployView, packageUploadDeployCommand, resourcePackagingService);
+    const iframeResizerScriptService = new cli_shared_1.IframeResizerScriptService();
+    const resourcePackagingService = new resource_packaging_service_1.ResourcePackagingService(archiverFactory, fileReader, process.cwd(), bridgeScriptService, iframeResizerScriptService);
+    const deployController = new deploy_controller_1.DeployController(assertiveAppConfigReader, configFile, lintService, installationsService, migrationKeysService, deployView, packageUploadDeployCommand, resourcePackagingService);
     const tunnelView = new tunnel_view_1.TunnelView(ui);
-    const localTunnelService = new tunnel_service_1.LocalTunnelService();
+    const configFilePortFindingService = new port_finding_service_1.ConfigFilePortFindingService(configFile);
+    const localTunnelService = new tunnel_service_1.LocalTunnelService(configFilePortFindingService);
     const dockerService = new docker_service_1.DockerService();
     const tunnelAnalyticsService = new tunnel_analytics_service_1.TunnelAnalyticsService(analyticsClientReporter);
-    const dockerTunnelService = new tunnel_service_1.DockerTunnelService(dockerService, tunnelAnalyticsService);
+    const dockerTunnelService = new tunnel_service_1.DockerTunnelService(configFilePortFindingService, dockerService, tunnelAnalyticsService);
     const tunnelController = new tunnel_controller_1.TunnelController(tunnelAnalyticsService, localTunnelService, dockerTunnelService, tunnelView);
+    const stubController = new stubController_1.StubController();
+    const prerequisitesController = new prerequisites_controller_1.PrerequisitesController(ui, featureFlagService, cliDetails);
     return {
         ui,
         cmd,
@@ -130,7 +155,6 @@ exports.getDependencies = async (cliDetails) => {
         commands: {
             loginCommand,
             logoutCommand,
-            createContainerTokenCommand,
             createAppCommand,
             registerAppCommand,
             installAppSiteCommand,
@@ -139,11 +163,14 @@ exports.getDependencies = async (cliDetails) => {
             setEnvironmentVariableCommand,
             deleteEnvironmentVariableCommand,
             listEnvironmentVariablesCommand,
+            configureProviderCommand,
             viewAppLogsCommand,
             getWebTriggerURLCommand
         },
         services: {
-            installationsService
+            featureFlagService,
+            installationsService,
+            migrationKeysService
         },
         controllers: {
             autocompleteController,
@@ -152,7 +179,10 @@ exports.getDependencies = async (cliDetails) => {
             installController,
             lintController,
             preCommandController,
-            tunnelController
+            tunnelController,
+            settingsController,
+            stubController,
+            prerequisitesController
         }
     };
 };

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/command-line/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAElE,OAAO,EAAmB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAqBvE,eAAO,MAAM,gBAAgB,SAAU,YAAY,0CAA4B,IAuB9E,CAAC;AA+CF,eAAO,MAAM,IAAI,QAAa,OAAO,CAAC,IAAI,CAQzC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/command-line/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAElE,OAAO,EAAmB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAuBvE,eAAO,MAAM,gBAAgB,SAAU,YAAY,0CAA4B,IAyB9E,CAAC;AAiBF,eAAO,MAAM,IAAI,QAAa,OAAO,CAAC,IAAI,CAUzC,CAAC"}

package/out/command-line/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.main = exports.registerCommands = void 0;
-const tslib_1 = require("tslib");
 const cli_shared_1 = require("@forge/cli-shared");
 const dependency_injection_1 = require("./dependency-injection");
 const version_info_1 = require("./version-info");
@@ -17,9 +16,11 @@ const register_log_commands_1 = require("./register-log-commands");
 const register_tunnel_commands_1 = require("./register-tunnel-commands");
 const register_webtrigger_commands_1 = require("./register-webtrigger-commands");
 const register_feedback_commands_1 = require("./register-feedback-commands");
-const command_suggestion_service_1 = tslib_1.__importDefault(require("../service/command-suggestion-service"));
+const register_settings_commands_1 = require("./register-settings-commands");
+const register_providers_commands_1 = require("./register-providers-commands");
 const sortCommands = (cmd) => {
     cmd.getDefinedCommands().sort((a, b) => a.name().localeCompare(b.name()));
+    cmd.getCommands().sort((a, b) => a.getCmdName().localeCompare(b.getCmdName()));
 };
 exports.registerCommands = (deps, cliDetails) => {
     if (cliDetails) {
@@ -40,47 +41,26 @@ exports.registerCommands = (deps, cliDetails) => {
     register_tunnel_commands_1.registerCommands(deps);
     register_webtrigger_commands_1.registerCommands(deps);
     register_feedback_commands_1.registerCommands(deps);
+    register_settings_commands_1.registerCommands(deps);
+    register_providers_commands_1.registerCommands(deps);
     sortCommands(deps.cmd);
 };
 const registerEvents = ({ cmd, ui }) => {
+    cmd.configureOutput({
+        writeErr: () => { }
+    });
     cmd.exitOverride((err) => {
         throw new command_1.WrapperError(err, 'cli');
     });
-    cmd.onUnknownCommand(([command]) => {
-        const errorMessage = [];
-        const suggestionService = new command_suggestion_service_1.default();
-        const suggestions = suggestionService.getSuggestions(command, cmd.getDefinedCommands().map((cmd) => cmd.name()));
-        errorMessage.push(cli_shared_1.Text.invalidCmd(command));
-        if (suggestions.length) {
-            errorMessage.push(`Did you mean:`);
-            errorMessage.push(suggestions.join('\n'));
-            errorMessage.push(cli_shared_1.Text.invalidCmdHelp);
-            ui.info(errorMessage.join('\n\n'));
-        }
-        else {
-            errorMessage.push(cli_shared_1.Text.invalidCmdHelp);
-            ui.error(new Error(errorMessage.join(' ')));
-        }
-        process.exit(0);
-    });
     process.on('unhandledRejection', (reason, promise) => {
         cli_shared_1.exitOnError(ui)(new Error(cli_shared_1.Text.error.unhandledRejection(reason, promise)));
     });
 };
-const runCLI = ({ cmd, ui }) => {
-    try {
-        if (!cmd.parse(process.argv)) {
-            cmd.help();
-        }
-    }
-    catch (err) {
-        return command_1.Command.reportHelp(cmd, err).then((e) => cli_shared_1.exitOnError(ui)(e));
-    }
-};
 exports.main = async () => {
     const cliDetails = version_info_1.getCLIDetails();
     const deps = await dependency_injection_1.getDependencies(cliDetails);
     exports.registerCommands(deps, cliDetails);
     registerEvents(deps);
-    await runCLI(deps);
+    await deps.controllers.prerequisitesController.check();
+    await deps.cmd.parse(process.argv);
 };

package/out/command-line/register-app-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-app-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-app-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAqB,aAAa,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG/G,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAsBtD,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAc7E;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,aAAa,EACjB,gBAAgB,EAAE,gBAAgB,EAClC,IAAI,EAAE,MAAM,EACZ,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,2BAA2B,GACnD,OAAO,CAAC,sBAAsB,CAAC,CAoFjC;AAoDD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAGlD"}
+{"version":3,"file":"register-app-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-app-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAqB,aAAa,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG/G,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAsBtD,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAY7E;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,aAAa,EACjB,gBAAgB,EAAE,gBAAgB,EAClC,IAAI,EAAE,MAAM,EACZ,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,2BAA2B,GACnD,OAAO,CAAC,sBAAsB,CAAC,CAoFjC;AA0CD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAGlD"}

package/out/command-line/register-app-commands.js

@@ -27,9 +27,7 @@ function directoryNameFromAppName(appName) {
     if (appName === undefined) {
         return undefined;
     }
-    const normalized = sanitize_filename_1.default(appName.trim())
-        .trim()
-        .replace(/ /g, '-');
+    const normalized = sanitize_filename_1.default(appName.trim()).trim().replace(/ /g, '-');
     const chars = Array.from(normalized);
     const allDashes = chars.every((char) => char === '-');
     return allDashes ? undefined : normalized;
@@ -113,18 +111,10 @@ function registerRegisterCommand({ cmd, ui, commands: { registerAppCommand } })
         ui.info(cli_shared_1.Text.register.intro);
         ui.info(cli_shared_1.Text.ctrlC);
         ui.emptyLine();
-        const oldAppName = await registerAppCommand.isAppAlreadyConfigured();
-        if (oldAppName !== 'missing') {
-            const force = await ui.confirm(cli_shared_1.Text.register.confirmQuestion);
-            ui.emptyLine();
-            if (!force) {
-                return;
-            }
-        }
         if (!name) {
             ui.info(cli_shared_1.Text.create.overviewAppName);
         }
-        const appName = name || (await ui.promptForText(cli_shared_1.Text.create.promptName, oldAppName === 'missing' ? undefined : oldAppName));
+        const appName = await ui.promptForText(cli_shared_1.Text.create.promptName);
         ui.emptyLine();
         const result = await ui.displayProgress(() => registerAppCommand.execute({ name: appName }), cli_shared_1.Text.register.cmd.start, cli_shared_1.Text.register.cmd.success(appName));
         ui.info(cli_shared_1.Text.register.cmd.successDetails(cli_shared_2.VALID_ENVIRONMENT_OPTIONS));

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

@@ -1 +1 @@
-{"version":3,"file":"register-authentication-command.d.ts","sourceRoot":"","sources":["../../src/command-line/register-authentication-command.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,+BAA+B,EAMhC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAQ,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAYtD,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,aAAa,EACjB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,YAAY,EAC1B,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,mBAAmB,GACpC,OAAO,CAAC;IAAE,KAAK,EAAE,+BAA+B,CAAC;IAAC,SAAS,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;CAAE,CAAC,CAoCrH;AAgED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAKlD"}
+{"version":3,"file":"register-authentication-command.d.ts","sourceRoot":"","sources":["../../src/command-line/register-authentication-command.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,+BAA+B,EAKhC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAQ,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAYtD,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,aAAa,EACjB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,YAAY,EAC1B,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,mBAAmB,GACpC,OAAO,CAAC;IAAE,KAAK,EAAE,+BAA+B,CAAC;IAAC,SAAS,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;CAAE,CAAC,CAoCrH;AAgDD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAIlD"}

package/out/command-line/register-authentication-command.js

@@ -50,6 +50,7 @@ function registerLoginCommand({ cmd, ui, graphqlGateway, commands: { loginComman
         .option('-u, --email <user email>', cli_shared_2.Text.login.optionEmail)
         .option('-t, --token <api token>', cli_shared_2.Text.login.optionToken)
         .requireNoAuthentication()
+        .nonInteractiveOption('--email', '--token')
         .action((options) => loginCommandHandler(ui, instructionsUrl, loginCommand, options));
 }
 function registerLogoutCommand({ cmd, ui, commands: { logoutCommand } }) {
@@ -62,26 +63,11 @@ function registerLogoutCommand({ cmd, ui, commands: { logoutCommand } }) {
         ui.info(cli_shared_2.Text.logout.loggedOut);
     });
 }
-function registerLoginCICommand({ cmd, ui, commands: { createContainerTokenCommand } }) {
-    cmd
-        .command('login:ci')
-        .description(cli_shared_2.Text.loginci.cmd)
-        .requireAppId()
-        .requireNoAuthentication()
-        .action(async () => {
-        const token = await createContainerTokenCommand.execute();
-        ui.info(cli_shared_2.Text.loginci.success(cli_shared_1.KEY, token));
-    });
-}
 function registerWhoAmICommand({ cmd, ui, commands: { loginCommand } }) {
     cmd
         .command('whoami')
         .description(cli_shared_2.Text.whoami.cmd)
         .action(async () => {
-        if (cli_shared_1.ContainerTokenAuthenticator.isAvailable()) {
-            ui.info(cli_shared_2.Text.whoami.success.containerToken(cli_shared_1.KEY));
-            return;
-        }
         try {
             const credentials = await cli_shared_1.getCredentialsStoreProvider(ui).getCredentials();
             const { name, accountId } = await loginCommand.getUser(credentials);
@@ -101,7 +87,6 @@ function registerWhoAmICommand({ cmd, ui, commands: { loginCommand } }) {
 function registerCommands(deps) {
     registerLoginCommand(deps);
     registerLogoutCommand(deps);
-    registerLoginCICommand(deps);
     registerWhoAmICommand(deps);
 }
 exports.registerCommands = registerCommands;

package/out/command-line/register-deployment-commands.d.ts

@@ -8,6 +8,14 @@ export interface DeploymentResult {
             extensionList: string[];
             fileCount: number;
         }[];
+        egressPermissionList?: {
+            type: string;
+            domains: string[] | undefined;
+        }[];
+        connectKey?: {
+            action?: string;
+            value?: string;
+        };
     };
 }
 export declare const registerCommands: ({ cmd, controllers: { deployController } }: Dependencies) => void;

package/out/command-line/register-deployment-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-deployment-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-deployment-commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE;QACT,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;QACtB,kBAAkB,EAAE;YAClB,OAAO,EAAE,MAAM,CAAC;YAChB,OAAO,EAAE,MAAM,CAAC;YAChB,aAAa,EAAE,MAAM,EAAE,CAAC;YACxB,SAAS,EAAE,MAAM,CAAC;SACnB,EAAE,CAAC;KACL,CAAC;CACH;AAID,eAAO,MAAM,gBAAgB,+CAAgD,YAAY,SAQxF,CAAC"}
+{"version":3,"file":"register-deployment-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-deployment-commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE;QACT,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;QACtB,kBAAkB,EAAE;YAClB,OAAO,EAAE,MAAM,CAAC;YAChB,OAAO,EAAE,MAAM,CAAC;YAChB,aAAa,EAAE,MAAM,EAAE,CAAC;YACxB,SAAS,EAAE,MAAM,CAAC;SACnB,EAAE,CAAC;QACJ,oBAAoB,CAAC,EAAE;YACrB,IAAI,EAAE,MAAM,CAAC;YACb,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;SAC/B,EAAE,CAAC;QACJ,UAAU,CAAC,EAAE;YACX,MAAM,CAAC,EAAE,MAAM,CAAC;YAChB,KAAK,CAAC,EAAE,MAAM,CAAC;SAChB,CAAC;KACH,CAAC;CACH;AAID,eAAO,MAAM,gBAAgB,+CAAgD,YAAY,SASxF,CAAC"}

package/out/command-line/register-deployment-commands.js

@@ -10,5 +10,6 @@ exports.registerCommands = ({ cmd, controllers: { deployController } }) => {
         .description(cli_shared_1.Text.deploy.cmd.desc)
         .option('-f, --no-verify', 'Disable pre-deployment checks')
         .environmentOption()
+        .nonInteractiveOption()
         .action(async (opts) => deployController.run(opts));
 };

package/out/command-line/register-environment-variables-commands.d.ts

@@ -1,3 +1,3 @@
 import { Dependencies } from './dependency-injection';
-export declare const registerCommands: (deps: Dependencies) => void;
+export declare const registerCommands: ({ cmd, ...deps }: Dependencies) => void;
 //# sourceMappingURL=register-environment-variables-commands.d.ts.map

package/out/command-line/register-environment-variables-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-environment-variables-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-environment-variables-commands.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAsGtD,eAAO,MAAM,gBAAgB,SAAU,YAAY,SAIlD,CAAC"}
+{"version":3,"file":"register-environment-variables-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-environment-variables-commands.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAwHtD,eAAO,MAAM,gBAAgB,qBAAsB,YAAY,KAAG,IAOjE,CAAC"}

package/out/command-line/register-environment-variables-commands.js

@@ -6,9 +6,11 @@ const cli_table3_1 = tslib_1.__importDefault(require("cli-table3"));
 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 COMMAND_NAME = 'variables';
+const SET_COMMAND_NAME = 'set';
 const registerSetEnvironmentVariableCommand = ({ cmd, ui, commands: { setEnvironmentVariableCommand } }) => {
     cmd
-        .command('variables:set [key] [value]')
+        .command(`${SET_COMMAND_NAME} [key] [value]`)
         .requireAppId()
         .description(cli_shared_2.Text.varsSet.cmd.desc)
         .option('--encrypt', cli_shared_2.Text.varsSet.optionSecret, false)
@@ -40,9 +42,10 @@ const registerSetEnvironmentVariableCommand = ({ cmd, ui, commands: { setEnviron
         ui.info(cli_shared_2.Text.varsList.hint);
     });
 };
+const UNSET_COMMAND_NAME = 'unset';
 const registerDeleteEnvironmentVariableCommand = ({ cmd, ui, commands: { deleteEnvironmentVariableCommand } }) => {
     cmd
-        .command('variables:unset <key>')
+        .command(`${UNSET_COMMAND_NAME} <key>`)
         .requireAppId()
         .description(cli_shared_2.Text.varsUnset.cmd.desc)
         .environmentOption()
@@ -54,9 +57,10 @@ const registerDeleteEnvironmentVariableCommand = ({ cmd, ui, commands: { deleteE
         ui.info(cli_shared_2.Text.varsList.hint);
     });
 };
+const LIST_COMMAND_NAME = 'list';
 const registerListEnvironmentVariableCommand = ({ cmd, ui, commands: { listEnvironmentVariablesCommand } }) => {
     cmd
-        .command('variables:list')
+        .command(LIST_COMMAND_NAME)
         .requireAppId()
         .description(cli_shared_2.Text.varsList.cmd)
         .environmentOption()
@@ -77,8 +81,19 @@ const registerListEnvironmentVariableCommand = ({ cmd, ui, commands: { listEnvir
         ui.info(cli_shared_2.Text.varsList.postfix);
     });
 };
-exports.registerCommands = (deps) => {
-    registerSetEnvironmentVariableCommand(deps);
-    registerDeleteEnvironmentVariableCommand(deps);
-    registerListEnvironmentVariableCommand(deps);
+const DEPRECATED_SET_COMMAND = 'variables:set';
+const DEPRECATED_UNSET_COMMAND = 'variables:unset';
+const DEPRECATED_LIST_COMMAND = 'variables:list';
+const registerVariablesSubcommandStubs = ({ cmd, controllers: { stubController } }) => {
+    cmd.deprecatedCommand(DEPRECATED_SET_COMMAND, `${COMMAND_NAME} ${SET_COMMAND_NAME}`, stubController);
+    cmd.deprecatedCommand(DEPRECATED_UNSET_COMMAND, `${COMMAND_NAME} ${UNSET_COMMAND_NAME}`, stubController);
+    cmd.deprecatedCommand(DEPRECATED_LIST_COMMAND, `${COMMAND_NAME} ${LIST_COMMAND_NAME}`, stubController);
+};
+exports.registerCommands = (_a) => {
+    var { cmd } = _a, deps = tslib_1.__rest(_a, ["cmd"]);
+    const variables = cmd.command(COMMAND_NAME).description(cli_shared_2.Text.variables.description);
+    registerVariablesSubcommandStubs(Object.assign({ cmd }, deps));
+    registerSetEnvironmentVariableCommand(Object.assign({ cmd: variables }, deps));
+    registerDeleteEnvironmentVariableCommand(Object.assign({ cmd: variables }, deps));
+    registerListEnvironmentVariableCommand(Object.assign({ cmd: variables }, deps));
 };

package/out/command-line/register-installation-commands.d.ts

@@ -1,3 +1,6 @@
 import { Dependencies } from './dependency-injection';
-export declare const registerCommands: (deps: Dependencies) => void;
+import { Installation } from '../service/installation-service';
+export declare const performSingleUninstall: (installId: string, { ui, commands: { uninstallAppCommand } }: Dependencies) => Promise<void>;
+export declare const performMultipleUninstalls: (appsToUninstall: Installation[], { ui, commands: { uninstallAppCommand } }: Dependencies) => Promise<void>;
+export declare const registerCommands: ({ cmd, ...deps }: Dependencies) => void;
 //# sourceMappingURL=register-installation-commands.d.ts.map

package/out/command-line/register-installation-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-installation-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-installation-commands.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAwLtD,eAAO,MAAM,gBAAgB,SAAU,YAAY,SAIlD,CAAC"}
+{"version":3,"file":"register-installation-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-installation-commands.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AA2D/D,eAAO,MAAM,sBAAsB,cACtB,MAAM,6CAC0B,YAAY,kBAwBxD,CAAC;AAEF,eAAO,MAAM,yBAAyB,oBACnB,YAAY,EAAE,6CACY,YAAY,kBA+CxD,CAAC;AAgEF,eAAO,MAAM,gBAAgB,qBAAsB,YAAY,KAAG,IAejE,CAAC"}

package/out/command-line/register-installation-commands.js

@@ -1,32 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerCommands = void 0;
+exports.registerCommands = exports.performMultipleUninstalls = exports.performSingleUninstall = void 0;
 const tslib_1 = require("tslib");
 const cli_table3_1 = tslib_1.__importDefault(require("cli-table3"));
 const cli_shared_1 = require("@forge/cli-shared");
 const cli_shared_2 = require("@forge/cli-shared");
 const shared_1 = require("../installations/shared");
 const errors_1 = require("./errors");
+const COMMAND_NAME = 'install';
 const registerInstallAppCommand = ({ cmd, controllers: { installController } }) => {
     cmd
-        .command('install')
         .requireAppId()
         .environmentOption()
         .siteAndProductOption()
         .option('--upgrade', cli_shared_2.Text.install.optionUpgrade)
         .option('--confirm-scopes', cli_shared_2.Text.install.optionConfirmScopes)
+        .nonInteractiveOption('--site', '--product', '--environment')
         .description(cli_shared_2.Text.install.cmd.description)
-        .action(async ({ environment, site, product, upgrade, confirmScopes }) => {
-        await installController.run({ environment, site, product, upgrade, confirmScopes });
+        .action(async ({ environment, site, product, upgrade, confirmScopes, nonInteractive }) => {
+        await installController.run({ environment, site, product, upgrade, confirmScopes, nonInteractive });
     });
 };
+const LIST_COMMAND_NAME = 'list';
 const registerListInstallationsCommand = ({ cmd, ui, services: { installationsService } }) => {
     cmd
-        .command('install:list')
+        .command(LIST_COMMAND_NAME)
         .requireAppId()
         .description(cli_shared_2.Text.installList.cmd)
         .action(async () => {
-        const { installations, name: appName } = await installationsService.listAppInstallations();
+        const { installations } = await installationsService.listAppInstallations();
         if (!installations.length) {
             ui.info(cli_shared_2.Text.installList.noInstallations);
             return;
@@ -41,17 +43,27 @@ const registerListInstallationsCommand = ({ cmd, ui, services: { installationsSe
                 cli_shared_2.Text.install.booleanToScope(isLatest)
             ]);
         }
-        ui.info(cli_shared_2.Text.installList.banner(appName));
+        ui.info(cli_shared_2.Text.installList.banner);
         ui.info(table.toString());
     });
 };
-const performSingleUninstall = async (installId, { ui, commands: { uninstallAppCommand } }) => {
-    const installation = await ui.displayProgress(() => uninstallAppCommand.execute(installId), cli_shared_2.Text.uninstall.cmd.start, cli_shared_2.Text.uninstall.cmd.success(false));
-    ui.info(cli_shared_2.Text.uninstall.done(cli_shared_1.capitalizeProduct(installation.product), installation.site, installation.environmentKey, cli_shared_1.environmentToOption, false));
+exports.performSingleUninstall = async (installId, { ui, commands: { uninstallAppCommand } }) => {
+    const installation = await ui.displayProgress(() => uninstallAppCommand.execute(installId), cli_shared_2.Text.uninstall.cmd.start, (result) => ({
+        successful: !!result.successful,
+        message: cli_shared_2.Text.uninstall.cmd.success(false)
+    }));
+    const uninstallMessageFormat = installation.successful ? cli_shared_2.Text.uninstall.done : cli_shared_2.Text.uninstall.failed;
+    const uninstallMessage = uninstallMessageFormat(cli_shared_1.capitalizeProduct(installation.product), installation.site, installation.environmentKey, cli_shared_1.environmentToOption, false);
+    if (installation.successful) {
+        ui.info(uninstallMessage);
+    }
+    else {
+        ui.error(new shared_1.UninstallAppError(uninstallMessage));
+    }
 };
-const performMultipleUninstalls = async (appsToUninstall, { ui, commands: { uninstallAppCommand } }) => {
-    const filteredInstalaltions = appsToUninstall.filter(({ product }) => product !== 'identity');
-    const hasMultipleNonIdentityApps = filteredInstalaltions.length > 1;
+exports.performMultipleUninstalls = async (appsToUninstall, { ui, commands: { uninstallAppCommand } }) => {
+    const filteredInstallations = appsToUninstall.filter(({ product }) => product !== 'identity');
+    const hasMultipleNonIdentityApps = filteredInstallations.length > 1;
     const uninstalledApps = await ui.displayProgress(() => uninstallAppCommand.batchExecute([], appsToUninstall), cli_shared_2.Text.uninstall.cmd.start, (result) => {
         const isSuccessful = !result.some(({ successful }) => successful === false);
         return {
@@ -86,7 +98,7 @@ const registerUninstallCommand = (deps) => {
         .requireAppId()
         .description(cli_shared_2.Text.uninstall.cmd.desc)
         .action(async (installationId) => {
-        const { installations, name: appName } = await installationsService.listAppInstallations();
+        const { installations } = await installationsService.listAppInstallations();
         if (!installations.length) {
             ui.info(cli_shared_2.Text.installList.noInstallations);
             return;
@@ -96,11 +108,11 @@ const registerUninstallCommand = (deps) => {
             ui.info(cli_shared_2.Text.uninstall.info);
             ui.info(cli_shared_2.Text.ctrlC);
             ui.emptyLine();
-            await performSingleUninstall(installId, deps);
+            await exports.performSingleUninstall(installId, deps);
         }
         else {
-            const filteredInstallations = installations.filter((install) => install.product !== 'identity');
-            const selectedSitesIndexes = await ui.promptForTable(cli_shared_2.Text.uninstall.interactive.desc, cli_shared_2.Text.uninstall.interactive.progressInfo(appName), ['Environment', 'Site', 'Product'], filteredInstallations.map(({ id, environmentKey, product, site }) => ({
+            const filteredInstallations = installations.filter((install) => install.product !== 'identity' && install.product !== 'jira-servicedesk');
+            const selectedSitesIndexes = await ui.promptForTable(cli_shared_2.Text.uninstall.interactive.desc, cli_shared_2.Text.uninstall.interactive.progressInfo, ['Environment', 'Site', 'Product'], filteredInstallations.map(({ id, environmentKey, product, site }) => ({
                 names: [cli_shared_1.environmentToOption(environmentKey), site, cli_shared_1.capitalizeProduct(product)],
                 value: id
             })));
@@ -109,16 +121,20 @@ const registerUninstallCommand = (deps) => {
             const remainingApps = filteredInstallations.filter((_, index) => !selectedSitesIndexes.includes(index));
             appsToUninstall.push(...shared_1.getHangingIdentityInstallationsFromSite(installations, remainingApps, selectedSites));
             if (appsToUninstall.length > 1) {
-                await performMultipleUninstalls(appsToUninstall, deps);
+                await exports.performMultipleUninstalls(appsToUninstall, deps);
             }
             else {
-                await performSingleUninstall(appsToUninstall[0].id, deps);
+                await exports.performSingleUninstall(appsToUninstall[0].id, deps);
             }
         }
     });
 };
-exports.registerCommands = (deps) => {
-    registerInstallAppCommand(deps);
-    registerListInstallationsCommand(deps);
-    registerUninstallCommand(deps);
+const DEPRECATED_LIST_COMMAND = 'install:list';
+exports.registerCommands = (_a) => {
+    var { cmd } = _a, deps = tslib_1.__rest(_a, ["cmd"]);
+    const install = cmd.command(COMMAND_NAME).description(cli_shared_2.Text.variables.description);
+    registerUninstallCommand(Object.assign({ cmd }, deps));
+    cmd.deprecatedCommand(DEPRECATED_LIST_COMMAND, `${COMMAND_NAME} ${LIST_COMMAND_NAME}`, deps.controllers.stubController);
+    registerInstallAppCommand(Object.assign({ cmd: install }, deps));
+    registerListInstallationsCommand(Object.assign({ cmd: install }, deps));
 };

package/out/command-line/register-providers-commands.d.ts

@@ -0,0 +1,3 @@
+import { Dependencies } from './dependency-injection';
+export declare const registerCommands: (deps: Dependencies) => void;
+//# sourceMappingURL=register-providers-commands.d.ts.map

package/out/command-line/register-providers-commands.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"register-providers-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-providers-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AA8DtD,eAAO,MAAM,gBAAgB,SAAU,YAAY,KAAG,IAErD,CAAC"}