@serve.zone/interfaces 32.33.0 → 32.34.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 +18 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/corestorelegacyadoption.d.ts +47 -16
- package/dist_ts/data/corestorelegacyadoption.js +85 -21
- package/dist_ts/platform/types.d.ts +7 -3
- package/dist_ts/requests/corestore.d.ts +6 -2
- package/package.json +1 -1
- package/readme.md +17 -5
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/corestorelegacyadoption.ts +132 -29
- package/ts/platform/types.ts +7 -3
- package/ts/requests/corestore.ts +6 -2
package/changelog.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-09-28 - 32.34.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- A fresh service can take over a legacy service's Corestore data. An
|
|
8
|
+
`adoptCorestoreLegacyResources` selection entry may name `successorServiceId`: the adopting
|
|
9
|
+
binding is then created on that successor, and `IPlatformBindingCorestoreLegacyAdoption` records
|
|
10
|
+
the legacy owner as `legacyServiceId`. `ICorestoreLegacyResourceAdoptionPlanEntry` carries the
|
|
11
|
+
same `successorServiceId`, so Corestore's offline adoption moves the resource from the legacy
|
|
12
|
+
owner's manifest entry to the successor's binding. `validateCorestoreLegacyResourceSelections`,
|
|
13
|
+
`validateCorestoreLegacyResourceAdoptionPlan`, `validatePlatformBindingCorestoreLegacyAdoption` and
|
|
14
|
+
`createCorestoreLegacyResourceAdoptionPlan` apply the rules: the successor is never the legacy
|
|
15
|
+
owner, owns no legacy resource of the capability, and no service capability adopts twice. New
|
|
16
|
+
refusals: `legacy-resource-adopted-elsewhere`, `successor-organization-mismatch`,
|
|
17
|
+
`successor-not-greenfield` and `successor-owns-legacy-resource`. Until now a legacy resource could
|
|
18
|
+
only be adopted by its own service, so a service replaced by a greenfield deployment stranded its
|
|
19
|
+
database and bucket.
|
|
20
|
+
|
|
3
21
|
## 2026-09-28 - 32.33.0
|
|
4
22
|
|
|
5
23
|
### Features
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/interfaces',
|
|
6
|
-
version: '32.
|
|
6
|
+
version: '32.34.0',
|
|
7
7
|
description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFNBQVM7SUFDbEIsV0FBVyxFQUFFLHVGQUF1RjtDQUNyRyxDQUFBIn0=
|
|
@@ -15,6 +15,12 @@ import type { TPlatformBindingStatusReason } from '../platform/types.js';
|
|
|
15
15
|
* answers the plan (`ICorestoreLegacyResourceAdoptionPlanEntry[]`).
|
|
16
16
|
* 3. The operator stops Corestore and runs its `legacy-resource-adoption` migration with that plan.
|
|
17
17
|
* Until then Corestore refuses the binding, which reports `legacy-adoption-pending`.
|
|
18
|
+
*
|
|
19
|
+
* A resource is adopted by a binding of the service that owns it, or, when the selection names a
|
|
20
|
+
* `successorServiceId`, by a binding of that successor: a fresh service of the same organization
|
|
21
|
+
* that replaces the legacy one and takes over its data. The successor's binding records the legacy
|
|
22
|
+
* owner as `corestoreLegacyAdoption.legacyServiceId`, and the plan entry carries the successor, so
|
|
23
|
+
* Corestore moves the resource from the legacy owner's manifest entry to the successor's binding.
|
|
18
24
|
*/
|
|
19
25
|
export type TCorestoreLegacyCapability = 'database' | 'objectstorage';
|
|
20
26
|
/**
|
|
@@ -83,20 +89,29 @@ export type TClusterCorestoreLegacyResourceInventory = {
|
|
|
83
89
|
reachable: false;
|
|
84
90
|
errorCode: 'CORESTORE_ENDPOINT_UNKNOWN' | 'CORESTORE_UNREACHABLE';
|
|
85
91
|
};
|
|
86
|
-
/**
|
|
92
|
+
/**
|
|
93
|
+
* One resource an administrator selects for adoption: the legacy resource `serviceId` owns of
|
|
94
|
+
* `capability`. Without `successorServiceId` a binding of `serviceId` adopts it; with it, a binding of
|
|
95
|
+
* that other service does, which must be a greenfield service of the same organization.
|
|
96
|
+
*/
|
|
87
97
|
export interface ICorestoreLegacyResourceSelection {
|
|
88
98
|
serviceId: string;
|
|
89
99
|
capability: TCorestoreLegacyCapability;
|
|
100
|
+
/** The service whose binding adopts the resource, when it is not `serviceId`; never `serviceId`. */
|
|
101
|
+
successorServiceId?: string;
|
|
90
102
|
}
|
|
91
103
|
/**
|
|
92
104
|
* One entry of Corestore's offline adoption plan, exactly the object its
|
|
93
|
-
* `legacy-resource-adoption` migration reads: the service
|
|
94
|
-
*
|
|
105
|
+
* `legacy-resource-adoption` migration reads: the service that owns the legacy resource, the
|
|
106
|
+
* capability, the binding that may adopt it and, when that binding belongs to another service, that
|
|
107
|
+
* successor service. The legacy identity is Corestore's own and is not restated here.
|
|
95
108
|
*/
|
|
96
109
|
export interface ICorestoreLegacyResourceAdoptionPlanEntry {
|
|
97
110
|
serviceId: string;
|
|
98
111
|
capability: TCorestoreLegacyCapability;
|
|
99
112
|
bindingId: string;
|
|
113
|
+
/** The service `bindingId` belongs to, when it is not `serviceId`; never `serviceId`. */
|
|
114
|
+
successorServiceId?: string;
|
|
100
115
|
}
|
|
101
116
|
/**
|
|
102
117
|
* Why `adoptCorestoreLegacyResources` wrote nothing:
|
|
@@ -107,11 +122,19 @@ export interface ICorestoreLegacyResourceAdoptionPlanEntry {
|
|
|
107
122
|
* - `legacy-resource-blocked`: a selected resource is unadopted with a blocker;
|
|
108
123
|
* - `legacy-resource-authorized-elsewhere`: a selected resource is authorized for a binding Cloudly
|
|
109
124
|
* does not hold as that resource's adoption;
|
|
110
|
-
* - `
|
|
111
|
-
*
|
|
112
|
-
*
|
|
125
|
+
* - `legacy-resource-adopted-elsewhere`: Cloudly already holds a binding of another service as a
|
|
126
|
+
* selected resource's adoption;
|
|
127
|
+
* - `service-absent`: Cloudly has no such service, legacy owner or successor;
|
|
128
|
+
* - `binding-exists`: the adopting service already has a binding of that capability that adopts
|
|
129
|
+
* nothing, or adopts another resource;
|
|
130
|
+
* - `successor-organization-mismatch`: the successor belongs to another organization than the
|
|
131
|
+
* legacy owner, or either names none;
|
|
132
|
+
* - `successor-not-greenfield`: the successor is not an immutable-deployment service (it deploys on
|
|
133
|
+
* push, or does not require an immutable image);
|
|
134
|
+
* - `successor-owns-legacy-resource`: the successor owns a legacy resource of that capability
|
|
135
|
+
* itself, which Corestore would keep beside the adopted one.
|
|
113
136
|
*/
|
|
114
|
-
export type TCorestoreLegacyAdoptionRefusal = 'legacy-inventory-unreachable' | 'legacy-inventory-changed' | 'legacy-resource-absent' | 'legacy-resource-blocked' | 'legacy-resource-authorized-elsewhere' | 'service-absent' | 'binding-exists';
|
|
137
|
+
export type TCorestoreLegacyAdoptionRefusal = 'legacy-inventory-unreachable' | 'legacy-inventory-changed' | 'legacy-resource-absent' | 'legacy-resource-blocked' | 'legacy-resource-authorized-elsewhere' | 'legacy-resource-adopted-elsewhere' | 'service-absent' | 'binding-exists' | 'successor-organization-mismatch' | 'successor-not-greenfield' | 'successor-owns-legacy-resource';
|
|
115
138
|
/** The named refusal of `adoptCorestoreLegacyResources`, sent as `TypedResponseError.errorData`. */
|
|
116
139
|
export interface ICorestoreLegacyAdoptionErrorData {
|
|
117
140
|
code: TCorestoreLegacyAdoptionRefusal;
|
|
@@ -136,11 +159,15 @@ export declare const validateClusterCorestoreLegacyResourceInventory: (valueArg:
|
|
|
136
159
|
* reads of an unchanged Corestore agree. Throws for an invalid or unreachable inventory.
|
|
137
160
|
*/
|
|
138
161
|
export declare const computeClusterCorestoreLegacyResourceInventorySha256: (inventoryArg: TClusterCorestoreLegacyResourceInventory) => Promise<string>;
|
|
139
|
-
/**
|
|
162
|
+
/**
|
|
163
|
+
* Validates an administrator's selection: 1..4096 exact entries, sorted by service then capability,
|
|
164
|
+
* and no service capability adopting twice, whether as legacy owner or as successor.
|
|
165
|
+
*/
|
|
140
166
|
export declare const validateCorestoreLegacyResourceSelections: (valueArg: unknown, pathArg?: string) => string[];
|
|
141
167
|
/**
|
|
142
168
|
* Validates an adoption plan by the rules Corestore's migration applies: a non-empty array of at
|
|
143
|
-
* most 4096 exact `{ serviceId, capability, bindingId }` entries,
|
|
169
|
+
* most 4096 exact `{ serviceId, capability, bindingId }` entries, each with `successorServiceId`
|
|
170
|
+
* when it names another service, canonical identifiers, and no legacy service capability, adopting
|
|
144
171
|
* service capability or binding id twice. Order is free.
|
|
145
172
|
*/
|
|
146
173
|
export declare const validateCorestoreLegacyResourceAdoptionPlan: (valueArg: unknown, pathArg?: string) => string[];
|
|
@@ -157,21 +184,25 @@ export interface ICorestoreLegacyAdoptionBindingView {
|
|
|
157
184
|
nodeId: string;
|
|
158
185
|
resourceName: string;
|
|
159
186
|
inventorySha256: string;
|
|
187
|
+
legacyServiceId?: string;
|
|
160
188
|
};
|
|
161
189
|
}
|
|
162
190
|
/**
|
|
163
191
|
* Content check of one adopting binding against the inventory it was adopted at, and the one rule
|
|
164
192
|
* that lets a binding carry a legacy bucket name: the binding names this node, this inventory
|
|
165
|
-
* digest and the legacy resource's name; the resource
|
|
166
|
-
*
|
|
167
|
-
*
|
|
168
|
-
*
|
|
193
|
+
* digest and the legacy resource's name; the resource belongs to `legacyServiceId` when the binding
|
|
194
|
+
* names one, and then its own service owns no legacy resource of the capability, otherwise to its
|
|
195
|
+
* own service; the resource is unadopted without a blocker or authorized for exactly this binding;
|
|
196
|
+
* an adopted bucket's `objectstorageBucketName` is the legacy bucket and its retention intent the
|
|
197
|
+
* legacy intent exactly, absent when the legacy bucket has none; a database binding carries
|
|
198
|
+
* neither. Whether the digest is current is the caller's to check.
|
|
169
199
|
*/
|
|
170
200
|
export declare const validatePlatformBindingCorestoreLegacyAdoption: (bindingArg: ICorestoreLegacyAdoptionBindingView, inventoryArg: TClusterCorestoreLegacyResourceInventory, inventorySha256Arg: string, pathArg?: string) => string[];
|
|
171
201
|
/**
|
|
172
|
-
* The plan for every adopting binding, sorted by service then capability, in the exact entry
|
|
173
|
-
* Corestore's migration reads
|
|
174
|
-
*
|
|
202
|
+
* The plan for every adopting binding, sorted by legacy service then capability, in the exact entry
|
|
203
|
+
* shape Corestore's migration reads: a binding adopting another service's resource names that
|
|
204
|
+
* service as `serviceId` and its own as `successorServiceId`. Throws unless every binding adopts a
|
|
205
|
+
* legacy resource and the result is a valid plan.
|
|
175
206
|
*/
|
|
176
207
|
export declare const createCorestoreLegacyResourceAdoptionPlan: (bindingsArg: readonly ICorestoreLegacyAdoptionBindingView[]) => ICorestoreLegacyResourceAdoptionPlanEntry[];
|
|
177
208
|
/**
|
|
@@ -164,7 +164,24 @@ export const computeClusterCorestoreLegacyResourceInventorySha256 = async (inven
|
|
|
164
164
|
}, failDigest, 'corestore legacy resource inventory'), failDigest);
|
|
165
165
|
};
|
|
166
166
|
const selectionKey = (entryArg) => `${entryArg.serviceId}\u0000${entryArg.capability}`;
|
|
167
|
-
/**
|
|
167
|
+
/** The service capability whose binding adopts the entry's resource: the successor's, or the owner's. */
|
|
168
|
+
const adoptingKey = (entryArg) => selectionKey({ serviceId: entryArg.successorServiceId ?? entryArg.serviceId, capability: entryArg.capability });
|
|
169
|
+
/**
|
|
170
|
+
* Whether an entry has exactly `baseKeysArg`, and `successorServiceId` at most: `shape` when not,
|
|
171
|
+
* `successor` when its successor is not a canonical identifier other than its `serviceId`.
|
|
172
|
+
*/
|
|
173
|
+
const successorShape = (entryArg, baseKeysArg) => {
|
|
174
|
+
if (!hasExactKeys(entryArg, baseKeysArg, ['successorServiceId']))
|
|
175
|
+
return 'shape';
|
|
176
|
+
return !Object.keys(entryArg).includes('successorServiceId')
|
|
177
|
+
|| (isIdentifier(entryArg.successorServiceId) && entryArg.successorServiceId !== entryArg.serviceId)
|
|
178
|
+
? 'exact'
|
|
179
|
+
: 'successor';
|
|
180
|
+
};
|
|
181
|
+
/**
|
|
182
|
+
* Validates an administrator's selection: 1..4096 exact entries, sorted by service then capability,
|
|
183
|
+
* and no service capability adopting twice, whether as legacy owner or as successor.
|
|
184
|
+
*/
|
|
168
185
|
export const validateCorestoreLegacyResourceSelections = (valueArg, pathArg = 'corestore legacy resource selection') => {
|
|
169
186
|
if (!Array.isArray(valueArg) || valueArg.length < 1
|
|
170
187
|
|| valueArg.length > corestoreLegacyAdoptionContract.maximumPlanEntries) {
|
|
@@ -172,23 +189,35 @@ export const validateCorestoreLegacyResourceSelections = (valueArg, pathArg = 'c
|
|
|
172
189
|
}
|
|
173
190
|
const errors = [];
|
|
174
191
|
let previous;
|
|
192
|
+
const adopting = new Set();
|
|
175
193
|
for (const [index, entry] of valueArg.entries()) {
|
|
176
|
-
|
|
177
|
-
|
|
194
|
+
const shape = isPlainRecord(entry) ? successorShape(entry, ['serviceId', 'capability']) : 'shape';
|
|
195
|
+
if (shape === 'shape' || !isIdentifier(entry.serviceId)
|
|
196
|
+
|| !isCapability(entry.capability)) {
|
|
178
197
|
errors.push(`${pathArg}[${index}] must be an exact { serviceId, capability }`);
|
|
179
198
|
continue;
|
|
180
199
|
}
|
|
181
|
-
|
|
200
|
+
if (shape === 'successor') {
|
|
201
|
+
errors.push(`${pathArg}[${index}] successorServiceId must name another service`);
|
|
202
|
+
continue;
|
|
203
|
+
}
|
|
204
|
+
const selection = entry;
|
|
205
|
+
const key = selectionKey(selection);
|
|
182
206
|
if (previous !== undefined && compareWireTokens(previous, key) >= 0) {
|
|
183
207
|
errors.push(`${pathArg} must be sorted by serviceId then capability without repeats`);
|
|
184
208
|
}
|
|
185
209
|
previous = key;
|
|
210
|
+
if (adopting.has(adoptingKey(selection))) {
|
|
211
|
+
errors.push(`${pathArg}[${index}] adopts into a service capability another entry adopts into`);
|
|
212
|
+
}
|
|
213
|
+
adopting.add(adoptingKey(selection));
|
|
186
214
|
}
|
|
187
215
|
return errors;
|
|
188
216
|
};
|
|
189
217
|
/**
|
|
190
218
|
* Validates an adoption plan by the rules Corestore's migration applies: a non-empty array of at
|
|
191
|
-
* most 4096 exact `{ serviceId, capability, bindingId }` entries,
|
|
219
|
+
* most 4096 exact `{ serviceId, capability, bindingId }` entries, each with `successorServiceId`
|
|
220
|
+
* when it names another service, canonical identifiers, and no legacy service capability, adopting
|
|
192
221
|
* service capability or binding id twice. Order is free.
|
|
193
222
|
*/
|
|
194
223
|
export const validateCorestoreLegacyResourceAdoptionPlan = (valueArg, pathArg = 'adoption plan') => {
|
|
@@ -198,29 +227,44 @@ export const validateCorestoreLegacyResourceAdoptionPlan = (valueArg, pathArg =
|
|
|
198
227
|
}
|
|
199
228
|
const errors = [];
|
|
200
229
|
const serviceCapabilities = new Set();
|
|
230
|
+
const adoptingCapabilities = new Set();
|
|
201
231
|
const bindingIds = new Set();
|
|
202
232
|
for (const [index, entry] of valueArg.entries()) {
|
|
203
|
-
|
|
204
|
-
|
|
233
|
+
const shape = isPlainRecord(entry) ? successorShape(entry, ['serviceId', 'capability', 'bindingId']) : 'shape';
|
|
234
|
+
const record = entry;
|
|
235
|
+
if (shape === 'shape' || !isIdentifier(record.serviceId) || !isIdentifier(record.bindingId)
|
|
236
|
+
|| !isCapability(record.capability)) {
|
|
205
237
|
errors.push(`${pathArg} entry ${index} must be an exact { serviceId, capability, bindingId }`);
|
|
206
238
|
continue;
|
|
207
239
|
}
|
|
208
|
-
|
|
209
|
-
|
|
240
|
+
if (shape === 'successor') {
|
|
241
|
+
errors.push(`${pathArg} entry ${index} successorServiceId must name another service`);
|
|
242
|
+
continue;
|
|
243
|
+
}
|
|
244
|
+
const planEntry = entry;
|
|
245
|
+
const serviceCapability = selectionKey(planEntry);
|
|
246
|
+
const adoptingCapability = adoptingKey(planEntry);
|
|
247
|
+
if (serviceCapabilities.has(serviceCapability) || adoptingCapabilities.has(adoptingCapability)
|
|
248
|
+
|| bindingIds.has(planEntry.bindingId)) {
|
|
210
249
|
errors.push(`${pathArg} entry ${index} repeats a service capability or binding id`);
|
|
211
250
|
}
|
|
212
251
|
serviceCapabilities.add(serviceCapability);
|
|
213
|
-
|
|
252
|
+
adoptingCapabilities.add(adoptingCapability);
|
|
253
|
+
bindingIds.add(planEntry.bindingId);
|
|
214
254
|
}
|
|
215
255
|
return errors;
|
|
216
256
|
};
|
|
257
|
+
/** The service that owns the legacy resource a binding adopts: its `legacyServiceId`, else its own. */
|
|
258
|
+
const legacyOwnerOf = (bindingArg) => bindingArg.corestoreLegacyAdoption?.legacyServiceId ?? bindingArg.serviceId;
|
|
217
259
|
/**
|
|
218
260
|
* Content check of one adopting binding against the inventory it was adopted at, and the one rule
|
|
219
261
|
* that lets a binding carry a legacy bucket name: the binding names this node, this inventory
|
|
220
|
-
* digest and the legacy resource's name; the resource
|
|
221
|
-
*
|
|
222
|
-
*
|
|
223
|
-
*
|
|
262
|
+
* digest and the legacy resource's name; the resource belongs to `legacyServiceId` when the binding
|
|
263
|
+
* names one, and then its own service owns no legacy resource of the capability, otherwise to its
|
|
264
|
+
* own service; the resource is unadopted without a blocker or authorized for exactly this binding;
|
|
265
|
+
* an adopted bucket's `objectstorageBucketName` is the legacy bucket and its retention intent the
|
|
266
|
+
* legacy intent exactly, absent when the legacy bucket has none; a database binding carries
|
|
267
|
+
* neither. Whether the digest is current is the caller's to check.
|
|
224
268
|
*/
|
|
225
269
|
export const validatePlatformBindingCorestoreLegacyAdoption = (bindingArg, inventoryArg, inventorySha256Arg, pathArg = 'platform binding corestoreLegacyAdoption') => {
|
|
226
270
|
if (validateClusterCorestoreLegacyResourceInventory(inventoryArg).length > 0 || inventoryArg.reachable !== true
|
|
@@ -228,18 +272,29 @@ export const validatePlatformBindingCorestoreLegacyAdoption = (bindingArg, inven
|
|
|
228
272
|
return [`${pathArg} needs a valid reachable inventory and its digest`];
|
|
229
273
|
}
|
|
230
274
|
const adoption = bindingArg.corestoreLegacyAdoption;
|
|
231
|
-
if (!isPlainRecord(adoption)
|
|
275
|
+
if (!isPlainRecord(adoption)
|
|
276
|
+
|| !hasExactKeys(adoption, ['nodeId', 'resourceName', 'inventorySha256'], ['legacyServiceId'])) {
|
|
232
277
|
return [`${pathArg} must use its exact schema`];
|
|
233
278
|
}
|
|
279
|
+
if (Object.keys(adoption).includes('legacyServiceId')
|
|
280
|
+
&& (!isIdentifier(adoption.legacyServiceId) || adoption.legacyServiceId === bindingArg.serviceId)) {
|
|
281
|
+
return [`${pathArg} legacyServiceId must name another service than the binding's`];
|
|
282
|
+
}
|
|
234
283
|
if (adoption.nodeId !== inventoryArg.nodeId || adoption.inventorySha256 !== inventorySha256Arg) {
|
|
235
284
|
return [`${pathArg} must name the inventory's node and digest`];
|
|
236
285
|
}
|
|
237
286
|
if (!isCapability(bindingArg.capability))
|
|
238
287
|
return [`${pathArg} needs a database or objectstorage binding`];
|
|
239
|
-
const
|
|
288
|
+
const resourceOf = (serviceIdArg) => inventoryArg.services
|
|
289
|
+
.find((serviceArg) => serviceArg.serviceId === serviceIdArg)
|
|
240
290
|
?.resources.find((resourceArg) => resourceArg.capability === bindingArg.capability);
|
|
291
|
+
const legacyOwner = legacyOwnerOf(bindingArg);
|
|
292
|
+
const resource = resourceOf(legacyOwner);
|
|
241
293
|
if (!resource)
|
|
242
294
|
return [`${pathArg} names no legacy resource of the service and capability`];
|
|
295
|
+
if (legacyOwner !== bindingArg.serviceId && resourceOf(bindingArg.serviceId)) {
|
|
296
|
+
return [`${pathArg} names a successor that owns a legacy resource of the capability itself`];
|
|
297
|
+
}
|
|
243
298
|
const errors = [];
|
|
244
299
|
const legacyName = resource.capability === 'database' ? resource.databaseName : resource.bucketName;
|
|
245
300
|
if (adoption.resourceName !== legacyName)
|
|
@@ -264,16 +319,25 @@ export const validatePlatformBindingCorestoreLegacyAdoption = (bindingArg, inven
|
|
|
264
319
|
return errors;
|
|
265
320
|
};
|
|
266
321
|
/**
|
|
267
|
-
* The plan for every adopting binding, sorted by service then capability, in the exact entry
|
|
268
|
-
* Corestore's migration reads
|
|
269
|
-
*
|
|
322
|
+
* The plan for every adopting binding, sorted by legacy service then capability, in the exact entry
|
|
323
|
+
* shape Corestore's migration reads: a binding adopting another service's resource names that
|
|
324
|
+
* service as `serviceId` and its own as `successorServiceId`. Throws unless every binding adopts a
|
|
325
|
+
* legacy resource and the result is a valid plan.
|
|
270
326
|
*/
|
|
271
327
|
export const createCorestoreLegacyResourceAdoptionPlan = (bindingsArg) => {
|
|
272
328
|
const plan = bindingsArg.map((bindingArg) => {
|
|
273
329
|
if (bindingArg.corestoreLegacyAdoption === undefined || !isCapability(bindingArg.capability)) {
|
|
274
330
|
throw new Error(`binding ${bindingArg.id} adopts no legacy Corestore resource`);
|
|
275
331
|
}
|
|
276
|
-
|
|
332
|
+
const legacyServiceId = bindingArg.corestoreLegacyAdoption.legacyServiceId;
|
|
333
|
+
return legacyServiceId === undefined
|
|
334
|
+
? { serviceId: bindingArg.serviceId, capability: bindingArg.capability, bindingId: bindingArg.id }
|
|
335
|
+
: {
|
|
336
|
+
serviceId: legacyServiceId,
|
|
337
|
+
capability: bindingArg.capability,
|
|
338
|
+
bindingId: bindingArg.id,
|
|
339
|
+
successorServiceId: bindingArg.serviceId,
|
|
340
|
+
};
|
|
277
341
|
}).sort((leftArg, rightArg) => compareWireTokens(selectionKey(leftArg), selectionKey(rightArg)));
|
|
278
342
|
const errors = validateCorestoreLegacyResourceAdoptionPlan(plan);
|
|
279
343
|
if (errors.length > 0)
|
|
@@ -289,4 +353,4 @@ export const readCorestoreLegacyAdoptionRefusal = (statusCodeArg, bodyArg) => (s
|
|
|
289
353
|
&& platformBindingStatusReasons.includes(bodyArg.code)
|
|
290
354
|
? bodyArg.code
|
|
291
355
|
: null);
|
|
292
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"corestorelegacyadoption.js","sourceRoot":"","sources":["../../ts/data/corestorelegacyadoption.ts"],"names":[],"mappings":"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"}
|
|
356
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"corestorelegacyadoption.js","sourceRoot":"","sources":["../../ts/data/corestorelegacyadoption.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,14 +62,18 @@ export interface IPlatformServiceEndpoint {
|
|
|
62
62
|
* the binding, and Cloudly refuses it (and `objectstorageBucketName`) on `upsertPlatformBinding`.
|
|
63
63
|
* `nodeId` is the node whose Corestore holds the resource, so the binding is placed there and
|
|
64
64
|
* nowhere else; `resourceName` is the legacy database or bucket name; `inventorySha256` is the
|
|
65
|
-
* legacy inventory the adoption was checked against
|
|
66
|
-
*
|
|
67
|
-
*
|
|
65
|
+
* legacy inventory the adoption was checked against; `legacyServiceId` is the service that owned the
|
|
66
|
+
* legacy resource when that is not the binding's own service (a successor adopting its
|
|
67
|
+
* predecessor's data), absent otherwise. An adopted bucket's `objectstorageBucketName` is the legacy
|
|
68
|
+
* bucket and its `objectstorageRetention.intent` the legacy intent exactly, or absent when the
|
|
69
|
+
* legacy bucket has none.
|
|
68
70
|
*/
|
|
69
71
|
export interface IPlatformBindingCorestoreLegacyAdoption {
|
|
70
72
|
nodeId: string;
|
|
71
73
|
resourceName: string;
|
|
72
74
|
inventorySha256: string;
|
|
75
|
+
/** The legacy resource's owner, when it is another service than the binding's; never its own. */
|
|
76
|
+
legacyServiceId?: string;
|
|
73
77
|
}
|
|
74
78
|
export interface IPlatformBinding {
|
|
75
79
|
id: string;
|
|
@@ -171,8 +171,12 @@ export interface IReq_Any_Cloudly_GetCorestoreLegacyResources extends plugins.ty
|
|
|
171
171
|
* Cloudly reads the node's legacy inventory again, requires `expectedInventorySha256`, and for
|
|
172
172
|
* each selected resource creates the adopting binding in one transaction: enabled, placed on
|
|
173
173
|
* `nodeId`, with `corestoreLegacyAdoption`, and for a bucket the legacy bucket name and retention
|
|
174
|
-
* intent (`validatePlatformBindingCorestoreLegacyAdoption`). A
|
|
175
|
-
*
|
|
174
|
+
* intent (`validatePlatformBindingCorestoreLegacyAdoption`). A selection naming a
|
|
175
|
+
* `successorServiceId` creates the binding on that successor instead, with
|
|
176
|
+
* `corestoreLegacyAdoption.legacyServiceId` naming the legacy owner; the successor must exist, share
|
|
177
|
+
* the legacy owner's organization, be an immutable-deployment service, own no legacy resource of
|
|
178
|
+
* that capability and hold no other binding of it. A legacy resource is adopted by one service
|
|
179
|
+
* only. A resource whose adopting binding already exists is answered unchanged. The response lists the adopting bindings and the plan
|
|
176
180
|
* (`createCorestoreLegacyResourceAdoptionPlan`) the operator hands to Corestore's offline
|
|
177
181
|
* `legacy-resource-adoption` migration. Refusals travel as `ICorestoreLegacyAdoptionErrorData`.
|
|
178
182
|
*/
|
package/package.json
CHANGED
package/readme.md
CHANGED
|
@@ -3679,13 +3679,25 @@ Coreflow, all exported from `data` and `platform`:
|
|
|
3679
3679
|
answer lists the bindings and the `plan`. Refusals travel as
|
|
3680
3680
|
`ICorestoreLegacyAdoptionErrorData { code, retryable }`: `legacy-inventory-unreachable` (the only
|
|
3681
3681
|
retryable one), `legacy-inventory-changed`, `legacy-resource-absent`, `legacy-resource-blocked`,
|
|
3682
|
-
`legacy-resource-authorized-elsewhere`, `
|
|
3682
|
+
`legacy-resource-authorized-elsewhere`, `legacy-resource-adopted-elsewhere`, `service-absent`,
|
|
3683
|
+
`binding-exists`, `successor-organization-mismatch`, `successor-not-greenfield` and
|
|
3684
|
+
`successor-owns-legacy-resource`.
|
|
3685
|
+
|
|
3686
|
+
**Successor.** A selection entry may name `successorServiceId`, another service that replaces the
|
|
3687
|
+
legacy owner: a fresh immutable-deployment service of the same organization, created by its
|
|
3688
|
+
greenfield reserve, that takes over the legacy data. The adopting binding is then the successor's,
|
|
3689
|
+
and its `corestoreLegacyAdoption.legacyServiceId` names the legacy owner (present only when the
|
|
3690
|
+
owner is another service; never the binding's own). The successor must own no legacy resource of
|
|
3691
|
+
that capability and hold no other binding of it, and a legacy resource is adopted by one service
|
|
3692
|
+
only. The selection refuses two entries adopting into the same service capability.
|
|
3683
3693
|
4. **Plan.** `ICorestoreLegacyResourceAdoptionPlanEntry` is exactly the
|
|
3684
3694
|
`{ serviceId, capability, bindingId }` object Corestore's `legacy-resource-adoption` migration
|
|
3685
|
-
reads
|
|
3686
|
-
|
|
3687
|
-
|
|
3688
|
-
|
|
3695
|
+
reads, plus `successorServiceId` when the binding belongs to a successor; `serviceId` is always
|
|
3696
|
+
the legacy owner. `validateCorestoreLegacyResourceAdoptionPlan` applies that migration's rules: a
|
|
3697
|
+
non-empty array of at most 4096 exact entries, canonical identifiers, no legacy service capability,
|
|
3698
|
+
adopting service capability or binding id twice, any order.
|
|
3699
|
+
`createCorestoreLegacyResourceAdoptionPlan(bindings)` builds it from the adopting bindings, sorted
|
|
3700
|
+
by legacy service then capability. The plan restates no legacy name or retention intent:
|
|
3689
3701
|
Corestore holds those itself, and the binding request that later reaches it carries the bucket and
|
|
3690
3702
|
intent it compares.
|
|
3691
3703
|
5. **Status.** Until the operator has run the migration, Corestore refuses the binding with a 409
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -29,6 +29,12 @@ import { isClusterNodeId } from '../private/nodeidentifier.js';
|
|
|
29
29
|
* answers the plan (`ICorestoreLegacyResourceAdoptionPlanEntry[]`).
|
|
30
30
|
* 3. The operator stops Corestore and runs its `legacy-resource-adoption` migration with that plan.
|
|
31
31
|
* Until then Corestore refuses the binding, which reports `legacy-adoption-pending`.
|
|
32
|
+
*
|
|
33
|
+
* A resource is adopted by a binding of the service that owns it, or, when the selection names a
|
|
34
|
+
* `successorServiceId`, by a binding of that successor: a fresh service of the same organization
|
|
35
|
+
* that replaces the legacy one and takes over its data. The successor's binding records the legacy
|
|
36
|
+
* owner as `corestoreLegacyAdoption.legacyServiceId`, and the plan entry carries the successor, so
|
|
37
|
+
* Corestore moves the resource from the legacy owner's manifest entry to the successor's binding.
|
|
32
38
|
*/
|
|
33
39
|
|
|
34
40
|
export type TCorestoreLegacyCapability = 'database' | 'objectstorage';
|
|
@@ -100,21 +106,30 @@ export type TClusterCorestoreLegacyResourceInventory =
|
|
|
100
106
|
errorCode: 'CORESTORE_ENDPOINT_UNKNOWN' | 'CORESTORE_UNREACHABLE';
|
|
101
107
|
};
|
|
102
108
|
|
|
103
|
-
/**
|
|
109
|
+
/**
|
|
110
|
+
* One resource an administrator selects for adoption: the legacy resource `serviceId` owns of
|
|
111
|
+
* `capability`. Without `successorServiceId` a binding of `serviceId` adopts it; with it, a binding of
|
|
112
|
+
* that other service does, which must be a greenfield service of the same organization.
|
|
113
|
+
*/
|
|
104
114
|
export interface ICorestoreLegacyResourceSelection {
|
|
105
115
|
serviceId: string;
|
|
106
116
|
capability: TCorestoreLegacyCapability;
|
|
117
|
+
/** The service whose binding adopts the resource, when it is not `serviceId`; never `serviceId`. */
|
|
118
|
+
successorServiceId?: string;
|
|
107
119
|
}
|
|
108
120
|
|
|
109
121
|
/**
|
|
110
122
|
* One entry of Corestore's offline adoption plan, exactly the object its
|
|
111
|
-
* `legacy-resource-adoption` migration reads: the service
|
|
112
|
-
*
|
|
123
|
+
* `legacy-resource-adoption` migration reads: the service that owns the legacy resource, the
|
|
124
|
+
* capability, the binding that may adopt it and, when that binding belongs to another service, that
|
|
125
|
+
* successor service. The legacy identity is Corestore's own and is not restated here.
|
|
113
126
|
*/
|
|
114
127
|
export interface ICorestoreLegacyResourceAdoptionPlanEntry {
|
|
115
128
|
serviceId: string;
|
|
116
129
|
capability: TCorestoreLegacyCapability;
|
|
117
130
|
bindingId: string;
|
|
131
|
+
/** The service `bindingId` belongs to, when it is not `serviceId`; never `serviceId`. */
|
|
132
|
+
successorServiceId?: string;
|
|
118
133
|
}
|
|
119
134
|
|
|
120
135
|
/**
|
|
@@ -126,9 +141,17 @@ export interface ICorestoreLegacyResourceAdoptionPlanEntry {
|
|
|
126
141
|
* - `legacy-resource-blocked`: a selected resource is unadopted with a blocker;
|
|
127
142
|
* - `legacy-resource-authorized-elsewhere`: a selected resource is authorized for a binding Cloudly
|
|
128
143
|
* does not hold as that resource's adoption;
|
|
129
|
-
* - `
|
|
130
|
-
*
|
|
131
|
-
*
|
|
144
|
+
* - `legacy-resource-adopted-elsewhere`: Cloudly already holds a binding of another service as a
|
|
145
|
+
* selected resource's adoption;
|
|
146
|
+
* - `service-absent`: Cloudly has no such service, legacy owner or successor;
|
|
147
|
+
* - `binding-exists`: the adopting service already has a binding of that capability that adopts
|
|
148
|
+
* nothing, or adopts another resource;
|
|
149
|
+
* - `successor-organization-mismatch`: the successor belongs to another organization than the
|
|
150
|
+
* legacy owner, or either names none;
|
|
151
|
+
* - `successor-not-greenfield`: the successor is not an immutable-deployment service (it deploys on
|
|
152
|
+
* push, or does not require an immutable image);
|
|
153
|
+
* - `successor-owns-legacy-resource`: the successor owns a legacy resource of that capability
|
|
154
|
+
* itself, which Corestore would keep beside the adopted one.
|
|
132
155
|
*/
|
|
133
156
|
export type TCorestoreLegacyAdoptionRefusal =
|
|
134
157
|
| 'legacy-inventory-unreachable'
|
|
@@ -136,8 +159,12 @@ export type TCorestoreLegacyAdoptionRefusal =
|
|
|
136
159
|
| 'legacy-resource-absent'
|
|
137
160
|
| 'legacy-resource-blocked'
|
|
138
161
|
| 'legacy-resource-authorized-elsewhere'
|
|
162
|
+
| 'legacy-resource-adopted-elsewhere'
|
|
139
163
|
| 'service-absent'
|
|
140
|
-
| 'binding-exists'
|
|
164
|
+
| 'binding-exists'
|
|
165
|
+
| 'successor-organization-mismatch'
|
|
166
|
+
| 'successor-not-greenfield'
|
|
167
|
+
| 'successor-owns-legacy-resource';
|
|
141
168
|
|
|
142
169
|
/** The named refusal of `adoptCorestoreLegacyResources`, sent as `TypedResponseError.errorData`. */
|
|
143
170
|
export interface ICorestoreLegacyAdoptionErrorData {
|
|
@@ -327,7 +354,29 @@ export const computeClusterCorestoreLegacyResourceInventorySha256 = async (
|
|
|
327
354
|
const selectionKey = (entryArg: { serviceId: string; capability: string }): string =>
|
|
328
355
|
`${entryArg.serviceId}\u0000${entryArg.capability}`;
|
|
329
356
|
|
|
330
|
-
/**
|
|
357
|
+
/** The service capability whose binding adopts the entry's resource: the successor's, or the owner's. */
|
|
358
|
+
const adoptingKey = (entryArg: { serviceId: string; capability: string; successorServiceId?: string }): string =>
|
|
359
|
+
selectionKey({ serviceId: entryArg.successorServiceId ?? entryArg.serviceId, capability: entryArg.capability });
|
|
360
|
+
|
|
361
|
+
/**
|
|
362
|
+
* Whether an entry has exactly `baseKeysArg`, and `successorServiceId` at most: `shape` when not,
|
|
363
|
+
* `successor` when its successor is not a canonical identifier other than its `serviceId`.
|
|
364
|
+
*/
|
|
365
|
+
const successorShape = (
|
|
366
|
+
entryArg: Record<string, unknown>,
|
|
367
|
+
baseKeysArg: readonly string[],
|
|
368
|
+
): 'exact' | 'shape' | 'successor' => {
|
|
369
|
+
if (!hasExactKeys(entryArg, baseKeysArg, ['successorServiceId'])) return 'shape';
|
|
370
|
+
return !Object.keys(entryArg).includes('successorServiceId')
|
|
371
|
+
|| (isIdentifier(entryArg.successorServiceId) && entryArg.successorServiceId !== entryArg.serviceId)
|
|
372
|
+
? 'exact'
|
|
373
|
+
: 'successor';
|
|
374
|
+
};
|
|
375
|
+
|
|
376
|
+
/**
|
|
377
|
+
* Validates an administrator's selection: 1..4096 exact entries, sorted by service then capability,
|
|
378
|
+
* and no service capability adopting twice, whether as legacy owner or as successor.
|
|
379
|
+
*/
|
|
331
380
|
export const validateCorestoreLegacyResourceSelections = (
|
|
332
381
|
valueArg: unknown,
|
|
333
382
|
pathArg = 'corestore legacy resource selection',
|
|
@@ -338,24 +387,36 @@ export const validateCorestoreLegacyResourceSelections = (
|
|
|
338
387
|
}
|
|
339
388
|
const errors: string[] = [];
|
|
340
389
|
let previous: string | undefined;
|
|
390
|
+
const adopting = new Set<string>();
|
|
341
391
|
for (const [index, entry] of valueArg.entries()) {
|
|
342
|
-
|
|
343
|
-
|
|
392
|
+
const shape = isPlainRecord(entry) ? successorShape(entry, ['serviceId', 'capability']) : 'shape';
|
|
393
|
+
if (shape === 'shape' || !isIdentifier((entry as Record<string, unknown>).serviceId)
|
|
394
|
+
|| !isCapability((entry as Record<string, unknown>).capability)) {
|
|
344
395
|
errors.push(`${pathArg}[${index}] must be an exact { serviceId, capability }`);
|
|
345
396
|
continue;
|
|
346
397
|
}
|
|
347
|
-
|
|
398
|
+
if (shape === 'successor') {
|
|
399
|
+
errors.push(`${pathArg}[${index}] successorServiceId must name another service`);
|
|
400
|
+
continue;
|
|
401
|
+
}
|
|
402
|
+
const selection = entry as ICorestoreLegacyResourceSelection;
|
|
403
|
+
const key = selectionKey(selection);
|
|
348
404
|
if (previous !== undefined && compareWireTokens(previous, key) >= 0) {
|
|
349
405
|
errors.push(`${pathArg} must be sorted by serviceId then capability without repeats`);
|
|
350
406
|
}
|
|
351
407
|
previous = key;
|
|
408
|
+
if (adopting.has(adoptingKey(selection))) {
|
|
409
|
+
errors.push(`${pathArg}[${index}] adopts into a service capability another entry adopts into`);
|
|
410
|
+
}
|
|
411
|
+
adopting.add(adoptingKey(selection));
|
|
352
412
|
}
|
|
353
413
|
return errors;
|
|
354
414
|
};
|
|
355
415
|
|
|
356
416
|
/**
|
|
357
417
|
* Validates an adoption plan by the rules Corestore's migration applies: a non-empty array of at
|
|
358
|
-
* most 4096 exact `{ serviceId, capability, bindingId }` entries,
|
|
418
|
+
* most 4096 exact `{ serviceId, capability, bindingId }` entries, each with `successorServiceId`
|
|
419
|
+
* when it names another service, canonical identifiers, and no legacy service capability, adopting
|
|
359
420
|
* service capability or binding id twice. Order is free.
|
|
360
421
|
*/
|
|
361
422
|
export const validateCorestoreLegacyResourceAdoptionPlan = (
|
|
@@ -368,19 +429,30 @@ export const validateCorestoreLegacyResourceAdoptionPlan = (
|
|
|
368
429
|
}
|
|
369
430
|
const errors: string[] = [];
|
|
370
431
|
const serviceCapabilities = new Set<string>();
|
|
432
|
+
const adoptingCapabilities = new Set<string>();
|
|
371
433
|
const bindingIds = new Set<string>();
|
|
372
434
|
for (const [index, entry] of valueArg.entries()) {
|
|
373
|
-
|
|
374
|
-
|
|
435
|
+
const shape = isPlainRecord(entry) ? successorShape(entry, ['serviceId', 'capability', 'bindingId']) : 'shape';
|
|
436
|
+
const record = entry as Record<string, unknown>;
|
|
437
|
+
if (shape === 'shape' || !isIdentifier(record.serviceId) || !isIdentifier(record.bindingId)
|
|
438
|
+
|| !isCapability(record.capability)) {
|
|
375
439
|
errors.push(`${pathArg} entry ${index} must be an exact { serviceId, capability, bindingId }`);
|
|
376
440
|
continue;
|
|
377
441
|
}
|
|
378
|
-
|
|
379
|
-
|
|
442
|
+
if (shape === 'successor') {
|
|
443
|
+
errors.push(`${pathArg} entry ${index} successorServiceId must name another service`);
|
|
444
|
+
continue;
|
|
445
|
+
}
|
|
446
|
+
const planEntry = entry as ICorestoreLegacyResourceAdoptionPlanEntry;
|
|
447
|
+
const serviceCapability = selectionKey(planEntry);
|
|
448
|
+
const adoptingCapability = adoptingKey(planEntry);
|
|
449
|
+
if (serviceCapabilities.has(serviceCapability) || adoptingCapabilities.has(adoptingCapability)
|
|
450
|
+
|| bindingIds.has(planEntry.bindingId)) {
|
|
380
451
|
errors.push(`${pathArg} entry ${index} repeats a service capability or binding id`);
|
|
381
452
|
}
|
|
382
453
|
serviceCapabilities.add(serviceCapability);
|
|
383
|
-
|
|
454
|
+
adoptingCapabilities.add(adoptingCapability);
|
|
455
|
+
bindingIds.add(planEntry.bindingId);
|
|
384
456
|
}
|
|
385
457
|
return errors;
|
|
386
458
|
};
|
|
@@ -392,16 +464,27 @@ export interface ICorestoreLegacyAdoptionBindingView {
|
|
|
392
464
|
capability: string;
|
|
393
465
|
objectstorageBucketName?: string;
|
|
394
466
|
objectstorageRetention?: { intent: IObjectStorageRetentionIntent };
|
|
395
|
-
corestoreLegacyAdoption?: {
|
|
467
|
+
corestoreLegacyAdoption?: {
|
|
468
|
+
nodeId: string;
|
|
469
|
+
resourceName: string;
|
|
470
|
+
inventorySha256: string;
|
|
471
|
+
legacyServiceId?: string;
|
|
472
|
+
};
|
|
396
473
|
}
|
|
397
474
|
|
|
475
|
+
/** The service that owns the legacy resource a binding adopts: its `legacyServiceId`, else its own. */
|
|
476
|
+
const legacyOwnerOf = (bindingArg: ICorestoreLegacyAdoptionBindingView): string =>
|
|
477
|
+
bindingArg.corestoreLegacyAdoption?.legacyServiceId ?? bindingArg.serviceId;
|
|
478
|
+
|
|
398
479
|
/**
|
|
399
480
|
* Content check of one adopting binding against the inventory it was adopted at, and the one rule
|
|
400
481
|
* that lets a binding carry a legacy bucket name: the binding names this node, this inventory
|
|
401
|
-
* digest and the legacy resource's name; the resource
|
|
402
|
-
*
|
|
403
|
-
*
|
|
404
|
-
*
|
|
482
|
+
* digest and the legacy resource's name; the resource belongs to `legacyServiceId` when the binding
|
|
483
|
+
* names one, and then its own service owns no legacy resource of the capability, otherwise to its
|
|
484
|
+
* own service; the resource is unadopted without a blocker or authorized for exactly this binding;
|
|
485
|
+
* an adopted bucket's `objectstorageBucketName` is the legacy bucket and its retention intent the
|
|
486
|
+
* legacy intent exactly, absent when the legacy bucket has none; a database binding carries
|
|
487
|
+
* neither. Whether the digest is current is the caller's to check.
|
|
405
488
|
*/
|
|
406
489
|
export const validatePlatformBindingCorestoreLegacyAdoption = (
|
|
407
490
|
bindingArg: ICorestoreLegacyAdoptionBindingView,
|
|
@@ -414,16 +497,27 @@ export const validatePlatformBindingCorestoreLegacyAdoption = (
|
|
|
414
497
|
return [`${pathArg} needs a valid reachable inventory and its digest`];
|
|
415
498
|
}
|
|
416
499
|
const adoption = bindingArg.corestoreLegacyAdoption;
|
|
417
|
-
if (!isPlainRecord(adoption)
|
|
500
|
+
if (!isPlainRecord(adoption)
|
|
501
|
+
|| !hasExactKeys(adoption, ['nodeId', 'resourceName', 'inventorySha256'], ['legacyServiceId'])) {
|
|
418
502
|
return [`${pathArg} must use its exact schema`];
|
|
419
503
|
}
|
|
504
|
+
if (Object.keys(adoption).includes('legacyServiceId')
|
|
505
|
+
&& (!isIdentifier(adoption.legacyServiceId) || adoption.legacyServiceId === bindingArg.serviceId)) {
|
|
506
|
+
return [`${pathArg} legacyServiceId must name another service than the binding's`];
|
|
507
|
+
}
|
|
420
508
|
if (adoption.nodeId !== inventoryArg.nodeId || adoption.inventorySha256 !== inventorySha256Arg) {
|
|
421
509
|
return [`${pathArg} must name the inventory's node and digest`];
|
|
422
510
|
}
|
|
423
511
|
if (!isCapability(bindingArg.capability)) return [`${pathArg} needs a database or objectstorage binding`];
|
|
424
|
-
const
|
|
512
|
+
const resourceOf = (serviceIdArg: string) => inventoryArg.services
|
|
513
|
+
.find((serviceArg) => serviceArg.serviceId === serviceIdArg)
|
|
425
514
|
?.resources.find((resourceArg) => resourceArg.capability === bindingArg.capability);
|
|
515
|
+
const legacyOwner = legacyOwnerOf(bindingArg);
|
|
516
|
+
const resource = resourceOf(legacyOwner);
|
|
426
517
|
if (!resource) return [`${pathArg} names no legacy resource of the service and capability`];
|
|
518
|
+
if (legacyOwner !== bindingArg.serviceId && resourceOf(bindingArg.serviceId)) {
|
|
519
|
+
return [`${pathArg} names a successor that owns a legacy resource of the capability itself`];
|
|
520
|
+
}
|
|
427
521
|
const errors: string[] = [];
|
|
428
522
|
const legacyName = resource.capability === 'database' ? resource.databaseName : resource.bucketName;
|
|
429
523
|
if (adoption.resourceName !== legacyName) errors.push(`${pathArg} resourceName must be the legacy resource's name`);
|
|
@@ -447,18 +541,27 @@ export const validatePlatformBindingCorestoreLegacyAdoption = (
|
|
|
447
541
|
};
|
|
448
542
|
|
|
449
543
|
/**
|
|
450
|
-
* The plan for every adopting binding, sorted by service then capability, in the exact entry
|
|
451
|
-
* Corestore's migration reads
|
|
452
|
-
*
|
|
544
|
+
* The plan for every adopting binding, sorted by legacy service then capability, in the exact entry
|
|
545
|
+
* shape Corestore's migration reads: a binding adopting another service's resource names that
|
|
546
|
+
* service as `serviceId` and its own as `successorServiceId`. Throws unless every binding adopts a
|
|
547
|
+
* legacy resource and the result is a valid plan.
|
|
453
548
|
*/
|
|
454
549
|
export const createCorestoreLegacyResourceAdoptionPlan = (
|
|
455
550
|
bindingsArg: readonly ICorestoreLegacyAdoptionBindingView[],
|
|
456
551
|
): ICorestoreLegacyResourceAdoptionPlanEntry[] => {
|
|
457
|
-
const plan = bindingsArg.map((bindingArg) => {
|
|
552
|
+
const plan = bindingsArg.map((bindingArg): ICorestoreLegacyResourceAdoptionPlanEntry => {
|
|
458
553
|
if (bindingArg.corestoreLegacyAdoption === undefined || !isCapability(bindingArg.capability)) {
|
|
459
554
|
throw new Error(`binding ${bindingArg.id} adopts no legacy Corestore resource`);
|
|
460
555
|
}
|
|
461
|
-
|
|
556
|
+
const legacyServiceId = bindingArg.corestoreLegacyAdoption.legacyServiceId;
|
|
557
|
+
return legacyServiceId === undefined
|
|
558
|
+
? { serviceId: bindingArg.serviceId, capability: bindingArg.capability, bindingId: bindingArg.id }
|
|
559
|
+
: {
|
|
560
|
+
serviceId: legacyServiceId,
|
|
561
|
+
capability: bindingArg.capability,
|
|
562
|
+
bindingId: bindingArg.id,
|
|
563
|
+
successorServiceId: bindingArg.serviceId,
|
|
564
|
+
};
|
|
462
565
|
}).sort((leftArg, rightArg) => compareWireTokens(selectionKey(leftArg), selectionKey(rightArg)));
|
|
463
566
|
const errors = validateCorestoreLegacyResourceAdoptionPlan(plan);
|
|
464
567
|
if (errors.length > 0) throw new Error(errors[0]);
|
package/ts/platform/types.ts
CHANGED
|
@@ -116,14 +116,18 @@ export interface IPlatformServiceEndpoint {
|
|
|
116
116
|
* the binding, and Cloudly refuses it (and `objectstorageBucketName`) on `upsertPlatformBinding`.
|
|
117
117
|
* `nodeId` is the node whose Corestore holds the resource, so the binding is placed there and
|
|
118
118
|
* nowhere else; `resourceName` is the legacy database or bucket name; `inventorySha256` is the
|
|
119
|
-
* legacy inventory the adoption was checked against
|
|
120
|
-
*
|
|
121
|
-
*
|
|
119
|
+
* legacy inventory the adoption was checked against; `legacyServiceId` is the service that owned the
|
|
120
|
+
* legacy resource when that is not the binding's own service (a successor adopting its
|
|
121
|
+
* predecessor's data), absent otherwise. An adopted bucket's `objectstorageBucketName` is the legacy
|
|
122
|
+
* bucket and its `objectstorageRetention.intent` the legacy intent exactly, or absent when the
|
|
123
|
+
* legacy bucket has none.
|
|
122
124
|
*/
|
|
123
125
|
export interface IPlatformBindingCorestoreLegacyAdoption {
|
|
124
126
|
nodeId: string;
|
|
125
127
|
resourceName: string;
|
|
126
128
|
inventorySha256: string;
|
|
129
|
+
/** The legacy resource's owner, when it is another service than the binding's; never its own. */
|
|
130
|
+
legacyServiceId?: string;
|
|
127
131
|
}
|
|
128
132
|
|
|
129
133
|
export interface IPlatformBinding {
|
package/ts/requests/corestore.ts
CHANGED
|
@@ -332,8 +332,12 @@ extends plugins.typedrequestInterfaces.implementsTR<
|
|
|
332
332
|
* Cloudly reads the node's legacy inventory again, requires `expectedInventorySha256`, and for
|
|
333
333
|
* each selected resource creates the adopting binding in one transaction: enabled, placed on
|
|
334
334
|
* `nodeId`, with `corestoreLegacyAdoption`, and for a bucket the legacy bucket name and retention
|
|
335
|
-
* intent (`validatePlatformBindingCorestoreLegacyAdoption`). A
|
|
336
|
-
*
|
|
335
|
+
* intent (`validatePlatformBindingCorestoreLegacyAdoption`). A selection naming a
|
|
336
|
+
* `successorServiceId` creates the binding on that successor instead, with
|
|
337
|
+
* `corestoreLegacyAdoption.legacyServiceId` naming the legacy owner; the successor must exist, share
|
|
338
|
+
* the legacy owner's organization, be an immutable-deployment service, own no legacy resource of
|
|
339
|
+
* that capability and hold no other binding of it. A legacy resource is adopted by one service
|
|
340
|
+
* only. A resource whose adopting binding already exists is answered unchanged. The response lists the adopting bindings and the plan
|
|
337
341
|
* (`createCorestoreLegacyResourceAdoptionPlan`) the operator hands to Corestore's offline
|
|
338
342
|
* `legacy-resource-adoption` migration. Refusals travel as `ICorestoreLegacyAdoptionErrorData`.
|
|
339
343
|
*/
|