@serve.zone/interfaces 15.0.0 → 16.0.1
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 +17 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/deploymentadoption.d.ts +97 -0
- package/dist_ts/data/deploymentadoption.js +306 -0
- package/dist_ts/data/immutableimage.d.ts +3 -1
- package/dist_ts/data/immutableimage.js +16 -1
- package/dist_ts/data/index.d.ts +1 -0
- package/dist_ts/data/index.js +2 -1
- package/dist_ts/data/user.d.ts +1 -1
- package/dist_ts/data/user.js +6 -1
- package/dist_ts/requests/service.d.ts +20 -0
- package/package.json +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/deploymentadoption.ts +450 -0
- package/ts/data/immutableimage.ts +17 -1
- package/ts/data/index.ts +1 -0
- package/ts/data/user.ts +6 -0
- package/ts/requests/service.ts +35 -0
package/changelog.md
CHANGED
|
@@ -1,5 +1,22 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-07-20 - 16.0.1
|
|
4
|
+
|
|
5
|
+
### Security
|
|
6
|
+
|
|
7
|
+
- bind existing-service adoption to configuration and no-replacement runtime semantics (deployment)
|
|
8
|
+
- Add an explicit generation-one adoption rollout mode with a complete service configuration digest.
|
|
9
|
+
- Require adoption consumers to retain and attest the exact verified runtime instead of treating adoption as a promotion.
|
|
10
|
+
|
|
11
|
+
## 2026-07-20 - 16.0.0
|
|
12
|
+
|
|
13
|
+
### Breaking Changes
|
|
14
|
+
|
|
15
|
+
- add attested existing-service adoption contracts (deployment)
|
|
16
|
+
- Add a mutation-free adoption preflight and a digest-fenced, idempotent adoption request.
|
|
17
|
+
- Require explicit service-scoped deployment:adopt-existing authority.
|
|
18
|
+
- Bind registry, release, target-scope, and healthy runtime digest evidence before switching a mutable service to immutable rollout state.
|
|
19
|
+
|
|
3
20
|
## 2026-07-20 - 15.0.0
|
|
4
21
|
|
|
5
22
|
### Breaking Changes
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/interfaces',
|
|
6
|
-
version: '
|
|
6
|
+
version: '16.0.1',
|
|
7
7
|
description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHVGQUF1RjtDQUNyRyxDQUFBIn0=
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
import type { IDeploymentPreflightRuntimeTask, IOciPlatformDescriptorSummary } from './deploymentpreflight.js';
|
|
2
|
+
import type { IImmutableImageDeploymentPlan, IImmutableImageTargetScope, TOciManifestMediaType, TSha256Digest } from './immutableimage.js';
|
|
3
|
+
import type { IRegistryTarget } from './registry.js';
|
|
4
|
+
export type TServiceDeploymentAdoptionDecision = 'GO' | 'NO-GO';
|
|
5
|
+
/**
|
|
6
|
+
* Canonical sha256 hash of the complete adoption preflight snapshot. It is a
|
|
7
|
+
* state/TOCTOU fence and must never be substituted with the OCI image digest.
|
|
8
|
+
*/
|
|
9
|
+
export type TServiceDeploymentAdoptionDigest = TSha256Digest & {
|
|
10
|
+
readonly __serviceDeploymentAdoptionDigest: unique symbol;
|
|
11
|
+
};
|
|
12
|
+
export type TServiceDeploymentAdoptionBlockerCode = 'INVALID_REQUEST' | 'AUTHORIZATION_MISSING' | 'SERVICE_NOT_FOUND' | 'SERVICE_OWNERSHIP_MISMATCH' | 'SERVICE_ALREADY_IMMUTABLE' | 'SERVICE_STATE_CONFLICT' | 'REGISTRY_TARGET_MISSING' | 'REGISTRY_REFERENCE_INVALID' | 'REGISTRY_DIGEST_MISSING' | 'OCI_INDEX_REQUIRED' | 'OCI_PLATFORM_MISSING' | 'RELEASE_NOT_FOUND' | 'RELEASE_TAG_AMBIGUOUS' | 'TARGET_SCOPE_UNAVAILABLE' | 'RUNTIME_ATTESTATION_INCOMPLETE' | 'RUNTIME_DIGEST_MISMATCH';
|
|
13
|
+
export interface IServiceDeploymentAdoptionBlocker {
|
|
14
|
+
code: TServiceDeploymentAdoptionBlockerCode;
|
|
15
|
+
message: string;
|
|
16
|
+
}
|
|
17
|
+
export interface IServiceDeploymentAdoptionPreflightInput {
|
|
18
|
+
requestId: string;
|
|
19
|
+
organizationId: string;
|
|
20
|
+
serviceId: string;
|
|
21
|
+
}
|
|
22
|
+
export interface IServiceDeploymentAdoptionInput extends IServiceDeploymentAdoptionPreflightInput {
|
|
23
|
+
idempotencyKey: string;
|
|
24
|
+
expectedAdoptionDigest: TServiceDeploymentAdoptionDigest;
|
|
25
|
+
}
|
|
26
|
+
interface IServiceDeploymentAdoptionReportBase {
|
|
27
|
+
schemaVersion: 1;
|
|
28
|
+
mutationPerformed: false;
|
|
29
|
+
requestId: string;
|
|
30
|
+
generatedAt: number;
|
|
31
|
+
runtimeAttestation: {
|
|
32
|
+
requiredReplicaCount: number;
|
|
33
|
+
observedReplicaCount: number;
|
|
34
|
+
healthyReplicaCount: number;
|
|
35
|
+
observedDigestReplicaCount: number;
|
|
36
|
+
observedDigestConsistent: boolean;
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
interface IServiceDeploymentAdoptionServiceSnapshot {
|
|
40
|
+
organizationId: string;
|
|
41
|
+
serviceId: string;
|
|
42
|
+
serviceName: string;
|
|
43
|
+
imageId: string;
|
|
44
|
+
deployOnPush: boolean;
|
|
45
|
+
immutableImageRequired: boolean;
|
|
46
|
+
configuredReference: string;
|
|
47
|
+
/** Hash of the complete persisted pre-adoption service configuration. */
|
|
48
|
+
configurationDigest: TSha256Digest;
|
|
49
|
+
registryTarget: IRegistryTarget;
|
|
50
|
+
}
|
|
51
|
+
interface IServiceDeploymentAdoptionRegistrySnapshot {
|
|
52
|
+
tag?: string;
|
|
53
|
+
digest?: TSha256Digest;
|
|
54
|
+
mediaType?: TOciManifestMediaType;
|
|
55
|
+
platforms: IOciPlatformDescriptorSummary[];
|
|
56
|
+
releaseId?: string;
|
|
57
|
+
releaseTag?: string;
|
|
58
|
+
}
|
|
59
|
+
export interface IServiceDeploymentAdoptionGoReport extends IServiceDeploymentAdoptionReportBase {
|
|
60
|
+
decision: 'GO';
|
|
61
|
+
service: IServiceDeploymentAdoptionServiceSnapshot & {
|
|
62
|
+
deployOnPush: true;
|
|
63
|
+
immutableImageRequired: false;
|
|
64
|
+
};
|
|
65
|
+
registry: IServiceDeploymentAdoptionRegistrySnapshot & {
|
|
66
|
+
tag: string;
|
|
67
|
+
digest: TSha256Digest;
|
|
68
|
+
mediaType: 'application/vnd.oci.image.index.v1+json' | 'application/vnd.docker.distribution.manifest.list.v2+json';
|
|
69
|
+
platforms: [IOciPlatformDescriptorSummary, ...IOciPlatformDescriptorSummary[]];
|
|
70
|
+
releaseId: string;
|
|
71
|
+
releaseTag: string;
|
|
72
|
+
};
|
|
73
|
+
runtimeTasks: [IDeploymentPreflightRuntimeTask, ...IDeploymentPreflightRuntimeTask[]];
|
|
74
|
+
targetScope: IImmutableImageTargetScope;
|
|
75
|
+
adoptionDigest: TServiceDeploymentAdoptionDigest;
|
|
76
|
+
blockers: [];
|
|
77
|
+
}
|
|
78
|
+
export interface IServiceDeploymentAdoptionNoGoReport extends IServiceDeploymentAdoptionReportBase {
|
|
79
|
+
decision: 'NO-GO';
|
|
80
|
+
service?: IServiceDeploymentAdoptionServiceSnapshot;
|
|
81
|
+
registry: IServiceDeploymentAdoptionRegistrySnapshot;
|
|
82
|
+
runtimeTasks: IDeploymentPreflightRuntimeTask[];
|
|
83
|
+
targetScope?: IImmutableImageTargetScope;
|
|
84
|
+
adoptionDigest?: never;
|
|
85
|
+
blockers: [IServiceDeploymentAdoptionBlocker, ...IServiceDeploymentAdoptionBlocker[]];
|
|
86
|
+
}
|
|
87
|
+
export type IServiceDeploymentAdoptionReport = IServiceDeploymentAdoptionGoReport | IServiceDeploymentAdoptionNoGoReport;
|
|
88
|
+
export interface IServiceDeploymentAdoptionResult {
|
|
89
|
+
adoptionId: string;
|
|
90
|
+
adoptionDigest: TServiceDeploymentAdoptionDigest;
|
|
91
|
+
idempotentReplay: boolean;
|
|
92
|
+
plan: IImmutableImageDeploymentPlan;
|
|
93
|
+
}
|
|
94
|
+
export declare const validateServiceDeploymentAdoptionPreflightInput: (inputArg: unknown) => string[];
|
|
95
|
+
export declare const validateServiceDeploymentAdoptionInput: (inputArg: unknown) => string[];
|
|
96
|
+
export declare const validateServiceDeploymentAdoptionReport: (reportArg: unknown) => string[];
|
|
97
|
+
export {};
|
|
@@ -0,0 +1,306 @@
|
|
|
1
|
+
import { normalizeImmutableReleaseTag, normalizeSha256Digest } from './immutableimage.js';
|
|
2
|
+
const boundaryIdentifierRegex = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
|
|
3
|
+
const indexMediaTypes = new Set([
|
|
4
|
+
'application/vnd.oci.image.index.v1+json',
|
|
5
|
+
'application/vnd.docker.distribution.manifest.list.v2+json',
|
|
6
|
+
]);
|
|
7
|
+
const adoptionBlockerCodes = new Set([
|
|
8
|
+
'INVALID_REQUEST',
|
|
9
|
+
'AUTHORIZATION_MISSING',
|
|
10
|
+
'SERVICE_NOT_FOUND',
|
|
11
|
+
'SERVICE_OWNERSHIP_MISMATCH',
|
|
12
|
+
'SERVICE_ALREADY_IMMUTABLE',
|
|
13
|
+
'SERVICE_STATE_CONFLICT',
|
|
14
|
+
'REGISTRY_TARGET_MISSING',
|
|
15
|
+
'REGISTRY_REFERENCE_INVALID',
|
|
16
|
+
'REGISTRY_DIGEST_MISSING',
|
|
17
|
+
'OCI_INDEX_REQUIRED',
|
|
18
|
+
'OCI_PLATFORM_MISSING',
|
|
19
|
+
'RELEASE_NOT_FOUND',
|
|
20
|
+
'RELEASE_TAG_AMBIGUOUS',
|
|
21
|
+
'TARGET_SCOPE_UNAVAILABLE',
|
|
22
|
+
'RUNTIME_ATTESTATION_INCOMPLETE',
|
|
23
|
+
'RUNTIME_DIGEST_MISMATCH',
|
|
24
|
+
]);
|
|
25
|
+
const isRecord = (valueArg) => Boolean(valueArg) && typeof valueArg === 'object' && !Array.isArray(valueArg);
|
|
26
|
+
const isBoundedIdentifier = (valueArg) => typeof valueArg === 'string' && boundaryIdentifierRegex.test(valueArg);
|
|
27
|
+
const isCanonicalDigest = (valueArg) => Boolean(normalizeSha256Digest(valueArg)) && normalizeSha256Digest(valueArg) === valueArg;
|
|
28
|
+
const isNonNegativeInteger = (valueArg) => Number.isSafeInteger(valueArg) && valueArg >= 0;
|
|
29
|
+
export const validateServiceDeploymentAdoptionPreflightInput = (inputArg) => {
|
|
30
|
+
if (!isRecord(inputArg))
|
|
31
|
+
return ['adoption preflight input must be an object'];
|
|
32
|
+
const errors = [];
|
|
33
|
+
if (!isBoundedIdentifier(inputArg.requestId)) {
|
|
34
|
+
errors.push('requestId must be a bounded canonical identifier');
|
|
35
|
+
}
|
|
36
|
+
for (const key of ['organizationId', 'serviceId']) {
|
|
37
|
+
if (!isBoundedIdentifier(inputArg[key])) {
|
|
38
|
+
errors.push(`${key} must be a bounded canonical identifier`);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
return errors;
|
|
42
|
+
};
|
|
43
|
+
export const validateServiceDeploymentAdoptionInput = (inputArg) => {
|
|
44
|
+
const errors = validateServiceDeploymentAdoptionPreflightInput(inputArg);
|
|
45
|
+
if (!isRecord(inputArg))
|
|
46
|
+
return errors;
|
|
47
|
+
if (!isBoundedIdentifier(inputArg.idempotencyKey)) {
|
|
48
|
+
errors.push('idempotencyKey must be a bounded canonical identifier');
|
|
49
|
+
}
|
|
50
|
+
if (!isCanonicalDigest(inputArg.expectedAdoptionDigest)) {
|
|
51
|
+
errors.push('expectedAdoptionDigest must be a canonical sha256 digest');
|
|
52
|
+
}
|
|
53
|
+
return errors;
|
|
54
|
+
};
|
|
55
|
+
export const validateServiceDeploymentAdoptionReport = (reportArg) => {
|
|
56
|
+
if (!isRecord(reportArg))
|
|
57
|
+
return ['adoption report must be an object'];
|
|
58
|
+
const errors = [];
|
|
59
|
+
if (reportArg.schemaVersion !== 1)
|
|
60
|
+
errors.push('schemaVersion must be 1');
|
|
61
|
+
if (reportArg.mutationPerformed !== false) {
|
|
62
|
+
errors.push('adoption preflight must be mutation-free');
|
|
63
|
+
}
|
|
64
|
+
if (!isBoundedIdentifier(reportArg.requestId)) {
|
|
65
|
+
errors.push('requestId must be a bounded canonical identifier');
|
|
66
|
+
}
|
|
67
|
+
if (!isNonNegativeInteger(reportArg.generatedAt)) {
|
|
68
|
+
errors.push('generatedAt must be a non-negative integer');
|
|
69
|
+
}
|
|
70
|
+
if (reportArg.decision !== 'GO' && reportArg.decision !== 'NO-GO') {
|
|
71
|
+
errors.push('decision must be GO or NO-GO');
|
|
72
|
+
}
|
|
73
|
+
const attestation = reportArg.runtimeAttestation;
|
|
74
|
+
if (!isRecord(attestation)) {
|
|
75
|
+
errors.push('runtimeAttestation must be an object');
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
for (const key of [
|
|
79
|
+
'requiredReplicaCount',
|
|
80
|
+
'observedReplicaCount',
|
|
81
|
+
'healthyReplicaCount',
|
|
82
|
+
'observedDigestReplicaCount',
|
|
83
|
+
]) {
|
|
84
|
+
if (!isNonNegativeInteger(attestation[key])) {
|
|
85
|
+
errors.push(`runtimeAttestation.${key} must be a non-negative integer`);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
if (typeof attestation.observedDigestConsistent !== 'boolean') {
|
|
89
|
+
errors.push('runtimeAttestation.observedDigestConsistent must be boolean');
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
const blockers = reportArg.blockers;
|
|
93
|
+
if (!Array.isArray(blockers)) {
|
|
94
|
+
errors.push('blockers must be an array');
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
for (const blocker of blockers) {
|
|
98
|
+
if (!isRecord(blocker)
|
|
99
|
+
|| !adoptionBlockerCodes.has(blocker.code)
|
|
100
|
+
|| typeof blocker.message !== 'string'
|
|
101
|
+
|| !blocker.message.trim()) {
|
|
102
|
+
errors.push('each blocker must contain a supported code and non-empty message');
|
|
103
|
+
break;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
if (reportArg.decision === 'NO-GO') {
|
|
108
|
+
if (Array.isArray(blockers) && blockers.length === 0) {
|
|
109
|
+
errors.push('a NO-GO report must contain at least one blocker');
|
|
110
|
+
}
|
|
111
|
+
if (reportArg.adoptionDigest !== undefined) {
|
|
112
|
+
errors.push('a NO-GO report must not contain an adoption digest');
|
|
113
|
+
}
|
|
114
|
+
return errors;
|
|
115
|
+
}
|
|
116
|
+
if (reportArg.decision !== 'GO')
|
|
117
|
+
return errors;
|
|
118
|
+
if (Array.isArray(blockers) && blockers.length !== 0) {
|
|
119
|
+
errors.push('a GO report must not contain blockers');
|
|
120
|
+
}
|
|
121
|
+
if (!isCanonicalDigest(reportArg.adoptionDigest)) {
|
|
122
|
+
errors.push('a GO report requires a canonical adoption digest');
|
|
123
|
+
}
|
|
124
|
+
const service = reportArg.service;
|
|
125
|
+
const registry = reportArg.registry;
|
|
126
|
+
const targetScope = reportArg.targetScope;
|
|
127
|
+
const runtimeTasks = reportArg.runtimeTasks;
|
|
128
|
+
if (!isRecord(service)) {
|
|
129
|
+
errors.push('a GO report requires a service snapshot');
|
|
130
|
+
}
|
|
131
|
+
else {
|
|
132
|
+
for (const key of ['organizationId', 'serviceId', 'serviceName', 'imageId']) {
|
|
133
|
+
if (!isBoundedIdentifier(service[key]))
|
|
134
|
+
errors.push(`service.${key} is invalid`);
|
|
135
|
+
}
|
|
136
|
+
if (service.deployOnPush !== true || service.immutableImageRequired !== false) {
|
|
137
|
+
errors.push('a GO report requires the legacy mutable service state');
|
|
138
|
+
}
|
|
139
|
+
if (typeof service.configuredReference !== 'string' || !service.configuredReference.trim()) {
|
|
140
|
+
errors.push('service.configuredReference must be non-empty');
|
|
141
|
+
}
|
|
142
|
+
if (!isCanonicalDigest(service.configurationDigest)) {
|
|
143
|
+
errors.push('service.configurationDigest must be a canonical sha256 digest');
|
|
144
|
+
}
|
|
145
|
+
if (!isRecord(service.registryTarget)) {
|
|
146
|
+
errors.push('service.registryTarget must be present');
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
let registryDigest;
|
|
150
|
+
if (!isRecord(registry)) {
|
|
151
|
+
errors.push('a GO report requires a registry snapshot');
|
|
152
|
+
}
|
|
153
|
+
else {
|
|
154
|
+
if (!normalizeImmutableReleaseTag(registry.tag) || registry.tag !== registry.releaseTag) {
|
|
155
|
+
errors.push('registry tag and releaseTag must be the same immutable tag');
|
|
156
|
+
}
|
|
157
|
+
if (!isCanonicalDigest(registry.digest)) {
|
|
158
|
+
errors.push('registry.digest must be a canonical sha256 digest');
|
|
159
|
+
}
|
|
160
|
+
else {
|
|
161
|
+
registryDigest = registry.digest;
|
|
162
|
+
if (reportArg.adoptionDigest === registry.digest) {
|
|
163
|
+
errors.push('adoption digest must be a distinct full-state fence, not the image digest');
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
if (!indexMediaTypes.has(registry.mediaType)) {
|
|
167
|
+
errors.push('registry.mediaType must identify an OCI image index');
|
|
168
|
+
}
|
|
169
|
+
if (!isBoundedIdentifier(registry.releaseId)) {
|
|
170
|
+
errors.push('registry.releaseId must be a bounded canonical identifier');
|
|
171
|
+
}
|
|
172
|
+
if (!Array.isArray(registry.platforms) || registry.platforms.length === 0) {
|
|
173
|
+
errors.push('registry.platforms must contain OCI platform evidence');
|
|
174
|
+
}
|
|
175
|
+
else {
|
|
176
|
+
for (const architecture of ['amd64', 'arm64']) {
|
|
177
|
+
if (!registry.platforms.some((platformArg) => isRecord(platformArg)
|
|
178
|
+
&& platformArg.os === 'linux'
|
|
179
|
+
&& platformArg.architecture === architecture
|
|
180
|
+
&& platformArg.runnable === true
|
|
181
|
+
&& platformArg.manifestPresent === true
|
|
182
|
+
&& isCanonicalDigest(platformArg.digest))) {
|
|
183
|
+
errors.push(`registry.platforms must contain runnable linux/${architecture} evidence`);
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
let requiredReplicaCount;
|
|
189
|
+
let targetNodeNames = [];
|
|
190
|
+
let replicasPerNode;
|
|
191
|
+
if (!isRecord(targetScope)) {
|
|
192
|
+
errors.push('a GO report requires an immutable target scope');
|
|
193
|
+
}
|
|
194
|
+
else {
|
|
195
|
+
const clusterIds = targetScope.targetClusterIds;
|
|
196
|
+
const nodeNames = targetScope.targetNodeNames;
|
|
197
|
+
replicasPerNode = targetScope.replicasPerNode;
|
|
198
|
+
requiredReplicaCount = targetScope.requiredReplicaCount;
|
|
199
|
+
if (!Array.isArray(clusterIds) || clusterIds.length !== 1
|
|
200
|
+
|| clusterIds.some((valueArg) => !isBoundedIdentifier(valueArg))
|
|
201
|
+
|| new Set(clusterIds).size !== clusterIds.length) {
|
|
202
|
+
errors.push('targetScope.targetClusterIds must identify exactly one attested cluster');
|
|
203
|
+
}
|
|
204
|
+
if (!Array.isArray(nodeNames) || nodeNames.length === 0
|
|
205
|
+
|| nodeNames.some((valueArg) => !isBoundedIdentifier(valueArg))
|
|
206
|
+
|| new Set(nodeNames).size !== nodeNames.length) {
|
|
207
|
+
errors.push('targetScope.targetNodeNames must be non-empty and unique');
|
|
208
|
+
}
|
|
209
|
+
else {
|
|
210
|
+
targetNodeNames = nodeNames;
|
|
211
|
+
}
|
|
212
|
+
if (!Number.isSafeInteger(replicasPerNode) || replicasPerNode < 1) {
|
|
213
|
+
errors.push('targetScope.replicasPerNode must be a positive integer');
|
|
214
|
+
}
|
|
215
|
+
if (!Number.isSafeInteger(requiredReplicaCount) || requiredReplicaCount < 1
|
|
216
|
+
|| requiredReplicaCount !== targetNodeNames.length * (replicasPerNode || 0)) {
|
|
217
|
+
errors.push('targetScope.requiredReplicaCount must match nodes times replicas');
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
if (!Array.isArray(runtimeTasks) || runtimeTasks.length === 0) {
|
|
221
|
+
errors.push('a GO report requires runtime task evidence');
|
|
222
|
+
}
|
|
223
|
+
else {
|
|
224
|
+
if (requiredReplicaCount !== undefined && runtimeTasks.length !== requiredReplicaCount) {
|
|
225
|
+
errors.push('runtime task count must equal the required replica count');
|
|
226
|
+
}
|
|
227
|
+
const deploymentIds = new Set();
|
|
228
|
+
const taskCountsByNode = new Map();
|
|
229
|
+
for (const task of runtimeTasks) {
|
|
230
|
+
if (!isRecord(task)
|
|
231
|
+
|| !isBoundedIdentifier(task.deploymentId)
|
|
232
|
+
|| deploymentIds.has(task.deploymentId)) {
|
|
233
|
+
errors.push('runtime task deployment IDs must be valid and unique');
|
|
234
|
+
continue;
|
|
235
|
+
}
|
|
236
|
+
deploymentIds.add(task.deploymentId);
|
|
237
|
+
if (!isBoundedIdentifier(task.nodeName) || !targetNodeNames.includes(task.nodeName)) {
|
|
238
|
+
errors.push('every runtime task must belong to the exact target node scope');
|
|
239
|
+
}
|
|
240
|
+
else {
|
|
241
|
+
taskCountsByNode.set(task.nodeName, (taskCountsByNode.get(task.nodeName) || 0) + 1);
|
|
242
|
+
}
|
|
243
|
+
if (task.status !== 'running' || task.healthStatus !== 'healthy') {
|
|
244
|
+
errors.push('every runtime task must be running and healthy');
|
|
245
|
+
}
|
|
246
|
+
if (!registryDigest || task.observedDigest !== registryDigest) {
|
|
247
|
+
errors.push('every runtime task must attest the exact registry digest');
|
|
248
|
+
}
|
|
249
|
+
if (typeof task.imageReference !== 'string' || !task.imageReference.trim()) {
|
|
250
|
+
errors.push('every runtime task must identify its image reference');
|
|
251
|
+
}
|
|
252
|
+
}
|
|
253
|
+
if (replicasPerNode !== undefined
|
|
254
|
+
&& targetNodeNames.some((nodeNameArg) => taskCountsByNode.get(nodeNameArg) !== replicasPerNode)) {
|
|
255
|
+
errors.push('runtime task evidence must cover every target node and replica');
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
if (isRecord(attestation) && requiredReplicaCount !== undefined) {
|
|
259
|
+
if (attestation.requiredReplicaCount !== requiredReplicaCount
|
|
260
|
+
|| attestation.observedReplicaCount !== requiredReplicaCount
|
|
261
|
+
|| attestation.healthyReplicaCount !== requiredReplicaCount
|
|
262
|
+
|| attestation.observedDigestReplicaCount !== requiredReplicaCount
|
|
263
|
+
|| attestation.observedDigestConsistent !== true) {
|
|
264
|
+
errors.push('runtime attestation must consistently cover every required replica');
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
if (isRecord(service) && isRecord(service.registryTarget) && isRecord(registry)) {
|
|
268
|
+
const target = service.registryTarget;
|
|
269
|
+
if (target.protocol !== 'oci'
|
|
270
|
+
|| target.tag !== registry.tag
|
|
271
|
+
|| target.serviceId !== service.serviceId
|
|
272
|
+
|| target.imageId !== service.imageId
|
|
273
|
+
|| typeof target.registryHost !== 'string'
|
|
274
|
+
|| !target.registryHost
|
|
275
|
+
|| typeof target.repository !== 'string'
|
|
276
|
+
|| !target.repository
|
|
277
|
+
|| target.imageUrl !== `${target.registryHost}/${target.repository}:${target.tag}`) {
|
|
278
|
+
errors.push('service registry target must exactly bind the adopted service, image, and tag');
|
|
279
|
+
}
|
|
280
|
+
if (registryDigest) {
|
|
281
|
+
const digestPinnedReference = `${target.registryHost}/${target.repository}@${registryDigest}`;
|
|
282
|
+
const tagAndDigestReference = `${target.imageUrl}@${registryDigest}`;
|
|
283
|
+
const configuredReferences = new Set([
|
|
284
|
+
target.tag,
|
|
285
|
+
target.imageUrl,
|
|
286
|
+
digestPinnedReference,
|
|
287
|
+
tagAndDigestReference,
|
|
288
|
+
]);
|
|
289
|
+
if (!configuredReferences.has(service.configuredReference)) {
|
|
290
|
+
errors.push('service configured reference must exactly bind the adopted registry target');
|
|
291
|
+
}
|
|
292
|
+
const runtimeReferences = new Set([
|
|
293
|
+
target.imageUrl,
|
|
294
|
+
digestPinnedReference,
|
|
295
|
+
tagAndDigestReference,
|
|
296
|
+
]);
|
|
297
|
+
if (Array.isArray(runtimeTasks)
|
|
298
|
+
&& runtimeTasks.some((taskArg) => !isRecord(taskArg)
|
|
299
|
+
|| !runtimeReferences.has(taskArg.imageReference))) {
|
|
300
|
+
errors.push('every runtime task image reference must exactly bind the adopted registry target');
|
|
301
|
+
}
|
|
302
|
+
}
|
|
303
|
+
}
|
|
304
|
+
return errors;
|
|
305
|
+
};
|
|
306
|
+
//# 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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"}
|
package/dist_ts/data/index.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ export * from './cloudlyconfig.js';
|
|
|
2
2
|
export * from './cluster.js';
|
|
3
3
|
export * from './config.js';
|
|
4
4
|
export * from './deployment.js';
|
|
5
|
+
export * from './deploymentadoption.js';
|
|
5
6
|
export * from './deploymentoperation.js';
|
|
6
7
|
export * from './deploymentpreflight.js';
|
|
7
8
|
export * from './migration.js';
|
package/dist_ts/data/index.js
CHANGED
|
@@ -2,6 +2,7 @@ export * from './cloudlyconfig.js';
|
|
|
2
2
|
export * from './cluster.js';
|
|
3
3
|
export * from './config.js';
|
|
4
4
|
export * from './deployment.js';
|
|
5
|
+
export * from './deploymentadoption.js';
|
|
5
6
|
export * from './deploymentoperation.js';
|
|
6
7
|
export * from './deploymentpreflight.js';
|
|
7
8
|
export * from './migration.js';
|
|
@@ -32,4 +33,4 @@ export * from './taskexecution.js';
|
|
|
32
33
|
export * from './traffic.js';
|
|
33
34
|
export * from './user.js';
|
|
34
35
|
export * from './version.js';
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9kYXRhL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMsMEJBQTBCLENBQUM7QUFDekMsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsVUFBVSxDQUFDO0FBQ3pCLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsWUFBWSxDQUFDO0FBQzNCLGNBQWMsdUJBQXVCLENBQUM7QUFDdEMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLFlBQVksQ0FBQztBQUMzQixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLFdBQVcsQ0FBQztBQUMxQixjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLFdBQVcsQ0FBQztBQUMxQixjQUFjLGNBQWMsQ0FBQyJ9
|
package/dist_ts/data/user.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ export interface IToken {
|
|
|
3
3
|
expiresAt: number;
|
|
4
4
|
assignedRoles: string[];
|
|
5
5
|
}
|
|
6
|
-
export type TServiceDeploymentCapability = 'deployment:preflight' | 'deployment:reserve' | 'deployment:registry-push' | 'deployment:release-read' | 'deployment:promote-image' | 'deployment:status' | 'deployment:create-greenfield' | 'deployment:promote-route' | 'deployment:rollback-image' | 'deployment:rollback-route' | 'deployment:retry' | 'deployment:cleanup';
|
|
6
|
+
export type TServiceDeploymentCapability = 'deployment:preflight' | 'deployment:reserve' | 'deployment:registry-push' | 'deployment:release-read' | 'deployment:promote-image' | 'deployment:adopt-existing' | 'deployment:status' | 'deployment:create-greenfield' | 'deployment:promote-route' | 'deployment:rollback-image' | 'deployment:rollback-route' | 'deployment:retry' | 'deployment:cleanup';
|
|
7
7
|
/**
|
|
8
8
|
* Server-persisted authority for one logical service. These grants are never
|
|
9
9
|
* accepted from the identity payload supplied by a caller; Cloudly reloads
|
package/dist_ts/data/user.js
CHANGED
|
@@ -4,6 +4,7 @@ const serviceDeploymentCapabilities = new Set([
|
|
|
4
4
|
'deployment:registry-push',
|
|
5
5
|
'deployment:release-read',
|
|
6
6
|
'deployment:promote-image',
|
|
7
|
+
'deployment:adopt-existing',
|
|
7
8
|
'deployment:status',
|
|
8
9
|
'deployment:create-greenfield',
|
|
9
10
|
'deployment:promote-route',
|
|
@@ -49,6 +50,10 @@ export const validateServiceDeploymentGrant = (grantArg) => {
|
|
|
49
50
|
&& !capabilities.includes('deployment:create-greenfield')) {
|
|
50
51
|
errors.push('an organization-service-slot grant must authorize greenfield creation');
|
|
51
52
|
}
|
|
53
|
+
if (capabilities && grant.scope !== 'service'
|
|
54
|
+
&& capabilities.includes('deployment:adopt-existing')) {
|
|
55
|
+
errors.push('deployment:adopt-existing requires an existing-service grant');
|
|
56
|
+
}
|
|
52
57
|
return errors;
|
|
53
58
|
};
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXNlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2RhdGEvdXNlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUE4Q0EsTUFBTSw2QkFBNkIsR0FBRyxJQUFJLEdBQUcsQ0FBK0I7SUFDMUUsc0JBQXNCO0lBQ3RCLG9CQUFvQjtJQUNwQiwwQkFBMEI7SUFDMUIseUJBQXlCO0lBQ3pCLDBCQUEwQjtJQUMxQiwyQkFBMkI7SUFDM0IsbUJBQW1CO0lBQ25CLDhCQUE4QjtJQUM5QiwwQkFBMEI7SUFDMUIsMkJBQTJCO0lBQzNCLDJCQUEyQjtJQUMzQixrQkFBa0I7SUFDbEIsb0JBQW9CO0NBQ3JCLENBQUMsQ0FBQztBQUVILE1BQU0saUNBQWlDLEdBQUcscUNBQXFDLENBQUM7QUFFaEYsTUFBTSxDQUFDLE1BQU0sOEJBQThCLEdBQUcsQ0FDNUMsUUFBaUIsRUFDUCxFQUFFO0lBQ1osTUFBTSxNQUFNLEdBQWEsRUFBRSxDQUFDO0lBQzVCLElBQUksQ0FBQyxRQUFRLElBQUksT0FBTyxRQUFRLEtBQUssUUFBUSxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQztRQUN6RSxPQUFPLENBQUMseUJBQXlCLENBQUMsQ0FBQztJQUNyQyxDQUFDO0lBQ0QsTUFBTSxLQUFLLEdBQUcsUUFBbUMsQ0FBQztJQUNsRCxJQUFJLEtBQUssQ0FBQyxLQUFLLEtBQUssU0FBUyxJQUFJLEtBQUssQ0FBQyxLQUFLLEtBQUssMkJBQTJCLEVBQUUsQ0FBQztRQUM3RSxNQUFNLENBQUMsSUFBSSxDQUFDLHlFQUF5RSxDQUFDLENBQUM7SUFDekYsQ0FBQztJQUNELElBQUksT0FBTyxLQUFLLENBQUMsY0FBYyxLQUFLLFFBQVE7V0FDdkMsQ0FBQyxpQ0FBaUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLGNBQWMsQ0FBQyxFQUFFLENBQUM7UUFDbkUsTUFBTSxDQUFDLElBQUksQ0FBQyx1REFBdUQsQ0FBQyxDQUFDO0lBQ3ZFLENBQUM7SUFDRCxJQUFJLE9BQU8sS0FBSyxDQUFDLFNBQVMsS0FBSyxRQUFRO1dBQ2xDLENBQUMsaUNBQWlDLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDO1FBQzlELE1BQU0sQ0FBQyxJQUFJLENBQUMsa0RBQWtELENBQUMsQ0FBQztJQUNsRSxDQUFDO0lBQ0QsTUFBTSxZQUFZLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDO1FBQ3BELENBQUMsQ0FBQyxLQUFLLENBQUMsWUFBWTtRQUNwQixDQUFDLENBQUMsU0FBUyxDQUFDO0lBQ2QsSUFBSSxDQUFDLFlBQVk7V0FDWixZQUFZLENBQUMsTUFBTSxHQUFHLENBQUM7V0FDdkIsWUFBWSxDQUFDLE1BQU0sR0FBRyw2QkFBNkIsQ0FBQyxJQUFJO1dBQ3hELElBQUksR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDLElBQUksS0FBSyxZQUFZLENBQUMsTUFBTTtXQUNsRCxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUMsYUFBYSxFQUFFLEVBQUUsQ0FBQyxDQUN0QyxPQUFPLGFBQWEsS0FBSyxRQUFRO2VBQzlCLENBQUMsNkJBQTZCLENBQUMsR0FBRyxDQUFDLGFBQTZDLENBQUMsQ0FDckYsQ0FBQyxFQUFFLENBQUM7UUFDTCxNQUFNLENBQUMsSUFBSSxDQUFDLGtGQUFrRixDQUFDLENBQUM7SUFDbEcsQ0FBQztJQUNELElBQUksWUFBWSxJQUFJLEtBQUssQ0FBQyxLQUFLLEtBQUssU0FBUztXQUN4QyxZQUFZLENBQUMsUUFBUSxDQUFDLDhCQUE4QixDQUFDLEVBQUUsQ0FBQztRQUMzRCxNQUFNLENBQUMsSUFBSSxDQUFDLGdFQUFnRSxDQUFDLENBQUM7SUFDaEYsQ0FBQztJQUNELElBQUksWUFBWSxJQUFJLEtBQUssQ0FBQyxLQUFLLEtBQUssMkJBQTJCO1dBQzFELENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FBQyw4QkFBOEIsQ0FBQyxFQUFFLENBQUM7UUFDNUQsTUFBTSxDQUFDLElBQUksQ0FBQyx1RUFBdUUsQ0FBQyxDQUFDO0lBQ3ZGLENBQUM7SUFDRCxJQUFJLFlBQVksSUFBSSxLQUFLLENBQUMsS0FBSyxLQUFLLFNBQVM7V0FDeEMsWUFBWSxDQUFDLFFBQVEsQ0FBQywyQkFBMkIsQ0FBQyxFQUFFLENBQUM7UUFDeEQsTUFBTSxDQUFDLElBQUksQ0FBQyw4REFBOEQsQ0FBQyxDQUFDO0lBQzlFLENBQUM7SUFDRCxPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDLENBQUMifQ==
|
|
@@ -7,6 +7,26 @@ import type { IImageRelease } from '../data/immutableimage.js';
|
|
|
7
7
|
import type { IDeploymentPreflightReport, IDeploymentPreflightRequestData } from '../data/deploymentpreflight.js';
|
|
8
8
|
import type { IDeploymentReservationInput, IServiceDeploymentOperation, IServiceDeploymentStatus } from '../data/deploymentoperation.js';
|
|
9
9
|
import type { TSha256Digest } from '../data/immutableimage.js';
|
|
10
|
+
import type { IServiceDeploymentAdoptionInput, IServiceDeploymentAdoptionPreflightInput, IServiceDeploymentAdoptionReport, IServiceDeploymentAdoptionResult } from '../data/deploymentadoption.js';
|
|
11
|
+
export interface IRequest_Any_Cloudly_GetServiceDeploymentAdoptionPreflight extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_Any_Cloudly_GetServiceDeploymentAdoptionPreflight> {
|
|
12
|
+
method: 'getServiceDeploymentAdoptionPreflight';
|
|
13
|
+
request: IServiceDeploymentAdoptionPreflightInput & {
|
|
14
|
+
identity: IIdentityCredential;
|
|
15
|
+
};
|
|
16
|
+
response: {
|
|
17
|
+
report: IServiceDeploymentAdoptionReport;
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
export interface IRequest_Any_Cloudly_AdoptServiceDeployment extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_Any_Cloudly_AdoptServiceDeployment> {
|
|
21
|
+
method: 'adoptServiceDeployment';
|
|
22
|
+
request: IServiceDeploymentAdoptionInput & {
|
|
23
|
+
identity: IIdentityCredential;
|
|
24
|
+
};
|
|
25
|
+
response: {
|
|
26
|
+
service: IService;
|
|
27
|
+
result: IServiceDeploymentAdoptionResult;
|
|
28
|
+
};
|
|
29
|
+
}
|
|
10
30
|
export interface IRequest_Any_Cloudly_GetDeploymentPreflight extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_Any_Cloudly_GetDeploymentPreflight> {
|
|
11
31
|
method: 'getDeploymentPreflight';
|
|
12
32
|
request: IDeploymentPreflightRequestData & {
|
package/package.json
CHANGED
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -0,0 +1,450 @@
|
|
|
1
|
+
import type {
|
|
2
|
+
IDeploymentPreflightRuntimeTask,
|
|
3
|
+
IOciPlatformDescriptorSummary,
|
|
4
|
+
} from './deploymentpreflight.js';
|
|
5
|
+
import type {
|
|
6
|
+
IImmutableImageDeploymentPlan,
|
|
7
|
+
IImmutableImageTargetScope,
|
|
8
|
+
TOciManifestMediaType,
|
|
9
|
+
TSha256Digest,
|
|
10
|
+
} from './immutableimage.js';
|
|
11
|
+
import { normalizeImmutableReleaseTag, normalizeSha256Digest } from './immutableimage.js';
|
|
12
|
+
import type { IRegistryTarget } from './registry.js';
|
|
13
|
+
|
|
14
|
+
export type TServiceDeploymentAdoptionDecision = 'GO' | 'NO-GO';
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* Canonical sha256 hash of the complete adoption preflight snapshot. It is a
|
|
18
|
+
* state/TOCTOU fence and must never be substituted with the OCI image digest.
|
|
19
|
+
*/
|
|
20
|
+
export type TServiceDeploymentAdoptionDigest = TSha256Digest & {
|
|
21
|
+
readonly __serviceDeploymentAdoptionDigest: unique symbol;
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
export type TServiceDeploymentAdoptionBlockerCode =
|
|
25
|
+
| 'INVALID_REQUEST'
|
|
26
|
+
| 'AUTHORIZATION_MISSING'
|
|
27
|
+
| 'SERVICE_NOT_FOUND'
|
|
28
|
+
| 'SERVICE_OWNERSHIP_MISMATCH'
|
|
29
|
+
| 'SERVICE_ALREADY_IMMUTABLE'
|
|
30
|
+
| 'SERVICE_STATE_CONFLICT'
|
|
31
|
+
| 'REGISTRY_TARGET_MISSING'
|
|
32
|
+
| 'REGISTRY_REFERENCE_INVALID'
|
|
33
|
+
| 'REGISTRY_DIGEST_MISSING'
|
|
34
|
+
| 'OCI_INDEX_REQUIRED'
|
|
35
|
+
| 'OCI_PLATFORM_MISSING'
|
|
36
|
+
| 'RELEASE_NOT_FOUND'
|
|
37
|
+
| 'RELEASE_TAG_AMBIGUOUS'
|
|
38
|
+
| 'TARGET_SCOPE_UNAVAILABLE'
|
|
39
|
+
| 'RUNTIME_ATTESTATION_INCOMPLETE'
|
|
40
|
+
| 'RUNTIME_DIGEST_MISMATCH';
|
|
41
|
+
|
|
42
|
+
export interface IServiceDeploymentAdoptionBlocker {
|
|
43
|
+
code: TServiceDeploymentAdoptionBlockerCode;
|
|
44
|
+
message: string;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
export interface IServiceDeploymentAdoptionPreflightInput {
|
|
48
|
+
requestId: string;
|
|
49
|
+
organizationId: string;
|
|
50
|
+
serviceId: string;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
export interface IServiceDeploymentAdoptionInput
|
|
54
|
+
extends IServiceDeploymentAdoptionPreflightInput {
|
|
55
|
+
idempotencyKey: string;
|
|
56
|
+
expectedAdoptionDigest: TServiceDeploymentAdoptionDigest;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
interface IServiceDeploymentAdoptionReportBase {
|
|
60
|
+
schemaVersion: 1;
|
|
61
|
+
mutationPerformed: false;
|
|
62
|
+
requestId: string;
|
|
63
|
+
generatedAt: number;
|
|
64
|
+
runtimeAttestation: {
|
|
65
|
+
requiredReplicaCount: number;
|
|
66
|
+
observedReplicaCount: number;
|
|
67
|
+
healthyReplicaCount: number;
|
|
68
|
+
observedDigestReplicaCount: number;
|
|
69
|
+
observedDigestConsistent: boolean;
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
interface IServiceDeploymentAdoptionServiceSnapshot {
|
|
74
|
+
organizationId: string;
|
|
75
|
+
serviceId: string;
|
|
76
|
+
serviceName: string;
|
|
77
|
+
imageId: string;
|
|
78
|
+
deployOnPush: boolean;
|
|
79
|
+
immutableImageRequired: boolean;
|
|
80
|
+
configuredReference: string;
|
|
81
|
+
/** Hash of the complete persisted pre-adoption service configuration. */
|
|
82
|
+
configurationDigest: TSha256Digest;
|
|
83
|
+
registryTarget: IRegistryTarget;
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
interface IServiceDeploymentAdoptionRegistrySnapshot {
|
|
87
|
+
tag?: string;
|
|
88
|
+
digest?: TSha256Digest;
|
|
89
|
+
mediaType?: TOciManifestMediaType;
|
|
90
|
+
platforms: IOciPlatformDescriptorSummary[];
|
|
91
|
+
releaseId?: string;
|
|
92
|
+
releaseTag?: string;
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
export interface IServiceDeploymentAdoptionGoReport
|
|
96
|
+
extends IServiceDeploymentAdoptionReportBase {
|
|
97
|
+
decision: 'GO';
|
|
98
|
+
service: IServiceDeploymentAdoptionServiceSnapshot & {
|
|
99
|
+
deployOnPush: true;
|
|
100
|
+
immutableImageRequired: false;
|
|
101
|
+
};
|
|
102
|
+
registry: IServiceDeploymentAdoptionRegistrySnapshot & {
|
|
103
|
+
tag: string;
|
|
104
|
+
digest: TSha256Digest;
|
|
105
|
+
mediaType:
|
|
106
|
+
| 'application/vnd.oci.image.index.v1+json'
|
|
107
|
+
| 'application/vnd.docker.distribution.manifest.list.v2+json';
|
|
108
|
+
platforms: [IOciPlatformDescriptorSummary, ...IOciPlatformDescriptorSummary[]];
|
|
109
|
+
releaseId: string;
|
|
110
|
+
releaseTag: string;
|
|
111
|
+
};
|
|
112
|
+
runtimeTasks: [IDeploymentPreflightRuntimeTask, ...IDeploymentPreflightRuntimeTask[]];
|
|
113
|
+
targetScope: IImmutableImageTargetScope;
|
|
114
|
+
adoptionDigest: TServiceDeploymentAdoptionDigest;
|
|
115
|
+
blockers: [];
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
export interface IServiceDeploymentAdoptionNoGoReport
|
|
119
|
+
extends IServiceDeploymentAdoptionReportBase {
|
|
120
|
+
decision: 'NO-GO';
|
|
121
|
+
service?: IServiceDeploymentAdoptionServiceSnapshot;
|
|
122
|
+
registry: IServiceDeploymentAdoptionRegistrySnapshot;
|
|
123
|
+
runtimeTasks: IDeploymentPreflightRuntimeTask[];
|
|
124
|
+
targetScope?: IImmutableImageTargetScope;
|
|
125
|
+
adoptionDigest?: never;
|
|
126
|
+
blockers: [IServiceDeploymentAdoptionBlocker, ...IServiceDeploymentAdoptionBlocker[]];
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
export type IServiceDeploymentAdoptionReport =
|
|
130
|
+
| IServiceDeploymentAdoptionGoReport
|
|
131
|
+
| IServiceDeploymentAdoptionNoGoReport;
|
|
132
|
+
|
|
133
|
+
export interface IServiceDeploymentAdoptionResult {
|
|
134
|
+
adoptionId: string;
|
|
135
|
+
adoptionDigest: TServiceDeploymentAdoptionDigest;
|
|
136
|
+
idempotentReplay: boolean;
|
|
137
|
+
plan: IImmutableImageDeploymentPlan;
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
const boundaryIdentifierRegex = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
|
|
141
|
+
const indexMediaTypes = new Set<TOciManifestMediaType>([
|
|
142
|
+
'application/vnd.oci.image.index.v1+json',
|
|
143
|
+
'application/vnd.docker.distribution.manifest.list.v2+json',
|
|
144
|
+
]);
|
|
145
|
+
const adoptionBlockerCodes = new Set<TServiceDeploymentAdoptionBlockerCode>([
|
|
146
|
+
'INVALID_REQUEST',
|
|
147
|
+
'AUTHORIZATION_MISSING',
|
|
148
|
+
'SERVICE_NOT_FOUND',
|
|
149
|
+
'SERVICE_OWNERSHIP_MISMATCH',
|
|
150
|
+
'SERVICE_ALREADY_IMMUTABLE',
|
|
151
|
+
'SERVICE_STATE_CONFLICT',
|
|
152
|
+
'REGISTRY_TARGET_MISSING',
|
|
153
|
+
'REGISTRY_REFERENCE_INVALID',
|
|
154
|
+
'REGISTRY_DIGEST_MISSING',
|
|
155
|
+
'OCI_INDEX_REQUIRED',
|
|
156
|
+
'OCI_PLATFORM_MISSING',
|
|
157
|
+
'RELEASE_NOT_FOUND',
|
|
158
|
+
'RELEASE_TAG_AMBIGUOUS',
|
|
159
|
+
'TARGET_SCOPE_UNAVAILABLE',
|
|
160
|
+
'RUNTIME_ATTESTATION_INCOMPLETE',
|
|
161
|
+
'RUNTIME_DIGEST_MISMATCH',
|
|
162
|
+
]);
|
|
163
|
+
|
|
164
|
+
const isRecord = (valueArg: unknown): valueArg is Record<string, unknown> =>
|
|
165
|
+
Boolean(valueArg) && typeof valueArg === 'object' && !Array.isArray(valueArg);
|
|
166
|
+
|
|
167
|
+
const isBoundedIdentifier = (valueArg: unknown): valueArg is string =>
|
|
168
|
+
typeof valueArg === 'string' && boundaryIdentifierRegex.test(valueArg);
|
|
169
|
+
|
|
170
|
+
const isCanonicalDigest = (valueArg: unknown): valueArg is TSha256Digest =>
|
|
171
|
+
Boolean(normalizeSha256Digest(valueArg)) && normalizeSha256Digest(valueArg) === valueArg;
|
|
172
|
+
|
|
173
|
+
const isNonNegativeInteger = (valueArg: unknown): valueArg is number =>
|
|
174
|
+
Number.isSafeInteger(valueArg) && (valueArg as number) >= 0;
|
|
175
|
+
|
|
176
|
+
export const validateServiceDeploymentAdoptionPreflightInput = (
|
|
177
|
+
inputArg: unknown,
|
|
178
|
+
): string[] => {
|
|
179
|
+
if (!isRecord(inputArg)) return ['adoption preflight input must be an object'];
|
|
180
|
+
const errors: string[] = [];
|
|
181
|
+
if (!isBoundedIdentifier(inputArg.requestId)) {
|
|
182
|
+
errors.push('requestId must be a bounded canonical identifier');
|
|
183
|
+
}
|
|
184
|
+
for (const key of ['organizationId', 'serviceId'] as const) {
|
|
185
|
+
if (!isBoundedIdentifier(inputArg[key])) {
|
|
186
|
+
errors.push(`${key} must be a bounded canonical identifier`);
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
return errors;
|
|
190
|
+
};
|
|
191
|
+
|
|
192
|
+
export const validateServiceDeploymentAdoptionInput = (inputArg: unknown): string[] => {
|
|
193
|
+
const errors = validateServiceDeploymentAdoptionPreflightInput(inputArg);
|
|
194
|
+
if (!isRecord(inputArg)) return errors;
|
|
195
|
+
if (!isBoundedIdentifier(inputArg.idempotencyKey)) {
|
|
196
|
+
errors.push('idempotencyKey must be a bounded canonical identifier');
|
|
197
|
+
}
|
|
198
|
+
if (!isCanonicalDigest(inputArg.expectedAdoptionDigest)) {
|
|
199
|
+
errors.push('expectedAdoptionDigest must be a canonical sha256 digest');
|
|
200
|
+
}
|
|
201
|
+
return errors;
|
|
202
|
+
};
|
|
203
|
+
|
|
204
|
+
export const validateServiceDeploymentAdoptionReport = (reportArg: unknown): string[] => {
|
|
205
|
+
if (!isRecord(reportArg)) return ['adoption report must be an object'];
|
|
206
|
+
const errors: string[] = [];
|
|
207
|
+
if (reportArg.schemaVersion !== 1) errors.push('schemaVersion must be 1');
|
|
208
|
+
if (reportArg.mutationPerformed !== false) {
|
|
209
|
+
errors.push('adoption preflight must be mutation-free');
|
|
210
|
+
}
|
|
211
|
+
if (!isBoundedIdentifier(reportArg.requestId)) {
|
|
212
|
+
errors.push('requestId must be a bounded canonical identifier');
|
|
213
|
+
}
|
|
214
|
+
if (!isNonNegativeInteger(reportArg.generatedAt)) {
|
|
215
|
+
errors.push('generatedAt must be a non-negative integer');
|
|
216
|
+
}
|
|
217
|
+
if (reportArg.decision !== 'GO' && reportArg.decision !== 'NO-GO') {
|
|
218
|
+
errors.push('decision must be GO or NO-GO');
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
const attestation = reportArg.runtimeAttestation;
|
|
222
|
+
if (!isRecord(attestation)) {
|
|
223
|
+
errors.push('runtimeAttestation must be an object');
|
|
224
|
+
} else {
|
|
225
|
+
for (const key of [
|
|
226
|
+
'requiredReplicaCount',
|
|
227
|
+
'observedReplicaCount',
|
|
228
|
+
'healthyReplicaCount',
|
|
229
|
+
'observedDigestReplicaCount',
|
|
230
|
+
] as const) {
|
|
231
|
+
if (!isNonNegativeInteger(attestation[key])) {
|
|
232
|
+
errors.push(`runtimeAttestation.${key} must be a non-negative integer`);
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
if (typeof attestation.observedDigestConsistent !== 'boolean') {
|
|
236
|
+
errors.push('runtimeAttestation.observedDigestConsistent must be boolean');
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
|
|
240
|
+
const blockers = reportArg.blockers;
|
|
241
|
+
if (!Array.isArray(blockers)) {
|
|
242
|
+
errors.push('blockers must be an array');
|
|
243
|
+
} else {
|
|
244
|
+
for (const blocker of blockers) {
|
|
245
|
+
if (!isRecord(blocker)
|
|
246
|
+
|| !adoptionBlockerCodes.has(blocker.code as TServiceDeploymentAdoptionBlockerCode)
|
|
247
|
+
|| typeof blocker.message !== 'string'
|
|
248
|
+
|| !blocker.message.trim()) {
|
|
249
|
+
errors.push('each blocker must contain a supported code and non-empty message');
|
|
250
|
+
break;
|
|
251
|
+
}
|
|
252
|
+
}
|
|
253
|
+
}
|
|
254
|
+
|
|
255
|
+
if (reportArg.decision === 'NO-GO') {
|
|
256
|
+
if (Array.isArray(blockers) && blockers.length === 0) {
|
|
257
|
+
errors.push('a NO-GO report must contain at least one blocker');
|
|
258
|
+
}
|
|
259
|
+
if (reportArg.adoptionDigest !== undefined) {
|
|
260
|
+
errors.push('a NO-GO report must not contain an adoption digest');
|
|
261
|
+
}
|
|
262
|
+
return errors;
|
|
263
|
+
}
|
|
264
|
+
if (reportArg.decision !== 'GO') return errors;
|
|
265
|
+
|
|
266
|
+
if (Array.isArray(blockers) && blockers.length !== 0) {
|
|
267
|
+
errors.push('a GO report must not contain blockers');
|
|
268
|
+
}
|
|
269
|
+
if (!isCanonicalDigest(reportArg.adoptionDigest)) {
|
|
270
|
+
errors.push('a GO report requires a canonical adoption digest');
|
|
271
|
+
}
|
|
272
|
+
|
|
273
|
+
const service = reportArg.service;
|
|
274
|
+
const registry = reportArg.registry;
|
|
275
|
+
const targetScope = reportArg.targetScope;
|
|
276
|
+
const runtimeTasks = reportArg.runtimeTasks;
|
|
277
|
+
if (!isRecord(service)) {
|
|
278
|
+
errors.push('a GO report requires a service snapshot');
|
|
279
|
+
} else {
|
|
280
|
+
for (const key of ['organizationId', 'serviceId', 'serviceName', 'imageId'] as const) {
|
|
281
|
+
if (!isBoundedIdentifier(service[key])) errors.push(`service.${key} is invalid`);
|
|
282
|
+
}
|
|
283
|
+
if (service.deployOnPush !== true || service.immutableImageRequired !== false) {
|
|
284
|
+
errors.push('a GO report requires the legacy mutable service state');
|
|
285
|
+
}
|
|
286
|
+
if (typeof service.configuredReference !== 'string' || !service.configuredReference.trim()) {
|
|
287
|
+
errors.push('service.configuredReference must be non-empty');
|
|
288
|
+
}
|
|
289
|
+
if (!isCanonicalDigest(service.configurationDigest)) {
|
|
290
|
+
errors.push('service.configurationDigest must be a canonical sha256 digest');
|
|
291
|
+
}
|
|
292
|
+
if (!isRecord(service.registryTarget)) {
|
|
293
|
+
errors.push('service.registryTarget must be present');
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
|
|
297
|
+
let registryDigest: TSha256Digest | undefined;
|
|
298
|
+
if (!isRecord(registry)) {
|
|
299
|
+
errors.push('a GO report requires a registry snapshot');
|
|
300
|
+
} else {
|
|
301
|
+
if (!normalizeImmutableReleaseTag(registry.tag) || registry.tag !== registry.releaseTag) {
|
|
302
|
+
errors.push('registry tag and releaseTag must be the same immutable tag');
|
|
303
|
+
}
|
|
304
|
+
if (!isCanonicalDigest(registry.digest)) {
|
|
305
|
+
errors.push('registry.digest must be a canonical sha256 digest');
|
|
306
|
+
} else {
|
|
307
|
+
registryDigest = registry.digest;
|
|
308
|
+
if (reportArg.adoptionDigest === registry.digest) {
|
|
309
|
+
errors.push('adoption digest must be a distinct full-state fence, not the image digest');
|
|
310
|
+
}
|
|
311
|
+
}
|
|
312
|
+
if (!indexMediaTypes.has(registry.mediaType as TOciManifestMediaType)) {
|
|
313
|
+
errors.push('registry.mediaType must identify an OCI image index');
|
|
314
|
+
}
|
|
315
|
+
if (!isBoundedIdentifier(registry.releaseId)) {
|
|
316
|
+
errors.push('registry.releaseId must be a bounded canonical identifier');
|
|
317
|
+
}
|
|
318
|
+
if (!Array.isArray(registry.platforms) || registry.platforms.length === 0) {
|
|
319
|
+
errors.push('registry.platforms must contain OCI platform evidence');
|
|
320
|
+
} else {
|
|
321
|
+
for (const architecture of ['amd64', 'arm64']) {
|
|
322
|
+
if (!registry.platforms.some((platformArg) => isRecord(platformArg)
|
|
323
|
+
&& platformArg.os === 'linux'
|
|
324
|
+
&& platformArg.architecture === architecture
|
|
325
|
+
&& platformArg.runnable === true
|
|
326
|
+
&& platformArg.manifestPresent === true
|
|
327
|
+
&& isCanonicalDigest(platformArg.digest))) {
|
|
328
|
+
errors.push(`registry.platforms must contain runnable linux/${architecture} evidence`);
|
|
329
|
+
}
|
|
330
|
+
}
|
|
331
|
+
}
|
|
332
|
+
}
|
|
333
|
+
|
|
334
|
+
let requiredReplicaCount: number | undefined;
|
|
335
|
+
let targetNodeNames: string[] = [];
|
|
336
|
+
let replicasPerNode: number | undefined;
|
|
337
|
+
if (!isRecord(targetScope)) {
|
|
338
|
+
errors.push('a GO report requires an immutable target scope');
|
|
339
|
+
} else {
|
|
340
|
+
const clusterIds = targetScope.targetClusterIds;
|
|
341
|
+
const nodeNames = targetScope.targetNodeNames;
|
|
342
|
+
replicasPerNode = targetScope.replicasPerNode as number;
|
|
343
|
+
requiredReplicaCount = targetScope.requiredReplicaCount as number;
|
|
344
|
+
if (!Array.isArray(clusterIds) || clusterIds.length !== 1
|
|
345
|
+
|| clusterIds.some((valueArg) => !isBoundedIdentifier(valueArg))
|
|
346
|
+
|| new Set(clusterIds).size !== clusterIds.length) {
|
|
347
|
+
errors.push('targetScope.targetClusterIds must identify exactly one attested cluster');
|
|
348
|
+
}
|
|
349
|
+
if (!Array.isArray(nodeNames) || nodeNames.length === 0
|
|
350
|
+
|| nodeNames.some((valueArg) => !isBoundedIdentifier(valueArg))
|
|
351
|
+
|| new Set(nodeNames).size !== nodeNames.length) {
|
|
352
|
+
errors.push('targetScope.targetNodeNames must be non-empty and unique');
|
|
353
|
+
} else {
|
|
354
|
+
targetNodeNames = nodeNames as string[];
|
|
355
|
+
}
|
|
356
|
+
if (!Number.isSafeInteger(replicasPerNode) || replicasPerNode < 1) {
|
|
357
|
+
errors.push('targetScope.replicasPerNode must be a positive integer');
|
|
358
|
+
}
|
|
359
|
+
if (!Number.isSafeInteger(requiredReplicaCount) || requiredReplicaCount < 1
|
|
360
|
+
|| requiredReplicaCount !== targetNodeNames.length * (replicasPerNode || 0)) {
|
|
361
|
+
errors.push('targetScope.requiredReplicaCount must match nodes times replicas');
|
|
362
|
+
}
|
|
363
|
+
}
|
|
364
|
+
|
|
365
|
+
if (!Array.isArray(runtimeTasks) || runtimeTasks.length === 0) {
|
|
366
|
+
errors.push('a GO report requires runtime task evidence');
|
|
367
|
+
} else {
|
|
368
|
+
if (requiredReplicaCount !== undefined && runtimeTasks.length !== requiredReplicaCount) {
|
|
369
|
+
errors.push('runtime task count must equal the required replica count');
|
|
370
|
+
}
|
|
371
|
+
const deploymentIds = new Set<string>();
|
|
372
|
+
const taskCountsByNode = new Map<string, number>();
|
|
373
|
+
for (const task of runtimeTasks) {
|
|
374
|
+
if (!isRecord(task)
|
|
375
|
+
|| !isBoundedIdentifier(task.deploymentId)
|
|
376
|
+
|| deploymentIds.has(task.deploymentId as string)) {
|
|
377
|
+
errors.push('runtime task deployment IDs must be valid and unique');
|
|
378
|
+
continue;
|
|
379
|
+
}
|
|
380
|
+
deploymentIds.add(task.deploymentId as string);
|
|
381
|
+
if (!isBoundedIdentifier(task.nodeName) || !targetNodeNames.includes(task.nodeName)) {
|
|
382
|
+
errors.push('every runtime task must belong to the exact target node scope');
|
|
383
|
+
} else {
|
|
384
|
+
taskCountsByNode.set(task.nodeName, (taskCountsByNode.get(task.nodeName) || 0) + 1);
|
|
385
|
+
}
|
|
386
|
+
if (task.status !== 'running' || task.healthStatus !== 'healthy') {
|
|
387
|
+
errors.push('every runtime task must be running and healthy');
|
|
388
|
+
}
|
|
389
|
+
if (!registryDigest || task.observedDigest !== registryDigest) {
|
|
390
|
+
errors.push('every runtime task must attest the exact registry digest');
|
|
391
|
+
}
|
|
392
|
+
if (typeof task.imageReference !== 'string' || !task.imageReference.trim()) {
|
|
393
|
+
errors.push('every runtime task must identify its image reference');
|
|
394
|
+
}
|
|
395
|
+
}
|
|
396
|
+
if (replicasPerNode !== undefined
|
|
397
|
+
&& targetNodeNames.some((nodeNameArg) => taskCountsByNode.get(nodeNameArg) !== replicasPerNode)) {
|
|
398
|
+
errors.push('runtime task evidence must cover every target node and replica');
|
|
399
|
+
}
|
|
400
|
+
}
|
|
401
|
+
|
|
402
|
+
if (isRecord(attestation) && requiredReplicaCount !== undefined) {
|
|
403
|
+
if (attestation.requiredReplicaCount !== requiredReplicaCount
|
|
404
|
+
|| attestation.observedReplicaCount !== requiredReplicaCount
|
|
405
|
+
|| attestation.healthyReplicaCount !== requiredReplicaCount
|
|
406
|
+
|| attestation.observedDigestReplicaCount !== requiredReplicaCount
|
|
407
|
+
|| attestation.observedDigestConsistent !== true) {
|
|
408
|
+
errors.push('runtime attestation must consistently cover every required replica');
|
|
409
|
+
}
|
|
410
|
+
}
|
|
411
|
+
|
|
412
|
+
if (isRecord(service) && isRecord(service.registryTarget) && isRecord(registry)) {
|
|
413
|
+
const target = service.registryTarget;
|
|
414
|
+
if (target.protocol !== 'oci'
|
|
415
|
+
|| target.tag !== registry.tag
|
|
416
|
+
|| target.serviceId !== service.serviceId
|
|
417
|
+
|| target.imageId !== service.imageId
|
|
418
|
+
|| typeof target.registryHost !== 'string'
|
|
419
|
+
|| !target.registryHost
|
|
420
|
+
|| typeof target.repository !== 'string'
|
|
421
|
+
|| !target.repository
|
|
422
|
+
|| target.imageUrl !== `${target.registryHost}/${target.repository}:${target.tag}`) {
|
|
423
|
+
errors.push('service registry target must exactly bind the adopted service, image, and tag');
|
|
424
|
+
}
|
|
425
|
+
if (registryDigest) {
|
|
426
|
+
const digestPinnedReference = `${target.registryHost}/${target.repository}@${registryDigest}`;
|
|
427
|
+
const tagAndDigestReference = `${target.imageUrl}@${registryDigest}`;
|
|
428
|
+
const configuredReferences = new Set([
|
|
429
|
+
target.tag,
|
|
430
|
+
target.imageUrl,
|
|
431
|
+
digestPinnedReference,
|
|
432
|
+
tagAndDigestReference,
|
|
433
|
+
]);
|
|
434
|
+
if (!configuredReferences.has(service.configuredReference as string)) {
|
|
435
|
+
errors.push('service configured reference must exactly bind the adopted registry target');
|
|
436
|
+
}
|
|
437
|
+
const runtimeReferences = new Set([
|
|
438
|
+
target.imageUrl,
|
|
439
|
+
digestPinnedReference,
|
|
440
|
+
tagAndDigestReference,
|
|
441
|
+
]);
|
|
442
|
+
if (Array.isArray(runtimeTasks)
|
|
443
|
+
&& runtimeTasks.some((taskArg) => !isRecord(taskArg)
|
|
444
|
+
|| !runtimeReferences.has(taskArg.imageReference as string))) {
|
|
445
|
+
errors.push('every runtime task image reference must exactly bind the adopted registry target');
|
|
446
|
+
}
|
|
447
|
+
}
|
|
448
|
+
}
|
|
449
|
+
return errors;
|
|
450
|
+
};
|
|
@@ -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
|
|
package/ts/data/index.ts
CHANGED
|
@@ -2,6 +2,7 @@ export * from './cloudlyconfig.js';
|
|
|
2
2
|
export * from './cluster.js';
|
|
3
3
|
export * from './config.js';
|
|
4
4
|
export * from './deployment.js';
|
|
5
|
+
export * from './deploymentadoption.js';
|
|
5
6
|
export * from './deploymentoperation.js';
|
|
6
7
|
export * from './deploymentpreflight.js';
|
|
7
8
|
export * from './migration.js';
|
package/ts/data/user.ts
CHANGED
|
@@ -10,6 +10,7 @@ export type TServiceDeploymentCapability =
|
|
|
10
10
|
| 'deployment:registry-push'
|
|
11
11
|
| 'deployment:release-read'
|
|
12
12
|
| 'deployment:promote-image'
|
|
13
|
+
| 'deployment:adopt-existing'
|
|
13
14
|
| 'deployment:status'
|
|
14
15
|
| 'deployment:create-greenfield'
|
|
15
16
|
| 'deployment:promote-route'
|
|
@@ -49,6 +50,7 @@ const serviceDeploymentCapabilities = new Set<TServiceDeploymentCapability>([
|
|
|
49
50
|
'deployment:registry-push',
|
|
50
51
|
'deployment:release-read',
|
|
51
52
|
'deployment:promote-image',
|
|
53
|
+
'deployment:adopt-existing',
|
|
52
54
|
'deployment:status',
|
|
53
55
|
'deployment:create-greenfield',
|
|
54
56
|
'deployment:promote-route',
|
|
@@ -100,6 +102,10 @@ export const validateServiceDeploymentGrant = (
|
|
|
100
102
|
&& !capabilities.includes('deployment:create-greenfield')) {
|
|
101
103
|
errors.push('an organization-service-slot grant must authorize greenfield creation');
|
|
102
104
|
}
|
|
105
|
+
if (capabilities && grant.scope !== 'service'
|
|
106
|
+
&& capabilities.includes('deployment:adopt-existing')) {
|
|
107
|
+
errors.push('deployment:adopt-existing requires an existing-service grant');
|
|
108
|
+
}
|
|
103
109
|
return errors;
|
|
104
110
|
};
|
|
105
111
|
|
package/ts/requests/service.ts
CHANGED
|
@@ -15,6 +15,41 @@ import type {
|
|
|
15
15
|
IServiceDeploymentStatus,
|
|
16
16
|
} from '../data/deploymentoperation.js';
|
|
17
17
|
import type { TSha256Digest } from '../data/immutableimage.js';
|
|
18
|
+
import type {
|
|
19
|
+
IServiceDeploymentAdoptionInput,
|
|
20
|
+
IServiceDeploymentAdoptionPreflightInput,
|
|
21
|
+
IServiceDeploymentAdoptionReport,
|
|
22
|
+
IServiceDeploymentAdoptionResult,
|
|
23
|
+
} from '../data/deploymentadoption.js';
|
|
24
|
+
|
|
25
|
+
export interface IRequest_Any_Cloudly_GetServiceDeploymentAdoptionPreflight
|
|
26
|
+
extends plugins.typedrequestInterfaces.implementsTR<
|
|
27
|
+
plugins.typedrequestInterfaces.ITypedRequest,
|
|
28
|
+
IRequest_Any_Cloudly_GetServiceDeploymentAdoptionPreflight
|
|
29
|
+
> {
|
|
30
|
+
method: 'getServiceDeploymentAdoptionPreflight';
|
|
31
|
+
request: IServiceDeploymentAdoptionPreflightInput & {
|
|
32
|
+
identity: IIdentityCredential;
|
|
33
|
+
};
|
|
34
|
+
response: {
|
|
35
|
+
report: IServiceDeploymentAdoptionReport;
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
export interface IRequest_Any_Cloudly_AdoptServiceDeployment
|
|
40
|
+
extends plugins.typedrequestInterfaces.implementsTR<
|
|
41
|
+
plugins.typedrequestInterfaces.ITypedRequest,
|
|
42
|
+
IRequest_Any_Cloudly_AdoptServiceDeployment
|
|
43
|
+
> {
|
|
44
|
+
method: 'adoptServiceDeployment';
|
|
45
|
+
request: IServiceDeploymentAdoptionInput & {
|
|
46
|
+
identity: IIdentityCredential;
|
|
47
|
+
};
|
|
48
|
+
response: {
|
|
49
|
+
service: IService;
|
|
50
|
+
result: IServiceDeploymentAdoptionResult;
|
|
51
|
+
};
|
|
52
|
+
}
|
|
18
53
|
|
|
19
54
|
export interface IRequest_Any_Cloudly_GetDeploymentPreflight
|
|
20
55
|
extends plugins.typedrequestInterfaces.implementsTR<
|