9113651c10
The three values that differ per host (deploy.hive-controller.dashboardPort, claudeCodePackage and otel.extraResourceAttributes) no longer go into the meta flake. hive-priv writes them into the container's /etc/hyperhive-hive-facts with the hive name and domain, and the agent reads them at boot: - HIVE_DASHBOARD_PORT reaches every unit through the hive-facts generator; the web UI still defaults to 7000 without it. - `claude` on PATH is a wrapper that runs HYPERHIVE_CLAUDE_CODE_PATH's claude when it is there, and the container's own claude-code otherwise. The host's serve.json keeps gc-rooting the pinned build. - OTEL_RESOURCE_ATTRIBUTES moves out of the units' Environment= into a boot-time generator, which appends HYPERHIVE_OTEL_EXTRA_RESOURCE_ATTRIBUTES. The agent options services.hyperhive.agent.claudeCodePath (now a removed option) and otel.extraResourceAttributes go; only the meta render set them. render_flake takes no HiveEnv any more, so the memory-cap render test and render_hive_flake_at, which only existed to vary HiveEnv into the render, go with it. Refs #4857
51 lines
1.7 KiB
Nix
51 lines
1.7 KiB
Nix
# `checks.script-test-agent-hive-facts` — runs the two readers of
|
|
# `/etc/hyperhive-hive-facts` in ../agent-modules/hive-facts.nix: the systemd
|
|
# environment generator and the login-shell snippet `/etc/set-environment`
|
|
# sources. Also the two consumers of what they pass on: ../agent-modules/otel.nix's
|
|
# `OTEL_RESOURCE_ATTRIBUTES` generator and ../agent-modules/default.nix's `claude`.
|
|
# The cases are in ./agent-hive-facts.sh.
|
|
#
|
|
# What runs is the rendered generator and snippet. The one edit is the facts
|
|
# file's path, moved under the build directory, and the snippet's reference to
|
|
# the generator, pointed at that edited copy.
|
|
{
|
|
pkgs,
|
|
lib,
|
|
self,
|
|
nixosSystem,
|
|
}:
|
|
let
|
|
inherit
|
|
(import ../module-eval/lib.nix {
|
|
inherit
|
|
pkgs
|
|
lib
|
|
self
|
|
nixosSystem
|
|
;
|
|
})
|
|
agentWith
|
|
;
|
|
|
|
machine = agentWith { services.hyperhive.agent.user.name = "a1"; };
|
|
|
|
# As text: building it would build the claude-code it falls back to.
|
|
claude = lib.findFirst (
|
|
p: (p.name or "") == "claude"
|
|
) (throw "no `claude` in systemPackages") machine.environment.systemPackages;
|
|
in
|
|
pkgs.runCommand "hyperhive-script-test-agent-hive-facts"
|
|
{
|
|
GENERATOR =
|
|
machine.environment.etc."systemd/system-environment-generators/50-hyperhive-hive-facts".source;
|
|
PROFILE = machine.environment.etc."hyperhive/hive-facts.sh".source;
|
|
EXTRA_INIT = machine.environment.extraInit;
|
|
OTEL_GENERATOR =
|
|
machine.environment.etc."systemd/system-environment-generators/60-hyperhive-otel-resource".source;
|
|
CLAUDE_WRAPPER = builtins.unsafeDiscardStringContext claude.text;
|
|
SHELLS = "${pkgs.dash}/bin/dash ${pkgs.bash}/bin/sh";
|
|
}
|
|
''
|
|
${pkgs.bash}/bin/bash ${./agent-hive-facts.sh}
|
|
touch "$out"
|
|
''
|