@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
|
@@ -5,6 +5,7 @@ const cli_shared_1 = require("@forge/cli-shared");
|
|
|
5
5
|
const egress_1 = require("@forge/egress");
|
|
6
6
|
const lodash_1 = require("lodash");
|
|
7
7
|
const graphql_client_1 = require("../installations/graphql-client");
|
|
8
|
+
const NO_DEPLOYMENTS_VERSION = '1.1.0';
|
|
8
9
|
const IDENTITY_PRODUCT_NAME = 'identity';
|
|
9
10
|
const BITBUCKET_PRODUCT_NAME = 'bitbucket';
|
|
10
11
|
const JIRA_SERVICE_DESK_PRODUCT_NAME = 'jira-servicedesk';
|
|
@@ -20,12 +21,14 @@ class InstallationService {
|
|
|
20
21
|
upgradeAppInstallationsClient;
|
|
21
22
|
hasNoAppInstallationsForEnvClient;
|
|
22
23
|
getEntitlementOffering;
|
|
23
|
-
|
|
24
|
+
getVersionByMajorVersionIdClient;
|
|
25
|
+
constructor(getAppConfig, listInstallationsClient, upgradeAppInstallationsClient, hasNoAppInstallationsForEnvClient, getEntitlementOffering, getVersionByMajorVersionIdClient) {
|
|
24
26
|
this.getAppConfig = getAppConfig;
|
|
25
27
|
this.listInstallationsClient = listInstallationsClient;
|
|
26
28
|
this.upgradeAppInstallationsClient = upgradeAppInstallationsClient;
|
|
27
29
|
this.hasNoAppInstallationsForEnvClient = hasNoAppInstallationsForEnvClient;
|
|
28
30
|
this.getEntitlementOffering = getEntitlementOffering;
|
|
31
|
+
this.getVersionByMajorVersionIdClient = getVersionByMajorVersionIdClient;
|
|
29
32
|
}
|
|
30
33
|
comparePossibleInstallations(url1, url2) {
|
|
31
34
|
const trimmedUrl1 = url1.replace(/\/+$/, '');
|
|
@@ -99,6 +102,28 @@ class InstallationService {
|
|
|
99
102
|
}
|
|
100
103
|
}
|
|
101
104
|
}
|
|
105
|
+
async getVersionByMajorVersionId(id, environmentKey, majorVersion) {
|
|
106
|
+
const versionDetails = await this.getVersionByMajorVersionIdClient.getVersionByMajorVersionId(id, environmentKey, majorVersion);
|
|
107
|
+
const versions = versionDetails?.nodes;
|
|
108
|
+
if (!versions || versions.length === 0)
|
|
109
|
+
return;
|
|
110
|
+
const version = versions[0];
|
|
111
|
+
if (!version)
|
|
112
|
+
return undefined;
|
|
113
|
+
const { scopes, egressAddresses, requiredProducts } = this.getPermissionsFromAppEnvironmentVersion(version);
|
|
114
|
+
const groupedEgressAddresses = (0, egress_1.sortAndGroupEgressPermissionsByDomain)(egressAddresses);
|
|
115
|
+
return {
|
|
116
|
+
scopes,
|
|
117
|
+
requiredProducts,
|
|
118
|
+
hasDeployments: version.version !== NO_DEPLOYMENTS_VERSION,
|
|
119
|
+
egressAddresses: groupedEgressAddresses,
|
|
120
|
+
addedScopes: scopes,
|
|
121
|
+
environmentType: versionDetails.environmentType,
|
|
122
|
+
versionId: version.id,
|
|
123
|
+
isLatest: version.isLatest,
|
|
124
|
+
version: version.version
|
|
125
|
+
};
|
|
126
|
+
}
|
|
102
127
|
getPermissionsFromAppEnvironmentVersion(appEnvironmentVersion) {
|
|
103
128
|
const permissions = appEnvironmentVersion?.permissions[0];
|
|
104
129
|
const requiredProducts = appEnvironmentVersion?.requiredProducts ?? [];
|
|
@@ -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;
|
|
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;AA6EvC,MAAM,qBAAqB,GAAG,UAAU,CAAC;AACzC,MAAM,sBAAsB,GAAG,WAAW,CAAC;AAC3C,MAAM,8BAA8B,GAAG,kBAAkB,CAAC;AAE1D,MAAa,kCAAmC,SAAQ,sBAAS;IAC/D;QACE,KAAK,CAAC,iBAAI,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IAClD,CAAC;CACF;AAJD,gFAIC;AAED,MAAa,mBAAmB;IAEX;IACA;IACA;IACA;IACA;IACA;IANnB,YACmB,YAA+B,EAC/B,uBAAmD,EACnD,6BAA4D,EAC5D,iCAAoE,EACpE,sBAA8C,EAC9C,gCAAkE;QALlE,iBAAY,GAAZ,YAAY,CAAmB;QAC/B,4BAAuB,GAAvB,uBAAuB,CAA4B;QACnD,kCAA6B,GAA7B,6BAA6B,CAA+B;QAC5D,sCAAiC,GAAjC,iCAAiC,CAAmC;QACpE,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,qCAAgC,GAAhC,gCAAgC,CAAkC;IAClF,CAAC;IAEI,4BAA4B,CAAC,IAAY,EAAE,IAAY;QAE7D,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC7C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC7C,OAAO,WAAW,KAAK,WAAW,CAAC;IACrC,CAAC;IAEO,mBAAmB,CAAC,UAAe,EAAE,gBAAwB,EAAE,mBAA2B;QAEhG,IAAI,mBAAmB,KAAK,sBAAsB,EAAE;YAClD,OAAO,IAAI,CAAC,4BAA4B,CAAC,UAAU,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;SAC7E;QAED,OAAO,IAAI,CAAC,4BAA4B,CAAC,UAAU,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC9E,CAAC;IAEO,mBAAmB,CACzB,aAA6B,EAC7B,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,iBAAiB,EAA6B;QAEvG,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE;YAChE,MAAM,YAAY,GAAG,CAAC,aAAa,IAAI,aAAa,KAAK,IAAA,+BAAkB,EAAC,OAAO,CAAC,CAAC;YACrF,MAAM,SAAS,GAAG,CAAC,UAAU,IAAI,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;YACrF,MAAM,gBAAgB,GAAG,CAAC,iBAAiB,IAAI,iBAAiB,KAAK,IAAA,gCAAmB,EAAC,cAAc,CAAC,CAAC;YAEzG,OAAO,YAAY,IAAI,SAAS,IAAI,gBAAgB,CAAC;QACvD,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,MAAkC;QAClE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAChD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAE1F,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,mBAAmB,CAAC,aAAa,EAAE,EAAE,GAAG,MAAM,EAAE,CAAC,EAAE,CAAC;IACnF,CAAC;IAEM,KAAK,CAAC,2BAA2B,CAAC,MAA0B;QACjE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAChD,OAAO,IAAI,CAAC,iCAAiC,CAAC,2BAA2B,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC3F,CAAC;IAEM,KAAK,CAAC,gCAAgC,CAAC,MAAkC;QAC9E,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAElE,OAAO;YACL,aAAa,EAAE,aAAa,CAAC,MAAM,CACjC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,KAAK,qBAAqB,IAAI,OAAO,KAAK,8BAA8B,CACjG;SACF,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,4BAA4B,CAAC,MAAiC;QACzE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,gCAAgC,CAAC,MAAM,CAAC,CAAC;QAE3E,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,MAAM,EAAE;YACxC,MAAM,IAAI,sBAAS,CAAC,iBAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC5D;QAED,IAAI,cAAc,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7C,MAAM,IAAI,kCAAkC,EAAE,CAAC;SAChD;QAED,OAAO,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,8BAA8B,CAAC,WAAmB;QAC7D,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,IAAI,CAAC,gCAAgC,CAAC;YACpE,WAAW;SACZ,CAAC,CAAC;QACH,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC9E,CAAC;IAEM,KAAK,CAAC,6BAA6B,CACxC,IAAS,EACT,OAAyB;QAEzB,OAAO,IAAI,CAAC,sBAAsB,CAAC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3E,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAC9B,IAAS,EACT,OAAe,EACf,cAAsB,EACtB,KAAa;QAEb,IAAI;YACF,MAAM,IAAI,CAAC,6BAA6B,CAAC,mBAAmB,CAAC;gBAC3D,IAAI;gBACJ,OAAO;gBACP,cAAc;gBACd,KAAK;aACN,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;SACd;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,CAAC,IAAI,KAAK,sCAAqB,EAAE;gBACpC,OAAO,IAAI,CAAC;aACb;iBAAM;gBACL,MAAM,CAAC,CAAC;aACT;SACF;IACH,CAAC;IAEM,KAAK,CAAC,0BAA0B,CACrC,EAAU,EACV,cAAsB,EACtB,YAAoB;QAEpB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,gCAAgC,CAAC,0BAA0B,CAC3F,EAAE,EACF,cAAc,EACd,YAAY,CACb,CAAC;QAEF,MAAM,QAAQ,GAAG,cAAc,EAAE,KAAK,CAAC;QACvC,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAG/C,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC;QAE/B,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,uCAAuC,CAAC,OAAO,CAAC,CAAC;QAC5G,MAAM,sBAAsB,GAAG,IAAA,8CAAqC,EAAC,eAAe,CAAC,CAAC;QAEtF,OAAO;YACL,MAAM;YACN,gBAAgB;YAChB,cAAc,EAAE,OAAO,CAAC,OAAO,KAAK,sBAAsB;YAC1D,eAAe,EAAE,sBAAsB;YACvC,WAAW,EAAE,MAAM;YACnB,eAAe,EAAE,cAAc,CAAC,eAAe;YAC/C,SAAS,EAAE,OAAO,CAAC,EAAE;YACrB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC;IACJ,CAAC;IAEO,uCAAuC,CAC7C,qBAAmD;QAEnD,MAAM,WAAW,GAAG,qBAAqB,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;QAC1D,MAAM,gBAAgB,GAAG,qBAAqB,EAAE,gBAAgB,IAAI,EAAE,CAAC;QAEvE,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,eAAe,EAAE,EAAE,EAAE,gBAAgB,EAAE,CAAC;SAC9D;QAED,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAEpD,MAAM,eAAe,GAAG,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,IAAA,oBAAO,EAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAEnH,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,CAAC;IACvD,CAAC;IAEM,KAAK,CAAC,4BAA4B,CACvC,KAAa,EACb,cAAsB;QAEtB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,WAAW,CAAC,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;QAChG,MAAM,QAAQ,GAAG,cAAc,EAAE,KAAK,CAAC;QACvC,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAE/C,MAAM,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,qBAAqB,EAAE,EAAE,CACzG,IAAI,CAAC,uCAAuC,CAAC,qBAAqB,CAAC,CACpE,CAAC;QAEF,MAAM,sBAAsB,GAAG,IAAA,8CAAqC,EAAC,eAAe,CAAC,CAAC;QAGtF,IAAI,CAAC,UAAU,EAAE;YACf,OAAO;gBACL,MAAM;gBACN,gBAAgB;gBAChB,cAAc,EAAE,KAAK;gBACrB,eAAe,EAAE,sBAAsB;gBACvC,WAAW,EAAE,MAAM;gBACnB,eAAe,EAAE,cAAc,CAAC,eAAe;aAChD,CAAC;SACH;QAED,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;QACzC,MAAM,WAAW,GAAG,IAAA,mBAAU,EAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAElD,OAAO;YACL,MAAM;YACN,gBAAgB;YAChB,cAAc,EAAE,IAAI;YACpB,eAAe,EAAE,sBAAsB;YACvC,WAAW;YACX,eAAe,EAAE,cAAc,CAAC,eAAe;SAChD,CAAC;IACJ,CAAC;CACF;AAzMD,kDAyMC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/cli",
|
|
3
|
-
"version": "12.
|
|
3
|
+
"version": "12.5.0-next.9",
|
|
4
4
|
"description": "A command line interface for managing Atlassian-hosted apps",
|
|
5
5
|
"author": "Atlassian",
|
|
6
6
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
@@ -18,14 +18,14 @@
|
|
|
18
18
|
"postinstall": "node -e \"fs.existsSync('./out/bin/postinstall.js') && require('./out/bin/postinstall.js')\""
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@forge/bundler": "6.1.
|
|
22
|
-
"@forge/cli-shared": "8.
|
|
21
|
+
"@forge/bundler": "6.1.4-next.8",
|
|
22
|
+
"@forge/cli-shared": "8.5.0-next.7",
|
|
23
23
|
"@forge/egress": "2.0.3",
|
|
24
|
-
"@forge/lint": "5.
|
|
25
|
-
"@forge/manifest": "10.
|
|
24
|
+
"@forge/lint": "5.11.0-next.7",
|
|
25
|
+
"@forge/manifest": "10.4.0-next.3",
|
|
26
26
|
"@forge/i18n": "0.0.7",
|
|
27
27
|
"@forge/runtime": "6.0.3",
|
|
28
|
-
"@forge/tunnel": "6.0.
|
|
28
|
+
"@forge/tunnel": "6.1.0-next.8",
|
|
29
29
|
"@forge/util": "2.0.0",
|
|
30
30
|
"@sentry/node": "7.106.0",
|
|
31
31
|
"ajv": "^8.12.0",
|