@forge/cli 6.12.0 → 6.13.0-next.8

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

@@ -11,8 +11,8 @@ class DeployView {
     getLogger() {
         return this.ui;
     }
-    displayStart(environment) {
-        this.ui.info(cli_shared_1.Text.deploy.cmd.start1(environment, cli_shared_1.environmentToOption));
+    displayStart(environment, environmentType) {
+        this.ui.info(cli_shared_1.Text.deploy.cmd.start1(environment, environmentType));
     }
     displayListAppInstallationsError() {
         this.ui.info(cli_shared_1.Text.deploy.taskListInstallation.listInstallationError);
@@ -53,7 +53,7 @@ class DeployView {
         this.ui.emptyLine();
     }
     displayEnvironmentCreationSuccessMessage(environment) {
-        this.ui.info(cli_shared_1.Text.createEnvironment.cmd.success(environment, cli_shared_1.AppEnvironmentType.Development, cli_shared_1.environmentToOption));
+        this.ui.info(cli_shared_1.Text.createEnvironment.cmd.success(environment, cli_shared_1.AppEnvironmentType.Development));
         this.ui.emptyLine();
     }
     async promptToContinueDeletingConnectKey() {
@@ -67,9 +67,17 @@ class DeployView {
         this.ui.emptyLine();
         return confirm;
     }
+    async promptToContinueDeploymentWhileReindexing() {
+        this.ui.emptyLine();
+        return await this.ui.confirm(cli_shared_1.Text.deploy.reindexingInProgress.continueDeployment);
+    }
+    displaySuccessfulDeploymentWhileReindexing() {
+        this.ui.emptyLine();
+        this.ui.info(cli_shared_1.Text.deploy.reindexingInProgress.successfulDeployment);
+    }
     async reportDeploymentProgress({ appAri, name, environmentKey, environmentType }, showDistributionPageLink, deployCallback) {
-        const result = await this.ui.displayProgress(() => deployCallback(), cli_shared_1.Text.deploy.cmd.start2(name, environmentKey, environmentType, cli_shared_1.environmentToOption), cli_shared_1.Text.deploy.cmd.success);
-        this.ui.info(cli_shared_1.Text.deploy.cmd.successDetails(name, environmentKey, environmentType, cli_shared_1.environmentToOption));
+        const result = await this.ui.displayProgress(() => deployCallback(), cli_shared_1.Text.deploy.cmd.start2(name, environmentKey, environmentType), cli_shared_1.Text.deploy.cmd.success);
+        this.ui.info(cli_shared_1.Text.deploy.cmd.successDetails(name, environmentKey, environmentType));
         if (environmentType === cli_shared_1.AppEnvironmentType.Production && showDistributionPageLink) {
             this.ui.info(cli_shared_1.Text.deploy.cmd.distributePageLink((0, cs_ari_1.parseAppAri)((0, cs_ari_1.parse)(appAri)).appId));
         }

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

@@ -20,7 +20,7 @@ class InstallView {
             const egressAddressesMismatch = !(0, lodash_1.isEqual)([...groupedManifestEgressAddresses].sort(), [...egressAddresses].sort());
             permissionsMismatchWithManifest = scopesMismatch || egressAddressesMismatch;
             if (permissionsMismatchWithManifest) {
-                this.ui.warn(text.permissionsMismatch((0, cli_shared_1.environmentToOption)(environment)));
+                this.ui.warn(text.permissionsMismatch(environment));
             }
         }
         if (!confirmScopes && !nonInteractive) {

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

@@ -4,6 +4,7 @@ export declare class SettingsView {
     private readonly ui;
     constructor(ui: UI);
     showSettings(preferences: [string, string, PreferenceValue][], json?: boolean): void;
+    showAdditionalInfo(message: string): void;
     setSuccess(setting: string, value: string): void;
 }
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"settings-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/settings-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAE7C,aAAK,eAAe,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;AAEpD,qBAAa,YAAY;IACX,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAE5B,YAAY,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,OAAO;IAiB7E,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAIjD"}
+{"version":3,"file":"settings-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/settings-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAE7C,aAAK,eAAe,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;AAEpD,qBAAa,YAAY;IACX,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAE5B,YAAY,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,OAAO;IAiB7E,kBAAkB,CAAC,OAAO,EAAE,MAAM;IAMlC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAIjD"}

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

@@ -18,6 +18,11 @@ class SettingsView {
             }
         });
     }
+    showAdditionalInfo(message) {
+        this.ui.emptyLine();
+        this.ui.info(message);
+        this.ui.emptyLine();
+    }
     setSuccess(setting, value) {
         this.ui.info(cli_shared_1.Text.settings.set.success(setting, value));
         this.ui.emptyLine();

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,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;IAET,OAAO,CAAC,QAAQ,CAAC,EAAE;IAD/B,OAAO,CAAC,QAAQ,CAAC,gCAAgC,CAAyC;gBAC7D,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;CA4CjB"}
+{"version":3,"file":"tunnel-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/tunnel-view.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,aAAa,EAEb,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;IAET,OAAO,CAAC,QAAQ,CAAC,EAAE;IAD/B,OAAO,CAAC,QAAQ,CAAC,gCAAgC,CAAyC;gBAC7D,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;CA4CjB"}

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

@@ -16,7 +16,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, (0, cli_shared_1.guessEnvironmentType)(environmentKey), cli_shared_1.environmentToOption));
+            this.ui.info(cli_shared_1.Text.tunnel.startingTunnel(environmentKey, (0, cli_shared_1.guessEnvironmentType)(environmentKey)));
             this.ui.emptyLine();
         }
         this.ui.info(cli_shared_1.Text.ctrlC);

package/out/entities/graphql-client.d.ts

@@ -2,6 +2,6 @@ import { GraphQLClient } from '@forge/cli-shared';
 export declare class EntitiesGraphqlClient {
     private readonly graphQLClient;
     constructor(graphQLClient: GraphQLClient);
-    getEntitiesDefinitions(oauthClientId: string, entities: string[]): Promise<any[]>;
+    getEntitiesDefinitions(oauthClientId: string): Promise<any[]>;
 }
 //# sourceMappingURL=graphql-client.d.ts.map

package/out/entities/graphql-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/entities/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,qBAAa,qBAAqB;IACpB,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,sBAAsB,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;CA+B/F"}
+{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/entities/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,qBAAa,qBAAqB;IACpB,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,sBAAsB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;CA0B3E"}

package/out/entities/graphql-client.js

@@ -5,13 +5,12 @@ class EntitiesGraphqlClient {
     constructor(graphQLClient) {
         this.graphQLClient = graphQLClient;
     }
-    async getEntitiesDefinitions(oauthClientId, entities) {
+    async getEntitiesDefinitions(oauthClientId) {
         var _a;
         const query = `
-      query forge_cli_getAppOauthClientIdDetails($oauthClientId: String!, $entities: [String!]!) {
+      query forge_cli_getAppOauthClientIdDetails($oauthClientId: String!) {
         ersLifecycle {
-          customEntityDefinitions(
-            entities: $entities
+          doneEntitiesFromERS(
             oauthClientId: $oauthClientId
           ) {
             indexes {
@@ -27,10 +26,9 @@ class EntitiesGraphqlClient {
       }
     `;
         const result = await this.graphQLClient.query(query, {
-            oauthClientId,
-            entities
+            oauthClientId
         });
-        return ((_a = result === null || result === void 0 ? void 0 : result.ersLifecycle) === null || _a === void 0 ? void 0 : _a.customEntityDefinitions) || [];
+        return ((_a = result === null || result === void 0 ? void 0 : result.ersLifecycle) === null || _a === void 0 ? void 0 : _a.doneEntitiesFromERS) || [];
     }
 }
 exports.EntitiesGraphqlClient = EntitiesGraphqlClient;

package/out/entities/list-indexes.d.ts

@@ -1,8 +1,10 @@
-import { AppConfigProvider, AppOauthClientIdClient } from '@forge/cli-shared';
+import { CustomEntitiesService } from '../service/custom-entities-service';
 export interface CustomEntityIndex {
     entityName: string;
     indexName: string;
     indexStatus: CustomEntityIndexStatus;
+    partition: string;
+    range: string;
 }
 export declare enum CustomEntityIndexStatus {
     ACTIVE = "ACTIVE",
@@ -15,13 +17,11 @@ export interface AppCustomEntitiesIndexes {
     indexes: CustomEntityIndex[];
 }
 export interface EntitiesClient {
-    getEntitiesDefinitions(oauthClientId: string, entities: string[]): Promise<any[]>;
+    getEntitiesDefinitions(oauthClientId: string): Promise<any[]>;
 }
 export declare class ListEntitiesIndexesCommand {
-    private readonly getAppConfig;
-    private readonly appOauthClient;
-    private readonly entitiesGraphqlClient;
-    constructor(getAppConfig: AppConfigProvider, appOauthClient: AppOauthClientIdClient, entitiesGraphqlClient: EntitiesClient);
-    execute(environment: string, entities: string[]): Promise<AppCustomEntitiesIndexes>;
+    private readonly customEntitiesService;
+    constructor(customEntitiesService: CustomEntitiesService);
+    execute(environment: string): Promise<AppCustomEntitiesIndexes>;
 }
 //# sourceMappingURL=list-indexes.d.ts.map

package/out/entities/list-indexes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list-indexes.d.ts","sourceRoot":"","sources":["../../src/entities/list-indexes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAE9E,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,uBAAuB,CAAC;CACtC;AAED,oBAAY,uBAAuB;IACjC,MAAM,WAAW;IACjB,QAAQ,aAAa;CACtB;AAED,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,iBAAiB,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,cAAc;IAC7B,sBAAsB,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;CACnF;AAED,qBAAa,0BAA0B;IAEnC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,qBAAqB;gBAFrB,YAAY,EAAE,iBAAiB,EAC/B,cAAc,EAAE,sBAAsB,EACtC,qBAAqB,EAAE,cAAc;IAG3C,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC;CA+CjG"}
+{"version":3,"file":"list-indexes.d.ts","sourceRoot":"","sources":["../../src/entities/list-indexes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAE3E,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,uBAAuB,CAAC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,oBAAY,uBAAuB;IACjC,MAAM,WAAW;IACjB,QAAQ,aAAa;CACtB;AAED,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,iBAAiB,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,cAAc;IAC7B,sBAAsB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;CAC/D;AAED,qBAAa,0BAA0B;IACzB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;gBAArB,qBAAqB,EAAE,qBAAqB;IAE5D,OAAO,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC;CAG7E"}

package/out/entities/list-indexes.js

@@ -7,55 +7,11 @@ var CustomEntityIndexStatus;
     CustomEntityIndexStatus["CREATING"] = "CREATING";
 })(CustomEntityIndexStatus = exports.CustomEntityIndexStatus || (exports.CustomEntityIndexStatus = {}));
 class ListEntitiesIndexesCommand {
-    constructor(getAppConfig, appOauthClient, entitiesGraphqlClient) {
-        this.getAppConfig = getAppConfig;
-        this.appOauthClient = appOauthClient;
-        this.entitiesGraphqlClient = entitiesGraphqlClient;
+    constructor(customEntitiesService) {
+        this.customEntitiesService = customEntitiesService;
     }
-    async execute(environment, entities) {
-        var _a;
-        const { id: appId } = await this.getAppConfig();
-        const { environmentId, oauthClientId } = await this.appOauthClient.getAppOauthClientIdDetails(appId, environment);
-        const results = await this.entitiesGraphqlClient.getEntitiesDefinitions(oauthClientId, entities);
-        const transformedIndexes = [];
-        const indexesToExclude = ['by-context-ari'];
-        for (const entity of results) {
-            const [, , , ...entityName] = entity.name.split('_');
-            for (const index of (_a = entity.indexes) !== null && _a !== void 0 ? _a : []) {
-                if (indexesToExclude.indexOf(index.name) < 0) {
-                    transformedIndexes.push({
-                        entityName: entityName.join('_'),
-                        indexName: index.name,
-                        indexStatus: index.status
-                    });
-                }
-            }
-        }
-        transformedIndexes.sort((index1, index2) => {
-            if (index1.indexStatus > index2.indexStatus) {
-                return -1;
-            }
-            else if (index1.indexStatus < index2.indexStatus) {
-                return 1;
-            }
-            else {
-                if (index1.entityName < index2.entityName) {
-                    return -1;
-                }
-                else if (index1.entityName > index2.entityName) {
-                    return 1;
-                }
-                else {
-                    return 0;
-                }
-            }
-        });
-        return {
-            appId,
-            environmentId,
-            oauthClientId,
-            indexes: transformedIndexes
-        };
+    async execute(environment) {
+        return await this.customEntitiesService.listEntitiesIndexes(environment);
     }
 }
 exports.ListEntitiesIndexesCommand = ListEntitiesIndexesCommand;

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

@@ -1 +1 @@
-{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/environment/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAKlB,aAAa,EAIb,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AACtF,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AACnF,OAAO,EACL,6BAA6B,EAC7B,uBAAuB,EACvB,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAE9B,eAAO,MAAM,0BAA0B,0BAA0B,CAAC;AAElE,qBAAa,eAAgB,SAAQ,SAAS;CAAG;AAEjD,qBAAa,aAAc,YAAW,uBAAuB,EAAE,qBAAqB,EAAE,uBAAuB;IAC/F,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,iBAAiB,CAAC,OAAO,EAAE,qBAAqB;IAgDhD,eAAe,CAAC,OAAO,EAAE,sBAAsB;;;;;IAmC/C,kBAAkB,CAAC,OAAO,EAAE,6BAA6B;IAkBzD,iBAAiB,CAAC,OAAO,EAAE,wBAAwB;CAuDjE"}
+{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/environment/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAIlB,aAAa,EAIb,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AACtF,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AACnF,OAAO,EACL,6BAA6B,EAC7B,uBAAuB,EACvB,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAE9B,eAAO,MAAM,0BAA0B,0BAA0B,CAAC;AAElE,qBAAa,eAAgB,SAAQ,SAAS;CAAG;AAEjD,qBAAa,aAAc,YAAW,uBAAuB,EAAE,qBAAqB,EAAE,uBAAuB;IAC/F,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,iBAAiB,CAAC,OAAO,EAAE,qBAAqB;IAgDhD,eAAe,CAAC,OAAO,EAAE,sBAAsB;;;;;IAmC/C,kBAAkB,CAAC,OAAO,EAAE,6BAA6B;IAkBzD,iBAAiB,CAAC,OAAO,EAAE,wBAAwB;CAuDjE"}

package/out/environment/graphql-client.js

@@ -124,7 +124,7 @@ class GraphqlClient {
         const error = (0, cli_shared_1.getError)(errors);
         let errorMessage = error.message;
         if (error.code === exports.APP_HAS_INSTALLATIONS_CODE) {
-            errorMessage = cli_shared_1.Text.deleteEnvironment.hasInstallationError(details.environmentKey, cli_shared_1.environmentToOption);
+            errorMessage = cli_shared_1.Text.deleteEnvironment.hasInstallationError(details.environmentKey);
         }
         if (!success) {
             throw new cli_shared_1.GraphQlMutationError(`${errorMessage} (requestId: ${requestId || 'unknown'})`, {

package/out/installations/graphql-client.d.ts.map

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

package/out/installations/graphql-client.js

@@ -37,7 +37,7 @@ class UpgradeError extends cli_shared_1.GraphQlMutationError {
 exports.UpgradeError = UpgradeError;
 class EnvironmentNotFoundError extends cli_shared_1.UserError {
     constructor(environmentKey) {
-        super(cli_shared_1.Text.env.error.envNotExist(environmentKey, cli_shared_1.environmentToOption));
+        super(cli_shared_1.Text.env.error.envNotExist(environmentKey));
     }
 }
 exports.EnvironmentNotFoundError = EnvironmentNotFoundError;

package/out/service/custom-entities-service.d.ts

@@ -0,0 +1,12 @@
+import { AppConfigProvider, AppOauthClientIdClient } from '@forge/cli-shared';
+import { AppCustomEntitiesIndexes, CustomEntityIndex, EntitiesClient } from '../entities/list-indexes';
+export declare class CustomEntitiesService {
+    private readonly appConfigProvider;
+    private readonly appOauthClient;
+    private readonly entitiesGraphqlClient;
+    constructor(appConfigProvider: AppConfigProvider, appOauthClient: AppOauthClientIdClient, entitiesGraphqlClient: EntitiesClient);
+    sortTransformedIndexes(transformedIndexes: CustomEntityIndex[]): CustomEntityIndex[];
+    listEntitiesIndexes(environment: string): Promise<AppCustomEntitiesIndexes>;
+    isReindexingInProgress(environment: string): Promise<boolean>;
+}
+//# sourceMappingURL=custom-entities-service.d.ts.map

package/out/service/custom-entities-service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"custom-entities-service.d.ts","sourceRoot":"","sources":["../../src/service/custom-entities-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAuB,MAAM,mBAAmB,CAAC;AACnG,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EAEjB,cAAc,EACf,MAAM,0BAA0B,CAAC;AAElC,qBAAa,qBAAqB;IAE9B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,qBAAqB;gBAFrB,iBAAiB,EAAE,iBAAiB,EACpC,cAAc,EAAE,sBAAsB,EACtC,qBAAqB,EAAE,cAAc;IAGxD,sBAAsB,CAAC,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,iBAAiB,EAAE;IAavE,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAkD3E,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAM3E"}

package/out/service/custom-entities-service.js

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CustomEntitiesService = void 0;
+const cli_shared_1 = require("@forge/cli-shared");
+const list_indexes_1 = require("../entities/list-indexes");
+class CustomEntitiesService {
+    constructor(appConfigProvider, appOauthClient, entitiesGraphqlClient) {
+        this.appConfigProvider = appConfigProvider;
+        this.appOauthClient = appOauthClient;
+        this.entitiesGraphqlClient = entitiesGraphqlClient;
+    }
+    sortTransformedIndexes(transformedIndexes) {
+        transformedIndexes.sort((index1, index2) => {
+            if (index1.indexStatus > index2.indexStatus) {
+                return -1;
+            }
+            else if (index1.indexStatus < index2.indexStatus) {
+                return 1;
+            }
+            else {
+                return 0;
+            }
+        });
+        return transformedIndexes;
+    }
+    async listEntitiesIndexes(environment) {
+        var _a;
+        const { id: appId } = await this.appConfigProvider();
+        const { environmentId, oauthClientId } = await this.appOauthClient.getAppOauthClientIdDetails(appId, environment);
+        const results = await this.entitiesGraphqlClient.getEntitiesDefinitions(oauthClientId);
+        const transformedIndexes = [];
+        const indexesToExclude = ['by-context-ari'];
+        for (const entity of results) {
+            const [, , , ...entityName] = entity.name.split('_');
+            const transformedIndexesPerEntity = [];
+            let byKeyIndex = {};
+            for (const index of (_a = entity.indexes) !== null && _a !== void 0 ? _a : []) {
+                if (indexesToExclude.indexOf(index.name) < 0) {
+                    if (index.name === 'by-key') {
+                        byKeyIndex = {
+                            entityName: entityName.join('_'),
+                            indexName: index.name.concat(' (default)'),
+                            indexStatus: index.status,
+                            partition: index.partition.length ? index.partition.join(', ') : 'None',
+                            range: 'key (data key)'
+                        };
+                    }
+                    else {
+                        transformedIndexesPerEntity.push({
+                            entityName: entityName.join('_'),
+                            indexName: index.name,
+                            indexStatus: index.status,
+                            partition: index.partition.length ? index.partition.join(', ') : 'None',
+                            range: index.range.length ? index.range.join(', ') : 'None'
+                        });
+                    }
+                }
+            }
+            this.sortTransformedIndexes(transformedIndexesPerEntity);
+            transformedIndexesPerEntity.push(byKeyIndex);
+            transformedIndexes.push(...transformedIndexesPerEntity);
+        }
+        return {
+            appId,
+            environmentId,
+            oauthClientId,
+            indexes: transformedIndexes
+        };
+    }
+    async isReindexingInProgress(environment) {
+        const { indexes: indexes } = await this.listEntitiesIndexes((0, cli_shared_1.optionToEnvironment)(environment || 'development'));
+        const indexStatuses = indexes.map((index) => index.indexStatus);
+        return indexStatuses.includes(list_indexes_1.CustomEntityIndexStatus.CREATING);
+    }
+}
+exports.CustomEntitiesService = CustomEntitiesService;

package/out/service/docker-service.d.ts

@@ -1,5 +1,6 @@
+import { UserError } from '@forge/cli-shared';
 import { spawn } from 'cross-spawn';
-export declare class DockerError extends Error {
+export declare class DockerError extends UserError {
     readonly code: DockerErrorCode;
     constructor(message: string, code: DockerErrorCode);
 }

package/out/service/docker-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"docker-service.d.ts","sourceRoot":"","sources":["../../src/service/docker-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAWpC,qBAAa,WAAY,SAAQ,KAAK;aACS,IAAI,EAAE,eAAe;gBAAtD,OAAO,EAAE,MAAM,EAAkB,IAAI,EAAE,eAAe;CAGnE;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,oBAAoB,wCAAwC,CAAC;AAE1E,oBAAY,eAAe;IACzB,kBAAkB,IAAA;IAClB,aAAa,IAAA;CACd;AAED,qBAAa,aAAa;IACjB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;IAIhD,gBAAgB,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;IAwB/D,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;IAI1D,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IActE,OAAO,CAAC,WAAW;CAWpB"}
+{"version":3,"file":"docker-service.d.ts","sourceRoot":"","sources":["../../src/service/docker-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAWpC,qBAAa,WAAY,SAAQ,SAAS;aACK,IAAI,EAAE,eAAe;gBAAtD,OAAO,EAAE,MAAM,EAAkB,IAAI,EAAE,eAAe;CAGnE;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,oBAAoB,wCAAwC,CAAC;AAE1E,oBAAY,eAAe;IACzB,kBAAkB,IAAA;IAClB,aAAa,IAAA;CACd;AAED,qBAAa,aAAa;IACjB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;IAIhD,gBAAgB,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;IAwB/D,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;IAI1D,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IActE,OAAO,CAAC,WAAW;CAWpB"}

package/out/service/docker-service.js

@@ -7,7 +7,7 @@ const command_exists_1 = tslib_1.__importDefault(require("command-exists"));
 const child_process_1 = require("child_process");
 const cross_spawn_1 = require("cross-spawn");
 const path_1 = tslib_1.__importDefault(require("path"));
-class DockerError extends Error {
+class DockerError extends cli_shared_1.UserError {
     constructor(message, code) {
         super(message);
         this.code = code;
@@ -22,7 +22,7 @@ var DockerErrorCode;
 })(DockerErrorCode = exports.DockerErrorCode || (exports.DockerErrorCode = {}));
 class DockerService {
     runContainer(args) {
-        return (0, cross_spawn_1.spawn)('docker', ['run', ...args], { stdio: 'inherit' });
+        return (0, cross_spawn_1.spawn)('docker', ['run', ...args], { stdio: ['inherit', 'inherit', 'pipe'] });
     }
     async getDockerVersion(debugEnabled) {
         if (!command_exists_1.default.sync('docker')) {

package/out/service/tunnel-analytics-service.d.ts

@@ -1,11 +1,15 @@
-import { PersonalApiCredentialsValidated } from '@forge/cli-shared';
+import { PersonalApiCredentialsValidated, CLIDetails } from '@forge/cli-shared';
 import { AnalyticsClientReporter } from '../analytics-client/analytics-client';
 import { DownloadProgressCallbacks } from '../command-line/view/tunnel-view';
 export declare class TunnelAnalyticsService {
     private readonly analyticsClientReporter;
-    constructor(analyticsClientReporter: AnalyticsClientReporter);
+    private readonly cliDetails;
+    constructor(analyticsClientReporter: AnalyticsClientReporter, cliDetails: CLIDetails | undefined);
     reportDockerVersion(creds: PersonalApiCredentialsValidated, dockerVersion: string | null): void;
     reportTunnelClosed(creds: PersonalApiCredentialsValidated): void;
+    reportTunnelFailure(creds: PersonalApiCredentialsValidated, errorName: string, attributes: {
+        [key: string]: any;
+    }): void;
     getImageDownloadReporters(creds: PersonalApiCredentialsValidated): DownloadProgressCallbacks;
 }
 //# sourceMappingURL=tunnel-analytics-service.d.ts.map

package/out/service/tunnel-analytics-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tunnel-analytics-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAE7E,qBAAa,sBAAsB;IACrB,OAAO,CAAC,QAAQ,CAAC,uBAAuB;gBAAvB,uBAAuB,EAAE,uBAAuB;IAEtE,mBAAmB,CAAC,KAAK,EAAE,+BAA+B,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAM/F,kBAAkB,CAAC,KAAK,EAAE,+BAA+B,GAAG,IAAI;IAIhE,yBAAyB,CAAC,KAAK,EAAE,+BAA+B,GAAG,yBAAyB;CAOpG"}
+{"version":3,"file":"tunnel-analytics-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,UAAU,EAAsB,MAAM,mBAAmB,CAAC;AACpG,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAE7E,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,uBAAuB,EAAE,uBAAuB,EAChD,UAAU,EAAE,UAAU,GAAG,SAAS;IAG9C,mBAAmB,CAAC,KAAK,EAAE,+BAA+B,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAM/F,kBAAkB,CAAC,KAAK,EAAE,+BAA+B,GAAG,IAAI;IAIhE,mBAAmB,CACxB,KAAK,EAAE,+BAA+B,EACtC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;IAgB7B,yBAAyB,CAAC,KAAK,EAAE,+BAA+B,GAAG,yBAAyB;CAOpG"}

package/out/service/tunnel-analytics-service.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TunnelAnalyticsService = void 0;
+const cli_shared_1 = require("@forge/cli-shared");
 class TunnelAnalyticsService {
-    constructor(analyticsClientReporter) {
+    constructor(analyticsClientReporter, cliDetails) {
         this.analyticsClientReporter = analyticsClientReporter;
+        this.cliDetails = cliDetails;
     }
     reportDockerVersion(creds, dockerVersion) {
         this.analyticsClientReporter.reportSuccess('docker version check', creds, {
@@ -13,6 +15,14 @@ class TunnelAnalyticsService {
     reportTunnelClosed(creds) {
         this.analyticsClientReporter.reportSuccess('close tunnel', creds, {});
     }
+    reportTunnelFailure(creds, errorName, attributes) {
+        var _a, _b;
+        attributes = Object.assign({ error: errorName, version: (_a = this.cliDetails) === null || _a === void 0 ? void 0 : _a.version, latest: (_b = this.cliDetails) === null || _b === void 0 ? void 0 : _b.latest, isLatest: (0, cli_shared_1.isLatestCLIVersion)(this.cliDetails) }, attributes);
+        if (attributes.isUserError === undefined) {
+            attributes = Object.assign(Object.assign({}, attributes), { isUserError: false });
+        }
+        this.analyticsClientReporter.reportInvokeFailure('tunnel', creds, attributes);
+    }
     getImageDownloadReporters(creds) {
         return {
             onStart: () => this.analyticsClientReporter.reportSuccess('image download started', creds, {}),

package/out/service/tunnel-service.d.ts

@@ -11,6 +11,9 @@ export interface TunnelOptions {
 export declare const CONTAINER_NAME = "forge-tunnel-docker";
 export declare const IMAGE_NAME: string;
 export declare class HiddenDockerTunnelError extends HiddenError {
+    private readonly userError;
+    constructor(userError: boolean, message?: string);
+    isUserError(): boolean;
 }
 export declare type TunnelService = {
     run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
@@ -23,8 +26,9 @@ export declare class InProcessTunnelService implements TunnelService {
     private readonly startTunnelCommand;
     private readonly tunnelInteractor;
     private readonly configFilePortFindingService;
-    constructor(ui: UI, startTunnelCommand: StartTunnelCommand, tunnelInteractor: TunnelInteractor, configFilePortFindingService: ConfigFilePortFindingService);
-    run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentials, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
+    private readonly analyticsService;
+    constructor(ui: UI, startTunnelCommand: StartTunnelCommand, tunnelInteractor: TunnelInteractor, configFilePortFindingService: ConfigFilePortFindingService, analyticsService: TunnelAnalyticsService);
+    run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
 }
 declare abstract class TunnelServiceBase implements TunnelService {
     protected readonly configFilePortFindingService: ConfigFilePortFindingService;
@@ -44,7 +48,7 @@ declare abstract class TunnelServiceBase implements TunnelService {
     protected getVolumeOptions(): string[];
 }
 export declare class LocalTunnelService extends TunnelServiceBase {
-    run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentials, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
+    run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
 }
 export declare class DockerTunnelService extends TunnelServiceBase {
     private readonly dockerService;

package/out/service/tunnel-service.d.ts.map

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

package/out/service/tunnel-service.js

@@ -10,7 +10,6 @@ const semver_1 = require("semver");
 const cli_shared_1 = require("@forge/cli-shared");
 const version_info_1 = require("../command-line/version-info");
 const DISABLE_TTY = process.env.DISABLE_TTY === 'true';
-const CUR_WORK_APP_DIR = process.env.CUR_WORK_APP_DIR;
 exports.CONTAINER_NAME = 'forge-tunnel-docker';
 const cliDetails = (0, version_info_1.getCLIDetails)();
 let versionTags;
@@ -29,6 +28,13 @@ exports.IMAGE_NAME = process.env.FORGE_DEV_DOCKER_TUNNEL
     ? 'local/forge-tunnel:test'
     : `atlassian/forge-tunnel:${versionTags[0]}`;
 class HiddenDockerTunnelError extends cli_shared_1.HiddenError {
+    constructor(userError, message) {
+        super(message);
+        this.userError = userError;
+    }
+    isUserError() {
+        return this.userError;
+    }
 }
 exports.HiddenDockerTunnelError = HiddenDockerTunnelError;
 class DebugNotSupportedError extends cli_shared_1.UserError {
@@ -38,11 +44,12 @@ class DebugNotSupportedError extends cli_shared_1.UserError {
 }
 exports.DebugNotSupportedError = DebugNotSupportedError;
 class InProcessTunnelService {
-    constructor(ui, startTunnelCommand, tunnelInteractor, configFilePortFindingService) {
+    constructor(ui, startTunnelCommand, tunnelInteractor, configFilePortFindingService, analyticsService) {
         this.ui = ui;
         this.startTunnelCommand = startTunnelCommand;
         this.tunnelInteractor = tunnelInteractor;
         this.configFilePortFindingService = configFilePortFindingService;
+        this.analyticsService = analyticsService;
     }
     async run(tunnelOptions, creds, debugEnabled, onError) {
         try {
@@ -59,6 +66,7 @@ class InProcessTunnelService {
             await this.tunnelInteractor.handleUserExitEvent(tunnel.stopFunction, monitor);
         }
         catch (e) {
+            this.analyticsService.reportTunnelFailure(creds, e.constructor.name, (0, cli_shared_1.isErrorWithAnalytics)(e) ? e.getAttributes() : {});
             if (onError) {
                 await onError(e);
             }
@@ -102,7 +110,7 @@ class TunnelServiceBase {
             ];
         }
         catch (e) {
-            throw new HiddenDockerTunnelError("Couldn't populate docker options for tunneling");
+            throw new HiddenDockerTunnelError(false, "Couldn't populate docker options for tunneling");
         }
     }
     getPortOptions(port, resourcePorts, cspReporterPort) {
@@ -157,7 +165,7 @@ class TunnelServiceBase {
         return [`-it`];
     }
     getVolumeOptions() {
-        const options = [`-v=${CUR_WORK_APP_DIR || process.cwd()}:/app:cached`];
+        const options = [`-v=${process.cwd()}:/app:cached`];
         if (process.env.FORGE_DEV_DOCKER_TUNNEL) {
             const monorepoRoot = (0, path_1.join)(__dirname, '../../../..');
             options.push(`-v=${monorepoRoot}:/monorepo:cached`);
@@ -204,6 +212,7 @@ class DockerTunnelService extends TunnelServiceBase {
         this.analyticsService = analyticsService;
     }
     async run(tunnelOptions, creds, debugEnabled) {
+        var _a;
         await this.validateDockerVersion(creds, debugEnabled);
         const dockerOptions = await this.getDockerOptions(tunnelOptions, debugEnabled, creds);
         const port = await (0, portfinder_1.getPortPromise)();
@@ -223,6 +232,23 @@ class DockerTunnelService extends TunnelServiceBase {
             ...dockerOptions
         ]);
         docker.on('exit', () => this.analyticsService.reportTunnelClosed(creds));
+        (_a = docker.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (error) => {
+            var _a;
+            const errorMessage = error;
+            let errorJson;
+            try {
+                errorJson = JSON.parse(errorMessage);
+            }
+            catch (e) {
+            }
+            if (errorJson && errorJson.__tunnel_error__) {
+                const tunnelErrorDetails = errorJson;
+                this.analyticsService.reportTunnelFailure(creds, tunnelErrorDetails.name, tunnelErrorDetails.attributes);
+            }
+            else {
+                (_a = process.stderr) === null || _a === void 0 ? void 0 : _a.write(errorMessage);
+            }
+        });
         this.dockerService.startCleanupWorker([docker.pid], exports.CONTAINER_NAME);
     }
     async bootstrapDocker() {
@@ -233,7 +259,7 @@ class DockerTunnelService extends TunnelServiceBase {
         const { major, minor, full } = await this.dockerService.getDockerVersion(debugEnabled);
         this.analyticsService.reportDockerVersion(creds, full);
         if (major < 17 || (major === 17 && minor < 3)) {
-            throw new HiddenDockerTunnelError();
+            throw new HiddenDockerTunnelError(true);
         }
     }
 }