@forge/cli 0.0.0-experimental-383053a → 0.0.0-experimental-3b4aabe

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

@@ -3,10 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeployView = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
 const lint_1 = require("@forge/lint");
+const cs_ari_1 = require("@forge/util/packages/cs-ari");
 class DeployView {
     constructor(ui) {
         this.ui = ui;
     }
+    getLogger() {
+        return this.ui;
+    }
     displayStart(environment) {
         this.ui.info(cli_shared_1.Text.deploy.cmd.start1(environment, cli_shared_1.environmentToOption));
     }
@@ -27,9 +31,27 @@ class DeployView {
     displayNoLintProblems() {
         this.ui.info(cli_shared_1.LogColor.trace(cli_shared_1.Text.lint.noProblems) + '\n');
     }
-    async reportDeploymentProgress(name, environment, deployCallback) {
-        const result = await this.ui.displayProgress(() => deployCallback(), cli_shared_1.Text.deploy.cmd.start2(name, environment, cli_shared_1.environmentToOption), cli_shared_1.Text.deploy.cmd.success);
-        this.ui.info(cli_shared_1.Text.deploy.cmd.successDetails(name, environment, cli_shared_1.environmentToOption));
+    displayConnectKeyChangeWarning(environment, migrationKey, connectKey) {
+        this.ui.warn(cli_shared_1.Text.deploy.connectKeyChange.connectKeyChangeWarning(environment, migrationKey, connectKey));
+    }
+    displayConnectKeyDeleteWarning(environment) {
+        this.ui.warn(cli_shared_1.Text.deploy.connectKeyChange.connectKeyDeleteWarning(environment));
+    }
+    displayMPACAppConnectKeyChangeError(mpacAppKey, connectKey) {
+        this.ui.info(cli_shared_1.Text.deploy.connectKeyChange.mpacAppConnectKeyChangeError(mpacAppKey, connectKey));
+    }
+    async promptToContinueDeletingConnectKey() {
+        return await this.ui.confirm(cli_shared_1.Text.deploy.connectKeyChange.continueDelete);
+    }
+    async promptToContinueChangingConnectKey() {
+        return await this.ui.confirm(cli_shared_1.Text.deploy.connectKeyChange.continueChange);
+    }
+    async reportDeploymentProgress(id, environment, showDistributionPageLink, deployCallback) {
+        const result = await this.ui.displayProgress(() => deployCallback(), cli_shared_1.Text.deploy.cmd.start2(environment, cli_shared_1.environmentToOption), cli_shared_1.Text.deploy.cmd.success);
+        this.ui.info(cli_shared_1.Text.deploy.cmd.successDetails(environment, cli_shared_1.environmentToOption));
+        if (environment === 'production' && showDistributionPageLink) {
+            this.ui.info(cli_shared_1.Text.deploy.cmd.distributePageLink(cs_ari_1.parseAppAri(cs_ari_1.parse(id)).appId));
+        }
         return result;
     }
 }

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

@@ -1,15 +1,17 @@
-import { Installation } from '../../service/installation-service';
 import { UI } from '@forge/cli-shared';
+import { AppEnvironmentPermissions, Installation } from '../../service/installation-service';
 interface InstallOrUpgradeCommandText {
     listScopes: (scopes: string[]) => string;
-    scopesDefaultEnvironment: string;
+    listEgressAddresses: (egressAddresses: string[]) => string;
+    permissionsMismatch: (environment: string) => string;
+    promptForPermissionsConfirmation: (permissionsMismatchInDevelopment: boolean) => string;
 }
 export declare class NoScopesError extends Error {
 }
 export declare class InstallView {
     private readonly ui;
     constructor(ui: UI);
-    promptForScopesConfirmation(scopes: string[], environment: string, confirmScopes: boolean, text: InstallOrUpgradeCommandText): Promise<boolean>;
+    promptForPermissionsConfirmation({ scopes, egressAddresses, addedScopes }: AppEnvironmentPermissions, manifestScopes: string[], manifestEgressAddresses: string[], environment: string, confirmScopes: boolean, nonInteractive: boolean, text: InstallOrUpgradeCommandText): Promise<boolean>;
     promptForUpgrade(installations: Installation[]): Promise<Installation>;
 }
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"install-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/install-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAKL,EAAE,EAEH,MAAM,mBAAmB,CAAC;AAE3B,UAAU,2BAA2B;IACnC,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,MAAM,CAAC;IACzC,wBAAwB,EAAE,MAAM,CAAC;CAClC;AAED,qBAAa,aAAc,SAAQ,KAAK;CAAG;AAE3C,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAEtB,2BAA2B,CACtC,MAAM,EAAE,MAAM,EAAE,EAChB,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,OAAO,EACtB,IAAI,EAAE,2BAA2B,GAChC,OAAO,CAAC,OAAO,CAAC;IAsBN,gBAAgB,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;CAqBpF"}
+{"version":3,"file":"install-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/install-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgD,EAAE,EAA8B,MAAM,mBAAmB,CAAC;AAGjH,OAAO,EAAE,yBAAyB,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAE7F,UAAU,2BAA2B;IACnC,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,MAAM,CAAC;IACzC,mBAAmB,EAAE,CAAC,eAAe,EAAE,MAAM,EAAE,KAAK,MAAM,CAAC;IAC3D,mBAAmB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,CAAC;IACrD,gCAAgC,EAAE,CAAC,gCAAgC,EAAE,OAAO,KAAK,MAAM,CAAC;CACzF;AAED,qBAAa,aAAc,SAAQ,KAAK;CAAG;AAE3C,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAEtB,gCAAgC,CAC3C,EAAE,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,EAAE,yBAAyB,EACnE,cAAc,EAAE,MAAM,EAAE,EACxB,uBAAuB,EAAE,MAAM,EAAE,EACjC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,OAAO,EACtB,cAAc,EAAE,OAAO,EACvB,IAAI,EAAE,2BAA2B,GAChC,OAAO,CAAC,OAAO,CAAC;IAoCN,gBAAgB,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;CAqBpF"}

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InstallView = exports.NoScopesError = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
+const lodash_1 = require("lodash");
 class NoScopesError extends Error {
 }
 exports.NoScopesError = NoScopesError;
@@ -9,19 +10,27 @@ class InstallView {
     constructor(ui) {
         this.ui = ui;
     }
-    async promptForScopesConfirmation(scopes, environment, confirmScopes, text) {
-        const isDefaultEnvironment = (env) => env === cli_shared_1.optionToEnvironment(cli_shared_1.DEFAULT_ENVIRONMENT_OPTION);
+    async promptForPermissionsConfirmation({ scopes, egressAddresses, addedScopes }, manifestScopes, manifestEgressAddresses, environment, confirmScopes, nonInteractive, text) {
         if (scopes.length === 0) {
             throw new NoScopesError();
         }
-        if (isDefaultEnvironment(environment)) {
-            this.ui.info(text.scopesDefaultEnvironment);
+        if (addedScopes.length)
+            this.ui.info(text.listScopes(addedScopes));
+        if (egressAddresses.length)
+            this.ui.info(text.listEgressAddresses(egressAddresses));
+        const cleanedManifestScopes = [...new Set(['read:me', ...manifestScopes])];
+        const groupedManifestEgressAddresses = [];
+        let permissionsMismatchWithManifest = false;
+        if (cli_shared_1.environmentToOption(environment) === cli_shared_1.DEFAULT_ENVIRONMENT_OPTION) {
+            const scopesMismatch = !lodash_1.isEqual([...cleanedManifestScopes].sort(), [...scopes].sort());
+            const egressAddressesMismatch = !lodash_1.isEqual([...groupedManifestEgressAddresses].sort(), [...egressAddresses].sort());
+            permissionsMismatchWithManifest = scopesMismatch || egressAddressesMismatch;
+            if (permissionsMismatchWithManifest) {
+                this.ui.warn(text.permissionsMismatch(cli_shared_1.environmentToOption(environment)));
+            }
         }
-        else {
-            this.ui.info(text.listScopes(scopes));
-        }
-        if (!confirmScopes) {
-            const scopesConfirmationResult = await this.ui.confirm(cli_shared_1.Text.install.promptForScopesConfirmation);
+        if (!confirmScopes && !nonInteractive) {
+            const scopesConfirmationResult = await this.ui.confirm(text.promptForPermissionsConfirmation(permissionsMismatchWithManifest));
             if (scopesConfirmationResult)
                 this.ui.emptyLine();
             return scopesConfirmationResult;
@@ -29,7 +38,7 @@ class InstallView {
         return true;
     }
     async promptForUpgrade(installations) {
-        const installationIndex = await this.ui.promptForSingleChoiceTable(cli_shared_1.Text.upgradeContext.promptInstallation, cli_shared_1.Text.upgradeContext.overview, ['Environment', 'Site', 'Product', 'Scopes'], installations.map(({ id, environmentKey, product, site, version }) => ({
+        const installationIndex = await this.ui.promptForSingleChoiceTable(cli_shared_1.Text.upgradeContext.promptInstallation, cli_shared_1.Text.upgradeContext.overview, ['Environment', 'Site', 'Product', 'Version'], installations.map(({ id, environmentKey, product, site, version }) => ({
             names: [
                 cli_shared_1.environmentToOption(environmentKey),
                 site,

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

@@ -1,11 +1,12 @@
 import { UI } from '@forge/cli-shared';
-import { LintFixState, LintResult } from '@forge/lint';
+import { LintFixState, LintLogger, LintResult } from '@forge/lint';
 export declare class LintView {
     private readonly ui;
     private lintResultReporter;
-    constructor(ui: UI, lintResultReporter?: (logger: Pick<import("@forge/cli-shared").Logger, "info">, lintResults: LintResult[], showSummary?: boolean | undefined) => void);
+    constructor(ui: UI, lintResultReporter?: (logger: Pick<import("@forge/cli-shared/src").Logger, "info">, lintResults: LintResult[], showSummary?: boolean | undefined) => void);
     reportLintResult(results: LintResult[]): void;
     reportFixResult(result: LintFixState): void;
+    getLogger(): LintLogger;
     showBlurb(): void;
 }
 //# sourceMappingURL=lint-view.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"lint-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/lint-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,EAAE,EAAY,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAqB,MAAM,aAAa,CAAC;AAE1E,qBAAa,QAAQ;IACP,OAAO,CAAC,QAAQ,CAAC,EAAE;IAAM,OAAO,CAAC,kBAAkB;gBAAlC,EAAE,EAAE,EAAE,EAAU,kBAAkB,mIAAoB;IAE5E,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI;IAI7C,eAAe,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAU3C,SAAS,IAAI,IAAI;CAGzB"}
+{"version":3,"file":"lint-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/lint-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,EAAE,EAAY,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAqB,MAAM,aAAa,CAAC;AAEtF,qBAAa,QAAQ;IACP,OAAO,CAAC,QAAQ,CAAC,EAAE;IAAM,OAAO,CAAC,kBAAkB;gBAAlC,EAAE,EAAE,EAAE,EAAU,kBAAkB,uIAAoB;IAE5E,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI;IAI7C,eAAe,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAU3C,SAAS,IAAI,UAAU;IAIvB,SAAS,IAAI,IAAI;CAGzB"}

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

@@ -21,6 +21,9 @@ class LintView {
             this.ui.info(cli_shared_1.Text.lint.fixFollowUp);
         }
     }
+    getLogger() {
+        return this.ui;
+    }
     showBlurb() {
         this.ui.info(cli_shared_1.Text.lint.blurb);
     }

package/out/command-line/view/lite-lint-view.d.ts

@@ -1,9 +1,10 @@
 import { UI } from '@forge/cli-shared';
-import { LintResult } from '@forge/lint';
+import { LintLogger, LintResult } from '@forge/lint';
 export declare class LiteLintView {
     private readonly ui;
     private reporter;
-    constructor(ui: UI, reporter?: (logger: Pick<import("@forge/cli-shared").Logger, "info">, lintResults: LintResult[], showSummary?: boolean | undefined) => void);
+    constructor(ui: UI, reporter?: (logger: Pick<import("@forge/cli-shared/src").Logger, "info">, lintResults: LintResult[], showSummary?: boolean | undefined) => void);
     reportErrors(report: LintResult[]): void;
+    getLogger(): LintLogger;
 }
 //# sourceMappingURL=lite-lint-view.d.ts.map

package/out/command-line/view/lite-lint-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lite-lint-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/lite-lint-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AACvC,OAAO,EAAqB,UAAU,EAAE,MAAM,aAAa,CAAC;AAE5D,qBAAa,YAAY;IACX,OAAO,CAAC,QAAQ,CAAC,EAAE;IAAM,OAAO,CAAC,QAAQ;gBAAxB,EAAE,EAAE,EAAE,EAAU,QAAQ,mIAAoB;IAElE,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI;CAIhD"}
+{"version":3,"file":"lite-lint-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/lite-lint-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AACvC,OAAO,EAAqB,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAExE,qBAAa,YAAY;IACX,OAAO,CAAC,QAAQ,CAAC,EAAE;IAAM,OAAO,CAAC,QAAQ;gBAAxB,EAAE,EAAE,EAAE,EAAU,QAAQ,uIAAoB;IAElE,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI;IAKxC,SAAS,IAAI,UAAU;CAG/B"}

package/out/command-line/view/lite-lint-view.js

@@ -11,5 +11,8 @@ class LiteLintView {
         this.ui.emptyLine();
         this.reporter(this.ui, report, false);
     }
+    getLogger() {
+        return this.ui;
+    }
 }
 exports.LiteLintView = LiteLintView;

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

@@ -0,0 +1,8 @@
+import { UI } from '@forge/cli-shared';
+export declare class SettingsView {
+    private readonly ui;
+    constructor(ui: UI);
+    showSettings(preferences: [string, string, boolean | undefined][]): void;
+    setSuccess(setting: string, value: string): void;
+}
+//# sourceMappingURL=settings-view.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"settings-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/settings-view.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAEvC,qBAAa,YAAY;IACX,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAE5B,YAAY,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC,EAAE;IAWjE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAIjD"}

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

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SettingsView = 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");
+class SettingsView {
+    constructor(ui) {
+        this.ui = ui;
+    }
+    showSettings(preferences) {
+        const table = new cli_table3_1.default(Object.assign(Object.assign({}, cli_shared_1.TableStyle.default), { head: ['Setting', 'Description', 'Value'] }));
+        preferences.forEach(([preference, desc, value]) => table.push([preference, desc, value !== null && value !== void 0 ? value : 'Not set']));
+        this.ui.info(table.toString());
+    }
+    setSuccess(setting, value) {
+        this.ui.info(cli_shared_1.Text.settings.set.success(setting, value));
+        this.ui.emptyLine();
+    }
+}
+exports.SettingsView = SettingsView;

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

@@ -14,7 +14,7 @@ class DeployMonitorGraphqlClient {
     }
     async getDeployment({ appId, environmentKey, deploymentId }) {
         const result = await this.graphqlClient.query(`
-        query appDeployment($appId: ID!, $environmentKey: String!, $id: ID!) {
+        query forge_cli_getApplicationDeploymentStatus($appId: ID!, $environmentKey: String!, $id: ID!) {
           appDeployment(appId: $appId, environmentKey: $environmentKey, id: $id) {
             status
             errorDetails {

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,EAEH,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,KAAK;CAAG;AACtD,qBAAa,sBAAuB,SAAQ,KAAK;CAAG;AACpD,qBAAa,mCAAoC,SAAQ,KAAK;CAAG;AAEjE,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;CAkBzB"}
+{"version":3,"file":"deployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/deployer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAOjB,KAAK,EAEL,EAAE,EAEH,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,KAAK;CAAG;AACtD,qBAAa,sBAAuB,SAAQ,KAAK;CAAG;AACpD,qBAAa,mCAAoC,SAAQ,KAAK;CAAG;AAEjE,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;CA+BzB"}

package/out/deploy/deployer/deployer.js

@@ -120,10 +120,26 @@ class ArtifactDeployer {
         };
     }
     handleErrorEvent(errorDetails) {
+        var _a;
         if (errorDetails) {
             const { code, message } = errorDetails;
             if (code === 'APP_CODE_SNAPSHOT_FAILED') {
-                throw new AppSnapshotFailedError(cli_shared_1.Text.snapshot.error('App code error', message));
+                throw new AppSnapshotFailedError(cli_shared_1.Text.snapshot.error('App code snapshot error', message));
+            }
+            if (code === 'APP_CODE_SNAPSHOT_TIMEOUT') {
+                throw new AppSnapshotFailedError(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(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(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(cli_shared_1.Text.deploy.egressURL.tooManyUrlsError(causeMessage));
+                }
             }
             if (code === 'HOSTED_RESOURCE_TOO_MANY_FILES') {
                 throw new HostedResourceDeploymentFailedError(cli_shared_1.Text.hostedResources.error(message));

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

@@ -1 +1 @@
-{"version":3,"file":"trigger-deploy-graphql-client.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/trigger-deploy-graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA+D,MAAM,mBAAmB,CAAC;AAE/G,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CACxD;AAED,qBAAa,iBAAkB,SAAQ,KAAK;;CAI3C;AAED,qBAAa,0BAA2B,YAAW,mBAAmB;IACxD,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,MAAM,CAAC,iBAAiB,EAAE,oBAAoB;CAsC5D"}
+{"version":3,"file":"trigger-deploy-graphql-client.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/trigger-deploy-graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EAId,MAAM,mBAAmB,CAAC;AAE3B,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CACxD;AAED,qBAAa,iBAAkB,SAAQ,KAAK;;CAI3C;AAED,qBAAa,0BAA2B,YAAW,mBAAmB;IACxD,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,MAAM,CAAC,iBAAiB,EAAE,oBAAoB;CAuC5D"}

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

@@ -14,12 +14,14 @@ class TriggerDeployGraphQLClient {
     }
     async deploy(deploymentDetails) {
         const deployAppQuery = `
-      mutation deployApp($input: CreateAppDeploymentInput!) {
+      mutation forge_cli_deployApplication($input: CreateAppDeploymentInput!) {
         createAppDeployment(input: $input) {
           success
-          message
-          errorDetails {
-            code
+          errors {
+            message
+            extensions {
+              errorType
+            }
           }
           deployment {
             id
@@ -27,11 +29,12 @@ class TriggerDeployGraphQLClient {
         }
       }
     `;
-        const { response: { createAppDeployment: { deployment, message, success, errorDetails } }, requestId } = await this.graphqlClient.mutate(deployAppQuery, {
+        const { response: { createAppDeployment: { deployment, success, errors } }, requestId } = await this.graphqlClient.mutate(deployAppQuery, {
             input: deploymentDetails
         });
+        const error = cli_shared_1.getError(errors);
         if (!success) {
-            throw new cli_shared_1.GraphQlMutationError(`${message} (requestId: ${requestId || 'unknown'})`, errorDetails ? errorDetails.code : undefined);
+            throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, error.code);
         }
         if (!deployment) {
             throw new NoDeploymentError();

package/out/deploy/packager/archiver.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="node" />
+import { Logger } from '@forge/cli-shared';
 export interface Archiver {
     addFile(fileName: string, contents: Buffer): void;
-    addManifestFile(filePath: string): void;
+    addRootDependencyFiles(filePaths: string[], logger: Logger): void;
     finalise(): Promise<string>;
     onWarning(cb: (err: Error) => void): void;
     onEntry(cb: (filePath: string) => void): void;
@@ -13,7 +14,7 @@ export declare class ZipArchiver implements Archiver {
     private rejects;
     constructor();
     addFile(fileName: string, contents: Buffer): void;
-    addManifestFile(filePath: string): void;
+    addRootDependencyFiles(fileNames: string[], logger: Logger): void;
     finalise(): Promise<string>;
     onWarning(cb: (err: Error) => void): void;
     onEntry(cb: (filePath: string) => void): void;

package/out/deploy/packager/archiver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/archiver.ts"],"names":[],"mappings":";AAMA,MAAM,WAAW,QAAQ;IACvB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAClD,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5B,SAAS,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAC;IAC1C,OAAO,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;CAC/C;AAED,qBAAa,WAAY,YAAW,QAAQ;IAC1C,OAAO,CAAC,OAAO,CAAmB;IAClC,OAAO,CAAC,QAAQ,CAAqC;IACrD,OAAO,CAAC,QAAQ,CAAsC;IACtD,OAAO,CAAC,OAAO,CAAmC;;IAU3C,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAIjD,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAIvC,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;IAS3B,SAAS,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI;IAIlC,OAAO,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI;IAQ7C,OAAO,CAAC,cAAc,CAIpB;IAEF,OAAO,CAAC,OAAO,CAIb;CACH"}
+{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/archiver.ts"],"names":[],"mappings":";AAKA,OAAO,EAAE,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAEjD,MAAM,WAAW,QAAQ;IACvB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAClD,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAClE,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5B,SAAS,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAC;IAC1C,OAAO,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;CAC/C;AAED,qBAAa,WAAY,YAAW,QAAQ;IAC1C,OAAO,CAAC,OAAO,CAAmB;IAClC,OAAO,CAAC,QAAQ,CAAqC;IACrD,OAAO,CAAC,QAAQ,CAAsC;IACtD,OAAO,CAAC,OAAO,CAAmC;;IAU3C,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAIjD,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAWjE,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;IAS3B,SAAS,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI;IAIlC,OAAO,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI;IAQ7C,OAAO,CAAC,cAAc,CAIpB;IAEF,OAAO,CAAC,OAAO,CAIb;CACH"}

package/out/deploy/packager/archiver.js

@@ -4,6 +4,7 @@ exports.ZipArchiver = void 0;
 const tslib_1 = require("tslib");
 const archiver_1 = tslib_1.__importDefault(require("archiver"));
 const fs_1 = require("fs");
+const path_1 = require("path");
 const tmp_1 = tslib_1.__importDefault(require("tmp"));
 const cli_shared_1 = require("@forge/cli-shared");
 class ZipArchiver {
@@ -30,8 +31,15 @@ class ZipArchiver {
     addFile(fileName, contents) {
         this.archive.append(contents, { name: fileName });
     }
-    addManifestFile(filePath) {
-        this.archive.file(filePath, { name: cli_shared_1.manifestFilename });
+    addRootDependencyFiles(fileNames, logger) {
+        const currentDirectory = process.cwd();
+        fileNames.forEach((fileName) => {
+            const filePath = path_1.join(currentDirectory, fileName);
+            if (fs_1.existsSync(filePath)) {
+                logger.debug(cli_shared_1.Text.deploy.taskPackage.packageFile(fileName, filePath));
+                this.archive.file(filePath, { name: fileName });
+            }
+        });
     }
     finalise() {
         return new Promise((resolve, reject) => {

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

@@ -1 +1 @@
-{"version":3,"file":"packager.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/packager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAA0B,MAAM,mBAAmB,CAAC;AAEnE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACvC,SAAS,CAAC,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC3C,QAAQ,CAAC,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH;AAED,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CAC1D;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,YAAa,SAAQ,KAAK;CAAG;AAE1C,qBAAa,WAAY,YAAW,QAAQ;IAExC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAFN,eAAe,EAAE,MAAM,QAAQ,EAC/B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO;IAGrB,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;CA0DtE"}
+{"version":3,"file":"packager.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/packager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAEtE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACvC,SAAS,CAAC,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC3C,QAAQ,CAAC,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH;AAED,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CAC1D;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,YAAa,SAAQ,KAAK;CAAG;AAE1C,qBAAa,WAAY,YAAW,QAAQ;IAExC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAFN,eAAe,EAAE,MAAM,QAAQ,EAC/B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO;IAGrB,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;CA0DtE"}

package/out/deploy/packager/packager.js

@@ -30,29 +30,29 @@ class AppPackager {
                 path: path_1.join(currentDirectory, 'src', handler)
             });
         }
-        let bundlerResponse;
-        try {
-            bundlerResponse = await this.bundle(process.cwd(), entryPoints);
-        }
-        catch (e) {
-            throw new BundlerError(e.message);
-        }
-        const { output, sourceMap, metadata } = bundlerResponse;
-        if (metadata) {
-            moduleList = metadata.modules;
-        }
-        this.logger.debug(cli_shared_1.Text.deploy.taskPackage.packageBundledFiles);
-        for (const { name } of entryPoints) {
-            archiver.addFile(`${name}.js`, Buffer.from(output[name]));
-        }
-        if (sourceMap) {
+        if (entryPoints.length > 0) {
+            let bundlerResponse;
+            try {
+                bundlerResponse = await this.bundle(process.cwd(), entryPoints);
+            }
+            catch (e) {
+                throw new BundlerError(e.message);
+            }
+            const { output, sourceMap, metadata } = bundlerResponse;
+            if (metadata) {
+                moduleList = metadata.modules;
+            }
+            this.logger.debug(cli_shared_1.Text.deploy.taskPackage.packageBundledFiles);
             for (const { name } of entryPoints) {
-                archiver.addFile(`${name}.js.map`, Buffer.from(sourceMap[name]));
+                archiver.addFile(`${name}.js`, Buffer.from(output[name]));
+            }
+            if (sourceMap) {
+                for (const { name } of entryPoints) {
+                    archiver.addFile(`${name}.js.map`, Buffer.from(sourceMap[name]));
+                }
             }
         }
-        const manifestPath = path_1.resolve(currentDirectory, cli_shared_1.manifestFilename);
-        this.logger.debug(cli_shared_1.Text.deploy.taskPackage.packageManifest(manifestPath));
-        archiver.addManifestFile(manifestPath);
+        archiver.addRootDependencyFiles(cli_shared_1.dependencyFileNames, this.logger);
         const archivePath = await archiver.finalise();
         this.logger.debug(cli_shared_1.Text.deploy.taskPackage.archiveCreated(archivePath));
         return { archivePath, moduleList };

package/out/deploy/uploader/artifact-graphql-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"artifact-graphql-client.d.ts","sourceRoot":"","sources":["../../../src/deploy/uploader/artifact-graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,aAAa,EAIb,0BAA0B,EAE3B,MAAM,mBAAmB,CAAC;AAE3B,UAAU,4BAA4B;IACpC,aAAa,EAAE,0BAA0B,EAAE,CAAC;IAC5C,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACtD,4BAA4B,CAC1B,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EAAE,GACrB,OAAO,CAAC,4BAA4B,CAAC,CAAC;CAC1C;AAED,qBAAa,oBAAqB,SAAQ,KAAK;;CAI9C;AAED,qBAAa,oBAAqB,SAAQ,KAAK;;CAI9C;AAED,qBAAa,eAAgB,SAAQ,KAAK;;CAIzC;AAED,qBAAa,qBAAsB,YAAW,cAAc;IAC9C,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAuCrD,4BAA4B,CACvC,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EAAE,GACrB,OAAO,CAAC,4BAA4B,CAAC;CA8CzC"}
+{"version":3,"file":"artifact-graphql-client.d.ts","sourceRoot":"","sources":["../../../src/deploy/uploader/artifact-graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,aAAa,EAIb,0BAA0B,EAG3B,MAAM,mBAAmB,CAAC;AAE3B,UAAU,4BAA4B;IACpC,aAAa,EAAE,0BAA0B,EAAE,CAAC;IAC5C,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACtD,4BAA4B,CAC1B,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EAAE,GACrB,OAAO,CAAC,4BAA4B,CAAC,CAAC;CAC1C;AAED,qBAAa,oBAAqB,SAAQ,KAAK;;CAI9C;AAED,qBAAa,oBAAqB,SAAQ,KAAK;;CAI9C;AAED,qBAAa,eAAgB,SAAQ,KAAK;;CAIzC;AAED,qBAAa,qBAAsB,YAAW,cAAc;IAC9C,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAwCrD,4BAA4B,CACvC,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EAAE,GACrB,OAAO,CAAC,4BAA4B,CAAC;CA+CzC"}

package/out/deploy/uploader/artifact-graphql-client.js

@@ -26,24 +26,27 @@ class ArtifactGraphQLClient {
     }
     async getUploadUrl(appDetails) {
         const artifactQuery = `
-      mutation getUploadUrl($input: CreateAppDeploymentUrlInput!) {
+      mutation forge_cli_getDeploymentUrl($input: CreateAppDeploymentUrlInput!) {
         createAppDeploymentUrl(input: $input) {
           success
-          message
-          errorDetails {
-            code
+          errors {
+            message
+            extensions {
+              errorType
+            }
           }
           deploymentUrl
         }
       }
     `;
-        const { response: { createAppDeploymentUrl: { deploymentUrl, success, errorDetails, message } }, requestId } = await this.graphqlClient.mutate(artifactQuery, {
+        const { response: { createAppDeploymentUrl: { deploymentUrl, success, errors } }, requestId } = await this.graphqlClient.mutate(artifactQuery, {
             input: {
                 appId: appDetails.id
             }
         });
+        const error = cli_shared_1.getError(errors);
         if (!success) {
-            throw new cli_shared_1.GraphQlMutationError(`${message} (requestId: ${requestId || 'unknown'})`, errorDetails ? errorDetails.code : undefined);
+            throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, error.code);
         }
         if (!deploymentUrl) {
             throw new NoDeploymentURLError();
@@ -52,13 +55,12 @@ class ArtifactGraphQLClient {
     }
     async getHostedResourcesUploadUrls(appDetails, environmentKey, resourceKeys) {
         const artifactQuery = `
-      mutation getHostedResourcesUploadUrls($input: CreateHostedResourceUploadUrlInput!) {
+      mutation forge_cli_getHostedResourcesUploadUrls($input: CreateHostedResourceUploadUrlInput!) {
         createHostedResourceUploadUrl(input: $input) {
           success
           errors {
             message
             extensions {
-              statusCode
               errorType
             }
           }
@@ -77,8 +79,9 @@ class ArtifactGraphQLClient {
                 resourceKeys
             }
         });
+        const error = cli_shared_1.getError(errors);
         if (!success) {
-            throw new cli_shared_1.GraphQlMutationError(`${JSON.stringify(errors)} (requestId: ${requestId || 'unknown'})`);
+            throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, error.code);
         }
         if (!preSignedUrls) {
             throw new NoPresignedUrlsError();

package/out/environment-variables/graphql-client.d.ts

@@ -9,7 +9,7 @@ export declare class MissingAppEnvironmentError extends Error {
 export declare class GraphqlClient implements SetEnvironmentVariableClient, DeleteEnvironmentVariableClient, ListEnvironmentVariablesClient {
     private readonly graphqlClient;
     constructor(graphqlClient: GraphQLClient);
-    listEnvironmentVariables(details: ListAppEnvironmentVariablesDetails): Promise<import("@forge/cli-shared").AppEnvironmentVariable[]>;
+    listEnvironmentVariables(details: ListAppEnvironmentVariablesDetails): Promise<import("@forge/cli-shared/src").AppEnvironmentVariable[] | null | undefined>;
     setEnvironmentVariable(details: SetAppEnvironmentVariableDetails): Promise<void>;
     deleteEnvironmentVariable(details: DeleteAppEnvironmentVariableDetails): Promise<void>;
 }

package/out/environment-variables/graphql-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/environment-variables/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAwB,MAAM,mBAAmB,CAAC;AAExE,OAAO,EACL,6BAA6B,IAAI,mCAAmC,EACpE,+BAA+B,EAChC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,8BAA8B,IAAI,kCAAkC,EACpE,8BAA8B,EAC/B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,6BAA6B,IAAI,gCAAgC,EACjE,4BAA4B,EAC7B,MAAM,4BAA4B,CAAC;AAEpC,qBAAa,eAAgB,SAAQ,KAAK;CAAG;AAC7C,qBAAa,0BAA2B,SAAQ,KAAK;CAAG;AAExD,qBAAa,aACX,YAAW,4BAA4B,EAAE,+BAA+B,EAAE,8BAA8B;IAC5F,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,wBAAwB,CAAC,OAAO,EAAE,kCAAkC;IAkCpE,sBAAsB,CAAC,OAAO,EAAE,gCAAgC;IAwChE,yBAAyB,CAAC,OAAO,EAAE,mCAAmC;CAsCpF"}
+{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/environment-variables/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,aAAa,EAAwB,MAAM,mBAAmB,CAAC;AAElF,OAAO,EACL,6BAA6B,IAAI,mCAAmC,EACpE,+BAA+B,EAChC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,8BAA8B,IAAI,kCAAkC,EACpE,8BAA8B,EAC/B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,6BAA6B,IAAI,gCAAgC,EACjE,4BAA4B,EAC7B,MAAM,4BAA4B,CAAC;AAEpC,qBAAa,eAAgB,SAAQ,KAAK;CAAG;AAC7C,qBAAa,0BAA2B,SAAQ,KAAK;CAAG;AAExD,qBAAa,aACX,YAAW,4BAA4B,EAAE,+BAA+B,EAAE,8BAA8B;IAC5F,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,wBAAwB,CAAC,OAAO,EAAE,kCAAkC;IAkCpE,sBAAsB,CAAC,OAAO,EAAE,gCAAgC;IAyChE,yBAAyB,CAAC,OAAO,EAAE,mCAAmC;CAuCpF"}

package/out/environment-variables/graphql-client.js

@@ -14,7 +14,7 @@ class GraphqlClient {
     }
     async listEnvironmentVariables(details) {
         const query = `
-      query app($appId: ID!, $key: String!) {
+      query forge_cli_getAppEnvironmentVariables($appId: ID!, $key: String!) {
         app(id: $appId) {
           name
           description
@@ -43,17 +43,19 @@ class GraphqlClient {
     }
     async setEnvironmentVariable(details) {
         const mutation = `
-      mutation setAppEnvironmentVariable($input: SetAppEnvironmentVariableInput!) {
+      mutation forge_cli_setAppEnvironmentVariable($input: SetAppEnvironmentVariableInput!) {
         setAppEnvironmentVariable(input: $input) {
           success
-          message
-          errorDetails {
-            code
+          errors {
+            message
+            extensions {
+              errorType
+            }
           }
         }
       }
     `;
-        const { response: { setAppEnvironmentVariable: { message, success, errorDetails } }, requestId } = await this.graphqlClient.mutate(mutation, {
+        const { response: { setAppEnvironmentVariable: { success, errors } }, requestId } = await this.graphqlClient.mutate(mutation, {
             input: {
                 environment: {
                     appId: details.appId,
@@ -66,23 +68,26 @@ class GraphqlClient {
                 }
             }
         });
+        const error = cli_shared_1.getError(errors);
         if (!success) {
-            throw new cli_shared_1.GraphQlMutationError(`${message} (requestId: ${requestId || 'unknown'})`, errorDetails ? errorDetails.code : undefined);
+            throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, error.code);
         }
     }
     async deleteEnvironmentVariable(details) {
         const mutation = `
-      mutation deleteAppEnvironmentVariable($input: DeleteAppEnvironmentVariableInput!) {
+      mutation forge_cli_deleteAppEnvironmentVariable($input: DeleteAppEnvironmentVariableInput!) {
         deleteAppEnvironmentVariable(input: $input) {
           success
-          message
-          errorDetails {
-            code
+          errors {
+            message
+            extensions {
+              errorType
+            }
           }
         }
       }
     `;
-        const { response: { deleteAppEnvironmentVariable: { message, success, errorDetails } }, requestId } = await this.graphqlClient.mutate(mutation, {
+        const { response: { deleteAppEnvironmentVariable: { success, errors } }, requestId } = await this.graphqlClient.mutate(mutation, {
             input: {
                 environment: {
                     appId: details.appId,
@@ -91,8 +96,9 @@ class GraphqlClient {
                 key: details.key
             }
         });
+        const error = cli_shared_1.getError(errors);
         if (!success) {
-            throw new cli_shared_1.GraphQlMutationError(`${message} (requestId: ${requestId || 'unknown'})`, errorDetails ? errorDetails.code : undefined);
+            throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, error.code);
         }
     }
 }

package/out/environment-variables/list-environment-variables.d.ts

@@ -11,12 +11,12 @@ export interface AppEnvironmentVariable {
     encrypt: boolean;
 }
 export interface ListEnvironmentVariablesClient {
-    listEnvironmentVariables(details: AppEnvironmentVariablesDetails): Promise<AppEnvironmentVariable[]>;
+    listEnvironmentVariables(details: AppEnvironmentVariablesDetails): Promise<AppEnvironmentVariable[] | null | undefined>;
 }
 export declare class ListEnvironmentVariablesCommand {
     private readonly client;
     private readonly getAppConfig;
     constructor(client: ListEnvironmentVariablesClient, getAppConfig: AppConfigProvider);
-    execute(details: EnvironmentVariablesDetails): Promise<AppEnvironmentVariable[]>;
+    execute(details: EnvironmentVariablesDetails): Promise<AppEnvironmentVariable[] | null | undefined>;
 }
 //# sourceMappingURL=list-environment-variables.d.ts.map

package/out/environment-variables/list-environment-variables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list-environment-variables.d.ts","sourceRoot":"","sources":["../../src/environment-variables/list-environment-variables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,MAAM,WAAW,2BAA2B;IAC1C,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,8BAA+B,SAAQ,2BAA2B;IACjF,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,sBAAsB;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,8BAA8B;IAC7C,wBAAwB,CAAC,OAAO,EAAE,8BAA8B,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC,CAAC;CACtG;AAED,qBAAa,+BAA+B;IAExC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;gBADZ,MAAM,EAAE,8BAA8B,EACtC,YAAY,EAAE,iBAAiB;IAGrC,OAAO,CAAC,OAAO,EAAE,2BAA2B;CAO1D"}
+{"version":3,"file":"list-environment-variables.d.ts","sourceRoot":"","sources":["../../src/environment-variables/list-environment-variables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,MAAM,WAAW,2BAA2B;IAC1C,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,8BAA+B,SAAQ,2BAA2B;IACjF,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,sBAAsB;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,8BAA8B;IAC7C,wBAAwB,CACtB,OAAO,EAAE,8BAA8B,GACtC,OAAO,CAAC,sBAAsB,EAAE,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;CACzD;AAED,qBAAa,+BAA+B;IAExC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;gBADZ,MAAM,EAAE,8BAA8B,EACtC,YAAY,EAAE,iBAAiB;IAGrC,OAAO,CAAC,OAAO,EAAE,2BAA2B;CAO1D"}