fix: preserve secret-url DB readiness authority
This commit is contained in:
@@ -90,6 +90,10 @@ async function run() {
|
||||
assert.equal(health.body.db.liveDbEvidence, false);
|
||||
assert.equal(health.body.db.connectionAttempted, false);
|
||||
assert.equal(health.body.db.connectionResult, "not_attempted_missing_env");
|
||||
assert.equal(health.body.db.endpointSource, "secret-url-host");
|
||||
assert.equal(health.body.db.optionalPublicDnsAlias.source, "optional-public-dns-alias");
|
||||
assert.equal(health.body.db.optionalPublicDnsAlias.requiredForReadiness, false);
|
||||
assert.equal(health.body.db.optionalPublicDnsAlias.usedForProbe, false);
|
||||
assert.equal(health.body.db.ready, false);
|
||||
assert.deepEqual(health.body.db.missingEnv, ["HWLAB_CLOUD_DB_URL", "HWLAB_CLOUD_DB_SSL_MODE"]);
|
||||
assert.equal(health.body.runtime.adapter, "memory");
|
||||
|
||||
@@ -145,7 +145,7 @@ function validateSource(ctx, manifest) {
|
||||
const tunnelClient = servicesById.get("hwlab-tunnel-client");
|
||||
const cli = servicesById.get("hwlab-cli");
|
||||
expectEqual(ctx, cloudApi?.env?.HWLAB_PUBLIC_ENDPOINT, endpoints.api?.url, "$.services.hwlab-cloud-api.env.HWLAB_PUBLIC_ENDPOINT", "cloud API public endpoint env");
|
||||
validateCloudApiDbDnsSource(ctx, cloudApi?.env ?? {});
|
||||
validateCloudApiDbSource(ctx, cloudApi?.env ?? {});
|
||||
validateCloudApiCodeAgentSource(ctx, cloudApi?.env ?? {});
|
||||
expectEqual(ctx, cli?.env?.HWLAB_CLI_ENDPOINT, endpoints.api?.url, "$.services.hwlab-cli.env.HWLAB_CLI_ENDPOINT", "CLI endpoint env");
|
||||
expectEqual(ctx, tunnelClient?.env?.HWLAB_FRP_PUBLIC_PORT, String(expectedPorts.api), "$.services.hwlab-tunnel-client.env.HWLAB_FRP_PUBLIC_PORT", "tunnel API public port env");
|
||||
@@ -189,13 +189,23 @@ function validateSource(ctx, manifest) {
|
||||
return { manifest, endpoints, servicesById, proxies, serviceMappings, healthPath: manifest.health?.path };
|
||||
}
|
||||
|
||||
function validateCloudApiDbDnsSource(ctx, env) {
|
||||
const dns = DEV_DB_ENV_CONTRACT.dns;
|
||||
const expectedHost = `${dns.serviceName}.${dns.namespace}.svc.cluster.local`;
|
||||
expectEqual(ctx, env.HWLAB_CLOUD_DB_SERVICE_NAME, dns.serviceName, "$.services.hwlab-cloud-api.env.HWLAB_CLOUD_DB_SERVICE_NAME", "cloud API DB service name");
|
||||
expectEqual(ctx, env.HWLAB_CLOUD_DB_SERVICE_NAMESPACE, dns.namespace, "$.services.hwlab-cloud-api.env.HWLAB_CLOUD_DB_SERVICE_NAMESPACE", "cloud API DB service namespace");
|
||||
expectEqual(ctx, env.HWLAB_CLOUD_DB_HOST, expectedHost, "$.services.hwlab-cloud-api.env.HWLAB_CLOUD_DB_HOST", "cloud API DB stable DNS host");
|
||||
expectEqual(ctx, env.HWLAB_CLOUD_DB_PORT, String(dns.port), "$.services.hwlab-cloud-api.env.HWLAB_CLOUD_DB_PORT", "cloud API DB service port");
|
||||
function validateCloudApiDbSource(ctx, env) {
|
||||
const alias = DEV_DB_ENV_CONTRACT.dns;
|
||||
expectEqual(ctx, env.HWLAB_CLOUD_DB_URL, "secretRef:hwlab-cloud-api-dev-db/database-url", "$.services.hwlab-cloud-api.env.HWLAB_CLOUD_DB_URL", "cloud API DB URL Secret reference");
|
||||
expectEqual(ctx, env.HWLAB_CLOUD_DB_SSL_MODE, "require", "$.services.hwlab-cloud-api.env.HWLAB_CLOUD_DB_SSL_MODE", "cloud API DB SSL mode");
|
||||
expectEqual(ctx, env.HWLAB_CLOUD_DB_CONTRACT, "dev-redacted-presence-only", "$.services.hwlab-cloud-api.env.HWLAB_CLOUD_DB_CONTRACT", "cloud API DB redacted contract marker");
|
||||
expectEqual(ctx, DEV_DB_ENV_CONTRACT.endpointAuthority.source, "secret-url-host", "internal/cloud/db-contract.mjs.endpointAuthority.source", "cloud API DB runtime authority source");
|
||||
expectEqual(ctx, DEV_DB_ENV_CONTRACT.endpointAuthority.env, "HWLAB_CLOUD_DB_URL", "internal/cloud/db-contract.mjs.endpointAuthority.env", "cloud API DB runtime authority env");
|
||||
expectEqual(ctx, alias.requiredForReadiness, false, "internal/cloud/db-contract.mjs.dns.requiredForReadiness", "cloud API DB DNS alias readiness requirement");
|
||||
expectEqual(ctx, alias.usedForProbe, false, "internal/cloud/db-contract.mjs.dns.usedForProbe", "cloud API DB DNS alias probe source");
|
||||
for (const name of [
|
||||
"HWLAB_CLOUD_DB_SERVICE_NAME",
|
||||
"HWLAB_CLOUD_DB_SERVICE_NAMESPACE",
|
||||
"HWLAB_CLOUD_DB_HOST",
|
||||
"HWLAB_CLOUD_DB_PORT"
|
||||
]) {
|
||||
expectEqual(ctx, env[name], undefined, `$.services.hwlab-cloud-api.env.${name}`, `${name} is optional and not a readiness hard requirement`);
|
||||
}
|
||||
}
|
||||
|
||||
function validateCloudApiCodeAgentSource(ctx, env) {
|
||||
@@ -317,7 +327,7 @@ function validateK3sArtifacts(ctx, source, rendered, services, workloads, health
|
||||
}
|
||||
}
|
||||
|
||||
validateCloudApiDbDnsArtifacts(ctx, services, workloads);
|
||||
validateCloudApiDbOptionalAliasArtifacts(ctx, services, workloads);
|
||||
validateCloudApiCodeAgentArtifacts(ctx, workloads);
|
||||
|
||||
expectEqual(ctx, healthContract.data?.endpoint, source.endpoints.api?.url, "deploy/k8s/dev/health-contract.yaml.data.endpoint", "health contract endpoint");
|
||||
@@ -327,30 +337,20 @@ function validateK3sArtifacts(ctx, source, rendered, services, workloads, health
|
||||
expectEqual(ctx, masterEdge.prodAcceptance, false, "deploy/master-edge/health-contract.json.prodAcceptance", "master edge PROD acceptance");
|
||||
}
|
||||
|
||||
function validateCloudApiDbDnsArtifacts(ctx, services, workloads) {
|
||||
const dns = DEV_DB_ENV_CONTRACT.dns;
|
||||
const expectedHost = `${dns.serviceName}.${dns.namespace}.svc.cluster.local`;
|
||||
const service = listItems(services).find((item) => item?.metadata?.name === dns.serviceName);
|
||||
expect(ctx, Boolean(service), "missing_rendered_artifact", "deploy/k8s/base/services.yaml.cloud-api-db", "cloud-api DB stable DNS Service exists");
|
||||
if (service) {
|
||||
const port = (service.spec?.ports ?? []).find((entry) => entry.name === dns.portName);
|
||||
expectEqual(ctx, service.metadata?.namespace, dns.namespace, "deploy/k8s/base/services.yaml.cloud-api-db.metadata.namespace", "cloud-api DB Service namespace");
|
||||
expectEqual(ctx, service.spec?.type, "ClusterIP", "deploy/k8s/base/services.yaml.cloud-api-db.spec.type", "cloud-api DB Service type");
|
||||
expectEqual(ctx, service.spec?.selector, undefined, "deploy/k8s/base/services.yaml.cloud-api-db.spec.selector", "cloud-api DB Service is selectorless until endpoints are provisioned");
|
||||
expectEqual(ctx, service.metadata?.labels?.["hwlab.pikastech.local/source-contract"], "db-dns", "deploy/k8s/base/services.yaml.cloud-api-db.metadata.labels.source-contract", "cloud-api DB Service source-contract label");
|
||||
expect(ctx, Boolean(port), "missing_rendered_artifact", "deploy/k8s/base/services.yaml.cloud-api-db.spec.ports.postgres", "cloud-api DB Service postgres port exists");
|
||||
if (port) {
|
||||
expectEqual(ctx, port.port, dns.port, "deploy/k8s/base/services.yaml.cloud-api-db.spec.ports.postgres.port", "cloud-api DB Service port");
|
||||
expectEqual(ctx, port.targetPort, dns.portName, "deploy/k8s/base/services.yaml.cloud-api-db.spec.ports.postgres.targetPort", "cloud-api DB Service targetPort");
|
||||
}
|
||||
}
|
||||
|
||||
function validateCloudApiDbOptionalAliasArtifacts(ctx, services, workloads) {
|
||||
const alias = DEV_DB_ENV_CONTRACT.dns;
|
||||
const service = listItems(services).find((item) => item?.metadata?.name === alias.serviceName);
|
||||
expectEqual(ctx, service, undefined, "deploy/k8s/base/services.yaml.cloud-api-db", "cloud-api-db remains optional until Service/Endpoint ownership and rollout contract exist");
|
||||
const container = mapByServiceId(listItems(workloads)).get("hwlab-cloud-api")?.spec?.template?.spec?.containers?.[0];
|
||||
const env = new Map((container?.env ?? []).map((entry) => [entry.name, entry.value]));
|
||||
expectEqual(ctx, env.get("HWLAB_CLOUD_DB_SERVICE_NAME"), dns.serviceName, "deploy/k8s/base/workloads.yaml.hwlab-cloud-api.env.HWLAB_CLOUD_DB_SERVICE_NAME", "cloud API workload DB service name");
|
||||
expectEqual(ctx, env.get("HWLAB_CLOUD_DB_SERVICE_NAMESPACE"), dns.namespace, "deploy/k8s/base/workloads.yaml.hwlab-cloud-api.env.HWLAB_CLOUD_DB_SERVICE_NAMESPACE", "cloud API workload DB service namespace");
|
||||
expectEqual(ctx, env.get("HWLAB_CLOUD_DB_HOST"), expectedHost, "deploy/k8s/base/workloads.yaml.hwlab-cloud-api.env.HWLAB_CLOUD_DB_HOST", "cloud API workload DB host");
|
||||
expectEqual(ctx, env.get("HWLAB_CLOUD_DB_PORT"), String(dns.port), "deploy/k8s/base/workloads.yaml.hwlab-cloud-api.env.HWLAB_CLOUD_DB_PORT", "cloud API workload DB port");
|
||||
for (const name of [
|
||||
"HWLAB_CLOUD_DB_SERVICE_NAME",
|
||||
"HWLAB_CLOUD_DB_SERVICE_NAMESPACE",
|
||||
"HWLAB_CLOUD_DB_HOST",
|
||||
"HWLAB_CLOUD_DB_PORT"
|
||||
]) {
|
||||
expectEqual(ctx, env.get(name), undefined, `deploy/k8s/base/workloads.yaml.hwlab-cloud-api.env.${name}`, `${name} is optional and not injected as readiness authority`);
|
||||
}
|
||||
}
|
||||
|
||||
function validateCloudApiCodeAgentArtifacts(ctx, workloads) {
|
||||
|
||||
@@ -502,7 +502,7 @@ function blockerHint(blocker) {
|
||||
return "Restore the public DEV health path and confirm it identifies HWLAB dev, not a substitute runtime.";
|
||||
}
|
||||
if (blocker.scope === "dev-health-db" || blocker.scope === "cloud-api-db" || blocker.scope === "cloud-api-db-config") {
|
||||
return "Configure and verify the DEV cloud-api DB env and stable DNS readiness through health output, without reading secret values.";
|
||||
return "Configure and verify the DEV cloud-api DB Secret URL host readiness through health output, without reading secret values.";
|
||||
}
|
||||
return blocker.summary;
|
||||
}
|
||||
@@ -749,14 +749,14 @@ async function checkCloudApiDb(deploy, workloads, services, blockers) {
|
||||
const missingSecretRefs = requiredEnv
|
||||
.filter((env) => env.secretRef && !env.secretRef.present)
|
||||
.map((env) => `${env.secretRef.secretName}/${env.secretRef.secretKey}`);
|
||||
const dnsContract = inspectCloudApiDbDnsContract(deployEnv, workloadEnv, services);
|
||||
const dnsContract = inspectCloudApiDbOptionalAliasContract(deployEnv, workloadEnv, services);
|
||||
const missingDnsContract = dnsContract.missing;
|
||||
if (missingManifest.length > 0 || missingK8s.length > 0 || missingSecretRefs.length > 0 || missingDnsContract.length > 0) {
|
||||
addBlocker(
|
||||
blockers,
|
||||
"runtime_blocker",
|
||||
"cloud-api-db-config",
|
||||
`cloud-api DEV DB env/DNS contract is incomplete; missing ${[...missingManifest, ...missingK8s, ...missingSecretRefs, ...missingDnsContract].join(", ")}`
|
||||
`cloud-api DEV DB env/authority contract is incomplete; missing ${[...missingManifest, ...missingK8s, ...missingSecretRefs, ...missingDnsContract].join(", ")}`
|
||||
);
|
||||
}
|
||||
|
||||
@@ -804,15 +804,13 @@ async function checkCloudApiDb(deploy, workloads, services, blockers) {
|
||||
valuesRedacted: true,
|
||||
liveDbEvidence: false,
|
||||
fixtureEvidence: false,
|
||||
note: "This check records DB env, Secret reference, and stable DNS Service presence only. It is not live DB evidence."
|
||||
note: "This check records DB env, Secret reference, and Secret URL host authority only. Optional cloud-api-db alias presence is diagnostic and is not live DB evidence."
|
||||
};
|
||||
}
|
||||
|
||||
function inspectCloudApiDbDnsContract(deployEnv, workloadEnv, services) {
|
||||
const dns = DEV_DB_ENV_CONTRACT.dns;
|
||||
const expectedHost = `${dns.serviceName}.${dns.namespace}.svc.cluster.local`;
|
||||
const service = listItems(services).find((item) => item?.metadata?.name === dns.serviceName) ?? null;
|
||||
const port = service?.spec?.ports?.find((entry) => entry.name === dns.portName) ?? null;
|
||||
function inspectCloudApiDbOptionalAliasContract(deployEnv, workloadEnv, services) {
|
||||
const alias = DEV_DB_ENV_CONTRACT.dns;
|
||||
const service = listItems(services).find((item) => item?.metadata?.name === alias.serviceName) ?? null;
|
||||
const actual = {
|
||||
deployServiceName: deployEnv.HWLAB_CLOUD_DB_SERVICE_NAME,
|
||||
deployServiceNamespace: deployEnv.HWLAB_CLOUD_DB_SERVICE_NAMESPACE,
|
||||
@@ -822,42 +820,25 @@ function inspectCloudApiDbDnsContract(deployEnv, workloadEnv, services) {
|
||||
workloadServiceNamespace: workloadEnv.get("HWLAB_CLOUD_DB_SERVICE_NAMESPACE")?.value,
|
||||
workloadHost: workloadEnv.get("HWLAB_CLOUD_DB_HOST")?.value,
|
||||
workloadPort: workloadEnv.get("HWLAB_CLOUD_DB_PORT")?.value,
|
||||
serviceName: service?.metadata?.name,
|
||||
serviceNamespace: service?.metadata?.namespace,
|
||||
serviceType: service?.spec?.type,
|
||||
serviceSelector: service?.spec?.selector ?? null,
|
||||
portName: port?.name,
|
||||
port: port?.port,
|
||||
targetPort: port?.targetPort
|
||||
serviceName: service?.metadata?.name
|
||||
};
|
||||
const checks = [
|
||||
["deployEnv.HWLAB_CLOUD_DB_SERVICE_NAME", actual.deployServiceName, dns.serviceName],
|
||||
["deployEnv.HWLAB_CLOUD_DB_SERVICE_NAMESPACE", actual.deployServiceNamespace, dns.namespace],
|
||||
["deployEnv.HWLAB_CLOUD_DB_HOST", actual.deployHost, expectedHost],
|
||||
["deployEnv.HWLAB_CLOUD_DB_PORT", actual.deployPort, String(dns.port)],
|
||||
["workloadEnv.HWLAB_CLOUD_DB_SERVICE_NAME", actual.workloadServiceName, dns.serviceName],
|
||||
["workloadEnv.HWLAB_CLOUD_DB_SERVICE_NAMESPACE", actual.workloadServiceNamespace, dns.namespace],
|
||||
["workloadEnv.HWLAB_CLOUD_DB_HOST", actual.workloadHost, expectedHost],
|
||||
["workloadEnv.HWLAB_CLOUD_DB_PORT", actual.workloadPort, String(dns.port)],
|
||||
["Service.metadata.name", actual.serviceName, dns.serviceName],
|
||||
["Service.metadata.namespace", actual.serviceNamespace, dns.namespace],
|
||||
["Service.spec.type", actual.serviceType, "ClusterIP"],
|
||||
["Service.spec.selector", actual.serviceSelector, null],
|
||||
["Service.port.name", actual.portName, dns.portName],
|
||||
["Service.port.port", actual.port, dns.port],
|
||||
["Service.port.targetPort", actual.targetPort, dns.portName]
|
||||
];
|
||||
const missing = checks
|
||||
.filter(([, actualValue, expectedValue]) => !Object.is(actualValue, expectedValue))
|
||||
.map(([name, actualValue, expectedValue]) => `${name} expected ${expectedValue} got ${actualValue ?? "missing"}`);
|
||||
const missing = [];
|
||||
for (const [name, value] of Object.entries(actual)) {
|
||||
if (value !== undefined) {
|
||||
missing.push(`${name} must be absent because ${alias.serviceName} is not the readiness authority`);
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
ready: missing.length === 0,
|
||||
host: expectedHost,
|
||||
serviceName: dns.serviceName,
|
||||
namespace: dns.namespace,
|
||||
port: dns.port,
|
||||
selectorless: service ? service.spec?.selector === undefined : false,
|
||||
source: alias.source,
|
||||
serviceName: alias.serviceName,
|
||||
namespace: alias.namespace,
|
||||
port: alias.port,
|
||||
portName: alias.portName,
|
||||
requiredForReadiness: alias.requiredForReadiness,
|
||||
usedForProbe: alias.usedForProbe,
|
||||
servicePresent: Boolean(service),
|
||||
secretMaterialRead: false,
|
||||
liveDbEvidence: false,
|
||||
missing,
|
||||
|
||||
@@ -305,6 +305,7 @@ function inspectCloudApiDbContract(deploy) {
|
||||
networkAttempted: false,
|
||||
result: "manifest_only_not_attempted",
|
||||
classification: "manifest_only",
|
||||
endpointSource: DEV_DB_ENV_CONTRACT.endpointAuthority.source,
|
||||
probeType: "tcp-connect",
|
||||
endpointRedacted: true,
|
||||
valueRedacted: true,
|
||||
@@ -321,6 +322,28 @@ function inspectCloudApiDbContract(deploy) {
|
||||
connectionChecked: false,
|
||||
connectionAttempted: false,
|
||||
connectionResult: connection.result,
|
||||
endpointSource: DEV_DB_ENV_CONTRACT.endpointAuthority.source,
|
||||
endpoint: {
|
||||
authoritative: {
|
||||
source: DEV_DB_ENV_CONTRACT.endpointAuthority.source,
|
||||
env: DEV_DB_ENV_CONTRACT.endpointAuthority.env,
|
||||
requiredForReadiness: true,
|
||||
usedForProbe: true,
|
||||
endpointRedacted: true,
|
||||
valueRedacted: true
|
||||
}
|
||||
},
|
||||
optionalPublicDnsAlias: {
|
||||
source: DEV_DB_ENV_CONTRACT.dns.source,
|
||||
serviceName: DEV_DB_ENV_CONTRACT.dns.serviceName,
|
||||
namespace: DEV_DB_ENV_CONTRACT.dns.namespace,
|
||||
port: DEV_DB_ENV_CONTRACT.dns.port,
|
||||
portName: DEV_DB_ENV_CONTRACT.dns.portName,
|
||||
requiredForReadiness: false,
|
||||
usedForProbe: false,
|
||||
envPresent: false,
|
||||
readyGate: "not_readiness_authority"
|
||||
},
|
||||
fields: [
|
||||
{
|
||||
name: "HWLAB_CLOUD_DB_URL",
|
||||
@@ -475,9 +498,25 @@ function summarizeRuntimeDbReadiness(db, secretPresence = unknownDbSecretPresenc
|
||||
const connectionResult = db.connectionResult ?? db.connection?.result ?? (connectionAttempted ? "unknown" : "not_attempted");
|
||||
const connectionClassification =
|
||||
db.connection?.classification ?? classificationForRuntimeDb(db, connectionAttempted, connectionResult);
|
||||
const endpointSource =
|
||||
db.endpointSource ?? db.connection?.endpointSource ?? db.endpoint?.authoritative?.source ?? DEV_DB_ENV_CONTRACT.endpointAuthority.source;
|
||||
const optionalPublicDnsAlias = db.optionalPublicDnsAlias ?? db.endpoint?.optionalPublicDnsAlias ?? {
|
||||
source: DEV_DB_ENV_CONTRACT.dns.source,
|
||||
serviceName: DEV_DB_ENV_CONTRACT.dns.serviceName,
|
||||
namespace: DEV_DB_ENV_CONTRACT.dns.namespace,
|
||||
port: DEV_DB_ENV_CONTRACT.dns.port,
|
||||
portName: DEV_DB_ENV_CONTRACT.dns.portName,
|
||||
requiredForReadiness: false,
|
||||
usedForProbe: false,
|
||||
envPresent: false,
|
||||
readyGate: "not_readiness_authority"
|
||||
};
|
||||
const liveConnected = Boolean(db.liveConnected ?? db.connected ?? db.ready);
|
||||
const blockerMessage = liveConnected ? null : db.blocker ?? blockerForRuntimeDb(db, connectionAttempted, connectionResult);
|
||||
const status = liveConnected ? "pass" : "blocked";
|
||||
const authorityReady = endpointSource === DEV_DB_ENV_CONTRACT.endpointAuthority.source;
|
||||
const blockerMessage = liveConnected && authorityReady
|
||||
? null
|
||||
: db.blocker ?? (authorityReady ? blockerForRuntimeDb(db, connectionAttempted, connectionResult) : "DB readiness did not use the Secret URL host authority");
|
||||
const status = liveConnected && authorityReady ? "pass" : "blocked";
|
||||
const secretRef = Array.isArray(db.secretRefs) ? db.secretRefs[0] : null;
|
||||
|
||||
return {
|
||||
@@ -495,6 +534,18 @@ function summarizeRuntimeDbReadiness(db, secretPresence = unknownDbSecretPresenc
|
||||
connectionAttempted,
|
||||
connectionResult,
|
||||
connectionClassification,
|
||||
endpointSource,
|
||||
optionalPublicDnsAlias: {
|
||||
source: optionalPublicDnsAlias.source ?? DEV_DB_ENV_CONTRACT.dns.source,
|
||||
serviceName: optionalPublicDnsAlias.serviceName ?? DEV_DB_ENV_CONTRACT.dns.serviceName,
|
||||
namespace: optionalPublicDnsAlias.namespace ?? DEV_DB_ENV_CONTRACT.dns.namespace,
|
||||
port: optionalPublicDnsAlias.port ?? DEV_DB_ENV_CONTRACT.dns.port,
|
||||
portName: optionalPublicDnsAlias.portName ?? DEV_DB_ENV_CONTRACT.dns.portName,
|
||||
requiredForReadiness: optionalPublicDnsAlias.requiredForReadiness === true,
|
||||
usedForProbe: optionalPublicDnsAlias.usedForProbe === true,
|
||||
envPresent: optionalPublicDnsAlias.envPresent === true,
|
||||
readyGate: optionalPublicDnsAlias.readyGate ?? "not_readiness_authority"
|
||||
},
|
||||
liveConnected,
|
||||
valuesRedacted: db.redaction?.valuesRedacted !== false && db.safety?.valuesRedacted === true,
|
||||
secretMaterialRead: false,
|
||||
@@ -507,6 +558,7 @@ function summarizeRuntimeDbReadiness(db, secretPresence = unknownDbSecretPresenc
|
||||
connectionAttempted,
|
||||
connectionResult,
|
||||
classification: connectionClassification,
|
||||
endpointSource,
|
||||
liveConnected,
|
||||
endpointRedacted: db.connection?.endpointRedacted !== false,
|
||||
valueRedacted: true
|
||||
@@ -906,7 +958,7 @@ function classifyMilestoneImpact(edgeHealth) {
|
||||
return {
|
||||
M3: {
|
||||
status: "separate_blocker",
|
||||
summary: "M3 still requires real DEV hardware trusted-loop operation/trace/audit/evidence; DB DNS failure and #143 provider Secret absence do not prove or clear M3."
|
||||
summary: "M3 still requires real DEV hardware trusted-loop operation/trace/audit/evidence; DB Secret URL host readiness failure and #143 provider Secret absence do not prove or clear M3."
|
||||
},
|
||||
M4: {
|
||||
status: dbBlocked || providerBlocked ? "blocked" : "not_proven",
|
||||
|
||||
@@ -28,6 +28,7 @@ test("runtime DB readiness preserves dns resolution classification", () => {
|
||||
attempted: true,
|
||||
result: "dns_error",
|
||||
classification: "dns_resolution_failed",
|
||||
endpointSource: "secret-url-host",
|
||||
endpointRedacted: true,
|
||||
valueRedacted: true
|
||||
},
|
||||
@@ -49,13 +50,70 @@ test("runtime DB readiness preserves dns resolution classification", () => {
|
||||
assert.equal(readiness.status, "blocked");
|
||||
assert.equal(readiness.connectionResult, "dns_error");
|
||||
assert.equal(readiness.connectionClassification, "dns_resolution_failed");
|
||||
assert.equal(readiness.endpointSource, "secret-url-host");
|
||||
assert.equal(readiness.optionalPublicDnsAlias.source, "optional-public-dns-alias");
|
||||
assert.equal(readiness.optionalPublicDnsAlias.requiredForReadiness, false);
|
||||
assert.equal(readiness.optionalPublicDnsAlias.usedForProbe, false);
|
||||
assert.equal(readiness.liveConnected, false);
|
||||
assert.equal(readiness.liveDbEvidence, false);
|
||||
assert.equal(readiness.secretMaterialRead, false);
|
||||
assert.equal(readiness.evidence[0].classification, "dns_resolution_failed");
|
||||
assert.equal(readiness.evidence[0].endpointSource, "secret-url-host");
|
||||
});
|
||||
|
||||
test("parallel blockers keep DB DNS and provider Secret gaps independent", () => {
|
||||
test("runtime DB readiness does not pass when live success uses a non-authoritative DB endpoint source", () => {
|
||||
const readiness = __testHooks.summarizeRuntimeDbReadiness(
|
||||
{
|
||||
configReady: true,
|
||||
ready: true,
|
||||
connected: true,
|
||||
liveConnected: true,
|
||||
liveDbEvidence: true,
|
||||
connectionAttempted: true,
|
||||
connectionResult: "connected",
|
||||
endpointSource: "optional-public-dns-alias",
|
||||
fields: [
|
||||
{ name: "HWLAB_CLOUD_DB_URL", present: true },
|
||||
{ name: "HWLAB_CLOUD_DB_SSL_MODE", present: true }
|
||||
],
|
||||
secretRefs: [
|
||||
{
|
||||
env: "HWLAB_CLOUD_DB_URL",
|
||||
secretName: "hwlab-cloud-api-dev-db",
|
||||
secretKey: "database-url",
|
||||
present: true,
|
||||
envInjected: true
|
||||
}
|
||||
],
|
||||
connection: {
|
||||
attempted: true,
|
||||
result: "connected",
|
||||
classification: "tcp_connected",
|
||||
endpointSource: "optional-public-dns-alias",
|
||||
endpointRedacted: true,
|
||||
valueRedacted: true
|
||||
},
|
||||
redaction: { valuesRedacted: true },
|
||||
safety: { valuesRedacted: true, liveDbEvidence: true }
|
||||
},
|
||||
{
|
||||
observable: true,
|
||||
secretName: "hwlab-cloud-api-dev-db",
|
||||
secretKey: "database-url",
|
||||
secretPresent: true,
|
||||
secretKeyPresent: true,
|
||||
secretValueRead: false,
|
||||
redacted: true
|
||||
}
|
||||
);
|
||||
|
||||
assert.equal(readiness.status, "blocked");
|
||||
assert.equal(readiness.liveConnected, true);
|
||||
assert.equal(readiness.endpointSource, "optional-public-dns-alias");
|
||||
assert.match(readiness.blocker, /Secret URL host/u);
|
||||
});
|
||||
|
||||
test("parallel blockers keep DB readiness and provider Secret gaps independent", () => {
|
||||
const edgeHealth = {
|
||||
runtimeDbReadiness: {
|
||||
status: "blocked",
|
||||
|
||||
@@ -841,7 +841,11 @@ function buildDoD(reports, milestones, blockers) {
|
||||
artifactIdentity.targetCoverage?.covered !== false &&
|
||||
artifactIdentity.artifactCatalog?.matchesTarget !== false;
|
||||
const cloudApiDb = cloudApiDbStatus(reports);
|
||||
const dbReady = cloudApiDb.ready === true && cloudApiDb.connected === true && cloudApiDb.liveDbEvidence === true;
|
||||
const dbReady =
|
||||
cloudApiDb.ready === true &&
|
||||
cloudApiDb.connected === true &&
|
||||
cloudApiDb.endpointSource === "secret-url-host" &&
|
||||
cloudApiDb.liveDbEvidence === true;
|
||||
const m3Live = statusIsPass(reports.devM3Hardware.liveOperation?.status);
|
||||
const m4Live = statusIsPass(reports.devM4Agent.livePreflight?.status);
|
||||
|
||||
@@ -885,7 +889,7 @@ function buildDoD(reports, milestones, blockers) {
|
||||
id: "cloud-api-db-ready",
|
||||
status: dbReady ? "pass" : "blocked",
|
||||
evidenceLevel: dbReady ? "DEV-LIVE" : "BLOCKED",
|
||||
summary: `cloud-api DB status=${cloudApiDb.status}; ready=${cloudApiDb.ready}; connected=${cloudApiDb.connected}; liveDbEvidence=${cloudApiDb.liveDbEvidence}.`
|
||||
summary: `cloud-api DB status=${cloudApiDb.status}; ready=${cloudApiDb.ready}; connected=${cloudApiDb.connected}; endpointSource=${cloudApiDb.endpointSource}; liveDbEvidence=${cloudApiDb.liveDbEvidence}.`
|
||||
},
|
||||
{
|
||||
id: "m3-hardware-trusted-loop",
|
||||
@@ -921,6 +925,7 @@ function cloudApiDbStatus(reports) {
|
||||
connected: db.connected === true || db.liveConnected === true,
|
||||
configReady: db.configReady === true,
|
||||
connectionChecked: db.connectionChecked === true,
|
||||
endpointSource: db.endpointSource ?? db.connection?.endpointSource ?? "unknown",
|
||||
liveDbEvidence: db.liveDbEvidence === true
|
||||
};
|
||||
}
|
||||
@@ -929,7 +934,7 @@ function buildCurrentDevLayering(reports, blockers) {
|
||||
const m2EndpointLive = hasCurrentM2EndpointEvidence(reports.devM2Smoke);
|
||||
const edgeLive = hasCurrentLiveEdgeEvidence(reports.devEdgeHealth);
|
||||
const cloudDb = cloudApiDbStatus(reports);
|
||||
const dbReady = cloudDb.ready && cloudDb.connected && cloudDb.liveDbEvidence;
|
||||
const dbReady = cloudDb.ready && cloudDb.connected && cloudDb.endpointSource === "secret-url-host" && cloudDb.liveDbEvidence;
|
||||
const m3Live = statusIsPass(reports.devM3Hardware.liveOperation?.status);
|
||||
const m4Live = statusIsPass(reports.devM4Agent.livePreflight?.status);
|
||||
const artifactIdentity = reports.devPreflight.artifactIdentity;
|
||||
@@ -962,7 +967,7 @@ function buildCurrentDevLayering(reports, blockers) {
|
||||
label: "DB live/degraded",
|
||||
status: dbReady ? "pass" : "blocked",
|
||||
evidenceLevel: dbReady ? "DEV-LIVE" : "BLOCKED",
|
||||
summary: `cloud-api DB status=${cloudDb.status}; configReady=${cloudDb.configReady}; ready=${cloudDb.ready}; connected=${cloudDb.connected}; liveDbEvidence=${cloudDb.liveDbEvidence}.`,
|
||||
summary: `cloud-api DB status=${cloudDb.status}; configReady=${cloudDb.configReady}; ready=${cloudDb.ready}; connected=${cloudDb.connected}; endpointSource=${cloudDb.endpointSource}; liveDbEvidence=${cloudDb.liveDbEvidence}.`,
|
||||
evidence: reports.devM5Gate.devPreconditions?.evidence?.filter((line) => line.includes("/health/live") || line.includes("DB")) ?? [],
|
||||
nextRequired: "Provide live DB connection evidence through redacted health output; route reachability alone is insufficient."
|
||||
},
|
||||
@@ -1079,11 +1084,12 @@ function buildMilestoneBlockerClassification(reports) {
|
||||
status: m4Live ? "pass" : "blocked",
|
||||
currentLevel: m4Live ? "DEV-LIVE" : "BLOCKED",
|
||||
blockerClass: m4Live ? "cleared" : "db-live-readiness",
|
||||
dependency: "Cloud API /health/live must report DB ready=true, connected=true, and liveDbEvidence=true before live agent scheduling/evidence closure.",
|
||||
dependency: "Cloud API /health/live must report DB ready=true, connected=true, endpointSource=secret-url-host, and liveDbEvidence=true before live agent scheduling/evidence closure.",
|
||||
evidence: [
|
||||
`db.status=${cloudDb.status}`,
|
||||
`db.ready=${cloudDb.ready}`,
|
||||
`db.connected=${cloudDb.connected}`,
|
||||
`db.endpointSource=${cloudDb.endpointSource}`,
|
||||
`db.liveDbEvidence=${cloudDb.liveDbEvidence}`
|
||||
],
|
||||
nextRequired: "Repair DB live readiness and rerun the M4 live preflight without scheduling a DEV agent task before preconditions pass.",
|
||||
@@ -1157,7 +1163,7 @@ function fallbackAction(scope) {
|
||||
if (scope === "base-image") return "Preload or tag node:20-bookworm-slim and rerun the base-image and artifact publish preflights.";
|
||||
if (scope.includes("artifact")) return "Publish DEV artifacts for every frozen HWLAB service and record immutable registry digests.";
|
||||
if (scope.includes("edge") || scope.includes("ingress") || scope.includes("frp")) return "Repair frp/master-edge/D601 router path and rerun read-only DEV edge health.";
|
||||
if (scope.includes("cloud-api-db")) return "Configure DEV cloud-api DB env readiness and rerun health/preflight without exposing secrets.";
|
||||
if (scope.includes("cloud-api-db")) return "Configure DEV cloud-api DB env readiness and Secret URL host connectivity, then rerun health/preflight without exposing secrets.";
|
||||
if (scope === "db-live") return "Repair DEV cloud-api DB live readiness, then rerun the read-only health and M4 preflight reports without exposing secret values.";
|
||||
if (scope === "m3-patch-panel-wiring") return "Load/apply DEV patch-panel wiring for res_boxsimu_1:DO1 -> res_boxsimu_2:DI1, then rerun the bounded DEV M3 smoke.";
|
||||
if (scope === "m3-box-simu-identity") return "Fix DEV box-simu instance identity so direct endpoints expose distinct res_boxsimu_1 and res_boxsimu_2 resources.";
|
||||
@@ -1173,8 +1179,8 @@ function evidenceRequiredFor(scope) {
|
||||
if (scope === "hwlab-router" || scope === "hwlab-tunnel-client" || scope === "hwlab-edge-proxy") return "Real repo entrypoints or dedicated Dockerfiles for route services, followed by artifact preflight.";
|
||||
if (scope.includes("artifact") || scope === "ghcr") return "Artifact publish report with ciPublished=true, registryVerified=true, and sha256 digest for each frozen service ID.";
|
||||
if (scope.includes("kubectl") || scope.includes("k3s")) return "Read-only kubectl/k3s report proving pods/services/configmaps are observable in hwlab-dev without reading Secrets.";
|
||||
if (scope.includes("cloud-api-db")) return "Cloud API health/live output showing DB env ready and redacted secret references, without secret material.";
|
||||
if (scope === "db-live") return "Cloud API /health/live output with ready=true, connected=true, liveDbEvidence=true, and redacted secret references.";
|
||||
if (scope.includes("cloud-api-db")) return "Cloud API health/live output showing DB env ready, endpointSource=secret-url-host, redacted secret references, and no secret material.";
|
||||
if (scope === "db-live") return "Cloud API /health/live output with ready=true, connected=true, endpointSource=secret-url-host, liveDbEvidence=true, and redacted secret references.";
|
||||
if (scope === "m3-patch-panel-wiring") return "Read-only patch-panel /status and /wiring showing active res_boxsimu_1:DO1 -> res_boxsimu_2:DI1 before a bounded write/read smoke records operation, trace, audit, and evidence IDs.";
|
||||
if (scope === "m3-box-simu-identity") return "Read-only direct box-simu /health/live and /status output showing distinct res_boxsimu_1 and res_boxsimu_2 resources.";
|
||||
if (scope === "m3-gateway-simu-identity") return "Read-only direct gateway-simu /health/live and /status output showing two distinct gateway identities/sessions.";
|
||||
|
||||
@@ -826,7 +826,7 @@ function validateCloudApiDbContract(reporter, deploy, workloads, services) {
|
||||
"cloud-api-db-env-contract",
|
||||
"db",
|
||||
"pass",
|
||||
"cloud-api DEV DB manifest declares the required env names, redacted Secret reference, and stable k3s DB DNS Service.",
|
||||
"cloud-api DEV DB manifest declares the required env names and redacted Secret reference; optional cloud-api-db alias is not a readiness gate.",
|
||||
evidence
|
||||
);
|
||||
} else {
|
||||
@@ -847,7 +847,7 @@ function validateCloudApiDbContract(reporter, deploy, workloads, services) {
|
||||
type: "contract_blocker",
|
||||
scope: "cloud-api-db-env-contract",
|
||||
summary: `cloud-api DEV DB contract is incomplete; missing ${missing.join(", ")}.`,
|
||||
nextTask: "Repair deploy/deploy.json, deploy/k8s/base/workloads.yaml, and deploy/k8s/base/services.yaml so they expose the required DB env names, redacted Secret reference, and stable DB Service DNS."
|
||||
nextTask: "Repair deploy/deploy.json and deploy/k8s/base/workloads.yaml so they expose the required DB env names and redacted Secret reference. Do not make cloud-api-db a hard readiness gate unless this repo also owns its Service/Endpoint rollout contract."
|
||||
});
|
||||
}
|
||||
|
||||
@@ -914,7 +914,7 @@ function inspectCloudApiDbStaticContract(deploy, workloads, services) {
|
||||
const missingSecretRefs = fields
|
||||
.filter((field) => field.secretRef && !field.secretRef.present)
|
||||
.map((field) => `${field.secretRef.secretName}/${field.secretRef.secretKey}`);
|
||||
const dnsContract = inspectCloudApiDbDnsContract(deployEnv, workloadEnv, services);
|
||||
const dnsContract = inspectCloudApiDbOptionalAliasContract(deployEnv, workloadEnv, services);
|
||||
|
||||
return {
|
||||
contractVersion: DEV_DB_ENV_CONTRACT.contractVersion,
|
||||
@@ -937,11 +937,9 @@ function inspectCloudApiDbStaticContract(deploy, workloads, services) {
|
||||
};
|
||||
}
|
||||
|
||||
function inspectCloudApiDbDnsContract(deployEnv, workloadEnv, services) {
|
||||
const dns = DEV_DB_ENV_CONTRACT.dns;
|
||||
const expectedHost = `${dns.serviceName}.${dns.namespace}.svc.cluster.local`;
|
||||
const service = listManifestItems(services).find((item) => item?.metadata?.name === dns.serviceName) ?? null;
|
||||
const port = service?.spec?.ports?.find((entry) => entry.name === dns.portName) ?? null;
|
||||
function inspectCloudApiDbOptionalAliasContract(deployEnv, workloadEnv, services) {
|
||||
const alias = DEV_DB_ENV_CONTRACT.dns;
|
||||
const service = listManifestItems(services).find((item) => item?.metadata?.name === alias.serviceName) ?? null;
|
||||
const actual = {
|
||||
deployServiceName: deployEnv.HWLAB_CLOUD_DB_SERVICE_NAME,
|
||||
deployServiceNamespace: deployEnv.HWLAB_CLOUD_DB_SERVICE_NAMESPACE,
|
||||
@@ -951,43 +949,25 @@ function inspectCloudApiDbDnsContract(deployEnv, workloadEnv, services) {
|
||||
workloadServiceNamespace: workloadEnv.get("HWLAB_CLOUD_DB_SERVICE_NAMESPACE")?.value,
|
||||
workloadHost: workloadEnv.get("HWLAB_CLOUD_DB_HOST")?.value,
|
||||
workloadPort: workloadEnv.get("HWLAB_CLOUD_DB_PORT")?.value,
|
||||
serviceName: service?.metadata?.name,
|
||||
serviceNamespace: service?.metadata?.namespace,
|
||||
serviceType: service?.spec?.type,
|
||||
serviceSelector: service?.spec?.selector ?? null,
|
||||
portName: port?.name,
|
||||
port: port?.port,
|
||||
targetPort: port?.targetPort
|
||||
serviceName: service?.metadata?.name
|
||||
};
|
||||
const checks = [
|
||||
["deployEnv.HWLAB_CLOUD_DB_SERVICE_NAME", actual.deployServiceName, dns.serviceName],
|
||||
["deployEnv.HWLAB_CLOUD_DB_SERVICE_NAMESPACE", actual.deployServiceNamespace, dns.namespace],
|
||||
["deployEnv.HWLAB_CLOUD_DB_HOST", actual.deployHost, expectedHost],
|
||||
["deployEnv.HWLAB_CLOUD_DB_PORT", actual.deployPort, String(dns.port)],
|
||||
["workloadEnv.HWLAB_CLOUD_DB_SERVICE_NAME", actual.workloadServiceName, dns.serviceName],
|
||||
["workloadEnv.HWLAB_CLOUD_DB_SERVICE_NAMESPACE", actual.workloadServiceNamespace, dns.namespace],
|
||||
["workloadEnv.HWLAB_CLOUD_DB_HOST", actual.workloadHost, expectedHost],
|
||||
["workloadEnv.HWLAB_CLOUD_DB_PORT", actual.workloadPort, String(dns.port)],
|
||||
["Service.metadata.name", actual.serviceName, dns.serviceName],
|
||||
["Service.metadata.namespace", actual.serviceNamespace, dns.namespace],
|
||||
["Service.spec.type", actual.serviceType, "ClusterIP"],
|
||||
["Service.spec.selector", actual.serviceSelector, null],
|
||||
["Service.port.name", actual.portName, dns.portName],
|
||||
["Service.port.port", actual.port, dns.port],
|
||||
["Service.port.targetPort", actual.targetPort, dns.portName]
|
||||
];
|
||||
const missing = checks
|
||||
.filter(([, actualValue, expectedValue]) => !Object.is(actualValue, expectedValue))
|
||||
.map(([name, actualValue, expectedValue]) => `${name} expected ${expectedValue} got ${actualValue ?? "missing"}`);
|
||||
const missing = [];
|
||||
for (const [name, value] of Object.entries(actual)) {
|
||||
if (value !== undefined) {
|
||||
missing.push(`${name} must be absent because ${alias.serviceName} is not the readiness authority`);
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
ready: missing.length === 0,
|
||||
host: expectedHost,
|
||||
serviceName: dns.serviceName,
|
||||
namespace: dns.namespace,
|
||||
port: dns.port,
|
||||
portName: dns.portName,
|
||||
selectorless: service ? service.spec?.selector === undefined : false,
|
||||
source: alias.source,
|
||||
serviceName: alias.serviceName,
|
||||
namespace: alias.namespace,
|
||||
port: alias.port,
|
||||
portName: alias.portName,
|
||||
requiredForReadiness: alias.requiredForReadiness,
|
||||
usedForProbe: alias.usedForProbe,
|
||||
servicePresent: Boolean(service),
|
||||
secretMaterialRead: false,
|
||||
liveDbEvidence: false,
|
||||
missing,
|
||||
|
||||
@@ -172,19 +172,19 @@ assert.equal(cloudApi.env.HWLAB_IMAGE_TAG, deployManifest.commitId.slice(0, 7),
|
||||
assert.equal(cloudApi.env.HWLAB_CLOUD_DB_URL, "secretRef:hwlab-cloud-api-dev-db/database-url", "cloud-api DB URL must be a Secret reference placeholder");
|
||||
assert.equal(cloudApi.env.HWLAB_CLOUD_DB_SSL_MODE, "require", "cloud-api DB SSL mode");
|
||||
assert.equal(cloudApi.env.HWLAB_CLOUD_DB_CONTRACT, "dev-redacted-presence-only", "cloud-api DB contract marker");
|
||||
assert.equal(cloudApi.env.HWLAB_CLOUD_DB_SERVICE_NAME, DEV_DB_ENV_CONTRACT.dns.serviceName, "cloud-api DB service name");
|
||||
assert.equal(cloudApi.env.HWLAB_CLOUD_DB_SERVICE_NAMESPACE, DEV_DB_ENV_CONTRACT.dns.namespace, "cloud-api DB service namespace");
|
||||
assert.equal(cloudApi.env.HWLAB_CLOUD_DB_HOST, DEV_DB_ENV_CONTRACT.dns.host, "cloud-api DB stable host");
|
||||
assert.equal(cloudApi.env.HWLAB_CLOUD_DB_PORT, String(DEV_DB_ENV_CONTRACT.dns.port), "cloud-api DB stable port");
|
||||
assert.equal(cloudApi.env.HWLAB_CLOUD_RUNTIME_ADAPTER, "postgres", "cloud-api runtime durable adapter");
|
||||
assert.equal(cloudApi.env.HWLAB_CLOUD_RUNTIME_DURABLE, "true", "cloud-api runtime durable flag");
|
||||
assert.equal(cloudApiWorkloadEnv.HWLAB_CLOUD_DB_SERVICE_NAME?.value, DEV_DB_ENV_CONTRACT.dns.serviceName, "cloud-api workload DB service name");
|
||||
assert.equal(cloudApiWorkloadEnv.HWLAB_CLOUD_DB_SERVICE_NAMESPACE?.value, DEV_DB_ENV_CONTRACT.dns.namespace, "cloud-api workload DB service namespace");
|
||||
assert.equal(cloudApiWorkloadEnv.HWLAB_CLOUD_DB_HOST?.value, DEV_DB_ENV_CONTRACT.dns.host, "cloud-api workload DB host");
|
||||
assert.equal(cloudApiWorkloadEnv.HWLAB_CLOUD_DB_PORT?.value, String(DEV_DB_ENV_CONTRACT.dns.port), "cloud-api workload DB port");
|
||||
assert.equal(cloudApiWorkloadEnv.HWLAB_CLOUD_RUNTIME_ADAPTER?.value, "postgres", "cloud-api workload runtime durable adapter");
|
||||
assert.equal(cloudApiWorkloadEnv.HWLAB_CLOUD_RUNTIME_DURABLE?.value, "true", "cloud-api workload runtime durable flag");
|
||||
assertCloudApiDbDnsContract(k8sServices, cloudApi.env);
|
||||
assert.equal(cloudApi.env.HWLAB_CLOUD_DB_SERVICE_NAME, undefined, "cloud-api DB alias service name is optional");
|
||||
assert.equal(cloudApi.env.HWLAB_CLOUD_DB_SERVICE_NAMESPACE, undefined, "cloud-api DB alias namespace is optional");
|
||||
assert.equal(cloudApi.env.HWLAB_CLOUD_DB_HOST, undefined, "cloud-api DB alias host is optional");
|
||||
assert.equal(cloudApi.env.HWLAB_CLOUD_DB_PORT, undefined, "cloud-api DB alias port is optional");
|
||||
assert.equal(cloudApiWorkloadEnv.HWLAB_CLOUD_DB_SERVICE_NAME, undefined, "cloud-api workload DB alias service name is optional");
|
||||
assert.equal(cloudApiWorkloadEnv.HWLAB_CLOUD_DB_SERVICE_NAMESPACE, undefined, "cloud-api workload DB alias namespace is optional");
|
||||
assert.equal(cloudApiWorkloadEnv.HWLAB_CLOUD_DB_HOST, undefined, "cloud-api workload DB alias host is optional");
|
||||
assert.equal(cloudApiWorkloadEnv.HWLAB_CLOUD_DB_PORT, undefined, "cloud-api workload DB alias port is optional");
|
||||
assertCloudApiDbOptionalAlias(k8sServices);
|
||||
assert.equal(cloudApi.env.HWLAB_CODE_AGENT_PROVIDER, "openai", "cloud-api Code Agent provider");
|
||||
assert.equal(cloudApi.env.HWLAB_CODE_AGENT_MODEL, DEV_CODE_AGENT_PROVIDER_CONTRACT.model, "cloud-api Code Agent model");
|
||||
assert.equal(
|
||||
@@ -223,28 +223,14 @@ function getWorkloadEnv(workloads, serviceId) {
|
||||
return {};
|
||||
}
|
||||
|
||||
function assertCloudApiDbDnsContract(services, env) {
|
||||
const dns = DEV_DB_ENV_CONTRACT.dns;
|
||||
const service = listItems(services).find((item) => item?.metadata?.name === dns.serviceName);
|
||||
assert.ok(service, `deploy/k8s/base/services.yaml must define Service/${dns.serviceName}`);
|
||||
assert.equal(service.metadata.namespace, dns.namespace, "cloud-api DB Service namespace");
|
||||
assert.equal(service.kind, "Service", "cloud-api DB Service kind");
|
||||
assert.equal(service.spec?.type, "ClusterIP", "cloud-api DB Service type");
|
||||
assert.equal(service.spec?.selector, undefined, "cloud-api DB Service must be selectorless until DB endpoints are provisioned");
|
||||
assert.equal(service.metadata?.labels?.["hwlab.pikastech.local/source-contract"], "db-dns", "cloud-api DB Service source-contract label");
|
||||
const port = service.spec?.ports?.find((entry) => entry.name === dns.portName);
|
||||
assert.ok(port, `Service/${dns.serviceName} must expose ${dns.portName}`);
|
||||
assert.equal(port.port, dns.port, "cloud-api DB Service port");
|
||||
assert.equal(port.targetPort, dns.portName, "cloud-api DB Service targetPort");
|
||||
|
||||
const expectedHost = `${dns.serviceName}.${dns.namespace}.svc.cluster.local`;
|
||||
assert.equal(dns.host, expectedHost, "DB DNS contract host matches service namespace");
|
||||
assert.equal(env.HWLAB_CLOUD_DB_HOST, expectedHost, "cloud-api DB host env matches Service DNS");
|
||||
assert.equal(env.HWLAB_CLOUD_DB_SERVICE_NAME, service.metadata.name, "cloud-api DB service env matches Service name");
|
||||
assert.equal(env.HWLAB_CLOUD_DB_SERVICE_NAMESPACE, service.metadata.namespace, "cloud-api DB namespace env matches Service namespace");
|
||||
assert.equal(env.HWLAB_CLOUD_DB_PORT, String(port.port), "cloud-api DB port env matches Service port");
|
||||
const secretUrl = parseDbUrlContract(`postgres://${env.HWLAB_CLOUD_DB_HOST}:${env.HWLAB_CLOUD_DB_PORT}/hwlab`);
|
||||
assert.equal(secretUrl.ok, true, "cloud-api DB stable host/port must form a supported postgres URL");
|
||||
function assertCloudApiDbOptionalAlias(services) {
|
||||
const alias = DEV_DB_ENV_CONTRACT.dns;
|
||||
const service = listItems(services).find((item) => item?.metadata?.name === alias.serviceName);
|
||||
assert.equal(DEV_DB_ENV_CONTRACT.endpointAuthority.source, "secret-url-host", "cloud-api DB runtime authority is the Secret URL host");
|
||||
assert.equal(DEV_DB_ENV_CONTRACT.endpointAuthority.env, "HWLAB_CLOUD_DB_URL", "cloud-api DB runtime authority env");
|
||||
assert.equal(alias.requiredForReadiness, false, "cloud-api DB alias is not a readiness requirement");
|
||||
assert.equal(alias.usedForProbe, false, "cloud-api DB alias is not the runtime TCP probe source");
|
||||
assert.equal(service, undefined, `Service/${alias.serviceName} is optional until this repo owns endpoints and rollout/apply contract`);
|
||||
}
|
||||
|
||||
function assertCodeAgentProviderWorkloadContract(env) {
|
||||
|
||||
@@ -14,7 +14,6 @@ const forbiddenRuntimeSubstitutes = Object.freeze([
|
||||
"provider-gateway",
|
||||
"microservice-proxy"
|
||||
]);
|
||||
const dbDnsComponent = "cloud-api-db";
|
||||
|
||||
async function readText(relativePath) {
|
||||
return readFile(path.join(repoRoot, relativePath), "utf8");
|
||||
@@ -125,31 +124,17 @@ function labelsFor(resource, label) {
|
||||
}
|
||||
|
||||
function assertMetadataServiceId(resource, expectedServiceId, label) {
|
||||
assert.equal(resource.metadata?.name, expectedServiceId, `${label}.metadata.name must match service id`);
|
||||
if (!resource.metadata?.labels?.["hwlab.pikastech.local/instance-id"]) {
|
||||
assert.equal(resource.metadata?.name, expectedServiceId, `${label}.metadata.name must match service id`);
|
||||
} else {
|
||||
assert.ok(resource.metadata?.name.startsWith(`${expectedServiceId}-`), `${label}.metadata.name must include service id prefix`);
|
||||
}
|
||||
assertDevNamespace(resource.metadata?.namespace, `${label}.metadata.namespace`);
|
||||
const labels = labelsFor(resource, label);
|
||||
assert.equal(labels[serviceIdLabel], expectedServiceId, `${label} service-id label`);
|
||||
assert.equal(labels["app.kubernetes.io/name"], expectedServiceId, `${label} app name label`);
|
||||
}
|
||||
|
||||
function assertDbDnsService(service) {
|
||||
const dns = DEV_DB_ENV_CONTRACT.dns;
|
||||
assert.equal(service.metadata?.name, dns.serviceName, "DB DNS Service name");
|
||||
assertDevNamespace(service.metadata?.namespace, "DB DNS Service namespace");
|
||||
assert.equal(service.metadata?.labels?.["app.kubernetes.io/name"], dbDnsComponent, "DB DNS app label");
|
||||
assert.equal(service.metadata?.labels?.["hwlab.pikastech.local/component"], dbDnsComponent, "DB DNS component label");
|
||||
assert.equal(service.metadata?.labels?.["hwlab.pikastech.local/source-contract"], "db-dns", "DB DNS source-contract label");
|
||||
assert.equal(service.metadata?.labels?.[serviceIdLabel], undefined, "DB DNS Service is not a frozen HWLAB runtime service-id");
|
||||
assert.equal(service.spec?.type, "ClusterIP", "DB DNS Service type");
|
||||
assert.equal(service.spec?.selector, undefined, "DB DNS Service stays selectorless until endpoints are provisioned");
|
||||
const ports = service.spec?.ports;
|
||||
assertArray(ports, "DB DNS Service ports");
|
||||
assert.equal(ports.length, 1, "DB DNS Service exposes one port");
|
||||
assert.equal(ports[0].name, dns.portName, "DB DNS Service port name");
|
||||
assert.equal(ports[0].port, dns.port, "DB DNS Service port");
|
||||
assert.equal(ports[0].targetPort, dns.portName, "DB DNS Service targetPort");
|
||||
}
|
||||
|
||||
function assertTemplateServiceId(workload, expectedServiceId, label) {
|
||||
const templateLabels = workload.spec?.template?.metadata?.labels;
|
||||
assertObject(templateLabels, `${label}.spec.template.metadata.labels`);
|
||||
@@ -311,24 +296,42 @@ function assertServices(services, guard) {
|
||||
assert.equal(services.kind, "List", "services kind");
|
||||
assertArray(services.items, "services items");
|
||||
|
||||
const runtimeServices = services.items.filter((item) => item.metadata?.name !== dbDnsComponent);
|
||||
const serviceIds = runtimeServices.map((item) => item.metadata?.labels?.[serviceIdLabel]);
|
||||
assertUnique(serviceIds, "k8s service ids");
|
||||
const runtimeServices = services.items;
|
||||
const serviceNames = runtimeServices.map((item) => item.metadata?.name);
|
||||
const serviceIds = [...new Set(runtimeServices.map((item) => item.metadata?.labels?.[serviceIdLabel]))];
|
||||
assertUnique(serviceNames, "k8s service names");
|
||||
assertSameMembers(serviceIds, guard.requiredK3sSkeleton.requiredServiceServiceIds, "k8s service ids");
|
||||
|
||||
const dbDnsService = services.items.find((item) => item.metadata?.name === dbDnsComponent);
|
||||
assert.ok(dbDnsService, "k8s services must include selectorless cloud-api-db DNS Service");
|
||||
assertDbDnsService(dbDnsService);
|
||||
assert.equal(
|
||||
services.items.some((item) => item.metadata?.name === DEV_DB_ENV_CONTRACT.dns.serviceName),
|
||||
false,
|
||||
"cloud-api-db is an optional future alias and is not required in the current runtime boundary"
|
||||
);
|
||||
assert.equal(DEV_DB_ENV_CONTRACT.endpointAuthority.source, "secret-url-host", "DB readiness authority must be the Secret URL host");
|
||||
assert.equal(DEV_DB_ENV_CONTRACT.dns.requiredForReadiness, false, "DB DNS alias must not be a readiness hard requirement");
|
||||
assert.equal(DEV_DB_ENV_CONTRACT.dns.usedForProbe, false, "DB DNS alias must not be the runtime probe target");
|
||||
|
||||
for (const service of runtimeServices) {
|
||||
const serviceId = service.metadata?.labels?.[serviceIdLabel];
|
||||
assertServiceId(serviceId, `k8s service ${service.metadata?.name}`);
|
||||
assertMetadataServiceId(service, serviceId, `k8s service ${serviceId}`);
|
||||
assertNoExternalNameSubstitute(service, `k8s service ${serviceId}`);
|
||||
assert.equal(service.spec?.selector?.["app.kubernetes.io/name"], serviceId, `${serviceId} selector`);
|
||||
if (service.metadata?.labels?.["hwlab.pikastech.local/instance-id"]) {
|
||||
assert.match(
|
||||
service.spec?.selector?.["statefulset.kubernetes.io/pod-name"],
|
||||
new RegExp(`^${escapeRegExp(serviceId)}-\\d+$`),
|
||||
`${serviceId} indexed selector`
|
||||
);
|
||||
} else {
|
||||
assert.equal(service.spec?.selector?.["app.kubernetes.io/name"], serviceId, `${serviceId} selector`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function escapeRegExp(value) {
|
||||
return String(value).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
||||
}
|
||||
|
||||
function assertDevHealthConfig(configMap) {
|
||||
assert.equal(configMap.kind, "ConfigMap", "dev health contract kind");
|
||||
assertDevNamespace(configMap.metadata?.namespace, "dev health contract namespace");
|
||||
|
||||
Reference in New Issue
Block a user