@forge/cli 12.7.1 → 12.8.0-next.14-experimental-994fcd3

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 CHANGED
@@ -1,5 +1,193 @@
1
1
  # @forge/cli
2
2
 
3
+ ## 12.8.0-next.14-experimental-994fcd3
4
+
5
+ ### Minor Changes
6
+
7
+ - 5efbe5a: Added new watch flag to show services command
8
+
9
+ ### Patch Changes
10
+
11
+ - 6ab8f99: Re-order dependency between sidecar container and app container so the sidecar is ready for app container bootstrap code
12
+ - ef033a5: support container identity when tunneling
13
+ - aaf8a03: forge tunnel with containers: delete auto generated docker compose files upon failing to startup
14
+ - Updated dependencies [414eba9]
15
+ - Updated dependencies [9a6d346]
16
+ - Updated dependencies [260eb24]
17
+ - Updated dependencies [49bbec0]
18
+ - Updated dependencies [c0d4168]
19
+ - Updated dependencies [6ab8f99]
20
+ - Updated dependencies [3228cf0]
21
+ - Updated dependencies [8962080]
22
+ - Updated dependencies [738ce50]
23
+ - Updated dependencies [ef033a5]
24
+ - Updated dependencies [5efbe5a]
25
+ - Updated dependencies [aaf8a03]
26
+ - Updated dependencies [f0a5a03]
27
+ - Updated dependencies [78efec7]
28
+ - @forge/lint@5.12.0-next.14-experimental-994fcd3
29
+ - @forge/manifest@11.0.0-next.5-experimental-994fcd3
30
+ - @forge/cli-shared@8.9.0-next.10-experimental-994fcd3
31
+ - @forge/tunnel@6.3.2-next.14-experimental-994fcd3
32
+ - @forge/bundler@6.1.11-next.14-experimental-994fcd3
33
+
34
+ ## 12.8.0-next.14
35
+
36
+ ### Patch Changes
37
+
38
+ - 6ab8f99: Re-order dependency between sidecar container and app container so the sidecar is ready for app container bootstrap code
39
+ - Updated dependencies [6ab8f99]
40
+ - @forge/cli-shared@8.9.0-next.10
41
+ - @forge/bundler@6.1.11-next.14
42
+ - @forge/lint@5.12.0-next.14
43
+ - @forge/tunnel@6.3.2-next.14
44
+
45
+ ## 12.8.0-next.13
46
+
47
+ ### Patch Changes
48
+
49
+ - Updated dependencies [f0a5a03]
50
+ - @forge/manifest@11.0.0-next.5
51
+ - @forge/bundler@6.1.11-next.13
52
+ - @forge/cli-shared@8.9.0-next.9
53
+ - @forge/lint@5.12.0-next.13
54
+ - @forge/tunnel@6.3.2-next.13
55
+
56
+ ## 12.8.0-next.12
57
+
58
+ ### Patch Changes
59
+
60
+ - Updated dependencies [3228cf0]
61
+ - @forge/manifest@11.0.0-next.4
62
+ - @forge/bundler@6.1.11-next.12
63
+ - @forge/cli-shared@8.9.0-next.8
64
+ - @forge/lint@5.12.0-next.12
65
+ - @forge/tunnel@6.3.2-next.12
66
+
67
+ ## 12.8.0-next.11
68
+
69
+ ### Patch Changes
70
+
71
+ - @forge/lint@5.12.0-next.11
72
+ - @forge/tunnel@6.3.2-next.11
73
+ - @forge/bundler@6.1.11-next.11
74
+
75
+ ## 12.8.0-next.10
76
+
77
+ ### Patch Changes
78
+
79
+ - Updated dependencies [49bbec0]
80
+ - @forge/cli-shared@8.9.0-next.7
81
+ - @forge/tunnel@6.3.2-next.10
82
+ - @forge/bundler@6.1.11-next.10
83
+ - @forge/lint@5.12.0-next.10
84
+
85
+ ## 12.8.0-next.9
86
+
87
+ ### Minor Changes
88
+
89
+ - 5efbe5a: Added new watch flag to show services command
90
+
91
+ ### Patch Changes
92
+
93
+ - Updated dependencies [5efbe5a]
94
+ - @forge/cli-shared@8.9.0-next.6
95
+ - @forge/bundler@6.1.11-next.9
96
+ - @forge/lint@5.12.0-next.9
97
+ - @forge/tunnel@6.3.2-next.9
98
+
99
+ ## 12.7.2-next.8
100
+
101
+ ### Patch Changes
102
+
103
+ - ef033a5: support container identity when tunneling
104
+ - Updated dependencies [ef033a5]
105
+ - @forge/cli-shared@8.8.2-next.5
106
+ - @forge/tunnel@6.3.2-next.8
107
+ - @forge/bundler@6.1.11-next.8
108
+ - @forge/lint@5.12.0-next.8
109
+
110
+ ## 12.7.2-next.7
111
+
112
+ ### Patch Changes
113
+
114
+ - Updated dependencies [414eba9]
115
+ - Updated dependencies [78efec7]
116
+ - @forge/lint@5.12.0-next.7
117
+ - @forge/manifest@11.0.0-next.3
118
+ - @forge/bundler@6.1.11-next.7
119
+ - @forge/cli-shared@8.8.2-next.4
120
+ - @forge/tunnel@6.3.2-next.7
121
+
122
+ ## 12.7.2-next.6
123
+
124
+ ### Patch Changes
125
+
126
+ - @forge/lint@5.12.0-next.6
127
+ - @forge/tunnel@6.3.2-next.6
128
+ - @forge/bundler@6.1.11-next.6
129
+
130
+ ## 12.7.2-next.5
131
+
132
+ ### Patch Changes
133
+
134
+ - Updated dependencies [260eb24]
135
+ - @forge/manifest@11.0.0-next.2
136
+ - @forge/bundler@6.1.11-next.5
137
+ - @forge/cli-shared@8.8.2-next.3
138
+ - @forge/lint@5.12.0-next.5
139
+ - @forge/tunnel@6.3.2-next.5
140
+
141
+ ## 12.7.2-next.4
142
+
143
+ ### Patch Changes
144
+
145
+ - Updated dependencies [738ce50]
146
+ - @forge/lint@5.12.0-next.4
147
+ - @forge/bundler@6.1.11-next.4
148
+ - @forge/tunnel@6.3.2-next.4
149
+
150
+ ## 12.7.2-next.3
151
+
152
+ ### Patch Changes
153
+
154
+ - Updated dependencies [9a6d346]
155
+ - @forge/manifest@11.0.0-next.1
156
+ - @forge/bundler@6.1.11-next.3
157
+ - @forge/cli-shared@8.8.2-next.2
158
+ - @forge/lint@5.11.7-next.3
159
+ - @forge/tunnel@6.3.2-next.3
160
+
161
+ ## 12.7.2-next.2
162
+
163
+ ### Patch Changes
164
+
165
+ - @forge/lint@5.11.7-next.2
166
+ - @forge/tunnel@6.3.2-next.2
167
+ - @forge/bundler@6.1.11-next.2
168
+
169
+ ## 12.7.2-next.1
170
+
171
+ ### Patch Changes
172
+
173
+ - aaf8a03: forge tunnel with containers: delete auto generated docker compose files upon failing to startup
174
+ - Updated dependencies [aaf8a03]
175
+ - @forge/cli-shared@8.8.2-next.1
176
+ - @forge/tunnel@6.3.2-next.1
177
+ - @forge/bundler@6.1.11-next.1
178
+ - @forge/lint@5.11.7-next.1
179
+
180
+ ## 12.7.2-next.0
181
+
182
+ ### Patch Changes
183
+
184
+ - Updated dependencies [8962080]
185
+ - @forge/manifest@11.0.0-next.0
186
+ - @forge/bundler@6.1.11-next.0
187
+ - @forge/cli-shared@8.8.2-next.0
188
+ - @forge/lint@5.11.7-next.0
189
+ - @forge/tunnel@6.3.2-next.0
190
+
3
191
  ## 12.7.1
4
192
 
5
193
  ### Patch Changes
@@ -1,23 +1,23 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "12.7.1",
3
+ "version": "12.8.0-next.14-experimental-994fcd3",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@forge/cli",
9
- "version": "12.7.1",
9
+ "version": "12.8.0-next.14-experimental-994fcd3",
10
10
  "hasInstallScript": true,
11
11
  "license": "SEE LICENSE IN LICENSE.txt",
12
12
  "dependencies": {
13
- "@forge/bundler": "6.1.10",
14
- "@forge/cli-shared": "8.8.1",
13
+ "@forge/bundler": "6.1.11-next.14-experimental-994fcd3",
14
+ "@forge/cli-shared": "8.9.0-next.10-experimental-994fcd3",
15
15
  "@forge/egress": "2.1.1",
16
16
  "@forge/i18n": "0.0.7",
17
- "@forge/lint": "5.11.6",
18
- "@forge/manifest": "10.8.0",
17
+ "@forge/lint": "5.12.0-next.14-experimental-994fcd3",
18
+ "@forge/manifest": "11.0.0-next.5-experimental-994fcd3",
19
19
  "@forge/runtime": "6.1.1",
20
- "@forge/tunnel": "6.3.1",
20
+ "@forge/tunnel": "6.3.2-next.14-experimental-994fcd3",
21
21
  "@forge/util": "2.0.1",
22
22
  "@sentry/node": "7.106.0",
23
23
  "ajv": "^8.12.0",
@@ -549,9 +549,9 @@
549
549
  }
550
550
  },
551
551
  "node_modules/@forge/bundler": {
552
- "version": "6.1.10",
553
- "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-6.1.10.tgz",
554
- "integrity": "sha512-m3lDMNsg0is52PqdNmPHkZRNT9XIVj8mz70VoPb09hlOA+PqiMSW82Tp/6gPc0fhMJfXqU8nywQ8jI1aGbmQmA==",
552
+ "version": "6.1.11-next.14-experimental-994fcd3",
553
+ "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-6.1.11-next.14-experimental-994fcd3.tgz",
554
+ "integrity": "sha512-pWicrcqpGVn81jJpJ2PFg0RFjk4CS6jJ8wbgu9TL07LkCaX23v2LvtH2TSDWey3w0HRaXzHhMnA8aMJ3ykh0NA==",
555
555
  "license": "SEE LICENSE IN LICENSE.txt",
556
556
  "dependencies": {
557
557
  "@babel/core": "^7.24.0",
@@ -563,10 +563,10 @@
563
563
  "@babel/plugin-transform-react-jsx": "^7.23.4",
564
564
  "@babel/traverse": "^7.24.0",
565
565
  "@babel/types": "^7.24.0",
566
- "@forge/cli-shared": "8.8.1",
566
+ "@forge/cli-shared": "8.9.0-next.10-experimental-994fcd3",
567
567
  "@forge/i18n": "0.0.7",
568
- "@forge/lint": "5.11.6",
569
- "@forge/manifest": "10.8.0",
568
+ "@forge/lint": "5.12.0-next.14-experimental-994fcd3",
569
+ "@forge/manifest": "11.0.0-next.5-experimental-994fcd3",
570
570
  "babel-loader": "^8.3.0",
571
571
  "cheerio": "^1.1.0",
572
572
  "cross-spawn": "^7.0.6",
@@ -586,13 +586,13 @@
586
586
  }
587
587
  },
588
588
  "node_modules/@forge/cli-shared": {
589
- "version": "8.8.1",
590
- "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-8.8.1.tgz",
591
- "integrity": "sha512-qahvQKEt/o+6f6r9uMASPUy/DoTgXJ1PX0iDPUfoq+CIsNhhT/i/MgUGjnczFPuD6pcgGuVpb7jSopT2k68KeA==",
589
+ "version": "8.9.0-next.10-experimental-994fcd3",
590
+ "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-8.9.0-next.10-experimental-994fcd3.tgz",
591
+ "integrity": "sha512-+fVOQ+OkFiVIPOPggh4wm3YOdb6KyQGaOi3wXVXaD1LiBTXqpuiujtwL7ye+incpHuw3NXuGiVQYnAfs9ysE3g==",
592
592
  "license": "SEE LICENSE IN LICENSE.txt",
593
593
  "dependencies": {
594
594
  "@forge/i18n": "0.0.7",
595
- "@forge/manifest": "10.8.0",
595
+ "@forge/manifest": "11.0.0-next.5-experimental-994fcd3",
596
596
  "@forge/util": "2.0.1",
597
597
  "@sentry/node": "7.106.0",
598
598
  "adm-zip": "^0.5.10",
@@ -603,6 +603,7 @@
603
603
  "cli-table3": "^0.6.5",
604
604
  "conf": "^10.2.0",
605
605
  "cross-spawn": "^7.0.6",
606
+ "docker-compose": "^1.3.0",
606
607
  "env-paths": "^2.2.1",
607
608
  "figures": "^3.2.0",
608
609
  "fp-ts": "^2.16.2",
@@ -625,9 +626,9 @@
625
626
  }
626
627
  },
627
628
  "node_modules/@forge/csp": {
628
- "version": "5.2.0",
629
- "resolved": "https://registry.npmjs.org/@forge/csp/-/csp-5.2.0.tgz",
630
- "integrity": "sha512-9Bg6J4iHoP4EXz3xlglNAs1u6jHwZwrbm96fl8d+FcE6quJzR/AoCVlGOf4qM74gfDV+uvRxuUOjhB3GhpNcPw==",
629
+ "version": "5.3.0-next.2-experimental-994fcd3",
630
+ "resolved": "https://registry.npmjs.org/@forge/csp/-/csp-5.3.0-next.2-experimental-994fcd3.tgz",
631
+ "integrity": "sha512-H56PzXkhbNkrQbyGS5P7jGs372twC7E8m6ILAr744LM0BQIjQer20x2v3XXq+7W/H8XexXiakg7mIjaq7jtNzQ==",
631
632
  "license": "SEE LICENSE IN LICENSE.txt",
632
633
  "dependencies": {
633
634
  "content-security-policy-parser": "^0.5.0"
@@ -660,16 +661,16 @@
660
661
  }
661
662
  },
662
663
  "node_modules/@forge/lint": {
663
- "version": "5.11.6",
664
- "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-5.11.6.tgz",
665
- "integrity": "sha512-eq4JJswVdsl2QY9RnpL3bOCrMr2RiOkHjiwInBRsxErxCB4nN7I9DnTY9Y/T4saxk7U3grc1tKR3a0/aJAL5ow==",
664
+ "version": "5.12.0-next.14-experimental-994fcd3",
665
+ "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-5.12.0-next.14-experimental-994fcd3.tgz",
666
+ "integrity": "sha512-tTLlrTOmT4TONJzldkrF1sdOQ9eJcdEXKEBq6REbtw+WCWiNEV8zR5LrupohWreQhRa1Wz4EWgwFY9eAzJG7aQ==",
666
667
  "license": "SEE LICENSE IN LICENSE.txt",
667
668
  "dependencies": {
668
669
  "@atlassian/atlassian-openapi": "^1.0.6",
669
- "@forge/cli-shared": "8.8.1",
670
- "@forge/csp": "5.2.0",
670
+ "@forge/cli-shared": "8.9.0-next.10-experimental-994fcd3",
671
+ "@forge/csp": "5.3.0-next.2-experimental-994fcd3",
671
672
  "@forge/egress": "2.1.1",
672
- "@forge/manifest": "10.8.0",
673
+ "@forge/manifest": "11.0.0-next.5-experimental-994fcd3",
673
674
  "@typescript-eslint/typescript-estree": "^5.62.0",
674
675
  "array.prototype.flatmap": "^1.3.3",
675
676
  "cross-spawn": "^7.0.6",
@@ -677,9 +678,9 @@
677
678
  }
678
679
  },
679
680
  "node_modules/@forge/manifest": {
680
- "version": "10.8.0",
681
- "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-10.8.0.tgz",
682
- "integrity": "sha512-0TjmxT7xuLEY+OKwvTztUEWeZYNnE426SS0LIjuOp5eqd5rSMJ8sNCOlYrSJQJKe+3NoIc9AoT4jRmB63u74KQ==",
681
+ "version": "11.0.0-next.5-experimental-994fcd3",
682
+ "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-11.0.0-next.5-experimental-994fcd3.tgz",
683
+ "integrity": "sha512-8ztCWlJy+Wvw073/BqSpoktNDpXm0qL3DZeKDqVrAgEx4jSdwn0lHRvfxfc9UkvF//QQcT3x7lrUFt+eh7GWbQ==",
683
684
  "license": "SEE LICENSE IN LICENSE.txt",
684
685
  "dependencies": {
685
686
  "@forge/i18n": "0.0.7",
@@ -700,14 +701,14 @@
700
701
  "license": "SEE LICENSE IN LICENSE.txt"
701
702
  },
702
703
  "node_modules/@forge/tunnel": {
703
- "version": "6.3.1",
704
- "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-6.3.1.tgz",
705
- "integrity": "sha512-wkGVPHapZYCz9eeSzhmFI1uILzR8Z8zGQnuMY906ggaU/97l7GwQ7EyNp91O5/u96r8PVoKJytEQ8mQ1X0Q77g==",
704
+ "version": "6.3.2-next.14-experimental-994fcd3",
705
+ "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-6.3.2-next.14-experimental-994fcd3.tgz",
706
+ "integrity": "sha512-TP+5fizx3wZyxefKKlo7G3g+YdPJdl82JfGzFNbzsK/bjfb1ET1bADifjZnMo5p5kF+E+XlVDpYNGN5/BmTGBg==",
706
707
  "license": "SEE LICENSE IN LICENSE.txt",
707
708
  "dependencies": {
708
- "@forge/bundler": "6.1.10",
709
- "@forge/cli-shared": "8.8.1",
710
- "@forge/csp": "5.2.0",
709
+ "@forge/bundler": "6.1.11-next.14-experimental-994fcd3",
710
+ "@forge/cli-shared": "8.9.0-next.10-experimental-994fcd3",
711
+ "@forge/csp": "5.3.0-next.2-experimental-994fcd3",
711
712
  "@forge/runtime": "6.1.1",
712
713
  "@forge/util": "^2.0.1",
713
714
  "cheerio": "^1.1.0",
@@ -13,11 +13,7 @@ export declare class TunnelController {
13
13
  private readonly environmentClient;
14
14
  constructor(nodeTunnelService: TunnelService, tunnelView: TunnelView, configFile: ConfigFile, cachedConfigService: CachedConfigService, containerCommandService: ContainerCommand, environmentClient: ListEnvironmentClient);
15
15
  run(tunnelOptions: TunnelCommandOptions): Promise<void>;
16
- private startDockerComposeStack;
17
16
  private processDockerAuthentication;
18
17
  private validateTunnelCommandOptions;
19
- private generateContainersDockerComposeFile;
20
- private getContainerDockerComposePath;
21
- private getProxySidecarConfig;
22
18
  }
23
19
  //# sourceMappingURL=tunnel-controller.d.ts.map
@@ -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,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"}
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,EASrB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAIL,aAAa,EAGd,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAE3E,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;YA8DtD,2BAA2B;YAa3B,4BAA4B;CA6B3C"}
@@ -1,13 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.TunnelController = void 0;
4
- const tslib_1 = require("tslib");
5
4
  const cli_shared_1 = require("@forge/cli-shared");
6
5
  const tunnel_service_1 = require("../../service/tunnel-service");
7
- const docker_compose_1 = require("docker-compose");
8
- const yaml = tslib_1.__importStar(require("yaml"));
9
- const fs = tslib_1.__importStar(require("fs"));
10
- const path = tslib_1.__importStar(require("path"));
11
6
  class TunnelController {
12
7
  nodeTunnelService;
13
8
  tunnelView;
@@ -25,19 +20,33 @@ class TunnelController {
25
20
  }
26
21
  async run(tunnelOptions) {
27
22
  const options = await this.validateTunnelCommandOptions(tunnelOptions);
28
- const envKey = tunnelOptions.environment;
23
+ const envKey = tunnelOptions.environment || cli_shared_1.DEFAULT_ENVIRONMENT_OPTION;
29
24
  this.tunnelView.preamble(envKey);
30
25
  const { app: { id: appId }, services, modules } = await this.configFile.readConfig();
31
26
  const serviceWithTunnelConfigExists = services?.some((service) => service.containers?.some((container) => {
32
27
  return !!container.tunnel;
33
28
  }));
34
29
  if (services && serviceWithTunnelConfigExists) {
30
+ const appEnvironments = await this.environmentClient.listEnvironment({ appId });
31
+ const environmentDetails = appEnvironments.filter((environment) => environment.key === envKey);
32
+ if (environmentDetails.length < 1) {
33
+ throw new tunnel_service_1.EnvironmentIsNotDefined(envKey);
34
+ }
35
+ const envId = environmentDetails[0].id;
35
36
  const childProcess = await this.containerCommandService.authenticateDocker();
36
37
  await this.processDockerAuthentication(childProcess);
37
- const dockerComposeFilePaths = await this.generateContainersDockerComposeFile(services, appId, envKey);
38
+ const dockerComposeFilePaths = await (0, cli_shared_1.generateContainersDockerComposeFile)(services, appId, envId);
38
39
  options.containersDockerComposeFiles = dockerComposeFilePaths;
39
- for (const [serviceKey, filePath] of Object.entries(dockerComposeFilePaths)) {
40
- await this.startDockerComposeStack(filePath, serviceKey);
40
+ try {
41
+ for (const [serviceKey, filePath] of Object.entries(dockerComposeFilePaths)) {
42
+ await (0, cli_shared_1.startDockerComposeStack)(filePath, serviceKey);
43
+ }
44
+ }
45
+ catch (err) {
46
+ for (const filePath of Object.values(dockerComposeFilePaths)) {
47
+ await (0, cli_shared_1.deleteDockerComposeFile)(filePath);
48
+ }
49
+ throw err;
41
50
  }
42
51
  }
43
52
  if (modules) {
@@ -48,29 +57,6 @@ class TunnelController {
48
57
  }
49
58
  return await this.nodeTunnelService.run(options);
50
59
  }
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
60
  async processDockerAuthentication(childProcess) {
75
61
  await new Promise((resolve, reject) => {
76
62
  childProcess.on('close', (code) => {
@@ -109,83 +95,6 @@ class TunnelController {
109
95
  }
110
96
  return options;
111
97
  }
112
- async generateContainersDockerComposeFile(services, appId, envKey) {
113
- const filesGenerated = {};
114
- for (const service of services) {
115
- const { key: serviceKey, containers } = service;
116
- const containersWithTunnelConfig = containers.filter((container) => !!container.tunnel);
117
- if (containersWithTunnelConfig.length > 0) {
118
- const port = await (0, cli_shared_1.getServicePort)(services, serviceKey);
119
- if (!port || port < 1024 || port > 49152) {
120
- throw new tunnel_service_1.InvalidContainerServicePort(serviceKey);
121
- }
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
- }));
133
- const dockerComposeConfig = {
134
- services: {
135
- ...containerConfig,
136
- ...(await this.getProxySidecarConfig(serviceKey, Object.keys(containerConfig), port, appId, envKey))
137
- }
138
- };
139
- const yamlString = yaml.stringify(dockerComposeConfig);
140
- const filePath = this.getContainerDockerComposePath(serviceKey);
141
- fs.writeFileSync(filePath, yamlString);
142
- filesGenerated[serviceKey] = filePath;
143
- }
144
- }
145
- return filesGenerated;
146
- }
147
- getContainerDockerComposePath(serviceKey) {
148
- const hiddenDir = path.join(process.cwd(), '.services');
149
- if (!fs.existsSync(hiddenDir)) {
150
- fs.mkdirSync(hiddenDir, { recursive: true });
151
- }
152
- return path.join(hiddenDir, `docker-compose-${serviceKey}.yml`);
153
- }
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
- }
163
- const appEnvironments = await this.environmentClient.listEnvironment({ appId });
164
- const environmentDetails = appEnvironments.filter((environment) => environment.key === envKey);
165
- if (environmentDetails.length < 1) {
166
- throw new tunnel_service_1.EnvironmentIsNotDefined(envKey);
167
- }
168
- let appIdShort = appId;
169
- if (appId.startsWith('ari:cloud:ecosystem::app/')) {
170
- appIdShort = appId.split('/')[1];
171
- }
172
- return {
173
- 'proxy-sidecar': {
174
- image: proxySidecarImage,
175
- container_name: `proxy-sidecar-${serviceKey}`,
176
- environment: [
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}`,
182
- `IS_LOCAL_DEV=true`
183
- ],
184
- ports: [`${port}:${cli_shared_1.DEFAULT_PROXY_INGRESS_PORT}`],
185
- depends_on: containerKeys
186
- }
187
- };
188
- }
189
98
  }
190
99
  exports.TunnelController = TunnelController;
191
100
  //# sourceMappingURL=tunnel-controller.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"tunnel-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tunnel-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":";;;AAAA,kDAW2B;AAE3B,iEAOsC;AAOtC,MAAa,gBAAgB;IAER;IACA;IACA;IACA;IACA;IACA;IANnB,YACmB,iBAAgC,EAChC,UAAsB,EACtB,UAAsB,EACtB,mBAAwC,EACxC,uBAAyC,EACzC,iBAAwC;QALxC,sBAAiB,GAAjB,iBAAiB,CAAe;QAChC,eAAU,GAAV,UAAU,CAAY;QACtB,eAAU,GAAV,UAAU,CAAY;QACtB,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,4BAAuB,GAAvB,uBAAuB,CAAkB;QACzC,sBAAiB,GAAjB,iBAAiB,CAAuB;IACxD,CAAC;IAEG,KAAK,CAAC,GAAG,CAAC,aAAmC;QAClD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,aAAa,CAAC,CAAC;QACvE,MAAM,MAAM,GAAG,aAAa,CAAC,WAAW,IAAI,uCAA0B,CAAC;QAEvE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAEjC,MAAM,EACJ,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAClB,QAAQ,EACR,OAAO,EACR,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;QAEvC,MAAM,6BAA6B,GAAG,QAAQ,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAC/D,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;YACrC,OAAO,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC;QAC5B,CAAC,CAAC,CACH,CAAC;QAEF,IAAI,QAAQ,IAAI,6BAA6B,EAAE;YAE7C,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;YAChF,MAAM,kBAAkB,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,KAAK,MAAM,CAAC,CAAC;YAC/F,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE;gBACjC,MAAM,IAAI,wCAAuB,CAAC,MAAM,CAAC,CAAC;aAC3C;YACD,MAAM,KAAK,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAGvC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,EAAE,CAAC;YAC7E,MAAM,IAAI,CAAC,2BAA2B,CAAC,YAAY,CAAC,CAAC;YAErD,MAAM,sBAAsB,GAAG,MAAM,IAAA,gDAAmC,EAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;YACjG,OAAO,CAAC,4BAA4B,GAAG,sBAAsB,CAAC;YAG9D,IAAI;gBACF,KAAK,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,EAAE;oBAC3E,MAAM,IAAA,oCAAuB,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;iBACrD;aACF;YAAC,OAAO,GAAG,EAAE;gBAEZ,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,EAAE;oBAC5D,MAAM,IAAA,oCAAuB,EAAC,QAAQ,CAAC,CAAC;iBACzC;gBACD,MAAM,GAAG,CAAC;aACX;SACF;QAED,IAAI,OAAO,EAAE;YACX,MAAM,aAAa,GAAG,IAAA,8BAAiB,EAAC,OAAO,CAAC,CAAC;YACjD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC5B,IAAI,CAAC,UAAU,CAAC,+BAA+B,CAAC,aAAa,CAAC,CAAC;aAChE;SACF;QAED,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAMO,KAAK,CAAC,2BAA2B,CAAC,YAA0B;QAClE,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;gBAChC,IAAI,IAAI,KAAK,CAAC,EAAE;oBACd,OAAO,EAAE,CAAC;iBACX;qBAAM;oBACL,MAAM,CAAC,IAAI,0CAAyB,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC;iBACtE;YACH,CAAC,CAAC,CAAC;YACH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,4BAA4B,CAAC,aAAmC;QAC5E,MAAM,aAAa,GAAG,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,CAAC;QAClE,MAAM,OAAO,GAAkB;YAC7B,GAAG,aAAa;YAChB,iBAAiB,EAAE,qCAAwB;YAC3C,aAAa;SACd,CAAC;QACF,IAAI,aAAa,CAAC,KAAK,EAAE;YACvB,IAAI,CAAC,aAAa,CAAC,qBAAqB,EAAE,MAAM,EAAE;gBAChD,MAAM,IAAI,yDAAwC,EAAE,CAAC;aACtD;YAID,MAAM,gBAAgB,GAAc,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;YAC3E,KAAK,MAAM,eAAe,IAAI,aAAa,CAAC,qBAAqB,EAAE;gBACjE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,eAAe,KAAK,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE;oBAChG,MAAM,IAAI,0CAAyB,CAAC,eAAe,CAAC,CAAC;iBACtD;aACF;YAED,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;YACvD,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,KAAK,EAAE;gBAC3C,MAAM,IAAI,+CAA8B,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;aAC3E;YACD,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;SAClC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AAlHD,4CAkHC"}
@@ -1 +1 @@
1
- {"version":3,"file":"register-show-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-show-commands.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAiKtD,eAAO,MAAM,gBAAgB,SAAU,YAAY,KAAG,IAKrD,CAAC"}
1
+ {"version":3,"file":"register-show-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-show-commands.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AA2KtD,eAAO,MAAM,gBAAgB,SAAU,YAAY,KAAG,IAKrD,CAAC"}
@@ -17,6 +17,7 @@ function showCommandError(ui, message) {
17
17
  function specifiedContainerExists(allServiceContainers, containerKey) {
18
18
  return allServiceContainers.some((ct) => ct.key === containerKey && ct.instances && ct.instances.length > 0);
19
19
  }
20
+ const SERVICES_REFRESH_INTERVAL_MS = 5000;
20
21
  const SHOW_SERVICES_COMMAND_NAME = 'services';
21
22
  const registerShowServiceCommand = (parent, { ui, commands: { containerCommand }, configFile }) => {
22
23
  parent
@@ -25,15 +26,29 @@ const registerShowServiceCommand = (parent, { ui, commands: { containerCommand }
25
26
  .requireAppId()
26
27
  .environmentOption()
27
28
  .option('-s, --service [service]', cli_shared_1.Text.show.services.cmd.serviceKeyOption)
28
- .action(async ({ service, environment }) => {
29
+ .option('-w, --watch', cli_shared_1.Text.show.services.cmd.watchOption)
30
+ .action(async ({ service, environment, watch }) => {
29
31
  ui.info(cli_shared_1.Text.show.services.overview);
30
32
  environment = (0, cli_shared_1.optionToEnvironment)(environment);
31
33
  const serviceNames = service ? [service] : readServicesFromConfig(await configFile.readConfig());
32
- const { services } = await containerCommand.getContainerServiceDetails(environment, serviceNames);
33
- if (!services || !services.length) {
34
- showCommandError(ui, cli_shared_1.Text.show.services.noServicesFound(environment));
35
- return;
36
- }
34
+ const getServices = async () => {
35
+ const { services } = await containerCommand.getContainerServiceDetails(environment, serviceNames);
36
+ if (!services || !services.length) {
37
+ showCommandError(ui, cli_shared_1.Text.show.services.noServicesFound(environment));
38
+ return;
39
+ }
40
+ return services.map((s) => ({
41
+ service: s.key,
42
+ serviceStatus: s.serviceStatus,
43
+ versionStatus: s.versionStatus,
44
+ runningCount: s.runningCount,
45
+ pendingCount: s.pendingCount,
46
+ maxCount: s.maxCount,
47
+ minCount: s.minCount,
48
+ createdAt: s.createdAt,
49
+ updatedAt: s.updatedAt
50
+ }));
51
+ };
37
52
  const headings = [
38
53
  ['service', 'Service'],
39
54
  ['serviceStatus', 'Service Status'],
@@ -49,21 +64,21 @@ const registerShowServiceCommand = (parent, { ui, commands: { containerCommand }
49
64
  headings.shift();
50
65
  }
51
66
  ui.emptyLine();
52
- ui.table(headings, services.map((s) => ({
53
- service: s.key,
54
- serviceStatus: s.serviceStatus,
55
- versionStatus: s.versionStatus,
56
- runningCount: s.runningCount,
57
- pendingCount: s.pendingCount,
58
- maxCount: s.maxCount,
59
- minCount: s.minCount,
60
- createdAt: s.createdAt,
61
- updatedAt: s.updatedAt
62
- })), {
63
- preMessage: service
64
- ? cli_shared_1.Text.show.services.specificService(service, environment)
65
- : cli_shared_1.Text.show.services.allServices(environment)
66
- });
67
+ if (watch) {
68
+ await ui.dynamicTable(headings, getServices, SERVICES_REFRESH_INTERVAL_MS, {
69
+ preMessage: service
70
+ ? cli_shared_1.Text.show.services.specificService(service, environment)
71
+ : cli_shared_1.Text.show.services.allServices(environment)
72
+ });
73
+ }
74
+ else {
75
+ const services = await getServices();
76
+ ui.table(headings, services, {
77
+ preMessage: service
78
+ ? cli_shared_1.Text.show.services.specificService(service, environment)
79
+ : cli_shared_1.Text.show.services.allServices(environment)
80
+ });
81
+ }
67
82
  ui.emptyLine();
68
83
  });
69
84
  };
@@ -1 +1 @@
1
- {"version":3,"file":"register-show-commands.js","sourceRoot":"","sources":["../../src/command-line/register-show-commands.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"register-show-commands.js","sourceRoot":"","sources":["../../src/command-line/register-show-commands.ts"],"names":[],"mappings":"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"}
@@ -16,15 +16,6 @@ export declare class InvalidDebugStartingPortNumber extends UserError {
16
16
  export declare class DockerAuthenticationError extends UserError {
17
17
  constructor(errCode: string);
18
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
- }
25
- export declare class InvalidContainerServicePort extends UserError {
26
- constructor(serviceKey: string);
27
- }
28
19
  export declare class EnvironmentIsNotDefined extends UserError {
29
20
  constructor(envKey: string);
30
21
  }
@@ -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,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;CAkB9D"}
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,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;CAkB9D"}
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.InProcessTunnelService = exports.EnvironmentIsNotDefined = exports.InvalidContainerServicePort = exports.DockerUnableToStartError = exports.DockerUnableToPullProxySidecarImage = exports.DockerAuthenticationError = exports.InvalidDebugStartingPortNumber = exports.DebugArgumentNameMismatch = exports.FunctionHandlersMustBeDefinedInDebugMode = void 0;
3
+ exports.InProcessTunnelService = exports.EnvironmentIsNotDefined = 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 {
@@ -27,24 +27,6 @@ class DockerAuthenticationError extends cli_shared_1.UserError {
27
27
  }
28
28
  }
29
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;
42
- class InvalidContainerServicePort extends cli_shared_1.UserError {
43
- constructor(serviceKey) {
44
- super(cli_shared_1.Text.error.invalidServicePort(serviceKey));
45
- }
46
- }
47
- exports.InvalidContainerServicePort = InvalidContainerServicePort;
48
30
  class EnvironmentIsNotDefined extends cli_shared_1.UserError {
49
31
  constructor(envKey) {
50
32
  super(cli_shared_1.Text.error.environmentIsNotDefined(envKey));
@@ -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,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;YACjB,GAAG,EAAE,aAAa,CAAC,GAAG;YACtB,IAAI,EAAE,aAAa,CAAC,SAAS;SAC9B,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;AAzBD,wDAyBC"}
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,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;YACjB,GAAG,EAAE,aAAa,CAAC,GAAG;YACtB,IAAI,EAAE,aAAa,CAAC,SAAS;SAC9B,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;AAzBD,wDAyBC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "12.7.1",
3
+ "version": "12.8.0-next.14-experimental-994fcd3",
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/validate/schema.json --output src/custom-scopes/generated-types.d.ts --style.singleQuote"
22
22
  },
23
23
  "dependencies": {
24
- "@forge/bundler": "6.1.10",
25
- "@forge/cli-shared": "8.8.1",
24
+ "@forge/bundler": "6.1.11-next.14-experimental-994fcd3",
25
+ "@forge/cli-shared": "8.9.0-next.10-experimental-994fcd3",
26
26
  "@forge/egress": "2.1.1",
27
- "@forge/lint": "5.11.6",
28
- "@forge/manifest": "10.8.0",
27
+ "@forge/lint": "5.12.0-next.14-experimental-994fcd3",
28
+ "@forge/manifest": "11.0.0-next.5-experimental-994fcd3",
29
29
  "@forge/i18n": "0.0.7",
30
30
  "@forge/runtime": "6.1.1",
31
- "@forge/tunnel": "6.3.1",
31
+ "@forge/tunnel": "6.3.2-next.14-experimental-994fcd3",
32
32
  "@forge/util": "2.0.1",
33
33
  "@sentry/node": "7.106.0",
34
34
  "ajv": "^8.12.0",