@forge/cli 12.7.1-next.9-experimental-44e92a2 → 12.7.2-next.8
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 +150 -9
- package/npm-shrinkwrap.json +52 -51
- package/out/command-line/controller/settings-controller.d.ts +1 -1
- package/out/command-line/controller/settings-controller.d.ts.map +1 -1
- package/out/command-line/controller/settings-controller.js +9 -1
- package/out/command-line/controller/settings-controller.js.map +1 -1
- package/out/command-line/controller/tunnel-controller.d.ts +0 -4
- package/out/command-line/controller/tunnel-controller.d.ts.map +1 -1
- package/out/command-line/controller/tunnel-controller.js +18 -109
- package/out/command-line/controller/tunnel-controller.js.map +1 -1
- package/out/service/cached-config-service.d.ts +2 -0
- package/out/service/cached-config-service.d.ts.map +1 -1
- package/out/service/cached-config-service.js +10 -0
- package/out/service/cached-config-service.js.map +1 -1
- package/out/service/tunnel-service.d.ts +0 -9
- package/out/service/tunnel-service.d.ts.map +1 -1
- package/out/service/tunnel-service.js +1 -19
- package/out/service/tunnel-service.js.map +1 -1
- package/package.json +9 -9
package/CHANGELOG.md
CHANGED
|
@@ -1,17 +1,112 @@
|
|
|
1
1
|
# @forge/cli
|
|
2
2
|
|
|
3
|
-
## 12.7.
|
|
3
|
+
## 12.7.2-next.8
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- ef033a5: support container identity when tunneling
|
|
8
|
+
- Updated dependencies [ef033a5]
|
|
9
|
+
- @forge/cli-shared@8.8.2-next.5
|
|
10
|
+
- @forge/tunnel@6.3.2-next.8
|
|
11
|
+
- @forge/bundler@6.1.11-next.8
|
|
12
|
+
- @forge/lint@5.12.0-next.8
|
|
13
|
+
|
|
14
|
+
## 12.7.2-next.7
|
|
15
|
+
|
|
16
|
+
### Patch Changes
|
|
17
|
+
|
|
18
|
+
- Updated dependencies [414eba9]
|
|
19
|
+
- Updated dependencies [78efec7]
|
|
20
|
+
- @forge/lint@5.12.0-next.7
|
|
21
|
+
- @forge/manifest@11.0.0-next.3
|
|
22
|
+
- @forge/bundler@6.1.11-next.7
|
|
23
|
+
- @forge/cli-shared@8.8.2-next.4
|
|
24
|
+
- @forge/tunnel@6.3.2-next.7
|
|
25
|
+
|
|
26
|
+
## 12.7.2-next.6
|
|
27
|
+
|
|
28
|
+
### Patch Changes
|
|
29
|
+
|
|
30
|
+
- @forge/lint@5.12.0-next.6
|
|
31
|
+
- @forge/tunnel@6.3.2-next.6
|
|
32
|
+
- @forge/bundler@6.1.11-next.6
|
|
33
|
+
|
|
34
|
+
## 12.7.2-next.5
|
|
35
|
+
|
|
36
|
+
### Patch Changes
|
|
37
|
+
|
|
38
|
+
- Updated dependencies [260eb24]
|
|
39
|
+
- @forge/manifest@11.0.0-next.2
|
|
40
|
+
- @forge/bundler@6.1.11-next.5
|
|
41
|
+
- @forge/cli-shared@8.8.2-next.3
|
|
42
|
+
- @forge/lint@5.12.0-next.5
|
|
43
|
+
- @forge/tunnel@6.3.2-next.5
|
|
44
|
+
|
|
45
|
+
## 12.7.2-next.4
|
|
46
|
+
|
|
47
|
+
### Patch Changes
|
|
48
|
+
|
|
49
|
+
- Updated dependencies [738ce50]
|
|
50
|
+
- @forge/lint@5.12.0-next.4
|
|
51
|
+
- @forge/bundler@6.1.11-next.4
|
|
52
|
+
- @forge/tunnel@6.3.2-next.4
|
|
53
|
+
|
|
54
|
+
## 12.7.2-next.3
|
|
55
|
+
|
|
56
|
+
### Patch Changes
|
|
57
|
+
|
|
58
|
+
- Updated dependencies [9a6d346]
|
|
59
|
+
- @forge/manifest@11.0.0-next.1
|
|
60
|
+
- @forge/bundler@6.1.11-next.3
|
|
61
|
+
- @forge/cli-shared@8.8.2-next.2
|
|
62
|
+
- @forge/lint@5.11.7-next.3
|
|
63
|
+
- @forge/tunnel@6.3.2-next.3
|
|
64
|
+
|
|
65
|
+
## 12.7.2-next.2
|
|
66
|
+
|
|
67
|
+
### Patch Changes
|
|
68
|
+
|
|
69
|
+
- @forge/lint@5.11.7-next.2
|
|
70
|
+
- @forge/tunnel@6.3.2-next.2
|
|
71
|
+
- @forge/bundler@6.1.11-next.2
|
|
72
|
+
|
|
73
|
+
## 12.7.2-next.1
|
|
74
|
+
|
|
75
|
+
### Patch Changes
|
|
76
|
+
|
|
77
|
+
- aaf8a03: forge tunnel with containers: delete auto generated docker compose files upon failing to startup
|
|
78
|
+
- Updated dependencies [aaf8a03]
|
|
79
|
+
- @forge/cli-shared@8.8.2-next.1
|
|
80
|
+
- @forge/tunnel@6.3.2-next.1
|
|
81
|
+
- @forge/bundler@6.1.11-next.1
|
|
82
|
+
- @forge/lint@5.11.7-next.1
|
|
83
|
+
|
|
84
|
+
## 12.7.2-next.0
|
|
85
|
+
|
|
86
|
+
### Patch Changes
|
|
87
|
+
|
|
88
|
+
- Updated dependencies [8962080]
|
|
89
|
+
- @forge/manifest@11.0.0-next.0
|
|
90
|
+
- @forge/bundler@6.1.11-next.0
|
|
91
|
+
- @forge/cli-shared@8.8.2-next.0
|
|
92
|
+
- @forge/lint@5.11.7-next.0
|
|
93
|
+
- @forge/tunnel@6.3.2-next.0
|
|
94
|
+
|
|
95
|
+
## 12.7.1
|
|
4
96
|
|
|
5
97
|
### Patch Changes
|
|
6
98
|
|
|
7
99
|
- db1aa23: Map more deploy errors with useful message and as user error
|
|
8
100
|
- f751b9b:
|
|
9
101
|
- 9cb69da: Enable force forge container deletion
|
|
102
|
+
- 4a9136d: Add Halloween spinner during October deployments
|
|
10
103
|
- 94243f1: Split development and contribution guidelines
|
|
11
104
|
- 8183db5: added cli command to hit decoupled state endpoint
|
|
12
105
|
- Updated dependencies [b3792e4]
|
|
13
106
|
- Updated dependencies [f751b9b]
|
|
107
|
+
- Updated dependencies [fae0e71]
|
|
14
108
|
- Updated dependencies [9cb69da]
|
|
109
|
+
- Updated dependencies [4a9136d]
|
|
15
110
|
- Updated dependencies [0ea6722]
|
|
16
111
|
- Updated dependencies [4718346]
|
|
17
112
|
- Updated dependencies [94243f1]
|
|
@@ -19,14 +114,60 @@
|
|
|
19
114
|
- Updated dependencies [8183db5]
|
|
20
115
|
- Updated dependencies [0ef937d]
|
|
21
116
|
- Updated dependencies [dcd46a4]
|
|
22
|
-
|
|
23
|
-
- @forge/
|
|
24
|
-
- @forge/
|
|
25
|
-
- @forge/
|
|
26
|
-
- @forge/
|
|
27
|
-
- @forge/
|
|
28
|
-
- @forge/
|
|
29
|
-
- @forge/
|
|
117
|
+
- Updated dependencies [8ec0d92]
|
|
118
|
+
- @forge/manifest@10.8.0
|
|
119
|
+
- @forge/cli-shared@8.8.1
|
|
120
|
+
- @forge/bundler@6.1.10
|
|
121
|
+
- @forge/egress@2.1.1
|
|
122
|
+
- @forge/lint@5.11.6
|
|
123
|
+
- @forge/runtime@6.1.1
|
|
124
|
+
- @forge/util@2.0.1
|
|
125
|
+
- @forge/tunnel@6.3.1
|
|
126
|
+
|
|
127
|
+
## 12.7.1-next.13
|
|
128
|
+
|
|
129
|
+
### Patch Changes
|
|
130
|
+
|
|
131
|
+
- Updated dependencies [8ec0d92]
|
|
132
|
+
- @forge/manifest@10.8.0-next.6
|
|
133
|
+
- @forge/bundler@6.1.10-next.12
|
|
134
|
+
- @forge/cli-shared@8.8.1-next.8
|
|
135
|
+
- @forge/lint@5.11.6-next.12
|
|
136
|
+
- @forge/tunnel@6.3.1-next.12
|
|
137
|
+
|
|
138
|
+
## 12.7.1-next.12
|
|
139
|
+
|
|
140
|
+
### Patch Changes
|
|
141
|
+
|
|
142
|
+
- 4a9136d: Add Halloween spinner during October deployments
|
|
143
|
+
- Updated dependencies [4a9136d]
|
|
144
|
+
- @forge/cli-shared@8.8.1-next.7
|
|
145
|
+
- @forge/bundler@6.1.10-next.11
|
|
146
|
+
- @forge/lint@5.11.6-next.11
|
|
147
|
+
- @forge/tunnel@6.3.1-next.11
|
|
148
|
+
|
|
149
|
+
## 12.7.1-next.11
|
|
150
|
+
|
|
151
|
+
### Patch Changes
|
|
152
|
+
|
|
153
|
+
- 8183db5: added cli command to hit decoupled state endpoint
|
|
154
|
+
- Updated dependencies [8183db5]
|
|
155
|
+
- @forge/cli-shared@8.8.1-next.6
|
|
156
|
+
- @forge/bundler@6.1.10-next.10
|
|
157
|
+
- @forge/lint@5.11.6-next.10
|
|
158
|
+
- @forge/tunnel@6.3.1-next.10
|
|
159
|
+
|
|
160
|
+
## 12.7.1-next.10
|
|
161
|
+
|
|
162
|
+
### Patch Changes
|
|
163
|
+
|
|
164
|
+
- Updated dependencies [fae0e71]
|
|
165
|
+
- Updated dependencies [4718346]
|
|
166
|
+
- @forge/manifest@10.8.0-next.5
|
|
167
|
+
- @forge/bundler@6.1.10-next.9
|
|
168
|
+
- @forge/cli-shared@8.8.1-next.5
|
|
169
|
+
- @forge/lint@5.11.6-next.9
|
|
170
|
+
- @forge/tunnel@6.3.1-next.9
|
|
30
171
|
|
|
31
172
|
## 12.7.1-next.9
|
|
32
173
|
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,24 +1,24 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/cli",
|
|
3
|
-
"version": "12.7.
|
|
3
|
+
"version": "12.7.2-next.8",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "@forge/cli",
|
|
9
|
-
"version": "12.7.
|
|
9
|
+
"version": "12.7.2-next.8",
|
|
10
10
|
"hasInstallScript": true,
|
|
11
11
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@forge/bundler": "6.1.
|
|
14
|
-
"@forge/cli-shared": "8.8.
|
|
15
|
-
"@forge/egress": "2.1.1
|
|
13
|
+
"@forge/bundler": "6.1.11-next.8",
|
|
14
|
+
"@forge/cli-shared": "8.8.2-next.5",
|
|
15
|
+
"@forge/egress": "2.1.1",
|
|
16
16
|
"@forge/i18n": "0.0.7",
|
|
17
|
-
"@forge/lint": "5.
|
|
18
|
-
"@forge/manifest": "
|
|
19
|
-
"@forge/runtime": "6.1.1
|
|
20
|
-
"@forge/tunnel": "6.3.
|
|
21
|
-
"@forge/util": "2.0.1
|
|
17
|
+
"@forge/lint": "5.12.0-next.8",
|
|
18
|
+
"@forge/manifest": "11.0.0-next.3",
|
|
19
|
+
"@forge/runtime": "6.1.1",
|
|
20
|
+
"@forge/tunnel": "6.3.2-next.8",
|
|
21
|
+
"@forge/util": "2.0.1",
|
|
22
22
|
"@sentry/node": "7.106.0",
|
|
23
23
|
"ajv": "^8.12.0",
|
|
24
24
|
"archiver": "^7.0.1",
|
|
@@ -549,9 +549,9 @@
|
|
|
549
549
|
}
|
|
550
550
|
},
|
|
551
551
|
"node_modules/@forge/bundler": {
|
|
552
|
-
"version": "6.1.
|
|
553
|
-
"resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-6.1.
|
|
554
|
-
"integrity": "sha512-
|
|
552
|
+
"version": "6.1.11-next.8",
|
|
553
|
+
"resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-6.1.11-next.8.tgz",
|
|
554
|
+
"integrity": "sha512-Un/PKx8+4rj5MdTpyvBjUVg2Bv2yd1vIMq9y5rEb1Hr6toVtVF8nxNzQ0PIF9JeXDsmVNZwTcamU8oZZYKruGA==",
|
|
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.
|
|
566
|
+
"@forge/cli-shared": "8.8.2-next.5",
|
|
567
567
|
"@forge/i18n": "0.0.7",
|
|
568
|
-
"@forge/lint": "5.
|
|
569
|
-
"@forge/manifest": "
|
|
568
|
+
"@forge/lint": "5.12.0-next.8",
|
|
569
|
+
"@forge/manifest": "11.0.0-next.3",
|
|
570
570
|
"babel-loader": "^8.3.0",
|
|
571
571
|
"cheerio": "^1.1.0",
|
|
572
572
|
"cross-spawn": "^7.0.6",
|
|
@@ -586,14 +586,14 @@
|
|
|
586
586
|
}
|
|
587
587
|
},
|
|
588
588
|
"node_modules/@forge/cli-shared": {
|
|
589
|
-
"version": "8.8.
|
|
590
|
-
"resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-8.8.
|
|
591
|
-
"integrity": "sha512
|
|
589
|
+
"version": "8.8.2-next.5",
|
|
590
|
+
"resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-8.8.2-next.5.tgz",
|
|
591
|
+
"integrity": "sha512-+qTqSStBJZWUyV7SM7kMc50ltD05WUzZMwHGV3jg3fv5QI8DSSo0jLG3m1j7qMDWWod42Po+6fXOHpSWUSGGIw==",
|
|
592
592
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
593
593
|
"dependencies": {
|
|
594
594
|
"@forge/i18n": "0.0.7",
|
|
595
|
-
"@forge/manifest": "
|
|
596
|
-
"@forge/util": "2.0.1
|
|
595
|
+
"@forge/manifest": "11.0.0-next.3",
|
|
596
|
+
"@forge/util": "2.0.1",
|
|
597
597
|
"@sentry/node": "7.106.0",
|
|
598
598
|
"adm-zip": "^0.5.10",
|
|
599
599
|
"array.prototype.flatmap": "^1.3.3",
|
|
@@ -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.
|
|
629
|
-
"resolved": "https://registry.npmjs.org/@forge/csp/-/csp-5.
|
|
630
|
-
"integrity": "sha512-
|
|
629
|
+
"version": "5.3.0-next.1",
|
|
630
|
+
"resolved": "https://registry.npmjs.org/@forge/csp/-/csp-5.3.0-next.1.tgz",
|
|
631
|
+
"integrity": "sha512-3nC41BHwN0CQnqD4Ky2/y8EPRepLiD38E9qPeFrSf4xP9aHVcU8FYTo9LfuJDh/fq2khesjZvK12YXad6qJmsg==",
|
|
631
632
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
632
633
|
"dependencies": {
|
|
633
634
|
"content-security-policy-parser": "^0.5.0"
|
|
@@ -642,9 +643,9 @@
|
|
|
642
643
|
}
|
|
643
644
|
},
|
|
644
645
|
"node_modules/@forge/egress": {
|
|
645
|
-
"version": "2.1.1
|
|
646
|
-
"resolved": "https://registry.npmjs.org/@forge/egress/-/egress-2.1.1
|
|
647
|
-
"integrity": "sha512-
|
|
646
|
+
"version": "2.1.1",
|
|
647
|
+
"resolved": "https://registry.npmjs.org/@forge/egress/-/egress-2.1.1.tgz",
|
|
648
|
+
"integrity": "sha512-ASgvdOLPQc/m+Aj3EN5eAdsGz8ZCP8A/+LlgGm5jBqEjRqy5UrCEdszF0lJBXsZzTTmVXTh6aePbfPPpGJTSlg==",
|
|
648
649
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
649
650
|
"dependencies": {
|
|
650
651
|
"minimatch": "^9.0.5"
|
|
@@ -660,16 +661,16 @@
|
|
|
660
661
|
}
|
|
661
662
|
},
|
|
662
663
|
"node_modules/@forge/lint": {
|
|
663
|
-
"version": "5.
|
|
664
|
-
"resolved": "https://registry.npmjs.org/@forge/lint/-/lint-5.
|
|
665
|
-
"integrity": "sha512-
|
|
664
|
+
"version": "5.12.0-next.8",
|
|
665
|
+
"resolved": "https://registry.npmjs.org/@forge/lint/-/lint-5.12.0-next.8.tgz",
|
|
666
|
+
"integrity": "sha512-6kgwG1M5tTQxLX11qtVdsJHtwTkJO39tBTuLQwr8gzZ+Bbu+d9oyQhER+UgQ5HMlfoE0oHB1QWsrM7I3yGIDpw==",
|
|
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.
|
|
670
|
-
"@forge/csp": "5.
|
|
671
|
-
"@forge/egress": "2.1.1
|
|
672
|
-
"@forge/manifest": "
|
|
670
|
+
"@forge/cli-shared": "8.8.2-next.5",
|
|
671
|
+
"@forge/csp": "5.3.0-next.1",
|
|
672
|
+
"@forge/egress": "2.1.1",
|
|
673
|
+
"@forge/manifest": "11.0.0-next.3",
|
|
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": "
|
|
681
|
-
"resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-
|
|
682
|
-
"integrity": "sha512-
|
|
681
|
+
"version": "11.0.0-next.3",
|
|
682
|
+
"resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-11.0.0-next.3.tgz",
|
|
683
|
+
"integrity": "sha512-O3WQNa78smatkcl/sZG09/yvB5oZkJ4BoxEwuhwMdg6fXdta26QQD2Pt5DfO6J0edcrSW+ZTvYlfsyZzTRbcOg==",
|
|
683
684
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
684
685
|
"dependencies": {
|
|
685
686
|
"@forge/i18n": "0.0.7",
|
|
@@ -694,22 +695,22 @@
|
|
|
694
695
|
}
|
|
695
696
|
},
|
|
696
697
|
"node_modules/@forge/runtime": {
|
|
697
|
-
"version": "6.1.1
|
|
698
|
-
"resolved": "https://registry.npmjs.org/@forge/runtime/-/runtime-6.1.1
|
|
699
|
-
"integrity": "sha512-
|
|
698
|
+
"version": "6.1.1",
|
|
699
|
+
"resolved": "https://registry.npmjs.org/@forge/runtime/-/runtime-6.1.1.tgz",
|
|
700
|
+
"integrity": "sha512-7S8Uv9qBSJllpPzBBawbSPgPbec7t9hCkGrXCyBMZCrVMDmoWah8z9jhWOpaDxOs4Lqxz4uYPQLFIPfluwZWpg==",
|
|
700
701
|
"license": "SEE LICENSE IN LICENSE.txt"
|
|
701
702
|
},
|
|
702
703
|
"node_modules/@forge/tunnel": {
|
|
703
|
-
"version": "6.3.
|
|
704
|
-
"resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-6.3.
|
|
705
|
-
"integrity": "sha512-
|
|
704
|
+
"version": "6.3.2-next.8",
|
|
705
|
+
"resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-6.3.2-next.8.tgz",
|
|
706
|
+
"integrity": "sha512-9i+HHEr9FW5PxF/lE4pRZ6Uemw0SXoOp2LaA+PdafEJaqL4H2E7XjVlDW7GDZsM7ah7+ME2RV1XxZ06a5IJXzA==",
|
|
706
707
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
707
708
|
"dependencies": {
|
|
708
|
-
"@forge/bundler": "6.1.
|
|
709
|
-
"@forge/cli-shared": "8.8.
|
|
710
|
-
"@forge/csp": "5.
|
|
711
|
-
"@forge/runtime": "6.1.1
|
|
712
|
-
"@forge/util": "^2.0.1
|
|
709
|
+
"@forge/bundler": "6.1.11-next.8",
|
|
710
|
+
"@forge/cli-shared": "8.8.2-next.5",
|
|
711
|
+
"@forge/csp": "5.3.0-next.1",
|
|
712
|
+
"@forge/runtime": "6.1.1",
|
|
713
|
+
"@forge/util": "^2.0.1",
|
|
713
714
|
"cheerio": "^1.1.0",
|
|
714
715
|
"chokidar": "^3.6.0",
|
|
715
716
|
"cloudflared": "^0.7.0",
|
|
@@ -727,9 +728,9 @@
|
|
|
727
728
|
}
|
|
728
729
|
},
|
|
729
730
|
"node_modules/@forge/util": {
|
|
730
|
-
"version": "2.0.1
|
|
731
|
-
"resolved": "https://registry.npmjs.org/@forge/util/-/util-2.0.1
|
|
732
|
-
"integrity": "sha512-
|
|
731
|
+
"version": "2.0.1",
|
|
732
|
+
"resolved": "https://registry.npmjs.org/@forge/util/-/util-2.0.1.tgz",
|
|
733
|
+
"integrity": "sha512-fYRpxdlGoB/r+E81s8/FVzjijs85mWgJPpEiqa5uG7qLz22EeaMBrpcu6to+NyKX2gfGR1hxjfiSnXOLzxYRfg==",
|
|
733
734
|
"license": "SEE LICENSE IN LICENSE.txt"
|
|
734
735
|
},
|
|
735
736
|
"node_modules/@graphql-typed-document-node/core": {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AppConfigProvider } from '@forge/cli-shared';
|
|
2
2
|
import { CachedConfigService } from '../../service/cached-config-service';
|
|
3
3
|
import { SettingsView } from '../view/settings-view';
|
|
4
|
-
export declare const ALLOWED_SETTINGS: readonly ["usage-analytics", "default-environment"];
|
|
4
|
+
export declare const ALLOWED_SETTINGS: readonly ["usage-analytics", "default-environment", "seasonal-effects"];
|
|
5
5
|
export declare class SettingsController {
|
|
6
6
|
private readonly settingsView;
|
|
7
7
|
private readonly cachedConfigService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/settings-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAMlB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,eAAO,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"settings-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/settings-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAMlB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,eAAO,MAAM,gBAAgB,yEAA0E,CAAC;AAYxG,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAFZ,YAAY,EAAE,YAAY,EAC1B,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,iBAAiB;IAGlD,OAAO,CAAC,YAAY,CA+ClB;IAEF,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,gBAAgB;IAIX,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO;IAU3B,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAiB1D"}
|
|
@@ -4,7 +4,7 @@ exports.SettingsController = exports.ALLOWED_SETTINGS = void 0;
|
|
|
4
4
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
5
5
|
const manifest_1 = require("@forge/manifest");
|
|
6
6
|
const environment_1 = require("../environment");
|
|
7
|
-
exports.ALLOWED_SETTINGS = ['usage-analytics', 'default-environment'];
|
|
7
|
+
exports.ALLOWED_SETTINGS = ['usage-analytics', 'default-environment', 'seasonal-effects'];
|
|
8
8
|
class SettingsController {
|
|
9
9
|
settingsView;
|
|
10
10
|
cachedConfigService;
|
|
@@ -54,6 +54,14 @@ class SettingsController {
|
|
|
54
54
|
},
|
|
55
55
|
getDisplayValue: (value) => cli_shared_1.Text.env.displayEnvironment(value, cli_shared_1.AppEnvironmentType.Development),
|
|
56
56
|
additionalInfo: cli_shared_1.Text.settings.defaultEnvironment.info
|
|
57
|
+
},
|
|
58
|
+
'seasonal-effects': {
|
|
59
|
+
description: cli_shared_1.Text.settings.seasonalEffects.description,
|
|
60
|
+
get: async () => this.cachedConfigService.getSeasonalEffects(),
|
|
61
|
+
set: async (value) => {
|
|
62
|
+
const parsedValue = this.parseBoolean(value);
|
|
63
|
+
this.cachedConfigService.setSeasonalEffects(parsedValue);
|
|
64
|
+
}
|
|
57
65
|
}
|
|
58
66
|
};
|
|
59
67
|
parseBoolean(value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/settings-controller.ts"],"names":[],"mappings":";;;AAAA,kDAO2B;AAC3B,8CAAyC;AAEzC,gDAAgF;AAInE,QAAA,gBAAgB,GAAG,CAAC,iBAAiB,EAAE,qBAAqB,CAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"settings-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/settings-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,
|
|
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
|
|
38
|
+
const dockerComposeFilePaths = await (0, cli_shared_1.generateContainersDockerComposeFile)(services, appId, envId);
|
|
38
39
|
options.containersDockerComposeFiles = dockerComposeFilePaths;
|
|
39
|
-
|
|
40
|
-
|
|
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":"
|
|
1
|
+
{"version":3,"file":"tunnel-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,5 +9,7 @@ export declare class CachedConfigService {
|
|
|
9
9
|
setDefaultEnvironment(appId: string, preference: string): void;
|
|
10
10
|
getAssistantName(): string | null;
|
|
11
11
|
setAssistantName(name: string | null): void;
|
|
12
|
+
getSeasonalEffects(): boolean;
|
|
13
|
+
setSeasonalEffects(enabled: boolean): void;
|
|
12
14
|
}
|
|
13
15
|
//# sourceMappingURL=cached-config-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cached-config-service.d.ts","sourceRoot":"","sources":["../../src/service/cached-config-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"cached-config-service.d.ts","sourceRoot":"","sources":["../../src/service/cached-config-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAS/C,qBAAa,mBAAmB;IAClB,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,UAAU;IAE5C,uBAAuB,IAAI,OAAO,GAAG,SAAS;IAO9C,uBAAuB,CAAC,UAAU,EAAE,OAAO,GAAG,IAAI;IAIzD,OAAO,CAAC,sBAAsB;IAIvB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAMxD,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAM9D,gBAAgB,IAAI,MAAM,GAAG,IAAI;IAIjC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAQ3C,kBAAkB,IAAI,OAAO;IAS7B,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAGlD"}
|
|
@@ -4,6 +4,7 @@ exports.CachedConfigService = void 0;
|
|
|
4
4
|
const ANALYTICS_PREFERENCES_KEY = 'analytics-preferences';
|
|
5
5
|
const DEFAULT_ENVIRONMENT_KEY = 'default-environment';
|
|
6
6
|
const ASSISTANT_NAME_KEY = 'assistant-name';
|
|
7
|
+
const SEASONAL_EFFECTS_KEY = 'seasonal-effects';
|
|
7
8
|
class CachedConfigService {
|
|
8
9
|
cachedConf;
|
|
9
10
|
constructor(cachedConf) {
|
|
@@ -41,6 +42,15 @@ class CachedConfigService {
|
|
|
41
42
|
this.cachedConf.set(ASSISTANT_NAME_KEY, name);
|
|
42
43
|
}
|
|
43
44
|
}
|
|
45
|
+
getSeasonalEffects() {
|
|
46
|
+
if (process.env.FORGE_DISABLE_SEASONAL_EFFECTS) {
|
|
47
|
+
return false;
|
|
48
|
+
}
|
|
49
|
+
return this.cachedConf.get(SEASONAL_EFFECTS_KEY) ?? true;
|
|
50
|
+
}
|
|
51
|
+
setSeasonalEffects(enabled) {
|
|
52
|
+
this.cachedConf.set(SEASONAL_EFFECTS_KEY, enabled);
|
|
53
|
+
}
|
|
44
54
|
}
|
|
45
55
|
exports.CachedConfigService = CachedConfigService;
|
|
46
56
|
//# sourceMappingURL=cached-config-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cached-config-service.js","sourceRoot":"","sources":["../../src/service/cached-config-service.ts"],"names":[],"mappings":";;;AAEA,MAAM,yBAAyB,GAAG,uBAAuB,CAAC;AAC1D,MAAM,uBAAuB,GAAG,qBAAqB,CAAC;AACtD,MAAM,kBAAkB,GAAG,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"cached-config-service.js","sourceRoot":"","sources":["../../src/service/cached-config-service.ts"],"names":[],"mappings":";;;AAEA,MAAM,yBAAyB,GAAG,uBAAuB,CAAC;AAC1D,MAAM,uBAAuB,GAAG,qBAAqB,CAAC;AACtD,MAAM,kBAAkB,GAAG,gBAAgB,CAAC;AAC5C,MAAM,oBAAoB,GAAG,kBAAkB,CAAC;AAIhD,MAAa,mBAAmB;IACD;IAA7B,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAEhD,uBAAuB;QAC5B,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;YACvC,OAAO,KAAK,CAAC;SACd;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACxD,CAAC;IAEM,uBAAuB,CAAC,UAAmB;QAChD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAC;IAC7D,CAAC;IAEO,sBAAsB;QAC5B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAsB,uBAAuB,CAAC,IAAI,EAAE,CAAC;IACjF,CAAC;IAEM,qBAAqB,CAAC,KAAa;QACxC,MAAM,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAE1D,OAAO,mBAAmB,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAEM,qBAAqB,CAAC,KAAa,EAAE,UAAkB;QAC5D,MAAM,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC1D,mBAAmB,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC;QACxC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAsB,uBAAuB,EAAE,mBAAmB,CAAC,CAAC;IACzF,CAAC;IAEM,gBAAgB;QACrB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,IAAI,CAAC;IACzD,CAAC;IAEM,gBAAgB,CAAC,IAAmB;QACzC,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;SAC5C;aAAM;YACL,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;SAC/C;IACH,CAAC;IAEM,kBAAkB;QAEvB,IAAI,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE;YAC9C,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,IAAI,CAAC;IAC3D,CAAC;IAEM,kBAAkB,CAAC,OAAgB;QACxC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;CACF;AAtDD,kDAsDC"}
|
|
@@ -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,
|
|
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.
|
|
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,
|
|
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.
|
|
3
|
+
"version": "12.7.2-next.8",
|
|
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,15 +21,15 @@
|
|
|
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.
|
|
25
|
-
"@forge/cli-shared": "8.8.
|
|
26
|
-
"@forge/egress": "2.1.1
|
|
27
|
-
"@forge/lint": "5.
|
|
28
|
-
"@forge/manifest": "
|
|
24
|
+
"@forge/bundler": "6.1.11-next.8",
|
|
25
|
+
"@forge/cli-shared": "8.8.2-next.5",
|
|
26
|
+
"@forge/egress": "2.1.1",
|
|
27
|
+
"@forge/lint": "5.12.0-next.8",
|
|
28
|
+
"@forge/manifest": "11.0.0-next.3",
|
|
29
29
|
"@forge/i18n": "0.0.7",
|
|
30
|
-
"@forge/runtime": "6.1.1
|
|
31
|
-
"@forge/tunnel": "6.3.
|
|
32
|
-
"@forge/util": "2.0.1
|
|
30
|
+
"@forge/runtime": "6.1.1",
|
|
31
|
+
"@forge/tunnel": "6.3.2-next.8",
|
|
32
|
+
"@forge/util": "2.0.1",
|
|
33
33
|
"@sentry/node": "7.106.0",
|
|
34
34
|
"ajv": "^8.12.0",
|
|
35
35
|
"archiver": "^7.0.1",
|