@serve.zone/interfaces 32.23.0 → 32.25.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 +55 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/clusternode.d.ts +16 -1
- package/dist_ts/data/clusternode.js +1 -1
- package/dist_ts/data/corestorelegacyadoption.d.ts +6 -2
- package/dist_ts/data/corestorelegacyadoption.js +11 -8
- package/dist_ts/data/runtimelocalstorageclaim.d.ts +73 -10
- package/dist_ts/data/runtimelocalstorageclaim.js +89 -2
- package/dist_ts/platform/index.d.ts +3 -1
- package/dist_ts/platform/index.js +4 -2
- package/dist_ts/platform/objectstorage.d.ts +58 -0
- package/dist_ts/platform/objectstorage.js +136 -1
- package/dist_ts/platform/objectstorageenvironment.d.ts +49 -0
- package/dist_ts/platform/objectstorageenvironment.js +119 -0
- package/dist_ts/platform/objectstorageretention.d.ts +40 -0
- package/dist_ts/platform/objectstorageretention.js +121 -1
- package/dist_ts/requests/node.d.ts +29 -0
- package/package.json +1 -1
- package/readme.md +130 -13
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/clusternode.ts +17 -1
- package/ts/data/corestorelegacyadoption.ts +19 -9
- package/ts/data/runtimelocalstorageclaim.ts +169 -10
- package/ts/platform/index.ts +3 -0
- package/ts/platform/objectstorage.ts +180 -0
- package/ts/platform/objectstorageenvironment.ts +176 -0
- package/ts/platform/objectstorageretention.ts +141 -0
- package/ts/requests/node.ts +33 -0
|
@@ -65,3 +65,43 @@ export declare const objectStorageRetentionIntentsEqual: (leftArg: unknown, righ
|
|
|
65
65
|
export declare const validateObjectStorageRetentionEvidence: (evidenceArg: unknown, expectedArg: IObjectStorageRetentionEvidenceExpectation) => Promise<string[]>;
|
|
66
66
|
export declare const validateObjectStorageRetentionBinding: (bindingArg: unknown, expectedArg: IObjectStorageRetentionEvidenceExpectation) => Promise<string[]>;
|
|
67
67
|
export declare const validatePlatformBindingObjectStorageRetention: (bindingArg: unknown, expectedArg: IObjectStorageRetentionEvidenceExpectation) => Promise<string[]>;
|
|
68
|
+
/**
|
|
69
|
+
* The non-secret environment names that tell a workload which retention its bucket carries.
|
|
70
|
+
*
|
|
71
|
+
* The names are the ones the cluster relay handed workloads on the Docker path, so an application
|
|
72
|
+
* that read them keeps working unchanged. Every value is a projection of verified
|
|
73
|
+
* `IObjectStorageRetentionEvidence`; none is a credential.
|
|
74
|
+
*
|
|
75
|
+
* - `S3_RETENTION_MODE`: `intent.mode`, always `compliance`.
|
|
76
|
+
* - `S3_RETENTION_POLICY_ID`: `intent.policyId`.
|
|
77
|
+
* - `S3_RETENTION_DURATION_SECONDS`: `intent.retentionDurationSeconds` in decimal.
|
|
78
|
+
* - `S3_RETENTION_INTENT_SHA256`: `intentSha256`.
|
|
79
|
+
* - `S3_RETENTION_SENTINEL_KEY`: `receipt.sentinelKey`.
|
|
80
|
+
* - `S3_RETENTION_CONFIGURED_AT`: `receipt.configuredAt`, Unix milliseconds in decimal.
|
|
81
|
+
* - `S3_RETENTION_SENTINEL_CREATED_AT`: `receipt.sentinel.createdAt`, Unix milliseconds in decimal.
|
|
82
|
+
* - `S3_RETENTION_SENTINEL_RETAIN_UNTIL`: `receipt.sentinel.retainUntil`, Unix milliseconds in
|
|
83
|
+
* decimal.
|
|
84
|
+
* - `S3_RETENTION_SENTINEL_PAYLOAD_SHA256`: `receipt.sentinel.payloadSha256`.
|
|
85
|
+
* - `S3_RETENTION_SENTINEL_METADATA_SHA256`: `receipt.sentinel.metadataSha256`.
|
|
86
|
+
* - `S3_RETENTION_SENTINEL_ETAG`: `receipt.sentinel.etag`.
|
|
87
|
+
*/
|
|
88
|
+
export declare const objectStorageRetentionEnvironmentKeys: readonly ["S3_RETENTION_MODE", "S3_RETENTION_POLICY_ID", "S3_RETENTION_DURATION_SECONDS", "S3_RETENTION_INTENT_SHA256", "S3_RETENTION_SENTINEL_KEY", "S3_RETENTION_CONFIGURED_AT", "S3_RETENTION_SENTINEL_CREATED_AT", "S3_RETENTION_SENTINEL_RETAIN_UNTIL", "S3_RETENTION_SENTINEL_PAYLOAD_SHA256", "S3_RETENTION_SENTINEL_METADATA_SHA256", "S3_RETENTION_SENTINEL_ETAG"];
|
|
89
|
+
export type TObjectStorageRetentionEnvironmentKey = typeof objectStorageRetentionEnvironmentKeys[number];
|
|
90
|
+
export type TObjectStorageRetentionEnvironment = {
|
|
91
|
+
[TKey in TObjectStorageRetentionEnvironmentKey]: string;
|
|
92
|
+
};
|
|
93
|
+
/**
|
|
94
|
+
* The retention environment of evidence that proves `expectedArg`.
|
|
95
|
+
*
|
|
96
|
+
* The evidence is validated against the expectation first, with the same validator every other
|
|
97
|
+
* consumer of retention evidence uses; the first reason it is refused is thrown. A workload is
|
|
98
|
+
* never told about a retention nobody proved.
|
|
99
|
+
*/
|
|
100
|
+
export declare const createObjectStorageRetentionEnvironment: (evidenceArg: IObjectStorageRetentionEvidence, expectedArg: IObjectStorageRetentionEvidenceExpectation) => Promise<TObjectStorageRetentionEnvironment>;
|
|
101
|
+
/**
|
|
102
|
+
* Validates a retention environment on its own: exactly its eleven keys, canonical values, an
|
|
103
|
+
* intent digest that matches the stated intent, and sentinel timestamps that agree with the
|
|
104
|
+
* duration. It cannot prove the authority or the bucket the evidence was bound to — the
|
|
105
|
+
* environment does not carry them — so it judges the shape a workload reads, not the proof.
|
|
106
|
+
*/
|
|
107
|
+
export declare const validateObjectStorageRetentionEnvironment: (environmentArg: unknown, pathArg?: string) => Promise<string[]>;
|
|
@@ -249,4 +249,124 @@ export const validatePlatformBindingObjectStorageRetention = async (bindingArg,
|
|
|
249
249
|
}
|
|
250
250
|
return validateObjectStorageRetentionBinding(bindingArg.objectstorageRetention, expectedArg);
|
|
251
251
|
};
|
|
252
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"objectstorageretention.js","sourceRoot":"","sources":["../../ts/platform/objectstorageretention.ts"],"names":[],"mappings":"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"}
|
|
252
|
+
/**
|
|
253
|
+
* The non-secret environment names that tell a workload which retention its bucket carries.
|
|
254
|
+
*
|
|
255
|
+
* The names are the ones the cluster relay handed workloads on the Docker path, so an application
|
|
256
|
+
* that read them keeps working unchanged. Every value is a projection of verified
|
|
257
|
+
* `IObjectStorageRetentionEvidence`; none is a credential.
|
|
258
|
+
*
|
|
259
|
+
* - `S3_RETENTION_MODE`: `intent.mode`, always `compliance`.
|
|
260
|
+
* - `S3_RETENTION_POLICY_ID`: `intent.policyId`.
|
|
261
|
+
* - `S3_RETENTION_DURATION_SECONDS`: `intent.retentionDurationSeconds` in decimal.
|
|
262
|
+
* - `S3_RETENTION_INTENT_SHA256`: `intentSha256`.
|
|
263
|
+
* - `S3_RETENTION_SENTINEL_KEY`: `receipt.sentinelKey`.
|
|
264
|
+
* - `S3_RETENTION_CONFIGURED_AT`: `receipt.configuredAt`, Unix milliseconds in decimal.
|
|
265
|
+
* - `S3_RETENTION_SENTINEL_CREATED_AT`: `receipt.sentinel.createdAt`, Unix milliseconds in decimal.
|
|
266
|
+
* - `S3_RETENTION_SENTINEL_RETAIN_UNTIL`: `receipt.sentinel.retainUntil`, Unix milliseconds in
|
|
267
|
+
* decimal.
|
|
268
|
+
* - `S3_RETENTION_SENTINEL_PAYLOAD_SHA256`: `receipt.sentinel.payloadSha256`.
|
|
269
|
+
* - `S3_RETENTION_SENTINEL_METADATA_SHA256`: `receipt.sentinel.metadataSha256`.
|
|
270
|
+
* - `S3_RETENTION_SENTINEL_ETAG`: `receipt.sentinel.etag`.
|
|
271
|
+
*/
|
|
272
|
+
export const objectStorageRetentionEnvironmentKeys = Object.freeze([
|
|
273
|
+
'S3_RETENTION_MODE',
|
|
274
|
+
'S3_RETENTION_POLICY_ID',
|
|
275
|
+
'S3_RETENTION_DURATION_SECONDS',
|
|
276
|
+
'S3_RETENTION_INTENT_SHA256',
|
|
277
|
+
'S3_RETENTION_SENTINEL_KEY',
|
|
278
|
+
'S3_RETENTION_CONFIGURED_AT',
|
|
279
|
+
'S3_RETENTION_SENTINEL_CREATED_AT',
|
|
280
|
+
'S3_RETENTION_SENTINEL_RETAIN_UNTIL',
|
|
281
|
+
'S3_RETENTION_SENTINEL_PAYLOAD_SHA256',
|
|
282
|
+
'S3_RETENTION_SENTINEL_METADATA_SHA256',
|
|
283
|
+
'S3_RETENTION_SENTINEL_ETAG',
|
|
284
|
+
]);
|
|
285
|
+
/**
|
|
286
|
+
* The retention environment of evidence that proves `expectedArg`.
|
|
287
|
+
*
|
|
288
|
+
* The evidence is validated against the expectation first, with the same validator every other
|
|
289
|
+
* consumer of retention evidence uses; the first reason it is refused is thrown. A workload is
|
|
290
|
+
* never told about a retention nobody proved.
|
|
291
|
+
*/
|
|
292
|
+
export const createObjectStorageRetentionEnvironment = async (evidenceArg, expectedArg) => {
|
|
293
|
+
const errors = await validateObjectStorageRetentionEvidence(evidenceArg, expectedArg);
|
|
294
|
+
if (errors.length > 0)
|
|
295
|
+
throw new Error(errors[0]);
|
|
296
|
+
return {
|
|
297
|
+
S3_RETENTION_MODE: evidenceArg.intent.mode,
|
|
298
|
+
S3_RETENTION_POLICY_ID: evidenceArg.intent.policyId,
|
|
299
|
+
S3_RETENTION_DURATION_SECONDS: String(evidenceArg.intent.retentionDurationSeconds),
|
|
300
|
+
S3_RETENTION_INTENT_SHA256: evidenceArg.intentSha256,
|
|
301
|
+
S3_RETENTION_SENTINEL_KEY: evidenceArg.receipt.sentinelKey,
|
|
302
|
+
S3_RETENTION_CONFIGURED_AT: String(evidenceArg.receipt.configuredAt),
|
|
303
|
+
S3_RETENTION_SENTINEL_CREATED_AT: String(evidenceArg.receipt.sentinel.createdAt),
|
|
304
|
+
S3_RETENTION_SENTINEL_RETAIN_UNTIL: String(evidenceArg.receipt.sentinel.retainUntil),
|
|
305
|
+
S3_RETENTION_SENTINEL_PAYLOAD_SHA256: evidenceArg.receipt.sentinel.payloadSha256,
|
|
306
|
+
S3_RETENTION_SENTINEL_METADATA_SHA256: evidenceArg.receipt.sentinel.metadataSha256,
|
|
307
|
+
S3_RETENTION_SENTINEL_ETAG: evidenceArg.receipt.sentinel.etag,
|
|
308
|
+
};
|
|
309
|
+
};
|
|
310
|
+
const canonicalDecimalPattern = /^[1-9][0-9]*$/;
|
|
311
|
+
const readCanonicalPositiveInteger = (valueArg) => (typeof valueArg === 'string'
|
|
312
|
+
&& canonicalDecimalPattern.test(valueArg)
|
|
313
|
+
&& Number.isSafeInteger(Number(valueArg))
|
|
314
|
+
? Number(valueArg)
|
|
315
|
+
: undefined);
|
|
316
|
+
/**
|
|
317
|
+
* Validates a retention environment on its own: exactly its eleven keys, canonical values, an
|
|
318
|
+
* intent digest that matches the stated intent, and sentinel timestamps that agree with the
|
|
319
|
+
* duration. It cannot prove the authority or the bucket the evidence was bound to — the
|
|
320
|
+
* environment does not carry them — so it judges the shape a workload reads, not the proof.
|
|
321
|
+
*/
|
|
322
|
+
export const validateObjectStorageRetentionEnvironment = async (environmentArg, pathArg = 'objectstorage retention environment') => {
|
|
323
|
+
if (!isRecord(environmentArg)
|
|
324
|
+
|| !hasExactKeys(environmentArg, objectStorageRetentionEnvironmentKeys)
|
|
325
|
+
|| objectStorageRetentionEnvironmentKeys.some((keyArg) => (typeof environmentArg[keyArg] !== 'string'))) {
|
|
326
|
+
return [`${pathArg} must contain exactly its string keys`];
|
|
327
|
+
}
|
|
328
|
+
const environment = environmentArg;
|
|
329
|
+
const errors = [];
|
|
330
|
+
const duration = readCanonicalPositiveInteger(environment.S3_RETENTION_DURATION_SECONDS);
|
|
331
|
+
const intent = {
|
|
332
|
+
mode: environment.S3_RETENTION_MODE,
|
|
333
|
+
policyId: environment.S3_RETENTION_POLICY_ID,
|
|
334
|
+
retentionDurationSeconds: duration,
|
|
335
|
+
};
|
|
336
|
+
const intentErrors = validateObjectStorageRetentionIntent(intent, `${pathArg} intent`);
|
|
337
|
+
errors.push(...intentErrors);
|
|
338
|
+
if (!sha256Pattern.test(environment.S3_RETENTION_INTENT_SHA256)
|
|
339
|
+
|| intentErrors.length === 0
|
|
340
|
+
&& environment.S3_RETENTION_INTENT_SHA256 !== await computeObjectStorageRetentionIntentSha256(intent)) {
|
|
341
|
+
errors.push(`${pathArg} S3_RETENTION_INTENT_SHA256 must be the digest of the stated intent`);
|
|
342
|
+
}
|
|
343
|
+
if (!sentinelKeyPattern.test(environment.S3_RETENTION_SENTINEL_KEY)) {
|
|
344
|
+
errors.push(`${pathArg} S3_RETENTION_SENTINEL_KEY must be canonical`);
|
|
345
|
+
}
|
|
346
|
+
const configuredAt = readCanonicalPositiveInteger(environment.S3_RETENTION_CONFIGURED_AT);
|
|
347
|
+
const createdAt = readCanonicalPositiveInteger(environment.S3_RETENTION_SENTINEL_CREATED_AT);
|
|
348
|
+
const retainUntil = readCanonicalPositiveInteger(environment.S3_RETENTION_SENTINEL_RETAIN_UNTIL);
|
|
349
|
+
if (configuredAt === undefined
|
|
350
|
+
|| createdAt === undefined
|
|
351
|
+
|| retainUntil === undefined
|
|
352
|
+
|| createdAt < configuredAt) {
|
|
353
|
+
errors.push(`${pathArg} timestamps must be canonical positive decimals in order`);
|
|
354
|
+
}
|
|
355
|
+
else if (intentErrors.length === 0) {
|
|
356
|
+
try {
|
|
357
|
+
if (retainUntil !== createObjectStorageRetentionRetainUntil(createdAt, duration)) {
|
|
358
|
+
errors.push(`${pathArg} S3_RETENTION_SENTINEL_RETAIN_UNTIL must equal createdAt plus duration`);
|
|
359
|
+
}
|
|
360
|
+
}
|
|
361
|
+
catch {
|
|
362
|
+
errors.push(`${pathArg} S3_RETENTION_SENTINEL_RETAIN_UNTIL arithmetic must be safe`);
|
|
363
|
+
}
|
|
364
|
+
}
|
|
365
|
+
if (!sha256Pattern.test(environment.S3_RETENTION_SENTINEL_PAYLOAD_SHA256)
|
|
366
|
+
|| !sha256Pattern.test(environment.S3_RETENTION_SENTINEL_METADATA_SHA256)
|
|
367
|
+
|| !etagPattern.test(environment.S3_RETENTION_SENTINEL_ETAG)) {
|
|
368
|
+
errors.push(`${pathArg} sentinel digests and ETag must be canonical`);
|
|
369
|
+
}
|
|
370
|
+
return errors;
|
|
371
|
+
};
|
|
372
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"objectstorageretention.js","sourceRoot":"","sources":["../../ts/platform/objectstorageretention.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import type { ICluster } from '../data/cluster.js';
|
|
|
4
4
|
import type { IClusterNode, INodeAction, INodeMetricsSample, TNodeActionName } from '../data/clusternode.js';
|
|
5
5
|
import type { IDeployment } from '../data/deployment.js';
|
|
6
6
|
import type { IIdentity } from '../data/user.js';
|
|
7
|
+
import type { IPlatformObjectStorageEndpoint } from '../platform/objectstorage.js';
|
|
7
8
|
import type { INodeCredentialMetadata, INodeCredentialMutationPreconditions, INodeCredentialMutationResult, TNodeCredentialPurpose } from '../data/nodecredential.js';
|
|
8
9
|
import type { INodeRuntimeRetirement } from '../data/noderetirement.js';
|
|
9
10
|
import type { INodeRuntimeBindingRead, INodeRuntimeBindingRequest } from '../data/noderuntimebinding.js';
|
|
@@ -217,6 +218,34 @@ export interface IReq_Any_Cloudly_SetClusterNodeCorestoreEndpoint extends plugin
|
|
|
217
218
|
node: IClusterNode;
|
|
218
219
|
};
|
|
219
220
|
}
|
|
221
|
+
/**
|
|
222
|
+
* An administrator states where a workload on one node reaches the node's Corestore object
|
|
223
|
+
* storage, and the region it signs for: `IClusterNode.data.corestoreObjectStorage`.
|
|
224
|
+
*
|
|
225
|
+
* A request of its own, separate from `setClusterNodeCorestoreEndpoint`, because the two are
|
|
226
|
+
* separate facts with separate readers — the relay dials the control endpoint, a workload dials
|
|
227
|
+
* this one — and setting one never touches the other. A caller that states only the control
|
|
228
|
+
* endpoint leaves this one as it stands.
|
|
229
|
+
*
|
|
230
|
+
* Cloudly validates it with `validatePlatformObjectStorageEndpoint` before it writes and takes the
|
|
231
|
+
* node's own real-write fence inside the writing transaction, as for the control endpoint.
|
|
232
|
+
* `objectStorage: null` clears it, which is the same fact as never having set one: no
|
|
233
|
+
* object-storage environment can be composed for a binding on this node. The endpoint says where,
|
|
234
|
+
* never with what — no credential travels in this request or in the node document.
|
|
235
|
+
*/
|
|
236
|
+
export interface IReq_Any_Cloudly_SetClusterNodeCorestoreObjectStorageEndpoint extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Any_Cloudly_SetClusterNodeCorestoreObjectStorageEndpoint> {
|
|
237
|
+
method: 'setClusterNodeCorestoreObjectStorageEndpoint';
|
|
238
|
+
request: {
|
|
239
|
+
identity: IIdentity;
|
|
240
|
+
nodeId: string;
|
|
241
|
+
/** The node's object-storage endpoint and region, or `null` to state that it has none. */
|
|
242
|
+
objectStorage: IPlatformObjectStorageEndpoint | null;
|
|
243
|
+
};
|
|
244
|
+
response: {
|
|
245
|
+
/** The node as it now stands, so a caller needs no second read to see what it set. */
|
|
246
|
+
node: IClusterNode;
|
|
247
|
+
};
|
|
248
|
+
}
|
|
220
249
|
export interface IReq_Any_Cloudly_CreateNodeAction extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Any_Cloudly_CreateNodeAction> {
|
|
221
250
|
method: 'createNodeAction';
|
|
222
251
|
request: {
|
package/package.json
CHANGED
package/readme.md
CHANGED
|
@@ -1984,25 +1984,64 @@ native fence.
|
|
|
1984
1984
|
|
|
1985
1985
|
### Runtime local storage claims
|
|
1986
1986
|
|
|
1987
|
-
`data.IRuntimeLocalStorageClaim` is a controller's authority for one retained
|
|
1988
|
-
one
|
|
1989
|
-
the claim revision (`id`, `generation`, `previous`), the organization, cluster, node,
|
|
1990
|
-
namespace, service and the service's own `volumeId`, and it states:
|
|
1991
|
-
|
|
1992
|
-
- `source
|
|
1993
|
-
|
|
1994
|
-
|
|
1987
|
+
`data.IRuntimeLocalStorageClaim` is a controller's authority for one retained volume of one service,
|
|
1988
|
+
mounted on one node. Cloudly and Onebox issue it alike (`controller.kind` is `cloudly` or `onebox`).
|
|
1989
|
+
It names the claim revision (`id`, `generation`, `previous`), the organization, cluster, node,
|
|
1990
|
+
runtime namespace, service and the service's own `volumeId`, and it states:
|
|
1991
|
+
|
|
1992
|
+
- `source` (`TRuntimeLocalStorageSource`), one of:
|
|
1993
|
+
- `{ kind: 'directory' }` (`TRuntimeLocalStorageDirectorySource`), a node-local directory the node
|
|
1994
|
+
derives from the claim's identity under a root only the node knows;
|
|
1995
|
+
- `{ kind: 'nfs', server, export, subPath, version }` (`TRuntimeLocalStorageNfsSource`), the
|
|
1996
|
+
directory `subPath` below the NFS export `server:export`;
|
|
1997
|
+
- `{ kind: 'smb', server, share, subPath, version, credential }` (`TRuntimeLocalStorageSmbSource`),
|
|
1998
|
+
the directory `subPath` below the SMB share `//server/share`. `credential` is an
|
|
1999
|
+
`IRuntimeAuthorityReference { id, generation, digest }` naming the credential the node
|
|
2000
|
+
authenticates with; the claim never carries a user name, password or domain, and the node
|
|
2001
|
+
resolves the material through the controller's secret delivery. NFS authenticates the node's
|
|
2002
|
+
host, so an `nfs` source names no credential;
|
|
1995
2003
|
- `initialization`: `empty` creates an empty root with `initialOwnership { uid, gid, mode }`, which
|
|
1996
2004
|
an `empty` claim must state, so a workload without `runAs` never meets a root-owned directory by
|
|
1997
2005
|
accident; `import` waits for the volume's bytes to be imported and states `initialOwnership: null`,
|
|
1998
2006
|
because an imported tree keeps its own ownership. `mode` holds directory permission bits only
|
|
1999
|
-
(`runtimeLocalStorageClaimContract.directoryModeBits`, `0o3777`; setuid is refused)
|
|
2007
|
+
(`runtimeLocalStorageClaimContract.directoryModeBits`, `0o3777`; setuid is refused). SMB carries no
|
|
2008
|
+
POSIX ownership, so the node presents an SMB volume with `initialOwnership`, and an `smb` claim is
|
|
2009
|
+
always `empty`;
|
|
2000
2010
|
- `mount { mountPath, readOnly }`, judged by the storage request's own mount path rule: canonical,
|
|
2001
2011
|
absolute, not `/`, and never overlapping `/run/secrets`;
|
|
2002
2012
|
- `accessMode: 'ReadWriteOnce'`, `reclaimPolicy: 'retain'`, and `lifecycle`: `bound` keeps the
|
|
2003
2013
|
volume, `purge` orders its bytes deleted and always follows a bound generation of the same claim.
|
|
2004
2014
|
|
|
2005
|
-
|
|
2015
|
+
A network source names the remote directory and nothing about how to mount it, so the node derives
|
|
2016
|
+
every mount parameter from these fields alone and a claim cannot smuggle an option in:
|
|
2017
|
+
|
|
2018
|
+
| Field | Rule |
|
|
2019
|
+
| --- | --- |
|
|
2020
|
+
| `server` | a lowercase fully qualified hostname of two or more labels whose last label is not numeric (a single label would resolve through each node's own search domains), or a canonical IP literal (a dotted quad without leading zeros, or RFC 5952 IPv6 without brackets or zone). No scheme, user info or port: the node connects to the protocol's standard port |
|
|
2021
|
+
| `export` | `/`, or `/` and canonical segments without a trailing slash |
|
|
2022
|
+
| `subPath` | `.` for the export or share itself, or canonical relative segments |
|
|
2023
|
+
| `share` | one segment of at most 80 characters, without `+`, `;`, `[` or `]` |
|
|
2024
|
+
| `version` | `nfs`: `3`, `4.0`, `4.1` or `4.2`; `smb`: `3.0`, `3.02` or `3.1.1` |
|
|
2025
|
+
|
|
2026
|
+
A segment is printable ASCII without a space, at most 255 characters, never `.` or `..`, and holds
|
|
2027
|
+
none of `"`, `*`, `,`, `/`, `:`, `<`, `=`, `>`, `?`, `\` or `|`: a comma or `=` would read as a mount
|
|
2028
|
+
option, and the rest have meaning in a mount source or an SMB name. `export` and `subPath` are at
|
|
2029
|
+
most 1024 characters. ASCII keeps one spelling per segment, but one remote directory can still be
|
|
2030
|
+
named several ways: a hostname and an address of the same server, a different `export`/`subPath`
|
|
2031
|
+
split, or a nested `subPath`. The contract cannot detect these aliases, so the controller must refuse
|
|
2032
|
+
overlapping bound claims itself. The versions are the kernel's own `vers=` spellings, and each pins one protocol version: a
|
|
2033
|
+
bare NFS `4` or SMB `3` negotiates one, which a claim that must mean the same mount on every node
|
|
2034
|
+
cannot allow. NFS version 2 and the SMB 1 and 2 dialects are refused; SMB 3 is the first dialect
|
|
2035
|
+
that encrypts. The bounds and version lists
|
|
2036
|
+
are `runtimeLocalStorageClaimContract.nfsVersions`, `smbVersions`, `maximumServerLength`,
|
|
2037
|
+
`maximumPathLength`, `maximumSegmentLength` and `maximumShareLength`.
|
|
2038
|
+
|
|
2039
|
+
`ReadWriteOnce` holds on the node that mounts the claim. A network directory is reachable from more
|
|
2040
|
+
than one node, so the controller issues at most one bound claim per remote directory; a node cannot
|
|
2041
|
+
see another node's mounts. A `purge` of a network claim deletes everything below `subPath`, the
|
|
2042
|
+
whole export or share for `.`.
|
|
2043
|
+
|
|
2044
|
+
The claim carries no host path, device, mount option or credential value.
|
|
2006
2045
|
`snapshotRuntimeLocalStorageClaim` makes a detached exact-schema snapshot,
|
|
2007
2046
|
`computeRuntimeLocalStorageClaimDigest` hashes it under `serve.zone/runtime-local-storage-claim`,
|
|
2008
2047
|
`validateRuntimeLocalStorageClaim` verifies the stated digest, and
|
|
@@ -3394,9 +3433,13 @@ Coreflow, all exported from `data` and `platform`:
|
|
|
3394
3433
|
`{ state: 'authorized', bindingId }`. The blocker names what would stop the offline adoption,
|
|
3395
3434
|
`null` when nothing would: `not-adoptable` (an allocation-managed database, another provider, a
|
|
3396
3435
|
resource name that is not its database or bucket name, or a bucket name that is not a canonical S3
|
|
3397
|
-
name), `ordinary-credentials-rotated
|
|
3398
|
-
|
|
3399
|
-
|
|
3436
|
+
name), `ordinary-credentials-rotated`, `owned-by-binding` or `fence-lineage-conflict` (the
|
|
3437
|
+
bucket's object-storage fence lineage cannot move to the adopting binding: the bucket has more than
|
|
3438
|
+
one lineage, or its lineage does not validate, belongs to another authority or has an unfinished
|
|
3439
|
+
mutation).
|
|
3440
|
+
Only a bucket has a fence lineage, so a database never names `fence-lineage-conflict`. An
|
|
3441
|
+
adoptable bucket must have a canonical S3 name, because a binding request carries only such a
|
|
3442
|
+
name. A consumed adoption removes the legacy entry, so it never appears.
|
|
3400
3443
|
2. **Relay.** `getClusterCorestoreLegacyResources { nodeId }` asks the relay for one node's
|
|
3401
3444
|
inventory, answered as `TClusterCorestoreLegacyResourceInventory`: `reachable: true` with the
|
|
3402
3445
|
services, or `reachable: false` with `errorCode` `CORESTORE_ENDPOINT_UNKNOWN` or
|
|
@@ -3443,6 +3486,78 @@ Coreflow, all exported from `data` and `platform`:
|
|
|
3443
3486
|
While a binding of a service reports `legacy-adoption-pending`, the service's runtime status waits as
|
|
3444
3487
|
`legacy-adoption-pending` instead of `bindings-pending`.
|
|
3445
3488
|
|
|
3489
|
+
### Object-Storage Binding Environment
|
|
3490
|
+
|
|
3491
|
+
An object-storage binding gives its workload two things. The access key and the secret reach it
|
|
3492
|
+
only as Secrets: the six aliases `createCorestoreCredentialSecretValues()` expands
|
|
3493
|
+
(`S3_ACCESS_KEY`, `S3_ACCESS_KEY_ID`, `S3_SECRET_KEY`, `S3_SECRET_ACCESS_KEY`,
|
|
3494
|
+
`AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY`), published through the sealed Secret set. Where the
|
|
3495
|
+
bucket is, and which retention it carries, is non-secret and reaches it through the runtime
|
|
3496
|
+
configuration: Cloudly composes it into `IRuntimeConfig.environment`, the complete public
|
|
3497
|
+
environment, so no further runtime spec or assignment field carries it. The names are the ones
|
|
3498
|
+
Corestore and the cluster relay handed workloads before, so an application that read them keeps
|
|
3499
|
+
working unchanged.
|
|
3500
|
+
|
|
3501
|
+
| Name | Value |
|
|
3502
|
+
| --- | --- |
|
|
3503
|
+
| `S3_ENDPOINT`, `AWS_ENDPOINT_URL` | The endpoint origin, for example `http://192.0.2.15:9000`. |
|
|
3504
|
+
| `S3_ENDPOINT_HOST` | The origin's host; an IPv6 literal keeps its brackets. |
|
|
3505
|
+
| `S3_PORT` | The origin's port, `80` or `443` when the origin states none. |
|
|
3506
|
+
| `S3_USE_SSL` | `true` for `https:`, `false` for `http:`. |
|
|
3507
|
+
| `S3_REGION`, `AWS_REGION` | The signing region. |
|
|
3508
|
+
| `S3_BUCKET` | `IPlatformBinding.objectstorageBucketName`. |
|
|
3509
|
+
| `AWS_S3_FORCE_PATH_STYLE` | Always `true`: a node-local origin has no wildcard DNS. |
|
|
3510
|
+
| `S3_RETENTION_MODE` | `intent.mode`, always `compliance`. |
|
|
3511
|
+
| `S3_RETENTION_POLICY_ID` | `intent.policyId`. |
|
|
3512
|
+
| `S3_RETENTION_DURATION_SECONDS` | `intent.retentionDurationSeconds`. |
|
|
3513
|
+
| `S3_RETENTION_INTENT_SHA256` | `intentSha256`. |
|
|
3514
|
+
| `S3_RETENTION_SENTINEL_KEY` | `receipt.sentinelKey`. |
|
|
3515
|
+
| `S3_RETENTION_CONFIGURED_AT` | `receipt.configuredAt`, Unix milliseconds. |
|
|
3516
|
+
| `S3_RETENTION_SENTINEL_CREATED_AT` | `receipt.sentinel.createdAt`, Unix milliseconds. |
|
|
3517
|
+
| `S3_RETENTION_SENTINEL_RETAIN_UNTIL` | `receipt.sentinel.retainUntil`, Unix milliseconds. |
|
|
3518
|
+
| `S3_RETENTION_SENTINEL_PAYLOAD_SHA256` | `receipt.sentinel.payloadSha256`. |
|
|
3519
|
+
| `S3_RETENTION_SENTINEL_METADATA_SHA256` | `receipt.sentinel.metadataSha256`. |
|
|
3520
|
+
| `S3_RETENTION_SENTINEL_ETAG` | `receipt.sentinel.etag`. |
|
|
3521
|
+
|
|
3522
|
+
Every number is a canonical decimal. `objectStorageEndpointEnvironmentKeys`,
|
|
3523
|
+
`objectStorageRetentionEnvironmentKeys` and `objectStorageBindingEnvironmentKeys` publish the
|
|
3524
|
+
lists in this order, with the matching `T…EnvironmentKey` and `T…Environment` types.
|
|
3525
|
+
|
|
3526
|
+
**Where the endpoint comes from.** Corestore is node-local, so the endpoint is a fact about the
|
|
3527
|
+
node that holds the bucket: `IClusterNode.data.corestoreObjectStorage` is an optional
|
|
3528
|
+
`IPlatformObjectStorageEndpoint { endpoint, region }`, checked by
|
|
3529
|
+
`validatePlatformObjectStorageEndpoint()` (a canonical `http:` or `https:` origin and a lowercase
|
|
3530
|
+
region). It sits beside `corestore`, not inside it: the relay dials the control endpoint and a
|
|
3531
|
+
workload dials this one, and `IClusterNodeCorestore` keeps its exact schema, so a relay that
|
|
3532
|
+
validates it goes on accepting every node document. An administrator sets it with
|
|
3533
|
+
`setClusterNodeCorestoreObjectStorageEndpoint { identity; nodeId; objectStorage }`, answered by
|
|
3534
|
+
Cloudly with the node as it now stands; `objectStorage: null` clears it. The request is separate
|
|
3535
|
+
from `setClusterNodeCorestoreEndpoint`, so setting the control endpoint never touches it. A node
|
|
3536
|
+
without it cannot give a workload an object-storage environment; nothing derives a port, a scheme
|
|
3537
|
+
or a region.
|
|
3538
|
+
|
|
3539
|
+
**Composing.** `createObjectStorageBindingEnvironment(binding, endpoint)` returns the nine endpoint
|
|
3540
|
+
names for a binding that declares no retention, and all twenty when it declares retention with
|
|
3541
|
+
evidence. It refuses by name, and never guesses, when the binding is not `objectstorage`, carries
|
|
3542
|
+
no canonical bucket, or declares retention without `evidence`: a bucket whose immutability is not
|
|
3543
|
+
proven yet must not be handed to its workload as if it were ordinary storage, so the workload
|
|
3544
|
+
waits for the evidence. The evidence is validated with `validateObjectStorageRetentionEvidence()`
|
|
3545
|
+
against the binding's own service, binding id, bucket and intent, and the reconciliation
|
|
3546
|
+
generation and request digest it states. The split helpers are
|
|
3547
|
+
`createObjectStorageEndpointEnvironment(endpoint, bucketName)` and
|
|
3548
|
+
`createObjectStorageRetentionEnvironment(evidence, expectation)`.
|
|
3549
|
+
`mergeObjectStorageBindingEnvironment(environment, bindingEnvironment)` adds one binding's names
|
|
3550
|
+
to a workload environment and refuses, naming every key, a name that is already set — by the
|
|
3551
|
+
service itself or by a second object-storage binding — instead of letting one value replace
|
|
3552
|
+
another.
|
|
3553
|
+
|
|
3554
|
+
**Validating.** `validateObjectStorageBindingEnvironment()` accepts exactly the endpoint names and
|
|
3555
|
+
all or none of the retention names, each value the one its endpoint and evidence derive, and
|
|
3556
|
+
refuses any other name — so a credential alias in the public environment is refused by name.
|
|
3557
|
+
`validateObjectStorageEndpointEnvironment()` and `validateObjectStorageRetentionEnvironment()`
|
|
3558
|
+
judge each half on its own. The environment does not carry the evidence's authority, so
|
|
3559
|
+
validating it checks what a workload reads, not the proof behind it.
|
|
3560
|
+
|
|
3446
3561
|
### Launcher Environment Delivery
|
|
3447
3562
|
|
|
3448
3563
|
Launcher environment delivery uses stable `szsv-<base32-sha256>` Docker
|
|
@@ -3484,6 +3599,8 @@ Available platform modules:
|
|
|
3484
3599
|
- `platform.objectstorageretention` for value-free immutable-retention intent,
|
|
3485
3600
|
capability and sentinel evidence, authority binding, digest helpers, and
|
|
3486
3601
|
strict validators.
|
|
3602
|
+
- `platform.objectstorageenvironment` for the non-secret workload environment of an
|
|
3603
|
+
object-storage binding; see Object-Storage Binding Environment.
|
|
3487
3604
|
- `platform.storagemigration` for fenced object-storage migration intent, status, consumer acknowledgements, canonical digests, and strict normalizers.
|
|
3488
3605
|
- `platform.types` provider and binding metadata is value-free. Provider-specific
|
|
3489
3606
|
operational config stays adapter-internal, while public DTOs expose typed
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/data/clusternode.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as plugins from '../plugins.js';
|
|
2
2
|
import { isSha256Digest, type TSha256Digest, type TImmutableContainerPlatform } from './immutableimage.js';
|
|
3
3
|
import type { ISparkNodeReportRecord } from './sparknodereport.js';
|
|
4
|
+
import type { IPlatformObjectStorageEndpoint } from '../platform/objectstorage.js';
|
|
4
5
|
import {
|
|
5
6
|
fleetCutoverContract,
|
|
6
7
|
snapshotFleetCutoverPreparedVolumeHandoffAggregate,
|
|
@@ -1773,6 +1774,21 @@ export interface IClusterNode {
|
|
|
1773
1774
|
* while Docker Swarm resolved it is exactly what stops resolving.
|
|
1774
1775
|
*/
|
|
1775
1776
|
corestore?: IClusterNodeCorestore;
|
|
1777
|
+
|
|
1778
|
+
/**
|
|
1779
|
+
* Where a workload on this node reaches the node's Corestore object storage, and the region
|
|
1780
|
+
* it signs for.
|
|
1781
|
+
*
|
|
1782
|
+
* Cloudly owns it, sets it with `setClusterNodeCorestoreObjectStorageEndpoint`, and composes
|
|
1783
|
+
* it into the environment of every object-storage binding placed on this node with
|
|
1784
|
+
* `createObjectStorageBindingEnvironment()`. It is a sibling of `corestore`, not a member:
|
|
1785
|
+
* the control API and the S3 API listen on different ports and have different readers — the
|
|
1786
|
+
* relay dials `corestore`, a workload dials this — and `corestore` keeps its exact schema.
|
|
1787
|
+
* Absent means no object-storage environment can be composed for this node, and a binding's
|
|
1788
|
+
* workload waits rather than being handed a guessed port, scheme or region. Value-free like
|
|
1789
|
+
* `corestore`: it says where, never with what.
|
|
1790
|
+
*/
|
|
1791
|
+
corestoreObjectStorage?: IPlatformObjectStorageEndpoint;
|
|
1776
1792
|
};
|
|
1777
1793
|
}
|
|
1778
1794
|
|
|
@@ -1789,7 +1805,7 @@ export interface IClusterNode {
|
|
|
1789
1805
|
export interface IClusterNodeCorestore {
|
|
1790
1806
|
/**
|
|
1791
1807
|
* The canonical origin of the control API, for example
|
|
1792
|
-
* `http://
|
|
1808
|
+
* `http://192.0.2.15:3000`.
|
|
1793
1809
|
*
|
|
1794
1810
|
* `http:` is admitted because Corestore terminates no TLS today — it binds a
|
|
1795
1811
|
* plain control port and advertises no transport-encryption guarantee — and
|
|
@@ -42,12 +42,17 @@ export type TCorestoreLegacyCapability = 'database' | 'objectstorage';
|
|
|
42
42
|
* - `ordinary-credentials-rotated`: its credentials were rotated, so the delivered ones are no
|
|
43
43
|
* longer the generation a binding adopts;
|
|
44
44
|
* - `owned-by-binding`: a credential binding or a named storage binding already owns the service
|
|
45
|
-
* capability, the resource or the bucket
|
|
45
|
+
* capability, the resource or the bucket;
|
|
46
|
+
* - `fence-lineage-conflict`: the bucket's object-storage fence lineage cannot move to the adopting
|
|
47
|
+
* binding, because the bucket has more than one lineage, or its lineage does not validate,
|
|
48
|
+
* belongs to another authority or has an unfinished mutation. Only a bucket has a fence lineage,
|
|
49
|
+
* so a database never names it.
|
|
46
50
|
*/
|
|
47
51
|
export type TCorestoreLegacyResourceBlocker =
|
|
48
52
|
| 'not-adoptable'
|
|
49
53
|
| 'ordinary-credentials-rotated'
|
|
50
|
-
| 'owned-by-binding'
|
|
54
|
+
| 'owned-by-binding'
|
|
55
|
+
| 'fence-lineage-conflict';
|
|
51
56
|
|
|
52
57
|
/**
|
|
53
58
|
* `unadopted` names what would stop the offline adoption, or `null` when nothing would;
|
|
@@ -155,7 +160,7 @@ const identifierPattern = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
|
|
|
155
160
|
const printableNamePattern = /^[\x21-\x7e]+$/;
|
|
156
161
|
const bareSha256Pattern = /^[a-f0-9]{64}$/;
|
|
157
162
|
const blockers: readonly TCorestoreLegacyResourceBlocker[] = [
|
|
158
|
-
'not-adoptable', 'ordinary-credentials-rotated', 'owned-by-binding',
|
|
163
|
+
'not-adoptable', 'ordinary-credentials-rotated', 'owned-by-binding', 'fence-lineage-conflict',
|
|
159
164
|
];
|
|
160
165
|
|
|
161
166
|
const isIdentifier = (valueArg: unknown): valueArg is string => (
|
|
@@ -172,13 +177,18 @@ const isCapability = (valueArg: unknown): valueArg is TCorestoreLegacyCapability
|
|
|
172
177
|
valueArg === 'database' || valueArg === 'objectstorage'
|
|
173
178
|
);
|
|
174
179
|
|
|
175
|
-
const validateAdoption = (
|
|
180
|
+
const validateAdoption = (
|
|
181
|
+
valueArg: unknown, capabilityArg: TCorestoreLegacyCapability, pathArg: string,
|
|
182
|
+
): string[] => {
|
|
176
183
|
if (!isPlainRecord(valueArg)) return [`${pathArg} must use its exact schema`];
|
|
177
184
|
if (valueArg.state === 'unadopted') {
|
|
178
185
|
if (!hasExactKeys(valueArg, ['state', 'blocker'])) return [`${pathArg} must use its exact schema`];
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
186
|
+
if (valueArg.blocker !== null && !(blockers as readonly unknown[]).includes(valueArg.blocker)) {
|
|
187
|
+
return [`${pathArg} blocker must be null or a named blocker`];
|
|
188
|
+
}
|
|
189
|
+
return valueArg.blocker === 'fence-lineage-conflict' && capabilityArg !== 'objectstorage'
|
|
190
|
+
? [`${pathArg} blocker fence-lineage-conflict must name a bucket`]
|
|
191
|
+
: [];
|
|
182
192
|
}
|
|
183
193
|
if (valueArg.state === 'authorized') {
|
|
184
194
|
if (!hasExactKeys(valueArg, ['state', 'bindingId'])) return [`${pathArg} must use its exact schema`];
|
|
@@ -198,7 +208,7 @@ const validateResource = (valueArg: unknown, pathArg: string): string[] => {
|
|
|
198
208
|
if (!hasExactKeys(valueArg, ['capability', 'databaseName', 'adoption'])) {
|
|
199
209
|
return [`${pathArg} must use its exact schema`];
|
|
200
210
|
}
|
|
201
|
-
const errors = validateAdoption(valueArg.adoption, `${pathArg} adoption`);
|
|
211
|
+
const errors = validateAdoption(valueArg.adoption, 'database', `${pathArg} adoption`);
|
|
202
212
|
if (!isLegacyName(valueArg.databaseName)) errors.push(`${pathArg} databaseName must be a bounded printable name`);
|
|
203
213
|
return errors;
|
|
204
214
|
}
|
|
@@ -206,7 +216,7 @@ const validateResource = (valueArg: unknown, pathArg: string): string[] => {
|
|
|
206
216
|
if (!hasExactKeys(valueArg, ['capability', 'bucketName', 'retention', 'adoption'])) {
|
|
207
217
|
return [`${pathArg} must use its exact schema`];
|
|
208
218
|
}
|
|
209
|
-
const errors = validateAdoption(valueArg.adoption, `${pathArg} adoption`);
|
|
219
|
+
const errors = validateAdoption(valueArg.adoption, 'objectstorage', `${pathArg} adoption`);
|
|
210
220
|
if (!isLegacyName(valueArg.bucketName)) {
|
|
211
221
|
errors.push(`${pathArg} bucketName must be a bounded printable name`);
|
|
212
222
|
} else if (errors.length === 0 && isAdoptable(valueArg.adoption)) {
|