@serve.zone/interfaces 32.66.0 → 32.68.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/deploymentoperation.d.ts +17 -3
- package/dist_ts/data/deploymentoperation.js +4 -1
- package/dist_ts/data/deploymentreleaseredeploy.d.ts +88 -0
- package/dist_ts/data/deploymentreleaseredeploy.js +120 -0
- package/dist_ts/data/hostedapp.d.ts +16 -0
- package/dist_ts/data/hostedapp.js +17 -1
- package/dist_ts/data/immutableimage.d.ts +17 -3
- package/dist_ts/data/immutableimage.js +18 -1
- package/dist_ts/data/index.d.ts +1 -0
- package/dist_ts/data/index.js +2 -1
- package/dist_ts/data/user.d.ts +7 -1
- package/dist_ts/data/user.js +6 -1
- package/dist_ts/requests/deployment.d.ts +5 -0
- package/dist_ts/requests/service.d.ts +42 -0
- package/package.json +2 -2
- package/readme.md +32 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/deploymentoperation.ts +21 -2
- package/ts/data/deploymentreleaseredeploy.ts +182 -0
- package/ts/data/hostedapp.ts +17 -0
- package/ts/data/immutableimage.ts +36 -3
- package/ts/data/index.ts +1 -0
- package/ts/data/user.ts +12 -1
- package/ts/requests/deployment.ts +5 -0
- package/ts/requests/service.ts +55 -0
|
@@ -64,6 +64,13 @@ export const selectTrustedImageReleaseEvidence = (argsArg) => {
|
|
|
64
64
|
evidenceArg.sourceRootDigest,
|
|
65
65
|
]
|
|
66
66
|
: []),
|
|
67
|
+
...(evidenceArg.source === 'cloudly-release-redeploy'
|
|
68
|
+
? [
|
|
69
|
+
evidenceArg.sourceReleaseId,
|
|
70
|
+
evidenceArg.sourceTag,
|
|
71
|
+
evidenceArg.sourceRootDigest,
|
|
72
|
+
]
|
|
73
|
+
: []),
|
|
67
74
|
].join('\u0000');
|
|
68
75
|
const uniqueEvidence = new Map();
|
|
69
76
|
const errors = [];
|
|
@@ -100,6 +107,16 @@ export const selectTrustedImageReleaseEvidence = (argsArg) => {
|
|
|
100
107
|
errors.push('trusted release evidence is ambiguous');
|
|
101
108
|
}
|
|
102
109
|
const evidence = evidenceMatches.length === 1 ? evidenceMatches[0] : undefined;
|
|
110
|
+
// A redeploy copies one root of this release row under a new tag; it never makes a new root,
|
|
111
|
+
// and only a row that was accepted before (promoted successfully) can be redeployed.
|
|
112
|
+
if (evidence?.source === 'cloudly-release-redeploy'
|
|
113
|
+
&& (argsArg.release.data.acceptedAt === undefined
|
|
114
|
+
|| evidence.sourceRootDigest !== argsArg.release.data.registryRootDigest
|
|
115
|
+
|| evidence.sourceReleaseId !== argsArg.release.id
|
|
116
|
+
|| evidence.sourceTag === evidence.tag
|
|
117
|
+
|| !argsArg.release.data.observedTags.includes(evidence.sourceTag))) {
|
|
118
|
+
errors.push('release redeploy evidence must name this accepted release, its root and an earlier tag of it');
|
|
119
|
+
}
|
|
103
120
|
if (evidence && evidence.manifestMediaType !== argsArg.release.data.manifestMediaType) {
|
|
104
121
|
errors.push('trusted release and release root media types disagree');
|
|
105
122
|
}
|
|
@@ -435,4 +452,4 @@ export const validateImageRolloutStatus = (statusArg) => {
|
|
|
435
452
|
}
|
|
436
453
|
return errors;
|
|
437
454
|
};
|
|
438
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"immutableimage.js","sourceRoot":"","sources":["../../ts/data/immutableimage.ts"],"names":[],"mappings":"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"}
|
|
455
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"immutableimage.js","sourceRoot":"","sources":["../../ts/data/immutableimage.ts"],"names":[],"mappings":"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"}
|
package/dist_ts/data/index.d.ts
CHANGED
|
@@ -18,6 +18,7 @@ export * from './deploymentlegacyimport.js';
|
|
|
18
18
|
export * from './deploymentmachineuser.js';
|
|
19
19
|
export * from './deploymentoperation.js';
|
|
20
20
|
export * from './deploymentpreflight.js';
|
|
21
|
+
export * from './deploymentreleaseredeploy.js';
|
|
21
22
|
export * from './migration.js';
|
|
22
23
|
export * from './dns.js';
|
|
23
24
|
export * from './docker.js';
|
package/dist_ts/data/index.js
CHANGED
|
@@ -18,6 +18,7 @@ export * from './deploymentlegacyimport.js';
|
|
|
18
18
|
export * from './deploymentmachineuser.js';
|
|
19
19
|
export * from './deploymentoperation.js';
|
|
20
20
|
export * from './deploymentpreflight.js';
|
|
21
|
+
export * from './deploymentreleaseredeploy.js';
|
|
21
22
|
export * from './migration.js';
|
|
22
23
|
export * from './dns.js';
|
|
23
24
|
export * from './docker.js';
|
|
@@ -88,4 +89,4 @@ export * from './user.js';
|
|
|
88
89
|
export * from './version.js';
|
|
89
90
|
export * from './webpush.js';
|
|
90
91
|
export * from './workloadreplicaidentity.js';
|
|
91
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9kYXRhL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxnQ0FBZ0MsQ0FBQztBQUMvQyxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLDhCQUE4QixDQUFDO0FBQzdDLGNBQWMsMEJBQTBCLENBQUM7QUFDekMsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLDRCQUE0QixDQUFDO0FBQzNDLGNBQWMsMEJBQTBCLENBQUM7QUFDekMsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLGdDQUFnQyxDQUFDO0FBQy9DLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxVQUFVLENBQUM7QUFDekIsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxZQUFZLENBQUM7QUFDM0IsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxZQUFZLENBQUM7QUFDM0IsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyxXQUFXLENBQUM7QUFDMUIsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyw4QkFBOEIsQ0FBQztBQUM3QyxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYyx3QkFBd0IsQ0FBQztBQUl2QyxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUc5RCxPQUFPLEVBQUUscUNBQXFDLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVwRixPQUFPLEVBQUUsMENBQTBDLEVBQUUsMENBQTBDLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUMxSSxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsd0JBQXdCLENBQUM7QUFDdkMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLDRCQUE0QixDQUFDO0FBQzNDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYyxnQ0FBZ0MsQ0FBQztBQUMvQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxrQkFBa0IsQ0FBQztBQUNqQyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsMEJBQTBCLENBQUM7QUFDekMsY0FBYyxrQ0FBa0MsQ0FBQztBQUNqRCxjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMsV0FBVyxDQUFDO0FBQzFCLGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMsOEJBQThCLENBQUMifQ==
|
package/dist_ts/data/user.d.ts
CHANGED
|
@@ -8,7 +8,13 @@ export type TServiceDeploymentCapability = 'deployment:preflight' | 'deployment:
|
|
|
8
8
|
* Reserve a greenfield successor whose image Cloudly imports from an attested legacy service,
|
|
9
9
|
* and have Cloudly import it. Granted on an organization-service-slot grant only.
|
|
10
10
|
*/
|
|
11
|
-
| 'deployment:import-legacy' | 'deployment:promote-route' | 'deployment:rollback-image' | 'deployment:rollback-route' | 'deployment:retry' | 'deployment:cleanup'
|
|
11
|
+
| 'deployment:import-legacy' | 'deployment:promote-route' | 'deployment:rollback-image' | 'deployment:rollback-route' | 'deployment:retry' | 'deployment:cleanup'
|
|
12
|
+
/**
|
|
13
|
+
* Start a release redeploy of the service (`startServiceReleaseDeployment`): Cloudly deploys one
|
|
14
|
+
* of the service's own accepted, retained releases again and runs the operation itself. Granted
|
|
15
|
+
* on an existing-service grant only; administrators hold it implicitly.
|
|
16
|
+
*/
|
|
17
|
+
| 'deployment:redeploy-release';
|
|
12
18
|
/**
|
|
13
19
|
* Server-persisted authority for one logical service. These grants are never
|
|
14
20
|
* accepted from the identity payload supplied by a caller; Cloudly reloads
|
package/dist_ts/data/user.js
CHANGED
|
@@ -13,6 +13,7 @@ const serviceDeploymentCapabilities = new Set([
|
|
|
13
13
|
'deployment:rollback-route',
|
|
14
14
|
'deployment:retry',
|
|
15
15
|
'deployment:cleanup',
|
|
16
|
+
'deployment:redeploy-release',
|
|
16
17
|
]);
|
|
17
18
|
const deploymentBoundaryIdentifierRegex = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
|
|
18
19
|
export const validateServiceDeploymentGrant = (grantArg) => {
|
|
@@ -55,10 +56,14 @@ export const validateServiceDeploymentGrant = (grantArg) => {
|
|
|
55
56
|
&& capabilities.includes('deployment:adopt-existing')) {
|
|
56
57
|
errors.push('deployment:adopt-existing requires an existing-service grant');
|
|
57
58
|
}
|
|
59
|
+
if (capabilities && grant.scope !== 'service'
|
|
60
|
+
&& capabilities.includes('deployment:redeploy-release')) {
|
|
61
|
+
errors.push('deployment:redeploy-release requires an existing-service grant');
|
|
62
|
+
}
|
|
58
63
|
if (capabilities && grant.scope !== 'organization-service-slot'
|
|
59
64
|
&& capabilities.includes('deployment:import-legacy')) {
|
|
60
65
|
errors.push('deployment:import-legacy requires an organization-service-slot grant');
|
|
61
66
|
}
|
|
62
67
|
return errors;
|
|
63
68
|
};
|
|
64
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXNlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2RhdGEvdXNlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUF5REEsTUFBTSw2QkFBNkIsR0FBRyxJQUFJLEdBQUcsQ0FBK0I7SUFDMUUsc0JBQXNCO0lBQ3RCLG9CQUFvQjtJQUNwQiwwQkFBMEI7SUFDMUIseUJBQXlCO0lBQ3pCLDBCQUEwQjtJQUMxQiwyQkFBMkI7SUFDM0IsbUJBQW1CO0lBQ25CLDhCQUE4QjtJQUM5QiwwQkFBMEI7SUFDMUIsMEJBQTBCO0lBQzFCLDJCQUEyQjtJQUMzQiwyQkFBMkI7SUFDM0Isa0JBQWtCO0lBQ2xCLG9CQUFvQjtJQUNwQiw2QkFBNkI7Q0FDOUIsQ0FBQyxDQUFDO0FBRUgsTUFBTSxpQ0FBaUMsR0FBRyxxQ0FBcUMsQ0FBQztBQUVoRixNQUFNLENBQUMsTUFBTSw4QkFBOEIsR0FBRyxDQUM1QyxRQUFpQixFQUNQLEVBQUU7SUFDWixNQUFNLE1BQU0sR0FBYSxFQUFFLENBQUM7SUFDNUIsSUFBSSxDQUFDLFFBQVEsSUFBSSxPQUFPLFFBQVEsS0FBSyxRQUFRLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDO1FBQ3pFLE9BQU8sQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO0lBQ3JDLENBQUM7SUFDRCxNQUFNLEtBQUssR0FBRyxRQUFtQyxDQUFDO0lBQ2xELElBQUksS0FBSyxDQUFDLEtBQUssS0FBSyxTQUFTLElBQUksS0FBSyxDQUFDLEtBQUssS0FBSywyQkFBMkIsRUFBRSxDQUFDO1FBQzdFLE1BQU0sQ0FBQyxJQUFJLENBQUMseUVBQXlFLENBQUMsQ0FBQztJQUN6RixDQUFDO0lBQ0QsSUFBSSxPQUFPLEtBQUssQ0FBQyxjQUFjLEtBQUssUUFBUTtXQUN2QyxDQUFDLGlDQUFpQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLEVBQUUsQ0FBQztRQUNuRSxNQUFNLENBQUMsSUFBSSxDQUFDLHVEQUF1RCxDQUFDLENBQUM7SUFDdkUsQ0FBQztJQUNELElBQUksT0FBTyxLQUFLLENBQUMsU0FBUyxLQUFLLFFBQVE7V0FDbEMsQ0FBQyxpQ0FBaUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUM7UUFDOUQsTUFBTSxDQUFDLElBQUksQ0FBQyxrREFBa0QsQ0FBQyxDQUFDO0lBQ2xFLENBQUM7SUFDRCxNQUFNLFlBQVksR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUM7UUFDcEQsQ0FBQyxDQUFDLEtBQUssQ0FBQyxZQUFZO1FBQ3BCLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFDZCxJQUFJLENBQUMsWUFBWTtXQUNaLFlBQVksQ0FBQyxNQUFNLEdBQUcsQ0FBQztXQUN2QixZQUFZLENBQUMsTUFBTSxHQUFHLDZCQUE2QixDQUFDLElBQUk7V0FDeEQsSUFBSSxHQUFHLENBQUMsWUFBWSxDQUFDLENBQUMsSUFBSSxLQUFLLFlBQVksQ0FBQyxNQUFNO1dBQ2xELFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQyxhQUFhLEVBQUUsRUFBRSxDQUFDLENBQ3RDLE9BQU8sYUFBYSxLQUFLLFFBQVE7ZUFDOUIsQ0FBQyw2QkFBNkIsQ0FBQyxHQUFHLENBQUMsYUFBNkMsQ0FBQyxDQUNyRixDQUFDLEVBQUUsQ0FBQztRQUNMLE1BQU0sQ0FBQyxJQUFJLENBQUMsa0ZBQWtGLENBQUMsQ0FBQztJQUNsRyxDQUFDO0lBQ0QsSUFBSSxZQUFZLElBQUksS0FBSyxDQUFDLEtBQUssS0FBSyxTQUFTO1dBQ3hDLFlBQVksQ0FBQyxRQUFRLENBQUMsOEJBQThCLENBQUMsRUFBRSxDQUFDO1FBQzNELE1BQU0sQ0FBQyxJQUFJLENBQUMsZ0VBQWdFLENBQUMsQ0FBQztJQUNoRixDQUFDO0lBQ0QsSUFBSSxZQUFZLElBQUksS0FBSyxDQUFDLEtBQUssS0FBSywyQkFBMkI7V0FDMUQsQ0FBQyxZQUFZLENBQUMsUUFBUSxDQUFDLDhCQUE4QixDQUFDLEVBQUUsQ0FBQztRQUM1RCxNQUFNLENBQUMsSUFBSSxDQUFDLHVFQUF1RSxDQUFDLENBQUM7SUFDdkYsQ0FBQztJQUNELElBQUksWUFBWSxJQUFJLEtBQUssQ0FBQyxLQUFLLEtBQUssU0FBUztXQUN4QyxZQUFZLENBQUMsUUFBUSxDQUFDLDJCQUEyQixDQUFDLEVBQUUsQ0FBQztRQUN4RCxNQUFNLENBQUMsSUFBSSxDQUFDLDhEQUE4RCxDQUFDLENBQUM7SUFDOUUsQ0FBQztJQUNELElBQUksWUFBWSxJQUFJLEtBQUssQ0FBQyxLQUFLLEtBQUssU0FBUztXQUN4QyxZQUFZLENBQUMsUUFBUSxDQUFDLDZCQUE2QixDQUFDLEVBQUUsQ0FBQztRQUMxRCxNQUFNLENBQUMsSUFBSSxDQUFDLGdFQUFnRSxDQUFDLENBQUM7SUFDaEYsQ0FBQztJQUNELElBQUksWUFBWSxJQUFJLEtBQUssQ0FBQyxLQUFLLEtBQUssMkJBQTJCO1dBQzFELFlBQVksQ0FBQyxRQUFRLENBQUMsMEJBQTBCLENBQUMsRUFBRSxDQUFDO1FBQ3ZELE1BQU0sQ0FBQyxJQUFJLENBQUMsc0VBQXNFLENBQUMsQ0FBQztJQUN0RixDQUFDO0lBQ0QsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQyxDQUFDIn0=
|
|
@@ -50,6 +50,11 @@ export interface IReq_Any_Cloudly_GetDeploymentsByNode extends plugins.typedrequ
|
|
|
50
50
|
deployments: IDeployment[];
|
|
51
51
|
};
|
|
52
52
|
}
|
|
53
|
+
/**
|
|
54
|
+
* @deprecated Stores a deployment record and deploys nothing; no runtime writes these records.
|
|
55
|
+
* A deployment is a release redeploy (`startServiceReleaseDeployment`) or a tsdeploy deployment.
|
|
56
|
+
* It is removed in the next Cloudly major.
|
|
57
|
+
*/
|
|
53
58
|
export interface IReq_Any_Cloudly_CreateDeployment extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Any_Cloudly_CreateDeployment> {
|
|
54
59
|
method: 'createDeployment';
|
|
55
60
|
request: {
|
|
@@ -9,6 +9,7 @@ import type { IImageRelease } from '../data/immutableimage.js';
|
|
|
9
9
|
import type { IDeploymentPreflightReport, IDeploymentPreflightRequestData } from '../data/deploymentpreflight.js';
|
|
10
10
|
import type { IDeploymentReservationInput, IServiceDeploymentOperation, IServiceDeploymentStatus } from '../data/deploymentoperation.js';
|
|
11
11
|
import type { TSha256Digest } from '../data/immutableimage.js';
|
|
12
|
+
import type { IServiceDeploymentOperationHistoryQuery, IServiceReleaseDeploymentStartInput } from '../data/deploymentreleaseredeploy.js';
|
|
12
13
|
import type { ILegacyServiceHostObservation, ILegacyServiceRuntimeAttestation } from '../data/deploymentlegacyimport.js';
|
|
13
14
|
import type { IProtocolOffer } from '../protocol.js';
|
|
14
15
|
import type { IRuntimeAssignmentLogAttemptPage, IRuntimeAssignmentLogPage } from '../data/runtimeassignmentlogs.js';
|
|
@@ -135,6 +136,11 @@ export interface IRequest_Any_Cloudly_PromoteServiceImageRelease extends plugins
|
|
|
135
136
|
operation: IServiceDeploymentOperation;
|
|
136
137
|
};
|
|
137
138
|
}
|
|
139
|
+
/**
|
|
140
|
+
* @deprecated Rolls back by re-opening an earlier operation; nothing calls it and it is not
|
|
141
|
+
* maintained. A rollback is a release redeploy (`startServiceReleaseDeployment`) of the earlier
|
|
142
|
+
* release. It is removed in the next Cloudly major.
|
|
143
|
+
*/
|
|
138
144
|
export interface IRequest_Any_Cloudly_RollbackServiceImageRelease extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_Any_Cloudly_RollbackServiceImageRelease> {
|
|
139
145
|
method: 'rollbackServiceImageRelease';
|
|
140
146
|
request: {
|
|
@@ -173,6 +179,42 @@ export interface IRequest_Any_Cloudly_ReserveServiceDeployment extends plugins.t
|
|
|
173
179
|
registryTarget: IRegistryTarget;
|
|
174
180
|
};
|
|
175
181
|
}
|
|
182
|
+
/**
|
|
183
|
+
* Starts a release redeploy: Cloudly deploys one of the service's own accepted, retained and whole
|
|
184
|
+
* releases again (`data.deploymentreleaseredeploy`) and runs the operation itself to `succeeded` or
|
|
185
|
+
* `failed`. The answer is the operation as it stands once it was started; its state, failure and
|
|
186
|
+
* evidence are read with `readServiceDeploymentStatus`, never assumed from the answer.
|
|
187
|
+
*
|
|
188
|
+
* An administrator or a deployment machine user holding `deployment:redeploy-release` on the
|
|
189
|
+
* service may start one; the operation's actor is the caller. A refusal carries one of
|
|
190
|
+
* `data.serviceReleaseDeploymentRefusalCodes` or a shared deployment code in its `code`. The same
|
|
191
|
+
* `idempotencyKey` with the same request answers the operation it started.
|
|
192
|
+
*/
|
|
193
|
+
export interface IRequest_Any_Cloudly_StartServiceReleaseDeployment extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_Any_Cloudly_StartServiceReleaseDeployment> {
|
|
194
|
+
method: 'startServiceReleaseDeployment';
|
|
195
|
+
request: {
|
|
196
|
+
identity: IIdentityCredential;
|
|
197
|
+
} & IServiceReleaseDeploymentStartInput;
|
|
198
|
+
response: {
|
|
199
|
+
operation: IServiceDeploymentOperation;
|
|
200
|
+
};
|
|
201
|
+
}
|
|
202
|
+
/**
|
|
203
|
+
* One page of a service's deployment operations, newest first: every operation of every origin
|
|
204
|
+
* (tsdeploy's and Cloudly's own). `nextBefore` names the operation the next page starts after and
|
|
205
|
+
* is absent on the last page. Administrators, or a deployment machine user holding
|
|
206
|
+
* `deployment:status` on the service.
|
|
207
|
+
*/
|
|
208
|
+
export interface IRequest_Any_Cloudly_GetServiceDeploymentOperations extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_Any_Cloudly_GetServiceDeploymentOperations> {
|
|
209
|
+
method: 'getServiceDeploymentOperations';
|
|
210
|
+
request: {
|
|
211
|
+
identity: IIdentityCredential;
|
|
212
|
+
} & IServiceDeploymentOperationHistoryQuery;
|
|
213
|
+
response: {
|
|
214
|
+
operations: IServiceDeploymentOperation[];
|
|
215
|
+
nextBefore?: string;
|
|
216
|
+
};
|
|
217
|
+
}
|
|
176
218
|
/**
|
|
177
219
|
* Answers one deployment operation's status and advances it: a rolling-out operation whose runtime
|
|
178
220
|
* evidence proves success or failure is transitioned before the answer. A deployment that polls
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/interfaces",
|
|
3
|
-
"version": "32.
|
|
3
|
+
"version": "32.68.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.",
|
|
6
6
|
"exports": {
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
30
|
"@git.zone/tsrepo": "^1.1.1",
|
|
31
|
-
"@types/node": "26.6.
|
|
31
|
+
"@types/node": "26.6.6",
|
|
32
32
|
"typescript": "^6.0.3"
|
|
33
33
|
},
|
|
34
34
|
"files": [
|
package/readme.md
CHANGED
|
@@ -3801,8 +3801,9 @@ verification, handlers validate `IHostedAppMachineClaims` and derive the exact
|
|
|
3801
3801
|
app instance and service from `servezone_app_instance_id` and
|
|
3802
3802
|
`servezone_service_id`; callers cannot submit those selectors. Bootstrap
|
|
3803
3803
|
actions are either a canonical same-origin `setupRoute` path or a nonsecret
|
|
3804
|
-
`message`.
|
|
3805
|
-
|
|
3804
|
+
`message`. Bootstrap actions and report payloads carry no tokens, usernames,
|
|
3805
|
+
passwords, or token URLs; the only credential is the host's machine JWT in
|
|
3806
|
+
`identity.jwt`. Each server action carries a CAS revision; completion
|
|
3806
3807
|
requires its exact ID, current revision, and `ready` status so a delayed request
|
|
3807
3808
|
cannot complete a replacement action. A host must judge a lifecycle report with
|
|
3808
3809
|
`data.validateHostedAppLifecycleReport` before it stores anything and refuse the
|
|
@@ -3812,6 +3813,26 @@ whole report on any error. The validator admits only the members of
|
|
|
3812
3813
|
malformed values. A member the report omits keeps its stored value;
|
|
3813
3814
|
`statusMessage: ''` clears the stored message.
|
|
3814
3815
|
|
|
3816
|
+
A host hands a hosted app its runtime identity in environment variables named
|
|
3817
|
+
by `data.hostedAppRuntimeIdentityKeys`:
|
|
3818
|
+
|
|
3819
|
+
```typescript
|
|
3820
|
+
import { data } from '@serve.zone/interfaces';
|
|
3821
|
+
|
|
3822
|
+
data.hostedAppRuntimeIdentityKeys.appInstanceId; // 'SERVEZONE_APP_INSTANCE_ID'
|
|
3823
|
+
data.hostedAppRuntimeIdentityKeys.hostType; // 'SERVEZONE_APP_HOST_TYPE'
|
|
3824
|
+
data.hostedAppRuntimeIdentityKeys.runtimeUrl; // 'SERVEZONE_RUNTIME_URL'
|
|
3825
|
+
data.hostedAppRuntimeIdentityKeys.controlToken; // 'SERVEZONE_APP_CONTROL_TOKEN'
|
|
3826
|
+
```
|
|
3827
|
+
|
|
3828
|
+
The first three are public environment values. Under `controlToken` the host
|
|
3829
|
+
delivers, as a secret, its machine JWT (`IHostedAppMachineClaims`, audience
|
|
3830
|
+
`data.hostedAppMachineAudience`). The app sends that token verbatim as
|
|
3831
|
+
`identity.jwt` of the hosted lifecycle requests and never logs, stores or
|
|
3832
|
+
decodes it. The host rotates the token only by replacing the workload and
|
|
3833
|
+
accepts only the token it issued last. These names are shipped values that
|
|
3834
|
+
running workloads read; they are never renamed.
|
|
3835
|
+
|
|
3815
3836
|
## App Store Catalog Contract
|
|
3816
3837
|
|
|
3817
3838
|
Onebox and Cloudly load the App Store at runtime as one signed catalog. The contract is what a consumer has to understand; everything else is data that arrives with the next catalog revision and needs no consumer release: new apps and versions, image digests, changelogs, descriptions.
|
|
@@ -3984,6 +4005,15 @@ A legacy `deployOnPush` service without deployable source moves to a greenfield
|
|
|
3984
4005
|
- Instead of the registry push, the deployer calls `importServiceDeploymentLegacyImage`: Cloudly imports the attested image from its own registry into the reserved tag — an index root as it is, a single platform manifest under a one-descriptor index of the manifest's own family — and records release evidence of source `cloudly-legacy-import` naming the legacy source. Steps 3 to 5 follow unchanged; `selectTrustedImageReleaseEvidence` accepts that evidence only with `evidenceSource: 'cloudly-legacy-import'`.
|
|
3985
4006
|
- The reservation and the import need the capability `deployment:import-legacy`, which only an organization-service-slot grant can carry.
|
|
3986
4007
|
|
|
4008
|
+
An existing service deploys one of its own releases again with a release redeploy, which needs no build, push or reservation:
|
|
4009
|
+
|
|
4010
|
+
- `startServiceReleaseDeployment` (`requests.service.IRequest_Any_Cloudly_StartServiceReleaseDeployment`) names the service, the release, an idempotency key and the service's current rollout fence (`expectedRolloutGeneration` at least 1 and `expectedCurrentRolloutId`, both required: a redeploy needs a current plan). `data.validateServiceReleaseDeploymentStartInput` states its shape.
|
|
4011
|
+
- An administrator, or a deployment machine user holding `deployment:redeploy-release` on an existing-service grant, may start one; the operation's actor is the caller. Only a release that was accepted, is still retained and is still whole is deployed; the refusals are `data.serviceReleaseDeploymentRefusalCodes`.
|
|
4012
|
+
- Cloudly creates an existing-service operation whose origin is `releaseRedeploy` (`data.IReleaseRedeployReference`) and whose release tag is the operation id (`redeploy-…`, `data.releaseRedeployContract.tagPrefix`, never a version string), tags the release's root under it in the same repository, records `cloudly-release-redeploy` evidence (`data.IImageReleaseRedeployEvidence`) naming the source release, its earlier tag and its root (`selectTrustedImageReleaseEvidence` accepts it only on a release row that was accepted before), promotes it and runs the operation through rollout, route promotion and public verification itself. It declares what is in force now: the routes and proposed configuration of the operation that owns the service's current plan.
|
|
4013
|
+
- The answer is the operation as started; whether the deploy happened is read with `readServiceDeploymentStatus`. `getServiceDeploymentOperations` lists a service's operations, newest first, a page at a time (`nextBefore`).
|
|
4014
|
+
|
|
4015
|
+
`rollbackServiceImageRelease` and `createDeployment` are deprecated: the first re-opens an earlier operation and nothing calls it, the second stores a deployment record and deploys nothing.
|
|
4016
|
+
|
|
3987
4017
|
`data.IDeploymentRouteRequest.proxied` carries provider-specific DNS proxy intent as an optional boolean. New route declarations should set it explicitly; omission remains valid for persisted historical operations and legacy callers.
|
|
3988
4018
|
|
|
3989
4019
|
`data.IServiceDeploymentOperation` is the durable revisioned compare-and-set fence for this workflow. Image promotion requires Cloudly-created trusted evidence that binds the operation, actor, repository, exact tag, root digest, and OCI index media type. The service request group also exposes deployment preflight, exact-digest rollback, retry, and cleanup contracts.
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -4,6 +4,7 @@ import type { IImageRolloutStatus, IImmutableImageDeploymentPlan, TSha256Digest
|
|
|
4
4
|
import { normalizeImmutableReleaseTag, normalizeSha256Digest } from './immutableimage.js';
|
|
5
5
|
import type { ILegacyImageImportReference } from './deploymentlegacyimport.js';
|
|
6
6
|
import { validateLegacyImageImportReference } from './deploymentlegacyimport.js';
|
|
7
|
+
import type { IReleaseRedeployReference } from './deploymentreleaseredeploy.js';
|
|
7
8
|
import type { IRegistryTarget } from './registry.js';
|
|
8
9
|
import { hasExactKeys } from '../private/dataproperties.js';
|
|
9
10
|
import { normalizeServiceAbsolutePath, validateServiceContainerArgs } from './service.js';
|
|
@@ -27,6 +28,7 @@ interface IDeploymentReservationInputBase {
|
|
|
27
28
|
interface ISourceDeploymentOrigin {
|
|
28
29
|
sourceRevision: string;
|
|
29
30
|
legacyImport?: never;
|
|
31
|
+
releaseRedeploy?: never;
|
|
30
32
|
}
|
|
31
33
|
|
|
32
34
|
/**
|
|
@@ -36,6 +38,18 @@ interface ISourceDeploymentOrigin {
|
|
|
36
38
|
interface ILegacyImportDeploymentOrigin {
|
|
37
39
|
legacyImport: ILegacyImageImportReference;
|
|
38
40
|
sourceRevision?: never;
|
|
41
|
+
releaseRedeploy?: never;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
/**
|
|
45
|
+
* An existing-service deployment Cloudly started and runs itself, of one of the service's own
|
|
46
|
+
* accepted releases (`startServiceReleaseDeployment`): nothing is built or pushed, so no source
|
|
47
|
+
* revision is stated. Never reserved through `reserveServiceDeployment`.
|
|
48
|
+
*/
|
|
49
|
+
interface IReleaseRedeployDeploymentOrigin {
|
|
50
|
+
releaseRedeploy: IReleaseRedeployReference;
|
|
51
|
+
sourceRevision?: never;
|
|
52
|
+
legacyImport?: never;
|
|
39
53
|
}
|
|
40
54
|
|
|
41
55
|
export interface IExistingServiceDeploymentReservationInput
|
|
@@ -265,6 +279,9 @@ export const validateDeploymentReservationInput = (inputArg: unknown): string[]
|
|
|
265
279
|
errors.push(`${field} must be a bounded canonical identifier`);
|
|
266
280
|
}
|
|
267
281
|
}
|
|
282
|
+
if (inputArg.releaseRedeploy !== undefined) {
|
|
283
|
+
errors.push('a release redeploy is started by startServiceReleaseDeployment, never reserved');
|
|
284
|
+
}
|
|
268
285
|
if (inputArg.legacyImport !== undefined) {
|
|
269
286
|
errors.push(...validateLegacyImageImportReference(inputArg.legacyImport));
|
|
270
287
|
if (inputArg.mode !== 'greenfield') {
|
|
@@ -432,12 +449,14 @@ export interface IServiceDeploymentOperation {
|
|
|
432
449
|
|
|
433
450
|
/**
|
|
434
451
|
* An operation's durable state. It states where its image comes from exactly as its reservation
|
|
435
|
-
* did: a `sourceRevision` for an image its deployer builds,
|
|
436
|
-
* for a legacy service's attested image Cloudly imports
|
|
452
|
+
* did: a `sourceRevision` for an image its deployer builds, a `legacyImport` (greenfield only)
|
|
453
|
+
* for a legacy service's attested image Cloudly imports, or a `releaseRedeploy` (existing-service
|
|
454
|
+
* only, never reserved) for one of the service's own releases Cloudly deploys again.
|
|
437
455
|
*/
|
|
438
456
|
export type IServiceDeploymentOperationData = IServiceDeploymentOperationStateData & (
|
|
439
457
|
| ISourceDeploymentOrigin
|
|
440
458
|
| ILegacyImportDeploymentOrigin
|
|
459
|
+
| IReleaseRedeployDeploymentOrigin
|
|
441
460
|
);
|
|
442
461
|
|
|
443
462
|
interface IServiceDeploymentOperationStateData {
|
|
@@ -0,0 +1,182 @@
|
|
|
1
|
+
import { readDataProperties } from '../private/dataproperties.js';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Release redeploy: an existing service deploys one of its own releases again, from Cloudly's
|
|
5
|
+
* registry, without a build or a push.
|
|
6
|
+
*
|
|
7
|
+
* An administrator (or a deployment machine user granted `deployment:redeploy-release` on the
|
|
8
|
+
* service) starts it with `startServiceReleaseDeployment`, naming the release and the service's
|
|
9
|
+
* current rollout fence. Cloudly then runs the whole deployment itself: it creates an
|
|
10
|
+
* existing-service operation whose origin is `releaseRedeploy`, tags the release's root under the
|
|
11
|
+
* operation's own tag in the service's repository (the tag is the operation id, which starts with
|
|
12
|
+
* {@link releaseRedeployContract.tagPrefix} and so can never be a version string), records
|
|
13
|
+
* `cloudly-release-redeploy` evidence naming the source release, promotes the release and drives
|
|
14
|
+
* the operation through rollout, route promotion and public verification to `succeeded` or
|
|
15
|
+
* `failed`. The operation's status is the only statement that the deploy happened.
|
|
16
|
+
*
|
|
17
|
+
* What the redeploy declares is the declaration in force now: the routes, public domains and
|
|
18
|
+
* proposed configuration of the operation that owns the service's current rollout plan, never the
|
|
19
|
+
* declaration the source release was first deployed with.
|
|
20
|
+
*
|
|
21
|
+
* Only a release that was accepted (promoted successfully before), is still retained by the
|
|
22
|
+
* registry's retention policy and is still whole (every manifest and blob present) can be
|
|
23
|
+
* redeployed. A release accepted before the current one is rolled back to (plan mode `rollback`);
|
|
24
|
+
* the current release, or one accepted after it, is promoted again (plan mode `promotion`).
|
|
25
|
+
*/
|
|
26
|
+
|
|
27
|
+
/** Where a release redeploy's image comes from: one release of the service itself. */
|
|
28
|
+
export interface IReleaseRedeployReference {
|
|
29
|
+
/** The release whose registry root the redeploy deploys again. */
|
|
30
|
+
sourceReleaseId: string;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
export const releaseRedeployContract = Object.freeze({
|
|
34
|
+
/**
|
|
35
|
+
* Every release redeploy's operation id, and therefore its release tag, starts with this. A
|
|
36
|
+
* semantic version never does, so a redeploy tag never collides with a version tag.
|
|
37
|
+
*/
|
|
38
|
+
tagPrefix: 'redeploy-',
|
|
39
|
+
/** Operations one history read answers when it names no limit. */
|
|
40
|
+
historyDefaultLimit: 20,
|
|
41
|
+
/** Operations one history read answers at most. */
|
|
42
|
+
historyMaximumLimit: 50,
|
|
43
|
+
});
|
|
44
|
+
|
|
45
|
+
/**
|
|
46
|
+
* The named refusals `startServiceReleaseDeployment` answers in its error's `code`, beside the
|
|
47
|
+
* shared deployment codes it reuses (`DEPLOYMENT_CAPABILITY_FORBIDDEN`, `DEPLOYMENT_IDENTITY_INVALID`,
|
|
48
|
+
* `DEPLOY_ON_PUSH_MUST_BE_DISABLED`, `DEPLOYMENT_ROLLOUT_FENCE_CONFLICT`,
|
|
49
|
+
* `DEPLOYMENT_IDEMPOTENCY_CONFLICT`, `DEPLOYMENT_PREFLIGHT_UNAVAILABLE`).
|
|
50
|
+
*
|
|
51
|
+
* - `DEPLOYMENT_REDEPLOY_INVALID`: the request is malformed.
|
|
52
|
+
* - `DEPLOYMENT_SERVICE_NOT_FOUND`: no such service.
|
|
53
|
+
* - `DEPLOYMENT_REDEPLOY_NO_CURRENT_PLAN`: the service has no current rollout plan to redeploy over.
|
|
54
|
+
* - `DEPLOYMENT_REDEPLOY_DECLARATION_UNAVAILABLE`: the plan is not owned by a deployment operation
|
|
55
|
+
* whose declaration Cloudly can state again (an adoption, or an operation that is gone).
|
|
56
|
+
* - `DEPLOYMENT_OPERATION_IN_FLIGHT`: another deployment operation of the service is not finished.
|
|
57
|
+
* - `DEPLOYMENT_RELEASE_NOT_FOUND`: no such release of this service.
|
|
58
|
+
* - `DEPLOYMENT_RELEASE_NOT_ACCEPTED`: the release was never promoted successfully.
|
|
59
|
+
* - `DEPLOYMENT_RELEASE_NOT_RETAINED`: retention no longer keeps the release.
|
|
60
|
+
* - `DEPLOYMENT_RELEASE_INCOMPLETE`: a manifest or blob of the release is missing from the registry.
|
|
61
|
+
* - `DEPLOYMENT_TARGET_SWARM_PHASE`: the service's rollout targets a cluster still in its Swarm
|
|
62
|
+
* phase, which a Cloudly-run deployment does not drive.
|
|
63
|
+
* - `DEPLOYMENT_TARGET_UNAVAILABLE`: the service's rollout target cannot be resolved.
|
|
64
|
+
*/
|
|
65
|
+
export const serviceReleaseDeploymentRefusalCodes = [
|
|
66
|
+
'DEPLOYMENT_REDEPLOY_INVALID',
|
|
67
|
+
'DEPLOYMENT_SERVICE_NOT_FOUND',
|
|
68
|
+
'DEPLOYMENT_REDEPLOY_NO_CURRENT_PLAN',
|
|
69
|
+
'DEPLOYMENT_REDEPLOY_DECLARATION_UNAVAILABLE',
|
|
70
|
+
'DEPLOYMENT_OPERATION_IN_FLIGHT',
|
|
71
|
+
'DEPLOYMENT_RELEASE_NOT_FOUND',
|
|
72
|
+
'DEPLOYMENT_RELEASE_NOT_ACCEPTED',
|
|
73
|
+
'DEPLOYMENT_RELEASE_NOT_RETAINED',
|
|
74
|
+
'DEPLOYMENT_RELEASE_INCOMPLETE',
|
|
75
|
+
'DEPLOYMENT_TARGET_SWARM_PHASE',
|
|
76
|
+
'DEPLOYMENT_TARGET_UNAVAILABLE',
|
|
77
|
+
] as const;
|
|
78
|
+
|
|
79
|
+
export type TServiceReleaseDeploymentRefusalCode = typeof serviceReleaseDeploymentRefusalCodes[number];
|
|
80
|
+
|
|
81
|
+
/** What `startServiceReleaseDeployment` states besides the caller's identity. */
|
|
82
|
+
export interface IServiceReleaseDeploymentStartInput {
|
|
83
|
+
serviceId: string;
|
|
84
|
+
releaseId: string;
|
|
85
|
+
/** Binds one start; the same key with the same request answers the operation it started. */
|
|
86
|
+
idempotencyKey: string;
|
|
87
|
+
/** The service's current rollout generation: at least 1, since a redeploy needs a current plan. */
|
|
88
|
+
expectedRolloutGeneration: number;
|
|
89
|
+
/** The service's current rollout id. */
|
|
90
|
+
expectedCurrentRolloutId: string;
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
/** What `getServiceDeploymentOperations` states besides the caller's identity. */
|
|
94
|
+
export interface IServiceDeploymentOperationHistoryQuery {
|
|
95
|
+
serviceId: string;
|
|
96
|
+
/** 1 to `releaseRedeployContract.historyMaximumLimit`; `historyDefaultLimit` when omitted. */
|
|
97
|
+
limit?: number;
|
|
98
|
+
/** An operation id the previous page answered as `nextBefore`: the page starts after it. */
|
|
99
|
+
before?: string;
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
const redeployIdentifierRegex = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
|
|
103
|
+
|
|
104
|
+
const isRedeployIdentifier = (valueArg: unknown): valueArg is string => (
|
|
105
|
+
typeof valueArg === 'string' && redeployIdentifierRegex.test(valueArg)
|
|
106
|
+
);
|
|
107
|
+
|
|
108
|
+
const startInputKeys = [
|
|
109
|
+
'serviceId',
|
|
110
|
+
'releaseId',
|
|
111
|
+
'idempotencyKey',
|
|
112
|
+
'expectedRolloutGeneration',
|
|
113
|
+
'expectedCurrentRolloutId',
|
|
114
|
+
] as const;
|
|
115
|
+
|
|
116
|
+
/** Every error of a start input; empty when it is exactly one valid input. */
|
|
117
|
+
export const validateServiceReleaseDeploymentStartInput = (inputArg: unknown): string[] => {
|
|
118
|
+
const input = readDataProperties(inputArg);
|
|
119
|
+
if (input === null) return ['release deployment start input must be a plain object'];
|
|
120
|
+
const errors: string[] = [];
|
|
121
|
+
const keys = Object.keys(input);
|
|
122
|
+
if (keys.length !== startInputKeys.length
|
|
123
|
+
|| !startInputKeys.every((keyArg) => keys.includes(keyArg))) {
|
|
124
|
+
errors.push(`release deployment start input must carry exactly ${startInputKeys.join(', ')}`);
|
|
125
|
+
}
|
|
126
|
+
for (const field of ['serviceId', 'releaseId', 'idempotencyKey', 'expectedCurrentRolloutId'] as const) {
|
|
127
|
+
if (!isRedeployIdentifier(input[field])) {
|
|
128
|
+
errors.push(`${field} must be a bounded canonical identifier`);
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
if (!Number.isSafeInteger(input.expectedRolloutGeneration)
|
|
132
|
+
|| (input.expectedRolloutGeneration as number) < 1) {
|
|
133
|
+
errors.push('expectedRolloutGeneration must be the current generation, at least 1');
|
|
134
|
+
}
|
|
135
|
+
return errors;
|
|
136
|
+
};
|
|
137
|
+
|
|
138
|
+
/** Every error of a release redeploy reference; empty when it is exactly one valid reference. */
|
|
139
|
+
export const validateReleaseRedeployReference = (referenceArg: unknown): string[] => {
|
|
140
|
+
const reference = readDataProperties(referenceArg);
|
|
141
|
+
if (reference === null) return ['releaseRedeploy must be a plain object'];
|
|
142
|
+
const keys = Object.keys(reference);
|
|
143
|
+
const errors: string[] = [];
|
|
144
|
+
if (keys.length !== 1 || keys[0] !== 'sourceReleaseId') {
|
|
145
|
+
errors.push('releaseRedeploy must carry exactly sourceReleaseId');
|
|
146
|
+
}
|
|
147
|
+
if (!isRedeployIdentifier(reference.sourceReleaseId)) {
|
|
148
|
+
errors.push('releaseRedeploy.sourceReleaseId must be a bounded canonical identifier');
|
|
149
|
+
}
|
|
150
|
+
return errors;
|
|
151
|
+
};
|
|
152
|
+
|
|
153
|
+
/** Every error of a history query; empty when it is exactly one valid query. */
|
|
154
|
+
export const validateServiceDeploymentOperationHistoryQuery = (queryArg: unknown): string[] => {
|
|
155
|
+
const query = readDataProperties(queryArg);
|
|
156
|
+
if (query === null) return ['deployment operation history query must be a plain object'];
|
|
157
|
+
const errors: string[] = [];
|
|
158
|
+
if (Object.keys(query).some((keyArg) => !['serviceId', 'limit', 'before'].includes(keyArg))) {
|
|
159
|
+
errors.push('deployment operation history query carries only serviceId, limit and before');
|
|
160
|
+
}
|
|
161
|
+
if (!isRedeployIdentifier(query.serviceId)) {
|
|
162
|
+
errors.push('serviceId must be a bounded canonical identifier');
|
|
163
|
+
}
|
|
164
|
+
if (query.limit !== undefined
|
|
165
|
+
&& (!Number.isSafeInteger(query.limit)
|
|
166
|
+
|| (query.limit as number) < 1
|
|
167
|
+
|| (query.limit as number) > releaseRedeployContract.historyMaximumLimit)) {
|
|
168
|
+
errors.push(`limit must be an integer from 1 to ${releaseRedeployContract.historyMaximumLimit}`);
|
|
169
|
+
}
|
|
170
|
+
if (query.before !== undefined && !isRedeployIdentifier(query.before)) {
|
|
171
|
+
errors.push('before must be a bounded canonical operation id');
|
|
172
|
+
}
|
|
173
|
+
return errors;
|
|
174
|
+
};
|
|
175
|
+
|
|
176
|
+
/** Whether a release tag is a release redeploy's own tag. */
|
|
177
|
+
export const isReleaseRedeployTag = (tagArg: unknown): boolean => (
|
|
178
|
+
typeof tagArg === 'string'
|
|
179
|
+
&& tagArg.startsWith(releaseRedeployContract.tagPrefix)
|
|
180
|
+
&& tagArg.length > releaseRedeployContract.tagPrefix.length
|
|
181
|
+
&& /^[A-Za-z0-9_][A-Za-z0-9._-]{0,127}$/.test(tagArg)
|
|
182
|
+
);
|