@serve.zone/interfaces 13.0.1 → 15.0.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 +17 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/deploymentoperation.d.ts +161 -0
- package/dist_ts/data/deploymentoperation.js +213 -0
- package/dist_ts/data/deploymentpreflight.d.ts +18 -16
- package/dist_ts/data/deploymentpreflight.js +75 -42
- package/dist_ts/data/immutableimage.d.ts +35 -1
- package/dist_ts/data/immutableimage.js +88 -1
- package/dist_ts/data/index.d.ts +1 -0
- package/dist_ts/data/index.js +2 -1
- package/dist_ts/data/service.d.ts +3 -1
- package/dist_ts/data/user.d.ts +14 -2
- package/dist_ts/data/user.js +54 -2
- package/dist_ts/requests/admin.d.ts +4 -6
- package/dist_ts/requests/service.d.ts +80 -5
- package/package.json +1 -1
- package/readme.md +14 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/deploymentoperation.ts +441 -0
- package/ts/data/deploymentpreflight.ts +128 -73
- package/ts/data/immutableimage.ts +120 -1
- package/ts/data/index.ts +1 -0
- package/ts/data/service.ts +3 -1
- package/ts/data/user.ts +85 -2
- package/ts/requests/admin.ts +4 -6
- package/ts/requests/service.ts +109 -5
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { normalizeSha256Digest } from './immutableimage.js';
|
|
1
|
+
import { normalizeImmutableReleaseTag, normalizeSha256Digest } from './immutableimage.js';
|
|
2
|
+
import { canonicalizeDeploymentHostname, getDeploymentRouteVerificationHostname, normalizeDeploymentReadinessPath, validateDeploymentProposedConfiguration, } from './deploymentoperation.js';
|
|
2
3
|
const fullGitRevisionRegex = /^[a-f0-9]{40}$/;
|
|
3
4
|
const semanticVersionRegex = /^(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)(?:-(?:0|[1-9][0-9]*|[0-9]*[A-Za-z-][0-9A-Za-z-]*)(?:\.(?:0|[1-9][0-9]*|[0-9]*[A-Za-z-][0-9A-Za-z-]*))*)?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/;
|
|
4
5
|
const requiredEvidenceKinds = new Set([
|
|
@@ -51,42 +52,13 @@ export const validateDeploymentPreflightRequest = (requestArg) => {
|
|
|
51
52
|
const configuration = isRecord(requestArg.proposedConfiguration)
|
|
52
53
|
? requestArg.proposedConfiguration
|
|
53
54
|
: undefined;
|
|
54
|
-
const
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
const capabilities = configuration?.requiredCapabilities;
|
|
62
|
-
const volumeMounts = configuration?.volumeMounts;
|
|
63
|
-
if (!configuration
|
|
64
|
-
|| configuration.schemaVersion !== 1
|
|
65
|
-
|| typeof configuration.declarationComplete !== 'boolean'
|
|
66
|
-
|| typeof configuration.projectName !== 'string'
|
|
67
|
-
|| !configuration.projectName.trim()
|
|
68
|
-
|| configuration.projectName.length > 200
|
|
69
|
-
|| !stringArrayValid(configuration.targetPlatforms, 8, /^[a-z0-9][a-z0-9._-]*\/[a-z0-9][a-z0-9._-]*$/)
|
|
70
|
-
|| !stringArrayValid(configuration.publicDomains, 32, /^[a-z0-9](?:[a-z0-9.-]*[a-z0-9])?$/)
|
|
71
|
-
|| !stringArrayValid(configuration.environmentVariableNames, 256, /^[A-Z_][A-Z0-9_]*$/)
|
|
72
|
-
|| !stringArrayValid(configuration.secretReferenceIds, 64, /^[A-Za-z0-9][A-Za-z0-9:._-]*$/)
|
|
73
|
-
|| !Array.isArray(configuration.containerPorts)
|
|
74
|
-
|| configuration.containerPorts.length > 64
|
|
75
|
-
|| configuration.containerPorts.some((portArg) => !Number.isSafeInteger(portArg) || portArg < 1 || portArg > 65535)
|
|
76
|
-
|| new Set(configuration.containerPorts).size !== configuration.containerPorts.length
|
|
77
|
-
|| !Array.isArray(volumeMounts)
|
|
78
|
-
|| volumeMounts.length > 32
|
|
79
|
-
|| volumeMounts.some((mountArg) => !isRecord(mountArg)
|
|
80
|
-
|| typeof mountArg.mountPath !== 'string'
|
|
81
|
-
|| !/^\/[A-Za-z0-9._/-]{0,254}$/.test(mountArg.mountPath)
|
|
82
|
-
|| (mountArg.storageClass !== 'corestore' && mountArg.storageClass !== 'ephemeral')
|
|
83
|
-
|| (mountArg.capability !== undefined
|
|
84
|
-
&& mountArg.capability !== 'database'
|
|
85
|
-
&& mountArg.capability !== 'objectstorage'))
|
|
86
|
-
|| !Array.isArray(capabilities)
|
|
87
|
-
|| capabilities.length > 2
|
|
88
|
-
|| capabilities.some((capabilityArg) => capabilityArg !== 'database' && capabilityArg !== 'objectstorage')
|
|
89
|
-
|| new Set(capabilities).size !== capabilities.length) {
|
|
55
|
+
const configurationContainerPorts = Array.isArray(configuration?.containerPorts)
|
|
56
|
+
? configuration.containerPorts
|
|
57
|
+
: [];
|
|
58
|
+
const configurationPublicDomains = Array.isArray(configuration?.publicDomains)
|
|
59
|
+
? configuration.publicDomains.filter((domainArg) => (typeof domainArg === 'string'))
|
|
60
|
+
: [];
|
|
61
|
+
if (validateDeploymentProposedConfiguration(configuration).length > 0) {
|
|
90
62
|
blockers.push({ code: 'INVALID_REQUEST', message: 'The proposed deployment configuration is malformed.' });
|
|
91
63
|
}
|
|
92
64
|
if (requestArg.ociIndexDigest !== undefined
|
|
@@ -95,12 +67,73 @@ export const validateDeploymentPreflightRequest = (requestArg) => {
|
|
|
95
67
|
blockers.push({ code: 'INVALID_REQUEST', message: 'OCI index digest is malformed.' });
|
|
96
68
|
}
|
|
97
69
|
if (requestArg.releaseTag !== undefined
|
|
98
|
-
&& (
|
|
99
|
-
|| !/^[A-Za-z0-9_][A-Za-z0-9._-]{0,127}$/.test(requestArg.releaseTag))) {
|
|
70
|
+
&& !normalizeImmutableReleaseTag(requestArg.releaseTag)) {
|
|
100
71
|
blockers.push({ code: 'INVALID_REQUEST', message: 'Release tag is malformed.' });
|
|
101
72
|
}
|
|
102
|
-
|
|
103
|
-
|
|
73
|
+
const mode = requestArg.mode === undefined && requestArg.greenfield === true
|
|
74
|
+
? 'greenfield'
|
|
75
|
+
: requestArg.mode;
|
|
76
|
+
if (mode !== 'greenfield' && mode !== 'existing-service') {
|
|
77
|
+
blockers.push({ code: 'INVALID_REQUEST', message: 'A supported deployment mode is required.' });
|
|
78
|
+
}
|
|
79
|
+
if (requestArg.greenfield !== undefined
|
|
80
|
+
&& (requestArg.greenfield !== true || mode !== 'greenfield')) {
|
|
81
|
+
blockers.push({ code: 'INVALID_REQUEST', message: 'Legacy greenfield mode is contradictory.' });
|
|
82
|
+
}
|
|
83
|
+
if (requestArg.phase !== undefined
|
|
84
|
+
&& requestArg.phase !== 'reserve'
|
|
85
|
+
&& requestArg.phase !== 'promote'
|
|
86
|
+
&& requestArg.phase !== 'route') {
|
|
87
|
+
blockers.push({ code: 'INVALID_REQUEST', message: 'Deployment preflight phase is invalid.' });
|
|
88
|
+
}
|
|
89
|
+
if (requestArg.organizationId !== undefined
|
|
90
|
+
&& (typeof requestArg.organizationId !== 'string'
|
|
91
|
+
|| !/^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/.test(requestArg.organizationId))) {
|
|
92
|
+
blockers.push({ code: 'INVALID_REQUEST', message: 'Deployment organization identifier is malformed.' });
|
|
93
|
+
}
|
|
94
|
+
if (requestArg.operationId !== undefined
|
|
95
|
+
&& (typeof requestArg.operationId !== 'string'
|
|
96
|
+
|| !/^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/.test(requestArg.operationId))) {
|
|
97
|
+
blockers.push({ code: 'INVALID_REQUEST', message: 'Deployment operation identifier is malformed.' });
|
|
98
|
+
}
|
|
99
|
+
const routeHostnames = Array.isArray(requestArg.routes)
|
|
100
|
+
? requestArg.routes.map((routeArg) => (isRecord(routeArg) && typeof routeArg.hostname === 'string'
|
|
101
|
+
? routeArg.hostname
|
|
102
|
+
: undefined))
|
|
103
|
+
: [];
|
|
104
|
+
if (requestArg.routes !== undefined && (!Array.isArray(requestArg.routes)
|
|
105
|
+
|| requestArg.routes.length > 32
|
|
106
|
+
|| new Set(routeHostnames).size !== routeHostnames.length
|
|
107
|
+
|| requestArg.routes.some((routeArg) => !isRecord(routeArg)
|
|
108
|
+
|| typeof routeArg.hostname !== 'string'
|
|
109
|
+
|| canonicalizeDeploymentHostname(routeArg.hostname) !== routeArg.hostname
|
|
110
|
+
|| !Number.isSafeInteger(routeArg.targetPort)
|
|
111
|
+
|| (typeof routeArg.targetPort === 'number'
|
|
112
|
+
&& (routeArg.targetPort < 1 || routeArg.targetPort > 65535))
|
|
113
|
+
|| !configurationContainerPorts.includes(routeArg.targetPort)
|
|
114
|
+
|| (routeArg.verificationHostname !== undefined
|
|
115
|
+
&& (typeof routeArg.verificationHostname !== 'string'
|
|
116
|
+
|| canonicalizeDeploymentHostname(routeArg.verificationHostname)
|
|
117
|
+
!== routeArg.verificationHostname))
|
|
118
|
+
|| getDeploymentRouteVerificationHostname(routeArg) === undefined
|
|
119
|
+
|| (routeArg.readinessPath !== undefined
|
|
120
|
+
&& (typeof routeArg.readinessPath !== 'string'
|
|
121
|
+
|| normalizeDeploymentReadinessPath(routeArg.readinessPath) !== routeArg.readinessPath))
|
|
122
|
+
|| (routeArg.expectedStatusCodes !== undefined
|
|
123
|
+
&& (!Array.isArray(routeArg.expectedStatusCodes)
|
|
124
|
+
|| routeArg.expectedStatusCodes.length < 1
|
|
125
|
+
|| routeArg.expectedStatusCodes.length > 16
|
|
126
|
+
|| new Set(routeArg.expectedStatusCodes).size !== routeArg.expectedStatusCodes.length
|
|
127
|
+
|| routeArg.expectedStatusCodes.some((statusArg) => (!Number.isSafeInteger(statusArg) || statusArg < 200 || statusArg > 299))))))) {
|
|
128
|
+
blockers.push({ code: 'INVALID_REQUEST', message: 'Deployment route declaration is malformed.' });
|
|
129
|
+
}
|
|
130
|
+
if (mode === 'greenfield' && Array.isArray(requestArg.routes)
|
|
131
|
+
&& JSON.stringify([...new Set(requestArg.routes.map((routeArg) => (isRecord(routeArg) && typeof routeArg.hostname === 'string' ? routeArg.hostname : '')))].sort())
|
|
132
|
+
!== JSON.stringify([...new Set(configurationPublicDomains)].sort())) {
|
|
133
|
+
blockers.push({
|
|
134
|
+
code: 'INVALID_REQUEST',
|
|
135
|
+
message: 'Greenfield routes must exactly match proposed public domains.',
|
|
136
|
+
});
|
|
104
137
|
}
|
|
105
138
|
return blockers;
|
|
106
139
|
};
|
|
@@ -153,4 +186,4 @@ export const validateDeploymentReleaseEvidence = (argsArg) => {
|
|
|
153
186
|
}
|
|
154
187
|
return blockers;
|
|
155
188
|
};
|
|
156
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploymentpreflight.js","sourceRoot":"","sources":["../../ts/data/deploymentpreflight.ts"],"names":[],"mappings":"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"}
|
|
189
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploymentpreflight.js","sourceRoot":"","sources":["../../ts/data/deploymentpreflight.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,11 +29,41 @@ export interface IImageRelease {
|
|
|
29
29
|
firstObservedAt: number;
|
|
30
30
|
lastObservedAt: number;
|
|
31
31
|
observationCount: number;
|
|
32
|
+
/** Cloudly-created evidence from an authenticated exact-tag registry PUT. */
|
|
33
|
+
trustedEvidence: IImageReleaseTrustedEvidence[];
|
|
32
34
|
acceptedAt?: number;
|
|
33
35
|
lastPromotedAt?: number;
|
|
34
36
|
promotionCount?: number;
|
|
35
37
|
};
|
|
36
38
|
}
|
|
39
|
+
export interface IImageReleaseTrustedEvidence {
|
|
40
|
+
source: 'cloudly-registry';
|
|
41
|
+
/** Deterministic ID for an authenticated registry acceptance event/retry. */
|
|
42
|
+
evidenceId: string;
|
|
43
|
+
operationId: string;
|
|
44
|
+
actorUserId: string;
|
|
45
|
+
registryHost: string;
|
|
46
|
+
repository: string;
|
|
47
|
+
tag: string;
|
|
48
|
+
registryRootDigest: TSha256Digest;
|
|
49
|
+
manifestMediaType: TOciManifestMediaType;
|
|
50
|
+
recordedAt: number;
|
|
51
|
+
}
|
|
52
|
+
export declare const selectTrustedImageReleaseEvidence: (argsArg: {
|
|
53
|
+
release: IImageRelease;
|
|
54
|
+
operationId: string;
|
|
55
|
+
actorUserId: string;
|
|
56
|
+
serviceId: string;
|
|
57
|
+
imageId: string;
|
|
58
|
+
registryHost: string;
|
|
59
|
+
repository: string;
|
|
60
|
+
tag: string;
|
|
61
|
+
digest: TSha256Digest;
|
|
62
|
+
}) => {
|
|
63
|
+
evidence?: IImageReleaseTrustedEvidence;
|
|
64
|
+
errors: string[];
|
|
65
|
+
};
|
|
66
|
+
export declare const normalizeImmutableReleaseTag: (tagArg: unknown) => string | undefined;
|
|
37
67
|
export interface IImmutableImageTargetScope {
|
|
38
68
|
targetClusterIds: string[];
|
|
39
69
|
targetNodeNames: string[];
|
|
@@ -46,6 +76,8 @@ export interface IImmutableImageDeploymentPlan {
|
|
|
46
76
|
rolloutId: string;
|
|
47
77
|
rolloutGeneration: number;
|
|
48
78
|
releaseId: string;
|
|
79
|
+
operationId: string;
|
|
80
|
+
releaseTag: string;
|
|
49
81
|
registryHost: string;
|
|
50
82
|
repository: string;
|
|
51
83
|
requestedDigest: TSha256Digest;
|
|
@@ -66,6 +98,8 @@ interface IRuntimeImageEvidenceBase {
|
|
|
66
98
|
taskReportedDigest?: TSha256Digest;
|
|
67
99
|
containerImageId?: string;
|
|
68
100
|
containerConfigImageReference?: string;
|
|
101
|
+
/** Digest observed from local Docker image state without implying rollout verification. */
|
|
102
|
+
observedDigest?: TSha256Digest;
|
|
69
103
|
resolvedDigest?: TSha256Digest;
|
|
70
104
|
platformManifestDigest?: TSha256Digest;
|
|
71
105
|
repoDigests?: string[];
|
|
@@ -136,7 +170,7 @@ export interface IImageRolloutStatus {
|
|
|
136
170
|
updatedAt: number;
|
|
137
171
|
reporters: IImageRolloutReporterStatus[];
|
|
138
172
|
}
|
|
139
|
-
export declare const normalizeSha256Digest: (digest:
|
|
173
|
+
export declare const normalizeSha256Digest: (digest: unknown) => TSha256Digest | undefined;
|
|
140
174
|
export declare const isSha256Digest: (digest: string) => digest is TSha256Digest;
|
|
141
175
|
export declare const buildDigestPinnedImageReference: (registryHost: string, repository: string, digest: TSha256Digest) => string;
|
|
142
176
|
export declare const getDigestFromPinnedImageReference: (imageReference: string) => TSha256Digest | undefined;
|
|
@@ -1,5 +1,80 @@
|
|
|
1
|
+
export const selectTrustedImageReleaseEvidence = (argsArg) => {
|
|
2
|
+
const evidenceFingerprint = (evidenceArg) => [
|
|
3
|
+
evidenceArg.source,
|
|
4
|
+
evidenceArg.evidenceId,
|
|
5
|
+
evidenceArg.operationId,
|
|
6
|
+
evidenceArg.actorUserId,
|
|
7
|
+
evidenceArg.registryHost,
|
|
8
|
+
evidenceArg.repository,
|
|
9
|
+
evidenceArg.tag,
|
|
10
|
+
evidenceArg.registryRootDigest,
|
|
11
|
+
evidenceArg.manifestMediaType,
|
|
12
|
+
evidenceArg.recordedAt,
|
|
13
|
+
].join('\u0000');
|
|
14
|
+
const uniqueEvidence = new Map();
|
|
15
|
+
const errors = [];
|
|
16
|
+
for (const evidence of argsArg.release.data.trustedEvidence || []) {
|
|
17
|
+
const existing = uniqueEvidence.get(evidence.evidenceId);
|
|
18
|
+
if (existing && evidenceFingerprint(existing) !== evidenceFingerprint(evidence)) {
|
|
19
|
+
errors.push('trusted release evidence identity is contradictory');
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
uniqueEvidence.set(evidence.evidenceId, evidence);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
const evidenceMatches = [...uniqueEvidence.values()].filter((evidenceArg) => (evidenceArg.source === 'cloudly-registry'
|
|
26
|
+
&& evidenceArg.operationId === argsArg.operationId
|
|
27
|
+
&& evidenceArg.actorUserId === argsArg.actorUserId
|
|
28
|
+
&& evidenceArg.registryHost === argsArg.registryHost
|
|
29
|
+
&& evidenceArg.repository === argsArg.repository
|
|
30
|
+
&& evidenceArg.tag === argsArg.tag
|
|
31
|
+
&& evidenceArg.registryRootDigest === argsArg.digest));
|
|
32
|
+
if (argsArg.release.data.serviceId !== argsArg.serviceId
|
|
33
|
+
|| argsArg.release.data.imageId !== argsArg.imageId
|
|
34
|
+
|| argsArg.release.data.registryHost !== argsArg.registryHost
|
|
35
|
+
|| argsArg.release.data.repository !== argsArg.repository
|
|
36
|
+
|| argsArg.release.data.registryRootDigest !== argsArg.digest) {
|
|
37
|
+
errors.push('release target or root digest does not match the deployment fence');
|
|
38
|
+
}
|
|
39
|
+
if (!argsArg.release.data.observedTags.includes(argsArg.tag)) {
|
|
40
|
+
errors.push('release has not observed the exact deployment tag');
|
|
41
|
+
}
|
|
42
|
+
if (evidenceMatches.length === 0) {
|
|
43
|
+
errors.push('trusted release evidence is missing');
|
|
44
|
+
}
|
|
45
|
+
else if (evidenceMatches.length > 1) {
|
|
46
|
+
errors.push('trusted release evidence is ambiguous');
|
|
47
|
+
}
|
|
48
|
+
const evidence = evidenceMatches.length === 1 ? evidenceMatches[0] : undefined;
|
|
49
|
+
if (evidence && evidence.manifestMediaType !== argsArg.release.data.manifestMediaType) {
|
|
50
|
+
errors.push('trusted release and release root media types disagree');
|
|
51
|
+
}
|
|
52
|
+
if (![
|
|
53
|
+
'application/vnd.oci.image.index.v1+json',
|
|
54
|
+
'application/vnd.docker.distribution.manifest.list.v2+json',
|
|
55
|
+
].includes(argsArg.release.data.manifestMediaType)
|
|
56
|
+
|| (evidence && ![
|
|
57
|
+
'application/vnd.oci.image.index.v1+json',
|
|
58
|
+
'application/vnd.docker.distribution.manifest.list.v2+json',
|
|
59
|
+
].includes(evidence.manifestMediaType))) {
|
|
60
|
+
errors.push('trusted release evidence must identify an OCI image index');
|
|
61
|
+
}
|
|
62
|
+
return { evidence, errors };
|
|
63
|
+
};
|
|
64
|
+
const immutableReleaseTagRegex = /^[A-Za-z0-9_][A-Za-z0-9._-]{0,127}$/;
|
|
65
|
+
export const normalizeImmutableReleaseTag = (tagArg) => {
|
|
66
|
+
if (typeof tagArg !== 'string'
|
|
67
|
+
|| tagArg.trim() !== tagArg
|
|
68
|
+
|| !immutableReleaseTagRegex.test(tagArg)
|
|
69
|
+
|| tagArg.toLowerCase() === 'latest') {
|
|
70
|
+
return undefined;
|
|
71
|
+
}
|
|
72
|
+
return tagArg;
|
|
73
|
+
};
|
|
1
74
|
const sha256DigestRegex = /^sha256:[a-f0-9]{64}$/;
|
|
2
75
|
export const normalizeSha256Digest = (digest) => {
|
|
76
|
+
if (typeof digest !== 'string')
|
|
77
|
+
return undefined;
|
|
3
78
|
const normalizedDigest = digest.trim().toLowerCase();
|
|
4
79
|
return sha256DigestRegex.test(normalizedDigest)
|
|
5
80
|
? normalizedDigest
|
|
@@ -32,6 +107,18 @@ export const validateImmutableImageDeploymentPlan = (planArg) => {
|
|
|
32
107
|
if (!Number.isSafeInteger(planArg.createdAt) || planArg.createdAt < 1) {
|
|
33
108
|
errors.push('createdAt must be a positive safe integer');
|
|
34
109
|
}
|
|
110
|
+
if (!planArg.operationId || planArg.operationId.length > 200) {
|
|
111
|
+
errors.push('operationId must be a bounded non-empty identifier');
|
|
112
|
+
}
|
|
113
|
+
if (!normalizeImmutableReleaseTag(planArg.releaseTag)) {
|
|
114
|
+
errors.push('releaseTag must be a non-latest canonical OCI tag');
|
|
115
|
+
}
|
|
116
|
+
if (![
|
|
117
|
+
'application/vnd.oci.image.index.v1+json',
|
|
118
|
+
'application/vnd.docker.distribution.manifest.list.v2+json',
|
|
119
|
+
].includes(planArg.manifestMediaType)) {
|
|
120
|
+
errors.push('immutable rollout root must be an OCI image index');
|
|
121
|
+
}
|
|
35
122
|
let expectedReference;
|
|
36
123
|
try {
|
|
37
124
|
expectedReference = buildDigestPinnedImageReference(planArg.registryHost, planArg.repository, planArg.requestedDigest);
|
|
@@ -143,4 +230,4 @@ export const validateImageRolloutStatus = (statusArg) => {
|
|
|
143
230
|
}
|
|
144
231
|
return errors;
|
|
145
232
|
};
|
|
146
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"immutableimage.js","sourceRoot":"","sources":["../../ts/data/immutableimage.ts"],"names":[],"mappings":"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"}
|
|
233
|
+
//# 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
|
@@ -2,6 +2,7 @@ export * from './cloudlyconfig.js';
|
|
|
2
2
|
export * from './cluster.js';
|
|
3
3
|
export * from './config.js';
|
|
4
4
|
export * from './deployment.js';
|
|
5
|
+
export * from './deploymentoperation.js';
|
|
5
6
|
export * from './deploymentpreflight.js';
|
|
6
7
|
export * from './migration.js';
|
|
7
8
|
export * from './dns.js';
|
package/dist_ts/data/index.js
CHANGED
|
@@ -2,6 +2,7 @@ export * from './cloudlyconfig.js';
|
|
|
2
2
|
export * from './cluster.js';
|
|
3
3
|
export * from './config.js';
|
|
4
4
|
export * from './deployment.js';
|
|
5
|
+
export * from './deploymentoperation.js';
|
|
5
6
|
export * from './deploymentpreflight.js';
|
|
6
7
|
export * from './migration.js';
|
|
7
8
|
export * from './dns.js';
|
|
@@ -31,4 +32,4 @@ export * from './taskexecution.js';
|
|
|
31
32
|
export * from './traffic.js';
|
|
32
33
|
export * from './user.js';
|
|
33
34
|
export * from './version.js';
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9kYXRhL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsMEJBQTBCLENBQUM7QUFDekMsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLFVBQVUsQ0FBQztBQUN6QixjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLFlBQVksQ0FBQztBQUMzQixjQUFjLHVCQUF1QixDQUFDO0FBQ3RDLGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxZQUFZLENBQUM7QUFDM0IsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyxXQUFXLENBQUM7QUFDMUIsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxrQkFBa0IsQ0FBQztBQUNqQyxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxXQUFXLENBQUM7QUFDMUIsY0FBYyxjQUFjLENBQUMifQ==
|
|
@@ -55,6 +55,8 @@ export interface IServiceReconciliationStatus {
|
|
|
55
55
|
export interface IService {
|
|
56
56
|
id: string;
|
|
57
57
|
data: {
|
|
58
|
+
/** Server-managed deployment ownership boundary. */
|
|
59
|
+
organizationId?: string;
|
|
58
60
|
name: string;
|
|
59
61
|
description: string;
|
|
60
62
|
imageId: string;
|
|
@@ -147,4 +149,4 @@ export interface IService {
|
|
|
147
149
|
};
|
|
148
150
|
}
|
|
149
151
|
/** Caller-writable service data. Immutable policy and rollout fields are server-managed. */
|
|
150
|
-
export type TServiceWritableData = Omit<IService['data'], 'immutableImageRequired' | 'imageDeployment' | 'imageRolloutStatus'>;
|
|
152
|
+
export type TServiceWritableData = Omit<IService['data'], 'organizationId' | 'immutableImageRequired' | 'imageDeployment' | 'imageRolloutStatus'>;
|
package/dist_ts/data/user.d.ts
CHANGED
|
@@ -3,16 +3,27 @@ export interface IToken {
|
|
|
3
3
|
expiresAt: number;
|
|
4
4
|
assignedRoles: string[];
|
|
5
5
|
}
|
|
6
|
-
export type TServiceDeploymentCapability = 'deployment:preflight' | 'deployment:create-greenfield' | 'deployment:promote-route' | 'deployment:rollback-route';
|
|
6
|
+
export type TServiceDeploymentCapability = 'deployment:preflight' | 'deployment:reserve' | 'deployment:registry-push' | 'deployment:release-read' | 'deployment:promote-image' | 'deployment:status' | 'deployment:create-greenfield' | 'deployment:promote-route' | 'deployment:rollback-image' | 'deployment:rollback-route' | 'deployment:retry' | 'deployment:cleanup';
|
|
7
7
|
/**
|
|
8
8
|
* Server-persisted authority for one logical service. These grants are never
|
|
9
9
|
* accepted from the identity payload supplied by a caller; Cloudly reloads
|
|
10
10
|
* the owning user from the verified JWT before evaluating them.
|
|
11
11
|
*/
|
|
12
|
-
|
|
12
|
+
interface IServiceDeploymentGrantBase {
|
|
13
|
+
organizationId: string;
|
|
13
14
|
serviceId: string;
|
|
14
15
|
capabilities: TServiceDeploymentCapability[];
|
|
15
16
|
}
|
|
17
|
+
/** Authority over one service that already exists and has the same owner. */
|
|
18
|
+
export interface IExistingServiceDeploymentGrant extends IServiceDeploymentGrantBase {
|
|
19
|
+
scope: 'service';
|
|
20
|
+
}
|
|
21
|
+
/** Authority to create one exact, not-yet-existing service ID in an organization. */
|
|
22
|
+
export interface IOrganizationServiceSlotDeploymentGrant extends IServiceDeploymentGrantBase {
|
|
23
|
+
scope: 'organization-service-slot';
|
|
24
|
+
}
|
|
25
|
+
export type IServiceDeploymentGrant = IExistingServiceDeploymentGrant | IOrganizationServiceSlotDeploymentGrant;
|
|
26
|
+
export declare const validateServiceDeploymentGrant: (grantArg: unknown) => string[];
|
|
16
27
|
export interface IIdentityCredential {
|
|
17
28
|
jwt: string;
|
|
18
29
|
}
|
|
@@ -38,3 +49,4 @@ export interface IUser {
|
|
|
38
49
|
serviceDeploymentGrants?: IServiceDeploymentGrant[];
|
|
39
50
|
};
|
|
40
51
|
}
|
|
52
|
+
export {};
|
package/dist_ts/data/user.js
CHANGED
|
@@ -1,2 +1,54 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
const serviceDeploymentCapabilities = new Set([
|
|
2
|
+
'deployment:preflight',
|
|
3
|
+
'deployment:reserve',
|
|
4
|
+
'deployment:registry-push',
|
|
5
|
+
'deployment:release-read',
|
|
6
|
+
'deployment:promote-image',
|
|
7
|
+
'deployment:status',
|
|
8
|
+
'deployment:create-greenfield',
|
|
9
|
+
'deployment:promote-route',
|
|
10
|
+
'deployment:rollback-image',
|
|
11
|
+
'deployment:rollback-route',
|
|
12
|
+
'deployment:retry',
|
|
13
|
+
'deployment:cleanup',
|
|
14
|
+
]);
|
|
15
|
+
const deploymentBoundaryIdentifierRegex = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
|
|
16
|
+
export const validateServiceDeploymentGrant = (grantArg) => {
|
|
17
|
+
const errors = [];
|
|
18
|
+
if (!grantArg || typeof grantArg !== 'object' || Array.isArray(grantArg)) {
|
|
19
|
+
return ['grant must be an object'];
|
|
20
|
+
}
|
|
21
|
+
const grant = grantArg;
|
|
22
|
+
if (grant.scope !== 'service' && grant.scope !== 'organization-service-slot') {
|
|
23
|
+
errors.push('scope must identify an existing service or an exact future service slot');
|
|
24
|
+
}
|
|
25
|
+
if (typeof grant.organizationId !== 'string'
|
|
26
|
+
|| !deploymentBoundaryIdentifierRegex.test(grant.organizationId)) {
|
|
27
|
+
errors.push('organizationId must be a bounded canonical identifier');
|
|
28
|
+
}
|
|
29
|
+
if (typeof grant.serviceId !== 'string'
|
|
30
|
+
|| !deploymentBoundaryIdentifierRegex.test(grant.serviceId)) {
|
|
31
|
+
errors.push('serviceId must be a bounded canonical identifier');
|
|
32
|
+
}
|
|
33
|
+
const capabilities = Array.isArray(grant.capabilities)
|
|
34
|
+
? grant.capabilities
|
|
35
|
+
: undefined;
|
|
36
|
+
if (!capabilities
|
|
37
|
+
|| capabilities.length < 1
|
|
38
|
+
|| capabilities.length > serviceDeploymentCapabilities.size
|
|
39
|
+
|| new Set(capabilities).size !== capabilities.length
|
|
40
|
+
|| capabilities.some((capabilityArg) => (typeof capabilityArg !== 'string'
|
|
41
|
+
|| !serviceDeploymentCapabilities.has(capabilityArg)))) {
|
|
42
|
+
errors.push('capabilities must be a non-empty unique set of supported deployment capabilities');
|
|
43
|
+
}
|
|
44
|
+
if (capabilities && grant.scope === 'service'
|
|
45
|
+
&& capabilities.includes('deployment:create-greenfield')) {
|
|
46
|
+
errors.push('an existing-service grant cannot authorize greenfield creation');
|
|
47
|
+
}
|
|
48
|
+
if (capabilities && grant.scope === 'organization-service-slot'
|
|
49
|
+
&& !capabilities.includes('deployment:create-greenfield')) {
|
|
50
|
+
errors.push('an organization-service-slot grant must authorize greenfield creation');
|
|
51
|
+
}
|
|
52
|
+
return errors;
|
|
53
|
+
};
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXNlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2RhdGEvdXNlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUE2Q0EsTUFBTSw2QkFBNkIsR0FBRyxJQUFJLEdBQUcsQ0FBK0I7SUFDMUUsc0JBQXNCO0lBQ3RCLG9CQUFvQjtJQUNwQiwwQkFBMEI7SUFDMUIseUJBQXlCO0lBQ3pCLDBCQUEwQjtJQUMxQixtQkFBbUI7SUFDbkIsOEJBQThCO0lBQzlCLDBCQUEwQjtJQUMxQiwyQkFBMkI7SUFDM0IsMkJBQTJCO0lBQzNCLGtCQUFrQjtJQUNsQixvQkFBb0I7Q0FDckIsQ0FBQyxDQUFDO0FBRUgsTUFBTSxpQ0FBaUMsR0FBRyxxQ0FBcUMsQ0FBQztBQUVoRixNQUFNLENBQUMsTUFBTSw4QkFBOEIsR0FBRyxDQUM1QyxRQUFpQixFQUNQLEVBQUU7SUFDWixNQUFNLE1BQU0sR0FBYSxFQUFFLENBQUM7SUFDNUIsSUFBSSxDQUFDLFFBQVEsSUFBSSxPQUFPLFFBQVEsS0FBSyxRQUFRLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDO1FBQ3pFLE9BQU8sQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO0lBQ3JDLENBQUM7SUFDRCxNQUFNLEtBQUssR0FBRyxRQUFtQyxDQUFDO0lBQ2xELElBQUksS0FBSyxDQUFDLEtBQUssS0FBSyxTQUFTLElBQUksS0FBSyxDQUFDLEtBQUssS0FBSywyQkFBMkIsRUFBRSxDQUFDO1FBQzdFLE1BQU0sQ0FBQyxJQUFJLENBQUMseUVBQXlFLENBQUMsQ0FBQztJQUN6RixDQUFDO0lBQ0QsSUFBSSxPQUFPLEtBQUssQ0FBQyxjQUFjLEtBQUssUUFBUTtXQUN2QyxDQUFDLGlDQUFpQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLEVBQUUsQ0FBQztRQUNuRSxNQUFNLENBQUMsSUFBSSxDQUFDLHVEQUF1RCxDQUFDLENBQUM7SUFDdkUsQ0FBQztJQUNELElBQUksT0FBTyxLQUFLLENBQUMsU0FBUyxLQUFLLFFBQVE7V0FDbEMsQ0FBQyxpQ0FBaUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUM7UUFDOUQsTUFBTSxDQUFDLElBQUksQ0FBQyxrREFBa0QsQ0FBQyxDQUFDO0lBQ2xFLENBQUM7SUFDRCxNQUFNLFlBQVksR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUM7UUFDcEQsQ0FBQyxDQUFDLEtBQUssQ0FBQyxZQUFZO1FBQ3BCLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFDZCxJQUFJLENBQUMsWUFBWTtXQUNaLFlBQVksQ0FBQyxNQUFNLEdBQUcsQ0FBQztXQUN2QixZQUFZLENBQUMsTUFBTSxHQUFHLDZCQUE2QixDQUFDLElBQUk7V0FDeEQsSUFBSSxHQUFHLENBQUMsWUFBWSxDQUFDLENBQUMsSUFBSSxLQUFLLFlBQVksQ0FBQyxNQUFNO1dBQ2xELFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQyxhQUFhLEVBQUUsRUFBRSxDQUFDLENBQ3RDLE9BQU8sYUFBYSxLQUFLLFFBQVE7ZUFDOUIsQ0FBQyw2QkFBNkIsQ0FBQyxHQUFHLENBQUMsYUFBNkMsQ0FBQyxDQUNyRixDQUFDLEVBQUUsQ0FBQztRQUNMLE1BQU0sQ0FBQyxJQUFJLENBQUMsa0ZBQWtGLENBQUMsQ0FBQztJQUNsRyxDQUFDO0lBQ0QsSUFBSSxZQUFZLElBQUksS0FBSyxDQUFDLEtBQUssS0FBSyxTQUFTO1dBQ3hDLFlBQVksQ0FBQyxRQUFRLENBQUMsOEJBQThCLENBQUMsRUFBRSxDQUFDO1FBQzNELE1BQU0sQ0FBQyxJQUFJLENBQUMsZ0VBQWdFLENBQUMsQ0FBQztJQUNoRixDQUFDO0lBQ0QsSUFBSSxZQUFZLElBQUksS0FBSyxDQUFDLEtBQUssS0FBSywyQkFBMkI7V0FDMUQsQ0FBQyxZQUFZLENBQUMsUUFBUSxDQUFDLDhCQUE4QixDQUFDLEVBQUUsQ0FBQztRQUM1RCxNQUFNLENBQUMsSUFBSSxDQUFDLHVFQUF1RSxDQUFDLENBQUM7SUFDdkYsQ0FBQztJQUNELE9BQU8sTUFBTSxDQUFDO0FBQ2hCLENBQUMsQ0FBQyJ9
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as plugins from '../plugins.js';
|
|
2
|
-
import type { IIdentity,
|
|
2
|
+
import type { IIdentity, IIdentityCredential, IServiceDeploymentGrant } from '../data/user.js';
|
|
3
3
|
export interface IReq_Admin_LoginWithUsernameAndPassword extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Admin_LoginWithUsernameAndPassword> {
|
|
4
4
|
method: 'adminLoginWithUsernameAndPassword';
|
|
5
5
|
request: {
|
|
@@ -13,15 +13,13 @@ export interface IReq_Admin_LoginWithUsernameAndPassword extends plugins.typedre
|
|
|
13
13
|
export interface IReq_Admin_ConfigureServiceDeploymentMachineUser extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Admin_ConfigureServiceDeploymentMachineUser> {
|
|
14
14
|
method: 'configureServiceDeploymentMachineUser';
|
|
15
15
|
request: {
|
|
16
|
-
identity:
|
|
16
|
+
identity: IIdentityCredential;
|
|
17
17
|
userId: string;
|
|
18
|
-
|
|
19
|
-
capabilities: TServiceDeploymentCapability[];
|
|
18
|
+
grant: IServiceDeploymentGrant;
|
|
20
19
|
};
|
|
21
20
|
response: {
|
|
22
21
|
userId: string;
|
|
23
|
-
|
|
24
|
-
capabilities: TServiceDeploymentCapability[];
|
|
22
|
+
grant: IServiceDeploymentGrant;
|
|
25
23
|
tokenRolesNormalized: true;
|
|
26
24
|
};
|
|
27
25
|
}
|