@forge/cli 6.5.0-next.9 → 6.6.0-next.3
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 +71 -0
- package/npm-shrinkwrap.json +83 -83
- package/out/autocomplete/autocomplete-config.json +3 -0
- package/out/command-line/command.d.ts.map +1 -1
- package/out/command-line/command.js +1 -1
- package/out/command-line/controller/deploy-controller.d.ts +3 -2
- package/out/command-line/controller/deploy-controller.d.ts.map +1 -1
- package/out/command-line/controller/deploy-controller.js +4 -2
- package/out/command-line/controller/install-controller.d.ts.map +1 -1
- package/out/command-line/controller/install-controller.js +8 -7
- package/out/command-line/controller/tunnel-controller.d.ts.map +1 -1
- package/out/command-line/controller/tunnel-controller.js +1 -1
- package/out/command-line/dependency-injection.d.ts +2 -0
- package/out/command-line/dependency-injection.d.ts.map +1 -1
- package/out/command-line/dependency-injection.js +4 -1
- package/out/command-line/environment.d.ts +1 -0
- package/out/command-line/environment.d.ts.map +1 -1
- package/out/command-line/environment.js +8 -8
- package/out/command-line/register-app-commands.d.ts.map +1 -1
- package/out/command-line/register-app-commands.js +23 -23
- package/out/command-line/register-environment-commands.d.ts +4 -2
- package/out/command-line/register-environment-commands.d.ts.map +1 -1
- package/out/command-line/register-environment-commands.js +39 -4
- package/out/command-line/register-tunnel-commands.d.ts.map +1 -1
- package/out/command-line/register-tunnel-commands.js +1 -0
- package/out/command-line/view/deploy-view.d.ts +2 -2
- package/out/command-line/view/deploy-view.d.ts.map +1 -1
- package/out/command-line/view/deploy-view.js +5 -5
- package/out/command-line/view/tunnel-view.d.ts +1 -1
- package/out/command-line/view/tunnel-view.d.ts.map +1 -1
- package/out/command-line/view/tunnel-view.js +6 -1
- package/out/environment/graphql-client.d.ts +10 -2
- package/out/environment/graphql-client.d.ts.map +1 -1
- package/out/environment/graphql-client.js +36 -1
- package/out/environment/list-environment.d.ts +17 -0
- package/out/environment/list-environment.d.ts.map +1 -0
- package/out/environment/list-environment.js +16 -0
- package/out/installations/graphql-client.d.ts +5 -4
- package/out/installations/graphql-client.d.ts.map +1 -1
- package/out/installations/graphql-client.js +15 -4
- package/out/migration-keys/graphql-client.js +1 -1
- package/out/service/installation-service.d.ts +8 -2
- package/out/service/installation-service.d.ts.map +1 -1
- package/out/service/installation-service.js +8 -2
- package/out/service/tunnel-service.d.ts +1 -0
- package/out/service/tunnel-service.d.ts.map +1 -1
- package/out/service/tunnel-service.js +2 -5
- package/package.json +8 -8
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { AppConfigProvider,
|
|
2
|
+
import { AppConfigProvider, AppEnvironmentType, AppEnvironmentVersion, Maybe } from '@forge/cli-shared';
|
|
3
3
|
import { URL } from 'url';
|
|
4
4
|
import { AppInstallSiteDetails } from '../installations/install-app-site';
|
|
5
5
|
export interface Installation {
|
|
@@ -7,6 +7,7 @@ export interface Installation {
|
|
|
7
7
|
product: string;
|
|
8
8
|
site: string;
|
|
9
9
|
environmentKey: string;
|
|
10
|
+
environmentType: AppEnvironmentType;
|
|
10
11
|
context: string;
|
|
11
12
|
version: {
|
|
12
13
|
isLatest: boolean;
|
|
@@ -21,15 +22,20 @@ export interface AppEnvironmentVersionPermissions {
|
|
|
21
22
|
}
|
|
22
23
|
export interface AppEnvironmentPermissions extends AppEnvironmentVersionPermissions {
|
|
23
24
|
addedScopes: string[];
|
|
25
|
+
environmentType: AppEnvironmentType;
|
|
24
26
|
}
|
|
25
27
|
interface InstallationFilterOptions {
|
|
26
28
|
site?: string;
|
|
27
29
|
product?: 'Jira' | 'Confluence';
|
|
28
30
|
environment?: string;
|
|
29
31
|
}
|
|
32
|
+
export interface AppEnvironmentVersionData {
|
|
33
|
+
nodes?: Array<Maybe<AppEnvironmentVersion>> | null;
|
|
34
|
+
environmentType: AppEnvironmentType;
|
|
35
|
+
}
|
|
30
36
|
export interface ListAppInstallationsClient {
|
|
31
37
|
listInstallations(appId: string): Promise<Installation[]>;
|
|
32
|
-
getVersions(appId: string, environmentKey: string, firstN: number): Promise<
|
|
38
|
+
getVersions(appId: string, environmentKey: string, firstN: number): Promise<AppEnvironmentVersionData>;
|
|
33
39
|
}
|
|
34
40
|
export interface UpgradeAppInstallationsClient {
|
|
35
41
|
upgradeInstallation({ site, product, environmentKey, appId }: AppInstallSiteDetails): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installation-service.d.ts","sourceRoot":"","sources":["../../src/service/installation-service.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,iBAAiB,EACjB,
|
|
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,EAKrB,KAAK,EAEN,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,kBAAkB,CAAC;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE;QACP,QAAQ,EAAE,OAAO,CAAC;KACnB,CAAC;CACH;AAED,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,YAAY,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,gCAAgC;IAC/C,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,yBAA0B,SAAQ,gCAAgC;IACjF,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,eAAe,EAAE,kBAAkB,CAAC;CACrC;AAED,UAAU,yBAAyB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,yBAAyB;IACxC,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,GAAG,IAAI,CAAC;IACnD,eAAe,EAAE,kBAAkB,CAAC;CACrC;AAED,MAAM,WAAW,0BAA0B;IACzC,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAC1D,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;CACxG;AAED,MAAM,WAAW,6BAA6B;IAC5C,mBAAmB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrG;AAKD,qBAAa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,6BAA6B;gBAF7B,YAAY,EAAE,iBAAiB,EAC/B,uBAAuB,EAAE,0BAA0B,EACnD,6BAA6B,EAAE,6BAA6B;IAG/E,OAAO,CAAC,mBAAmB;IAiBd,oBAAoB,CAAC,MAAM,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,eAAe,CAAC;IAOlF,gCAAgC,CAAC,MAAM,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,eAAe,CAAC;IAU9F,8BAA8B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOrE,mBAAmB,CAC9B,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC;IAkBnB,OAAO,CAAC,uCAAuC;IAgBlC,4BAA4B,CACvC,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC;CAiClD"}
|
|
@@ -80,12 +80,18 @@ class InstallationService {
|
|
|
80
80
|
return {
|
|
81
81
|
scopes,
|
|
82
82
|
egressAddresses: groupedEgressAddresses,
|
|
83
|
-
addedScopes: scopes
|
|
83
|
+
addedScopes: scopes,
|
|
84
|
+
environmentType: versionDetails.environmentType
|
|
84
85
|
};
|
|
85
86
|
}
|
|
86
87
|
const { scopes: oldScopes } = oldVersion;
|
|
87
88
|
const addedScopes = (0, lodash_1.difference)(scopes, oldScopes);
|
|
88
|
-
return {
|
|
89
|
+
return {
|
|
90
|
+
scopes,
|
|
91
|
+
egressAddresses: groupedEgressAddresses,
|
|
92
|
+
addedScopes,
|
|
93
|
+
environmentType: versionDetails.environmentType
|
|
94
|
+
};
|
|
89
95
|
}
|
|
90
96
|
}
|
|
91
97
|
exports.InstallationService = InstallationService;
|
|
@@ -6,6 +6,7 @@ import { ConfigFilePortFindingService } from './port-finding-service';
|
|
|
6
6
|
import { TunnelAnalyticsService } from './tunnel-analytics-service';
|
|
7
7
|
export interface TunnelOptions {
|
|
8
8
|
debug?: boolean;
|
|
9
|
+
environment?: string;
|
|
9
10
|
}
|
|
10
11
|
export declare const CONTAINER_NAME = "forge-tunnel-docker";
|
|
11
12
|
export declare const IMAGE_NAME: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAMpC,OAAO,EAIL,WAAW,EACX,sBAAsB,EACtB,+BAA+B,
|
|
1
|
+
{"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,12 +40,9 @@ class InProcessTunnelService {
|
|
|
40
40
|
}
|
|
41
41
|
async run(tunnelOptions, creds, debugEnabled, onError) {
|
|
42
42
|
try {
|
|
43
|
-
this.ui.info(cli_shared_1.Text.tunnel.preamble);
|
|
44
|
-
this.ui.info(cli_shared_1.Text.ctrlC);
|
|
45
|
-
this.ui.emptyLine();
|
|
46
43
|
const resourcePortMap = await this.configFilePortFindingService.findPorts();
|
|
47
44
|
const tunnel = await this.startTunnelCommand.execute({
|
|
48
|
-
environmentKey: process.env.ENVIRONMENT_KEY || 'default',
|
|
45
|
+
environmentKey: tunnelOptions.environment || process.env.ENVIRONMENT_KEY || 'default',
|
|
49
46
|
resourcePortMap,
|
|
50
47
|
host: 'localhost'
|
|
51
48
|
});
|
|
@@ -83,7 +80,7 @@ class TunnelServiceBase {
|
|
|
83
80
|
`--env`,
|
|
84
81
|
`FORGE_API_TOKEN=${token}`,
|
|
85
82
|
`--env`,
|
|
86
|
-
`ENVIRONMENT_KEY
|
|
83
|
+
`ENVIRONMENT_KEY=${tunnelOptions.environment || 'default'}`,
|
|
87
84
|
`--env`,
|
|
88
85
|
`TUNNEL_INSPECTOR_ENABLED=${!!tunnelOptions.debug}`,
|
|
89
86
|
`--env`,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/cli",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.6.0-next.3",
|
|
4
4
|
"description": "A command line interface for managing Atlassian-hosted apps",
|
|
5
5
|
"author": "Atlassian",
|
|
6
6
|
"license": "UNLICENSED",
|
|
@@ -18,13 +18,13 @@
|
|
|
18
18
|
"postinstall": "node -e \"process.exitCode = fs.existsSync('./out/bin/postinstall.js')\" || node ./out/bin/postinstall.js"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@forge/bundler": "4.6.
|
|
22
|
-
"@forge/cli-shared": "3.
|
|
21
|
+
"@forge/bundler": "4.6.1-next.2",
|
|
22
|
+
"@forge/cli-shared": "3.8.0-next.1",
|
|
23
23
|
"@forge/egress": "1.1.2",
|
|
24
|
-
"@forge/lint": "3.2.
|
|
25
|
-
"@forge/manifest": "4.
|
|
26
|
-
"@forge/runtime": "4.3.0
|
|
27
|
-
"@forge/tunnel": "3.
|
|
24
|
+
"@forge/lint": "3.2.17-next.1",
|
|
25
|
+
"@forge/manifest": "4.8.0-next.0",
|
|
26
|
+
"@forge/runtime": "4.3.0",
|
|
27
|
+
"@forge/tunnel": "3.3.0-next.2",
|
|
28
28
|
"@forge/util": "1.2.1",
|
|
29
29
|
"@sentry/node": "^7.29.0",
|
|
30
30
|
"ajv": "^6.12.6",
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"commander": "^7.0.0",
|
|
38
38
|
"cross-spawn": "^7.0.3",
|
|
39
39
|
"dayjs": "^1.9.7",
|
|
40
|
-
"didyoumean": "^1.2.
|
|
40
|
+
"didyoumean": "^1.2.2",
|
|
41
41
|
"env-paths": "^2.2.0",
|
|
42
42
|
"fs-extra": "^8.1.0",
|
|
43
43
|
"form-data": "^3.0.0",
|