@serve.zone/interfaces 16.1.0 → 16.2.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 CHANGED
@@ -1,5 +1,14 @@
1
1
  # Changelog
2
2
 
3
+ ## 2026-07-20 - 16.2.0
4
+
5
+ ### Security
6
+
7
+ - add least-privilege adoption image tag bootstrap (deployment)
8
+ - Promote only the exact healthy live service digest from its server-derived mutable registry target to a canonical bare semantic-version tag.
9
+ - Return complete OCI index, platform, release, and digest-pinned evidence without granting general registry manifest writes.
10
+ - Add an explicit rollout-adoption bootstrap for legacy services whose immutable target differs from the retained runtime, with a generation-one digest-pinned plan and pollable rollout status.
11
+
3
12
  ## 2026-07-20 - 16.1.0
4
13
 
5
14
  ### Security
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/interfaces',
6
- version: '16.1.0',
6
+ version: '16.2.0',
7
7
  description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
8
8
  };
9
9
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHVGQUF1RjtDQUNyRyxDQUFBIn0=
@@ -1,6 +1,6 @@
1
1
  import type { IDeploymentPreflightRuntimeTask, IOciPlatformDescriptorSummary } from './deploymentpreflight.js';
2
2
  import type { IDeployment } from './deployment.js';
3
- import type { IImmutableImageDeploymentPlan, IImmutableRolloutReportEnvelope, IImmutableImageTargetScope, TOciManifestMediaType, TSha256Digest } from './immutableimage.js';
3
+ import type { IImageRolloutStatus, IImmutableImageDeploymentPlan, IImmutableRolloutReportEnvelope, IImmutableImageTargetScope, TOciManifestMediaType, TSha256Digest } from './immutableimage.js';
4
4
  import type { IRegistryTarget } from './registry.js';
5
5
  export type TServiceDeploymentAdoptionDecision = 'GO' | 'NO-GO';
6
6
  /**
@@ -24,6 +24,44 @@ export interface IServiceDeploymentAdoptionInput extends IServiceDeploymentAdopt
24
24
  idempotencyKey: string;
25
25
  expectedAdoptionDigest: TServiceDeploymentAdoptionDigest;
26
26
  }
27
+ export interface IServiceDeploymentAdoptionImagePromotionInput extends IServiceDeploymentAdoptionPreflightInput {
28
+ targetReleaseTag: string;
29
+ expectedSourceImageDigest?: TSha256Digest;
30
+ idempotencyKey: string;
31
+ }
32
+ export interface IServiceDeploymentAdoptionImagePromotionResult {
33
+ status: 'promoted' | 'already-promoted';
34
+ organizationId: string;
35
+ serviceId: string;
36
+ sourceTag: string;
37
+ releaseTag: string;
38
+ registryHost: string;
39
+ repository: string;
40
+ digest: TSha256Digest;
41
+ mediaType: 'application/vnd.oci.image.index.v1+json' | 'application/vnd.docker.distribution.manifest.list.v2+json';
42
+ platforms: IOciPlatformDescriptorSummary[];
43
+ releaseId: string;
44
+ digestPinnedImageReference: string;
45
+ }
46
+ export interface IServiceDeploymentAdoptionRolloutInput extends IServiceDeploymentAdoptionPreflightInput {
47
+ releaseTag: string;
48
+ expectedTargetImageDigest: TSha256Digest;
49
+ idempotencyKey: string;
50
+ }
51
+ export interface IServiceDeploymentAdoptionRolloutResult {
52
+ status: 'rollout-started' | 'rollout-in-progress' | 'rollout-succeeded' | 'rollout-failed';
53
+ idempotentReplay: boolean;
54
+ operationId: string;
55
+ organizationId: string;
56
+ serviceId: string;
57
+ registryHost: string;
58
+ repository: string;
59
+ releaseTag: string;
60
+ digest: TSha256Digest;
61
+ releaseId: string;
62
+ plan: IImmutableImageDeploymentPlan;
63
+ rolloutStatus: IImageRolloutStatus;
64
+ }
27
65
  interface IServiceDeploymentAdoptionReportBase {
28
66
  schemaVersion: 1;
29
67
  mutationPerformed: false;
@@ -109,7 +147,12 @@ export interface IServiceDeploymentAdoptionRetentionAttestation {
109
147
  attestedAt: number;
110
148
  }
111
149
  export declare const validateServiceDeploymentAdoptionRetentionAttestation: (attestationArg: unknown) => string[];
150
+ export declare const normalizeServiceDeploymentAdoptionReleaseTag: (tagArg: unknown) => string | undefined;
112
151
  export declare const validateServiceDeploymentAdoptionPreflightInput: (inputArg: unknown) => string[];
113
152
  export declare const validateServiceDeploymentAdoptionInput: (inputArg: unknown) => string[];
153
+ export declare const validateServiceDeploymentAdoptionImagePromotionInput: (inputArg: unknown) => string[];
154
+ export declare const validateServiceDeploymentAdoptionImagePromotionResult: (resultArg: unknown) => string[];
155
+ export declare const validateServiceDeploymentAdoptionRolloutInput: (inputArg: unknown) => string[];
156
+ export declare const validateServiceDeploymentAdoptionRolloutResult: (resultArg: unknown) => string[];
114
157
  export declare const validateServiceDeploymentAdoptionReport: (reportArg: unknown) => string[];
115
158
  export {};
@@ -1,4 +1,4 @@
1
- import { normalizeImmutableReleaseTag, normalizeSha256Digest } from './immutableimage.js';
1
+ import { normalizeImmutableReleaseTag, normalizeSha256Digest, validateImageRolloutStatus, validateImmutableImageDeploymentPlan, } from './immutableimage.js';
2
2
  export const validateServiceDeploymentAdoptionRetentionAttestation = (attestationArg) => {
3
3
  if (!isRecord(attestationArg))
4
4
  return ['retention attestation must be an object'];
@@ -34,6 +34,7 @@ export const validateServiceDeploymentAdoptionRetentionAttestation = (attestatio
34
34
  return errors;
35
35
  };
36
36
  const boundaryIdentifierRegex = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
37
+ const immutableSemverReleaseTagRegex = /^(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)(?:-(?:0|[1-9][0-9]*|[A-Za-z-][0-9A-Za-z-]*)(?:\.(?:0|[1-9][0-9]*|[A-Za-z-][0-9A-Za-z-]*))*)?$/;
37
38
  const indexMediaTypes = new Set([
38
39
  'application/vnd.oci.image.index.v1+json',
39
40
  'application/vnd.docker.distribution.manifest.list.v2+json',
@@ -60,6 +61,12 @@ const isRecord = (valueArg) => Boolean(valueArg) && typeof valueArg === 'object'
60
61
  const isBoundedIdentifier = (valueArg) => typeof valueArg === 'string' && boundaryIdentifierRegex.test(valueArg);
61
62
  const isCanonicalDigest = (valueArg) => Boolean(normalizeSha256Digest(valueArg)) && normalizeSha256Digest(valueArg) === valueArg;
62
63
  const isNonNegativeInteger = (valueArg) => Number.isSafeInteger(valueArg) && valueArg >= 0;
64
+ export const normalizeServiceDeploymentAdoptionReleaseTag = (tagArg) => {
65
+ const normalizedTag = normalizeImmutableReleaseTag(tagArg);
66
+ return normalizedTag && immutableSemverReleaseTagRegex.test(normalizedTag)
67
+ ? normalizedTag
68
+ : undefined;
69
+ };
63
70
  export const validateServiceDeploymentAdoptionPreflightInput = (inputArg) => {
64
71
  if (!isRecord(inputArg))
65
72
  return ['adoption preflight input must be an object'];
@@ -86,6 +93,175 @@ export const validateServiceDeploymentAdoptionInput = (inputArg) => {
86
93
  }
87
94
  return errors;
88
95
  };
96
+ export const validateServiceDeploymentAdoptionImagePromotionInput = (inputArg) => {
97
+ const errors = validateServiceDeploymentAdoptionPreflightInput(inputArg);
98
+ if (!isRecord(inputArg))
99
+ return errors;
100
+ if (!normalizeServiceDeploymentAdoptionReleaseTag(inputArg.targetReleaseTag)) {
101
+ errors.push('targetReleaseTag must be a canonical OCI-safe semantic version tag');
102
+ }
103
+ if (!isBoundedIdentifier(inputArg.idempotencyKey)) {
104
+ errors.push('idempotencyKey must be a bounded canonical identifier');
105
+ }
106
+ if (inputArg.expectedSourceImageDigest !== undefined
107
+ && !isCanonicalDigest(inputArg.expectedSourceImageDigest)) {
108
+ errors.push('expectedSourceImageDigest must be a canonical sha256 digest when provided');
109
+ }
110
+ return errors;
111
+ };
112
+ export const validateServiceDeploymentAdoptionImagePromotionResult = (resultArg) => {
113
+ if (!isRecord(resultArg))
114
+ return ['adoption image promotion result must be an object'];
115
+ const errors = [];
116
+ if (resultArg.status !== 'promoted' && resultArg.status !== 'already-promoted') {
117
+ errors.push('status must identify a promoted or already-promoted result');
118
+ }
119
+ for (const key of ['organizationId', 'serviceId', 'releaseId']) {
120
+ if (!isBoundedIdentifier(resultArg[key])) {
121
+ errors.push(`${key} must be a bounded canonical identifier`);
122
+ }
123
+ }
124
+ if (typeof resultArg.sourceTag !== 'string'
125
+ || resultArg.sourceTag.trim() !== resultArg.sourceTag
126
+ || resultArg.sourceTag.length < 1
127
+ || resultArg.sourceTag.length > 128) {
128
+ errors.push('sourceTag must be a bounded canonical registry tag');
129
+ }
130
+ if (!normalizeServiceDeploymentAdoptionReleaseTag(resultArg.releaseTag)) {
131
+ errors.push('releaseTag must be a canonical OCI-safe semantic version tag');
132
+ }
133
+ if (typeof resultArg.registryHost !== 'string'
134
+ || resultArg.registryHost.trim() !== resultArg.registryHost
135
+ || !resultArg.registryHost) {
136
+ errors.push('registryHost must be a non-empty canonical string');
137
+ }
138
+ if (typeof resultArg.repository !== 'string'
139
+ || resultArg.repository.trim() !== resultArg.repository
140
+ || !resultArg.repository) {
141
+ errors.push('repository must be a non-empty canonical string');
142
+ }
143
+ if (!isCanonicalDigest(resultArg.digest)) {
144
+ errors.push('digest must be a canonical sha256 digest');
145
+ }
146
+ if (!indexMediaTypes.has(resultArg.mediaType)) {
147
+ errors.push('mediaType must identify an OCI image index');
148
+ }
149
+ if (!Array.isArray(resultArg.platforms)) {
150
+ errors.push('platforms must contain OCI platform evidence');
151
+ }
152
+ else {
153
+ for (const architecture of ['amd64', 'arm64']) {
154
+ if (!resultArg.platforms.some((platformArg) => isRecord(platformArg)
155
+ && platformArg.os === 'linux'
156
+ && platformArg.architecture === architecture
157
+ && platformArg.runnable === true
158
+ && platformArg.manifestPresent === true
159
+ && isCanonicalDigest(platformArg.digest))) {
160
+ errors.push(`platforms must contain runnable linux/${architecture} evidence`);
161
+ }
162
+ }
163
+ }
164
+ if (isCanonicalDigest(resultArg.digest)
165
+ && typeof resultArg.registryHost === 'string'
166
+ && typeof resultArg.repository === 'string'
167
+ && resultArg.digestPinnedImageReference
168
+ !== `${resultArg.registryHost}/${resultArg.repository}@${resultArg.digest}`) {
169
+ errors.push('digestPinnedImageReference must bind the exact registry digest');
170
+ }
171
+ return errors;
172
+ };
173
+ export const validateServiceDeploymentAdoptionRolloutInput = (inputArg) => {
174
+ const errors = validateServiceDeploymentAdoptionPreflightInput(inputArg);
175
+ if (!isRecord(inputArg))
176
+ return errors;
177
+ if (!normalizeServiceDeploymentAdoptionReleaseTag(inputArg.releaseTag)) {
178
+ errors.push('releaseTag must be a canonical OCI-safe semantic version tag');
179
+ }
180
+ if (!isCanonicalDigest(inputArg.expectedTargetImageDigest)) {
181
+ errors.push('expectedTargetImageDigest must be a canonical sha256 digest');
182
+ }
183
+ if (!isBoundedIdentifier(inputArg.idempotencyKey)) {
184
+ errors.push('idempotencyKey must be a bounded canonical identifier');
185
+ }
186
+ return errors;
187
+ };
188
+ export const validateServiceDeploymentAdoptionRolloutResult = (resultArg) => {
189
+ if (!isRecord(resultArg))
190
+ return ['adoption rollout result must be an object'];
191
+ const errors = [];
192
+ if (![
193
+ 'rollout-started',
194
+ 'rollout-in-progress',
195
+ 'rollout-succeeded',
196
+ 'rollout-failed',
197
+ ].includes(resultArg.status)) {
198
+ errors.push('status must identify a supported adoption rollout state');
199
+ }
200
+ if (typeof resultArg.idempotentReplay !== 'boolean') {
201
+ errors.push('idempotentReplay must be boolean');
202
+ }
203
+ for (const key of ['operationId', 'organizationId', 'serviceId', 'releaseId']) {
204
+ if (!isBoundedIdentifier(resultArg[key]))
205
+ errors.push(`${key} must be a bounded identifier`);
206
+ }
207
+ if (!normalizeServiceDeploymentAdoptionReleaseTag(resultArg.releaseTag)) {
208
+ errors.push('releaseTag must be a canonical OCI-safe semantic version tag');
209
+ }
210
+ if (!isCanonicalDigest(resultArg.digest)) {
211
+ errors.push('digest must be a canonical sha256 digest');
212
+ }
213
+ if (!isRecord(resultArg.plan)) {
214
+ errors.push('plan must be present');
215
+ }
216
+ else {
217
+ errors.push(...validateImmutableImageDeploymentPlan(resultArg.plan).map((errorArg) => `plan: ${errorArg}`));
218
+ if (resultArg.plan.operationId !== resultArg.operationId
219
+ || resultArg.plan.releaseId !== resultArg.releaseId
220
+ || resultArg.plan.releaseTag !== resultArg.releaseTag
221
+ || resultArg.plan.requestedDigest !== resultArg.digest
222
+ || resultArg.plan.registryHost !== resultArg.registryHost
223
+ || resultArg.plan.repository !== resultArg.repository
224
+ || resultArg.plan.mode !== 'promotion'
225
+ || resultArg.plan.rolloutGeneration !== 1) {
226
+ errors.push('plan must bind the exact generation-one adoption rollout result');
227
+ }
228
+ }
229
+ if (!isRecord(resultArg.rolloutStatus)) {
230
+ errors.push('rolloutStatus must be present');
231
+ }
232
+ else {
233
+ errors.push(...validateImageRolloutStatus(resultArg.rolloutStatus).map((errorArg) => `rolloutStatus: ${errorArg}`));
234
+ if (isRecord(resultArg.plan)
235
+ && (resultArg.rolloutStatus.rolloutId !== resultArg.plan.rolloutId
236
+ || resultArg.rolloutStatus.rolloutGeneration !== resultArg.plan.rolloutGeneration
237
+ || resultArg.rolloutStatus.expectedDigest !== resultArg.digest)) {
238
+ errors.push('rolloutStatus must bind the exact adoption rollout plan');
239
+ }
240
+ }
241
+ if (isRecord(resultArg.rolloutStatus)) {
242
+ const rolloutStatus = resultArg.rolloutStatus.status;
243
+ const successful = rolloutStatus === 'succeeded';
244
+ const failed = rolloutStatus === 'failed'
245
+ || rolloutStatus === 'mismatched'
246
+ || rolloutStatus === 'rolling-back'
247
+ || rolloutStatus === 'rolled-back';
248
+ if ((resultArg.status === 'rollout-succeeded') !== successful) {
249
+ errors.push('rollout-succeeded must exactly match a succeeded rolloutStatus');
250
+ }
251
+ if ((resultArg.status === 'rollout-failed') !== failed) {
252
+ errors.push('rollout-failed must exactly match a failed or mismatched rolloutStatus');
253
+ }
254
+ if ((resultArg.status === 'rollout-started' || resultArg.status === 'rollout-in-progress')
255
+ && (successful || failed)) {
256
+ errors.push('an active rollout result must not contain a terminal rolloutStatus');
257
+ }
258
+ }
259
+ if (typeof resultArg.registryHost !== 'string' || !resultArg.registryHost
260
+ || typeof resultArg.repository !== 'string' || !resultArg.repository) {
261
+ errors.push('registryHost and repository must be non-empty strings');
262
+ }
263
+ return errors;
264
+ };
89
265
  export const validateServiceDeploymentAdoptionReport = (reportArg) => {
90
266
  if (!isRecord(reportArg))
91
267
  return ['adoption report must be an object'];
@@ -337,4 +513,4 @@ export const validateServiceDeploymentAdoptionReport = (reportArg) => {
337
513
  }
338
514
  return errors;
339
515
  };
340
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploymentadoption.js","sourceRoot":"","sources":["../../ts/data/deploymentadoption.ts"],"names":[],"mappings":"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"}
516
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploymentadoption.js","sourceRoot":"","sources":["../../ts/data/deploymentadoption.ts"],"names":[],"mappings":"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"}
@@ -7,7 +7,25 @@ import type { IImageRelease } from '../data/immutableimage.js';
7
7
  import type { IDeploymentPreflightReport, IDeploymentPreflightRequestData } from '../data/deploymentpreflight.js';
8
8
  import type { IDeploymentReservationInput, IServiceDeploymentOperation, IServiceDeploymentStatus } from '../data/deploymentoperation.js';
9
9
  import type { TSha256Digest } from '../data/immutableimage.js';
10
- import type { IServiceDeploymentAdoptionInput, IServiceDeploymentAdoptionPreflightInput, IServiceDeploymentAdoptionReport, IServiceDeploymentAdoptionResult } from '../data/deploymentadoption.js';
10
+ import type { IServiceDeploymentAdoptionInput, IServiceDeploymentAdoptionImagePromotionInput, IServiceDeploymentAdoptionImagePromotionResult, IServiceDeploymentAdoptionRolloutInput, IServiceDeploymentAdoptionRolloutResult, IServiceDeploymentAdoptionPreflightInput, IServiceDeploymentAdoptionReport, IServiceDeploymentAdoptionResult } from '../data/deploymentadoption.js';
11
+ export interface IRequest_Any_Cloudly_BootstrapServiceDeploymentAdoptionRollout extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_Any_Cloudly_BootstrapServiceDeploymentAdoptionRollout> {
12
+ method: 'bootstrapServiceDeploymentAdoptionRollout';
13
+ request: IServiceDeploymentAdoptionRolloutInput & {
14
+ identity: IIdentityCredential;
15
+ };
16
+ response: {
17
+ result: IServiceDeploymentAdoptionRolloutResult;
18
+ };
19
+ }
20
+ export interface IRequest_Any_Cloudly_PromoteServiceDeploymentAdoptionImage extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_Any_Cloudly_PromoteServiceDeploymentAdoptionImage> {
21
+ method: 'promoteServiceDeploymentAdoptionImage';
22
+ request: IServiceDeploymentAdoptionImagePromotionInput & {
23
+ identity: IIdentityCredential;
24
+ };
25
+ response: {
26
+ result: IServiceDeploymentAdoptionImagePromotionResult;
27
+ };
28
+ }
11
29
  export interface IRequest_Any_Cloudly_GetServiceDeploymentAdoptionPreflight extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_Any_Cloudly_GetServiceDeploymentAdoptionPreflight> {
12
30
  method: 'getServiceDeploymentAdoptionPreflight';
13
31
  request: IServiceDeploymentAdoptionPreflightInput & {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@serve.zone/interfaces",
3
- "version": "16.1.0",
3
+ "version": "16.2.0",
4
4
  "private": false,
5
5
  "description": "Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.",
6
6
  "exports": {
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/interfaces',
6
- version: '16.1.0',
6
+ version: '16.2.0',
7
7
  description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
8
8
  }
@@ -4,13 +4,19 @@ import type {
4
4
  } from './deploymentpreflight.js';
5
5
  import type { IDeployment } from './deployment.js';
6
6
  import type {
7
+ IImageRolloutStatus,
7
8
  IImmutableImageDeploymentPlan,
8
9
  IImmutableRolloutReportEnvelope,
9
10
  IImmutableImageTargetScope,
10
11
  TOciManifestMediaType,
11
12
  TSha256Digest,
12
13
  } from './immutableimage.js';
13
- import { normalizeImmutableReleaseTag, normalizeSha256Digest } from './immutableimage.js';
14
+ import {
15
+ normalizeImmutableReleaseTag,
16
+ normalizeSha256Digest,
17
+ validateImageRolloutStatus,
18
+ validateImmutableImageDeploymentPlan,
19
+ } from './immutableimage.js';
14
20
  import type { IRegistryTarget } from './registry.js';
15
21
 
16
22
  export type TServiceDeploymentAdoptionDecision = 'GO' | 'NO-GO';
@@ -58,6 +64,56 @@ extends IServiceDeploymentAdoptionPreflightInput {
58
64
  expectedAdoptionDigest: TServiceDeploymentAdoptionDigest;
59
65
  }
60
66
 
67
+ export interface IServiceDeploymentAdoptionImagePromotionInput
68
+ extends IServiceDeploymentAdoptionPreflightInput {
69
+ targetReleaseTag: string;
70
+ expectedSourceImageDigest?: TSha256Digest;
71
+ idempotencyKey: string;
72
+ }
73
+
74
+ export interface IServiceDeploymentAdoptionImagePromotionResult {
75
+ status: 'promoted' | 'already-promoted';
76
+ organizationId: string;
77
+ serviceId: string;
78
+ sourceTag: string;
79
+ releaseTag: string;
80
+ registryHost: string;
81
+ repository: string;
82
+ digest: TSha256Digest;
83
+ mediaType:
84
+ | 'application/vnd.oci.image.index.v1+json'
85
+ | 'application/vnd.docker.distribution.manifest.list.v2+json';
86
+ platforms: IOciPlatformDescriptorSummary[];
87
+ releaseId: string;
88
+ digestPinnedImageReference: string;
89
+ }
90
+
91
+ export interface IServiceDeploymentAdoptionRolloutInput
92
+ extends IServiceDeploymentAdoptionPreflightInput {
93
+ releaseTag: string;
94
+ expectedTargetImageDigest: TSha256Digest;
95
+ idempotencyKey: string;
96
+ }
97
+
98
+ export interface IServiceDeploymentAdoptionRolloutResult {
99
+ status:
100
+ | 'rollout-started'
101
+ | 'rollout-in-progress'
102
+ | 'rollout-succeeded'
103
+ | 'rollout-failed';
104
+ idempotentReplay: boolean;
105
+ operationId: string;
106
+ organizationId: string;
107
+ serviceId: string;
108
+ registryHost: string;
109
+ repository: string;
110
+ releaseTag: string;
111
+ digest: TSha256Digest;
112
+ releaseId: string;
113
+ plan: IImmutableImageDeploymentPlan;
114
+ rolloutStatus: IImageRolloutStatus;
115
+ }
116
+
61
117
  interface IServiceDeploymentAdoptionReportBase {
62
118
  schemaVersion: 1;
63
119
  mutationPerformed: false;
@@ -194,6 +250,7 @@ export const validateServiceDeploymentAdoptionRetentionAttestation = (
194
250
  };
195
251
 
196
252
  const boundaryIdentifierRegex = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
253
+ const immutableSemverReleaseTagRegex = /^(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)(?:-(?:0|[1-9][0-9]*|[A-Za-z-][0-9A-Za-z-]*)(?:\.(?:0|[1-9][0-9]*|[A-Za-z-][0-9A-Za-z-]*))*)?$/;
197
254
  const indexMediaTypes = new Set<TOciManifestMediaType>([
198
255
  'application/vnd.oci.image.index.v1+json',
199
256
  'application/vnd.docker.distribution.manifest.list.v2+json',
@@ -229,6 +286,15 @@ const isCanonicalDigest = (valueArg: unknown): valueArg is TSha256Digest =>
229
286
  const isNonNegativeInteger = (valueArg: unknown): valueArg is number =>
230
287
  Number.isSafeInteger(valueArg) && (valueArg as number) >= 0;
231
288
 
289
+ export const normalizeServiceDeploymentAdoptionReleaseTag = (
290
+ tagArg: unknown,
291
+ ): string | undefined => {
292
+ const normalizedTag = normalizeImmutableReleaseTag(tagArg);
293
+ return normalizedTag && immutableSemverReleaseTagRegex.test(normalizedTag)
294
+ ? normalizedTag
295
+ : undefined;
296
+ };
297
+
232
298
  export const validateServiceDeploymentAdoptionPreflightInput = (
233
299
  inputArg: unknown,
234
300
  ): string[] => {
@@ -257,6 +323,183 @@ export const validateServiceDeploymentAdoptionInput = (inputArg: unknown): strin
257
323
  return errors;
258
324
  };
259
325
 
326
+ export const validateServiceDeploymentAdoptionImagePromotionInput = (
327
+ inputArg: unknown,
328
+ ): string[] => {
329
+ const errors = validateServiceDeploymentAdoptionPreflightInput(inputArg);
330
+ if (!isRecord(inputArg)) return errors;
331
+ if (!normalizeServiceDeploymentAdoptionReleaseTag(inputArg.targetReleaseTag)) {
332
+ errors.push('targetReleaseTag must be a canonical OCI-safe semantic version tag');
333
+ }
334
+ if (!isBoundedIdentifier(inputArg.idempotencyKey)) {
335
+ errors.push('idempotencyKey must be a bounded canonical identifier');
336
+ }
337
+ if (inputArg.expectedSourceImageDigest !== undefined
338
+ && !isCanonicalDigest(inputArg.expectedSourceImageDigest)) {
339
+ errors.push('expectedSourceImageDigest must be a canonical sha256 digest when provided');
340
+ }
341
+ return errors;
342
+ };
343
+
344
+ export const validateServiceDeploymentAdoptionImagePromotionResult = (
345
+ resultArg: unknown,
346
+ ): string[] => {
347
+ if (!isRecord(resultArg)) return ['adoption image promotion result must be an object'];
348
+ const errors: string[] = [];
349
+ if (resultArg.status !== 'promoted' && resultArg.status !== 'already-promoted') {
350
+ errors.push('status must identify a promoted or already-promoted result');
351
+ }
352
+ for (const key of ['organizationId', 'serviceId', 'releaseId'] as const) {
353
+ if (!isBoundedIdentifier(resultArg[key])) {
354
+ errors.push(`${key} must be a bounded canonical identifier`);
355
+ }
356
+ }
357
+ if (typeof resultArg.sourceTag !== 'string'
358
+ || resultArg.sourceTag.trim() !== resultArg.sourceTag
359
+ || resultArg.sourceTag.length < 1
360
+ || resultArg.sourceTag.length > 128) {
361
+ errors.push('sourceTag must be a bounded canonical registry tag');
362
+ }
363
+ if (!normalizeServiceDeploymentAdoptionReleaseTag(resultArg.releaseTag)) {
364
+ errors.push('releaseTag must be a canonical OCI-safe semantic version tag');
365
+ }
366
+ if (typeof resultArg.registryHost !== 'string'
367
+ || resultArg.registryHost.trim() !== resultArg.registryHost
368
+ || !resultArg.registryHost) {
369
+ errors.push('registryHost must be a non-empty canonical string');
370
+ }
371
+ if (typeof resultArg.repository !== 'string'
372
+ || resultArg.repository.trim() !== resultArg.repository
373
+ || !resultArg.repository) {
374
+ errors.push('repository must be a non-empty canonical string');
375
+ }
376
+ if (!isCanonicalDigest(resultArg.digest)) {
377
+ errors.push('digest must be a canonical sha256 digest');
378
+ }
379
+ if (!indexMediaTypes.has(resultArg.mediaType as TOciManifestMediaType)) {
380
+ errors.push('mediaType must identify an OCI image index');
381
+ }
382
+ if (!Array.isArray(resultArg.platforms)) {
383
+ errors.push('platforms must contain OCI platform evidence');
384
+ } else {
385
+ for (const architecture of ['amd64', 'arm64']) {
386
+ if (!resultArg.platforms.some((platformArg) => isRecord(platformArg)
387
+ && platformArg.os === 'linux'
388
+ && platformArg.architecture === architecture
389
+ && platformArg.runnable === true
390
+ && platformArg.manifestPresent === true
391
+ && isCanonicalDigest(platformArg.digest))) {
392
+ errors.push(`platforms must contain runnable linux/${architecture} evidence`);
393
+ }
394
+ }
395
+ }
396
+ if (isCanonicalDigest(resultArg.digest)
397
+ && typeof resultArg.registryHost === 'string'
398
+ && typeof resultArg.repository === 'string'
399
+ && resultArg.digestPinnedImageReference
400
+ !== `${resultArg.registryHost}/${resultArg.repository}@${resultArg.digest}`) {
401
+ errors.push('digestPinnedImageReference must bind the exact registry digest');
402
+ }
403
+ return errors;
404
+ };
405
+
406
+ export const validateServiceDeploymentAdoptionRolloutInput = (
407
+ inputArg: unknown,
408
+ ): string[] => {
409
+ const errors = validateServiceDeploymentAdoptionPreflightInput(inputArg);
410
+ if (!isRecord(inputArg)) return errors;
411
+ if (!normalizeServiceDeploymentAdoptionReleaseTag(inputArg.releaseTag)) {
412
+ errors.push('releaseTag must be a canonical OCI-safe semantic version tag');
413
+ }
414
+ if (!isCanonicalDigest(inputArg.expectedTargetImageDigest)) {
415
+ errors.push('expectedTargetImageDigest must be a canonical sha256 digest');
416
+ }
417
+ if (!isBoundedIdentifier(inputArg.idempotencyKey)) {
418
+ errors.push('idempotencyKey must be a bounded canonical identifier');
419
+ }
420
+ return errors;
421
+ };
422
+
423
+ export const validateServiceDeploymentAdoptionRolloutResult = (
424
+ resultArg: unknown,
425
+ ): string[] => {
426
+ if (!isRecord(resultArg)) return ['adoption rollout result must be an object'];
427
+ const errors: string[] = [];
428
+ if (![
429
+ 'rollout-started',
430
+ 'rollout-in-progress',
431
+ 'rollout-succeeded',
432
+ 'rollout-failed',
433
+ ].includes(resultArg.status as string)) {
434
+ errors.push('status must identify a supported adoption rollout state');
435
+ }
436
+ if (typeof resultArg.idempotentReplay !== 'boolean') {
437
+ errors.push('idempotentReplay must be boolean');
438
+ }
439
+ for (const key of ['operationId', 'organizationId', 'serviceId', 'releaseId'] as const) {
440
+ if (!isBoundedIdentifier(resultArg[key])) errors.push(`${key} must be a bounded identifier`);
441
+ }
442
+ if (!normalizeServiceDeploymentAdoptionReleaseTag(resultArg.releaseTag)) {
443
+ errors.push('releaseTag must be a canonical OCI-safe semantic version tag');
444
+ }
445
+ if (!isCanonicalDigest(resultArg.digest)) {
446
+ errors.push('digest must be a canonical sha256 digest');
447
+ }
448
+ if (!isRecord(resultArg.plan)) {
449
+ errors.push('plan must be present');
450
+ } else {
451
+ errors.push(...validateImmutableImageDeploymentPlan(
452
+ resultArg.plan as unknown as IImmutableImageDeploymentPlan,
453
+ ).map((errorArg) => `plan: ${errorArg}`));
454
+ if (resultArg.plan.operationId !== resultArg.operationId
455
+ || resultArg.plan.releaseId !== resultArg.releaseId
456
+ || resultArg.plan.releaseTag !== resultArg.releaseTag
457
+ || resultArg.plan.requestedDigest !== resultArg.digest
458
+ || resultArg.plan.registryHost !== resultArg.registryHost
459
+ || resultArg.plan.repository !== resultArg.repository
460
+ || resultArg.plan.mode !== 'promotion'
461
+ || resultArg.plan.rolloutGeneration !== 1) {
462
+ errors.push('plan must bind the exact generation-one adoption rollout result');
463
+ }
464
+ }
465
+ if (!isRecord(resultArg.rolloutStatus)) {
466
+ errors.push('rolloutStatus must be present');
467
+ } else {
468
+ errors.push(...validateImageRolloutStatus(
469
+ resultArg.rolloutStatus as unknown as IImageRolloutStatus,
470
+ ).map((errorArg) => `rolloutStatus: ${errorArg}`));
471
+ if (isRecord(resultArg.plan)
472
+ && (resultArg.rolloutStatus.rolloutId !== resultArg.plan.rolloutId
473
+ || resultArg.rolloutStatus.rolloutGeneration !== resultArg.plan.rolloutGeneration
474
+ || resultArg.rolloutStatus.expectedDigest !== resultArg.digest)) {
475
+ errors.push('rolloutStatus must bind the exact adoption rollout plan');
476
+ }
477
+ }
478
+ if (isRecord(resultArg.rolloutStatus)) {
479
+ const rolloutStatus = resultArg.rolloutStatus.status;
480
+ const successful = rolloutStatus === 'succeeded';
481
+ const failed = rolloutStatus === 'failed'
482
+ || rolloutStatus === 'mismatched'
483
+ || rolloutStatus === 'rolling-back'
484
+ || rolloutStatus === 'rolled-back';
485
+ if ((resultArg.status === 'rollout-succeeded') !== successful) {
486
+ errors.push('rollout-succeeded must exactly match a succeeded rolloutStatus');
487
+ }
488
+ if ((resultArg.status === 'rollout-failed') !== failed) {
489
+ errors.push('rollout-failed must exactly match a failed or mismatched rolloutStatus');
490
+ }
491
+ if ((resultArg.status === 'rollout-started' || resultArg.status === 'rollout-in-progress')
492
+ && (successful || failed)) {
493
+ errors.push('an active rollout result must not contain a terminal rolloutStatus');
494
+ }
495
+ }
496
+ if (typeof resultArg.registryHost !== 'string' || !resultArg.registryHost
497
+ || typeof resultArg.repository !== 'string' || !resultArg.repository) {
498
+ errors.push('registryHost and repository must be non-empty strings');
499
+ }
500
+ return errors;
501
+ };
502
+
260
503
  export const validateServiceDeploymentAdoptionReport = (reportArg: unknown): string[] => {
261
504
  if (!isRecord(reportArg)) return ['adoption report must be an object'];
262
505
  const errors: string[] = [];
@@ -17,11 +17,43 @@ import type {
17
17
  import type { TSha256Digest } from '../data/immutableimage.js';
18
18
  import type {
19
19
  IServiceDeploymentAdoptionInput,
20
+ IServiceDeploymentAdoptionImagePromotionInput,
21
+ IServiceDeploymentAdoptionImagePromotionResult,
22
+ IServiceDeploymentAdoptionRolloutInput,
23
+ IServiceDeploymentAdoptionRolloutResult,
20
24
  IServiceDeploymentAdoptionPreflightInput,
21
25
  IServiceDeploymentAdoptionReport,
22
26
  IServiceDeploymentAdoptionResult,
23
27
  } from '../data/deploymentadoption.js';
24
28
 
29
+ export interface IRequest_Any_Cloudly_BootstrapServiceDeploymentAdoptionRollout
30
+ extends plugins.typedrequestInterfaces.implementsTR<
31
+ plugins.typedrequestInterfaces.ITypedRequest,
32
+ IRequest_Any_Cloudly_BootstrapServiceDeploymentAdoptionRollout
33
+ > {
34
+ method: 'bootstrapServiceDeploymentAdoptionRollout';
35
+ request: IServiceDeploymentAdoptionRolloutInput & {
36
+ identity: IIdentityCredential;
37
+ };
38
+ response: {
39
+ result: IServiceDeploymentAdoptionRolloutResult;
40
+ };
41
+ }
42
+
43
+ export interface IRequest_Any_Cloudly_PromoteServiceDeploymentAdoptionImage
44
+ extends plugins.typedrequestInterfaces.implementsTR<
45
+ plugins.typedrequestInterfaces.ITypedRequest,
46
+ IRequest_Any_Cloudly_PromoteServiceDeploymentAdoptionImage
47
+ > {
48
+ method: 'promoteServiceDeploymentAdoptionImage';
49
+ request: IServiceDeploymentAdoptionImagePromotionInput & {
50
+ identity: IIdentityCredential;
51
+ };
52
+ response: {
53
+ result: IServiceDeploymentAdoptionImagePromotionResult;
54
+ };
55
+ }
56
+
25
57
  export interface IRequest_Any_Cloudly_GetServiceDeploymentAdoptionPreflight
26
58
  extends plugins.typedrequestInterfaces.implementsTR<
27
59
  plugins.typedrequestInterfaces.ITypedRequest,