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

package/out/deploy/packager/packager.js

@@ -7,10 +7,9 @@ class BundlerError extends Error {
 }
 exports.BundlerError = BundlerError;
 class AppPackager {
-    constructor(archiverFactory, logger, bundle) {
+    constructor(archiverFactory, logger) {
         this.archiverFactory = archiverFactory;
         this.logger = logger;
-        this.bundle = bundle;
     }
     async package(handlers) {
         let moduleList;
@@ -30,28 +29,6 @@ class AppPackager {
                 path: path_1.join(currentDirectory, 'src', handler)
             });
         }
-        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`, Buffer.from(output[name]));
-            }
-            if (sourceMap) {
-                for (const { name } of entryPoints) {
-                    archiver.addFile(`${name}.js.map`, Buffer.from(sourceMap[name]));
-                }
-            }
-        }
         archiver.addRootDependencyFiles(cli_shared_1.dependencyFileNames, this.logger);
         const archivePath = await archiver.finalise();
         this.logger.debug(cli_shared_1.Text.deploy.taskPackage.archiveCreated(archivePath));

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

@@ -51,7 +51,6 @@ export declare class InstallationsGraphqlClient implements InstallAppClient, Lis
     getInstallation(appId: string, installationId: string): Promise<Installation>;
     private getAppInstallationTask;
     private monitorUninstallApp;
-    private createCloudIdToHostnameMap;
     private resolveInstallationsHostnames;
     private getAllInstallations;
     private getCloudId;

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":";AACA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EACL,cAAc,EAGd,aAAa,EACb,oBAAoB,EAEpB,KAAK,EACN,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,sBAAsB,EAQvB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EACL,YAAY,EACZ,0BAA0B,EAC1B,6BAA6B,EAC9B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAEzE,eAAO,MAAM,kCAAkC,MAAM,CAAC;AAgBtD,eAAO,MAAM,qBAAqB,kCAAkC,CAAC;AAMrE,qBAAa,qBAAsB,SAAQ,oBAAoB;gBACjD,SAAS,SAAY,EAAE,KAAK,SAAY;CAGrD;AAED,qBAAa,qBAAsB,SAAQ,oBAAoB;;CAI9D;AAED,qBAAa,iBAAkB,SAAQ,oBAAoB;gBAC7C,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;CAGtD;AAED,qBAAa,YAAa,SAAQ,oBAAoB;gBACxC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;CAGtD;AAED,qBAAa,wBAAyB,SAAQ,KAAK;CAAG;AACtD,qBAAa,kBAAmB,SAAQ,KAAK;CAAG;AAChD,qBAAa,8BAA+B,SAAQ,KAAK;CAAG;AAC5D,qBAAa,eAAgB,SAAQ,KAAK;CAAG;AAC7C,qBAAa,uBAAwB,SAAQ,KAAK;CAAG;AACrD,qBAAa,yBAA0B,SAAQ,KAAK;CAAG;AAEvD,qBAAa,8BAA+B,SAAQ,KAAK;;CAIxD;AAED,qBAAa,yBAA0B,SAAQ,KAAK;gBACtC,GAAG,EAAE,GAAG;CAGrB;AAuBD,qBAAa,0BACX,YAAW,gBAAgB,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,6BAA6B;IAW9F,OAAO,CAAC,QAAQ,CAAC,aAAa;IAAiB,OAAO,CAAC,QAAQ,CAAC,KAAK;WAVnE,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;gBAU1C,aAAa,EAAE,aAAa,EAAmB,KAAK,EAAE,KAAK;IAE3E,kBAAkB,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,qBAAqB;IAoDlF,mBAAmB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,qBAAqB;YA8ClF,0BAA0B;IAe3B,YAAY,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC;IAgC7D,qBAAqB,CAAC,IAAI,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAmB7F,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAKzD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;YAS5E,sBAAsB;YA8BtB,mBAAmB;YAiBnB,0BAA0B;YAsC1B,6BAA6B;YAqC7B,mBAAmB;YAsCnB,UAAU;IAgBX,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;CAqCjH"}
+{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EACL,cAAc,EAGd,aAAa,EACb,oBAAoB,EAEpB,KAAK,EACN,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,sBAAsB,EAQvB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EACL,YAAY,EACZ,0BAA0B,EAC1B,6BAA6B,EAC9B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAEzE,eAAO,MAAM,kCAAkC,MAAM,CAAC;AAatD,eAAO,MAAM,qBAAqB,kCAAkC,CAAC;AAMrE,qBAAa,qBAAsB,SAAQ,oBAAoB;gBACjD,SAAS,SAAY,EAAE,KAAK,SAAY;CAGrD;AAED,qBAAa,qBAAsB,SAAQ,oBAAoB;;CAI9D;AAED,qBAAa,iBAAkB,SAAQ,oBAAoB;gBAC7C,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;CAGtD;AAED,qBAAa,YAAa,SAAQ,oBAAoB;gBACxC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;CAGtD;AAED,qBAAa,wBAAyB,SAAQ,KAAK;CAAG;AACtD,qBAAa,kBAAmB,SAAQ,KAAK;CAAG;AAChD,qBAAa,8BAA+B,SAAQ,KAAK;CAAG;AAC5D,qBAAa,eAAgB,SAAQ,KAAK;CAAG;AAC7C,qBAAa,uBAAwB,SAAQ,KAAK;CAAG;AACrD,qBAAa,yBAA0B,SAAQ,KAAK;CAAG;AAEvD,qBAAa,8BAA+B,SAAQ,KAAK;;CAIxD;AAED,qBAAa,yBAA0B,SAAQ,KAAK;gBACtC,GAAG,EAAE,GAAG;CAGrB;AAeD,qBAAa,0BACX,YAAW,gBAAgB,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,6BAA6B;IAK9F,OAAO,CAAC,QAAQ,CAAC,aAAa;IAAiB,OAAO,CAAC,QAAQ,CAAC,KAAK;WAJnE,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;gBAI1C,aAAa,EAAE,aAAa,EAAmB,KAAK,EAAE,KAAK;IAE3E,kBAAkB,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,qBAAqB;IAoDlF,mBAAmB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,qBAAqB;YA8ClF,0BAA0B;IAe3B,YAAY,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC;IAgC7D,qBAAqB,CAAC,IAAI,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAmB7F,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAKzD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;YAS5E,sBAAsB;YA8BtB,mBAAmB;YAiBnB,6BAA6B;YAI7B,mBAAmB;YAsCnB,UAAU;IAgBX,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;CAqCjH"}

package/out/installations/graphql-client.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InstallationsGraphqlClient = exports.InvalidAtlassianSiteError = exports.UnknownSiteWithoutCloudIdError = exports.InstallationNotFoundError = exports.MissingAppUninstallTask = exports.MissingAppError = exports.InstallationRequestFailedError = exports.MissingTaskIdError = exports.EnvironmentNotFoundError = exports.UpgradeError = exports.InstallationError = exports.AlreadyInstalledError = exports.PermissionDeniedError = exports.ALREADY_UPGRADED_CODE = exports.UNINSTALLATION_EVENT_POLL_INTERVAL = void 0;
-const cs_ari_1 = require("@forge/util/packages/cs-ari");
 const cli_shared_1 = require("@forge/cli-shared");
 const cli_shared_2 = require("@forge/cli-shared");
 const cli_shared_3 = require("@forge/cli-shared");
@@ -63,12 +62,6 @@ class InvalidAtlassianSiteError extends Error {
     }
 }
 exports.InvalidAtlassianSiteError = InvalidAtlassianSiteError;
-const tenantToHostname = (tenantInfo) => {
-    if (!tenantInfo) {
-        return null;
-    }
-    return tenantInfo.hostName || null;
-};
 const tenantContextsToCloudId = (url, contexts) => {
     if (!contexts.length) {
         throw new InvalidAtlassianSiteError(url);
@@ -85,12 +78,7 @@ class InstallationsGraphqlClient {
         this.pause = pause;
     }
     static buildInstallationContext(product, cloudId) {
-        const ari = new cs_ari_1.ResourceIdentifier({
-            resourceOwner: product.toLowerCase(),
-            resourceType: 'site',
-            resourceId: cloudId
-        });
-        return ari.toString();
+        return '';
     }
     async installAppIntoSite({ environmentKey, site, product, appId }) {
         const cloudId = await this.getCloudId(site);
@@ -124,7 +112,7 @@ class InstallationsGraphqlClient {
                 throw new AlreadyInstalledError();
             }
             if (error.code === PERMISSION_DENIED) {
-                throw new PermissionDeniedError(requestId, cs_ari_1.parse(appId).resourceId);
+                throw new Error();
             }
             throw new InstallationError(`${error.message} (requestId: ${requestId || 'unknown'})`, error.code);
         }
@@ -269,58 +257,8 @@ class InstallationsGraphqlClient {
         }
         return true;
     }
-    async createCloudIdToHostnameMap(cloudIds) {
-        const MAX_CLOUD_IDS_AT_ONCE = 20;
-        const cloudIdsChunks = [];
-        for (let i = 0; i < cloudIds.length; i += MAX_CLOUD_IDS_AT_ONCE) {
-            cloudIdsChunks.push(cloudIds.slice(i, i + MAX_CLOUD_IDS_AT_ONCE));
-        }
-        const query = `
-      query forge_cli_getHostnameForTenantContexts($cloudIds: [ID!]!) {
-        tenantContexts(cloudIds: $cloudIds) {
-          hostName
-        }
-      }
-    `;
-        const results = await Promise.all(cloudIdsChunks.map((cloudIdsChunk) => this.graphqlClient.query(query, {
-            cloudIds: cloudIdsChunk
-        })));
-        const tenantContexts = [].concat(...results.map((result) => result.tenantContexts || []));
-        const cloudIdToHostname = {};
-        cloudIds.forEach((cloudId, index) => {
-            const maybeHostname = tenantToHostname(tenantContexts[index]);
-            cloudIdToHostname[cloudId] = maybeHostname || cloudId;
-        });
-        return cloudIdToHostname;
-    }
     async resolveInstallationsHostnames(installations) {
-        if (!installations.length) {
-            return [];
-        }
-        const installationContexts = installations.map(({ installation }) => {
-            const context = cs_ari_1.parse(installation.installationContext);
-            const cloudId = context.resourceId;
-            if (!cloudId) {
-                throw new UnknownSiteWithoutCloudIdError();
-            }
-            return context;
-        });
-        const uniqueCloudIds = [...new Set(installationContexts.map((context) => context.resourceId))];
-        const cloudIdToHostname = await this.createCloudIdToHostnameMap(uniqueCloudIds);
-        return installationContexts.map((context, i) => {
-            const { environment, installation } = installations[i];
-            const site = cloudIdToHostname[context.resourceId];
-            return {
-                id: installation.id,
-                product: context.resourceOwner,
-                environmentKey: environment,
-                context: installation.installationContext,
-                site,
-                version: installation.version || {
-                    isLatest: false
-                }
-            };
-        });
+        return [];
     }
     async getAllInstallations(appId) {
         const query = `

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

@@ -1,11 +1,6 @@
 import { PersonalApiCredentialsValidated } 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);
-    reportDockerVersion(creds: PersonalApiCredentialsValidated, dockerVersion: string | null): void;
-    reportTunnelClosed(creds: PersonalApiCredentialsValidated): 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,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAE7E,qBAAa,sBAAsB;IAC1B,yBAAyB,CAAC,KAAK,EAAE,+BAA+B,GAAG,yBAAyB;CAOpG"}

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

@@ -2,22 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TunnelAnalyticsService = void 0;
 class TunnelAnalyticsService {
-    constructor(analyticsClientReporter) {
-        this.analyticsClientReporter = analyticsClientReporter;
-    }
-    reportDockerVersion(creds, dockerVersion) {
-        this.analyticsClientReporter.reportSuccess('docker version check', creds, {
-            dockerVersion
-        });
-    }
-    reportTunnelClosed(creds) {
-        this.analyticsClientReporter.reportSuccess('close tunnel', creds, {});
-    }
     getImageDownloadReporters(creds) {
         return {
-            onStart: () => this.analyticsClientReporter.reportSuccess('image download started', creds, {}),
-            onFailure: () => this.analyticsClientReporter.reportSuccess('image download failed', creds, {}),
-            onSuccess: () => this.analyticsClientReporter.reportSuccess('image download finished', creds, {})
+            onStart: () => void 0,
+            onFailure: () => void 0,
+            onSuccess: () => void 0
         };
     }
 }

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

@@ -2,7 +2,6 @@ import { HiddenError, PersonalApiCredentialsValidated } from '@forge/cli-shared'
 import { spawn } from 'cross-spawn';
 import { DockerService } from './docker-service';
 import { ConfigFilePortFindingService } from './port-finding-service';
-import { TunnelAnalyticsService } from './tunnel-analytics-service';
 export interface TunnelOptions {
     debug?: boolean;
 }
@@ -36,8 +35,7 @@ export declare class LocalTunnelService extends TunnelService {
 }
 export declare class DockerTunnelService extends TunnelService {
     private readonly dockerService;
-    private readonly analyticsService;
-    constructor(configFilePortFindingService: ConfigFilePortFindingService, dockerService: DockerService, analyticsService: TunnelAnalyticsService);
+    constructor(configFilePortFindingService: ConfigFilePortFindingService, dockerService: DockerService);
     run(tunnelOptions: TunnelOptions, creds: {
         email: string;
         token: string;

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":"AAAA,OAAO,EAA8B,WAAW,EAAE,+BAA+B,EAAE,MAAM,mBAAmB,CAAC;AAC7G,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAOpC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAKD,eAAO,MAAM,cAAc,wBAAwB,CAAC;AAcpD,eAAO,MAAM,UAAU,QAEuB,CAAC;AAE/C,qBAAa,uBAAwB,SAAQ,WAAW;CAAG;AAE3D,8BAAsB,aAAa;IACrB,SAAS,CAAC,QAAQ,CAAC,4BAA4B,EAAE,4BAA4B;gBAA1D,4BAA4B,EAAE,4BAA4B;aAEzE,GAAG,CACjB,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,EACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,GAC7B,OAAO,CAAC,IAAI,CAAC;cAEA,gBAAgB,CAC9B,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,OAAO,EACrB,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,+BAA+B,GAChD,OAAO,CAAC,MAAM,EAAE,CAAC;IA+BpB,SAAS,CAAC,cAAc,CACtB,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,eAAe,EAAE,MAAM,GAAG,SAAS,GAClC,MAAM,EAAE;IAwBX,SAAS,CAAC,2BAA2B,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,EAAE;IAItF,SAAS,CAAC,kCAAkC,IAAI,MAAM,EAAE;IAUxD,SAAS,CAAC,wBAAwB,CAAC,GAAG,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAQ1F,SAAS,CAAC,+BAA+B,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;IAYvF,SAAS,CAAC,qBAAqB,IAAI,MAAM,EAAE;IAQ3C,SAAS,CAAC,gBAAgB,IAAI,MAAM,EAAE;CAavC;AAED,qBAAa,kBAAmB,SAAQ,aAAa;IACtC,GAAG,CACd,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAC1D,YAAY,EAAE,OAAO,EACrB,OAAO,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,GAC5B,OAAO,CAAC,IAAI,CAAC;CA0BjB;AAED,qBAAa,mBAAoB,SAAQ,aAAa;IAGlD,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAFjC,4BAA4B,EAAE,4BAA4B,EACzC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,sBAAsB;IAK9C,GAAG,CACd,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAC1D,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,IAAI,CAAC;IA2BH,eAAe,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC;YAKnD,qBAAqB;CASpC"}
+{"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,WAAW,EAAE,+BAA+B,EAAE,MAAM,mBAAmB,CAAC;AAC7G,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAOpC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAEtE,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAKD,eAAO,MAAM,cAAc,wBAAwB,CAAC;AAcpD,eAAO,MAAM,UAAU,QAEuB,CAAC;AAE/C,qBAAa,uBAAwB,SAAQ,WAAW;CAAG;AAE3D,8BAAsB,aAAa;IACrB,SAAS,CAAC,QAAQ,CAAC,4BAA4B,EAAE,4BAA4B;gBAA1D,4BAA4B,EAAE,4BAA4B;aAEzE,GAAG,CACjB,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,EACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,GAC7B,OAAO,CAAC,IAAI,CAAC;cAEA,gBAAgB,CAC9B,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,OAAO,EACrB,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,+BAA+B,GAChD,OAAO,CAAC,MAAM,EAAE,CAAC;IA+BpB,SAAS,CAAC,cAAc,CACtB,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,eAAe,EAAE,MAAM,GAAG,SAAS,GAClC,MAAM,EAAE;IAwBX,SAAS,CAAC,2BAA2B,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,EAAE;IAItF,SAAS,CAAC,kCAAkC,IAAI,MAAM,EAAE;IAUxD,SAAS,CAAC,wBAAwB,CAAC,GAAG,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAQ1F,SAAS,CAAC,+BAA+B,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;IAYvF,SAAS,CAAC,qBAAqB,IAAI,MAAM,EAAE;IAQ3C,SAAS,CAAC,gBAAgB,IAAI,MAAM,EAAE;CAavC;AAED,qBAAa,kBAAmB,SAAQ,aAAa;IACtC,GAAG,CACd,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAC1D,YAAY,EAAE,OAAO,EACrB,OAAO,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,GAC5B,OAAO,CAAC,IAAI,CAAC;CA0BjB;AAED,qBAAa,mBAAoB,SAAQ,aAAa;IAGlD,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAD9B,4BAA4B,EAAE,4BAA4B,EACzC,aAAa,EAAE,aAAa;IAKlC,GAAG,CACd,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAC1D,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,IAAI,CAAC;IAyBH,eAAe,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC;YAKnD,qBAAqB;CAOpC"}

package/out/service/tunnel-service.js

@@ -148,10 +148,9 @@ class LocalTunnelService extends TunnelService {
 }
 exports.LocalTunnelService = LocalTunnelService;
 class DockerTunnelService extends TunnelService {
-    constructor(configFilePortFindingService, dockerService, analyticsService) {
+    constructor(configFilePortFindingService, dockerService) {
         super(configFilePortFindingService);
         this.dockerService = dockerService;
-        this.analyticsService = analyticsService;
     }
     async run(tunnelOptions, creds, debugEnabled) {
         await this.validateDockerVersion(creds, debugEnabled);
@@ -172,7 +171,6 @@ class DockerTunnelService extends TunnelService {
             ...resourcePortEnvVarOption,
             ...dockerOptions
         ]);
-        docker.on('exit', () => this.analyticsService.reportTunnelClosed(creds));
         this.dockerService.startCleanupWorker([docker.pid], exports.CONTAINER_NAME);
     }
     async bootstrapDocker() {
@@ -180,8 +178,7 @@ class DockerTunnelService extends TunnelService {
         return this.dockerService.downloadImage(exports.IMAGE_NAME);
     }
     async validateDockerVersion(creds, debugEnabled) {
-        const { major, minor, full } = await this.dockerService.getDockerVersion(debugEnabled);
-        this.analyticsService.reportDockerVersion(creds, full);
+        const { major, minor } = await this.dockerService.getDockerVersion(debugEnabled);
         if (major < 17 || (major === 17 && minor < 3)) {
             throw new HiddenDockerTunnelError();
         }

package/out/webtrigger/get-webtrigger-url.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-webtrigger-url.d.ts","sourceRoot":"","sources":["../../src/webtrigger/get-webtrigger-url.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,MAAM,WAAW,OAAO;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC/E;AACD,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,uBAAuB;gBAHvB,YAAY,EAAE,iBAAiB,EAC/B,gBAAgB,EAAE,gBAAgB,EAClC,oBAAoB,EAAE,oBAAoB,EAC1C,uBAAuB,EAAE,uBAAuB;IAGtD,OAAO,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAgBnF"}
+{"version":3,"file":"get-webtrigger-url.d.ts","sourceRoot":"","sources":["../../src/webtrigger/get-webtrigger-url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,MAAM,WAAW,OAAO;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC/E;AACD,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,uBAAuB;gBAHvB,YAAY,EAAE,iBAAiB,EAC/B,gBAAgB,EAAE,gBAAgB,EAClC,oBAAoB,EAAE,oBAAoB,EAC1C,uBAAuB,EAAE,uBAAuB;IAGtD,OAAO,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAcnF"}

package/out/webtrigger/get-webtrigger-url.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetWebTriggerURLCommand = void 0;
-const cs_ari_1 = require("@forge/util/packages/cs-ari");
 class GetWebTriggerURLCommand {
     constructor(getAppConfig, webTriggerClient, appEnvironmentClient, webTriggerGraphqlClient) {
         this.getAppConfig = getAppConfig;
@@ -13,10 +12,8 @@ class GetWebTriggerURLCommand {
         const { id: appId } = await this.getAppConfig();
         const { environmentKey, context } = await this.webTriggerClient.getInstallation(appId, installationId);
         const environmentId = await this.appEnvironmentClient.getAppEnvironmentId(appId, environmentKey);
-        const ari = cs_ari_1.parse(appId);
-        const appAri = cs_ari_1.parseAppAri(ari);
         return await this.webTriggerGraphqlClient.createWebTriggerUrl({
-            appId: appAri.appId,
+            appId: '',
             contextId: context,
             environmentId: environmentId,
             triggerKey: functionKey

package/out/workers/forge-cli-workers.js

@@ -12,7 +12,7 @@ const workerInfo = JSON.parse(process.argv[2]);
 const cachedConf = cli_shared_1.CachedConf.getCache(unique_machine_id_1.FORGE_CLI_PACKAGE);
 const cachedConfigService = new cached_config_service_1.CachedConfigService(cachedConf);
 const ALL_WORKERS = [
-    new analytics_message_worker_1.AnalyticsMessageWorker(new local_file_storage_1.LocalFileStorage(), new analytics_message_handler_1.AnalyticsMessageHandler(workerInfo ? workerInfo.environment : undefined), cachedConfigService),
+    new analytics_message_worker_1.AnalyticsMessageWorker(new local_file_storage_1.LocalFileStorage(), new analytics_message_handler_1.AnalyticsMessageHandler(), cachedConfigService),
     new version_check_worker_1.VersionCheckWorker(workerInfo)
 ];
 const TIMEOUT = 10 * 1000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli",
-  "version": "0.0.0-experimental-c3effe3",
+  "version": "0.0.0-experimental-a9f00a0",
   "description": "A command line interface for managing Atlassian-hosted apps",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -18,11 +18,9 @@
     "postinstall": "node -e \"process.exitCode = fs.existsSync('./out/bin/postinstall.js')\" || node ./out/bin/postinstall.js"
   },
   "dependencies": {
-    "@forge/bundler": "0.0.0-experimental-c3effe3",
-    "@forge/cli-shared": "0.0.0-experimental-c3effe3",
-    "@forge/lint": "0.0.0-experimental-c3effe3",
-    "@forge/manifest": "0.0.0-experimental-c3effe3",
-    "@forge/util": "1.2.0",
+    "@forge/cli-shared": "2.7.0",
+    "@forge/lint": "3.2.1",
+    "@forge/manifest": "3.9.1",
     "ajv": "^6.12.5",
     "archiver": "^5.2.0",
     "case": "^1.6.2",