@forge/cli 12.8.0 → 12.9.0-next.16-experimental-4bd2ca0
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 +204 -0
- package/npm-shrinkwrap.json +40 -40
- package/out/command-line/controller/custom-scopes-controller.d.ts +8 -2
- package/out/command-line/controller/custom-scopes-controller.d.ts.map +1 -1
- package/out/command-line/controller/custom-scopes-controller.js +55 -3
- package/out/command-line/controller/custom-scopes-controller.js.map +1 -1
- package/out/command-line/controller/install-controller.d.ts.map +1 -1
- package/out/command-line/controller/install-controller.js +8 -5
- 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 +3 -1
- package/out/command-line/dependency-injection.js.map +1 -1
- package/out/command-line/register-custom-scopes-commands.d.ts.map +1 -1
- package/out/command-line/register-custom-scopes-commands.js +15 -7
- package/out/command-line/register-custom-scopes-commands.js.map +1 -1
- package/out/command-line/view/custom-scopes-view.d.ts +16 -2
- package/out/command-line/view/custom-scopes-view.d.ts.map +1 -1
- package/out/command-line/view/custom-scopes-view.js +50 -2
- package/out/command-line/view/custom-scopes-view.js.map +1 -1
- package/out/custom-scopes/repository.d.ts +5 -1
- package/out/custom-scopes/repository.d.ts.map +1 -1
- package/out/custom-scopes/repository.js +8 -8
- package/out/custom-scopes/repository.js.map +1 -1
- package/out/custom-scopes/validation/schema.json +3 -1
- package/out/installations/graphql-client.d.ts +13 -4
- package/out/installations/graphql-client.d.ts.map +1 -1
- package/out/installations/graphql-client.js +48 -8
- package/out/installations/graphql-client.js.map +1 -1
- package/out/installations/install-app-site.d.ts +5 -0
- package/out/installations/install-app-site.d.ts.map +1 -1
- package/out/installations/install-app-site.js.map +1 -1
- package/out/service/custom-scopes-service.d.ts +10 -4
- package/out/service/custom-scopes-service.d.ts.map +1 -1
- package/out/service/custom-scopes-service.js +11 -9
- package/out/service/custom-scopes-service.js.map +1 -1
- package/out/service/installation-service.d.ts +3 -3
- package/out/service/installation-service.d.ts.map +1 -1
- package/out/service/installation-service.js +5 -2
- package/out/service/installation-service.js.map +1 -1
- package/package.json +7 -7
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { repository } from '../custom-scopes';
|
|
1
|
+
import { repository, validation } from '../custom-scopes';
|
|
2
2
|
import { AppCustomScope } from '../custom-scopes/repository';
|
|
3
3
|
export { AppCustomScope };
|
|
4
|
+
export declare type ValidationError = validation.ErrorObject;
|
|
4
5
|
export declare const enum Status {
|
|
5
6
|
Ok = "Ok",
|
|
6
7
|
InvalidResponseError = "InvalidResponseError",
|
|
@@ -21,11 +22,16 @@ export declare type CreateError = Result<Status.FileReadError, {
|
|
|
21
22
|
path: string;
|
|
22
23
|
error: string;
|
|
23
24
|
}> | Result<Status.YAMLParseError, {
|
|
24
|
-
errors:
|
|
25
|
+
errors: {
|
|
26
|
+
message: string;
|
|
27
|
+
}[];
|
|
25
28
|
}> | Result<Status.ValidationError, {
|
|
26
|
-
|
|
29
|
+
data: Record<string, unknown>;
|
|
30
|
+
errors: ValidationError[];
|
|
27
31
|
}> | Result<Status.RemoteError, {
|
|
28
|
-
errors:
|
|
32
|
+
errors: Extract<repository.StoreError, {
|
|
33
|
+
status: repository.Status.RemoteError;
|
|
34
|
+
}>['errors'];
|
|
29
35
|
}>;
|
|
30
36
|
export interface Service {
|
|
31
37
|
listScopes(appId: string, environmentId: string): Promise<ListOk | ListError>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-scopes-service.d.ts","sourceRoot":"","sources":["../../src/service/custom-scopes-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"custom-scopes-service.d.ts","sourceRoot":"","sources":["../../src/service/custom-scopes-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,CAAC;AAE1B,oBAAY,eAAe,GAAG,UAAU,CAAC,WAAW,CAAC;AAErD,0BAAkB,MAAM;IACtB,EAAE,OAAO;IACT,oBAAoB,yBAAyB;IAC7C,aAAa,kBAAkB;IAC/B,cAAc,mBAAmB;IACjC,eAAe,oBAAoB;IACnC,WAAW,gBAAgB;CAC5B;AAED,aAAK,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,GAAG,EAAE,IAAI;IAAE,MAAM,EAAE,CAAC,CAAA;CAAE,GAAG,CAAC,CAAC;AAEzE,oBAAY,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE;IAAE,MAAM,EAAE,cAAc,EAAE,CAAA;CAAE,CAAC,CAAC;AACrE,oBAAY,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAE5D,oBAAY,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AACzC,oBAAY,WAAW,GACnB,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,GAC7D,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE;IAAE,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CAAE,CAAC,GAChE,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,MAAM,EAAE,eAAe,EAAE,CAAA;CAAE,CAAC,GAC5F,MAAM,CACJ,MAAM,CAAC,WAAW,EAClB;IAAE,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE;QAAE,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,WAAW,CAAA;KAAE,CAAC,CAAC,QAAQ,CAAC,CAAA;CAAE,CAChG,CAAC;AAEN,MAAM,WAAW,OAAO;IAOtB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAS9E,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,WAAW,CAAC,CAAC;CAC7G;AAED,eAAO,MAAM,MAAM,SAAU,WAAW,UAAU,KAAG,OAEpD,CAAC"}
|
|
@@ -33,17 +33,19 @@ class DefaultService {
|
|
|
33
33
|
}
|
|
34
34
|
const yamlDocument = yaml_1.default.parseDocument(rawFile);
|
|
35
35
|
if (yamlDocument.errors.length > 0) {
|
|
36
|
-
|
|
37
|
-
|
|
36
|
+
return {
|
|
37
|
+
status: "YAMLParseError",
|
|
38
|
+
errors: yamlDocument.errors.map(({ message }) => ({ message }))
|
|
39
|
+
};
|
|
38
40
|
}
|
|
39
|
-
const
|
|
41
|
+
const data = yamlDocument.toJSON();
|
|
42
|
+
const validationResult = custom_scopes_1.validation.validate(data);
|
|
40
43
|
if (!validationResult.isValid) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
errors
|
|
45
|
-
}
|
|
46
|
-
return { status: "ValidationError", errors };
|
|
44
|
+
return {
|
|
45
|
+
status: "ValidationError",
|
|
46
|
+
data,
|
|
47
|
+
errors: validationResult.errors
|
|
48
|
+
};
|
|
47
49
|
}
|
|
48
50
|
const scopes = Object.entries(validationResult.data.scopes).map(([name, { displayName, description }]) => ({
|
|
49
51
|
name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-scopes-service.js","sourceRoot":"","sources":["../../src/service/custom-scopes-service.ts"],"names":[],"mappings":";;;;AAAA,gEAA0B;AAC1B,wDAAwB;AAExB,oDAA0D;
|
|
1
|
+
{"version":3,"file":"custom-scopes-service.js","sourceRoot":"","sources":["../../src/service/custom-scopes-service.ts"],"names":[],"mappings":";;;;AAAA,gEAA0B;AAC1B,wDAAwB;AAExB,oDAA0D;AAkDnD,MAAM,MAAM,GAAG,CAAC,IAA2B,EAAW,EAAE;IAC7D,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC,CAAC;AAFW,QAAA,MAAM,UAEjB;AAEF,MAAM,cAAc;IACW;IAA7B,YAA6B,UAAiC;QAAjC,eAAU,GAAV,UAAU,CAAuB;IAAG,CAAC;IAE3D,KAAK,CAAC,UAAU,CAAC,KAAa,EAAE,aAAqB;QAC1D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QAEhE,QAAQ,MAAM,CAAC,MAAM,EAAE;YACrB;gBACE,OAAO,EAAE,MAAM,MAAW,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;YACtD;gBACE,OAAO,EAAE,MAAM,wBAA6B,EAAE,CAAC;SAClD;IACH,CAAC;IAEM,KAAK,CAAC,YAAY,CACvB,KAAa,EACb,aAAqB,EACrB,cAAsB;QAEtB,IAAI,OAAO,CAAC;QACZ,IAAI;YACF,OAAO,GAAG,kBAAE,CAAC,YAAY,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;SACnD;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,EAAE,MAAM,iBAAsB,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;SACjF;QAED,MAAM,YAAY,GAAG,cAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YAClC,OAAO;gBACL,MAAM,kBAAuB;gBAC7B,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;aAChE,CAAC;SACH;QAED,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;QACnC,MAAM,gBAAgB,GAAG,0BAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE;YAC7B,OAAO;gBACL,MAAM,mBAAwB;gBAC9B,IAAI;gBACJ,MAAM,EAAE,gBAAgB,CAAC,MAAM;aAChC,CAAC;SACH;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACzG,IAAI;YACJ,WAAW;YACX,WAAW;SACZ,CAAC,CAAC,CAAC;QAEJ,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YACnD,KAAK;YACL,aAAa;YACb,MAAM;SACP,CAAC,CAAC;QAEH,QAAQ,gBAAgB,CAAC,MAAM,EAAE;YAC/B;gBACE,OAAO,EAAE,MAAM,MAAW,EAAE,CAAC;YAC/B;gBACE,OAAO,EAAE,MAAM,eAAoB,EAAE,MAAM,EAAE,gBAAgB,CAAC,MAAM,EAAE,CAAC;SAC1E;IACH,CAAC;CACF"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { AppConfigProvider, AppEnvironmentType, AppEnvironmentVersion, Maybe, SupportedProduct, BaseError, HamsEntitlement, CcpEntitlement } from '@forge/cli-shared';
|
|
3
3
|
import { URL } from 'url';
|
|
4
|
-
import {
|
|
4
|
+
import { AppInstallUpgradeSiteDetails } from '../installations/install-app-site';
|
|
5
5
|
export interface Installation {
|
|
6
6
|
id: string;
|
|
7
7
|
product: string;
|
|
@@ -51,7 +51,7 @@ export interface GetEntitlementOffering {
|
|
|
51
51
|
getEntitlementOffering(site: URL, product: SupportedProduct): Promise<Maybe<CcpEntitlement> | Maybe<HamsEntitlement> | undefined>;
|
|
52
52
|
}
|
|
53
53
|
export interface UpgradeAppInstallationsClient {
|
|
54
|
-
upgradeInstallation({ site, product, environmentKey, appId, isCodeUpgrade }:
|
|
54
|
+
upgradeInstallation({ site, product, environmentKey, appId, currentVersion, isCodeUpgrade, targetVersion, isLatest }: AppInstallUpgradeSiteDetails): Promise<void>;
|
|
55
55
|
}
|
|
56
56
|
export interface HasNoAppInstallationsForEnvClient {
|
|
57
57
|
hasNoAppInstallationsForEnv(appId: string, appEnv: AppEnvironmentType): Promise<boolean>;
|
|
@@ -79,7 +79,7 @@ export declare class InstallationService {
|
|
|
79
79
|
findOnlyMatchingInstallation(filter: InstallationFilterOptions): Promise<Installation>;
|
|
80
80
|
hasOutdatedProductInstallation(environment: string): Promise<boolean>;
|
|
81
81
|
getEntitlementOfferingProduct(site: URL, product: SupportedProduct): Promise<Maybe<CcpEntitlement> | Maybe<HamsEntitlement> | undefined>;
|
|
82
|
-
upgradeInstallation(site: URL, product: string, environmentKey: string, appId: string, majorVersionId?: string, isCodeUpgrade?: boolean): Promise<boolean>;
|
|
82
|
+
upgradeInstallation(site: URL, product: string, environmentKey: string, appId: string, currentVersion: string, majorVersionId?: string, isCodeUpgrade?: boolean, targetVersion?: string, isLatest?: boolean): Promise<boolean>;
|
|
83
83
|
getVersionByMajorVersionId(id: string, environmentKey: string, majorVersion: number): Promise<AppEnvironmentPermissions | undefined>;
|
|
84
84
|
private getPermissionsFromAppEnvironmentVersion;
|
|
85
85
|
getAppEnvironmentPermissions(appId: string, environmentKey: string): Promise<AppEnvironmentPermissions | undefined>;
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"installation-service.d.ts","sourceRoot":"","sources":["../../src/service/installation-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,15 +86,18 @@ class InstallationService {
|
|
|
86
86
|
async getEntitlementOfferingProduct(site, product) {
|
|
87
87
|
return this.getEntitlementOffering.getEntitlementOffering(site, product);
|
|
88
88
|
}
|
|
89
|
-
async upgradeInstallation(site, product, environmentKey, appId, majorVersionId, isCodeUpgrade) {
|
|
89
|
+
async upgradeInstallation(site, product, environmentKey, appId, currentVersion, majorVersionId, isCodeUpgrade, targetVersion, isLatest) {
|
|
90
90
|
try {
|
|
91
91
|
await this.upgradeAppInstallationsClient.upgradeInstallation({
|
|
92
92
|
site,
|
|
93
93
|
product,
|
|
94
94
|
environmentKey,
|
|
95
95
|
appId,
|
|
96
|
+
currentVersion,
|
|
96
97
|
majorVersionId,
|
|
97
|
-
isCodeUpgrade
|
|
98
|
+
isCodeUpgrade,
|
|
99
|
+
targetVersion,
|
|
100
|
+
isLatest
|
|
98
101
|
});
|
|
99
102
|
return false;
|
|
100
103
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installation-service.js","sourceRoot":"","sources":["../../src/service/installation-service.ts"],"names":[],"mappings":";;;AAAA,kDAc2B;AAC3B,0CAAsE;AACtE,mCAAoC;AAGpC,oEAAwE;AAMxE,MAAM,sBAAsB,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"installation-service.js","sourceRoot":"","sources":["../../src/service/installation-service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/cli",
|
|
3
|
-
"version": "12.
|
|
3
|
+
"version": "12.9.0-next.16-experimental-4bd2ca0",
|
|
4
4
|
"description": "A command line interface for managing Atlassian-hosted apps",
|
|
5
5
|
"author": "Atlassian",
|
|
6
6
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
@@ -21,14 +21,14 @@
|
|
|
21
21
|
"generate:custom-scopes-types": "json2ts --input src/custom-scopes/validation/schema.json --output src/custom-scopes/generated-types.d.ts --style.singleQuote"
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@forge/bundler": "6.1.11",
|
|
25
|
-
"@forge/cli-shared": "8.9.
|
|
24
|
+
"@forge/bundler": "6.1.12-next.11-experimental-4bd2ca0",
|
|
25
|
+
"@forge/cli-shared": "8.9.1-next.10-experimental-4bd2ca0",
|
|
26
26
|
"@forge/egress": "2.1.1",
|
|
27
|
-
"@forge/lint": "5.12.
|
|
28
|
-
"@forge/manifest": "11.0.
|
|
27
|
+
"@forge/lint": "5.12.1-next.11-experimental-4bd2ca0",
|
|
28
|
+
"@forge/manifest": "11.1.0-next.6-experimental-4bd2ca0",
|
|
29
29
|
"@forge/i18n": "0.0.7",
|
|
30
30
|
"@forge/runtime": "6.1.1",
|
|
31
|
-
"@forge/tunnel": "6.3.
|
|
31
|
+
"@forge/tunnel": "6.3.3-next.11-experimental-4bd2ca0",
|
|
32
32
|
"@forge/util": "2.0.1",
|
|
33
33
|
"@sentry/node": "7.106.0",
|
|
34
34
|
"ajv": "^8.12.0",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"cheerio": "^1.1.0",
|
|
39
39
|
"cli-table3": "^0.6.5",
|
|
40
40
|
"command-exists": "^1.2.9",
|
|
41
|
-
"commander": "^
|
|
41
|
+
"commander": "^13.1.0",
|
|
42
42
|
"cross-spawn": "^7.0.6",
|
|
43
43
|
"dayjs": "^1.11.13",
|
|
44
44
|
"didyoumean": "^1.2.2",
|