@forge/cli 14.1.0-next.21-experimental-554d417 → 14.1.0
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 +146 -6
- package/npm-shrinkwrap.json +42 -40
- package/out/autocomplete/autocomplete-config.json +8 -0
- package/out/build/graphql-client.d.ts.map +1 -1
- package/out/build/graphql-client.js +10 -17
- package/out/build/graphql-client.js.map +1 -1
- package/out/command-line/controller/global-install-controller.d.ts +5 -2
- package/out/command-line/controller/global-install-controller.d.ts.map +1 -1
- package/out/command-line/controller/global-install-controller.js +7 -22
- package/out/command-line/controller/global-install-controller.js.map +1 -1
- package/out/command-line/controller/install-controller.d.ts.map +1 -1
- package/out/command-line/controller/install-controller.js +49 -29
- package/out/command-line/controller/install-controller.js.map +1 -1
- package/out/command-line/dependency-injection.js +1 -1
- package/out/command-line/dependency-injection.js.map +1 -1
- package/out/command-line/index.d.ts.map +1 -1
- package/out/command-line/index.js +1 -0
- package/out/command-line/index.js.map +1 -1
- package/out/command-line/register-app-commands.d.ts +2 -1
- package/out/command-line/register-app-commands.d.ts.map +1 -1
- package/out/command-line/register-app-commands.js +44 -70
- package/out/command-line/register-app-commands.js.map +1 -1
- package/out/command-line/register-environments-commands.d.ts.map +1 -1
- package/out/command-line/register-environments-commands.js +3 -1
- package/out/command-line/register-environments-commands.js.map +1 -1
- package/out/command-line/register-show-commands.js +1 -1
- package/out/command-line/register-show-commands.js.map +1 -1
- package/out/command-line/view/global-install-view.d.ts +1 -3
- package/out/command-line/view/global-install-view.d.ts.map +1 -1
- package/out/command-line/view/global-install-view.js +1 -11
- package/out/command-line/view/global-install-view.js.map +1 -1
- package/out/containers/container-command.d.ts.map +1 -1
- package/out/containers/container-command.js +40 -17
- package/out/containers/container-command.js.map +1 -1
- package/out/custom-scopes/repository.d.ts.map +1 -1
- package/out/custom-scopes/repository.js +11 -7
- package/out/custom-scopes/repository.js.map +1 -1
- package/out/deploy/deployer/deploy-monitor-graphql-client.d.ts.map +1 -1
- package/out/deploy/deployer/deploy-monitor-graphql-client.js +4 -3
- package/out/deploy/deployer/deploy-monitor-graphql-client.js.map +1 -1
- package/out/deploy/deployer/deployer.d.ts +2 -2
- package/out/deploy/deployer/deployer.d.ts.map +1 -1
- package/out/deploy/deployer/deployer.js +16 -9
- package/out/deploy/deployer/deployer.js.map +1 -1
- package/out/deploy/deployer/trigger-deploy-graphql-client.d.ts.map +1 -1
- package/out/deploy/deployer/trigger-deploy-graphql-client.js +4 -3
- package/out/deploy/deployer/trigger-deploy-graphql-client.js.map +1 -1
- package/out/deploy/uploader/artifact-graphql-client.d.ts.map +1 -1
- package/out/deploy/uploader/artifact-graphql-client.js +13 -10
- package/out/deploy/uploader/artifact-graphql-client.js.map +1 -1
- package/out/deployments/deployments-graphql-client.d.ts +6 -0
- package/out/deployments/deployments-graphql-client.d.ts.map +1 -1
- package/out/deployments/deployments-graphql-client.js +45 -38
- package/out/deployments/deployments-graphql-client.js.map +1 -1
- package/out/devspace/graphql-client.d.ts.map +1 -1
- package/out/devspace/graphql-client.js +23 -12
- package/out/devspace/graphql-client.js.map +1 -1
- package/out/eligibility/graphql-client.d.ts.map +1 -1
- package/out/eligibility/graphql-client.js +8 -3
- package/out/eligibility/graphql-client.js.map +1 -1
- package/out/entities/graphql-client.d.ts.map +1 -1
- package/out/entities/graphql-client.js +5 -6
- package/out/entities/graphql-client.js.map +1 -1
- package/out/environment/graphql-client.d.ts.map +1 -1
- package/out/environment/graphql-client.js +14 -20
- package/out/environment/graphql-client.js.map +1 -1
- package/out/environment-variables/graphql-client.d.ts.map +1 -1
- package/out/environment-variables/graphql-client.js +10 -8
- package/out/environment-variables/graphql-client.js.map +1 -1
- package/out/installations/graphql-client.d.ts +0 -1
- package/out/installations/graphql-client.d.ts.map +1 -1
- package/out/installations/graphql-client.js +90 -75
- package/out/installations/graphql-client.js.map +1 -1
- package/out/installations/install-app-unit.d.ts +0 -1
- package/out/installations/install-app-unit.d.ts.map +1 -1
- package/out/installations/site-translation/sited-products.d.ts.map +1 -1
- package/out/installations/site-translation/sited-products.js +20 -20
- package/out/installations/site-translation/sited-products.js.map +1 -1
- package/out/manifest/render.d.ts.map +1 -1
- package/out/manifest/render.js +2 -2
- package/out/manifest/render.js.map +1 -1
- package/out/migration-keys/graphql-client.d.ts.map +1 -1
- package/out/migration-keys/graphql-client.js +50 -25
- package/out/migration-keys/graphql-client.js.map +1 -1
- package/out/providers/graphql-client.d.ts.map +1 -1
- package/out/providers/graphql-client.js +4 -3
- package/out/providers/graphql-client.js.map +1 -1
- package/out/rollout/graphql-client.d.ts.map +1 -1
- package/out/rollout/graphql-client.js +6 -7
- package/out/rollout/graphql-client.js.map +1 -1
- package/out/service/extensions-service.d.ts.map +1 -1
- package/out/service/extensions-service.js +10 -8
- package/out/service/extensions-service.js.map +1 -1
- package/out/service/installation-service.d.ts +2 -1
- package/out/service/installation-service.d.ts.map +1 -1
- package/out/service/installation-service.js +4 -0
- package/out/service/installation-service.js.map +1 -1
- package/out/service/version-service.d.ts.map +1 -1
- package/out/service/version-service.js +17 -13
- package/out/service/version-service.js.map +1 -1
- package/out/site/graphql-client.d.ts.map +1 -1
- package/out/site/graphql-client.js +6 -6
- package/out/site/graphql-client.js.map +1 -1
- package/out/version/graphql-client.d.ts +1 -1
- package/out/version/graphql-client.d.ts.map +1 -1
- package/out/version/graphql-client.js +56 -53
- package/out/version/graphql-client.js.map +1 -1
- package/out/webtrigger/graphql-client.d.ts.map +1 -1
- package/out/webtrigger/graphql-client.js +31 -29
- package/out/webtrigger/graphql-client.js.map +1 -1
- package/package.json +9 -7
package/CHANGELOG.md
CHANGED
|
@@ -1,53 +1,193 @@
|
|
|
1
1
|
# @forge/cli
|
|
2
2
|
|
|
3
|
-
## 14.1.0
|
|
3
|
+
## 14.1.0
|
|
4
4
|
|
|
5
5
|
### Minor Changes
|
|
6
6
|
|
|
7
|
+
- c2f6468: Removed the "Global (EAP)" product option from `forge create`. Global templates are now listed under the Jira, Confluence, and Multiple products, and set `app.compatibility` to match the selected product. The global product in `forge module add` is now labelled "Global".
|
|
7
8
|
- 82730f2: Added container services to version details tables, interactive property selection, version summaries, and comparison tables.
|
|
8
9
|
- dc2caec: Added container service definitions and counts to version JSON and file output, including comparison files.
|
|
9
10
|
- 9f27f8a: Update uninstall flow to improve user experience and support global apps
|
|
10
11
|
- cf81630: Wire up global apps installer into existing flow for EAP
|
|
11
12
|
- a384019: Add identity client for listing orgs and units
|
|
12
13
|
- 9d391ab: `forge show services` and `forge show containers` now read every placement the app is deployed to, by paginating the `appContainerServices` query instead of reading only the first placement. Both commands report which placement each service and container runs in, so a service deployed to more than one placement is no longer collapsed into a single row.
|
|
14
|
+
- 9869ca2: Make the `forge show services` and `forge show containers` commands public. `forge show` is no longer hidden from `forge --help`, and is listed under the "Manage" help group alongside `forge containers`.
|
|
13
15
|
- 988dff5: Replace the `--shard` option on the `forge show` commands with `--placement`, which takes a bare placement ID such as `ic-dr6` or `us-east-1`. The `appContainerServices` query now filters on `PLACEMENT` using a fully qualified `EcosystemAppPlacementAri`, with the placement type derived from the ID.
|
|
14
16
|
- 4740d03: Add new controller and ui to support global install flow EAP
|
|
15
17
|
|
|
16
18
|
### Patch Changes
|
|
17
19
|
|
|
18
20
|
- 2a491b9: Increase the timeout for deployment artifact and hosted resource uploads from 30s to 5 minutes.
|
|
21
|
+
- fb0dbe8: Global app installs no longer mark connections as linked, so you can connect the same Atlassian app or platform tool more than once (for example, multiple Jira sites).
|
|
22
|
+
- c0b2b2a: Support global apps install for app-id-override flag
|
|
19
23
|
- 93f4631: Improved artifact too large error messages to include limits
|
|
20
24
|
- b77e195: Improved rendering performance for multiline tables, including `forge version compare`.
|
|
25
|
+
- 78af9a2: Always bundle the Node runtime loader, removing the forge-cli-bundle-runtime-loader feature gate
|
|
26
|
+
- 797ac88: Add tests for manual packaging
|
|
21
27
|
- ea3b2ba: Implement error message for deployment failure due to exceededing file size for skill directory
|
|
22
28
|
- e7f5975: Bump undici to 7.29.1 to fix a TLS certificate validation bypass via dropped connect options in BalancedPool.
|
|
23
29
|
- b0f042b: Update global apps uninstall to use unit ari instead of installation id in interactive mode
|
|
24
30
|
- c9d9fb9: Add CLI smoke tests for valid rovo skills
|
|
25
31
|
- ac7b04b: Remove EAP status of dashboards widget and background scripts
|
|
32
|
+
- 3e160b1: Generate GraphQL types from CLI `graphql()` documents with `@graphql-codegen/client-preset` and `onlyOperationTypes`. Stop star-exporting the 27MB gateway dump from `@forge/cli-shared`.
|
|
26
33
|
- 777ea86: Fixed the container service details return type to match the GraphQL services selection, resolving CLI build errors.
|
|
27
34
|
- Updated dependencies [2a491b9]
|
|
35
|
+
- Updated dependencies [c2f6468]
|
|
36
|
+
- Updated dependencies [fb0dbe8]
|
|
28
37
|
- Updated dependencies [82730f2]
|
|
29
38
|
- Updated dependencies [dc2caec]
|
|
30
39
|
- Updated dependencies [b090628]
|
|
31
40
|
- Updated dependencies [385ac1a]
|
|
32
41
|
- Updated dependencies [9f27f8a]
|
|
42
|
+
- Updated dependencies [c0b2b2a]
|
|
33
43
|
- Updated dependencies [cf81630]
|
|
34
44
|
- Updated dependencies [a384019]
|
|
45
|
+
- Updated dependencies [e7dc317]
|
|
35
46
|
- Updated dependencies [56fd47c]
|
|
36
47
|
- Updated dependencies [9d391ab]
|
|
48
|
+
- Updated dependencies [5932866]
|
|
37
49
|
- Updated dependencies [988dff5]
|
|
38
50
|
- Updated dependencies [93f4631]
|
|
39
51
|
- Updated dependencies [b77e195]
|
|
52
|
+
- Updated dependencies [78af9a2]
|
|
53
|
+
- Updated dependencies [797ac88]
|
|
40
54
|
- Updated dependencies [ea3b2ba]
|
|
41
55
|
- Updated dependencies [4740d03]
|
|
42
56
|
- Updated dependencies [3012e11]
|
|
43
57
|
- Updated dependencies [2d36913]
|
|
44
58
|
- Updated dependencies [bf90ab4]
|
|
59
|
+
- Updated dependencies [3e160b1]
|
|
60
|
+
- Updated dependencies [537590c]
|
|
45
61
|
- Updated dependencies [ce74751]
|
|
46
|
-
|
|
47
|
-
- @forge/
|
|
48
|
-
- @forge/
|
|
49
|
-
- @forge/
|
|
50
|
-
- @forge/bundler@7.2.3
|
|
62
|
+
- Updated dependencies [608da16]
|
|
63
|
+
- @forge/cli-shared@9.7.0
|
|
64
|
+
- @forge/manifest@13.6.0
|
|
65
|
+
- @forge/lint@6.3.0
|
|
66
|
+
- @forge/bundler@7.2.3
|
|
67
|
+
- @forge/tunnel@7.2.0
|
|
68
|
+
|
|
69
|
+
## 14.1.0-next.32
|
|
70
|
+
|
|
71
|
+
### Patch Changes
|
|
72
|
+
|
|
73
|
+
- Updated dependencies [537590c]
|
|
74
|
+
- @forge/manifest@13.6.0-next.5
|
|
75
|
+
- @forge/bundler@7.2.3-next.26
|
|
76
|
+
- @forge/cli-shared@9.7.0-next.25
|
|
77
|
+
- @forge/lint@6.3.0-next.26
|
|
78
|
+
- @forge/tunnel@7.2.0-next.27
|
|
79
|
+
|
|
80
|
+
## 14.1.0-next.31
|
|
81
|
+
|
|
82
|
+
### Minor Changes
|
|
83
|
+
|
|
84
|
+
- c2f6468: Removed the "Global (EAP)" product option from `forge create`. Global templates are now listed under the Jira, Confluence, and Multiple products, and set `app.compatibility` to match the selected product. The global product in `forge module add` is now labelled "Global".
|
|
85
|
+
|
|
86
|
+
### Patch Changes
|
|
87
|
+
|
|
88
|
+
- Updated dependencies [c2f6468]
|
|
89
|
+
- @forge/cli-shared@9.7.0-next.24
|
|
90
|
+
- @forge/bundler@7.2.3-next.25
|
|
91
|
+
- @forge/lint@6.3.0-next.25
|
|
92
|
+
- @forge/tunnel@7.2.0-next.26
|
|
93
|
+
|
|
94
|
+
## 14.1.0-next.30
|
|
95
|
+
|
|
96
|
+
### Patch Changes
|
|
97
|
+
|
|
98
|
+
- 3e160b1: Generate GraphQL types from CLI `graphql()` documents with `@graphql-codegen/client-preset` and `onlyOperationTypes`. Stop star-exporting the 27MB gateway dump from `@forge/cli-shared`.
|
|
99
|
+
- Updated dependencies [3e160b1]
|
|
100
|
+
- @forge/cli-shared@9.7.0-next.23
|
|
101
|
+
- @forge/lint@6.3.0-next.24
|
|
102
|
+
- @forge/tunnel@7.2.0-next.25
|
|
103
|
+
- @forge/bundler@7.2.3-next.24
|
|
104
|
+
|
|
105
|
+
## 14.1.0-next.29
|
|
106
|
+
|
|
107
|
+
### Patch Changes
|
|
108
|
+
|
|
109
|
+
- Updated dependencies [5932866]
|
|
110
|
+
- @forge/manifest@13.6.0-next.4
|
|
111
|
+
- @forge/bundler@7.2.3-next.23
|
|
112
|
+
- @forge/cli-shared@9.7.0-next.22
|
|
113
|
+
- @forge/lint@6.3.0-next.23
|
|
114
|
+
- @forge/tunnel@7.2.0-next.24
|
|
115
|
+
|
|
116
|
+
## 14.1.0-next.28
|
|
117
|
+
|
|
118
|
+
### Patch Changes
|
|
119
|
+
|
|
120
|
+
- Updated dependencies [e7dc317]
|
|
121
|
+
- @forge/lint@6.3.0-next.22
|
|
122
|
+
- @forge/cli-shared@9.7.0-next.21
|
|
123
|
+
- @forge/manifest@13.6.0-next.3
|
|
124
|
+
- @forge/bundler@7.2.3-next.22
|
|
125
|
+
- @forge/tunnel@7.2.0-next.23
|
|
126
|
+
|
|
127
|
+
## 14.1.0-next.27
|
|
128
|
+
|
|
129
|
+
### Patch Changes
|
|
130
|
+
|
|
131
|
+
- fb0dbe8: Global app installs no longer mark connections as linked, so you can connect the same Atlassian app or platform tool more than once (for example, multiple Jira sites).
|
|
132
|
+
- Updated dependencies [fb0dbe8]
|
|
133
|
+
- @forge/cli-shared@9.7.0-next.20
|
|
134
|
+
- @forge/bundler@7.2.3-next.21
|
|
135
|
+
- @forge/lint@6.2.3-next.21
|
|
136
|
+
- @forge/tunnel@7.2.0-next.22
|
|
137
|
+
|
|
138
|
+
## 14.1.0-next.26
|
|
139
|
+
|
|
140
|
+
### Patch Changes
|
|
141
|
+
|
|
142
|
+
- Updated dependencies [608da16]
|
|
143
|
+
- @forge/cli-shared@9.7.0-next.19
|
|
144
|
+
- @forge/bundler@7.2.3-next.20
|
|
145
|
+
- @forge/lint@6.2.3-next.20
|
|
146
|
+
- @forge/tunnel@7.2.0-next.21
|
|
147
|
+
|
|
148
|
+
## 14.1.0-next.25
|
|
149
|
+
|
|
150
|
+
### Minor Changes
|
|
151
|
+
|
|
152
|
+
- cf81630: Wire up global apps installer into existing flow for EAP
|
|
153
|
+
|
|
154
|
+
### Patch Changes
|
|
155
|
+
|
|
156
|
+
- c0b2b2a: Support global apps install for app-id-override flag
|
|
157
|
+
- Updated dependencies [c0b2b2a]
|
|
158
|
+
- Updated dependencies [cf81630]
|
|
159
|
+
- @forge/cli-shared@9.7.0-next.18
|
|
160
|
+
- @forge/bundler@7.2.3-next.19
|
|
161
|
+
- @forge/lint@6.2.3-next.19
|
|
162
|
+
- @forge/tunnel@7.2.0-next.20
|
|
163
|
+
|
|
164
|
+
## 14.1.0-next.24
|
|
165
|
+
|
|
166
|
+
### Patch Changes
|
|
167
|
+
|
|
168
|
+
- 797ac88: Add tests for manual packaging
|
|
169
|
+
- Updated dependencies [797ac88]
|
|
170
|
+
- @forge/cli-shared@9.7.0-next.17
|
|
171
|
+
- @forge/bundler@7.2.3-next.18
|
|
172
|
+
- @forge/lint@6.2.3-next.18
|
|
173
|
+
- @forge/tunnel@7.2.0-next.19
|
|
174
|
+
|
|
175
|
+
## 14.1.0-next.23
|
|
176
|
+
|
|
177
|
+
### Patch Changes
|
|
178
|
+
|
|
179
|
+
- 78af9a2: Always bundle the Node runtime loader, removing the forge-cli-bundle-runtime-loader feature gate
|
|
180
|
+
- Updated dependencies [78af9a2]
|
|
181
|
+
- @forge/bundler@7.2.3-next.17
|
|
182
|
+
- @forge/cli-shared@9.7.0-next.16
|
|
183
|
+
- @forge/tunnel@7.2.0-next.18
|
|
184
|
+
- @forge/lint@6.2.3-next.17
|
|
185
|
+
|
|
186
|
+
## 14.1.0-next.22
|
|
187
|
+
|
|
188
|
+
### Minor Changes
|
|
189
|
+
|
|
190
|
+
- 9869ca2: Make the `forge show services` and `forge show containers` commands public. `forge show` is no longer hidden from `forge --help`, and is listed under the "Manage" help group alongside `forge containers`.
|
|
51
191
|
|
|
52
192
|
## 14.1.0-next.21
|
|
53
193
|
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/cli",
|
|
3
|
-
"version": "14.1.0
|
|
3
|
+
"version": "14.1.0",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "@forge/cli",
|
|
9
|
-
"version": "14.1.0
|
|
9
|
+
"version": "14.1.0",
|
|
10
10
|
"hasInstallScript": true,
|
|
11
11
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@forge/bundler": "7.2.3
|
|
14
|
-
"@forge/cli-shared": "9.7.0
|
|
13
|
+
"@forge/bundler": "7.2.3",
|
|
14
|
+
"@forge/cli-shared": "9.7.0",
|
|
15
15
|
"@forge/egress": "3.0.0",
|
|
16
16
|
"@forge/i18n": "1.0.0",
|
|
17
|
-
"@forge/lint": "6.
|
|
18
|
-
"@forge/manifest": "13.6.0
|
|
17
|
+
"@forge/lint": "6.3.0",
|
|
18
|
+
"@forge/manifest": "13.6.0",
|
|
19
19
|
"@forge/runtime": "7.0.0",
|
|
20
|
-
"@forge/tunnel": "7.2.0
|
|
20
|
+
"@forge/tunnel": "7.2.0",
|
|
21
21
|
"@forge/util": "3.0.0",
|
|
22
22
|
"@sentry/node": "7.106.0",
|
|
23
23
|
"ajv": "^8.18.0",
|
|
@@ -73,6 +73,7 @@
|
|
|
73
73
|
"@types/tmp": "^0.2.6",
|
|
74
74
|
"adm-zip": "^0.6.0",
|
|
75
75
|
"chokidar": "^4.0.3",
|
|
76
|
+
"esbuild": "^0.28.2",
|
|
76
77
|
"jest": "^29.7.0",
|
|
77
78
|
"jest-matcher-specific-error": "^1.0.0",
|
|
78
79
|
"jest-when": "^3.6.0",
|
|
@@ -81,7 +82,8 @@
|
|
|
81
82
|
"memfs": "4.57.7",
|
|
82
83
|
"sentry-testkit": "^5.0.10",
|
|
83
84
|
"type-fest": "4.10.2",
|
|
84
|
-
"typescript": "5.9.2"
|
|
85
|
+
"typescript": "5.9.2",
|
|
86
|
+
"vite": "^5.4.19"
|
|
85
87
|
},
|
|
86
88
|
"engines": {
|
|
87
89
|
"node": ">=20.18.1"
|
|
@@ -543,9 +545,9 @@
|
|
|
543
545
|
}
|
|
544
546
|
},
|
|
545
547
|
"node_modules/@forge/bundler": {
|
|
546
|
-
"version": "7.2.3
|
|
547
|
-
"resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-7.2.3
|
|
548
|
-
"integrity": "sha512-
|
|
548
|
+
"version": "7.2.3",
|
|
549
|
+
"resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-7.2.3.tgz",
|
|
550
|
+
"integrity": "sha512-Ln4XuMOulWmTUaS+H8afXBClLDFuX3jWJocS0ErDozqP5ENOftXDL6rPtCl5xmIwzkzT+9y0EYqEQ/MSjsnC6A==",
|
|
549
551
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
550
552
|
"dependencies": {
|
|
551
553
|
"@babel/core": "^7.24.0",
|
|
@@ -557,10 +559,10 @@
|
|
|
557
559
|
"@babel/plugin-transform-react-jsx": "^7.23.4",
|
|
558
560
|
"@babel/traverse": "^7.24.0",
|
|
559
561
|
"@babel/types": "^7.24.0",
|
|
560
|
-
"@forge/cli-shared": "9.7.0
|
|
562
|
+
"@forge/cli-shared": "9.7.0",
|
|
561
563
|
"@forge/i18n": "1.0.0",
|
|
562
|
-
"@forge/lint": "6.
|
|
563
|
-
"@forge/manifest": "13.6.0
|
|
564
|
+
"@forge/lint": "6.3.0",
|
|
565
|
+
"@forge/manifest": "13.6.0",
|
|
564
566
|
"babel-loader": "^8.3.0",
|
|
565
567
|
"cheerio": "^1.2.0",
|
|
566
568
|
"chokidar": "^4.0.3",
|
|
@@ -589,13 +591,13 @@
|
|
|
589
591
|
}
|
|
590
592
|
},
|
|
591
593
|
"node_modules/@forge/cli-shared": {
|
|
592
|
-
"version": "9.7.0
|
|
593
|
-
"resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-9.7.0
|
|
594
|
-
"integrity": "sha512-
|
|
594
|
+
"version": "9.7.0",
|
|
595
|
+
"resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-9.7.0.tgz",
|
|
596
|
+
"integrity": "sha512-Kn6h87OxXgHPXereHBkfStp7SNp4yhcT+A3FNA1KN6ZqwssItfMM5a3zN8SvXKLCqQhlJsweZixsD1EuXTap+g==",
|
|
595
597
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
596
598
|
"dependencies": {
|
|
597
599
|
"@forge/i18n": "1.0.0",
|
|
598
|
-
"@forge/manifest": "13.6.0
|
|
600
|
+
"@forge/manifest": "13.6.0",
|
|
599
601
|
"@forge/util": "3.0.0",
|
|
600
602
|
"@sentry/node": "7.106.0",
|
|
601
603
|
"@vercel/detect-agent": "^1.2.3",
|
|
@@ -615,7 +617,7 @@
|
|
|
615
617
|
"fs-extra": "^11.2.0",
|
|
616
618
|
"get-folder-size": "^5.0.0",
|
|
617
619
|
"glob": "^13.0.0",
|
|
618
|
-
"graphql": "^16.
|
|
620
|
+
"graphql": "^16.14.0",
|
|
619
621
|
"graphql-request": "7.4.0",
|
|
620
622
|
"inquirer": "^8.2.6",
|
|
621
623
|
"inquirer-autocomplete-prompt": "^2.0.1",
|
|
@@ -640,9 +642,9 @@
|
|
|
640
642
|
}
|
|
641
643
|
},
|
|
642
644
|
"node_modules/@forge/csp": {
|
|
643
|
-
"version": "6.3.1
|
|
644
|
-
"resolved": "https://registry.npmjs.org/@forge/csp/-/csp-6.3.1
|
|
645
|
-
"integrity": "sha512-
|
|
645
|
+
"version": "6.3.1",
|
|
646
|
+
"resolved": "https://registry.npmjs.org/@forge/csp/-/csp-6.3.1.tgz",
|
|
647
|
+
"integrity": "sha512-3G20IOayG3gois5fAgU1ZvKygsCTRzzNV/PuWSu3twUN1F2Mci53X7b2knsNzKNXQiR5Itf78jf9+YPxssPcvg==",
|
|
646
648
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
647
649
|
"dependencies": {
|
|
648
650
|
"content-security-policy-parser": "^0.6.0"
|
|
@@ -692,16 +694,16 @@
|
|
|
692
694
|
}
|
|
693
695
|
},
|
|
694
696
|
"node_modules/@forge/lint": {
|
|
695
|
-
"version": "6.
|
|
696
|
-
"resolved": "https://registry.npmjs.org/@forge/lint/-/lint-6.
|
|
697
|
-
"integrity": "sha512-
|
|
697
|
+
"version": "6.3.0",
|
|
698
|
+
"resolved": "https://registry.npmjs.org/@forge/lint/-/lint-6.3.0.tgz",
|
|
699
|
+
"integrity": "sha512-CeyOMosZSYUOW8vHI7rUtKY359YT2XexQmf3MdMHmnmCgSJbK0EBsBBJdBjq8hPC5JME1tf9mTZiqf39DOhD0w==",
|
|
698
700
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
699
701
|
"dependencies": {
|
|
700
702
|
"@atlassian/atlassian-openapi": "^1.0.6",
|
|
701
|
-
"@forge/cli-shared": "9.7.0
|
|
702
|
-
"@forge/csp": "6.3.1
|
|
703
|
+
"@forge/cli-shared": "9.7.0",
|
|
704
|
+
"@forge/csp": "6.3.1",
|
|
703
705
|
"@forge/egress": "3.0.0",
|
|
704
|
-
"@forge/manifest": "13.6.0
|
|
706
|
+
"@forge/manifest": "13.6.0",
|
|
705
707
|
"@typescript-eslint/typescript-estree": "^5.62.0",
|
|
706
708
|
"archiver": "^8.0.0",
|
|
707
709
|
"array.prototype.flatmap": "^1.3.3",
|
|
@@ -719,9 +721,9 @@
|
|
|
719
721
|
}
|
|
720
722
|
},
|
|
721
723
|
"node_modules/@forge/manifest": {
|
|
722
|
-
"version": "13.6.0
|
|
723
|
-
"resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-13.6.0
|
|
724
|
-
"integrity": "sha512-
|
|
724
|
+
"version": "13.6.0",
|
|
725
|
+
"resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-13.6.0.tgz",
|
|
726
|
+
"integrity": "sha512-LgapC/jjIibdinF1SueF8Ouv0gTc6M8L2trFfMeFDmNsHmXN17coY/G7zxSh7zhWGTtbzFdL2wOBWf6rigZesg==",
|
|
725
727
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
726
728
|
"dependencies": {
|
|
727
729
|
"@forge/i18n": "1.0.0",
|
|
@@ -758,14 +760,14 @@
|
|
|
758
760
|
}
|
|
759
761
|
},
|
|
760
762
|
"node_modules/@forge/tunnel": {
|
|
761
|
-
"version": "7.2.0
|
|
762
|
-
"resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-7.2.0
|
|
763
|
-
"integrity": "sha512-
|
|
763
|
+
"version": "7.2.0",
|
|
764
|
+
"resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-7.2.0.tgz",
|
|
765
|
+
"integrity": "sha512-xWcDUwv5Qab7UDUSHkkKy3WFGgiaF1ns9/lw2SRce2vdF0zigckImcWS4D1vSzFPW+mqrMhwcOA3nKKU7CqLww==",
|
|
764
766
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
765
767
|
"dependencies": {
|
|
766
|
-
"@forge/bundler": "7.2.3
|
|
767
|
-
"@forge/cli-shared": "9.7.0
|
|
768
|
-
"@forge/csp": "6.3.1
|
|
768
|
+
"@forge/bundler": "7.2.3",
|
|
769
|
+
"@forge/cli-shared": "9.7.0",
|
|
770
|
+
"@forge/csp": "6.3.1",
|
|
769
771
|
"@forge/runtime": "7.0.0",
|
|
770
772
|
"@forge/util": "^3.0.0",
|
|
771
773
|
"cheerio": "^1.2.0",
|
|
@@ -4953,9 +4955,9 @@
|
|
|
4953
4955
|
"integrity": "sha1-QYPk6L8Iu24Fu7L30uDI9xLKQOM= sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
|
|
4954
4956
|
},
|
|
4955
4957
|
"node_modules/graphql": {
|
|
4956
|
-
"version": "16.
|
|
4957
|
-
"resolved": "https://registry.npmjs.org/graphql/-/graphql-16.
|
|
4958
|
-
"integrity": "sha1-
|
|
4958
|
+
"version": "16.14.2",
|
|
4959
|
+
"resolved": "https://registry.npmjs.org/graphql/-/graphql-16.14.2.tgz",
|
|
4960
|
+
"integrity": "sha1-g/ryWGnj33J8yFUWHbXahbDlssA= sha512-Chq1s4CY7jmh8gO2qvLIJyfCDIN+EHLFW/9iShnp1z8FjBQMoodWP1kDC36VAMXXIvAjj4ARa7ntfAV2BrjsbA==",
|
|
4959
4961
|
"engines": {
|
|
4960
4962
|
"node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
|
|
4961
4963
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/build/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/build/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,aAAa,EAAwC,MAAM,mBAAmB,CAAC;AACpH,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,eAAO,MAAM,SAAS,MAAM,CAAC;AAE7B,qBAAa,kBAAkB;IACjB,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;CA2ErF"}
|
|
@@ -9,17 +9,9 @@ class BuildGraphqlClient {
|
|
|
9
9
|
this.graphqlClient = graphqlClient;
|
|
10
10
|
}
|
|
11
11
|
async getAllBuildsByApp(appId, limit) {
|
|
12
|
-
const query = `
|
|
13
|
-
query getBuildsByApp(
|
|
14
|
-
$appId:
|
|
15
|
-
$last: Int
|
|
16
|
-
$before: String
|
|
17
|
-
) {
|
|
18
|
-
buildsByApp(
|
|
19
|
-
appId: $appId
|
|
20
|
-
last: $last
|
|
21
|
-
before: $before
|
|
22
|
-
) {
|
|
12
|
+
const query = (0, cli_shared_1.graphql)(`
|
|
13
|
+
query getBuildsByApp($appId: ID!, $last: Int, $before: String) {
|
|
14
|
+
buildsByApp(appId: $appId, last: $last, before: $before) {
|
|
23
15
|
nodes {
|
|
24
16
|
createdAt
|
|
25
17
|
tag
|
|
@@ -40,18 +32,19 @@ class BuildGraphqlClient {
|
|
|
40
32
|
totalCount
|
|
41
33
|
}
|
|
42
34
|
}
|
|
43
|
-
|
|
35
|
+
`);
|
|
44
36
|
let hasPreviousPage = true;
|
|
45
37
|
let cursor = undefined;
|
|
46
38
|
const output = [];
|
|
47
39
|
while (hasPreviousPage && (!limit || output.length < limit)) {
|
|
48
40
|
const remainingLimit = limit ? limit - output.length : exports.PAGE_SIZE;
|
|
49
41
|
const _limit = remainingLimit > 0 ? Math.min(exports.PAGE_SIZE, remainingLimit) : exports.PAGE_SIZE;
|
|
50
|
-
const
|
|
42
|
+
const variables = {
|
|
51
43
|
appId,
|
|
52
44
|
last: _limit,
|
|
53
45
|
before: cursor
|
|
54
|
-
}
|
|
46
|
+
};
|
|
47
|
+
const result = await this.graphqlClient.query(query, variables);
|
|
55
48
|
if (!result.buildsByApp?.nodes || !result.buildsByApp?.pageInfo) {
|
|
56
49
|
throw new cli_shared_1.MissingAppError();
|
|
57
50
|
}
|
|
@@ -65,8 +58,8 @@ class BuildGraphqlClient {
|
|
|
65
58
|
createdAt: node.createdAt,
|
|
66
59
|
tag: node.tag,
|
|
67
60
|
createdBy: {
|
|
68
|
-
name: node.createdByUser
|
|
69
|
-
email: node.createdByUser
|
|
61
|
+
name: node.createdByUser.name,
|
|
62
|
+
email: 'email' in node.createdByUser ? node.createdByUser.email || undefined : undefined
|
|
70
63
|
}
|
|
71
64
|
});
|
|
72
65
|
if (limit && output.length >= limit) {
|
|
@@ -75,7 +68,7 @@ class BuildGraphqlClient {
|
|
|
75
68
|
}
|
|
76
69
|
}
|
|
77
70
|
hasPreviousPage = pageInfo.hasPreviousPage;
|
|
78
|
-
cursor = pageInfo.endCursor;
|
|
71
|
+
cursor = pageInfo.endCursor ?? undefined;
|
|
79
72
|
}
|
|
80
73
|
return output;
|
|
81
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphql-client.js","sourceRoot":"","sources":["../../src/build/graphql-client.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"graphql-client.js","sourceRoot":"","sources":["../../src/build/graphql-client.ts"],"names":[],"mappings":";;;AAAA,kDAAoH;AAGvG,QAAA,SAAS,GAAG,GAAG,CAAC;AAE7B,MAAa,kBAAkB;IACA;IAA7B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAEtD,KAAK,CAAC,iBAAiB,CAAC,KAAa,EAAE,KAAc;QAC1D,MAAM,KAAK,GAAG,IAAA,oBAAO,EAAC;;;;;;;;;;;;;;;;;;;;;;;KAuBrB,CAAC,CAAC;QAEH,IAAI,eAAe,GAAG,IAAI,CAAC;QAC3B,IAAI,MAAM,GAAuB,SAAS,CAAC;QAC3C,MAAM,MAAM,GAAiB,EAAE,CAAC;QAEhC,OAAO,eAAe,IAAI,CAAC,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC,EAAE,CAAC;YAC5D,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,iBAAS,CAAC;YACjE,MAAM,MAAM,GAAG,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAS,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,iBAAS,CAAC;YACpF,MAAM,SAAS,GAAoC;gBACjD,KAAK;gBACL,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE,MAAM;aACf,CAAC;YAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YAEhE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,EAAE,CAAC;gBAChE,MAAM,IAAI,4BAAe,EAAE,CAAC;YAC9B,CAAC;YAED,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC;YAE/C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,IAAI,EAAE,CAAC;oBACT,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC;wBAC9B,MAAM,IAAI,gCAAmB,CAC3B,2DAA2D,IAAI,CAAC,GAAG,4BAA4B,CAChG,CAAC;oBACJ,CAAC;oBAED,MAAM,CAAC,IAAI,CAAC;wBACV,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,GAAG,EAAE,IAAI,CAAC,GAAG;wBAEb,SAAS,EAAE;4BACT,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI;4BAC7B,KAAK,EAAE,OAAO,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,IAAI,SAAS,CAAC,CAAC,CAAC,SAAS;yBACzF;qBACF,CAAC,CAAC;oBACH,IAAI,KAAK,IAAI,MAAM,CAAC,MAAM,IAAI,KAAK,EAAE,CAAC;wBACpC,MAAM;oBACR,CAAC;gBACH,CAAC;YACH,CAAC;YACD,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAC;YAC3C,MAAM,GAAG,QAAQ,CAAC,SAAS,IAAI,SAAS,CAAC;QAC3C,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AA9ED,gDA8EC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { URL } from 'url';
|
|
2
|
-
import { AppEnvironmentType, SupportedProductsService } from '@forge/cli-shared';
|
|
2
|
+
import { AppEnvironmentType, EcosystemAppInstallationOverridesInput, LicenseOverrideState, SupportedProductsService } from '@forge/cli-shared';
|
|
3
3
|
import { IdentityClient } from '../../service/identity/identity-client';
|
|
4
4
|
import { InstallAppUnitClient } from '../../installations/install-app-unit';
|
|
5
5
|
import { GlobalInstallView } from '../view/global-install-view';
|
|
@@ -14,6 +14,9 @@ export interface GlobalInstallProps {
|
|
|
14
14
|
environment: string;
|
|
15
15
|
nonInteractive?: boolean;
|
|
16
16
|
unitId?: string;
|
|
17
|
+
majorVersionId?: string;
|
|
18
|
+
licenseOverride?: LicenseOverrideState;
|
|
19
|
+
overrides?: EcosystemAppInstallationOverridesInput;
|
|
17
20
|
product?: string;
|
|
18
21
|
site?: URL;
|
|
19
22
|
}
|
|
@@ -32,7 +35,7 @@ export declare class GlobalInstallController {
|
|
|
32
35
|
private readonly installationService;
|
|
33
36
|
private readonly supportedProductsService;
|
|
34
37
|
constructor(view: GlobalInstallView, identityClient: IdentityClient, installUnitClient: InstallAppUnitClient, installationService: AppEnvironmentPermissionsReader, supportedProductsService: SupportedProductsService);
|
|
35
|
-
run({ appId, environment, nonInteractive, unitId, product, site }: GlobalInstallProps): Promise<void>;
|
|
38
|
+
run({ appId, environment, nonInteractive, unitId, majorVersionId, licenseOverride, overrides, product, site }: GlobalInstallProps): Promise<void>;
|
|
36
39
|
runUpgrade({ appId, environment, nonInteractive, unitId, majorVersionId, isCodeUpgrade }: GlobalUpgradeProps): Promise<void>;
|
|
37
40
|
private assertDeployed;
|
|
38
41
|
private resolveTarget;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global-install-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/global-install-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,
|
|
1
|
+
{"version":3,"file":"global-install-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/global-install-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EACL,kBAAkB,EAClB,sCAAsC,EACtC,oBAAoB,EACpB,wBAAwB,EAGzB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,cAAc,EAA6B,MAAM,wCAAwC,CAAC;AACnG,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAE5E,OAAO,EAAoC,iBAAiB,EAAiB,MAAM,6BAA6B,CAAC;AAGjH,MAAM,WAAW,+BAA+B;IAC9C,4BAA4B,CAC1B,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC;QAAE,cAAc,EAAE,OAAO,CAAC;QAAC,eAAe,EAAE,kBAAkB,CAAA;KAAE,GAAG,SAAS,CAAC,CAAC;CAC1F;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,oBAAoB,CAAC;IACvC,SAAS,CAAC,EAAE,sCAAsC,CAAC;IACnD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAUD,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,wBAAwB;gBAJxB,IAAI,EAAE,iBAAiB,EACvB,cAAc,EAAE,cAAc,EAC9B,iBAAiB,EAAE,oBAAoB,EACvC,mBAAmB,EAAE,+BAA+B,EACpD,wBAAwB,EAAE,wBAAwB;IAGxD,GAAG,CAAC,EACf,KAAK,EACL,WAAW,EACX,cAAc,EACd,MAAM,EACN,cAAc,EACd,eAAe,EACf,SAAS,EACT,OAAO,EACP,IAAI,EACL,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoDxB,UAAU,CAAC,EACtB,KAAK,EACL,WAAW,EACX,cAAc,EACd,MAAM,EACN,cAAc,EACd,aAAa,EACd,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;YAqCvB,cAAc;YAQd,aAAa;YASb,UAAU;YAcV,WAAW;YAmBX,eAAe;YAsCf,qBAAqB;YA4BrB,WAAW;IAWzB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,iBAAiB;CAM1B"}
|
|
@@ -21,7 +21,7 @@ class GlobalInstallController {
|
|
|
21
21
|
this.installationService = installationService;
|
|
22
22
|
this.supportedProductsService = supportedProductsService;
|
|
23
23
|
}
|
|
24
|
-
async run({ appId, environment, nonInteractive, unitId, product, site }) {
|
|
24
|
+
async run({ appId, environment, nonInteractive, unitId, majorVersionId, licenseOverride, overrides, product, site }) {
|
|
25
25
|
if ((product || site) && !unitId) {
|
|
26
26
|
throw new cli_shared_1.UserError(cli_shared_1.Text.install.global.error.connectRequiresUnit);
|
|
27
27
|
}
|
|
@@ -35,12 +35,10 @@ class GlobalInstallController {
|
|
|
35
35
|
const existingInstallationId = await this.installUnitClient.getUnitInstallationId(appId, environment, target.unitId);
|
|
36
36
|
if (existingInstallationId) {
|
|
37
37
|
this.view.showAlreadyInstalled(target);
|
|
38
|
-
const alreadyLinkedProducts = await this.installUnitClient.getLinkedConnectionProducts(appId, existingInstallationId);
|
|
39
38
|
await this.linkConnections({
|
|
40
39
|
environment,
|
|
41
40
|
installationId: existingInstallationId,
|
|
42
|
-
nonInteractive: isNonInteractive
|
|
43
|
-
alreadyLinkedProducts
|
|
41
|
+
nonInteractive: isNonInteractive
|
|
44
42
|
});
|
|
45
43
|
return;
|
|
46
44
|
}
|
|
@@ -52,6 +50,9 @@ class GlobalInstallController {
|
|
|
52
50
|
appId,
|
|
53
51
|
environmentKey: environment,
|
|
54
52
|
unitId: target.unitId,
|
|
53
|
+
majorVersionId,
|
|
54
|
+
licenseOverride,
|
|
55
|
+
overrides,
|
|
55
56
|
environmentType
|
|
56
57
|
}));
|
|
57
58
|
this.view.showInstallSuccess(environment, target);
|
|
@@ -132,18 +133,10 @@ class GlobalInstallController {
|
|
|
132
133
|
this.view.showSelectUnitOverview();
|
|
133
134
|
return { unit: await this.view.selectUnit(units), onlyUnit };
|
|
134
135
|
}
|
|
135
|
-
async linkConnections({ environment, installationId, nonInteractive
|
|
136
|
+
async linkConnections({ environment, installationId, nonInteractive }) {
|
|
136
137
|
if (nonInteractive) {
|
|
137
138
|
return;
|
|
138
139
|
}
|
|
139
|
-
const linkedSet = new Set(alreadyLinkedProducts.map((product) => product.toLowerCase()));
|
|
140
|
-
const options = LINKABLE_CONNECTIONS.map((connection) => ({
|
|
141
|
-
...connection,
|
|
142
|
-
linked: linkedSet.has(connection.product.toLowerCase())
|
|
143
|
-
}));
|
|
144
|
-
if (options.every((option) => option.linked)) {
|
|
145
|
-
return;
|
|
146
|
-
}
|
|
147
140
|
if (!(await this.view.confirmConnect(false))) {
|
|
148
141
|
return;
|
|
149
142
|
}
|
|
@@ -151,11 +144,7 @@ class GlobalInstallController {
|
|
|
151
144
|
throw new cli_shared_1.UserError(cli_shared_1.Text.install.global.error.noInstallationId);
|
|
152
145
|
}
|
|
153
146
|
for (;;) {
|
|
154
|
-
const selected = await this.view.selectConnection(
|
|
155
|
-
if (selected.linked) {
|
|
156
|
-
this.view.showAlreadyLinked(selected.product);
|
|
157
|
-
continue;
|
|
158
|
-
}
|
|
147
|
+
const selected = await this.view.selectConnection(LINKABLE_CONNECTIONS);
|
|
159
148
|
const kind = selected.kind;
|
|
160
149
|
const target = await this.view.promptForConnectionTarget(kind);
|
|
161
150
|
const url = this.supportedProductsService.validateSite(this.normalizeTarget(kind, target), selected.product);
|
|
@@ -164,10 +153,6 @@ class GlobalInstallController {
|
|
|
164
153
|
continue;
|
|
165
154
|
}
|
|
166
155
|
await this.performLink(environment, installationId, selected.product, kind, url);
|
|
167
|
-
selected.linked = true;
|
|
168
|
-
if (options.every((option) => option.linked)) {
|
|
169
|
-
break;
|
|
170
|
-
}
|
|
171
156
|
if (!(await this.view.confirmConnect(true))) {
|
|
172
157
|
break;
|
|
173
158
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global-install-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/global-install-controller.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"global-install-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/global-install-controller.ts"],"names":[],"mappings":";;;AACA,kDAO2B;AAI3B,2EAA2E;AAkC3E,MAAM,oBAAoB,GAAoC;IAC5D,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE;IACjC,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE;IACvC,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE;CAC5C,CAAC;AAEF,MAAa,uBAAuB;IAEf;IACA;IACA;IACA;IACA;IALnB,YACmB,IAAuB,EACvB,cAA8B,EAC9B,iBAAuC,EACvC,mBAAoD,EACpD,wBAAkD;QAJlD,SAAI,GAAJ,IAAI,CAAmB;QACvB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAsB;QACvC,wBAAmB,GAAnB,mBAAmB,CAAiC;QACpD,6BAAwB,GAAxB,wBAAwB,CAA0B;IAClE,CAAC;IAEG,KAAK,CAAC,GAAG,CAAC,EACf,KAAK,EACL,WAAW,EACX,cAAc,EACd,MAAM,EACN,cAAc,EACd,eAAe,EACf,SAAS,EACT,OAAO,EACP,IAAI,EACe;QACnB,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjC,MAAM,IAAI,sBAAS,CAAC,iBAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACrE,CAAC;QAED,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAEtE,MAAM,gBAAgB,GAAG,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;QAElE,IAAI,gBAAgB,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;YACnF,OAAO;QACT,CAAC;QAED,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,CAC/E,KAAK,EACL,WAAW,EACX,MAAM,CAAC,MAAM,CACd,CAAC;QACF,IAAI,sBAAsB,EAAE,CAAC;YAC3B,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;YACvC,MAAM,IAAI,CAAC,eAAe,CAAC;gBACzB,WAAW;gBACX,cAAc,EAAE,sBAAsB;gBACtC,cAAc,EAAE,gBAAgB;aACjC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,EAAE,CAAC;YACrE,OAAO;QACT,CAAC;QAED,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CACzD,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC;YACxC,KAAK;YACL,cAAc,EAAE,WAAW;YAC3B,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,cAAc;YACd,eAAe;YACf,SAAS;YACT,eAAe;SAChB,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAElD,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,WAAW,EAAE,cAAc,EAAE,cAAc,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAChG,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,EACtB,KAAK,EACL,WAAW,EACX,cAAc,EACd,MAAM,EACN,cAAc,EACd,aAAa,EACM;QACnB,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAE9C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC5F,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;YAC1B,MAAM,IAAI,sBAAS,CAAC,iBAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACrE,CAAC;QAED,IAAI,cAAsB,CAAC;QAC3B,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;YACnF,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,IAAI,sBAAS,CAAC,iBAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;YAC5E,CAAC;YACD,cAAc,GAAG,KAAK,CAAC,MAAM,CAAC;QAChC,CAAC;aAAM,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtC,cAAc,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QAC3C,CAAC;aAAM,IAAI,cAAc,EAAE,CAAC;YAC1B,MAAM,IAAI,sBAAS,CAAC,iBAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC5E,CAAC;aAAM,CAAC;YACN,cAAc,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC;QAChF,CAAC;QAED,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAC9B,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC;YACtC,KAAK;YACL,cAAc,EAAE,WAAW;YAC3B,MAAM,EAAE,cAAc;YACtB,cAAc;YACd,aAAa;SACd,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;IACxE,CAAC;IAGO,KAAK,CAAC,cAAc,CAAC,KAAa,EAAE,WAAmB;QAC7D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,4BAA4B,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QACpG,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,CAAC;YACjC,MAAM,IAAI,sBAAS,CAAC,iBAAI,CAAC,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC;QACzE,CAAC;QACD,OAAO,WAAW,CAAC,eAAe,CAAC;IACrC,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,QAA4B,EAAE,cAAwB;QAChF,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;QAC9B,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QAClD,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;QACvE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC/E,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,cAAwB;QAC/C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC,CAAC;QACtF,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,IAAI,sBAAS,CAAC,iBAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACxD,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;QACD,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,IAAI,sBAAS,CAAC,iBAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC3E,CAAC;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAEO,KAAK,CAAC,WAAW,CACvB,GAAgB,EAChB,cAAwB;QAExB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9F,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,IAAI,sBAAS,CAAC,iBAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QACnE,CAAC;QACD,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC;QACpC,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC;QACtC,CAAC;QACD,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,IAAI,sBAAS,CAAC,iBAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC5E,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACnC,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC;IAC/D,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,EAC5B,WAAW,EACX,cAAc,EACd,cAAc,EAKf;QACC,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAC7C,OAAO;QACT,CAAC;QACD,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,sBAAS,CAAC,iBAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAClE,CAAC;QAED,SAAS,CAAC;YACR,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,CAAC;YACxE,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YAC3B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;YAC/D,MAAM,GAAG,GAAG,IAAI,CAAC,wBAAwB,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;YAE7G,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC1D,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,EAAE,CAAC;gBAChD,SAAS;YACX,CAAC;YAED,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,cAAc,EAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;YAEjF,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;gBAC5C,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,qBAAqB,CACjC,KAAa,EACb,WAAmB,EACnB,MAAc,EACd,OAAgB,EAChB,IAAU;QAEV,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;YACtB,MAAM,IAAI,sBAAS,CAAC,iBAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACtE,CAAC;QACD,MAAM,UAAU,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;QACvG,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,sBAAS,CAAC,iBAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC;QAChF,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QACtG,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,sBAAS,CAAC,iBAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5E,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,wBAAwB,CAAC,YAAY,CACpD,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,EACtD,UAAU,CAAC,OAAO,CACnB,CAAC;QACF,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,cAAc,EAAE,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAChG,CAAC;IAGO,KAAK,CAAC,WAAW,CACvB,WAAmB,EACnB,cAAsB,EACtB,OAAe,EACf,IAAoB,EACpB,GAAQ;QAER,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,cAAc,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;QAC9G,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IAC3F,CAAC;IAEO,eAAe,CAAC,IAAoB,EAAE,KAAa;QACzD,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;YACzB,OAAO,sCAAmB,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QAC5D,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;IAEO,iBAAiB,CAAC,IAAoB,EAAE,GAAQ;QACtD,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;YACzB,OAAO,sCAAmB,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC;QACnE,CAAC;QACD,OAAO,GAAG,CAAC,IAAI,CAAC;IAClB,CAAC;CACF;AA/PD,0DA+PC"}
|