@serve.zone/interfaces 32.21.0 → 32.23.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 +91 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/clusteringress.d.ts +58 -0
- package/dist_ts/data/clusteringress.js +96 -2
- package/dist_ts/data/clusteringressdesignation.d.ts +64 -0
- package/dist_ts/data/clusteringressdesignation.js +84 -0
- package/dist_ts/data/corestorelegacyadoption.d.ts +178 -0
- package/dist_ts/data/corestorelegacyadoption.js +289 -0
- package/dist_ts/data/index.d.ts +6 -0
- package/dist_ts/data/index.js +6 -1
- package/dist_ts/data/networkprojection.d.ts +18 -0
- package/dist_ts/data/networkprojection.js +31 -2
- package/dist_ts/data/networkprotection.d.ts +13 -0
- package/dist_ts/data/networkprotection.js +8 -2
- package/dist_ts/data/networkworkloadingress.d.ts +61 -0
- package/dist_ts/data/networkworkloadingress.js +54 -0
- package/dist_ts/data/runtimelocalstorageclaim.d.ts +124 -0
- package/dist_ts/data/runtimelocalstorageclaim.js +167 -0
- package/dist_ts/data/service.d.ts +15 -1
- package/dist_ts/data/service.js +1 -1
- package/dist_ts/data/serviceruntime.d.ts +15 -3
- package/dist_ts/data/serviceruntime.js +7 -2
- package/dist_ts/data/servicevolumeinitialization.d.ts +91 -0
- package/dist_ts/data/servicevolumeinitialization.js +93 -0
- package/dist_ts/platform/types.d.ts +45 -0
- package/dist_ts/platform/types.js +27 -2
- package/dist_ts/private/storagecontract.d.ts +1 -0
- package/dist_ts/private/storagecontract.js +2 -1
- package/dist_ts/requests/clusteringress.d.ts +52 -0
- package/dist_ts/requests/clusteringress.js +1 -1
- package/dist_ts/requests/corestore.d.ts +60 -0
- package/dist_ts/requests/corestore.js +1 -1
- package/dist_ts/requests/platform.d.ts +6 -1
- package/dist_ts/requests/runtimesession.d.ts +12 -0
- package/dist_ts/requests/service.d.ts +23 -0
- package/package.json +1 -1
- package/readme.md +262 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/clusteringress.ts +136 -1
- package/ts/data/clusteringressdesignation.ts +141 -0
- package/ts/data/corestorelegacyadoption.ts +471 -0
- package/ts/data/index.ts +7 -0
- package/ts/data/networkprojection.ts +49 -1
- package/ts/data/networkprotection.ts +20 -1
- package/ts/data/networkworkloadingress.ts +107 -0
- package/ts/data/runtimelocalstorageclaim.ts +275 -0
- package/ts/data/service.ts +16 -0
- package/ts/data/serviceruntime.ts +19 -2
- package/ts/data/servicevolumeinitialization.ts +159 -0
- package/ts/platform/types.ts +75 -0
- package/ts/private/storagecontract.ts +1 -0
- package/ts/requests/clusteringress.ts +65 -0
- package/ts/requests/corestore.ts +79 -0
- package/ts/requests/platform.ts +6 -0
- package/ts/requests/runtimesession.ts +16 -0
- package/ts/requests/service.ts +28 -0
|
@@ -0,0 +1,178 @@
|
|
|
1
|
+
import type { IObjectStorageRetentionIntent } from '../platform/objectstorageretention.js';
|
|
2
|
+
import type { TPlatformBindingStatusReason } from '../platform/types.js';
|
|
3
|
+
/**
|
|
4
|
+
* Moving a service's legacy Corestore resources into credential bindings.
|
|
5
|
+
*
|
|
6
|
+
* A Corestore root converted from a release before 32 still holds the databases and buckets
|
|
7
|
+
* `/resources/provision` created, one per service and capability, in its manifest. Corestore
|
|
8
|
+
* refuses a credential binding beside such a resource until an operator authorizes that exact
|
|
9
|
+
* binding to adopt it, offline, with a plan file. The flow across the three owners:
|
|
10
|
+
*
|
|
11
|
+
* 1. Corestore answers `GET /control/legacy-resources` with its `ICorestoreLegacyResourceInventory`;
|
|
12
|
+
* the cluster relay reads it for Cloudly (`getClusterCorestoreLegacyResources`).
|
|
13
|
+
* 2. `adoptCorestoreLegacyResources` checks the admin's selection against that inventory at an
|
|
14
|
+
* exact digest, creates each adopting binding with the legacy bucket and retention intent, and
|
|
15
|
+
* answers the plan (`ICorestoreLegacyResourceAdoptionPlanEntry[]`).
|
|
16
|
+
* 3. The operator stops Corestore and runs its `legacy-resource-adoption` migration with that plan.
|
|
17
|
+
* Until then Corestore refuses the binding, which reports `legacy-adoption-pending`.
|
|
18
|
+
*/
|
|
19
|
+
export type TCorestoreLegacyCapability = 'database' | 'objectstorage';
|
|
20
|
+
/**
|
|
21
|
+
* Why Corestore's offline adoption would refuse an unadopted resource:
|
|
22
|
+
*
|
|
23
|
+
* - `not-adoptable`: its identity is not what a credential binding can adopt (an
|
|
24
|
+
* allocation-managed database, another provider, a resource name that differs from its database
|
|
25
|
+
* or bucket name, or a bucket name that is not a canonical S3 name);
|
|
26
|
+
* - `ordinary-credentials-rotated`: its credentials were rotated, so the delivered ones are no
|
|
27
|
+
* longer the generation a binding adopts;
|
|
28
|
+
* - `owned-by-binding`: a credential binding or a named storage binding already owns the service
|
|
29
|
+
* capability, the resource or the bucket.
|
|
30
|
+
*/
|
|
31
|
+
export type TCorestoreLegacyResourceBlocker = 'not-adoptable' | 'ordinary-credentials-rotated' | 'owned-by-binding';
|
|
32
|
+
/**
|
|
33
|
+
* `unadopted` names what would stop the offline adoption, or `null` when nothing would;
|
|
34
|
+
* `authorized` names the binding the operator authorized, which is the only binding Corestore will
|
|
35
|
+
* let take the resource. A consumed adoption leaves no legacy resource behind, so it never appears.
|
|
36
|
+
*/
|
|
37
|
+
export type TCorestoreLegacyResourceAdoption = {
|
|
38
|
+
state: 'unadopted';
|
|
39
|
+
blocker: TCorestoreLegacyResourceBlocker | null;
|
|
40
|
+
} | {
|
|
41
|
+
state: 'authorized';
|
|
42
|
+
bindingId: string;
|
|
43
|
+
};
|
|
44
|
+
/**
|
|
45
|
+
* One legacy resource, by the identity Corestore's manifest states. A database is named by its
|
|
46
|
+
* database name, a bucket by its bucket name and its retention intent, `null` when it has none.
|
|
47
|
+
*/
|
|
48
|
+
export type TCorestoreLegacyResource = {
|
|
49
|
+
capability: 'database';
|
|
50
|
+
databaseName: string;
|
|
51
|
+
adoption: TCorestoreLegacyResourceAdoption;
|
|
52
|
+
} | {
|
|
53
|
+
capability: 'objectstorage';
|
|
54
|
+
bucketName: string;
|
|
55
|
+
retention: IObjectStorageRetentionIntent | null;
|
|
56
|
+
adoption: TCorestoreLegacyResourceAdoption;
|
|
57
|
+
};
|
|
58
|
+
/** One service's legacy resources, at most one per capability, `database` first. */
|
|
59
|
+
export interface ICorestoreLegacyServiceResources {
|
|
60
|
+
serviceId: string;
|
|
61
|
+
resources: TCorestoreLegacyResource[];
|
|
62
|
+
}
|
|
63
|
+
/** What Corestore answers on `GET /control/legacy-resources`: every service, sorted by id. */
|
|
64
|
+
export interface ICorestoreLegacyResourceInventory {
|
|
65
|
+
services: ICorestoreLegacyServiceResources[];
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* One node's legacy resources as the cluster relay read them. An unreachable node names why and
|
|
69
|
+
* lists nothing, because a silent empty list would read as a node with nothing to adopt.
|
|
70
|
+
*/
|
|
71
|
+
export type TClusterCorestoreLegacyResourceInventory = {
|
|
72
|
+
nodeId: string;
|
|
73
|
+
checkedAt: number;
|
|
74
|
+
reachable: true;
|
|
75
|
+
services: ICorestoreLegacyServiceResources[];
|
|
76
|
+
} | {
|
|
77
|
+
nodeId: string;
|
|
78
|
+
checkedAt: number;
|
|
79
|
+
reachable: false;
|
|
80
|
+
errorCode: 'CORESTORE_ENDPOINT_UNKNOWN' | 'CORESTORE_UNREACHABLE';
|
|
81
|
+
};
|
|
82
|
+
/** One resource an administrator selects for adoption. */
|
|
83
|
+
export interface ICorestoreLegacyResourceSelection {
|
|
84
|
+
serviceId: string;
|
|
85
|
+
capability: TCorestoreLegacyCapability;
|
|
86
|
+
}
|
|
87
|
+
/**
|
|
88
|
+
* One entry of Corestore's offline adoption plan, exactly the object its
|
|
89
|
+
* `legacy-resource-adoption` migration reads: the service, the capability and the binding that may
|
|
90
|
+
* adopt its legacy resource. The legacy identity is Corestore's own and is not restated here.
|
|
91
|
+
*/
|
|
92
|
+
export interface ICorestoreLegacyResourceAdoptionPlanEntry {
|
|
93
|
+
serviceId: string;
|
|
94
|
+
capability: TCorestoreLegacyCapability;
|
|
95
|
+
bindingId: string;
|
|
96
|
+
}
|
|
97
|
+
/**
|
|
98
|
+
* Why `adoptCorestoreLegacyResources` wrote nothing:
|
|
99
|
+
*
|
|
100
|
+
* - `legacy-inventory-unreachable`: the relay could not read the node's Corestore (retryable);
|
|
101
|
+
* - `legacy-inventory-changed`: the inventory no longer has `expectedInventorySha256`;
|
|
102
|
+
* - `legacy-resource-absent`: a selected service has no legacy resource of that capability;
|
|
103
|
+
* - `legacy-resource-blocked`: a selected resource is unadopted with a blocker;
|
|
104
|
+
* - `legacy-resource-authorized-elsewhere`: a selected resource is authorized for a binding Cloudly
|
|
105
|
+
* does not hold as that resource's adoption;
|
|
106
|
+
* - `service-absent`: Cloudly has no such service;
|
|
107
|
+
* - `binding-exists`: the service already has a binding of that capability that adopts nothing,
|
|
108
|
+
* or adopts another resource.
|
|
109
|
+
*/
|
|
110
|
+
export type TCorestoreLegacyAdoptionRefusal = 'legacy-inventory-unreachable' | 'legacy-inventory-changed' | 'legacy-resource-absent' | 'legacy-resource-blocked' | 'legacy-resource-authorized-elsewhere' | 'service-absent' | 'binding-exists';
|
|
111
|
+
/** The named refusal of `adoptCorestoreLegacyResources`, sent as `TypedResponseError.errorData`. */
|
|
112
|
+
export interface ICorestoreLegacyAdoptionErrorData {
|
|
113
|
+
code: TCorestoreLegacyAdoptionRefusal;
|
|
114
|
+
/** True for `legacy-inventory-unreachable` only; every other refusal needs a new read first. */
|
|
115
|
+
retryable: boolean;
|
|
116
|
+
}
|
|
117
|
+
export declare const corestoreLegacyAdoptionContract: Readonly<{
|
|
118
|
+
/** Corestore's control path for its legacy inventory, bearer-authenticated like every other. */
|
|
119
|
+
readonly inventoryPath: "/control/legacy-resources";
|
|
120
|
+
/** Corestore's own plan bound, which also bounds a selection and an inventory. */
|
|
121
|
+
readonly maximumPlanEntries: 4096;
|
|
122
|
+
readonly maximumServices: 4096;
|
|
123
|
+
readonly maximumNameLength: 255;
|
|
124
|
+
readonly digestDomain: "serve.zone/corestore-legacy-resources";
|
|
125
|
+
}>;
|
|
126
|
+
/** Validates Corestore's answer on its legacy inventory path and names every reason it is refused. */
|
|
127
|
+
export declare const validateCorestoreLegacyResourceInventory: (valueArg: unknown, pathArg?: string) => string[];
|
|
128
|
+
/** Validates one node's legacy inventory as the relay reports it. Shape only. */
|
|
129
|
+
export declare const validateClusterCorestoreLegacyResourceInventory: (valueArg: unknown, pathArg?: string) => string[];
|
|
130
|
+
/**
|
|
131
|
+
* The digest an adoption is checked against: the node and its services, not the read time, so two
|
|
132
|
+
* reads of an unchanged Corestore agree. Throws for an invalid or unreachable inventory.
|
|
133
|
+
*/
|
|
134
|
+
export declare const computeClusterCorestoreLegacyResourceInventorySha256: (inventoryArg: TClusterCorestoreLegacyResourceInventory) => Promise<string>;
|
|
135
|
+
/** Validates an administrator's selection: 1..4096 exact entries, sorted by service then capability. */
|
|
136
|
+
export declare const validateCorestoreLegacyResourceSelections: (valueArg: unknown, pathArg?: string) => string[];
|
|
137
|
+
/**
|
|
138
|
+
* Validates an adoption plan by the rules Corestore's migration applies: a non-empty array of at
|
|
139
|
+
* most 4096 exact `{ serviceId, capability, bindingId }` entries, canonical identifiers, and no
|
|
140
|
+
* service capability or binding id twice. Order is free.
|
|
141
|
+
*/
|
|
142
|
+
export declare const validateCorestoreLegacyResourceAdoptionPlan: (valueArg: unknown, pathArg?: string) => string[];
|
|
143
|
+
/** The binding fields an adoption judges; a full `IPlatformBinding` satisfies it. */
|
|
144
|
+
export interface ICorestoreLegacyAdoptionBindingView {
|
|
145
|
+
id: string;
|
|
146
|
+
serviceId: string;
|
|
147
|
+
capability: string;
|
|
148
|
+
objectstorageBucketName?: string;
|
|
149
|
+
objectstorageRetention?: {
|
|
150
|
+
intent: IObjectStorageRetentionIntent;
|
|
151
|
+
};
|
|
152
|
+
corestoreLegacyAdoption?: {
|
|
153
|
+
nodeId: string;
|
|
154
|
+
resourceName: string;
|
|
155
|
+
inventorySha256: string;
|
|
156
|
+
};
|
|
157
|
+
}
|
|
158
|
+
/**
|
|
159
|
+
* Content check of one adopting binding against the inventory it was adopted at, and the one rule
|
|
160
|
+
* that lets a binding carry a legacy bucket name: the binding names this node, this inventory
|
|
161
|
+
* digest and the legacy resource's name; the resource is unadopted without a blocker or authorized
|
|
162
|
+
* for exactly this binding; an adopted bucket's `objectstorageBucketName` is the legacy bucket and
|
|
163
|
+
* its retention intent the legacy intent exactly, absent when the legacy bucket has none; a
|
|
164
|
+
* database binding carries neither. Whether the digest is current is the caller's to check.
|
|
165
|
+
*/
|
|
166
|
+
export declare const validatePlatformBindingCorestoreLegacyAdoption: (bindingArg: ICorestoreLegacyAdoptionBindingView, inventoryArg: TClusterCorestoreLegacyResourceInventory, inventorySha256Arg: string, pathArg?: string) => string[];
|
|
167
|
+
/**
|
|
168
|
+
* The plan for every adopting binding, sorted by service then capability, in the exact entry shape
|
|
169
|
+
* Corestore's migration reads. Throws unless every binding adopts a legacy resource and the result
|
|
170
|
+
* is a valid plan.
|
|
171
|
+
*/
|
|
172
|
+
export declare const createCorestoreLegacyResourceAdoptionPlan: (bindingsArg: readonly ICorestoreLegacyAdoptionBindingView[]) => ICorestoreLegacyResourceAdoptionPlanEntry[];
|
|
173
|
+
/**
|
|
174
|
+
* The binding status reason a Corestore control answer names: a 409 whose body is
|
|
175
|
+
* `{ ok: false, error, code }` with `code` one of the legacy adoption reasons. Every other answer,
|
|
176
|
+
* including a 409 with another code, names none and keeps its ordinary failure handling.
|
|
177
|
+
*/
|
|
178
|
+
export declare const readCorestoreLegacyAdoptionRefusal: (statusCodeArg: number, bodyArg: unknown) => TPlatformBindingStatusReason | null;
|
|
@@ -0,0 +1,289 @@
|
|
|
1
|
+
import { objectStorageRetentionIntentsEqual, validateObjectStorageRetentionIntent, } from '../platform/objectstorageretention.js';
|
|
2
|
+
import { validatePlatformObjectStorageBucketName } from '../platform/objectstorage.js';
|
|
3
|
+
import { platformBindingStatusReasons } from '../platform/types.js';
|
|
4
|
+
import { canonicalizeStrictJson, compareWireTokens, createCanonicalJsonSha256Hex, } from '../private/canonicaljson.js';
|
|
5
|
+
import { hasExactKeys, isPlainRecord } from '../private/dataproperties.js';
|
|
6
|
+
import { isClusterNodeId } from '../private/nodeidentifier.js';
|
|
7
|
+
export const corestoreLegacyAdoptionContract = Object.freeze({
|
|
8
|
+
/** Corestore's control path for its legacy inventory, bearer-authenticated like every other. */
|
|
9
|
+
inventoryPath: '/control/legacy-resources',
|
|
10
|
+
/** Corestore's own plan bound, which also bounds a selection and an inventory. */
|
|
11
|
+
maximumPlanEntries: 4096,
|
|
12
|
+
maximumServices: 4096,
|
|
13
|
+
maximumNameLength: 255,
|
|
14
|
+
digestDomain: 'serve.zone/corestore-legacy-resources',
|
|
15
|
+
});
|
|
16
|
+
const identifierPattern = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
|
|
17
|
+
const printableNamePattern = /^[\x21-\x7e]+$/;
|
|
18
|
+
const bareSha256Pattern = /^[a-f0-9]{64}$/;
|
|
19
|
+
const blockers = [
|
|
20
|
+
'not-adoptable', 'ordinary-credentials-rotated', 'owned-by-binding',
|
|
21
|
+
];
|
|
22
|
+
const isIdentifier = (valueArg) => (typeof valueArg === 'string' && identifierPattern.test(valueArg));
|
|
23
|
+
const isLegacyName = (valueArg) => (typeof valueArg === 'string'
|
|
24
|
+
&& valueArg.length <= corestoreLegacyAdoptionContract.maximumNameLength
|
|
25
|
+
&& printableNamePattern.test(valueArg));
|
|
26
|
+
const isCapability = (valueArg) => (valueArg === 'database' || valueArg === 'objectstorage');
|
|
27
|
+
const validateAdoption = (valueArg, pathArg) => {
|
|
28
|
+
if (!isPlainRecord(valueArg))
|
|
29
|
+
return [`${pathArg} must use its exact schema`];
|
|
30
|
+
if (valueArg.state === 'unadopted') {
|
|
31
|
+
if (!hasExactKeys(valueArg, ['state', 'blocker']))
|
|
32
|
+
return [`${pathArg} must use its exact schema`];
|
|
33
|
+
return valueArg.blocker === null || blockers.includes(valueArg.blocker)
|
|
34
|
+
? []
|
|
35
|
+
: [`${pathArg} blocker must be null or a named blocker`];
|
|
36
|
+
}
|
|
37
|
+
if (valueArg.state === 'authorized') {
|
|
38
|
+
if (!hasExactKeys(valueArg, ['state', 'bindingId']))
|
|
39
|
+
return [`${pathArg} must use its exact schema`];
|
|
40
|
+
return isIdentifier(valueArg.bindingId) ? [] : [`${pathArg} bindingId must be a canonical identifier`];
|
|
41
|
+
}
|
|
42
|
+
return [`${pathArg} state must be unadopted or authorized`];
|
|
43
|
+
};
|
|
44
|
+
/** An adoptable resource is one the offline adoption could authorize or already did. */
|
|
45
|
+
const isAdoptable = (adoptionArg) => (isPlainRecord(adoptionArg) && (adoptionArg.state === 'authorized' || adoptionArg.blocker === null));
|
|
46
|
+
const validateResource = (valueArg, pathArg) => {
|
|
47
|
+
if (!isPlainRecord(valueArg))
|
|
48
|
+
return [`${pathArg} must use its exact schema`];
|
|
49
|
+
if (valueArg.capability === 'database') {
|
|
50
|
+
if (!hasExactKeys(valueArg, ['capability', 'databaseName', 'adoption'])) {
|
|
51
|
+
return [`${pathArg} must use its exact schema`];
|
|
52
|
+
}
|
|
53
|
+
const errors = validateAdoption(valueArg.adoption, `${pathArg} adoption`);
|
|
54
|
+
if (!isLegacyName(valueArg.databaseName))
|
|
55
|
+
errors.push(`${pathArg} databaseName must be a bounded printable name`);
|
|
56
|
+
return errors;
|
|
57
|
+
}
|
|
58
|
+
if (valueArg.capability === 'objectstorage') {
|
|
59
|
+
if (!hasExactKeys(valueArg, ['capability', 'bucketName', 'retention', 'adoption'])) {
|
|
60
|
+
return [`${pathArg} must use its exact schema`];
|
|
61
|
+
}
|
|
62
|
+
const errors = validateAdoption(valueArg.adoption, `${pathArg} adoption`);
|
|
63
|
+
if (!isLegacyName(valueArg.bucketName)) {
|
|
64
|
+
errors.push(`${pathArg} bucketName must be a bounded printable name`);
|
|
65
|
+
}
|
|
66
|
+
else if (errors.length === 0 && isAdoptable(valueArg.adoption)) {
|
|
67
|
+
// A binding request carries only a canonical bucket, so an adoptable bucket has to be one.
|
|
68
|
+
errors.push(...validatePlatformObjectStorageBucketName(valueArg.bucketName, `${pathArg} bucketName`));
|
|
69
|
+
}
|
|
70
|
+
if (valueArg.retention !== null) {
|
|
71
|
+
errors.push(...validateObjectStorageRetentionIntent(valueArg.retention, `${pathArg} retention`));
|
|
72
|
+
}
|
|
73
|
+
return errors;
|
|
74
|
+
}
|
|
75
|
+
return [`${pathArg} capability must be database or objectstorage`];
|
|
76
|
+
};
|
|
77
|
+
const validateServices = (valueArg, pathArg) => {
|
|
78
|
+
if (!Array.isArray(valueArg) || valueArg.length > corestoreLegacyAdoptionContract.maximumServices) {
|
|
79
|
+
return [`${pathArg} must be a bounded array`];
|
|
80
|
+
}
|
|
81
|
+
const errors = [];
|
|
82
|
+
let previousServiceId;
|
|
83
|
+
for (const [index, service] of valueArg.entries()) {
|
|
84
|
+
const servicePath = `${pathArg}[${index}]`;
|
|
85
|
+
if (!isPlainRecord(service) || !hasExactKeys(service, ['serviceId', 'resources'])) {
|
|
86
|
+
errors.push(`${servicePath} must use its exact schema`);
|
|
87
|
+
continue;
|
|
88
|
+
}
|
|
89
|
+
if (!isIdentifier(service.serviceId)) {
|
|
90
|
+
errors.push(`${servicePath} serviceId must be a canonical identifier`);
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
if (previousServiceId !== undefined && compareWireTokens(previousServiceId, service.serviceId) >= 0) {
|
|
94
|
+
errors.push(`${pathArg} must be sorted by serviceId without repeats`);
|
|
95
|
+
}
|
|
96
|
+
previousServiceId = service.serviceId;
|
|
97
|
+
}
|
|
98
|
+
if (!Array.isArray(service.resources) || service.resources.length < 1 || service.resources.length > 2) {
|
|
99
|
+
errors.push(`${servicePath} resources must list one or two resources`);
|
|
100
|
+
continue;
|
|
101
|
+
}
|
|
102
|
+
for (const [resourceIndex, resource] of service.resources.entries()) {
|
|
103
|
+
errors.push(...validateResource(resource, `${servicePath} resources[${resourceIndex}]`));
|
|
104
|
+
}
|
|
105
|
+
if (service.resources.length === 2
|
|
106
|
+
&& !(isPlainRecord(service.resources[0]) && service.resources[0].capability === 'database'
|
|
107
|
+
&& isPlainRecord(service.resources[1]) && service.resources[1].capability === 'objectstorage')) {
|
|
108
|
+
errors.push(`${servicePath} resources must hold one database before one objectstorage resource`);
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
return errors;
|
|
112
|
+
};
|
|
113
|
+
/** Validates Corestore's answer on its legacy inventory path and names every reason it is refused. */
|
|
114
|
+
export const validateCorestoreLegacyResourceInventory = (valueArg, pathArg = 'corestore legacy resource inventory') => {
|
|
115
|
+
if (!isPlainRecord(valueArg) || !hasExactKeys(valueArg, ['services'])) {
|
|
116
|
+
return [`${pathArg} must use its exact schema`];
|
|
117
|
+
}
|
|
118
|
+
return validateServices(valueArg.services, `${pathArg} services`);
|
|
119
|
+
};
|
|
120
|
+
/** Validates one node's legacy inventory as the relay reports it. Shape only. */
|
|
121
|
+
export const validateClusterCorestoreLegacyResourceInventory = (valueArg, pathArg = 'cluster corestore legacy resource inventory') => {
|
|
122
|
+
if (!isPlainRecord(valueArg))
|
|
123
|
+
return [`${pathArg} must use its exact schema`];
|
|
124
|
+
const reachable = valueArg.reachable;
|
|
125
|
+
if (reachable === true
|
|
126
|
+
? !hasExactKeys(valueArg, ['nodeId', 'checkedAt', 'reachable', 'services'])
|
|
127
|
+
: reachable !== false || !hasExactKeys(valueArg, ['nodeId', 'checkedAt', 'reachable', 'errorCode'])) {
|
|
128
|
+
return [`${pathArg} must use its exact schema`];
|
|
129
|
+
}
|
|
130
|
+
const errors = [];
|
|
131
|
+
if (!isClusterNodeId(valueArg.nodeId))
|
|
132
|
+
errors.push(`${pathArg} nodeId must be a node id`);
|
|
133
|
+
if (!Number.isSafeInteger(valueArg.checkedAt) || valueArg.checkedAt < 0) {
|
|
134
|
+
errors.push(`${pathArg} checkedAt must be a non-negative safe integer`);
|
|
135
|
+
}
|
|
136
|
+
if (reachable === true) {
|
|
137
|
+
errors.push(...validateServices(valueArg.services, `${pathArg} services`));
|
|
138
|
+
}
|
|
139
|
+
else if (valueArg.errorCode !== 'CORESTORE_ENDPOINT_UNKNOWN' && valueArg.errorCode !== 'CORESTORE_UNREACHABLE') {
|
|
140
|
+
errors.push(`${pathArg} errorCode must name why the node could not be read`);
|
|
141
|
+
}
|
|
142
|
+
return errors;
|
|
143
|
+
};
|
|
144
|
+
const failDigest = (reasonArg) => {
|
|
145
|
+
throw new Error(reasonArg);
|
|
146
|
+
};
|
|
147
|
+
/**
|
|
148
|
+
* The digest an adoption is checked against: the node and its services, not the read time, so two
|
|
149
|
+
* reads of an unchanged Corestore agree. Throws for an invalid or unreachable inventory.
|
|
150
|
+
*/
|
|
151
|
+
export const computeClusterCorestoreLegacyResourceInventorySha256 = async (inventoryArg) => {
|
|
152
|
+
const errors = validateClusterCorestoreLegacyResourceInventory(inventoryArg);
|
|
153
|
+
if (errors.length > 0)
|
|
154
|
+
throw new Error(errors[0]);
|
|
155
|
+
if (inventoryArg.reachable !== true)
|
|
156
|
+
throw new Error('an unreachable legacy inventory has no digest');
|
|
157
|
+
return createCanonicalJsonSha256Hex(canonicalizeStrictJson({
|
|
158
|
+
domain: corestoreLegacyAdoptionContract.digestDomain,
|
|
159
|
+
nodeId: inventoryArg.nodeId,
|
|
160
|
+
services: inventoryArg.services,
|
|
161
|
+
}, failDigest, 'corestore legacy resource inventory'), failDigest);
|
|
162
|
+
};
|
|
163
|
+
const selectionKey = (entryArg) => `${entryArg.serviceId}\u0000${entryArg.capability}`;
|
|
164
|
+
/** Validates an administrator's selection: 1..4096 exact entries, sorted by service then capability. */
|
|
165
|
+
export const validateCorestoreLegacyResourceSelections = (valueArg, pathArg = 'corestore legacy resource selection') => {
|
|
166
|
+
if (!Array.isArray(valueArg) || valueArg.length < 1
|
|
167
|
+
|| valueArg.length > corestoreLegacyAdoptionContract.maximumPlanEntries) {
|
|
168
|
+
return [`${pathArg} must be a non-empty bounded array`];
|
|
169
|
+
}
|
|
170
|
+
const errors = [];
|
|
171
|
+
let previous;
|
|
172
|
+
for (const [index, entry] of valueArg.entries()) {
|
|
173
|
+
if (!isPlainRecord(entry) || !hasExactKeys(entry, ['serviceId', 'capability'])
|
|
174
|
+
|| !isIdentifier(entry.serviceId) || !isCapability(entry.capability)) {
|
|
175
|
+
errors.push(`${pathArg}[${index}] must be an exact { serviceId, capability }`);
|
|
176
|
+
continue;
|
|
177
|
+
}
|
|
178
|
+
const key = selectionKey(entry);
|
|
179
|
+
if (previous !== undefined && compareWireTokens(previous, key) >= 0) {
|
|
180
|
+
errors.push(`${pathArg} must be sorted by serviceId then capability without repeats`);
|
|
181
|
+
}
|
|
182
|
+
previous = key;
|
|
183
|
+
}
|
|
184
|
+
return errors;
|
|
185
|
+
};
|
|
186
|
+
/**
|
|
187
|
+
* Validates an adoption plan by the rules Corestore's migration applies: a non-empty array of at
|
|
188
|
+
* most 4096 exact `{ serviceId, capability, bindingId }` entries, canonical identifiers, and no
|
|
189
|
+
* service capability or binding id twice. Order is free.
|
|
190
|
+
*/
|
|
191
|
+
export const validateCorestoreLegacyResourceAdoptionPlan = (valueArg, pathArg = 'adoption plan') => {
|
|
192
|
+
if (!Array.isArray(valueArg) || valueArg.length === 0
|
|
193
|
+
|| valueArg.length > corestoreLegacyAdoptionContract.maximumPlanEntries) {
|
|
194
|
+
return [`${pathArg} must be a non-empty bounded array`];
|
|
195
|
+
}
|
|
196
|
+
const errors = [];
|
|
197
|
+
const serviceCapabilities = new Set();
|
|
198
|
+
const bindingIds = new Set();
|
|
199
|
+
for (const [index, entry] of valueArg.entries()) {
|
|
200
|
+
if (!isPlainRecord(entry) || !hasExactKeys(entry, ['serviceId', 'capability', 'bindingId'])
|
|
201
|
+
|| !isIdentifier(entry.serviceId) || !isIdentifier(entry.bindingId) || !isCapability(entry.capability)) {
|
|
202
|
+
errors.push(`${pathArg} entry ${index} must be an exact { serviceId, capability, bindingId }`);
|
|
203
|
+
continue;
|
|
204
|
+
}
|
|
205
|
+
const serviceCapability = selectionKey(entry);
|
|
206
|
+
if (serviceCapabilities.has(serviceCapability) || bindingIds.has(entry.bindingId)) {
|
|
207
|
+
errors.push(`${pathArg} entry ${index} repeats a service capability or binding id`);
|
|
208
|
+
}
|
|
209
|
+
serviceCapabilities.add(serviceCapability);
|
|
210
|
+
bindingIds.add(entry.bindingId);
|
|
211
|
+
}
|
|
212
|
+
return errors;
|
|
213
|
+
};
|
|
214
|
+
/**
|
|
215
|
+
* Content check of one adopting binding against the inventory it was adopted at, and the one rule
|
|
216
|
+
* that lets a binding carry a legacy bucket name: the binding names this node, this inventory
|
|
217
|
+
* digest and the legacy resource's name; the resource is unadopted without a blocker or authorized
|
|
218
|
+
* for exactly this binding; an adopted bucket's `objectstorageBucketName` is the legacy bucket and
|
|
219
|
+
* its retention intent the legacy intent exactly, absent when the legacy bucket has none; a
|
|
220
|
+
* database binding carries neither. Whether the digest is current is the caller's to check.
|
|
221
|
+
*/
|
|
222
|
+
export const validatePlatformBindingCorestoreLegacyAdoption = (bindingArg, inventoryArg, inventorySha256Arg, pathArg = 'platform binding corestoreLegacyAdoption') => {
|
|
223
|
+
if (validateClusterCorestoreLegacyResourceInventory(inventoryArg).length > 0 || inventoryArg.reachable !== true
|
|
224
|
+
|| typeof inventorySha256Arg !== 'string' || !bareSha256Pattern.test(inventorySha256Arg)) {
|
|
225
|
+
return [`${pathArg} needs a valid reachable inventory and its digest`];
|
|
226
|
+
}
|
|
227
|
+
const adoption = bindingArg.corestoreLegacyAdoption;
|
|
228
|
+
if (!isPlainRecord(adoption) || !hasExactKeys(adoption, ['nodeId', 'resourceName', 'inventorySha256'])) {
|
|
229
|
+
return [`${pathArg} must use its exact schema`];
|
|
230
|
+
}
|
|
231
|
+
if (adoption.nodeId !== inventoryArg.nodeId || adoption.inventorySha256 !== inventorySha256Arg) {
|
|
232
|
+
return [`${pathArg} must name the inventory's node and digest`];
|
|
233
|
+
}
|
|
234
|
+
if (!isCapability(bindingArg.capability))
|
|
235
|
+
return [`${pathArg} needs a database or objectstorage binding`];
|
|
236
|
+
const resource = inventoryArg.services.find((serviceArg) => serviceArg.serviceId === bindingArg.serviceId)
|
|
237
|
+
?.resources.find((resourceArg) => resourceArg.capability === bindingArg.capability);
|
|
238
|
+
if (!resource)
|
|
239
|
+
return [`${pathArg} names no legacy resource of the service and capability`];
|
|
240
|
+
const errors = [];
|
|
241
|
+
const legacyName = resource.capability === 'database' ? resource.databaseName : resource.bucketName;
|
|
242
|
+
if (adoption.resourceName !== legacyName)
|
|
243
|
+
errors.push(`${pathArg} resourceName must be the legacy resource's name`);
|
|
244
|
+
if (resource.adoption.state === 'unadopted' ? resource.adoption.blocker !== null
|
|
245
|
+
: resource.adoption.bindingId !== bindingArg.id) {
|
|
246
|
+
errors.push(`${pathArg} names a resource that is blocked or authorized for another binding`);
|
|
247
|
+
}
|
|
248
|
+
if (resource.capability === 'objectstorage') {
|
|
249
|
+
if (bindingArg.objectstorageBucketName !== resource.bucketName) {
|
|
250
|
+
errors.push(`${pathArg} objectstorageBucketName must be the legacy bucket`);
|
|
251
|
+
}
|
|
252
|
+
if (resource.retention === null
|
|
253
|
+
? bindingArg.objectstorageRetention !== undefined
|
|
254
|
+
: !objectStorageRetentionIntentsEqual(bindingArg.objectstorageRetention?.intent, resource.retention)) {
|
|
255
|
+
errors.push(`${pathArg} retention intent must be the legacy bucket's exactly`);
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
else if (bindingArg.objectstorageBucketName !== undefined || bindingArg.objectstorageRetention !== undefined) {
|
|
259
|
+
errors.push(`${pathArg} database binding must carry no bucket or retention`);
|
|
260
|
+
}
|
|
261
|
+
return errors;
|
|
262
|
+
};
|
|
263
|
+
/**
|
|
264
|
+
* The plan for every adopting binding, sorted by service then capability, in the exact entry shape
|
|
265
|
+
* Corestore's migration reads. Throws unless every binding adopts a legacy resource and the result
|
|
266
|
+
* is a valid plan.
|
|
267
|
+
*/
|
|
268
|
+
export const createCorestoreLegacyResourceAdoptionPlan = (bindingsArg) => {
|
|
269
|
+
const plan = bindingsArg.map((bindingArg) => {
|
|
270
|
+
if (bindingArg.corestoreLegacyAdoption === undefined || !isCapability(bindingArg.capability)) {
|
|
271
|
+
throw new Error(`binding ${bindingArg.id} adopts no legacy Corestore resource`);
|
|
272
|
+
}
|
|
273
|
+
return { serviceId: bindingArg.serviceId, capability: bindingArg.capability, bindingId: bindingArg.id };
|
|
274
|
+
}).sort((leftArg, rightArg) => compareWireTokens(selectionKey(leftArg), selectionKey(rightArg)));
|
|
275
|
+
const errors = validateCorestoreLegacyResourceAdoptionPlan(plan);
|
|
276
|
+
if (errors.length > 0)
|
|
277
|
+
throw new Error(errors[0]);
|
|
278
|
+
return plan;
|
|
279
|
+
};
|
|
280
|
+
/**
|
|
281
|
+
* The binding status reason a Corestore control answer names: a 409 whose body is
|
|
282
|
+
* `{ ok: false, error, code }` with `code` one of the legacy adoption reasons. Every other answer,
|
|
283
|
+
* including a 409 with another code, names none and keeps its ordinary failure handling.
|
|
284
|
+
*/
|
|
285
|
+
export const readCorestoreLegacyAdoptionRefusal = (statusCodeArg, bodyArg) => (statusCodeArg === 409 && isPlainRecord(bodyArg) && bodyArg.ok === false
|
|
286
|
+
&& platformBindingStatusReasons.includes(bodyArg.code)
|
|
287
|
+
? bodyArg.code
|
|
288
|
+
: null);
|
|
289
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"corestorelegacyadoption.js","sourceRoot":"","sources":["../../ts/data/corestorelegacyadoption.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kCAAkC,EAClC,oCAAoC,GACrC,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,uCAAuC,EAAE,MAAM,8BAA8B,CAAC;AAEvF,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EACjB,4BAA4B,GAC7B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAiI/D,MAAM,CAAC,MAAM,+BAA+B,GAAG,MAAM,CAAC,MAAM,CAAC;IAC3D,gGAAgG;IAChG,aAAa,EAAE,2BAA2B;IAC1C,kFAAkF;IAClF,kBAAkB,EAAE,IAAI;IACxB,eAAe,EAAE,IAAI;IACrB,iBAAiB,EAAE,GAAG;IACtB,YAAY,EAAE,uCAAuC;CAC7C,CAAC,CAAC;AAEZ,MAAM,iBAAiB,GAAG,qCAAqC,CAAC;AAChE,MAAM,oBAAoB,GAAG,gBAAgB,CAAC;AAC9C,MAAM,iBAAiB,GAAG,gBAAgB,CAAC;AAC3C,MAAM,QAAQ,GAA+C;IAC3D,eAAe,EAAE,8BAA8B,EAAE,kBAAkB;CACpE,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,QAAiB,EAAsB,EAAE,CAAC,CAC9D,OAAO,QAAQ,KAAK,QAAQ,IAAI,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CACjE,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,QAAiB,EAAsB,EAAE,CAAC,CAC9D,OAAO,QAAQ,KAAK,QAAQ;OACzB,QAAQ,CAAC,MAAM,IAAI,+BAA+B,CAAC,iBAAiB;OACpE,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,CACvC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,QAAiB,EAA0C,EAAE,CAAC,CAClF,QAAQ,KAAK,UAAU,IAAI,QAAQ,KAAK,eAAe,CACxD,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,QAAiB,EAAE,OAAe,EAAY,EAAE;IACxE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;QAAE,OAAO,CAAC,GAAG,OAAO,4BAA4B,CAAC,CAAC;IAC9E,IAAI,QAAQ,CAAC,KAAK,KAAK,WAAW,EAAE,CAAC;QACnC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAAE,OAAO,CAAC,GAAG,OAAO,4BAA4B,CAAC,CAAC;QACnG,OAAO,QAAQ,CAAC,OAAO,KAAK,IAAI,IAAK,QAA+B,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC7F,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,CAAC,GAAG,OAAO,0CAA0C,CAAC,CAAC;IAC7D,CAAC;IACD,IAAI,QAAQ,CAAC,KAAK,KAAK,YAAY,EAAE,CAAC;QACpC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;YAAE,OAAO,CAAC,GAAG,OAAO,4BAA4B,CAAC,CAAC;QACrG,OAAO,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,2CAA2C,CAAC,CAAC;IACzG,CAAC;IACD,OAAO,CAAC,GAAG,OAAO,wCAAwC,CAAC,CAAC;AAC9D,CAAC,CAAC;AAEF,wFAAwF;AACxF,MAAM,WAAW,GAAG,CAAC,WAAoB,EAAW,EAAE,CAAC,CACrD,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,KAAK,YAAY,IAAI,WAAW,CAAC,OAAO,KAAK,IAAI,CAAC,CACnG,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,QAAiB,EAAE,OAAe,EAAY,EAAE;IACxE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;QAAE,OAAO,CAAC,GAAG,OAAO,4BAA4B,CAAC,CAAC;IAC9E,IAAI,QAAQ,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;QACvC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,YAAY,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC;YACxE,OAAO,CAAC,GAAG,OAAO,4BAA4B,CAAC,CAAC;QAClD,CAAC;QACD,MAAM,MAAM,GAAG,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,OAAO,WAAW,CAAC,CAAC;QAC1E,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC;YAAE,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,gDAAgD,CAAC,CAAC;QAClH,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IAAI,QAAQ,CAAC,UAAU,KAAK,eAAe,EAAE,CAAC;QAC5C,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC;YACnF,OAAO,CAAC,GAAG,OAAO,4BAA4B,CAAC,CAAC;QAClD,CAAC;QACD,MAAM,MAAM,GAAG,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,OAAO,WAAW,CAAC,CAAC;QAC1E,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACvC,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,8CAA8C,CAAC,CAAC;QACxE,CAAC;aAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjE,2FAA2F;YAC3F,MAAM,CAAC,IAAI,CAAC,GAAG,uCAAuC,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,OAAO,aAAa,CAAC,CAAC,CAAC;QACxG,CAAC;QACD,IAAI,QAAQ,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;YAChC,MAAM,CAAC,IAAI,CAAC,GAAG,oCAAoC,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,OAAO,YAAY,CAAC,CAAC,CAAC;QACnG,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,OAAO,CAAC,GAAG,OAAO,+CAA+C,CAAC,CAAC;AACrE,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,QAAiB,EAAE,OAAe,EAAY,EAAE;IACxE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,+BAA+B,CAAC,eAAe,EAAE,CAAC;QAClG,OAAO,CAAC,GAAG,OAAO,0BAA0B,CAAC,CAAC;IAChD,CAAC;IACD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,iBAAqC,CAAC;IAC1C,KAAK,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;QAClD,MAAM,WAAW,GAAG,GAAG,OAAO,IAAI,KAAK,GAAG,CAAC;QAC3C,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC;YAClF,MAAM,CAAC,IAAI,CAAC,GAAG,WAAW,4BAA4B,CAAC,CAAC;YACxD,SAAS;QACX,CAAC;QACD,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YACrC,MAAM,CAAC,IAAI,CAAC,GAAG,WAAW,2CAA2C,CAAC,CAAC;QACzE,CAAC;aAAM,CAAC;YACN,IAAI,iBAAiB,KAAK,SAAS,IAAI,iBAAiB,CAAC,iBAAiB,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;gBACpG,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,8CAA8C,CAAC,CAAC;YACxE,CAAC;YACD,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC;QACxC,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtG,MAAM,CAAC,IAAI,CAAC,GAAG,WAAW,2CAA2C,CAAC,CAAC;YACvE,SAAS;QACX,CAAC;QACD,KAAK,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;YACpE,MAAM,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,QAAQ,EAAE,GAAG,WAAW,cAAc,aAAa,GAAG,CAAC,CAAC,CAAC;QAC3F,CAAC;QACD,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;eAC7B,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU;mBACrF,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,UAAU,KAAK,eAAe,CAAC,EAAE,CAAC;YACnG,MAAM,CAAC,IAAI,CAAC,GAAG,WAAW,qEAAqE,CAAC,CAAC;QACnG,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,sGAAsG;AACtG,MAAM,CAAC,MAAM,wCAAwC,GAAG,CACtD,QAAiB,EACjB,OAAO,GAAG,qCAAqC,EACrC,EAAE;IACZ,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;QACtE,OAAO,CAAC,GAAG,OAAO,4BAA4B,CAAC,CAAC;IAClD,CAAC;IACD,OAAO,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,OAAO,WAAW,CAAC,CAAC;AACpE,CAAC,CAAC;AAEF,iFAAiF;AACjF,MAAM,CAAC,MAAM,+CAA+C,GAAG,CAC7D,QAAiB,EACjB,OAAO,GAAG,6CAA6C,EAC7C,EAAE;IACZ,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;QAAE,OAAO,CAAC,GAAG,OAAO,4BAA4B,CAAC,CAAC;IAC9E,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;IACrC,IAAI,SAAS,KAAK,IAAI;QACpB,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;QAC3E,CAAC,CAAC,SAAS,KAAK,KAAK,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC;QACtG,OAAO,CAAC,GAAG,OAAO,4BAA4B,CAAC,CAAC;IAClD,CAAC;IACD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,2BAA2B,CAAC,CAAC;IAC1F,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAK,QAAQ,CAAC,SAAoB,GAAG,CAAC,EAAE,CAAC;QACpF,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,gDAAgD,CAAC,CAAC;IAC1E,CAAC;IACD,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;QACvB,MAAM,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,OAAO,WAAW,CAAC,CAAC,CAAC;IAC7E,CAAC;SAAM,IAAI,QAAQ,CAAC,SAAS,KAAK,4BAA4B,IAAI,QAAQ,CAAC,SAAS,KAAK,uBAAuB,EAAE,CAAC;QACjH,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,qDAAqD,CAAC,CAAC;IAC/E,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,SAAiB,EAAS,EAAE;IAC9C,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;AAC7B,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,oDAAoD,GAAG,KAAK,EACvE,YAAsD,EACrC,EAAE;IACnB,MAAM,MAAM,GAAG,+CAA+C,CAAC,YAAY,CAAC,CAAC;IAC7E,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAClD,IAAI,YAAY,CAAC,SAAS,KAAK,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACtG,OAAO,4BAA4B,CAAC,sBAAsB,CAAC;QACzD,MAAM,EAAE,+BAA+B,CAAC,YAAY;QACpD,MAAM,EAAE,YAAY,CAAC,MAAM;QAC3B,QAAQ,EAAE,YAAY,CAAC,QAAQ;KAChC,EAAE,UAAU,EAAE,qCAAqC,CAAC,EAAE,UAAU,CAAC,CAAC;AACrE,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,QAAmD,EAAU,EAAE,CACnF,GAAG,QAAQ,CAAC,SAAS,SAAS,QAAQ,CAAC,UAAU,EAAE,CAAC;AAEtD,wGAAwG;AACxG,MAAM,CAAC,MAAM,yCAAyC,GAAG,CACvD,QAAiB,EACjB,OAAO,GAAG,qCAAqC,EACrC,EAAE;IACZ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;WAC9C,QAAQ,CAAC,MAAM,GAAG,+BAA+B,CAAC,kBAAkB,EAAE,CAAC;QAC1E,OAAO,CAAC,GAAG,OAAO,oCAAoC,CAAC,CAAC;IAC1D,CAAC;IACD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,QAA4B,CAAC;IACjC,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;QAChD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;eACzE,CAAC,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;YACvE,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,IAAI,KAAK,8CAA8C,CAAC,CAAC;YAC/E,SAAS;QACX,CAAC;QACD,MAAM,GAAG,GAAG,YAAY,CAAC,KAAqD,CAAC,CAAC;QAChF,IAAI,QAAQ,KAAK,SAAS,IAAI,iBAAiB,CAAC,QAAQ,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACpE,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,8DAA8D,CAAC,CAAC;QACxF,CAAC;QACD,QAAQ,GAAG,GAAG,CAAC;IACjB,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,2CAA2C,GAAG,CACzD,QAAiB,EACjB,OAAO,GAAG,eAAe,EACf,EAAE;IACZ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;WAChD,QAAQ,CAAC,MAAM,GAAG,+BAA+B,CAAC,kBAAkB,EAAE,CAAC;QAC1E,OAAO,CAAC,GAAG,OAAO,oCAAoC,CAAC,CAAC;IAC1D,CAAC;IACD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC9C,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IACrC,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;QAChD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;eACtF,CAAC,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;YACzG,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,UAAU,KAAK,wDAAwD,CAAC,CAAC;YAC/F,SAAS;QACX,CAAC;QACD,MAAM,iBAAiB,GAAG,YAAY,CAAC,KAAqD,CAAC,CAAC;QAC9F,IAAI,mBAAmB,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,SAAmB,CAAC,EAAE,CAAC;YAC5F,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,UAAU,KAAK,6CAA6C,CAAC,CAAC;QACtF,CAAC;QACD,mBAAmB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC3C,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,SAAmB,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAYF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,8CAA8C,GAAG,CAC5D,UAA+C,EAC/C,YAAsD,EACtD,kBAA0B,EAC1B,OAAO,GAAG,0CAA0C,EAC1C,EAAE;IACZ,IAAI,+CAA+C,CAAC,YAAY,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,YAAY,CAAC,SAAS,KAAK,IAAI;WAC1G,OAAO,kBAAkB,KAAK,QAAQ,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC3F,OAAO,CAAC,GAAG,OAAO,mDAAmD,CAAC,CAAC;IACzE,CAAC;IACD,MAAM,QAAQ,GAAG,UAAU,CAAC,uBAAuB,CAAC;IACpD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,cAAc,EAAE,iBAAiB,CAAC,CAAC,EAAE,CAAC;QACvG,OAAO,CAAC,GAAG,OAAO,4BAA4B,CAAC,CAAC;IAClD,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,KAAK,YAAY,CAAC,MAAM,IAAI,QAAQ,CAAC,eAAe,KAAK,kBAAkB,EAAE,CAAC;QAC/F,OAAO,CAAC,GAAG,OAAO,4CAA4C,CAAC,CAAC;IAClE,CAAC;IACD,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,UAAU,CAAC;QAAE,OAAO,CAAC,GAAG,OAAO,4CAA4C,CAAC,CAAC;IAC1G,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,KAAK,UAAU,CAAC,SAAS,CAAC;QACxG,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,UAAU,KAAK,UAAU,CAAC,UAAU,CAAC,CAAC;IACtF,IAAI,CAAC,QAAQ;QAAE,OAAO,CAAC,GAAG,OAAO,yDAAyD,CAAC,CAAC;IAC5F,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;IACpG,IAAI,QAAQ,CAAC,YAAY,KAAK,UAAU;QAAE,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,kDAAkD,CAAC,CAAC;IACpH,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,KAAK,IAAI;QAC9E,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,KAAK,UAAU,CAAC,EAAE,EAAE,CAAC;QAClD,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,qEAAqE,CAAC,CAAC;IAC/F,CAAC;IACD,IAAI,QAAQ,CAAC,UAAU,KAAK,eAAe,EAAE,CAAC;QAC5C,IAAI,UAAU,CAAC,uBAAuB,KAAK,QAAQ,CAAC,UAAU,EAAE,CAAC;YAC/D,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,oDAAoD,CAAC,CAAC;QAC9E,CAAC;QACD,IAAI,QAAQ,CAAC,SAAS,KAAK,IAAI;YAC7B,CAAC,CAAC,UAAU,CAAC,sBAAsB,KAAK,SAAS;YACjD,CAAC,CAAC,CAAC,kCAAkC,CAAC,UAAU,CAAC,sBAAsB,EAAE,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YACvG,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,uDAAuD,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;SAAM,IAAI,UAAU,CAAC,uBAAuB,KAAK,SAAS,IAAI,UAAU,CAAC,sBAAsB,KAAK,SAAS,EAAE,CAAC;QAC/G,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,qDAAqD,CAAC,CAAC;IAC/E,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,yCAAyC,GAAG,CACvD,WAA2D,EACd,EAAE;IAC/C,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QAC1C,IAAI,UAAU,CAAC,uBAAuB,KAAK,SAAS,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7F,MAAM,IAAI,KAAK,CAAC,WAAW,UAAU,CAAC,EAAE,sCAAsC,CAAC,CAAC;QAClF,CAAC;QACD,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,UAAU,EAAE,UAAU,CAAC,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC;IAC1G,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,iBAAiB,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACjG,MAAM,MAAM,GAAG,2CAA2C,CAAC,IAAI,CAAC,CAAC;IACjE,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAClD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAChD,aAAqB,EACrB,OAAgB,EACqB,EAAE,CAAC,CACxC,aAAa,KAAK,GAAG,IAAI,aAAa,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,EAAE,KAAK,KAAK;OACjE,4BAAmD,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;IAC9E,CAAC,CAAC,OAAO,CAAC,IAAoC;IAC9C,CAAC,CAAC,IAAI,CACT,CAAC"}
|
package/dist_ts/data/index.d.ts
CHANGED
|
@@ -3,9 +3,11 @@ export * from './cluster.js';
|
|
|
3
3
|
export * from './clusterruntime.js';
|
|
4
4
|
export * from './clustervpn.js';
|
|
5
5
|
export * from './clusteringress.js';
|
|
6
|
+
export * from './clusteringressdesignation.js';
|
|
6
7
|
export * from './clusterrelaycredential.js';
|
|
7
8
|
export * from './config.js';
|
|
8
9
|
export * from './corestore.js';
|
|
10
|
+
export * from './corestorelegacyadoption.js';
|
|
9
11
|
export * from './coremail.js';
|
|
10
12
|
export * from './coremail.runtime.js';
|
|
11
13
|
export * from './deployment.js';
|
|
@@ -40,6 +42,8 @@ export * from './networkprojection.js';
|
|
|
40
42
|
export type { IRuntimeNetworkRouterPacketGrant, IRuntimeNetworkRouterProjection } from './networkrouter.js';
|
|
41
43
|
export type { IRuntimeNetworkHostIngress, IRuntimeNetworkHostPacketGrant, IRuntimeNetworkHostProjection } from './networkhost.js';
|
|
42
44
|
export { runtimeNetworkHostContract } from './networkhost.js';
|
|
45
|
+
export type { IRuntimeNetworkWorkloadIngress, IRuntimeNetworkWorkloadIngressPacketGrant, IRuntimeNetworkWorkloadIngressProjection } from './networkworkloadingress.js';
|
|
46
|
+
export { runtimeNetworkWorkloadIngressContract } from './networkworkloadingress.js';
|
|
43
47
|
export * from './networkprotection.js';
|
|
44
48
|
export * from './networksigning.js';
|
|
45
49
|
export * from './privatenetwork.js';
|
|
@@ -48,6 +52,7 @@ export * from './releaseversion.js';
|
|
|
48
52
|
export * from './runtimeassignment.js';
|
|
49
53
|
export * from './runtimeconfig.js';
|
|
50
54
|
export * from './runtimestorageclaim.js';
|
|
55
|
+
export * from './runtimelocalstorageclaim.js';
|
|
51
56
|
export * from './runtimesession.js';
|
|
52
57
|
export * from './runtimeterminalreceipt.js';
|
|
53
58
|
export * from './secret.js';
|
|
@@ -62,6 +67,7 @@ export * from './service.js';
|
|
|
62
67
|
export * from './servicecredential.js';
|
|
63
68
|
export * from './serviceports.js';
|
|
64
69
|
export * from './serviceruntime.js';
|
|
70
|
+
export * from './servicevolumeinitialization.js';
|
|
65
71
|
export * from './status.js';
|
|
66
72
|
export * from './taskexecution.js';
|
|
67
73
|
export * from './traffic.js';
|
package/dist_ts/data/index.js
CHANGED
|
@@ -3,9 +3,11 @@ export * from './cluster.js';
|
|
|
3
3
|
export * from './clusterruntime.js';
|
|
4
4
|
export * from './clustervpn.js';
|
|
5
5
|
export * from './clusteringress.js';
|
|
6
|
+
export * from './clusteringressdesignation.js';
|
|
6
7
|
export * from './clusterrelaycredential.js';
|
|
7
8
|
export * from './config.js';
|
|
8
9
|
export * from './corestore.js';
|
|
10
|
+
export * from './corestorelegacyadoption.js';
|
|
9
11
|
export * from './coremail.js';
|
|
10
12
|
export * from './coremail.runtime.js';
|
|
11
13
|
export * from './deployment.js';
|
|
@@ -38,6 +40,7 @@ export * from './networklease.js';
|
|
|
38
40
|
export * from './networknode.js';
|
|
39
41
|
export * from './networkprojection.js';
|
|
40
42
|
export { runtimeNetworkHostContract } from './networkhost.js';
|
|
43
|
+
export { runtimeNetworkWorkloadIngressContract } from './networkworkloadingress.js';
|
|
41
44
|
export * from './networkprotection.js';
|
|
42
45
|
export * from './networksigning.js';
|
|
43
46
|
export * from './privatenetwork.js';
|
|
@@ -46,6 +49,7 @@ export * from './releaseversion.js';
|
|
|
46
49
|
export * from './runtimeassignment.js';
|
|
47
50
|
export * from './runtimeconfig.js';
|
|
48
51
|
export * from './runtimestorageclaim.js';
|
|
52
|
+
export * from './runtimelocalstorageclaim.js';
|
|
49
53
|
export * from './runtimesession.js';
|
|
50
54
|
export * from './runtimeterminalreceipt.js';
|
|
51
55
|
export * from './secret.js';
|
|
@@ -60,10 +64,11 @@ export * from './service.js';
|
|
|
60
64
|
export * from './servicecredential.js';
|
|
61
65
|
export * from './serviceports.js';
|
|
62
66
|
export * from './serviceruntime.js';
|
|
67
|
+
export * from './servicevolumeinitialization.js';
|
|
63
68
|
export * from './status.js';
|
|
64
69
|
export * from './taskexecution.js';
|
|
65
70
|
export * from './traffic.js';
|
|
66
71
|
export * from './user.js';
|
|
67
72
|
export * from './version.js';
|
|
68
73
|
export * from './webpush.js';
|
|
69
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9kYXRhL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxnQ0FBZ0MsQ0FBQztBQUMvQyxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyw4QkFBOEIsQ0FBQztBQUM3QyxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLHVCQUF1QixDQUFDO0FBQ3RDLGNBQWMsaUJBQWlCLENBQUM7QUFDaEMsY0FBYyx5QkFBeUIsQ0FBQztBQUN4QyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsMEJBQTBCLENBQUM7QUFDekMsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLFVBQVUsQ0FBQztBQUN6QixjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLFlBQVksQ0FBQztBQUMzQixjQUFjLHVCQUF1QixDQUFDO0FBQ3RDLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLFlBQVksQ0FBQztBQUMzQixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLFdBQVcsQ0FBQztBQUMxQixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyx5QkFBeUIsQ0FBQztBQUN4QyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsd0JBQXdCLENBQUM7QUFHdkMsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFHOUQsT0FBTyxFQUFFLHFDQUFxQyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDcEYsY0FBYyx3QkFBd0IsQ0FBQztBQUN2QyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLCtCQUErQixDQUFDO0FBQzlDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMsd0JBQXdCLENBQUM7QUFDdkMsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsa0NBQWtDLENBQUM7QUFDakQsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLFdBQVcsQ0FBQztBQUMxQixjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLGNBQWMsQ0FBQyJ9
|
|
@@ -4,6 +4,7 @@ import type { IRuntimeNetworkHandoffLease, IRuntimeNetworkProtectedAuthority } f
|
|
|
4
4
|
import type { IPrivateNetwork, IServicePrivateNetworks, IServicePrivateNetworkDnsPolicy } from './privatenetwork.js';
|
|
5
5
|
import { type IRuntimeNetworkRouterPacketGrant, type IRuntimeNetworkRouterProjection } from './networkrouter.js';
|
|
6
6
|
import { type IRuntimeNetworkHostPacketGrant, type IRuntimeNetworkHostProjection } from './networkhost.js';
|
|
7
|
+
import { type IRuntimeNetworkWorkloadIngressPacketGrant, type IRuntimeNetworkWorkloadIngressProjection } from './networkworkloadingress.js';
|
|
7
8
|
export interface IRuntimeNetworkNodeScope {
|
|
8
9
|
controller: IRuntimeController;
|
|
9
10
|
nodeId: string;
|
|
@@ -154,6 +155,21 @@ export interface IRuntimeNetworkProjection extends IRuntimeNetworkNodeScope {
|
|
|
154
155
|
* host-origin flow; any other controller kind carrying it is refused.
|
|
155
156
|
*/
|
|
156
157
|
host?: IRuntimeNetworkHostProjection;
|
|
158
|
+
/**
|
|
159
|
+
* One-way workload ingress selections of a `cloudly` projection: the cluster ingress workload dials
|
|
160
|
+
* exact target workload ports across organizations (`IRuntimeNetworkWorkloadIngressPacketGrant`).
|
|
161
|
+
* Omitted, it keeps the canonical bytes and grants no such flow; any other controller kind
|
|
162
|
+
* carrying it is refused.
|
|
163
|
+
*/
|
|
164
|
+
workloadIngress?: IRuntimeNetworkWorkloadIngressProjection;
|
|
165
|
+
/**
|
|
166
|
+
* Ids of the protected authority's platform endpoints whose address this projection's node's own
|
|
167
|
+
* host carries, such as a relay listener or a Corestore beside the node on one machine. The node
|
|
168
|
+
* delivers workload flows to them locally instead of forwarding them. Sorted, unique and never
|
|
169
|
+
* empty when present; omitted, it keeps the canonical bytes and states that no endpoint is local.
|
|
170
|
+
* It grants nothing: a workload still reaches only the endpoints it selects.
|
|
171
|
+
*/
|
|
172
|
+
hostPlatformEndpointIds?: string[];
|
|
157
173
|
digest: TSha256Digest;
|
|
158
174
|
}
|
|
159
175
|
export interface IRuntimeNetworkDnsView {
|
|
@@ -203,6 +219,8 @@ export declare const getRuntimeNetworkProjectionPacketGrants: (value: unknown) =
|
|
|
203
219
|
export declare const getRuntimeNetworkProjectionRouterPacketGrants: (value: unknown) => Promise<IRuntimeNetworkRouterPacketGrant[]>;
|
|
204
220
|
/** Host-origin authority comes only from explicit signed `onebox` selections of local workload ports. */
|
|
205
221
|
export declare const getRuntimeNetworkProjectionHostPacketGrants: (value: unknown) => Promise<IRuntimeNetworkHostPacketGrant[]>;
|
|
222
|
+
/** One-way workload ingress authority comes only from explicit signed `cloudly` selections of exact target ports. */
|
|
223
|
+
export declare const getRuntimeNetworkProjectionWorkloadIngressPacketGrants: (value: unknown) => Promise<IRuntimeNetworkWorkloadIngressPacketGrant[]>;
|
|
206
224
|
/** Complete offline DNS material, including authorized names never previously queried. */
|
|
207
225
|
/** Select exact local receivers before expansion; all targets still come from
|
|
208
226
|
* the complete validated projection. Selection supplies no attachment authority. */
|