@forge/cli 12.4.0 → 12.5.0-next.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +119 -0
- package/npm-shrinkwrap.json +45 -30
- package/out/analytics-client/analytics-client.d.ts +20 -0
- package/out/analytics-client/analytics-client.d.ts.map +1 -1
- package/out/analytics-client/analytics-client.js +34 -0
- package/out/analytics-client/analytics-client.js.map +1 -1
- package/out/autocomplete/autocomplete-config.json +3 -0
- package/out/command-line/controller/install-controller.d.ts +3 -1
- package/out/command-line/controller/install-controller.d.ts.map +1 -1
- package/out/command-line/controller/install-controller.js +35 -8
- package/out/command-line/controller/install-controller.js.map +1 -1
- package/out/command-line/dependency-injection.d.ts.map +1 -1
- package/out/command-line/dependency-injection.js +4 -4
- package/out/command-line/dependency-injection.js.map +1 -1
- package/out/command-line/register-app-commands.d.ts +4 -4
- package/out/command-line/register-app-commands.d.ts.map +1 -1
- package/out/command-line/register-app-commands.js +19 -42
- package/out/command-line/register-app-commands.js.map +1 -1
- package/out/command-line/register-installation-commands.d.ts.map +1 -1
- package/out/command-line/register-installation-commands.js +4 -2
- package/out/command-line/register-installation-commands.js.map +1 -1
- package/out/command-line/register-show-commands.js +3 -3
- package/out/command-line/register-show-commands.js.map +1 -1
- package/out/command-line/view/install-view.d.ts +1 -1
- package/out/command-line/view/install-view.d.ts.map +1 -1
- package/out/command-line/view/install-view.js +2 -2
- package/out/command-line/view/install-view.js.map +1 -1
- package/out/deploy/packager/packager.d.ts +4 -1
- package/out/deploy/packager/packager.d.ts.map +1 -1
- package/out/deploy/packager/packager.js +19 -2
- package/out/deploy/packager/packager.js.map +1 -1
- package/out/deploy/packager/runtime-bundler.d.ts +4 -4
- package/out/deploy/packager/runtime-bundler.d.ts.map +1 -1
- package/out/deploy/packager/runtime-bundler.js +7 -9
- package/out/deploy/packager/runtime-bundler.js.map +1 -1
- package/out/devspace/devspace-service.d.ts +3 -1
- package/out/devspace/devspace-service.d.ts.map +1 -1
- package/out/devspace/devspace-service.js +27 -17
- package/out/devspace/devspace-service.js.map +1 -1
- package/out/installations/graphql-client.d.ts +7 -3
- package/out/installations/graphql-client.d.ts.map +1 -1
- package/out/installations/graphql-client.js +71 -13
- package/out/installations/graphql-client.js.map +1 -1
- package/out/installations/install-app-site.d.ts +4 -2
- package/out/installations/install-app-site.d.ts.map +1 -1
- package/out/installations/install-app-site.js +4 -2
- package/out/installations/install-app-site.js.map +1 -1
- package/out/service/installation-service.d.ts +9 -1
- package/out/service/installation-service.d.ts.map +1 -1
- package/out/service/installation-service.js +26 -1
- package/out/service/installation-service.js.map +1 -1
- package/package.json +6 -6
|
@@ -20,7 +20,7 @@ class RuntimeBundler {
|
|
|
20
20
|
this.configReader = configReader;
|
|
21
21
|
}
|
|
22
22
|
async packageCode(archiver, entryPoints, i18nResourceBundle) {
|
|
23
|
-
|
|
23
|
+
let combinedMetadata = (0, bundler_1.emptyMetadata)();
|
|
24
24
|
if (entryPoints.length > 0) {
|
|
25
25
|
let bundlerResponse;
|
|
26
26
|
try {
|
|
@@ -31,16 +31,14 @@ class RuntimeBundler {
|
|
|
31
31
|
}
|
|
32
32
|
const { outputDir, metadata } = bundlerResponse;
|
|
33
33
|
if (metadata) {
|
|
34
|
-
|
|
35
|
-
moduleList.push(...metadata.modules);
|
|
36
|
-
}
|
|
34
|
+
combinedMetadata = (0, bundler_1.mergeMetadata)(combinedMetadata, metadata);
|
|
37
35
|
}
|
|
38
36
|
this.logger.debug(cli_shared_1.Text.deploy.taskPackage.packageBundledFiles);
|
|
39
37
|
for (const name of await this.fileSystemReader.getFileGlobList([`${outputDir}/**`])) {
|
|
40
38
|
archiver.addFileFrom(path_1.default.relative(outputDir, name), name);
|
|
41
39
|
}
|
|
42
40
|
}
|
|
43
|
-
return
|
|
41
|
+
return combinedMetadata;
|
|
44
42
|
}
|
|
45
43
|
async packageDependencies(archiver) {
|
|
46
44
|
const manifest = JSON.stringify(await this.configReader.readConfig());
|
|
@@ -54,13 +52,13 @@ class RuntimeBundler {
|
|
|
54
52
|
}
|
|
55
53
|
async packageAll(archiver, handlers, packageConfig, i18nResourceBundle) {
|
|
56
54
|
const entryPoints = (0, bundler_1.getEntryPoints)(handlers);
|
|
57
|
-
const
|
|
55
|
+
const metadata = await this.packageCode(archiver, entryPoints, i18nResourceBundle);
|
|
58
56
|
await this.packageDependencies(archiver);
|
|
59
57
|
const files = await this.fileSystemReader.getFileGlobList(packageConfig?.extraFiles ?? []);
|
|
60
58
|
for (const fileName of files) {
|
|
61
59
|
archiver.addFileFrom(fileName, fileName);
|
|
62
60
|
}
|
|
63
|
-
return
|
|
61
|
+
return metadata;
|
|
64
62
|
}
|
|
65
63
|
packageI18nResources(archiver, i18nResourceBundle) {
|
|
66
64
|
(0, cli_shared_1.listFilesInI18nResourceBundle)(i18nResourceBundle).forEach(([fileName, filePath]) => {
|
|
@@ -69,13 +67,13 @@ class RuntimeBundler {
|
|
|
69
67
|
}
|
|
70
68
|
async bundle(handlers, i18nResourceBundle, packageConfig) {
|
|
71
69
|
const archiver = this.archiverFactory();
|
|
72
|
-
const
|
|
70
|
+
const metadata = await this.packageAll(archiver, handlers, packageConfig, i18nResourceBundle);
|
|
73
71
|
if (handlers.length === 0) {
|
|
74
72
|
this.packageI18nResources(archiver, i18nResourceBundle);
|
|
75
73
|
}
|
|
76
74
|
const archivePath = await archiver.finalise();
|
|
77
75
|
this.logger.debug(cli_shared_1.Text.deploy.taskPackage.archiveCreated(archivePath));
|
|
78
|
-
return { runtimeArchivePath: archivePath,
|
|
76
|
+
return { runtimeArchivePath: archivePath, metadata };
|
|
79
77
|
}
|
|
80
78
|
}
|
|
81
79
|
exports.RuntimeBundler = RuntimeBundler;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-bundler.js","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,
|
|
1
|
+
{"version":3,"file":"runtime-bundler.js","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { CommandLineUI } from '@forge/cli-shared';
|
|
2
2
|
import { DevSpaceClient, DevSpaceDetails, DevSpaceCreateResult } from './graphql-client';
|
|
3
|
+
import { AnalyticsClientReporter } from '../analytics-client/analytics-client';
|
|
3
4
|
export declare class DevSpaceService {
|
|
4
5
|
private readonly devSpaceClient;
|
|
5
|
-
|
|
6
|
+
private readonly analyticsClient;
|
|
7
|
+
constructor(devSpaceClient: DevSpaceClient, analyticsClient: AnalyticsClientReporter);
|
|
6
8
|
private fetchAllDevSpaces;
|
|
7
9
|
private doesDevSpaceAlreadyExists;
|
|
8
10
|
getDevSpaces(ui: CommandLineUI): Promise<DevSpaceDetails[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"devspace-service.d.ts","sourceRoot":"","sources":["../../src/devspace/devspace-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAQ,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"devspace-service.d.ts","sourceRoot":"","sources":["../../src/devspace/devspace-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAQ,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACzF,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAM/E,qBAAa,eAAe;IAExB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,eAAe;gBADf,cAAc,EAAE,cAAc,EAC9B,eAAe,EAAE,uBAAuB;YAG7C,iBAAiB;IAU/B,OAAO,CAAC,yBAAyB;IAKpB,YAAY,CAAC,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAI3D,cAAc,CACzB,EAAE,EAAE,aAAa,EACjB,SAAS,EAAE,eAAe,EAAE,EAC5B,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;QAAE,QAAQ,EAAE,eAAe,CAAC;QAAC,cAAc,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;IA2C5D,kBAAkB,CAAC,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;YAI1E,sBAAsB;CAkDrC"}
|
|
@@ -3,12 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.DevSpaceService = void 0;
|
|
4
4
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
5
5
|
const DEV_SPACE_ERROR_MESSAGES = {
|
|
6
|
-
NAME_ALREADY_EXISTS: 'Developer
|
|
6
|
+
NAME_ALREADY_EXISTS: 'Developer Space with this name already exists'
|
|
7
7
|
};
|
|
8
8
|
class DevSpaceService {
|
|
9
9
|
devSpaceClient;
|
|
10
|
-
|
|
10
|
+
analyticsClient;
|
|
11
|
+
constructor(devSpaceClient, analyticsClient) {
|
|
11
12
|
this.devSpaceClient = devSpaceClient;
|
|
13
|
+
this.analyticsClient = analyticsClient;
|
|
12
14
|
}
|
|
13
15
|
async fetchAllDevSpaces() {
|
|
14
16
|
const devSpaceIds = await this.devSpaceClient.getDevSpacesWithLinkingAccess();
|
|
@@ -66,33 +68,41 @@ class DevSpaceService {
|
|
|
66
68
|
}
|
|
67
69
|
}
|
|
68
70
|
async createDevSpaceFlow(ui) {
|
|
69
|
-
const cont = await ui.confirm(cli_shared_1.Text.devSpace.createContinuePrompt);
|
|
70
|
-
if (!cont) {
|
|
71
|
-
return null;
|
|
72
|
-
}
|
|
73
71
|
return await this.promptForNameAndCreate(ui);
|
|
74
72
|
}
|
|
75
73
|
async promptForNameAndCreate(ui, isRetry = false) {
|
|
76
|
-
if (isRetry) {
|
|
77
|
-
ui.info(cli_shared_1.Text.devSpace.error.nameAlreadyExists);
|
|
78
|
-
ui.emptyLine();
|
|
79
|
-
}
|
|
80
|
-
else {
|
|
74
|
+
if (!isRetry) {
|
|
81
75
|
ui.info(cli_shared_1.Text.devSpace.createMessage);
|
|
82
76
|
}
|
|
83
77
|
const name = await ui.promptForText(cli_shared_1.Text.devSpace.createPrompt);
|
|
84
|
-
if (!name || !name.trim()) {
|
|
85
|
-
ui.info(cli_shared_1.Text.devSpace.nameRequired);
|
|
86
|
-
return null;
|
|
87
|
-
}
|
|
88
78
|
ui.emptyLine();
|
|
89
79
|
ui.clearSpinner();
|
|
90
80
|
try {
|
|
91
|
-
const result = await ui.displayProgress(() => this.devSpaceClient.createDevSpace({ name
|
|
81
|
+
const result = await ui.displayProgress(() => this.devSpaceClient.createDevSpace({ name }), cli_shared_1.Text.devSpace.createInProgress, (result) => cli_shared_1.Text.devSpace.createdAndContributing(result.name));
|
|
82
|
+
await this.analyticsClient.reportDevSpaceCreated({
|
|
83
|
+
developerSpaceId: result.id,
|
|
84
|
+
developerSpaceName: result.name,
|
|
85
|
+
isRetryAttempt: isRetry
|
|
86
|
+
});
|
|
92
87
|
return result;
|
|
93
88
|
}
|
|
94
89
|
catch (error) {
|
|
95
|
-
if (
|
|
90
|
+
if (error.statusCode === 400) {
|
|
91
|
+
if (this.doesDevSpaceAlreadyExists(error)) {
|
|
92
|
+
ui.info(cli_shared_1.Text.devSpace.error.nameAlreadyExists);
|
|
93
|
+
ui.emptyLine();
|
|
94
|
+
await this.analyticsClient.reportDevSpaceRetryAttempt({
|
|
95
|
+
triedDeveloperSpaceName: name,
|
|
96
|
+
reason: 'nameAlreadyExists'
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
await this.analyticsClient.reportDevSpaceRetryAttempt({
|
|
101
|
+
triedDeveloperSpaceName: name,
|
|
102
|
+
reason: 'validationError'
|
|
103
|
+
});
|
|
104
|
+
ui.error(new Error(cli_shared_1.Text.devSpace.error.create(error.message)));
|
|
105
|
+
}
|
|
96
106
|
return await this.promptForNameAndCreate(ui, true);
|
|
97
107
|
}
|
|
98
108
|
throw error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"devspace-service.js","sourceRoot":"","sources":["../../src/devspace/devspace-service.ts"],"names":[],"mappings":";;;AAAA,kDAAwD;
|
|
1
|
+
{"version":3,"file":"devspace-service.js","sourceRoot":"","sources":["../../src/devspace/devspace-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,10 @@ export declare class PermissionDeniedError extends GraphQlMutationError {
|
|
|
11
11
|
constructor(requestId: string | undefined, appId: string | undefined, statusCode: number | undefined);
|
|
12
12
|
}
|
|
13
13
|
export declare class AlreadyInstalledError extends GraphQlMutationError {
|
|
14
|
-
|
|
14
|
+
readonly hasMajorVersion?: boolean | undefined;
|
|
15
|
+
readonly environment?: string | undefined;
|
|
16
|
+
readonly environmentType?: AppEnvironmentType | undefined;
|
|
17
|
+
constructor(requestId: string | undefined, statusCode: number | undefined, hasMajorVersion?: boolean | undefined, environment?: string | undefined, environmentType?: AppEnvironmentType | undefined);
|
|
15
18
|
}
|
|
16
19
|
export declare class InstallationError extends GraphQlMutationError {
|
|
17
20
|
constructor(message: string, { requestId, code, statusCode }: {
|
|
@@ -57,10 +60,10 @@ export declare class InstallationsGraphqlClient implements InstallAppClient, Lis
|
|
|
57
60
|
constructor(graphqlClient: GraphQLClient, sitedProductTranslator: SiteTranslator, bitbucketTranslator: SiteTranslator, pause: Pause);
|
|
58
61
|
private buildInstallationContext;
|
|
59
62
|
private getProductTranslation;
|
|
60
|
-
installAppIntoSite({ environmentKey, site, product, appId, licenseOverride, overrides }: AppInstallSiteDetails): Promise<void>;
|
|
63
|
+
installAppIntoSite({ environmentKey, site, product, appId, licenseOverride, overrides, majorVersionId, environmentType }: AppInstallSiteDetails): Promise<void>;
|
|
61
64
|
getEntitlementOffering(site: URL, product: SupportedProduct): Promise<Maybe<CcpEntitlement | HamsEntitlement | undefined>>;
|
|
62
65
|
getHamsProductKeys(product: SupportedProduct): string[];
|
|
63
|
-
upgradeInstallation({ site, product, environmentKey, appId }: AppInstallSiteDetails): Promise<void>;
|
|
66
|
+
upgradeInstallation({ site, product, environmentKey, appId, majorVersionId }: AppInstallSiteDetails): Promise<void>;
|
|
64
67
|
private monitorAppInstallOrUpgrade;
|
|
65
68
|
private handleFailedInstallOrUpgrade;
|
|
66
69
|
uninstallApp(input: AppUninstallationInput): Promise<boolean>;
|
|
@@ -77,5 +80,6 @@ export declare class InstallationsGraphqlClient implements InstallAppClient, Lis
|
|
|
77
80
|
private getAllInstallations;
|
|
78
81
|
static buildInstallationsFilter(appId: string, installationFilterOptions: InstallationFilterOptions | undefined, buildInstallationContext: (product: string, site: URL) => Promise<string>): Promise<AppInstallationsByAppFilter>;
|
|
79
82
|
getVersions(appId: string, environmentKey: string, firstN?: number): Promise<AppEnvironmentVersionData>;
|
|
83
|
+
getVersionByMajorVersionId(id: string, environmentKey: string, majorVersion?: number): Promise<AppEnvironmentVersionData | undefined>;
|
|
80
84
|
}
|
|
81
85
|
//# sourceMappingURL=graphql-client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAK1B,OAAO,EACL,kBAAkB,EAIlB,sBAAsB,EAKtB,aAAa,EACb,oBAAoB,EAGpB,KAAK,EAIL,KAAK,EAGL,SAAS,EACT,SAAS,EAET,gBAAgB,EAChB,eAAe,EACf,cAAc,EACd,2BAA2B,
|
|
1
|
+
{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,8 +20,17 @@ class PermissionDeniedError extends cli_shared_1.GraphQlMutationError {
|
|
|
20
20
|
}
|
|
21
21
|
exports.PermissionDeniedError = PermissionDeniedError;
|
|
22
22
|
class AlreadyInstalledError extends cli_shared_1.GraphQlMutationError {
|
|
23
|
-
|
|
24
|
-
|
|
23
|
+
hasMajorVersion;
|
|
24
|
+
environment;
|
|
25
|
+
environmentType;
|
|
26
|
+
constructor(requestId, statusCode, hasMajorVersion, environment, environmentType) {
|
|
27
|
+
const message = hasMajorVersion && environment && environmentType
|
|
28
|
+
? cli_shared_1.Text.install.error.alreadyInstalledErrorWithMajorVersion(environment, environmentType)
|
|
29
|
+
: cli_shared_1.Text.install.error.alreadyInstalledError;
|
|
30
|
+
super(message, { requestId, code: ALREADY_INSTALLED_CODE, statusCode });
|
|
31
|
+
this.hasMajorVersion = hasMajorVersion;
|
|
32
|
+
this.environment = environment;
|
|
33
|
+
this.environmentType = environmentType;
|
|
25
34
|
}
|
|
26
35
|
}
|
|
27
36
|
exports.AlreadyInstalledError = AlreadyInstalledError;
|
|
@@ -102,7 +111,7 @@ class InstallationsGraphqlClient {
|
|
|
102
111
|
}
|
|
103
112
|
return this.sitedProductTranslator;
|
|
104
113
|
}
|
|
105
|
-
async installAppIntoSite({ environmentKey, site, product, appId, licenseOverride, overrides }) {
|
|
114
|
+
async installAppIntoSite({ environmentKey, site, product, appId, licenseOverride, overrides, majorVersionId, environmentType }) {
|
|
106
115
|
const workspaceAri = await this.buildInstallationContext(product, site);
|
|
107
116
|
const query = `
|
|
108
117
|
mutation forge_cli_installApplication($input: AppInstallationInput!) {
|
|
@@ -126,15 +135,13 @@ class InstallationsGraphqlClient {
|
|
|
126
135
|
environmentKey,
|
|
127
136
|
async: true,
|
|
128
137
|
licenseOverride,
|
|
129
|
-
overrides
|
|
138
|
+
overrides,
|
|
139
|
+
...(majorVersionId ? { versionId: majorVersionId } : {})
|
|
130
140
|
}
|
|
131
141
|
};
|
|
132
142
|
const { response: { installApp: { success, taskId, errors } }, requestId } = await this.graphqlClient.mutate(query, variables);
|
|
133
143
|
const error = (0, cli_shared_1.getError)(errors);
|
|
134
144
|
if (!success) {
|
|
135
|
-
if (error.code === ALREADY_INSTALLED_CODE) {
|
|
136
|
-
throw new AlreadyInstalledError(requestId, error.statusCode);
|
|
137
|
-
}
|
|
138
145
|
if (error.code === PERMISSION_DENIED) {
|
|
139
146
|
throw new PermissionDeniedError(requestId, ari_1.AnyAri.parse(appId).resourceId, error.statusCode);
|
|
140
147
|
}
|
|
@@ -147,7 +154,7 @@ class InstallationsGraphqlClient {
|
|
|
147
154
|
if (!taskId) {
|
|
148
155
|
throw new MissingTaskIdError(error.message);
|
|
149
156
|
}
|
|
150
|
-
await this.monitorAppInstallOrUpgrade(taskId);
|
|
157
|
+
await this.monitorAppInstallOrUpgrade(taskId, !!majorVersionId, environmentKey, environmentType);
|
|
151
158
|
}
|
|
152
159
|
async getEntitlementOffering(site, product) {
|
|
153
160
|
try {
|
|
@@ -206,7 +213,7 @@ class InstallationsGraphqlClient {
|
|
|
206
213
|
throw new Error('Unsupported product');
|
|
207
214
|
}
|
|
208
215
|
}
|
|
209
|
-
async upgradeInstallation({ site, product, environmentKey, appId }) {
|
|
216
|
+
async upgradeInstallation({ site, product, environmentKey, appId, majorVersionId }) {
|
|
210
217
|
const workspaceAri = await this.buildInstallationContext(product, site);
|
|
211
218
|
const query = `
|
|
212
219
|
mutation forge_cli_upgradeApplication($input: AppInstallationUpgradeInput!) {
|
|
@@ -243,26 +250,29 @@ class InstallationsGraphqlClient {
|
|
|
243
250
|
if (!taskId) {
|
|
244
251
|
throw new MissingTaskIdError(error.message);
|
|
245
252
|
}
|
|
246
|
-
await this.monitorAppInstallOrUpgrade(taskId);
|
|
253
|
+
await this.monitorAppInstallOrUpgrade(taskId, !!majorVersionId, environmentKey);
|
|
247
254
|
}
|
|
248
|
-
async monitorAppInstallOrUpgrade(taskId) {
|
|
255
|
+
async monitorAppInstallOrUpgrade(taskId, hasMajorVersion, environment, environmentType) {
|
|
249
256
|
let status = cli_shared_1.AppTaskState.Pending;
|
|
250
257
|
while (status !== cli_shared_1.AppTaskState.Complete) {
|
|
251
258
|
const result = await this.getAppInstallationTaskRetry(taskId);
|
|
252
259
|
status = result.state;
|
|
253
260
|
if (status === cli_shared_1.AppTaskState.Failed) {
|
|
254
|
-
this.handleFailedInstallOrUpgrade(result);
|
|
261
|
+
this.handleFailedInstallOrUpgrade(result, hasMajorVersion, environment, environmentType);
|
|
255
262
|
}
|
|
256
263
|
if (status !== cli_shared_1.AppTaskState.Complete)
|
|
257
264
|
await this.pause(exports.UNINSTALLATION_EVENT_POLL_INTERVAL);
|
|
258
265
|
}
|
|
259
266
|
}
|
|
260
|
-
handleFailedInstallOrUpgrade(result) {
|
|
267
|
+
handleFailedInstallOrUpgrade(result, hasMajorVersion, environment, environmentType) {
|
|
261
268
|
const { errors, requestId } = result;
|
|
262
269
|
const error = errors?.[0];
|
|
263
270
|
const statusCode = error?.extensions?.statusCode;
|
|
264
271
|
const isUserError = statusCode && statusCode >= 400 && statusCode < 500 ? true : false;
|
|
265
272
|
const code = error?.extensions?.errorType ?? undefined;
|
|
273
|
+
if (code === ALREADY_INSTALLED_CODE) {
|
|
274
|
+
throw new AlreadyInstalledError(requestId, statusCode ?? undefined, hasMajorVersion, environment, environmentType);
|
|
275
|
+
}
|
|
266
276
|
if (error && requestId) {
|
|
267
277
|
error.message = cli_shared_1.Text.install.error.appendRequestIdToErrorMessage(error.message ?? undefined, requestId);
|
|
268
278
|
}
|
|
@@ -570,6 +580,54 @@ class InstallationsGraphqlClient {
|
|
|
570
580
|
environmentType: result.app.environmentByKey.type
|
|
571
581
|
};
|
|
572
582
|
}
|
|
583
|
+
async getVersionByMajorVersionId(id, environmentKey, majorVersion) {
|
|
584
|
+
if (!majorVersion) {
|
|
585
|
+
return undefined;
|
|
586
|
+
}
|
|
587
|
+
const query = `
|
|
588
|
+
query forge_cli_getApplicationVersionList($id: ID!, $environmentKey: String!, $majorVersion: Int!) {
|
|
589
|
+
app(id: $id) {
|
|
590
|
+
environmentByKey(key: $environmentKey) {
|
|
591
|
+
type
|
|
592
|
+
versions(majorVersion: $majorVersion) {
|
|
593
|
+
nodes {
|
|
594
|
+
id
|
|
595
|
+
version
|
|
596
|
+
isLatest
|
|
597
|
+
requiredProducts
|
|
598
|
+
permissions {
|
|
599
|
+
egress {
|
|
600
|
+
addresses
|
|
601
|
+
}
|
|
602
|
+
scopes {
|
|
603
|
+
key
|
|
604
|
+
}
|
|
605
|
+
}
|
|
606
|
+
}
|
|
607
|
+
}
|
|
608
|
+
}
|
|
609
|
+
}
|
|
610
|
+
}`;
|
|
611
|
+
const variables = {
|
|
612
|
+
id,
|
|
613
|
+
environmentKey,
|
|
614
|
+
majorVersion
|
|
615
|
+
};
|
|
616
|
+
const { app } = await this.graphqlClient.query(query, variables);
|
|
617
|
+
if (!app) {
|
|
618
|
+
throw new MissingAppError();
|
|
619
|
+
}
|
|
620
|
+
if (!app.environmentByKey) {
|
|
621
|
+
throw new EnvironmentNotFoundError(environmentKey);
|
|
622
|
+
}
|
|
623
|
+
if (!app.environmentByKey.versions?.nodes?.length) {
|
|
624
|
+
return undefined;
|
|
625
|
+
}
|
|
626
|
+
return {
|
|
627
|
+
nodes: app.environmentByKey.versions.nodes,
|
|
628
|
+
environmentType: app.environmentByKey.type
|
|
629
|
+
};
|
|
630
|
+
}
|
|
573
631
|
}
|
|
574
632
|
exports.InstallationsGraphqlClient = InstallationsGraphqlClient;
|
|
575
633
|
//# sourceMappingURL=graphql-client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphql-client.js","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"graphql-client.js","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { URL } from 'url';
|
|
3
|
-
import { AppConfigProvider, EcosystemAppInstallationOverridesInput, LicenseOverrideState } from '@forge/cli-shared';
|
|
3
|
+
import { AppConfigProvider, AppEnvironmentType, EcosystemAppInstallationOverridesInput, LicenseOverrideState } from '@forge/cli-shared';
|
|
4
4
|
export interface TriggerAppSiteInstallDetails {
|
|
5
5
|
site: URL;
|
|
6
6
|
product: string;
|
|
7
7
|
environmentKey: string;
|
|
8
8
|
licenseOverride?: LicenseOverrideState;
|
|
9
9
|
overrides?: EcosystemAppInstallationOverridesInput;
|
|
10
|
+
majorVersionId?: string;
|
|
11
|
+
environmentType?: AppEnvironmentType;
|
|
10
12
|
}
|
|
11
13
|
export interface AppInstallSiteDetails extends TriggerAppSiteInstallDetails {
|
|
12
14
|
appId: string;
|
|
@@ -18,6 +20,6 @@ export declare class InstallAppSiteCommand {
|
|
|
18
20
|
private readonly getAppConfig;
|
|
19
21
|
private readonly installAppClient;
|
|
20
22
|
constructor(getAppConfig: AppConfigProvider, installAppClient: InstallAppClient);
|
|
21
|
-
execute({ environmentKey, site, product, licenseOverride, overrides }: TriggerAppSiteInstallDetails): Promise<void>;
|
|
23
|
+
execute({ environmentKey, site, product, licenseOverride, overrides, majorVersionId, environmentType }: TriggerAppSiteInstallDetails): Promise<void>;
|
|
22
24
|
}
|
|
23
25
|
//# sourceMappingURL=install-app-site.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-app-site.d.ts","sourceRoot":"","sources":["../../src/installations/install-app-site.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,
|
|
1
|
+
{"version":3,"file":"install-app-site.d.ts","sourceRoot":"","sources":["../../src/installations/install-app-site.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,sCAAsC,EACtC,oBAAoB,EACrB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,WAAW,4BAA4B;IAC3C,IAAI,EAAE,GAAG,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,oBAAoB,CAAC;IACvC,SAAS,CAAC,EAAE,sCAAsC,CAAC;IACnD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,kBAAkB,CAAC;CACtC;AAED,MAAM,WAAW,qBAAsB,SAAQ,4BAA4B;IACzE,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,kBAAkB,CAAC,iBAAiB,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7E;AAED,qBAAa,qBAAqB;IAE9B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBADhB,YAAY,EAAE,iBAAiB,EAC/B,gBAAgB,EAAE,gBAAgB;IAGxC,OAAO,CAAC,EACnB,cAAc,EACd,IAAI,EACJ,OAAO,EACP,eAAe,EACf,SAAS,EACT,cAAc,EACd,eAAe,EAChB,EAAE,4BAA4B;CAahC"}
|
|
@@ -8,7 +8,7 @@ class InstallAppSiteCommand {
|
|
|
8
8
|
this.getAppConfig = getAppConfig;
|
|
9
9
|
this.installAppClient = installAppClient;
|
|
10
10
|
}
|
|
11
|
-
async execute({ environmentKey, site, product, licenseOverride, overrides }) {
|
|
11
|
+
async execute({ environmentKey, site, product, licenseOverride, overrides, majorVersionId, environmentType }) {
|
|
12
12
|
const { id: appId } = await this.getAppConfig();
|
|
13
13
|
return await this.installAppClient.installAppIntoSite({
|
|
14
14
|
appId,
|
|
@@ -16,7 +16,9 @@ class InstallAppSiteCommand {
|
|
|
16
16
|
site,
|
|
17
17
|
product,
|
|
18
18
|
licenseOverride,
|
|
19
|
-
overrides
|
|
19
|
+
overrides,
|
|
20
|
+
majorVersionId,
|
|
21
|
+
environmentType
|
|
20
22
|
});
|
|
21
23
|
}
|
|
22
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-app-site.js","sourceRoot":"","sources":["../../src/installations/install-app-site.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"install-app-site.js","sourceRoot":"","sources":["../../src/installations/install-app-site.ts"],"names":[],"mappings":";;;AA0BA,MAAa,qBAAqB;IAEb;IACA;IAFnB,YACmB,YAA+B,EAC/B,gBAAkC;QADlC,iBAAY,GAAZ,YAAY,CAAmB;QAC/B,qBAAgB,GAAhB,gBAAgB,CAAkB;IAClD,CAAC;IAEG,KAAK,CAAC,OAAO,CAAC,EACnB,cAAc,EACd,IAAI,EACJ,OAAO,EACP,eAAe,EACf,SAAS,EACT,cAAc,EACd,eAAe,EACc;QAC7B,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAChD,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC;YACpD,KAAK;YACL,cAAc;YACd,IAAI;YACJ,OAAO;YACP,eAAe;YACf,SAAS;YACT,cAAc;YACd,eAAe;SAChB,CAAC,CAAC;IACL,CAAC;CACF;AA3BD,sDA2BC"}
|
|
@@ -29,6 +29,9 @@ export interface AppEnvironmentPermissions extends AppEnvironmentVersionPermissi
|
|
|
29
29
|
addedScopes: string[];
|
|
30
30
|
environmentType: AppEnvironmentType;
|
|
31
31
|
hasDeployments: boolean;
|
|
32
|
+
isLatest?: boolean;
|
|
33
|
+
version?: string;
|
|
34
|
+
versionId?: string;
|
|
32
35
|
}
|
|
33
36
|
export interface InstallationFilterOptions {
|
|
34
37
|
site?: URL;
|
|
@@ -53,6 +56,9 @@ export interface UpgradeAppInstallationsClient {
|
|
|
53
56
|
export interface HasNoAppInstallationsForEnvClient {
|
|
54
57
|
hasNoAppInstallationsForEnv(appId: string, appEnv: AppEnvironmentType): Promise<boolean>;
|
|
55
58
|
}
|
|
59
|
+
export interface GetVersionByMajorVersionIdClient {
|
|
60
|
+
getVersionByMajorVersionId(id: string, environmentKey: string, majorVersion: number): Promise<AppEnvironmentVersionData | undefined>;
|
|
61
|
+
}
|
|
56
62
|
export declare class MultipleMatchingInstallationsError extends BaseError {
|
|
57
63
|
constructor();
|
|
58
64
|
}
|
|
@@ -62,7 +68,8 @@ export declare class InstallationService {
|
|
|
62
68
|
private readonly upgradeAppInstallationsClient;
|
|
63
69
|
private readonly hasNoAppInstallationsForEnvClient;
|
|
64
70
|
private readonly getEntitlementOffering;
|
|
65
|
-
|
|
71
|
+
private readonly getVersionByMajorVersionIdClient;
|
|
72
|
+
constructor(getAppConfig: AppConfigProvider, listInstallationsClient: ListAppInstallationsClient, upgradeAppInstallationsClient: UpgradeAppInstallationsClient, hasNoAppInstallationsForEnvClient: HasNoAppInstallationsForEnvClient, getEntitlementOffering: GetEntitlementOffering, getVersionByMajorVersionIdClient: GetVersionByMajorVersionIdClient);
|
|
66
73
|
private comparePossibleInstallations;
|
|
67
74
|
private matchSiteForProduct;
|
|
68
75
|
private filterInstallations;
|
|
@@ -73,6 +80,7 @@ export declare class InstallationService {
|
|
|
73
80
|
hasOutdatedProductInstallation(environment: string): Promise<boolean>;
|
|
74
81
|
getEntitlementOfferingProduct(site: URL, product: SupportedProduct): Promise<Maybe<CcpEntitlement> | Maybe<HamsEntitlement> | undefined>;
|
|
75
82
|
upgradeInstallation(site: URL, product: string, environmentKey: string, appId: string): Promise<boolean>;
|
|
83
|
+
getVersionByMajorVersionId(id: string, environmentKey: string, majorVersion: number): Promise<AppEnvironmentPermissions | undefined>;
|
|
76
84
|
private getPermissionsFromAppEnvironmentVersion;
|
|
77
85
|
getAppEnvironmentPermissions(appId: string, environmentKey: string): Promise<AppEnvironmentPermissions | undefined>;
|
|
78
86
|
}
|
|
@@ -1 +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,EAGrB,KAAK,EAGL,gBAAgB,EAEhB,SAAS,EACT,eAAe,EACf,cAAc,EACf,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"installation-service.d.ts","sourceRoot":"","sources":["../../src/service/installation-service.ts"],"names":[],"mappings":"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"}
|