@aifabrix/builder 2.55.2 → 2.57.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/lib/agent-kit/session-report.js +76 -0
- package/lib/agent-kit/start.js +124 -57
- package/lib/agent-kit/tmux-sessions.js +163 -0
- package/lib/api/environments.api.js +38 -0
- package/lib/api/marketplace-bootstrap.api.js +31 -0
- package/lib/api/pipeline.api.js +32 -3
- package/lib/app/deploy.js +6 -5
- package/lib/cli/setup-app.js +7 -6
- package/lib/cli/setup-environment.js +76 -19
- package/lib/cli/setup-external-system-help.js +15 -3
- package/lib/cli/setup-external-system.js +21 -3
- package/lib/commands/agent-kit-help.js +32 -15
- package/lib/commands/agent-kit.js +90 -8
- package/lib/commands/repair-datasource-auto-rbac.js +4 -9
- package/lib/commands/upload-openapi-sync-followup.js +59 -0
- package/lib/commands/upload-qualification-client.js +131 -0
- package/lib/commands/upload-qualification-followups.js +104 -0
- package/lib/commands/upload-qualification-poll.js +143 -0
- package/lib/commands/upload.js +37 -156
- package/lib/deployment/deploy-poll-ui.js +14 -10
- package/lib/deployment/deployer-status.js +4 -4
- package/lib/deployment/installation/azure-infra-stage.js +160 -0
- package/lib/deployment/installation/azure-preflight.js +102 -0
- package/lib/deployment/installation/azure-readiness.js +71 -0
- package/lib/deployment/installation/docker-register.js +112 -0
- package/lib/deployment/installation/environment-auth.js +76 -0
- package/lib/deployment/installation/environment-manifest.js +165 -0
- package/lib/deployment/installation/environment-stage.js +191 -0
- package/lib/deployment/installation/index.js +39 -0
- package/lib/deployment/installation/infra-catalog.js +165 -0
- package/lib/deployment/installation/infra-manifest.js +161 -0
- package/lib/deployment/installation/infra-projection.js +86 -0
- package/lib/deployment/installation/public-ip.js +65 -0
- package/lib/deployment/installation/stage-input.js +169 -0
- package/lib/deployment/installation/stage-output.js +53 -0
- package/lib/deployment/installation/workspace-env.js +76 -0
- package/lib/deployment/installation/workspace-files.js +178 -0
- package/lib/deployment/installation/workspace-schema.js +40 -0
- package/lib/deployment/installation/workspace-secrets.js +66 -0
- package/lib/deployment/installation/workspace.js +128 -0
- package/lib/deployment/marketplace-environment.js +305 -0
- package/lib/external-system/deploy.js +46 -51
- package/lib/generator/builders.js +4 -0
- package/lib/generator/helpers.js +55 -99
- package/lib/generator/index.js +0 -4
- package/lib/generator/split-variables.js +11 -5
- package/lib/internal/fs-real-sync.js +29 -0
- package/lib/programmatic/builder-api-request.js +8 -4
- package/lib/programmatic/capability-registry.js +2 -0
- package/lib/programmatic/get-deploy-status.js +45 -0
- package/lib/programmatic/get-upload-status.js +45 -0
- package/lib/programmatic/http-accepted-response.js +31 -0
- package/lib/programmatic/openapi-descriptions.js +14 -4
- package/lib/programmatic/request-timeout.js +21 -15
- package/lib/programmatic/route-handler-map.js +6 -0
- package/lib/programmatic/run-deploy.js +7 -3
- package/lib/programmatic/run-upload.js +11 -7
- package/lib/role-assistant/package-validate.js +4 -0
- package/lib/role-assistant/test-runner-clarification-resubmit.js +149 -0
- package/lib/role-assistant/test-runner.js +14 -17
- package/lib/schema/application-schema.json +20 -2
- package/lib/schema/infra-parameter.schema.json +7 -0
- package/lib/schema/infra.parameter.yaml +32 -43
- package/lib/schema/infrastructure-schema.json +1480 -399
- package/lib/schema/installation-environment.schema.json +601 -0
- package/lib/utils/cli-utils.js +3 -2
- package/lib/utils/qualification-poll-ui.js +136 -0
- package/lib/utils/variable-transformer.js +3 -0
- package/lib/validation/required-variables.js +41 -0
- package/lib/validation/validator.js +8 -5
- package/package.json +7 -2
- package/templates/README.md +4 -0
- package/templates/agent-kit/instructions/AGENTKIT.md +6 -6
- package/templates/agent-kit/skills/shared/hosts.md +10 -10
- package/templates/applications/builder-api/env.template +4 -0
- package/templates/applications/dataplane/application.yaml +1 -1
- package/templates/applications/dataplane/env.template +1 -1
- package/templates/applications/keycloak/Dockerfile +12 -5
- package/templates/applications/keycloak/application.yaml +2 -2
- package/templates/applications/keycloak/cimd-lenient-parse/AbstractClientIdMetadataDocumentExecutor.java +3 -3
- package/templates/applications/keycloak/cimd-lenient-parse/SOURCE.md +6 -6
- package/templates/applications/keycloak/env.template +13 -1
- package/templates/applications/miso-controller/application.yaml +3 -2
- package/templates/applications/miso-controller/env.template +28 -22
- package/templates/marketplace/createUiDefinition.json +77 -0
- package/templates/marketplace/install.parameters.example.json +9 -0
- package/templates/marketplace/main.json +4087 -0
- package/lib/generator/deploy-manifest-azure-kv.js +0 -81
|
@@ -0,0 +1,161 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* @fileoverview Generation, normalization and projection of the committed, non-secret
|
|
5
|
+
* `environment-infra.json` installation manifest. Every operational value is explicit in the
|
|
6
|
+
* file with its source and description; secrets appear only as `valueFromEnv` references.
|
|
7
|
+
*/
|
|
8
|
+
|
|
9
|
+
const crypto = require('crypto');
|
|
10
|
+
const {
|
|
11
|
+
PARAMETER_CATALOG, OUTPUT_CATALOG, DEFAULT_LICENSE_EDITION, DEFAULT_ONBOARDING_MODE
|
|
12
|
+
} = require('./infra-catalog');
|
|
13
|
+
|
|
14
|
+
const INFRA_SCHEMA_VERSION = '2.0.0';
|
|
15
|
+
const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
16
|
+
|
|
17
|
+
function entry(value, source, description, extra = {}) {
|
|
18
|
+
return { value, source, description, ...extra };
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
function templateDefault(template, name) {
|
|
22
|
+
const value = template.parameters[name].defaultValue;
|
|
23
|
+
if (typeof value === 'string' && value.startsWith('[')) return '';
|
|
24
|
+
return value === undefined ? '' : value;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
function parameterEntry(name, template) {
|
|
28
|
+
const spec = PARAMETER_CATALOG[name];
|
|
29
|
+
switch (spec.kind) {
|
|
30
|
+
case 'secretEnv':
|
|
31
|
+
return { valueFromEnv: spec.env, source: 'secretEnv', required: spec.required, description: spec.description };
|
|
32
|
+
case 'acrLookup':
|
|
33
|
+
return entry(null, 'azureAcrLookup', spec.description);
|
|
34
|
+
case 'fixed':
|
|
35
|
+
return entry(spec.value, spec.source, spec.description);
|
|
36
|
+
case 'deferred':
|
|
37
|
+
return entry(null, 'deferred', spec.description, { requiredAt: 'tenantActivation' });
|
|
38
|
+
case 'allowMyIp':
|
|
39
|
+
return entry(name === 'allowedIPs' ? [] : false, spec.source, spec.description);
|
|
40
|
+
case 'license':
|
|
41
|
+
return entry(DEFAULT_LICENSE_EDITION, spec.source, spec.description);
|
|
42
|
+
case 'onboarding':
|
|
43
|
+
return entry(DEFAULT_ONBOARDING_MODE, spec.source, spec.description);
|
|
44
|
+
default:
|
|
45
|
+
return entry(templateDefault(template, name), spec.source, spec.description, spec.required ? { required: true } : {});
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
function buildParameters(template, existing = {}) {
|
|
50
|
+
const parameters = {};
|
|
51
|
+
for (const name of Object.keys(PARAMETER_CATALOG)) {
|
|
52
|
+
const fresh = parameterEntry(name, template);
|
|
53
|
+
const workflowOwned = ['fixed', 'deferred', 'secretEnv'].includes(PARAMETER_CATALOG[name].kind);
|
|
54
|
+
parameters[name] = existing[name] && !workflowOwned ? { ...fresh, value: existing[name].value } : fresh;
|
|
55
|
+
}
|
|
56
|
+
return parameters;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
function buildOutputs(existing = {}) {
|
|
60
|
+
return Object.fromEntries(Object.entries(OUTPUT_CATALOG).map(([name, description]) =>
|
|
61
|
+
[name, { value: existing[name]?.value ?? null, description }]));
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
function azureSections(template, existing) {
|
|
65
|
+
return {
|
|
66
|
+
acrName: existing.acrName || entry('', 'user', 'Required private ACR name. Builder resolves and persists its login server and resource ID using the authenticated Azure account.', { required: true }),
|
|
67
|
+
allowMyIp: existing.allowMyIp || entry(false, 'cliOrFile', 'Default-off internal test access. When enabled, Builder resolves and audits one public IPv4 /32.', { resolvedCidr: null, resolvedAt: null, resolver: null }),
|
|
68
|
+
preset: existing.preset || entry('s', 'cliOrFile', 'Shared infrastructure sizing preset.'),
|
|
69
|
+
parameters: buildParameters(template, existing.parameters),
|
|
70
|
+
outputs: buildOutputs(existing.outputs),
|
|
71
|
+
controllerUrl: existing.controllerUrl || entry(null, 'infraOutput', 'Activated Miso Controller URL derived from the Miso web application output.'),
|
|
72
|
+
tenantActivation: existing.tenantActivation || {
|
|
73
|
+
status: entry('pending', 'controller', 'Server-reported tenant activation state; Builder never marks activation complete.'),
|
|
74
|
+
url: entry(null, 'infraOutput', 'URL the user opens to sign in and complete tenant activation.')
|
|
75
|
+
},
|
|
76
|
+
deployment: existing.deployment || {
|
|
77
|
+
status: entry('not-deployed', 'azureDeployment', 'Latest shared infrastructure deployment status.'),
|
|
78
|
+
name: null, id: null, inputHash: null, completedAt: null
|
|
79
|
+
}
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
function dockerSections(template, existing) {
|
|
84
|
+
const moriDefault = templateDefault(template, 'moriBaseUrl');
|
|
85
|
+
return {
|
|
86
|
+
moriBaseUrl: existing.moriBaseUrl || entry(moriDefault, 'templateDefault', 'Mori service base URL used for registration.', { required: true }),
|
|
87
|
+
marketplaceSubscriptionId: existing.marketplaceSubscriptionId || entry('', 'workspace', 'Marketplace subscription ID; empty selects Mori Community.'),
|
|
88
|
+
registration: existing.registration || {
|
|
89
|
+
status: entry('not-registered', 'mori', 'Mori registration status; the one-time key is stored only in local user secrets.'),
|
|
90
|
+
evidence: null
|
|
91
|
+
}
|
|
92
|
+
};
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
function identitySections(vendor, resourceGroup, existing) {
|
|
96
|
+
const docker = vendor === 'DOCKER';
|
|
97
|
+
const idEntry = (description) => docker
|
|
98
|
+
? entry(crypto.randomUUID(), 'generated', description)
|
|
99
|
+
: entry('', 'user', description, { required: true });
|
|
100
|
+
return {
|
|
101
|
+
schemaVersion: INFRA_SCHEMA_VERSION,
|
|
102
|
+
vendor: existing.vendor || entry(vendor, 'cli', 'Installation vendor; immutable once recorded.'),
|
|
103
|
+
resourceGroup: existing.resourceGroup || entry(resourceGroup, 'command', 'Workspace and Azure resource-group key.'),
|
|
104
|
+
installId: existing.installId || entry(resourceGroup, 'command', 'Installation identifier and deployment journal key.'),
|
|
105
|
+
subscriptionId: existing.subscriptionId || idEntry(docker
|
|
106
|
+
? 'Stable Docker installation UUID sent to Mori.'
|
|
107
|
+
: 'Approved installation subscription recorded by this workspace; active Azure account must match.'),
|
|
108
|
+
tenantId: existing.tenantId || idEntry(docker
|
|
109
|
+
? 'Stable Docker owner UUID sent to Mori.'
|
|
110
|
+
: 'Approved installation directory tenant recorded by this workspace; not an Entra provider setting.')
|
|
111
|
+
};
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
/**
|
|
115
|
+
* Creates or normalizes the infra manifest for a vendor, preserving user-owned values.
|
|
116
|
+
* @param {Object} params - Inputs
|
|
117
|
+
* @param {string} params.vendor - AZURE or DOCKER
|
|
118
|
+
* @param {string} params.resourceGroup - Resource-group key
|
|
119
|
+
* @param {Object} params.template - Parsed shipped Marketplace template
|
|
120
|
+
* @param {Object|null} params.existing - Existing manifest
|
|
121
|
+
* @returns {Object} Manifest document
|
|
122
|
+
*/
|
|
123
|
+
function buildInfraDocument({ vendor, resourceGroup, template, existing }) {
|
|
124
|
+
const current = existing || {};
|
|
125
|
+
if (existing && existing.schemaVersion !== INFRA_SCHEMA_VERSION) {
|
|
126
|
+
throw new Error(`environment-infra.json schemaVersion ${existing.schemaVersion} is not supported; expected ${INFRA_SCHEMA_VERSION}`);
|
|
127
|
+
}
|
|
128
|
+
const sections = vendor === 'DOCKER' ? dockerSections(template, current) : azureSections(template, current);
|
|
129
|
+
return {
|
|
130
|
+
...identitySections(vendor, resourceGroup, current),
|
|
131
|
+
...sections,
|
|
132
|
+
variables: current.variables || {},
|
|
133
|
+
generated: current.generated || {}
|
|
134
|
+
};
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
/**
|
|
138
|
+
* Lists user-owned required fields that are still empty or invalid.
|
|
139
|
+
* @param {Object} doc - Manifest
|
|
140
|
+
* @returns {string[]} JSON paths inside environment-infra.json
|
|
141
|
+
*/
|
|
142
|
+
function missingRequiredFields(doc) {
|
|
143
|
+
const missing = [];
|
|
144
|
+
for (const key of ['subscriptionId', 'tenantId']) {
|
|
145
|
+
if (!UUID.test(String(doc[key].value || ''))) missing.push(`${key}.value (UUID)`);
|
|
146
|
+
}
|
|
147
|
+
if (doc.vendor.value === 'DOCKER') {
|
|
148
|
+
if (!/^https:\/\//.test(String(doc.moriBaseUrl.value || ''))) missing.push('moriBaseUrl.value (https URL)');
|
|
149
|
+
return missing;
|
|
150
|
+
}
|
|
151
|
+
if (!/^[a-zA-Z0-9]{5,50}$/.test(String(doc.acrName.value || ''))) missing.push('acrName.value');
|
|
152
|
+
if (!/^[a-z0-9]+$/.test(String(doc.parameters.location.value || ''))) missing.push('parameters.location.value');
|
|
153
|
+
if (!/^https:\/\//.test(String(doc.parameters.moriBaseUrl.value || ''))) missing.push('parameters.moriBaseUrl.value (https URL)');
|
|
154
|
+
return missing;
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
module.exports = {
|
|
158
|
+
INFRA_SCHEMA_VERSION,
|
|
159
|
+
buildInfraDocument,
|
|
160
|
+
missingRequiredFields
|
|
161
|
+
};
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* @fileoverview Projects `environment-infra.json` plus resolved workspace secrets into standard
|
|
5
|
+
* ARM deploymentParameters, and applies the default-off current-IP access option.
|
|
6
|
+
* Deferred tenant-activation parameters are never projected.
|
|
7
|
+
*/
|
|
8
|
+
|
|
9
|
+
const { PARAMETER_CATALOG } = require('./infra-catalog');
|
|
10
|
+
const { sha256 } = require('./workspace-files');
|
|
11
|
+
|
|
12
|
+
function projectParameter(name, doc, context) {
|
|
13
|
+
const spec = PARAMETER_CATALOG[name];
|
|
14
|
+
switch (spec.kind) {
|
|
15
|
+
case 'deferred':
|
|
16
|
+
return undefined;
|
|
17
|
+
case 'secretEnv': {
|
|
18
|
+
const value = context.env[spec.env];
|
|
19
|
+
if (spec.required && (typeof value !== 'string' || value === '')) {
|
|
20
|
+
throw new Error(`Workspace .env is missing required ${spec.env}; rerun after the secret resolves`);
|
|
21
|
+
}
|
|
22
|
+
return value;
|
|
23
|
+
}
|
|
24
|
+
case 'acrLookup':
|
|
25
|
+
if (!context.acr || !context.acr[spec.field]) {
|
|
26
|
+
throw new Error(`ACR ${spec.field} was not resolved from acrName`);
|
|
27
|
+
}
|
|
28
|
+
return context.acr[spec.field];
|
|
29
|
+
case 'fixed':
|
|
30
|
+
return spec.value;
|
|
31
|
+
default:
|
|
32
|
+
return doc.parameters[name].value;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
/**
|
|
37
|
+
* Builds the owner-only ARM parameters document and the non-secret input hash.
|
|
38
|
+
* @param {Object} doc - Infra manifest
|
|
39
|
+
* @param {Object} context - Resolution context
|
|
40
|
+
* @param {Object.<string,string>} context.env - Resolved workspace .env values
|
|
41
|
+
* @param {{ id: string, loginServer: string }} context.acr - Resolved registry
|
|
42
|
+
* @param {string} context.templateHash - SHA-256 of the deployed template
|
|
43
|
+
* @returns {{ document: Object, inputHash: string }}
|
|
44
|
+
*/
|
|
45
|
+
function buildArmParameters(doc, context) {
|
|
46
|
+
const parameters = {};
|
|
47
|
+
const nonSecret = {};
|
|
48
|
+
for (const name of Object.keys(PARAMETER_CATALOG)) {
|
|
49
|
+
const value = projectParameter(name, doc, context);
|
|
50
|
+
if (value === undefined) continue;
|
|
51
|
+
parameters[name] = { value };
|
|
52
|
+
// Secrets never enter the hash.
|
|
53
|
+
if (PARAMETER_CATALOG[name].kind !== 'secretEnv') nonSecret[name] = value;
|
|
54
|
+
}
|
|
55
|
+
return {
|
|
56
|
+
document: {
|
|
57
|
+
$schema: 'https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#',
|
|
58
|
+
contentVersion: '1.0.0.0',
|
|
59
|
+
parameters
|
|
60
|
+
},
|
|
61
|
+
inputHash: sha256(JSON.stringify({ templateHash: context.templateHash, parameters: nonSecret }))
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
/**
|
|
66
|
+
* Applies or revokes the generated caller `/32` rule. User-entered rules are preserved.
|
|
67
|
+
* @param {Object} doc - Infra manifest (mutated)
|
|
68
|
+
* @param {{ enabled: boolean, cidr?: string, resolvedAt?: string, resolver?: string }} access
|
|
69
|
+
*/
|
|
70
|
+
function applyAllowMyIp(doc, access) {
|
|
71
|
+
const previous = doc.allowMyIp.resolvedCidr;
|
|
72
|
+
const current = Array.isArray(doc.parameters.allowedIPs.value) ? doc.parameters.allowedIPs.value : [];
|
|
73
|
+
const userRules = current.filter(rule => rule !== previous);
|
|
74
|
+
doc.allowMyIp.value = access.enabled;
|
|
75
|
+
if (access.enabled) {
|
|
76
|
+
doc.parameters.allowedIPs.value = [...new Set([...userRules, access.cidr])];
|
|
77
|
+
doc.parameters.enablePostgresPublicAccess.value = true;
|
|
78
|
+
Object.assign(doc.allowMyIp, { resolvedCidr: access.cidr, resolvedAt: access.resolvedAt, resolver: access.resolver });
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
doc.parameters.allowedIPs.value = userRules;
|
|
82
|
+
doc.parameters.enablePostgresPublicAccess.value = false;
|
|
83
|
+
Object.assign(doc.allowMyIp, { resolvedCidr: null, resolvedAt: null, resolver: null });
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
module.exports = { buildArmParameters, applyAllowMyIp };
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* @fileoverview Resolves the caller's single public IPv4 for default-off, invocation-specific
|
|
5
|
+
* infrastructure test access. Sends no credentials or cookies, follows no redirects and never
|
|
6
|
+
* retries against another host.
|
|
7
|
+
*/
|
|
8
|
+
|
|
9
|
+
const net = require('net');
|
|
10
|
+
const { makeApiCall } = require('../../utils/api');
|
|
11
|
+
|
|
12
|
+
const PUBLIC_IP_RESOLVER = 'https://api.ipify.org?format=json';
|
|
13
|
+
const TIMEOUT_MS = 5000;
|
|
14
|
+
|
|
15
|
+
const NON_PUBLIC_IPV4 = [
|
|
16
|
+
['0.0.0.0', 8], ['10.0.0.0', 8], ['100.64.0.0', 10], ['127.0.0.0', 8], ['169.254.0.0', 16],
|
|
17
|
+
['172.16.0.0', 12], ['192.0.0.0', 24], ['192.0.2.0', 24], ['192.88.99.0', 24], ['192.168.0.0', 16],
|
|
18
|
+
['198.18.0.0', 15], ['198.51.100.0', 24], ['203.0.113.0', 24], ['224.0.0.0', 4], ['240.0.0.0', 4]
|
|
19
|
+
];
|
|
20
|
+
|
|
21
|
+
function ipv4ToInt(ip) {
|
|
22
|
+
return ip.split('.').reduce((acc, octet) => ((acc << 8) + Number(octet)) >>> 0, 0);
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
/**
|
|
26
|
+
* True for one strictly formatted, globally routable IPv4 address.
|
|
27
|
+
* @param {string} ip - Candidate address
|
|
28
|
+
* @returns {boolean}
|
|
29
|
+
*/
|
|
30
|
+
function isPublicIpv4(ip) {
|
|
31
|
+
if (typeof ip !== 'string' || net.isIPv4(ip) !== true || !/^(\d{1,3})(\.\d{1,3}){3}$/.test(ip)) return false;
|
|
32
|
+
if (ip.split('.').some(octet => octet.length > 1 && octet.startsWith('0'))) return false;
|
|
33
|
+
const value = ipv4ToInt(ip);
|
|
34
|
+
return !NON_PUBLIC_IPV4.some(([base, bits]) => {
|
|
35
|
+
const mask = bits === 0 ? 0 : (~0 << (32 - bits)) >>> 0;
|
|
36
|
+
return ((value & mask) >>> 0) === ((ipv4ToInt(base) & mask) >>> 0);
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/**
|
|
41
|
+
* Resolves the caller's public IPv4 as a `/32` rule.
|
|
42
|
+
* @param {Function} [call] - HTTP call (defaults to the shared API utility)
|
|
43
|
+
* @param {Function} [now] - Clock
|
|
44
|
+
* @returns {Promise<{ cidr: string, resolvedAt: string, resolver: string }>}
|
|
45
|
+
*/
|
|
46
|
+
async function resolvePublicIpv4(call = makeApiCall, now = () => new Date()) {
|
|
47
|
+
const response = await call(PUBLIC_IP_RESOLVER, {
|
|
48
|
+
method: 'GET',
|
|
49
|
+
headers: { Accept: 'application/json' },
|
|
50
|
+
redirect: 'error',
|
|
51
|
+
credentials: 'omit',
|
|
52
|
+
timeoutMs: TIMEOUT_MS
|
|
53
|
+
});
|
|
54
|
+
if (!response || !response.success) {
|
|
55
|
+
throw new Error('Could not resolve the caller public IPv4 for --allow-my-ip (resolver unavailable, redirected or timed out)');
|
|
56
|
+
}
|
|
57
|
+
const data = response.data;
|
|
58
|
+
const ip = data && typeof data === 'object' && !Array.isArray(data) ? data.ip : undefined;
|
|
59
|
+
if (!isPublicIpv4(ip)) {
|
|
60
|
+
throw new Error('Public IP resolver did not return exactly one public IPv4 address; --allow-my-ip was not applied');
|
|
61
|
+
}
|
|
62
|
+
return { cidr: `${ip}/32`, resolvedAt: now().toISOString(), resolver: PUBLIC_IP_RESOLVER };
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
module.exports = { PUBLIC_IP_RESOLVER, isPublicIpv4, resolvePublicIpv4 };
|
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* @fileoverview Workspace-mode `env deploy <resource-group> --stage <stage>` input validation:
|
|
5
|
+
* resource-group key, stage, vendor matrix and stage-scoped option checks. Runs before any
|
|
6
|
+
* filesystem, network or cloud mutation.
|
|
7
|
+
*/
|
|
8
|
+
|
|
9
|
+
const path = require('path');
|
|
10
|
+
const { normalizeLicenseEdition } = require('./infra-catalog');
|
|
11
|
+
|
|
12
|
+
const WORKSPACE_STAGES = Object.freeze(['register', 'infra', 'dev', 'tst', 'pro']);
|
|
13
|
+
const ENVIRONMENT_STAGES = Object.freeze(['dev', 'tst', 'pro']);
|
|
14
|
+
const VENDORS = Object.freeze(['AZURE', 'DOCKER']);
|
|
15
|
+
const DEFAULT_VENDOR = 'AZURE';
|
|
16
|
+
const RESOURCE_GROUP_KEY = /^[a-z][a-z0-9-]{2,39}$/;
|
|
17
|
+
const ENV_VAR_NAME = /^[A-Z_][A-Z0-9_]*$/;
|
|
18
|
+
const LEGACY_MARKETPLACE_FLAGS = Object.freeze([
|
|
19
|
+
'marketplaceJson', 'parameters', 'subscription', 'resourceGroup', 'installId'
|
|
20
|
+
]);
|
|
21
|
+
const DOCKER_SETUP_GUIDANCE = 'DOCKER installations deploy through "aifabrix setup"; only --stage register is supported for DOCKER.';
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* True when options select the deprecated explicit Marketplace/journal mode.
|
|
25
|
+
* @param {Object} options - Commander options
|
|
26
|
+
* @returns {boolean}
|
|
27
|
+
*/
|
|
28
|
+
function isLegacyMarketplaceMode(options) {
|
|
29
|
+
if (LEGACY_MARKETPLACE_FLAGS.some(flag => options[flag] !== undefined && options[flag] !== null)) {
|
|
30
|
+
return true;
|
|
31
|
+
}
|
|
32
|
+
return !options.stage && Boolean(options.controllerUrl);
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
/**
|
|
36
|
+
* True when options select the resource-group installation workspace mode.
|
|
37
|
+
* @param {Object} options - Commander options
|
|
38
|
+
* @returns {boolean}
|
|
39
|
+
*/
|
|
40
|
+
function isWorkspaceMode(options) {
|
|
41
|
+
return Boolean(options.stage) && !isLegacyMarketplaceMode(options);
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
/**
|
|
45
|
+
* Validates the positional resource-group key before it is used as a path segment.
|
|
46
|
+
* @param {string} value - Positional value
|
|
47
|
+
* @returns {string} The validated key
|
|
48
|
+
* @throws {Error} On absolute paths, separators, traversal, normalization changes or bad format
|
|
49
|
+
*/
|
|
50
|
+
function validateResourceGroupKey(value) {
|
|
51
|
+
const raw = typeof value === 'string' ? value : '';
|
|
52
|
+
if (!raw || path.isAbsolute(raw) || /[\\/]/.test(raw) || raw.includes('..') ||
|
|
53
|
+
path.normalize(raw) !== raw || raw.normalize('NFC') !== raw || raw.trim() !== raw) {
|
|
54
|
+
throw new Error('Resource group must be a plain workspace key without paths, separators or traversal');
|
|
55
|
+
}
|
|
56
|
+
if (!RESOURCE_GROUP_KEY.test(raw)) {
|
|
57
|
+
throw new Error('Resource group must be a lowercase Azure-safe name (3-40 characters: a-z, 0-9, -; starts with a letter)');
|
|
58
|
+
}
|
|
59
|
+
return raw;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* Normalizes a vendor value case-insensitively.
|
|
64
|
+
* @param {string|undefined} value - Raw vendor value
|
|
65
|
+
* @returns {string|undefined} Canonical vendor or undefined when absent
|
|
66
|
+
*/
|
|
67
|
+
function normalizeVendor(value) {
|
|
68
|
+
if (value === undefined || value === null || value === '') return undefined;
|
|
69
|
+
const vendor = String(value).trim().toUpperCase();
|
|
70
|
+
if (!VENDORS.includes(vendor)) {
|
|
71
|
+
throw new Error(`Unsupported vendor "${value}". Use one of: ${VENDORS.join(', ')}`);
|
|
72
|
+
}
|
|
73
|
+
return vendor;
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
function validateStage(stage) {
|
|
77
|
+
const value = String(stage || '').trim().toLowerCase();
|
|
78
|
+
if (!WORKSPACE_STAGES.includes(value)) {
|
|
79
|
+
throw new Error(`Unsupported stage "${stage}". Use one of: ${WORKSPACE_STAGES.join(', ')}`);
|
|
80
|
+
}
|
|
81
|
+
return value;
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
function resolveVendor(stage, requested, persisted) {
|
|
85
|
+
if (requested && persisted && requested !== persisted) {
|
|
86
|
+
throw new Error(`Workspace vendor is ${persisted}; --vendor ${requested} conflicts with the existing installation`);
|
|
87
|
+
}
|
|
88
|
+
if (stage === 'register') {
|
|
89
|
+
if (requested !== 'DOCKER') {
|
|
90
|
+
throw new Error('--stage register requires explicit --vendor DOCKER; AZURE installations register with Mori during tenant activation in Miso');
|
|
91
|
+
}
|
|
92
|
+
return requested;
|
|
93
|
+
}
|
|
94
|
+
const vendor = requested || persisted || DEFAULT_VENDOR;
|
|
95
|
+
if (vendor === 'DOCKER') {
|
|
96
|
+
throw new Error(`--stage ${stage} is not supported for DOCKER. ${DOCKER_SETUP_GUIDANCE}`);
|
|
97
|
+
}
|
|
98
|
+
return vendor;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
function assertInfraOnlyOptions(stage, options) {
|
|
102
|
+
if (options.allowMyIp && stage !== 'infra') {
|
|
103
|
+
throw new Error('--allow-my-ip is supported only with --stage infra for AZURE installations');
|
|
104
|
+
}
|
|
105
|
+
if (options.licenseEdition === undefined) return;
|
|
106
|
+
if (stage !== 'infra') {
|
|
107
|
+
throw new Error('--license-edition is supported only with --stage infra for AZURE installations');
|
|
108
|
+
}
|
|
109
|
+
normalizeLicenseEdition(options.licenseEdition);
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
function assertStageScopedOptions(stage, options) {
|
|
113
|
+
assertInfraOnlyOptions(stage, options);
|
|
114
|
+
const envOnly = [['controllerUrl', '--controller-url'], ['misoApiKeyEnv', '--miso-api-key-env']];
|
|
115
|
+
for (const [key, flag] of envOnly) {
|
|
116
|
+
if (options[key] !== undefined && !ENVIRONMENT_STAGES.includes(stage)) {
|
|
117
|
+
throw new Error(`${flag} is supported only with --stage dev, tst or pro`);
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
if (options.config !== undefined) {
|
|
121
|
+
throw new Error('--config is not supported with --stage; environment settings live in the workspace environment files');
|
|
122
|
+
}
|
|
123
|
+
if (options.preset !== undefined && stage === 'register') {
|
|
124
|
+
throw new Error('--preset is not supported with --stage register');
|
|
125
|
+
}
|
|
126
|
+
if (options.misoApiKeyEnv !== undefined && !ENV_VAR_NAME.test(String(options.misoApiKeyEnv))) {
|
|
127
|
+
throw new Error('--miso-api-key-env must be an environment-variable name (for example MISO_API_KEY), never a key value');
|
|
128
|
+
}
|
|
129
|
+
if (options.controllerUrl !== undefined && !/^https:\/\/[^/\s]+(\/[^\s]*)?$/.test(String(options.controllerUrl))) {
|
|
130
|
+
throw new Error('--controller-url must be an https:// URL');
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
/**
|
|
135
|
+
* Resolves validated workspace-mode input.
|
|
136
|
+
* @param {string} resourceGroupKey - Positional resource-group key
|
|
137
|
+
* @param {Object} options - Commander options
|
|
138
|
+
* @param {string|undefined} persistedVendor - Vendor recorded in an existing workspace
|
|
139
|
+
* @returns {{ resourceGroup: string, stage: string, vendor: string, allowMyIp: boolean, licenseEdition: string|undefined,
|
|
140
|
+
* preset: string|undefined, controllerUrl: string|undefined, misoApiKeyEnv: string|undefined }}
|
|
141
|
+
*/
|
|
142
|
+
function resolveStageInput(resourceGroupKey, options, persistedVendor) {
|
|
143
|
+
const resourceGroup = validateResourceGroupKey(resourceGroupKey);
|
|
144
|
+
const stage = validateStage(options.stage);
|
|
145
|
+
assertStageScopedOptions(stage, options);
|
|
146
|
+
const vendor = resolveVendor(stage, normalizeVendor(options.vendor), normalizeVendor(persistedVendor));
|
|
147
|
+
return {
|
|
148
|
+
resourceGroup,
|
|
149
|
+
stage,
|
|
150
|
+
vendor,
|
|
151
|
+
allowMyIp: options.allowMyIp === true,
|
|
152
|
+
licenseEdition: options.licenseEdition,
|
|
153
|
+
preset: options.preset,
|
|
154
|
+
controllerUrl: options.controllerUrl,
|
|
155
|
+
misoApiKeyEnv: options.misoApiKeyEnv
|
|
156
|
+
};
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
module.exports = {
|
|
160
|
+
WORKSPACE_STAGES,
|
|
161
|
+
ENVIRONMENT_STAGES,
|
|
162
|
+
VENDORS,
|
|
163
|
+
DEFAULT_VENDOR,
|
|
164
|
+
isLegacyMarketplaceMode,
|
|
165
|
+
isWorkspaceMode,
|
|
166
|
+
validateResourceGroupKey,
|
|
167
|
+
normalizeVendor,
|
|
168
|
+
resolveStageInput
|
|
169
|
+
};
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* @fileoverview Terminal summary lines for installation workspace stages (tty-summary profile).
|
|
5
|
+
*/
|
|
6
|
+
|
|
7
|
+
const {
|
|
8
|
+
formatSuccessLine,
|
|
9
|
+
formatNextActions,
|
|
10
|
+
metadata
|
|
11
|
+
} = require('../../utils/cli-test-layout-chalk');
|
|
12
|
+
|
|
13
|
+
function registerLines(result, resourceGroup) {
|
|
14
|
+
return [
|
|
15
|
+
formatSuccessLine(result.alreadyRegistered
|
|
16
|
+
? `DOCKER installation ${resourceGroup} is already registered with Mori`
|
|
17
|
+
: `DOCKER installation ${resourceGroup} registered with Mori`),
|
|
18
|
+
formatNextActions(['Install locally with: aifabrix setup'])
|
|
19
|
+
];
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
function infraLines(result, resourceGroup) {
|
|
23
|
+
return [
|
|
24
|
+
formatSuccessLine(`Shared infrastructure ready: ${result.controllerUrl}`),
|
|
25
|
+
formatNextActions([
|
|
26
|
+
`Tenant activation is pending. Open ${result.activationUrl}, sign in and complete activation.`,
|
|
27
|
+
`Then deploy environments: af env deploy ${resourceGroup} --stage dev (or tst, pro)`
|
|
28
|
+
])
|
|
29
|
+
];
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
function environmentLines(result) {
|
|
33
|
+
return [
|
|
34
|
+
formatSuccessLine(`Environment ${result.envKey} ${result.status} (deployment ${result.deploymentId}${result.resumed ? ', resumed' : ''})`),
|
|
35
|
+
formatNextActions([`Deploy applications with: aifabrix deploy <app> (environment ${result.envKey})`])
|
|
36
|
+
];
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/**
|
|
40
|
+
* @param {Object} result - Stage result
|
|
41
|
+
* @param {string} resourceGroup - Resource-group key
|
|
42
|
+
* @returns {string} Multi-line summary
|
|
43
|
+
*/
|
|
44
|
+
function formatStageResult(result, resourceGroup) {
|
|
45
|
+
const header = metadata(`Workspace: ${result.workspaceDir}`);
|
|
46
|
+
let lines;
|
|
47
|
+
if (result.stage === 'register') lines = registerLines(result, resourceGroup);
|
|
48
|
+
else if (result.stage === 'infra') lines = infraLines(result, resourceGroup);
|
|
49
|
+
else lines = environmentLines(result);
|
|
50
|
+
return `${[header, ...lines].join('\n')}\n`;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
module.exports = { formatStageResult };
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* @fileoverview Owner-only workspace `.env` merge/remove. Never replaces the file as a whole:
|
|
5
|
+
* preserves unrelated values and comments, enforces mode 0600, and refuses to overwrite a
|
|
6
|
+
* conflicting user-set value. Error messages name keys only, never values.
|
|
7
|
+
*/
|
|
8
|
+
|
|
9
|
+
// Real-sync adapter: installation workspace state must not disappear under Jest fs mocks.
|
|
10
|
+
const fs = require('../../internal/fs-real-sync');
|
|
11
|
+
const { parseEnvContentToMap, mergeEnvMapIntoContent } = require('../../core/secrets-env-content');
|
|
12
|
+
const { writeFileAtomic, assertIgnoredSecretFile } = require('./workspace-files');
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* @param {string} envPath - Workspace .env path
|
|
16
|
+
* @returns {Object.<string, string>} Parsed values (empty when absent)
|
|
17
|
+
*/
|
|
18
|
+
function readWorkspaceEnv(envPath) {
|
|
19
|
+
if (!fs.existsSync(envPath)) return {};
|
|
20
|
+
return parseEnvContentToMap(fs.readFileSync(envPath, 'utf8'));
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
function findConflicts(existing, entries, replaceable) {
|
|
24
|
+
return Object.keys(entries).filter((key) => {
|
|
25
|
+
const current = existing[key];
|
|
26
|
+
return current !== undefined && current !== '' && current !== entries[key] && !replaceable.has(key);
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
/**
|
|
31
|
+
* Atomically merges owned keys into the workspace `.env`.
|
|
32
|
+
* @param {string} envPath - Workspace .env path
|
|
33
|
+
* @param {Object.<string, string>} entries - Keys to set
|
|
34
|
+
* @param {Object} context - Merge context
|
|
35
|
+
* @param {string} context.root - Workspace root (ignore check)
|
|
36
|
+
* @param {string[]} [context.replaceable] - Keys Builder may replace when they differ
|
|
37
|
+
* @throws {Error} When a user-set value conflicts
|
|
38
|
+
*/
|
|
39
|
+
function mergeWorkspaceEnv(envPath, entries, context) {
|
|
40
|
+
assertIgnoredSecretFile(envPath, context.root);
|
|
41
|
+
const content = fs.existsSync(envPath) ? fs.readFileSync(envPath, 'utf8') : '';
|
|
42
|
+
const existing = parseEnvContentToMap(content);
|
|
43
|
+
const conflicts = findConflicts(existing, entries, new Set(context.replaceable || []));
|
|
44
|
+
if (conflicts.length > 0) {
|
|
45
|
+
throw new Error(
|
|
46
|
+
`Workspace .env already sets a different value for ${conflicts.join(', ')}. ` +
|
|
47
|
+
'Remove or correct those lines, then rerun.'
|
|
48
|
+
);
|
|
49
|
+
}
|
|
50
|
+
const changed = Object.fromEntries(Object.entries(entries).filter(([key, value]) => existing[key] !== value));
|
|
51
|
+
if (Object.keys(changed).length === 0 && content) {
|
|
52
|
+
fs.chmodSync(envPath, 0o600);
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
const merged = mergeEnvMapIntoContent(content, changed);
|
|
56
|
+
writeFileAtomic(envPath, merged.endsWith('\n') ? merged : `${merged}\n`, 0o600);
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* Removes one resolved key line from the workspace `.env` (no-op when absent).
|
|
61
|
+
* @param {string} envPath - Workspace .env path
|
|
62
|
+
* @param {string} key - Variable name
|
|
63
|
+
*/
|
|
64
|
+
function removeWorkspaceEnvKey(envPath, key) {
|
|
65
|
+
if (!fs.existsSync(envPath)) return;
|
|
66
|
+
const lines = fs.readFileSync(envPath, 'utf8').split(/\r?\n/);
|
|
67
|
+
const kept = lines.filter((line) => {
|
|
68
|
+
const trimmed = line.trim();
|
|
69
|
+
return trimmed.startsWith('#') || trimmed.substring(0, trimmed.indexOf('=')).trim() !== key;
|
|
70
|
+
});
|
|
71
|
+
if (kept.length !== lines.length) {
|
|
72
|
+
writeFileAtomic(envPath, kept.join('\n'), 0o600);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
module.exports = { readWorkspaceEnv, mergeWorkspaceEnv, removeWorkspaceEnvKey };
|