@forge/cli 10.13.6 → 11.0.0

package/out/installations/graphql-client.js

@@ -73,7 +73,7 @@ class InstallationNotFoundError extends cli_shared_1.UserError {
 exports.InstallationNotFoundError = InstallationNotFoundError;
 class InstallationsGraphqlClient {
     graphqlClient;
-    cloudIdTranslator;
+    sitedProductTranslator;
     bitbucketTranslator;
     pause;
     SITE_RESOURCE_TYPE = 'site';
@@ -86,9 +86,9 @@ class InstallationsGraphqlClient {
         });
         return ari.toString();
     }
-    constructor(graphqlClient, cloudIdTranslator, bitbucketTranslator, pause) {
+    constructor(graphqlClient, sitedProductTranslator, bitbucketTranslator, pause) {
         this.graphqlClient = graphqlClient;
-        this.cloudIdTranslator = cloudIdTranslator;
+        this.sitedProductTranslator = sitedProductTranslator;
         this.bitbucketTranslator = bitbucketTranslator;
         this.pause = pause;
     }
@@ -100,7 +100,7 @@ class InstallationsGraphqlClient {
         if (product && (0, cli_shared_1.isBitbucketProduct)(product)) {
             return this.bitbucketTranslator;
         }
-        return this.cloudIdTranslator;
+        return this.sitedProductTranslator;
     }
     async installAppIntoSite({ environmentKey, site, product, appId, licenseOverride, overrides }) {
         const workspaceAri = await this.buildInstallationContext(product, site);
@@ -260,6 +260,32 @@ class InstallationsGraphqlClient {
         }
         throw new InstallationNotFoundError(cli_shared_1.Text.installationId.errors.notFound(installationId));
     }
+    async hasNoAppInstallationsForEnv(appId, appEnv) {
+        const query = `
+      query forge_cli_hasNoAppInstallationsForEnv($filter: AppInstallationsByAppFilter!) {
+        ecosystem {
+          appInstallationsByApp(filter: $filter, first: 1) {
+            totalCount
+          }
+        }
+      }
+    `;
+        const result = (await this.graphqlClient.query(query, {
+            filter: {
+                apps: {
+                    ids: [appId]
+                },
+                appEnvironments: {
+                    types: [appEnv]
+                }
+            }
+        }));
+        const totalCount = result?.ecosystem?.appInstallationsByApp?.totalCount ?? -1;
+        if (totalCount < 0) {
+            throw new MissingAppError();
+        }
+        return totalCount === 0;
+    }
     async getAppInstallationTask(taskId) {
         const query = `
       query forge_cli_getInstallationTask($id: ID!) {
@@ -315,9 +341,11 @@ class InstallationsGraphqlClient {
     }
     async getCombinedHostnameMap(installationContexts) {
         const bitbucketAris = this.getResourceArisForProduct(installationContexts, this.bitbucketTranslator.ariBelongsToProduct);
-        const bbWorkspaceAriToHostname = await this.bitbucketTranslator.getSitesForResourceAris(bitbucketAris);
-        const cloudIdAris = this.getResourceArisForProduct(installationContexts, this.cloudIdTranslator.ariBelongsToProduct);
-        const siteAriToHostname = await this.cloudIdTranslator.getSitesForResourceAris(cloudIdAris);
+        const cloudIdAris = this.getResourceArisForProduct(installationContexts, this.sitedProductTranslator.ariBelongsToProduct);
+        const [siteAriToHostname, bbWorkspaceAriToHostname] = await Promise.all([
+            this.sitedProductTranslator.getSitesForResourceAris(cloudIdAris),
+            this.bitbucketTranslator.getSitesForResourceAris(bitbucketAris)
+        ]);
         const combinedAriToHostname = {
             ...siteAriToHostname,
             ...bbWorkspaceAriToHostname
@@ -333,12 +361,19 @@ class InstallationsGraphqlClient {
         return installationContexts.map((context, i) => {
             const { environment, environmentType, installation } = installations[i];
             const site = combinedAriToHostname[context.toString()];
+            const secondaryProducts = (installation.secondaryInstallationContexts ?? [])
+                .map((context) => (0, cli_shared_1.parseInstallationContext)(context))
+                .map((context) => context.resourceOwner);
             return {
                 id: installation.id,
+                ...(secondaryProducts.length > 0 ? { secondaryProducts } : {}),
                 product: context.resourceOwner,
                 environmentKey: environment,
                 environmentType,
                 context: installation.installationContext,
+                ...(installation.secondaryInstallationContexts?.length
+                    ? { secondaryContexts: installation.secondaryInstallationContexts }
+                    : {}),
                 site,
                 version: installation.appEnvironmentVersion || {
                     isLatest: false,
@@ -355,6 +390,7 @@ class InstallationsGraphqlClient {
             nodes {
               id
               installationContext
+              secondaryInstallationContexts
               appEnvironment {
                 key
                 type
@@ -414,6 +450,7 @@ class InstallationsGraphqlClient {
             type
             versions(first: $firstN) {
               nodes {
+                primaryProduct
                 permissions {
                   egress {
                     addresses

package/out/installations/installation-helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"installation-helper.d.ts","sourceRoot":"","sources":["../../src/installations/installation-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAyC,EAAE,EAAmB,MAAM,mBAAmB,CAAC;AAE/F,wBAAgB,sBAAsB,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,CAWtE;AAED,wBAAsB,wBAAwB,CAC5C,EAAE,EAAE,EAAE,EACN,aAAa,EAAE,YAAY,EAAE,EAC7B,uBAAuB,EAAE,MAAM,EAC/B,yBAAyB,EAAE,MAAM,GAChC,OAAO,CAAC,YAAY,CAAC,CAmBvB"}
+{"version":3,"file":"installation-helper.d.ts","sourceRoot":"","sources":["../../src/installations/installation-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAiD,EAAE,EAAmB,MAAM,mBAAmB,CAAC;AAEvG,wBAAgB,sBAAsB,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,CAWtE;AAED,wBAAsB,wBAAwB,CAC5C,EAAE,EAAE,EAAE,EACN,aAAa,EAAE,YAAY,EAAE,EAC7B,uBAAuB,EAAE,MAAM,EAC/B,yBAAyB,EAAE,MAAM,GAChC,OAAO,CAAC,YAAY,CAAC,CAmBvB"}

package/out/installations/installation-helper.js

@@ -19,7 +19,7 @@ async function selectSingleInstallation(ui, installations, installationTableProm
         names: [
             (0, cli_shared_1.environmentToOption)(environmentKey),
             site,
-            (0, cli_shared_1.capitalise)(product),
+            (0, cli_shared_1.productDisplayName)(product),
             cli_shared_1.Text.install.booleanToScope(version.isLatest),
             (0, semver_1.major)(version.version).toString()
         ],

package/out/installations/site-translation/bitbucket.d.ts

@@ -1,16 +1,15 @@
 /// <reference types="node" />
 import { SiteTranslator } from './site-translation';
 import { URL } from 'url';
-import { Ari } from '@forge/util/packages/ari';
-import { EnrichedAri } from '@forge/cli-shared';
+import { Ari, AnyAri } from '@forge/util/packages/ari';
 export declare class InvalidWorkspaceError extends Error {
     constructor(url: URL);
 }
 export declare const getBitbucketEndpoint: () => string;
 export declare class BitbucketTranslator implements SiteTranslator {
-    ariBelongsToProduct(ari: EnrichedAri): boolean;
+    ariBelongsToProduct(ari: AnyAri): boolean;
     buildInstallationContext(product: string, site: URL): Promise<Ari>;
-    getSitesForResourceAris(aris: EnrichedAri[]): Promise<Record<string, string>>;
+    getSitesForResourceAris(aris: AnyAri[]): Promise<Record<string, string>>;
     private getWorkspaceId;
     getWorkspaceUrl(workspaceId: string): Promise<URL | null>;
     private decorateWorkspaceId;

package/out/installations/site-translation/bitbucket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bitbucket.d.ts","sourceRoot":"","sources":["../../../src/installations/site-translation/bitbucket.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAU,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,WAAW,EAA0B,MAAM,mBAAmB,CAAC;AAExE,qBAAa,qBAAsB,SAAQ,KAAK;gBAClC,GAAG,EAAE,GAAG;CAGrB;AAOD,eAAO,MAAM,oBAAoB,QAAO,MAEvC,CAAC;AAEF,qBAAa,mBAAoB,YAAW,cAAc;IACjD,mBAAmB,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO;IAIxC,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAUlE,uBAAuB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAc5E,cAAc;IAwBf,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC;IAsBtE,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,oBAAoB;IAW5B,OAAO,CAAC,iBAAiB;CAG1B"}
+{"version":3,"file":"bitbucket.d.ts","sourceRoot":"","sources":["../../../src/installations/site-translation/bitbucket.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAGvD,qBAAa,qBAAsB,SAAQ,KAAK;gBAClC,GAAG,EAAE,GAAG;CAGrB;AAOD,eAAO,MAAM,oBAAoB,QAAO,MAEvC,CAAC;AAEF,qBAAa,mBAAoB,YAAW,cAAc;IACjD,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAInC,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAUlE,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAcvE,cAAc;IAwBf,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC;IAsBtE,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,oBAAoB;IAW5B,OAAO,CAAC,iBAAiB;CAG1B"}

package/out/installations/site-translation/bitbucket.js

@@ -94,7 +94,7 @@ class BitbucketTranslator {
         if (workspaceURL.hostname !== BITBUCKET_URL.hostname) {
             throw new InvalidWorkspaceError(workspaceURL);
         }
-        const pathnames = workspaceURL.pathname.substr(1).split('/');
+        const pathnames = workspaceURL.pathname.substring(1).split('/');
         if (!pathnames.length) {
             throw new InvalidWorkspaceError(workspaceURL);
         }

package/out/installations/site-translation/index.d.ts

@@ -1,4 +1,4 @@
 export * from './bitbucket';
-export * from './cloudid-products';
+export * from './sited-products';
 export * from './site-translation';
 //# sourceMappingURL=index.d.ts.map

package/out/installations/site-translation/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/installations/site-translation/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/installations/site-translation/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC"}

package/out/installations/site-translation/index.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./bitbucket"), exports);
-tslib_1.__exportStar(require("./cloudid-products"), exports);
+tslib_1.__exportStar(require("./sited-products"), exports);
 tslib_1.__exportStar(require("./site-translation"), exports);

package/out/installations/site-translation/site-translation.d.ts

@@ -1,10 +1,9 @@
 /// <reference types="node" />
 import { URL } from 'url';
-import { Ari } from '@forge/util/packages/ari';
-import { EnrichedAri } from '@forge/cli-shared';
+import { AnyAri, Ari } from '@forge/util/packages/ari';
 export interface SiteTranslator {
     buildInstallationContext: (product: string, site: URL) => Promise<Ari>;
-    getSitesForResourceAris: (ari: EnrichedAri[]) => Promise<Record<string, string>>;
-    ariBelongsToProduct: (ari: EnrichedAri) => boolean;
+    getSitesForResourceAris: (ari: AnyAri[]) => Promise<Record<string, string>>;
+    ariBelongsToProduct: (ari: AnyAri) => boolean;
 }
 //# sourceMappingURL=site-translation.d.ts.map

package/out/installations/site-translation/site-translation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"site-translation.d.ts","sourceRoot":"","sources":["../../../src/installations/site-translation/site-translation.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,WAAW,cAAc;IAC7B,wBAAwB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAEvE,uBAAuB,EAAE,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACjF,mBAAmB,EAAE,CAAC,GAAG,EAAE,WAAW,KAAK,OAAO,CAAC;CACpD"}
+{"version":3,"file":"site-translation.d.ts","sourceRoot":"","sources":["../../../src/installations/site-translation/site-translation.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAEvD,MAAM,WAAW,cAAc;IAC7B,wBAAwB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAEvE,uBAAuB,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5E,mBAAmB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;CAC/C"}

package/out/installations/site-translation/sited-products.d.ts

@@ -0,0 +1,29 @@
+/// <reference types="node" />
+import { SiteTranslator } from './site-translation';
+import { URL } from 'url';
+import { AnyAri, Ari } from '@forge/util/packages/ari';
+import { GraphQLClient, UserError } from '@forge/cli-shared';
+export declare const GRAPH_PRODUCT_ID_IN_TCS = "devops";
+export declare class InvalidAtlassianSiteError extends UserError {
+    constructor(url: URL);
+}
+declare type CloudIdAndActivationId = {
+    cloudId: string;
+    activationId: string;
+};
+export declare class ActivationIdMissingError extends Error {
+    constructor(url: string, product: string);
+}
+export declare class SitedProductTranslator implements SiteTranslator {
+    private graphqlClient;
+    constructor(graphqlClient: GraphQLClient);
+    ariBelongsToProduct(ari: AnyAri): boolean;
+    buildInstallationContext(product: string, site: URL): Promise<Ari>;
+    getSitesForResourceAris(aris: AnyAri[]): Promise<Record<string, string>>;
+    private queryHostnamesByCloudIds;
+    private queryHostnamesByActivationIds;
+    private bulkQuerySiteHostnames;
+    getCloudIdAndActivationId(site: URL, productResourceOwner: string): Promise<CloudIdAndActivationId>;
+}
+export {};
+//# sourceMappingURL=sited-products.d.ts.map

package/out/installations/site-translation/sited-products.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sited-products.d.ts","sourceRoot":"","sources":["../../../src/installations/site-translation/sited-products.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAIL,aAAa,EAOb,SAAS,EAEV,MAAM,mBAAmB,CAAC;AAE3B,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAShD,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,GAAG,EAAE,GAAG;CAGrB;AAED,aAAK,sBAAsB,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC;AACxE,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAGzC;AAmCD,qBAAa,sBAAuB,YAAW,cAAc;IAC/C,OAAO,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAEzC,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAQnC,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAQlE,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAkCrF,OAAO,CAAC,wBAAwB,CAqB9B;IAEF,OAAO,CAAC,6BAA6B,CAiBnC;YAEY,sBAAsB;IAmBvB,yBAAyB,CAAC,IAAI,EAAE,GAAG,EAAE,oBAAoB,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;CAqBjH"}

package/out/installations/site-translation/sited-products.js

@@ -0,0 +1,133 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SitedProductTranslator = exports.ActivationIdMissingError = exports.InvalidAtlassianSiteError = exports.GRAPH_PRODUCT_ID_IN_TCS = void 0;
+const cli_shared_1 = require("@forge/cli-shared");
+exports.GRAPH_PRODUCT_ID_IN_TCS = 'devops';
+const PRODUCT_RESOURCE_OWNER_TO_TCS_PRODUCT_ID = {
+    graph: exports.GRAPH_PRODUCT_ID_IN_TCS
+};
+const NON_SITED_PRODUCTS_USING_WORKSPACE_ARI = [cli_shared_1.TRELLO_RESOURCE_OWNER, cli_shared_1.BITBUCKET_RESOURCE_OWNER];
+class InvalidAtlassianSiteError extends cli_shared_1.UserError {
+    constructor(url) {
+        super(cli_shared_1.Text.install.error.invalidAtlassianSite(url));
+    }
+}
+exports.InvalidAtlassianSiteError = InvalidAtlassianSiteError;
+class ActivationIdMissingError extends Error {
+    constructor(url, product) {
+        super(cli_shared_1.Text.install.error.activationIdMissing(url, product));
+    }
+}
+exports.ActivationIdMissingError = ActivationIdMissingError;
+function removeDuplicatedAris(aris) {
+    return Array.from(new Map(aris.map((ari) => [ari.toString(), ari])).values());
+}
+const tenantContextsToCloudIdAndActivationId = (url, contexts, productResourceOwner) => {
+    if (!contexts.length) {
+        throw new InvalidAtlassianSiteError(url);
+    }
+    const context = contexts[0];
+    if (!context || !context.cloudId) {
+        throw new InvalidAtlassianSiteError(url);
+    }
+    const activationId = context.activationIdByProduct?.active;
+    if (!activationId) {
+        throw new ActivationIdMissingError(url.toString(), (0, cli_shared_1.productDisplayName)(productResourceOwner));
+    }
+    return { cloudId: context.cloudId, activationId: activationId };
+};
+function splitArrayToChunks(array, chunkSize) {
+    const chunks = [];
+    for (let i = 0; i < array.length; i += chunkSize) {
+        chunks.push(array.slice(i, i + chunkSize));
+    }
+    return chunks;
+}
+class SitedProductTranslator {
+    graphqlClient;
+    constructor(graphqlClient) {
+        this.graphqlClient = graphqlClient;
+    }
+    ariBelongsToProduct(ari) {
+        return (ari.resourceType === cli_shared_1.SITE_RESOURCE_TYPE ||
+            (ari.resourceType === cli_shared_1.WORKSPACE_RESOURCE_TYPE &&
+                !NON_SITED_PRODUCTS_USING_WORKSPACE_ARI.includes(ari.resourceOwner)));
+    }
+    async buildInstallationContext(product, site) {
+        const productResourceOwner = (0, cli_shared_1.ariResourceOwner)(product);
+        const { cloudId, activationId } = await this.getCloudIdAndActivationId(site, productResourceOwner);
+        const workspaceAriCreator = cli_shared_1.createWorkspaceAriByProduct[productResourceOwner];
+        return workspaceAriCreator(cloudId, activationId);
+    }
+    async getSitesForResourceAris(aris) {
+        const uniqueAris = removeDuplicatedAris(aris);
+        const arisWithCloudId = uniqueAris.filter((ari) => ari.resourceType == cli_shared_1.SITE_RESOURCE_TYPE || !!ari.cloudId);
+        const arisWithOnlyActivationId = uniqueAris.filter((ari) => ari.resourceType == cli_shared_1.WORKSPACE_RESOURCE_TYPE && !ari.cloudId);
+        const [cloudIdArisToHostname, activationIdArisToHostname] = await Promise.all([
+            this.bulkQuerySiteHostnames(arisWithCloudId, (ari) => ari.cloudId || ari.resourceId, this.queryHostnamesByCloudIds),
+            this.bulkQuerySiteHostnames(arisWithOnlyActivationId, (ari) => ari.resourceId, this.queryHostnamesByActivationIds)
+        ]);
+        return {
+            ...cloudIdArisToHostname,
+            ...activationIdArisToHostname
+        };
+    }
+    queryHostnamesByCloudIds = async (cloudIds) => {
+        const query = `
+        query forge_cli_getHostnameForTenantContexts($cloudIds: [ID!]!) {
+            tenantContexts(cloudIds: $cloudIds) {
+                hostName
+            }
+        }
+        `;
+        const response = await this.graphqlClient.query(query, {
+            cloudIds: cloudIds
+        });
+        return Object.fromEntries(cloudIds.map((id, index) => [
+            id,
+            response?.tenantContexts?.[index]?.hostName || id
+        ]));
+    };
+    queryHostnamesByActivationIds = async (activationIds) => {
+        const query = `
+        query forge_cli_getHostnameForTenantContexts($activationIds: [ID!]!) {
+            tenantContexts(activationIds: $activationIds) {
+                hostName
+            }
+        }
+        `;
+        const response = await this.graphqlClient.query(query, {
+            activationIds: activationIds
+        });
+        return Object.fromEntries(activationIds.map((id, index) => [id, response?.tenantContexts?.[index]?.hostName]));
+    };
+    async bulkQuerySiteHostnames(aris, idExtractor, querySiteHostnameFunction) {
+        if (aris.length === 0) {
+            return {};
+        }
+        const idsToQuery = [...new Set(aris.map(idExtractor))];
+        const idsChunks = splitArrayToChunks(idsToQuery, 20);
+        const chunkedMapping = await Promise.all(idsChunks.map(querySiteHostnameFunction));
+        const fullMapping = Object.assign({}, ...chunkedMapping);
+        return Object.fromEntries(aris.map((ari) => [ari.toString(), fullMapping[idExtractor(ari)]]));
+    }
+    async getCloudIdAndActivationId(site, productResourceOwner) {
+        const query = `
+        query getTenantContextDetails($hostNames: [String!], $product: String!) {
+          tenantContexts(hostNames: $hostNames) {
+            cloudId
+            activationIdByProduct(product: $product) {
+              active
+            }
+          }
+        }
+        `;
+        const result = await this.graphqlClient.query(query, {
+            hostNames: [site.hostname],
+            product: PRODUCT_RESOURCE_OWNER_TO_TCS_PRODUCT_ID[productResourceOwner] || productResourceOwner
+        });
+        const tenantContexts = result.tenantContexts || [];
+        return tenantContextsToCloudIdAndActivationId(site, tenantContexts, productResourceOwner);
+    }
+}
+exports.SitedProductTranslator = SitedProductTranslator;

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

@@ -1,14 +1,16 @@
 /// <reference types="node" />
-import { AppConfigProvider, AppEnvironmentType, AppEnvironmentVersion, Maybe } from '@forge/cli-shared';
+import { AppConfigProvider, AppEnvironmentType, AppEnvironmentVersion, Maybe, SupportedProduct, BaseError } from '@forge/cli-shared';
 import { URL } from 'url';
 import { AppInstallSiteDetails } from '../installations/install-app-site';
 export interface Installation {
     id: string;
     product: string;
+    secondaryProducts?: string[];
     site: string;
     environmentKey: string;
     environmentType: AppEnvironmentType;
     context: string;
+    secondaryContexts?: string[];
     version: {
         isLatest: boolean;
         version: string;
@@ -20,6 +22,7 @@ export interface AppInstallation {
 export interface AppEnvironmentVersionPermissions {
     scopes: string[];
     egressAddresses: string[];
+    primaryProduct?: string;
 }
 export interface AppEnvironmentPermissions extends AppEnvironmentVersionPermissions {
     addedScopes: string[];
@@ -27,8 +30,8 @@ export interface AppEnvironmentPermissions extends AppEnvironmentVersionPermissi
     hasDeployments: boolean;
 }
 interface InstallationFilterOptions {
-    site?: string;
-    product?: 'Jira' | 'Confluence';
+    site?: URL;
+    product?: SupportedProduct;
     environment?: string;
 }
 export interface AppEnvironmentVersionData {
@@ -42,14 +45,25 @@ export interface ListAppInstallationsClient {
 export interface UpgradeAppInstallationsClient {
     upgradeInstallation({ site, product, environmentKey, appId }: AppInstallSiteDetails): Promise<void>;
 }
+export interface HasNoAppInstallationsForEnvClient {
+    hasNoAppInstallationsForEnv(appId: string, appEnv: AppEnvironmentType): Promise<boolean>;
+}
+export declare class MultipleMatchingInstallationsError extends BaseError {
+    constructor();
+}
 export declare class InstallationService {
     private readonly getAppConfig;
     private readonly listInstallationsClient;
     private readonly upgradeAppInstallationsClient;
-    constructor(getAppConfig: AppConfigProvider, listInstallationsClient: ListAppInstallationsClient, upgradeAppInstallationsClient: UpgradeAppInstallationsClient);
+    private readonly hasNoAppInstallationsForEnvClient;
+    constructor(getAppConfig: AppConfigProvider, listInstallationsClient: ListAppInstallationsClient, upgradeAppInstallationsClient: UpgradeAppInstallationsClient, hasNoAppInstallationsForEnvClient: HasNoAppInstallationsForEnvClient);
+    private comparePossibleInstallations;
+    private matchSiteForProduct;
     private filterInstallations;
     listAppInstallations(filter?: InstallationFilterOptions): Promise<AppInstallation>;
+    hasNoAppInstallationsForEnv(appEnv: AppEnvironmentType): Promise<boolean>;
     listNonTechnicalAppInstallations(filter?: InstallationFilterOptions): Promise<AppInstallation>;
+    findOnlyMatchingInstallation(filter: InstallationFilterOptions): Promise<Installation>;
     hasOutdatedProductInstallation(environment: string): Promise<boolean>;
     upgradeInstallation(site: URL, product: string, environmentKey: string, appId: string): Promise<boolean>;
     private getPermissionsFromAppEnvironmentVersion;

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,EACjB,kBAAkB,EAClB,qBAAqB,EAKrB,KAAK,EAEN,MAAM,mBAAmB,CAAC;AAG3B,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,eAAe,EAAE,kBAAkB,CAAC;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE;QACP,QAAQ,EAAE,OAAO,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;KACjB,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;IACtB,eAAe,EAAE,kBAAkB,CAAC;IACpC,cAAc,EAAE,OAAO,CAAC;CACzB;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,yBAAyB;IACxC,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,GAAG,IAAI,CAAC;IACnD,eAAe,EAAE,kBAAkB,CAAC;CACrC;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,yBAAyB,CAAC,CAAC;CACxG;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;CAiClD"}
+{"version":3,"file":"installation-service.d.ts","sourceRoot":"","sources":["../../src/service/installation-service.ts"],"names":[],"mappings":"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"}

package/out/service/installation-service.js

@@ -1,29 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InstallationService = void 0;
+exports.InstallationService = exports.MultipleMatchingInstallationsError = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
 const egress_1 = require("@forge/egress");
 const lodash_1 = require("lodash");
 const graphql_client_1 = require("../installations/graphql-client");
 const IDENTITY_PRODUCT_NAME = 'identity';
+const BITBUCKET_PRODUCT_NAME = 'bitbucket';
 const JIRA_SERVICE_DESK_PRODUCT_NAME = 'jira-servicedesk';
+class MultipleMatchingInstallationsError extends cli_shared_1.BaseError {
+    constructor() {
+        super(cli_shared_1.Text.error.multipleMatchingInstallations);
+    }
+}
+exports.MultipleMatchingInstallationsError = MultipleMatchingInstallationsError;
 class InstallationService {
     getAppConfig;
     listInstallationsClient;
     upgradeAppInstallationsClient;
-    constructor(getAppConfig, listInstallationsClient, upgradeAppInstallationsClient) {
+    hasNoAppInstallationsForEnvClient;
+    constructor(getAppConfig, listInstallationsClient, upgradeAppInstallationsClient, hasNoAppInstallationsForEnvClient) {
         this.getAppConfig = getAppConfig;
         this.listInstallationsClient = listInstallationsClient;
         this.upgradeAppInstallationsClient = upgradeAppInstallationsClient;
+        this.hasNoAppInstallationsForEnvClient = hasNoAppInstallationsForEnvClient;
+    }
+    comparePossibleInstallations(url1, url2) {
+        const trimmedUrl1 = url1.replace(/\/+$/, '');
+        const trimmedUrl2 = url2.replace(/\/+$/, '');
+        return trimmedUrl1 === trimmedUrl2;
+    }
+    matchSiteForProduct(filterSite, installationSite, installationProduct) {
+        if (installationProduct === BITBUCKET_PRODUCT_NAME) {
+            return this.comparePossibleInstallations(filterSite.href, installationSite);
+        }
+        return this.comparePossibleInstallations(filterSite.host, installationSite);
     }
     filterInstallations(installations, { site: filterSite, product: filterProduct, environment: filterEnvironment }) {
-        const isDefaultEnvironment = (env) => env === (0, cli_shared_1.optionToEnvironment)(cli_shared_1.DEFAULT_ENVIRONMENT_OPTION);
         return installations.filter(({ product, site, environmentKey }) => {
             const matchProduct = !filterProduct || filterProduct === (0, cli_shared_1.productDisplayName)(product);
-            const matchSite = !filterSite || filterSite === site;
-            const matchEnvironment = filterEnvironment
-                ? isDefaultEnvironment(filterEnvironment) || filterEnvironment === (0, cli_shared_1.environmentToOption)(environmentKey)
-                : true;
+            const matchSite = !filterSite || this.matchSiteForProduct(filterSite, site, product);
+            const matchEnvironment = !filterEnvironment || filterEnvironment === (0, cli_shared_1.optionToEnvironment)(environmentKey);
             return matchProduct && matchSite && matchEnvironment;
         });
     }
@@ -32,12 +49,26 @@ class InstallationService {
         const installations = await this.listInstallationsClient.listInstallations(appId);
         return { installations: this.filterInstallations(installations, { ...filter }) };
     }
+    async hasNoAppInstallationsForEnv(appEnv) {
+        const { id: appId } = await this.getAppConfig();
+        return this.hasNoAppInstallationsForEnvClient.hasNoAppInstallationsForEnv(appId, appEnv);
+    }
     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 findOnlyMatchingInstallation(filter) {
+        const filterInstalls = await this.listNonTechnicalAppInstallations(filter);
+        if (!filterInstalls.installations.length) {
+            throw new cli_shared_1.UserError(cli_shared_1.Text.error.invalidInstallationContext);
+        }
+        if (filterInstalls.installations.length !== 1) {
+            throw new MultipleMatchingInstallationsError();
+        }
+        return filterInstalls.installations[0];
+    }
     async hasOutdatedProductInstallation(environment) {
         const { installations } = await this.listNonTechnicalAppInstallations({
             environment
@@ -65,23 +96,25 @@ class InstallationService {
     }
     getPermissionsFromAppEnvironmentVersion(appEnvironmentVersion) {
         const permissions = appEnvironmentVersion?.permissions[0];
+        const primaryProduct = appEnvironmentVersion?.primaryProduct ?? undefined;
         if (!permissions) {
-            return { scopes: [], egressAddresses: [] };
+            return { scopes: [], egressAddresses: [], primaryProduct };
         }
         const scopes = permissions.scopes.map((s) => s.key);
         const egressAddresses = permissions?.egress ? (0, cli_shared_1.flatMap)(permissions.egress, ({ addresses }) => addresses ?? []) : [];
-        return { scopes, egressAddresses };
+        return { scopes, egressAddresses, primaryProduct };
     }
     async getAppEnvironmentPermissions(appId, environmentKey) {
         const versionDetails = await this.listInstallationsClient.getVersions(appId, environmentKey, 2);
         const versions = versionDetails?.nodes;
         if (!versions || versions.length === 0)
             return;
-        const [{ scopes, egressAddresses }, oldVersion] = versions.map((appEnvironmentVersion) => this.getPermissionsFromAppEnvironmentVersion(appEnvironmentVersion));
+        const [{ scopes, egressAddresses, primaryProduct }, oldVersion] = versions.map((appEnvironmentVersion) => this.getPermissionsFromAppEnvironmentVersion(appEnvironmentVersion));
         const groupedEgressAddresses = (0, egress_1.sortAndGroupEgressPermissionsByDomain)(egressAddresses);
         if (!oldVersion) {
             return {
                 scopes,
+                primaryProduct,
                 hasDeployments: false,
                 egressAddresses: groupedEgressAddresses,
                 addedScopes: scopes,
@@ -92,6 +125,7 @@ class InstallationService {
         const addedScopes = (0, lodash_1.difference)(scopes, oldScopes);
         return {
             scopes,
+            primaryProduct,
             hasDeployments: true,
             egressAddresses: groupedEgressAddresses,
             addedScopes,

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

@@ -240,7 +240,7 @@ class DockerTunnelService extends SandboxTunnelServiceBase {
         if (process.env.FORGE_DEV_DOCKER_TUNNEL) {
             const monorepoRoot = (0, path_1.join)(__dirname, '../../../..');
             options.push(`-v=${monorepoRoot}:/monorepo:cached`);
-            options.push(`-v=${monorepoRoot}/node_modules/@koterpillar/cloudflared/docker-bin:/monorepo/node_modules/@koterpillar/cloudflared/bin`);
+            options.push(`-v=${monorepoRoot}/node_modules/cloudflared/docker-bin:/monorepo/node_modules/cloudflared/bin`);
         }
         if (process.env.FORGE_TUNNEL_MOUNT_DIRECTORIES) {
             const mounts = process.env.FORGE_TUNNEL_MOUNT_DIRECTORIES.split(',');