npm package diff
Package: @forge/cli
Versions: 10.5.0-next.1-experimental-264fa0f - 10.5.0-next.11
File: package/out/installations/graphql-client.js
Index: package/out/installations/graphql-client.js
===================================================================
--- package/out/installations/graphql-client.js
+++ package/out/installations/graphql-client.js
@@ -1,7 +1,7 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-exports.InstallationsGraphqlClient = exports.UnknownSiteWithoutResourceIdError = exports.InstallationNotFoundError = exports.MissingAppUninstallTask = exports.MissingAppEnvironmentError = exports.MissingAppError = exports.InstallationRequestFailedError = exports.MissingTaskIdError = exports.EnvironmentNotFoundError = exports.UpgradeError = exports.InstallationError = exports.AlreadyInstalledError = exports.PermissionDeniedError = exports.ALREADY_UPGRADED_CODE = exports.UNINSTALLATION_EVENT_POLL_INTERVAL = void 0;
+exports.InstallationsGraphqlClient = exports.InstallationNotFoundError = exports.MissingAppUninstallTask = exports.MissingAppEnvironmentError = exports.MissingAppError = exports.InstallationRequestFailedError = exports.MissingTaskIdError = exports.EnvironmentNotFoundError = exports.UpgradeError = exports.InstallationError = exports.AlreadyInstalledError = exports.PermissionDeniedError = exports.ALREADY_UPGRADED_CODE = exports.UNINSTALLATION_EVENT_POLL_INTERVAL = void 0;
const exponential_backoff_1 = require("exponential-backoff");
const ari_1 = require("@forge/util/packages/ari");
const cli_shared_1 = require("@forge/cli-shared");
const harmonized_app_installation_errors_1 = require("./harmonized-apps/harmonized-app-installation-errors");
@@ -70,14 +70,8 @@
exports.MissingAppUninstallTask = MissingAppUninstallTask;
class InstallationNotFoundError extends cli_shared_1.UserError {
}
exports.InstallationNotFoundError = InstallationNotFoundError;
-class UnknownSiteWithoutResourceIdError extends Error {
- constructor() {
- super(cli_shared_1.Text.installList.noResourceId);
- }
-}
-exports.UnknownSiteWithoutResourceIdError = UnknownSiteWithoutResourceIdError;
class InstallationsGraphqlClient {
graphqlClient;
cloudIdTranslator;
bitbucketTranslator;
@@ -324,29 +318,22 @@
return [...new Set(installationContexts.filter((context) => condition(context)))];
}
async getCombinedHostnameMap(installationContexts) {
const bitbucketAris = this.getResourceArisForProduct(installationContexts, this.bitbucketTranslator.ariBelongsToProduct);
- const workspaceAriToHostname = await this.bitbucketTranslator.getSitesForResourceAris(bitbucketAris);
+ const bbWorkspaceAriToHostname = await this.bitbucketTranslator.getSitesForResourceAris(bitbucketAris);
const cloudIdAris = this.getResourceArisForProduct(installationContexts, this.cloudIdTranslator.ariBelongsToProduct);
const siteAriToHostname = await this.cloudIdTranslator.getSitesForResourceAris(cloudIdAris);
const combinedAriToHostname = {
...siteAriToHostname,
- ...workspaceAriToHostname
+ ...bbWorkspaceAriToHostname
};
return combinedAriToHostname;
}
async resolveInstallationsHostnames(installations) {
if (!installations.length) {
return [];
}
- const installationContexts = installations.map(({ installation }) => {
- const context = ari_1.AnyAri.parse(installation.installationContext);
- const resourceId = context.resourceId;
- if (!resourceId) {
- throw new UnknownSiteWithoutResourceIdError();
- }
- return context;
- });
+ const installationContexts = installations.map(({ installation }) => (0, cli_shared_1.parseInstallationContext)(installation.installationContext));
const combinedAriToHostname = await this.getCombinedHostnameMap(installationContexts);
return installationContexts.map((context, i) => {
const { environment, environmentType, installation } = installations[i];
const site = combinedAriToHostname[context.toString()];