@serve.zone/interfaces 16.0.0 → 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 +15 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/deploymentadoption.d.ts +21 -1
- package/dist_ts/data/deploymentadoption.js +38 -1
- package/dist_ts/data/immutableimage.d.ts +3 -1
- package/dist_ts/data/immutableimage.js +16 -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 +61 -0
- package/ts/data/immutableimage.ts +17 -1
- package/ts/requests/deployment.ts +20 -0
package/changelog.md
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
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
|
+
|
|
10
|
+
## 2026-07-20 - 16.0.1
|
|
11
|
+
|
|
12
|
+
### Security
|
|
13
|
+
|
|
14
|
+
- bind existing-service adoption to configuration and no-replacement runtime semantics (deployment)
|
|
15
|
+
- Add an explicit generation-one adoption rollout mode with a complete service configuration digest.
|
|
16
|
+
- Require adoption consumers to retain and attest the exact verified runtime instead of treating adoption as a promotion.
|
|
17
|
+
|
|
3
18
|
## 2026-07-20 - 16.0.0
|
|
4
19
|
|
|
5
20
|
### Breaking Changes
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/interfaces',
|
|
6
|
-
version: '16.
|
|
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
|
/**
|
|
@@ -44,6 +45,8 @@ interface IServiceDeploymentAdoptionServiceSnapshot {
|
|
|
44
45
|
deployOnPush: boolean;
|
|
45
46
|
immutableImageRequired: boolean;
|
|
46
47
|
configuredReference: string;
|
|
48
|
+
/** Hash of the complete persisted pre-adoption service configuration. */
|
|
49
|
+
configurationDigest: TSha256Digest;
|
|
47
50
|
registryTarget: IRegistryTarget;
|
|
48
51
|
}
|
|
49
52
|
interface IServiceDeploymentAdoptionRegistrySnapshot {
|
|
@@ -89,6 +92,23 @@ export interface IServiceDeploymentAdoptionResult {
|
|
|
89
92
|
idempotentReplay: boolean;
|
|
90
93
|
plan: IImmutableImageDeploymentPlan;
|
|
91
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[];
|
|
92
112
|
export declare const validateServiceDeploymentAdoptionPreflightInput: (inputArg: unknown) => string[];
|
|
93
113
|
export declare const validateServiceDeploymentAdoptionInput: (inputArg: unknown) => string[];
|
|
94
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',
|
|
@@ -139,6 +173,9 @@ export const validateServiceDeploymentAdoptionReport = (reportArg) => {
|
|
|
139
173
|
if (typeof service.configuredReference !== 'string' || !service.configuredReference.trim()) {
|
|
140
174
|
errors.push('service.configuredReference must be non-empty');
|
|
141
175
|
}
|
|
176
|
+
if (!isCanonicalDigest(service.configurationDigest)) {
|
|
177
|
+
errors.push('service.configurationDigest must be a canonical sha256 digest');
|
|
178
|
+
}
|
|
142
179
|
if (!isRecord(service.registryTarget)) {
|
|
143
180
|
errors.push('service.registryTarget must be present');
|
|
144
181
|
}
|
|
@@ -300,4 +337,4 @@ export const validateServiceDeploymentAdoptionReport = (reportArg) => {
|
|
|
300
337
|
}
|
|
301
338
|
return errors;
|
|
302
339
|
};
|
|
303
|
-
//# 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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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
export type TSha256Digest = `sha256:${string}`;
|
|
3
3
|
export type TImageDeploymentPolicy = 'legacy-tag' | 'immutable-digest';
|
|
4
4
|
export type TOciManifestMediaType = 'application/vnd.oci.image.index.v1+json' | 'application/vnd.oci.image.manifest.v1+json' | 'application/vnd.docker.distribution.manifest.list.v2+json' | 'application/vnd.docker.distribution.manifest.v2+json';
|
|
5
|
-
export type TImmutableImageRolloutMode = 'promotion' | 'automatic' | 'rollback';
|
|
5
|
+
export type TImmutableImageRolloutMode = 'promotion' | 'automatic' | 'rollback' | 'adoption';
|
|
6
6
|
export type TImmutableImageMismatchReason = 'immutable-plan-missing' | 'requested-digest-missing' | 'requested-digest-malformed' | 'registry-digest-inconsistent' | 'runtime-capability-missing' | 'pull-failed' | 'pulled-digest-missing' | 'pulled-digest-mismatch' | 'service-image-not-digest-pinned' | 'service-image-digest-mismatch' | 'task-image-not-digest-pinned' | 'task-image-digest-mismatch' | 'container-inspection-unavailable' | 'container-image-id-missing' | 'container-repodigest-missing' | 'container-repodigest-mismatch' | 'runtime-attestation-missing' | 'required-replica-missing' | 'replica-unhealthy' | 'replica-failed' | 'stale-rollout-report' | 'rollback-target-not-accepted';
|
|
7
7
|
export type TRuntimeImageVerificationStatus = 'not-required' | 'pending' | 'verified' | 'missing' | 'mismatched';
|
|
8
8
|
export type TImmutableImageRolloutStatus = 'pending' | 'deploying' | 'verifying' | 'succeeded' | 'failed' | 'mismatched' | 'rolling-back' | 'rolled-back';
|
|
@@ -85,6 +85,8 @@ export interface IImmutableImageDeploymentPlan {
|
|
|
85
85
|
manifestMediaType: TOciManifestMediaType;
|
|
86
86
|
createdAt: number;
|
|
87
87
|
mode: TImmutableImageRolloutMode;
|
|
88
|
+
/** Full pre-adoption service configuration fence, required only for adoption. */
|
|
89
|
+
adoptionConfigurationDigest?: TSha256Digest;
|
|
88
90
|
rollbackOfRolloutId?: string;
|
|
89
91
|
targetScope: IImmutableImageTargetScope;
|
|
90
92
|
}
|
|
@@ -113,6 +113,9 @@ export const validateImmutableImageDeploymentPlan = (planArg) => {
|
|
|
113
113
|
if (!normalizeImmutableReleaseTag(planArg.releaseTag)) {
|
|
114
114
|
errors.push('releaseTag must be a non-latest canonical OCI tag');
|
|
115
115
|
}
|
|
116
|
+
if (!['promotion', 'automatic', 'rollback', 'adoption'].includes(planArg.mode)) {
|
|
117
|
+
errors.push('mode must be a supported immutable rollout mode');
|
|
118
|
+
}
|
|
116
119
|
if (![
|
|
117
120
|
'application/vnd.oci.image.index.v1+json',
|
|
118
121
|
'application/vnd.docker.distribution.manifest.list.v2+json',
|
|
@@ -149,6 +152,18 @@ export const validateImmutableImageDeploymentPlan = (planArg) => {
|
|
|
149
152
|
if (planArg.mode !== 'rollback' && planArg.rollbackOfRolloutId) {
|
|
150
153
|
errors.push('only rollback rollouts may set rollbackOfRolloutId');
|
|
151
154
|
}
|
|
155
|
+
if (planArg.mode === 'adoption') {
|
|
156
|
+
if (planArg.rolloutGeneration !== 1) {
|
|
157
|
+
errors.push('adoption must create rollout generation one');
|
|
158
|
+
}
|
|
159
|
+
if (!planArg.adoptionConfigurationDigest
|
|
160
|
+
|| !isSha256Digest(planArg.adoptionConfigurationDigest)) {
|
|
161
|
+
errors.push('adoption must bind a canonical service configuration digest');
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
else if (planArg.adoptionConfigurationDigest !== undefined) {
|
|
165
|
+
errors.push('only adoption may bind a service configuration digest');
|
|
166
|
+
}
|
|
152
167
|
return errors;
|
|
153
168
|
};
|
|
154
169
|
export const validateImageRolloutStatus = (statusArg) => {
|
|
@@ -230,4 +245,4 @@ export const validateImageRolloutStatus = (statusArg) => {
|
|
|
230
245
|
}
|
|
231
246
|
return errors;
|
|
232
247
|
};
|
|
233
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"immutableimage.js","sourceRoot":"","sources":["../../ts/data/immutableimage.ts"],"names":[],"mappings":"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"}
|
|
248
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"immutableimage.js","sourceRoot":"","sources":["../../ts/data/immutableimage.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,
|
|
@@ -78,6 +80,8 @@ interface IServiceDeploymentAdoptionServiceSnapshot {
|
|
|
78
80
|
deployOnPush: boolean;
|
|
79
81
|
immutableImageRequired: boolean;
|
|
80
82
|
configuredReference: string;
|
|
83
|
+
/** Hash of the complete persisted pre-adoption service configuration. */
|
|
84
|
+
configurationDigest: TSha256Digest;
|
|
81
85
|
registryTarget: IRegistryTarget;
|
|
82
86
|
}
|
|
83
87
|
|
|
@@ -135,6 +139,60 @@ export interface IServiceDeploymentAdoptionResult {
|
|
|
135
139
|
plan: IImmutableImageDeploymentPlan;
|
|
136
140
|
}
|
|
137
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
|
+
|
|
138
196
|
const boundaryIdentifierRegex = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
|
|
139
197
|
const indexMediaTypes = new Set<TOciManifestMediaType>([
|
|
140
198
|
'application/vnd.oci.image.index.v1+json',
|
|
@@ -284,6 +342,9 @@ export const validateServiceDeploymentAdoptionReport = (reportArg: unknown): str
|
|
|
284
342
|
if (typeof service.configuredReference !== 'string' || !service.configuredReference.trim()) {
|
|
285
343
|
errors.push('service.configuredReference must be non-empty');
|
|
286
344
|
}
|
|
345
|
+
if (!isCanonicalDigest(service.configurationDigest)) {
|
|
346
|
+
errors.push('service.configurationDigest must be a canonical sha256 digest');
|
|
347
|
+
}
|
|
287
348
|
if (!isRecord(service.registryTarget)) {
|
|
288
349
|
errors.push('service.registryTarget must be present');
|
|
289
350
|
}
|
|
@@ -9,7 +9,7 @@ export type TOciManifestMediaType =
|
|
|
9
9
|
| 'application/vnd.docker.distribution.manifest.list.v2+json'
|
|
10
10
|
| 'application/vnd.docker.distribution.manifest.v2+json';
|
|
11
11
|
|
|
12
|
-
export type TImmutableImageRolloutMode = 'promotion' | 'automatic' | 'rollback';
|
|
12
|
+
export type TImmutableImageRolloutMode = 'promotion' | 'automatic' | 'rollback' | 'adoption';
|
|
13
13
|
|
|
14
14
|
export type TImmutableImageMismatchReason =
|
|
15
15
|
| 'immutable-plan-missing'
|
|
@@ -206,6 +206,8 @@ export interface IImmutableImageDeploymentPlan {
|
|
|
206
206
|
manifestMediaType: TOciManifestMediaType;
|
|
207
207
|
createdAt: number;
|
|
208
208
|
mode: TImmutableImageRolloutMode;
|
|
209
|
+
/** Full pre-adoption service configuration fence, required only for adoption. */
|
|
210
|
+
adoptionConfigurationDigest?: TSha256Digest;
|
|
209
211
|
rollbackOfRolloutId?: string;
|
|
210
212
|
targetScope: IImmutableImageTargetScope;
|
|
211
213
|
}
|
|
@@ -359,6 +361,9 @@ export const validateImmutableImageDeploymentPlan = (
|
|
|
359
361
|
if (!normalizeImmutableReleaseTag(planArg.releaseTag)) {
|
|
360
362
|
errors.push('releaseTag must be a non-latest canonical OCI tag');
|
|
361
363
|
}
|
|
364
|
+
if (!['promotion', 'automatic', 'rollback', 'adoption'].includes(planArg.mode)) {
|
|
365
|
+
errors.push('mode must be a supported immutable rollout mode');
|
|
366
|
+
}
|
|
362
367
|
if (![
|
|
363
368
|
'application/vnd.oci.image.index.v1+json',
|
|
364
369
|
'application/vnd.docker.distribution.manifest.list.v2+json',
|
|
@@ -398,6 +403,17 @@ export const validateImmutableImageDeploymentPlan = (
|
|
|
398
403
|
if (planArg.mode !== 'rollback' && planArg.rollbackOfRolloutId) {
|
|
399
404
|
errors.push('only rollback rollouts may set rollbackOfRolloutId');
|
|
400
405
|
}
|
|
406
|
+
if (planArg.mode === 'adoption') {
|
|
407
|
+
if (planArg.rolloutGeneration !== 1) {
|
|
408
|
+
errors.push('adoption must create rollout generation one');
|
|
409
|
+
}
|
|
410
|
+
if (!planArg.adoptionConfigurationDigest
|
|
411
|
+
|| !isSha256Digest(planArg.adoptionConfigurationDigest)) {
|
|
412
|
+
errors.push('adoption must bind a canonical service configuration digest');
|
|
413
|
+
}
|
|
414
|
+
} else if (planArg.adoptionConfigurationDigest !== undefined) {
|
|
415
|
+
errors.push('only adoption may bind a service configuration digest');
|
|
416
|
+
}
|
|
401
417
|
return errors;
|
|
402
418
|
};
|
|
403
419
|
|
|
@@ -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,
|