@forge/cli 4.5.2 → 5.0.0

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

@@ -0,0 +1,17 @@
+/// <reference types="node" />
+import { SiteTranslator, ResourcefulAri } from './site-translation';
+import { URL } from 'url';
+import { Ari } from '@forge/util/packages/cs-ari';
+import { GraphQLClient } from '@forge/cli-shared';
+export declare class InvalidAtlassianSiteError extends Error {
+    constructor(url: URL);
+}
+export declare class CloudIdTranslator implements SiteTranslator {
+    private graphqlClient;
+    constructor(graphqlClient: GraphQLClient);
+    ariBelongsToProduct(ari: ResourcefulAri): boolean;
+    buildInstallationContext(product: string, site: URL): Promise<Ari>;
+    getSitesForResourceAris(aris: ResourcefulAri[]): Promise<Record<string, string>>;
+    private getCloudId;
+}
+//# sourceMappingURL=cloudid-products.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"cloudid-products.d.ts","sourceRoot":"","sources":["../../../src/installations/site-translation/cloudid-products.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAsB,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,aAAa,EAA8B,MAAM,mBAAmB,CAAC;AAE9E,qBAAa,yBAA0B,SAAQ,KAAK;gBACtC,GAAG,EAAE,GAAG;CAGrB;AAyBD,qBAAa,iBAAkB,YAAW,cAAc;IAC1C,OAAO,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAEzC,mBAAmB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO;IAI3C,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAUlE,uBAAuB,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YA6C/E,UAAU;CAezB"}

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

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CloudIdTranslator = exports.InvalidAtlassianSiteError = void 0;
+const cs_ari_1 = require("@forge/util/packages/cs-ari");
+const cli_shared_1 = require("@forge/cli-shared");
+class InvalidAtlassianSiteError extends Error {
+    constructor(url) {
+        super(cli_shared_1.Text.install.error.invalidAtlassianSite(url));
+    }
+}
+exports.InvalidAtlassianSiteError = InvalidAtlassianSiteError;
+const RESOURCE_TYPE = 'site';
+const tenantContextsToCloudId = (url, contexts) => {
+    if (!contexts.length) {
+        throw new InvalidAtlassianSiteError(url);
+    }
+    const context = contexts[0];
+    if (!context || !context.cloudId) {
+        throw new InvalidAtlassianSiteError(url);
+    }
+    return context.cloudId;
+};
+const tenantToHostname = (tenantInfo) => {
+    if (!tenantInfo) {
+        return null;
+    }
+    return tenantInfo.hostName || null;
+};
+class CloudIdTranslator {
+    constructor(graphqlClient) {
+        this.graphqlClient = graphqlClient;
+    }
+    ariBelongsToProduct(ari) {
+        return ari.resourceType === RESOURCE_TYPE;
+    }
+    async buildInstallationContext(product, site) {
+        const cloudId = await this.getCloudId(site);
+        const ari = new cs_ari_1.ResourceIdentifier({
+            resourceOwner: product.toLowerCase(),
+            resourceType: RESOURCE_TYPE,
+            resourceId: cloudId
+        });
+        return ari;
+    }
+    async getSitesForResourceAris(aris) {
+        const MAX_CLOUD_IDS_AT_ONCE = 20;
+        const cloudIds = [...new Set(aris.map((ari) => ari.resourceId))];
+        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 = {};
+        const ariToHostname = {};
+        cloudIds.forEach((cloudId, index) => {
+            const maybeHostname = tenantToHostname(tenantContexts[index]);
+            cloudIdToHostname[cloudId] = maybeHostname || cloudId;
+        });
+        aris.forEach((ari) => {
+            ariToHostname[ari.toString()] = cloudIdToHostname[ari.resourceId];
+        });
+        return ariToHostname;
+    }
+    async getCloudId(site) {
+        const query = `
+          query forge_cli_getCloudIfForTenantContexts($hostNames: [String!]) {
+            tenantContexts(hostNames: $hostNames) {
+              cloudId
+            }
+          }
+        `;
+        const result = await this.graphqlClient.query(query, {
+            hostNames: [site.hostname]
+        });
+        const tenantContexts = result.tenantContexts || [];
+        return tenantContextsToCloudId(site, tenantContexts);
+    }
+}
+exports.CloudIdTranslator = CloudIdTranslator;

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

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

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

@@ -0,0 +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"}

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

@@ -0,0 +1,6 @@
+"use strict";
+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("./site-translation"), exports);

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

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

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

@@ -0,0 +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,6BAA6B,CAAC;AAElD,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,cAAc,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACpF,mBAAmB,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC;CACvD;AAED,MAAM,WAAW,cAAe,SAAQ,GAAG;IACzC,UAAU,EAAE,MAAM,CAAC;CACpB"}

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

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,4 +1,4 @@
-import { HiddenError, PersonalApiCredentialsValidated } from '@forge/cli-shared';
+import { HiddenError, PersonalApiCredentials, PersonalApiCredentialsValidated } from '@forge/cli-shared';
 import { spawn } from 'cross-spawn';
 import { DockerService } from './docker-service';
 import { ConfigFilePortFindingService } from './port-finding-service';
@@ -14,7 +14,7 @@ export declare abstract class TunnelService {
     protected readonly configFilePortFindingService: ConfigFilePortFindingService;
     constructor(configFilePortFindingService: ConfigFilePortFindingService);
     abstract run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => void): Promise<void>;
-    protected getDockerOptions(tunnelOptions: TunnelOptions, debugEnabled: boolean, { email, token }: PersonalApiCredentialsValidated): Promise<string[]>;
+    protected getDockerOptions(tunnelOptions: TunnelOptions, debugEnabled: boolean, { email, token }: PersonalApiCredentials): Promise<string[]>;
     protected getPortOptions(port: number, resourcePorts: Record<string, number>, cspReporterPort: number | undefined): string[];
     protected getResourcePortEnvVarOption(resourcePorts: Record<string, number>): string[];
     protected getUserEnvironmentVariablesOptions(): string[];
@@ -28,21 +28,13 @@ export declare abstract class TunnelService {
     protected getVolumeOptions(): string[];
 }
 export declare class LocalTunnelService extends TunnelService {
-    run(tunnelOptions: TunnelOptions, creds: {
-        email: string;
-        token: string;
-        accountId: string;
-    }, debugEnabled: boolean, onError: (err: Error) => void): Promise<void>;
+    run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentials, debugEnabled: boolean, onError: (err: Error) => void): Promise<void>;
 }
 export declare class DockerTunnelService extends TunnelService {
     private readonly dockerService;
     private readonly analyticsService;
     constructor(configFilePortFindingService: ConfigFilePortFindingService, dockerService: DockerService, analyticsService: TunnelAnalyticsService);
-    run(tunnelOptions: TunnelOptions, creds: {
-        email: string;
-        token: string;
-        accountId: string;
-    }, debugEnabled: boolean): Promise<void>;
+    run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean): Promise<void>;
     bootstrapDocker(): Promise<ReturnType<typeof spawn>>;
     private validateDockerVersion;
 }

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,EAGL,WAAW,EACX,sBAAsB,EACtB,+BAA+B,EAChC,MAAM,mBAAmB,CAAC;AAC3B,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,sBAAsB,GACvC,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,sBAAsB,EAC7B,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,+BAA+B,EACtC,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,IAAI,CAAC;IA2BH,eAAe,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC;YAKnD,qBAAqB;CASpC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli",
-  "version": "4.5.2",
+  "version": "5.0.0",
   "description": "A command line interface for managing Atlassian-hosted apps",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -18,11 +18,11 @@
     "postinstall": "node -e \"process.exitCode = fs.existsSync('./out/bin/postinstall.js')\" || node ./out/bin/postinstall.js"
   },
   "dependencies": {
-    "@forge/bundler": "3.0.11",
-    "@forge/cli-shared": "2.6.2",
+    "@forge/bundler": "3.0.12",
+    "@forge/cli-shared": "3.0.0",
     "@forge/csp": "^1.11.0",
-    "@forge/lint": "3.2.2",
-    "@forge/manifest": "4.0.0",
+    "@forge/lint": "3.2.3",
+    "@forge/manifest": "4.1.0",
     "@forge/util": "1.2.0",
     "ajv": "^6.12.5",
     "archiver": "^5.2.0",
@@ -75,9 +75,6 @@
     "jest-fixtures": "^0.6.0",
     "memfs": "^3.4.1"
   },
-  "optionalDependencies": {
-    "keytar": "^7.0.0"
-  },
   "engines": {
     "node": ">=12.13.1"
   }