@serve.zone/interfaces 32.44.0 → 32.45.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 +39 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/index.d.ts +1 -0
- package/dist_ts/data/index.js +2 -1
- package/dist_ts/data/runtimeassignment.d.ts +24 -3
- package/dist_ts/data/runtimeassignment.js +19 -3
- package/dist_ts/data/serviceplatformownership.d.ts +55 -0
- package/dist_ts/data/serviceplatformownership.js +62 -0
- package/dist_ts/data/serviceruntime.d.ts +49 -1
- package/dist_ts/data/serviceruntime.js +44 -2
- package/dist_ts/requests/network.d.ts +76 -1
- package/package.json +4 -4
- package/readme.md +28 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/index.ts +1 -0
- package/ts/data/runtimeassignment.ts +33 -5
- package/ts/data/serviceplatformownership.ts +95 -0
- package/ts/data/serviceruntime.ts +68 -1
- package/ts/requests/network.ts +65 -1
package/changelog.md
CHANGED
|
@@ -1,5 +1,44 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-10-04 - 32.45.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- A node can say it refused a run. `TRuntimeAssignmentFailureCause` gains
|
|
8
|
+
`{ kind: 'refused'; reason: TRuntimeAssignmentRefusalReason }` (`runtimeAssignmentRefusalReasons`:
|
|
9
|
+
`unsupported-readiness`, `unresolved-authority`, `invalid`) for a run refused before any runtime
|
|
10
|
+
effect, and `{ kind: 'container-refused'; grpcCode }` for a deterministic CRI
|
|
11
|
+
`CreateContainer` refusal (gRPC status 1..16, as for `image-pull-refused`). Both are exact records and, like `image-pull-refused`, belong only to
|
|
12
|
+
a failed observation whose `runtime` is null. A `refused` run is never re-placed with an
|
|
13
|
+
identical configuration: the controller places a new attempt only after the spec or another
|
|
14
|
+
input of the assignment changed. Consumers earlier than this release refuse an observation that
|
|
15
|
+
states either cause.
|
|
16
|
+
- `TServiceRuntimeRefusal` gains `readiness-network-unsupported`: an `isolated` spec with a `tcp`
|
|
17
|
+
or `http` readiness probe. `isServiceRuntimeReadinessReachable(spec)` is the rule; the spec
|
|
18
|
+
snapshot still reads such a spec, so stored specs stay readable.
|
|
19
|
+
- `IServiceRuntimeAssignmentView.dispatch` (optional, `IServiceRuntimeAssignmentDispatch | null`)
|
|
20
|
+
states the controller's last dispatch of the slot's current revision: `delivered`, a closed
|
|
21
|
+
`TAssignmentDispatchReason` (`assignmentDispatchReasons`) and `at`.
|
|
22
|
+
`isServiceRuntimeAssignmentDispatch` validates one exactly.
|
|
23
|
+
- A platform-owned service takes infrastructure-administrator authority over its published ports;
|
|
24
|
+
every organization service keeps the federated organization-owner rule. An administrator
|
|
25
|
+
designates a service that belongs to no idp.global organization (the cluster ingress, a platform
|
|
26
|
+
call router) with `designatePlatformOwnedService`, withdraws it with
|
|
27
|
+
`undesignatePlatformOwnedService` and reads it with `getServicePlatformOwnership`
|
|
28
|
+
(`IServicePlatformOwnership`, `snapshotServicePlatformOwnership`). From then on
|
|
29
|
+
`getServicePublishedPorts` and `setServicePublishedPorts` for that service require a verified
|
|
30
|
+
administrator, as `setServiceNetworkEgress` does, and no organization owner. Only a platform
|
|
31
|
+
organization's service is designated: `isPlatformOrganizationId` is true exactly for a canonical
|
|
32
|
+
identifier carrying `:` (`legacy:Service:<id>`, `Organization:<id>`) and false for an idp.global
|
|
33
|
+
nanoid, whichever character it starts with, and for anything that is not a canonical identifier
|
|
34
|
+
(empty, whitespace). Withdrawing a designation leaves the service's published ports with no
|
|
35
|
+
writer until it is designated again. Refusals are the closed `servicePlatformOwnershipRefusals`:
|
|
36
|
+
`service-unknown`, `service-deleting`, `organization-not-platform`, `conflict`.
|
|
37
|
+
|
|
38
|
+
### Maintenance
|
|
39
|
+
|
|
40
|
+
- Release tooling: @git.zone/tstest 7.1.0, @git.zone/tsdoc 3.0.2, @types/node 26.6.3.
|
|
41
|
+
|
|
3
42
|
## 2026-10-02 - 32.44.0
|
|
4
43
|
|
|
5
44
|
### Features
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/interfaces',
|
|
6
|
-
version: '32.
|
|
6
|
+
version: '32.45.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=
|
package/dist_ts/data/index.d.ts
CHANGED
|
@@ -75,6 +75,7 @@ export * from './sparklegacyretirement.js';
|
|
|
75
75
|
export * from './sparknodereport.js';
|
|
76
76
|
export * from './service.js';
|
|
77
77
|
export * from './servicecredential.js';
|
|
78
|
+
export * from './serviceplatformownership.js';
|
|
78
79
|
export * from './serviceports.js';
|
|
79
80
|
export * from './serviceruntime.js';
|
|
80
81
|
export * from './servicevolumeinitialization.js';
|
package/dist_ts/data/index.js
CHANGED
|
@@ -71,6 +71,7 @@ export * from './sparklegacyretirement.js';
|
|
|
71
71
|
export * from './sparknodereport.js';
|
|
72
72
|
export * from './service.js';
|
|
73
73
|
export * from './servicecredential.js';
|
|
74
|
+
export * from './serviceplatformownership.js';
|
|
74
75
|
export * from './serviceports.js';
|
|
75
76
|
export * from './serviceruntime.js';
|
|
76
77
|
export * from './servicevolumeinitialization.js';
|
|
@@ -80,4 +81,4 @@ export * from './traffic.js';
|
|
|
80
81
|
export * from './user.js';
|
|
81
82
|
export * from './version.js';
|
|
82
83
|
export * from './webpush.js';
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9kYXRhL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxnQ0FBZ0MsQ0FBQztBQUMvQyxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLDhCQUE4QixDQUFDO0FBQzdDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsdUJBQXVCLENBQUM7QUFDdEMsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsMEJBQTBCLENBQUM7QUFDekMsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLFVBQVUsQ0FBQztBQUN6QixjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLFlBQVksQ0FBQztBQUMzQixjQUFjLHVCQUF1QixDQUFDO0FBQ3RDLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLFlBQVksQ0FBQztBQUMzQixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLFdBQVcsQ0FBQztBQUMxQixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyx5QkFBeUIsQ0FBQztBQUN4QyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyw4QkFBOEIsQ0FBQztBQUM3QyxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYyx3QkFBd0IsQ0FBQztBQUd2QyxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUc5RCxPQUFPLEVBQUUscUNBQXFDLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVwRixPQUFPLEVBQUUsMENBQTBDLEVBQUUsMENBQTBDLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUMxSSxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsd0JBQXdCLENBQUM7QUFDdkMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLDRCQUE0QixDQUFDO0FBQzNDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYyxnQ0FBZ0MsQ0FBQztBQUMvQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsa0NBQWtDLENBQUM7QUFDakQsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLFdBQVcsQ0FBQztBQUMxQixjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLGNBQWMsQ0FBQyJ9
|
|
@@ -108,6 +108,14 @@ export type TRuntimeAssignmentDecision = {
|
|
|
108
108
|
*/
|
|
109
109
|
export declare const runtimeImagePullRefusalReasons: readonly ["unauthorized", "not-found", "tls", "transport", "deadline", "unavailable", "other"];
|
|
110
110
|
export type TRuntimeImagePullRefusalReason = typeof runtimeImagePullRefusalReasons[number];
|
|
111
|
+
/**
|
|
112
|
+
* Why a node refused to start a run before any runtime effect of it, as the node names it:
|
|
113
|
+
* `unsupported-readiness` a readiness probe the run's network cannot carry (a TCP or HTTP probe of
|
|
114
|
+
* a run without network authority), `unresolved-authority` a workload authority the node cannot
|
|
115
|
+
* resolve, and `invalid` an assignment or configuration the node cannot read.
|
|
116
|
+
*/
|
|
117
|
+
export declare const runtimeAssignmentRefusalReasons: readonly ["unsupported-readiness", "unresolved-authority", "invalid"];
|
|
118
|
+
export type TRuntimeAssignmentRefusalReason = typeof runtimeAssignmentRefusalReasons[number];
|
|
111
119
|
/**
|
|
112
120
|
* Why a run failed, as its node can name it. Value-free: it carries a cause word and at most a
|
|
113
121
|
* bounded status number, never a runtime message, a registry, a reference or a path.
|
|
@@ -120,9 +128,16 @@ export type TRuntimeImagePullRefusalReason = typeof runtimeImagePullRefusalReaso
|
|
|
120
128
|
* - `runtime-absent`: the runtime holds no sandbox or container of a run that should be running.
|
|
121
129
|
* - `network-epoch-ended`: the run's network attachment belongs to a network epoch that has ended,
|
|
122
130
|
* so the node stopped it rather than leave it running without its network.
|
|
131
|
+
* - `refused`: the node refused the run before any runtime effect of it, for `reason`, so the
|
|
132
|
+
* observation carries no runtime identity.
|
|
133
|
+
* - `container-refused`: the runtime deterministically refused to create the run's container
|
|
134
|
+
* (CRI `CreateContainer`), so no container of the run exists and the observation carries no
|
|
135
|
+
* runtime identity. `grpcCode` is the runtime's gRPC status code (1..16).
|
|
123
136
|
*
|
|
124
|
-
* The cause explains the failure
|
|
125
|
-
*
|
|
137
|
+
* The cause explains the failure. Every failed run is replaced the same way, whichever cause it
|
|
138
|
+
* states, with one exception: a `refused` run is never re-placed with an identical configuration,
|
|
139
|
+
* because the node refuses the same input the same way. The controller places a new attempt only
|
|
140
|
+
* after the service's runtime spec or another input of the assignment changed.
|
|
126
141
|
*/
|
|
127
142
|
export type TRuntimeAssignmentFailureCause = {
|
|
128
143
|
kind: 'image-pull-refused';
|
|
@@ -135,8 +150,14 @@ export type TRuntimeAssignmentFailureCause = {
|
|
|
135
150
|
kind: 'runtime-absent';
|
|
136
151
|
} | {
|
|
137
152
|
kind: 'network-epoch-ended';
|
|
153
|
+
} | {
|
|
154
|
+
kind: 'refused';
|
|
155
|
+
reason: TRuntimeAssignmentRefusalReason;
|
|
156
|
+
} | {
|
|
157
|
+
kind: 'container-refused';
|
|
158
|
+
grpcCode: number;
|
|
138
159
|
};
|
|
139
|
-
export declare const runtimeAssignmentFailureCauseKinds: readonly ["image-pull-refused", "exited", "runtime-absent", "network-epoch-ended"];
|
|
160
|
+
export declare const runtimeAssignmentFailureCauseKinds: readonly ["image-pull-refused", "exited", "runtime-absent", "network-epoch-ended", "refused", "container-refused"];
|
|
140
161
|
/** Value-free execution evidence. Receipt/acceptance alone never means ready. */
|
|
141
162
|
export interface IRuntimeAssignmentObservation {
|
|
142
163
|
assignment: IRuntimeAssignmentReference;
|
|
@@ -59,8 +59,19 @@ export const isResolvedWorkloadAuthorities = (valueArg) => isCanonicalTokenList(
|
|
|
59
59
|
*/
|
|
60
60
|
export const runtimeImagePullRefusalReasons = ['unauthorized', 'not-found', 'tls', 'transport', 'deadline',
|
|
61
61
|
'unavailable', 'other'];
|
|
62
|
+
/**
|
|
63
|
+
* Why a node refused to start a run before any runtime effect of it, as the node names it:
|
|
64
|
+
* `unsupported-readiness` a readiness probe the run's network cannot carry (a TCP or HTTP probe of
|
|
65
|
+
* a run without network authority), `unresolved-authority` a workload authority the node cannot
|
|
66
|
+
* resolve, and `invalid` an assignment or configuration the node cannot read.
|
|
67
|
+
*/
|
|
68
|
+
export const runtimeAssignmentRefusalReasons = ['unsupported-readiness', 'unresolved-authority', 'invalid'];
|
|
62
69
|
export const runtimeAssignmentFailureCauseKinds = ['image-pull-refused', 'exited', 'runtime-absent',
|
|
63
|
-
'network-epoch-ended'];
|
|
70
|
+
'network-epoch-ended', 'refused', 'container-refused'];
|
|
71
|
+
/** The causes of a run of which nothing ever existed, so their observation names no runtime identity. */
|
|
72
|
+
const causesWithoutRuntime = [
|
|
73
|
+
'image-pull-refused', 'refused', 'container-refused',
|
|
74
|
+
];
|
|
64
75
|
export const runtimeAssignmentContract = Object.freeze({
|
|
65
76
|
assignmentDigestDomain: 'serve.zone/runtime-assignment',
|
|
66
77
|
observationDigestDomain: 'serve.zone/runtime-assignment-observation',
|
|
@@ -301,6 +312,11 @@ const isFailureCause = (valueArg) => {
|
|
|
301
312
|
case 'runtime-absent':
|
|
302
313
|
case 'network-epoch-ended':
|
|
303
314
|
return isExactRecord(valueArg, ['kind']);
|
|
315
|
+
case 'refused':
|
|
316
|
+
return isExactRecord(valueArg, ['kind', 'reason'])
|
|
317
|
+
&& runtimeAssignmentRefusalReasons.some((reasonArg) => reasonArg === valueArg.reason);
|
|
318
|
+
case 'container-refused':
|
|
319
|
+
return isExactRecord(valueArg, ['kind', 'grpcCode']) && isBoundedInteger(valueArg.grpcCode, 1, 16);
|
|
304
320
|
default:
|
|
305
321
|
return false;
|
|
306
322
|
}
|
|
@@ -326,7 +342,7 @@ const assertObservation = (valueArg) => {
|
|
|
326
342
|
fail('runtime observation readiness and identity contradict its phase');
|
|
327
343
|
}
|
|
328
344
|
if (Object.hasOwn(valueArg, 'cause') && (valueArg.phase !== 'failed' || !isFailureCause(valueArg.cause)
|
|
329
|
-
|| (valueArg.cause.kind
|
|
345
|
+
|| (causesWithoutRuntime.includes(valueArg.cause.kind) && valueArg.runtime !== null))) {
|
|
330
346
|
fail('runtime observation failure cause must be exact and belong to a failed run');
|
|
331
347
|
}
|
|
332
348
|
canonical(valueArg);
|
|
@@ -402,4 +418,4 @@ export const evaluateRuntimeAssignmentObservation = async (incomingArg, accepted
|
|
|
402
418
|
return { status: 'reject', reason: 'invalid' };
|
|
403
419
|
}
|
|
404
420
|
};
|
|
405
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"runtimeassignment.js","sourceRoot":"","sources":["../../ts/data/runtimeassignment.ts"],"names":[],"mappings":"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"}
|
|
421
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"runtimeassignment.js","sourceRoot":"","sources":["../../ts/data/runtimeassignment.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Which authority writes a service's runtime network policy, decided by whether the service is
|
|
3
|
+
* platform-owned.
|
|
4
|
+
*
|
|
5
|
+
* A service of an idp.global organization is that organization's: its published ports are written
|
|
6
|
+
* only by a federated sign-in holding the organization's freshly introspected `owner` role, and an
|
|
7
|
+
* infrastructure administrator does not substitute for it. A platform-owned service belongs to no
|
|
8
|
+
* idp.global organization — the cluster ingress, a platform call router — so no organization owner
|
|
9
|
+
* exists who could authorize it. An infrastructure administrator designates such a service
|
|
10
|
+
* platform-owned, and from then on only a verified administrator reads and writes its published
|
|
11
|
+
* ports, as only an administrator writes its egress and its runtime spec. The designation names
|
|
12
|
+
* the authority and nothing else: it grants no port, egress or placement by itself.
|
|
13
|
+
*
|
|
14
|
+
* Only a service of a platform organization (`isPlatformOrganizationId`) is ever designated, so the
|
|
15
|
+
* federated owner rule stays the only rule for every other service, including any whose
|
|
16
|
+
* organization id is not a canonical identifier at all. Withdrawing the designation hands the
|
|
17
|
+
* ports back to the organization-owner rule, and a platform organization has no idp.global owner:
|
|
18
|
+
* the service's published ports then have no writer, and stay as they are, until an administrator
|
|
19
|
+
* designates it again.
|
|
20
|
+
*/
|
|
21
|
+
export interface IServicePlatformOwnership {
|
|
22
|
+
organizationId: string;
|
|
23
|
+
serviceId: string;
|
|
24
|
+
/** The administrator who designated the service. */
|
|
25
|
+
actorId: string;
|
|
26
|
+
/** Unix milliseconds on Cloudly's clock. */
|
|
27
|
+
designatedAt: number;
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Every reason Cloudly answers instead of designating a service platform-owned or withdrawing the
|
|
31
|
+
* designation. Each travels by name as a `TypedResponseError`, and a refused request changes
|
|
32
|
+
* nothing.
|
|
33
|
+
*/
|
|
34
|
+
export declare const servicePlatformOwnershipRefusals: readonly ["service-unknown", "service-deleting", "organization-not-platform", "conflict"];
|
|
35
|
+
/** One of the reasons Cloudly answers instead of a designation change. */
|
|
36
|
+
export type TServicePlatformOwnershipRefusal = typeof servicePlatformOwnershipRefusals[number];
|
|
37
|
+
export declare const servicePlatformOwnershipContract: Readonly<{
|
|
38
|
+
readonly error: "Service platform ownership contract rejected.";
|
|
39
|
+
}>;
|
|
40
|
+
/**
|
|
41
|
+
* Whether an organization id names a platform organization, the only kind whose service an
|
|
42
|
+
* administrator may designate platform-owned.
|
|
43
|
+
*
|
|
44
|
+
* Every organization Cloudly assigns outside idp.global is namespaced with `:` — a legacy service's
|
|
45
|
+
* own `legacy:Service:<id>`, a platform `Organization:<id>` — while idp.global names an
|
|
46
|
+
* organization by a 21-character nanoid in the URL alphabet (`A-Za-z0-9_-`), which never carries
|
|
47
|
+
* `:`. An id is a platform organization's exactly when it is a canonical identifier (an ASCII
|
|
48
|
+
* letter or digit, then up to 199 of letters, digits, `:`, `.`, `_` and `-`) and carries `:`.
|
|
49
|
+
* Everything else is not: an idp.global id, whichever character it starts with, and any value that
|
|
50
|
+
* is not a canonical identifier — empty, whitespace, a non-string. The answer fails closed: an id
|
|
51
|
+
* this rule cannot read never gains administrator authority.
|
|
52
|
+
*/
|
|
53
|
+
export declare const isPlatformOrganizationId: (organizationId: string) => boolean;
|
|
54
|
+
/** Detached exact-schema snapshot of a stored or answered designation. */
|
|
55
|
+
export declare const snapshotServicePlatformOwnership: (value: unknown) => IServicePlatformOwnership;
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import { captureNetwork, networkCounter, networkId, networkRecord, requireNetwork } from '../private/networkcontract.js';
|
|
2
|
+
/**
|
|
3
|
+
* Every reason Cloudly answers instead of designating a service platform-owned or withdrawing the
|
|
4
|
+
* designation. Each travels by name as a `TypedResponseError`, and a refused request changes
|
|
5
|
+
* nothing.
|
|
6
|
+
*/
|
|
7
|
+
export const servicePlatformOwnershipRefusals = Object.freeze([
|
|
8
|
+
/** No service of that id belongs to the named organization. */
|
|
9
|
+
'service-unknown',
|
|
10
|
+
/** The service's deletion has begun; no new authority outlives it. */
|
|
11
|
+
'service-deleting',
|
|
12
|
+
/**
|
|
13
|
+
* The named organization is not a platform organization (`isPlatformOrganizationId`): an
|
|
14
|
+
* idp.global organization, whose owner keeps the authority over its runtime network policy, or an
|
|
15
|
+
* id that is no canonical identifier.
|
|
16
|
+
*/
|
|
17
|
+
'organization-not-platform',
|
|
18
|
+
/** Another write changed the service's designation first: read it again. */
|
|
19
|
+
'conflict',
|
|
20
|
+
]);
|
|
21
|
+
export const servicePlatformOwnershipContract = Object.freeze({
|
|
22
|
+
error: 'Service platform ownership contract rejected.',
|
|
23
|
+
});
|
|
24
|
+
/**
|
|
25
|
+
* Whether an organization id names a platform organization, the only kind whose service an
|
|
26
|
+
* administrator may designate platform-owned.
|
|
27
|
+
*
|
|
28
|
+
* Every organization Cloudly assigns outside idp.global is namespaced with `:` — a legacy service's
|
|
29
|
+
* own `legacy:Service:<id>`, a platform `Organization:<id>` — while idp.global names an
|
|
30
|
+
* organization by a 21-character nanoid in the URL alphabet (`A-Za-z0-9_-`), which never carries
|
|
31
|
+
* `:`. An id is a platform organization's exactly when it is a canonical identifier (an ASCII
|
|
32
|
+
* letter or digit, then up to 199 of letters, digits, `:`, `.`, `_` and `-`) and carries `:`.
|
|
33
|
+
* Everything else is not: an idp.global id, whichever character it starts with, and any value that
|
|
34
|
+
* is not a canonical identifier — empty, whitespace, a non-string. The answer fails closed: an id
|
|
35
|
+
* this rule cannot read never gains administrator authority.
|
|
36
|
+
*/
|
|
37
|
+
export const isPlatformOrganizationId = (organizationId) => {
|
|
38
|
+
try {
|
|
39
|
+
return networkId(organizationId).includes(':');
|
|
40
|
+
}
|
|
41
|
+
catch {
|
|
42
|
+
return false;
|
|
43
|
+
}
|
|
44
|
+
};
|
|
45
|
+
/** Detached exact-schema snapshot of a stored or answered designation. */
|
|
46
|
+
export const snapshotServicePlatformOwnership = (value) => {
|
|
47
|
+
try {
|
|
48
|
+
const item = networkRecord(captureNetwork(value), ['organizationId', 'serviceId', 'actorId', 'designatedAt']);
|
|
49
|
+
const organizationId = networkId(item.organizationId);
|
|
50
|
+
requireNetwork(isPlatformOrganizationId(organizationId));
|
|
51
|
+
return {
|
|
52
|
+
organizationId,
|
|
53
|
+
serviceId: networkId(item.serviceId),
|
|
54
|
+
actorId: networkId(item.actorId),
|
|
55
|
+
designatedAt: networkCounter(item.designatedAt),
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
catch {
|
|
59
|
+
throw new Error(servicePlatformOwnershipContract.error);
|
|
60
|
+
}
|
|
61
|
+
};
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZXBsYXRmb3Jtb3duZXJzaGlwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvZGF0YS9zZXJ2aWNlcGxhdGZvcm1vd25lcnNoaXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxjQUFjLEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxjQUFjLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQStCekg7Ozs7R0FJRztBQUNILE1BQU0sQ0FBQyxNQUFNLGdDQUFnQyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUM7SUFDNUQsK0RBQStEO0lBQy9ELGlCQUFpQjtJQUNqQixzRUFBc0U7SUFDdEUsa0JBQWtCO0lBQ2xCOzs7O09BSUc7SUFDSCwyQkFBMkI7SUFDM0IsNEVBQTRFO0lBQzVFLFVBQVU7Q0FDRixDQUFDLENBQUM7QUFLWixNQUFNLENBQUMsTUFBTSxnQ0FBZ0MsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDO0lBQzVELEtBQUssRUFBRSwrQ0FBK0M7Q0FDOUMsQ0FBQyxDQUFDO0FBRVo7Ozs7Ozs7Ozs7OztHQVlHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sd0JBQXdCLEdBQUcsQ0FBQyxjQUFzQixFQUFXLEVBQUU7SUFDMUUsSUFBSSxDQUFDO1FBQ0gsT0FBTyxTQUFTLENBQUMsY0FBYyxDQUFDLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ2pELENBQUM7SUFBQyxNQUFNLENBQUM7UUFDUCxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7QUFDSCxDQUFDLENBQUM7QUFFRiwwRUFBMEU7QUFDMUUsTUFBTSxDQUFDLE1BQU0sZ0NBQWdDLEdBQUcsQ0FBQyxLQUFjLEVBQTZCLEVBQUU7SUFDNUYsSUFBSSxDQUFDO1FBQ0gsTUFBTSxJQUFJLEdBQUcsYUFBYSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLGdCQUFnQixFQUFFLFdBQVcsRUFBRSxTQUFTLEVBQUUsY0FBYyxDQUFDLENBQUMsQ0FBQztRQUM5RyxNQUFNLGNBQWMsR0FBRyxTQUFTLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDO1FBQ3RELGNBQWMsQ0FBQyx3QkFBd0IsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDO1FBQ3pELE9BQU87WUFDTCxjQUFjO1lBQ2QsU0FBUyxFQUFFLFNBQVMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDO1lBQ3BDLE9BQU8sRUFBRSxTQUFTLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztZQUNoQyxZQUFZLEVBQUUsY0FBYyxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUM7U0FDaEQsQ0FBQztJQUNKLENBQUM7SUFBQyxNQUFNLENBQUM7UUFDUCxNQUFNLElBQUksS0FBSyxDQUFDLGdDQUFnQyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzFELENBQUM7QUFDSCxDQUFDLENBQUMifQ==
|
|
@@ -73,7 +73,7 @@ export declare const serviceRuntimeContract: Readonly<{
|
|
|
73
73
|
readonly maximumAssignmentPageSize: 256;
|
|
74
74
|
}>;
|
|
75
75
|
declare const serviceRuntimeWaitingReasons: readonly ["node-network-pending", "conflict", "failure-backoff", "storage-import-pending", "bindings-pending", "legacy-adoption-pending", "objectstorage-retention-pending"];
|
|
76
|
-
declare const serviceRuntimeRefusals: readonly ["cluster-runtime-missing", "organization-missing", "image-plan-missing", "platform-unsupported", "secrets-unsupported", "volumes-unsupported", "port-protocol-unsupported", "ports-too-many", "readiness-target-undeclared", "environment-too-large", "no-eligible-node", "replica-limit", "node-authority-unsupported", "network-policy-missing", "network-policy-mismatch", "network-workload-pool-missing", "network-workload-pool-exhausted", "volume-driver-unsupported", "volume-options-unsupported", "volume-shared-unsupported", "volume-placement-unsupported", "volume-initialization-unknown", "volume-ownership-unknown", "objectstorage-endpoint-missing", "objectstorage-binding-invalid", "objectstorage-environment-conflict", "objectstorage-endpoint-unselected", "database-endpoint-missing", "database-endpoint-unselected", "published-port-reserved", "published-port-symmetric-without-egress"];
|
|
76
|
+
declare const serviceRuntimeRefusals: readonly ["cluster-runtime-missing", "organization-missing", "image-plan-missing", "platform-unsupported", "secrets-unsupported", "volumes-unsupported", "port-protocol-unsupported", "ports-too-many", "readiness-target-undeclared", "environment-too-large", "no-eligible-node", "replica-limit", "node-authority-unsupported", "network-policy-missing", "network-policy-mismatch", "network-workload-pool-missing", "network-workload-pool-exhausted", "volume-driver-unsupported", "volume-options-unsupported", "volume-shared-unsupported", "volume-placement-unsupported", "volume-initialization-unknown", "volume-ownership-unknown", "objectstorage-endpoint-missing", "objectstorage-binding-invalid", "objectstorage-environment-conflict", "objectstorage-endpoint-unselected", "database-endpoint-missing", "database-endpoint-unselected", "published-port-reserved", "published-port-symmetric-without-egress", "readiness-network-unsupported"];
|
|
77
77
|
/**
|
|
78
78
|
* Why the producer is not converging yet, though nothing needs an administrator:
|
|
79
79
|
* `node-network-pending` waits for a node's network readiness, `conflict` for a sweep over inputs
|
|
@@ -137,6 +137,13 @@ export type TServiceRuntimeWaitingReason = typeof serviceRuntimeWaitingReasons[n
|
|
|
137
137
|
* which the handoff leases' `runtimeNetworkHandoffSnatPortRange` owns; a document written before
|
|
138
138
|
* that rule can hold one. `published-port-symmetric-without-egress` is a `symmetric` entry in a
|
|
139
139
|
* document whose `publicEgress` is false, which a projection endpoint refuses.
|
|
140
|
+
*
|
|
141
|
+
* `readiness-network-unsupported` is a spec whose network is `isolated` and whose readiness probe is
|
|
142
|
+
* `tcp` or `http`: an isolated workload has no address its node can dial, so the probe could never
|
|
143
|
+
* pass and the node refuses the run (`TRuntimeAssignmentFailureCause` `refused` for
|
|
144
|
+
* `unsupported-readiness`). `isServiceRuntimeReadinessReachable` is this rule; a producer answers
|
|
145
|
+
* what it returns. The spec snapshot still reads such a spec, so a stored one stays readable and
|
|
146
|
+
* is answered with this refusal rather than refused as data.
|
|
140
147
|
*/
|
|
141
148
|
export type TServiceRuntimeRefusal = typeof serviceRuntimeRefusals[number];
|
|
142
149
|
interface IServiceRuntimeStatusBase {
|
|
@@ -164,6 +171,32 @@ export type IServiceRuntimeStatus = IServiceRuntimeStatusBase & ({
|
|
|
164
171
|
* node admitted but has not yet reported on reads as undelivered.
|
|
165
172
|
*/
|
|
166
173
|
export type TServiceRuntimeAssignmentDelivery = 'undelivered' | 'delivered';
|
|
174
|
+
/**
|
|
175
|
+
* Why one dispatch of an assignment revision to its node ended as it did.
|
|
176
|
+
*
|
|
177
|
+
* The node holds the revision: `accepted`, `replay` or `historical` is what the node answered to
|
|
178
|
+
* the push, and `acknowledged` a revision the node's current session acknowledged before, answered
|
|
179
|
+
* from that acknowledgement without pushing it again.
|
|
180
|
+
*
|
|
181
|
+
* The node does not hold it from this dispatch: `node-busy` while the node already carries its limit
|
|
182
|
+
* of pushes in flight, `node-not-connected` while no live peer holds a session for the node,
|
|
183
|
+
* `session-moved` when the session the dispatch began on is no longer the node's current one,
|
|
184
|
+
* `intent-not-current` when the revision is no longer the one the controller wants on that node,
|
|
185
|
+
* `request-unbound` when the request does not bind to the session it would travel on,
|
|
186
|
+
* `node-refused` when the node (or the relay carrying it) answered the push with a refusal,
|
|
187
|
+
* `push-failed` when the push got no answer in time or its carrier failed, and
|
|
188
|
+
* `acknowledgement-unbound` when the answer names another revision.
|
|
189
|
+
*/
|
|
190
|
+
export declare const assignmentDispatchReasons: readonly ["accepted", "replay", "historical", "acknowledged", "node-busy", "node-not-connected", "session-moved", "intent-not-current", "request-unbound", "node-refused", "push-failed", "acknowledgement-unbound"];
|
|
191
|
+
export type TAssignmentDispatchReason = typeof assignmentDispatchReasons[number];
|
|
192
|
+
/** The last dispatch of a slot's current assignment, as the controller recorded it. Value-free. */
|
|
193
|
+
export interface IServiceRuntimeAssignmentDispatch {
|
|
194
|
+
/** Whether the node holds the revision after this dispatch. */
|
|
195
|
+
delivered: boolean;
|
|
196
|
+
reason: TAssignmentDispatchReason;
|
|
197
|
+
/** Unix milliseconds on the controller's clock when this dispatch ended. */
|
|
198
|
+
at: number;
|
|
199
|
+
}
|
|
167
200
|
/** One replica slot's current assignment, as an administrator reads it. */
|
|
168
201
|
export interface IServiceRuntimeAssignmentView {
|
|
169
202
|
serviceId: string;
|
|
@@ -180,12 +213,27 @@ export interface IServiceRuntimeAssignmentView {
|
|
|
180
213
|
/** Joined stop and remove receipts of this attempt. */
|
|
181
214
|
terminalReceiptCount: 0 | 1 | 2;
|
|
182
215
|
delivery: TServiceRuntimeAssignmentDelivery;
|
|
216
|
+
/**
|
|
217
|
+
* The last dispatch of the current revision while the controller still remembers one, null when
|
|
218
|
+
* it remembers none. Absent from a controller that does not report dispatches. Dispatch is the
|
|
219
|
+
* controller's push; `delivery` stays the node's own evidence.
|
|
220
|
+
*/
|
|
221
|
+
dispatch?: IServiceRuntimeAssignmentDispatch | null;
|
|
183
222
|
}
|
|
184
223
|
/**
|
|
185
224
|
* Structural snapshot for exact persistence and for a spec write. Whether the cluster, the nodes and
|
|
186
225
|
* the platform endpoints exist, and whether the service declares the readiness target, is Cloudly's.
|
|
187
226
|
*/
|
|
188
227
|
export declare const snapshotServiceRuntimeSpec: (value: unknown) => IServiceRuntimeSpec;
|
|
228
|
+
/**
|
|
229
|
+
* Whether a spec's readiness probe can reach its workload: false exactly for an `isolated` network
|
|
230
|
+
* with a `tcp` or `http` probe, which the producer answers as `readiness-network-unsupported`. The
|
|
231
|
+
* spec is read through `snapshotServiceRuntimeSpec`, so a value that is no spec is refused with its
|
|
232
|
+
* rejection rather than judged.
|
|
233
|
+
*/
|
|
234
|
+
export declare const isServiceRuntimeReadinessReachable: (value: unknown) => boolean;
|
|
235
|
+
/** Exactly a recorded dispatch of an assignment: a known reason and a positive Unix millisecond time. */
|
|
236
|
+
export declare const isServiceRuntimeAssignmentDispatch: (value: unknown) => value is IServiceRuntimeAssignmentDispatch;
|
|
189
237
|
/** Structural snapshot for exact persistence: a reason belongs to exactly one state. */
|
|
190
238
|
export declare const snapshotServiceRuntimeStatus: (value: unknown) => IServiceRuntimeStatus;
|
|
191
239
|
export {};
|
|
@@ -28,7 +28,28 @@ const serviceRuntimeRefusals = [
|
|
|
28
28
|
'volume-placement-unsupported', 'volume-initialization-unknown', 'volume-ownership-unknown',
|
|
29
29
|
'objectstorage-endpoint-missing', 'objectstorage-binding-invalid', 'objectstorage-environment-conflict',
|
|
30
30
|
'objectstorage-endpoint-unselected', 'database-endpoint-missing', 'database-endpoint-unselected',
|
|
31
|
-
'published-port-reserved', 'published-port-symmetric-without-egress',
|
|
31
|
+
'published-port-reserved', 'published-port-symmetric-without-egress', 'readiness-network-unsupported',
|
|
32
|
+
];
|
|
33
|
+
/**
|
|
34
|
+
* Why one dispatch of an assignment revision to its node ended as it did.
|
|
35
|
+
*
|
|
36
|
+
* The node holds the revision: `accepted`, `replay` or `historical` is what the node answered to
|
|
37
|
+
* the push, and `acknowledged` a revision the node's current session acknowledged before, answered
|
|
38
|
+
* from that acknowledgement without pushing it again.
|
|
39
|
+
*
|
|
40
|
+
* The node does not hold it from this dispatch: `node-busy` while the node already carries its limit
|
|
41
|
+
* of pushes in flight, `node-not-connected` while no live peer holds a session for the node,
|
|
42
|
+
* `session-moved` when the session the dispatch began on is no longer the node's current one,
|
|
43
|
+
* `intent-not-current` when the revision is no longer the one the controller wants on that node,
|
|
44
|
+
* `request-unbound` when the request does not bind to the session it would travel on,
|
|
45
|
+
* `node-refused` when the node (or the relay carrying it) answered the push with a refusal,
|
|
46
|
+
* `push-failed` when the push got no answer in time or its carrier failed, and
|
|
47
|
+
* `acknowledgement-unbound` when the answer names another revision.
|
|
48
|
+
*/
|
|
49
|
+
export const assignmentDispatchReasons = [
|
|
50
|
+
'accepted', 'replay', 'historical', 'acknowledged',
|
|
51
|
+
'node-busy', 'node-not-connected', 'session-moved', 'intent-not-current', 'request-unbound', 'node-refused',
|
|
52
|
+
'push-failed', 'acknowledgement-unbound',
|
|
32
53
|
];
|
|
33
54
|
/** Sorted, duplicate-free and read by the vocabulary the ids belong to: a node's, or the canonical one. */
|
|
34
55
|
const sortedIds = (value, maximum, read) => networkSorted(networkList(value, maximum, read), id => id);
|
|
@@ -86,6 +107,27 @@ export const snapshotServiceRuntimeSpec = (value) => producerSafe(() => {
|
|
|
86
107
|
placement: placementOf(item.placement), replicasPerNode: item.replicasPerNode, hold: item.hold,
|
|
87
108
|
profile: profileOf(item.profile), network: networkOf(item.network), revision: networkCounter(item.revision) };
|
|
88
109
|
});
|
|
110
|
+
/**
|
|
111
|
+
* Whether a spec's readiness probe can reach its workload: false exactly for an `isolated` network
|
|
112
|
+
* with a `tcp` or `http` probe, which the producer answers as `readiness-network-unsupported`. The
|
|
113
|
+
* spec is read through `snapshotServiceRuntimeSpec`, so a value that is no spec is refused with its
|
|
114
|
+
* rejection rather than judged.
|
|
115
|
+
*/
|
|
116
|
+
export const isServiceRuntimeReadinessReachable = (value) => {
|
|
117
|
+
const { profile, network } = snapshotServiceRuntimeSpec(value);
|
|
118
|
+
return network.mode === 'attached' || profile.readiness.kind === 'process';
|
|
119
|
+
};
|
|
120
|
+
/** Exactly a recorded dispatch of an assignment: a known reason and a positive Unix millisecond time. */
|
|
121
|
+
export const isServiceRuntimeAssignmentDispatch = (value) => {
|
|
122
|
+
try {
|
|
123
|
+
const item = networkRecord(captureNetwork(value), ['delivered', 'reason', 'at']);
|
|
124
|
+
networkCounter(item.at);
|
|
125
|
+
return typeof item.delivered === 'boolean' && isOneOf(assignmentDispatchReasons, item.reason);
|
|
126
|
+
}
|
|
127
|
+
catch {
|
|
128
|
+
return false;
|
|
129
|
+
}
|
|
130
|
+
};
|
|
89
131
|
/** Structural snapshot for exact persistence: a reason belongs to exactly one state. */
|
|
90
132
|
export const snapshotServiceRuntimeStatus = (value) => producerSafe(() => {
|
|
91
133
|
const item = networkRecord(captureNetwork(value), ['id', 'specRevision', 'state', 'reason', 'changedAt']);
|
|
@@ -102,4 +144,4 @@ export const snapshotServiceRuntimeStatus = (value) => producerSafe(() => {
|
|
|
102
144
|
requireNetwork(item.state === 'refused' && isOneOf(serviceRuntimeRefusals, item.reason));
|
|
103
145
|
return { ...base, state: item.state, reason: item.reason };
|
|
104
146
|
});
|
|
105
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
147
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"serviceruntime.js","sourceRoot":"","sources":["../../ts/data/serviceruntime.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import type { IRuntimeNetworkAddressPlan, TRuntimeNetworkAddressPlanWritableData
|
|
|
4
4
|
import type { IRuntimeNetworkNodeReadiness, IRuntimeRouterIncarnation } from '../data/networknode.js';
|
|
5
5
|
import type { IPrivateNetwork, IServicePrivateNetworks, ISetServicePrivateNetworks, TPrivateNetworkMutation } from '../data/privatenetwork.js';
|
|
6
6
|
import type { IServiceNetworkEgress, IServicePublishedPorts, ISetServiceNetworkEgress, ISetServicePublishedPorts } from '../data/networkprojection.js';
|
|
7
|
+
import type { IServicePlatformOwnership } from '../data/serviceplatformownership.js';
|
|
7
8
|
/** Current organization picker data. Entries are never cached authorization grants. */
|
|
8
9
|
export interface IReq_Cloudly_ListOwnedOrganizations extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Cloudly_ListOwnedOrganizations> {
|
|
9
10
|
method: 'listOwnedOrganizations';
|
|
@@ -97,7 +98,14 @@ export interface IReq_Cloudly_SetServicePrivateNetworks extends plugins.typedreq
|
|
|
97
98
|
replayed: boolean;
|
|
98
99
|
};
|
|
99
100
|
}
|
|
100
|
-
/**
|
|
101
|
+
/**
|
|
102
|
+
* null means the service has never had a policy document, neither published ports nor egress.
|
|
103
|
+
*
|
|
104
|
+
* The authority follows the service (`IServicePlatformOwnership`): a platform-owned service is read
|
|
105
|
+
* by a verified administrator, every other service by a federated sign-in holding the named
|
|
106
|
+
* organization's freshly introspected `owner` role. A caller without that authority, or naming no
|
|
107
|
+
* such service, is answered one denial text, whichever it is.
|
|
108
|
+
*/
|
|
101
109
|
export interface IReq_Cloudly_GetServicePublishedPorts extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Cloudly_GetServicePublishedPorts> {
|
|
102
110
|
method: 'getServicePublishedPorts';
|
|
103
111
|
request: {
|
|
@@ -119,6 +127,15 @@ export interface IReq_Cloudly_GetServicePublishedPorts extends plugins.typedrequ
|
|
|
119
127
|
* attached spec stating `publicEgress: false` and `platformEndpointIds: []` matches it and reaches
|
|
120
128
|
* no public address and no platform endpoint; `network-policy-missing` means the service has no
|
|
121
129
|
* document at all.
|
|
130
|
+
*
|
|
131
|
+
* The authority follows the service (`IServicePlatformOwnership`): a platform-owned service is
|
|
132
|
+
* written by a verified administrator, every other service by a federated sign-in holding the named
|
|
133
|
+
* organization's freshly introspected `owner` role, and an administrator does not substitute for
|
|
134
|
+
* that owner. A caller without that authority, or naming no such service, is answered one denial
|
|
135
|
+
* text, whichever it is. A designation that changes while the write is staged refuses it as the
|
|
136
|
+
* policy write's own `conflict`, the refusal a stale `expectedRevision` is also answered (read the
|
|
137
|
+
* document and the authority again); it is a service network policy refusal, not one of
|
|
138
|
+
* `servicePlatformOwnershipRefusals`.
|
|
122
139
|
*/
|
|
123
140
|
export interface IReq_Cloudly_SetServicePublishedPorts extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Cloudly_SetServicePublishedPorts> {
|
|
124
141
|
method: 'setServicePublishedPorts';
|
|
@@ -183,6 +200,64 @@ export interface IReq_Admin_Cloudly_SetServiceNetworkEgress extends plugins.type
|
|
|
183
200
|
replayed: boolean;
|
|
184
201
|
};
|
|
185
202
|
}
|
|
203
|
+
/**
|
|
204
|
+
* Designates one service platform-owned (`IServicePlatformOwnership`), so that a verified
|
|
205
|
+
* administrator, and no organization owner, holds the authority over its published ports.
|
|
206
|
+
*
|
|
207
|
+
* Only a verified administrator calls it. Cloudly designates only a service of a platform
|
|
208
|
+
* organization (`isPlatformOrganizationId`: a canonical identifier carrying `:`, such as
|
|
209
|
+
* `legacy:Service:<id>` or `Organization:<id>`) and refuses every other organization id, an
|
|
210
|
+
* idp.global one or one that is no canonical identifier, as `organization-not-platform` before it
|
|
211
|
+
* reads the service. It refuses a service that is not the named organization's (`service-unknown`)
|
|
212
|
+
* and a deleting one (`service-deleting`); refusals are `servicePlatformOwnershipRefusals`. A
|
|
213
|
+
* service already designated answers its stored designation unchanged with `changed: false`.
|
|
214
|
+
*/
|
|
215
|
+
export interface IReq_Admin_Cloudly_DesignatePlatformOwnedService extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Admin_Cloudly_DesignatePlatformOwnedService> {
|
|
216
|
+
method: 'designatePlatformOwnedService';
|
|
217
|
+
request: {
|
|
218
|
+
identity: IIdentityCredential;
|
|
219
|
+
organizationId: string;
|
|
220
|
+
serviceId: string;
|
|
221
|
+
};
|
|
222
|
+
response: {
|
|
223
|
+
platformOwnership: IServicePlatformOwnership;
|
|
224
|
+
changed: boolean;
|
|
225
|
+
};
|
|
226
|
+
}
|
|
227
|
+
/**
|
|
228
|
+
* Withdraws a service's platform-owned designation; its published ports stay as they are, and from
|
|
229
|
+
* then on the organization-owner rule governs them. A designated service is always a platform
|
|
230
|
+
* organization's, which has no idp.global owner, so after the withdrawal nobody writes or reads its
|
|
231
|
+
* published ports until an administrator designates it again: the authority fails closed.
|
|
232
|
+
*
|
|
233
|
+
* Only a verified administrator calls it. Refusals are `service-unknown` and `conflict`; a service
|
|
234
|
+
* without a designation answers `changed: false`.
|
|
235
|
+
*/
|
|
236
|
+
export interface IReq_Admin_Cloudly_UndesignatePlatformOwnedService extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Admin_Cloudly_UndesignatePlatformOwnedService> {
|
|
237
|
+
method: 'undesignatePlatformOwnedService';
|
|
238
|
+
request: {
|
|
239
|
+
identity: IIdentityCredential;
|
|
240
|
+
organizationId: string;
|
|
241
|
+
serviceId: string;
|
|
242
|
+
};
|
|
243
|
+
response: {
|
|
244
|
+
platformOwnership: null;
|
|
245
|
+
changed: boolean;
|
|
246
|
+
};
|
|
247
|
+
}
|
|
248
|
+
/** The service's platform-owned designation, or null when it has none. Only a verified administrator reads it. */
|
|
249
|
+
export interface IReq_Admin_Cloudly_GetServicePlatformOwnership extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Admin_Cloudly_GetServicePlatformOwnership> {
|
|
250
|
+
method: 'getServicePlatformOwnership';
|
|
251
|
+
/** Refused `service-unknown` when no service of that id belongs to the named organization. */
|
|
252
|
+
request: {
|
|
253
|
+
identity: IIdentityCredential;
|
|
254
|
+
organizationId: string;
|
|
255
|
+
serviceId: string;
|
|
256
|
+
};
|
|
257
|
+
response: {
|
|
258
|
+
platformOwnership: IServicePlatformOwnership | null;
|
|
259
|
+
};
|
|
260
|
+
}
|
|
186
261
|
export interface IRequest_Any_Cloudly_GetNetworkNodes {
|
|
187
262
|
method: 'getNetworkNodes';
|
|
188
263
|
request: {};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/interfaces",
|
|
3
|
-
"version": "32.
|
|
3
|
+
"version": "32.45.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.",
|
|
6
6
|
"exports": {
|
|
@@ -28,10 +28,10 @@
|
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
30
|
"@git.zone/tsbuild": "^5.1.2",
|
|
31
|
-
"@git.zone/tsdoc": "^3.0.
|
|
31
|
+
"@git.zone/tsdoc": "^3.0.2",
|
|
32
32
|
"@git.zone/tsrun": "^3.0.2",
|
|
33
|
-
"@git.zone/tstest": "
|
|
34
|
-
"@types/node": "26.6.
|
|
33
|
+
"@git.zone/tstest": "^7.1.0",
|
|
34
|
+
"@types/node": "26.6.3"
|
|
35
35
|
},
|
|
36
36
|
"files": [
|
|
37
37
|
"ts/**/*",
|
package/readme.md
CHANGED
|
@@ -515,6 +515,34 @@ list is a valid policy meaning the service publishes nothing. Callers never supp
|
|
|
515
515
|
from the accepted policy revision and digest, and node-level host-port placement
|
|
516
516
|
stays Cloudly's decision.
|
|
517
517
|
|
|
518
|
+
Who authors a service's published ports follows the service. A service of an
|
|
519
|
+
idp.global organization is that organization's: only a federated sign-in holding
|
|
520
|
+
its freshly introspected `owner` role reads and writes them, and an
|
|
521
|
+
infrastructure administrator does not substitute for it. A platform-owned
|
|
522
|
+
service (`data.IServicePlatformOwnership`: `organizationId`, `serviceId`, the
|
|
523
|
+
designating administrator's `actorId`, `designatedAt`) belongs to no idp.global
|
|
524
|
+
organization, such as the cluster ingress or a platform call router; only a
|
|
525
|
+
verified administrator reads and writes its published ports, as only an
|
|
526
|
+
administrator writes its egress. An administrator designates such a service
|
|
527
|
+
with `designatePlatformOwnedService`, withdraws it with
|
|
528
|
+
`undesignatePlatformOwnedService` and reads it with `getServicePlatformOwnership`
|
|
529
|
+
(`requests.network.IReq_Admin_Cloudly_DesignatePlatformOwnedService`,
|
|
530
|
+
`IReq_Admin_Cloudly_UndesignatePlatformOwnedService`,
|
|
531
|
+
`IReq_Admin_Cloudly_GetServicePlatformOwnership`). Only a platform
|
|
532
|
+
organization's service is designated: `data.isPlatformOrganizationId` is true
|
|
533
|
+
exactly for a canonical identifier that carries `:` (`legacy:Service:<id>`,
|
|
534
|
+
`Organization:<id>`), and false for an idp.global nanoid, whichever character it
|
|
535
|
+
starts with, and for any value that is not a canonical identifier, such as an
|
|
536
|
+
empty or whitespace id. Cloudly refuses every other id as
|
|
537
|
+
`organization-not-platform`, and further designation refusals are
|
|
538
|
+
`service-unknown`, `service-deleting` and `conflict`
|
|
539
|
+
(`data.servicePlatformOwnershipRefusals`). The designation grants no port, egress
|
|
540
|
+
or placement by itself. Withdrawing it leaves the service's published ports as
|
|
541
|
+
they are with no writer, because a platform organization has no idp.global
|
|
542
|
+
owner, until an administrator designates the service again. A published-port
|
|
543
|
+
write staged while the designation changes is refused as the policy write's
|
|
544
|
+
`conflict`.
|
|
545
|
+
|
|
518
546
|
A published entry with `hostPortEnd` publishes every port from `hostPort` to
|
|
519
547
|
`hostPortEnd` inclusive, each to the same port inside the workload, so its
|
|
520
548
|
`targetPort` equals `hostPort` and a one-port range is written without the member.
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/data/index.ts
CHANGED
|
@@ -76,6 +76,7 @@ export * from './sparklegacyretirement.js';
|
|
|
76
76
|
export * from './sparknodereport.js';
|
|
77
77
|
export * from './service.js';
|
|
78
78
|
export * from './servicecredential.js';
|
|
79
|
+
export * from './serviceplatformownership.js';
|
|
79
80
|
export * from './serviceports.js';
|
|
80
81
|
export * from './serviceruntime.js';
|
|
81
82
|
export * from './servicevolumeinitialization.js';
|
|
@@ -164,6 +164,15 @@ export const runtimeImagePullRefusalReasons = ['unauthorized', 'not-found', 'tls
|
|
|
164
164
|
'unavailable', 'other'] as const;
|
|
165
165
|
export type TRuntimeImagePullRefusalReason = typeof runtimeImagePullRefusalReasons[number];
|
|
166
166
|
|
|
167
|
+
/**
|
|
168
|
+
* Why a node refused to start a run before any runtime effect of it, as the node names it:
|
|
169
|
+
* `unsupported-readiness` a readiness probe the run's network cannot carry (a TCP or HTTP probe of
|
|
170
|
+
* a run without network authority), `unresolved-authority` a workload authority the node cannot
|
|
171
|
+
* resolve, and `invalid` an assignment or configuration the node cannot read.
|
|
172
|
+
*/
|
|
173
|
+
export const runtimeAssignmentRefusalReasons = ['unsupported-readiness', 'unresolved-authority', 'invalid'] as const;
|
|
174
|
+
export type TRuntimeAssignmentRefusalReason = typeof runtimeAssignmentRefusalReasons[number];
|
|
175
|
+
|
|
167
176
|
/**
|
|
168
177
|
* Why a run failed, as its node can name it. Value-free: it carries a cause word and at most a
|
|
169
178
|
* bounded status number, never a runtime message, a registry, a reference or a path.
|
|
@@ -176,17 +185,31 @@ export type TRuntimeImagePullRefusalReason = typeof runtimeImagePullRefusalReaso
|
|
|
176
185
|
* - `runtime-absent`: the runtime holds no sandbox or container of a run that should be running.
|
|
177
186
|
* - `network-epoch-ended`: the run's network attachment belongs to a network epoch that has ended,
|
|
178
187
|
* so the node stopped it rather than leave it running without its network.
|
|
188
|
+
* - `refused`: the node refused the run before any runtime effect of it, for `reason`, so the
|
|
189
|
+
* observation carries no runtime identity.
|
|
190
|
+
* - `container-refused`: the runtime deterministically refused to create the run's container
|
|
191
|
+
* (CRI `CreateContainer`), so no container of the run exists and the observation carries no
|
|
192
|
+
* runtime identity. `grpcCode` is the runtime's gRPC status code (1..16).
|
|
179
193
|
*
|
|
180
|
-
* The cause explains the failure
|
|
181
|
-
*
|
|
194
|
+
* The cause explains the failure. Every failed run is replaced the same way, whichever cause it
|
|
195
|
+
* states, with one exception: a `refused` run is never re-placed with an identical configuration,
|
|
196
|
+
* because the node refuses the same input the same way. The controller places a new attempt only
|
|
197
|
+
* after the service's runtime spec or another input of the assignment changed.
|
|
182
198
|
*/
|
|
183
199
|
export type TRuntimeAssignmentFailureCause =
|
|
184
200
|
| { kind: 'image-pull-refused'; reason: TRuntimeImagePullRefusalReason; grpcCode: number }
|
|
185
201
|
| { kind: 'exited'; exitCode: number | null }
|
|
186
202
|
| { kind: 'runtime-absent' }
|
|
187
|
-
| { kind: 'network-epoch-ended' }
|
|
203
|
+
| { kind: 'network-epoch-ended' }
|
|
204
|
+
| { kind: 'refused'; reason: TRuntimeAssignmentRefusalReason }
|
|
205
|
+
| { kind: 'container-refused'; grpcCode: number };
|
|
188
206
|
export const runtimeAssignmentFailureCauseKinds = ['image-pull-refused', 'exited', 'runtime-absent',
|
|
189
|
-
'network-epoch-ended'] as const satisfies readonly TRuntimeAssignmentFailureCause['kind'][];
|
|
207
|
+
'network-epoch-ended', 'refused', 'container-refused'] as const satisfies readonly TRuntimeAssignmentFailureCause['kind'][];
|
|
208
|
+
|
|
209
|
+
/** The causes of a run of which nothing ever existed, so their observation names no runtime identity. */
|
|
210
|
+
const causesWithoutRuntime: readonly TRuntimeAssignmentFailureCause['kind'][] = [
|
|
211
|
+
'image-pull-refused', 'refused', 'container-refused',
|
|
212
|
+
];
|
|
190
213
|
|
|
191
214
|
/** Value-free execution evidence. Receipt/acceptance alone never means ready. */
|
|
192
215
|
export interface IRuntimeAssignmentObservation {
|
|
@@ -483,6 +506,11 @@ const isFailureCause = (valueArg: unknown): valueArg is TRuntimeAssignmentFailur
|
|
|
483
506
|
case 'runtime-absent':
|
|
484
507
|
case 'network-epoch-ended':
|
|
485
508
|
return isExactRecord(valueArg, ['kind']);
|
|
509
|
+
case 'refused':
|
|
510
|
+
return isExactRecord(valueArg, ['kind', 'reason'])
|
|
511
|
+
&& runtimeAssignmentRefusalReasons.some((reasonArg) => reasonArg === valueArg.reason);
|
|
512
|
+
case 'container-refused':
|
|
513
|
+
return isExactRecord(valueArg, ['kind', 'grpcCode']) && isBoundedInteger(valueArg.grpcCode, 1, 16);
|
|
486
514
|
default:
|
|
487
515
|
return false;
|
|
488
516
|
}
|
|
@@ -508,7 +536,7 @@ const assertObservation = (valueArg: unknown): IRuntimeAssignmentObservation =>
|
|
|
508
536
|
fail('runtime observation readiness and identity contradict its phase');
|
|
509
537
|
}
|
|
510
538
|
if (Object.hasOwn(valueArg, 'cause') && (valueArg.phase !== 'failed' || !isFailureCause(valueArg.cause)
|
|
511
|
-
|| (valueArg.cause.kind
|
|
539
|
+
|| (causesWithoutRuntime.includes(valueArg.cause.kind) && valueArg.runtime !== null))) {
|
|
512
540
|
fail('runtime observation failure cause must be exact and belong to a failed run');
|
|
513
541
|
}
|
|
514
542
|
canonical(valueArg);
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
import { captureNetwork, networkCounter, networkId, networkRecord, requireNetwork } from '../private/networkcontract.js';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Which authority writes a service's runtime network policy, decided by whether the service is
|
|
5
|
+
* platform-owned.
|
|
6
|
+
*
|
|
7
|
+
* A service of an idp.global organization is that organization's: its published ports are written
|
|
8
|
+
* only by a federated sign-in holding the organization's freshly introspected `owner` role, and an
|
|
9
|
+
* infrastructure administrator does not substitute for it. A platform-owned service belongs to no
|
|
10
|
+
* idp.global organization — the cluster ingress, a platform call router — so no organization owner
|
|
11
|
+
* exists who could authorize it. An infrastructure administrator designates such a service
|
|
12
|
+
* platform-owned, and from then on only a verified administrator reads and writes its published
|
|
13
|
+
* ports, as only an administrator writes its egress and its runtime spec. The designation names
|
|
14
|
+
* the authority and nothing else: it grants no port, egress or placement by itself.
|
|
15
|
+
*
|
|
16
|
+
* Only a service of a platform organization (`isPlatformOrganizationId`) is ever designated, so the
|
|
17
|
+
* federated owner rule stays the only rule for every other service, including any whose
|
|
18
|
+
* organization id is not a canonical identifier at all. Withdrawing the designation hands the
|
|
19
|
+
* ports back to the organization-owner rule, and a platform organization has no idp.global owner:
|
|
20
|
+
* the service's published ports then have no writer, and stay as they are, until an administrator
|
|
21
|
+
* designates it again.
|
|
22
|
+
*/
|
|
23
|
+
export interface IServicePlatformOwnership {
|
|
24
|
+
organizationId: string;
|
|
25
|
+
serviceId: string;
|
|
26
|
+
/** The administrator who designated the service. */
|
|
27
|
+
actorId: string;
|
|
28
|
+
/** Unix milliseconds on Cloudly's clock. */
|
|
29
|
+
designatedAt: number;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
/**
|
|
33
|
+
* Every reason Cloudly answers instead of designating a service platform-owned or withdrawing the
|
|
34
|
+
* designation. Each travels by name as a `TypedResponseError`, and a refused request changes
|
|
35
|
+
* nothing.
|
|
36
|
+
*/
|
|
37
|
+
export const servicePlatformOwnershipRefusals = Object.freeze([
|
|
38
|
+
/** No service of that id belongs to the named organization. */
|
|
39
|
+
'service-unknown',
|
|
40
|
+
/** The service's deletion has begun; no new authority outlives it. */
|
|
41
|
+
'service-deleting',
|
|
42
|
+
/**
|
|
43
|
+
* The named organization is not a platform organization (`isPlatformOrganizationId`): an
|
|
44
|
+
* idp.global organization, whose owner keeps the authority over its runtime network policy, or an
|
|
45
|
+
* id that is no canonical identifier.
|
|
46
|
+
*/
|
|
47
|
+
'organization-not-platform',
|
|
48
|
+
/** Another write changed the service's designation first: read it again. */
|
|
49
|
+
'conflict',
|
|
50
|
+
] as const);
|
|
51
|
+
|
|
52
|
+
/** One of the reasons Cloudly answers instead of a designation change. */
|
|
53
|
+
export type TServicePlatformOwnershipRefusal = typeof servicePlatformOwnershipRefusals[number];
|
|
54
|
+
|
|
55
|
+
export const servicePlatformOwnershipContract = Object.freeze({
|
|
56
|
+
error: 'Service platform ownership contract rejected.',
|
|
57
|
+
} as const);
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* Whether an organization id names a platform organization, the only kind whose service an
|
|
61
|
+
* administrator may designate platform-owned.
|
|
62
|
+
*
|
|
63
|
+
* Every organization Cloudly assigns outside idp.global is namespaced with `:` — a legacy service's
|
|
64
|
+
* own `legacy:Service:<id>`, a platform `Organization:<id>` — while idp.global names an
|
|
65
|
+
* organization by a 21-character nanoid in the URL alphabet (`A-Za-z0-9_-`), which never carries
|
|
66
|
+
* `:`. An id is a platform organization's exactly when it is a canonical identifier (an ASCII
|
|
67
|
+
* letter or digit, then up to 199 of letters, digits, `:`, `.`, `_` and `-`) and carries `:`.
|
|
68
|
+
* Everything else is not: an idp.global id, whichever character it starts with, and any value that
|
|
69
|
+
* is not a canonical identifier — empty, whitespace, a non-string. The answer fails closed: an id
|
|
70
|
+
* this rule cannot read never gains administrator authority.
|
|
71
|
+
*/
|
|
72
|
+
export const isPlatformOrganizationId = (organizationId: string): boolean => {
|
|
73
|
+
try {
|
|
74
|
+
return networkId(organizationId).includes(':');
|
|
75
|
+
} catch {
|
|
76
|
+
return false;
|
|
77
|
+
}
|
|
78
|
+
};
|
|
79
|
+
|
|
80
|
+
/** Detached exact-schema snapshot of a stored or answered designation. */
|
|
81
|
+
export const snapshotServicePlatformOwnership = (value: unknown): IServicePlatformOwnership => {
|
|
82
|
+
try {
|
|
83
|
+
const item = networkRecord(captureNetwork(value), ['organizationId', 'serviceId', 'actorId', 'designatedAt']);
|
|
84
|
+
const organizationId = networkId(item.organizationId);
|
|
85
|
+
requireNetwork(isPlatformOrganizationId(organizationId));
|
|
86
|
+
return {
|
|
87
|
+
organizationId,
|
|
88
|
+
serviceId: networkId(item.serviceId),
|
|
89
|
+
actorId: networkId(item.actorId),
|
|
90
|
+
designatedAt: networkCounter(item.designatedAt),
|
|
91
|
+
};
|
|
92
|
+
} catch {
|
|
93
|
+
throw new Error(servicePlatformOwnershipContract.error);
|
|
94
|
+
}
|
|
95
|
+
};
|
|
@@ -91,7 +91,7 @@ const serviceRuntimeRefusals = [
|
|
|
91
91
|
'volume-placement-unsupported', 'volume-initialization-unknown', 'volume-ownership-unknown',
|
|
92
92
|
'objectstorage-endpoint-missing', 'objectstorage-binding-invalid', 'objectstorage-environment-conflict',
|
|
93
93
|
'objectstorage-endpoint-unselected', 'database-endpoint-missing', 'database-endpoint-unselected',
|
|
94
|
-
'published-port-reserved', 'published-port-symmetric-without-egress',
|
|
94
|
+
'published-port-reserved', 'published-port-symmetric-without-egress', 'readiness-network-unsupported',
|
|
95
95
|
] as const;
|
|
96
96
|
|
|
97
97
|
/**
|
|
@@ -158,6 +158,13 @@ export type TServiceRuntimeWaitingReason = typeof serviceRuntimeWaitingReasons[n
|
|
|
158
158
|
* which the handoff leases' `runtimeNetworkHandoffSnatPortRange` owns; a document written before
|
|
159
159
|
* that rule can hold one. `published-port-symmetric-without-egress` is a `symmetric` entry in a
|
|
160
160
|
* document whose `publicEgress` is false, which a projection endpoint refuses.
|
|
161
|
+
*
|
|
162
|
+
* `readiness-network-unsupported` is a spec whose network is `isolated` and whose readiness probe is
|
|
163
|
+
* `tcp` or `http`: an isolated workload has no address its node can dial, so the probe could never
|
|
164
|
+
* pass and the node refuses the run (`TRuntimeAssignmentFailureCause` `refused` for
|
|
165
|
+
* `unsupported-readiness`). `isServiceRuntimeReadinessReachable` is this rule; a producer answers
|
|
166
|
+
* what it returns. The spec snapshot still reads such a spec, so a stored one stays readable and
|
|
167
|
+
* is answered with this refusal rather than refused as data.
|
|
161
168
|
*/
|
|
162
169
|
export type TServiceRuntimeRefusal = typeof serviceRuntimeRefusals[number];
|
|
163
170
|
|
|
@@ -184,6 +191,38 @@ export type IServiceRuntimeStatus = IServiceRuntimeStatusBase & (
|
|
|
184
191
|
*/
|
|
185
192
|
export type TServiceRuntimeAssignmentDelivery = 'undelivered' | 'delivered';
|
|
186
193
|
|
|
194
|
+
/**
|
|
195
|
+
* Why one dispatch of an assignment revision to its node ended as it did.
|
|
196
|
+
*
|
|
197
|
+
* The node holds the revision: `accepted`, `replay` or `historical` is what the node answered to
|
|
198
|
+
* the push, and `acknowledged` a revision the node's current session acknowledged before, answered
|
|
199
|
+
* from that acknowledgement without pushing it again.
|
|
200
|
+
*
|
|
201
|
+
* The node does not hold it from this dispatch: `node-busy` while the node already carries its limit
|
|
202
|
+
* of pushes in flight, `node-not-connected` while no live peer holds a session for the node,
|
|
203
|
+
* `session-moved` when the session the dispatch began on is no longer the node's current one,
|
|
204
|
+
* `intent-not-current` when the revision is no longer the one the controller wants on that node,
|
|
205
|
+
* `request-unbound` when the request does not bind to the session it would travel on,
|
|
206
|
+
* `node-refused` when the node (or the relay carrying it) answered the push with a refusal,
|
|
207
|
+
* `push-failed` when the push got no answer in time or its carrier failed, and
|
|
208
|
+
* `acknowledgement-unbound` when the answer names another revision.
|
|
209
|
+
*/
|
|
210
|
+
export const assignmentDispatchReasons = [
|
|
211
|
+
'accepted', 'replay', 'historical', 'acknowledged',
|
|
212
|
+
'node-busy', 'node-not-connected', 'session-moved', 'intent-not-current', 'request-unbound', 'node-refused',
|
|
213
|
+
'push-failed', 'acknowledgement-unbound',
|
|
214
|
+
] as const;
|
|
215
|
+
export type TAssignmentDispatchReason = typeof assignmentDispatchReasons[number];
|
|
216
|
+
|
|
217
|
+
/** The last dispatch of a slot's current assignment, as the controller recorded it. Value-free. */
|
|
218
|
+
export interface IServiceRuntimeAssignmentDispatch {
|
|
219
|
+
/** Whether the node holds the revision after this dispatch. */
|
|
220
|
+
delivered: boolean;
|
|
221
|
+
reason: TAssignmentDispatchReason;
|
|
222
|
+
/** Unix milliseconds on the controller's clock when this dispatch ended. */
|
|
223
|
+
at: number;
|
|
224
|
+
}
|
|
225
|
+
|
|
187
226
|
/** One replica slot's current assignment, as an administrator reads it. */
|
|
188
227
|
export interface IServiceRuntimeAssignmentView {
|
|
189
228
|
serviceId: string;
|
|
@@ -200,6 +239,12 @@ export interface IServiceRuntimeAssignmentView {
|
|
|
200
239
|
/** Joined stop and remove receipts of this attempt. */
|
|
201
240
|
terminalReceiptCount: 0 | 1 | 2;
|
|
202
241
|
delivery: TServiceRuntimeAssignmentDelivery;
|
|
242
|
+
/**
|
|
243
|
+
* The last dispatch of the current revision while the controller still remembers one, null when
|
|
244
|
+
* it remembers none. Absent from a controller that does not report dispatches. Dispatch is the
|
|
245
|
+
* controller's push; `delivery` stays the node's own evidence.
|
|
246
|
+
*/
|
|
247
|
+
dispatch?: IServiceRuntimeAssignmentDispatch | null;
|
|
203
248
|
}
|
|
204
249
|
|
|
205
250
|
/** Sorted, duplicate-free and read by the vocabulary the ids belong to: a node's, or the canonical one. */
|
|
@@ -264,6 +309,28 @@ export const snapshotServiceRuntimeSpec = (value: unknown): IServiceRuntimeSpec
|
|
|
264
309
|
profile: profileOf(item.profile), network: networkOf(item.network), revision: networkCounter(item.revision) };
|
|
265
310
|
});
|
|
266
311
|
|
|
312
|
+
/**
|
|
313
|
+
* Whether a spec's readiness probe can reach its workload: false exactly for an `isolated` network
|
|
314
|
+
* with a `tcp` or `http` probe, which the producer answers as `readiness-network-unsupported`. The
|
|
315
|
+
* spec is read through `snapshotServiceRuntimeSpec`, so a value that is no spec is refused with its
|
|
316
|
+
* rejection rather than judged.
|
|
317
|
+
*/
|
|
318
|
+
export const isServiceRuntimeReadinessReachable = (value: unknown): boolean => {
|
|
319
|
+
const { profile, network } = snapshotServiceRuntimeSpec(value);
|
|
320
|
+
return network.mode === 'attached' || profile.readiness.kind === 'process';
|
|
321
|
+
};
|
|
322
|
+
|
|
323
|
+
/** Exactly a recorded dispatch of an assignment: a known reason and a positive Unix millisecond time. */
|
|
324
|
+
export const isServiceRuntimeAssignmentDispatch = (value: unknown): value is IServiceRuntimeAssignmentDispatch => {
|
|
325
|
+
try {
|
|
326
|
+
const item = networkRecord(captureNetwork(value), ['delivered', 'reason', 'at']);
|
|
327
|
+
networkCounter(item.at);
|
|
328
|
+
return typeof item.delivered === 'boolean' && isOneOf(assignmentDispatchReasons, item.reason);
|
|
329
|
+
} catch {
|
|
330
|
+
return false;
|
|
331
|
+
}
|
|
332
|
+
};
|
|
333
|
+
|
|
267
334
|
/** Structural snapshot for exact persistence: a reason belongs to exactly one state. */
|
|
268
335
|
export const snapshotServiceRuntimeStatus = (value: unknown): IServiceRuntimeStatus => producerSafe(() => {
|
|
269
336
|
const item = networkRecord(captureNetwork(value), ['id', 'specRevision', 'state', 'reason', 'changedAt']);
|
package/ts/requests/network.ts
CHANGED
|
@@ -9,6 +9,7 @@ import type {
|
|
|
9
9
|
import type {
|
|
10
10
|
IServiceNetworkEgress, IServicePublishedPorts, ISetServiceNetworkEgress, ISetServicePublishedPorts,
|
|
11
11
|
} from '../data/networkprojection.js';
|
|
12
|
+
import type { IServicePlatformOwnership } from '../data/serviceplatformownership.js';
|
|
12
13
|
|
|
13
14
|
/** Current organization picker data. Entries are never cached authorization grants. */
|
|
14
15
|
export interface IReq_Cloudly_ListOwnedOrganizations extends plugins.typedrequestInterfaces.implementsTR<
|
|
@@ -73,7 +74,14 @@ export interface IReq_Cloudly_SetServicePrivateNetworks extends plugins.typedreq
|
|
|
73
74
|
response: { membership: IServicePrivateNetworks; replayed: boolean };
|
|
74
75
|
}
|
|
75
76
|
|
|
76
|
-
/**
|
|
77
|
+
/**
|
|
78
|
+
* null means the service has never had a policy document, neither published ports nor egress.
|
|
79
|
+
*
|
|
80
|
+
* The authority follows the service (`IServicePlatformOwnership`): a platform-owned service is read
|
|
81
|
+
* by a verified administrator, every other service by a federated sign-in holding the named
|
|
82
|
+
* organization's freshly introspected `owner` role. A caller without that authority, or naming no
|
|
83
|
+
* such service, is answered one denial text, whichever it is.
|
|
84
|
+
*/
|
|
77
85
|
export interface IReq_Cloudly_GetServicePublishedPorts extends plugins.typedrequestInterfaces.implementsTR<
|
|
78
86
|
plugins.typedrequestInterfaces.ITypedRequest, IReq_Cloudly_GetServicePublishedPorts
|
|
79
87
|
> {
|
|
@@ -92,6 +100,15 @@ export interface IReq_Cloudly_GetServicePublishedPorts extends plugins.typedrequ
|
|
|
92
100
|
* attached spec stating `publicEgress: false` and `platformEndpointIds: []` matches it and reaches
|
|
93
101
|
* no public address and no platform endpoint; `network-policy-missing` means the service has no
|
|
94
102
|
* document at all.
|
|
103
|
+
*
|
|
104
|
+
* The authority follows the service (`IServicePlatformOwnership`): a platform-owned service is
|
|
105
|
+
* written by a verified administrator, every other service by a federated sign-in holding the named
|
|
106
|
+
* organization's freshly introspected `owner` role, and an administrator does not substitute for
|
|
107
|
+
* that owner. A caller without that authority, or naming no such service, is answered one denial
|
|
108
|
+
* text, whichever it is. A designation that changes while the write is staged refuses it as the
|
|
109
|
+
* policy write's own `conflict`, the refusal a stale `expectedRevision` is also answered (read the
|
|
110
|
+
* document and the authority again); it is a service network policy refusal, not one of
|
|
111
|
+
* `servicePlatformOwnershipRefusals`.
|
|
95
112
|
*/
|
|
96
113
|
export interface IReq_Cloudly_SetServicePublishedPorts extends plugins.typedrequestInterfaces.implementsTR<
|
|
97
114
|
plugins.typedrequestInterfaces.ITypedRequest, IReq_Cloudly_SetServicePublishedPorts
|
|
@@ -147,6 +164,53 @@ export interface IReq_Admin_Cloudly_SetServiceNetworkEgress extends plugins.type
|
|
|
147
164
|
response: { networkEgress: IServiceNetworkEgress; replayed: boolean };
|
|
148
165
|
}
|
|
149
166
|
|
|
167
|
+
/**
|
|
168
|
+
* Designates one service platform-owned (`IServicePlatformOwnership`), so that a verified
|
|
169
|
+
* administrator, and no organization owner, holds the authority over its published ports.
|
|
170
|
+
*
|
|
171
|
+
* Only a verified administrator calls it. Cloudly designates only a service of a platform
|
|
172
|
+
* organization (`isPlatformOrganizationId`: a canonical identifier carrying `:`, such as
|
|
173
|
+
* `legacy:Service:<id>` or `Organization:<id>`) and refuses every other organization id, an
|
|
174
|
+
* idp.global one or one that is no canonical identifier, as `organization-not-platform` before it
|
|
175
|
+
* reads the service. It refuses a service that is not the named organization's (`service-unknown`)
|
|
176
|
+
* and a deleting one (`service-deleting`); refusals are `servicePlatformOwnershipRefusals`. A
|
|
177
|
+
* service already designated answers its stored designation unchanged with `changed: false`.
|
|
178
|
+
*/
|
|
179
|
+
export interface IReq_Admin_Cloudly_DesignatePlatformOwnedService extends plugins.typedrequestInterfaces.implementsTR<
|
|
180
|
+
plugins.typedrequestInterfaces.ITypedRequest, IReq_Admin_Cloudly_DesignatePlatformOwnedService
|
|
181
|
+
> {
|
|
182
|
+
method: 'designatePlatformOwnedService';
|
|
183
|
+
request: { identity: IIdentityCredential; organizationId: string; serviceId: string };
|
|
184
|
+
response: { platformOwnership: IServicePlatformOwnership; changed: boolean };
|
|
185
|
+
}
|
|
186
|
+
|
|
187
|
+
/**
|
|
188
|
+
* Withdraws a service's platform-owned designation; its published ports stay as they are, and from
|
|
189
|
+
* then on the organization-owner rule governs them. A designated service is always a platform
|
|
190
|
+
* organization's, which has no idp.global owner, so after the withdrawal nobody writes or reads its
|
|
191
|
+
* published ports until an administrator designates it again: the authority fails closed.
|
|
192
|
+
*
|
|
193
|
+
* Only a verified administrator calls it. Refusals are `service-unknown` and `conflict`; a service
|
|
194
|
+
* without a designation answers `changed: false`.
|
|
195
|
+
*/
|
|
196
|
+
export interface IReq_Admin_Cloudly_UndesignatePlatformOwnedService extends plugins.typedrequestInterfaces.implementsTR<
|
|
197
|
+
plugins.typedrequestInterfaces.ITypedRequest, IReq_Admin_Cloudly_UndesignatePlatformOwnedService
|
|
198
|
+
> {
|
|
199
|
+
method: 'undesignatePlatformOwnedService';
|
|
200
|
+
request: { identity: IIdentityCredential; organizationId: string; serviceId: string };
|
|
201
|
+
response: { platformOwnership: null; changed: boolean };
|
|
202
|
+
}
|
|
203
|
+
|
|
204
|
+
/** The service's platform-owned designation, or null when it has none. Only a verified administrator reads it. */
|
|
205
|
+
export interface IReq_Admin_Cloudly_GetServicePlatformOwnership extends plugins.typedrequestInterfaces.implementsTR<
|
|
206
|
+
plugins.typedrequestInterfaces.ITypedRequest, IReq_Admin_Cloudly_GetServicePlatformOwnership
|
|
207
|
+
> {
|
|
208
|
+
method: 'getServicePlatformOwnership';
|
|
209
|
+
/** Refused `service-unknown` when no service of that id belongs to the named organization. */
|
|
210
|
+
request: { identity: IIdentityCredential; organizationId: string; serviceId: string };
|
|
211
|
+
response: { platformOwnership: IServicePlatformOwnership | null };
|
|
212
|
+
}
|
|
213
|
+
|
|
150
214
|
export interface IRequest_Any_Cloudly_GetNetworkNodes {
|
|
151
215
|
method: 'getNetworkNodes';
|
|
152
216
|
request: {};
|