@xemahq/xema 0.13.0 → 0.14.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 +68 -20
- package/dist/assets/boot-graph.json +57 -15
- package/dist/assets/core/distribution.lock.json +667 -297
- package/dist/assets/core/images.lock.json +136 -136
- package/dist/assets/oss/distribution.lock.json +1497 -461
- package/dist/assets/oss/images.lock.json +423 -188
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +36 -1
- package/dist/cli.js.map +1 -1
- package/dist/commands/apply.d.ts.map +1 -1
- package/dist/commands/apply.js +1 -1
- package/dist/commands/apply.js.map +1 -1
- package/dist/commands/biome-dev.d.ts +3 -0
- package/dist/commands/biome-dev.d.ts.map +1 -0
- package/dist/commands/biome-dev.js +176 -0
- package/dist/commands/biome-dev.js.map +1 -0
- package/dist/commands/biome-validate.d.ts +10 -0
- package/dist/commands/biome-validate.d.ts.map +1 -0
- package/dist/commands/biome-validate.js +49 -0
- package/dist/commands/biome-validate.js.map +1 -0
- package/dist/commands/biome.d.ts.map +1 -1
- package/dist/commands/biome.js +359 -25
- package/dist/commands/biome.js.map +1 -1
- package/dist/commands/canopy.d.ts +3 -0
- package/dist/commands/canopy.d.ts.map +1 -0
- package/dist/commands/canopy.js +214 -0
- package/dist/commands/canopy.js.map +1 -0
- package/dist/commands/config.d.ts +3 -0
- package/dist/commands/config.d.ts.map +1 -0
- package/dist/commands/config.js +78 -0
- package/dist/commands/config.js.map +1 -0
- package/dist/commands/dev.d.ts.map +1 -1
- package/dist/commands/dev.js +71 -21
- package/dist/commands/dev.js.map +1 -1
- package/dist/commands/dist.js +1 -1
- package/dist/commands/dist.js.map +1 -1
- package/dist/commands/down.d.ts.map +1 -1
- package/dist/commands/down.js +40 -6
- package/dist/commands/down.js.map +1 -1
- package/dist/commands/import.d.ts.map +1 -1
- package/dist/commands/import.js +1 -1
- package/dist/commands/import.js.map +1 -1
- package/dist/commands/installation.d.ts +3 -0
- package/dist/commands/installation.d.ts.map +1 -0
- package/dist/commands/installation.js +101 -0
- package/dist/commands/installation.js.map +1 -0
- package/dist/commands/logs.d.ts.map +1 -1
- package/dist/commands/logs.js +6 -14
- package/dist/commands/logs.js.map +1 -1
- package/dist/commands/objects.d.ts.map +1 -1
- package/dist/commands/objects.js +85 -6
- package/dist/commands/objects.js.map +1 -1
- package/dist/commands/plan.d.ts.map +1 -1
- package/dist/commands/plan.js +1 -1
- package/dist/commands/plan.js.map +1 -1
- package/dist/commands/run.d.ts.map +1 -1
- package/dist/commands/run.js +61 -9
- package/dist/commands/run.js.map +1 -1
- package/dist/commands/serve.d.ts.map +1 -1
- package/dist/commands/serve.js +33 -13
- package/dist/commands/serve.js.map +1 -1
- package/dist/commands/shell.d.ts.map +1 -1
- package/dist/commands/shell.js +190 -6
- package/dist/commands/shell.js.map +1 -1
- package/dist/commands/source.d.ts +3 -0
- package/dist/commands/source.d.ts.map +1 -0
- package/dist/commands/source.js +120 -0
- package/dist/commands/source.js.map +1 -0
- package/dist/commands/status.d.ts.map +1 -1
- package/dist/commands/status.js +29 -3
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/up.d.ts.map +1 -1
- package/dist/commands/up.js +55 -5
- package/dist/commands/up.js.map +1 -1
- package/dist/dev/env-defaults.d.ts.map +1 -1
- package/dist/dev/env-defaults.js +9 -6
- package/dist/dev/env-defaults.js.map +1 -1
- package/dist/dev/forked-worker.d.ts +15 -0
- package/dist/dev/forked-worker.d.ts.map +1 -1
- package/dist/dev/forked-worker.js +72 -14
- package/dist/dev/forked-worker.js.map +1 -1
- package/dist/dev/opa-policies.d.ts +3 -0
- package/dist/dev/opa-policies.d.ts.map +1 -0
- package/dist/dev/opa-policies.js +64 -0
- package/dist/dev/opa-policies.js.map +1 -0
- package/dist/lib/cli-errors.d.ts +7 -0
- package/dist/lib/cli-errors.d.ts.map +1 -0
- package/dist/lib/cli-errors.js +30 -0
- package/dist/lib/cli-errors.js.map +1 -0
- package/dist/lib/control-plane.d.ts.map +1 -1
- package/dist/lib/control-plane.js +5 -2
- package/dist/lib/control-plane.js.map +1 -1
- package/dist/lib/exit-codes.d.ts +3 -4
- package/dist/lib/exit-codes.d.ts.map +1 -1
- package/dist/lib/exit-codes.js +3 -4
- package/dist/lib/exit-codes.js.map +1 -1
- package/dist/lib/http-error.d.ts +2 -0
- package/dist/lib/http-error.d.ts.map +1 -0
- package/dist/lib/http-error.js +51 -0
- package/dist/lib/http-error.js.map +1 -0
- package/dist/lib/roster-profile.d.ts +10 -0
- package/dist/lib/roster-profile.d.ts.map +1 -0
- package/dist/lib/roster-profile.js +44 -0
- package/dist/lib/roster-profile.js.map +1 -0
- package/dist/runtime/biome-dev.d.ts +28 -0
- package/dist/runtime/biome-dev.d.ts.map +1 -0
- package/dist/runtime/biome-dev.js +131 -0
- package/dist/runtime/biome-dev.js.map +1 -0
- package/dist/runtime/biome-local-install.d.ts +29 -0
- package/dist/runtime/biome-local-install.d.ts.map +1 -0
- package/dist/runtime/biome-local-install.js +243 -0
- package/dist/runtime/biome-local-install.js.map +1 -0
- package/dist/runtime/biome-publish.d.ts +34 -0
- package/dist/runtime/biome-publish.d.ts.map +1 -0
- package/dist/runtime/biome-publish.js +214 -0
- package/dist/runtime/biome-publish.js.map +1 -0
- package/dist/runtime/biome-scaffold.d.ts +35 -0
- package/dist/runtime/biome-scaffold.d.ts.map +1 -0
- package/dist/runtime/biome-scaffold.js +153 -0
- package/dist/runtime/biome-scaffold.js.map +1 -0
- package/dist/runtime/biome-validate.d.ts +28 -0
- package/dist/runtime/biome-validate.d.ts.map +1 -0
- package/dist/runtime/biome-validate.js +450 -0
- package/dist/runtime/biome-validate.js.map +1 -0
- package/dist/runtime/boot-graph-loader.d.ts +1 -0
- package/dist/runtime/boot-graph-loader.d.ts.map +1 -1
- package/dist/runtime/boot-graph-loader.js +99 -7
- package/dist/runtime/boot-graph-loader.js.map +1 -1
- package/dist/runtime/canopy-refs.d.ts +8 -0
- package/dist/runtime/canopy-refs.d.ts.map +1 -0
- package/dist/runtime/canopy-refs.js +51 -0
- package/dist/runtime/canopy-refs.js.map +1 -0
- package/dist/runtime/canopy-replies.d.ts +14 -0
- package/dist/runtime/canopy-replies.d.ts.map +1 -0
- package/dist/runtime/canopy-replies.js +39 -0
- package/dist/runtime/canopy-replies.js.map +1 -0
- package/dist/runtime/capability-invoke.d.ts +35 -0
- package/dist/runtime/capability-invoke.d.ts.map +1 -0
- package/dist/runtime/capability-invoke.js +119 -0
- package/dist/runtime/capability-invoke.js.map +1 -0
- package/dist/runtime/config/dev-mode.d.ts +8 -0
- package/dist/runtime/config/dev-mode.d.ts.map +1 -0
- package/dist/runtime/config/dev-mode.js +84 -0
- package/dist/runtime/config/dev-mode.js.map +1 -0
- package/dist/runtime/config/init-presets.d.ts +1 -1
- package/dist/runtime/config/init-presets.d.ts.map +1 -1
- package/dist/runtime/config/init-presets.js +63 -11
- package/dist/runtime/config/init-presets.js.map +1 -1
- package/dist/runtime/config/loader.d.ts +1 -0
- package/dist/runtime/config/loader.d.ts.map +1 -1
- package/dist/runtime/config/loader.js +41 -5
- package/dist/runtime/config/loader.js.map +1 -1
- package/dist/runtime/config/schema.d.ts +27 -12
- package/dist/runtime/config/schema.d.ts.map +1 -1
- package/dist/runtime/config/schema.js +113 -8
- package/dist/runtime/config/schema.js.map +1 -1
- package/dist/runtime/config/sources-config.d.ts +14 -0
- package/dist/runtime/config/sources-config.d.ts.map +1 -0
- package/dist/runtime/config/sources-config.js +79 -0
- package/dist/runtime/config/sources-config.js.map +1 -0
- package/dist/runtime/distribution/compose.d.ts.map +1 -1
- package/dist/runtime/distribution/compose.js +3 -1
- package/dist/runtime/distribution/compose.js.map +1 -1
- package/dist/runtime/env-seeder.d.ts +5 -0
- package/dist/runtime/env-seeder.d.ts.map +1 -1
- package/dist/runtime/env-seeder.js +118 -16
- package/dist/runtime/env-seeder.js.map +1 -1
- package/dist/runtime/foreground.d.ts +4 -0
- package/dist/runtime/foreground.d.ts.map +1 -1
- package/dist/runtime/foreground.js +11 -0
- package/dist/runtime/foreground.js.map +1 -1
- package/dist/runtime/infra/infra-catalog.d.ts +1 -0
- package/dist/runtime/infra/infra-catalog.d.ts.map +1 -1
- package/dist/runtime/infra/infra-catalog.js +2 -1
- package/dist/runtime/infra/infra-catalog.js.map +1 -1
- package/dist/runtime/infra/infra-runner.d.ts +5 -0
- package/dist/runtime/infra/infra-runner.d.ts.map +1 -1
- package/dist/runtime/infra/infra-runner.js +82 -13
- package/dist/runtime/infra/infra-runner.js.map +1 -1
- package/dist/runtime/installation/compiler.d.ts +37 -0
- package/dist/runtime/installation/compiler.d.ts.map +1 -0
- package/dist/runtime/installation/compiler.js +190 -0
- package/dist/runtime/installation/compiler.js.map +1 -0
- package/dist/runtime/installation/contract.d.ts +125 -0
- package/dist/runtime/installation/contract.d.ts.map +1 -0
- package/dist/runtime/installation/contract.js +182 -0
- package/dist/runtime/installation/contract.js.map +1 -0
- package/dist/runtime/installation/diagnostics.d.ts +16 -0
- package/dist/runtime/installation/diagnostics.d.ts.map +1 -0
- package/dist/runtime/installation/diagnostics.js +21 -0
- package/dist/runtime/installation/diagnostics.js.map +1 -0
- package/dist/runtime/installation/diff.d.ts +17 -0
- package/dist/runtime/installation/diff.d.ts.map +1 -0
- package/dist/runtime/installation/diff.js +99 -0
- package/dist/runtime/installation/diff.js.map +1 -0
- package/dist/runtime/installation/format.d.ts +3 -0
- package/dist/runtime/installation/format.d.ts.map +1 -0
- package/dist/runtime/installation/format.js +22 -0
- package/dist/runtime/installation/format.js.map +1 -0
- package/dist/runtime/installation/from-current-config.d.ts +8 -0
- package/dist/runtime/installation/from-current-config.d.ts.map +1 -0
- package/dist/runtime/installation/from-current-config.js +75 -0
- package/dist/runtime/installation/from-current-config.js.map +1 -0
- package/dist/runtime/installation/index.d.ts +13 -0
- package/dist/runtime/installation/index.d.ts.map +1 -0
- package/dist/runtime/installation/index.js +29 -0
- package/dist/runtime/installation/index.js.map +1 -0
- package/dist/runtime/installation/lifecycle.d.ts +23 -0
- package/dist/runtime/installation/lifecycle.d.ts.map +1 -0
- package/dist/runtime/installation/lifecycle.js +70 -0
- package/dist/runtime/installation/lifecycle.js.map +1 -0
- package/dist/runtime/installation/serialization.d.ts +3 -0
- package/dist/runtime/installation/serialization.d.ts.map +1 -0
- package/dist/runtime/installation/serialization.js +39 -0
- package/dist/runtime/installation/serialization.js.map +1 -0
- package/dist/runtime/installation/state-store.d.ts +20 -0
- package/dist/runtime/installation/state-store.d.ts.map +1 -0
- package/dist/runtime/installation/state-store.js +257 -0
- package/dist/runtime/installation/state-store.js.map +1 -0
- package/dist/runtime/installation/status.d.ts +30 -0
- package/dist/runtime/installation/status.d.ts.map +1 -0
- package/dist/runtime/installation/status.js +138 -0
- package/dist/runtime/installation/status.js.map +1 -0
- package/dist/runtime/installation/support-bundle.d.ts +30 -0
- package/dist/runtime/installation/support-bundle.d.ts.map +1 -0
- package/dist/runtime/installation/support-bundle.js +130 -0
- package/dist/runtime/installation/support-bundle.js.map +1 -0
- package/dist/runtime/installation/validation.d.ts +8 -0
- package/dist/runtime/installation/validation.d.ts.map +1 -0
- package/dist/runtime/installation/validation.js +39 -0
- package/dist/runtime/installation/validation.js.map +1 -0
- package/dist/runtime/installation/validators/common.d.ts +4 -0
- package/dist/runtime/installation/validators/common.d.ts.map +1 -0
- package/dist/runtime/installation/validators/common.js +29 -0
- package/dist/runtime/installation/validators/common.js.map +1 -0
- package/dist/runtime/installation/validators/infrastructure.d.ts +4 -0
- package/dist/runtime/installation/validators/infrastructure.d.ts.map +1 -0
- package/dist/runtime/installation/validators/infrastructure.js +78 -0
- package/dist/runtime/installation/validators/infrastructure.js.map +1 -0
- package/dist/runtime/installation/validators/operational.d.ts +4 -0
- package/dist/runtime/installation/validators/operational.d.ts.map +1 -0
- package/dist/runtime/installation/validators/operational.js +126 -0
- package/dist/runtime/installation/validators/operational.js.map +1 -0
- package/dist/runtime/installation/validators/profile.d.ts +4 -0
- package/dist/runtime/installation/validators/profile.d.ts.map +1 -0
- package/dist/runtime/installation/validators/profile.js +78 -0
- package/dist/runtime/installation/validators/profile.js.map +1 -0
- package/dist/runtime/installation/validators/secrets.d.ts +4 -0
- package/dist/runtime/installation/validators/secrets.d.ts.map +1 -0
- package/dist/runtime/installation/validators/secrets.js +68 -0
- package/dist/runtime/installation/validators/secrets.js.map +1 -0
- package/dist/runtime/launch-plan-format.d.ts +3 -0
- package/dist/runtime/launch-plan-format.d.ts.map +1 -0
- package/dist/runtime/launch-plan-format.js +57 -0
- package/dist/runtime/launch-plan-format.js.map +1 -0
- package/dist/runtime/launch.d.ts +25 -3
- package/dist/runtime/launch.d.ts.map +1 -1
- package/dist/runtime/launch.js +264 -24
- package/dist/runtime/launch.js.map +1 -1
- package/dist/runtime/object-registry-client.d.ts +31 -0
- package/dist/runtime/object-registry-client.d.ts.map +1 -0
- package/dist/runtime/object-registry-client.js +54 -0
- package/dist/runtime/object-registry-client.js.map +1 -0
- package/dist/runtime/paths.d.ts +1 -0
- package/dist/runtime/paths.d.ts.map +1 -1
- package/dist/runtime/paths.js +2 -0
- package/dist/runtime/paths.js.map +1 -1
- package/dist/runtime/roster.d.ts +10 -4
- package/dist/runtime/roster.d.ts.map +1 -1
- package/dist/runtime/roster.js +73 -7
- package/dist/runtime/roster.js.map +1 -1
- package/dist/runtime/run-manifest.d.ts +23 -0
- package/dist/runtime/run-manifest.d.ts.map +1 -0
- package/dist/runtime/run-manifest.js +273 -0
- package/dist/runtime/run-manifest.js.map +1 -0
- package/dist/runtime/runner/container-runner.d.ts +6 -0
- package/dist/runtime/runner/container-runner.d.ts.map +1 -1
- package/dist/runtime/runner/container-runner.js +25 -6
- package/dist/runtime/runner/container-runner.js.map +1 -1
- package/dist/runtime/runner/docker-cli.d.ts +6 -1
- package/dist/runtime/runner/docker-cli.d.ts.map +1 -1
- package/dist/runtime/runner/docker-cli.js +47 -6
- package/dist/runtime/runner/docker-cli.js.map +1 -1
- package/dist/runtime/runner/native-runner.d.ts.map +1 -1
- package/dist/runtime/runner/native-runner.js +21 -14
- package/dist/runtime/runner/native-runner.js.map +1 -1
- package/dist/runtime/secrets/managed-local-store.d.ts +26 -0
- package/dist/runtime/secrets/managed-local-store.d.ts.map +1 -0
- package/dist/runtime/secrets/managed-local-store.js +202 -0
- package/dist/runtime/secrets/managed-local-store.js.map +1 -0
- package/dist/runtime/secrets/resolver.d.ts +23 -0
- package/dist/runtime/secrets/resolver.d.ts.map +1 -0
- package/dist/runtime/secrets/resolver.js +265 -0
- package/dist/runtime/secrets/resolver.js.map +1 -0
- package/dist/runtime/secrets/url-security.d.ts +3 -0
- package/dist/runtime/secrets/url-security.d.ts.map +1 -0
- package/dist/runtime/secrets/url-security.js +13 -0
- package/dist/runtime/secrets/url-security.js.map +1 -0
- package/dist/runtime/sources/credentials.d.ts.map +1 -1
- package/dist/runtime/sources/credentials.js +2 -1
- package/dist/runtime/sources/credentials.js.map +1 -1
- package/dist/runtime/sources/kinds/git.d.ts +6 -3
- package/dist/runtime/sources/kinds/git.d.ts.map +1 -1
- package/dist/runtime/sources/kinds/git.js +99 -22
- package/dist/runtime/sources/kinds/git.js.map +1 -1
- package/dist/runtime/sources/resolve-context.d.ts +7 -0
- package/dist/runtime/sources/resolve-context.d.ts.map +1 -0
- package/dist/runtime/sources/resolve-context.js +3 -0
- package/dist/runtime/sources/resolve-context.js.map +1 -0
- package/dist/runtime/sources/resolver.d.ts +2 -2
- package/dist/runtime/sources/resolver.d.ts.map +1 -1
- package/dist/runtime/sources/resolver.js +11 -5
- package/dist/runtime/sources/resolver.js.map +1 -1
- package/dist/runtime/store-client.d.ts +59 -0
- package/dist/runtime/store-client.d.ts.map +1 -0
- package/dist/runtime/store-client.js +71 -0
- package/dist/runtime/store-client.js.map +1 -0
- package/dist/runtime/supervisor.d.ts +6 -0
- package/dist/runtime/supervisor.d.ts.map +1 -1
- package/dist/runtime/supervisor.js +37 -5
- package/dist/runtime/supervisor.js.map +1 -1
- package/dist/runtime/waves.d.ts +1 -1
- package/dist/runtime/waves.d.ts.map +1 -1
- package/dist/runtime/waves.js +86 -19
- package/dist/runtime/waves.js.map +1 -1
- package/examples/01-local-native.yaml +4 -1
- package/examples/03-byo-infra.yaml +17 -7
- package/examples/05-appliance-helm.yaml +1 -1
- package/examples/06-biome-sources.yaml +4 -1
- package/package.json +6 -5
- package/xema.config.example.yaml +22 -18
|
@@ -0,0 +1,265 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SecretResolver = void 0;
|
|
4
|
+
exports.secretEnvironment = secretEnvironment;
|
|
5
|
+
exports.assertSecretMaterializationSupported = assertSecretMaterializationSupported;
|
|
6
|
+
exports.externalPostgresCredentials = externalPostgresCredentials;
|
|
7
|
+
const node_fs_1 = require("node:fs");
|
|
8
|
+
const node_path_1 = require("node:path");
|
|
9
|
+
const schema_1 = require("../config/schema");
|
|
10
|
+
const ENV_NAME = /^[A-Za-z_][A-Za-z0-9_]*$/;
|
|
11
|
+
class SecretResolver {
|
|
12
|
+
env;
|
|
13
|
+
cwd;
|
|
14
|
+
prompt;
|
|
15
|
+
constructor(opts = {}) {
|
|
16
|
+
this.env = opts.env ?? process.env;
|
|
17
|
+
this.cwd = opts.cwd ?? process.cwd();
|
|
18
|
+
this.prompt = opts.prompt ?? promptHidden;
|
|
19
|
+
}
|
|
20
|
+
async resolve(config) {
|
|
21
|
+
const resolved = new Map();
|
|
22
|
+
for (const [name, declaration] of Object.entries(config.secrets)) {
|
|
23
|
+
const value = await this.resolveOne(name, declaration);
|
|
24
|
+
if (value.length === 0) {
|
|
25
|
+
throw new Error(`Secret "${name}" resolved to an empty value.`);
|
|
26
|
+
}
|
|
27
|
+
if (value.includes('\0')) {
|
|
28
|
+
throw new Error(`Secret "${name}" contains a NUL byte.`);
|
|
29
|
+
}
|
|
30
|
+
resolved.set(name, value);
|
|
31
|
+
}
|
|
32
|
+
validateInfraReferences(config, resolved);
|
|
33
|
+
validateExternalPostgres(config, resolved);
|
|
34
|
+
return new SecretSnapshot(resolved);
|
|
35
|
+
}
|
|
36
|
+
async resolveOne(name, declaration) {
|
|
37
|
+
switch (declaration.from) {
|
|
38
|
+
case schema_1.SecretSource.Env: {
|
|
39
|
+
const envName = declaration.env ?? name;
|
|
40
|
+
if (!ENV_NAME.test(envName)) {
|
|
41
|
+
throw new Error(`Secret "${name}" has invalid env source "${envName}". Use a valid environment variable name.`);
|
|
42
|
+
}
|
|
43
|
+
const value = this.env[envName];
|
|
44
|
+
if (value === undefined || value.length === 0) {
|
|
45
|
+
throw new Error(`Secret "${name}" requires environment variable ${envName}, but it is unset or empty.`);
|
|
46
|
+
}
|
|
47
|
+
return value;
|
|
48
|
+
}
|
|
49
|
+
case schema_1.SecretSource.File: {
|
|
50
|
+
if (declaration.path === undefined) {
|
|
51
|
+
throw new Error(`Secret "${name}" uses a file source but has no path.`);
|
|
52
|
+
}
|
|
53
|
+
const path = (0, node_path_1.isAbsolute)(declaration.path)
|
|
54
|
+
? declaration.path
|
|
55
|
+
: (0, node_path_1.resolve)(this.cwd, declaration.path);
|
|
56
|
+
return readSecretFile(name, path);
|
|
57
|
+
}
|
|
58
|
+
case schema_1.SecretSource.Prompt:
|
|
59
|
+
return this.prompt(name);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
exports.SecretResolver = SecretResolver;
|
|
64
|
+
function secretEnvironment(resolved) {
|
|
65
|
+
const env = {};
|
|
66
|
+
for (const [name, value] of resolved) {
|
|
67
|
+
if (ENV_NAME.test(name)) {
|
|
68
|
+
env[name] = value;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
return env;
|
|
72
|
+
}
|
|
73
|
+
function assertSecretMaterializationSupported(config, substrate) {
|
|
74
|
+
if (substrate !== schema_1.Substrate.Helm) {
|
|
75
|
+
return;
|
|
76
|
+
}
|
|
77
|
+
const hasDeclarations = Object.keys(config.secrets).length > 0;
|
|
78
|
+
const usesExternalPostgres = config.infra[schema_1.InfraComponent.Postgres]?.mode === schema_1.InfraMode.External;
|
|
79
|
+
if (hasDeclarations || usesExternalPostgres) {
|
|
80
|
+
throw new Error('The Helm substrate does not materialize launcher secrets or external PostgreSQL credentials. Configure Kubernetes Secrets through the service charts instead.');
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
function externalPostgresCredentials(config, resolved) {
|
|
84
|
+
const postgres = config.infra[schema_1.InfraComponent.Postgres];
|
|
85
|
+
if (postgres?.mode !== schema_1.InfraMode.External) {
|
|
86
|
+
return undefined;
|
|
87
|
+
}
|
|
88
|
+
const url = parsePostgresUrl(postgres);
|
|
89
|
+
const username = decodeURIComponent(url.username);
|
|
90
|
+
const inlinePassword = decodeURIComponent(url.password);
|
|
91
|
+
if (inlinePassword.length > 0) {
|
|
92
|
+
throw new Error('infra.postgres external URL must not contain a password; reference a declared secret with secretRef.');
|
|
93
|
+
}
|
|
94
|
+
if (username.length === 0) {
|
|
95
|
+
throw new Error('infra.postgres external URL must include an explicit username.');
|
|
96
|
+
}
|
|
97
|
+
if (postgres.secretRef === undefined) {
|
|
98
|
+
throw new Error('infra.postgres external configuration requires secretRef.');
|
|
99
|
+
}
|
|
100
|
+
const password = resolved.get(postgres.secretRef);
|
|
101
|
+
if (password === undefined || password.length === 0) {
|
|
102
|
+
throw new Error(`infra.postgres secretRef "${postgres.secretRef}" is unresolved.`);
|
|
103
|
+
}
|
|
104
|
+
return { username, password };
|
|
105
|
+
}
|
|
106
|
+
function validateInfraReferences(config, resolved) {
|
|
107
|
+
for (const [component, componentConfig] of Object.entries(config.infra)) {
|
|
108
|
+
if (componentConfig === undefined) {
|
|
109
|
+
continue;
|
|
110
|
+
}
|
|
111
|
+
const reference = componentConfig.secretRef;
|
|
112
|
+
if (reference === undefined) {
|
|
113
|
+
continue;
|
|
114
|
+
}
|
|
115
|
+
if (component !== schema_1.InfraComponent.Postgres) {
|
|
116
|
+
throw new Error(`infra.${component}.secretRef is unsupported; only external PostgreSQL passwords accept an infra secretRef.`);
|
|
117
|
+
}
|
|
118
|
+
if (!resolved.has(reference)) {
|
|
119
|
+
throw new Error(`infra.${component}.secretRef references undeclared or unresolved secret "${reference}".`);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
function validateExternalPostgres(config, resolved) {
|
|
124
|
+
externalPostgresCredentials(config, resolved);
|
|
125
|
+
}
|
|
126
|
+
function parsePostgresUrl(config) {
|
|
127
|
+
if (config.url === undefined) {
|
|
128
|
+
throw new Error('infra.postgres external configuration has no URL.');
|
|
129
|
+
}
|
|
130
|
+
let url;
|
|
131
|
+
try {
|
|
132
|
+
url = new URL(config.url);
|
|
133
|
+
}
|
|
134
|
+
catch {
|
|
135
|
+
throw new Error('infra.postgres external URL is invalid.');
|
|
136
|
+
}
|
|
137
|
+
if (url.protocol !== 'postgres:' && url.protocol !== 'postgresql:') {
|
|
138
|
+
throw new Error('infra.postgres external URL must use the postgres or postgresql scheme.');
|
|
139
|
+
}
|
|
140
|
+
return url;
|
|
141
|
+
}
|
|
142
|
+
async function promptHidden(name) {
|
|
143
|
+
const input = process.stdin;
|
|
144
|
+
const output = process.stderr;
|
|
145
|
+
if (!input.isTTY || !output.isTTY || typeof input.setRawMode !== 'function') {
|
|
146
|
+
throw new Error(`Secret "${name}" requires an interactive terminal. Use an env or file source for unattended launches.`);
|
|
147
|
+
}
|
|
148
|
+
output.write(`Secret ${name}: `);
|
|
149
|
+
return new Promise((resolvePromise, rejectPromise) => {
|
|
150
|
+
const bytes = [];
|
|
151
|
+
const wasRaw = input.isRaw;
|
|
152
|
+
let settled = false;
|
|
153
|
+
const cleanup = () => {
|
|
154
|
+
input.off('data', onData);
|
|
155
|
+
input.off('end', onEnd);
|
|
156
|
+
input.off('error', onError);
|
|
157
|
+
input.setRawMode(wasRaw);
|
|
158
|
+
input.pause();
|
|
159
|
+
output.write('\n');
|
|
160
|
+
};
|
|
161
|
+
const finish = (operation) => {
|
|
162
|
+
if (settled) {
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
165
|
+
settled = true;
|
|
166
|
+
cleanup();
|
|
167
|
+
operation();
|
|
168
|
+
};
|
|
169
|
+
const onEnd = () => {
|
|
170
|
+
finish(() => rejectPromise(new Error(`Secret prompt for "${name}" ended before a value was read.`)));
|
|
171
|
+
};
|
|
172
|
+
const onError = () => {
|
|
173
|
+
finish(() => rejectPromise(new Error(`Secret prompt for "${name}" failed.`)));
|
|
174
|
+
};
|
|
175
|
+
const onData = (chunk) => {
|
|
176
|
+
for (const byte of chunk) {
|
|
177
|
+
if (byte === 3) {
|
|
178
|
+
finish(() => rejectPromise(new Error(`Secret prompt for "${name}" was cancelled.`)));
|
|
179
|
+
return;
|
|
180
|
+
}
|
|
181
|
+
if (byte === 10 || byte === 13) {
|
|
182
|
+
finish(() => resolvePromise(Buffer.concat(bytes).toString('utf8')));
|
|
183
|
+
return;
|
|
184
|
+
}
|
|
185
|
+
if (byte === 8 || byte === 127) {
|
|
186
|
+
const current = Buffer.concat(bytes);
|
|
187
|
+
bytes.length = 0;
|
|
188
|
+
if (current.length > 0) {
|
|
189
|
+
bytes.push(current.subarray(0, current.length - 1));
|
|
190
|
+
}
|
|
191
|
+
continue;
|
|
192
|
+
}
|
|
193
|
+
bytes.push(Buffer.from([byte]));
|
|
194
|
+
}
|
|
195
|
+
};
|
|
196
|
+
input.setRawMode(true);
|
|
197
|
+
input.resume();
|
|
198
|
+
input.on('data', onData);
|
|
199
|
+
input.once('end', onEnd);
|
|
200
|
+
input.once('error', onError);
|
|
201
|
+
});
|
|
202
|
+
}
|
|
203
|
+
function readSecretFile(name, path) {
|
|
204
|
+
let descriptor;
|
|
205
|
+
try {
|
|
206
|
+
descriptor = (0, node_fs_1.openSync)(path, node_fs_1.constants.O_RDONLY | (node_fs_1.constants.O_NOFOLLOW ?? 0));
|
|
207
|
+
const metadata = (0, node_fs_1.fstatSync)(descriptor);
|
|
208
|
+
if (!metadata.isFile()) {
|
|
209
|
+
throw new Error('source is not a regular file');
|
|
210
|
+
}
|
|
211
|
+
if (process.platform !== 'win32' && (metadata.mode & 0o077) !== 0) {
|
|
212
|
+
throw new Error(`source permissions are ${modeString(metadata.mode)}; expected no group or other access (0600 or stricter)`);
|
|
213
|
+
}
|
|
214
|
+
return (0, node_fs_1.readFileSync)(descriptor, 'utf8');
|
|
215
|
+
}
|
|
216
|
+
catch (error) {
|
|
217
|
+
const reason = error instanceof Error ? error.message : String(error);
|
|
218
|
+
throw new Error(`Secret "${name}" could not be read from ${path}: ${reason}`);
|
|
219
|
+
}
|
|
220
|
+
finally {
|
|
221
|
+
if (descriptor !== undefined) {
|
|
222
|
+
(0, node_fs_1.closeSync)(descriptor);
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
function modeString(mode) {
|
|
227
|
+
return (mode & 0o777).toString(8).padStart(4, '0');
|
|
228
|
+
}
|
|
229
|
+
class SecretSnapshot {
|
|
230
|
+
#values;
|
|
231
|
+
constructor(values) {
|
|
232
|
+
this.#values = new Map(values);
|
|
233
|
+
Object.freeze(this);
|
|
234
|
+
}
|
|
235
|
+
get size() {
|
|
236
|
+
return this.#values.size;
|
|
237
|
+
}
|
|
238
|
+
get(key) {
|
|
239
|
+
return this.#values.get(key);
|
|
240
|
+
}
|
|
241
|
+
has(key) {
|
|
242
|
+
return this.#values.has(key);
|
|
243
|
+
}
|
|
244
|
+
entries() {
|
|
245
|
+
return this.#values.entries();
|
|
246
|
+
}
|
|
247
|
+
keys() {
|
|
248
|
+
return this.#values.keys();
|
|
249
|
+
}
|
|
250
|
+
values() {
|
|
251
|
+
return this.#values.values();
|
|
252
|
+
}
|
|
253
|
+
forEach(callbackfn, thisArg) {
|
|
254
|
+
this.#values.forEach((value, key) => {
|
|
255
|
+
callbackfn.call(thisArg, value, key, this);
|
|
256
|
+
});
|
|
257
|
+
}
|
|
258
|
+
[Symbol.iterator]() {
|
|
259
|
+
return this.entries();
|
|
260
|
+
}
|
|
261
|
+
get [Symbol.toStringTag]() {
|
|
262
|
+
return 'SecretSnapshot';
|
|
263
|
+
}
|
|
264
|
+
}
|
|
265
|
+
//# sourceMappingURL=resolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../../src/runtime/secrets/resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"url-security.d.ts","sourceRoot":"","sources":["../../../src/runtime/secrets/url-security.ts"],"names":[],"mappings":"AAGA,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAK/D"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isSensitiveCredentialKey = isSensitiveCredentialKey;
|
|
4
|
+
exports.urlContainsCredentialMaterial = urlContainsCredentialMaterial;
|
|
5
|
+
const CREDENTIAL_KEY = /(password|token|authorization|credential|private[-_]?key|secret[-_]?value)|^value$/i;
|
|
6
|
+
function isSensitiveCredentialKey(key) {
|
|
7
|
+
return CREDENTIAL_KEY.test(key);
|
|
8
|
+
}
|
|
9
|
+
function urlContainsCredentialMaterial(url) {
|
|
10
|
+
return (url.password.length > 0 ||
|
|
11
|
+
[...url.searchParams.keys()].some(isSensitiveCredentialKey));
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=url-security.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"url-security.js","sourceRoot":"","sources":["../../../src/runtime/secrets/url-security.ts"],"names":[],"mappings":";;AAGA,4DAEC;AAED,sEAKC;AAZD,MAAM,cAAc,GAClB,qFAAqF,CAAC;AAExF,SAAgB,wBAAwB,CAAC,GAAW;IAClD,OAAO,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClC,CAAC;AAED,SAAgB,6BAA6B,CAAC,GAAQ;IACpD,OAAO,CACL,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC;QACvB,CAAC,GAAG,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAC5D,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../../../src/runtime/sources/credentials.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,gBAAgB,QAA8C,CAAC;AAQ5E,wBAAgB,mBAAmB,CAAC,IAAI,GAAE,MAAyB,GAAG,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CA2BhG;AAMD,qBAAa,kBAAkB;IAI3B,OAAO,CAAC,QAAQ,CAAC,GAAG;IAHtB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8B;gBAGrC,GAAG,GAAE,MAAM,CAAC,UAAwB,EACrD,SAAS,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC;IAUzC,GAAG,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;IAa9C,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAejF,OAAO,CAAC,MAAM;
|
|
1
|
+
{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../../../src/runtime/sources/credentials.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,gBAAgB,QAA8C,CAAC;AAQ5E,wBAAgB,mBAAmB,CAAC,IAAI,GAAE,MAAyB,GAAG,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CA2BhG;AAMD,qBAAa,kBAAkB;IAI3B,OAAO,CAAC,QAAQ,CAAC,GAAG;IAHtB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8B;gBAGrC,GAAG,GAAE,MAAM,CAAC,UAAwB,EACrD,SAAS,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC;IAUzC,GAAG,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;IAa9C,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAejF,OAAO,CAAC,MAAM;CAWf"}
|
|
@@ -61,7 +61,8 @@ class CredentialResolver {
|
|
|
61
61
|
if (fromEnv !== undefined && fromEnv.length > 0) {
|
|
62
62
|
return fromEnv;
|
|
63
63
|
}
|
|
64
|
-
|
|
64
|
+
const fromFile = this.fileCreds.get(name);
|
|
65
|
+
return fromFile !== undefined && fromFile.length > 0 ? fromFile : undefined;
|
|
65
66
|
}
|
|
66
67
|
}
|
|
67
68
|
exports.CredentialResolver = CredentialResolver;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../../../src/runtime/sources/credentials.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../../../src/runtime/sources/credentials.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import { type LockIndex } from '../../roster';
|
|
2
2
|
import type { CredentialResolver } from '../credentials';
|
|
3
|
+
import type { LaunchResolveContext } from '../resolve-context';
|
|
3
4
|
import type { GitSource } from '../schema';
|
|
4
|
-
import type { SourceResolveContext } from '../types';
|
|
5
5
|
type LogFn = (line: string) => void;
|
|
6
|
-
export
|
|
7
|
-
|
|
6
|
+
export interface CheckoutOptions {
|
|
7
|
+
readonly offline?: boolean;
|
|
8
|
+
}
|
|
9
|
+
export declare function resolveGitSource(spec: GitSource, ctx: LaunchResolveContext): LockIndex | null;
|
|
10
|
+
export declare function checkoutGitSource(spec: GitSource, credentials: CredentialResolver, log?: LogFn, opts?: CheckoutOptions): string;
|
|
8
11
|
export {};
|
|
9
12
|
//# sourceMappingURL=git.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../../../src/runtime/sources/kinds/git.ts"],"names":[],"mappings":"AAKA,OAAO,EAA6B,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../../../src/runtime/sources/kinds/git.ts"],"names":[],"mappings":"AAKA,OAAO,EAA6B,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAG3C,KAAK,KAAK,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;AAmBpC,MAAM,WAAW,eAAe;IAE9B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAoBD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,oBAAoB,GAAG,SAAS,GAAG,IAAI,CAwD7F;AA4BD,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,SAAS,EACf,WAAW,EAAE,kBAAkB,EAC/B,GAAG,CAAC,EAAE,KAAK,EACX,IAAI,GAAE,eAAoB,GACzB,MAAM,CAKR"}
|
|
@@ -11,54 +11,131 @@ const manifest_walk_1 = require("../manifest-walk");
|
|
|
11
11
|
const GIT_CACHE_DIR = (0, node_path_1.join)((0, node_os_1.homedir)(), '.xema', 'cache', 'git');
|
|
12
12
|
const REF_MARKER = '.xema-source-ref';
|
|
13
13
|
const CLONE_TIMEOUT_MS = 120_000;
|
|
14
|
+
const FULL_SHA_REF = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/i;
|
|
14
15
|
function resolveGitSource(spec, ctx) {
|
|
15
16
|
if (ctx.usesImages) {
|
|
16
17
|
ctx.log?.(`source "${spec.name}" (git): inert on an image substrate ` +
|
|
17
18
|
`(a clone is source, not an image; use native substrate for git biomes).`);
|
|
18
19
|
return null;
|
|
19
20
|
}
|
|
20
|
-
const
|
|
21
|
-
const
|
|
22
|
-
const
|
|
23
|
-
|
|
21
|
+
const ref = spec.ref ?? 'HEAD';
|
|
22
|
+
const dir = gitCacheDir(spec);
|
|
23
|
+
const cached = hasCachedCheckout(dir);
|
|
24
|
+
const shadowed = ctx.workspaceProvidedBiomes;
|
|
25
|
+
if (!cached && ctx.offline) {
|
|
26
|
+
const line = `source "${spec.name}" (git): would clone ${spec.url}@${ref} ` +
|
|
27
|
+
`(offline preview — not fetched).`;
|
|
28
|
+
ctx.note?.(line);
|
|
29
|
+
ctx.log?.(line);
|
|
30
|
+
return null;
|
|
31
|
+
}
|
|
32
|
+
if (cached && isFullyShadowed(discoverServerBiomes(dir), shadowed)) {
|
|
33
|
+
ctx.log?.(`source "${spec.name}" (git): all biomes already provided by workspace — skipped (C1).`);
|
|
34
|
+
return null;
|
|
35
|
+
}
|
|
36
|
+
checkoutGitSource(spec, ctx.credentials, ctx.log, { offline: ctx.offline });
|
|
37
|
+
let serverBiomes = discoverServerBiomes(dir);
|
|
38
|
+
if (shadowed !== undefined && shadowed.size > 0) {
|
|
39
|
+
const before = serverBiomes.length;
|
|
40
|
+
serverBiomes = serverBiomes.filter((b) => !shadowed.has(b.id));
|
|
41
|
+
const dropped = before - serverBiomes.length;
|
|
42
|
+
if (dropped > 0) {
|
|
43
|
+
ctx.log?.(`source "${spec.name}" (git): ${String(dropped)} biome(s) already provided by workspace ` +
|
|
44
|
+
`— not overriding a local biome (C1).`);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
ctx.log?.(`source "${spec.name}" (git): ${String(serverBiomes.length)} biome(s) from ${spec.url}@${ref}`);
|
|
24
48
|
return (0, roster_1.indexFromDiscoveredBiomes)(serverBiomes, { sourceName: spec.name, sourceRoot: dir });
|
|
25
49
|
}
|
|
26
|
-
function
|
|
27
|
-
|
|
50
|
+
function discoverServerBiomes(dir) {
|
|
51
|
+
return (0, manifest_walk_1.walkBiomeManifests)(dir).biomes.filter((b) => b.target === 'server' && b.services.length > 0);
|
|
52
|
+
}
|
|
53
|
+
function isFullyShadowed(biomes, shadowed) {
|
|
54
|
+
if (shadowed === undefined || shadowed.size === 0) {
|
|
55
|
+
return false;
|
|
56
|
+
}
|
|
57
|
+
return biomes.length > 0 && biomes.every((b) => shadowed.has(b.id));
|
|
58
|
+
}
|
|
59
|
+
function checkoutGitSource(spec, credentials, log, opts = {}) {
|
|
28
60
|
const ref = spec.ref ?? 'HEAD';
|
|
29
|
-
const dir = (
|
|
30
|
-
ensureClone(spec, dir, ref,
|
|
61
|
+
const dir = gitCacheDir(spec);
|
|
62
|
+
ensureClone(spec, dir, ref, credentials, log, opts.offline ?? false);
|
|
31
63
|
return dir;
|
|
32
64
|
}
|
|
33
|
-
function
|
|
34
|
-
|
|
65
|
+
function gitCacheDir(spec) {
|
|
66
|
+
return (0, node_path_1.join)(GIT_CACHE_DIR, spec.name);
|
|
67
|
+
}
|
|
68
|
+
function hasCachedCheckout(dir) {
|
|
69
|
+
return (0, node_fs_1.existsSync)((0, node_path_1.join)(dir, REF_MARKER));
|
|
70
|
+
}
|
|
71
|
+
function ensureClone(spec, dir, ref, credentials, log, offline) {
|
|
72
|
+
const isSha = FULL_SHA_REF.test(ref);
|
|
73
|
+
if (hasCachedCheckout(dir)) {
|
|
35
74
|
const cached = (0, node_fs_1.readFileSync)((0, node_path_1.join)(dir, REF_MARKER), 'utf8').trim();
|
|
36
75
|
if (cached === ref) {
|
|
37
|
-
|
|
76
|
+
if (isSha) {
|
|
77
|
+
log?.(`source "${spec.name}" (git): reusing pinned commit ${ref}.`);
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
if (offline) {
|
|
81
|
+
log?.(`source "${spec.name}" (git): offline — reusing cached clone (${ref}); may be stale.`);
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
const token = credentials.resolve(spec.authTokenEnv, spec.name);
|
|
85
|
+
refreshFloatingRef(spec, dir, ref, token, log);
|
|
38
86
|
return;
|
|
39
87
|
}
|
|
40
88
|
}
|
|
89
|
+
if (offline) {
|
|
90
|
+
throw new Error(`source "${spec.name}" (git): offline and no cached clone for ${spec.url}@${ref}. ` +
|
|
91
|
+
`Run \`xema up\`/\`dev\` online once to populate ~/.xema/cache/git.`);
|
|
92
|
+
}
|
|
41
93
|
if ((0, node_fs_1.existsSync)(dir)) {
|
|
42
94
|
(0, node_fs_1.rmSync)(dir, { recursive: true, force: true });
|
|
43
95
|
}
|
|
44
96
|
(0, node_fs_1.mkdirSync)(GIT_CACHE_DIR, { recursive: true });
|
|
45
|
-
const
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
97
|
+
const token = credentials.resolve(spec.authTokenEnv, spec.name);
|
|
98
|
+
cloneAtRef(spec, dir, ref, isSha, token, log);
|
|
99
|
+
(0, node_fs_1.writeFileSync)((0, node_path_1.join)(dir, REF_MARKER), ref, 'utf8');
|
|
100
|
+
}
|
|
101
|
+
function cloneAtRef(spec, dir, ref, isSha, token, log) {
|
|
50
102
|
try {
|
|
51
|
-
(
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
103
|
+
if (isSha) {
|
|
104
|
+
runGit(['clone', '--depth', '1', '--', spec.url, dir], token);
|
|
105
|
+
runGit(['-C', dir, 'fetch', '--depth', '1', 'origin', '--', ref], token);
|
|
106
|
+
runGit(['-C', dir, 'checkout', '--detach', ref], token);
|
|
107
|
+
log?.(`source "${spec.name}" (git): checked out commit ${ref}.`);
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
const args = ['clone', '--depth', '1'];
|
|
111
|
+
if (spec.ref !== undefined) {
|
|
112
|
+
args.push('--branch', spec.ref);
|
|
113
|
+
}
|
|
114
|
+
args.push('--', spec.url, dir);
|
|
115
|
+
runGit(args, token);
|
|
56
116
|
}
|
|
57
117
|
catch (err) {
|
|
58
118
|
const message = err instanceof Error ? err.message : String(err);
|
|
59
119
|
throw new Error(`source "${spec.name}" (git): clone of ${spec.url}@${ref} failed: ${message}`);
|
|
60
120
|
}
|
|
61
|
-
|
|
121
|
+
}
|
|
122
|
+
function refreshFloatingRef(spec, dir, ref, token, log) {
|
|
123
|
+
try {
|
|
124
|
+
runGit(['-C', dir, 'fetch', '--depth', '1', 'origin', '--', ref], token);
|
|
125
|
+
runGit(['-C', dir, 'reset', '--hard', 'FETCH_HEAD'], token);
|
|
126
|
+
log?.(`source "${spec.name}" (git): refreshed floating ref ${ref} to remote.`);
|
|
127
|
+
}
|
|
128
|
+
catch (err) {
|
|
129
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
130
|
+
throw new Error(`source "${spec.name}" (git): refresh of ${spec.url}@${ref} failed: ${message}`);
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
function runGit(args, token) {
|
|
134
|
+
(0, node_child_process_1.execFileSync)('git', [...args], {
|
|
135
|
+
stdio: 'pipe',
|
|
136
|
+
timeout: CLONE_TIMEOUT_MS,
|
|
137
|
+
env: gitEnvWithAuth(token),
|
|
138
|
+
});
|
|
62
139
|
}
|
|
63
140
|
function gitEnvWithAuth(token) {
|
|
64
141
|
const base = { ...process.env, GIT_TERMINAL_PROMPT: '0' };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../../../src/runtime/sources/kinds/git.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../../../src/runtime/sources/kinds/git.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { SourceResolveContext } from './types';
|
|
2
|
+
export interface LaunchResolveContext extends SourceResolveContext {
|
|
3
|
+
readonly offline: boolean;
|
|
4
|
+
readonly note?: (line: string) => void;
|
|
5
|
+
readonly workspaceProvidedBiomes?: ReadonlySet<string>;
|
|
6
|
+
}
|
|
7
|
+
//# sourceMappingURL=resolve-context.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve-context.d.ts","sourceRoot":"","sources":["../../../src/runtime/sources/resolve-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AASpD,MAAM,WAAW,oBAAqB,SAAQ,oBAAoB;IAOhE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAM1B,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAOvC,QAAQ,CAAC,uBAAuB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CACxD"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve-context.js","sourceRoot":"","sources":["../../../src/runtime/sources/resolve-context.ts"],"names":[],"mappings":""}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { type LockIndex } from '../roster';
|
|
2
2
|
import { CredentialResolver } from './credentials';
|
|
3
3
|
import { SourceKind, type SourceSpec } from './schema';
|
|
4
|
-
import type {
|
|
5
|
-
export declare function composeSourceIndex(base: LockIndex, sources: readonly SourceSpec[], ctx:
|
|
4
|
+
import type { LaunchResolveContext } from './resolve-context';
|
|
5
|
+
export declare function composeSourceIndex(base: LockIndex, sources: readonly SourceSpec[], ctx: LaunchResolveContext): LockIndex;
|
|
6
6
|
export interface SourceStatus {
|
|
7
7
|
readonly name: string;
|
|
8
8
|
readonly kind: SourceKind;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../../src/runtime/sources/resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAInD,OAAO,EAAE,UAAU,EAAE,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAEvD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../../src/runtime/sources/resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAInD,OAAO,EAAE,UAAU,EAAE,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAEvD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAqB9D,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,SAAS,UAAU,EAAE,EAC9B,GAAG,EAAE,oBAAoB,GACxB,SAAS,CAoCX;AAsBD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAE1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAE3B,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;IAE/B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAC9B;AAGD,wBAAgB,eAAe,CAC7B,OAAO,EAAE,SAAS,UAAU,EAAE,EAC9B,WAAW,GAAE,kBAA6C,GACzD,YAAY,EAAE,CAahB"}
|
|
@@ -14,19 +14,25 @@ function composeSourceIndex(base, sources, ctx) {
|
|
|
14
14
|
for (const spec of sources) {
|
|
15
15
|
(spec.kind === schema_1.SourceKind.Workspace ? workspace : other).push(spec);
|
|
16
16
|
}
|
|
17
|
-
let
|
|
18
|
-
for (const spec of [...
|
|
17
|
+
let workspaceIndex = null;
|
|
18
|
+
for (const spec of [...workspace].reverse()) {
|
|
19
19
|
const contrib = resolveOne(spec, ctx);
|
|
20
20
|
if (contrib !== null) {
|
|
21
|
-
|
|
21
|
+
workspaceIndex = workspaceIndex === null ? contrib : (0, roster_1.mergeIndices)(workspaceIndex, contrib);
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
|
-
|
|
25
|
-
|
|
24
|
+
const workspaceProvidedBiomes = workspaceIndex !== null ? new Set(workspaceIndex.servicesByBiome.keys()) : ctx.workspaceProvidedBiomes;
|
|
25
|
+
const otherCtx = workspaceProvidedBiomes !== undefined ? { ...ctx, workspaceProvidedBiomes } : ctx;
|
|
26
|
+
let index = base;
|
|
27
|
+
for (const spec of [...other].reverse()) {
|
|
28
|
+
const contrib = resolveOne(spec, otherCtx);
|
|
26
29
|
if (contrib !== null) {
|
|
27
30
|
index = (0, roster_1.mergeIndices)(index, contrib);
|
|
28
31
|
}
|
|
29
32
|
}
|
|
33
|
+
if (workspaceIndex !== null) {
|
|
34
|
+
index = (0, roster_1.mergeIndices)(index, workspaceIndex);
|
|
35
|
+
}
|
|
30
36
|
return index;
|
|
31
37
|
}
|
|
32
38
|
function resolveOne(spec, ctx) {
|