@forge/cli 6.8.2 → 6.9.0-next.22

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

@@ -10,6 +10,7 @@ import { ListContributorsCommand } from '../contributors/list-contributors';
 import { RemoveContributorsCommand } from '../contributors/remove-contributors';
 import { CreateEnvironmentCommand } from '../environment/create-environment';
 import { ListEnvironmentCommand } from '../environment/list-environment';
+import { DeleteEnvironmentCommand } from '../environment/delete-environment';
 import { InstallAppSiteCommand } from '../installations/install-app-site';
 import { UninstallAppCommand } from '../installations/uninstall-app';
 import { InstallationService } from '../service/installation-service';
@@ -53,6 +54,7 @@ export declare const getDependencies: (cliDetails: CLIDetails | undefined) => Pr
         removeContributorsCommand: RemoveContributorsCommand;
         createEnvironmentCommand: CreateEnvironmentCommand;
         listEnvironmentCommand: ListEnvironmentCommand;
+        deleteEnvironmentCommand: DeleteEnvironmentCommand;
         viewAppLogsCommand: ViewAppLogsCommand;
         getWebTriggerURLCommand: GetWebTriggerURLCommand;
         listEntitiesIndexesCommand: ListEntitiesIndexesCommand;

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

@@ -1 +1 @@
-{"version":3,"file":"dependency-injection.d.ts","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAGhB,kBAAkB,EAUlB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EAEnB,MAAM,mBAAmB,CAAC;AAc3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAML,0BAA0B,EAG3B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gCAAgC,EAAE,MAAM,sDAAsD,CAAC;AAExG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAIlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAGhF,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAMzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAIzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAWlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAIhF,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmTvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;AAC3D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}
+{"version":3,"file":"dependency-injection.d.ts","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAGhB,kBAAkB,EAUlB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EAEnB,MAAM,mBAAmB,CAAC;AAc3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAML,0BAA0B,EAG3B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gCAAgC,EAAE,MAAM,sDAAsD,CAAC;AAExG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAIlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAGhF,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAM7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAIzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAWlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAIhF,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqTvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;AAC3D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}

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

@@ -23,6 +23,7 @@ const graphql_client_4 = require("../contributors/graphql-client");
 const graphql_client_5 = require("../entities/graphql-client");
 const create_environment_1 = require("../environment/create-environment");
 const list_environment_1 = require("../environment/list-environment");
+const delete_environment_1 = require("../environment/delete-environment");
 const graphql_client_6 = require("../environment/graphql-client");
 const graphql_client_7 = require("../installations/graphql-client");
 const site_translation_1 = require("../installations/site-translation");
@@ -125,6 +126,7 @@ const getDependencies = async (cliDetails) => {
     const environmentClient = new graphql_client_6.GraphqlClient(graphQLClient);
     const createEnvironmentCommand = new create_environment_1.CreateEnvironmentCommand(environmentClient, assertiveAppConfigReader);
     const listEnvironmentCommand = new list_environment_1.ListEnvironmentCommand(environmentClient, assertiveAppConfigReader);
+    const deleteEnvironmentCommand = new delete_environment_1.DeleteEnvironmentCommand(environmentClient, 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);
@@ -206,6 +208,7 @@ const getDependencies = async (cliDetails) => {
             removeContributorsCommand,
             createEnvironmentCommand,
             listEnvironmentCommand,
+            deleteEnvironmentCommand,
             viewAppLogsCommand,
             getWebTriggerURLCommand,
             listEntitiesIndexesCommand

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

@@ -2,7 +2,14 @@ import { UI } from '@forge/cli-shared';
 import { Dependencies } from './dependency-injection';
 import { CreateEnvironmentCommand } from '../environment/create-environment';
 import { ListEnvironmentCommand } from '../environment/list-environment';
+import { DeleteEnvironmentCommand } from '../environment/delete-environment';
+interface RemoveEnvironmentArgs {
+    environment?: string[];
+    nonInteractive?: boolean;
+}
 export declare const createEnvironmentHandler: (ui: UI, createEnvironmentCommand: CreateEnvironmentCommand, environmentKey?: string) => Promise<void>;
 export declare const listEnvironmentHandler: (ui: UI, listEnvironmentCommand: ListEnvironmentCommand) => Promise<void>;
+export declare const deleteEnvironmentHandler: (ui: UI, options: RemoveEnvironmentArgs, listEnvironmentCommand: ListEnvironmentCommand, deleteEnvironmentCommand: DeleteEnvironmentCommand) => Promise<void>;
 export declare const registerCommands: (deps: Dependencies) => void;
+export {};
 //# sourceMappingURL=register-environment-commands.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"register-environment-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-environment-commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAQ,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAIzE,eAAO,MAAM,wBAAwB,OAC/B,EAAE,4BACoB,wBAAwB,mBACjC,MAAM,kBAmBxB,CAAC;AAEF,eAAO,MAAM,sBAAsB,OAAc,EAAE,0BAA0B,sBAAsB,kBAiClG,CAAC;AA8BF,eAAO,MAAM,gBAAgB,SAAU,YAAY,KAAG,IAMrD,CAAC"}
+{"version":3,"file":"register-environment-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-environment-commands.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EAMH,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAA2B,MAAM,mCAAmC,CAAC;AAMtG,UAAU,qBAAqB;IAC7B,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,eAAO,MAAM,wBAAwB,OAC/B,EAAE,4BACoB,wBAAwB,mBACjC,MAAM,kBAoBxB,CAAC;AAEF,eAAO,MAAM,sBAAsB,OAAc,EAAE,0BAA0B,sBAAsB,kBAiClG,CAAC;AAEF,eAAO,MAAM,wBAAwB,OAC/B,EAAE,WACG,qBAAqB,0BACN,sBAAsB,4BACpB,wBAAwB,kBAmCnD,CAAC;AA+IF,eAAO,MAAM,gBAAgB,SAAU,YAAY,KAAG,IAOrD,CAAC"}

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

@@ -1,17 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerCommands = exports.listEnvironmentHandler = exports.createEnvironmentHandler = void 0;
+exports.registerCommands = exports.deleteEnvironmentHandler = exports.listEnvironmentHandler = exports.createEnvironmentHandler = void 0;
+const tslib_1 = require("tslib");
 const cli_shared_1 = require("@forge/cli-shared");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const errors_1 = require("./errors");
 const COMMAND_NAME = 'environment';
 const createEnvironmentHandler = async (ui, createEnvironmentCommand, environmentKey) => {
-    ui.info(cli_shared_1.Text.createEnvironment.overview);
-    ui.emptyLine();
     if (!environmentKey) {
+        ui.info(cli_shared_1.Text.createEnvironment.overview);
+        ui.emptyLine();
         environmentKey = await ui.promptForText(cli_shared_1.Text.createEnvironment.promptEnvironmentKey);
         ui.emptyLine();
     }
-    const args = { environmentKey };
-    await ui.displayProgress(() => createEnvironmentCommand.execute(args), cli_shared_1.Text.createEnvironment.cmd.start, cli_shared_1.Text.createEnvironment.cmd.success(environmentKey));
+    const args = {
+        environmentKey: (0, cli_shared_1.optionToEnvironment)(environmentKey)
+    };
+    await ui.displayProgress(() => createEnvironmentCommand.execute(args), cli_shared_1.Text.createEnvironment.cmd.start, cli_shared_1.Text.createEnvironment.cmd.success(environmentKey, cli_shared_1.AppEnvironmentType.Development, cli_shared_1.environmentToOption));
     ui.emptyLine();
     ui.info(cli_shared_1.Text.createEnvironment.successMessage);
 };
@@ -27,10 +32,10 @@ const listEnvironmentHandler = async (ui, listEnvironmentCommand) => {
         ['type', 'Type'],
         ['name', 'Name'],
         ['lastDeployedAt', 'Last deployed at']
-    ], environments.map(({ type, key: name, lastDeployedAt }) => {
+    ], environments.map(({ type, key, lastDeployedAt }) => {
         return {
             type,
-            name,
+            name: (0, cli_shared_1.environmentToOption)(key),
             lastDeployedAt
         };
     }), {
@@ -44,6 +49,92 @@ const listEnvironmentHandler = async (ui, listEnvironmentCommand) => {
     });
 };
 exports.listEnvironmentHandler = listEnvironmentHandler;
+const deleteEnvironmentHandler = async (ui, options, listEnvironmentCommand, deleteEnvironmentCommand) => {
+    let confirmDeleteEnvironments = false;
+    let environmentKeys = options.environment;
+    const nonInteractive = options.nonInteractive;
+    if (!environmentKeys) {
+        environmentKeys = await getEnvironmentKeysToDelete(ui, listEnvironmentCommand);
+    }
+    if (!environmentKeys) {
+        return;
+    }
+    environmentKeys = environmentKeys.map(cli_shared_1.optionToEnvironment);
+    if (nonInteractive) {
+        confirmDeleteEnvironments = true;
+    }
+    if (!confirmDeleteEnvironments) {
+        confirmDeleteEnvironments = await getDeleteConfirmation(ui, environmentKeys);
+    }
+    if (!confirmDeleteEnvironments) {
+        return;
+    }
+    ui.emptyLine();
+    const { deletedEnvironments, successful } = await deleteEnvironments(ui, deleteEnvironmentCommand, environmentKeys);
+    ui.emptyLine();
+    displayDeleteResult(ui, deletedEnvironments, successful);
+};
+exports.deleteEnvironmentHandler = deleteEnvironmentHandler;
+const getEnvironmentKeysToDelete = async (ui, listEnvironmentCommand) => {
+    const environments = (await listEnvironmentCommand.execute())
+        .filter((env) => env.type === cli_shared_1.AppEnvironmentType.Development && env.key !== cli_shared_1.DEFAULT_ENVIRONMENT_KEY)
+        .sort((a, b) => Number(a.lastDeployedAt) - Number(b.lastDeployedAt));
+    if (environments.length === 0) {
+        ui.info(cli_shared_1.Text.deleteEnvironment.noEnvironmentMessage);
+        return;
+    }
+    ui.info(cli_shared_1.Text.deleteEnvironment.overview);
+    ui.emptyLine();
+    const selectedEnvironmentIndexes = await ui.promptForTable(cli_shared_1.Text.deleteEnvironment.prompt, cli_shared_1.Text.deleteEnvironment.info, ['Name', 'Last deployed at'], environments.map(({ key, lastDeployedAt }) => ({
+        names: [(0, cli_shared_1.environmentToOption)(key), new Date(Number(lastDeployedAt)).toISOString()]
+    })));
+    return selectedEnvironmentIndexes.map((index) => environments[index].key);
+};
+const getDeleteConfirmation = async (ui, environmentKeys) => {
+    ui.info(cli_shared_1.Text.deleteEnvironment.confirmationInfo);
+    ui.emptyLine();
+    environmentKeys.forEach((envKey) => {
+        ui.info(chalk_1.default.grey((0, cli_shared_1.environmentToOption)(envKey)));
+    });
+    ui.emptyLine();
+    ui.warn(cli_shared_1.Text.deleteEnvironment.warningMessage);
+    ui.emptyLine();
+    return ui.confirm(cli_shared_1.Text.deleteEnvironment.promptConfirmation);
+};
+const deleteEnvironments = async (ui, deleteEnvironmentCommand, environmentKeys) => {
+    let successful = false;
+    const args = { environmentKeys };
+    const deletedEnvironments = await ui.displayProgress(() => deleteEnvironmentCommand.batchExecute(args), cli_shared_1.Text.deleteEnvironment.cmd.start, (result) => {
+        successful = result.every(({ successful }) => successful);
+        return {
+            successful,
+            message: cli_shared_1.Text.deleteEnvironment.cmd.start
+        };
+    });
+    return {
+        deletedEnvironments,
+        successful
+    };
+};
+const displayDeleteResult = (ui, deletedEnvironments, deleteSuccessful) => {
+    const deferredErrors = [];
+    const successfulDelete = deletedEnvironments.filter((env) => env.successful);
+    const failedDelete = deletedEnvironments.filter((env) => !env.successful);
+    successfulDelete.forEach(({ environmentKey }) => {
+        ui.info(cli_shared_1.Text.deleteEnvironment.individualSuccessMessage(environmentKey, cli_shared_1.AppEnvironmentType.Development, cli_shared_1.environmentToOption));
+    });
+    failedDelete.forEach(({ error }) => {
+        if (error !== undefined) {
+            ui.error(error);
+            deferredErrors.push(error);
+        }
+    });
+    if (!deleteSuccessful) {
+        throw new errors_1.DeferredErrors(deferredErrors);
+    }
+    ui.emptyLine();
+    ui.info(cli_shared_1.Text.deleteEnvironment.successMessage);
+};
 const registerCreateEnvironmentCommand = (parent, { ui, commands: { createEnvironmentCommand } }) => {
     parent
         .command('create')
@@ -64,10 +155,22 @@ const registerListEnvironmentCommand = (parent, { ui, commands: { listEnvironmen
         await (0, exports.listEnvironmentHandler)(ui, listEnvironmentCommand);
     });
 };
+const registerDeleteEnvironmentCommand = (parent, { ui, commands: { listEnvironmentCommand, deleteEnvironmentCommand } }) => {
+    parent
+        .command('delete')
+        .requireAppId()
+        .description(cli_shared_1.Text.deleteEnvironment.cmd.desc)
+        .option('-e, --environment [environments...]', cli_shared_1.Text.deleteEnvironment.optionEnvironmentKey)
+        .nonInteractiveOption('--environment')
+        .action(async (options) => {
+        await (0, exports.deleteEnvironmentHandler)(ui, options, listEnvironmentCommand, deleteEnvironmentCommand);
+    });
+};
 const registerCommands = (deps) => {
     const { cmd } = deps;
     const environment = cmd.command(COMMAND_NAME).description(cli_shared_1.Text.environment.desc);
     registerCreateEnvironmentCommand(environment, deps);
     registerListEnvironmentCommand(environment, deps);
+    registerDeleteEnvironmentCommand(environment, deps);
 };
 exports.registerCommands = registerCommands;

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

@@ -1,3 +1,6 @@
+import { UI } from '@forge/cli-shared';
 import { Dependencies } from './dependency-injection';
+import { ListEnvironmentVariablesCommand } from '../environment-variables/list-environment-variables';
+export declare function listEnvironmentVariableCommandHandler(ui: UI, listEnvironmentVariablesCommand: ListEnvironmentVariablesCommand, environment: string, json: boolean): Promise<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":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AA2HtD,eAAO,MAAM,gBAAgB,qBAAsB,YAAY,KAAG,IAOjE,CAAC"}
+{"version":3,"file":"register-environment-variables-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-environment-variables-commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAmD,MAAM,mBAAmB,CAAC;AAExF,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AA2EtG,wBAAsB,qCAAqC,CACzD,EAAE,EAAE,EAAE,EACN,+BAA+B,EAAE,+BAA+B,EAChE,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,OAAO,iBAwBd;AA4BD,eAAO,MAAM,gBAAgB,qBAAsB,YAAY,KAAG,IAOjE,CAAC"}

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

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerCommands = void 0;
+exports.registerCommands = exports.listEnvironmentVariableCommandHandler = void 0;
 const tslib_1 = require("tslib");
 const cli_shared_1 = require("@forge/cli-shared");
-const cli_shared_2 = require("@forge/cli-shared");
 const COMMAND_NAME = 'variables';
 const SET_COMMAND_NAME = 'set';
 const registerSetEnvironmentVariableCommand = ({ cmd, ui, commands: { setEnvironmentVariableCommand } }) => {
@@ -14,7 +13,7 @@ const registerSetEnvironmentVariableCommand = ({ cmd, ui, commands: { setEnviron
         .option('--encrypt', cli_shared_1.Text.varsSet.optionSecret, false)
         .environmentOption()
         .action(async (key, value, { environment, encrypt }) => {
-        ui.info(cli_shared_1.Text.varsSet.overview(environment, cli_shared_2.environmentToOption));
+        ui.info(cli_shared_1.Text.varsSet.overview(environment, (0, cli_shared_1.guessEnvironmentType)(environment), cli_shared_1.environmentToOption));
         ui.info(cli_shared_1.Text.ctrlC);
         ui.emptyLine();
         if (!value && !encrypt) {
@@ -48,7 +47,7 @@ const registerDeleteEnvironmentVariableCommand = ({ cmd, ui, commands: { deleteE
         .description(cli_shared_1.Text.varsUnset.cmd.desc)
         .environmentOption()
         .action(async (key, { environment }) => {
-        ui.info(cli_shared_1.Text.varsUnset.cmd.start(environment, cli_shared_2.environmentToOption));
+        ui.info(cli_shared_1.Text.varsUnset.cmd.start(environment, (0, cli_shared_1.guessEnvironmentType)(environment), cli_shared_1.environmentToOption));
         ui.info(cli_shared_1.Text.ctrlC);
         await deleteEnvironmentVariableCommand.execute({ environment, key });
         ui.info(cli_shared_1.Text.varsUnset.cmd.success(key));
@@ -56,6 +55,27 @@ const registerDeleteEnvironmentVariableCommand = ({ cmd, ui, commands: { deleteE
     });
 };
 const LIST_COMMAND_NAME = 'list';
+async function listEnvironmentVariableCommandHandler(ui, listEnvironmentVariablesCommand, environment, json) {
+    const variables = await listEnvironmentVariablesCommand.execute({ environment });
+    ui.table([
+        ['encrypted', 'Encrypted?'],
+        ['key', 'Key'],
+        ['value', 'Value']
+    ], variables === null || variables === void 0 ? void 0 : variables.map(({ encrypt: encrypted, key, value }) => ({
+        encrypted,
+        key,
+        value: encrypted ? cli_shared_1.Text.varsList.encryptedValue : value
+    })), {
+        json,
+        emptyMessage: cli_shared_1.Text.varsList.empty(environment, (0, cli_shared_1.guessEnvironmentType)(environment), cli_shared_1.environmentToOption),
+        preMessage: cli_shared_1.Text.varsList.overview(environment, (0, cli_shared_1.guessEnvironmentType)(environment), cli_shared_1.environmentToOption),
+        postMessage: cli_shared_1.Text.varsList.postfix,
+        format: {
+            encrypted: (value) => (value ? '✔' : '')
+        }
+    });
+}
+exports.listEnvironmentVariableCommandHandler = listEnvironmentVariableCommandHandler;
 const registerListEnvironmentVariableCommand = ({ cmd, ui, commands: { listEnvironmentVariablesCommand } }) => {
     cmd
         .command(LIST_COMMAND_NAME)
@@ -64,24 +84,7 @@ const registerListEnvironmentVariableCommand = ({ cmd, ui, commands: { listEnvir
         .environmentOption()
         .jsonOption()
         .action(async ({ environment, json }) => {
-        const variables = await listEnvironmentVariablesCommand.execute({ environment });
-        ui.table([
-            ['encrypted', 'Encrypted?'],
-            ['key', 'Key'],
-            ['value', 'Value']
-        ], variables === null || variables === void 0 ? void 0 : variables.map(({ encrypt: encrypted, key, value }) => ({
-            encrypted,
-            key,
-            value: encrypted ? cli_shared_1.Text.varsList.encryptedValue : value
-        })), {
-            json,
-            emptyMessage: cli_shared_1.Text.varsList.empty(environment, cli_shared_2.environmentToOption),
-            preMessage: cli_shared_1.Text.varsList.overview(environment, cli_shared_2.environmentToOption),
-            postMessage: cli_shared_1.Text.varsList.postfix,
-            format: {
-                encrypted: (value) => (value ? '✔' : '')
-            }
-        });
+        await listEnvironmentVariableCommandHandler(ui, listEnvironmentVariablesCommand, environment, json);
     });
 };
 const DEPRECATED_SET_COMMAND = 'variables:set';

package/out/command-line/version-info.js

@@ -23,7 +23,7 @@ const getCLIDetails = () => {
     }
 };
 exports.getCLIDetails = getCLIDetails;
-const supportedNodeMajorVersions = [14, 16, 18];
+const supportedNodeMajorVersions = [16, 18];
 exports.semverSupportedNodeVersion = supportedNodeMajorVersions.map((v) => `${v}.x`).join(' || ');
 exports.humanReadableSupportedNodeVersion = supportedNodeMajorVersions
     .map((v) => `${v}.x`)

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

@@ -1 +1 @@
-{"version":3,"file":"tunnel-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/tunnel-view.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,aAAa,EAGb,WAAW,EAGX,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGpC,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,qBAAa,eAAgB,SAAQ,SAAS;CAAG;AAEjD,qBAAa,UAAU;IACT,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,aAAa;IAEvC,cAAc,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI;IAW7C,qBAAqB,CAAC,MAAM,EAAE,OAAO,WAAW,GAAG,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC;IAQhF,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,MAAM;IA+BxE,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAQpG,sBAAsB,CAC3B,yBAAyB,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,EACnD,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,yBAAyB,GAC3D,OAAO,CAAC,IAAI,CAAC;CAyCjB"}
+{"version":3,"file":"tunnel-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/tunnel-view.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,aAAa,EAGb,WAAW,EAIX,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGpC,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,qBAAa,eAAgB,SAAQ,SAAS;CAAG;AAEjD,qBAAa,UAAU;IACT,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,aAAa;IAEvC,cAAc,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI;IAa7C,qBAAqB,CAAC,MAAM,EAAE,OAAO,WAAW,GAAG,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC;IAQhF,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,MAAM;IA+BxE,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAQpG,sBAAsB,CAC3B,yBAAyB,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,EACnD,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,yBAAyB,GAC3D,OAAO,CAAC,IAAI,CAAC;CAyCjB"}

package/out/command-line/view/tunnel-view.js

@@ -15,7 +15,7 @@ class TunnelView {
         this.ui.info(cli_shared_1.Text.tunnel.preamble);
         if (environmentKey && environmentKey !== cli_shared_1.DEFAULT_ENVIRONMENT_KEY) {
             this.ui.emptyLine();
-            this.ui.info(cli_shared_1.Text.tunnel.startingTunnel(environmentKey, cli_shared_1.environmentToOption));
+            this.ui.info(cli_shared_1.Text.tunnel.startingTunnel(environmentKey, (0, cli_shared_1.guessEnvironmentType)(environmentKey), cli_shared_1.environmentToOption));
             this.ui.emptyLine();
         }
         this.ui.info(cli_shared_1.Text.ctrlC);

package/out/deploy/deployer/deploy-monitor-graphql-client.d.ts

@@ -4,13 +4,8 @@ export interface DeployMonitorDetails {
     deploymentId: string;
     environmentKey: string;
 }
-export declare enum DeployMonitorStatus {
-    InProgress = "IN_PROGRESS",
-    Done = "DONE",
-    Failed = "FAILED"
-}
-export declare type DeployMonitor = Pick<AppDeployment, 'stages'> & Pick<AppDeployment, 'errorDetails'> & {
-    status: DeployMonitorStatus;
+export declare type DeployMonitor = Pick<AppDeployment, 'stages' | 'errorDetails' | 'status'> & {
+    requestId: string;
 };
 export declare type DeployMonitorEvent = AppDeploymentLogEvent | AppDeploymentSnapshotLogEvent | AppDeploymentTransitionEvent;
 export interface DeployMonitorClient {

package/out/deploy/deployer/deploy-monitor-graphql-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy-monitor-graphql-client.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/deploy-monitor-graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,qBAAqB,EACrB,6BAA6B,EAC7B,4BAA4B,EAC5B,aAAa,EAEd,MAAM,mBAAmB,CAAC;AAI3B,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,oBAAY,mBAAmB;IAC7B,UAAU,gBAAgB;IAC1B,IAAI,SAAS;IACb,MAAM,WAAW;CAClB;AAED,oBAAY,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,GACvD,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,GAAG;IAAE,MAAM,EAAE,mBAAmB,CAAA;CAAE,CAAC;AAGxE,oBAAY,kBAAkB,GAAG,qBAAqB,GAAG,6BAA6B,GAAG,4BAA4B,CAAC;AAEtH,MAAM,WAAW,mBAAmB;IAClC,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CACtE;AAED,qBAAa,0BAA2B,YAAW,mBAAmB;IACxD,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,aAAa,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE,oBAAoB,GAAG,OAAO,CAAC,aAAa,CAAC;CA8ClH"}
+{"version":3,"file":"deploy-monitor-graphql-client.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/deploy-monitor-graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,qBAAqB,EACrB,6BAA6B,EAC7B,4BAA4B,EAC5B,aAAa,EAEd,MAAM,mBAAmB,CAAC;AAI3B,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,oBAAY,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,QAAQ,GAAG,cAAc,GAAG,QAAQ,CAAC,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAG9G,oBAAY,kBAAkB,GAAG,qBAAqB,GAAG,6BAA6B,GAAG,4BAA4B,CAAC;AAEtH,MAAM,WAAW,mBAAmB;IAClC,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CACtE;AAED,qBAAa,0BAA2B,YAAW,mBAAmB;IACxD,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,aAAa,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE,oBAAoB,GAAG,OAAO,CAAC,aAAa,CAAC;CA8ClH"}

package/out/deploy/deployer/deploy-monitor-graphql-client.js

@@ -1,19 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeployMonitorGraphqlClient = exports.DeployMonitorStatus = void 0;
+exports.DeployMonitorGraphqlClient = void 0;
 const trigger_deploy_graphql_client_1 = require("./trigger-deploy-graphql-client");
-var DeployMonitorStatus;
-(function (DeployMonitorStatus) {
-    DeployMonitorStatus["InProgress"] = "IN_PROGRESS";
-    DeployMonitorStatus["Done"] = "DONE";
-    DeployMonitorStatus["Failed"] = "FAILED";
-})(DeployMonitorStatus = exports.DeployMonitorStatus || (exports.DeployMonitorStatus = {}));
 class DeployMonitorGraphqlClient {
     constructor(graphqlClient) {
         this.graphqlClient = graphqlClient;
     }
     async getDeployment({ appId, environmentKey, deploymentId }) {
-        const result = await this.graphqlClient.query(`
+        const { appDeployment, requestId } = await this.graphqlClient.query(`
         query forge_cli_getApplicationDeploymentStatus($appId: ID!, $environmentKey: String!, $id: ID!) {
           appDeployment(appId: $appId, environmentKey: $environmentKey, id: $id) {
             status
@@ -48,10 +42,10 @@ class DeployMonitorGraphqlClient {
             environmentKey,
             id: deploymentId
         });
-        if (!result.appDeployment) {
+        if (!appDeployment) {
             throw new trigger_deploy_graphql_client_1.NoDeploymentError();
         }
-        return result.appDeployment;
+        return Object.assign(Object.assign({}, appDeployment), { requestId });
     }
 }
 exports.DeployMonitorGraphqlClient = DeployMonitorGraphqlClient;

package/out/deploy/deployer/deployer.d.ts

@@ -1,19 +1,19 @@
-import { AppConfigProvider, Pause, UI, BaseError } from '@forge/cli-shared';
-import { DeployMonitorClient, DeployMonitorStatus } from './deploy-monitor-graphql-client';
+import { AppConfigProvider, AppDeploymentStatus, Pause, UI, BaseError } from '@forge/cli-shared';
+import { DeployMonitorClient } from './deploy-monitor-graphql-client';
 import { TriggerDeployClient } from './trigger-deploy-graphql-client';
 export declare class AppDeploymentFailedError extends BaseError {
-    private readonly userError?;
-    constructor(userError?: boolean | undefined, message?: string);
+    private readonly userError;
+    constructor(userError?: boolean, requestId?: string | undefined, message?: string);
     isUserError(): boolean;
 }
 export declare class AppSnapshotFailedError extends BaseError {
-    private readonly userError?;
-    constructor(userError?: boolean | undefined, message?: string);
+    private readonly userError;
+    constructor(userError?: boolean, requestId?: string | undefined, message?: string);
     isUserError(): boolean;
 }
 export declare class HostedResourceDeploymentFailedError extends BaseError {
-    private readonly userError?;
-    constructor(userError?: boolean | undefined, message?: string);
+    private readonly userError;
+    constructor(userError?: boolean, requestId?: string | undefined, message?: string);
     isUserError(): boolean;
 }
 export interface Deployer {
@@ -29,7 +29,7 @@ export declare class ArtifactDeployer implements Deployer {
     deploy(environmentKey: string, artifactUrl: string, hostedResourceUploadId?: string): Promise<void>;
     private doDeploy;
     pollAndCheckEvents(appId: string, environmentKey: string, deploymentId: string, totalStreamed: number): Promise<{
-        status: DeployMonitorStatus;
+        status: AppDeploymentStatus;
         totalStreamed: number;
     }>;
     private monitorDeployment;

package/out/deploy/deployer/deployer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/deployer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAOjB,KAAK,EAEL,EAAE,EAEF,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAsB,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC/G,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAItE,qBAAa,wBAAyB,SAAQ,SAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAAV,SAAS,CAAC,qBAAS,EAAE,OAAO,CAAC,EAAE,MAAM;IAG3D,WAAW,IAAI,OAAO;CAG9B;AACD,qBAAa,sBAAuB,SAAQ,SAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAAV,SAAS,CAAC,qBAAS,EAAE,OAAO,CAAC,EAAE,MAAM;IAG3D,WAAW,IAAI,OAAO;CAG9B;AACD,qBAAa,mCAAoC,SAAQ,SAAS;IACpD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAAV,SAAS,CAAC,qBAAS,EAAE,OAAO,CAAC,EAAE,MAAM;IAG3D,WAAW,IAAI,OAAO;CAG9B;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,sBAAsB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrG;AAyBD,qBAAa,gBAAiB,YAAW,QAAQ;IAE7C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAJF,gBAAgB,EAAE,iBAAiB,EACnC,YAAY,EAAE,mBAAmB,EACjC,mBAAmB,EAAE,mBAAmB,EACxC,KAAK,EAAE,KAAK,EACZ,EAAE,EAAE,EAAE;IAGZ,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,sBAAsB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAMlG,QAAQ;IAcT,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;;;;YA2BpG,iBAAiB;IAa/B,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,0BAA0B;IA6BlC,OAAO,CAAC,gBAAgB;CAiDzB"}
+{"version":3,"file":"deployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/deployer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAKjB,mBAAmB,EAGnB,KAAK,EAEL,EAAE,EAEF,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAsB,MAAM,iCAAiC,CAAC;AAC1F,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAItE,qBAAa,wBAAyB,SAAQ,SAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM;IAGlG,WAAW,IAAI,OAAO;CAG9B;AACD,qBAAa,sBAAuB,SAAQ,SAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM;IAGlG,WAAW,IAAI,OAAO;CAG9B;AACD,qBAAa,mCAAoC,SAAQ,SAAS;IACpD,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM;IAGlG,WAAW,IAAI,OAAO;CAG9B;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,sBAAsB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrG;AAyBD,qBAAa,gBAAiB,YAAW,QAAQ;IAE7C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAJF,gBAAgB,EAAE,iBAAiB,EACnC,YAAY,EAAE,mBAAmB,EACjC,mBAAmB,EAAE,mBAAmB,EACxC,KAAK,EAAE,KAAK,EACZ,EAAE,EAAE,EAAE;IAGZ,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,sBAAsB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAMlG,QAAQ;IAcT,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;;;;YA2BpG,iBAAiB;IAa/B,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,0BAA0B;IA6BlC,OAAO,CAAC,gBAAgB;CAsDzB"}

package/out/deploy/deployer/deployer.js

@@ -2,35 +2,34 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArtifactDeployer = exports.HostedResourceDeploymentFailedError = exports.AppSnapshotFailedError = exports.AppDeploymentFailedError = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
-const deploy_monitor_graphql_client_1 = require("./deploy-monitor-graphql-client");
 const DEPLOYMENT_EVENT_POLL_INTERVAL = 500;
 class AppDeploymentFailedError extends cli_shared_1.BaseError {
-    constructor(userError, message) {
-        super(message);
+    constructor(userError = false, requestId, message) {
+        super(requestId, `${message} (requestId: ${requestId || 'unknown'})`);
         this.userError = userError;
     }
     isUserError() {
-        return Boolean(this.userError);
+        return this.userError;
     }
 }
 exports.AppDeploymentFailedError = AppDeploymentFailedError;
 class AppSnapshotFailedError extends cli_shared_1.BaseError {
-    constructor(userError, message) {
-        super(message);
+    constructor(userError = false, requestId, message) {
+        super(requestId, message);
         this.userError = userError;
     }
     isUserError() {
-        return Boolean(this.userError);
+        return this.userError;
     }
 }
 exports.AppSnapshotFailedError = AppSnapshotFailedError;
 class HostedResourceDeploymentFailedError extends cli_shared_1.BaseError {
-    constructor(userError, message) {
-        super(message);
+    constructor(userError = false, requestId, message) {
+        super(requestId, message);
         this.userError = userError;
     }
     isUserError() {
-        return Boolean(this.userError);
+        return this.userError;
     }
 }
 exports.HostedResourceDeploymentFailedError = HostedResourceDeploymentFailedError;
@@ -65,7 +64,7 @@ class ArtifactDeployer {
         });
     }
     async pollAndCheckEvents(appId, environmentKey, deploymentId, totalStreamed) {
-        const { stages, status, errorDetails } = await this.deployMonitorClient.getDeployment({
+        const { stages, status, errorDetails, requestId } = await this.deployMonitorClient.getDeployment({
             appId,
             environmentKey,
             deploymentId
@@ -78,8 +77,8 @@ class ArtifactDeployer {
             }
             totalStreamed = events.length;
         }
-        if (status === deploy_monitor_graphql_client_1.DeployMonitorStatus.Failed) {
-            this.handleErrorEvent(errorDetails);
+        if (status === cli_shared_1.AppDeploymentStatus.Failed) {
+            this.handleErrorEvent(errorDetails, requestId);
         }
         return {
             status,
@@ -88,8 +87,8 @@ class ArtifactDeployer {
     }
     async monitorDeployment(appId, environmentKey, deploymentId) {
         let totalStreamed = 0;
-        let status = deploy_monitor_graphql_client_1.DeployMonitorStatus.InProgress;
-        while (status !== deploy_monitor_graphql_client_1.DeployMonitorStatus.Done) {
+        let status = cli_shared_1.AppDeploymentStatus.InProgress;
+        while (status !== cli_shared_1.AppDeploymentStatus.Done) {
             const checks = await this.pollAndCheckEvents(appId, environmentKey, deploymentId, totalStreamed);
             totalStreamed = checks.totalStreamed;
             status = checks.status;
@@ -140,26 +139,26 @@ class ArtifactDeployer {
             }
         };
     }
-    handleErrorEvent(errorDetails) {
+    handleErrorEvent(errorDetails, requestId) {
         var _a;
         if (errorDetails) {
             const { code, message } = errorDetails;
             if (code === 'APP_CODE_SNAPSHOT_FAILED') {
-                throw new AppSnapshotFailedError(true, cli_shared_1.Text.snapshot.error('App code snapshot error', message));
+                throw new AppSnapshotFailedError(true, requestId, cli_shared_1.Text.snapshot.error('App code snapshot error', message));
             }
             if (code === 'APP_CODE_SNAPSHOT_TIMEOUT') {
-                throw new AppSnapshotFailedError(false, cli_shared_1.Text.snapshot.timeout);
+                throw new AppSnapshotFailedError(false, requestId, cli_shared_1.Text.snapshot.timeout);
             }
             if (code === 'ENVIRONMENT_UPDATE_VALIDATION_FAILED') {
                 const causeMessage = (_a = errorDetails === null || errorDetails === void 0 ? void 0 : errorDetails.fields) === null || _a === void 0 ? void 0 : _a.validationResult.message.replace(/Upsert.*Details /, '');
                 if ((causeMessage === null || causeMessage === void 0 ? void 0 : causeMessage.startsWith('Invalid URL')) && causeMessage.includes('EGRESS')) {
-                    throw new AppDeploymentFailedError(true, cli_shared_1.Text.deploy.egressURL.invalidURLError(causeMessage));
+                    throw new AppDeploymentFailedError(true, requestId, cli_shared_1.Text.deploy.egressURL.invalidURLError(causeMessage));
                 }
                 else if (causeMessage === null || causeMessage === void 0 ? void 0 : causeMessage.startsWith('Egress permission URL')) {
-                    throw new AppDeploymentFailedError(true, cli_shared_1.Text.deploy.egressURL.tooManyURLCharactersError(causeMessage));
+                    throw new AppDeploymentFailedError(true, requestId, cli_shared_1.Text.deploy.egressURL.tooManyURLCharactersError(causeMessage));
                 }
                 else if (causeMessage === null || causeMessage === void 0 ? void 0 : causeMessage.includes('permission URLs provided, exceeding')) {
-                    throw new AppDeploymentFailedError(true, cli_shared_1.Text.deploy.egressURL.tooManyUrlsError(causeMessage));
+                    throw new AppDeploymentFailedError(true, requestId, cli_shared_1.Text.deploy.egressURL.tooManyUrlsError(causeMessage));
                 }
             }
             if ([
@@ -168,20 +167,20 @@ class ArtifactDeployer {
                 'HOSTED_RESOURCE_FILE_PATH_REFERS_TO_PARENT',
                 'HOSTED_RESOURCE_INVALID_EGRESS_PERMISSIONS'
             ].includes(code)) {
-                throw new HostedResourceDeploymentFailedError(true, cli_shared_1.Text.hostedResources.error(message));
+                throw new HostedResourceDeploymentFailedError(true, requestId, cli_shared_1.Text.hostedResources.error(message));
             }
             if ([
                 'HOSTED_RESOURCE_FAILED_TO_FETCH',
                 'HOSTED_RESOURCE_FAILED_TO_COPY',
                 'HOSTED_RESOURCE_UPLOAD_ID_MISSING'
             ].includes(code)) {
-                throw new HostedResourceDeploymentFailedError(false, cli_shared_1.Text.hostedResources.error(message));
+                throw new HostedResourceDeploymentFailedError(false, requestId, cli_shared_1.Text.hostedResources.error(message));
             }
             if (code === 'HOSTED_RESOURCES_LAMBDA_TIMEOUT') {
-                throw new HostedResourceDeploymentFailedError(false, cli_shared_1.Text.hostedResources.error(cli_shared_1.Text.hostedResources.lambdaTimeout));
+                throw new HostedResourceDeploymentFailedError(false, requestId, cli_shared_1.Text.hostedResources.error(cli_shared_1.Text.hostedResources.lambdaTimeout));
             }
         }
-        throw new AppDeploymentFailedError(false, cli_shared_1.Text.deploy.taskDeploy.serverStepFailed);
+        throw new AppDeploymentFailedError(false, requestId, cli_shared_1.Text.deploy.taskDeploy.serverStepFailed);
     }
 }
 exports.ArtifactDeployer = ArtifactDeployer;

package/out/environment/delete-environment.d.ts

@@ -0,0 +1,27 @@
+import { AppConfigProvider } from '@forge/cli-shared';
+export interface DeleteEnvironmentOutput {
+    environmentKey: string;
+    successful: boolean;
+    error?: Error;
+}
+export interface DeleteEnvironmentDetails {
+    appId: string;
+    environmentKey: string;
+}
+export interface BatchEnvironmentDetails {
+    environmentKeys: string[];
+}
+export interface BatchDeleteEnvironmentDetails extends BatchEnvironmentDetails {
+    appId: string;
+}
+export interface DeleteEnvironmentClient {
+    deleteEnvironment(details: DeleteEnvironmentDetails): Promise<boolean>;
+    deleteEnvironments(details: BatchDeleteEnvironmentDetails): Promise<DeleteEnvironmentOutput[]>;
+}
+export declare class DeleteEnvironmentCommand {
+    private readonly client;
+    private readonly getAppConfig;
+    constructor(client: DeleteEnvironmentClient, getAppConfig: AppConfigProvider);
+    batchExecute(details: BatchEnvironmentDetails): Promise<DeleteEnvironmentOutput[]>;
+}
+//# sourceMappingURL=delete-environment.d.ts.map

package/out/environment/delete-environment.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"delete-environment.d.ts","sourceRoot":"","sources":["../../src/environment/delete-environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,MAAM,WAAW,uBAAuB;IACtC,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,uBAAuB;IACtC,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,6BAA8B,SAAQ,uBAAuB;IAC5E,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,uBAAuB;IACtC,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACvE,kBAAkB,CAAC,OAAO,EAAE,6BAA6B,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAAC;CAChG;AAED,qBAAa,wBAAwB;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAA2B,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAA9D,MAAM,EAAE,uBAAuB,EAAmB,YAAY,EAAE,iBAAiB;IAEjG,YAAY,CAAC,OAAO,EAAE,uBAAuB;CAO3D"}