@serve.zone/interfaces 23.1.0 → 24.0.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 +17 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/appstore/types.d.ts +2 -2
- package/dist_ts/appstore/types.js +1 -1
- package/dist_ts/data/clusternode.d.ts +85 -0
- package/dist_ts/data/clusternode.js +355 -1
- package/dist_ts/data/secret.d.ts +51 -4
- package/dist_ts/data/secret.js +326 -10
- package/dist_ts/requests/secret.d.ts +33 -6
- package/dist_ts/requests/secret.js +198 -1
- package/dist_ts/runtime.d.ts +61 -25
- package/dist_ts/runtime.js +256 -93
- package/dist_ts/runtime.workloadinit.d.ts +129 -0
- package/dist_ts/runtime.workloadinit.js +405 -0
- package/package.json +1 -1
- package/readme.md +48 -13
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/appstore/types.ts +2 -2
- package/ts/data/clusternode.ts +513 -0
- package/ts/data/secret.ts +402 -16
- package/ts/requests/secret.ts +248 -6
- package/ts/runtime.ts +399 -137
- package/ts/runtime.workloadinit.ts +582 -0
package/changelog.md
CHANGED
|
@@ -1,5 +1,22 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-07-31 - 24.0.0
|
|
4
|
+
|
|
5
|
+
### Breaking Changes
|
|
6
|
+
|
|
7
|
+
- replace pre-cutover secret lifecycle and runtime authority contracts (secrets-runtime)
|
|
8
|
+
- Replace caller-timestamp envelope opening and retiring ingress recipients with active-only recipient metadata and reproducible admission bindings.
|
|
9
|
+
- Add version-specific purge preflight and purgeSecretVersion contracts with revision fences, retention blockers, and durable purge operation metadata.
|
|
10
|
+
- Replace runtime registration v1 self-attested node and WorkloadInit evidence with v2 Cloudly target authority, Spark Swarm observations, and WorkloadInit approval authority contracts.
|
|
11
|
+
|
|
12
|
+
## 2026-07-31 - 23.2.0
|
|
13
|
+
|
|
14
|
+
### Features
|
|
15
|
+
|
|
16
|
+
- add registration expectation contract (secret-runtime)
|
|
17
|
+
- Adds getCoreflowSecretRuntimeRegistrationExpectation for JWT-derived secret runtime registration expectations.
|
|
18
|
+
- Exposes a dedicated coreflowSecretRuntimeRegistrationTagId and validation that only accepts identity.jwt in expectation requests.
|
|
19
|
+
|
|
3
20
|
## 2026-07-31 - 23.1.0
|
|
4
21
|
|
|
5
22
|
### Features
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/interfaces',
|
|
6
|
-
version: '
|
|
6
|
+
version: '24.0.0',
|
|
7
7
|
description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHVGQUF1RjtDQUNyRyxDQUFBIn0=
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type TSecretDelivery, type TSecretGeneratedEncoding, type
|
|
1
|
+
import { type TSecretDelivery, type TSecretGeneratedEncoding, type IActiveSecretRecipientMetadata, type TSecretValueInput } from '../data/secret.js';
|
|
2
2
|
import { type IHostedAppRoleDefinition } from '../data/hostedapp.js';
|
|
3
3
|
import type { IServiceDomainRoute, IServicePublicPortMapping, IServiceTargetPort } from '../data/serviceports.js';
|
|
4
4
|
import type { IStorageCapacityRequest, IStorageClassRequirement, TFilesystemStorageAccessMode, TObjectStorageAccessMode, TObjectStorageDelivery, TStorageReclaimPolicy, TStorageResourceKind, TStorageSnapshotMode } from '../platform/storage.js';
|
|
@@ -292,7 +292,7 @@ export interface IAppStoreInstallRequest {
|
|
|
292
292
|
}>;
|
|
293
293
|
}
|
|
294
294
|
export declare const validateAppStoreEnvironmentDeclarations: (declarationsArg: unknown) => string[];
|
|
295
|
-
export declare const validateAppStoreInstallRequest: (requestArg: unknown, configArg: IAppStoreVersionConfig, activeIngressRecipientArg:
|
|
295
|
+
export declare const validateAppStoreInstallRequest: (requestArg: unknown, configArg: IAppStoreVersionConfig, activeIngressRecipientArg: IActiveSecretRecipientMetadata) => Promise<string[]>;
|
|
296
296
|
export interface IUpgradeableAppStoreService {
|
|
297
297
|
serviceId?: string;
|
|
298
298
|
serviceName: string;
|
|
@@ -282,4 +282,4 @@ export const validateAppStoreInstallRequest = async (requestArg, configArg, acti
|
|
|
282
282
|
}
|
|
283
283
|
return errors;
|
|
284
284
|
};
|
|
285
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"types.js","sourceRoot":"","sources":["../../ts/appstore/types.ts"],"names":[],"mappings":"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"}
|
|
285
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"types.js","sourceRoot":"","sources":["../../ts/appstore/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as plugins from '../plugins.js';
|
|
2
|
+
import type { TSha256Digest, TImmutableContainerPlatform } from './immutableimage.js';
|
|
2
3
|
export interface IClusterNodeMetrics {
|
|
3
4
|
cpuUsagePercent: number;
|
|
4
5
|
memoryUsedMB: number;
|
|
@@ -80,6 +81,89 @@ export interface ISparkActionResultResponse {
|
|
|
80
81
|
accepted: boolean;
|
|
81
82
|
message?: string;
|
|
82
83
|
}
|
|
84
|
+
export interface ISwarmManagerObservedNodeV1 {
|
|
85
|
+
swarmNodeId: string;
|
|
86
|
+
nodeName: string;
|
|
87
|
+
platform: TImmutableContainerPlatform;
|
|
88
|
+
role: 'manager' | 'worker';
|
|
89
|
+
availability: 'active' | 'pause' | 'drain';
|
|
90
|
+
state: 'unknown' | 'down' | 'ready' | 'disconnected';
|
|
91
|
+
managerStatus?: {
|
|
92
|
+
leader: boolean;
|
|
93
|
+
reachability: 'unknown' | 'unreachable' | 'reachable';
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
export interface ISwarmManagerSnapshotV1 {
|
|
97
|
+
snapshotVersion: 1;
|
|
98
|
+
snapshotDigest: TSha256Digest;
|
|
99
|
+
nodeCount: number;
|
|
100
|
+
managerCount: number;
|
|
101
|
+
nodes: ISwarmManagerObservedNodeV1[];
|
|
102
|
+
}
|
|
103
|
+
interface ISparkSwarmObservationBaseV1 {
|
|
104
|
+
schemaVersion: 1;
|
|
105
|
+
reporterSessionId: string;
|
|
106
|
+
observationSequence: number;
|
|
107
|
+
observedAt: number;
|
|
108
|
+
}
|
|
109
|
+
export type TSparkSwarmObservationV1 = (ISparkSwarmObservationBaseV1 & {
|
|
110
|
+
state: 'unknown';
|
|
111
|
+
reason: 'docker-unavailable' | 'query-failed' | 'not-initialized';
|
|
112
|
+
}) | (ISparkSwarmObservationBaseV1 & {
|
|
113
|
+
state: 'not-member';
|
|
114
|
+
}) | (ISparkSwarmObservationBaseV1 & {
|
|
115
|
+
state: 'member';
|
|
116
|
+
swarmClusterId: string;
|
|
117
|
+
localSwarmNodeId: string;
|
|
118
|
+
controlAvailable: boolean;
|
|
119
|
+
managerSnapshot?: ISwarmManagerSnapshotV1;
|
|
120
|
+
});
|
|
121
|
+
/** Cloudly derives node and cluster scope from this authenticated Spark request. */
|
|
122
|
+
export interface ISparkSwarmObservationRequest {
|
|
123
|
+
nodeId: string;
|
|
124
|
+
nodeToken: string;
|
|
125
|
+
observation: TSparkSwarmObservationV1;
|
|
126
|
+
}
|
|
127
|
+
export interface ISparkSwarmObservationResponse {
|
|
128
|
+
accepted: boolean;
|
|
129
|
+
acceptedSequence?: number;
|
|
130
|
+
targetGeneration?: number;
|
|
131
|
+
message?: string;
|
|
132
|
+
}
|
|
133
|
+
export interface IClusterRuntimeTargetV1 {
|
|
134
|
+
cloudlyNodeId: string;
|
|
135
|
+
swarmClusterId: string;
|
|
136
|
+
swarmNodeId: string;
|
|
137
|
+
nodeName: string;
|
|
138
|
+
platform: TImmutableContainerPlatform;
|
|
139
|
+
}
|
|
140
|
+
export interface IClusterRuntimeTargetSetReadyV1 {
|
|
141
|
+
schemaVersion: 1;
|
|
142
|
+
state: 'ready';
|
|
143
|
+
cloudlyClusterId: string;
|
|
144
|
+
swarmClusterId: string;
|
|
145
|
+
generation: number;
|
|
146
|
+
targetSetDigest: TSha256Digest;
|
|
147
|
+
acceptedAt: number;
|
|
148
|
+
freshUntil: number;
|
|
149
|
+
targets: IClusterRuntimeTargetV1[];
|
|
150
|
+
}
|
|
151
|
+
export interface IClusterRuntimeTargetSetUnavailableV1 {
|
|
152
|
+
schemaVersion: 1;
|
|
153
|
+
state: 'unavailable';
|
|
154
|
+
cloudlyClusterId: string;
|
|
155
|
+
generation: number;
|
|
156
|
+
changedAt: number;
|
|
157
|
+
reason: 'never-observed' | 'stale' | 'no-manager-consensus' | 'identity-conflict' | 'no-schedulable-targets';
|
|
158
|
+
}
|
|
159
|
+
export type TClusterRuntimeTargetSetV1 = IClusterRuntimeTargetSetReadyV1 | IClusterRuntimeTargetSetUnavailableV1;
|
|
160
|
+
export declare const createSwarmManagerSnapshotDigestInput: (swarmClusterIdArg: string, snapshotArg: ISwarmManagerSnapshotV1) => string;
|
|
161
|
+
export declare const computeSwarmManagerSnapshotDigest: (swarmClusterIdArg: string, snapshotArg: ISwarmManagerSnapshotV1) => Promise<TSha256Digest>;
|
|
162
|
+
export declare const validateSparkSwarmObservation: (observationArg: unknown) => Promise<string[]>;
|
|
163
|
+
export declare const createClusterRuntimeTargetSetDigestInput: (targetSetArg: IClusterRuntimeTargetSetReadyV1) => string;
|
|
164
|
+
export declare const computeClusterRuntimeTargetSetDigest: (targetSetArg: IClusterRuntimeTargetSetReadyV1) => Promise<TSha256Digest>;
|
|
165
|
+
export declare const validateClusterRuntimeTargetSet: (targetSetArg: unknown) => Promise<string[]>;
|
|
166
|
+
export declare const isClusterRuntimeTargetSetFresh: (targetSetArg: TClusterRuntimeTargetSetV1, nowArg: number) => targetSetArg is IClusterRuntimeTargetSetReadyV1;
|
|
83
167
|
export type TSparkNodeMode = 'cloudly' | 'coreflow-node';
|
|
84
168
|
export type TSparkCloudlyConnectionStatus = 'not-configured' | 'connecting' | 'connected' | 'failed';
|
|
85
169
|
export interface ISparkNodeRuntimeInfo {
|
|
@@ -152,3 +236,4 @@ export interface IClusterNode {
|
|
|
152
236
|
requiredDebianPackages: string[];
|
|
153
237
|
};
|
|
154
238
|
}
|
|
239
|
+
export {};
|
|
@@ -1,2 +1,356 @@
|
|
|
1
1
|
import * as plugins from '../plugins.js';
|
|
2
|
-
|
|
2
|
+
const runtimeIdentifierRegex = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
|
|
3
|
+
const runtimeDigestRegex = /^sha256:[a-f0-9]{64}$/;
|
|
4
|
+
const runtimePlatforms = new Set([
|
|
5
|
+
'linux/amd64',
|
|
6
|
+
'linux/arm64',
|
|
7
|
+
]);
|
|
8
|
+
const maximumSwarmNodes = 1024;
|
|
9
|
+
const isRuntimeRecord = (valueArg) => (Boolean(valueArg) && typeof valueArg === 'object' && !Array.isArray(valueArg));
|
|
10
|
+
const hasExactRuntimeKeys = (valueArg, keysArg) => JSON.stringify(Object.keys(valueArg).sort()) === JSON.stringify([...keysArg].sort());
|
|
11
|
+
const isRuntimeIdentifier = (valueArg) => (typeof valueArg === 'string' && runtimeIdentifierRegex.test(valueArg));
|
|
12
|
+
const isPositiveSafeInteger = (valueArg) => (Number.isSafeInteger(valueArg) && valueArg > 0);
|
|
13
|
+
const computeSha256 = async (inputArg) => {
|
|
14
|
+
const digest = new Uint8Array(await globalThis.crypto.subtle.digest('SHA-256', new TextEncoder().encode(inputArg)));
|
|
15
|
+
return `sha256:${[...digest]
|
|
16
|
+
.map((byteArg) => byteArg.toString(16).padStart(2, '0'))
|
|
17
|
+
.join('')}`;
|
|
18
|
+
};
|
|
19
|
+
const canonicalSwarmNode = (nodeArg) => ({
|
|
20
|
+
swarmNodeId: nodeArg.swarmNodeId,
|
|
21
|
+
nodeName: nodeArg.nodeName,
|
|
22
|
+
platform: nodeArg.platform,
|
|
23
|
+
role: nodeArg.role,
|
|
24
|
+
availability: nodeArg.availability,
|
|
25
|
+
state: nodeArg.state,
|
|
26
|
+
managerStatus: nodeArg.managerStatus
|
|
27
|
+
? {
|
|
28
|
+
leader: nodeArg.managerStatus.leader,
|
|
29
|
+
reachability: nodeArg.managerStatus.reachability,
|
|
30
|
+
}
|
|
31
|
+
: null,
|
|
32
|
+
});
|
|
33
|
+
export const createSwarmManagerSnapshotDigestInput = (swarmClusterIdArg, snapshotArg) => JSON.stringify({
|
|
34
|
+
schemaVersion: 1,
|
|
35
|
+
purpose: 'serve.zone/swarm-manager-snapshot',
|
|
36
|
+
swarmClusterId: swarmClusterIdArg,
|
|
37
|
+
snapshotVersion: snapshotArg.snapshotVersion,
|
|
38
|
+
nodeCount: snapshotArg.nodeCount,
|
|
39
|
+
managerCount: snapshotArg.managerCount,
|
|
40
|
+
nodes: snapshotArg.nodes.map(canonicalSwarmNode),
|
|
41
|
+
});
|
|
42
|
+
export const computeSwarmManagerSnapshotDigest = async (swarmClusterIdArg, snapshotArg) => computeSha256(createSwarmManagerSnapshotDigestInput(swarmClusterIdArg, snapshotArg));
|
|
43
|
+
const validateSwarmManagerSnapshot = async (swarmClusterIdArg, localSwarmNodeIdArg, snapshotArg) => {
|
|
44
|
+
if (!isRuntimeRecord(snapshotArg)
|
|
45
|
+
|| !hasExactRuntimeKeys(snapshotArg, [
|
|
46
|
+
'snapshotVersion',
|
|
47
|
+
'snapshotDigest',
|
|
48
|
+
'nodeCount',
|
|
49
|
+
'managerCount',
|
|
50
|
+
'nodes',
|
|
51
|
+
])) {
|
|
52
|
+
return ['Spark Swarm manager snapshot must use its exact schema'];
|
|
53
|
+
}
|
|
54
|
+
const errors = [];
|
|
55
|
+
if (snapshotArg.snapshotVersion !== 1) {
|
|
56
|
+
errors.push('Spark Swarm manager snapshotVersion must be 1');
|
|
57
|
+
}
|
|
58
|
+
if (typeof snapshotArg.snapshotDigest !== 'string'
|
|
59
|
+
|| !runtimeDigestRegex.test(snapshotArg.snapshotDigest)) {
|
|
60
|
+
errors.push('Spark Swarm manager snapshot digest must be canonical');
|
|
61
|
+
}
|
|
62
|
+
if (!Array.isArray(snapshotArg.nodes)
|
|
63
|
+
|| snapshotArg.nodes.length === 0
|
|
64
|
+
|| snapshotArg.nodes.length > maximumSwarmNodes) {
|
|
65
|
+
errors.push('Spark Swarm manager snapshot nodes must be a non-empty bounded array');
|
|
66
|
+
return errors;
|
|
67
|
+
}
|
|
68
|
+
if (snapshotArg.nodeCount !== snapshotArg.nodes.length
|
|
69
|
+
|| !isPositiveSafeInteger(snapshotArg.nodeCount)) {
|
|
70
|
+
errors.push('Spark Swarm manager snapshot nodeCount must match nodes');
|
|
71
|
+
}
|
|
72
|
+
const nodeIds = new Set();
|
|
73
|
+
const nodeNames = new Set();
|
|
74
|
+
let managerCount = 0;
|
|
75
|
+
let leaderCount = 0;
|
|
76
|
+
let previousSortKey;
|
|
77
|
+
for (const [index, nodeArg] of snapshotArg.nodes.entries()) {
|
|
78
|
+
if (!isRuntimeRecord(nodeArg)) {
|
|
79
|
+
errors.push(`Spark Swarm manager snapshot nodes[${index}] must be an object`);
|
|
80
|
+
continue;
|
|
81
|
+
}
|
|
82
|
+
const isManager = nodeArg.role === 'manager';
|
|
83
|
+
const expectedKeys = [
|
|
84
|
+
'swarmNodeId',
|
|
85
|
+
'nodeName',
|
|
86
|
+
'platform',
|
|
87
|
+
'role',
|
|
88
|
+
'availability',
|
|
89
|
+
'state',
|
|
90
|
+
...(isManager ? ['managerStatus'] : []),
|
|
91
|
+
];
|
|
92
|
+
if (!hasExactRuntimeKeys(nodeArg, expectedKeys)) {
|
|
93
|
+
errors.push(`Spark Swarm manager snapshot nodes[${index}] must use its exact role schema`);
|
|
94
|
+
}
|
|
95
|
+
if (!isRuntimeIdentifier(nodeArg.swarmNodeId) || !isRuntimeIdentifier(nodeArg.nodeName)) {
|
|
96
|
+
errors.push(`Spark Swarm manager snapshot nodes[${index}] identity must be canonical`);
|
|
97
|
+
}
|
|
98
|
+
if (!runtimePlatforms.has(nodeArg.platform)) {
|
|
99
|
+
errors.push(`Spark Swarm manager snapshot nodes[${index}] platform must be supported`);
|
|
100
|
+
}
|
|
101
|
+
if (!['manager', 'worker'].includes(nodeArg.role)
|
|
102
|
+
|| !['active', 'pause', 'drain'].includes(nodeArg.availability)
|
|
103
|
+
|| !['unknown', 'down', 'ready', 'disconnected'].includes(nodeArg.state)) {
|
|
104
|
+
errors.push(`Spark Swarm manager snapshot nodes[${index}] scheduler state must be canonical`);
|
|
105
|
+
}
|
|
106
|
+
if (isManager) {
|
|
107
|
+
managerCount++;
|
|
108
|
+
if (!isRuntimeRecord(nodeArg.managerStatus)
|
|
109
|
+
|| !hasExactRuntimeKeys(nodeArg.managerStatus, ['leader', 'reachability'])
|
|
110
|
+
|| typeof nodeArg.managerStatus.leader !== 'boolean'
|
|
111
|
+
|| !['unknown', 'unreachable', 'reachable']
|
|
112
|
+
.includes(nodeArg.managerStatus.reachability)) {
|
|
113
|
+
errors.push(`Spark Swarm manager snapshot nodes[${index}] managerStatus must be canonical`);
|
|
114
|
+
}
|
|
115
|
+
else if (nodeArg.managerStatus.leader) {
|
|
116
|
+
leaderCount++;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
if (isRuntimeIdentifier(nodeArg.swarmNodeId)) {
|
|
120
|
+
if (nodeIds.has(nodeArg.swarmNodeId)) {
|
|
121
|
+
errors.push('Spark Swarm manager snapshot node IDs must be unique');
|
|
122
|
+
}
|
|
123
|
+
nodeIds.add(nodeArg.swarmNodeId);
|
|
124
|
+
}
|
|
125
|
+
if (isRuntimeIdentifier(nodeArg.nodeName)) {
|
|
126
|
+
if (nodeNames.has(nodeArg.nodeName)) {
|
|
127
|
+
errors.push('Spark Swarm manager snapshot node names must be unique');
|
|
128
|
+
}
|
|
129
|
+
nodeNames.add(nodeArg.nodeName);
|
|
130
|
+
}
|
|
131
|
+
if (isRuntimeIdentifier(nodeArg.swarmNodeId) && isRuntimeIdentifier(nodeArg.nodeName)) {
|
|
132
|
+
const sortKey = `${nodeArg.swarmNodeId}\0${nodeArg.nodeName}\0${nodeArg.platform}`;
|
|
133
|
+
if (previousSortKey !== undefined && sortKey <= previousSortKey) {
|
|
134
|
+
errors.push('Spark Swarm manager snapshot nodes must be uniquely sorted');
|
|
135
|
+
}
|
|
136
|
+
previousSortKey = sortKey;
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
if (snapshotArg.managerCount !== managerCount || !isPositiveSafeInteger(snapshotArg.managerCount)) {
|
|
140
|
+
errors.push('Spark Swarm manager snapshot managerCount must match nodes');
|
|
141
|
+
}
|
|
142
|
+
if (leaderCount > 1)
|
|
143
|
+
errors.push('Spark Swarm manager snapshot may contain at most one leader');
|
|
144
|
+
const sourceNode = snapshotArg.nodes.find((nodeArg) => (isRuntimeRecord(nodeArg) && nodeArg.swarmNodeId === localSwarmNodeIdArg));
|
|
145
|
+
if (!isRuntimeRecord(sourceNode)
|
|
146
|
+
|| sourceNode.role !== 'manager'
|
|
147
|
+
|| sourceNode.availability !== 'active'
|
|
148
|
+
|| sourceNode.state !== 'ready'
|
|
149
|
+
|| !isRuntimeRecord(sourceNode.managerStatus)
|
|
150
|
+
|| sourceNode.managerStatus.reachability !== 'reachable') {
|
|
151
|
+
errors.push('Spark Swarm manager snapshot source must be an active reachable manager');
|
|
152
|
+
}
|
|
153
|
+
if (errors.length === 0
|
|
154
|
+
&& snapshotArg.snapshotDigest !== await computeSwarmManagerSnapshotDigest(swarmClusterIdArg, snapshotArg)) {
|
|
155
|
+
errors.push('Spark Swarm manager snapshot digest does not match');
|
|
156
|
+
}
|
|
157
|
+
return errors;
|
|
158
|
+
};
|
|
159
|
+
export const validateSparkSwarmObservation = async (observationArg) => {
|
|
160
|
+
try {
|
|
161
|
+
if (!isRuntimeRecord(observationArg))
|
|
162
|
+
return ['Spark Swarm observation must be an object'];
|
|
163
|
+
const observation = observationArg;
|
|
164
|
+
const commonKeys = [
|
|
165
|
+
'schemaVersion',
|
|
166
|
+
'reporterSessionId',
|
|
167
|
+
'observationSequence',
|
|
168
|
+
'observedAt',
|
|
169
|
+
'state',
|
|
170
|
+
];
|
|
171
|
+
const expectedKeys = observation.state === 'unknown'
|
|
172
|
+
? [...commonKeys, 'reason']
|
|
173
|
+
: observation.state === 'not-member'
|
|
174
|
+
? commonKeys
|
|
175
|
+
: observation.state === 'member'
|
|
176
|
+
? [
|
|
177
|
+
...commonKeys,
|
|
178
|
+
'swarmClusterId',
|
|
179
|
+
'localSwarmNodeId',
|
|
180
|
+
'controlAvailable',
|
|
181
|
+
...(observation.managerSnapshot === undefined ? [] : ['managerSnapshot']),
|
|
182
|
+
]
|
|
183
|
+
: [];
|
|
184
|
+
if (expectedKeys.length === 0 || !hasExactRuntimeKeys(observation, expectedKeys)) {
|
|
185
|
+
return ['Spark Swarm observation must use its exact state schema'];
|
|
186
|
+
}
|
|
187
|
+
const errors = [];
|
|
188
|
+
if (observation.schemaVersion !== 1)
|
|
189
|
+
errors.push('Spark Swarm observation schemaVersion must be 1');
|
|
190
|
+
if (!isRuntimeIdentifier(observation.reporterSessionId)
|
|
191
|
+
|| !isPositiveSafeInteger(observation.observationSequence)
|
|
192
|
+
|| !isPositiveSafeInteger(observation.observedAt)) {
|
|
193
|
+
errors.push('Spark Swarm observation identity, sequence, and timestamp must be canonical');
|
|
194
|
+
}
|
|
195
|
+
if (observation.state === 'unknown'
|
|
196
|
+
&& !['docker-unavailable', 'query-failed', 'not-initialized']
|
|
197
|
+
.includes(observation.reason)) {
|
|
198
|
+
errors.push('Spark Swarm observation unknown reason must be canonical');
|
|
199
|
+
}
|
|
200
|
+
if (observation.state === 'member') {
|
|
201
|
+
if (!isRuntimeIdentifier(observation.swarmClusterId)
|
|
202
|
+
|| !isRuntimeIdentifier(observation.localSwarmNodeId)
|
|
203
|
+
|| typeof observation.controlAvailable !== 'boolean') {
|
|
204
|
+
errors.push('Spark Swarm member observation must have canonical local authority');
|
|
205
|
+
}
|
|
206
|
+
if (observation.managerSnapshot !== undefined) {
|
|
207
|
+
if (observation.controlAvailable !== true) {
|
|
208
|
+
errors.push('Spark Swarm manager snapshot requires controlAvailable');
|
|
209
|
+
}
|
|
210
|
+
else if (isRuntimeIdentifier(observation.swarmClusterId)
|
|
211
|
+
&& isRuntimeIdentifier(observation.localSwarmNodeId)) {
|
|
212
|
+
errors.push(...await validateSwarmManagerSnapshot(observation.swarmClusterId, observation.localSwarmNodeId, observation.managerSnapshot));
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
return errors;
|
|
217
|
+
}
|
|
218
|
+
catch {
|
|
219
|
+
return ['Spark Swarm observation must be safely inspectable'];
|
|
220
|
+
}
|
|
221
|
+
};
|
|
222
|
+
const canonicalRuntimeTarget = (targetArg) => ({
|
|
223
|
+
cloudlyNodeId: targetArg.cloudlyNodeId,
|
|
224
|
+
swarmClusterId: targetArg.swarmClusterId,
|
|
225
|
+
swarmNodeId: targetArg.swarmNodeId,
|
|
226
|
+
nodeName: targetArg.nodeName,
|
|
227
|
+
platform: targetArg.platform,
|
|
228
|
+
});
|
|
229
|
+
export const createClusterRuntimeTargetSetDigestInput = (targetSetArg) => JSON.stringify({
|
|
230
|
+
schemaVersion: targetSetArg.schemaVersion,
|
|
231
|
+
purpose: 'serve.zone/cluster-runtime-target-set',
|
|
232
|
+
cloudlyClusterId: targetSetArg.cloudlyClusterId,
|
|
233
|
+
swarmClusterId: targetSetArg.swarmClusterId,
|
|
234
|
+
generation: targetSetArg.generation,
|
|
235
|
+
targets: targetSetArg.targets.map(canonicalRuntimeTarget),
|
|
236
|
+
});
|
|
237
|
+
export const computeClusterRuntimeTargetSetDigest = async (targetSetArg) => computeSha256(createClusterRuntimeTargetSetDigestInput(targetSetArg));
|
|
238
|
+
export const validateClusterRuntimeTargetSet = async (targetSetArg) => {
|
|
239
|
+
try {
|
|
240
|
+
if (!isRuntimeRecord(targetSetArg))
|
|
241
|
+
return ['cluster runtime target set must be an object'];
|
|
242
|
+
if (targetSetArg.state === 'unavailable') {
|
|
243
|
+
if (!hasExactRuntimeKeys(targetSetArg, [
|
|
244
|
+
'schemaVersion',
|
|
245
|
+
'state',
|
|
246
|
+
'cloudlyClusterId',
|
|
247
|
+
'generation',
|
|
248
|
+
'changedAt',
|
|
249
|
+
'reason',
|
|
250
|
+
])) {
|
|
251
|
+
return ['unavailable cluster runtime target set must use its exact schema'];
|
|
252
|
+
}
|
|
253
|
+
const errors = [];
|
|
254
|
+
if (targetSetArg.schemaVersion !== 1
|
|
255
|
+
|| !isRuntimeIdentifier(targetSetArg.cloudlyClusterId)
|
|
256
|
+
|| !Number.isSafeInteger(targetSetArg.generation)
|
|
257
|
+
|| targetSetArg.generation < 0
|
|
258
|
+
|| !isPositiveSafeInteger(targetSetArg.changedAt)
|
|
259
|
+
|| ![
|
|
260
|
+
'never-observed',
|
|
261
|
+
'stale',
|
|
262
|
+
'no-manager-consensus',
|
|
263
|
+
'identity-conflict',
|
|
264
|
+
'no-schedulable-targets',
|
|
265
|
+
].includes(targetSetArg.reason)) {
|
|
266
|
+
errors.push('unavailable cluster runtime target set fields must be canonical');
|
|
267
|
+
}
|
|
268
|
+
if (targetSetArg.reason === 'never-observed' && targetSetArg.generation !== 0) {
|
|
269
|
+
errors.push('never-observed target state must use generation zero');
|
|
270
|
+
}
|
|
271
|
+
return errors;
|
|
272
|
+
}
|
|
273
|
+
if (targetSetArg.state !== 'ready'
|
|
274
|
+
|| !hasExactRuntimeKeys(targetSetArg, [
|
|
275
|
+
'schemaVersion',
|
|
276
|
+
'state',
|
|
277
|
+
'cloudlyClusterId',
|
|
278
|
+
'swarmClusterId',
|
|
279
|
+
'generation',
|
|
280
|
+
'targetSetDigest',
|
|
281
|
+
'acceptedAt',
|
|
282
|
+
'freshUntil',
|
|
283
|
+
'targets',
|
|
284
|
+
])) {
|
|
285
|
+
return ['ready cluster runtime target set must use its exact schema'];
|
|
286
|
+
}
|
|
287
|
+
const errors = [];
|
|
288
|
+
if (targetSetArg.schemaVersion !== 1
|
|
289
|
+
|| !isRuntimeIdentifier(targetSetArg.cloudlyClusterId)
|
|
290
|
+
|| !isRuntimeIdentifier(targetSetArg.swarmClusterId)
|
|
291
|
+
|| !isPositiveSafeInteger(targetSetArg.generation)
|
|
292
|
+
|| !isPositiveSafeInteger(targetSetArg.acceptedAt)
|
|
293
|
+
|| !isPositiveSafeInteger(targetSetArg.freshUntil)
|
|
294
|
+
|| targetSetArg.freshUntil <= targetSetArg.acceptedAt
|
|
295
|
+
|| typeof targetSetArg.targetSetDigest !== 'string'
|
|
296
|
+
|| !runtimeDigestRegex.test(targetSetArg.targetSetDigest)) {
|
|
297
|
+
errors.push('ready cluster runtime target set authority fields must be canonical');
|
|
298
|
+
}
|
|
299
|
+
if (!Array.isArray(targetSetArg.targets)
|
|
300
|
+
|| targetSetArg.targets.length === 0
|
|
301
|
+
|| targetSetArg.targets.length > maximumSwarmNodes) {
|
|
302
|
+
errors.push('ready cluster runtime target set targets must be a non-empty bounded array');
|
|
303
|
+
return errors;
|
|
304
|
+
}
|
|
305
|
+
const cloudlyNodeIds = new Set();
|
|
306
|
+
const swarmNodeScopes = new Set();
|
|
307
|
+
const nodeNames = new Set();
|
|
308
|
+
let previousSortKey;
|
|
309
|
+
for (const [index, targetArg] of targetSetArg.targets.entries()) {
|
|
310
|
+
if (!isRuntimeRecord(targetArg)
|
|
311
|
+
|| !hasExactRuntimeKeys(targetArg, [
|
|
312
|
+
'cloudlyNodeId',
|
|
313
|
+
'swarmClusterId',
|
|
314
|
+
'swarmNodeId',
|
|
315
|
+
'nodeName',
|
|
316
|
+
'platform',
|
|
317
|
+
])
|
|
318
|
+
|| !isRuntimeIdentifier(targetArg.cloudlyNodeId)
|
|
319
|
+
|| !isRuntimeIdentifier(targetArg.swarmClusterId)
|
|
320
|
+
|| !isRuntimeIdentifier(targetArg.swarmNodeId)
|
|
321
|
+
|| !isRuntimeIdentifier(targetArg.nodeName)
|
|
322
|
+
|| targetArg.swarmClusterId !== targetSetArg.swarmClusterId
|
|
323
|
+
|| !runtimePlatforms.has(targetArg.platform)) {
|
|
324
|
+
errors.push(`cluster runtime target set targets[${index}] must be canonical`);
|
|
325
|
+
continue;
|
|
326
|
+
}
|
|
327
|
+
const sortKey = `${targetArg.cloudlyNodeId}\0${targetArg.swarmClusterId}\0${targetArg.swarmNodeId}\0${targetArg.nodeName}\0${targetArg.platform}`;
|
|
328
|
+
if (previousSortKey !== undefined && sortKey <= previousSortKey) {
|
|
329
|
+
errors.push('cluster runtime target set targets must be uniquely sorted');
|
|
330
|
+
}
|
|
331
|
+
previousSortKey = sortKey;
|
|
332
|
+
const swarmScope = `${targetArg.swarmClusterId}\0${targetArg.swarmNodeId}`;
|
|
333
|
+
if (cloudlyNodeIds.has(targetArg.cloudlyNodeId)
|
|
334
|
+
|| swarmNodeScopes.has(swarmScope)
|
|
335
|
+
|| nodeNames.has(targetArg.nodeName)) {
|
|
336
|
+
errors.push('cluster runtime target identities must be unique');
|
|
337
|
+
}
|
|
338
|
+
cloudlyNodeIds.add(targetArg.cloudlyNodeId);
|
|
339
|
+
swarmNodeScopes.add(swarmScope);
|
|
340
|
+
nodeNames.add(targetArg.nodeName);
|
|
341
|
+
}
|
|
342
|
+
if (errors.length === 0
|
|
343
|
+
&& targetSetArg.targetSetDigest !== await computeClusterRuntimeTargetSetDigest(targetSetArg)) {
|
|
344
|
+
errors.push('cluster runtime target set digest does not match');
|
|
345
|
+
}
|
|
346
|
+
return errors;
|
|
347
|
+
}
|
|
348
|
+
catch {
|
|
349
|
+
return ['cluster runtime target set must be safely inspectable'];
|
|
350
|
+
}
|
|
351
|
+
};
|
|
352
|
+
export const isClusterRuntimeTargetSetFresh = (targetSetArg, nowArg) => (targetSetArg.state === 'ready'
|
|
353
|
+
&& Number.isSafeInteger(nowArg)
|
|
354
|
+
&& nowArg >= targetSetArg.acceptedAt
|
|
355
|
+
&& nowArg < targetSetArg.freshUntil);
|
|
356
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clusternode.js","sourceRoot":"","sources":["../../ts/data/clusternode.ts"],"names":[],"mappings":"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"}
|