feat: dev binary channel with CLI flags and auto-update #11
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,32 @@ import ( | |
| ) | ||
|
|
||
| func main() { | ||
| if len(os.Args) > 1 { | ||
| switch os.Args[1] { | ||
| case "--version", "-v": | ||
| fmt.Printf("vf-agent %s\n", agent.Version) | ||
| os.Exit(0) | ||
| case "--help", "-h": | ||
| fmt.Print(`VectorFlow Agent | ||
|
|
||
| Usage: vf-agent [flags] | ||
|
|
||
| Flags: | ||
| --version, -v Print version and exit | ||
| --help, -h Show this help | ||
|
|
||
| Environment variables: | ||
| VF_URL Server URL (required) | ||
| VF_TOKEN Enrollment token | ||
| VF_DATA_DIR Data directory (default: /var/lib/vf-agent) | ||
| VF_VECTOR_BIN Path to Vector binary (default: vector) | ||
| VF_POLL_INTERVAL Poll interval duration (default: 15s) | ||
| VF_LOG_LEVEL Log level: debug|info|warn|error (default: info) | ||
| `) | ||
| os.Exit(0) | ||
| } | ||
| } | ||
|
|
||
| cfg, err := config.Load() | ||
| if err != nil { | ||
| fmt.Fprintf(os.Stderr, "config error: %v\n", err) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| -- AlterTable | ||
| ALTER TABLE "SystemSettings" ADD COLUMN "latestAgentChecksums" TEXT; | ||
| ALTER TABLE "SystemSettings" ADD COLUMN "latestDevAgentRelease" TEXT; | ||
| ALTER TABLE "SystemSettings" ADD COLUMN "latestDevAgentReleaseCheckedAt" TIMESTAMP(3); | ||
| ALTER TABLE "SystemSettings" ADD COLUMN "latestDevAgentChecksums" TEXT; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -411,10 +411,14 @@ model SystemSettings { | |
| lastBackupStatus String? | ||
| lastBackupError String? | ||
|
|
||
| latestServerRelease String? | ||
| latestServerReleaseCheckedAt DateTime? | ||
| latestAgentRelease String? | ||
| latestAgentReleaseCheckedAt DateTime? | ||
| latestAgentChecksums String? // JSON: {"vf-agent-linux-amd64":"sha256..."} | ||
| latestDevAgentRelease String? | ||
| latestDevAgentReleaseCheckedAt DateTime? | ||
| latestDevAgentChecksums String? // JSON: {"vf-agent-linux-amd64":"sha256..."} | ||
|
|
||
| updatedAt DateTime @updatedAt | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -69,6 +69,15 @@ export default function FleetPage() { | |
| ); | ||
| const latestAgentVersion = versionQuery.data?.agent.latestVersion ?? null; | ||
| const agentChecksums = versionQuery.data?.agent.checksums ?? {}; | ||
| const latestDevAgentVersion = versionQuery.data?.devAgent?.latestVersion ?? null; | ||
| const devAgentChecksums = versionQuery.data?.devAgent?.checksums ?? {}; | ||
|
|
||
| const getNodeLatest = (node: { agentVersion: string | null }) => { | ||
| if (node.agentVersion?.startsWith("dev-")) { | ||
| return { version: latestDevAgentVersion, checksums: devAgentChecksums, tag: "dev" }; | ||
| } | ||
| return { version: latestAgentVersion, checksums: agentChecksums, tag: latestAgentVersion ? `v${latestAgentVersion}` : null }; | ||
| }; | ||
|
|
||
| const triggerUpdate = useMutation( | ||
| trpc.fleet.triggerAgentUpdate.mutationOptions({ | ||
|
|
@@ -132,9 +141,9 @@ export default function FleetPage() { | |
| <span className="font-mono text-sm text-muted-foreground"> | ||
| {node.agentVersion ?? "—"} | ||
| </span> | ||
| {getNodeLatest(node).version && | ||
| node.agentVersion && | ||
| isVersionOlder(node.agentVersion, getNodeLatest(node).version ?? "") && ( | ||
| <Badge variant="outline" className="text-amber-600"> | ||
| Update available | ||
| </Badge> | ||
|
|
@@ -165,9 +174,9 @@ export default function FleetPage() { | |
| Update pending... | ||
| </Badge> | ||
| ) : node.deploymentMode === "DOCKER" ? ( | ||
| getNodeLatest(node).version && | ||
| node.agentVersion && | ||
| isVersionOlder(node.agentVersion, getNodeLatest(node).version ?? "") ? ( | ||
| <Tooltip> | ||
| <TooltipTrigger asChild> | ||
| <span> | ||
|
|
@@ -179,20 +188,21 @@ export default function FleetPage() { | |
| <TooltipContent>Update via Docker image pull</TooltipContent> | ||
| </Tooltip> | ||
| ) : null | ||
| ) : getNodeLatest(node).version && | ||
| node.agentVersion && | ||
| isVersionOlder(node.agentVersion, getNodeLatest(node).version ?? "") ? ( | ||
| <Button | ||
| variant="outline" | ||
| size="sm" | ||
| disabled={triggerUpdate.isPending} | ||
| onClick={(e) => { | ||
| e.preventDefault(); | ||
| const latest = getNodeLatest(node); | ||
| triggerUpdate.mutate({ | ||
| nodeId: node.id, | ||
| targetVersion: latest.version!, | ||
| downloadUrl: `https://github.com/${AGENT_REPO}/releases/download/${latest.tag}/vf-agent-linux-amd64`, | ||
| checksum: `sha256:${latest.checksums["vf-agent-linux-amd64"] ?? ""}`, | ||
|
Comment on lines
+204
to
+205
There was a problem hiding this comment. Hardcoded The download URL and checksum key both hardcode The
Then use the per-node architecture in the update command: const arch = node.arch ?? "amd64"; // e.g. "amd64" | "arm64"
triggerUpdate.mutate({
nodeId: node.id,
targetVersion: latest.version!,
downloadUrl: `https://github.com/${AGENT_REPO}/releases/download/${latest.tag}/vf-agent-linux-${arch}`,
checksum: `sha256:${latest.checksums[`vf-agent-linux-${arch}`] ?? ""}`,
});Prompt To Fix With AIThis is a comment left during a code review.
Path: src/app/(dashboard)/fleet/page.tsx
Line: 204-205
Comment:
Hardcoded `amd64` architecture breaks arm64 agent updates
The download URL and checksum key both hardcode `vf-agent-linux-amd64`, but the CI workflow explicitly builds and publishes both `vf-agent-linux-amd64` and `vf-agent-linux-arm64` for the dev channel (`.github/workflows/ci.yml` lines 169–170, 188–189). An arm64 agent (e.g., running on AWS Graviton or Raspberry Pi) that is offered an update will download and attempt to execute the `amd64` binary, causing the agent to crash or fail to restart.
The `VectorNode` model includes an `os` field but no architecture information. To fix this, either:
1. Add an `arch` field to `VectorNode` (persisted from agent heartbeat metadata)
2. Infer the architecture from `agentVersion` or `metadata` if available
3. Default to `amd64` with an override mechanism for known arm64 deployments
Then use the per-node architecture in the update command:
```typescript
const arch = node.arch ?? "amd64"; // e.g. "amd64" | "arm64"
triggerUpdate.mutate({
nodeId: node.id,
targetVersion: latest.version!,
downloadUrl: `https://github.com/${AGENT_REPO}/releases/download/${latest.tag}/vf-agent-linux-${arch}`,
checksum: `sha256:${latest.checksums[`vf-agent-linux-${arch}`] ?? ""}`,
});
```
How can I resolve this? If you propose a fix, please make it concise. |
||
| }); | ||
| }} | ||
| > | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,26 @@ | ||
| /** | ||
| * Returns true if `current` is an older version than `latest`. | ||
| * | ||
| * For release versions: standard semver comparison. | ||
| * For dev versions: true if SHAs differ (any difference = update available). | ||
| * Cross-channel (dev vs release): always false. | ||
| */ | ||
| export function isVersionOlder(current: string, latest: string): boolean { | ||
| const currentIsDev = current.startsWith("dev-"); | ||
| const latestIsDev = latest.startsWith("dev-"); | ||
|
|
||
| // Plain "dev" (local build, no SHA) — not trackable | ||
| if (current === "dev" || latest === "dev") return false; | ||
|
|
||
| // Cross-channel: never suggest updates | ||
| if (currentIsDev !== latestIsDev) return false; | ||
|
|
||
| // Dev-to-dev: different SHA means update available | ||
| if (currentIsDev && latestIsDev) { | ||
| return current !== latest; | ||
| } | ||
|
|
||
| // Release-to-release: semver comparison | ||
| const a = current.split(".").map(Number); | ||
| const b = latest.split(".").map(Number); | ||
| for (let i = 0; i < Math.max(a.length, b.length); i++) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,7 +5,7 @@ import { prisma } from "@/lib/prisma"; | |
| import { encrypt, decrypt } from "@/server/services/crypto"; | ||
| import { withAudit } from "@/server/middleware/audit"; | ||
| import { invalidateAuthCache } from "@/auth"; | ||
| import { checkServerVersion, checkAgentVersion, checkDevAgentVersion } from "@/server/services/version-check"; | ||
| import { | ||
| createBackup, | ||
| listBackups, | ||
|
|
@@ -277,11 +277,20 @@ export const settingsRouter = router({ | |
| checkVersion: protectedProcedure | ||
| .input(z.object({ force: z.boolean().optional() }).optional()) | ||
| .query(async ({ input }) => { | ||
| const [server, agent, devAgent] = await Promise.all([ | ||
| checkServerVersion(input?.force), | ||
| checkAgentVersion(input?.force), | ||
| checkDevAgentVersion(input?.force), | ||
| ]); | ||
| return { | ||
| server, | ||
| agent, | ||
| devAgent: { | ||
| latestVersion: devAgent.latestVersion, | ||
| checksums: devAgent.checksums, | ||
| checkedAt: devAgent.checkedAt, | ||
| }, | ||
| }; | ||
| }), | ||
|
|
||
| // ─── Backup & Restore ───────────────────────────────────────────────────── | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dev release race condition on concurrent pushes
The
agent-dev-binariesjob has noconcurrencygroup. If two commits land onmainin quick succession, two workflow runs will overlap. The delete → create sequence is not atomic, so the following interleaving is possible:gh release delete dev← removes devgh release create dev← publishes commit-A binariesgh release delete dev← removes commit-A binariesgh release create dev← publishes commit-B binaries ✓ (correct final state)…or, if scheduling flips steps 2 and 3:
gh release delete devgh release delete dev(already gone — silently ignored with|| true)gh release create dev← publishes commit-B binariesgh release create dev← FAILS with "release already exists"In scenario 4,
gh release createexits non-zero and the step fails, causing the newer commit's release to persist — but subsequent CI runs will surface a noisy failure that needs to be retried manually.Add a job-level
concurrencykey to cancel in-progress runs:With
cancel-in-progress: true, only the latest push's job ever reaches the delete/create steps, making the operation effectively atomic.Prompt To Fix With AI