Skip to content

fix(admin): fix error handling and exit codes in admin CLI commands #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
birme merged 2 commits into from
Sep 17, 2026
Merged

fix(admin): fix error handling and exit codes in admin CLI commands #161

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8018119
fix(admin): fix error handling and exit codes in admin CLI commands
claude Sep 16, 2026
5d65d46
fix(admin): fix prettier formatting in remove-all-instances error mes…
claude Sep 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 32 additions & 7 deletions packages/cli/src/admin/cmd.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ export default function cmdAdmin() {
(tenant) => tenant.remainingTokens < -200
);
let instancesSuspended = 0;
let instancesFailed = 0;
let tenantsFailed = 0;
const tenantsExceedingCount = tenantsExceeding.length;
for (const tenant of tenantsExceeding) {
if (tenantPlanMap[tenant.tenantId]?.planType === 'FREE') {
Expand All @@ -129,6 +131,7 @@ export default function cmdAdmin() {
instancesSuspended++;
console.log('Suspended');
} catch (err) {
instancesFailed++;
console.log(
`Failed to suspend ${item.serviceId}: ${
item.instance
Expand All @@ -142,6 +145,7 @@ export default function cmdAdmin() {
}
}
} catch (err) {
tenantsFailed++;
console.log(
`Failed to process tenant ${tenant.tenantId}: ${
(err as Error).message
Expand All @@ -153,8 +157,11 @@ export default function cmdAdmin() {
console.log(
`${tenantsExceedingCount} / ${
Object.keys(tenantPlanMap).length
} tenants below threshold, suspended ${instancesSuspended} instances`
} tenants below threshold, suspended ${instancesSuspended} instances, ${instancesFailed} instance failures, ${tenantsFailed} tenant failures`
);
if (instancesFailed > 0 || tenantsFailed > 0) {
process.exitCode = 1;
}
} catch (err) {
console.log((err as Error).message);
}
Expand Down Expand Up @@ -184,13 +191,31 @@ export default function cmdAdmin() {
'Are you really sure you want to remove all above instances for tenant ' +
`${tenantId} in ${environment}? (yes/no) `
);
let instancesRemoved = 0;
let instancesFailed = 0;
for (const item of instancesToRemove) {
await removeInstanceForTenant(
tenantId,
item.serviceId,
item.instance,
environment
);
try {
await removeInstanceForTenant(
tenantId,
item.serviceId,
item.instance,
environment
);
instancesRemoved++;
} catch (innerErr) {
instancesFailed++;
console.error(
`Failed to remove ${item.serviceId}/${item.instance}: ${
(innerErr as Error).message
}`
);
}
}
console.log(
`Removed ${instancesRemoved} instances, ${instancesFailed} failed`
);
if (instancesFailed > 0) {
process.exitCode = 1;
}
} catch (err) {
console.log((err as Error).message);
Expand Down
Loading