mulesoft-anypoint-cli-agent-fabric-plugin 1.0.11 → 1.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +49 -27
- package/dist/commands/agent-network/project/build.d.ts +14 -14
- package/dist/commands/agent-network/project/build.js +11 -10
- package/dist/commands/agent-network/project/build.js.map +1 -1
- package/dist/commands/agent-network/project/create.d.ts +20 -17
- package/dist/commands/agent-network/project/create.js +58 -35
- package/dist/commands/agent-network/project/create.js.map +1 -1
- package/dist/commands/agent-network/project/deploy.d.ts +22 -21
- package/dist/commands/agent-network/project/deploy.js +75 -63
- package/dist/commands/agent-network/project/deploy.js.map +1 -1
- package/dist/commands/agent-network/project/publish.d.ts +13 -15
- package/dist/commands/agent-network/project/publish.js +32 -46
- package/dist/commands/agent-network/project/publish.js.map +1 -1
- package/dist/commands/agent-network/project/undeploy.d.ts +29 -0
- package/dist/commands/agent-network/project/undeploy.js +137 -0
- package/dist/commands/agent-network/project/undeploy.js.map +1 -0
- package/dist/commands/agent-network/project/unpublish.d.ts +28 -0
- package/dist/commands/agent-network/project/unpublish.js +138 -0
- package/dist/commands/agent-network/project/unpublish.js.map +1 -0
- package/dist/commands/agent-network/setup/dependencies.d.ts +6 -6
- package/dist/commands/agent-network/setup/dependencies.js +5 -7
- package/dist/commands/agent-network/setup/dependencies.js.map +1 -1
- package/dist/commands/agent-network/setup/gateways.d.ts +21 -15
- package/dist/commands/agent-network/setup/gateways.js +150 -93
- package/dist/commands/agent-network/setup/gateways.js.map +1 -1
- package/dist/errors/base-error.js.map +1 -1
- package/dist/errors/error-factory.d.ts +58 -13
- package/dist/errors/error-factory.js +251 -62
- package/dist/errors/error-factory.js.map +1 -1
- package/dist/helpers/connection.d.ts +20 -0
- package/dist/helpers/connection.js +88 -0
- package/dist/helpers/connection.js.map +1 -0
- package/dist/helpers/dependency-manager.d.ts +1 -1
- package/dist/helpers/dependency-manager.js +10 -9
- package/dist/helpers/dependency-manager.js.map +1 -1
- package/dist/helpers/entitlement-utils.js +3 -3
- package/dist/helpers/entitlement-utils.js.map +1 -1
- package/dist/helpers/policy-helper.d.ts +27 -29
- package/dist/helpers/policy-helper.js +112 -49
- package/dist/helpers/policy-helper.js.map +1 -1
- package/dist/helpers/project/api-project-dependency-fetcher.js +9 -11
- package/dist/helpers/project/api-project-dependency-fetcher.js.map +1 -1
- package/dist/helpers/project/constants.d.ts +4 -2
- package/dist/helpers/project/constants.js +4 -2
- package/dist/helpers/project/constants.js.map +1 -1
- package/dist/helpers/project/templates.js +1 -1
- package/dist/helpers/project/validation-commons.d.ts +4 -0
- package/dist/helpers/project/validation-commons.js +28 -5
- package/dist/helpers/project/validation-commons.js.map +1 -1
- package/dist/helpers/request-logging.d.ts +36 -0
- package/dist/helpers/request-logging.js +181 -0
- package/dist/helpers/request-logging.js.map +1 -0
- package/dist/helpers/request-utils.d.ts +1 -1
- package/dist/helpers/request-utils.js.map +1 -1
- package/dist/helpers/utils.d.ts +19 -10
- package/dist/helpers/utils.js +172 -46
- package/dist/helpers/utils.js.map +1 -1
- package/dist/index.d.ts +3 -0
- package/dist/index.js +7 -1
- package/dist/index.js.map +1 -1
- package/dist/types/agent-network-v2.d.ts +379 -0
- package/dist/types/agent-network-v2.js +23 -0
- package/dist/types/agent-network-v2.js.map +1 -0
- package/dist/types/agent-network.d.ts +226 -219
- package/dist/types/agent-network.js +11 -14
- package/dist/types/agent-network.js.map +1 -1
- package/dist/types/types.d.ts +57 -17
- package/dist/utils/builders/builder.d.ts +13 -0
- package/dist/utils/builders/builder.js +219 -11
- package/dist/utils/builders/builder.js.map +1 -1
- package/dist/utils/builders/common/agent-metadata.d.ts +21 -0
- package/dist/utils/builders/common/agent-metadata.js +69 -0
- package/dist/utils/builders/common/agent-metadata.js.map +1 -0
- package/dist/utils/builders/common/asset-file-resolver.d.ts +3 -0
- package/dist/utils/builders/common/asset-file-resolver.js +29 -0
- package/dist/utils/builders/common/asset-file-resolver.js.map +1 -0
- package/dist/utils/builders/common/connection-facet-helpers.d.ts +27 -0
- package/dist/utils/builders/common/connection-facet-helpers.js +46 -0
- package/dist/utils/builders/common/connection-facet-helpers.js.map +1 -0
- package/dist/utils/builders/common/connection-metadata.d.ts +5 -0
- package/dist/utils/builders/common/connection-metadata.js +21 -0
- package/dist/utils/builders/common/connection-metadata.js.map +1 -0
- package/dist/utils/builders/common/network-builder-helpers.d.ts +7 -0
- package/dist/utils/builders/common/network-builder-helpers.js +21 -0
- package/dist/utils/builders/common/network-builder-helpers.js.map +1 -0
- package/dist/utils/builders/common/network-metadata.d.ts +5 -0
- package/dist/utils/builders/common/network-metadata.js +21 -0
- package/dist/utils/builders/common/network-metadata.js.map +1 -0
- package/dist/utils/builders/common/registry-entry.d.ts +2 -0
- package/dist/utils/builders/common/registry-entry.js +17 -0
- package/dist/utils/builders/common/registry-entry.js.map +1 -0
- package/dist/utils/builders/common/types.d.ts +31 -0
- package/dist/utils/builders/common/types.js +3 -0
- package/dist/utils/builders/common/types.js.map +1 -0
- package/dist/utils/builders/policies-factory.d.ts +8 -1
- package/dist/utils/builders/policies-factory.js +33 -4
- package/dist/utils/builders/policies-factory.js.map +1 -1
- package/dist/utils/builders/project-builder-impl.d.ts +48 -3
- package/dist/utils/builders/project-builder-impl.js +121 -5
- package/dist/utils/builders/project-builder-impl.js.map +1 -1
- package/dist/utils/builders/project-builder.d.ts +52 -4
- package/dist/utils/builders/project-builder.js +11 -1
- package/dist/utils/builders/project-builder.js.map +1 -1
- package/dist/utils/builders/remote-space-resolver.d.ts +19 -0
- package/dist/utils/builders/remote-space-resolver.js +216 -0
- package/dist/utils/builders/remote-space-resolver.js.map +1 -0
- package/dist/utils/builders/space-serializer.d.ts +17 -2
- package/dist/utils/builders/space-serializer.js +146 -23
- package/dist/utils/builders/space-serializer.js.map +1 -1
- package/dist/utils/builders/v1/agent-builder.d.ts +15 -0
- package/dist/utils/builders/v1/agent-builder.js +73 -0
- package/dist/utils/builders/v1/agent-builder.js.map +1 -0
- package/dist/utils/builders/{broker-builder.d.ts → v1/broker-builder.d.ts} +8 -1
- package/dist/utils/builders/v1/broker-builder.js +251 -0
- package/dist/utils/builders/v1/broker-builder.js.map +1 -0
- package/dist/utils/builders/{connections-builder.d.ts → v1/connections-builder.d.ts} +4 -3
- package/dist/utils/builders/v1/connections-builder.js +187 -0
- package/dist/utils/builders/v1/connections-builder.js.map +1 -0
- package/dist/utils/builders/{llm-builder.d.ts → v1/llm-builder.d.ts} +5 -2
- package/dist/utils/builders/v1/llm-builder.js +71 -0
- package/dist/utils/builders/v1/llm-builder.js.map +1 -0
- package/dist/utils/builders/{mcp-builder.d.ts → v1/mcp-builder.d.ts} +5 -2
- package/dist/utils/builders/v1/mcp-builder.js +59 -0
- package/dist/utils/builders/v1/mcp-builder.js.map +1 -0
- package/dist/utils/builders/{network-builder.d.ts → v1/network-builder.d.ts} +2 -1
- package/dist/utils/builders/v1/network-builder.js +71 -0
- package/dist/utils/builders/v1/network-builder.js.map +1 -0
- package/dist/utils/builders/{path.d.ts → v1/path.d.ts} +1 -1
- package/dist/utils/builders/{path.js → v1/path.js} +1 -1
- package/dist/utils/builders/v1/path.js.map +1 -0
- package/dist/utils/builders/v2/agent-builder.d.ts +17 -0
- package/dist/utils/builders/v2/agent-builder.js +137 -0
- package/dist/utils/builders/v2/agent-builder.js.map +1 -0
- package/dist/utils/builders/v2/broker-builder.d.ts +21 -0
- package/dist/utils/builders/v2/broker-builder.js +158 -0
- package/dist/utils/builders/v2/broker-builder.js.map +1 -0
- package/dist/utils/builders/v2/connections-builder.d.ts +18 -0
- package/dist/utils/builders/v2/connections-builder.js +191 -0
- package/dist/utils/builders/v2/connections-builder.js.map +1 -0
- package/dist/utils/builders/v2/llm-builder.d.ts +11 -0
- package/dist/utils/builders/v2/llm-builder.js +63 -0
- package/dist/utils/builders/v2/llm-builder.js.map +1 -0
- package/dist/utils/builders/v2/mcp-builder.d.ts +10 -0
- package/dist/utils/builders/v2/mcp-builder.js +61 -0
- package/dist/utils/builders/v2/mcp-builder.js.map +1 -0
- package/dist/utils/builders/v2/network-builder.d.ts +14 -0
- package/dist/utils/builders/v2/network-builder.js +118 -0
- package/dist/utils/builders/v2/network-builder.js.map +1 -0
- package/dist/utils/builders/v2/path.d.ts +12 -0
- package/dist/utils/builders/v2/path.js +41 -0
- package/dist/utils/builders/v2/path.js.map +1 -0
- package/dist/utils/constants.d.ts +40 -2
- package/dist/utils/constants.js +50 -3
- package/dist/utils/constants.js.map +1 -1
- package/dist/utils/exchange.d.ts +5 -6
- package/dist/utils/exchange.js +74 -70
- package/dist/utils/exchange.js.map +1 -1
- package/dist/utils/facets/abstract-facet.d.ts +2 -26
- package/dist/utils/facets/abstract-facet.js +5 -29
- package/dist/utils/facets/abstract-facet.js.map +1 -1
- package/dist/utils/facets/agent-graph-facet.d.ts +17 -0
- package/dist/utils/facets/agent-graph-facet.js +271 -0
- package/dist/utils/facets/agent-graph-facet.js.map +1 -0
- package/dist/utils/facets/api-instance-facet.d.ts +2 -0
- package/dist/utils/facets/api-instance-facet.js +51 -14
- package/dist/utils/facets/api-instance-facet.js.map +1 -1
- package/dist/utils/facets/apim-policy-helpers.d.ts +24 -0
- package/dist/utils/facets/apim-policy-helpers.js +36 -0
- package/dist/utils/facets/apim-policy-helpers.js.map +1 -0
- package/dist/utils/facets/asset-facet.d.ts +6 -2
- package/dist/utils/facets/asset-facet.js +145 -82
- package/dist/utils/facets/asset-facet.js.map +1 -1
- package/dist/utils/facets/connection-facet.d.ts +2 -0
- package/dist/utils/facets/connection-facet.js +51 -14
- package/dist/utils/facets/connection-facet.js.map +1 -1
- package/dist/utils/facets/deployment-helpers.d.ts +28 -1
- package/dist/utils/facets/deployment-helpers.js +83 -3
- package/dist/utils/facets/deployment-helpers.js.map +1 -1
- package/dist/utils/facets/deployment-runner.d.ts +12 -0
- package/dist/utils/facets/deployment-runner.js +41 -0
- package/dist/utils/facets/deployment-runner.js.map +1 -0
- package/dist/utils/facets/facets.d.ts +4 -0
- package/dist/utils/facets/facets.js +75 -7
- package/dist/utils/facets/facets.js.map +1 -1
- package/dist/utils/facets/mule-application-facet.d.ts +1 -5
- package/dist/utils/facets/mule-application-facet.js +45 -79
- package/dist/utils/facets/mule-application-facet.js.map +1 -1
- package/dist/utils/facets/publication-metadata-patcher.d.ts +2 -0
- package/dist/utils/facets/publication-metadata-patcher.js +61 -0
- package/dist/utils/facets/publication-metadata-patcher.js.map +1 -0
- package/dist/utils/facets/publication-rank.d.ts +4 -0
- package/dist/utils/facets/publication-rank.js +27 -0
- package/dist/utils/facets/publication-rank.js.map +1 -0
- package/dist/utils/facets/undeploy-helpers.d.ts +6 -0
- package/dist/utils/facets/undeploy-helpers.js +68 -0
- package/dist/utils/facets/undeploy-helpers.js.map +1 -0
- package/dist/utils/facets/unpublish-preflight.d.ts +2 -0
- package/dist/utils/facets/unpublish-preflight.js +55 -0
- package/dist/utils/facets/unpublish-preflight.js.map +1 -0
- package/dist/utils/files.js +10 -2
- package/dist/utils/files.js.map +1 -1
- package/dist/utils/gateway-mode.d.ts +22 -0
- package/dist/utils/gateway-mode.js +38 -0
- package/dist/utils/gateway-mode.js.map +1 -0
- package/dist/utils/gateway.d.ts +24 -6
- package/dist/utils/gateway.js +112 -36
- package/dist/utils/gateway.js.map +1 -1
- package/dist/utils/logger.d.ts +1 -0
- package/dist/utils/logger.js +6 -0
- package/dist/utils/logger.js.map +1 -1
- package/dist/utils/retryable-requester.d.ts +6 -0
- package/dist/utils/retryable-requester.js +43 -0
- package/dist/utils/retryable-requester.js.map +1 -0
- package/dist/utils/uris.d.ts +4 -4
- package/dist/utils/uris.js +14 -6
- package/dist/utils/uris.js.map +1 -1
- package/dist/utils/variables.d.ts +3 -4
- package/dist/utils/variables.js +20 -9
- package/dist/utils/variables.js.map +1 -1
- package/dist/utils/zip-utils.d.ts +10 -0
- package/dist/utils/zip-utils.js +19 -0
- package/dist/utils/zip-utils.js.map +1 -0
- package/package.json +8 -2
- package/templates/{agent-network.yaml.template → agent-network/agent-network.yaml.template} +1 -1
- package/templates/{exchange.json.template → agent-network/exchange.json.template} +1 -0
- package/templates/agentic-network/agent-network.yaml.template +93 -0
- package/templates/agentic-network/brokers/broker1.agent.template +103 -0
- package/templates/agentic-network/exchange.json.template +37 -0
- package/dist/utils/builders/agent-builder.d.ts +0 -11
- package/dist/utils/builders/agent-builder.js +0 -79
- package/dist/utils/builders/agent-builder.js.map +0 -1
- package/dist/utils/builders/broker-builder.js +0 -292
- package/dist/utils/builders/broker-builder.js.map +0 -1
- package/dist/utils/builders/connections-builder.js +0 -233
- package/dist/utils/builders/connections-builder.js.map +0 -1
- package/dist/utils/builders/llm-builder.js +0 -64
- package/dist/utils/builders/llm-builder.js.map +0 -1
- package/dist/utils/builders/mcp-builder.js +0 -48
- package/dist/utils/builders/mcp-builder.js.map +0 -1
- package/dist/utils/builders/network-builder.js +0 -77
- package/dist/utils/builders/network-builder.js.map +0 -1
- package/dist/utils/builders/path.js.map +0 -1
package/dist/utils/gateway.js
CHANGED
|
@@ -1,59 +1,108 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.GatewayUtils = void 0;
|
|
3
|
+
exports.GatewayUtils = exports.getClusterUrl = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const constants_1 = require("./constants");
|
|
6
6
|
const error_factory_1 = require("../errors/error-factory");
|
|
7
7
|
const uris_1 = require("./uris");
|
|
8
|
-
const logger_1 = require("./logger");
|
|
9
8
|
const semver_1 = tslib_1.__importDefault(require("semver"));
|
|
9
|
+
const logger_1 = require("./logger");
|
|
10
|
+
const retryable_requester_1 = require("./retryable-requester");
|
|
11
|
+
const retryRequester = retryable_requester_1.RetryableRequester.getInstance();
|
|
12
|
+
const AGENT_GRAPH_RUNTIME_TYPE = 'agent-graph';
|
|
13
|
+
const GATEWAY_PAGE_SIZE = 20;
|
|
14
|
+
// Backstop for servers that ignore pagination.
|
|
15
|
+
const MAX_GATEWAY_PAGES = 100;
|
|
16
|
+
async function fetchAllGateways(requester, organizationId, environmentId) {
|
|
17
|
+
var _a;
|
|
18
|
+
const gateways = [];
|
|
19
|
+
let lastTotalElements;
|
|
20
|
+
let hitBackstop = true;
|
|
21
|
+
for (let pageNumber = 0; pageNumber < MAX_GATEWAY_PAGES; pageNumber++) {
|
|
22
|
+
// eslint-disable-next-line no-await-in-loop -- pages must be fetched sequentially; each response determines whether more pages exist
|
|
23
|
+
const response = await retryRequester.execute(() => requester.get((0, uris_1.getAllGatewaysUrl)(organizationId, environmentId, pageNumber, GATEWAY_PAGE_SIZE)));
|
|
24
|
+
if (response.status !== 200) {
|
|
25
|
+
throw error_factory_1.ErrorFactory.unableToRetrieveGateways(organizationId, environmentId, response.statusText);
|
|
26
|
+
}
|
|
27
|
+
const page = response.data;
|
|
28
|
+
lastTotalElements = page.totalElements;
|
|
29
|
+
// Only a defined-but-wrong pageNumber means the server ignored the cursor; an omitted one is tolerated.
|
|
30
|
+
if (pageNumber > 0 && page.pageNumber !== undefined && page.pageNumber !== pageNumber) {
|
|
31
|
+
logger_1.Log.warn('Gateway list pagination appears unsupported by the server; results may be incomplete');
|
|
32
|
+
hitBackstop = false;
|
|
33
|
+
break;
|
|
34
|
+
}
|
|
35
|
+
const content = (_a = page.content) !== null && _a !== void 0 ? _a : [];
|
|
36
|
+
gateways.push(...content);
|
|
37
|
+
if (page.totalElements === undefined || content.length === 0 || gateways.length >= page.totalElements) {
|
|
38
|
+
hitBackstop = false;
|
|
39
|
+
break;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
if (hitBackstop) {
|
|
43
|
+
logger_1.Log.warn(`Gateway pagination hit MAX_GATEWAY_PAGES backstop (${MAX_GATEWAY_PAGES}); returned ${gateways.length} of ${lastTotalElements !== null && lastTotalElements !== void 0 ? lastTotalElements : 'unknown'} gateways`);
|
|
44
|
+
}
|
|
45
|
+
return gateways;
|
|
46
|
+
}
|
|
47
|
+
function stripTrailingSlash(url) {
|
|
48
|
+
return url.endsWith('/') ? url.slice(0, -1) : url;
|
|
49
|
+
}
|
|
50
|
+
// Builds a cluster-internal gateway URL: http://<name>:<port>. Apps running inside the cluster
|
|
51
|
+
// reach the gateway by its service name on the ingress (8081) / egress (8082) port.
|
|
52
|
+
function getClusterUrl(name, port) {
|
|
53
|
+
return `http://${name}:${port}`;
|
|
54
|
+
}
|
|
55
|
+
exports.getClusterUrl = getClusterUrl;
|
|
56
|
+
function publicUrlFromConfig(gateway) {
|
|
57
|
+
return (gateway.configuration.ingress.publicUrl || gateway.configuration.ingress.internalUrl).split(',')[0].trim();
|
|
58
|
+
}
|
|
10
59
|
exports.GatewayUtils = {
|
|
11
60
|
async getGatewayId(requester, organizationId, environment, targetGwName) {
|
|
12
|
-
const environmentId = environment
|
|
13
|
-
const environmentName = environment
|
|
14
|
-
const
|
|
15
|
-
const
|
|
16
|
-
const selectedGateway = gateways.content.find(gw => gw.name === targetGwName);
|
|
61
|
+
const environmentId = environment.id;
|
|
62
|
+
const environmentName = environment.name;
|
|
63
|
+
const gateways = await fetchAllGateways(requester, organizationId, environmentId);
|
|
64
|
+
const selectedGateway = gateways.find(gw => gw.name === targetGwName);
|
|
17
65
|
if (!selectedGateway) {
|
|
18
|
-
throw error_factory_1.ErrorFactory.gatewayNotFoundError(targetGwName, gateways
|
|
66
|
+
throw error_factory_1.ErrorFactory.gatewayNotFoundError(targetGwName, gateways, environmentId, environmentName);
|
|
19
67
|
}
|
|
20
68
|
return selectedGateway.id;
|
|
21
69
|
},
|
|
22
70
|
async getGatewayDescription(requester, organizationId, environment, targetGwName) {
|
|
23
|
-
const environmentId = environment
|
|
71
|
+
const environmentId = environment.id;
|
|
24
72
|
const gatewayId = await this.getGatewayId(requester, organizationId, environment, targetGwName);
|
|
25
73
|
// Get the url from /api/v1/organizations/{organizationId}/environments/{environmentId}/gateways/{gatewayId}
|
|
26
|
-
const gatewayResponse = await requester.get((0, uris_1.getGatewayDescriptionUrl)(organizationId, environmentId, gatewayId));
|
|
74
|
+
const gatewayResponse = await retryRequester.execute(() => requester.get((0, uris_1.getGatewayDescriptionUrl)(organizationId, environmentId, gatewayId)));
|
|
27
75
|
return gatewayResponse.data;
|
|
28
76
|
},
|
|
29
77
|
async getGatewayStatus(requester, organizationId, environmentId, gatewayId) {
|
|
30
78
|
// Get the url from /xapi/v1/organizations/{organizationId}/environments/{environmentId}/gateways/{gatewayId}
|
|
31
|
-
const gatewayResponse = await requester.get((0, uris_1.getGatewayStatusUrl)(organizationId, environmentId, gatewayId));
|
|
79
|
+
const gatewayResponse = await retryRequester.execute(() => requester.get((0, uris_1.getGatewayStatusUrl)(organizationId, environmentId, gatewayId)));
|
|
32
80
|
return gatewayResponse.data;
|
|
33
81
|
},
|
|
34
|
-
async
|
|
35
|
-
const
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
82
|
+
async getTargetSpaces(requester, organizationId, environmentId) {
|
|
83
|
+
const targetSpacesResponse = await retryRequester.execute(() => requester.get((0, uris_1.getTargetSpacesUrl)(organizationId, environmentId)));
|
|
84
|
+
return targetSpacesResponse.data.content;
|
|
85
|
+
},
|
|
86
|
+
resolveTargetSpace(targetSpaces, targetSpace, environment) {
|
|
87
|
+
const matchedTargetSpace = targetSpaces.find(item => item.name === targetSpace);
|
|
88
|
+
if (!matchedTargetSpace) {
|
|
89
|
+
throw error_factory_1.ErrorFactory.runtimeTargetNotFoundError(targetSpace, targetSpaces, environment.id, environment.name);
|
|
41
90
|
}
|
|
42
|
-
return
|
|
91
|
+
return matchedTargetSpace;
|
|
43
92
|
},
|
|
44
|
-
async
|
|
45
|
-
const
|
|
93
|
+
async getTargetSpace(requester, organizationId, environment, targetSpace) {
|
|
94
|
+
const targetSpaces = await this.getTargetSpaces(requester, organizationId, environment.id);
|
|
95
|
+
return this.resolveTargetSpace(targetSpaces, targetSpace, environment);
|
|
96
|
+
},
|
|
97
|
+
async getTargetSpaceMetadata(requester, organizationId, targetSpaceId, runtimeType) {
|
|
98
|
+
const targetResponse = await retryRequester.execute(() => requester.get((0, uris_1.getTargetSpaceMetadataUrl)(organizationId, targetSpaceId, runtimeType)));
|
|
46
99
|
if (targetResponse.status !== 200) {
|
|
47
100
|
throw error_factory_1.ErrorFactory.unableToRetrieveTargetSpaceMetadata(targetSpaceId, targetResponse.statusText);
|
|
48
101
|
}
|
|
49
102
|
return targetResponse.data;
|
|
50
103
|
},
|
|
51
104
|
async getGateways(requester, organizationId, environmentId) {
|
|
52
|
-
|
|
53
|
-
if (gatewaysResponse.status !== 200) {
|
|
54
|
-
throw error_factory_1.ErrorFactory.unableToRetrieveGateways(organizationId, environmentId, gatewaysResponse.statusText);
|
|
55
|
-
}
|
|
56
|
-
return gatewaysResponse.data.content;
|
|
105
|
+
return fetchAllGateways(requester, organizationId, environmentId);
|
|
57
106
|
},
|
|
58
107
|
intoMuleAppName(descriptor) {
|
|
59
108
|
return descriptor.assetId + constants_1.MULE_APPLICATION_SUFFIX;
|
|
@@ -61,7 +110,7 @@ exports.GatewayUtils = {
|
|
|
61
110
|
async getLatestGatewayVersion(requester, channelReleaseName) {
|
|
62
111
|
// Get the latest gateway version for the specified channel
|
|
63
112
|
try {
|
|
64
|
-
const response = await requester.get((0, uris_1.getGatewayVersionsUrl)());
|
|
113
|
+
const response = await retryRequester.execute(() => requester.get((0, uris_1.getGatewayVersionsUrl)()));
|
|
65
114
|
if (response.status !== 200) {
|
|
66
115
|
throw error_factory_1.ErrorFactory.unableToRetrieveGatewayVersions(response.statusText);
|
|
67
116
|
}
|
|
@@ -82,10 +131,14 @@ exports.GatewayUtils = {
|
|
|
82
131
|
throw error_factory_1.ErrorFactory.unableToRetrieveGatewayVersions(error instanceof Error ? error.message : 'Unknown error');
|
|
83
132
|
}
|
|
84
133
|
},
|
|
85
|
-
|
|
134
|
+
// Mule-specific resolver: selects the latest version on the EDGE release channel.
|
|
135
|
+
// Kept separate from getLatestAgentGraphRuntimeVersion on purpose — the two runtimes'
|
|
136
|
+
// version-selection policies (channel filter here vs. non-semver filter + caller fallback there)
|
|
137
|
+
// are expected to diverge, so do not DRY these into one parameterized helper.
|
|
138
|
+
async getLatestMuleRuntimeVersion(requester, runtimeTarget, organizationId) {
|
|
86
139
|
var _a;
|
|
87
140
|
try {
|
|
88
|
-
const targetSpace = await this.getTargetSpaceMetadata(requester, organizationId,
|
|
141
|
+
const targetSpace = await this.getTargetSpaceMetadata(requester, organizationId, runtimeTarget.id);
|
|
89
142
|
const runtimeVersions = (_a = targetSpace.runtimes
|
|
90
143
|
.find(runtime => runtime.type.toLowerCase() === 'mule')) === null || _a === void 0 ? void 0 : _a.versions.filter(version => version.channel.toUpperCase() === 'EDGE').map(version => version.baseVersion).sort((a, b) => semver_1.default.compare(b, a));
|
|
91
144
|
return Array.isArray(runtimeVersions) && runtimeVersions.length > 0 ? runtimeVersions[0] : this.DEFAULT_MULE_VERSION;
|
|
@@ -96,20 +149,43 @@ exports.GatewayUtils = {
|
|
|
96
149
|
// Fallback to default version if API call fails
|
|
97
150
|
return this.DEFAULT_MULE_VERSION;
|
|
98
151
|
},
|
|
152
|
+
// Agent-graph-specific resolver: selects the newest valid-semver baseVersion and carries a
|
|
153
|
+
// caller-provided fallback (so a project-pinned runtimeVer survives a lookup failure).
|
|
154
|
+
// Kept separate from getLatestMuleRuntimeVersion on purpose — the Mule policy filters by EDGE
|
|
155
|
+
// channel; this one filters non-semver baseVersions instead.
|
|
156
|
+
async getLatestAgentGraphRuntimeVersion(requester, runtimeTarget, organizationId, fallbackVersion) {
|
|
157
|
+
var _a, _b;
|
|
158
|
+
const resolvedFallback = fallbackVersion !== null && fallbackVersion !== void 0 ? fallbackVersion : this.DEFAULT_AGENT_GRAPH_RUNTIME_VERSION;
|
|
159
|
+
try {
|
|
160
|
+
const targetSpace = await this.getTargetSpaceMetadata(requester, organizationId, runtimeTarget.id, AGENT_GRAPH_RUNTIME_TYPE);
|
|
161
|
+
const runtimeVersions = (_b = (_a = targetSpace.runtimes
|
|
162
|
+
.find(runtime => runtime.type.toLowerCase() === AGENT_GRAPH_RUNTIME_TYPE)) === null || _a === void 0 ? void 0 : _a.versions) === null || _b === void 0 ? void 0 : _b.map(version => version.baseVersion).filter(version => semver_1.default.valid(version) !== null).sort((a, b) => semver_1.default.compare(b, a));
|
|
163
|
+
return Array.isArray(runtimeVersions) && runtimeVersions.length > 0 ? runtimeVersions[0] : resolvedFallback;
|
|
164
|
+
}
|
|
165
|
+
catch {
|
|
166
|
+
logger_1.Log.warn('Could not fetch Agent Graph runtime versions, using default version');
|
|
167
|
+
}
|
|
168
|
+
return resolvedFallback;
|
|
169
|
+
},
|
|
99
170
|
sanitizeUpstreamUrl(upstreamUrl) {
|
|
100
171
|
if (!upstreamUrl.endsWith('/')) {
|
|
101
172
|
return `${upstreamUrl}/`;
|
|
102
173
|
}
|
|
103
174
|
return upstreamUrl;
|
|
104
175
|
},
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
176
|
+
// Returns the externally-reachable URL of the gateway: configuration.ingress.publicUrl with
|
|
177
|
+
// internalUrl as fallback. Use this when the URL will be exposed outside the cluster (e.g.
|
|
178
|
+
// an API instance's endpointUri shown to consumers). Never resolves through clusterUrl.
|
|
179
|
+
getGatewayPublicUrl(gateway) {
|
|
180
|
+
return stripTrailingSlash(publicUrlFromConfig(gateway));
|
|
181
|
+
},
|
|
182
|
+
// Returns the cluster-internal URL of the gateway on the egress port (8082). Use this when an
|
|
183
|
+
// application running inside the cluster needs to make outbound calls through the gateway —
|
|
184
|
+
// resolved via the gateway's service name (gateway.name), never the public URL.
|
|
185
|
+
getEgressClusterUrl(gateway) {
|
|
186
|
+
return stripTrailingSlash(getClusterUrl(gateway.name, constants_1.EGRESS_GW_PORT));
|
|
112
187
|
},
|
|
113
188
|
DEFAULT_MULE_VERSION: '4.9.7',
|
|
189
|
+
DEFAULT_AGENT_GRAPH_RUNTIME_VERSION: '0.1.235',
|
|
114
190
|
};
|
|
115
191
|
//# sourceMappingURL=gateway.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../src/utils/gateway.ts"],"names":[],"mappings":";;;;AASA,
|
|
1
|
+
{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../src/utils/gateway.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/logger.d.ts
CHANGED
package/dist/utils/logger.js
CHANGED
|
@@ -21,6 +21,12 @@ exports.Log = {
|
|
|
21
21
|
debug(message) {
|
|
22
22
|
anypoint_cli_command_1.Logger.debug(message);
|
|
23
23
|
},
|
|
24
|
+
// Mirrors the base Logger's debug gate (default level INFO, overridable via
|
|
25
|
+
// ANYPOINT_LOG_LEVEL). Use to skip building expensive debug messages that
|
|
26
|
+
// would otherwise be computed and then discarded on the debug-off hot path.
|
|
27
|
+
isDebugEnabled() {
|
|
28
|
+
return (process.env.ANYPOINT_LOG_LEVEL || 'INFO').toUpperCase() === 'DEBUG';
|
|
29
|
+
},
|
|
24
30
|
debugStartTime(label) {
|
|
25
31
|
anypoint_cli_command_1.Logger.debugStartTime(label);
|
|
26
32
|
},
|
package/dist/utils/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":";;;AAAA,+DAA2C;AAE9B,QAAA,GAAG,GAAG;IACjB,QAAQ,CAAC,OAAe;QACtB,6BAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAA;IACrD,CAAC;IAED,YAAY;QACV,6BAAM,CAAC,YAAY,EAAE,CAAA;IACvB,CAAC;IAED,QAAQ;QACN,6BAAM,CAAC,QAAQ,EAAE,CAAA;IACnB,CAAC;IAED,MAAM,CAAC,OAAe;QACpB,6BAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACxB,CAAC;IAED,IAAI,CAAC,OAAe;QAClB,6BAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,OAAe;QACnB,6BAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACvB,CAAC;IAED,cAAc,CAAC,KAAa;QAC1B,6BAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;IAED,YAAY,CAAC,KAAa;QACxB,6BAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;IAC5B,CAAC;IAED,IAAI,CAAC,OAAe;QAClB,6BAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,OAAe;QACnB,6BAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACvB,CAAC;IAED,KAAK,CAAC,OAAe;QACnB,6BAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACvB,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,UAAkB,EAAE,OAAa;QAC/C,OAAO,6BAAM,CAAC,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;IAC9C,CAAC;IAED,SAAS,CAAC,GAAW,EAAE,IAAe;QACpC,6BAAM,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAC7B,CAAC;CACF,CAAA"}
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":";;;AAAA,+DAA2C;AAE9B,QAAA,GAAG,GAAG;IACjB,QAAQ,CAAC,OAAe;QACtB,6BAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAA;IACrD,CAAC;IAED,YAAY;QACV,6BAAM,CAAC,YAAY,EAAE,CAAA;IACvB,CAAC;IAED,QAAQ;QACN,6BAAM,CAAC,QAAQ,EAAE,CAAA;IACnB,CAAC;IAED,MAAM,CAAC,OAAe;QACpB,6BAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACxB,CAAC;IAED,IAAI,CAAC,OAAe;QAClB,6BAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,OAAe;QACnB,6BAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACvB,CAAC;IAED,4EAA4E;IAC5E,0EAA0E;IAC1E,4EAA4E;IAC5E,cAAc;QACZ,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,MAAM,CAAC,CAAC,WAAW,EAAE,KAAK,OAAO,CAAA;IAC7E,CAAC;IAED,cAAc,CAAC,KAAa;QAC1B,6BAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;IAED,YAAY,CAAC,KAAa;QACxB,6BAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;IAC5B,CAAC;IAED,IAAI,CAAC,OAAe;QAClB,6BAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,OAAe;QACnB,6BAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACvB,CAAC;IAED,KAAK,CAAC,OAAe;QACnB,6BAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACvB,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,UAAkB,EAAE,OAAa;QAC/C,OAAO,6BAAM,CAAC,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;IAC9C,CAAC;IAED,SAAS,CAAC,GAAW,EAAE,IAAe;QACpC,6BAAM,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAC7B,CAAC;CACF,CAAA"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.RetryableRequester = void 0;
|
|
4
|
+
const request_utils_1 = require("../helpers/request-utils");
|
|
5
|
+
const logger_1 = require("./logger");
|
|
6
|
+
const DEFAULT_MAX_ATTEMPTS = 3;
|
|
7
|
+
class RetryableRequester {
|
|
8
|
+
static getInstance() {
|
|
9
|
+
if (!RetryableRequester.instance) {
|
|
10
|
+
RetryableRequester.instance = new RetryableRequester();
|
|
11
|
+
}
|
|
12
|
+
return RetryableRequester.instance;
|
|
13
|
+
}
|
|
14
|
+
async execute(request, maxAttempts = DEFAULT_MAX_ATTEMPTS) {
|
|
15
|
+
var _a;
|
|
16
|
+
let lastError;
|
|
17
|
+
for (let attempt = 1; attempt <= maxAttempts; attempt++) {
|
|
18
|
+
try {
|
|
19
|
+
return await request();
|
|
20
|
+
}
|
|
21
|
+
catch (error) {
|
|
22
|
+
lastError = error;
|
|
23
|
+
if (attempt < maxAttempts && this.isRetryable(error)) {
|
|
24
|
+
const status = (_a = error.response) === null || _a === void 0 ? void 0 : _a.status;
|
|
25
|
+
logger_1.Log.debug(`Request failed with status ${status}, retrying (attempt ${attempt + 1}/${maxAttempts})...`);
|
|
26
|
+
continue;
|
|
27
|
+
}
|
|
28
|
+
throw error;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
throw lastError;
|
|
32
|
+
}
|
|
33
|
+
isRetryable(error) {
|
|
34
|
+
var _a;
|
|
35
|
+
if (!(0, request_utils_1.isAnAxiosError)(error)) {
|
|
36
|
+
return false;
|
|
37
|
+
}
|
|
38
|
+
const status = (_a = error.response) === null || _a === void 0 ? void 0 : _a.status;
|
|
39
|
+
return status !== undefined && status >= 500 && status <= 599;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
exports.RetryableRequester = RetryableRequester;
|
|
43
|
+
//# sourceMappingURL=retryable-requester.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"retryable-requester.js","sourceRoot":"","sources":["../../src/utils/retryable-requester.ts"],"names":[],"mappings":";;;AACA,4DAAuD;AACvD,qCAA4B;AAE5B,MAAM,oBAAoB,GAAG,CAAC,CAAA;AAE9B,MAAa,kBAAkB;IAG7B,MAAM,CAAC,WAAW;QAChB,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE;YAChC,kBAAkB,CAAC,QAAQ,GAAG,IAAI,kBAAkB,EAAE,CAAA;SACvD;QAED,OAAO,kBAAkB,CAAC,QAAQ,CAAA;IACpC,CAAC;IAED,KAAK,CAAC,OAAO,CAAI,OAAyB,EAAE,cAAsB,oBAAoB;;QACpF,IAAI,SAAkB,CAAA;QACtB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,WAAW,EAAE,OAAO,EAAE,EAAE;YACvD,IAAI;gBACF,OAAO,MAAM,OAAO,EAAE,CAAA;aACvB;YAAC,OAAO,KAAK,EAAE;gBACd,SAAS,GAAG,KAAK,CAAA;gBACjB,IAAI,OAAO,GAAG,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;oBACpD,MAAM,MAAM,GAAG,MAAC,KAAoB,CAAC,QAAQ,0CAAE,MAAM,CAAA;oBACrD,YAAG,CAAC,KAAK,CAAC,8BAA8B,MAAM,uBAAuB,OAAO,GAAG,CAAC,IAAI,WAAW,MAAM,CAAC,CAAA;oBACtG,SAAQ;iBACT;gBAED,MAAM,KAAK,CAAA;aACZ;SACF;QAED,MAAM,SAAS,CAAA;IACjB,CAAC;IAEO,WAAW,CAAC,KAAc;;QAChC,IAAI,CAAC,IAAA,8BAAc,EAAC,KAAK,CAAC,EAAE;YAC1B,OAAO,KAAK,CAAA;SACb;QACD,MAAM,MAAM,GAAG,MAAC,KAAoB,CAAC,QAAQ,0CAAE,MAAM,CAAA;QACrD,OAAO,MAAM,KAAK,SAAS,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,IAAI,GAAG,CAAA;IAC/D,CAAC;CACF;AAtCD,gDAsCC"}
|
package/dist/utils/uris.d.ts
CHANGED
|
@@ -18,10 +18,10 @@ export declare const getAssetInfoUri: (groupId: string, assetId: string) => stri
|
|
|
18
18
|
* Get the exchange URL for an asset
|
|
19
19
|
*/
|
|
20
20
|
export declare const getExchangeUrl: (host: string, groupId: string, assetId: string) => string;
|
|
21
|
-
export declare const getAllGatewaysUrl: (organizationId: string, environmentId: string) => string;
|
|
21
|
+
export declare const getAllGatewaysUrl: (organizationId: string, environmentId: string, pageNumber?: number, pageSize?: number) => string;
|
|
22
22
|
export declare const getGatewayDescriptionUrl: (organizationId: string, environmentId: string, gatewayId: string) => string;
|
|
23
23
|
export declare const getGatewayStatusUrl: (organizationId: string, environmentId: string, gatewayId: string) => string;
|
|
24
|
-
export declare const
|
|
25
|
-
export declare const getTargetSpaceMetadataUrl: (organizationId: string, targetSpaceId: string) => string;
|
|
24
|
+
export declare const getTargetSpacesUrl: (organizationId: string, environmentId: string) => string;
|
|
25
|
+
export declare const getTargetSpaceMetadataUrl: (organizationId: string, targetSpaceId: string, runtimeType?: string) => string;
|
|
26
26
|
export declare const getGatewayVersionsUrl: () => string;
|
|
27
|
-
export declare const getAllDomainsUrl: (organizationId: string, environmentId: string,
|
|
27
|
+
export declare const getAllDomainsUrl: (organizationId: string, environmentId: string, targetSpaceId: string) => string;
|
package/dist/utils/uris.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getAllDomainsUrl = exports.getGatewayVersionsUrl = exports.getTargetSpaceMetadataUrl = exports.
|
|
3
|
+
exports.getAllDomainsUrl = exports.getGatewayVersionsUrl = exports.getTargetSpaceMetadataUrl = exports.getTargetSpacesUrl = exports.getGatewayStatusUrl = exports.getGatewayDescriptionUrl = exports.getAllGatewaysUrl = exports.getExchangeUrl = exports.getAssetInfoUri = exports.getPublishAssetUri = exports.getAssetExistsUri = exports.LOWER_ENVS = void 0;
|
|
4
4
|
/**
|
|
5
5
|
* URI utility functions for API endpoints
|
|
6
6
|
*/
|
|
@@ -12,6 +12,8 @@ exports.LOWER_ENVS = [
|
|
|
12
12
|
'test1.platform.mulesoft.com',
|
|
13
13
|
'stage1.platform.mulesoft.com',
|
|
14
14
|
'gdev1.platform.mulesoft.com',
|
|
15
|
+
'gstage1.platform.mulesoft.com',
|
|
16
|
+
'gstage1.platform.mulesoft.mil',
|
|
15
17
|
];
|
|
16
18
|
/**
|
|
17
19
|
* Get the URI for checking if an asset exists in exchange
|
|
@@ -33,18 +35,24 @@ exports.getAssetInfoUri = getAssetInfoUri;
|
|
|
33
35
|
*/
|
|
34
36
|
const getExchangeUrl = (host, groupId, assetId) => `https://${host}/exchange/${groupId}/${assetId}`;
|
|
35
37
|
exports.getExchangeUrl = getExchangeUrl;
|
|
36
|
-
const getAllGatewaysUrl = (organizationId, environmentId) =>
|
|
38
|
+
const getAllGatewaysUrl = (organizationId, environmentId, pageNumber, pageSize = 20) => {
|
|
39
|
+
const base = `/gatewaymanager/api/v1/organizations/${organizationId}/environments/${environmentId}/gateways`;
|
|
40
|
+
return pageNumber === undefined ? base : `${base}?pageNumber=${pageNumber}&pageSize=${pageSize}`;
|
|
41
|
+
};
|
|
37
42
|
exports.getAllGatewaysUrl = getAllGatewaysUrl;
|
|
38
43
|
const getGatewayDescriptionUrl = (organizationId, environmentId, gatewayId) => `/gatewaymanager/api/v1/organizations/${organizationId}/environments/${environmentId}/gateways/${gatewayId}`;
|
|
39
44
|
exports.getGatewayDescriptionUrl = getGatewayDescriptionUrl;
|
|
40
45
|
const getGatewayStatusUrl = (organizationId, environmentId, gatewayId) => `/gatewaymanager/xapi/v1/organizations/${organizationId}/environments/${environmentId}/gateways/${gatewayId}`;
|
|
41
46
|
exports.getGatewayStatusUrl = getGatewayStatusUrl;
|
|
42
|
-
const
|
|
43
|
-
exports.
|
|
44
|
-
const getTargetSpaceMetadataUrl = (organizationId, targetSpaceId) =>
|
|
47
|
+
const getTargetSpacesUrl = (organizationId, environmentId) => `/gatewaymanager/xapi/v1/organizations/${organizationId}/environments/${environmentId}/gateways/targets`;
|
|
48
|
+
exports.getTargetSpacesUrl = getTargetSpacesUrl;
|
|
49
|
+
const getTargetSpaceMetadataUrl = (organizationId, targetSpaceId, runtimeType) => {
|
|
50
|
+
const base = `/runtimefabric/api/organizations/${organizationId}/targets/${targetSpaceId}`;
|
|
51
|
+
return runtimeType ? `${base}?runtimeType=${encodeURIComponent(runtimeType)}` : base;
|
|
52
|
+
};
|
|
45
53
|
exports.getTargetSpaceMetadataUrl = getTargetSpaceMetadataUrl;
|
|
46
54
|
const getGatewayVersionsUrl = () => '/gatewaymanager/xapi/v1/gateway/versions';
|
|
47
55
|
exports.getGatewayVersionsUrl = getGatewayVersionsUrl;
|
|
48
|
-
const getAllDomainsUrl = (organizationId, environmentId,
|
|
56
|
+
const getAllDomainsUrl = (organizationId, environmentId, targetSpaceId) => `/runtimefabric/api/organizations/${organizationId}/targets/${targetSpaceId}/environments/${environmentId}/domains?sendAppUniqueId=true`;
|
|
49
57
|
exports.getAllDomainsUrl = getAllDomainsUrl;
|
|
50
58
|
//# sourceMappingURL=uris.js.map
|
package/dist/utils/uris.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uris.js","sourceRoot":"","sources":["../../src/utils/uris.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACU,QAAA,UAAU,GAAG;IACxB,4BAA4B;IAC5B,2BAA2B;IAC3B,4BAA4B;IAC5B,4BAA4B;IAC5B,6BAA6B;IAC7B,8BAA8B;IAC9B,6BAA6B;
|
|
1
|
+
{"version":3,"file":"uris.js","sourceRoot":"","sources":["../../src/utils/uris.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACU,QAAA,UAAU,GAAG;IACxB,4BAA4B;IAC5B,2BAA2B;IAC3B,4BAA4B;IAC5B,4BAA4B;IAC5B,6BAA6B;IAC7B,8BAA8B;IAC9B,6BAA6B;IAC7B,+BAA+B;IAC/B,+BAA+B;CAChC,CAAA;AACD;;GAEG;AACI,MAAM,iBAAiB,GAAG,CAAC,OAAe,EAAE,OAAe,EAAE,OAAe,EAAU,EAAE,CAC7F,2BAA2B,OAAO,IAAI,OAAO,IAAI,OAAO,EAAE,CAAA;AAD/C,QAAA,iBAAiB,qBAC8B;AAE5D;;GAEG;AACI,MAAM,kBAAkB,GAAG,CAAC,OAAe,EAAE,OAAe,EAAE,OAAe,EAAU,EAAE,CAC9F,kCAAkC,OAAO,WAAW,OAAO,IAAI,OAAO,IAAI,OAAO,EAAE,CAAA;AADxE,QAAA,kBAAkB,sBACsD;AAErF;;GAEG;AACI,MAAM,eAAe,GAAG,CAAC,OAAe,EAAE,OAAe,EAAU,EAAE,CAC1E,2BAA2B,OAAO,IAAI,OAAO,QAAQ,CAAA;AAD1C,QAAA,eAAe,mBAC2B;AAEvD;;GAEG;AACI,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,OAAe,EAAE,OAAe,EAAU,EAAE,CACvF,WAAW,IAAI,aAAa,OAAO,IAAI,OAAO,EAAE,CAAA;AADrC,QAAA,cAAc,kBACuB;AAE3C,MAAM,iBAAiB,GAAG,CAAC,cAAsB,EAAE,aAAqB,EAAE,UAAmB,EAAE,QAAQ,GAAG,EAAE,EAAU,EAAE;IAC7H,MAAM,IAAI,GAAG,wCAAwC,cAAc,iBAAiB,aAAa,WAAW,CAAA;IAC5G,OAAO,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,eAAe,UAAU,aAAa,QAAQ,EAAE,CAAA;AAClG,CAAC,CAAA;AAHY,QAAA,iBAAiB,qBAG7B;AAEM,MAAM,wBAAwB,GAAG,CAAC,cAAsB,EAAE,aAAqB,EAAE,SAAiB,EAAU,EAAE,CACnH,wCAAwC,cAAc,iBAAiB,aAAa,aAAa,SAAS,EAAE,CAAA;AADjG,QAAA,wBAAwB,4BACyE;AAEvG,MAAM,mBAAmB,GAAG,CAAC,cAAsB,EAAE,aAAqB,EAAE,SAAiB,EAAU,EAAE,CAC9G,yCAAyC,cAAc,iBAAiB,aAAa,aAAa,SAAS,EAAE,CAAA;AADlG,QAAA,mBAAmB,uBAC+E;AAExG,MAAM,kBAAkB,GAAG,CAAC,cAAsB,EAAE,aAAqB,EAAU,EAAE,CAC1F,yCAAyC,cAAc,iBAAiB,aAAa,mBAAmB,CAAA;AAD7F,QAAA,kBAAkB,sBAC2E;AAEnG,MAAM,yBAAyB,GAAG,CAAC,cAAsB,EAAE,aAAqB,EAAE,WAAoB,EAAU,EAAE;IACvH,MAAM,IAAI,GAAG,oCAAoC,cAAc,YAAY,aAAa,EAAE,CAAA;IAC1F,OAAO,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,gBAAgB,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AACtF,CAAC,CAAA;AAHY,QAAA,yBAAyB,6BAGrC;AAEM,MAAM,qBAAqB,GAAG,GAAW,EAAE,CAChD,0CAA0C,CAAA;AAD/B,QAAA,qBAAqB,yBACU;AAErC,MAAM,gBAAgB,GAAG,CAAC,cAAsB,EAAE,aAAqB,EAAE,aAAqB,EAAU,EAAE,CAC/G,oCAAoC,cAAc,YAAY,aAAa,iBAAiB,aAAa,+BAA+B,CAAA;AAD7H,QAAA,gBAAgB,oBAC6G"}
|
|
@@ -1,16 +1,15 @@
|
|
|
1
1
|
import { NestedVariables, Variables } from '../types/types';
|
|
2
2
|
import { StageContext } from './builders/project-builder';
|
|
3
|
-
import {
|
|
3
|
+
import { AgentNetwork } from '../types/agent-network';
|
|
4
|
+
import Properties = AgentNetwork.Properties;
|
|
4
5
|
export declare const VariablesHelper: {
|
|
5
6
|
flattenVariables(variables: NestedVariables, prefix?: string): Variables;
|
|
6
7
|
propertiesArrayToObject(properties: string[]): Record<string, string>;
|
|
7
8
|
checkIfPromptsNeeded(variables: any, defaultProp: Record<string, string>, prefix?: string): boolean;
|
|
9
|
+
sanitizeVariables(variables: NestedVariables, prefix?: string): NestedVariables;
|
|
8
10
|
promptForVariables(variables: Variables, defaultProp: Record<string, string>, prefix?: string): Promise<Properties>;
|
|
9
11
|
/**
|
|
10
12
|
* Recursively traverses all values in an object or array and applies replacePlaceholder to each simple value (string, number, boolean).
|
|
11
|
-
* @param obj The object or array to process
|
|
12
|
-
* @param collectedVariables The variable of the properties
|
|
13
|
-
* @returns A new object or array with placeholders replaced
|
|
14
13
|
*/
|
|
15
14
|
recursivelyReplacePlaceholders<T>(obj: T, collectedVariables: Record<string, string>): T;
|
|
16
15
|
getAllVariablesFromContext(context: StageContext): Record<string, string>;
|
package/dist/utils/variables.js
CHANGED
|
@@ -32,24 +32,40 @@ exports.VariablesHelper = {
|
|
|
32
32
|
for (const [key, value] of Object.entries(variables)) {
|
|
33
33
|
const fullKey = prefix ? `${prefix}.${key}` : key;
|
|
34
34
|
if (typeof value === 'object' && value !== null && 'description' in value) {
|
|
35
|
-
// This is a leaf variable with description
|
|
36
35
|
if (!defaultProp[fullKey]) {
|
|
37
36
|
return true;
|
|
38
37
|
}
|
|
39
38
|
}
|
|
40
|
-
else if (typeof value === 'object' && value !== null &&
|
|
41
|
-
this.checkIfPromptsNeeded(value, defaultProp, fullKey)) {
|
|
39
|
+
else if (typeof value === 'object' && value !== null && this.checkIfPromptsNeeded(value, defaultProp, fullKey)) {
|
|
42
40
|
return true;
|
|
43
41
|
}
|
|
44
42
|
}
|
|
45
43
|
return false;
|
|
46
44
|
},
|
|
45
|
+
sanitizeVariables(variables, prefix = '') {
|
|
46
|
+
const sanitized = {};
|
|
47
|
+
for (const [key, value] of Object.entries(variables)) {
|
|
48
|
+
const fullKey = prefix ? `${prefix}.${key}` : key;
|
|
49
|
+
if (typeof value === 'object' && value !== null && 'description' in value) {
|
|
50
|
+
const isSecured = value.secret !== false;
|
|
51
|
+
if (isSecured && value.default) {
|
|
52
|
+
sanitized[key] = { description: value.description, secret: value.secret };
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
sanitized[key] = { ...value };
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
else if (typeof value === 'object' && value !== null) {
|
|
59
|
+
sanitized[key] = this.sanitizeVariables(value, fullKey);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
return sanitized;
|
|
63
|
+
},
|
|
47
64
|
async promptForVariables(variables, defaultProp, prefix = '') {
|
|
48
65
|
let collectedVariables = { properties: {}, securedProperties: {} };
|
|
49
66
|
for (const [key, value] of Object.entries(variables)) {
|
|
50
67
|
const fullKey = prefix ? `${prefix}.${key}` : key;
|
|
51
68
|
if (typeof value === 'object' && value !== null && 'description' in value) {
|
|
52
|
-
// This is a leaf variable with description
|
|
53
69
|
const varValue = value;
|
|
54
70
|
const isSecured = !(varValue.secret === false);
|
|
55
71
|
const propertyGroup = isSecured ? collectedVariables.securedProperties : collectedVariables.properties;
|
|
@@ -67,7 +83,6 @@ exports.VariablesHelper = {
|
|
|
67
83
|
}
|
|
68
84
|
else if (typeof value === 'object' && value !== null) {
|
|
69
85
|
const childVariables = await this.promptForVariables(value, defaultProp, fullKey);
|
|
70
|
-
// This is a nested object, recurse
|
|
71
86
|
collectedVariables = {
|
|
72
87
|
properties: {
|
|
73
88
|
...collectedVariables.properties,
|
|
@@ -84,9 +99,6 @@ exports.VariablesHelper = {
|
|
|
84
99
|
},
|
|
85
100
|
/**
|
|
86
101
|
* Recursively traverses all values in an object or array and applies replacePlaceholder to each simple value (string, number, boolean).
|
|
87
|
-
* @param obj The object or array to process
|
|
88
|
-
* @param collectedVariables The variable of the properties
|
|
89
|
-
* @returns A new object or array with placeholders replaced
|
|
90
102
|
*/
|
|
91
103
|
recursivelyReplacePlaceholders(obj, collectedVariables) {
|
|
92
104
|
if (Array.isArray(obj)) {
|
|
@@ -99,7 +111,6 @@ exports.VariablesHelper = {
|
|
|
99
111
|
}
|
|
100
112
|
return result;
|
|
101
113
|
}
|
|
102
|
-
// Simple value (string, number, boolean, etc.)
|
|
103
114
|
if (typeof obj !== 'string') {
|
|
104
115
|
return obj;
|
|
105
116
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variables.js","sourceRoot":"","sources":["../../src/utils/variables.ts"],"names":[],"mappings":";;;AACA,qCAA4B;AAC5B,2DAAoD;
|
|
1
|
+
{"version":3,"file":"variables.js","sourceRoot":"","sources":["../../src/utils/variables.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
/// <reference types="node" />
|
|
3
|
+
export type ZipableFile = {
|
|
4
|
+
path: string;
|
|
5
|
+
data: Buffer;
|
|
6
|
+
};
|
|
7
|
+
export declare class ZipUtils {
|
|
8
|
+
static zip(files: ZipableFile[]): Promise<Uint8Array>;
|
|
9
|
+
static generateZipFile(projectDirectory: any, mainFile: any): Promise<void>;
|
|
10
|
+
}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ZipUtils = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const jszip_1 = tslib_1.__importDefault(require("jszip"));
|
|
6
|
+
class ZipUtils {
|
|
7
|
+
static async zip(files) {
|
|
8
|
+
const jszip = new jszip_1.default();
|
|
9
|
+
for (const file of files) {
|
|
10
|
+
jszip.file(file.path, file.data);
|
|
11
|
+
}
|
|
12
|
+
return jszip.generateAsync({ type: 'uint8array' });
|
|
13
|
+
}
|
|
14
|
+
static async generateZipFile(projectDirectory, mainFile) {
|
|
15
|
+
// intentionally empty
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
exports.ZipUtils = ZipUtils;
|
|
19
|
+
//# sourceMappingURL=zip-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"zip-utils.js","sourceRoot":"","sources":["../../src/utils/zip-utils.ts"],"names":[],"mappings":";;;;AAAA,0DAAyB;AAOzB,MAAa,QAAQ;IACZ,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,KAAoB;QAC1C,MAAM,KAAK,GAAG,IAAI,eAAK,EAAE,CAAA;QACzB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;SACjC;QAED,OAAO,KAAK,CAAC,aAAa,CAAC,EAAC,IAAI,EAAE,YAAY,EAAC,CAAC,CAAA;IAClD,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,gBAAgB,EAAE,QAAQ;QAC5D,sBAAsB;IACxB,CAAC;CACF;AAbD,4BAaC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "mulesoft-anypoint-cli-agent-fabric-plugin",
|
|
3
|
-
"version": "1.0
|
|
3
|
+
"version": "1.1.0",
|
|
4
4
|
"description": "Agent Fabric CLI Plugin",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"files": [
|
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
"anypoint-cli-agent-fabric-plugin": "./bin/run"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
+
"@sf-agentscript/agentfabric-dialect": "1.0.2",
|
|
18
19
|
"@oclif/core": "1.26.1",
|
|
19
20
|
"@oclif/plugin-version": "1.0.4",
|
|
20
21
|
"ajv": "^8.17.1",
|
|
@@ -22,11 +23,13 @@
|
|
|
22
23
|
"ajv-keywords": "^5.1.0",
|
|
23
24
|
"anypoint-cli-command": "1.6.8",
|
|
24
25
|
"anypoint-cli-exchange-library": "0.1.13",
|
|
25
|
-
"anypoint-project-builder": "2.3.
|
|
26
|
+
"anypoint-project-builder": "2.3.2-10",
|
|
26
27
|
"fs-extra": "^11.3.0",
|
|
27
28
|
"jszip": "^3.10.1",
|
|
28
29
|
"junit-report-builder": "^3.2.1",
|
|
29
30
|
"semver": "^7.7.2",
|
|
31
|
+
"tree-sitter": "^0.25.0",
|
|
32
|
+
"web-tree-sitter": "^0.25.10",
|
|
30
33
|
"whatwg-url": "^11.0.0",
|
|
31
34
|
"xml2js": "^0.6.2",
|
|
32
35
|
"yaml": "^2.6.0"
|
|
@@ -90,6 +93,9 @@
|
|
|
90
93
|
"eslint --fix"
|
|
91
94
|
]
|
|
92
95
|
},
|
|
96
|
+
"overrides": {
|
|
97
|
+
"node-gyp": "^10.3.1"
|
|
98
|
+
},
|
|
93
99
|
"engines": {
|
|
94
100
|
"node": ">=20.0.0"
|
|
95
101
|
},
|