diff --git a/scripts/src/hwlab-node/entry.ts b/scripts/src/hwlab-node/entry.ts index a27a8b8c..f8b3bb77 100644 --- a/scripts/src/hwlab-node/entry.ts +++ b/scripts/src/hwlab-node/entry.ts @@ -14,7 +14,7 @@ import { runCommand, type CommandResult } from "../command"; import { startJob } from "../jobs"; import { classifySshTcpPoolFailure } from "../ssh"; import { HWLAB_NODE_CONTROL_PLANE_CONFIG_PATH, hwlabNodeControlPlaneInfraHelp, runHwlabNodeControlPlaneInfra } from "../hwlab-node-control-plane"; -import { hwlabRuntimeLaneConfigPath, hwlabRuntimeLaneIds, hwlabRuntimeLaneSpec, hwlabRuntimeLaneSpecForNode, hwlabRuntimeNodeIds, isHwlabRuntimeLane, type HwlabRuntimeLane, type HwlabRuntimeLaneSpec, type HwlabRuntimeObservabilityRecordingRuleSpec, type HwlabRuntimeObservabilitySpec, type HwlabRuntimeObservabilityWarningAlertSpec, type HwlabRuntimePublicExposureSpec, type HwlabRuntimeWebProbeAlertThresholdsSpec, type HwlabRuntimeWebProbeProjectManagementSpec } from "../hwlab-node-lanes"; +import { hwlabRuntimeLaneConfigPath, hwlabRuntimeLaneIds, hwlabRuntimeLaneSpecForNode, hwlabRuntimeNodeIds, isHwlabRuntimeLane, type HwlabRuntimeLane, type HwlabRuntimeLaneSpec, type HwlabRuntimeObservabilityRecordingRuleSpec, type HwlabRuntimeObservabilitySpec, type HwlabRuntimeObservabilityWarningAlertSpec, type HwlabRuntimePublicExposureSpec, type HwlabRuntimeWebProbeAlertThresholdsSpec, type HwlabRuntimeWebProbeProjectManagementSpec } from "../hwlab-node-lanes"; import { nodeWebProbeScriptRunnerSource } from "../hwlab-node-web-probe-runner-source"; import { nodeWebObserveAnalyzerSource } from "../hwlab-node-web-observe-analyzer-source"; import { nodeWebObserveRunnerSource } from "../hwlab-node-web-observe-runner-source"; @@ -26,7 +26,7 @@ import { runWebProbeSentinelCommand, type WebProbeSentinelOptions } from "../hwl import { hwlabNodeHelp, hwlabNodeObservabilityHelp, hwlabNodeWebProbeHelp } from "../hwlab-node-help"; import { compactWebProbeResult, compactWebProbeScriptResult } from "../hwlab-node-web-probe-summary"; import { nodeObservabilityRecordingRuleExpression, nodeObservabilityRecordingRuleSummaries, nodeObservabilityWarningAlertExpression, nodeObservabilityWarningAlertSummaries } from "../hwlab-node-observability-promql"; -import { runDelegatedHwlabNodeCommand, type DelegatedNodeDomain } from "../hwlab-node-transport"; +import type { DelegatedNodeDomain } from "../hwlab-node-transport"; import { runHwlabFakeModelProviderCommand } from "../hwlab-fake-model-provider"; import type { RenderedCliResult } from "../output"; @@ -41,9 +41,9 @@ import { nodeRuntimeUnsupportedAction } from "./runtime-common"; import { runNodeEndpointBridge } from "./secret-scripts"; import { nodeRuntimeSourceWorkspaceCommand } from "./source-workspace"; import { nodeRuntimeGitMirrorRun, nodeRuntimeGitMirrorStatus, nodeScopedFullOutput, withNodeRuntimeGitMirrorRendered } from "./status"; -import { assertNodeId, positiveIntegerOption, requiredOption, stripOption } from "./utils"; +import { assertNodeId, positiveIntegerOption, requiredOption } from "./utils"; import { legacyHwlabNodeWebProbeUnsupported } from "../web-probe"; -import { rewriteDelegatedNodeResult, startNodeDelegatedJob } from "./web-probe"; +import { startNodeDelegatedJob } from "./web-probe"; import { assertKnownOptions } from "./web-probe-observe"; export { hwlabNodeHelp, hwlabNodeWebProbeHelp, hwlabNodeObservabilityHelp } from "../hwlab-node-help"; @@ -590,7 +590,6 @@ export function parseNodeObservabilityOptions(args: string[]): NodeObservability export async function runNodeDelegatedDomain(config: Config, domain: DelegatedNodeDomain, args: string[]): Promise | RenderedCliResult> { const scoped = parseNodeScopedDelegatedOptions(domain, args); - const defaultSpec = hwlabRuntimeLaneSpec(scoped.lane); if (domain === "control-plane" && scoped.action === "public-exposure") { return runNodePublicExposure({ action: "public-exposure", @@ -615,7 +614,7 @@ export async function runNodeDelegatedDomain(config: Config, domain: DelegatedNo if (domain === "control-plane" && scoped.action === "allow-endpoint-bridge") { return runNodeEndpointBridge(scoped); } - if (domain === "control-plane" && scoped.node !== defaultSpec.nodeId) { + if (domain === "control-plane") { if (scoped.action === "status") { const result = nodeRuntimeControlPlaneStatus(scoped); if (scoped.originalArgs.includes("--raw")) return result; @@ -628,7 +627,7 @@ export async function runNodeDelegatedDomain(config: Config, domain: DelegatedNo } return nodeRuntimeUnsupportedAction(scoped); } - if (domain === "git-mirror" && scoped.node !== defaultSpec.nodeId) { + if (domain === "git-mirror") { if (scoped.action === "status") { const result = nodeRuntimeGitMirrorStatus(scoped); return nodeScopedFullOutput(scoped) ? result : withNodeRuntimeGitMirrorRendered(result, scoped); @@ -640,13 +639,5 @@ export async function runNodeDelegatedDomain(config: Config, domain: DelegatedNo } return nodeRuntimeUnsupportedAction(scoped); } - if (domain === "control-plane" && scoped.action === "trigger-current" && scoped.confirm && !scoped.dryRun && !scoped.wait) { - return startNodeDelegatedJob(scoped); - } - if (domain === "git-mirror" && (scoped.action === "sync" || scoped.action === "flush") && scoped.confirm && !scoped.dryRun && !scoped.wait) { - return startNodeDelegatedJob(scoped); - } - const delegatedArgs = stripOption(args, "--node"); - const result = await runDelegatedHwlabNodeCommand(config, domain, delegatedArgs); - return rewriteDelegatedNodeResult(result, scoped); + return nodeRuntimeUnsupportedAction(scoped); }