@forge/cli 6.14.1 → 6.15.0-next.51
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 +561 -0
- package/npm-shrinkwrap.json +1764 -2396
- package/out/analytics-client/analytics-client.d.ts +1 -1
- package/out/analytics-client/analytics-client.d.ts.map +1 -1
- package/out/autocomplete/autocomplete-config.json +16 -0
- package/out/bin/postinstall.js +1 -2
- package/out/command-line/anon-user-id.js +1 -1
- package/out/command-line/command.d.ts +8 -8
- package/out/command-line/command.d.ts.map +1 -1
- package/out/command-line/command.js +8 -8
- package/out/command-line/controller/default-environment-controller.d.ts +2 -3
- package/out/command-line/controller/default-environment-controller.d.ts.map +1 -1
- package/out/command-line/controller/default-environment-controller.js +2 -8
- package/out/command-line/controller/install-controller.d.ts.map +1 -1
- package/out/command-line/controller/install-controller.js +3 -2
- package/out/command-line/controller/prerequisites-controller.d.ts +1 -10
- package/out/command-line/controller/prerequisites-controller.d.ts.map +1 -1
- package/out/command-line/controller/prerequisites-controller.js +1 -22
- package/out/command-line/controller/settings-controller.d.ts +3 -7
- package/out/command-line/controller/settings-controller.d.ts.map +1 -1
- package/out/command-line/controller/settings-controller.js +33 -50
- package/out/command-line/dependency-injection.d.ts +2 -2
- package/out/command-line/dependency-injection.d.ts.map +1 -1
- package/out/command-line/dependency-injection.js +3 -4
- package/out/command-line/index.d.ts +1 -1
- package/out/command-line/index.d.ts.map +1 -1
- package/out/command-line/index.js +6 -12
- package/out/command-line/register-installation-commands.js +6 -6
- package/out/command-line/register-settings-commands.d.ts +1 -1
- package/out/command-line/register-settings-commands.d.ts.map +1 -1
- package/out/command-line/register-settings-commands.js +5 -5
- package/out/command-line/unique-machine-id.d.ts +0 -1
- package/out/command-line/unique-machine-id.d.ts.map +1 -1
- package/out/command-line/unique-machine-id.js +2 -3
- package/out/command-line/version-info.d.ts.map +1 -1
- package/out/command-line/version-info.js +2 -3
- package/out/command-line/view/install-view.d.ts.map +1 -1
- package/out/command-line/view/install-view.js +1 -1
- package/out/command-line/view/settings-view.d.ts +1 -1
- package/out/command-line/view/settings-view.d.ts.map +1 -1
- package/out/contributors/graphql-client.d.ts +0 -2
- package/out/contributors/graphql-client.d.ts.map +1 -1
- package/out/contributors/graphql-client.js +24 -16
- package/out/deploy/deployer/deploy-monitor-graphql-client.d.ts +2 -2
- package/out/deploy/deployer/deploy-monitor-graphql-client.d.ts.map +1 -1
- package/out/deploy/deployer/deployer.d.ts.map +1 -1
- package/out/deploy/deployer/deployer.js +2 -1
- package/out/environment/graphql-client.d.ts.map +1 -1
- package/out/environment/graphql-client.js +6 -0
- package/out/installations/graphql-client.d.ts.map +1 -1
- package/out/installations/graphql-client.js +8 -8
- package/out/installations/site-translation/bitbucket.js +1 -1
- package/out/installations/site-translation/cloudid-products.d.ts.map +1 -1
- package/out/installations/site-translation/cloudid-products.js +1 -1
- package/out/service/installation-service.js +1 -1
- package/out/service/migration-keys-service.d.ts +1 -1
- package/out/service/migration-keys-service.d.ts.map +1 -1
- package/out/service/tunnel-service.d.ts +1 -1
- package/out/service/tunnel-service.d.ts.map +1 -1
- package/out/workers/forge-cli-workers.js +1 -2
- package/out/workers/tunnel-clean-up-worker.d.ts +1 -1
- package/out/workers/tunnel-clean-up-worker.d.ts.map +1 -1
- package/package.json +24 -24
|
@@ -8,7 +8,7 @@ const errors_1 = require("./errors");
|
|
|
8
8
|
const COMMAND_NAME = 'install';
|
|
9
9
|
async function validateContext({ site, product }) {
|
|
10
10
|
if (product) {
|
|
11
|
-
product = (0, cli_shared_1.
|
|
11
|
+
product = (0, cli_shared_1.productDisplayName)(product);
|
|
12
12
|
if (!(0, cli_shared_1.isSupportedProduct)(product)) {
|
|
13
13
|
throw new cli_shared_1.ValidationError(cli_shared_1.Text.error.invalidProduct);
|
|
14
14
|
}
|
|
@@ -22,7 +22,7 @@ const registerInstallAppCommand = ({ cmd, controllers: { installController } })
|
|
|
22
22
|
.requireAppId()
|
|
23
23
|
.environmentOption()
|
|
24
24
|
.option('-s, --site [site]', cli_shared_1.Text.optionSite)
|
|
25
|
-
.option('-p, --product [product]', cli_shared_1.Text.optionProduct(cli_shared_1.
|
|
25
|
+
.option('-p, --product [product]', cli_shared_1.Text.optionProduct((0, cli_shared_1.getSupportedProducts)()))
|
|
26
26
|
.precondition(validateContext)
|
|
27
27
|
.option('--upgrade', cli_shared_1.Text.install.optionUpgrade, false)
|
|
28
28
|
.option('--confirm-scopes', cli_shared_1.Text.install.optionConfirmScopes, false)
|
|
@@ -51,7 +51,7 @@ const registerListInstallationsCommand = ({ cmd, ui, services: { installationsSe
|
|
|
51
51
|
id,
|
|
52
52
|
environment: (0, cli_shared_1.environmentToOption)(environmentKey),
|
|
53
53
|
site,
|
|
54
|
-
product: (0, cli_shared_1.
|
|
54
|
+
product: (0, cli_shared_1.productDisplayName)(product),
|
|
55
55
|
version: cli_shared_1.Text.install.booleanToScope(isLatest)
|
|
56
56
|
})), {
|
|
57
57
|
json,
|
|
@@ -66,7 +66,7 @@ const performSingleUninstall = async (installId, { ui, commands: { uninstallAppC
|
|
|
66
66
|
message: cli_shared_1.Text.uninstall.cmd.success(false)
|
|
67
67
|
}));
|
|
68
68
|
const uninstallMessageFormat = installation.successful ? cli_shared_1.Text.uninstall.done : cli_shared_1.Text.uninstall.failed;
|
|
69
|
-
const uninstallMessage = uninstallMessageFormat((0, cli_shared_1.
|
|
69
|
+
const uninstallMessage = uninstallMessageFormat((0, cli_shared_1.productDisplayName)(installation.product), installation.site, installation.environmentKey, false);
|
|
70
70
|
if (installation.successful) {
|
|
71
71
|
ui.info(uninstallMessage);
|
|
72
72
|
}
|
|
@@ -88,7 +88,7 @@ const performMultipleUninstalls = async (appsToUninstall, { ui, commands: { unin
|
|
|
88
88
|
const deferredErrors = [];
|
|
89
89
|
uninstalledApps.forEach((uninstall) => {
|
|
90
90
|
const uninstallMessageFormat = uninstall.successful ? cli_shared_1.Text.uninstall.done : cli_shared_1.Text.uninstall.failed;
|
|
91
|
-
const formattedMessage = uninstallMessageFormat((0, cli_shared_1.
|
|
91
|
+
const formattedMessage = uninstallMessageFormat((0, cli_shared_1.productDisplayName)(uninstall.product), uninstall.site, uninstall.environmentKey, hasMultipleNonIdentityApps);
|
|
92
92
|
if (uninstall.successful && uninstall.product !== 'identity') {
|
|
93
93
|
ui.info(formattedMessage);
|
|
94
94
|
}
|
|
@@ -128,7 +128,7 @@ const registerUninstallCommand = (deps) => {
|
|
|
128
128
|
else {
|
|
129
129
|
const filteredInstallations = installations.filter((install) => install.product !== 'identity' && install.product !== 'jira-servicedesk');
|
|
130
130
|
const selectedSitesIndexes = await ui.promptForTable(cli_shared_1.Text.uninstall.interactive.desc, cli_shared_1.Text.uninstall.interactive.progressInfo, ['Environment', 'Site', 'Product'], filteredInstallations.map(({ id, environmentKey, product, site }) => ({
|
|
131
|
-
names: [(0, cli_shared_1.environmentToOption)(environmentKey), site, (0, cli_shared_1.
|
|
131
|
+
names: [(0, cli_shared_1.environmentToOption)(environmentKey), site, (0, cli_shared_1.productDisplayName)(product)],
|
|
132
132
|
value: id
|
|
133
133
|
})));
|
|
134
134
|
const appsToUninstall = filteredInstallations.filter((_, index) => selectedSitesIndexes.includes(index));
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { Dependencies } from './dependency-injection';
|
|
2
|
-
export declare const registerCommands: ({ cmd, ...deps }: Dependencies) =>
|
|
2
|
+
export declare const registerCommands: ({ cmd, ...deps }: Dependencies) => void;
|
|
3
3
|
//# sourceMappingURL=register-settings-commands.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-settings-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-settings-commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAiCtD,eAAO,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"register-settings-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-settings-commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAiCtD,eAAO,MAAM,gBAAgB,qBAAsB,YAAY,SAK9D,CAAC"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.registerCommands = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
6
|
+
const settings_controller_1 = require("./controller/settings-controller");
|
|
6
7
|
const COMMAND_NAME = 'settings';
|
|
7
8
|
const SHOW_COMMAND_NAME = 'list';
|
|
8
9
|
const SET_COMMAND_NAME = 'set <setting> <boolean|string>';
|
|
@@ -18,11 +19,10 @@ const registerSettingsList = ({ cmd, controllers: { settingsController } }) => {
|
|
|
18
19
|
return { analytics: {} };
|
|
19
20
|
});
|
|
20
21
|
};
|
|
21
|
-
const registerSettingsSet =
|
|
22
|
-
const allowedSettings = await settingsController.getPublicSettings();
|
|
22
|
+
const registerSettingsSet = ({ cmd, controllers: { settingsController } }) => {
|
|
23
23
|
cmd
|
|
24
24
|
.command(SET_COMMAND_NAME)
|
|
25
|
-
.description(cli_shared_1.Text.settings.set.description(
|
|
25
|
+
.description(cli_shared_1.Text.settings.set.description(settings_controller_1.ALLOWED_SETTINGS))
|
|
26
26
|
.requireNoAuthentication()
|
|
27
27
|
.requireNoAnalyticsConsent()
|
|
28
28
|
.action(async (preference, value) => {
|
|
@@ -30,10 +30,10 @@ const registerSettingsSet = async ({ cmd, controllers: { settingsController } })
|
|
|
30
30
|
return { analytics: {} };
|
|
31
31
|
});
|
|
32
32
|
};
|
|
33
|
-
const registerCommands =
|
|
33
|
+
const registerCommands = (_a) => {
|
|
34
34
|
var { cmd } = _a, deps = tslib_1.__rest(_a, ["cmd"]);
|
|
35
35
|
const preferences = cmd.command(COMMAND_NAME).requireNoAuthentication().description(cli_shared_1.Text.settings.description);
|
|
36
36
|
registerSettingsList(Object.assign({ cmd: preferences }, deps));
|
|
37
|
-
|
|
37
|
+
registerSettingsSet(Object.assign({ cmd: preferences }, deps));
|
|
38
38
|
};
|
|
39
39
|
exports.registerCommands = registerCommands;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unique-machine-id.d.ts","sourceRoot":"","sources":["../../src/command-line/unique-machine-id.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"unique-machine-id.d.ts","sourceRoot":"","sources":["../../src/command-line/unique-machine-id.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,YAAY,QAAO,MACkE,CAAC"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getMachineId =
|
|
3
|
+
exports.getMachineId = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const uuid_1 = tslib_1.__importDefault(require("uuid"));
|
|
6
6
|
const node_machine_id_1 = require("node-machine-id");
|
|
7
7
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
8
|
-
exports.FORGE_CLI_PACKAGE = '@forge/cli';
|
|
9
8
|
const MACHINE_ID_CACHE_KEY = 'machineId';
|
|
10
9
|
const generateMachineId = () => {
|
|
11
10
|
try {
|
|
@@ -15,5 +14,5 @@ const generateMachineId = () => {
|
|
|
15
14
|
return (0, uuid_1.default)();
|
|
16
15
|
}
|
|
17
16
|
};
|
|
18
|
-
const getMachineId = () => cli_shared_1.CachedConf.getCache(
|
|
17
|
+
const getMachineId = () => cli_shared_1.CachedConf.getCache(cli_shared_1.CONFIG_PROJECT_NAME).cached(MACHINE_ID_CACHE_KEY, generateMachineId);
|
|
19
18
|
exports.getMachineId = getMachineId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-info.d.ts","sourceRoot":"","sources":["../../src/command-line/version-info.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"version-info.d.ts","sourceRoot":"","sources":["../../src/command-line/version-info.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB,WAAW,CAAC;AAC1C,eAAO,MAAM,sBAAsB,QAAsB,CAAC;AAE1D,OAAO,EAAc,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE3D,eAAO,MAAM,aAAa,QAAO,UAAU,GAAG,SAgB7C,CAAC;AAGF,eAAO,MAAM,0BAA0B,QAA+D,CAAC;AACvG,eAAO,MAAM,iCAAiC,QAGL,CAAC;AAE1C,eAAO,MAAM,kBAAkB,SAAgB,MAAM,KAAG,QAAQ,IAAI,CAKnE,CAAC;AAEF,eAAO,MAAM,iBAAiB,SAAU,MAAM,SAG7C,CAAC"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.clearVersionCache = exports.cacheLatestVersion = exports.humanReadableSupportedNodeVersion = exports.semverSupportedNodeVersion = exports.getCLIDetails = exports.VERSION_CACHE_INTERVAL = exports.VERSION_CACHE_KEY = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
|
-
const latest_version_1 = tslib_1.__importDefault(require("latest-version"));
|
|
6
4
|
exports.VERSION_CACHE_KEY = 'latest';
|
|
7
5
|
exports.VERSION_CACHE_INTERVAL = 1000 * 60 * 60 * 24;
|
|
8
6
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
@@ -30,7 +28,8 @@ exports.humanReadableSupportedNodeVersion = supportedNodeMajorVersions
|
|
|
30
28
|
.join(', ')
|
|
31
29
|
.replace(/^(.*)?,\s(.*)$/g, '$1 or $2');
|
|
32
30
|
const cacheLatestVersion = async (name) => {
|
|
33
|
-
const
|
|
31
|
+
const latestVersion = (await import('latest-version')).default;
|
|
32
|
+
const latest = await latestVersion(name);
|
|
34
33
|
const cachedConf = cli_shared_1.CachedConf.getCache(name);
|
|
35
34
|
cachedConf.set(exports.VERSION_CACHE_KEY, latest, exports.VERSION_CACHE_INTERVAL);
|
|
36
35
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/install-view.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"install-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/install-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,EAAE,EAEF,UAAU,EAEX,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,yBAAyB,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAE7F,UAAU,2BAA2B;IACnC,UAAU,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,MAAM,CAAC;IAC7C,mBAAmB,EAAE,CAAC,eAAe,EAAE,MAAM,EAAE,KAAK,MAAM,CAAC;IAC3D,mBAAmB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,CAAC;IACrD,gCAAgC,EAAE,CAAC,gCAAgC,EAAE,OAAO,KAAK,MAAM,CAAC;CACzF;AAED,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAEtB,gCAAgC,CAC3C,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,yBAAyB,EACtD,WAAW,EAAE,UAAU,EAAE,EACzB,cAAc,EAAE,MAAM,EAAE,EACxB,uBAAuB,EAAE,MAAM,EAAE,EACjC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,OAAO,EACtB,cAAc,EAAE,OAAO,EACvB,IAAI,EAAE,2BAA2B,GAChC,OAAO,CAAC,OAAO,CAAC;IA+BN,gBAAgB,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;CAqBpF"}
|
|
@@ -36,7 +36,7 @@ class InstallView {
|
|
|
36
36
|
names: [
|
|
37
37
|
(0, cli_shared_1.environmentToOption)(environmentKey),
|
|
38
38
|
site,
|
|
39
|
-
(0, cli_shared_1.
|
|
39
|
+
(0, cli_shared_1.productDisplayName)(product),
|
|
40
40
|
cli_shared_1.Text.install.booleanToScope(version.isLatest)
|
|
41
41
|
],
|
|
42
42
|
value: id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/settings-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAE7C,
|
|
1
|
+
{"version":3,"file":"settings-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/settings-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAE7C,KAAK,eAAe,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;AAEpD,qBAAa,YAAY;IACX,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAE5B,YAAY,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,OAAO;IAiB7E,kBAAkB,CAAC,OAAO,EAAE,MAAM;IAMlC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAIjD"}
|
|
@@ -2,8 +2,6 @@ import { GraphQLClient } from '@forge/cli-shared';
|
|
|
2
2
|
import { AppContributorDetails, AddContributorClient } from './add-contributor';
|
|
3
3
|
import { Contributor, ListContributorsClient } from './list-contributors';
|
|
4
4
|
import { RemoveContributorsDetails, RemoveContributorsClient } from './remove-contributors';
|
|
5
|
-
export declare class MissingAppContributors extends Error {
|
|
6
|
-
}
|
|
7
5
|
export declare class GraphqlClient implements AddContributorClient, ListContributorsClient, RemoveContributorsClient {
|
|
8
6
|
private readonly graphqlClient;
|
|
9
7
|
constructor(graphqlClient: GraphQLClient);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/contributors/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/contributors/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,aAAa,EAGd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAE5F,qBAAa,aAAc,YAAW,oBAAoB,EAAE,sBAAsB,EAAE,wBAAwB;IAC9F,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,cAAc,CAAC,OAAO,EAAE,qBAAqB;IAoD7C,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAkCvD,kBAAkB,CAAC,OAAO,EAAE,yBAAyB;CAmDnE"}
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.GraphqlClient =
|
|
3
|
+
exports.GraphqlClient = void 0;
|
|
4
4
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
5
|
-
class MissingAppContributors extends Error {
|
|
6
|
-
}
|
|
7
|
-
exports.MissingAppContributors = MissingAppContributors;
|
|
8
5
|
class GraphqlClient {
|
|
9
6
|
constructor(graphqlClient) {
|
|
10
7
|
this.graphqlClient = graphqlClient;
|
|
@@ -39,6 +36,9 @@ class GraphqlClient {
|
|
|
39
36
|
const { success, errors } = addAppContributor;
|
|
40
37
|
const error = (0, cli_shared_1.getError)(errors);
|
|
41
38
|
if (!success) {
|
|
39
|
+
if (error.code === cli_shared_1.APP_NOT_IN_EAP) {
|
|
40
|
+
throw new cli_shared_1.AppNotInMUAOEAPError(requestId);
|
|
41
|
+
}
|
|
42
42
|
throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, {
|
|
43
43
|
requestId,
|
|
44
44
|
code: error.code,
|
|
@@ -58,19 +58,24 @@ class GraphqlClient {
|
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
`;
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
61
|
+
try {
|
|
62
|
+
const { appContributors } = await this.graphqlClient.query(query, {
|
|
63
|
+
id: appId
|
|
64
|
+
});
|
|
65
|
+
return appContributors.map((contributor) => ({
|
|
66
|
+
accountId: contributor.accountId,
|
|
67
|
+
email: contributor.email,
|
|
68
|
+
isOwner: contributor.isOwner,
|
|
69
|
+
publicName: contributor.publicName,
|
|
70
|
+
accountStatus: contributor.status
|
|
71
|
+
}));
|
|
72
|
+
}
|
|
73
|
+
catch (e) {
|
|
74
|
+
if (e instanceof cli_shared_1.GraphQLProviderServiceError && e.getCode() === cli_shared_1.APP_NOT_IN_EAP) {
|
|
75
|
+
throw new cli_shared_1.AppNotInMUAOEAPError(e.requestId);
|
|
76
|
+
}
|
|
77
|
+
throw e;
|
|
66
78
|
}
|
|
67
|
-
return appContributors.map((contributor) => ({
|
|
68
|
-
accountId: contributor.accountId,
|
|
69
|
-
email: contributor.email,
|
|
70
|
-
isOwner: contributor.isOwner,
|
|
71
|
-
publicName: contributor.publicName,
|
|
72
|
-
accountStatus: contributor.status
|
|
73
|
-
}));
|
|
74
79
|
}
|
|
75
80
|
async removeContributors(details) {
|
|
76
81
|
const mutation = `
|
|
@@ -102,6 +107,9 @@ class GraphqlClient {
|
|
|
102
107
|
const { success, errors } = removeAppContributors;
|
|
103
108
|
const error = (0, cli_shared_1.getError)(errors);
|
|
104
109
|
if (!success) {
|
|
110
|
+
if (error.code === cli_shared_1.APP_NOT_IN_EAP) {
|
|
111
|
+
throw new cli_shared_1.AppNotInMUAOEAPError(requestId);
|
|
112
|
+
}
|
|
105
113
|
throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, {
|
|
106
114
|
requestId,
|
|
107
115
|
code: error.code,
|
|
@@ -4,10 +4,10 @@ export interface DeployMonitorDetails {
|
|
|
4
4
|
deploymentId: string;
|
|
5
5
|
environmentKey: string;
|
|
6
6
|
}
|
|
7
|
-
export
|
|
7
|
+
export type DeployMonitor = Pick<AppDeployment, 'stages' | 'errorDetails' | 'status'> & {
|
|
8
8
|
requestId: string;
|
|
9
9
|
};
|
|
10
|
-
export
|
|
10
|
+
export type DeployMonitorEvent = AppDeploymentLogEvent | AppDeploymentSnapshotLogEvent | AppDeploymentTransitionEvent;
|
|
11
11
|
export interface DeployMonitorClient {
|
|
12
12
|
getDeployment(details: DeployMonitorDetails): Promise<DeployMonitor>;
|
|
13
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-monitor-graphql-client.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/deploy-monitor-graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,qBAAqB,EACrB,6BAA6B,EAC7B,4BAA4B,EAC5B,aAAa,EAEd,MAAM,mBAAmB,CAAC;AAI3B,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,
|
|
1
|
+
{"version":3,"file":"deploy-monitor-graphql-client.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/deploy-monitor-graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,qBAAqB,EACrB,6BAA6B,EAC7B,4BAA4B,EAC5B,aAAa,EAEd,MAAM,mBAAmB,CAAC;AAI3B,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,QAAQ,GAAG,cAAc,GAAG,QAAQ,CAAC,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAG9G,MAAM,MAAM,kBAAkB,GAAG,qBAAqB,GAAG,6BAA6B,GAAG,4BAA4B,CAAC;AAEtH,MAAM,WAAW,mBAAmB;IAClC,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CACtE;AAED,qBAAa,0BAA2B,YAAW,mBAAmB;IACxD,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,aAAa,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE,oBAAoB,GAAG,OAAO,CAAC,aAAa,CAAC;CA8ClH"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/deployer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAKjB,mBAAmB,EAGnB,KAAK,EAEL,EAAE,EAEF,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAsB,MAAM,iCAAiC,CAAC;AAC1F,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAItE,qBAAa,wBAAyB,SAAQ,SAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM;IAGlG,WAAW,IAAI,OAAO;CAG9B;AACD,qBAAa,sBAAuB,SAAQ,SAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM;IAGlG,WAAW,IAAI,OAAO;CAG9B;AACD,qBAAa,mCAAoC,SAAQ,SAAS;IACpD,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM;IAGlG,WAAW,IAAI,OAAO;CAG9B;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,sBAAsB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrG;AAyBD,qBAAa,gBAAiB,YAAW,QAAQ;IAE7C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAJF,gBAAgB,EAAE,iBAAiB,EACnC,YAAY,EAAE,mBAAmB,EACjC,mBAAmB,EAAE,mBAAmB,EACxC,KAAK,EAAE,KAAK,EACZ,EAAE,EAAE,EAAE;IAGZ,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,sBAAsB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAMlG,QAAQ;IAcT,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;;;;YA2BpG,iBAAiB;IAa/B,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,0BAA0B;IA6BlC,OAAO,CAAC,gBAAgB;
|
|
1
|
+
{"version":3,"file":"deployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/deployer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAKjB,mBAAmB,EAGnB,KAAK,EAEL,EAAE,EAEF,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAsB,MAAM,iCAAiC,CAAC;AAC1F,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAItE,qBAAa,wBAAyB,SAAQ,SAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM;IAGlG,WAAW,IAAI,OAAO;CAG9B;AACD,qBAAa,sBAAuB,SAAQ,SAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM;IAGlG,WAAW,IAAI,OAAO;CAG9B;AACD,qBAAa,mCAAoC,SAAQ,SAAS;IACpD,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM;IAGlG,WAAW,IAAI,OAAO;CAG9B;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,sBAAsB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrG;AAyBD,qBAAa,gBAAiB,YAAW,QAAQ;IAE7C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAJF,gBAAgB,EAAE,iBAAiB,EACnC,YAAY,EAAE,mBAAmB,EACjC,mBAAmB,EAAE,mBAAmB,EACxC,KAAK,EAAE,KAAK,EACZ,EAAE,EAAE,EAAE;IAGZ,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,sBAAsB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAMlG,QAAQ;IAcT,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;;;;YA2BpG,iBAAiB;IAa/B,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,0BAA0B;IA6BlC,OAAO,CAAC,gBAAgB;CAuDzB"}
|
|
@@ -165,7 +165,8 @@ class ArtifactDeployer {
|
|
|
165
165
|
'HOSTED_RESOURCE_TOO_MANY_FILES',
|
|
166
166
|
'HOSTED_RESOURCE_ZIP_TOO_BIG',
|
|
167
167
|
'HOSTED_RESOURCE_FILE_PATH_REFERS_TO_PARENT',
|
|
168
|
-
'HOSTED_RESOURCE_INVALID_EGRESS_PERMISSIONS'
|
|
168
|
+
'HOSTED_RESOURCE_INVALID_EGRESS_PERMISSIONS',
|
|
169
|
+
'HOSTED_RESOURCE_ICON_RESOURCE_MISSING'
|
|
169
170
|
].includes(code)) {
|
|
170
171
|
throw new HostedResourceDeploymentFailedError(true, requestId, cli_shared_1.Text.hostedResources.error(message));
|
|
171
172
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/environment/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/environment/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAKlB,aAAa,EAIb,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AACtF,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AACnF,OAAO,EACL,6BAA6B,EAC7B,uBAAuB,EACvB,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAE9B,eAAO,MAAM,0BAA0B,0BAA0B,CAAC;AAElE,qBAAa,eAAgB,SAAQ,SAAS;CAAG;AAEjD,qBAAa,aAAc,YAAW,uBAAuB,EAAE,qBAAqB,EAAE,uBAAuB;IAC/F,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,iBAAiB,CAAC,OAAO,EAAE,qBAAqB;IAoDhD,eAAe,CAAC,OAAO,EAAE,sBAAsB;;;;;IAmC/C,kBAAkB,CAAC,OAAO,EAAE,6BAA6B;IAkBzD,iBAAiB,CAAC,OAAO,EAAE,wBAAwB;CA2DjE"}
|
|
@@ -40,6 +40,9 @@ class GraphqlClient {
|
|
|
40
40
|
const { success, errors } = createAppEnvironment;
|
|
41
41
|
const error = (0, cli_shared_1.getError)(errors);
|
|
42
42
|
if (!success) {
|
|
43
|
+
if (error.code === cli_shared_1.APP_NOT_IN_EAP) {
|
|
44
|
+
throw new cli_shared_1.AppNotInMUAOEAPError(requestId);
|
|
45
|
+
}
|
|
43
46
|
throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, {
|
|
44
47
|
requestId,
|
|
45
48
|
code: error.code,
|
|
@@ -127,6 +130,9 @@ class GraphqlClient {
|
|
|
127
130
|
errorMessage = cli_shared_1.Text.deleteEnvironment.hasInstallationError(details.environmentKey);
|
|
128
131
|
}
|
|
129
132
|
if (!success) {
|
|
133
|
+
if (error.code === cli_shared_1.APP_NOT_IN_EAP) {
|
|
134
|
+
throw new cli_shared_1.AppNotInMUAOEAPError(requestId);
|
|
135
|
+
}
|
|
130
136
|
throw new cli_shared_1.GraphQlMutationError(`${errorMessage} (requestId: ${requestId || 'unknown'})`, {
|
|
131
137
|
requestId,
|
|
132
138
|
code: error.code,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,sBAAsB,
|
|
1
|
+
{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,6 +74,14 @@ class UnknownSiteWithoutResourceIdError extends Error {
|
|
|
74
74
|
}
|
|
75
75
|
exports.UnknownSiteWithoutResourceIdError = UnknownSiteWithoutResourceIdError;
|
|
76
76
|
class InstallationsGraphqlClient {
|
|
77
|
+
static buildInstallationContext(product, resourceId, resourceType) {
|
|
78
|
+
const ari = new cs_ari_1.ResourceIdentifier({
|
|
79
|
+
resourceOwner: (0, cli_shared_1.ariResourceOwner)(product),
|
|
80
|
+
resourceType: resourceType,
|
|
81
|
+
resourceId: resourceId
|
|
82
|
+
});
|
|
83
|
+
return ari.toString();
|
|
84
|
+
}
|
|
77
85
|
constructor(graphqlClient, cloudIdTranslator, bitbucketTranslator, pause) {
|
|
78
86
|
this.graphqlClient = graphqlClient;
|
|
79
87
|
this.cloudIdTranslator = cloudIdTranslator;
|
|
@@ -82,14 +90,6 @@ class InstallationsGraphqlClient {
|
|
|
82
90
|
this.SITE_RESOURCE_TYPE = 'site';
|
|
83
91
|
this.WORKSPACE_RESOURCE_TYPE = 'workspace';
|
|
84
92
|
}
|
|
85
|
-
static buildInstallationContext(product, resourceId, resourceType) {
|
|
86
|
-
const ari = new cs_ari_1.ResourceIdentifier({
|
|
87
|
-
resourceOwner: product.toLowerCase(),
|
|
88
|
-
resourceType: resourceType,
|
|
89
|
-
resourceId: resourceId
|
|
90
|
-
});
|
|
91
|
-
return ari.toString();
|
|
92
|
-
}
|
|
93
93
|
async buildInstallationContext(product, site) {
|
|
94
94
|
const ari = await this.getProductTranslation(product).buildInstallationContext(product, site);
|
|
95
95
|
return ari.toString();
|
|
@@ -33,7 +33,7 @@ class BitbucketTranslator {
|
|
|
33
33
|
async buildInstallationContext(product, site) {
|
|
34
34
|
const workspaceId = await this.getWorkspaceId(site);
|
|
35
35
|
const ari = new cs_ari_1.ResourceIdentifier({
|
|
36
|
-
resourceOwner:
|
|
36
|
+
resourceOwner: (0, cli_shared_1.ariResourceOwner)(product),
|
|
37
37
|
resourceType: RESOURCE_TYPE,
|
|
38
38
|
resourceId: workspaceId
|
|
39
39
|
});
|
|
@@ -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,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAsB,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,aAAa,EAA8B,SAAS,
|
|
1
|
+
{"version":3,"file":"cloudid-products.d.ts","sourceRoot":"","sources":["../../../src/installations/site-translation/cloudid-products.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAsB,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,aAAa,EAA8B,SAAS,EAAoB,MAAM,mBAAmB,CAAC;AAE3G,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,GAAG,EAAE,GAAG;CAGrB;AAyBD,qBAAa,iBAAkB,YAAW,cAAc;IAC1C,OAAO,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAEzC,mBAAmB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO;IAI3C,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAUlE,uBAAuB,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YA6C/E,UAAU;CAezB"}
|
|
@@ -36,7 +36,7 @@ class CloudIdTranslator {
|
|
|
36
36
|
async buildInstallationContext(product, site) {
|
|
37
37
|
const cloudId = await this.getCloudId(site);
|
|
38
38
|
const ari = new cs_ari_1.ResourceIdentifier({
|
|
39
|
-
resourceOwner:
|
|
39
|
+
resourceOwner: (0, cli_shared_1.ariResourceOwner)(product),
|
|
40
40
|
resourceType: RESOURCE_TYPE,
|
|
41
41
|
resourceId: cloudId
|
|
42
42
|
});
|
|
@@ -16,7 +16,7 @@ class InstallationService {
|
|
|
16
16
|
filterInstallations(installations, { site: filterSite, product: filterProduct, environment: filterEnvironment }) {
|
|
17
17
|
const isDefaultEnvironment = (env) => env === (0, cli_shared_1.optionToEnvironment)(cli_shared_1.DEFAULT_ENVIRONMENT_OPTION);
|
|
18
18
|
return installations.filter(({ product, site, environmentKey }) => {
|
|
19
|
-
const matchProduct = !filterProduct || filterProduct === (0, cli_shared_1.
|
|
19
|
+
const matchProduct = !filterProduct || filterProduct === (0, cli_shared_1.productDisplayName)(product);
|
|
20
20
|
const matchSite = !filterSite || filterSite === site;
|
|
21
21
|
const matchEnvironment = filterEnvironment
|
|
22
22
|
? isDefaultEnvironment(filterEnvironment) || filterEnvironment === (0, cli_shared_1.environmentToOption)(environmentKey)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration-keys-service.d.ts","sourceRoot":"","sources":["../../src/service/migration-keys-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,
|
|
1
|
+
{"version":3,"file":"migration-keys-service.d.ts","sourceRoot":"","sources":["../../src/service/migration-keys-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AACF,MAAM,WAAW,2BAA2B;IAC1C,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IACrC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AACD,MAAM,WAAW,sBAAsB;IACrC,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;CACrG;AAED,qBAAa,oBAAoB;IAE7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBADZ,mBAAmB,EAAE,sBAAsB,EAC3C,YAAY,EAAE,iBAAiB;IAGrC,iCAAiC,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC;CAI7G"}
|
|
@@ -15,7 +15,7 @@ export declare class HiddenDockerTunnelError extends HiddenError {
|
|
|
15
15
|
constructor(userError: boolean, message?: string);
|
|
16
16
|
isUserError(): boolean;
|
|
17
17
|
}
|
|
18
|
-
export
|
|
18
|
+
export type TunnelService = {
|
|
19
19
|
run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
|
|
20
20
|
};
|
|
21
21
|
export declare class DebugNotSupportedError extends UserError {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAMpC,OAAO,EAIL,WAAW,EAEX,sBAAsB,EACtB,+BAA+B,EAG/B,EAAE,EACF,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGrE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAID,eAAO,MAAM,cAAc,wBAAwB,CAAC;AAcpD,eAAO,MAAM,UAAU,QAEuB,CAAC;AAE/C,qBAAa,uBAAwB,SAAQ,WAAW;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,MAAM;IAI1D,WAAW,IAAI,OAAO;CAG9B;AAED,
|
|
1
|
+
{"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,9 +7,8 @@ const worker_1 = require("./worker");
|
|
|
7
7
|
const version_check_worker_1 = require("./version-check-worker");
|
|
8
8
|
const cached_config_service_1 = require("../service/cached-config-service");
|
|
9
9
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
10
|
-
const unique_machine_id_1 = require("../command-line/unique-machine-id");
|
|
11
10
|
const workerInfo = JSON.parse(process.argv[2]);
|
|
12
|
-
const cachedConf = cli_shared_1.CachedConf.getCache(
|
|
11
|
+
const cachedConf = cli_shared_1.CachedConf.getCache(cli_shared_1.CONFIG_PROJECT_NAME);
|
|
13
12
|
const cachedConfigService = new cached_config_service_1.CachedConfigService(cachedConf);
|
|
14
13
|
const ALL_WORKERS = [
|
|
15
14
|
new analytics_message_worker_1.AnalyticsMessageWorker(new local_file_storage_1.LocalFileStorage(), new analytics_message_handler_1.AnalyticsMessageHandler(workerInfo ? workerInfo.environment : undefined), cachedConfigService),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-clean-up-worker.d.ts","sourceRoot":"","sources":["../../src/workers/tunnel-clean-up-worker.ts"],"names":[],"mappings":"AAGA,
|
|
1
|
+
{"version":3,"file":"tunnel-clean-up-worker.d.ts","sourceRoot":"","sources":["../../src/workers/tunnel-clean-up-worker.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF,qBAAa,mBAAmB;IACvB,MAAM,IAAI,IAAI;CAwBtB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/cli",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.15.0-next.51",
|
|
4
4
|
"description": "A command line interface for managing Atlassian-hosted apps",
|
|
5
5
|
"author": "Atlassian",
|
|
6
6
|
"license": "UNLICENSED",
|
|
@@ -18,46 +18,46 @@
|
|
|
18
18
|
"postinstall": "node -e \"process.exitCode = fs.existsSync('./out/bin/postinstall.js')\" || node ./out/bin/postinstall.js"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@forge/bundler": "4.10.
|
|
22
|
-
"@forge/cli-shared": "3.
|
|
21
|
+
"@forge/bundler": "4.10.3-next.43",
|
|
22
|
+
"@forge/cli-shared": "3.16.0-next.29",
|
|
23
23
|
"@forge/egress": "1.2.1",
|
|
24
|
-
"@forge/lint": "3.6.
|
|
25
|
-
"@forge/manifest": "4.
|
|
26
|
-
"@forge/runtime": "4.4.
|
|
27
|
-
"@forge/tunnel": "3.6.
|
|
28
|
-
"@forge/util": "1.2
|
|
29
|
-
"@sentry/node": "^7.
|
|
24
|
+
"@forge/lint": "3.6.2-next.29",
|
|
25
|
+
"@forge/manifest": "4.17.0-next.12",
|
|
26
|
+
"@forge/runtime": "4.4.4-next.14",
|
|
27
|
+
"@forge/tunnel": "3.6.3-next.48",
|
|
28
|
+
"@forge/util": "1.3.0-next.2",
|
|
29
|
+
"@sentry/node": "^7.57.0",
|
|
30
30
|
"ajv": "^6.12.6",
|
|
31
|
-
"archiver": "^5.
|
|
31
|
+
"archiver": "^5.3.1",
|
|
32
32
|
"case": "^1.6.3",
|
|
33
33
|
"chalk": "^2.4.2",
|
|
34
34
|
"cheerio": "^0.22.0",
|
|
35
35
|
"cli-table3": "^0.6.3",
|
|
36
36
|
"command-exists": "^1.2.9",
|
|
37
|
-
"commander": "^7.
|
|
37
|
+
"commander": "^7.2.0",
|
|
38
38
|
"cross-spawn": "^7.0.3",
|
|
39
|
-
"dayjs": "^1.9
|
|
39
|
+
"dayjs": "^1.11.9",
|
|
40
40
|
"didyoumean": "^1.2.2",
|
|
41
41
|
"env-paths": "^2.2.1",
|
|
42
42
|
"form-data": "^3.0.1",
|
|
43
43
|
"fs-extra": "^8.1.0",
|
|
44
44
|
"hidefile": "^3.0.0",
|
|
45
|
-
"latest-version": "^
|
|
45
|
+
"latest-version": "^6.0.0",
|
|
46
46
|
"lodash": "^4.17.21",
|
|
47
47
|
"mkdirp": "^1.0.4",
|
|
48
|
-
"node-fetch": "2.6.
|
|
48
|
+
"node-fetch": "2.6.12",
|
|
49
49
|
"node-machine-id": "^1.1.12",
|
|
50
50
|
"omelette": "^0.4.17",
|
|
51
|
-
"ora": "^4.
|
|
51
|
+
"ora": "^4.1.1",
|
|
52
52
|
"portfinder": "^1.0.32",
|
|
53
53
|
"sanitize-filename": "^1.6.3",
|
|
54
|
-
"semver": "^
|
|
55
|
-
"tmp": "^0.1
|
|
56
|
-
"tslib": "^2.
|
|
54
|
+
"semver": "^7.5.4",
|
|
55
|
+
"tmp": "^0.2.1",
|
|
56
|
+
"tslib": "^2.6.0",
|
|
57
57
|
"uuid": "^3.4.0"
|
|
58
58
|
},
|
|
59
59
|
"devDependencies": {
|
|
60
|
-
"@types/archiver": "^5.
|
|
60
|
+
"@types/archiver": "^5.3.2",
|
|
61
61
|
"@types/cheerio": "^0.22.31",
|
|
62
62
|
"@types/command-exists": "^1.2.0",
|
|
63
63
|
"@types/cross-spawn": "^6.0.2",
|
|
@@ -66,20 +66,20 @@
|
|
|
66
66
|
"@types/hidefile": "^3.0.0",
|
|
67
67
|
"@types/inquirer": "^8.2.6",
|
|
68
68
|
"@types/jest": "^29.1.2",
|
|
69
|
-
"@types/js-yaml": "^3.12.
|
|
69
|
+
"@types/js-yaml": "^3.12.7",
|
|
70
70
|
"@types/minimatch": "^3.0.5",
|
|
71
71
|
"@types/mkdirp": "^1.0.2",
|
|
72
|
-
"@types/node": "14.18.
|
|
72
|
+
"@types/node": "14.18.53",
|
|
73
73
|
"@types/node-fetch": "^2.6.4",
|
|
74
74
|
"@types/omelette": "^0.4.2",
|
|
75
|
-
"@types/semver": "^
|
|
76
|
-
"@types/tmp": "^0.
|
|
75
|
+
"@types/semver": "^7.5.0",
|
|
76
|
+
"@types/tmp": "^0.2.3",
|
|
77
77
|
"@types/uuid": "^3.4.10",
|
|
78
78
|
"jest": "^29.1.2",
|
|
79
79
|
"jest-fixtures": "^0.6.0",
|
|
80
80
|
"jest-matcher-specific-error": "^1.0.0",
|
|
81
81
|
"jest-when": "^3.5.2",
|
|
82
|
-
"memfs": "^3.
|
|
82
|
+
"memfs": "^3.5.3",
|
|
83
83
|
"sentry-testkit": "^5.0.5",
|
|
84
84
|
"type-fest": "1.4.0"
|
|
85
85
|
},
|