@forge/cli 12.6.2-next.3-experimental-1a0bb6a → 12.7.0-next.5
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 +24 -10
- package/npm-shrinkwrap.json +69 -45
- package/out/command-line/controller/tunnel-controller.d.ts +5 -1
- package/out/command-line/controller/tunnel-controller.d.ts.map +1 -1
- package/out/command-line/controller/tunnel-controller.js +89 -19
- package/out/command-line/controller/tunnel-controller.js.map +1 -1
- package/out/command-line/dependency-injection.js +2 -2
- package/out/command-line/dependency-injection.js.map +1 -1
- package/out/containers/container-command.d.ts +3 -1
- package/out/containers/container-command.d.ts.map +1 -1
- package/out/containers/container-command.js +1 -0
- package/out/containers/container-command.js.map +1 -1
- package/out/service/tunnel-service.d.ts +9 -0
- package/out/service/tunnel-service.d.ts.map +1 -1
- package/out/service/tunnel-service.js +20 -2
- package/out/service/tunnel-service.js.map +1 -1
- package/package.json +9 -8
package/CHANGELOG.md
CHANGED
|
@@ -1,18 +1,32 @@
|
|
|
1
1
|
# @forge/cli
|
|
2
2
|
|
|
3
|
-
## 12.
|
|
3
|
+
## 12.7.0-next.5
|
|
4
4
|
|
|
5
5
|
### Patch Changes
|
|
6
6
|
|
|
7
|
-
- Updated dependencies [
|
|
8
|
-
- Updated dependencies [
|
|
9
|
-
- Updated dependencies [
|
|
10
|
-
- @forge/
|
|
11
|
-
- @forge/
|
|
12
|
-
- @forge/
|
|
13
|
-
- @forge/lint@5.11.5-next.
|
|
14
|
-
- @forge/tunnel@6.
|
|
15
|
-
|
|
7
|
+
- Updated dependencies [96d7a67]
|
|
8
|
+
- Updated dependencies [e65918b]
|
|
9
|
+
- Updated dependencies [873a240]
|
|
10
|
+
- @forge/manifest@10.7.0-next.1
|
|
11
|
+
- @forge/bundler@6.1.9-next.5
|
|
12
|
+
- @forge/cli-shared@8.8.0-next.3
|
|
13
|
+
- @forge/lint@5.11.5-next.5
|
|
14
|
+
- @forge/tunnel@6.3.0-next.5
|
|
15
|
+
|
|
16
|
+
## 12.7.0-next.4
|
|
17
|
+
|
|
18
|
+
### Minor Changes
|
|
19
|
+
|
|
20
|
+
- 8ff224b: Add automatic spinning up of docker compose stacks for containers when tunneling
|
|
21
|
+
|
|
22
|
+
### Patch Changes
|
|
23
|
+
|
|
24
|
+
- Updated dependencies [8ff224b]
|
|
25
|
+
- @forge/runtime@6.1.0-next.0
|
|
26
|
+
- @forge/tunnel@6.3.0-next.4
|
|
27
|
+
- @forge/cli-shared@8.8.0-next.2
|
|
28
|
+
- @forge/bundler@6.1.9-next.4
|
|
29
|
+
- @forge/lint@5.11.5-next.4
|
|
16
30
|
|
|
17
31
|
## 12.6.2-next.3
|
|
18
32
|
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/cli",
|
|
3
|
-
"version": "12.
|
|
3
|
+
"version": "12.7.0-next.5",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "@forge/cli",
|
|
9
|
-
"version": "12.
|
|
9
|
+
"version": "12.7.0-next.5",
|
|
10
10
|
"hasInstallScript": true,
|
|
11
11
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@forge/bundler": "6.1.9-next.
|
|
14
|
-
"@forge/cli-shared": "8.
|
|
15
|
-
"@forge/egress": "2.1.0-next.0
|
|
13
|
+
"@forge/bundler": "6.1.9-next.5",
|
|
14
|
+
"@forge/cli-shared": "8.8.0-next.3",
|
|
15
|
+
"@forge/egress": "2.1.0-next.0",
|
|
16
16
|
"@forge/i18n": "0.0.7",
|
|
17
|
-
"@forge/lint": "5.11.5-next.
|
|
18
|
-
"@forge/manifest": "10.7.0-next.
|
|
19
|
-
"@forge/runtime": "6.0.
|
|
20
|
-
"@forge/tunnel": "6.
|
|
17
|
+
"@forge/lint": "5.11.5-next.5",
|
|
18
|
+
"@forge/manifest": "10.7.0-next.1",
|
|
19
|
+
"@forge/runtime": "6.1.0-next.0",
|
|
20
|
+
"@forge/tunnel": "6.3.0-next.5",
|
|
21
21
|
"@forge/util": "2.0.0",
|
|
22
22
|
"@sentry/node": "7.106.0",
|
|
23
23
|
"ajv": "^8.12.0",
|
|
@@ -32,6 +32,7 @@
|
|
|
32
32
|
"dayjs": "^1.11.13",
|
|
33
33
|
"didyoumean": "^1.2.2",
|
|
34
34
|
"diff": "^7.0.0",
|
|
35
|
+
"docker-compose": "^1.3.0",
|
|
35
36
|
"env-paths": "^2.2.1",
|
|
36
37
|
"exponential-backoff": "^3.1.2",
|
|
37
38
|
"form-data": "^4.0.4",
|
|
@@ -547,9 +548,9 @@
|
|
|
547
548
|
}
|
|
548
549
|
},
|
|
549
550
|
"node_modules/@forge/bundler": {
|
|
550
|
-
"version": "6.1.9-next.
|
|
551
|
-
"resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-6.1.9-next.
|
|
552
|
-
"integrity": "sha512-
|
|
551
|
+
"version": "6.1.9-next.5",
|
|
552
|
+
"resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-6.1.9-next.5.tgz",
|
|
553
|
+
"integrity": "sha512-d5fnDwQE/FSJlEUEIvGNPeqc45j+uNgnD1Q6hgRXicy8za7rUepoS0k8KNtguOFP2TzJBRhFOzbPi9X05OVO8A==",
|
|
553
554
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
554
555
|
"dependencies": {
|
|
555
556
|
"@babel/core": "^7.24.0",
|
|
@@ -561,10 +562,10 @@
|
|
|
561
562
|
"@babel/plugin-transform-react-jsx": "^7.23.4",
|
|
562
563
|
"@babel/traverse": "^7.24.0",
|
|
563
564
|
"@babel/types": "^7.24.0",
|
|
564
|
-
"@forge/cli-shared": "8.
|
|
565
|
+
"@forge/cli-shared": "8.8.0-next.3",
|
|
565
566
|
"@forge/i18n": "0.0.7",
|
|
566
|
-
"@forge/lint": "5.11.5-next.
|
|
567
|
-
"@forge/manifest": "10.7.0-next.
|
|
567
|
+
"@forge/lint": "5.11.5-next.5",
|
|
568
|
+
"@forge/manifest": "10.7.0-next.1",
|
|
568
569
|
"babel-loader": "^8.3.0",
|
|
569
570
|
"cheerio": "^1.1.0",
|
|
570
571
|
"cross-spawn": "^7.0.6",
|
|
@@ -584,13 +585,13 @@
|
|
|
584
585
|
}
|
|
585
586
|
},
|
|
586
587
|
"node_modules/@forge/cli-shared": {
|
|
587
|
-
"version": "8.
|
|
588
|
-
"resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-8.
|
|
589
|
-
"integrity": "sha512-
|
|
588
|
+
"version": "8.8.0-next.3",
|
|
589
|
+
"resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-8.8.0-next.3.tgz",
|
|
590
|
+
"integrity": "sha512-manIC33SqKXYFpZ0XVT9k30M5Z093GJXFzZuSe6feBuD3ocvnPaaUaL0oHU5ybc+uv5Ul8H/OxoBtbGclHvKkQ==",
|
|
590
591
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
591
592
|
"dependencies": {
|
|
592
593
|
"@forge/i18n": "0.0.7",
|
|
593
|
-
"@forge/manifest": "10.7.0-next.
|
|
594
|
+
"@forge/manifest": "10.7.0-next.1",
|
|
594
595
|
"@forge/util": "2.0.0",
|
|
595
596
|
"@sentry/node": "7.106.0",
|
|
596
597
|
"adm-zip": "^0.5.10",
|
|
@@ -623,9 +624,9 @@
|
|
|
623
624
|
}
|
|
624
625
|
},
|
|
625
626
|
"node_modules/@forge/csp": {
|
|
626
|
-
"version": "5.1.1-next.0
|
|
627
|
-
"resolved": "https://registry.npmjs.org/@forge/csp/-/csp-5.1.1-next.0
|
|
628
|
-
"integrity": "sha512
|
|
627
|
+
"version": "5.1.1-next.0",
|
|
628
|
+
"resolved": "https://registry.npmjs.org/@forge/csp/-/csp-5.1.1-next.0.tgz",
|
|
629
|
+
"integrity": "sha512-+zLsxbYj32hHpuhpMnL+QcTPgz0IiTv/HR9A6XCdk6xeZ6a9iUd2m4ddQlF3VGPlj8DQsJDBUAb5/l8BSDInKw==",
|
|
629
630
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
630
631
|
"dependencies": {
|
|
631
632
|
"content-security-policy-parser": "^0.5.0"
|
|
@@ -640,9 +641,9 @@
|
|
|
640
641
|
}
|
|
641
642
|
},
|
|
642
643
|
"node_modules/@forge/egress": {
|
|
643
|
-
"version": "2.1.0-next.0
|
|
644
|
-
"resolved": "https://registry.npmjs.org/@forge/egress/-/egress-2.1.0-next.0
|
|
645
|
-
"integrity": "sha512
|
|
644
|
+
"version": "2.1.0-next.0",
|
|
645
|
+
"resolved": "https://registry.npmjs.org/@forge/egress/-/egress-2.1.0-next.0.tgz",
|
|
646
|
+
"integrity": "sha512-44V1ZELmi9ca84wnM+Jl6QZMORo/aaSH5PB2yhfpPg/0O0olovjP+EfTODXvkI4xsfSQV/3FYbq3YXNTTsYneg==",
|
|
646
647
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
647
648
|
"dependencies": {
|
|
648
649
|
"minimatch": "^9.0.5"
|
|
@@ -658,16 +659,16 @@
|
|
|
658
659
|
}
|
|
659
660
|
},
|
|
660
661
|
"node_modules/@forge/lint": {
|
|
661
|
-
"version": "5.11.5-next.
|
|
662
|
-
"resolved": "https://registry.npmjs.org/@forge/lint/-/lint-5.11.5-next.
|
|
663
|
-
"integrity": "sha512-
|
|
662
|
+
"version": "5.11.5-next.5",
|
|
663
|
+
"resolved": "https://registry.npmjs.org/@forge/lint/-/lint-5.11.5-next.5.tgz",
|
|
664
|
+
"integrity": "sha512-Kqms6Bj6w0WZ8M1yo5tur7wYT4wUgsi5lMHbMZSPxzpMK7R9CQ4VMlZ+Oi6diDPdzbuRimkeZ3EqrnEoPMfpUg==",
|
|
664
665
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
665
666
|
"dependencies": {
|
|
666
667
|
"@atlassian/atlassian-openapi": "^1.0.6",
|
|
667
|
-
"@forge/cli-shared": "8.
|
|
668
|
-
"@forge/csp": "5.1.1-next.0
|
|
669
|
-
"@forge/egress": "2.1.0-next.0
|
|
670
|
-
"@forge/manifest": "10.7.0-next.
|
|
668
|
+
"@forge/cli-shared": "8.8.0-next.3",
|
|
669
|
+
"@forge/csp": "5.1.1-next.0",
|
|
670
|
+
"@forge/egress": "2.1.0-next.0",
|
|
671
|
+
"@forge/manifest": "10.7.0-next.1",
|
|
671
672
|
"@typescript-eslint/typescript-estree": "^5.62.0",
|
|
672
673
|
"array.prototype.flatmap": "^1.3.3",
|
|
673
674
|
"cross-spawn": "^7.0.6",
|
|
@@ -675,9 +676,9 @@
|
|
|
675
676
|
}
|
|
676
677
|
},
|
|
677
678
|
"node_modules/@forge/manifest": {
|
|
678
|
-
"version": "10.7.0-next.
|
|
679
|
-
"resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-10.7.0-next.
|
|
680
|
-
"integrity": "sha512-
|
|
679
|
+
"version": "10.7.0-next.1",
|
|
680
|
+
"resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-10.7.0-next.1.tgz",
|
|
681
|
+
"integrity": "sha512-Qh8pjF57HqhJP0yzyN0Rlx/2/s2XVNh5gbG8N9SnNfIZnLLgrVe27QqY8I8HWvbPO9YoVG0FlZkicWonWgdWEQ==",
|
|
681
682
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
682
683
|
"dependencies": {
|
|
683
684
|
"@forge/i18n": "0.0.7",
|
|
@@ -692,24 +693,25 @@
|
|
|
692
693
|
}
|
|
693
694
|
},
|
|
694
695
|
"node_modules/@forge/runtime": {
|
|
695
|
-
"version": "6.0.
|
|
696
|
-
"resolved": "https://registry.npmjs.org/@forge/runtime/-/runtime-6.0.
|
|
697
|
-
"integrity": "sha512-
|
|
696
|
+
"version": "6.1.0-next.0",
|
|
697
|
+
"resolved": "https://registry.npmjs.org/@forge/runtime/-/runtime-6.1.0-next.0.tgz",
|
|
698
|
+
"integrity": "sha512-OJ1wmfzPNCRnTZiSkNSrPQVMgHJXJEqPu1fthJpfpLVZrIHNL9Uo0BhNHAuf89uINLbfhIksIC1BPTe3C95vKw==",
|
|
698
699
|
"license": "SEE LICENSE IN LICENSE.txt"
|
|
699
700
|
},
|
|
700
701
|
"node_modules/@forge/tunnel": {
|
|
701
|
-
"version": "6.
|
|
702
|
-
"resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-6.
|
|
703
|
-
"integrity": "sha512-
|
|
702
|
+
"version": "6.3.0-next.5",
|
|
703
|
+
"resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-6.3.0-next.5.tgz",
|
|
704
|
+
"integrity": "sha512-IpzXUCDgeP5xrZzB5OuKloGSQdjvbYoht2VnDROjJG0E2PVaGqp6HDJO1mmtEstbHvKUrhSOAghdSmmL/ijA8w==",
|
|
704
705
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
705
706
|
"dependencies": {
|
|
706
|
-
"@forge/bundler": "6.1.9-next.
|
|
707
|
-
"@forge/cli-shared": "8.
|
|
708
|
-
"@forge/csp": "5.1.1-next.0
|
|
709
|
-
"@forge/runtime": "6.0.
|
|
707
|
+
"@forge/bundler": "6.1.9-next.5",
|
|
708
|
+
"@forge/cli-shared": "8.8.0-next.3",
|
|
709
|
+
"@forge/csp": "5.1.1-next.0",
|
|
710
|
+
"@forge/runtime": "6.1.0-next.0",
|
|
710
711
|
"cheerio": "^1.1.0",
|
|
711
712
|
"chokidar": "^3.6.0",
|
|
712
713
|
"cloudflared": "^0.7.0",
|
|
714
|
+
"docker-compose": "^1.3.0",
|
|
713
715
|
"express": "^4.18.3",
|
|
714
716
|
"express-intercept": "^1.1.1",
|
|
715
717
|
"http-proxy-middleware": "^2.0.9",
|
|
@@ -3212,6 +3214,28 @@
|
|
|
3212
3214
|
"node": ">=6"
|
|
3213
3215
|
}
|
|
3214
3216
|
},
|
|
3217
|
+
"node_modules/docker-compose": {
|
|
3218
|
+
"version": "1.3.0",
|
|
3219
|
+
"resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-1.3.0.tgz",
|
|
3220
|
+
"integrity": "sha1-baS7nVQrTM5kdKoxRqkJ7aXSNiM= sha512-7Gevk/5eGD50+eMD+XDnFnOrruFkL0kSd7jEG4cjmqweDSUhB7i0g8is/nBdVpl+Bx338SqIB2GLKm32M+Vs6g==",
|
|
3221
|
+
"dependencies": {
|
|
3222
|
+
"yaml": "^2.2.2"
|
|
3223
|
+
},
|
|
3224
|
+
"engines": {
|
|
3225
|
+
"node": ">= 6.0.0"
|
|
3226
|
+
}
|
|
3227
|
+
},
|
|
3228
|
+
"node_modules/docker-compose/node_modules/yaml": {
|
|
3229
|
+
"version": "2.8.1",
|
|
3230
|
+
"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
|
|
3231
|
+
"integrity": "sha1-GHCqArYx9+gyi5P4vFdPrF1sTXk= sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
|
|
3232
|
+
"bin": {
|
|
3233
|
+
"yaml": "bin.mjs"
|
|
3234
|
+
},
|
|
3235
|
+
"engines": {
|
|
3236
|
+
"node": ">= 14.6"
|
|
3237
|
+
}
|
|
3238
|
+
},
|
|
3215
3239
|
"node_modules/dom-converter": {
|
|
3216
3240
|
"version": "0.2.0",
|
|
3217
3241
|
"resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
|
|
@@ -2,15 +2,19 @@ import { ConfigFile, TunnelCommandOptions } from '@forge/cli-shared';
|
|
|
2
2
|
import { TunnelService } from '../../service/tunnel-service';
|
|
3
3
|
import { TunnelView } from '../view/tunnel-view';
|
|
4
4
|
import { CachedConfigService } from '../../service/cached-config-service';
|
|
5
|
+
import { ContainerCommand } from '../../containers';
|
|
5
6
|
import { ListEnvironmentClient } from '../../environment/list-environment';
|
|
6
7
|
export declare class TunnelController {
|
|
7
8
|
private readonly nodeTunnelService;
|
|
8
9
|
private readonly tunnelView;
|
|
9
10
|
private readonly configFile;
|
|
10
11
|
private readonly cachedConfigService;
|
|
12
|
+
private readonly containerCommandService;
|
|
11
13
|
private readonly environmentClient;
|
|
12
|
-
constructor(nodeTunnelService: TunnelService, tunnelView: TunnelView, configFile: ConfigFile, cachedConfigService: CachedConfigService, environmentClient: ListEnvironmentClient);
|
|
14
|
+
constructor(nodeTunnelService: TunnelService, tunnelView: TunnelView, configFile: ConfigFile, cachedConfigService: CachedConfigService, containerCommandService: ContainerCommand, environmentClient: ListEnvironmentClient);
|
|
13
15
|
run(tunnelOptions: TunnelCommandOptions): Promise<void>;
|
|
16
|
+
private startDockerComposeStack;
|
|
17
|
+
private processDockerAuthentication;
|
|
14
18
|
private validateTunnelCommandOptions;
|
|
15
19
|
private generateContainersDockerComposeFile;
|
|
16
20
|
private getContainerDockerComposePath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,oBAAoB,EAQrB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,
|
|
1
|
+
{"version":3,"file":"tunnel-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,oBAAoB,EAQrB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAOL,aAAa,EAGd,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAE1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAM3E,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBALjB,iBAAiB,EAAE,aAAa,EAChC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU,EACtB,mBAAmB,EAAE,mBAAmB,EACxC,uBAAuB,EAAE,gBAAgB,EACzC,iBAAiB,EAAE,qBAAqB;IAG9C,GAAG,CAAC,aAAa,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;YA+CtD,uBAAuB;YA6BvB,2BAA2B;YAa3B,4BAA4B;YA8B5B,mCAAmC;IAgDjD,OAAO,CAAC,6BAA6B;YASvB,qBAAqB;CAgDpC"}
|
|
@@ -4,6 +4,7 @@ exports.TunnelController = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
6
6
|
const tunnel_service_1 = require("../../service/tunnel-service");
|
|
7
|
+
const docker_compose_1 = require("docker-compose");
|
|
7
8
|
const yaml = tslib_1.__importStar(require("yaml"));
|
|
8
9
|
const fs = tslib_1.__importStar(require("fs"));
|
|
9
10
|
const path = tslib_1.__importStar(require("path"));
|
|
@@ -12,12 +13,14 @@ class TunnelController {
|
|
|
12
13
|
tunnelView;
|
|
13
14
|
configFile;
|
|
14
15
|
cachedConfigService;
|
|
16
|
+
containerCommandService;
|
|
15
17
|
environmentClient;
|
|
16
|
-
constructor(nodeTunnelService, tunnelView, configFile, cachedConfigService, environmentClient) {
|
|
18
|
+
constructor(nodeTunnelService, tunnelView, configFile, cachedConfigService, containerCommandService, environmentClient) {
|
|
17
19
|
this.nodeTunnelService = nodeTunnelService;
|
|
18
20
|
this.tunnelView = tunnelView;
|
|
19
21
|
this.configFile = configFile;
|
|
20
22
|
this.cachedConfigService = cachedConfigService;
|
|
23
|
+
this.containerCommandService = containerCommandService;
|
|
21
24
|
this.environmentClient = environmentClient;
|
|
22
25
|
}
|
|
23
26
|
async run(tunnelOptions) {
|
|
@@ -25,8 +28,17 @@ class TunnelController {
|
|
|
25
28
|
const envKey = tunnelOptions.environment;
|
|
26
29
|
this.tunnelView.preamble(envKey);
|
|
27
30
|
const { app: { id: appId }, services, modules } = await this.configFile.readConfig();
|
|
28
|
-
|
|
29
|
-
|
|
31
|
+
const serviceWithTunnelConfigExists = services?.some((service) => service.containers?.some((container) => {
|
|
32
|
+
return !!container.tunnel;
|
|
33
|
+
}));
|
|
34
|
+
if (services && serviceWithTunnelConfigExists) {
|
|
35
|
+
const childProcess = await this.containerCommandService.authenticateDocker();
|
|
36
|
+
await this.processDockerAuthentication(childProcess);
|
|
37
|
+
const dockerComposeFilePaths = await this.generateContainersDockerComposeFile(services, appId, envKey);
|
|
38
|
+
options.containersDockerComposeFiles = dockerComposeFilePaths;
|
|
39
|
+
for (const [serviceKey, filePath] of Object.entries(dockerComposeFilePaths)) {
|
|
40
|
+
await this.startDockerComposeStack(filePath, serviceKey);
|
|
41
|
+
}
|
|
30
42
|
}
|
|
31
43
|
if (modules) {
|
|
32
44
|
const uiKit1Modules = (0, cli_shared_1.findUIKit1Modules)(modules);
|
|
@@ -36,6 +48,42 @@ class TunnelController {
|
|
|
36
48
|
}
|
|
37
49
|
return await this.nodeTunnelService.run(options);
|
|
38
50
|
}
|
|
51
|
+
async startDockerComposeStack(dockerComposeFilePath, serviceKey) {
|
|
52
|
+
try {
|
|
53
|
+
await (0, docker_compose_1.pullOne)('proxy-sidecar', {
|
|
54
|
+
cwd: path.dirname(dockerComposeFilePath),
|
|
55
|
+
log: true,
|
|
56
|
+
config: dockerComposeFilePath
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
catch (err) {
|
|
60
|
+
throw new tunnel_service_1.DockerUnableToPullProxySidecarImage(err);
|
|
61
|
+
}
|
|
62
|
+
try {
|
|
63
|
+
await (0, docker_compose_1.upAll)({
|
|
64
|
+
cwd: path.dirname(dockerComposeFilePath),
|
|
65
|
+
log: true,
|
|
66
|
+
config: dockerComposeFilePath,
|
|
67
|
+
composeOptions: [`-p${serviceKey}`]
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
catch (err) {
|
|
71
|
+
throw new tunnel_service_1.DockerUnableToStartError(err);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
async processDockerAuthentication(childProcess) {
|
|
75
|
+
await new Promise((resolve, reject) => {
|
|
76
|
+
childProcess.on('close', (code) => {
|
|
77
|
+
if (code === 0) {
|
|
78
|
+
resolve();
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
reject(new tunnel_service_1.DockerAuthenticationError(code?.toString() || 'unknown'));
|
|
82
|
+
}
|
|
83
|
+
});
|
|
84
|
+
childProcess.on('error', reject);
|
|
85
|
+
});
|
|
86
|
+
}
|
|
39
87
|
async validateTunnelCommandOptions(tunnelOptions) {
|
|
40
88
|
const assistantName = this.cachedConfigService.getAssistantName();
|
|
41
89
|
const options = {
|
|
@@ -62,7 +110,7 @@ class TunnelController {
|
|
|
62
110
|
return options;
|
|
63
111
|
}
|
|
64
112
|
async generateContainersDockerComposeFile(services, appId, envKey) {
|
|
65
|
-
const filesGenerated =
|
|
113
|
+
const filesGenerated = {};
|
|
66
114
|
for (const service of services) {
|
|
67
115
|
const { key: serviceKey, containers } = service;
|
|
68
116
|
const containersWithTunnelConfig = containers.filter((container) => !!container.tunnel);
|
|
@@ -71,15 +119,27 @@ class TunnelController {
|
|
|
71
119
|
if (!port || port < 1024 || port > 49152) {
|
|
72
120
|
throw new tunnel_service_1.InvalidContainerServicePort(serviceKey);
|
|
73
121
|
}
|
|
74
|
-
const containerConfig = Object.fromEntries(containersWithTunnelConfig.map((container) =>
|
|
122
|
+
const containerConfig = Object.fromEntries(containersWithTunnelConfig.map((container) => {
|
|
123
|
+
const config = {
|
|
124
|
+
container_name: container.key,
|
|
125
|
+
...container.tunnel?.docker
|
|
126
|
+
};
|
|
127
|
+
const envArray = container?.tunnel?.docker.environment ?? [];
|
|
128
|
+
const filteredEnvArray = envArray.filter((envVar) => !envVar.startsWith('FORGE_EGRESS_PROXY_URL='));
|
|
129
|
+
filteredEnvArray.push('FORGE_EGRESS_PROXY_URL=http://proxy-sidecar:7072');
|
|
130
|
+
config.environment = filteredEnvArray;
|
|
131
|
+
return [container.key, config];
|
|
132
|
+
}));
|
|
75
133
|
const dockerComposeConfig = {
|
|
76
|
-
|
|
77
|
-
|
|
134
|
+
services: {
|
|
135
|
+
...containerConfig,
|
|
136
|
+
...(await this.getProxySidecarConfig(serviceKey, Object.keys(containerConfig), port, appId, envKey))
|
|
137
|
+
}
|
|
78
138
|
};
|
|
79
139
|
const yamlString = yaml.stringify(dockerComposeConfig);
|
|
80
140
|
const filePath = this.getContainerDockerComposePath(serviceKey);
|
|
81
141
|
fs.writeFileSync(filePath, yamlString);
|
|
82
|
-
filesGenerated
|
|
142
|
+
filesGenerated[serviceKey] = filePath;
|
|
83
143
|
}
|
|
84
144
|
}
|
|
85
145
|
return filesGenerated;
|
|
@@ -91,28 +151,38 @@ class TunnelController {
|
|
|
91
151
|
}
|
|
92
152
|
return path.join(hiddenDir, `docker-compose-${serviceKey}.yml`);
|
|
93
153
|
}
|
|
94
|
-
async getProxySidecarConfig(serviceKey, port, appId, envKey = cli_shared_1.DEFAULT_ENVIRONMENT_OPTION) {
|
|
95
|
-
|
|
96
|
-
|
|
154
|
+
async getProxySidecarConfig(serviceKey, containerKeys, port, appId, envKey = cli_shared_1.DEFAULT_ENVIRONMENT_OPTION) {
|
|
155
|
+
let fopBaseUrl = 'https://forge-outbound-proxy.services.atlassian.com';
|
|
156
|
+
let jwksUrl = 'https://forge.cdn.prod.atlassian-dev.net/.well-known/jwks.json';
|
|
157
|
+
let proxySidecarImage = 'forge-ecr.services.atlassian.com/forge-platform/proxy-sidecar:latest';
|
|
158
|
+
if (process.env.FORGE_GRAPHQL_GATEWAY?.startsWith('https://api-private.stg.atlassian.com/graphql')) {
|
|
159
|
+
fopBaseUrl = 'https://forge-outbound-proxy.stg.services.atlassian.com';
|
|
160
|
+
jwksUrl = 'https://forge.cdn.stg.atlassian-dev.net/.well-known/jwks.json';
|
|
161
|
+
proxySidecarImage = 'forge-ecr.stg.services.atlassian.com/forge-platform/proxy-sidecar:latest';
|
|
162
|
+
}
|
|
97
163
|
const appEnvironments = await this.environmentClient.listEnvironment({ appId });
|
|
98
164
|
const environmentDetails = appEnvironments.filter((environment) => environment.key === envKey);
|
|
99
165
|
if (environmentDetails.length < 1) {
|
|
100
166
|
throw new tunnel_service_1.EnvironmentIsNotDefined(envKey);
|
|
101
167
|
}
|
|
168
|
+
let appIdShort = appId;
|
|
169
|
+
if (appId.startsWith('ari:cloud:ecosystem::app/')) {
|
|
170
|
+
appIdShort = appId.split('/')[1];
|
|
171
|
+
}
|
|
102
172
|
return {
|
|
103
173
|
'proxy-sidecar': {
|
|
104
|
-
image:
|
|
105
|
-
container_name:
|
|
174
|
+
image: proxySidecarImage,
|
|
175
|
+
container_name: `proxy-sidecar-${serviceKey}`,
|
|
106
176
|
environment: [
|
|
107
|
-
`SERVICE_URL=http://${
|
|
108
|
-
`FOP_BASE_URL=${
|
|
109
|
-
`APP_ID=ari:cloud:ecosystem::app/${
|
|
110
|
-
`ENV_ID=ari:cloud:ecosystem::environment/${
|
|
111
|
-
`JWKS_URL=${
|
|
177
|
+
`SERVICE_URL=http://${containerKeys[0]}:8080`,
|
|
178
|
+
`FOP_BASE_URL=${fopBaseUrl}`,
|
|
179
|
+
`APP_ID=ari:cloud:ecosystem::app/${appIdShort}`,
|
|
180
|
+
`ENV_ID=ari:cloud:ecosystem::environment/${appIdShort}/${environmentDetails[0].id}`,
|
|
181
|
+
`JWKS_URL=${jwksUrl}`,
|
|
112
182
|
`IS_LOCAL_DEV=true`
|
|
113
183
|
],
|
|
114
184
|
ports: [`${port}:${cli_shared_1.DEFAULT_PROXY_INGRESS_PORT}`],
|
|
115
|
-
depends_on:
|
|
185
|
+
depends_on: containerKeys
|
|
116
186
|
}
|
|
117
187
|
};
|
|
118
188
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":";;;;AAAA,kDAU2B;AAE3B,
|
|
1
|
+
{"version":3,"file":"tunnel-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -199,12 +199,12 @@ const getDependencies = async (cliDetails) => {
|
|
|
199
199
|
const nodeTunnelService = new tunnel_service_1.InProcessTunnelService(startTunnelCommand, tunnelInteractor, configFilePortFindingService);
|
|
200
200
|
const tunnelView = new tunnel_view_1.TunnelView(ui);
|
|
201
201
|
const dockerService = new docker_service_1.DockerService();
|
|
202
|
-
const
|
|
202
|
+
const containerCommand = new containers_1.ContainerCommand(graphQLClient, assertiveAppConfigReader, dockerService);
|
|
203
|
+
const tunnelController = new tunnel_controller_1.TunnelController(nodeTunnelService, tunnelView, configFile, cachedConfigService, containerCommand, environmentClient);
|
|
203
204
|
const stubController = new stubController_1.StubController();
|
|
204
205
|
const prerequisitesController = new prerequisites_controller_1.PrerequisitesController(ui, cliDetails);
|
|
205
206
|
const defaultEnvironmentController = new default_environment_controller_1.DefaultEnvironmentController(ui, credentialStore, cachedConfigService, assertiveAppConfigReader, userRepository, createEnvironmentCommand, listEnvironmentCommand, getAppOwnerQuery);
|
|
206
207
|
cmd = command_1.Command.program(ui, analyticsClientReporter, preCommandController, cliDetails, credentialStore, defaultEnvironmentController, supportedProductsService, cachedConfigService);
|
|
207
|
-
const containerCommand = new containers_1.ContainerCommand(graphQLClient, assertiveAppConfigReader, dockerService);
|
|
208
208
|
await supportedProductsService.initializeWithSupportedProducts(statsigService);
|
|
209
209
|
return {
|
|
210
210
|
ui,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependency-injection.js","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dependency-injection.js","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
1
2
|
import { AppConfigProvider, GraphQLClient, AppContainer, AppContainerRegistryLogin, AppContainerImage, AppContainerServices } from '@forge/cli-shared';
|
|
2
3
|
import { DockerService } from '../service/docker-service';
|
|
4
|
+
import { ChildProcess } from 'node:child_process';
|
|
3
5
|
export declare class UnexpectedAppContainerRegistryLoginError extends Error {
|
|
4
6
|
constructor();
|
|
5
7
|
}
|
|
@@ -21,6 +23,6 @@ export declare class ContainerCommand {
|
|
|
21
23
|
endCursor?: string;
|
|
22
24
|
hasNextPage: boolean;
|
|
23
25
|
}>;
|
|
24
|
-
authenticateDocker(): Promise<
|
|
26
|
+
authenticateDocker(): Promise<ChildProcess>;
|
|
25
27
|
}
|
|
26
28
|
//# sourceMappingURL=container-command.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container-command.d.ts","sourceRoot":"","sources":["../../src/containers/container-command.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAEjB,aAAa,EAEb,YAAY,EACZ,yBAAyB,EAKzB,iBAAiB,EAGjB,oBAAoB,EACrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"container-command.d.ts","sourceRoot":"","sources":["../../src/containers/container-command.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,iBAAiB,EAEjB,aAAa,EAEb,YAAY,EACZ,yBAAyB,EAKzB,iBAAiB,EAGjB,oBAAoB,EACrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,qBAAa,wCAAyC,SAAQ,KAAK;;CAIlE;AAED,qBAAa,mCAAoC,SAAQ,KAAK;;CAI7D;AAED,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAFb,MAAM,EAAE,aAAa,EACrB,YAAY,EAAE,iBAAiB,EAC/B,aAAa,EAAE,aAAa;IAGzC,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IA2CnD,eAAe,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAiB1C,0BAA0B,CAAC,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC;IA6CzG,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsCpC,iBAAiB,IAAI,OAAO,CAAC,yBAAyB,CAAC;IAyBvD,WAAW,CACtB,GAAG,EAAE,MAAM,EACX,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC;QAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,CAAC;IAuCxE,kBAAkB,IAAI,OAAO,CAAC,YAAY,CAAC;CASzD"}
|
|
@@ -196,6 +196,7 @@ class ContainerCommand {
|
|
|
196
196
|
const dockerProcess = this.dockerService.authenticateDocker(args);
|
|
197
197
|
dockerProcess.stdin?.write(loginDetails.password + '\n');
|
|
198
198
|
dockerProcess.stdin?.end();
|
|
199
|
+
return dockerProcess;
|
|
199
200
|
}
|
|
200
201
|
}
|
|
201
202
|
exports.ContainerCommand = ContainerCommand;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container-command.js","sourceRoot":"","sources":["../../src/containers/container-command.ts"],"names":[],"mappings":";;;AAAA,kDAe2B;
|
|
1
|
+
{"version":3,"file":"container-command.js","sourceRoot":"","sources":["../../src/containers/container-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,15 @@ export declare class DebugArgumentNameMismatch extends UserError {
|
|
|
13
13
|
export declare class InvalidDebugStartingPortNumber extends UserError {
|
|
14
14
|
constructor(port: string);
|
|
15
15
|
}
|
|
16
|
+
export declare class DockerAuthenticationError extends UserError {
|
|
17
|
+
constructor(errCode: string);
|
|
18
|
+
}
|
|
19
|
+
export declare class DockerUnableToPullProxySidecarImage extends UserError {
|
|
20
|
+
constructor(err?: Error);
|
|
21
|
+
}
|
|
22
|
+
export declare class DockerUnableToStartError extends UserError {
|
|
23
|
+
constructor(err?: Error);
|
|
24
|
+
}
|
|
16
25
|
export declare class InvalidContainerServicePort extends UserError {
|
|
17
26
|
constructor(serviceKey: string);
|
|
18
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAQ,aAAa,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAErE,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAEtE,oBAAY,aAAa,GAAG;IAC1B,GAAG,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClD,CAAC;AAEF,qBAAa,wCAAyC,SAAQ,SAAS;;CAItE;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,eAAe,EAAE,MAAM;CAGpC;AAED,qBAAa,8BAA+B,SAAQ,SAAS;gBAC/C,IAAI,EAAE,MAAM;CAGzB;AAED,qBAAa,2BAA4B,SAAQ,SAAS;gBAC5C,UAAU,EAAE,MAAM;CAG/B;AAED,qBAAa,uBAAwB,SAAQ,SAAS;gBACxC,MAAM,EAAE,MAAM;CAG3B;AAaD,qBAAa,sBAAuB,YAAW,aAAa;IAExD,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,4BAA4B;gBAF5B,kBAAkB,EAAE,kBAAkB,EACtC,gBAAgB,EAAE,gBAAgB,EAClC,4BAA4B,EAAE,4BAA4B;IAGhE,GAAG,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAQ,aAAa,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAErE,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAEtE,oBAAY,aAAa,GAAG;IAC1B,GAAG,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClD,CAAC;AAEF,qBAAa,wCAAyC,SAAQ,SAAS;;CAItE;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,eAAe,EAAE,MAAM;CAGpC;AAED,qBAAa,8BAA+B,SAAQ,SAAS;gBAC/C,IAAI,EAAE,MAAM;CAGzB;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,OAAO,EAAE,MAAM;CAG5B;AAED,qBAAa,mCAAoC,SAAQ,SAAS;gBACpD,GAAG,CAAC,EAAE,KAAK;CAGxB;AAED,qBAAa,wBAAyB,SAAQ,SAAS;gBACzC,GAAG,CAAC,EAAE,KAAK;CAGxB;AAED,qBAAa,2BAA4B,SAAQ,SAAS;gBAC5C,UAAU,EAAE,MAAM;CAG/B;AAED,qBAAa,uBAAwB,SAAQ,SAAS;gBACxC,MAAM,EAAE,MAAM;CAG3B;AAaD,qBAAa,sBAAuB,YAAW,aAAa;IAExD,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,4BAA4B;gBAF5B,kBAAkB,EAAE,kBAAkB,EACtC,gBAAgB,EAAE,gBAAgB,EAClC,4BAA4B,EAAE,4BAA4B;IAGhE,GAAG,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAgB9D"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.InProcessTunnelService = exports.EnvironmentIsNotDefined = exports.InvalidContainerServicePort = exports.InvalidDebugStartingPortNumber = exports.DebugArgumentNameMismatch = exports.FunctionHandlersMustBeDefinedInDebugMode = void 0;
|
|
3
|
+
exports.InProcessTunnelService = exports.EnvironmentIsNotDefined = exports.InvalidContainerServicePort = exports.DockerUnableToStartError = exports.DockerUnableToPullProxySidecarImage = exports.DockerAuthenticationError = exports.InvalidDebugStartingPortNumber = exports.DebugArgumentNameMismatch = exports.FunctionHandlersMustBeDefinedInDebugMode = void 0;
|
|
4
4
|
const manifest_1 = require("@forge/manifest");
|
|
5
5
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
6
6
|
class FunctionHandlersMustBeDefinedInDebugMode extends cli_shared_1.UserError {
|
|
@@ -21,6 +21,24 @@ class InvalidDebugStartingPortNumber extends cli_shared_1.UserError {
|
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
exports.InvalidDebugStartingPortNumber = InvalidDebugStartingPortNumber;
|
|
24
|
+
class DockerAuthenticationError extends cli_shared_1.UserError {
|
|
25
|
+
constructor(errCode) {
|
|
26
|
+
super(cli_shared_1.Text.tunnel.unableToAuthenticateDocker(errCode));
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
exports.DockerAuthenticationError = DockerAuthenticationError;
|
|
30
|
+
class DockerUnableToPullProxySidecarImage extends cli_shared_1.UserError {
|
|
31
|
+
constructor(err) {
|
|
32
|
+
super(cli_shared_1.Text.tunnel.unableToPullProxySidecarImage(err?.message ?? 'Unknown Error Occurred.'));
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
exports.DockerUnableToPullProxySidecarImage = DockerUnableToPullProxySidecarImage;
|
|
36
|
+
class DockerUnableToStartError extends cli_shared_1.UserError {
|
|
37
|
+
constructor(err) {
|
|
38
|
+
super(cli_shared_1.Text.tunnel.unableToStartDockerComposeStack(err?.message ?? 'Unknown Error Occurred.'));
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
exports.DockerUnableToStartError = DockerUnableToStartError;
|
|
24
42
|
class InvalidContainerServicePort extends cli_shared_1.UserError {
|
|
25
43
|
constructor(serviceKey) {
|
|
26
44
|
super(cli_shared_1.Text.error.invalidServicePort(serviceKey));
|
|
@@ -48,7 +66,7 @@ class InProcessTunnelService {
|
|
|
48
66
|
environmentKey: tunnelOptions.environment || process.env.ENVIRONMENT_KEY || 'default',
|
|
49
67
|
resourcePortMap,
|
|
50
68
|
host: 'localhost'
|
|
51
|
-
});
|
|
69
|
+
}, tunnelOptions.containersDockerComposeFiles);
|
|
52
70
|
const monitor = await this.tunnelInteractor.watchApp(tunnel, tunnelOptions);
|
|
53
71
|
const manifestFileWatcher = this.tunnelInteractor.watchAndWarnOnManifestChanges(manifest_1.MANIFEST_FILE);
|
|
54
72
|
await this.tunnelInteractor.handleUserExitEvent(tunnel.stopFunction, monitor, manifestFileWatcher);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-service.js","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":";;;AAAA,8CAAgD;AAEhD,kDAAmE;AASnE,MAAa,wCAAyC,SAAQ,sBAAS;IACrE;QACE,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC;IACnD,CAAC;CACF;AAJD,4FAIC;AAED,MAAa,yBAA0B,SAAQ,sBAAS;IACtD,YAAY,eAAuB;QACjC,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAC,CAAC;IAChE,CAAC;CACF;AAJD,8DAIC;AAED,MAAa,8BAA+B,SAAQ,sBAAS;IAC3D,YAAY,IAAY;QACtB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,CAAC;CACF;AAJD,wEAIC;AAED,MAAa,2BAA4B,SAAQ,sBAAS;IACxD,YAAY,UAAkB;QAC5B,KAAK,CAAC,iBAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC;IACnD,CAAC;CACF;AAJD,kEAIC;AAED,MAAa,uBAAwB,SAAQ,sBAAS;IACpD,YAAY,MAAc;QACxB,KAAK,CAAC,iBAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;IACpD,CAAC;CACF;AAJD,0DAIC;AAaD,MAAa,sBAAsB;IAEd;IACA;IACA;IAHnB,YACmB,kBAAsC,EACtC,gBAAkC,EAClC,4BAA0D;QAF1D,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iCAA4B,GAA5B,4BAA4B,CAA8B;IAC1E,CAAC;IAEG,KAAK,CAAC,GAAG,CAAC,aAA4B;QAC3C,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,SAAS,EAAE,CAAC;QAE5E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"tunnel-service.js","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":";;;AAAA,8CAAgD;AAEhD,kDAAmE;AASnE,MAAa,wCAAyC,SAAQ,sBAAS;IACrE;QACE,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC;IACnD,CAAC;CACF;AAJD,4FAIC;AAED,MAAa,yBAA0B,SAAQ,sBAAS;IACtD,YAAY,eAAuB;QACjC,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAC,CAAC;IAChE,CAAC;CACF;AAJD,8DAIC;AAED,MAAa,8BAA+B,SAAQ,sBAAS;IAC3D,YAAY,IAAY;QACtB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,CAAC;CACF;AAJD,wEAIC;AAED,MAAa,yBAA0B,SAAQ,sBAAS;IACtD,YAAY,OAAe;QACzB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC,CAAC;IACzD,CAAC;CACF;AAJD,8DAIC;AAED,MAAa,mCAAoC,SAAQ,sBAAS;IAChE,YAAY,GAAW;QACrB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,GAAG,EAAE,OAAO,IAAI,yBAAyB,CAAC,CAAC,CAAC;IAC9F,CAAC;CACF;AAJD,kFAIC;AAED,MAAa,wBAAyB,SAAQ,sBAAS;IACrD,YAAY,GAAW;QACrB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,+BAA+B,CAAC,GAAG,EAAE,OAAO,IAAI,yBAAyB,CAAC,CAAC,CAAC;IAChG,CAAC;CACF;AAJD,4DAIC;AAED,MAAa,2BAA4B,SAAQ,sBAAS;IACxD,YAAY,UAAkB;QAC5B,KAAK,CAAC,iBAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC;IACnD,CAAC;CACF;AAJD,kEAIC;AAED,MAAa,uBAAwB,SAAQ,sBAAS;IACpD,YAAY,MAAc;QACxB,KAAK,CAAC,iBAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;IACpD,CAAC;CACF;AAJD,0DAIC;AAaD,MAAa,sBAAsB;IAEd;IACA;IACA;IAHnB,YACmB,kBAAsC,EACtC,gBAAkC,EAClC,4BAA0D;QAF1D,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iCAA4B,GAA5B,4BAA4B,CAA8B;IAC1E,CAAC;IAEG,KAAK,CAAC,GAAG,CAAC,aAA4B;QAC3C,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,SAAS,EAAE,CAAC;QAE5E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAClD;YACE,cAAc,EAAE,aAAa,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,SAAS;YACrF,eAAe;YACf,IAAI,EAAE,WAAW;SAClB,EACD,aAAa,CAAC,4BAA4B,CAC3C,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAC5E,MAAM,mBAAmB,GAAG,IAAI,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,wBAAa,CAAC,CAAC;QAC/F,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC;IACrG,CAAC;CACF;AAvBD,wDAuBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/cli",
|
|
3
|
-
"version": "12.
|
|
3
|
+
"version": "12.7.0-next.5",
|
|
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.9-next.
|
|
22
|
-
"@forge/cli-shared": "8.
|
|
23
|
-
"@forge/egress": "2.1.0-next.0
|
|
24
|
-
"@forge/lint": "5.11.5-next.
|
|
25
|
-
"@forge/manifest": "10.7.0-next.
|
|
21
|
+
"@forge/bundler": "6.1.9-next.5",
|
|
22
|
+
"@forge/cli-shared": "8.8.0-next.3",
|
|
23
|
+
"@forge/egress": "2.1.0-next.0",
|
|
24
|
+
"@forge/lint": "5.11.5-next.5",
|
|
25
|
+
"@forge/manifest": "10.7.0-next.1",
|
|
26
26
|
"@forge/i18n": "0.0.7",
|
|
27
|
-
"@forge/runtime": "6.0.
|
|
28
|
-
"@forge/tunnel": "6.
|
|
27
|
+
"@forge/runtime": "6.1.0-next.0",
|
|
28
|
+
"@forge/tunnel": "6.3.0-next.5",
|
|
29
29
|
"@forge/util": "2.0.0",
|
|
30
30
|
"@sentry/node": "7.106.0",
|
|
31
31
|
"ajv": "^8.12.0",
|
|
@@ -40,6 +40,7 @@
|
|
|
40
40
|
"dayjs": "^1.11.13",
|
|
41
41
|
"didyoumean": "^1.2.2",
|
|
42
42
|
"diff": "^7.0.0",
|
|
43
|
+
"docker-compose": "^1.3.0",
|
|
43
44
|
"env-paths": "^2.2.1",
|
|
44
45
|
"exponential-backoff": "^3.1.2",
|
|
45
46
|
"form-data": "^4.0.4",
|