@forge/cli 13.3.0-next.0-experimental-620648d → 13.3.0-next.7-experimental-116e5ca
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 +100 -8
- package/npm-shrinkwrap.json +40 -38
- package/out/autocomplete/autocomplete-config.json +3 -0
- package/out/command-line/controller/deploy-controller.d.ts +2 -1
- package/out/command-line/controller/deploy-controller.d.ts.map +1 -1
- package/out/command-line/controller/deploy-controller.js +16 -6
- package/out/command-line/controller/deploy-controller.js.map +1 -1
- package/out/command-line/controller/install-controller.d.ts +0 -3
- package/out/command-line/controller/install-controller.d.ts.map +1 -1
- package/out/command-line/controller/install-controller.js +0 -81
- package/out/command-line/controller/install-controller.js.map +1 -1
- package/out/command-line/dependency-injection.d.ts.map +1 -1
- package/out/command-line/dependency-injection.js +3 -3
- package/out/command-line/dependency-injection.js.map +1 -1
- package/out/command-line/register-app-commands.d.ts.map +1 -1
- package/out/command-line/register-app-commands.js +0 -1
- package/out/command-line/register-app-commands.js.map +1 -1
- package/out/command-line/register-build-commands.d.ts +2 -1
- package/out/command-line/register-build-commands.d.ts.map +1 -1
- package/out/command-line/register-build-commands.js.map +1 -1
- package/out/command-line/register-deployment-commands.d.ts.map +1 -1
- package/out/command-line/register-deployment-commands.js +9 -2
- package/out/command-line/register-deployment-commands.js.map +1 -1
- package/out/command-line/view/deploy-view.d.ts +3 -1
- package/out/command-line/view/deploy-view.d.ts.map +1 -1
- package/out/command-line/view/deploy-view.js +13 -2
- package/out/command-line/view/deploy-view.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 +4 -3
- package/out/deploy/deployer/deployer.js.map +1 -1
- package/out/deploy/deployer/trigger-deploy-graphql-client.d.ts +1 -0
- package/out/deploy/deployer/trigger-deploy-graphql-client.d.ts.map +1 -1
- package/out/deploy/deployer/trigger-deploy-graphql-client.js.map +1 -1
- package/out/deploy/package-upload-deploy.d.ts +6 -3
- package/out/deploy/package-upload-deploy.d.ts.map +1 -1
- package/out/deploy/package-upload-deploy.js +18 -8
- package/out/deploy/package-upload-deploy.js.map +1 -1
- package/out/deploy/uploader/uploader.d.ts +15 -2
- package/out/deploy/uploader/uploader.d.ts.map +1 -1
- package/out/deploy/uploader/uploader.js +94 -12
- package/out/deploy/uploader/uploader.js.map +1 -1
- package/out/installations/graphql-client.d.ts.map +1 -1
- package/out/installations/graphql-client.js +2 -6
- package/out/installations/graphql-client.js.map +1 -1
- package/out/service/installation-service.d.ts +0 -2
- package/out/service/installation-service.d.ts.map +1 -1
- package/out/service/installation-service.js +0 -3
- package/out/service/installation-service.js.map +1 -1
- package/out/service/lint-service.d.ts +5 -3
- package/out/service/lint-service.d.ts.map +1 -1
- package/out/service/lint-service.js +5 -3
- package/out/service/lint-service.js.map +1 -1
- package/package.json +6 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,23 +1,115 @@
|
|
|
1
1
|
# @forge/cli
|
|
2
2
|
|
|
3
|
-
## 13.3.0-next.
|
|
3
|
+
## 13.3.0-next.7-experimental-116e5ca
|
|
4
4
|
|
|
5
5
|
### Minor Changes
|
|
6
6
|
|
|
7
|
-
-
|
|
7
|
+
- 4d50a76: Changes to forge deploy with a feature-gated combined artifact upload flow.
|
|
8
|
+
- 342098d: Implement server-side linter logic to prevent accidental major app version deployments
|
|
8
9
|
- d706cd8: Add support for manually bundling UI Kit resources and bypassing the built-in default bundler
|
|
9
10
|
|
|
10
11
|
### Patch Changes
|
|
11
12
|
|
|
13
|
+
- e7bfe5e: Removing installationTarget
|
|
14
|
+
- Updated dependencies [4d50a76]
|
|
15
|
+
- Updated dependencies [f01417b]
|
|
12
16
|
- Updated dependencies [d706cd8]
|
|
13
|
-
- Updated dependencies [
|
|
17
|
+
- Updated dependencies [342098d]
|
|
18
|
+
- Updated dependencies [0949833]
|
|
19
|
+
- Updated dependencies [d1610cc]
|
|
20
|
+
- Updated dependencies [e7bfe5e]
|
|
21
|
+
- Updated dependencies [498fda5]
|
|
14
22
|
- Updated dependencies [ca4fa27]
|
|
23
|
+
- Updated dependencies [39f1f15]
|
|
24
|
+
- Updated dependencies [c3a0f20]
|
|
15
25
|
- Updated dependencies [d706cd8]
|
|
16
|
-
- @forge/
|
|
17
|
-
- @forge/
|
|
18
|
-
- @forge/
|
|
19
|
-
- @forge/
|
|
20
|
-
- @forge/
|
|
26
|
+
- @forge/cli-shared@9.3.0-next.7-experimental-116e5ca
|
|
27
|
+
- @forge/manifest@13.3.0-next.6-experimental-116e5ca
|
|
28
|
+
- @forge/bundler@7.1.0-next.7-experimental-116e5ca
|
|
29
|
+
- @forge/lint@6.0.3-next.7-experimental-116e5ca
|
|
30
|
+
- @forge/tunnel@7.1.0-next.7-experimental-116e5ca
|
|
31
|
+
|
|
32
|
+
## 13.3.0-next.7
|
|
33
|
+
|
|
34
|
+
### Patch Changes
|
|
35
|
+
|
|
36
|
+
- e7bfe5e: Removing installationTarget
|
|
37
|
+
- Updated dependencies [e7bfe5e]
|
|
38
|
+
- @forge/cli-shared@9.3.0-next.7
|
|
39
|
+
- @forge/manifest@13.3.0-next.6
|
|
40
|
+
- @forge/bundler@7.1.0-next.7
|
|
41
|
+
- @forge/lint@6.0.3-next.7
|
|
42
|
+
- @forge/tunnel@7.1.0-next.7
|
|
43
|
+
|
|
44
|
+
## 13.3.0-next.6
|
|
45
|
+
|
|
46
|
+
### Patch Changes
|
|
47
|
+
|
|
48
|
+
- Updated dependencies [0949833]
|
|
49
|
+
- @forge/cli-shared@9.3.0-next.6
|
|
50
|
+
- @forge/bundler@7.1.0-next.6
|
|
51
|
+
- @forge/lint@6.0.3-next.6
|
|
52
|
+
- @forge/tunnel@7.1.0-next.6
|
|
53
|
+
|
|
54
|
+
## 13.3.0-next.5
|
|
55
|
+
|
|
56
|
+
### Patch Changes
|
|
57
|
+
|
|
58
|
+
- Updated dependencies [d1610cc]
|
|
59
|
+
- @forge/manifest@13.3.0-next.5
|
|
60
|
+
- @forge/bundler@7.1.0-next.5
|
|
61
|
+
- @forge/cli-shared@9.3.0-next.5
|
|
62
|
+
- @forge/lint@6.0.3-next.5
|
|
63
|
+
- @forge/tunnel@7.1.0-next.5
|
|
64
|
+
|
|
65
|
+
## 13.3.0-next.4
|
|
66
|
+
|
|
67
|
+
### Patch Changes
|
|
68
|
+
|
|
69
|
+
- Updated dependencies [c3a0f20]
|
|
70
|
+
- @forge/manifest@13.3.0-next.4
|
|
71
|
+
- @forge/bundler@7.0.3-next.4
|
|
72
|
+
- @forge/cli-shared@9.3.0-next.4
|
|
73
|
+
- @forge/lint@6.0.3-next.4
|
|
74
|
+
- @forge/tunnel@7.1.0-next.4
|
|
75
|
+
|
|
76
|
+
## 13.3.0-next.3
|
|
77
|
+
|
|
78
|
+
### Patch Changes
|
|
79
|
+
|
|
80
|
+
- Updated dependencies [498fda5]
|
|
81
|
+
- @forge/manifest@13.3.0-next.3
|
|
82
|
+
- @forge/bundler@7.0.3-next.3
|
|
83
|
+
- @forge/cli-shared@9.3.0-next.3
|
|
84
|
+
- @forge/lint@6.0.3-next.3
|
|
85
|
+
- @forge/tunnel@7.1.0-next.3
|
|
86
|
+
|
|
87
|
+
## 13.3.0-next.2
|
|
88
|
+
|
|
89
|
+
### Patch Changes
|
|
90
|
+
|
|
91
|
+
- Updated dependencies [f01417b]
|
|
92
|
+
- @forge/manifest@13.3.0-next.2
|
|
93
|
+
- @forge/bundler@7.0.3-next.2
|
|
94
|
+
- @forge/cli-shared@9.3.0-next.2
|
|
95
|
+
- @forge/lint@6.0.3-next.2
|
|
96
|
+
- @forge/tunnel@7.1.0-next.2
|
|
97
|
+
|
|
98
|
+
## 13.3.0-next.1
|
|
99
|
+
|
|
100
|
+
### Minor Changes
|
|
101
|
+
|
|
102
|
+
- 4d50a76: Changes to forge deploy with a feature-gated combined artifact upload flow.
|
|
103
|
+
|
|
104
|
+
### Patch Changes
|
|
105
|
+
|
|
106
|
+
- Updated dependencies [4d50a76]
|
|
107
|
+
- Updated dependencies [39f1f15]
|
|
108
|
+
- @forge/cli-shared@9.3.0-next.1
|
|
109
|
+
- @forge/manifest@13.3.0-next.1
|
|
110
|
+
- @forge/bundler@7.0.3-next.1
|
|
111
|
+
- @forge/lint@6.0.3-next.1
|
|
112
|
+
- @forge/tunnel@7.1.0-next.1
|
|
21
113
|
|
|
22
114
|
## 13.3.0-next.0
|
|
23
115
|
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/cli",
|
|
3
|
-
"version": "13.3.0-next.
|
|
3
|
+
"version": "13.3.0-next.7-experimental-116e5ca",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "@forge/cli",
|
|
9
|
-
"version": "13.3.0-next.
|
|
9
|
+
"version": "13.3.0-next.7-experimental-116e5ca",
|
|
10
10
|
"hasInstallScript": true,
|
|
11
11
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@forge/bundler": "7.0
|
|
14
|
-
"@forge/cli-shared": "9.3.0-next.
|
|
13
|
+
"@forge/bundler": "7.1.0-next.7-experimental-116e5ca",
|
|
14
|
+
"@forge/cli-shared": "9.3.0-next.7-experimental-116e5ca",
|
|
15
15
|
"@forge/egress": "3.0.0",
|
|
16
16
|
"@forge/i18n": "1.0.0",
|
|
17
|
-
"@forge/lint": "6.0.3-next.
|
|
18
|
-
"@forge/manifest": "13.3.0-next.
|
|
17
|
+
"@forge/lint": "6.0.3-next.7-experimental-116e5ca",
|
|
18
|
+
"@forge/manifest": "13.3.0-next.6-experimental-116e5ca",
|
|
19
19
|
"@forge/runtime": "7.0.0",
|
|
20
|
-
"@forge/tunnel": "7.1.0-next.
|
|
20
|
+
"@forge/tunnel": "7.1.0-next.7-experimental-116e5ca",
|
|
21
21
|
"@forge/util": "3.0.0",
|
|
22
22
|
"@sentry/node": "7.106.0",
|
|
23
23
|
"ajv": "^8.18.0",
|
|
@@ -555,9 +555,9 @@
|
|
|
555
555
|
}
|
|
556
556
|
},
|
|
557
557
|
"node_modules/@forge/bundler": {
|
|
558
|
-
"version": "7.0
|
|
559
|
-
"resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-7.0
|
|
560
|
-
"integrity": "sha512-
|
|
558
|
+
"version": "7.1.0-next.7-experimental-116e5ca",
|
|
559
|
+
"resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-7.1.0-next.7-experimental-116e5ca.tgz",
|
|
560
|
+
"integrity": "sha512-DTGvE3WILe2rIpmreQbthMPM97wg3OtVj7L/YJKRGzLZazpydon+xv6yrC1tvCV5PJ4TibTZs/jNt1rZoLF7+w==",
|
|
561
561
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
562
562
|
"dependencies": {
|
|
563
563
|
"@babel/core": "^7.24.0",
|
|
@@ -569,10 +569,10 @@
|
|
|
569
569
|
"@babel/plugin-transform-react-jsx": "^7.23.4",
|
|
570
570
|
"@babel/traverse": "^7.24.0",
|
|
571
571
|
"@babel/types": "^7.24.0",
|
|
572
|
-
"@forge/cli-shared": "9.3.0-next.
|
|
572
|
+
"@forge/cli-shared": "9.3.0-next.7-experimental-116e5ca",
|
|
573
573
|
"@forge/i18n": "1.0.0",
|
|
574
|
-
"@forge/lint": "6.0.3-next.
|
|
575
|
-
"@forge/manifest": "13.3.0-next.
|
|
574
|
+
"@forge/lint": "6.0.3-next.7-experimental-116e5ca",
|
|
575
|
+
"@forge/manifest": "13.3.0-next.6-experimental-116e5ca",
|
|
576
576
|
"babel-loader": "^8.3.0",
|
|
577
577
|
"cheerio": "^1.2.0",
|
|
578
578
|
"cross-spawn": "^7.0.6",
|
|
@@ -600,13 +600,13 @@
|
|
|
600
600
|
}
|
|
601
601
|
},
|
|
602
602
|
"node_modules/@forge/cli-shared": {
|
|
603
|
-
"version": "9.3.0-next.
|
|
604
|
-
"resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-9.3.0-next.
|
|
605
|
-
"integrity": "sha512-
|
|
603
|
+
"version": "9.3.0-next.7-experimental-116e5ca",
|
|
604
|
+
"resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-9.3.0-next.7-experimental-116e5ca.tgz",
|
|
605
|
+
"integrity": "sha512-HdG6/Rdb1nC7bjAIEKJe150D4FhiS1L1ZHkxDQAowQk2pAD1ZTYKYwBOiP4sxicwMiKRIIUefPOOijGEte8HyA==",
|
|
606
606
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
607
607
|
"dependencies": {
|
|
608
608
|
"@forge/i18n": "1.0.0",
|
|
609
|
-
"@forge/manifest": "13.3.0-next.
|
|
609
|
+
"@forge/manifest": "13.3.0-next.6-experimental-116e5ca",
|
|
610
610
|
"@forge/util": "3.0.0",
|
|
611
611
|
"@sentry/node": "7.106.0",
|
|
612
612
|
"@vercel/detect-agent": "^1.2.3",
|
|
@@ -651,9 +651,9 @@
|
|
|
651
651
|
}
|
|
652
652
|
},
|
|
653
653
|
"node_modules/@forge/csp": {
|
|
654
|
-
"version": "6.2.0-experimental-
|
|
655
|
-
"resolved": "https://registry.npmjs.org/@forge/csp/-/csp-6.2.0-experimental-
|
|
656
|
-
"integrity": "sha512-
|
|
654
|
+
"version": "6.2.0-experimental-116e5ca",
|
|
655
|
+
"resolved": "https://registry.npmjs.org/@forge/csp/-/csp-6.2.0-experimental-116e5ca.tgz",
|
|
656
|
+
"integrity": "sha512-K7WxcTIsIBbq/whaeC81m3tzX/xM+mYJ13IeW7bKJMkKP5v9B2PjddP8Q4IJ5cqIkk2dwUbX6GWJb2W+v7IKVw==",
|
|
657
657
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
658
658
|
"dependencies": {
|
|
659
659
|
"content-security-policy-parser": "^0.6.0"
|
|
@@ -703,20 +703,22 @@
|
|
|
703
703
|
}
|
|
704
704
|
},
|
|
705
705
|
"node_modules/@forge/lint": {
|
|
706
|
-
"version": "6.0.3-next.
|
|
707
|
-
"resolved": "https://registry.npmjs.org/@forge/lint/-/lint-6.0.3-next.
|
|
708
|
-
"integrity": "sha512-
|
|
706
|
+
"version": "6.0.3-next.7-experimental-116e5ca",
|
|
707
|
+
"resolved": "https://registry.npmjs.org/@forge/lint/-/lint-6.0.3-next.7-experimental-116e5ca.tgz",
|
|
708
|
+
"integrity": "sha512-CUkhOtD4qmz0Qpy6eggnAq2ojFWf3jEbRPeC71Z9vCD51h8eK3XkkE0tVQzvulei5hXg0pUdOFgXsDwV3a00KQ==",
|
|
709
709
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
710
710
|
"dependencies": {
|
|
711
711
|
"@atlassian/atlassian-openapi": "^1.0.6",
|
|
712
|
-
"@forge/cli-shared": "9.3.0-next.
|
|
713
|
-
"@forge/csp": "6.2.0-experimental-
|
|
712
|
+
"@forge/cli-shared": "9.3.0-next.7-experimental-116e5ca",
|
|
713
|
+
"@forge/csp": "6.2.0-experimental-116e5ca",
|
|
714
714
|
"@forge/egress": "3.0.0",
|
|
715
|
-
"@forge/manifest": "13.3.0-next.
|
|
715
|
+
"@forge/manifest": "13.3.0-next.6-experimental-116e5ca",
|
|
716
716
|
"@typescript-eslint/typescript-estree": "^5.62.0",
|
|
717
|
+
"archiver": "^8.0.0",
|
|
717
718
|
"array.prototype.flatmap": "^1.3.3",
|
|
718
719
|
"cross-spawn": "^7.0.6",
|
|
719
720
|
"node-fetch": "2.7.0",
|
|
721
|
+
"tmp": "^0.2.3",
|
|
720
722
|
"typescript": "5.9.2"
|
|
721
723
|
},
|
|
722
724
|
"peerDependencies": {
|
|
@@ -729,9 +731,9 @@
|
|
|
729
731
|
}
|
|
730
732
|
},
|
|
731
733
|
"node_modules/@forge/manifest": {
|
|
732
|
-
"version": "13.3.0-next.
|
|
733
|
-
"resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-13.3.0-next.
|
|
734
|
-
"integrity": "sha512-
|
|
734
|
+
"version": "13.3.0-next.6-experimental-116e5ca",
|
|
735
|
+
"resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-13.3.0-next.6-experimental-116e5ca.tgz",
|
|
736
|
+
"integrity": "sha512-lMZPGqGLuGoFYuJ22lEq8BFgbbLd2AUgvhR9g9J2kXeiH3UABfHEMS6YDNpeY5XxfKsdXfAmxpgz0Qx/DE2c+Q==",
|
|
735
737
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
736
738
|
"dependencies": {
|
|
737
739
|
"@forge/i18n": "1.0.0",
|
|
@@ -768,14 +770,14 @@
|
|
|
768
770
|
}
|
|
769
771
|
},
|
|
770
772
|
"node_modules/@forge/tunnel": {
|
|
771
|
-
"version": "7.1.0-next.
|
|
772
|
-
"resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-7.1.0-next.
|
|
773
|
-
"integrity": "sha512-
|
|
773
|
+
"version": "7.1.0-next.7-experimental-116e5ca",
|
|
774
|
+
"resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-7.1.0-next.7-experimental-116e5ca.tgz",
|
|
775
|
+
"integrity": "sha512-zb0TRofx4hFkHNT5CQsKPWOLx/Bv1ZjsSaxT2bRGjPXx24VZYVIelE79vscXnQSC4CNW0IeXlct9ZzBAr581Ww==",
|
|
774
776
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
775
777
|
"dependencies": {
|
|
776
|
-
"@forge/bundler": "7.0
|
|
777
|
-
"@forge/cli-shared": "9.3.0-next.
|
|
778
|
-
"@forge/csp": "6.2.0-experimental-
|
|
778
|
+
"@forge/bundler": "7.1.0-next.7-experimental-116e5ca",
|
|
779
|
+
"@forge/cli-shared": "9.3.0-next.7-experimental-116e5ca",
|
|
780
|
+
"@forge/csp": "6.2.0-experimental-116e5ca",
|
|
779
781
|
"@forge/runtime": "7.0.0",
|
|
780
782
|
"@forge/util": "^3.0.0",
|
|
781
783
|
"cheerio": "^1.2.0",
|
|
@@ -8414,9 +8416,9 @@
|
|
|
8414
8416
|
"integrity": "sha1-Wrr3FKlAXbBQRzK7zNLO3Z75U30= sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
|
|
8415
8417
|
},
|
|
8416
8418
|
"node_modules/tmp": {
|
|
8417
|
-
"version": "0.2.
|
|
8418
|
-
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.
|
|
8419
|
-
"integrity": "sha1-
|
|
8419
|
+
"version": "0.2.7",
|
|
8420
|
+
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.7.tgz",
|
|
8421
|
+
"integrity": "sha1-JvTbEdFgHOgBLcuKeY7OHAapkFk= sha512-e0votIpp4Uo2AJYSzVHV6xCcawuiez3DzqDAbrTc3YxBkplN6e+dM13ZeIcZnDg/QpSuU2zfZ3rzwY8ukEnaXw==",
|
|
8420
8422
|
"engines": {
|
|
8421
8423
|
"node": ">=14.14"
|
|
8422
8424
|
}
|
|
@@ -16,6 +16,7 @@ interface DeployOptions {
|
|
|
16
16
|
majorVersion?: number;
|
|
17
17
|
buildTag?: string;
|
|
18
18
|
skipRollout?: boolean;
|
|
19
|
+
approveRules?: string[];
|
|
19
20
|
}
|
|
20
21
|
export declare class DeployLintFailureError extends HiddenError {
|
|
21
22
|
private readonly scopes;
|
|
@@ -52,7 +53,7 @@ export declare class DeployController {
|
|
|
52
53
|
private verifyPostDeployment;
|
|
53
54
|
private confirmAndCreateEnvironment;
|
|
54
55
|
private getAppEnvironmentDetails;
|
|
55
|
-
run({ environment, verify, nonInteractive, majorVersion, buildTag, skipRollout }: DeployOptions): Promise<DeploymentResult | void>;
|
|
56
|
+
run({ environment, verify, nonInteractive, majorVersion, buildTag, skipRollout, approveRules }: DeployOptions): Promise<DeploymentResult | void>;
|
|
56
57
|
}
|
|
57
58
|
export {};
|
|
58
59
|
//# sourceMappingURL=deploy-controller.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/deploy-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,oBAAoB,EAGpB,UAAU,EACV,cAAc,EAEd,WAAW,EAGZ,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAA+B,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AACzG,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAEhF,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,UAAU,aAAa;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/deploy-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -104,15 +104,24 @@ class DeployController {
|
|
|
104
104
|
}
|
|
105
105
|
return { proceed: true, connectKeyChanged: false, connectKeyDeleted: false };
|
|
106
106
|
}
|
|
107
|
-
async verifyPreDeployment(environment) {
|
|
107
|
+
async verifyPreDeployment(environment, approveRules) {
|
|
108
108
|
this.deployView.displayLintRunning();
|
|
109
|
-
const { lintResults } = await this.lintService.run(environment, { fix: false }, this.deployView.getLogger());
|
|
109
|
+
const { lintResults } = await this.lintService.run(environment, { fix: false, approveRules }, this.deployView.getLogger());
|
|
110
110
|
const problemCount = this.lintService.problemCount(lintResults);
|
|
111
|
-
if (problemCount.errors) {
|
|
111
|
+
if (problemCount.errors && problemCount.approvals) {
|
|
112
|
+
this.deployView.displayLintErrorsWithApprovals(lintResults);
|
|
113
|
+
const failures = this.lintService.failedScopes(lintResults);
|
|
114
|
+
throw new DeployLintFailureError(failures);
|
|
115
|
+
}
|
|
116
|
+
else if (problemCount.errors) {
|
|
112
117
|
this.deployView.displayLintErrors(lintResults);
|
|
113
118
|
const failures = this.lintService.failedScopes(lintResults);
|
|
114
119
|
throw new DeployLintFailureError(failures);
|
|
115
120
|
}
|
|
121
|
+
else if (problemCount.approvals) {
|
|
122
|
+
this.deployView.displayLintApprovals(lintResults.filter((r) => r.approvals.length));
|
|
123
|
+
throw new DeployLintFailureError([]);
|
|
124
|
+
}
|
|
116
125
|
else if (problemCount.warnings) {
|
|
117
126
|
this.deployView.displayLintWarnings(problemCount.warnings);
|
|
118
127
|
}
|
|
@@ -203,7 +212,7 @@ class DeployController {
|
|
|
203
212
|
return this.appEnvironmentClient.getAppEnvironmentDetails(id, environment);
|
|
204
213
|
}
|
|
205
214
|
}
|
|
206
|
-
async run({ environment, verify, nonInteractive, majorVersion, buildTag, skipRollout }) {
|
|
215
|
+
async run({ environment, verify, nonInteractive, majorVersion, buildTag, skipRollout, approveRules }) {
|
|
207
216
|
const { id } = await this.appConfigProvider();
|
|
208
217
|
const appDetails = await this.getAppEnvironmentDetails(id, environment, nonInteractive);
|
|
209
218
|
appDetails.buildTag = buildTag;
|
|
@@ -212,7 +221,7 @@ class DeployController {
|
|
|
212
221
|
let hasConnectKeyChanged = false;
|
|
213
222
|
let hasConnectKeyDeleted = false;
|
|
214
223
|
if (verify && !buildTag) {
|
|
215
|
-
await this.verifyPreDeployment(environment);
|
|
224
|
+
await this.verifyPreDeployment(environment, approveRules);
|
|
216
225
|
const keys = await this.migrationKeysService.getMigrationKeysForAppEnvironment(environment);
|
|
217
226
|
const { proceed, connectKeyChanged, connectKeyDeleted } = await this.validateConnectKeyChange(environment, keys);
|
|
218
227
|
if (!proceed) {
|
|
@@ -247,13 +256,14 @@ class DeployController {
|
|
|
247
256
|
handlers,
|
|
248
257
|
resources,
|
|
249
258
|
environmentKey: environment,
|
|
259
|
+
environmentType: appDetails.environmentType,
|
|
250
260
|
packageConfig,
|
|
251
261
|
majorVersion,
|
|
252
262
|
modules: config.modules,
|
|
253
263
|
i18nConfig: config.translations,
|
|
254
264
|
buildTag,
|
|
255
265
|
skipRollout
|
|
256
|
-
}));
|
|
266
|
+
}), approveRules);
|
|
257
267
|
if (verify) {
|
|
258
268
|
await this.verifyPostDeployment(environment, appDetails.environmentType, majorVersion);
|
|
259
269
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/deploy-controller.ts"],"names":[],"mappings":";;;AAAA,kDAW2B;AAU3B,sCAA2C;
|
|
1
|
+
{"version":3,"file":"deploy-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/deploy-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,9 +49,6 @@ export declare class InstallController {
|
|
|
49
49
|
isNonProductionAppInstallationAttempt(site: URL, products: SupportedProduct[], environmentType: AppEnvironmentType): Promise<boolean>;
|
|
50
50
|
private checkProductEntitlementOffering;
|
|
51
51
|
private getAllScopeKeys;
|
|
52
|
-
private toAppResourceId;
|
|
53
|
-
private getModuleInstances;
|
|
54
|
-
private getInstallSuccessDeeplinks;
|
|
55
52
|
private extractManifestData;
|
|
56
53
|
private getXPAProductsAndSite;
|
|
57
54
|
private checkForMultiProductScopes;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/install-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAElB,UAAU,EAcV,cAAc,EACd,gBAAgB,EAChB,wBAAwB,EAExB,EAAE,EAKH,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAwB,MAAM,sCAAsC,CAAC;AACnG,OAAO,EAA2C,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAElH,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,UAAU,gBAAgB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,QAAQ,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC9B,OAAO,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;IACtC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;
|
|
1
|
+
{"version":3,"file":"install-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/install-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAElB,UAAU,EAcV,cAAc,EACd,gBAAgB,EAChB,wBAAwB,EAExB,EAAE,EAKH,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAwB,MAAM,sCAAsC,CAAC;AACnG,OAAO,EAA2C,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAElH,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,UAAU,gBAAgB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,QAAQ,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC9B,OAAO,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;IACtC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAsBD,qBAAa,iBAAkB,SAAQ,KAAK;gBAC9B,WAAW,EAAE,MAAM;CAGhC;AAuBD,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,wBAAwB;IACzC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc;IACjD,OAAO,CAAC,QAAQ,CAAC,eAAe;gBARf,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,EAAE,EACN,qBAAqB,EAAE,qBAAqB,EAC5C,mBAAmB,EAAE,mBAAmB,EACxC,WAAW,EAAE,WAAW,EACxB,wBAAwB,EAAE,wBAAwB,EAChD,cAAc,EAAE,cAAc,EAChC,eAAe,EAAE,eAAe;YAGrC,cAAc;YAmBd,gBAAgB;YA4DhB,iBAAiB;YA0BjB,aAAa;YA2Bb,mBAAmB;YAkBnB,wBAAwB;IAkDtC,OAAO,CAAC,uCAAuC;IAa/C,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,qBAAqB;IAe7B,OAAO,CAAC,oBAAoB;IAK5B,OAAO,CAAC,qBAAqB;IAwB7B,OAAO,CAAC,qBAAqB,CAM3B;YAEY,mCAAmC;IAcpC,GAAG,CAAC,EACf,WAAW,EACX,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,aAAa,EACb,OAAO,EACP,YAAY,EACZ,eAAe,EACf,cAAc,EACd,YAAY,EACZ,aAAa,EACd,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IA4NnC,OAAO,CAAC,0BAA0B;IAWrB,qCAAqC,CAChD,IAAI,EAAE,GAAG,EACT,QAAQ,EAAE,gBAAgB,EAAE,EAC5B,eAAe,EAAE,kBAAkB;YAevB,+BAA+B;IAc7C,OAAO,CAAC,eAAe,CAErB;IAEF,OAAO,CAAC,mBAAmB,CAOzB;IAEF,OAAO,CAAC,qBAAqB,CAgD3B;IAEF,OAAO,CAAC,0BAA0B,CAkChC;YAEY,gBAAgB;IAU9B,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,oBAAoB;IA2B5B,OAAO,CAAC,uBAAuB;YAiBjB,8CAA8C;IAY5D,OAAO,CAAC,+BAA+B,CAWrC;CACH"}
|
|
@@ -265,14 +265,12 @@ class InstallController {
|
|
|
265
265
|
const { scopes: environmentScopes, egressAddresses: environmentEgressAddresses, environmentType } = environmentPermissions;
|
|
266
266
|
let manifestScopes = new Set(environmentScopes);
|
|
267
267
|
let manifestEgressAddresses = [...environmentEgressAddresses];
|
|
268
|
-
let manifestModules;
|
|
269
268
|
if (!appIdOverride) {
|
|
270
269
|
const [{ permissions, modules }, manifestEgressEntries] = await Promise.all([
|
|
271
270
|
this.configFile.readConfig(),
|
|
272
271
|
this.configFile.getEgressPermissions()
|
|
273
272
|
]);
|
|
274
273
|
this.checkForUIKit1Modules(modules);
|
|
275
|
-
manifestModules = modules;
|
|
276
274
|
({ manifestEgressAddresses, manifestScopes } = this.extractManifestData(manifestEgressEntries, permissions));
|
|
277
275
|
}
|
|
278
276
|
const differenceInScopes = environmentScopes.filter((x) => !scopesFromLastInstallation.has(x));
|
|
@@ -317,16 +315,6 @@ class InstallController {
|
|
|
317
315
|
}
|
|
318
316
|
else {
|
|
319
317
|
this.ui.info(text.success.banner(environment, environmentType, (0, cli_shared_1.productDisplayName)(successfulProducts.join(', ')), site.host));
|
|
320
|
-
const deeplinks = this.getInstallSuccessDeeplinks({
|
|
321
|
-
site,
|
|
322
|
-
appId: id,
|
|
323
|
-
environmentId: environmentPermissions.environmentId,
|
|
324
|
-
modules: manifestModules,
|
|
325
|
-
successfulProducts
|
|
326
|
-
});
|
|
327
|
-
if (deeplinks.length > 0) {
|
|
328
|
-
this.ui.info(cli_shared_1.Text.install.success.deeplinks(deeplinks));
|
|
329
|
-
}
|
|
330
318
|
}
|
|
331
319
|
}
|
|
332
320
|
else if (!isUpgrade) {
|
|
@@ -370,75 +358,6 @@ class InstallController {
|
|
|
370
358
|
getAllScopeKeys = (scopes) => {
|
|
371
359
|
return Array.isArray(scopes) ? scopes : Object.keys(scopes);
|
|
372
360
|
};
|
|
373
|
-
toAppResourceId = (appId) => {
|
|
374
|
-
const appIdParts = appId.split('/');
|
|
375
|
-
return appIdParts[appIdParts.length - 1] || appId;
|
|
376
|
-
};
|
|
377
|
-
getModuleInstances = (modules, moduleName) => {
|
|
378
|
-
const entries = modules?.[moduleName];
|
|
379
|
-
if (!Array.isArray(entries)) {
|
|
380
|
-
return [];
|
|
381
|
-
}
|
|
382
|
-
return entries.filter((entry) => typeof entry === 'object' && entry !== null);
|
|
383
|
-
};
|
|
384
|
-
getInstallSuccessDeeplinks = ({ site, appId, environmentId, modules, successfulProducts }) => {
|
|
385
|
-
if (!environmentId || !modules) {
|
|
386
|
-
return [];
|
|
387
|
-
}
|
|
388
|
-
const successfulProductsLower = new Set(successfulProducts.map((value) => value.toLowerCase()));
|
|
389
|
-
const appResourceId = this.toAppResourceId(appId);
|
|
390
|
-
const siteBase = `${site.protocol}//${site.host}`;
|
|
391
|
-
const derivedLinks = [];
|
|
392
|
-
if (successfulProductsLower.has('jira')) {
|
|
393
|
-
const [jiraGlobalPage] = this.getModuleInstances(modules, 'jira:globalPage');
|
|
394
|
-
if (jiraGlobalPage) {
|
|
395
|
-
derivedLinks.push({
|
|
396
|
-
moduleType: 'jira:globalPage',
|
|
397
|
-
moduleKey: jiraGlobalPage.key,
|
|
398
|
-
url: `${siteBase}/jira/apps/${appResourceId}/${environmentId}`
|
|
399
|
-
});
|
|
400
|
-
}
|
|
401
|
-
const [jiraAdminPage] = this.getModuleInstances(modules, 'jira:adminPage');
|
|
402
|
-
if (jiraAdminPage) {
|
|
403
|
-
derivedLinks.push({
|
|
404
|
-
moduleType: 'jira:adminPage',
|
|
405
|
-
moduleKey: jiraAdminPage.key,
|
|
406
|
-
url: `${siteBase}/jira/settings/apps/${appResourceId}/${environmentId}`
|
|
407
|
-
});
|
|
408
|
-
}
|
|
409
|
-
}
|
|
410
|
-
if (successfulProductsLower.has('confluence')) {
|
|
411
|
-
for (const moduleInstance of this.getModuleInstances(modules, 'confluence:globalPage')) {
|
|
412
|
-
if (!moduleInstance.key) {
|
|
413
|
-
continue;
|
|
414
|
-
}
|
|
415
|
-
const confluenceRoute = moduleInstance.route;
|
|
416
|
-
if (!confluenceRoute) {
|
|
417
|
-
continue;
|
|
418
|
-
}
|
|
419
|
-
derivedLinks.push({
|
|
420
|
-
moduleType: 'confluence:globalPage',
|
|
421
|
-
moduleKey: moduleInstance.key,
|
|
422
|
-
url: `${siteBase}/wiki/apps/${appResourceId}/${environmentId}/${encodeURIComponent(confluenceRoute)}`
|
|
423
|
-
});
|
|
424
|
-
}
|
|
425
|
-
}
|
|
426
|
-
const [globalUiModule] = this.getModuleInstances(modules, 'global:ui');
|
|
427
|
-
if (globalUiModule) {
|
|
428
|
-
derivedLinks.push({
|
|
429
|
-
moduleType: 'global:ui',
|
|
430
|
-
moduleKey: globalUiModule.key,
|
|
431
|
-
url: `${siteBase}/apps/a/${appResourceId}/e/${environmentId}`
|
|
432
|
-
});
|
|
433
|
-
}
|
|
434
|
-
if (derivedLinks.length === 1) {
|
|
435
|
-
return [{ url: derivedLinks[0].url }];
|
|
436
|
-
}
|
|
437
|
-
return derivedLinks.map((link) => ({
|
|
438
|
-
label: link.moduleKey ? `${link.moduleType} (${link.moduleKey})` : link.moduleType,
|
|
439
|
-
url: link.url
|
|
440
|
-
}));
|
|
441
|
-
};
|
|
442
361
|
extractManifestData = (manifestEgressEntries, permissions) => {
|
|
443
362
|
const manifestEgressAddresses = (0, cli_shared_1.flatMap)(manifestEgressEntries, ({ domains }) => domains ?? []);
|
|
444
363
|
const manifestScopes = new Set(this.getAllScopeKeys(permissions?.scopes ?? []));
|