@supersdk/supercli 0.3.3 → 0.3.5-staging.52
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/dist/build/artifactIntegrity.js +158 -2
- package/dist/build/artifactIntegrity.js.map +1 -1
- package/dist/build/projectBuild.js +335 -0
- package/dist/build/projectBuild.js.map +1 -0
- package/dist/cli.js +0 -2
- package/dist/cli.js.map +1 -1
- package/dist/commands/add.js +35 -29
- package/dist/commands/add.js.map +1 -1
- package/dist/commands/build.js +407 -105
- package/dist/commands/build.js.map +1 -1
- package/dist/commands/init.js +22 -29
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/register.js +62 -217
- package/dist/commands/register.js.map +1 -1
- package/dist/config/appConfig.js +36 -163
- package/dist/config/appConfig.js.map +1 -1
- package/dist/config/superConfig.js +213 -185
- package/dist/config/superConfig.js.map +1 -1
- package/dist/deploy/domainEndpoints.js +142 -0
- package/dist/deploy/domainEndpoints.js.map +1 -0
- package/dist/deploy/manifest.js +189 -167
- package/dist/deploy/manifest.js.map +1 -1
- package/dist/deploy/preflight.js +15 -16
- package/dist/deploy/preflight.js.map +1 -1
- package/dist/deploy/resultWriter.js +95 -9
- package/dist/deploy/resultWriter.js.map +1 -1
- package/dist/deploy/runAdapter.js +79 -10
- package/dist/deploy/runAdapter.js.map +1 -1
- package/dist/deploy/siteAdapter.js +54 -8
- package/dist/deploy/siteAdapter.js.map +1 -1
- package/dist/docker/dockerCli.js +72 -77
- package/dist/docker/dockerCli.js.map +1 -1
- package/dist/publish/runClient.js +4 -0
- package/dist/publish/runClient.js.map +1 -1
- package/dist/template/README.md +26 -94
- package/dist/template/android/gradle/supersdk-config-reader.gradle +13 -62
- package/dist/template/android/scripts/build.sh +11 -0
- package/dist/template/ios/project.yml +1 -1
- package/dist/template/ios/scripts/build.sh +19 -0
- package/dist/template/ios/scripts/render_project.py +60 -0
- package/dist/template/ios/supersdk-default.config.json +6 -0
- package/dist/template/service/scripts/build.sh +11 -0
- package/dist/template/super.json +22 -14
- package/dist/template/template_manifest.json +3 -7
- package/dist/template/web/package.json +8 -0
- package/dist/template/web/scripts/build.sh +8 -0
- package/dist/template/web/scripts/web_package.py +490 -0
- package/dist/template/web/src/js/app.js +2 -2
- package/dist/util/shell.js +3 -3
- package/dist/workspace/config.js +3 -79
- package/dist/workspace/config.js.map +1 -1
- package/dist/workspace/identity.js +6 -15
- package/dist/workspace/identity.js.map +1 -1
- package/dist/workspace/projectIdentity.js +2 -7
- package/dist/workspace/projectIdentity.js.map +1 -1
- package/dist/workspace/template.js +205 -77
- package/dist/workspace/template.js.map +1 -1
- package/package.json +4 -1
- package/dist/commands/config.js +0 -170
- package/dist/commands/config.js.map +0 -1
- package/dist/template/scripts/android_snapshot_canary.py +0 -145
- package/dist/template/scripts/build_android.sh +0 -382
- package/dist/template/scripts/build_ios.sh +0 -331
- package/dist/template/scripts/build_service.sh +0 -89
- package/dist/template/scripts/build_site.sh +0 -57
- package/dist/template/scripts/lib/workspace.sh +0 -43
- package/dist/template/scripts/serve_web.py +0 -78
- package/dist/template/scripts/super_build_orchestrator.py +0 -344
- package/dist/template/scripts/supersdk_template.py +0 -1394
- package/dist/template/scripts/web_host_validator.py +0 -103
- package/dist/template/scripts/web_package.py +0 -296
- package/dist/template/scripts/ws03_shared_schema_merge_guard.py +0 -73
- package/dist/template/super_build.sh +0 -70
- package/dist/workspace/inspect.js +0 -275
- package/dist/workspace/inspect.js.map +0 -1
package/dist/deploy/preflight.js
CHANGED
|
@@ -78,7 +78,6 @@ function manifestFailureCode(error) {
|
|
|
78
78
|
switch (error.code) {
|
|
79
79
|
case 'ARTIFACT_MISSING': return { publicCode: error.code, status: 'artifact-missing' };
|
|
80
80
|
case 'ARTIFACT_NOT_DEPLOYABLE': return { publicCode: error.code, status: 'build-failed' };
|
|
81
|
-
case 'ARTIFACT_BUILDER_INCOMPATIBLE':
|
|
82
81
|
case 'ARTIFACT_INTEGRITY_FAILED': return { publicCode: error.code, status: 'invalid-artifact' };
|
|
83
82
|
}
|
|
84
83
|
}
|
|
@@ -103,13 +102,20 @@ function preflightDeploy(options) {
|
|
|
103
102
|
}
|
|
104
103
|
let manifest;
|
|
105
104
|
let manifestError;
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
105
|
+
if (selected.some((project) => project.type === 'site' || project.type === 'service')) {
|
|
106
|
+
try {
|
|
107
|
+
manifest = (0, manifest_1.verifyBuildSelection)({
|
|
108
|
+
buildDir: options.buildDir,
|
|
109
|
+
config: options.config,
|
|
110
|
+
selectedProjectIds: selected.map((project) => project.projectId),
|
|
111
|
+
selectionMode: options.projectId === undefined ? 'all' : 'single',
|
|
112
|
+
});
|
|
113
|
+
}
|
|
114
|
+
catch (error) {
|
|
115
|
+
manifestError = error instanceof manifest_1.ManifestValidationError
|
|
116
|
+
? error
|
|
117
|
+
: new manifest_1.ManifestValidationError('ARTIFACT_INTEGRITY_FAILED', error.message);
|
|
118
|
+
}
|
|
113
119
|
}
|
|
114
120
|
const buildManifestSha256 = manifest?.rawSha256 ?? (0, manifest_1.buildManifestRawSha256)(options.buildDir);
|
|
115
121
|
const plans = [];
|
|
@@ -151,14 +157,7 @@ function preflightDeploy(options) {
|
|
|
151
157
|
}
|
|
152
158
|
let build;
|
|
153
159
|
try {
|
|
154
|
-
build = (0, manifest_1.
|
|
155
|
-
buildDir: options.buildDir,
|
|
156
|
-
manifest: manifest.manifest,
|
|
157
|
-
configSha256: options.config.digest,
|
|
158
|
-
spid: options.config.spid,
|
|
159
|
-
projectId: project.projectId,
|
|
160
|
-
type: project.type,
|
|
161
|
-
});
|
|
160
|
+
build = (0, manifest_1.requireDeployableProject)(manifest, project.projectId);
|
|
162
161
|
}
|
|
163
162
|
catch (error) {
|
|
164
163
|
const validation = error instanceof manifest_1.ManifestValidationError
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preflight.js","sourceRoot":"","sources":["../../src/deploy/preflight.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"preflight.js","sourceRoot":"","sources":["../../src/deploy/preflight.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,6 +38,7 @@ exports.createDeployResultWriter = createDeployResultWriter;
|
|
|
38
38
|
const crypto = __importStar(require("node:crypto"));
|
|
39
39
|
const fs = __importStar(require("node:fs"));
|
|
40
40
|
const path = __importStar(require("node:path"));
|
|
41
|
+
const domainEndpoints_1 = require("./domainEndpoints");
|
|
41
42
|
const PUBLIC_CODE = /^[A-Z][A-Z0-9_]{0,63}$/;
|
|
42
43
|
const SHA256 = /^[0-9a-f]{64}$/;
|
|
43
44
|
const SPID = /^[a-z0-9]{8}$/;
|
|
@@ -53,6 +54,76 @@ function assertSafeString(value, label) {
|
|
|
53
54
|
if (TOKEN_SHAPED.test(value))
|
|
54
55
|
throw new Error(`${label} contains a token-shaped value`);
|
|
55
56
|
}
|
|
57
|
+
function validateDomains(resource) {
|
|
58
|
+
if (resource.domains === undefined)
|
|
59
|
+
return;
|
|
60
|
+
if (!Array.isArray(resource.domains) || resource.domains.length === 0) {
|
|
61
|
+
throw new Error('resource.domains must be a non-empty endpoint list when present');
|
|
62
|
+
}
|
|
63
|
+
for (const [index, endpoint] of resource.domains.entries()) {
|
|
64
|
+
if (typeof endpoint === 'object' && endpoint !== null) {
|
|
65
|
+
const candidate = endpoint;
|
|
66
|
+
if (typeof candidate.domain === 'string')
|
|
67
|
+
assertSafeString(candidate.domain, `resource.domains[${index}].domain`);
|
|
68
|
+
if (typeof candidate.url === 'string')
|
|
69
|
+
assertSafeString(candidate.url, `resource.domains[${index}].url`);
|
|
70
|
+
}
|
|
71
|
+
if (!(0, domainEndpoints_1.isDeployDomainEndpoint)(endpoint))
|
|
72
|
+
throw new Error(`invalid resource.domains[${index}] endpoint`);
|
|
73
|
+
}
|
|
74
|
+
const platform = resource.domains[0];
|
|
75
|
+
const platformCount = resource.domains.filter((endpoint) => endpoint.kind === 'platform').length;
|
|
76
|
+
const primaryCount = resource.domains.filter((endpoint) => endpoint.primary).length;
|
|
77
|
+
if (platform.kind !== 'platform' || !platform.primary || platformCount !== 1 || primaryCount !== 1) {
|
|
78
|
+
throw new Error('resource.domains must start with the unique primary platform endpoint');
|
|
79
|
+
}
|
|
80
|
+
if (typeof resource.domain !== 'string' || resource.domain !== platform.domain) {
|
|
81
|
+
throw new Error('resource.domain must equal the primary platform endpoint domain');
|
|
82
|
+
}
|
|
83
|
+
if (platform.status === 'pending' && resource.domains.length !== 1) {
|
|
84
|
+
throw new Error('a pending platform endpoint cannot include custom endpoints');
|
|
85
|
+
}
|
|
86
|
+
const seen = new Set();
|
|
87
|
+
let previousCustomDomain;
|
|
88
|
+
for (const [index, endpoint] of resource.domains.entries()) {
|
|
89
|
+
if (seen.has(endpoint.domain))
|
|
90
|
+
throw new Error(`resource.domains contains duplicate domain ${endpoint.domain}`);
|
|
91
|
+
seen.add(endpoint.domain);
|
|
92
|
+
if (index === 0)
|
|
93
|
+
continue;
|
|
94
|
+
if (endpoint.kind !== 'custom')
|
|
95
|
+
throw new Error('only the first resource.domains endpoint may be platform');
|
|
96
|
+
if (previousCustomDomain !== undefined && previousCustomDomain >= endpoint.domain) {
|
|
97
|
+
throw new Error('resource.domains custom endpoints must be sorted by domain');
|
|
98
|
+
}
|
|
99
|
+
previousCustomDomain = endpoint.domain;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
function validateResource(resource) {
|
|
103
|
+
if (resource.id !== undefined) {
|
|
104
|
+
if (typeof resource.id !== 'number' && typeof resource.id !== 'string')
|
|
105
|
+
throw new Error('resource.id must be a string or number');
|
|
106
|
+
if (typeof resource.id === 'string')
|
|
107
|
+
assertSafeString(resource.id, 'resource.id');
|
|
108
|
+
}
|
|
109
|
+
if (resource.domain !== undefined) {
|
|
110
|
+
if (typeof resource.domain !== 'string')
|
|
111
|
+
throw new Error('resource.domain must be a string');
|
|
112
|
+
assertSafeString(resource.domain, 'resource.domain');
|
|
113
|
+
}
|
|
114
|
+
if (resource.status !== undefined) {
|
|
115
|
+
if (typeof resource.status !== 'string')
|
|
116
|
+
throw new Error('resource.status must be a string');
|
|
117
|
+
assertSafeString(resource.status, 'resource.status');
|
|
118
|
+
}
|
|
119
|
+
if (resource.pending !== undefined && typeof resource.pending !== 'boolean')
|
|
120
|
+
throw new Error('resource.pending must be a boolean');
|
|
121
|
+
if (resource.imageDigest !== undefined
|
|
122
|
+
&& (typeof resource.imageDigest !== 'string' || !/^sha256:[0-9a-f]{64}$/.test(resource.imageDigest))) {
|
|
123
|
+
throw new Error('resource.imageDigest must be sha256-pinned');
|
|
124
|
+
}
|
|
125
|
+
validateDomains(resource);
|
|
126
|
+
}
|
|
56
127
|
function validateProject(project) {
|
|
57
128
|
assertSafeString(project.projectId, 'projectId');
|
|
58
129
|
if (!PROJECT_TYPES.has(project.type))
|
|
@@ -70,20 +141,35 @@ function validateProject(project) {
|
|
|
70
141
|
assertSafeString(project.error.message, 'error.message');
|
|
71
142
|
}
|
|
72
143
|
if (project.resource) {
|
|
73
|
-
|
|
74
|
-
assertSafeString(project.resource.domain, 'resource.domain');
|
|
75
|
-
if (typeof project.resource.status === 'string')
|
|
76
|
-
assertSafeString(project.resource.status, 'resource.status');
|
|
77
|
-
if (typeof project.resource.imageDigest === 'string' && !/^sha256:[0-9a-f]{64}$/.test(project.resource.imageDigest)) {
|
|
78
|
-
throw new Error('resource.imageDigest must be sha256-pinned');
|
|
79
|
-
}
|
|
144
|
+
validateResource(project.resource);
|
|
80
145
|
}
|
|
81
146
|
}
|
|
147
|
+
function snapshotEndpoint(endpoint) {
|
|
148
|
+
return {
|
|
149
|
+
domain: endpoint.domain,
|
|
150
|
+
url: endpoint.url,
|
|
151
|
+
kind: endpoint.kind,
|
|
152
|
+
status: endpoint.status,
|
|
153
|
+
primary: endpoint.primary,
|
|
154
|
+
};
|
|
155
|
+
}
|
|
156
|
+
function snapshotResource(resource) {
|
|
157
|
+
return {
|
|
158
|
+
...(resource.id !== undefined ? { id: resource.id } : {}),
|
|
159
|
+
...(resource.domain !== undefined ? { domain: resource.domain } : {}),
|
|
160
|
+
...(resource.domains !== undefined ? { domains: resource.domains.map(snapshotEndpoint) } : {}),
|
|
161
|
+
...(resource.imageDigest !== undefined ? { imageDigest: resource.imageDigest } : {}),
|
|
162
|
+
...(resource.status !== undefined ? { status: resource.status } : {}),
|
|
163
|
+
...(resource.pending !== undefined ? { pending: resource.pending } : {}),
|
|
164
|
+
};
|
|
165
|
+
}
|
|
82
166
|
function snapshotProjects(projects) {
|
|
83
167
|
return projects.map((project) => ({
|
|
84
|
-
|
|
168
|
+
projectId: project.projectId,
|
|
169
|
+
type: project.type,
|
|
170
|
+
status: project.status,
|
|
85
171
|
...(project.target ? { target: { ...project.target } } : {}),
|
|
86
|
-
...(project.resource ? { resource:
|
|
172
|
+
...(project.resource ? { resource: snapshotResource(project.resource) } : {}),
|
|
87
173
|
...(project.error ? { error: { ...project.error } } : {}),
|
|
88
174
|
}));
|
|
89
175
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resultWriter.js","sourceRoot":"","sources":["../../src/deploy/resultWriter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"resultWriter.js","sourceRoot":"","sources":["../../src/deploy/resultWriter.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,6 +42,7 @@ const registry_1 = require("../docker/registry");
|
|
|
42
42
|
const log_1 = require("../util/log");
|
|
43
43
|
const runClient_1 = require("../publish/runClient");
|
|
44
44
|
const envelope_1 = require("../output/envelope");
|
|
45
|
+
const domainEndpoints_1 = require("./domainEndpoints");
|
|
45
46
|
const PLACEHOLDER_DIGEST = `sha256:${'0'.repeat(64)}`;
|
|
46
47
|
exports.defaultRunAdapterDeps = {
|
|
47
48
|
createClient: (apiOrigin) => new runClient_1.RunClient(apiOrigin),
|
|
@@ -103,19 +104,73 @@ async function call(operation, input, fn) {
|
|
|
103
104
|
function isFailure(value) {
|
|
104
105
|
return 'ok' in value && value.ok === false;
|
|
105
106
|
}
|
|
106
|
-
function
|
|
107
|
-
const value = record(
|
|
107
|
+
function resourceFromView(rawView, imageDigest, customDomains = [], invalidDomainLogInput) {
|
|
108
|
+
const value = record(rawView);
|
|
108
109
|
const id = typeof value?.id === 'number' || typeof value?.id === 'string' ? value.id : undefined;
|
|
109
|
-
const domain = typeof value?.domain === 'string' && value.domain.length > 0 ? value.domain : undefined;
|
|
110
110
|
const status = typeof value?.status === 'string' ? value.status : undefined;
|
|
111
|
+
const platform = (0, domainEndpoints_1.createPlatformDomainEndpoint)(value?.domain, status === 'active' && value?.pointer_sync_state === 'synced' ? 'ready' : 'pending');
|
|
112
|
+
if (value && Object.prototype.hasOwnProperty.call(value, 'domain') && !platform && invalidDomainLogInput) {
|
|
113
|
+
log_1.log.error('SuperRun service detail contained an invalid platform domain; omitted from deploy result', {
|
|
114
|
+
target: 'SuperRun',
|
|
115
|
+
projectId: invalidDomainLogInput.project.projectId,
|
|
116
|
+
envTarget: invalidDomainLogInput.target.envTarget,
|
|
117
|
+
request_summary: `${invalidDomainLogInput.spid}/${invalidDomainLogInput.target.slug}/${invalidDomainLogInput.target.env}`,
|
|
118
|
+
response_summary: 'RUN_PLATFORM_DOMAIN_INVALID',
|
|
119
|
+
duration_ms: 0,
|
|
120
|
+
retry: false,
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
const domains = (0, domainEndpoints_1.mergeDomainEndpoints)(platform, status === 'active' ? customDomains : []);
|
|
111
124
|
return {
|
|
112
125
|
...(id !== undefined ? { id } : {}),
|
|
113
|
-
...(
|
|
126
|
+
...(platform ? { domain: platform.domain, domains } : {}),
|
|
114
127
|
...(imageDigest ? { imageDigest } : {}),
|
|
115
128
|
...(status ? { status } : {}),
|
|
116
129
|
...(status === 'provisioning' ? { pending: true } : {}),
|
|
117
130
|
};
|
|
118
131
|
}
|
|
132
|
+
function resource(outcome, imageDigest) {
|
|
133
|
+
return resourceFromView(data(outcome), imageDigest);
|
|
134
|
+
}
|
|
135
|
+
function readyCustomDomains(list, input) {
|
|
136
|
+
const projected = (0, domainEndpoints_1.createReadyCustomDomainEndpoints)(list);
|
|
137
|
+
if (projected.rejected > 0) {
|
|
138
|
+
log_1.log.error(`SuperRun custom-host list contained ${projected.rejected} invalid endpoint item(s); omitted from deploy result`, {
|
|
139
|
+
target: 'SuperRun',
|
|
140
|
+
projectId: input.project.projectId,
|
|
141
|
+
envTarget: input.target.envTarget,
|
|
142
|
+
request_summary: `${input.spid}/${input.target.slug}/${input.target.env}`,
|
|
143
|
+
response_summary: 'RUN_CUSTOM_HOST_ITEM_INVALID',
|
|
144
|
+
duration_ms: 0,
|
|
145
|
+
retry: false,
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
return projected.domains;
|
|
149
|
+
}
|
|
150
|
+
function logInvalidCustomHostResponse(input, started) {
|
|
151
|
+
const message = 'custom-host list response data.list must be an array';
|
|
152
|
+
log_1.log.error(`SuperRun post-deploy custom-host projection failed: ${message}`, {
|
|
153
|
+
target: 'SuperRun',
|
|
154
|
+
projectId: input.project.projectId,
|
|
155
|
+
envTarget: input.target.envTarget,
|
|
156
|
+
request_summary: `${input.spid}/${input.target.slug}/${input.target.env}`,
|
|
157
|
+
response_summary: 'RUN_CUSTOM_HOST_RESPONSE_INVALID',
|
|
158
|
+
duration_ms: Date.now() - started,
|
|
159
|
+
retry: true,
|
|
160
|
+
});
|
|
161
|
+
}
|
|
162
|
+
async function finalReadyCustomDomains(client, context, input) {
|
|
163
|
+
const started = Date.now();
|
|
164
|
+
const listed = await call('list custom hosts after committed deploy', input, () => (client.listCustomHosts(context, input.spid, input.target.slug, input.target.env)));
|
|
165
|
+
if (isFailure(listed))
|
|
166
|
+
return [];
|
|
167
|
+
const list = record(data(listed))?.list;
|
|
168
|
+
if (!Array.isArray(list)) {
|
|
169
|
+
logInvalidCustomHostResponse(input, started);
|
|
170
|
+
return [];
|
|
171
|
+
}
|
|
172
|
+
return readyCustomDomains(list, input);
|
|
173
|
+
}
|
|
119
174
|
function stringField(value, key) {
|
|
120
175
|
const field = record(value)?.[key];
|
|
121
176
|
return typeof field === 'string' && field.length > 0 ? field : undefined;
|
|
@@ -182,13 +237,24 @@ async function waitForReadiness(initial, imageDigest, client, context, input, de
|
|
|
182
237
|
ok: true,
|
|
183
238
|
soft: true,
|
|
184
239
|
message: `accepted service ${input.spid}/${input.target.slug}/${input.target.env}; readiness is still provisioning after ${attempts} check(s)`,
|
|
185
|
-
resource: {
|
|
240
|
+
resource: {
|
|
241
|
+
...resourceFromView(view, imageDigest, [], input),
|
|
242
|
+
status: 'provisioning',
|
|
243
|
+
pending: true,
|
|
244
|
+
},
|
|
186
245
|
};
|
|
187
246
|
}
|
|
247
|
+
const customDomains = status === 'active'
|
|
248
|
+
? await finalReadyCustomDomains(client, context, input)
|
|
249
|
+
: [];
|
|
188
250
|
return {
|
|
189
251
|
ok: true,
|
|
190
252
|
message: `service ${input.spid}/${input.target.slug}/${input.target.env} reached ${status}`,
|
|
191
|
-
resource: {
|
|
253
|
+
resource: {
|
|
254
|
+
...resourceFromView(view, imageDigest, customDomains, input),
|
|
255
|
+
status,
|
|
256
|
+
pending: false,
|
|
257
|
+
},
|
|
192
258
|
};
|
|
193
259
|
}
|
|
194
260
|
function createBody(input, imageRef, digest) {
|
|
@@ -235,8 +301,8 @@ async function deployRun(input, deps = exports.defaultRunAdapterDeps) {
|
|
|
235
301
|
return { ok: true, message: `validated service ${input.spid}/${input.target.slug}/${input.target.env}`, resource: resource(checked) };
|
|
236
302
|
}
|
|
237
303
|
const archive = archivePath(input);
|
|
238
|
-
if (!archive
|
|
239
|
-
return { ok: false, kind: 'business_error', code: 'ARTIFACT_NOT_DEPLOYABLE', message: 'service
|
|
304
|
+
if (!archive) {
|
|
305
|
+
return { ok: false, kind: 'business_error', code: 'ARTIFACT_NOT_DEPLOYABLE', message: 'verified service-image archive is missing', retryable: false };
|
|
240
306
|
}
|
|
241
307
|
const current = await call('get service', input, () => client.getService(context, input.spid, input.target.slug, input.target.env));
|
|
242
308
|
let existing = false;
|
|
@@ -274,7 +340,7 @@ async function deployRun(input, deps = exports.defaultRunAdapterDeps) {
|
|
|
274
340
|
const repository = (0, registry_1.imageRepository)(registry.host, input.spid, input.target.slug);
|
|
275
341
|
const targetTag = (0, registry_1.imageTag)(repository, input.target.env);
|
|
276
342
|
const credential = { registry: registry.host, username: registry_1.REGISTRY_BASIC_USERNAME, secret: input.token };
|
|
277
|
-
const pushed = await deps.docker.loadTagAndPush({ archive, targetTag, credential
|
|
343
|
+
const pushed = await deps.docker.loadTagAndPush({ archive, targetTag, credential });
|
|
278
344
|
if (!pushed.ok) {
|
|
279
345
|
const message = redact(pushed.message, input);
|
|
280
346
|
log_1.log.error(`registry ${pushed.stage} failed: ${message}`, {
|
|
@@ -284,8 +350,11 @@ async function deployRun(input, deps = exports.defaultRunAdapterDeps) {
|
|
|
284
350
|
request_summary: `${input.spid}/${input.target.slug}`,
|
|
285
351
|
response_summary: pushed.stage,
|
|
286
352
|
duration_ms: 0,
|
|
287
|
-
retry:
|
|
353
|
+
retry: !pushed.notDeployable,
|
|
288
354
|
});
|
|
355
|
+
if (pushed.notDeployable) {
|
|
356
|
+
return { ok: false, kind: 'business_error', code: 'ARTIFACT_NOT_DEPLOYABLE', message, retryable: false };
|
|
357
|
+
}
|
|
289
358
|
return { ok: false, kind: 'infra_error', code: `REGISTRY_${pushed.stage.toUpperCase()}_FAILED`, message, retryable: true };
|
|
290
359
|
}
|
|
291
360
|
const imageRef = (0, registry_1.digestRef)(repository, pushed.digest);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runAdapter.js","sourceRoot":"","sources":["../../src/deploy/runAdapter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"runAdapter.js","sourceRoot":"","sources":["../../src/deploy/runAdapter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6NA,gDAKC;AAkID,8BAyEC;AA7aD,oDAAsC;AAEtC,mDAI6B;AAC7B,iDAM4B;AAC5B,qCAAkC;AAClC,oDAO8B;AAE9B,iDAAuD;AAEvD,uDAI2B;AAI3B,MAAM,kBAAkB,GAAG,UAAU,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;AAazC,QAAA,qBAAqB,GAAmB;IACnD,YAAY,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,qBAAS,CAAC,SAAS,CAAC;IACrD,MAAM,EAAE,sCAA0B;IAClC,QAAQ,EAAE,MAAM,CAAC,UAAU;IAC3B,GAAG,EAAE,IAAI,CAAC,GAAG;IACb,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAChE,qBAAqB,EAAE,EAAE;IACzB,uBAAuB,EAAE,KAAK;IAC9B,kBAAkB,EAAE,OAAO;CAC5B,CAAC;AAmBF,SAAS,MAAM,CAAC,KAAc;IAC5B,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAgC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7H,CAAC;AAED,SAAS,IAAI,CAAC,OAAoB;IAChC,OAAO,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;AACpH,CAAC;AAED,SAAS,MAAM,CAAC,OAAe,EAAE,KAAqB;IACpD,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC/E,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpG,OAAO,IAAA,4BAAiB,EAAC,QAAQ,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,OAAO,CAAC,OAAmE,EAAE,SAAiB,EAAE,KAAqB,EAAE,OAAe;IAC7I,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,KAAK,cAAc,IAAI,OAAO,CAAC,IAAI,KAAK,aAAa;WAC9E,CAAC,OAAO,CAAC,IAAI,KAAK,gBAAgB,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;IAC9D,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,KAAK,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI;QAC3D,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW;YAC1C,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,cAAc;gBAChD,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,IAAI,aAAa,CAAC;IACzF,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,KAAK,gBAAgB,CAAC,CAAC,CAAC,IAAA,4BAAgB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC;QAC3G,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,8DAA8D;YAChG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;IACtB,MAAM,OAAO,GAAG,MAAM,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;IACjD,SAAG,CAAC,KAAK,CAAC,YAAY,SAAS,YAAY,OAAO,EAAE,EAAE;QACpD,MAAM,EAAE,UAAU;QAClB,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS;QAClC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS;QACjC,eAAe,EAAE,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE;QACzE,gBAAgB,EAAE,IAAI;QACtB,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO;QACjC,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;IACH,OAAO;QACL,EAAE,EAAE,KAAK;QACT,IAAI,EAAE,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,cAAc;YACpD,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW;gBAC1C,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,cAAc;oBAChD,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,gBAAgB;QACzE,IAAI;QACJ,OAAO;QACP,SAAS;KACV,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,IAAI,CAAC,SAAiB,EAAE,KAAqB,EAAE,EAA8B;IAC1F,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC3B,MAAM,OAAO,GAAG,MAAM,EAAE,EAAE,CAAC;IAC3B,OAAO,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AAC/H,CAAC;AAED,SAAS,SAAS,CAAC,KAAmC;IACpD,OAAO,IAAI,IAAI,KAAK,IAAI,KAAK,CAAC,EAAE,KAAK,KAAK,CAAC;AAC7C,CAAC;AAED,SAAS,gBAAgB,CACvB,OAAgB,EAChB,WAAoB,EACpB,gBAAiD,EAAE,EACnD,qBAAsC;IAEtC,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAC9B,MAAM,EAAE,GAAG,OAAO,KAAK,EAAE,EAAE,KAAK,QAAQ,IAAI,OAAO,KAAK,EAAE,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACjG,MAAM,MAAM,GAAG,OAAO,KAAK,EAAE,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5E,MAAM,QAAQ,GAAG,IAAA,8CAA4B,EAC3C,KAAK,EAAE,MAAM,EACb,MAAM,KAAK,QAAQ,IAAI,KAAK,EAAE,kBAAkB,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CACpF,CAAC;IACF,IAAI,KAAK,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,IAAI,qBAAqB,EAAE,CAAC;QACzG,SAAG,CAAC,KAAK,CAAC,0FAA0F,EAAE;YACpG,MAAM,EAAE,UAAU;YAClB,SAAS,EAAE,qBAAqB,CAAC,OAAO,CAAC,SAAS;YAClD,SAAS,EAAE,qBAAqB,CAAC,MAAM,CAAC,SAAS;YACjD,eAAe,EAAE,GAAG,qBAAqB,CAAC,IAAI,IAAI,qBAAqB,CAAC,MAAM,CAAC,IAAI,IAAI,qBAAqB,CAAC,MAAM,CAAC,GAAG,EAAE;YACzH,gBAAgB,EAAE,6BAA6B;YAC/C,WAAW,EAAE,CAAC;YACd,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;IACL,CAAC;IACD,MAAM,OAAO,GAAG,IAAA,sCAAoB,EAAC,QAAQ,EAAE,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACzF,OAAO;QACL,GAAG,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7B,GAAG,CAAC,MAAM,KAAK,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACxD,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,OAAoB,EAAE,WAAoB;IAC1D,OAAO,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC,CAAC;AACtD,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAwB,EAAE,KAAqB;IACzE,MAAM,SAAS,GAAG,IAAA,kDAAgC,EAAC,IAAI,CAAC,CAAC;IACzD,IAAI,SAAS,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC;QAC3B,SAAG,CAAC,KAAK,CAAC,uCAAuC,SAAS,CAAC,QAAQ,uDAAuD,EAAE;YAC1H,MAAM,EAAE,UAAU;YAClB,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS;YAClC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS;YACjC,eAAe,EAAE,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE;YACzE,gBAAgB,EAAE,8BAA8B;YAChD,WAAW,EAAE,CAAC;YACd,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAC,OAAO,CAAC;AAC3B,CAAC;AAED,SAAS,4BAA4B,CAAC,KAAqB,EAAE,OAAe;IAC1E,MAAM,OAAO,GAAG,sDAAsD,CAAC;IACvE,SAAG,CAAC,KAAK,CAAC,uDAAuD,OAAO,EAAE,EAAE;QAC1E,MAAM,EAAE,UAAU;QAClB,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS;QAClC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS;QACjC,eAAe,EAAE,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE;QACzE,gBAAgB,EAAE,kCAAkC;QACpD,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO;QACjC,KAAK,EAAE,IAAI;KACZ,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,uBAAuB,CACpC,MAAqB,EACrB,OAA0B,EAC1B,KAAqB;IAErB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,0CAA0C,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CACjF,MAAM,CAAC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CACjF,CAAC,CAAC;IACH,IAAI,SAAS,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,CAAC;IACjC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC;IACxC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACzB,4BAA4B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC7C,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,WAAW,CAAC,KAAc,EAAE,GAAW;IAC9C,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACnC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAC3E,CAAC;AAED,SAAgB,kBAAkB,CAAC,OAAgB;IACjD,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC;IACrC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC;IAClG,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxD,OAAO,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAChE,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAe;IAC5C,OAAO,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,eAAe,CAAC;AACvF,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,MAAqB,EACrB,OAA0B,EAC1B,KAAqB,EACrB,IAAa,EACb,MAAc;IAEd,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACxG,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc;QACnE,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACzF,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,eAAe,CAAC,IAAI,kCAAkC,MAAM,EAAE,EAAE,KAAK,CAAC,CAAC;IAC/G,MAAM,KAAK,GAAG,CAAC,WAAW,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,sBAAsB,MAAM,EAAE,CAAC,CAAC;IAC7G,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,KAAK,CAAC,IAAI,CAAC,QAAQ,KAAK,CAAC,MAAM,0BAA0B,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5G,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc;YAChE,CAAC,CAAC,0CAA0C;YAC5C,CAAC,CAAC,iCAAiC,CAAC,CAAC;IACzC,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,uEAAuE,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC;IACpG,OAAO;QACL,EAAE,EAAE,KAAK;QACT,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,mBAAmB;QACvE,OAAO,EAAE,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChD,SAAS,EAAE,KAAK;KACjB,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,OAAoB,EACpB,WAAmB,EACnB,MAAqB,EACrB,OAA0B,EAC1B,KAAqB,EACrB,IAAoB;IAEpB,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;IACzB,IAAI,OAAO,GAAG,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC7C,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,cAAc,CAAC;IAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,OACE,MAAM,KAAK,cAAc;WACtB,QAAQ,GAAG,IAAI,CAAC,qBAAqB;WACrC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,IAAI,CAAC,kBAAkB,EACnD,CAAC;QACD,QAAQ,IAAI,CAAC,CAAC;QACd,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,kBAAkB,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC;QACpF,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjG,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc;YAAE,SAAS;QAC1E,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;QACpB,OAAO,GAAG,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACxC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,MAAM,CAAC;IACpC,CAAC;IACD,IAAI,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAChD,OAAO,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,MAAM,KAAK,cAAc,EAAE,CAAC;QAC9B,OAAO;YACL,EAAE,EAAE,IAAI;YACR,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,oBAAoB,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,2CAA2C,QAAQ,WAAW;YAC9I,QAAQ,EAAE;gBACR,GAAG,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,KAAK,CAAC;gBACjD,MAAM,EAAE,cAAc;gBACtB,OAAO,EAAE,IAAI;aACd;SACF,CAAC;IACJ,CAAC;IACD,MAAM,aAAa,GAAG,MAAM,KAAK,QAAQ;QACvC,CAAC,CAAC,MAAM,uBAAuB,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC;QACvD,CAAC,CAAC,EAAE,CAAC;IACP,OAAO;QACL,EAAE,EAAE,IAAI;QACR,OAAO,EAAE,WAAW,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,YAAY,MAAM,EAAE;QAC3F,QAAQ,EAAE;YACR,GAAG,gBAAgB,CACjB,IAAI,EACJ,WAAW,EACX,aAAa,EACb,KAAK,CACN;YACD,MAAM;YACN,OAAO,EAAE,KAAK;SACf;KACF,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,KAAqB,EAAE,QAAgB,EAAE,MAAc;IACzE,OAAO;QACL,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI;QAC5C,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI;QACvB,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG;QACrB,SAAS,EAAE,QAAQ;QACnB,YAAY,EAAE,MAAM;QACpB,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI;QAC/B,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpF,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpF,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpF,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChK,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,KAAK,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClH,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACjE,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,KAAqB,EAAE,QAAgB,EAAE,MAAc;IAC3E,OAAO;QACL,SAAS,EAAE,QAAQ;QACnB,YAAY,EAAE,MAAM;QACpB,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI;QAC/B,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpF,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpF,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpF,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,KAAK,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACnH,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,KAAqB;IACxC,OAAO,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,eAAe,IAAI,QAAQ,CAAC,IAAI,KAAK,sBAAsB,CAAC,EAAE,YAAY,CAAC;AAC7I,CAAC;AAEM,KAAK,UAAU,SAAS,CAAC,KAAqB,EAAE,OAAuB,6BAAqB;IACjG,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAClD,MAAM,OAAO,GAAsB,EAAE,WAAW,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;IACpF,MAAM,cAAc,GAAG,KAAK,CAAC,cAAc,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC/D,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACjB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE;YAClG,GAAG,UAAU,CAAC,KAAK,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,kBAAkB,EAAE,EAAE,kBAAkB,CAAC;YACtF,OAAO,EAAE,IAAI;SACd,EAAE,cAAc,CAAC,CAAC,CAAC;QACpB,IAAI,SAAS,CAAC,OAAO,CAAC;YAAE,OAAO,OAAO,CAAC;QACvC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,qBAAqB,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;IACxI,CAAC;IAED,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IACnC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,yBAAyB,EAAE,OAAO,EAAE,2CAA2C,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;IACxJ,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACpI,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;QACvB,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW;YAAE,OAAO,OAAO,CAAC;IACnD,CAAC;SAAM,CAAC;QACN,QAAQ,GAAG,IAAI,CAAC;QAChB,IAAI,KAAK,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE,uBAAuB;gBAC7B,OAAO,EAAE,WAAW,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,0FAA0F;gBACnJ,SAAS,EAAE,KAAK;aACjB,CAAC;QACJ,CAAC;IACH,CAAC;IACD,MAAM,QAAQ,GAAG,IAAA,8BAAmB,EAAC,KAAK,CAAC,SAAS,EAAE,EAAE,oBAAoB,EAAE,KAAK,CAAC,oBAAoB,EAAE,CAAC,CAAC;IAC5G,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QACjC,OAAO;YACL,EAAE,EAAE,KAAK;YACT,IAAI,EAAE,gBAAgB;YACtB,IAAI,EAAE,QAAQ,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,0BAA0B;YAC1F,OAAO,EAAE,QAAQ,CAAC,IAAI,KAAK,SAAS;gBAClC,CAAC,CAAC,qBAAqB,QAAQ,CAAC,IAAI,gCAAgC,QAAQ,CAAC,IAAI,EAAE;gBACnF,CAAC,CAAC,+DAA+D;YACnE,SAAS,EAAE,KAAK;SACjB,CAAC;IACJ,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IAClC,IAAI,CAAC,KAAK,CAAC,SAAS;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,oBAAoB,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IACpI,MAAM,UAAU,GAAG,IAAA,0BAAe,EAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjF,MAAM,SAAS,GAAG,IAAA,mBAAQ,EAAC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACzD,MAAM,UAAU,GAAuB,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,kCAAuB,EAAE,MAAM,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;IAC3H,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,CAAC;IACpF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC9C,SAAG,CAAC,KAAK,CAAC,YAAY,MAAM,CAAC,KAAK,YAAY,OAAO,EAAE,EAAE;YACvD,MAAM,EAAE,QAAQ,CAAC,IAAI;YACrB,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS;YAClC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS;YACjC,eAAe,EAAE,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE;YACrD,gBAAgB,EAAE,MAAM,CAAC,KAAK;YAC9B,WAAW,EAAE,CAAC;YACd,KAAK,EAAE,CAAC,MAAM,CAAC,aAAa;SAC7B,CAAC,CAAC;QACH,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,yBAAyB,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;QAC3G,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,YAAY,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IAC7H,CAAC;IACD,MAAM,QAAQ,GAAG,IAAA,oBAAS,EAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,QAAQ;QACvB,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC,CAAC;QAC3L,CAAC,CAAC,MAAM,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC;IACrJ,IAAI,SAAS,CAAC,QAAQ,CAAC;QAAE,OAAO,QAAQ,CAAC;IACzC,OAAO,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;AACjF,CAAC"}
|
|
@@ -40,6 +40,8 @@ const log_1 = require("../util/log");
|
|
|
40
40
|
const siteZip_1 = require("../publish/siteZip");
|
|
41
41
|
const siteClient_1 = require("../publish/siteClient");
|
|
42
42
|
const responseClassifier_1 = require("../publish/responseClassifier");
|
|
43
|
+
const envelope_1 = require("../output/envelope");
|
|
44
|
+
const domainEndpoints_1 = require("./domainEndpoints");
|
|
43
45
|
exports.defaultSiteAdapterDeps = {
|
|
44
46
|
createClient: (apiOrigin) => new siteClient_1.SiteClient(apiOrigin),
|
|
45
47
|
buildZip: siteZip_1.buildSiteZip,
|
|
@@ -55,15 +57,20 @@ function id(value) {
|
|
|
55
57
|
const candidate = object(value)?.id;
|
|
56
58
|
return typeof candidate === 'number' && Number.isSafeInteger(candidate) && candidate > 0 ? candidate : undefined;
|
|
57
59
|
}
|
|
58
|
-
function domain(value) {
|
|
59
|
-
const candidate = object(value)?.domain;
|
|
60
|
-
return typeof candidate === 'string' && candidate.length > 0 ? candidate : undefined;
|
|
61
|
-
}
|
|
62
60
|
function environmentExists(value, env) {
|
|
63
61
|
return Array.isArray(value) && value.some((entry) => object(entry)?.name === env);
|
|
64
62
|
}
|
|
63
|
+
function siteEnvironment(value, env) {
|
|
64
|
+
const environments = object(value)?.environments;
|
|
65
|
+
if (!Array.isArray(environments))
|
|
66
|
+
return undefined;
|
|
67
|
+
return environments
|
|
68
|
+
.map((entry) => object(entry))
|
|
69
|
+
.find((entry) => entry?.env === env);
|
|
70
|
+
}
|
|
65
71
|
function redact(message, values) {
|
|
66
|
-
|
|
72
|
+
const explicit = values.reduce((safe, value) => value.length > 0 ? safe.split(value).join('[REDACTED]') : safe, message);
|
|
73
|
+
return (0, envelope_1.redactTokenShaped)(explicit);
|
|
67
74
|
}
|
|
68
75
|
function failure(outcome, operation, input, started) {
|
|
69
76
|
const retryable = outcome.kind === 'rate_limited' || outcome.kind === 'infra_error'
|
|
@@ -117,13 +124,15 @@ async function deploySite(input, deps = exports.defaultSiteAdapterDeps) {
|
|
|
117
124
|
const client = deps.createClient(input.apiOrigin);
|
|
118
125
|
const context = { accessToken: input.token, orgId: input.orgId };
|
|
119
126
|
let siteId = 0;
|
|
127
|
+
let authoritativeSiteView;
|
|
120
128
|
const existing = await call('get site', input, () => client.getSite(context, input.spid, input.target.slug));
|
|
121
129
|
if (isFailure(existing)) {
|
|
122
130
|
if (existing.code !== 'NOT_FOUND')
|
|
123
131
|
return existing;
|
|
124
132
|
}
|
|
125
133
|
else {
|
|
126
|
-
|
|
134
|
+
authoritativeSiteView = data(existing);
|
|
135
|
+
siteId = id(authoritativeSiteView) ?? 0;
|
|
127
136
|
if (siteId === 0)
|
|
128
137
|
return { ok: false, kind: 'infra_error', code: 'SITE_RESPONSE_INVALID', message: 'SuperSite returned an invalid site identity', retryable: true };
|
|
129
138
|
}
|
|
@@ -155,7 +164,8 @@ async function deploySite(input, deps = exports.defaultSiteAdapterDeps) {
|
|
|
155
164
|
}));
|
|
156
165
|
if (isFailure(createdSite))
|
|
157
166
|
return createdSite;
|
|
158
|
-
|
|
167
|
+
authoritativeSiteView = data(createdSite);
|
|
168
|
+
siteId = id(authoritativeSiteView) ?? 0;
|
|
159
169
|
if (siteId === 0)
|
|
160
170
|
return { ok: false, kind: 'infra_error', code: 'SITE_RESPONSE_INVALID', message: 'SuperSite create returned no valid site id', retryable: true };
|
|
161
171
|
}
|
|
@@ -172,11 +182,47 @@ async function deploySite(input, deps = exports.defaultSiteAdapterDeps) {
|
|
|
172
182
|
// reuse the server idempotency record instead of behaving like an abort (GO-015).
|
|
173
183
|
const soft = deployed.kind === 'soft_success';
|
|
174
184
|
const resource = data(deployed);
|
|
185
|
+
let targetEnvironment = siteEnvironment(authoritativeSiteView, input.target.env);
|
|
186
|
+
if (!targetEnvironment) {
|
|
187
|
+
const refreshed = await call('get site after committed deploy', input, () => (client.getSite(context, input.spid, input.target.slug)));
|
|
188
|
+
if (!isFailure(refreshed)) {
|
|
189
|
+
targetEnvironment = siteEnvironment(data(refreshed), input.target.env);
|
|
190
|
+
if (!targetEnvironment) {
|
|
191
|
+
log_1.log.error('SuperSite committed deploy has no authoritative target environment', {
|
|
192
|
+
target: 'SuperSite',
|
|
193
|
+
projectId: input.projectId,
|
|
194
|
+
envTarget: input.target.envTarget,
|
|
195
|
+
request_summary: `${input.spid}/${input.target.slug}/${input.target.env}`,
|
|
196
|
+
response_summary: 'SITE_ENVIRONMENT_MISSING',
|
|
197
|
+
duration_ms: 0,
|
|
198
|
+
retry: false,
|
|
199
|
+
});
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
const platform = (0, domainEndpoints_1.createPlatformDomainEndpoint)(targetEnvironment?.domain, soft ? 'pending' : 'ready');
|
|
204
|
+
const domains = (0, domainEndpoints_1.mergeDomainEndpoints)(platform, []);
|
|
205
|
+
if (targetEnvironment && !platform) {
|
|
206
|
+
log_1.log.error('SuperSite authoritative target environment has no valid domain', {
|
|
207
|
+
target: 'SuperSite',
|
|
208
|
+
projectId: input.projectId,
|
|
209
|
+
envTarget: input.target.envTarget,
|
|
210
|
+
request_summary: `${input.spid}/${input.target.slug}/${input.target.env}`,
|
|
211
|
+
response_summary: 'SITE_DOMAIN_INVALID',
|
|
212
|
+
duration_ms: 0,
|
|
213
|
+
retry: false,
|
|
214
|
+
});
|
|
215
|
+
}
|
|
216
|
+
const deployResource = {
|
|
217
|
+
id: id(resource) ?? siteId,
|
|
218
|
+
...(platform ? { domain: platform.domain, domains } : {}),
|
|
219
|
+
...(soft ? { pending: true } : {}),
|
|
220
|
+
};
|
|
175
221
|
return {
|
|
176
222
|
ok: true,
|
|
177
223
|
soft,
|
|
178
224
|
message: soft ? `site deployed; edge pointer is still converging` : `deployed site ${input.spid}/${input.target.slug}/${input.target.env}`,
|
|
179
|
-
resource:
|
|
225
|
+
resource: deployResource,
|
|
180
226
|
};
|
|
181
227
|
}
|
|
182
228
|
//# sourceMappingURL=siteAdapter.js.map
|