@forge/cli 0.0.0-experimental-819498d → 0.0.0-experimental-a9f00a0

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

@@ -1 +1 @@
-{"version":3,"file":"installation-service.d.ts","sourceRoot":"","sources":["../../src/service/installation-service.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,iBAAiB,EAKjB,cAAc,EACf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE;QACP,QAAQ,EAAE,OAAO,CAAC;KACnB,CAAC;CACH;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,YAAY,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,qBAAqB;IACpC,cAAc,EAAE,IAAI,CAAC;CACtB;AAED,UAAU,yBAAyB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,0BAA0B;IACzC,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAC1D,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;CACrF;AAED,MAAM,WAAW,6BAA6B;IAC5C,mBAAmB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;CACjH;AAID,qBAAa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,6BAA6B;gBAF7B,YAAY,EAAE,iBAAiB,EAC/B,uBAAuB,EAAE,0BAA0B,EACnD,6BAA6B,EAAE,6BAA6B;IAG/E,OAAO,CAAC,mBAAmB;IAiBd,oBAAoB,CAAC,MAAM,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,eAAe,CAAC;IAOlF,+BAA+B,CAAC,MAAM,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,eAAe,CAAC;IAM7F,8BAA8B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOrE,mBAAmB,CAC9B,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,gBAAgB,GAAG,qBAAqB,CAAC;IAqBvC,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;CAG7D"}
+{"version":3,"file":"installation-service.d.ts","sourceRoot":"","sources":["../../src/service/installation-service.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,iBAAiB,EACjB,cAAc,EAQf,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE;QACP,QAAQ,EAAE,OAAO,CAAC;KACnB,CAAC;CACH;AAED,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,YAAY,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,gCAAgC;IAC/C,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,yBAA0B,SAAQ,gCAAgC;IACjF,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,UAAU,yBAAyB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,0BAA0B;IACzC,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAC1D,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;CACzG;AAED,MAAM,WAAW,6BAA6B;IAC5C,mBAAmB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrG;AAKD,qBAAa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,6BAA6B;gBAF7B,YAAY,EAAE,iBAAiB,EAC/B,uBAAuB,EAAE,0BAA0B,EACnD,6BAA6B,EAAE,6BAA6B;IAG/E,OAAO,CAAC,mBAAmB;IAiBd,oBAAoB,CAAC,MAAM,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,eAAe,CAAC;IAOlF,gCAAgC,CAAC,MAAM,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,eAAe,CAAC;IAU9F,8BAA8B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOrE,mBAAmB,CAC9B,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC;IAkBnB,OAAO,CAAC,uCAAuC;IAgBlC,4BAA4B,CACvC,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC;CAyBlD"}

package/out/service/installation-service.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InstallationService = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
+const lodash_1 = require("lodash");
 const graphql_client_1 = require("../installations/graphql-client");
 const IDENTITY_PRODUCT_NAME = 'identity';
+const JIRA_SERVICE_DESK_PRODUCT_NAME = 'jira-servicedesk';
 class InstallationService {
     constructor(getAppConfig, listInstallationsClient, upgradeAppInstallationsClient) {
         this.getAppConfig = getAppConfig;
@@ -22,43 +24,66 @@ class InstallationService {
         });
     }
     async listAppInstallations(filter) {
-        const { id: appId, name } = await this.getAppConfig();
+        const { id: appId } = await this.getAppConfig();
         const installations = await this.listInstallationsClient.listInstallations(appId);
-        return { name, installations: this.filterInstallations(installations, Object.assign({}, filter)) };
+        return { installations: this.filterInstallations(installations, Object.assign({}, filter)) };
     }
-    async listNonIdentityAppInstallations(filter) {
-        const { name, installations } = await this.listAppInstallations(filter);
-        return { name, installations: installations.filter(({ product }) => product !== IDENTITY_PRODUCT_NAME) };
+    async listNonTechnicalAppInstallations(filter) {
+        const { installations } = await this.listAppInstallations(filter);
+        return {
+            installations: installations.filter(({ product }) => product !== IDENTITY_PRODUCT_NAME && product !== JIRA_SERVICE_DESK_PRODUCT_NAME)
+        };
     }
     async hasOutdatedProductInstallation(environment) {
-        const { installations } = await this.listNonIdentityAppInstallations({
+        const { installations } = await this.listNonTechnicalAppInstallations({
             environment
         });
         return installations.some((installation) => !installation.version.isLatest);
     }
     async upgradeInstallation(site, product, environmentKey, appId) {
         try {
-            const result = await this.upgradeAppInstallationsClient.upgradeInstallation({
+            await this.upgradeAppInstallationsClient.upgradeInstallation({
                 site,
                 product,
                 environmentKey,
                 appId
             });
-            return result;
+            return false;
         }
         catch (e) {
             if (e.code === graphql_client_1.ALREADY_UPGRADED_CODE) {
-                return {
-                    alreadyUpdated: true
-                };
+                return true;
             }
             else {
                 throw e;
             }
         }
     }
-    async getScopes(appId, environmentKey) {
-        return await this.listInstallationsClient.getScopes(appId, environmentKey);
+    getPermissionsFromAppEnvironmentVersion(appEnvironmentVersion) {
+        const permissions = appEnvironmentVersion === null || appEnvironmentVersion === void 0 ? void 0 : appEnvironmentVersion.permissions[0];
+        if (!permissions) {
+            return { scopes: [], egressAddresses: [] };
+        }
+        const scopes = permissions.scopes.map((s) => s.key);
+        const egressAddresses = (permissions === null || permissions === void 0 ? void 0 : permissions.egress) ? cli_shared_1.flatMap(permissions.egress, ({ addresses }) => addresses !== null && addresses !== void 0 ? addresses : []) : [];
+        return { scopes, egressAddresses };
+    }
+    async getAppEnvironmentPermissions(appId, environmentKey) {
+        const versionDetails = await this.listInstallationsClient.getVersions(appId, environmentKey, 2);
+        const versions = versionDetails === null || versionDetails === void 0 ? void 0 : versionDetails.nodes;
+        if (!versions || versions.length === 0)
+            return;
+        const [{ scopes }, oldVersion] = versions.map((appEnvironmentVersion) => this.getPermissionsFromAppEnvironmentVersion(appEnvironmentVersion));
+        if (!oldVersion) {
+            return {
+                scopes,
+                egressAddresses: [],
+                addedScopes: scopes
+            };
+        }
+        const { scopes: oldScopes } = oldVersion;
+        const addedScopes = lodash_1.difference(scopes, oldScopes);
+        return { scopes, egressAddresses: [], addedScopes };
     }
 }
 exports.InstallationService = InstallationService;

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { ConfigFile, FileSystemReader } from '@forge/cli-shared';
-import { LintFixState, LintResult, ProblemCount } from '@forge/lint';
+import { LintFixState, LintResult, LintLogger, ProblemCount } from '@forge/lint';
 interface LintOptions {
     fix?: boolean;
 }
@@ -13,7 +13,7 @@ export declare class LintService {
     private readonly configFile;
     private readonly fileSystemReader;
     constructor(configFile: ConfigFile, fileSystemReader: FileSystemReader);
-    run(environment: string, { fix }: LintOptions, directory?: string, lintFunction?: (filesToLint: string[], manifest: import("@forge/manifest").ManifestSchema, environment: string, parseFunction?: ((filepath: string, parser: (code: string, ...args: any[]) => Promise<import("@forge/lint").ASTParseResult>, readFilePromise?: typeof import("fs").readFile.__promisify__ | undefined) => Promise<import("@forge/lint").LintInput>) | undefined, linters?: import("@forge/lint").LinterInterface[] | undefined) => Promise<LintResult[]>): Promise<RunResult>;
+    run(environment: string, { fix }: LintOptions, logger: LintLogger, directory?: string, lintFunction?: (filesToLint: string[], manifest: import("@forge/manifest").ManifestSchema, environment: string, logger: Pick<import("@forge/cli-shared/src").Logger, "info">, parseFunction?: ((filepath: string, parser: (code: string, filepath: string, parseOptions?: Partial<import("@forge/lint").ParseOptions> | undefined) => Promise<import("@forge/lint").ASTParseResult>, readFilePromise?: typeof import("fs").readFile.__promisify__ | undefined) => Promise<import("@forge/lint").LintInput>) | undefined, linters?: import("@forge/lint").LinterInterface[] | undefined) => Promise<LintResult[]>): Promise<RunResult>;
     private fix;
     problemCount(lintResults: LintResult[]): ProblemCount;
     private failedScopesFromLintResult;

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

@@ -1 +1 @@
-{"version":3,"file":"lint-service.d.ts","sourceRoot":"","sources":["../../src/service/lint-service.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAsB,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrF,OAAO,EAEL,YAAY,EACZ,UAAU,EAGV,YAAY,EACb,MAAM,aAAa,CAAC;AAErB,UAAU,WAAW;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,UAAU,SAAS;IACjB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,YAAY,CAAC;CAC3B;AAED,eAAO,MAAM,iBAAiB,UAAU,CAAC;AAEzC,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAc,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAzD,UAAU,EAAE,UAAU,EAAmB,gBAAgB,EAAE,gBAAgB;IAE3F,GAAG,CACd,WAAW,EAAE,MAAM,EACnB,EAAE,GAAG,EAAE,EAAE,WAAW,EACpB,SAAS,SAAoB,EAC7B,YAAY,4bAAO,GAClB,OAAO,CAAC,SAAS,CAAC;YAYP,GAAG;IASV,YAAY,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,YAAY;IAI5D,OAAO,CAAC,0BAA0B;IAI3B,YAAY,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,EAAE;CAOzD"}
+{"version":3,"file":"lint-service.d.ts","sourceRoot":"","sources":["../../src/service/lint-service.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAsB,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrF,OAAO,EAEL,YAAY,EACZ,UAAU,EAGV,UAAU,EACV,YAAY,EACb,MAAM,aAAa,CAAC;AAErB,UAAU,WAAW;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,UAAU,SAAS;IACjB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,YAAY,CAAC;CAC3B;AAED,eAAO,MAAM,iBAAiB,UAAU,CAAC;AAEzC,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAc,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAzD,UAAU,EAAE,UAAU,EAAmB,gBAAgB,EAAE,gBAAgB;IAE3F,GAAG,CACd,WAAW,EAAE,MAAM,EACnB,EAAE,GAAG,EAAE,EAAE,WAAW,EACpB,MAAM,EAAE,UAAU,EAClB,SAAS,SAAoB,EAC7B,YAAY,okBAAO,GAClB,OAAO,CAAC,SAAS,CAAC;YAYP,GAAG;IASV,YAAY,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,YAAY;IAI5D,OAAO,CAAC,0BAA0B;IAI3B,YAAY,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,EAAE;CAOzD"}

package/out/service/lint-service.js

@@ -9,10 +9,10 @@ class LintService {
         this.configFile = configFile;
         this.fileSystemReader = fileSystemReader;
     }
-    async run(environment, { fix }, directory = exports.DEFAULT_DIRECTORY, lintFunction = lint_1.lint) {
+    async run(environment, { fix }, logger, directory = exports.DEFAULT_DIRECTORY, lintFunction = lint_1.lint) {
         const exclude = [...(await cli_shared_1.listGitIgnoreFiles(this.fileSystemReader)), '.git', 'node_modules'];
         const filesToLint = await this.fileSystemReader.recursiveReadDir(directory, exclude);
-        const lintResults = await lintFunction(filesToLint, await this.configFile.readConfig(), environment);
+        const lintResults = await lintFunction(filesToLint, await this.configFile.readConfig(), environment, logger);
         if (fix) {
             return { lintResults, fixResults: await this.fix(lintResults) };
         }

package/out/service/lite-lint-service.d.ts

@@ -1,9 +1,9 @@
-import { LintResult } from '@forge/lint';
+import { LintLogger, LintResult } from '@forge/lint';
 export declare class LiteLintService {
     private readonly lintService;
     private readonly problemCounter;
-    constructor(lintService?: (linter?: import("@forge/lint").LinterInterface | undefined) => Promise<LintResult[]>, problemCounter?: (lintResults: LintResult[]) => import("@forge/lint").ProblemCount);
-    run(checkSchema: boolean): Promise<LintResult[]>;
+    constructor(lintService?: (logger: Pick<import("@forge/cli-shared/src").Logger, "info">, linter?: import("@forge/lint").LinterInterface | undefined) => Promise<LintResult[]>, problemCounter?: (lintResults: LintResult[]) => import("@forge/lint").ProblemCount);
+    run(checkSchema: boolean, logger: LintLogger): Promise<LintResult[]>;
     private filterResults;
     hasErrors(report: LintResult[]): boolean;
 }

package/out/service/lite-lint-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lite-lint-service.d.ts","sourceRoot":"","sources":["../../src/service/lite-lint-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,UAAU,EAAE,MAAM,aAAa,CAAC;AAGjE,qBAAa,eAAe;IACd,OAAO,CAAC,QAAQ,CAAC,WAAW;IAAa,OAAO,CAAC,QAAQ,CAAC,cAAc;gBAAvD,WAAW,wFAAW,EAAmB,cAAc,oEAAe;IAEtF,GAAG,CAAC,WAAW,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAK7D,OAAO,CAAC,aAAa;IASd,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO;CAGhD"}
+{"version":3,"file":"lite-lint-service.d.ts","sourceRoot":"","sources":["../../src/service/lite-lint-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,UAAU,EAAgB,UAAU,EAAE,MAAM,aAAa,CAAC;AAG7E,qBAAa,eAAe;IACd,OAAO,CAAC,QAAQ,CAAC,WAAW;IAAa,OAAO,CAAC,QAAQ,CAAC,cAAc;gBAAvD,WAAW,sJAAW,EAAmB,cAAc,oEAAe;IAEtF,GAAG,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAKjF,OAAO,CAAC,aAAa;IASd,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO;CAGhD"}

package/out/service/lite-lint-service.js

@@ -8,8 +8,8 @@ class LiteLintService {
         this.lintService = lintService;
         this.problemCounter = problemCounter;
     }
-    async run(checkSchema) {
-        const report = await this.lintService();
+    async run(checkSchema, logger) {
+        const report = await this.lintService(logger);
         return this.filterResults(report, checkSchema);
     }
     filterResults(report, checkSchema) {

package/out/service/migration-keys-service.d.ts

@@ -0,0 +1,19 @@
+import { AppConfigProvider } from 'packages/forge-cli-shared/src/apps';
+export declare type MigrationKeys = {
+    jira?: string;
+    confluence?: string;
+};
+export interface AppEnvironmentMigrationKeys {
+    migrationKeys?: MigrationKeys | null;
+    mpacAppKey?: string | null;
+}
+export interface GetMigrationKeysClient {
+    getLatestMigrationKeys(appId: string, environmentKey: string): Promise<AppEnvironmentMigrationKeys>;
+}
+export declare class MigrationKeysService {
+    private readonly migrationKeysClient;
+    private readonly getAppConfig;
+    constructor(migrationKeysClient: GetMigrationKeysClient, getAppConfig: AppConfigProvider);
+    getMigrationKeysForAppEnvironment(environmentKey: string): Promise<AppEnvironmentMigrationKeys>;
+}
+//# sourceMappingURL=migration-keys-service.d.ts.map

package/out/service/migration-keys-service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migration-keys-service.d.ts","sourceRoot":"","sources":["../../src/service/migration-keys-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,oBAAY,aAAa,GAAG;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AACF,MAAM,WAAW,2BAA2B;IAC1C,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IACrC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AACD,MAAM,WAAW,sBAAsB;IACrC,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;CACrG;AAED,qBAAa,oBAAoB;IAE7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBADZ,mBAAmB,EAAE,sBAAsB,EAC3C,YAAY,EAAE,iBAAiB;IAGrC,iCAAiC,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC;CAI7G"}

package/out/service/migration-keys-service.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MigrationKeysService = void 0;
+class MigrationKeysService {
+    constructor(migrationKeysClient, getAppConfig) {
+        this.migrationKeysClient = migrationKeysClient;
+        this.getAppConfig = getAppConfig;
+    }
+    async getMigrationKeysForAppEnvironment(environmentKey) {
+        const { id: appId } = await this.getAppConfig();
+        return await this.migrationKeysClient.getLatestMigrationKeys(appId, environmentKey);
+    }
+}
+exports.MigrationKeysService = MigrationKeysService;

package/out/service/resource-packaging-service.d.ts

@@ -1,5 +1,5 @@
 import { Modules } from '@forge/manifest';
-import { FileSystemReader, ResourceDetails, BridgeScriptService } from '@forge/cli-shared';
+import { FileSystemReader, ResourceDetails, BridgeScriptService, IframeResizerScriptService } from '@forge/cli-shared';
 import { Archiver } from '../deploy';
 export declare class ResourceDirectoryMissingError extends Error {
     constructor(key: string, dir: string);
@@ -33,7 +33,8 @@ export declare class ResourcePackagingService {
     private readonly fileSystemReader;
     private readonly appDir;
     private readonly bridgeScriptService;
-    constructor(archiverFactory: () => Archiver, fileSystemReader: FileSystemReader, appDir: string, bridgeScriptService: BridgeScriptService);
+    private readonly iframeResizerScriptService;
+    constructor(archiverFactory: () => Archiver, fileSystemReader: FileSystemReader, appDir: string, bridgeScriptService: BridgeScriptService, iframeResizerScriptService: IframeResizerScriptService);
     private getResourcesInformation;
     private transformRelativeResourcePathsToAbsolute;
     private processFile;

package/out/service/resource-packaging-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resource-packaging-service.d.ts","sourceRoot":"","sources":["../../src/service/resource-packaging-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAsB,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAC/G,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAKrC,qBAAa,6BAA8B,SAAQ,KAAK;gBAC1C,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAGrC;AAED,qBAAa,2BAA4B,SAAQ,KAAK;gBACxC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAGrC;AAeD,MAAM,WAAW,gBAAgB;IAC/B,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,EAAE,CAAC;QACrB,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED,qBAAa,4BAA6B,SAAQ,KAAK;;CAItD;AAED,qBAAa,0BAA2B,SAAQ,KAAK;;CAIpD;AAED,qBAAa,kCAAmC,SAAQ,KAAK;gBAC/C,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAGnD;AAED,qBAAa,oCAAqC,SAAQ,KAAK;gBACjD,WAAW,EAAE,MAAM;CAGhC;AAED,qBAAa,wBAAwB;IAEjC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;gBAHnB,eAAe,EAAE,MAAM,QAAQ,EAC/B,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,mBAAmB;YAG7C,uBAAuB;IAerC,OAAO,CAAC,wCAAwC;IAIhD,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,wBAAwB;IAMhC,OAAO,CAAC,iCAAiC;YAM3B,qBAAqB;IAatB,YAAY,CAAC,SAAS,EAAE,eAAe,EAAE,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAiCtG"}
+{"version":3,"file":"resource-packaging-service.d.ts","sourceRoot":"","sources":["../../src/service/resource-packaging-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EACL,gBAAgB,EAChB,eAAe,EAGf,mBAAmB,EACnB,0BAA0B,EAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAKrC,qBAAa,6BAA8B,SAAQ,KAAK;gBAC1C,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAGrC;AAED,qBAAa,2BAA4B,SAAQ,KAAK;gBACxC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAGrC;AAeD,MAAM,WAAW,gBAAgB;IAC/B,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,EAAE,CAAC;QACrB,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED,qBAAa,4BAA6B,SAAQ,KAAK;;CAItD;AAED,qBAAa,0BAA2B,SAAQ,KAAK;;CAIpD;AAED,qBAAa,kCAAmC,SAAQ,KAAK;gBAC/C,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAGnD;AAED,qBAAa,oCAAqC,SAAQ,KAAK;gBACjD,WAAW,EAAE,MAAM;CAGhC;AAED,qBAAa,wBAAwB;IAEjC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,0BAA0B;gBAJ1B,eAAe,EAAE,MAAM,QAAQ,EAC/B,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,mBAAmB,EACxC,0BAA0B,EAAE,0BAA0B;YAG3D,uBAAuB;IAerC,OAAO,CAAC,wCAAwC;IAIhD,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,wBAAwB;IAMhC,OAAO,CAAC,iCAAiC;YAM3B,qBAAqB;IAatB,YAAY,CAAC,SAAS,EAAE,eAAe,EAAE,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAiCtG"}

package/out/service/resource-packaging-service.js

@@ -42,11 +42,12 @@ class DetailedMalformedHtmlEntrypointError extends Error {
 }
 exports.DetailedMalformedHtmlEntrypointError = DetailedMalformedHtmlEntrypointError;
 class ResourcePackagingService {
-    constructor(archiverFactory, fileSystemReader, appDir, bridgeScriptService) {
+    constructor(archiverFactory, fileSystemReader, appDir, bridgeScriptService, iframeResizerScriptService) {
         this.archiverFactory = archiverFactory;
         this.fileSystemReader = fileSystemReader;
         this.appDir = appDir;
         this.bridgeScriptService = bridgeScriptService;
+        this.iframeResizerScriptService = iframeResizerScriptService;
     }
     async getResourcesInformation(resources) {
         return await Promise.all(resources.map(async ({ key, directory, resourceType }) => {
@@ -65,7 +66,10 @@ class ResourcePackagingService {
     }
     processFile(filePath, content) {
         if (filePath === CUSTOM_UI_ENTRYPOINT) {
-            return this.bridgeScriptService.injectBridgeCore(content, () => {
+            const contentWithIframeResizerScript = this.iframeResizerScriptService.injectIframeResizer(content, () => {
+                throw new MalformedHtmlEntrypointError();
+            });
+            return this.bridgeScriptService.injectBridgeCore(contentWithIframeResizerScript, () => {
                 throw new MalformedHtmlEntrypointError();
             });
         }

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;IA8BpB,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;IAWvF,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

@@ -38,7 +38,7 @@ class TunnelService {
     async getDockerOptions(tunnelOptions, debugEnabled, { email, token }) {
         try {
             const graphqlGateway = cli_shared_1.getGraphqlGateway();
-            const dockerOptions = [
+            return [
                 '--rm',
                 `--name`,
                 exports.CONTAINER_NAME,
@@ -56,9 +56,10 @@ class TunnelService {
                 `FORGE_GRAPHQL_GATEWAY=${graphqlGateway}`,
                 `--env`,
                 `VERBOSE_MODE=${debugEnabled}`,
+                `--env`,
+                `CLI_DETAILS=${JSON.stringify(cliDetails)}`,
                 `${exports.IMAGE_NAME}`
             ];
-            return dockerOptions;
         }
         catch (e) {
             throw new HiddenDockerTunnelError("Couldn't populate docker options for tunneling");
@@ -99,11 +100,12 @@ class TunnelService {
         return Object.assign(Object.assign({}, env), { PATH: process.env.PATH || '', FORCE_COLOR: '1' });
     }
     transformDockerOptionsToEnvVars(options) {
-        const envVarRegex = new RegExp('^\\w+=.+$', 'g');
+        const envVarRegex = new RegExp('^(\\w+)=(.+)$', 'g');
         const envVars = options.filter((opt) => envVarRegex.test(opt));
         const envVarObj = {};
         envVars.forEach((envVar) => {
-            const [key, val] = envVar.split('=');
+            envVarRegex.lastIndex = 0;
+            const [, key, val] = envVarRegex.exec(envVar);
             envVarObj[key] = val;
         });
         return envVarObj;
@@ -146,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);
@@ -170,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() {
@@ -178,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

@@ -1,12 +1,18 @@
 import { AppConfigProvider } from '@forge/cli-shared';
-import { GlobalEdgeClient } from '@forge/cli-shared';
 import { AppEnvironmentClient } from '@forge/cli-shared';
 import { Installation } from '../service/installation-service';
+import { WebTriggerGraphQLClient } from './graphql-client';
 export interface Context {
     contextId: string;
     environmentARI: string;
     extensionKey: string;
 }
+export interface WebTriggerUrlDetails {
+    appId: string;
+    contextId: string;
+    environmentId: string;
+    triggerKey: string;
+}
 export interface WebTriggerClient {
     getInstallation(appId: string, installationId: string): Promise<Installation>;
 }
@@ -14,8 +20,8 @@ export declare class GetWebTriggerURLCommand {
     private readonly getAppConfig;
     private readonly webTriggerClient;
     private readonly appEnvironmentClient;
-    private readonly globalEdgeClient;
-    constructor(getAppConfig: AppConfigProvider, webTriggerClient: WebTriggerClient, appEnvironmentClient: AppEnvironmentClient, globalEdgeClient: GlobalEdgeClient);
-    execute(installationId: string, functionKey: string, isProduction: boolean): Promise<string>;
+    private readonly webTriggerGraphqlClient;
+    constructor(getAppConfig: AppConfigProvider, webTriggerClient: WebTriggerClient, appEnvironmentClient: AppEnvironmentClient, webTriggerGraphqlClient: WebTriggerGraphQLClient);
+    execute(installationId: string, functionKey: string): Promise<string>;
 }
 //# sourceMappingURL=get-webtrigger-url.d.ts.map

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":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,MAAM,WAAW,OAAO;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC/E;AAQD,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,gBAAgB;gBAHhB,YAAY,EAAE,iBAAiB,EAC/B,gBAAgB,EAAE,gBAAgB,EAClC,oBAAoB,EAAE,oBAAoB,EAC1C,gBAAgB,EAAE,gBAAgB;IAGxC,OAAO,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;CAkB1G"}
+{"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,33 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetWebTriggerURLCommand = void 0;
-const cs_ari_1 = require("@forge/util/packages/cs-ari");
-const url_1 = require("url");
-const cli_shared_1 = require("@forge/cli-shared");
-function buildWebtriggerURL(appId, context, extension, isProduction) {
-    const hostname = isProduction ? `${appId}.hello.atlassian-dev.net` : `${appId}.xen.atlassian-dev.net`;
-    const urlObj = new url_1.URL(`/x0/${cli_shared_1.encodeContext(context, extension)}`, `https://${hostname}`);
-    return urlObj.toString();
-}
 class GetWebTriggerURLCommand {
-    constructor(getAppConfig, webTriggerClient, appEnvironmentClient, globalEdgeClient) {
+    constructor(getAppConfig, webTriggerClient, appEnvironmentClient, webTriggerGraphqlClient) {
         this.getAppConfig = getAppConfig;
         this.webTriggerClient = webTriggerClient;
         this.appEnvironmentClient = appEnvironmentClient;
-        this.globalEdgeClient = globalEdgeClient;
+        this.webTriggerGraphqlClient = webTriggerGraphqlClient;
     }
-    async execute(installationId, functionKey, isProduction) {
+    async execute(installationId, functionKey) {
         const { id: appId } = await this.getAppConfig();
-        const { product, site, environmentKey } = await this.webTriggerClient.getInstallation(appId, installationId);
-        const [environmentId, cloudId] = await Promise.all([
-            this.appEnvironmentClient.getAppEnvironmentId(appId, environmentKey),
-            this.globalEdgeClient.getCloudId(new url_1.URL(`https://${site}`))
-        ]);
-        const context = cli_shared_1.buildContextAri(cloudId, product);
-        const ari = cs_ari_1.parse(appId);
-        const appAri = cs_ari_1.parseAppAri(ari);
-        const extension = cli_shared_1.buildExtensionAri(appAri.appId, environmentId, functionKey);
-        return buildWebtriggerURL(appAri.appId, context, extension, isProduction);
+        const { environmentKey, context } = await this.webTriggerClient.getInstallation(appId, installationId);
+        const environmentId = await this.appEnvironmentClient.getAppEnvironmentId(appId, environmentKey);
+        return await this.webTriggerGraphqlClient.createWebTriggerUrl({
+            appId: '',
+            contextId: context,
+            environmentId: environmentId,
+            triggerKey: functionKey
+        });
     }
 }
 exports.GetWebTriggerURLCommand = GetWebTriggerURLCommand;

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

@@ -0,0 +1,14 @@
+import { GraphQLClient, GraphQlMutationError } from '@forge/cli-shared';
+import { WebTriggerUrlDetails } from './get-webtrigger-url';
+export declare class WebTriggerCreationError extends GraphQlMutationError {
+    constructor(message: string, code: string | undefined);
+}
+export declare class MissingWebTriggerUrlError extends GraphQlMutationError {
+    constructor(requestId: string | undefined);
+}
+export declare class WebTriggerGraphQLClient {
+    private readonly graphQLClient;
+    constructor(graphQLClient: GraphQLClient);
+    createWebTriggerUrl({ appId, contextId, environmentId, triggerKey }: WebTriggerUrlDetails): Promise<string>;
+}
+//# sourceMappingURL=graphql-client.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/webtrigger/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAyC,MAAM,mBAAmB,CAAC;AAC/G,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,qBAAa,uBAAwB,SAAQ,oBAAoB;gBACnD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;CAGtD;AAED,qBAAa,yBAA0B,SAAQ,oBAAoB;gBACrD,SAAS,EAAE,MAAM,GAAG,SAAS;CAO1C;AAED,qBAAa,uBAAuB;IACtB,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,mBAAmB,CAAC,EAC/B,KAAK,EACL,SAAS,EACT,aAAa,EACb,UAAU,EACX,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC;CAoC1C"}

package/out/webtrigger/graphql-client.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebTriggerGraphQLClient = exports.MissingWebTriggerUrlError = exports.WebTriggerCreationError = void 0;
+const cli_shared_1 = require("@forge/cli-shared");
+class WebTriggerCreationError extends cli_shared_1.GraphQlMutationError {
+    constructor(message, code) {
+        super(cli_shared_1.Text.webtrigger.error.creationError(message), code);
+    }
+}
+exports.WebTriggerCreationError = WebTriggerCreationError;
+class MissingWebTriggerUrlError extends cli_shared_1.GraphQlMutationError {
+    constructor(requestId) {
+        super(cli_shared_1.Text.webtrigger.error.creationError(`Web Trigger URL not found after successful creation, requestId: ${requestId !== null && requestId !== void 0 ? requestId : 'N/A'}`));
+    }
+}
+exports.MissingWebTriggerUrlError = MissingWebTriggerUrlError;
+class WebTriggerGraphQLClient {
+    constructor(graphQLClient) {
+        this.graphQLClient = graphQLClient;
+    }
+    async createWebTriggerUrl({ appId, contextId, environmentId, triggerKey }) {
+        const query = `
+        mutation forge_cli_createWebTriggerUrl($input: WebTriggerUrlInput!) {
+            createWebTriggerUrl(input: $input) {
+            statusCode
+            success
+            message
+            url
+            }
+        }
+        `;
+        const variables = {
+            input: {
+                appId,
+                contextId,
+                envId: environmentId,
+                triggerKey
+            }
+        };
+        const { response: { createWebTriggerUrl: { success, statusCode, message, url } }, requestId } = await this.graphQLClient.mutate(query, variables);
+        if (!success) {
+            throw new WebTriggerCreationError(message, statusCode.toString());
+        }
+        else {
+            if (url) {
+                return url;
+            }
+            throw new MissingWebTriggerUrlError(requestId);
+        }
+    }
+}
+exports.WebTriggerGraphQLClient = WebTriggerGraphQLClient;

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

@@ -9,10 +9,10 @@ const cached_config_service_1 = require("../service/cached-config-service");
 const cli_shared_1 = require("@forge/cli-shared");
 const unique_machine_id_1 = require("../command-line/unique-machine-id");
 const workerInfo = JSON.parse(process.argv[2]);
-const cachedConf = new cli_shared_1.CachedConf(unique_machine_id_1.FORGE_CLI_PACKAGE);
+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;