typekro 0.30.1 → 0.31.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/dist/.tsbuildinfo +1 -1
- package/dist/core/containers/build.d.ts.map +1 -1
- package/dist/core/containers/build.js +82 -2
- package/dist/core/containers/build.js.map +1 -1
- package/dist/core/containers/errors.d.ts +8 -1
- package/dist/core/containers/errors.d.ts.map +1 -1
- package/dist/core/containers/errors.js +11 -3
- package/dist/core/containers/errors.js.map +1 -1
- package/dist/core/containers/image.d.ts.map +1 -1
- package/dist/core/containers/image.js +10 -0
- package/dist/core/containers/image.js.map +1 -1
- package/dist/core/containers/registries/types.d.ts +11 -0
- package/dist/core/containers/registries/types.d.ts.map +1 -1
- package/dist/core/deployment/schema-cel-evaluator.d.ts.map +1 -1
- package/dist/core/deployment/schema-cel-evaluator.js +46 -7
- package/dist/core/deployment/schema-cel-evaluator.js.map +1 -1
- package/dist/core/references/cel-evaluator.d.ts +8 -0
- package/dist/core/references/cel-evaluator.d.ts.map +1 -1
- package/dist/core/references/cel-evaluator.js +35 -48
- package/dist/core/references/cel-evaluator.js.map +1 -1
- package/dist/core/references/cel.d.ts.map +1 -1
- package/dist/core/references/cel.js +13 -1
- package/dist/core/references/cel.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/core/containers/build.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,qBAAqB,EACrB,oBAAoB,EAErB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/core/containers/build.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,qBAAqB,EACrB,oBAAoB,EAErB,MAAM,uBAAuB,CAAC;AAmM/B,6DAA6D;AAC7D,wBAAsB,cAAc,CAClC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,oBAAoB,CAAC,CAuL/B;AAED,oFAAoF;AACpF,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,MAAM,CAAC,CAmCjB"}
|
|
@@ -109,10 +109,57 @@ async function verifyPublishedDigest(taggedImageUri, metadataPath, session, buil
|
|
|
109
109
|
}
|
|
110
110
|
return digest;
|
|
111
111
|
}
|
|
112
|
+
async function inspectPublishedDigest(taggedImageUri, session, builder, timeout, signal) {
|
|
113
|
+
try {
|
|
114
|
+
const inspected = await execDocker([
|
|
115
|
+
'buildx',
|
|
116
|
+
'imagetools',
|
|
117
|
+
'inspect',
|
|
118
|
+
taggedImageUri,
|
|
119
|
+
...(builder ? ['--builder', builder] : []),
|
|
120
|
+
'--format',
|
|
121
|
+
'{{json .Manifest.Digest}}',
|
|
122
|
+
], {
|
|
123
|
+
quiet: true,
|
|
124
|
+
timeout,
|
|
125
|
+
...(session.environment ? { environment: session.environment } : {}),
|
|
126
|
+
...(signal ? { signal } : {}),
|
|
127
|
+
});
|
|
128
|
+
return digestFromInspectOutput(inspected.stdout);
|
|
129
|
+
}
|
|
130
|
+
catch (error) {
|
|
131
|
+
if (error instanceof ContainerBuildError && error.code === 'BUILD_CANCELLED')
|
|
132
|
+
throw error;
|
|
133
|
+
if (signal?.aborted)
|
|
134
|
+
throw ContainerBuildError.cancelled();
|
|
135
|
+
if (error instanceof ContainerBuildError && error.code === 'BUILD_TIMEOUT')
|
|
136
|
+
throw error;
|
|
137
|
+
if (error instanceof ContainerBuildError && error.code === 'DIGEST_VERIFICATION_FAILED') {
|
|
138
|
+
throw error;
|
|
139
|
+
}
|
|
140
|
+
if (manifestWasPositivelyNotFound(error, taggedImageUri)) {
|
|
141
|
+
logger.debug('Container tag is not available for adoption', { taggedImageUri });
|
|
142
|
+
return undefined;
|
|
143
|
+
}
|
|
144
|
+
const cause = error instanceof Error ? error : new Error(String(error));
|
|
145
|
+
throw ContainerBuildError.tagInspectionFailed(taggedImageUri, cause);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
function manifestWasPositivelyNotFound(error, taggedImageUri) {
|
|
149
|
+
if (!(error instanceof ContainerBuildError) || error.code !== 'DOCKER_COMMAND_FAILED') {
|
|
150
|
+
return false;
|
|
151
|
+
}
|
|
152
|
+
const stderr = error.command?.stderr;
|
|
153
|
+
if (typeof stderr !== 'string')
|
|
154
|
+
return false;
|
|
155
|
+
const target = taggedImageUri.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
156
|
+
const knownAbsence = new RegExp(`^ERROR:\\s+${target}:\\s+(?:not found|manifest unknown(?::.*)?|manifest_unknown(?::.*)?|no such manifest(?::.*)?)\\s*$`, 'i');
|
|
157
|
+
return stderr.split(/\r?\n/).some((line) => knownAbsence.test(line.trim()));
|
|
158
|
+
}
|
|
112
159
|
/** Build, publish, and registry-verify a container image. */
|
|
113
160
|
export async function buildContainer(options) {
|
|
114
161
|
const startedAt = Date.now();
|
|
115
|
-
const { context, dockerfile = 'Dockerfile', imageName, buildArgs, target, quiet = false, progress = 'auto', timeout = 300_000, signal, extraDockerArgs = [], } = options;
|
|
162
|
+
const { context, dockerfile = 'Dockerfile', imageName, buildArgs, target, existingTagPolicy = 'replace', quiet = false, progress = 'auto', timeout = 300_000, signal, extraDockerArgs = [], } = options;
|
|
116
163
|
const contextPath = resolve(context);
|
|
117
164
|
if (!existsSync(contextPath)) {
|
|
118
165
|
throw new ContainerBuildError(`Build context directory not found: ${contextPath}`, 'INVALID_CONTEXT');
|
|
@@ -126,6 +173,16 @@ export async function buildContainer(options) {
|
|
|
126
173
|
}
|
|
127
174
|
if (buildArgs)
|
|
128
175
|
validateBuildArgs(buildArgs);
|
|
176
|
+
if (existingTagPolicy !== 'replace' && existingTagPolicy !== 'adopt') {
|
|
177
|
+
throw new ContainerBuildError(`Invalid existing tag policy: "${String(existingTagPolicy)}".`, 'INVALID_TAG_POLICY', ['Use "replace" for mutable tags or "adopt" for immutable content-derived tags.']);
|
|
178
|
+
}
|
|
179
|
+
if (existingTagPolicy === 'adopt' &&
|
|
180
|
+
(options.tag === undefined || options.tag === 'content-hash')) {
|
|
181
|
+
throw new ContainerBuildError('Adopting an existing tag requires an explicit tag derived from the complete build input.', 'UNSAFE_ADOPTION_TAG', [
|
|
182
|
+
'Include the context, Dockerfile, build arguments, target, platforms, extra Docker arguments, and relevant filesystem metadata in the tag identity.',
|
|
183
|
+
'Use existingTagPolicy: "replace" with TypeKro\'s built-in content-hash tag.',
|
|
184
|
+
]);
|
|
185
|
+
}
|
|
129
186
|
const platforms = resolvePlatforms(options);
|
|
130
187
|
let tag = options.tag ?? 'latest';
|
|
131
188
|
if (tag === 'content-hash')
|
|
@@ -133,7 +190,7 @@ export async function buildContainer(options) {
|
|
|
133
190
|
await checkDockerAvailable(signal);
|
|
134
191
|
const registry = resolveRegistry(options.registry);
|
|
135
192
|
const taggedImageUri = await registry.resolveImageUri(imageName, tag);
|
|
136
|
-
logger.info('
|
|
193
|
+
logger.info('Resolving container artifact', {
|
|
137
194
|
taggedImageUri,
|
|
138
195
|
platforms: platforms.length ? platforms : ['native'],
|
|
139
196
|
});
|
|
@@ -164,6 +221,29 @@ export async function buildContainer(options) {
|
|
|
164
221
|
if (session.buildkitConfigPath || platforms.length > 1) {
|
|
165
222
|
builder = await createBuildxBuilder(session, timeout, signal);
|
|
166
223
|
}
|
|
224
|
+
if (existingTagPolicy === 'adopt') {
|
|
225
|
+
const digest = await inspectPublishedDigest(taggedImageUri, session, builder, timeout, signal);
|
|
226
|
+
if (digest) {
|
|
227
|
+
const repository = repositoryFromTaggedUri(taggedImageUri);
|
|
228
|
+
const imageUri = `${repository}@${digest}`;
|
|
229
|
+
const duration = Date.now() - startedAt;
|
|
230
|
+
logger.info('Existing container tag adopted', {
|
|
231
|
+
imageUri,
|
|
232
|
+
taggedImageUri,
|
|
233
|
+
duration,
|
|
234
|
+
});
|
|
235
|
+
return {
|
|
236
|
+
imageUri,
|
|
237
|
+
taggedImageUri,
|
|
238
|
+
repository,
|
|
239
|
+
tag,
|
|
240
|
+
digest,
|
|
241
|
+
duration,
|
|
242
|
+
pushed: true,
|
|
243
|
+
platforms,
|
|
244
|
+
};
|
|
245
|
+
}
|
|
246
|
+
}
|
|
167
247
|
await execDocker([
|
|
168
248
|
'buildx',
|
|
169
249
|
'build',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/core/containers/build.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/core/containers/build.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,15 +2,22 @@
|
|
|
2
2
|
* Container Build Errors
|
|
3
3
|
*/
|
|
4
4
|
import { TypeKroError } from '../errors.js';
|
|
5
|
+
export interface DockerCommandFailure {
|
|
6
|
+
readonly exitCode: number;
|
|
7
|
+
readonly args: readonly string[];
|
|
8
|
+
readonly stderr: string;
|
|
9
|
+
}
|
|
5
10
|
export declare class ContainerBuildError extends TypeKroError {
|
|
6
11
|
readonly suggestions: string[];
|
|
7
|
-
|
|
12
|
+
readonly command?: DockerCommandFailure | undefined;
|
|
13
|
+
constructor(message: string, code: string, suggestions?: string[], cause?: Error, command?: DockerCommandFailure | undefined);
|
|
8
14
|
static dockerNotAvailable(detail?: string): ContainerBuildError;
|
|
9
15
|
static buildFailed(exitCode: number, stderr: string): ContainerBuildError;
|
|
10
16
|
static commandFailed(exitCode: number, args: readonly string[], stderr: string): ContainerBuildError;
|
|
11
17
|
static timeout(timeout: number, operation: string): ContainerBuildError;
|
|
12
18
|
static cancelled(): ContainerBuildError;
|
|
13
19
|
static digestVerificationFailed(detail: string): ContainerBuildError;
|
|
20
|
+
static tagInspectionFailed(imageUri: string, cause: Error): ContainerBuildError;
|
|
14
21
|
static pushFailed(imageUri: string, cause: Error): ContainerBuildError;
|
|
15
22
|
static ecrAuthFailed(cause: Error): ContainerBuildError;
|
|
16
23
|
static registryNotSupported(type: string): ContainerBuildError;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/core/containers/errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,qBAAa,mBAAoB,SAAQ,YAAY;aAIjC,WAAW,EAAE,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/core/containers/errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,mBAAoB,SAAQ,YAAY;aAIjC,WAAW,EAAE,MAAM,EAAE;aAErB,OAAO,CAAC,EAAE,oBAAoB;gBAJ9C,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACI,WAAW,GAAE,MAAM,EAAO,EAC1C,KAAK,CAAC,EAAE,KAAK,EACG,OAAO,CAAC,EAAE,oBAAoB,YAAA;IAMhD,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,mBAAmB;IAY/D,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,mBAAmB;IAYzE,MAAM,CAAC,aAAa,CAClB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,MAAM,EAAE,MAAM,GACb,mBAAmB;IAWtB,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,mBAAmB;IAQvE,MAAM,CAAC,SAAS,IAAI,mBAAmB;IAIvC,MAAM,CAAC,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,mBAAmB;IAQpE,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,mBAAmB;IAY/E,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,mBAAmB;IAatE,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,mBAAmB;IAcvD,MAAM,CAAC,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB;CAU/D"}
|
|
@@ -4,9 +4,11 @@
|
|
|
4
4
|
import { TypeKroError } from '../errors.js';
|
|
5
5
|
export class ContainerBuildError extends TypeKroError {
|
|
6
6
|
suggestions;
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
command;
|
|
8
|
+
constructor(message, code, suggestions = [], cause, command) {
|
|
9
|
+
super(message, code, { suggestions, ...(command ? { command } : {}) }, cause ? { cause } : undefined);
|
|
9
10
|
this.suggestions = suggestions;
|
|
11
|
+
this.command = command;
|
|
10
12
|
this.name = 'ContainerBuildError';
|
|
11
13
|
}
|
|
12
14
|
static dockerNotAvailable(detail) {
|
|
@@ -25,7 +27,7 @@ export class ContainerBuildError extends TypeKroError {
|
|
|
25
27
|
}
|
|
26
28
|
static commandFailed(exitCode, args, stderr) {
|
|
27
29
|
const operation = args.slice(0, 2).join(' ');
|
|
28
|
-
return new ContainerBuildError(`Docker ${operation} failed with exit code ${exitCode}:\n${stderr.slice(0, 2_000)}`, 'DOCKER_COMMAND_FAILED', ['Review the redacted Docker diagnostics and registry/build configuration.']);
|
|
30
|
+
return new ContainerBuildError(`Docker ${operation} failed with exit code ${exitCode}:\n${stderr.slice(0, 2_000)}`, 'DOCKER_COMMAND_FAILED', ['Review the redacted Docker diagnostics and registry/build configuration.'], undefined, { exitCode, args: [...args], stderr });
|
|
29
31
|
}
|
|
30
32
|
static timeout(timeout, operation) {
|
|
31
33
|
return new ContainerBuildError(`Container operation timed out after ${timeout}ms: ${operation}`, 'BUILD_TIMEOUT', ['Increase the timeout or inspect registry and builder connectivity.']);
|
|
@@ -36,6 +38,12 @@ export class ContainerBuildError extends TypeKroError {
|
|
|
36
38
|
static digestVerificationFailed(detail) {
|
|
37
39
|
return new ContainerBuildError(`Registry manifest digest verification failed: ${detail}`, 'DIGEST_VERIFICATION_FAILED', ['Verify registry availability, credentials, and that the pushed tag was not mutated.']);
|
|
38
40
|
}
|
|
41
|
+
static tagInspectionFailed(imageUri, cause) {
|
|
42
|
+
return new ContainerBuildError(`Failed to inspect existing container tag ${imageUri}: ${cause.message}`, 'TAG_INSPECTION_FAILED', [
|
|
43
|
+
'Verify registry availability, credentials, and TLS configuration.',
|
|
44
|
+
'Retry only after the registry can positively distinguish a missing manifest from an inspection failure.',
|
|
45
|
+
], cause);
|
|
46
|
+
}
|
|
39
47
|
static pushFailed(imageUri, cause) {
|
|
40
48
|
return new ContainerBuildError(`Failed to push ${imageUri}: ${cause.message}`, 'PUSH_FAILED', [
|
|
41
49
|
'Verify registry credentials are valid.',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/core/containers/errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/core/containers/errors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../../src/core/containers/image.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;
|
|
1
|
+
{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../../src/core/containers/image.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAQH,OAAO,KAAK,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAEzF,8FAA8F;AAC9F,MAAM,WAAW,cAAc;IAC7B,uEAAuE;IACvE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,8EAA8E;IAC9E,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,sEAAsE;IACtE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;CACvC;AAED,6GAA6G;AAC7G,MAAM,WAAW,gBAAiB,SAAQ,qBAAqB;IAC7D,iGAAiG;IACjG,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAQ9E;AAOD,uGAAuG;AACvG,KAAK,OAAO,GAAG,CAAC,OAAO,EAAE,qBAAqB,KAAK,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAgHjF;;;;GAIG;AACH,wBAAgB,SAAS,CACvB,OAAO,EAAE,gBAAgB,EACzB,KAAK,GAAE,OAAwB,GAC9B,OAAO,CAAC,cAAc,CAAC,CAazB;AAED,sGAAsG;AACtG,wBAAgB,mBAAmB,IAAI,IAAI,CAE1C"}
|
|
@@ -30,6 +30,7 @@ import { createHash } from 'node:crypto';
|
|
|
30
30
|
import { existsSync } from 'node:fs';
|
|
31
31
|
import { join, resolve } from 'node:path';
|
|
32
32
|
import { buildContainer, computeContentHash } from './build.js';
|
|
33
|
+
import { ContainerBuildError } from './errors.js';
|
|
33
34
|
/**
|
|
34
35
|
* Split a full image URI into `{ repository, tag }`. Handles digest form (`repo@sha256:…`) and tag
|
|
35
36
|
* form (`repo:tag`), registry-port-colon aware (a colon in `host:port/...` is not the tag separator).
|
|
@@ -103,6 +104,14 @@ function registryIdentity(registry) {
|
|
|
103
104
|
async function resolvedBuildOptions(options, build) {
|
|
104
105
|
const context = resolve(options.context);
|
|
105
106
|
const dockerfile = options.dockerfile ?? 'Dockerfile';
|
|
107
|
+
if (build === buildContainer &&
|
|
108
|
+
options.existingTagPolicy === 'adopt' &&
|
|
109
|
+
(options.tag === undefined || options.tag === 'content-hash')) {
|
|
110
|
+
throw new ContainerBuildError('Adopting an existing tag requires an explicit tag derived from the complete build input.', 'UNSAFE_ADOPTION_TAG', [
|
|
111
|
+
'Include the context, Dockerfile, build arguments, target, platforms, extra Docker arguments, and relevant filesystem metadata in the tag identity.',
|
|
112
|
+
'Use existingTagPolicy: "replace" with TypeKro\'s built-in content-hash tag.',
|
|
113
|
+
]);
|
|
114
|
+
}
|
|
106
115
|
let tag = options.tag ?? 'content-hash';
|
|
107
116
|
if (tag === 'content-hash' &&
|
|
108
117
|
build === buildContainer &&
|
|
@@ -119,6 +128,7 @@ function buildCacheKey(options, build) {
|
|
|
119
128
|
dockerfile: options.dockerfile,
|
|
120
129
|
imageName: options.imageName,
|
|
121
130
|
tag: options.tag,
|
|
131
|
+
existingTagPolicy: options.existingTagPolicy,
|
|
122
132
|
platform: options.platform,
|
|
123
133
|
platforms: options.platforms ? [...options.platforms] : undefined,
|
|
124
134
|
buildArgs: sortedRecord(options.buildArgs),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image.js","sourceRoot":"","sources":["../../../src/core/containers/image.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"image.js","sourceRoot":"","sources":["../../../src/core/containers/image.ts"],"names":[],"mappings":"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"}
|
|
@@ -72,6 +72,17 @@ export interface ContainerBuildOptions {
|
|
|
72
72
|
dockerfile?: string;
|
|
73
73
|
imageName: string;
|
|
74
74
|
tag?: string;
|
|
75
|
+
/**
|
|
76
|
+
* How to handle a remote tag that already resolves in the registry.
|
|
77
|
+
*
|
|
78
|
+
* `adopt` skips the build and returns the registry-verified immutable
|
|
79
|
+
* digest. It requires an explicit tag derived from the complete build input
|
|
80
|
+
* and a registry that enforces immutability. TypeKro's built-in
|
|
81
|
+
* `content-hash` is intentionally rejected because it does not cover build
|
|
82
|
+
* arguments, targets, platforms, extra Docker arguments, or all filesystem
|
|
83
|
+
* metadata. The default `replace` preserves ordinary mutable-tag behavior.
|
|
84
|
+
*/
|
|
85
|
+
existingTagPolicy?: 'replace' | 'adopt';
|
|
75
86
|
/** Build one target platform. Mutually exclusive with `platforms`. */
|
|
76
87
|
platform?: string;
|
|
77
88
|
/** Build and publish a multi-platform manifest with Buildx. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/core/containers/registries/types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/core/containers/registries/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-cel-evaluator.d.ts","sourceRoot":"","sources":["../../../src/core/deployment/schema-cel-evaluator.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"schema-cel-evaluator.d.ts","sourceRoot":"","sources":["../../../src/core/deployment/schema-cel-evaluator.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAwJnE,uFAAuF;AACvF,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAMT"}
|
|
@@ -10,21 +10,60 @@ function hasSchemaValue(fieldPath, spec) {
|
|
|
10
10
|
}
|
|
11
11
|
return current !== undefined;
|
|
12
12
|
}
|
|
13
|
+
/**
|
|
14
|
+
* Apply evaluator-only rewrites to CEL source while preserving quoted data
|
|
15
|
+
* byte-for-byte. Structured defaults are embedded as CEL object literals, so
|
|
16
|
+
* function-looking text inside their string values must never be rewritten.
|
|
17
|
+
*/
|
|
18
|
+
function rewriteOutsideQuotedStrings(expression, rewrite) {
|
|
19
|
+
let result = '';
|
|
20
|
+
let unquotedStart = 0;
|
|
21
|
+
for (let index = 0; index < expression.length; index++) {
|
|
22
|
+
const quote = expression[index];
|
|
23
|
+
if (quote !== '"' && quote !== "'")
|
|
24
|
+
continue;
|
|
25
|
+
result += rewrite(expression.slice(unquotedStart, index));
|
|
26
|
+
let end = index + 1;
|
|
27
|
+
let escaped = false;
|
|
28
|
+
for (; end < expression.length; end++) {
|
|
29
|
+
const character = expression[end];
|
|
30
|
+
if (escaped) {
|
|
31
|
+
escaped = false;
|
|
32
|
+
}
|
|
33
|
+
else if (character === '\\') {
|
|
34
|
+
escaped = true;
|
|
35
|
+
}
|
|
36
|
+
else if (character === quote) {
|
|
37
|
+
end++;
|
|
38
|
+
break;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
result += expression.slice(index, end);
|
|
42
|
+
unquotedStart = end;
|
|
43
|
+
index = end - 1;
|
|
44
|
+
}
|
|
45
|
+
return result + rewrite(expression.slice(unquotedStart));
|
|
46
|
+
}
|
|
13
47
|
function prepareSchemaExpression(expression) {
|
|
14
|
-
let prepared = expression;
|
|
15
48
|
const schemaPath = '[a-zA-Z_$][\\w$]*(?:\\.[a-zA-Z_$][\\w$]*)*';
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
49
|
+
return rewriteOutsideQuotedStrings(expression, (unquotedSource) => {
|
|
50
|
+
let prepared = unquotedSource;
|
|
51
|
+
prepared = prepared.replace(new RegExp(`\\bhas\\((?:schema\\.)?spec\\.(${schemaPath})\\)`, 'g'), '__has("$1")');
|
|
52
|
+
prepared = prepared.replace(new RegExp(`\\b(?:schema\\.)?spec\\.(${schemaPath})\\.orValue\\(`, 'g'), '__orValue($1, ');
|
|
53
|
+
prepared = prepared.replace(/\bstring\(/g, '__string(');
|
|
54
|
+
prepared = prepared.replace(/\bdyn\(/g, '__dyn(');
|
|
55
|
+
prepared = prepared.replace(/schema\.spec\.(\w+)/g, '$1');
|
|
56
|
+
prepared = prepared.replace(/\bspec\.(\w+)/g, '$1');
|
|
57
|
+
return prepared;
|
|
58
|
+
});
|
|
22
59
|
}
|
|
23
60
|
function createEvaluationScope(spec) {
|
|
24
61
|
return Object.freeze(Object.assign(Object.create(null), spec, {
|
|
25
62
|
__has: (path) => hasSchemaValue(path, spec),
|
|
26
63
|
__orValue: (value, defaultValue) => value ?? defaultValue,
|
|
27
64
|
__string: (value) => String(value ?? ''),
|
|
65
|
+
// KRO uses dyn() only for static type widening; it is runtime identity.
|
|
66
|
+
__dyn: (value) => value,
|
|
28
67
|
omit: () => undefined,
|
|
29
68
|
}));
|
|
30
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-cel-evaluator.js","sourceRoot":"","sources":["../../../src/core/deployment/schema-cel-evaluator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAKnE,SAAS,cAAc,CAAC,SAAiB,EAAE,IAAuB;IAChE,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1D,IAAI,OAAO,GAAY,IAAI,CAAC;IAE5B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC;YACrF,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,GAAI,OAAmC,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC;IAED,OAAO,OAAO,KAAK,SAAS,CAAC;AAC/B,CAAC;AAED,SAAS,
|
|
1
|
+
{"version":3,"file":"schema-cel-evaluator.js","sourceRoot":"","sources":["../../../src/core/deployment/schema-cel-evaluator.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,14 @@
|
|
|
22
22
|
import type { CelEvaluationContext } from '../types/references.js';
|
|
23
23
|
import type { CelExpression, KubernetesRef } from '../types.js';
|
|
24
24
|
export declare class CelEvaluator {
|
|
25
|
+
/**
|
|
26
|
+
* Runtime implementations for CEL functions TypeKro emits itself.
|
|
27
|
+
*
|
|
28
|
+
* `dyn()` is a CEL type conversion used to widen expressions during KRO
|
|
29
|
+
* admission. It does not change the runtime value, so direct-mode evaluation
|
|
30
|
+
* must treat it as an identity function.
|
|
31
|
+
*/
|
|
32
|
+
private evaluationFunctions;
|
|
25
33
|
/**
|
|
26
34
|
* Evaluate a CEL expression with the given context
|
|
27
35
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cel-evaluator.d.ts","sourceRoot":"","sources":["../../../src/core/references/cel-evaluator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAOH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAEnE,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEhE,qBAAa,YAAY;IACvB;;OAEG;IACG,QAAQ,CAAC,UAAU,EAAE,aAAa,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"cel-evaluator.d.ts","sourceRoot":"","sources":["../../../src/core/references/cel-evaluator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAOH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAEnE,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEhE,qBAAa,YAAY;IACvB;;;;;;OAMG;IACH,OAAO,CAAC,mBAAmB;IA0B3B;;OAEG;IACG,QAAQ,CAAC,UAAU,EAAE,aAAa,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;IAgB1F;;OAEG;IACH,KAAK,CAAC,UAAU,EAAE,aAAa,GAAG,CAAC,OAAO,EAAE,oBAAoB,KAAK,OAAO,CAAC,OAAO,CAAC;IAoBrF;;OAEG;IACH,QAAQ,CAAC,UAAU,EAAE,aAAa,GAAG;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE;IAmBvE;;OAEG;YACW,eAAe;IA6C7B;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAwBjC;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IA4B1B;;OAEG;IACH,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,aAAa,EAAE,GAAG,aAAa;IAgBlF,4DAA4D;IAC5D,OAAO,CAAC,MAAM,CAAC,eAAe,CAAmB;IAEjD;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAYlC;;OAEG;IACH,MAAM,CAAC,WAAW;QAChB;;WAEG;2BACgB,KAAK,CAAC,MAAM,GAAG,aAAa,CAAC,KAAG,aAAa;QAgBhE;;WAEG;iCAEU,MAAM,GAAG,aAAa,aACtB,OAAO,cACN,OAAO,KAClB,aAAa;QAgBhB;;WAEG;mBACQ,aAAa,KAAG,aAAa;QAKxC;;WAEG;oBACS,aAAa,KAAG,aAAa;QAKzC;;WAEG;wBACa,aAAa,aAAa,MAAM,KAAG,aAAa;QAKhE;;WAEG;0BACe,aAAa,UAAU,MAAM,KAAG,aAAa;QAK/D;;WAEG;wBACa,aAAa,UAAU,MAAM,KAAG,aAAa;QAK7D;;WAEG;mBACQ,aAAa,aAAa,MAAM,KAAG,aAAa;QAQ3D;;WAEG;sBACW,aAAa,aAAa,MAAM,KAAG,aAAa;QAQ9D;;WAEG;sBACW,aAAa,aAAa,MAAM,KAAG,aAAa;QAQ9D;;WAEG;mBACQ,aAAa,aAAa,MAAM,KAAG,aAAa;MAO3D;CACH"}
|
|
@@ -26,6 +26,39 @@ import { CEL_EXPRESSION_BRAND } from '../constants/brands.js';
|
|
|
26
26
|
import { ensureError, TypeKroError } from '../errors.js';
|
|
27
27
|
import { CelEvaluationError } from '../types/references.js';
|
|
28
28
|
export class CelEvaluator {
|
|
29
|
+
/**
|
|
30
|
+
* Runtime implementations for CEL functions TypeKro emits itself.
|
|
31
|
+
*
|
|
32
|
+
* `dyn()` is a CEL type conversion used to widen expressions during KRO
|
|
33
|
+
* admission. It does not change the runtime value, so direct-mode evaluation
|
|
34
|
+
* must treat it as an identity function.
|
|
35
|
+
*/
|
|
36
|
+
evaluationFunctions(context) {
|
|
37
|
+
return {
|
|
38
|
+
string: (value) => String(value),
|
|
39
|
+
int: (value) => parseInt(String(value), 10),
|
|
40
|
+
double: (value) => parseFloat(String(value)),
|
|
41
|
+
dyn: (value) => value,
|
|
42
|
+
size: (collection) => {
|
|
43
|
+
if (Array.isArray(collection))
|
|
44
|
+
return collection.length;
|
|
45
|
+
if (typeof collection === 'string')
|
|
46
|
+
return collection.length;
|
|
47
|
+
if (collection && typeof collection === 'object')
|
|
48
|
+
return Object.keys(collection).length;
|
|
49
|
+
return 0;
|
|
50
|
+
},
|
|
51
|
+
has: (obj, field) => {
|
|
52
|
+
if (typeof field === 'string') {
|
|
53
|
+
return obj !== null && typeof obj === 'object' && field in obj;
|
|
54
|
+
}
|
|
55
|
+
// For expressions like has(config.debug), the field access is already resolved
|
|
56
|
+
return obj !== undefined && obj !== null;
|
|
57
|
+
},
|
|
58
|
+
concat: (...args) => args.join(''),
|
|
59
|
+
...context.functions,
|
|
60
|
+
};
|
|
61
|
+
}
|
|
29
62
|
/**
|
|
30
63
|
* Evaluate a CEL expression with the given context
|
|
31
64
|
*/
|
|
@@ -34,30 +67,7 @@ export class CelEvaluator {
|
|
|
34
67
|
// Build the evaluation context for cel-js
|
|
35
68
|
const celContext = await this.buildCelContext(expression, context);
|
|
36
69
|
// Use cel-js to evaluate the expression with standard functions
|
|
37
|
-
const functions =
|
|
38
|
-
// Standard CEL functions
|
|
39
|
-
string: (value) => String(value),
|
|
40
|
-
int: (value) => parseInt(String(value), 10),
|
|
41
|
-
double: (value) => parseFloat(String(value)),
|
|
42
|
-
size: (collection) => {
|
|
43
|
-
if (Array.isArray(collection))
|
|
44
|
-
return collection.length;
|
|
45
|
-
if (typeof collection === 'string')
|
|
46
|
-
return collection.length;
|
|
47
|
-
if (collection && typeof collection === 'object')
|
|
48
|
-
return Object.keys(collection).length;
|
|
49
|
-
return 0;
|
|
50
|
-
},
|
|
51
|
-
has: (obj, field) => {
|
|
52
|
-
if (field) {
|
|
53
|
-
return obj && typeof obj === 'object' && field in obj;
|
|
54
|
-
}
|
|
55
|
-
// For expressions like has(config.debug), the field access is already resolved
|
|
56
|
-
return obj !== undefined && obj !== null;
|
|
57
|
-
},
|
|
58
|
-
concat: (...args) => args.join(''),
|
|
59
|
-
...context.functions,
|
|
60
|
-
};
|
|
70
|
+
const functions = this.evaluationFunctions(context);
|
|
61
71
|
const result = evaluate(expression.expression, celContext, functions);
|
|
62
72
|
return result;
|
|
63
73
|
}
|
|
@@ -78,30 +88,7 @@ export class CelEvaluator {
|
|
|
78
88
|
}
|
|
79
89
|
return async (context) => {
|
|
80
90
|
const celContext = await this.buildCelContext(expression, context);
|
|
81
|
-
const functions =
|
|
82
|
-
// Standard CEL functions
|
|
83
|
-
string: (value) => String(value),
|
|
84
|
-
int: (value) => parseInt(String(value), 10),
|
|
85
|
-
double: (value) => parseFloat(String(value)),
|
|
86
|
-
size: (collection) => {
|
|
87
|
-
if (Array.isArray(collection))
|
|
88
|
-
return collection.length;
|
|
89
|
-
if (typeof collection === 'string')
|
|
90
|
-
return collection.length;
|
|
91
|
-
if (collection && typeof collection === 'object')
|
|
92
|
-
return Object.keys(collection).length;
|
|
93
|
-
return 0;
|
|
94
|
-
},
|
|
95
|
-
has: (obj, field) => {
|
|
96
|
-
if (field) {
|
|
97
|
-
return obj && typeof obj === 'object' && field in obj;
|
|
98
|
-
}
|
|
99
|
-
// For expressions like has(config.debug), the field access is already resolved
|
|
100
|
-
return obj !== undefined && obj !== null;
|
|
101
|
-
},
|
|
102
|
-
concat: (...args) => args.join(''),
|
|
103
|
-
...context.functions,
|
|
104
|
-
};
|
|
91
|
+
const functions = this.evaluationFunctions(context);
|
|
105
92
|
return evaluate(parseResult.cst, celContext, functions);
|
|
106
93
|
};
|
|
107
94
|
}
|