@serve.zone/interfaces 32.50.0 → 32.51.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 +33 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/deploymentlegacyimport.d.ts +120 -6
- package/dist_ts/data/deploymentlegacyimport.js +289 -5
- package/dist_ts/requests/service.d.ts +9 -5
- package/package.json +2 -2
- package/readme.md +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/deploymentlegacyimport.ts +413 -13
- package/ts/requests/service.ts +12 -5
package/changelog.md
CHANGED
|
@@ -1,5 +1,38 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-10-06 - 32.51.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- A legacy service's runtime attestation is captured from an administrator's host observation, so
|
|
8
|
+
it no longer needs a fleet Coreflow session or Spark, which legacy hosts do not run.
|
|
9
|
+
`IRequest_Any_Cloudly_CaptureLegacyServiceRuntimeAttestation` now carries `hostObservation`
|
|
10
|
+
(`ILegacyServiceHostObservation`, `data/deploymentlegacyimport.ts`): the Swarm service name, spec
|
|
11
|
+
image and mode (`TLegacyHostSwarmServiceMode`, replicated with its desired replicas, or global),
|
|
12
|
+
and per replica the node hostname, Swarm task id, full container id, the engine's image store
|
|
13
|
+
(`TLegacyHostImageStore`), the container's image id, the image's `RepoDigests`, the container
|
|
14
|
+
state (`TLegacyHostContainerState`) and its health (`TLegacyHostContainerHealth`, `none` when no
|
|
15
|
+
healthcheck applies). `validateLegacyServiceHostObservation` judges its exact shape,
|
|
16
|
+
`selectLegacyServiceHostObservationRootDigest` names the one root every replica runs from the
|
|
17
|
+
service's own repository, and `judgeLegacyServiceHostObservation` judges it against that root as
|
|
18
|
+
Cloudly reads it: exactly the desired replicas of a replicated service, a spec image naming the
|
|
19
|
+
repository by the source tag or the root digest, every replica running and healthy or without a
|
|
20
|
+
healthcheck (`unhealthy` and `starting` are refused), and each container's image id the root
|
|
21
|
+
digest on the containerd image store or a platform image configuration digest of the root on the
|
|
22
|
+
classic store. The source tag need not still name the root.
|
|
23
|
+
`ILegacyServiceRuntimeAttestation.data.runtime` records `evidenceSource`
|
|
24
|
+
(`TLegacyServiceRuntimeEvidenceSource`, `administrator-host-observation`) and the
|
|
25
|
+
`hostObservation` it was built from; `validateLegacyServiceRuntimeAttestation` requires both and
|
|
26
|
+
that `requiredReplicaCount` and `tasks` are the observed desired replicas and Swarm tasks.
|
|
27
|
+
The capture request's `hostObservation` and the record's `evidenceSource`/`hostObservation` are
|
|
28
|
+
new required members, which stays a minor of the one common major 32 because the previous capture
|
|
29
|
+
had no success path on a fleet without a Coreflow session, no shipped store holds an attestation
|
|
30
|
+
record, and Cloudly is the only code consumer.
|
|
31
|
+
|
|
32
|
+
### Maintenance
|
|
33
|
+
|
|
34
|
+
- Release tooling: `@git.zone/tstest` 7.1.0 → 7.2.0. pnpm stays at 12.8.1 until 12.8.2 is seven days old (2026-10-07 01:15 UTC); `@types/node` stays at 26.6.3 until 26.6.4 is seven days old (2026-10-08 22:39 UTC).
|
|
35
|
+
|
|
3
36
|
## 2026-10-06 - 32.50.0
|
|
4
37
|
|
|
5
38
|
### Features
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/interfaces',
|
|
6
|
-
version: '32.
|
|
6
|
+
version: '32.51.0',
|
|
7
7
|
description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFNBQVM7SUFDbEIsV0FBVyxFQUFFLHVGQUF1RjtDQUNyRyxDQUFBIn0=
|
|
@@ -4,8 +4,10 @@ import type { TImmutableContainerPlatform, TOciManifestMediaType, TSha256Digest
|
|
|
4
4
|
* service already runs, instead of one built from a source revision.
|
|
5
5
|
*
|
|
6
6
|
* A legacy service without deployable source still has an image in Cloudly's registry and, until
|
|
7
|
-
* its runtime is frozen,
|
|
8
|
-
*
|
|
7
|
+
* its runtime is frozen, replicas running it. An administrator observes those replicas on the
|
|
8
|
+
* hosts that run them ({@link ILegacyServiceHostObservation}) while they still run, and Cloudly
|
|
9
|
+
* captures that observation once as a {@link ILegacyServiceRuntimeAttestation} after it verified
|
|
10
|
+
* the observed root against its own registry. A greenfield successor
|
|
9
11
|
* reservation names the attestation in `legacyImport` instead of a `sourceRevision`, and Cloudly
|
|
10
12
|
* then imports the attested image into the successor's own repository and release tag itself:
|
|
11
13
|
* the bytes never leave the registry and the release records that it was imported, not built.
|
|
@@ -44,18 +46,86 @@ export interface ILegacyServiceImageSource {
|
|
|
44
46
|
*/
|
|
45
47
|
platforms: ILegacyImagePlatformManifest[];
|
|
46
48
|
}
|
|
47
|
-
/**
|
|
49
|
+
/**
|
|
50
|
+
* One replica of the legacy service, observed running the attested digest in its own stated
|
|
51
|
+
* health: healthy, or running with no healthcheck that could state one.
|
|
52
|
+
*/
|
|
48
53
|
export interface ILegacyServiceRuntimeTaskAttestation {
|
|
54
|
+
/** The replica's runtime identity: the Swarm task it was observed as. */
|
|
49
55
|
deploymentId: string;
|
|
56
|
+
/** The hostname of the node the replica was observed on. */
|
|
50
57
|
nodeName: string;
|
|
51
58
|
observedDigest: TSha256Digest;
|
|
52
59
|
}
|
|
60
|
+
/**
|
|
61
|
+
* Where the runtime part of an attestation comes from. `administrator-host-observation`: an
|
|
62
|
+
* administrator read the legacy Swarm service and its containers on the hosts that run them, and
|
|
63
|
+
* Cloudly judged that observation against its own registry.
|
|
64
|
+
*/
|
|
65
|
+
export type TLegacyServiceRuntimeEvidenceSource = 'administrator-host-observation';
|
|
66
|
+
/** A container's state as the Docker engine reports it (`State.Status`). */
|
|
67
|
+
export type TLegacyHostContainerState = 'created' | 'running' | 'paused' | 'restarting' | 'removing' | 'exited' | 'dead';
|
|
68
|
+
/**
|
|
69
|
+
* A container's health as the Docker engine reports it (`State.Health.Status`). `none`: no
|
|
70
|
+
* healthcheck applies to the container — the image declares none and the service adds none — so
|
|
71
|
+
* the engine reports no health state at all.
|
|
72
|
+
*/
|
|
73
|
+
export type TLegacyHostContainerHealth = 'healthy' | 'unhealthy' | 'starting' | 'none';
|
|
74
|
+
/**
|
|
75
|
+
* The image store of the Docker engine that runs a container. On the `containerd` store a
|
|
76
|
+
* container's image id is the digest of the root it was pulled as; on the `classic` store it is
|
|
77
|
+
* the image configuration digest of the platform manifest the engine pulled.
|
|
78
|
+
*/
|
|
79
|
+
export type TLegacyHostImageStore = 'containerd' | 'classic';
|
|
80
|
+
/** A Swarm service's mode (`Spec.Mode`): a replicated service states its desired replicas. */
|
|
81
|
+
export type TLegacyHostSwarmServiceMode = {
|
|
82
|
+
kind: 'replicated';
|
|
83
|
+
desiredReplicas: number;
|
|
84
|
+
} | {
|
|
85
|
+
kind: 'global';
|
|
86
|
+
};
|
|
87
|
+
/** One replica of a legacy Swarm service, as an administrator read it on the node that runs it. */
|
|
88
|
+
export interface ILegacyHostReplicaObservation {
|
|
89
|
+
/** The hostname of the node the task runs on. */
|
|
90
|
+
nodeHostname: string;
|
|
91
|
+
/** The Swarm task id (25 lowercase base-36 characters). */
|
|
92
|
+
swarmTaskId: string;
|
|
93
|
+
/** The full container id of the task (64 lowercase hex characters). */
|
|
94
|
+
containerId: string;
|
|
95
|
+
imageStore: TLegacyHostImageStore;
|
|
96
|
+
/** The container's image id (`Image`), a sha256 digest. */
|
|
97
|
+
containerImageId: TSha256Digest;
|
|
98
|
+
/** The `RepoDigests` of the container's image, exactly as the engine lists them. */
|
|
99
|
+
imageRepoDigests: string[];
|
|
100
|
+
state: TLegacyHostContainerState;
|
|
101
|
+
health: TLegacyHostContainerHealth;
|
|
102
|
+
}
|
|
103
|
+
/**
|
|
104
|
+
* An administrator's observation of the legacy Swarm service of one legacy service and of every
|
|
105
|
+
* container its tasks run, read on the hosts while the legacy runtime still runs.
|
|
106
|
+
*
|
|
107
|
+
* It states facts, not conclusions: Cloudly judges it against its own registry
|
|
108
|
+
* ({@link judgeLegacyServiceHostObservation}) before it attests anything.
|
|
109
|
+
*/
|
|
110
|
+
export interface ILegacyServiceHostObservation {
|
|
111
|
+
/** The Swarm service name. */
|
|
112
|
+
swarmServiceName: string;
|
|
113
|
+
/** The image reference of the Swarm service spec (`Spec.TaskTemplate.ContainerSpec.Image`). */
|
|
114
|
+
specImage: string;
|
|
115
|
+
mode: TLegacyHostSwarmServiceMode;
|
|
116
|
+
/** When the administrator read the hosts, in milliseconds since the epoch. */
|
|
117
|
+
observedAt: number;
|
|
118
|
+
/** Every running task's replica, sorted by `swarmTaskId`. */
|
|
119
|
+
replicas: ILegacyHostReplicaObservation[];
|
|
120
|
+
}
|
|
53
121
|
/**
|
|
54
122
|
* Durable evidence, captured by an administrator while the legacy runtime still ran, that every
|
|
55
|
-
*
|
|
123
|
+
* desired replica of a legacy service ran, in its own stated health, exactly the registry root it
|
|
124
|
+
* names.
|
|
56
125
|
*
|
|
57
126
|
* Cloudly writes one and never changes it. A capture only succeeds on complete evidence, so a
|
|
58
|
-
* stored attestation is by construction one whose runtime digest is its source root digest
|
|
127
|
+
* stored attestation is by construction one whose runtime digest is its source root digest and
|
|
128
|
+
* whose runtime part is exactly the host observation it records.
|
|
59
129
|
*/
|
|
60
130
|
export interface ILegacyServiceRuntimeAttestation {
|
|
61
131
|
id: string;
|
|
@@ -64,11 +134,16 @@ export interface ILegacyServiceRuntimeAttestation {
|
|
|
64
134
|
organizationId: string;
|
|
65
135
|
source: ILegacyServiceImageSource;
|
|
66
136
|
runtime: {
|
|
137
|
+
/** The desired replicas of the observed replicated Swarm service. */
|
|
67
138
|
requiredReplicaCount: number;
|
|
139
|
+
/** Replicas observed running healthy, or running with no healthcheck (`health: 'none'`). */
|
|
68
140
|
healthyReplicaCount: number;
|
|
69
141
|
runtimeDigest: TSha256Digest;
|
|
70
|
-
/** Sorted by deploymentId, one per required replica. */
|
|
142
|
+
/** Sorted by deploymentId, one per required replica: the observed replicas. */
|
|
71
143
|
tasks: ILegacyServiceRuntimeTaskAttestation[];
|
|
144
|
+
evidenceSource: TLegacyServiceRuntimeEvidenceSource;
|
|
145
|
+
/** The observation the runtime part was built from, as the administrator submitted it. */
|
|
146
|
+
hostObservation: ILegacyServiceHostObservation;
|
|
72
147
|
};
|
|
73
148
|
capturedByUserId: string;
|
|
74
149
|
capturedAt: number;
|
|
@@ -89,4 +164,43 @@ export declare const isLegacyImagePlatformManifestMediaType: (valueArg: unknown)
|
|
|
89
164
|
/** True when a media type names an index of either family. */
|
|
90
165
|
export declare const isLegacyImageImportIndexMediaType: (valueArg: unknown) => valueArg is TLegacyImageImportIndexMediaType;
|
|
91
166
|
export declare const validateLegacyImageImportReference: (referenceArg: unknown) => string[];
|
|
167
|
+
/**
|
|
168
|
+
* The shape of a host observation: exact keys at every level, Docker's own value sets, at most 64
|
|
169
|
+
* replicas, unique and sorted by Swarm task id, each container observed once. It judges nothing
|
|
170
|
+
* against a registry; {@link judgeLegacyServiceHostObservation} does.
|
|
171
|
+
*/
|
|
172
|
+
export declare const validateLegacyServiceHostObservation: (observationArg: unknown, labelArg?: string) => string[];
|
|
173
|
+
/** True when a value is a well-formed host observation. */
|
|
174
|
+
export declare const isLegacyServiceHostObservation: (valueArg: unknown) => valueArg is ILegacyServiceHostObservation;
|
|
175
|
+
/**
|
|
176
|
+
* The one root digest every observed replica runs from the legacy service's own repository, which
|
|
177
|
+
* is the digest Cloudly then inspects in its registry. Refused when a replica's root from that
|
|
178
|
+
* repository is unknown, when the replicas run more than one root, or when nothing was observed.
|
|
179
|
+
*/
|
|
180
|
+
export declare const selectLegacyServiceHostObservationRootDigest: (argsArg: {
|
|
181
|
+
observation: ILegacyServiceHostObservation;
|
|
182
|
+
registryHost: string;
|
|
183
|
+
repository: string;
|
|
184
|
+
}) => {
|
|
185
|
+
rootDigest?: TSha256Digest;
|
|
186
|
+
errors: string[];
|
|
187
|
+
};
|
|
188
|
+
/**
|
|
189
|
+
* Judges a well-formed host observation against the registry source Cloudly inspected for it.
|
|
190
|
+
* Every rule an attestation's runtime part must meet:
|
|
191
|
+
*
|
|
192
|
+
* - the Swarm service is replicated, with at least one desired replica, and exactly its desired
|
|
193
|
+
* replicas were observed;
|
|
194
|
+
* - its spec image names the source repository by the source tag, by the root digest, or by both;
|
|
195
|
+
* - every replica is `running`, and `healthy` or without a healthcheck (`none`) — `unhealthy` and
|
|
196
|
+
* `starting` are refused;
|
|
197
|
+
* - every replica runs the source root from the source repository: its image lists
|
|
198
|
+
* `registryHost/repository@rootDigest`, and its image id is the root digest on the containerd
|
|
199
|
+
* store or one of the root's platform image configuration digests on the classic store.
|
|
200
|
+
*/
|
|
201
|
+
export declare const judgeLegacyServiceHostObservation: (argsArg: {
|
|
202
|
+
observation: ILegacyServiceHostObservation;
|
|
203
|
+
source: ILegacyServiceImageSource;
|
|
204
|
+
label?: string;
|
|
205
|
+
}) => string[];
|
|
92
206
|
export declare const validateLegacyServiceRuntimeAttestation: (attestationArg: unknown) => string[];
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { normalizeSha256Digest } from './immutableimage.js';
|
|
2
|
-
import { hasExactKeys, isPlainRecord } from '../private/dataproperties.js';
|
|
2
|
+
import { hasExactKeys, isPlainRecord, readDataElements, readDataProperties, } from '../private/dataproperties.js';
|
|
3
3
|
const identifierRegex = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
|
|
4
4
|
/** An OCI tag, the mutable `latest` included: the source tag is whatever the legacy service ran. */
|
|
5
5
|
const ociTagRegex = /^[A-Za-z0-9_][A-Za-z0-9._-]{0,127}$/;
|
|
@@ -16,6 +16,31 @@ const legacyImageImportIndexMediaTypes = [
|
|
|
16
16
|
'application/vnd.docker.distribution.manifest.list.v2+json',
|
|
17
17
|
];
|
|
18
18
|
const legacyImagePlatforms = ['linux/amd64', 'linux/arm64'];
|
|
19
|
+
const legacyHostContainerStates = [
|
|
20
|
+
'created',
|
|
21
|
+
'running',
|
|
22
|
+
'paused',
|
|
23
|
+
'restarting',
|
|
24
|
+
'removing',
|
|
25
|
+
'exited',
|
|
26
|
+
'dead',
|
|
27
|
+
];
|
|
28
|
+
const legacyHostContainerHealths = [
|
|
29
|
+
'healthy',
|
|
30
|
+
'unhealthy',
|
|
31
|
+
'starting',
|
|
32
|
+
'none',
|
|
33
|
+
];
|
|
34
|
+
/** The health states a replica may be attested in: healthy, or no healthcheck at all. */
|
|
35
|
+
const attestableLegacyHostContainerHealths = ['healthy', 'none'];
|
|
36
|
+
const legacyHostImageStores = ['containerd', 'classic'];
|
|
37
|
+
const swarmTaskIdRegex = /^[a-z0-9]{25}$/;
|
|
38
|
+
const containerIdRegex = /^[0-9a-f]{64}$/;
|
|
39
|
+
const swarmServiceNameRegex = /^[A-Za-z0-9][A-Za-z0-9_.-]{0,62}$/;
|
|
40
|
+
const nodeHostnameRegex = /^(?=.{1,253}$)[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?(?:\.[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$/;
|
|
41
|
+
const imageReferenceRegex = /^\S{1,512}$/;
|
|
42
|
+
const repoDigestRegex = /^[^\s@]{1,440}@sha256:[0-9a-f]{64}$/;
|
|
43
|
+
const maximumRepoDigestCount = 32;
|
|
19
44
|
const isIdentifier = (valueArg) => (typeof valueArg === 'string' && identifierRegex.test(valueArg));
|
|
20
45
|
const isCanonicalDigest = (valueArg) => (typeof valueArg === 'string' && normalizeSha256Digest(valueArg) === valueArg);
|
|
21
46
|
const isPositiveSafeInteger = (valueArg, maximumArg) => (typeof valueArg === 'number'
|
|
@@ -44,6 +69,232 @@ export const validateLegacyImageImportReference = (referenceArg) => {
|
|
|
44
69
|
}
|
|
45
70
|
return errors;
|
|
46
71
|
};
|
|
72
|
+
const validateHostReplicaObservation = (replicaArg, labelArg) => {
|
|
73
|
+
const replica = readDataProperties(replicaArg);
|
|
74
|
+
if (replica === null)
|
|
75
|
+
return [`${labelArg} must be a plain data object`];
|
|
76
|
+
const errors = [];
|
|
77
|
+
if (!hasExactKeys(replica, [
|
|
78
|
+
'nodeHostname',
|
|
79
|
+
'swarmTaskId',
|
|
80
|
+
'containerId',
|
|
81
|
+
'imageStore',
|
|
82
|
+
'containerImageId',
|
|
83
|
+
'imageRepoDigests',
|
|
84
|
+
'state',
|
|
85
|
+
'health',
|
|
86
|
+
])) {
|
|
87
|
+
errors.push(`${labelArg} must use its exact schema`);
|
|
88
|
+
}
|
|
89
|
+
if (typeof replica.nodeHostname !== 'string' || !nodeHostnameRegex.test(replica.nodeHostname)) {
|
|
90
|
+
errors.push(`${labelArg}.nodeHostname must be a host name`);
|
|
91
|
+
}
|
|
92
|
+
if (typeof replica.swarmTaskId !== 'string' || !swarmTaskIdRegex.test(replica.swarmTaskId)) {
|
|
93
|
+
errors.push(`${labelArg}.swarmTaskId must be a Swarm task id`);
|
|
94
|
+
}
|
|
95
|
+
if (typeof replica.containerId !== 'string' || !containerIdRegex.test(replica.containerId)) {
|
|
96
|
+
errors.push(`${labelArg}.containerId must be a full container id`);
|
|
97
|
+
}
|
|
98
|
+
if (!legacyHostImageStores.some((storeArg) => storeArg === replica.imageStore)) {
|
|
99
|
+
errors.push(`${labelArg}.imageStore must be containerd or classic`);
|
|
100
|
+
}
|
|
101
|
+
if (!isCanonicalDigest(replica.containerImageId)) {
|
|
102
|
+
errors.push(`${labelArg}.containerImageId must be a canonical sha256 digest`);
|
|
103
|
+
}
|
|
104
|
+
const repoDigests = readDataElements(replica.imageRepoDigests, maximumRepoDigestCount);
|
|
105
|
+
if (repoDigests === null
|
|
106
|
+
|| repoDigests.some((entryArg) => typeof entryArg !== 'string' || !repoDigestRegex.test(entryArg))
|
|
107
|
+
|| new Set(repoDigests).size !== repoDigests.length) {
|
|
108
|
+
errors.push(`${labelArg}.imageRepoDigests must be unique digested image references`);
|
|
109
|
+
}
|
|
110
|
+
if (!legacyHostContainerStates.some((stateArg) => stateArg === replica.state)) {
|
|
111
|
+
errors.push(`${labelArg}.state must be a Docker container state`);
|
|
112
|
+
}
|
|
113
|
+
if (!legacyHostContainerHealths.some((healthArg) => healthArg === replica.health)) {
|
|
114
|
+
errors.push(`${labelArg}.health must be healthy, unhealthy, starting or none`);
|
|
115
|
+
}
|
|
116
|
+
return errors;
|
|
117
|
+
};
|
|
118
|
+
const validateHostSwarmServiceMode = (modeArg, labelArg) => {
|
|
119
|
+
const mode = readDataProperties(modeArg);
|
|
120
|
+
if (mode === null)
|
|
121
|
+
return [`${labelArg} must be a plain data object`];
|
|
122
|
+
if (mode.kind === 'global') {
|
|
123
|
+
return hasExactKeys(mode, ['kind']) ? [] : [`${labelArg} must use its exact schema`];
|
|
124
|
+
}
|
|
125
|
+
if (mode.kind !== 'replicated')
|
|
126
|
+
return [`${labelArg}.kind must be replicated or global`];
|
|
127
|
+
const errors = [];
|
|
128
|
+
if (!hasExactKeys(mode, ['kind', 'desiredReplicas'])) {
|
|
129
|
+
errors.push(`${labelArg} must use its exact schema`);
|
|
130
|
+
}
|
|
131
|
+
if (typeof mode.desiredReplicas !== 'number'
|
|
132
|
+
|| !Number.isSafeInteger(mode.desiredReplicas)
|
|
133
|
+
|| mode.desiredReplicas < 0
|
|
134
|
+
|| mode.desiredReplicas > maximumReplicaCount) {
|
|
135
|
+
errors.push(`${labelArg}.desiredReplicas must be a bounded replica count`);
|
|
136
|
+
}
|
|
137
|
+
return errors;
|
|
138
|
+
};
|
|
139
|
+
/**
|
|
140
|
+
* The shape of a host observation: exact keys at every level, Docker's own value sets, at most 64
|
|
141
|
+
* replicas, unique and sorted by Swarm task id, each container observed once. It judges nothing
|
|
142
|
+
* against a registry; {@link judgeLegacyServiceHostObservation} does.
|
|
143
|
+
*/
|
|
144
|
+
export const validateLegacyServiceHostObservation = (observationArg, labelArg = 'hostObservation') => {
|
|
145
|
+
const observation = readDataProperties(observationArg);
|
|
146
|
+
if (observation === null)
|
|
147
|
+
return [`${labelArg} must be a plain data object`];
|
|
148
|
+
const errors = [];
|
|
149
|
+
if (!hasExactKeys(observation, ['swarmServiceName', 'specImage', 'mode', 'observedAt', 'replicas'])) {
|
|
150
|
+
errors.push(`${labelArg} must use its exact schema`);
|
|
151
|
+
}
|
|
152
|
+
if (typeof observation.swarmServiceName !== 'string'
|
|
153
|
+
|| !swarmServiceNameRegex.test(observation.swarmServiceName)) {
|
|
154
|
+
errors.push(`${labelArg}.swarmServiceName must be a Swarm service name`);
|
|
155
|
+
}
|
|
156
|
+
if (typeof observation.specImage !== 'string' || !imageReferenceRegex.test(observation.specImage)) {
|
|
157
|
+
errors.push(`${labelArg}.specImage must be a bounded image reference`);
|
|
158
|
+
}
|
|
159
|
+
errors.push(...validateHostSwarmServiceMode(observation.mode, `${labelArg}.mode`));
|
|
160
|
+
if (!isPositiveSafeInteger(observation.observedAt, Number.MAX_SAFE_INTEGER)) {
|
|
161
|
+
errors.push(`${labelArg}.observedAt must be a positive timestamp`);
|
|
162
|
+
}
|
|
163
|
+
const replicas = readDataElements(observation.replicas, maximumReplicaCount);
|
|
164
|
+
if (replicas === null) {
|
|
165
|
+
errors.push(`${labelArg}.replicas must be a list of at most ${maximumReplicaCount} replicas`);
|
|
166
|
+
return errors;
|
|
167
|
+
}
|
|
168
|
+
replicas.forEach((replicaArg, indexArg) => {
|
|
169
|
+
errors.push(...validateHostReplicaObservation(replicaArg, `${labelArg}.replicas[${indexArg}]`));
|
|
170
|
+
});
|
|
171
|
+
const readReplicaKey = (replicaArg, keyArg) => (readDataProperties(replicaArg)?.[keyArg]);
|
|
172
|
+
const taskIds = replicas.map((replicaArg) => readReplicaKey(replicaArg, 'swarmTaskId'));
|
|
173
|
+
const sortedTaskIds = taskIds
|
|
174
|
+
.filter((idArg) => typeof idArg === 'string')
|
|
175
|
+
.sort();
|
|
176
|
+
if (new Set(taskIds).size !== taskIds.length
|
|
177
|
+
|| JSON.stringify(taskIds) !== JSON.stringify(sortedTaskIds)) {
|
|
178
|
+
errors.push(`${labelArg}.replicas must be unique and sorted by swarmTaskId`);
|
|
179
|
+
}
|
|
180
|
+
const containerIds = replicas.map((replicaArg) => readReplicaKey(replicaArg, 'containerId'));
|
|
181
|
+
if (new Set(containerIds).size !== containerIds.length) {
|
|
182
|
+
errors.push(`${labelArg}.replicas must observe each container once`);
|
|
183
|
+
}
|
|
184
|
+
return errors;
|
|
185
|
+
};
|
|
186
|
+
/** True when a value is a well-formed host observation. */
|
|
187
|
+
export const isLegacyServiceHostObservation = (valueArg) => (validateLegacyServiceHostObservation(valueArg).length === 0);
|
|
188
|
+
/**
|
|
189
|
+
* The root digest one replica was pulled as from `registryHost/repository`.
|
|
190
|
+
*
|
|
191
|
+
* On the containerd store that is the container's image id, which the image's `RepoDigests` must
|
|
192
|
+
* list for the repository. On the classic store it is the one digest `RepoDigests` lists for the
|
|
193
|
+
* repository; none, or more than one, leaves the root unknown.
|
|
194
|
+
*/
|
|
195
|
+
const selectReplicaRootDigest = (replicaArg, repositoryReferenceArg) => {
|
|
196
|
+
const prefix = `${repositoryReferenceArg}@`;
|
|
197
|
+
const repositoryDigests = replicaArg.imageRepoDigests
|
|
198
|
+
.filter((entryArg) => entryArg.startsWith(prefix))
|
|
199
|
+
.map((entryArg) => normalizeSha256Digest(entryArg.slice(prefix.length)))
|
|
200
|
+
.filter((digestArg) => digestArg !== undefined);
|
|
201
|
+
if (replicaArg.imageStore === 'containerd') {
|
|
202
|
+
return repositoryDigests.includes(replicaArg.containerImageId)
|
|
203
|
+
? replicaArg.containerImageId
|
|
204
|
+
: undefined;
|
|
205
|
+
}
|
|
206
|
+
return repositoryDigests.length === 1 ? repositoryDigests[0] : undefined;
|
|
207
|
+
};
|
|
208
|
+
/**
|
|
209
|
+
* The one root digest every observed replica runs from the legacy service's own repository, which
|
|
210
|
+
* is the digest Cloudly then inspects in its registry. Refused when a replica's root from that
|
|
211
|
+
* repository is unknown, when the replicas run more than one root, or when nothing was observed.
|
|
212
|
+
*/
|
|
213
|
+
export const selectLegacyServiceHostObservationRootDigest = (argsArg) => {
|
|
214
|
+
const repositoryReference = `${argsArg.registryHost}/${argsArg.repository}`;
|
|
215
|
+
const errors = [];
|
|
216
|
+
const roots = new Set();
|
|
217
|
+
argsArg.observation.replicas.forEach((replicaArg, indexArg) => {
|
|
218
|
+
const root = selectReplicaRootDigest(replicaArg, repositoryReference);
|
|
219
|
+
if (root === undefined) {
|
|
220
|
+
errors.push(replicaArg.imageStore === 'containerd'
|
|
221
|
+
? `hostObservation.replicas[${indexArg}] image is not listed as ${repositoryReference}@<its image id>`
|
|
222
|
+
: `hostObservation.replicas[${indexArg}] image lists not exactly one digest of ${repositoryReference}`);
|
|
223
|
+
return;
|
|
224
|
+
}
|
|
225
|
+
roots.add(root);
|
|
226
|
+
});
|
|
227
|
+
if (argsArg.observation.replicas.length === 0) {
|
|
228
|
+
errors.push('hostObservation must observe at least one replica');
|
|
229
|
+
}
|
|
230
|
+
if (roots.size > 1) {
|
|
231
|
+
errors.push('hostObservation replicas run more than one root digest');
|
|
232
|
+
}
|
|
233
|
+
const [rootDigest] = [...roots];
|
|
234
|
+
return errors.length === 0 && rootDigest !== undefined ? { rootDigest, errors } : { errors };
|
|
235
|
+
};
|
|
236
|
+
/**
|
|
237
|
+
* Judges a well-formed host observation against the registry source Cloudly inspected for it.
|
|
238
|
+
* Every rule an attestation's runtime part must meet:
|
|
239
|
+
*
|
|
240
|
+
* - the Swarm service is replicated, with at least one desired replica, and exactly its desired
|
|
241
|
+
* replicas were observed;
|
|
242
|
+
* - its spec image names the source repository by the source tag, by the root digest, or by both;
|
|
243
|
+
* - every replica is `running`, and `healthy` or without a healthcheck (`none`) — `unhealthy` and
|
|
244
|
+
* `starting` are refused;
|
|
245
|
+
* - every replica runs the source root from the source repository: its image lists
|
|
246
|
+
* `registryHost/repository@rootDigest`, and its image id is the root digest on the containerd
|
|
247
|
+
* store or one of the root's platform image configuration digests on the classic store.
|
|
248
|
+
*/
|
|
249
|
+
export const judgeLegacyServiceHostObservation = (argsArg) => {
|
|
250
|
+
const label = argsArg.label ?? 'hostObservation';
|
|
251
|
+
const { observation, source } = argsArg;
|
|
252
|
+
const errors = [];
|
|
253
|
+
if (observation.mode.kind !== 'replicated') {
|
|
254
|
+
errors.push(`${label}.mode must be replicated: a legacy service runs as a replicated Swarm service`);
|
|
255
|
+
}
|
|
256
|
+
else if (observation.mode.desiredReplicas < 1) {
|
|
257
|
+
errors.push(`${label}.mode must desire at least one replica`);
|
|
258
|
+
}
|
|
259
|
+
else if (observation.replicas.length !== observation.mode.desiredReplicas) {
|
|
260
|
+
errors.push(`${label} must observe exactly the ${observation.mode.desiredReplicas} desired replicas`);
|
|
261
|
+
}
|
|
262
|
+
const repositoryReference = `${source.registryHost}/${source.repository}`;
|
|
263
|
+
const specImages = [
|
|
264
|
+
`${repositoryReference}:${source.tag}`,
|
|
265
|
+
`${repositoryReference}@${source.rootDigest}`,
|
|
266
|
+
`${repositoryReference}:${source.tag}@${source.rootDigest}`,
|
|
267
|
+
];
|
|
268
|
+
if (!specImages.includes(observation.specImage)) {
|
|
269
|
+
errors.push(`${label}.specImage must name ${repositoryReference} by its source tag or root digest`);
|
|
270
|
+
}
|
|
271
|
+
const imageConfigDigests = source.platforms.map((platformArg) => platformArg.imageConfigDigest);
|
|
272
|
+
observation.replicas.forEach((replicaArg, indexArg) => {
|
|
273
|
+
const replicaLabel = `${label}.replicas[${indexArg}]`;
|
|
274
|
+
if (replicaArg.state !== 'running') {
|
|
275
|
+
errors.push(`${replicaLabel}.state must be running`);
|
|
276
|
+
}
|
|
277
|
+
if (!attestableLegacyHostContainerHealths.includes(replicaArg.health)) {
|
|
278
|
+
errors.push(`${replicaLabel}.health must be healthy or none`);
|
|
279
|
+
}
|
|
280
|
+
if (!replicaArg.imageRepoDigests.includes(`${repositoryReference}@${source.rootDigest}`)) {
|
|
281
|
+
errors.push(`${replicaLabel} image must be ${repositoryReference}@${source.rootDigest}`);
|
|
282
|
+
}
|
|
283
|
+
if (replicaArg.imageStore === 'containerd') {
|
|
284
|
+
if (replicaArg.containerImageId !== source.rootDigest) {
|
|
285
|
+
errors.push(`${replicaLabel}.containerImageId must be the root digest on the containerd image store`);
|
|
286
|
+
}
|
|
287
|
+
return;
|
|
288
|
+
}
|
|
289
|
+
if (!imageConfigDigests.includes(replicaArg.containerImageId)) {
|
|
290
|
+
errors.push(`${replicaLabel}.containerImageId must be a platform image configuration digest of the root on the classic image store`);
|
|
291
|
+
}
|
|
292
|
+
if (selectReplicaRootDigest(replicaArg, repositoryReference) === undefined) {
|
|
293
|
+
errors.push(`${replicaLabel} image must list exactly one digest of ${repositoryReference} on the classic image store`);
|
|
294
|
+
}
|
|
295
|
+
});
|
|
296
|
+
return errors;
|
|
297
|
+
};
|
|
47
298
|
const validatePlatformManifest = (manifestArg, indexArg) => {
|
|
48
299
|
const label = `source.platforms[${indexArg}]`;
|
|
49
300
|
if (!isPlainRecord(manifestArg))
|
|
@@ -137,18 +388,51 @@ const validateImageSource = (sourceArg) => {
|
|
|
137
388
|
}
|
|
138
389
|
return errors;
|
|
139
390
|
};
|
|
140
|
-
const
|
|
391
|
+
const isLegacyServiceImageSource = (valueArg) => (validateImageSource(valueArg).length === 0);
|
|
392
|
+
const validateRuntime = (runtimeArg, sourceArg) => {
|
|
141
393
|
if (!isPlainRecord(runtimeArg))
|
|
142
394
|
return ['runtime must be an object'];
|
|
395
|
+
const rootDigest = isPlainRecord(sourceArg) ? sourceArg.rootDigest : undefined;
|
|
143
396
|
const errors = [];
|
|
144
397
|
if (!hasExactKeys(runtimeArg, [
|
|
145
398
|
'requiredReplicaCount',
|
|
146
399
|
'healthyReplicaCount',
|
|
147
400
|
'runtimeDigest',
|
|
148
401
|
'tasks',
|
|
402
|
+
'evidenceSource',
|
|
403
|
+
'hostObservation',
|
|
149
404
|
])) {
|
|
150
405
|
errors.push('runtime must use its exact schema');
|
|
151
406
|
}
|
|
407
|
+
if (runtimeArg.evidenceSource !== 'administrator-host-observation') {
|
|
408
|
+
errors.push('runtime.evidenceSource must be administrator-host-observation');
|
|
409
|
+
}
|
|
410
|
+
const hostObservation = runtimeArg.hostObservation;
|
|
411
|
+
const observationErrors = validateLegacyServiceHostObservation(hostObservation, 'runtime.hostObservation');
|
|
412
|
+
errors.push(...observationErrors);
|
|
413
|
+
if (observationErrors.length === 0
|
|
414
|
+
&& isLegacyServiceHostObservation(hostObservation)
|
|
415
|
+
&& isLegacyServiceImageSource(sourceArg)) {
|
|
416
|
+
errors.push(...judgeLegacyServiceHostObservation({
|
|
417
|
+
observation: hostObservation,
|
|
418
|
+
source: sourceArg,
|
|
419
|
+
label: 'runtime.hostObservation',
|
|
420
|
+
}));
|
|
421
|
+
if (hostObservation.mode.kind === 'replicated'
|
|
422
|
+
&& runtimeArg.requiredReplicaCount !== hostObservation.mode.desiredReplicas) {
|
|
423
|
+
errors.push('runtime.requiredReplicaCount must be the observed desired replicas');
|
|
424
|
+
}
|
|
425
|
+
const recordedTasks = readDataElements(runtimeArg.tasks, maximumReplicaCount) ?? [];
|
|
426
|
+
if (recordedTasks.length !== hostObservation.replicas.length
|
|
427
|
+
|| hostObservation.replicas.some((replicaArg, indexArg) => {
|
|
428
|
+
const task = recordedTasks[indexArg];
|
|
429
|
+
return !isPlainRecord(task)
|
|
430
|
+
|| task.deploymentId !== replicaArg.swarmTaskId
|
|
431
|
+
|| task.nodeName !== replicaArg.nodeHostname;
|
|
432
|
+
})) {
|
|
433
|
+
errors.push('runtime.tasks must be the observed replicas: each Swarm task on its node');
|
|
434
|
+
}
|
|
435
|
+
}
|
|
152
436
|
if (!isPositiveSafeInteger(runtimeArg.requiredReplicaCount, maximumReplicaCount)) {
|
|
153
437
|
errors.push('runtime.requiredReplicaCount must be a positive bounded replica count');
|
|
154
438
|
}
|
|
@@ -158,7 +442,7 @@ const validateRuntime = (runtimeArg, rootDigestArg) => {
|
|
|
158
442
|
if (!isCanonicalDigest(runtimeArg.runtimeDigest)) {
|
|
159
443
|
errors.push('runtime.runtimeDigest must be a canonical sha256 digest');
|
|
160
444
|
}
|
|
161
|
-
else if (runtimeArg.runtimeDigest !==
|
|
445
|
+
else if (runtimeArg.runtimeDigest !== rootDigest) {
|
|
162
446
|
errors.push('runtime.runtimeDigest must be the attested source root digest');
|
|
163
447
|
}
|
|
164
448
|
if (!Array.isArray(runtimeArg.tasks) || runtimeArg.tasks.length !== runtimeArg.requiredReplicaCount) {
|
|
@@ -231,7 +515,7 @@ export const validateLegacyServiceRuntimeAttestation = (attestationArg) => {
|
|
|
231
515
|
errors.push('capturedAt must be a positive timestamp');
|
|
232
516
|
}
|
|
233
517
|
errors.push(...validateImageSource(data.source));
|
|
234
|
-
errors.push(...validateRuntime(data.runtime,
|
|
518
|
+
errors.push(...validateRuntime(data.runtime, data.source));
|
|
235
519
|
return errors;
|
|
236
520
|
};
|
|
237
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploymentlegacyimport.js","sourceRoot":"","sources":["../../ts/data/deploymentlegacyimport.ts"],"names":[],"mappings":"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"}
|
|
521
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploymentlegacyimport.js","sourceRoot":"","sources":["../../ts/data/deploymentlegacyimport.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ import type { IImageRelease } from '../data/immutableimage.js';
|
|
|
9
9
|
import type { IDeploymentPreflightReport, IDeploymentPreflightRequestData } from '../data/deploymentpreflight.js';
|
|
10
10
|
import type { IDeploymentReservationInput, IServiceDeploymentOperation, IServiceDeploymentStatus } from '../data/deploymentoperation.js';
|
|
11
11
|
import type { TSha256Digest } from '../data/immutableimage.js';
|
|
12
|
-
import type { ILegacyServiceRuntimeAttestation } from '../data/deploymentlegacyimport.js';
|
|
12
|
+
import type { ILegacyServiceHostObservation, ILegacyServiceRuntimeAttestation } from '../data/deploymentlegacyimport.js';
|
|
13
13
|
import type { IProtocolOffer } from '../protocol.js';
|
|
14
14
|
import type { IRuntimeAssignmentLogAttemptPage, IRuntimeAssignmentLogPage } from '../data/runtimeassignmentlogs.js';
|
|
15
15
|
import type { IServiceRuntimeAssignmentView, IServiceRuntimeSpec, IServiceRuntimeStatus, TServiceRuntimeSpecWritableData } from '../data/serviceruntime.js';
|
|
@@ -224,10 +224,13 @@ export interface IRequest_Any_Cloudly_CleanupServiceDeployment extends plugins.t
|
|
|
224
224
|
};
|
|
225
225
|
}
|
|
226
226
|
/**
|
|
227
|
-
* Captures durable evidence that a legacy `deployOnPush` service runs exactly
|
|
228
|
-
*
|
|
229
|
-
*
|
|
230
|
-
*
|
|
227
|
+
* Captures durable evidence that a legacy `deployOnPush` service runs exactly one registry root of
|
|
228
|
+
* its own repository, from an administrator's observation of its Swarm service and containers on
|
|
229
|
+
* the hosts that run them (`hostObservation`). Cloudly judges the observation itself
|
|
230
|
+
* (`data.judgeLegacyServiceHostObservation`): every desired replica running, healthy or without a
|
|
231
|
+
* healthcheck, on one root that is whole in Cloudly's own registry, its platform manifests read
|
|
232
|
+
* from there. The source tag need not still name that root. Administrators only, and only while
|
|
233
|
+
* the legacy runtime still runs — incomplete evidence is refused, never stored.
|
|
231
234
|
*
|
|
232
235
|
* `expectedRuntimeDigest`, when stated, is an assertion the observed digest must equal. Capturing
|
|
233
236
|
* again for an unchanged digest returns the attestation already stored.
|
|
@@ -238,6 +241,7 @@ export interface IRequest_Any_Cloudly_CaptureLegacyServiceRuntimeAttestation ext
|
|
|
238
241
|
identity: IIdentityCredential;
|
|
239
242
|
legacyServiceId: string;
|
|
240
243
|
expectedRuntimeDigest?: TSha256Digest;
|
|
244
|
+
hostObservation: ILegacyServiceHostObservation;
|
|
241
245
|
};
|
|
242
246
|
response: {
|
|
243
247
|
attestation: ILegacyServiceRuntimeAttestation;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/interfaces",
|
|
3
|
-
"version": "32.
|
|
3
|
+
"version": "32.51.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.",
|
|
6
6
|
"exports": {
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"@git.zone/tsbuild": "^5.1.2",
|
|
31
31
|
"@git.zone/tsdoc": "^3.0.2",
|
|
32
32
|
"@git.zone/tsrun": "^3.0.2",
|
|
33
|
-
"@git.zone/tstest": "^7.
|
|
33
|
+
"@git.zone/tstest": "^7.2.0",
|
|
34
34
|
"@types/node": "26.6.3"
|
|
35
35
|
},
|
|
36
36
|
"files": [
|
package/readme.md
CHANGED
|
@@ -3640,7 +3640,7 @@ The immutable deployment workflow is:
|
|
|
3640
3640
|
|
|
3641
3641
|
A legacy `deployOnPush` service without deployable source moves to a greenfield successor by a legacy import, which replaces step 2:
|
|
3642
3642
|
|
|
3643
|
-
- While the legacy replicas still run — before its runtime is frozen — an administrator
|
|
3643
|
+
- While the legacy replicas still run — before its runtime is frozen — an administrator reads the legacy Swarm service and every container of its tasks on the hosts that run them, and submits that as `hostObservation` (`data.ILegacyServiceHostObservation`: Swarm service name, spec image and mode with its desired replicas; per replica the node hostname, Swarm task id, container id, the engine's image store, the container's image id, the image's `RepoDigests`, the container state and its health, `none` when no healthcheck applies) to `captureLegacyServiceRuntimeAttestation` (`requests.service.IRequest_Any_Cloudly_CaptureLegacyServiceRuntimeAttestation`). `data.validateLegacyServiceHostObservation` judges its shape, `data.selectLegacyServiceHostObservationRootDigest` names the one root every replica runs from the service's own repository, and `data.judgeLegacyServiceHostObservation` judges it against that root as Cloudly reads it from its own registry: exactly the desired replicas of a replicated service, its spec image naming the repository by the source tag or the root digest, every replica `running` and `healthy` or `none`, each container's image id the root digest on the containerd image store or one of the root's platform image configuration digests on the classic store. The source tag need not still name the root. The stored `data.ILegacyServiceRuntimeAttestation` records that root, its platform manifests, the replicas, the evidence source `administrator-host-observation` and the observation itself; `data.validateLegacyServiceRuntimeAttestation` states its rules. Incomplete evidence is refused, never stored, and there is no substitute once the runtime is stopped. `getLegacyServiceRuntimeAttestations` lists what Cloudly holds for a legacy service; both requests are for administrators only.
|
|
3644
3644
|
- The greenfield reservation, and every preflight of it, names `legacyImport` (`data.ILegacyImageImportReference`: legacy service, attestation, asserted source root digest) instead of `sourceRevision`, `sourceDirty` and release evidence. Refusals are the blockers `LEGACY_IMPORT_ATTESTATION_MISSING`, `LEGACY_IMPORT_SOURCE_MISMATCH` and `LEGACY_IMPORT_PLATFORM_MISMATCH`.
|
|
3645
3645
|
- Instead of the registry push, the deployer calls `importServiceDeploymentLegacyImage`: Cloudly imports the attested image from its own registry into the reserved tag — an index root as it is, a single platform manifest under a one-descriptor index of the manifest's own family — and records release evidence of source `cloudly-legacy-import` naming the legacy source. Steps 3 to 5 follow unchanged; `selectTrustedImageReleaseEvidence` accepts that evidence only with `evidenceSource: 'cloudly-legacy-import'`.
|
|
3646
3646
|
- The reservation and the import need the capability `deployment:import-legacy`, which only an organization-service-slot grant can carry.
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -4,15 +4,22 @@ import type {
|
|
|
4
4
|
TSha256Digest,
|
|
5
5
|
} from './immutableimage.js';
|
|
6
6
|
import { normalizeSha256Digest } from './immutableimage.js';
|
|
7
|
-
import {
|
|
7
|
+
import {
|
|
8
|
+
hasExactKeys,
|
|
9
|
+
isPlainRecord,
|
|
10
|
+
readDataElements,
|
|
11
|
+
readDataProperties,
|
|
12
|
+
} from '../private/dataproperties.js';
|
|
8
13
|
|
|
9
14
|
/**
|
|
10
15
|
* Legacy image import: a greenfield deployment whose image is the one a legacy `deployOnPush`
|
|
11
16
|
* service already runs, instead of one built from a source revision.
|
|
12
17
|
*
|
|
13
18
|
* A legacy service without deployable source still has an image in Cloudly's registry and, until
|
|
14
|
-
* its runtime is frozen,
|
|
15
|
-
*
|
|
19
|
+
* its runtime is frozen, replicas running it. An administrator observes those replicas on the
|
|
20
|
+
* hosts that run them ({@link ILegacyServiceHostObservation}) while they still run, and Cloudly
|
|
21
|
+
* captures that observation once as a {@link ILegacyServiceRuntimeAttestation} after it verified
|
|
22
|
+
* the observed root against its own registry. A greenfield successor
|
|
16
23
|
* reservation names the attestation in `legacyImport` instead of a `sourceRevision`, and Cloudly
|
|
17
24
|
* then imports the attested image into the successor's own repository and release tag itself:
|
|
18
25
|
* the bytes never leave the registry and the release records that it was imported, not built.
|
|
@@ -60,19 +67,98 @@ export interface ILegacyServiceImageSource {
|
|
|
60
67
|
platforms: ILegacyImagePlatformManifest[];
|
|
61
68
|
}
|
|
62
69
|
|
|
63
|
-
/**
|
|
70
|
+
/**
|
|
71
|
+
* One replica of the legacy service, observed running the attested digest in its own stated
|
|
72
|
+
* health: healthy, or running with no healthcheck that could state one.
|
|
73
|
+
*/
|
|
64
74
|
export interface ILegacyServiceRuntimeTaskAttestation {
|
|
75
|
+
/** The replica's runtime identity: the Swarm task it was observed as. */
|
|
65
76
|
deploymentId: string;
|
|
77
|
+
/** The hostname of the node the replica was observed on. */
|
|
66
78
|
nodeName: string;
|
|
67
79
|
observedDigest: TSha256Digest;
|
|
68
80
|
}
|
|
69
81
|
|
|
82
|
+
/**
|
|
83
|
+
* Where the runtime part of an attestation comes from. `administrator-host-observation`: an
|
|
84
|
+
* administrator read the legacy Swarm service and its containers on the hosts that run them, and
|
|
85
|
+
* Cloudly judged that observation against its own registry.
|
|
86
|
+
*/
|
|
87
|
+
export type TLegacyServiceRuntimeEvidenceSource = 'administrator-host-observation';
|
|
88
|
+
|
|
89
|
+
/** A container's state as the Docker engine reports it (`State.Status`). */
|
|
90
|
+
export type TLegacyHostContainerState =
|
|
91
|
+
| 'created'
|
|
92
|
+
| 'running'
|
|
93
|
+
| 'paused'
|
|
94
|
+
| 'restarting'
|
|
95
|
+
| 'removing'
|
|
96
|
+
| 'exited'
|
|
97
|
+
| 'dead';
|
|
98
|
+
|
|
99
|
+
/**
|
|
100
|
+
* A container's health as the Docker engine reports it (`State.Health.Status`). `none`: no
|
|
101
|
+
* healthcheck applies to the container — the image declares none and the service adds none — so
|
|
102
|
+
* the engine reports no health state at all.
|
|
103
|
+
*/
|
|
104
|
+
export type TLegacyHostContainerHealth = 'healthy' | 'unhealthy' | 'starting' | 'none';
|
|
105
|
+
|
|
106
|
+
/**
|
|
107
|
+
* The image store of the Docker engine that runs a container. On the `containerd` store a
|
|
108
|
+
* container's image id is the digest of the root it was pulled as; on the `classic` store it is
|
|
109
|
+
* the image configuration digest of the platform manifest the engine pulled.
|
|
110
|
+
*/
|
|
111
|
+
export type TLegacyHostImageStore = 'containerd' | 'classic';
|
|
112
|
+
|
|
113
|
+
/** A Swarm service's mode (`Spec.Mode`): a replicated service states its desired replicas. */
|
|
114
|
+
export type TLegacyHostSwarmServiceMode =
|
|
115
|
+
| { kind: 'replicated'; desiredReplicas: number }
|
|
116
|
+
| { kind: 'global' };
|
|
117
|
+
|
|
118
|
+
/** One replica of a legacy Swarm service, as an administrator read it on the node that runs it. */
|
|
119
|
+
export interface ILegacyHostReplicaObservation {
|
|
120
|
+
/** The hostname of the node the task runs on. */
|
|
121
|
+
nodeHostname: string;
|
|
122
|
+
/** The Swarm task id (25 lowercase base-36 characters). */
|
|
123
|
+
swarmTaskId: string;
|
|
124
|
+
/** The full container id of the task (64 lowercase hex characters). */
|
|
125
|
+
containerId: string;
|
|
126
|
+
imageStore: TLegacyHostImageStore;
|
|
127
|
+
/** The container's image id (`Image`), a sha256 digest. */
|
|
128
|
+
containerImageId: TSha256Digest;
|
|
129
|
+
/** The `RepoDigests` of the container's image, exactly as the engine lists them. */
|
|
130
|
+
imageRepoDigests: string[];
|
|
131
|
+
state: TLegacyHostContainerState;
|
|
132
|
+
health: TLegacyHostContainerHealth;
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
/**
|
|
136
|
+
* An administrator's observation of the legacy Swarm service of one legacy service and of every
|
|
137
|
+
* container its tasks run, read on the hosts while the legacy runtime still runs.
|
|
138
|
+
*
|
|
139
|
+
* It states facts, not conclusions: Cloudly judges it against its own registry
|
|
140
|
+
* ({@link judgeLegacyServiceHostObservation}) before it attests anything.
|
|
141
|
+
*/
|
|
142
|
+
export interface ILegacyServiceHostObservation {
|
|
143
|
+
/** The Swarm service name. */
|
|
144
|
+
swarmServiceName: string;
|
|
145
|
+
/** The image reference of the Swarm service spec (`Spec.TaskTemplate.ContainerSpec.Image`). */
|
|
146
|
+
specImage: string;
|
|
147
|
+
mode: TLegacyHostSwarmServiceMode;
|
|
148
|
+
/** When the administrator read the hosts, in milliseconds since the epoch. */
|
|
149
|
+
observedAt: number;
|
|
150
|
+
/** Every running task's replica, sorted by `swarmTaskId`. */
|
|
151
|
+
replicas: ILegacyHostReplicaObservation[];
|
|
152
|
+
}
|
|
153
|
+
|
|
70
154
|
/**
|
|
71
155
|
* Durable evidence, captured by an administrator while the legacy runtime still ran, that every
|
|
72
|
-
*
|
|
156
|
+
* desired replica of a legacy service ran, in its own stated health, exactly the registry root it
|
|
157
|
+
* names.
|
|
73
158
|
*
|
|
74
159
|
* Cloudly writes one and never changes it. A capture only succeeds on complete evidence, so a
|
|
75
|
-
* stored attestation is by construction one whose runtime digest is its source root digest
|
|
160
|
+
* stored attestation is by construction one whose runtime digest is its source root digest and
|
|
161
|
+
* whose runtime part is exactly the host observation it records.
|
|
76
162
|
*/
|
|
77
163
|
export interface ILegacyServiceRuntimeAttestation {
|
|
78
164
|
id: string;
|
|
@@ -81,11 +167,16 @@ export interface ILegacyServiceRuntimeAttestation {
|
|
|
81
167
|
organizationId: string;
|
|
82
168
|
source: ILegacyServiceImageSource;
|
|
83
169
|
runtime: {
|
|
170
|
+
/** The desired replicas of the observed replicated Swarm service. */
|
|
84
171
|
requiredReplicaCount: number;
|
|
172
|
+
/** Replicas observed running healthy, or running with no healthcheck (`health: 'none'`). */
|
|
85
173
|
healthyReplicaCount: number;
|
|
86
174
|
runtimeDigest: TSha256Digest;
|
|
87
|
-
/** Sorted by deploymentId, one per required replica. */
|
|
175
|
+
/** Sorted by deploymentId, one per required replica: the observed replicas. */
|
|
88
176
|
tasks: ILegacyServiceRuntimeTaskAttestation[];
|
|
177
|
+
evidenceSource: TLegacyServiceRuntimeEvidenceSource;
|
|
178
|
+
/** The observation the runtime part was built from, as the administrator submitted it. */
|
|
179
|
+
hostObservation: ILegacyServiceHostObservation;
|
|
89
180
|
};
|
|
90
181
|
capturedByUserId: string;
|
|
91
182
|
capturedAt: number;
|
|
@@ -120,6 +211,31 @@ const legacyImageImportIndexMediaTypes: readonly TLegacyImageImportIndexMediaTyp
|
|
|
120
211
|
'application/vnd.docker.distribution.manifest.list.v2+json',
|
|
121
212
|
];
|
|
122
213
|
const legacyImagePlatforms: readonly TImmutableContainerPlatform[] = ['linux/amd64', 'linux/arm64'];
|
|
214
|
+
const legacyHostContainerStates: readonly TLegacyHostContainerState[] = [
|
|
215
|
+
'created',
|
|
216
|
+
'running',
|
|
217
|
+
'paused',
|
|
218
|
+
'restarting',
|
|
219
|
+
'removing',
|
|
220
|
+
'exited',
|
|
221
|
+
'dead',
|
|
222
|
+
];
|
|
223
|
+
const legacyHostContainerHealths: readonly TLegacyHostContainerHealth[] = [
|
|
224
|
+
'healthy',
|
|
225
|
+
'unhealthy',
|
|
226
|
+
'starting',
|
|
227
|
+
'none',
|
|
228
|
+
];
|
|
229
|
+
/** The health states a replica may be attested in: healthy, or no healthcheck at all. */
|
|
230
|
+
const attestableLegacyHostContainerHealths: readonly TLegacyHostContainerHealth[] = ['healthy', 'none'];
|
|
231
|
+
const legacyHostImageStores: readonly TLegacyHostImageStore[] = ['containerd', 'classic'];
|
|
232
|
+
const swarmTaskIdRegex = /^[a-z0-9]{25}$/;
|
|
233
|
+
const containerIdRegex = /^[0-9a-f]{64}$/;
|
|
234
|
+
const swarmServiceNameRegex = /^[A-Za-z0-9][A-Za-z0-9_.-]{0,62}$/;
|
|
235
|
+
const nodeHostnameRegex = /^(?=.{1,253}$)[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?(?:\.[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$/;
|
|
236
|
+
const imageReferenceRegex = /^\S{1,512}$/;
|
|
237
|
+
const repoDigestRegex = /^[^\s@]{1,440}@sha256:[0-9a-f]{64}$/;
|
|
238
|
+
const maximumRepoDigestCount = 32;
|
|
123
239
|
|
|
124
240
|
const isIdentifier = (valueArg: unknown): valueArg is string => (
|
|
125
241
|
typeof valueArg === 'string' && identifierRegex.test(valueArg)
|
|
@@ -168,6 +284,256 @@ export const validateLegacyImageImportReference = (referenceArg: unknown): strin
|
|
|
168
284
|
return errors;
|
|
169
285
|
};
|
|
170
286
|
|
|
287
|
+
const validateHostReplicaObservation = (
|
|
288
|
+
replicaArg: unknown,
|
|
289
|
+
labelArg: string,
|
|
290
|
+
): string[] => {
|
|
291
|
+
const replica = readDataProperties(replicaArg);
|
|
292
|
+
if (replica === null) return [`${labelArg} must be a plain data object`];
|
|
293
|
+
const errors: string[] = [];
|
|
294
|
+
if (!hasExactKeys(replica, [
|
|
295
|
+
'nodeHostname',
|
|
296
|
+
'swarmTaskId',
|
|
297
|
+
'containerId',
|
|
298
|
+
'imageStore',
|
|
299
|
+
'containerImageId',
|
|
300
|
+
'imageRepoDigests',
|
|
301
|
+
'state',
|
|
302
|
+
'health',
|
|
303
|
+
])) {
|
|
304
|
+
errors.push(`${labelArg} must use its exact schema`);
|
|
305
|
+
}
|
|
306
|
+
if (typeof replica.nodeHostname !== 'string' || !nodeHostnameRegex.test(replica.nodeHostname)) {
|
|
307
|
+
errors.push(`${labelArg}.nodeHostname must be a host name`);
|
|
308
|
+
}
|
|
309
|
+
if (typeof replica.swarmTaskId !== 'string' || !swarmTaskIdRegex.test(replica.swarmTaskId)) {
|
|
310
|
+
errors.push(`${labelArg}.swarmTaskId must be a Swarm task id`);
|
|
311
|
+
}
|
|
312
|
+
if (typeof replica.containerId !== 'string' || !containerIdRegex.test(replica.containerId)) {
|
|
313
|
+
errors.push(`${labelArg}.containerId must be a full container id`);
|
|
314
|
+
}
|
|
315
|
+
if (!legacyHostImageStores.some((storeArg) => storeArg === replica.imageStore)) {
|
|
316
|
+
errors.push(`${labelArg}.imageStore must be containerd or classic`);
|
|
317
|
+
}
|
|
318
|
+
if (!isCanonicalDigest(replica.containerImageId)) {
|
|
319
|
+
errors.push(`${labelArg}.containerImageId must be a canonical sha256 digest`);
|
|
320
|
+
}
|
|
321
|
+
const repoDigests = readDataElements(replica.imageRepoDigests, maximumRepoDigestCount);
|
|
322
|
+
if (repoDigests === null
|
|
323
|
+
|| repoDigests.some((entryArg) => typeof entryArg !== 'string' || !repoDigestRegex.test(entryArg))
|
|
324
|
+
|| new Set(repoDigests).size !== repoDigests.length) {
|
|
325
|
+
errors.push(`${labelArg}.imageRepoDigests must be unique digested image references`);
|
|
326
|
+
}
|
|
327
|
+
if (!legacyHostContainerStates.some((stateArg) => stateArg === replica.state)) {
|
|
328
|
+
errors.push(`${labelArg}.state must be a Docker container state`);
|
|
329
|
+
}
|
|
330
|
+
if (!legacyHostContainerHealths.some((healthArg) => healthArg === replica.health)) {
|
|
331
|
+
errors.push(`${labelArg}.health must be healthy, unhealthy, starting or none`);
|
|
332
|
+
}
|
|
333
|
+
return errors;
|
|
334
|
+
};
|
|
335
|
+
|
|
336
|
+
const validateHostSwarmServiceMode = (modeArg: unknown, labelArg: string): string[] => {
|
|
337
|
+
const mode = readDataProperties(modeArg);
|
|
338
|
+
if (mode === null) return [`${labelArg} must be a plain data object`];
|
|
339
|
+
if (mode.kind === 'global') {
|
|
340
|
+
return hasExactKeys(mode, ['kind']) ? [] : [`${labelArg} must use its exact schema`];
|
|
341
|
+
}
|
|
342
|
+
if (mode.kind !== 'replicated') return [`${labelArg}.kind must be replicated or global`];
|
|
343
|
+
const errors: string[] = [];
|
|
344
|
+
if (!hasExactKeys(mode, ['kind', 'desiredReplicas'])) {
|
|
345
|
+
errors.push(`${labelArg} must use its exact schema`);
|
|
346
|
+
}
|
|
347
|
+
if (typeof mode.desiredReplicas !== 'number'
|
|
348
|
+
|| !Number.isSafeInteger(mode.desiredReplicas)
|
|
349
|
+
|| mode.desiredReplicas < 0
|
|
350
|
+
|| mode.desiredReplicas > maximumReplicaCount) {
|
|
351
|
+
errors.push(`${labelArg}.desiredReplicas must be a bounded replica count`);
|
|
352
|
+
}
|
|
353
|
+
return errors;
|
|
354
|
+
};
|
|
355
|
+
|
|
356
|
+
/**
|
|
357
|
+
* The shape of a host observation: exact keys at every level, Docker's own value sets, at most 64
|
|
358
|
+
* replicas, unique and sorted by Swarm task id, each container observed once. It judges nothing
|
|
359
|
+
* against a registry; {@link judgeLegacyServiceHostObservation} does.
|
|
360
|
+
*/
|
|
361
|
+
export const validateLegacyServiceHostObservation = (
|
|
362
|
+
observationArg: unknown,
|
|
363
|
+
labelArg = 'hostObservation',
|
|
364
|
+
): string[] => {
|
|
365
|
+
const observation = readDataProperties(observationArg);
|
|
366
|
+
if (observation === null) return [`${labelArg} must be a plain data object`];
|
|
367
|
+
const errors: string[] = [];
|
|
368
|
+
if (!hasExactKeys(observation, ['swarmServiceName', 'specImage', 'mode', 'observedAt', 'replicas'])) {
|
|
369
|
+
errors.push(`${labelArg} must use its exact schema`);
|
|
370
|
+
}
|
|
371
|
+
if (typeof observation.swarmServiceName !== 'string'
|
|
372
|
+
|| !swarmServiceNameRegex.test(observation.swarmServiceName)) {
|
|
373
|
+
errors.push(`${labelArg}.swarmServiceName must be a Swarm service name`);
|
|
374
|
+
}
|
|
375
|
+
if (typeof observation.specImage !== 'string' || !imageReferenceRegex.test(observation.specImage)) {
|
|
376
|
+
errors.push(`${labelArg}.specImage must be a bounded image reference`);
|
|
377
|
+
}
|
|
378
|
+
errors.push(...validateHostSwarmServiceMode(observation.mode, `${labelArg}.mode`));
|
|
379
|
+
if (!isPositiveSafeInteger(observation.observedAt, Number.MAX_SAFE_INTEGER)) {
|
|
380
|
+
errors.push(`${labelArg}.observedAt must be a positive timestamp`);
|
|
381
|
+
}
|
|
382
|
+
const replicas = readDataElements(observation.replicas, maximumReplicaCount);
|
|
383
|
+
if (replicas === null) {
|
|
384
|
+
errors.push(`${labelArg}.replicas must be a list of at most ${maximumReplicaCount} replicas`);
|
|
385
|
+
return errors;
|
|
386
|
+
}
|
|
387
|
+
replicas.forEach((replicaArg, indexArg) => {
|
|
388
|
+
errors.push(...validateHostReplicaObservation(replicaArg, `${labelArg}.replicas[${indexArg}]`));
|
|
389
|
+
});
|
|
390
|
+
const readReplicaKey = (replicaArg: unknown, keyArg: string): unknown => (
|
|
391
|
+
readDataProperties(replicaArg)?.[keyArg]
|
|
392
|
+
);
|
|
393
|
+
const taskIds = replicas.map((replicaArg) => readReplicaKey(replicaArg, 'swarmTaskId'));
|
|
394
|
+
const sortedTaskIds = taskIds
|
|
395
|
+
.filter((idArg): idArg is string => typeof idArg === 'string')
|
|
396
|
+
.sort();
|
|
397
|
+
if (new Set(taskIds).size !== taskIds.length
|
|
398
|
+
|| JSON.stringify(taskIds) !== JSON.stringify(sortedTaskIds)) {
|
|
399
|
+
errors.push(`${labelArg}.replicas must be unique and sorted by swarmTaskId`);
|
|
400
|
+
}
|
|
401
|
+
const containerIds = replicas.map((replicaArg) => readReplicaKey(replicaArg, 'containerId'));
|
|
402
|
+
if (new Set(containerIds).size !== containerIds.length) {
|
|
403
|
+
errors.push(`${labelArg}.replicas must observe each container once`);
|
|
404
|
+
}
|
|
405
|
+
return errors;
|
|
406
|
+
};
|
|
407
|
+
|
|
408
|
+
/** True when a value is a well-formed host observation. */
|
|
409
|
+
export const isLegacyServiceHostObservation = (
|
|
410
|
+
valueArg: unknown,
|
|
411
|
+
): valueArg is ILegacyServiceHostObservation => (
|
|
412
|
+
validateLegacyServiceHostObservation(valueArg).length === 0
|
|
413
|
+
);
|
|
414
|
+
|
|
415
|
+
/**
|
|
416
|
+
* The root digest one replica was pulled as from `registryHost/repository`.
|
|
417
|
+
*
|
|
418
|
+
* On the containerd store that is the container's image id, which the image's `RepoDigests` must
|
|
419
|
+
* list for the repository. On the classic store it is the one digest `RepoDigests` lists for the
|
|
420
|
+
* repository; none, or more than one, leaves the root unknown.
|
|
421
|
+
*/
|
|
422
|
+
const selectReplicaRootDigest = (
|
|
423
|
+
replicaArg: ILegacyHostReplicaObservation,
|
|
424
|
+
repositoryReferenceArg: string,
|
|
425
|
+
): TSha256Digest | undefined => {
|
|
426
|
+
const prefix = `${repositoryReferenceArg}@`;
|
|
427
|
+
const repositoryDigests = replicaArg.imageRepoDigests
|
|
428
|
+
.filter((entryArg) => entryArg.startsWith(prefix))
|
|
429
|
+
.map((entryArg) => normalizeSha256Digest(entryArg.slice(prefix.length)))
|
|
430
|
+
.filter((digestArg): digestArg is TSha256Digest => digestArg !== undefined);
|
|
431
|
+
if (replicaArg.imageStore === 'containerd') {
|
|
432
|
+
return repositoryDigests.includes(replicaArg.containerImageId)
|
|
433
|
+
? replicaArg.containerImageId
|
|
434
|
+
: undefined;
|
|
435
|
+
}
|
|
436
|
+
return repositoryDigests.length === 1 ? repositoryDigests[0] : undefined;
|
|
437
|
+
};
|
|
438
|
+
|
|
439
|
+
/**
|
|
440
|
+
* The one root digest every observed replica runs from the legacy service's own repository, which
|
|
441
|
+
* is the digest Cloudly then inspects in its registry. Refused when a replica's root from that
|
|
442
|
+
* repository is unknown, when the replicas run more than one root, or when nothing was observed.
|
|
443
|
+
*/
|
|
444
|
+
export const selectLegacyServiceHostObservationRootDigest = (argsArg: {
|
|
445
|
+
observation: ILegacyServiceHostObservation;
|
|
446
|
+
registryHost: string;
|
|
447
|
+
repository: string;
|
|
448
|
+
}): { rootDigest?: TSha256Digest; errors: string[] } => {
|
|
449
|
+
const repositoryReference = `${argsArg.registryHost}/${argsArg.repository}`;
|
|
450
|
+
const errors: string[] = [];
|
|
451
|
+
const roots = new Set<TSha256Digest>();
|
|
452
|
+
argsArg.observation.replicas.forEach((replicaArg, indexArg) => {
|
|
453
|
+
const root = selectReplicaRootDigest(replicaArg, repositoryReference);
|
|
454
|
+
if (root === undefined) {
|
|
455
|
+
errors.push(replicaArg.imageStore === 'containerd'
|
|
456
|
+
? `hostObservation.replicas[${indexArg}] image is not listed as ${repositoryReference}@<its image id>`
|
|
457
|
+
: `hostObservation.replicas[${indexArg}] image lists not exactly one digest of ${repositoryReference}`);
|
|
458
|
+
return;
|
|
459
|
+
}
|
|
460
|
+
roots.add(root);
|
|
461
|
+
});
|
|
462
|
+
if (argsArg.observation.replicas.length === 0) {
|
|
463
|
+
errors.push('hostObservation must observe at least one replica');
|
|
464
|
+
}
|
|
465
|
+
if (roots.size > 1) {
|
|
466
|
+
errors.push('hostObservation replicas run more than one root digest');
|
|
467
|
+
}
|
|
468
|
+
const [rootDigest] = [...roots];
|
|
469
|
+
return errors.length === 0 && rootDigest !== undefined ? { rootDigest, errors } : { errors };
|
|
470
|
+
};
|
|
471
|
+
|
|
472
|
+
/**
|
|
473
|
+
* Judges a well-formed host observation against the registry source Cloudly inspected for it.
|
|
474
|
+
* Every rule an attestation's runtime part must meet:
|
|
475
|
+
*
|
|
476
|
+
* - the Swarm service is replicated, with at least one desired replica, and exactly its desired
|
|
477
|
+
* replicas were observed;
|
|
478
|
+
* - its spec image names the source repository by the source tag, by the root digest, or by both;
|
|
479
|
+
* - every replica is `running`, and `healthy` or without a healthcheck (`none`) — `unhealthy` and
|
|
480
|
+
* `starting` are refused;
|
|
481
|
+
* - every replica runs the source root from the source repository: its image lists
|
|
482
|
+
* `registryHost/repository@rootDigest`, and its image id is the root digest on the containerd
|
|
483
|
+
* store or one of the root's platform image configuration digests on the classic store.
|
|
484
|
+
*/
|
|
485
|
+
export const judgeLegacyServiceHostObservation = (argsArg: {
|
|
486
|
+
observation: ILegacyServiceHostObservation;
|
|
487
|
+
source: ILegacyServiceImageSource;
|
|
488
|
+
label?: string;
|
|
489
|
+
}): string[] => {
|
|
490
|
+
const label = argsArg.label ?? 'hostObservation';
|
|
491
|
+
const { observation, source } = argsArg;
|
|
492
|
+
const errors: string[] = [];
|
|
493
|
+
if (observation.mode.kind !== 'replicated') {
|
|
494
|
+
errors.push(`${label}.mode must be replicated: a legacy service runs as a replicated Swarm service`);
|
|
495
|
+
} else if (observation.mode.desiredReplicas < 1) {
|
|
496
|
+
errors.push(`${label}.mode must desire at least one replica`);
|
|
497
|
+
} else if (observation.replicas.length !== observation.mode.desiredReplicas) {
|
|
498
|
+
errors.push(`${label} must observe exactly the ${observation.mode.desiredReplicas} desired replicas`);
|
|
499
|
+
}
|
|
500
|
+
const repositoryReference = `${source.registryHost}/${source.repository}`;
|
|
501
|
+
const specImages = [
|
|
502
|
+
`${repositoryReference}:${source.tag}`,
|
|
503
|
+
`${repositoryReference}@${source.rootDigest}`,
|
|
504
|
+
`${repositoryReference}:${source.tag}@${source.rootDigest}`,
|
|
505
|
+
];
|
|
506
|
+
if (!specImages.includes(observation.specImage)) {
|
|
507
|
+
errors.push(`${label}.specImage must name ${repositoryReference} by its source tag or root digest`);
|
|
508
|
+
}
|
|
509
|
+
const imageConfigDigests = source.platforms.map((platformArg) => platformArg.imageConfigDigest);
|
|
510
|
+
observation.replicas.forEach((replicaArg, indexArg) => {
|
|
511
|
+
const replicaLabel = `${label}.replicas[${indexArg}]`;
|
|
512
|
+
if (replicaArg.state !== 'running') {
|
|
513
|
+
errors.push(`${replicaLabel}.state must be running`);
|
|
514
|
+
}
|
|
515
|
+
if (!attestableLegacyHostContainerHealths.includes(replicaArg.health)) {
|
|
516
|
+
errors.push(`${replicaLabel}.health must be healthy or none`);
|
|
517
|
+
}
|
|
518
|
+
if (!replicaArg.imageRepoDigests.includes(`${repositoryReference}@${source.rootDigest}`)) {
|
|
519
|
+
errors.push(`${replicaLabel} image must be ${repositoryReference}@${source.rootDigest}`);
|
|
520
|
+
}
|
|
521
|
+
if (replicaArg.imageStore === 'containerd') {
|
|
522
|
+
if (replicaArg.containerImageId !== source.rootDigest) {
|
|
523
|
+
errors.push(`${replicaLabel}.containerImageId must be the root digest on the containerd image store`);
|
|
524
|
+
}
|
|
525
|
+
return;
|
|
526
|
+
}
|
|
527
|
+
if (!imageConfigDigests.includes(replicaArg.containerImageId)) {
|
|
528
|
+
errors.push(`${replicaLabel}.containerImageId must be a platform image configuration digest of the root on the classic image store`);
|
|
529
|
+
}
|
|
530
|
+
if (selectReplicaRootDigest(replicaArg, repositoryReference) === undefined) {
|
|
531
|
+
errors.push(`${replicaLabel} image must list exactly one digest of ${repositoryReference} on the classic image store`);
|
|
532
|
+
}
|
|
533
|
+
});
|
|
534
|
+
return errors;
|
|
535
|
+
};
|
|
536
|
+
|
|
171
537
|
const validatePlatformManifest = (
|
|
172
538
|
manifestArg: unknown,
|
|
173
539
|
indexArg: number,
|
|
@@ -270,17 +636,54 @@ const validateImageSource = (sourceArg: unknown): string[] => {
|
|
|
270
636
|
return errors;
|
|
271
637
|
};
|
|
272
638
|
|
|
273
|
-
const
|
|
639
|
+
const isLegacyServiceImageSource = (valueArg: unknown): valueArg is ILegacyServiceImageSource => (
|
|
640
|
+
validateImageSource(valueArg).length === 0
|
|
641
|
+
);
|
|
642
|
+
|
|
643
|
+
const validateRuntime = (runtimeArg: unknown, sourceArg: unknown): string[] => {
|
|
274
644
|
if (!isPlainRecord(runtimeArg)) return ['runtime must be an object'];
|
|
645
|
+
const rootDigest = isPlainRecord(sourceArg) ? sourceArg.rootDigest : undefined;
|
|
275
646
|
const errors: string[] = [];
|
|
276
647
|
if (!hasExactKeys(runtimeArg, [
|
|
277
648
|
'requiredReplicaCount',
|
|
278
649
|
'healthyReplicaCount',
|
|
279
650
|
'runtimeDigest',
|
|
280
651
|
'tasks',
|
|
652
|
+
'evidenceSource',
|
|
653
|
+
'hostObservation',
|
|
281
654
|
])) {
|
|
282
655
|
errors.push('runtime must use its exact schema');
|
|
283
656
|
}
|
|
657
|
+
if (runtimeArg.evidenceSource !== 'administrator-host-observation') {
|
|
658
|
+
errors.push('runtime.evidenceSource must be administrator-host-observation');
|
|
659
|
+
}
|
|
660
|
+
const hostObservation = runtimeArg.hostObservation;
|
|
661
|
+
const observationErrors = validateLegacyServiceHostObservation(
|
|
662
|
+
hostObservation, 'runtime.hostObservation');
|
|
663
|
+
errors.push(...observationErrors);
|
|
664
|
+
if (observationErrors.length === 0
|
|
665
|
+
&& isLegacyServiceHostObservation(hostObservation)
|
|
666
|
+
&& isLegacyServiceImageSource(sourceArg)) {
|
|
667
|
+
errors.push(...judgeLegacyServiceHostObservation({
|
|
668
|
+
observation: hostObservation,
|
|
669
|
+
source: sourceArg,
|
|
670
|
+
label: 'runtime.hostObservation',
|
|
671
|
+
}));
|
|
672
|
+
if (hostObservation.mode.kind === 'replicated'
|
|
673
|
+
&& runtimeArg.requiredReplicaCount !== hostObservation.mode.desiredReplicas) {
|
|
674
|
+
errors.push('runtime.requiredReplicaCount must be the observed desired replicas');
|
|
675
|
+
}
|
|
676
|
+
const recordedTasks = readDataElements(runtimeArg.tasks, maximumReplicaCount) ?? [];
|
|
677
|
+
if (recordedTasks.length !== hostObservation.replicas.length
|
|
678
|
+
|| hostObservation.replicas.some((replicaArg, indexArg) => {
|
|
679
|
+
const task = recordedTasks[indexArg];
|
|
680
|
+
return !isPlainRecord(task)
|
|
681
|
+
|| task.deploymentId !== replicaArg.swarmTaskId
|
|
682
|
+
|| task.nodeName !== replicaArg.nodeHostname;
|
|
683
|
+
})) {
|
|
684
|
+
errors.push('runtime.tasks must be the observed replicas: each Swarm task on its node');
|
|
685
|
+
}
|
|
686
|
+
}
|
|
284
687
|
if (!isPositiveSafeInteger(runtimeArg.requiredReplicaCount, maximumReplicaCount)) {
|
|
285
688
|
errors.push('runtime.requiredReplicaCount must be a positive bounded replica count');
|
|
286
689
|
}
|
|
@@ -289,7 +692,7 @@ const validateRuntime = (runtimeArg: unknown, rootDigestArg: unknown): string[]
|
|
|
289
692
|
}
|
|
290
693
|
if (!isCanonicalDigest(runtimeArg.runtimeDigest)) {
|
|
291
694
|
errors.push('runtime.runtimeDigest must be a canonical sha256 digest');
|
|
292
|
-
} else if (runtimeArg.runtimeDigest !==
|
|
695
|
+
} else if (runtimeArg.runtimeDigest !== rootDigest) {
|
|
293
696
|
errors.push('runtime.runtimeDigest must be the attested source root digest');
|
|
294
697
|
}
|
|
295
698
|
if (!Array.isArray(runtimeArg.tasks) || runtimeArg.tasks.length !== runtimeArg.requiredReplicaCount) {
|
|
@@ -363,9 +766,6 @@ export const validateLegacyServiceRuntimeAttestation = (attestationArg: unknown)
|
|
|
363
766
|
errors.push('capturedAt must be a positive timestamp');
|
|
364
767
|
}
|
|
365
768
|
errors.push(...validateImageSource(data.source));
|
|
366
|
-
errors.push(...validateRuntime(
|
|
367
|
-
data.runtime,
|
|
368
|
-
isPlainRecord(data.source) ? data.source.rootDigest : undefined,
|
|
369
|
-
));
|
|
769
|
+
errors.push(...validateRuntime(data.runtime, data.source));
|
|
370
770
|
return errors;
|
|
371
771
|
};
|
package/ts/requests/service.ts
CHANGED
|
@@ -17,7 +17,10 @@ import type {
|
|
|
17
17
|
IServiceDeploymentStatus,
|
|
18
18
|
} from '../data/deploymentoperation.js';
|
|
19
19
|
import type { TSha256Digest } from '../data/immutableimage.js';
|
|
20
|
-
import type {
|
|
20
|
+
import type {
|
|
21
|
+
ILegacyServiceHostObservation,
|
|
22
|
+
ILegacyServiceRuntimeAttestation,
|
|
23
|
+
} from '../data/deploymentlegacyimport.js';
|
|
21
24
|
import type { IProtocolOffer } from '../protocol.js';
|
|
22
25
|
import type {
|
|
23
26
|
IRuntimeAssignmentLogAttemptPage,
|
|
@@ -330,10 +333,13 @@ extends plugins.typedrequestInterfaces.implementsTR<
|
|
|
330
333
|
}
|
|
331
334
|
|
|
332
335
|
/**
|
|
333
|
-
* Captures durable evidence that a legacy `deployOnPush` service runs exactly
|
|
334
|
-
*
|
|
335
|
-
*
|
|
336
|
-
*
|
|
336
|
+
* Captures durable evidence that a legacy `deployOnPush` service runs exactly one registry root of
|
|
337
|
+
* its own repository, from an administrator's observation of its Swarm service and containers on
|
|
338
|
+
* the hosts that run them (`hostObservation`). Cloudly judges the observation itself
|
|
339
|
+
* (`data.judgeLegacyServiceHostObservation`): every desired replica running, healthy or without a
|
|
340
|
+
* healthcheck, on one root that is whole in Cloudly's own registry, its platform manifests read
|
|
341
|
+
* from there. The source tag need not still name that root. Administrators only, and only while
|
|
342
|
+
* the legacy runtime still runs — incomplete evidence is refused, never stored.
|
|
337
343
|
*
|
|
338
344
|
* `expectedRuntimeDigest`, when stated, is an assertion the observed digest must equal. Capturing
|
|
339
345
|
* again for an unchanged digest returns the attestation already stored.
|
|
@@ -348,6 +354,7 @@ extends plugins.typedrequestInterfaces.implementsTR<
|
|
|
348
354
|
identity: IIdentityCredential;
|
|
349
355
|
legacyServiceId: string;
|
|
350
356
|
expectedRuntimeDigest?: TSha256Digest;
|
|
357
|
+
hostObservation: ILegacyServiceHostObservation;
|
|
351
358
|
};
|
|
352
359
|
response: {
|
|
353
360
|
attestation: ILegacyServiceRuntimeAttestation;
|