fix(smoke): read CLI credentials from ~/.mcpctl (active path)
Some checks failed
CI/CD / lint (pull_request) Successful in 1m15s
CI/CD / test (pull_request) Successful in 1m17s
CI/CD / typecheck (pull_request) Successful in 2m52s
CI/CD / smoke (pull_request) Failing after 1m54s
CI/CD / build (pull_request) Successful in 4m49s
CI/CD / publish (pull_request) Has been skipped

passwd smoke read ~/.config/mcpctl/credentials and silently skipped; the CLI
stores creds at ~/.mcpctl/credentials. Now verified live against prod (4/4).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Michal
2026-06-16 22:41:30 +01:00
parent ad2ba12b5b
commit 4c7e648771
2 changed files with 13 additions and 4 deletions

View File

@@ -44,6 +44,11 @@ REG_PUBLIC="mysources.co.uk" # what k8s pulls from (same backend)
# Deployments avoids that provider entirely. # Deployments avoids that provider entirely.
MCPD_URN='urn:pulumi:homelab::k8s-deployments::kubernetes:core/v1:Namespace$kubernetes:apps/v1:Deployment::mcpd' MCPD_URN='urn:pulumi:homelab::k8s-deployments::kubernetes:core/v1:Namespace$kubernetes:apps/v1:Deployment::mcpd'
MCPLOCAL_URN='urn:pulumi:homelab::k8s-deployments::kubernetes:core/v1:Namespace$kubernetes:apps/v1:Deployment::mcplocal' MCPLOCAL_URN='urn:pulumi:homelab::k8s-deployments::kubernetes:core/v1:Namespace$kubernetes:apps/v1:Deployment::mcplocal'
# Prior kubectl-based deploys (old fulldeploy.sh) took server-side-apply
# ownership of the Deployment .image field under the `kubectl-set` field
# manager, which makes a plain pulumi apply conflict. Force-apply lets Pulumi
# reclaim the field and become the single source of truth going forward.
export PULUMI_K8S_ENABLE_PATCH_FORCE=true
BACKUP_DIR="$HOME/tmp/mcpctl-backup" BACKUP_DIR="$HOME/tmp/mcpctl-backup"
DATE="$(date +%Y%m%d-%H%M%S)" DATE="$(date +%Y%m%d-%H%M%S)"

View File

@@ -62,10 +62,14 @@ async function healthz(): Promise<boolean> {
} }
function adminToken(): string | undefined { function adminToken(): string | undefined {
// The CLI stores credentials at ~/.mcpctl/credentials (see config/loader.ts).
for (const p of [join(homedir(), '.mcpctl', 'credentials'), join(homedir(), '.config', 'mcpctl', 'credentials')]) {
try { try {
const raw = readFileSync(join(homedir(), '.config', 'mcpctl', 'credentials'), 'utf-8'); const tok = (JSON.parse(readFileSync(p, 'utf-8')) as { token?: string }).token;
return (JSON.parse(raw) as { token?: string }).token; if (tok) return tok;
} catch { return undefined; } } catch { /* try next */ }
}
return undefined;
} }
async function login(email: string, password: string): Promise<Resp> { async function login(email: string, password: string): Promise<Resp> {