Add shift handover and RunPod, and make CX-Tools work in a container
Handover - The Confluence shift doc becomes the landing page: shift metadata, the top-of-page checks, key updates with their Zendesk/Jira refs and status, and the free-text comments. "Hand over shift" closes the shift, opens the next one and carries the live items across, dropping anything done or marked "remove at end of shift" - the retyping this replaces. - The RunPod table on that page is read from live host state instead of being copied in by hand, with the six-colour key preserved. RunPod - GraphQL client keyed on CX_RUNPOD_API_KEY. The old console login is kept as a fallback but cannot run unattended: the account has 2FA, so Clerk verifies the password and then asks for an emailed code and never issues a session. That is the real cause of the "No active session found" failure, and the client now says so instead of failing opaquely. TOTP is supported if the account moves to an authenticator app. - Hosts and their listing history are persisted, so "most problematic hosts" can be ranked and each machine has a timeline of who listed or unlisted it, with the Zendesk comment and the error hint. - The unlisting emails are parsed for the error block (they arrive quoted-printable) and classified into a likely cause and a next step. Zendesk and Jira - Unlisting raises a Zendesk ticket that follows the format of RunPod's own email, keyed on the machine so one machine keeps one thread, posted as an internal note. - Jira is split in two: the Infrahub/OIE instance and the RunPod/RMA one, which may be a different Atlassian site. Blank RunPod values fall back to the defaults rather than failing. Running in a container - CX-Tools reads its keys from 1Password, which needs a desktop app. Config is a dataclass whose lookups live in per-field default factories, so passing CX_INFRAHUB_TOKEN/CX_INFRAINSIGHT_TOKEN in means those factories never run and CX-Tools itself stays unmodified. - CX-Tools reaches OpenStack with `docker exec <region>-osc`, so the image now carries the Docker client (the static binary, not the docker.io package) and compose mounts the host socket with group_add for it. Verified from inside the container: live OpenStack and Infrahub calls both succeed. Also fixes Settings, which read the environment at class-definition time and so ignored anything set afterwards; a fresh Settings() silently returned stale values. Caught by the Jira scoping tests. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -55,22 +55,60 @@ def _import_cxlib(path: str):
|
||||
return cxlib
|
||||
|
||||
|
||||
def _tokens_from_env() -> dict[str, str]:
|
||||
"""API keys supplied directly, bypassing 1Password.
|
||||
|
||||
CX-Tools reads its keys from 1Password, which needs an interactive session
|
||||
and a desktop app - neither exists in a container. `Config` is a dataclass
|
||||
whose 1Password lookups live in per-field default factories, so passing the
|
||||
values in means those factories never run. CX-Tools itself is unmodified.
|
||||
"""
|
||||
return {
|
||||
"api_key": os.environ.get("CX_INFRAHUB_TOKEN", "").strip(),
|
||||
"insight_api_key": os.environ.get("CX_INFRAINSIGHT_TOKEN", "").strip(),
|
||||
}
|
||||
|
||||
|
||||
def _silence_1password(path: str) -> None:
|
||||
"""Stop the CX-Tools secret loader from reaching for `op`.
|
||||
|
||||
`Config.os_cmd` re-reads the merged config on every OpenStack call, which
|
||||
would otherwise retry a sign-in that cannot succeed here. Marking the module
|
||||
as already loaded makes those calls no-ops.
|
||||
"""
|
||||
if path not in sys.path:
|
||||
sys.path.insert(0, path)
|
||||
try:
|
||||
import secrets_1password # noqa: PLC0415
|
||||
except Exception:
|
||||
return
|
||||
secrets_1password._loaded = True
|
||||
|
||||
|
||||
def bootstrap() -> tuple[Any, Any]:
|
||||
"""Import cxlib and build the shared Config, loading secrets exactly once.
|
||||
|
||||
Call this from the foreground at startup: constructing Config triggers the
|
||||
CX-Tools 1Password loader, which may need an interactive sign-in.
|
||||
With CX_INFRAHUB_TOKEN / CX_INFRAINSIGHT_TOKEN set, credentials come from
|
||||
the environment. Without them, CX-Tools falls back to 1Password, which is
|
||||
what a laptop run does.
|
||||
"""
|
||||
with _lock:
|
||||
if _state["config"] is not None:
|
||||
return _state["cx"], _state["config"]
|
||||
path = locate_cx_tools()
|
||||
cx = _import_cxlib(path)
|
||||
config = cx.Config(no_color=True, debug=bool(os.environ.get("CX_DEBUG")))
|
||||
|
||||
tokens = _tokens_from_env()
|
||||
if tokens["api_key"]:
|
||||
_silence_1password(path)
|
||||
config = cx.Config(no_color=True, debug=bool(os.environ.get("CX_DEBUG")),
|
||||
**{k: v for k, v in tokens.items() if v})
|
||||
else:
|
||||
config = cx.Config(no_color=True, debug=bool(os.environ.get("CX_DEBUG")))
|
||||
if not config.api_key or config.api_key in {"REDACT", "REPLACE_WITH_API_KEY"}:
|
||||
raise BridgeError(
|
||||
"CX-Tools could not load the Infrahub API key from 1Password. "
|
||||
"Run `op signin` in this shell, then restart cx-triage."
|
||||
"No Infrahub API key. Set CX_INFRAHUB_TOKEN (and CX_INFRAINSIGHT_TOKEN), "
|
||||
"or run `op signin` in this shell for the 1Password path."
|
||||
)
|
||||
_state.update({"path": path, "cx": cx, "config": config})
|
||||
return cx, config
|
||||
|
||||
Reference in New Issue
Block a user