@forge/cli 10.6.1 → 10.7.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 CHANGED
@@ -1,5 +1,131 @@
1
1
  # @forge/cli
2
2
 
3
+ ## 10.7.0
4
+
5
+ ### Minor Changes
6
+
7
+ - bb8baa2: Use workspaceAri for installApp and updateApp mutation
8
+
9
+ ### Patch Changes
10
+
11
+ - d07d506: Clean up feature flags
12
+ - Updated dependencies [bb8baa2]
13
+ - Updated dependencies [981965f]
14
+ - Updated dependencies [455ab8a]
15
+ - Updated dependencies [a30b439]
16
+ - Updated dependencies [5edaced]
17
+ - Updated dependencies [d07d506]
18
+ - Updated dependencies [3b3f1f8]
19
+ - Updated dependencies [65bb6b7]
20
+ - Updated dependencies [025fc1f]
21
+ - @forge/cli-shared@5.5.2
22
+ - @forge/manifest@7.8.0
23
+ - @forge/lint@5.4.0
24
+ - @forge/bundler@4.19.2
25
+ - @forge/tunnel@5.5.2
26
+
27
+ ## 10.7.0-next.9
28
+
29
+ ### Patch Changes
30
+
31
+ - d07d506: Clean up feature flags
32
+ - Updated dependencies [d07d506]
33
+ - @forge/cli-shared@5.5.2-next.6
34
+ - @forge/bundler@4.19.2-next.9
35
+ - @forge/lint@5.4.0-next.7
36
+ - @forge/tunnel@5.5.2-next.9
37
+
38
+ ## 10.7.0-next.8
39
+
40
+ ### Patch Changes
41
+
42
+ - Updated dependencies [455ab8a]
43
+ - Updated dependencies [025fc1f]
44
+ - @forge/manifest@7.8.0-next.2
45
+ - @forge/bundler@4.19.2-next.8
46
+ - @forge/cli-shared@5.5.2-next.5
47
+ - @forge/lint@5.4.0-next.6
48
+ - @forge/tunnel@5.5.2-next.8
49
+
50
+ ## 10.7.0-next.7
51
+
52
+ ### Minor Changes
53
+
54
+ - bb8baa2: Use workspaceAri for installApp and updateApp mutation
55
+
56
+ ### Patch Changes
57
+
58
+ - Updated dependencies [bb8baa2]
59
+ - @forge/cli-shared@5.5.2-next.4
60
+ - @forge/bundler@4.19.2-next.7
61
+ - @forge/lint@5.4.0-next.5
62
+ - @forge/tunnel@5.5.2-next.7
63
+
64
+ ## 10.6.2-next.6
65
+
66
+ ### Patch Changes
67
+
68
+ - Updated dependencies [981965f]
69
+ - @forge/manifest@7.7.2-next.1
70
+ - @forge/bundler@4.19.2-next.6
71
+ - @forge/cli-shared@5.5.2-next.3
72
+ - @forge/lint@5.4.0-next.4
73
+ - @forge/tunnel@5.5.2-next.6
74
+
75
+ ## 10.6.2-next.5
76
+
77
+ ### Patch Changes
78
+
79
+ - @forge/bundler@4.19.2-next.5
80
+ - @forge/tunnel@5.5.2-next.5
81
+
82
+ ## 10.6.2-next.4
83
+
84
+ ### Patch Changes
85
+
86
+ - Updated dependencies [3b3f1f8]
87
+ - @forge/lint@5.4.0-next.3
88
+ - @forge/bundler@4.19.2-next.4
89
+ - @forge/tunnel@5.5.2-next.4
90
+
91
+ ## 10.6.2-next.3
92
+
93
+ ### Patch Changes
94
+
95
+ - Updated dependencies [65bb6b7]
96
+ - @forge/manifest@7.7.2-next.0
97
+ - @forge/bundler@4.19.2-next.3
98
+ - @forge/cli-shared@5.5.2-next.2
99
+ - @forge/lint@5.3.5-next.2
100
+ - @forge/tunnel@5.5.2-next.3
101
+
102
+ ## 10.6.2-next.2
103
+
104
+ ### Patch Changes
105
+
106
+ - Updated dependencies [5edaced]
107
+ - @forge/cli-shared@5.5.2-next.1
108
+ - @forge/bundler@4.19.2-next.2
109
+ - @forge/lint@5.3.5-next.1
110
+ - @forge/tunnel@5.5.2-next.2
111
+
112
+ ## 10.6.2-next.1
113
+
114
+ ### Patch Changes
115
+
116
+ - @forge/bundler@4.19.2-next.1
117
+ - @forge/tunnel@5.5.2-next.1
118
+
119
+ ## 10.6.2-next.0
120
+
121
+ ### Patch Changes
122
+
123
+ - Updated dependencies [a30b439]
124
+ - @forge/cli-shared@5.5.2-next.0
125
+ - @forge/bundler@4.19.2-next.0
126
+ - @forge/lint@5.3.5-next.0
127
+ - @forge/tunnel@5.5.2-next.0
128
+
3
129
  ## 10.6.1
4
130
 
5
131
  ### Patch Changes
@@ -1,23 +1,23 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "10.6.1",
3
+ "version": "10.7.0",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@forge/cli",
9
- "version": "10.6.1",
9
+ "version": "10.7.0",
10
10
  "hasInstallScript": true,
11
11
  "license": "UNLICENSED",
12
12
  "dependencies": {
13
- "@forge/bundler": "4.19.1",
14
- "@forge/cli-shared": "5.5.1",
13
+ "@forge/bundler": "4.19.2",
14
+ "@forge/cli-shared": "5.5.2",
15
15
  "@forge/egress": "1.2.13",
16
16
  "@forge/i18n": "0.0.1",
17
- "@forge/lint": "5.3.4",
18
- "@forge/manifest": "7.7.1",
17
+ "@forge/lint": "5.4.0",
18
+ "@forge/manifest": "7.8.0",
19
19
  "@forge/runtime": "5.10.1",
20
- "@forge/tunnel": "5.5.1",
20
+ "@forge/tunnel": "5.5.2",
21
21
  "@forge/util": "1.4.4",
22
22
  "@sentry/node": "7.100.1",
23
23
  "ajv": "^8.12.0",
@@ -832,9 +832,9 @@
832
832
  "integrity": "sha512-zG50ZRzbKyWHVb/XjI6iCIyyDNmSHdlclvehMjFZ/A3qpHExjSCjaszeY6gBDJKD2GORKKjQ3LS1UyRpiVVvkA=="
833
833
  },
834
834
  "node_modules/@forge/bundler": {
835
- "version": "4.19.1",
836
- "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.19.1.tgz",
837
- "integrity": "sha512-yX4oFRD0NgI17vw0z70OjxwUHFKqUVr8q9X8eE0LNrXqlkMaKmgQ1wWO8P99LxsKEDwxlTYphyr9ws80HN+sWA==",
835
+ "version": "4.19.2",
836
+ "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.19.2.tgz",
837
+ "integrity": "sha512-+wmVpB267tHKdipSECJGQ+NDKwoWcua9poFU2g8Ybih4TE6TRmr14FAwpV09W3HVFil/yNRgLeb9ZpJQln6PfQ==",
838
838
  "dependencies": {
839
839
  "@babel/core": "^7.24.0",
840
840
  "@babel/plugin-transform-class-properties": "^7.23.3",
@@ -843,12 +843,12 @@
843
843
  "@babel/plugin-transform-optional-chaining": "^7.23.4",
844
844
  "@babel/plugin-transform-react-jsx": "^7.23.4",
845
845
  "@babel/preset-typescript": "^7.23.3",
846
- "@forge/api": "3.9.2",
846
+ "@forge/api": "4.0.0",
847
847
  "@forge/babel-plugin-transform-ui": "1.1.18",
848
- "@forge/cli-shared": "5.5.1",
848
+ "@forge/cli-shared": "5.5.2",
849
849
  "@forge/i18n": "0.0.1",
850
- "@forge/lint": "5.3.4",
851
- "@forge/manifest": "7.7.1",
850
+ "@forge/lint": "5.4.0",
851
+ "@forge/manifest": "7.8.0",
852
852
  "@forge/util": "1.4.4",
853
853
  "assert": "^2.1.0",
854
854
  "babel-loader": "^8.3.0",
@@ -887,30 +887,30 @@
887
887
  }
888
888
  },
889
889
  "node_modules/@forge/bundler/node_modules/@forge/api": {
890
- "version": "3.9.2",
891
- "resolved": "https://registry.npmjs.org/@forge/api/-/api-3.9.2.tgz",
892
- "integrity": "sha512-KyjmHkyZLumb2qcSble4A/gHrH0blx+Mn3Zrs+4JlBYgs+iUFp5HW3o2Ui8ITBN+xtnVwQg8KAz1D88foGtW8A==",
890
+ "version": "4.0.0",
891
+ "resolved": "https://registry.npmjs.org/@forge/api/-/api-4.0.0.tgz",
892
+ "integrity": "sha512-Ym+XyYq+Uy1KjLjhLSsoilelaSAN04GhkTdeMeq5dp3a0Fjk5AKsP266NTFr2/i+zTcI4Oo8kIXhJenWqes+NQ==",
893
893
  "dependencies": {
894
894
  "@forge/auth": "0.0.5",
895
895
  "@forge/egress": "1.2.13",
896
- "@forge/storage": "1.5.15",
896
+ "@forge/storage": "1.6.0",
897
897
  "@forge/util": "1.4.4",
898
898
  "@types/node-fetch": "^2.6.11",
899
899
  "node-fetch": "2.7.0"
900
900
  }
901
901
  },
902
902
  "node_modules/@forge/bundler/node_modules/@forge/storage": {
903
- "version": "1.5.15",
904
- "resolved": "https://registry.npmjs.org/@forge/storage/-/storage-1.5.15.tgz",
905
- "integrity": "sha512-n4AWXkzMA4Pv4nam+dTu7PHgDQtMwaAF2MalOWF323zGvYKS/gZJY+7efJq0DLP783iTfjvYT879EHhCrfvEXA=="
903
+ "version": "1.6.0",
904
+ "resolved": "https://registry.npmjs.org/@forge/storage/-/storage-1.6.0.tgz",
905
+ "integrity": "sha512-gu7Uv6GgDOmRVRrZ2WRe9jyG6uq8Wn21ak+M3hPI1ukqZQyDRoHQes6rEU+n8FwiNtj8ryAmZDEz/CvAlWbCDw=="
906
906
  },
907
907
  "node_modules/@forge/cli-shared": {
908
- "version": "5.5.1",
909
- "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-5.5.1.tgz",
910
- "integrity": "sha512-CGN1T4nUBuK6TovBi8tuxXvmsvTkK8MubK9Rq8y67yleefv3glXyYTrTNlUfXpx5illFaB86PfNEoutd42ItjQ==",
908
+ "version": "5.5.2",
909
+ "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-5.5.2.tgz",
910
+ "integrity": "sha512-yfSTNOogvJDv/qoUTefgqP9rj1gPXT90jidg+rnNhT4HvJ6I3crm5KgUca4RJLIQeJqr0smM3cWnlc9LX0pInw==",
911
911
  "dependencies": {
912
912
  "@forge/i18n": "0.0.1",
913
- "@forge/manifest": "7.7.1",
913
+ "@forge/manifest": "7.8.0",
914
914
  "@forge/util": "1.4.4",
915
915
  "@sentry/node": "7.100.1",
916
916
  "adm-zip": "^0.5.10",
@@ -969,13 +969,13 @@
969
969
  }
970
970
  },
971
971
  "node_modules/@forge/lint": {
972
- "version": "5.3.4",
973
- "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-5.3.4.tgz",
974
- "integrity": "sha512-zl8qa68o1SZNeudxP+hVN1HbiwBv8oTBWIztojAJaRZvbOVEAspH6eCmpw4XEA5h0dTkUTIBmWk1dnX1LWMJIQ==",
972
+ "version": "5.4.0",
973
+ "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-5.4.0.tgz",
974
+ "integrity": "sha512-1Y2Ej5vrKVr1W7CpKfLMY0IWYZvVXeeK7XsBFOovUUvMXRy6YKIw/l2qYjC8CC9BwgXCyDgp7NIJHUxMf8QkYw==",
975
975
  "dependencies": {
976
- "@forge/cli-shared": "5.5.1",
976
+ "@forge/cli-shared": "5.5.2",
977
977
  "@forge/egress": "1.2.13",
978
- "@forge/manifest": "7.7.1",
978
+ "@forge/manifest": "7.8.0",
979
979
  "@typescript-eslint/typescript-estree": "^5.62.0",
980
980
  "array.prototype.flatmap": "^1.3.2",
981
981
  "atlassian-openapi": "^1.0.18",
@@ -984,9 +984,9 @@
984
984
  }
985
985
  },
986
986
  "node_modules/@forge/manifest": {
987
- "version": "7.7.1",
988
- "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-7.7.1.tgz",
989
- "integrity": "sha512-YFB+7nXAhTDzk9P4zje8OFPmXzxNZ+griPnKLbwd/YOSByySnEEMhRtGo0iqPEOqPPXP6Z2Q38XhLpFj7ZxjNQ==",
987
+ "version": "7.8.0",
988
+ "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-7.8.0.tgz",
989
+ "integrity": "sha512-d0MG8DokEpOsWWKmHj2XddAU56wN166SLMMHBDHELxI3AtFn56ftBMuSzXLRQ20J7J3ekvQgcRo0wEPoNU+blQ==",
990
990
  "dependencies": {
991
991
  "@forge/i18n": "0.0.1",
992
992
  "@sentry/node": "7.100.1",
@@ -1015,12 +1015,12 @@
1015
1015
  }
1016
1016
  },
1017
1017
  "node_modules/@forge/tunnel": {
1018
- "version": "5.5.1",
1019
- "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-5.5.1.tgz",
1020
- "integrity": "sha512-hxEpOCy4GkBInr0jkPQ++34FYLoSrtcFzEmuDazZhqPZ+FYeoPriTC8nyu+j7FiM99dO622xuHulONso8adezQ==",
1018
+ "version": "5.5.2",
1019
+ "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-5.5.2.tgz",
1020
+ "integrity": "sha512-9zj9lDXn8QVJIJlUXiJ7Iw9LJbAEWxLDmozTwRFtRv0nguof4WNdJqis7vX2Bw4vXH7NohhmQyEbZUP36uqpEg==",
1021
1021
  "dependencies": {
1022
- "@forge/bundler": "4.19.1",
1023
- "@forge/cli-shared": "5.5.1",
1022
+ "@forge/bundler": "4.19.2",
1023
+ "@forge/cli-shared": "5.5.2",
1024
1024
  "@forge/csp": "3.3.0",
1025
1025
  "@forge/runtime": "5.10.1",
1026
1026
  "chokidar": "^3.6.0",
@@ -1 +1 @@
1
- {"version":3,"file":"dependency-injection.d.ts","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAGhB,kBAAkB,EAGlB,gBAAgB,EAQhB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EAElB,kBAAkB,EAInB,MAAM,mBAAmB,CAAC;AAc3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAML,0BAA0B,EAG3B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gCAAgC,EAAE,MAAM,sDAAsD,CAAC;AAExG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAIlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAM7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAI3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAUlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAIhF,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAE3F,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmWvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAC7D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"dependency-injection.d.ts","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAGhB,kBAAkB,EAGlB,gBAAgB,EAQhB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EAElB,kBAAkB,EAInB,MAAM,mBAAmB,CAAC;AAc3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAML,0BAA0B,EAG3B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gCAAgC,EAAE,MAAM,sDAAsD,CAAC;AAExG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAIlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAM7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAI3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAUlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAIhF,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAE3F,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkWvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAC7D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}
@@ -136,7 +136,7 @@ const getDependencies = async (cliDetails) => {
136
136
  const listEntitiesIndexesCommand = new list_indexes_1.ListEntitiesIndexesCommand(customEntitiesService);
137
137
  const bitbucketTranslation = new site_translation_1.BitbucketTranslator();
138
138
  const cloudProductTranslation = new site_translation_1.CloudIdTranslator(graphQLClient);
139
- const installationsClient = new graphql_client_6.InstallationsGraphqlClient(graphQLClient, cloudProductTranslation, bitbucketTranslation, cli_shared_1.pause, featureFlagService);
139
+ const installationsClient = new graphql_client_6.InstallationsGraphqlClient(graphQLClient, cloudProductTranslation, bitbucketTranslation, cli_shared_1.pause);
140
140
  const installAppSiteCommand = new install_app_site_1.InstallAppSiteCommand(assertiveAppConfigReader, installationsClient);
141
141
  const uninstallAppCommand = new uninstall_app_1.UninstallAppCommand(assertiveAppConfigReader, installationsClient);
142
142
  const deployMonitorClient = new deploy_1.DeployMonitorGraphqlClient(graphQLClient);
@@ -1,4 +1,4 @@
1
- import { AppUninstallationInput, GraphQLClient, GraphQlMutationError, Pause, BaseError, UserError, FeatureFlagReader } from '@forge/cli-shared';
1
+ import { AppUninstallationInput, GraphQLClient, GraphQlMutationError, Pause, BaseError, UserError } from '@forge/cli-shared';
2
2
  import { AppInstallSiteDetails, InstallAppClient } from './install-app-site';
3
3
  import { AppEnvironmentVersionData, Installation, ListAppInstallationsClient, UpgradeAppInstallationsClient } from '../service/installation-service';
4
4
  import { UninstallAppClient, UninstallAppOutput } from './uninstall-app';
@@ -49,11 +49,10 @@ export declare class InstallationsGraphqlClient implements InstallAppClient, Lis
49
49
  private readonly cloudIdTranslator;
50
50
  private readonly bitbucketTranslator;
51
51
  private readonly pause;
52
- private readonly featureFlagReader;
53
52
  SITE_RESOURCE_TYPE: string;
54
53
  WORKSPACE_RESOURCE_TYPE: string;
55
54
  static buildInstallationContext(product: string, resourceId: string, resourceType: string): string;
56
- constructor(graphqlClient: GraphQLClient, cloudIdTranslator: SiteTranslator, bitbucketTranslator: SiteTranslator, pause: Pause, featureFlagReader: FeatureFlagReader);
55
+ constructor(graphqlClient: GraphQLClient, cloudIdTranslator: SiteTranslator, bitbucketTranslator: SiteTranslator, pause: Pause);
57
56
  private buildInstallationContext;
58
57
  private getProductTranslation;
59
58
  installAppIntoSite({ environmentKey, site, product, appId, licenseOverride }: AppInstallSiteDetails): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,sBAAsB,EAKtB,aAAa,EACb,oBAAoB,EAOpB,KAAK,EAGL,SAAS,EACT,SAAS,EACT,iBAAiB,EAGlB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EACL,yBAAyB,EACzB,YAAY,EACZ,0BAA0B,EAC1B,6BAA6B,EAC9B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAEzE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,eAAO,MAAM,kCAAkC,MAAM,CAAC;AActD,eAAO,MAAM,qBAAqB,kCAAkC,CAAC;AAMrE,qBAAa,qBAAsB,SAAQ,oBAAoB;gBACjD,SAAS,oBAAY,EAAE,KAAK,oBAAY,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS;CAOrF;AAED,qBAAa,qBAAsB,SAAQ,oBAAoB;gBACjD,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS;CAG1E;AAED,qBAAa,iBAAkB,SAAQ,oBAAoB;gBAEvD,OAAO,EAAE,MAAM,EACf,EACE,SAAS,EACT,IAAI,EACJ,UAAU,EACX,EAAE;QACD,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;QAC9B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;KAChC;CAIJ;AAED,qBAAa,YAAa,SAAQ,oBAAoB;gBAElD,OAAO,EAAE,MAAM,EACf,EACE,SAAS,EACT,IAAI,EACJ,UAAU,EACX,EAAE;QACD,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;QAC9B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;KAChC;CAIJ;AAED,qBAAa,wBAAyB,SAAQ,SAAS;gBACzC,cAAc,EAAE,MAAM;CAGnC;AAED,qBAAa,kBAAmB,SAAQ,KAAK;CAAG;AAEhD,qBAAa,8BAA+B,SAAQ,SAAS;IAEzD,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,QAAQ,CAAC,IAAI,CAAC;gBADG,SAAS,EAAE,OAAO,EAC1B,IAAI,CAAC,oBAAQ,EACtB,OAAO,CAAC,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS;IAIzB,WAAW,IAAI,OAAO;CAG9B;AAED,qBAAa,eAAgB,SAAQ,SAAS;CAAG;AAEjD,qBAAa,0BAA2B,SAAQ,KAAK;CAAG;AAExD,qBAAa,uBAAwB,SAAQ,KAAK;CAAG;AAErD,qBAAa,yBAA0B,SAAQ,SAAS;CAAG;AAE3D,qBAAa,0BACX,YAAW,gBAAgB,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,6BAA6B;IAgBxG,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAlBpC,kBAAkB,SAAU;IAC5B,uBAAuB,SAAe;WAExB,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM;gBAWtF,aAAa,EAAE,aAAa,EAC5B,iBAAiB,EAAE,cAAc,EACjC,mBAAmB,EAAE,cAAc,EACnC,KAAK,EAAE,KAAK,EACZ,iBAAiB,EAAE,iBAAiB;YAGzC,wBAAwB;IAKtC,OAAO,CAAC,qBAAqB;IAQhB,kBAAkB,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,EAAE,qBAAqB;IAyDnG,mBAAmB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,qBAAqB;YAkDlF,0BAA0B;IA6B3B,YAAY,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC;IAqC7D,qBAAqB,CAAC,IAAI,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAmB7F,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAKzD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;YAS5E,sBAAsB;YAqCtB,2BAA2B;YAY3B,mBAAmB;IAiBjC,OAAO,CAAC,yBAAyB;YAOnB,sBAAsB;YAoBtB,6BAA6B;YA6B7B,mBAAmB;IAuEpB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,OAAO,CAAC,yBAAyB,CAAC;CAyChH"}
1
+ {"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,sBAAsB,EAKtB,aAAa,EACb,oBAAoB,EAOpB,KAAK,EAGL,SAAS,EACT,SAAS,EAGV,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EACL,yBAAyB,EACzB,YAAY,EACZ,0BAA0B,EAC1B,6BAA6B,EAC9B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAEzE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,eAAO,MAAM,kCAAkC,MAAM,CAAC;AActD,eAAO,MAAM,qBAAqB,kCAAkC,CAAC;AAMrE,qBAAa,qBAAsB,SAAQ,oBAAoB;gBACjD,SAAS,oBAAY,EAAE,KAAK,oBAAY,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS;CAOrF;AAED,qBAAa,qBAAsB,SAAQ,oBAAoB;gBACjD,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS;CAG1E;AAED,qBAAa,iBAAkB,SAAQ,oBAAoB;gBAEvD,OAAO,EAAE,MAAM,EACf,EACE,SAAS,EACT,IAAI,EACJ,UAAU,EACX,EAAE;QACD,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;QAC9B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;KAChC;CAIJ;AAED,qBAAa,YAAa,SAAQ,oBAAoB;gBAElD,OAAO,EAAE,MAAM,EACf,EACE,SAAS,EACT,IAAI,EACJ,UAAU,EACX,EAAE;QACD,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;QAC9B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;KAChC;CAIJ;AAED,qBAAa,wBAAyB,SAAQ,SAAS;gBACzC,cAAc,EAAE,MAAM;CAGnC;AAED,qBAAa,kBAAmB,SAAQ,KAAK;CAAG;AAEhD,qBAAa,8BAA+B,SAAQ,SAAS;IAEzD,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,QAAQ,CAAC,IAAI,CAAC;gBADG,SAAS,EAAE,OAAO,EAC1B,IAAI,CAAC,oBAAQ,EACtB,OAAO,CAAC,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS;IAIzB,WAAW,IAAI,OAAO;CAG9B;AAED,qBAAa,eAAgB,SAAQ,SAAS;CAAG;AAEjD,qBAAa,0BAA2B,SAAQ,KAAK;CAAG;AAExD,qBAAa,uBAAwB,SAAQ,KAAK;CAAG;AAErD,qBAAa,yBAA0B,SAAQ,SAAS;CAAG;AAE3D,qBAAa,0BACX,YAAW,gBAAgB,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,6BAA6B;IAgBxG,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK;IAjBxB,kBAAkB,SAAU;IAC5B,uBAAuB,SAAe;WAExB,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM;gBAWtF,aAAa,EAAE,aAAa,EAC5B,iBAAiB,EAAE,cAAc,EACjC,mBAAmB,EAAE,cAAc,EACnC,KAAK,EAAE,KAAK;YAGjB,wBAAwB;IAKtC,OAAO,CAAC,qBAAqB;IAQhB,kBAAkB,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,EAAE,qBAAqB;IAwDnG,mBAAmB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,qBAAqB;YAiDlF,0BAA0B;IAyB3B,YAAY,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC;IAqC7D,qBAAqB,CAAC,IAAI,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAmB7F,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAKzD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;YAS5E,sBAAsB;YAqCtB,2BAA2B;YAY3B,mBAAmB;IAiBjC,OAAO,CAAC,yBAAyB;YAOnB,sBAAsB;YAoBtB,6BAA6B;YA6B7B,mBAAmB;IAuEpB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,OAAO,CAAC,yBAAyB,CAAC;CAyChH"}
@@ -76,7 +76,6 @@ class InstallationsGraphqlClient {
76
76
  cloudIdTranslator;
77
77
  bitbucketTranslator;
78
78
  pause;
79
- featureFlagReader;
80
79
  SITE_RESOURCE_TYPE = 'site';
81
80
  WORKSPACE_RESOURCE_TYPE = 'workspace';
82
81
  static buildInstallationContext(product, resourceId, resourceType) {
@@ -87,12 +86,11 @@ class InstallationsGraphqlClient {
87
86
  });
88
87
  return ari.toString();
89
88
  }
90
- constructor(graphqlClient, cloudIdTranslator, bitbucketTranslator, pause, featureFlagReader) {
89
+ constructor(graphqlClient, cloudIdTranslator, bitbucketTranslator, pause) {
91
90
  this.graphqlClient = graphqlClient;
92
91
  this.cloudIdTranslator = cloudIdTranslator;
93
92
  this.bitbucketTranslator = bitbucketTranslator;
94
93
  this.pause = pause;
95
- this.featureFlagReader = featureFlagReader;
96
94
  }
97
95
  async buildInstallationContext(product, site) {
98
96
  const ari = await this.getProductTranslation(product).buildInstallationContext(product, site);
@@ -105,7 +103,7 @@ class InstallationsGraphqlClient {
105
103
  return this.cloudIdTranslator;
106
104
  }
107
105
  async installAppIntoSite({ environmentKey, site, product, appId, licenseOverride }) {
108
- const installationContext = await this.buildInstallationContext(product, site);
106
+ const workspaceAri = await this.buildInstallationContext(product, site);
109
107
  const query = `
110
108
  mutation forge_cli_installApplication($input: AppInstallationInput!) {
111
109
  installApp(input: $input) {
@@ -123,7 +121,7 @@ class InstallationsGraphqlClient {
123
121
  `;
124
122
  const variables = {
125
123
  input: {
126
- installationContext,
124
+ installationContext: workspaceAri,
127
125
  appId,
128
126
  environmentKey,
129
127
  async: true,
@@ -151,7 +149,7 @@ class InstallationsGraphqlClient {
151
149
  await this.monitorAppInstallOrUpgrade(taskId);
152
150
  }
153
151
  async upgradeInstallation({ site, product, environmentKey, appId }) {
154
- const installationContext = await this.buildInstallationContext(product, site);
152
+ const workspaceAri = await this.buildInstallationContext(product, site);
155
153
  const query = `
156
154
  mutation forge_cli_upgradeApplication($input: AppInstallationUpgradeInput!) {
157
155
  upgradeApp(input: $input) {
@@ -169,7 +167,7 @@ class InstallationsGraphqlClient {
169
167
  `;
170
168
  const variables = {
171
169
  input: {
172
- installationContext,
170
+ installationContext: workspaceAri,
173
171
  appId,
174
172
  environmentKey,
175
173
  async: true
@@ -196,14 +194,11 @@ class InstallationsGraphqlClient {
196
194
  status = result.state;
197
195
  if (status === cli_shared_1.AppTaskState.Failed) {
198
196
  const { errors, requestId } = result;
199
- const shouldDisplayHarmonizedAppInstallationErrors = await this.featureFlagReader.shouldDisplayErrorsForHarmonizedApps();
200
197
  const error = errors?.[0];
201
198
  const statusCode = error?.extensions?.statusCode;
202
199
  const isUserError = statusCode && statusCode >= 400 && statusCode < 500 ? true : false;
203
200
  const code = error?.extensions?.errorType ?? undefined;
204
- throw new InstallationRequestFailedError(isUserError, code, shouldDisplayHarmonizedAppInstallationErrors
205
- ? (0, harmonized_app_installation_errors_1.expandHarmonizedAppInstallationError)(code, error?.message ?? undefined)
206
- : error?.message ?? undefined, requestId);
201
+ throw new InstallationRequestFailedError(isUserError, code, (0, harmonized_app_installation_errors_1.expandHarmonizedAppInstallationError)(code, error?.message ?? undefined), requestId);
207
202
  }
208
203
  if (status !== cli_shared_1.AppTaskState.Complete)
209
204
  await this.pause(exports.UNINSTALLATION_EVENT_POLL_INTERVAL);
@@ -6,12 +6,20 @@ import { GraphQLClient, UserError, EnrichedAri } from '@forge/cli-shared';
6
6
  export declare class InvalidAtlassianSiteError extends UserError {
7
7
  constructor(url: URL);
8
8
  }
9
+ declare type CloudIdAndActivationId = {
10
+ cloudId: string;
11
+ activationId: string;
12
+ };
13
+ export declare class ActivationIdMissingError extends Error {
14
+ constructor(url: string, product: string);
15
+ }
9
16
  export declare class CloudIdTranslator implements SiteTranslator {
10
17
  private graphqlClient;
11
18
  constructor(graphqlClient: GraphQLClient);
12
19
  ariBelongsToProduct(ari: EnrichedAri): boolean;
13
20
  buildInstallationContext(product: string, site: URL): Promise<Ari>;
14
21
  getSitesForResourceAris(aris: EnrichedAri[]): Promise<Record<string, string>>;
15
- private getCloudId;
22
+ getCloudIdAndActivationId(site: URL, product: string): Promise<CloudIdAndActivationId>;
16
23
  }
24
+ export {};
17
25
  //# sourceMappingURL=cloudid-products.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"cloudid-products.d.ts","sourceRoot":"","sources":["../../../src/installations/site-translation/cloudid-products.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAU,MAAM,0BAA0B,CAAC;AACvD,OAAO,EACL,aAAa,EAOb,SAAS,EAGT,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAE3B,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,GAAG,EAAE,GAAG;CAGrB;AAuBD,qBAAa,iBAAkB,YAAW,cAAc;IAC1C,OAAO,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAEzC,mBAAmB,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO;IAQxC,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAUlE,uBAAuB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YA4C5E,UAAU;CAezB"}
1
+ {"version":3,"file":"cloudid-products.d.ts","sourceRoot":"","sources":["../../../src/installations/site-translation/cloudid-products.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EACL,aAAa,EAOb,SAAS,EAET,WAAW,EAEZ,MAAM,mBAAmB,CAAC;AAE3B,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,GAAG,EAAE,GAAG;CAGrB;AAED,aAAK,sBAAsB,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC;AACxE,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAGzC;AA+BD,qBAAa,iBAAkB,YAAW,cAAc;IAC1C,OAAO,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAEzC,mBAAmB,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO;IAQxC,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IASlE,uBAAuB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IA2C7E,yBAAyB,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;CAsBpG"}
@@ -1,7 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.CloudIdTranslator = exports.InvalidAtlassianSiteError = void 0;
4
- const ari_1 = require("@forge/util/packages/ari");
3
+ exports.CloudIdTranslator = exports.ActivationIdMissingError = exports.InvalidAtlassianSiteError = void 0;
5
4
  const cli_shared_1 = require("@forge/cli-shared");
6
5
  class InvalidAtlassianSiteError extends cli_shared_1.UserError {
7
6
  constructor(url) {
@@ -9,7 +8,13 @@ class InvalidAtlassianSiteError extends cli_shared_1.UserError {
9
8
  }
10
9
  }
11
10
  exports.InvalidAtlassianSiteError = InvalidAtlassianSiteError;
12
- const tenantContextsToCloudId = (url, contexts) => {
11
+ class ActivationIdMissingError extends Error {
12
+ constructor(url, product) {
13
+ super(cli_shared_1.Text.install.error.activationIdMissing(url, product));
14
+ }
15
+ }
16
+ exports.ActivationIdMissingError = ActivationIdMissingError;
17
+ const tenantContextsToCloudIdAndActivationId = (url, contexts, product) => {
13
18
  if (!contexts.length) {
14
19
  throw new InvalidAtlassianSiteError(url);
15
20
  }
@@ -17,7 +22,11 @@ const tenantContextsToCloudId = (url, contexts) => {
17
22
  if (!context || !context.cloudId) {
18
23
  throw new InvalidAtlassianSiteError(url);
19
24
  }
20
- return context.cloudId;
25
+ const activationId = context.activationIdByProduct?.active;
26
+ if (!activationId) {
27
+ throw new ActivationIdMissingError(url.toString(), product);
28
+ }
29
+ return { cloudId: context.cloudId, activationId: activationId };
21
30
  };
22
31
  const tenantToHostname = (tenantInfo) => {
23
32
  if (!tenantInfo) {
@@ -36,13 +45,11 @@ class CloudIdTranslator {
36
45
  ![cli_shared_1.TRELLO_RESOURCE_OWNER, cli_shared_1.BITBUCKET_RESOURCE_OWNER].includes(ari.resourceOwner)));
37
46
  }
38
47
  async buildInstallationContext(product, site) {
39
- const cloudId = await this.getCloudId(site);
40
- const ari = ari_1.AnyAri.create({
41
- resourceOwner: (0, cli_shared_1.ariResourceOwner)(product),
42
- resourceType: cli_shared_1.SITE_RESOURCE_TYPE,
43
- resourceId: cloudId
44
- });
45
- return ari;
48
+ const lowerCaseProduct = product.toLowerCase();
49
+ const { cloudId, activationId } = await this.getCloudIdAndActivationId(site, lowerCaseProduct);
50
+ const workspaceAriCreator = cli_shared_1.createWorkspaceAriByProduct[lowerCaseProduct];
51
+ const workspaceAri = workspaceAriCreator(cloudId, activationId);
52
+ return workspaceAri;
46
53
  }
47
54
  async getSitesForResourceAris(aris) {
48
55
  const MAX_CLOUD_IDS_AT_ONCE = 20;
@@ -73,19 +80,24 @@ class CloudIdTranslator {
73
80
  });
74
81
  return ariToHostname;
75
82
  }
76
- async getCloudId(site) {
83
+ async getCloudIdAndActivationId(site, product) {
77
84
  const query = `
78
- query forge_cli_getCloudIfForTenantContexts($hostNames: [String!]) {
79
- tenantContexts(hostNames: $hostNames) {
80
- cloudId
85
+ query getTenantContextDetails($hostNames: [String!], $product: String!) {
86
+ tenantContexts(hostNames: $hostNames) {
87
+ cloudId
88
+ activationIdByProduct(product: $product) {
89
+ product
90
+ active
81
91
  }
82
92
  }
93
+ }
83
94
  `;
84
95
  const result = await this.graphqlClient.query(query, {
85
- hostNames: [site.hostname]
96
+ hostNames: [site.hostname],
97
+ product
86
98
  });
87
99
  const tenantContexts = result.tenantContexts || [];
88
- return tenantContextsToCloudId(site, tenantContexts);
100
+ return tenantContextsToCloudIdAndActivationId(site, tenantContexts, product);
89
101
  }
90
102
  }
91
103
  exports.CloudIdTranslator = CloudIdTranslator;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "10.6.1",
3
+ "version": "10.7.0",
4
4
  "description": "A command line interface for managing Atlassian-hosted apps",
5
5
  "author": "Atlassian",
6
6
  "license": "UNLICENSED",
@@ -18,13 +18,13 @@
18
18
  "postinstall": "node -e \"fs.existsSync('./out/bin/postinstall.js') && require('./out/bin/postinstall.js')\""
19
19
  },
20
20
  "dependencies": {
21
- "@forge/bundler": "4.19.1",
22
- "@forge/cli-shared": "5.5.1",
21
+ "@forge/bundler": "4.19.2",
22
+ "@forge/cli-shared": "5.5.2",
23
23
  "@forge/egress": "1.2.13",
24
- "@forge/lint": "5.3.4",
25
- "@forge/manifest": "7.7.1",
24
+ "@forge/lint": "5.4.0",
25
+ "@forge/manifest": "7.8.0",
26
26
  "@forge/runtime": "5.10.1",
27
- "@forge/tunnel": "5.5.1",
27
+ "@forge/tunnel": "5.5.2",
28
28
  "@forge/util": "1.4.4",
29
29
  "@sentry/node": "7.100.1",
30
30
  "@forge/i18n": "0.0.1",