npm package diff
Package: @forge/cli
Versions: 10.6.1 - 10.7.0-next.9
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
@@ -75,9 +75,8 @@
graphqlClient;
cloudIdTranslator;
bitbucketTranslator;
pause;
- featureFlagReader;
SITE_RESOURCE_TYPE = 'site';
WORKSPACE_RESOURCE_TYPE = 'workspace';
static buildInstallationContext(product, resourceId, resourceType) {
const ari = ari_1.AnyAri.create({
@@ -86,14 +85,13 @@
resourceId: resourceId
});
return ari.toString();
}
- constructor(graphqlClient, cloudIdTranslator, bitbucketTranslator, pause, featureFlagReader) {
+ constructor(graphqlClient, cloudIdTranslator, bitbucketTranslator, pause) {
this.graphqlClient = graphqlClient;
this.cloudIdTranslator = cloudIdTranslator;
this.bitbucketTranslator = bitbucketTranslator;
this.pause = pause;
- this.featureFlagReader = featureFlagReader;
}
async buildInstallationContext(product, site) {
const ari = await this.getProductTranslation(product).buildInstallationContext(product, site);
return ari.toString();
@@ -104,9 +102,9 @@
}
return this.cloudIdTranslator;
}
async installAppIntoSite({ environmentKey, site, product, appId, licenseOverride }) {
- const installationContext = await this.buildInstallationContext(product, site);
+ const workspaceAri = await this.buildInstallationContext(product, site);
const query = `
mutation forge_cli_installApplication($input: AppInstallationInput!) {
installApp(input: $input) {
success
@@ -122,9 +120,9 @@
}
`;
const variables = {
input: {
- installationContext,
+ installationContext: workspaceAri,
appId,
environmentKey,
async: true,
licenseOverride
@@ -150,9 +148,9 @@
}
await this.monitorAppInstallOrUpgrade(taskId);
}
async upgradeInstallation({ site, product, environmentKey, appId }) {
- const installationContext = await this.buildInstallationContext(product, site);
+ const workspaceAri = await this.buildInstallationContext(product, site);
const query = `
mutation forge_cli_upgradeApplication($input: AppInstallationUpgradeInput!) {
upgradeApp(input: $input) {
success
@@ -168,9 +166,9 @@
}
`;
const variables = {
input: {
- installationContext,
+ installationContext: workspaceAri,
appId,
environmentKey,
async: true
}
@@ -195,16 +193,13 @@
const result = await this.getAppInstallationTaskRetry(taskId);
status = result.state;
if (status === cli_shared_1.AppTaskState.Failed) {
const { errors, requestId } = result;
- const shouldDisplayHarmonizedAppInstallationErrors = await this.featureFlagReader.shouldDisplayErrorsForHarmonizedApps();
const error = errors?.[0];
const statusCode = error?.extensions?.statusCode;
const isUserError = statusCode && statusCode >= 400 && statusCode < 500 ? true : false;
const code = error?.extensions?.errorType ?? undefined;
- throw new InstallationRequestFailedError(isUserError, code, shouldDisplayHarmonizedAppInstallationErrors
- ? (0, harmonized_app_installation_errors_1.expandHarmonizedAppInstallationError)(code, error?.message ?? undefined)
- : error?.message ?? undefined, requestId);
+ throw new InstallationRequestFailedError(isUserError, code, (0, harmonized_app_installation_errors_1.expandHarmonizedAppInstallationError)(code, error?.message ?? undefined), requestId);
}
if (status !== cli_shared_1.AppTaskState.Complete)
await this.pause(exports.UNINSTALLATION_EVENT_POLL_INTERVAL);
}