@serve.zone/interfaces 16.0.1 → 16.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/changelog.md +7 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/deploymentadoption.d.ts +19 -1
- package/dist_ts/data/deploymentadoption.js +35 -1
- package/dist_ts/requests/deployment.d.ts +12 -0
- package/package.json +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/deploymentadoption.ts +56 -0
- package/ts/requests/deployment.ts +20 -0
package/changelog.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-07-20 - 16.1.0
|
|
4
|
+
|
|
5
|
+
### Security
|
|
6
|
+
|
|
7
|
+
- require acknowledged Coreflow retention before completing adoption (deployment)
|
|
8
|
+
- Add a two-phase, session-bound retention-attestation contract with exact operation, configuration, runtime, and reporter evidence.
|
|
9
|
+
|
|
3
10
|
## 2026-07-20 - 16.0.1
|
|
4
11
|
|
|
5
12
|
### Security
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/interfaces',
|
|
6
|
-
version: '16.0
|
|
6
|
+
version: '16.1.0',
|
|
7
7
|
description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHVGQUF1RjtDQUNyRyxDQUFBIn0=
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { IDeploymentPreflightRuntimeTask, IOciPlatformDescriptorSummary } from './deploymentpreflight.js';
|
|
2
|
-
import type {
|
|
2
|
+
import type { IDeployment } from './deployment.js';
|
|
3
|
+
import type { IImmutableImageDeploymentPlan, IImmutableRolloutReportEnvelope, IImmutableImageTargetScope, TOciManifestMediaType, TSha256Digest } from './immutableimage.js';
|
|
3
4
|
import type { IRegistryTarget } from './registry.js';
|
|
4
5
|
export type TServiceDeploymentAdoptionDecision = 'GO' | 'NO-GO';
|
|
5
6
|
/**
|
|
@@ -91,6 +92,23 @@ export interface IServiceDeploymentAdoptionResult {
|
|
|
91
92
|
idempotentReplay: boolean;
|
|
92
93
|
plan: IImmutableImageDeploymentPlan;
|
|
93
94
|
}
|
|
95
|
+
export type TServiceDeploymentAdoptionRetentionPhase = 'prepare' | 'commit';
|
|
96
|
+
/**
|
|
97
|
+
* A session-bound Coreflow assertion that its local live runtime can be
|
|
98
|
+
* retained for the exact adoption plan without mutating the Docker service.
|
|
99
|
+
*/
|
|
100
|
+
export interface IServiceDeploymentAdoptionRetentionAttestation {
|
|
101
|
+
schemaVersion: 1;
|
|
102
|
+
phase: TServiceDeploymentAdoptionRetentionPhase;
|
|
103
|
+
retainedWithoutMutation: true;
|
|
104
|
+
serviceId: string;
|
|
105
|
+
operationId: string;
|
|
106
|
+
adoptionConfigurationDigest: TSha256Digest;
|
|
107
|
+
immutableReport: IImmutableRolloutReportEnvelope;
|
|
108
|
+
deployments: IDeployment[];
|
|
109
|
+
attestedAt: number;
|
|
110
|
+
}
|
|
111
|
+
export declare const validateServiceDeploymentAdoptionRetentionAttestation: (attestationArg: unknown) => string[];
|
|
94
112
|
export declare const validateServiceDeploymentAdoptionPreflightInput: (inputArg: unknown) => string[];
|
|
95
113
|
export declare const validateServiceDeploymentAdoptionInput: (inputArg: unknown) => string[];
|
|
96
114
|
export declare const validateServiceDeploymentAdoptionReport: (reportArg: unknown) => string[];
|
|
@@ -1,4 +1,38 @@
|
|
|
1
1
|
import { normalizeImmutableReleaseTag, normalizeSha256Digest } from './immutableimage.js';
|
|
2
|
+
export const validateServiceDeploymentAdoptionRetentionAttestation = (attestationArg) => {
|
|
3
|
+
if (!isRecord(attestationArg))
|
|
4
|
+
return ['retention attestation must be an object'];
|
|
5
|
+
const errors = [];
|
|
6
|
+
if (attestationArg.schemaVersion !== 1)
|
|
7
|
+
errors.push('retention attestation schemaVersion must be 1');
|
|
8
|
+
if (attestationArg.phase !== 'prepare' && attestationArg.phase !== 'commit') {
|
|
9
|
+
errors.push('retention attestation phase is invalid');
|
|
10
|
+
}
|
|
11
|
+
if (attestationArg.retainedWithoutMutation !== true) {
|
|
12
|
+
errors.push('retention attestation must assert mutation-free retention');
|
|
13
|
+
}
|
|
14
|
+
if (!isBoundedIdentifier(attestationArg.serviceId)
|
|
15
|
+
|| !isBoundedIdentifier(attestationArg.operationId)) {
|
|
16
|
+
errors.push('retention attestation service and operation IDs must be bounded identifiers');
|
|
17
|
+
}
|
|
18
|
+
if (!isCanonicalDigest(attestationArg.adoptionConfigurationDigest)) {
|
|
19
|
+
errors.push('retention attestation configuration digest must be canonical');
|
|
20
|
+
}
|
|
21
|
+
if (!Number.isSafeInteger(attestationArg.attestedAt) || attestationArg.attestedAt < 1) {
|
|
22
|
+
errors.push('retention attestation timestamp must be a positive integer');
|
|
23
|
+
}
|
|
24
|
+
if (!isRecord(attestationArg.immutableReport)) {
|
|
25
|
+
errors.push('retention attestation requires an immutable report envelope');
|
|
26
|
+
}
|
|
27
|
+
if (!Array.isArray(attestationArg.deployments) || attestationArg.deployments.length < 1) {
|
|
28
|
+
errors.push('retention attestation requires at least one deployment');
|
|
29
|
+
}
|
|
30
|
+
else if (attestationArg.deployments.some((deploymentArg) => (!isRecord(deploymentArg)
|
|
31
|
+
|| deploymentArg.serviceId !== attestationArg.serviceId))) {
|
|
32
|
+
errors.push('retention attestation deployments must belong to the exact service');
|
|
33
|
+
}
|
|
34
|
+
return errors;
|
|
35
|
+
};
|
|
2
36
|
const boundaryIdentifierRegex = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
|
|
3
37
|
const indexMediaTypes = new Set([
|
|
4
38
|
'application/vnd.oci.image.index.v1+json',
|
|
@@ -303,4 +337,4 @@ export const validateServiceDeploymentAdoptionReport = (reportArg) => {
|
|
|
303
337
|
}
|
|
304
338
|
return errors;
|
|
305
339
|
};
|
|
306
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploymentadoption.js","sourceRoot":"","sources":["../../ts/data/deploymentadoption.ts"],"names":[],"mappings":"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"}
|
|
340
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploymentadoption.js","sourceRoot":"","sources":["../../ts/data/deploymentadoption.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import type { IDeployment } from '../data/deployment.js';
|
|
|
3
3
|
import type { IService } from '../data/service.js';
|
|
4
4
|
import type { IIdentity } from '../data/user.js';
|
|
5
5
|
import type { IImmutableRolloutReportEnvelope } from '../data/immutableimage.js';
|
|
6
|
+
import type { IServiceDeploymentAdoptionRetentionAttestation, TServiceDeploymentAdoptionRetentionPhase } from '../data/deploymentadoption.js';
|
|
6
7
|
export interface IDeploymentWorkspaceFileEntry {
|
|
7
8
|
type: 'file' | 'directory';
|
|
8
9
|
name: string;
|
|
@@ -199,6 +200,17 @@ export interface IReq_Cloudly_Coreflow_GetServiceDeployments extends plugins.typ
|
|
|
199
200
|
deployments: IDeployment[];
|
|
200
201
|
};
|
|
201
202
|
}
|
|
203
|
+
export interface IReq_Cloudly_Coreflow_AttestServiceDeploymentAdoption extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Cloudly_Coreflow_AttestServiceDeploymentAdoption> {
|
|
204
|
+
method: 'coreflowAttestServiceDeploymentAdoption';
|
|
205
|
+
request: {
|
|
206
|
+
phase: TServiceDeploymentAdoptionRetentionPhase;
|
|
207
|
+
service: IService;
|
|
208
|
+
};
|
|
209
|
+
response: {
|
|
210
|
+
found: boolean;
|
|
211
|
+
attestation?: IServiceDeploymentAdoptionRetentionAttestation;
|
|
212
|
+
};
|
|
213
|
+
}
|
|
202
214
|
export interface IReq_Cloudly_Coreflow_RestartDeployment extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Cloudly_Coreflow_RestartDeployment> {
|
|
203
215
|
method: 'coreflowRestartDeployment';
|
|
204
216
|
request: {
|
package/package.json
CHANGED
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -2,8 +2,10 @@ import type {
|
|
|
2
2
|
IDeploymentPreflightRuntimeTask,
|
|
3
3
|
IOciPlatformDescriptorSummary,
|
|
4
4
|
} from './deploymentpreflight.js';
|
|
5
|
+
import type { IDeployment } from './deployment.js';
|
|
5
6
|
import type {
|
|
6
7
|
IImmutableImageDeploymentPlan,
|
|
8
|
+
IImmutableRolloutReportEnvelope,
|
|
7
9
|
IImmutableImageTargetScope,
|
|
8
10
|
TOciManifestMediaType,
|
|
9
11
|
TSha256Digest,
|
|
@@ -137,6 +139,60 @@ export interface IServiceDeploymentAdoptionResult {
|
|
|
137
139
|
plan: IImmutableImageDeploymentPlan;
|
|
138
140
|
}
|
|
139
141
|
|
|
142
|
+
export type TServiceDeploymentAdoptionRetentionPhase = 'prepare' | 'commit';
|
|
143
|
+
|
|
144
|
+
/**
|
|
145
|
+
* A session-bound Coreflow assertion that its local live runtime can be
|
|
146
|
+
* retained for the exact adoption plan without mutating the Docker service.
|
|
147
|
+
*/
|
|
148
|
+
export interface IServiceDeploymentAdoptionRetentionAttestation {
|
|
149
|
+
schemaVersion: 1;
|
|
150
|
+
phase: TServiceDeploymentAdoptionRetentionPhase;
|
|
151
|
+
retainedWithoutMutation: true;
|
|
152
|
+
serviceId: string;
|
|
153
|
+
operationId: string;
|
|
154
|
+
adoptionConfigurationDigest: TSha256Digest;
|
|
155
|
+
immutableReport: IImmutableRolloutReportEnvelope;
|
|
156
|
+
deployments: IDeployment[];
|
|
157
|
+
attestedAt: number;
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
export const validateServiceDeploymentAdoptionRetentionAttestation = (
|
|
161
|
+
attestationArg: unknown,
|
|
162
|
+
): string[] => {
|
|
163
|
+
if (!isRecord(attestationArg)) return ['retention attestation must be an object'];
|
|
164
|
+
const errors: string[] = [];
|
|
165
|
+
if (attestationArg.schemaVersion !== 1) errors.push('retention attestation schemaVersion must be 1');
|
|
166
|
+
if (attestationArg.phase !== 'prepare' && attestationArg.phase !== 'commit') {
|
|
167
|
+
errors.push('retention attestation phase is invalid');
|
|
168
|
+
}
|
|
169
|
+
if (attestationArg.retainedWithoutMutation !== true) {
|
|
170
|
+
errors.push('retention attestation must assert mutation-free retention');
|
|
171
|
+
}
|
|
172
|
+
if (!isBoundedIdentifier(attestationArg.serviceId)
|
|
173
|
+
|| !isBoundedIdentifier(attestationArg.operationId)) {
|
|
174
|
+
errors.push('retention attestation service and operation IDs must be bounded identifiers');
|
|
175
|
+
}
|
|
176
|
+
if (!isCanonicalDigest(attestationArg.adoptionConfigurationDigest)) {
|
|
177
|
+
errors.push('retention attestation configuration digest must be canonical');
|
|
178
|
+
}
|
|
179
|
+
if (!Number.isSafeInteger(attestationArg.attestedAt) || (attestationArg.attestedAt as number) < 1) {
|
|
180
|
+
errors.push('retention attestation timestamp must be a positive integer');
|
|
181
|
+
}
|
|
182
|
+
if (!isRecord(attestationArg.immutableReport)) {
|
|
183
|
+
errors.push('retention attestation requires an immutable report envelope');
|
|
184
|
+
}
|
|
185
|
+
if (!Array.isArray(attestationArg.deployments) || attestationArg.deployments.length < 1) {
|
|
186
|
+
errors.push('retention attestation requires at least one deployment');
|
|
187
|
+
} else if (attestationArg.deployments.some((deploymentArg) => (
|
|
188
|
+
!isRecord(deploymentArg)
|
|
189
|
+
|| deploymentArg.serviceId !== attestationArg.serviceId
|
|
190
|
+
))) {
|
|
191
|
+
errors.push('retention attestation deployments must belong to the exact service');
|
|
192
|
+
}
|
|
193
|
+
return errors;
|
|
194
|
+
};
|
|
195
|
+
|
|
140
196
|
const boundaryIdentifierRegex = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
|
|
141
197
|
const indexMediaTypes = new Set<TOciManifestMediaType>([
|
|
142
198
|
'application/vnd.oci.image.index.v1+json',
|
|
@@ -3,6 +3,10 @@ import type { IDeployment } from '../data/deployment.js';
|
|
|
3
3
|
import type { IService } from '../data/service.js';
|
|
4
4
|
import type { IIdentity } from '../data/user.js';
|
|
5
5
|
import type { IImmutableRolloutReportEnvelope } from '../data/immutableimage.js';
|
|
6
|
+
import type {
|
|
7
|
+
IServiceDeploymentAdoptionRetentionAttestation,
|
|
8
|
+
TServiceDeploymentAdoptionRetentionPhase,
|
|
9
|
+
} from '../data/deploymentadoption.js';
|
|
6
10
|
|
|
7
11
|
export interface IDeploymentWorkspaceFileEntry {
|
|
8
12
|
type: 'file' | 'directory';
|
|
@@ -291,6 +295,22 @@ extends plugins.typedrequestInterfaces.implementsTR<
|
|
|
291
295
|
};
|
|
292
296
|
}
|
|
293
297
|
|
|
298
|
+
export interface IReq_Cloudly_Coreflow_AttestServiceDeploymentAdoption
|
|
299
|
+
extends plugins.typedrequestInterfaces.implementsTR<
|
|
300
|
+
plugins.typedrequestInterfaces.ITypedRequest,
|
|
301
|
+
IReq_Cloudly_Coreflow_AttestServiceDeploymentAdoption
|
|
302
|
+
> {
|
|
303
|
+
method: 'coreflowAttestServiceDeploymentAdoption';
|
|
304
|
+
request: {
|
|
305
|
+
phase: TServiceDeploymentAdoptionRetentionPhase;
|
|
306
|
+
service: IService;
|
|
307
|
+
};
|
|
308
|
+
response: {
|
|
309
|
+
found: boolean;
|
|
310
|
+
attestation?: IServiceDeploymentAdoptionRetentionAttestation;
|
|
311
|
+
};
|
|
312
|
+
}
|
|
313
|
+
|
|
294
314
|
export interface IReq_Cloudly_Coreflow_RestartDeployment
|
|
295
315
|
extends plugins.typedrequestInterfaces.implementsTR<
|
|
296
316
|
plugins.typedrequestInterfaces.ITypedRequest,
|