@synteq/cli 0.1.5 → 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/run.js +61 -2
- package/dist/api/client.d.ts +29 -37
- package/dist/api/client.js +42 -49
- package/dist/api/client.js.map +1 -1
- package/dist/api/factory.d.ts +3 -0
- package/dist/api/factory.js +1 -1
- package/dist/api/factory.js.map +1 -1
- package/dist/api/types.d.ts +14 -23
- package/dist/auth/scope.d.ts +19 -0
- package/dist/auth/scope.js +65 -0
- package/dist/auth/scope.js.map +1 -0
- package/dist/base/command.d.ts +1 -1
- package/dist/base/command.js +49 -0
- package/dist/base/command.js.map +1 -1
- package/dist/commands/account/index.d.ts +1 -0
- package/dist/commands/account/index.js +1 -0
- package/dist/commands/account/index.js.map +1 -1
- package/dist/commands/account/show.d.ts +1 -0
- package/dist/commands/account/show.js +1 -0
- package/dist/commands/account/show.js.map +1 -1
- package/dist/commands/api.d.ts +1 -0
- package/dist/commands/api.js +5 -4
- package/dist/commands/api.js.map +1 -1
- package/dist/commands/catalog.d.ts +1 -0
- package/dist/commands/catalog.js +6 -1
- package/dist/commands/catalog.js.map +1 -1
- package/dist/commands/config/index.d.ts +1 -0
- package/dist/commands/config/index.js +1 -0
- package/dist/commands/config/index.js.map +1 -1
- package/dist/commands/config/set-api-url.d.ts +1 -0
- package/dist/commands/config/set-api-url.js +38 -2
- package/dist/commands/config/set-api-url.js.map +1 -1
- package/dist/commands/config/show.d.ts +1 -0
- package/dist/commands/config/show.js +1 -0
- package/dist/commands/config/show.js.map +1 -1
- package/dist/commands/credits/add.d.ts +1 -0
- package/dist/commands/credits/add.js +1 -0
- package/dist/commands/credits/add.js.map +1 -1
- package/dist/commands/credits/index.d.ts +1 -0
- package/dist/commands/credits/index.js +1 -0
- package/dist/commands/credits/index.js.map +1 -1
- package/dist/commands/credits/list.d.ts +1 -0
- package/dist/commands/credits/list.js +1 -0
- package/dist/commands/credits/list.js.map +1 -1
- package/dist/commands/gpu/activity.d.ts +2 -0
- package/dist/commands/gpu/activity.js +7 -0
- package/dist/commands/gpu/activity.js.map +1 -1
- package/dist/commands/gpu/bandwidth.d.ts +2 -0
- package/dist/commands/gpu/bandwidth.js +5 -0
- package/dist/commands/gpu/bandwidth.js.map +1 -1
- package/dist/commands/gpu/boot-order.d.ts +2 -0
- package/dist/commands/gpu/boot-order.js +6 -0
- package/dist/commands/gpu/boot-order.js.map +1 -1
- package/dist/commands/gpu/console.d.ts +2 -0
- package/dist/commands/gpu/console.js +6 -0
- package/dist/commands/gpu/console.js.map +1 -1
- package/dist/commands/gpu/details.d.ts +3 -0
- package/dist/commands/gpu/details.js +10 -0
- package/dist/commands/gpu/details.js.map +1 -1
- package/dist/commands/gpu/index.d.ts +1 -0
- package/dist/commands/gpu/index.js +1 -0
- package/dist/commands/gpu/index.js.map +1 -1
- package/dist/commands/gpu/ip/add.d.ts +2 -0
- package/dist/commands/gpu/ip/add.js +7 -0
- package/dist/commands/gpu/ip/add.js.map +1 -1
- package/dist/commands/gpu/ip/list.d.ts +2 -0
- package/dist/commands/gpu/ip/list.js +5 -0
- package/dist/commands/gpu/ip/list.js.map +1 -1
- package/dist/commands/gpu/list.d.ts +1 -0
- package/dist/commands/gpu/list.js +1 -0
- package/dist/commands/gpu/list.js.map +1 -1
- package/dist/commands/gpu/order.d.ts +1 -0
- package/dist/commands/gpu/order.js +3 -0
- package/dist/commands/gpu/order.js.map +1 -1
- package/dist/commands/gpu/power.d.ts +2 -0
- package/dist/commands/gpu/power.js +7 -0
- package/dist/commands/gpu/power.js.map +1 -1
- package/dist/commands/gpu/reinstall.d.ts +2 -0
- package/dist/commands/gpu/reinstall.js +8 -0
- package/dist/commands/gpu/reinstall.js.map +1 -1
- package/dist/commands/gpu/resize.d.ts +2 -0
- package/dist/commands/gpu/resize.js +7 -0
- package/dist/commands/gpu/resize.js.map +1 -1
- package/dist/commands/gpu/stats.d.ts +2 -0
- package/dist/commands/gpu/stats.js +6 -0
- package/dist/commands/gpu/stats.js.map +1 -1
- package/dist/commands/help.d.ts +2 -0
- package/dist/commands/help.js +5 -0
- package/dist/commands/help.js.map +1 -1
- package/dist/commands/instant-metal/activity.d.ts +2 -0
- package/dist/commands/instant-metal/activity.js +7 -0
- package/dist/commands/instant-metal/activity.js.map +1 -1
- package/dist/commands/instant-metal/bandwidth.d.ts +2 -0
- package/dist/commands/instant-metal/bandwidth.js +5 -0
- package/dist/commands/instant-metal/bandwidth.js.map +1 -1
- package/dist/commands/instant-metal/boot-order.d.ts +2 -0
- package/dist/commands/instant-metal/boot-order.js +6 -0
- package/dist/commands/instant-metal/boot-order.js.map +1 -1
- package/dist/commands/instant-metal/console.d.ts +2 -0
- package/dist/commands/instant-metal/console.js +6 -0
- package/dist/commands/instant-metal/console.js.map +1 -1
- package/dist/commands/instant-metal/details.d.ts +3 -0
- package/dist/commands/instant-metal/details.js +10 -0
- package/dist/commands/instant-metal/details.js.map +1 -1
- package/dist/commands/instant-metal/index.d.ts +1 -0
- package/dist/commands/instant-metal/index.js +1 -0
- package/dist/commands/instant-metal/index.js.map +1 -1
- package/dist/commands/instant-metal/ip/add.d.ts +2 -0
- package/dist/commands/instant-metal/ip/add.js +7 -0
- package/dist/commands/instant-metal/ip/add.js.map +1 -1
- package/dist/commands/instant-metal/ip/list.d.ts +2 -0
- package/dist/commands/instant-metal/ip/list.js +5 -0
- package/dist/commands/instant-metal/ip/list.js.map +1 -1
- package/dist/commands/instant-metal/list.d.ts +1 -0
- package/dist/commands/instant-metal/list.js +1 -0
- package/dist/commands/instant-metal/list.js.map +1 -1
- package/dist/commands/instant-metal/order.d.ts +1 -0
- package/dist/commands/instant-metal/order.js +3 -0
- package/dist/commands/instant-metal/order.js.map +1 -1
- package/dist/commands/instant-metal/power.d.ts +2 -0
- package/dist/commands/instant-metal/power.js +7 -0
- package/dist/commands/instant-metal/power.js.map +1 -1
- package/dist/commands/instant-metal/reinstall.d.ts +2 -0
- package/dist/commands/instant-metal/reinstall.js +8 -0
- package/dist/commands/instant-metal/reinstall.js.map +1 -1
- package/dist/commands/instant-metal/resize.d.ts +2 -0
- package/dist/commands/instant-metal/resize.js +7 -0
- package/dist/commands/instant-metal/resize.js.map +1 -1
- package/dist/commands/instant-metal/stats.d.ts +2 -0
- package/dist/commands/instant-metal/stats.js +6 -0
- package/dist/commands/instant-metal/stats.js.map +1 -1
- package/dist/commands/login.d.ts +1 -0
- package/dist/commands/login.js +1 -0
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/logout.d.ts +1 -0
- package/dist/commands/logout.js +1 -0
- package/dist/commands/logout.js.map +1 -1
- package/dist/commands/order/gpu.d.ts +1 -0
- package/dist/commands/order/gpu.js +3 -0
- package/dist/commands/order/gpu.js.map +1 -1
- package/dist/commands/order/instant-metal.d.ts +1 -0
- package/dist/commands/order/instant-metal.js +3 -0
- package/dist/commands/order/instant-metal.js.map +1 -1
- package/dist/commands/order/storage.d.ts +1 -0
- package/dist/commands/order/storage.js +2 -1
- package/dist/commands/order/storage.js.map +1 -1
- package/dist/commands/order/vps.d.ts +1 -0
- package/dist/commands/order/vps.js +3 -0
- package/dist/commands/order/vps.js.map +1 -1
- package/dist/commands/order.d.ts +1 -0
- package/dist/commands/order.js +1 -0
- package/dist/commands/order.js.map +1 -1
- package/dist/commands/os-images.d.ts +1 -0
- package/dist/commands/os-images.js +4 -1
- package/dist/commands/os-images.js.map +1 -1
- package/dist/commands/payments/index.d.ts +1 -0
- package/dist/commands/payments/index.js +1 -0
- package/dist/commands/payments/index.js.map +1 -1
- package/dist/commands/payments/methods/add.d.ts +1 -0
- package/dist/commands/payments/methods/add.js +1 -0
- package/dist/commands/payments/methods/add.js.map +1 -1
- package/dist/commands/payments/methods/delete.d.ts +1 -0
- package/dist/commands/payments/methods/delete.js +1 -0
- package/dist/commands/payments/methods/delete.js.map +1 -1
- package/dist/commands/payments/methods/index.d.ts +1 -0
- package/dist/commands/payments/methods/index.js +1 -0
- package/dist/commands/payments/methods/index.js.map +1 -1
- package/dist/commands/payments/methods/list.d.ts +1 -0
- package/dist/commands/payments/methods/list.js +1 -0
- package/dist/commands/payments/methods/list.js.map +1 -1
- package/dist/commands/payments/methods/set-default.d.ts +1 -0
- package/dist/commands/payments/methods/set-default.js +1 -0
- package/dist/commands/payments/methods/set-default.js.map +1 -1
- package/dist/commands/projects/index.d.ts +1 -0
- package/dist/commands/projects/index.js +1 -0
- package/dist/commands/projects/index.js.map +1 -1
- package/dist/commands/projects/list.d.ts +1 -0
- package/dist/commands/projects/list.js +1 -0
- package/dist/commands/projects/list.js.map +1 -1
- package/dist/commands/resources.d.ts +1 -0
- package/dist/commands/resources.js +33 -21
- package/dist/commands/resources.js.map +1 -1
- package/dist/commands/settings/index.d.ts +1 -0
- package/dist/commands/settings/index.js +1 -0
- package/dist/commands/settings/index.js.map +1 -1
- package/dist/commands/settings/render-mode.d.ts +1 -0
- package/dist/commands/settings/render-mode.js +1 -0
- package/dist/commands/settings/render-mode.js.map +1 -1
- package/dist/commands/ssh-key/add.d.ts +1 -0
- package/dist/commands/ssh-key/add.js +1 -0
- package/dist/commands/ssh-key/add.js.map +1 -1
- package/dist/commands/ssh-key/delete.d.ts +1 -0
- package/dist/commands/ssh-key/delete.js +1 -0
- package/dist/commands/ssh-key/delete.js.map +1 -1
- package/dist/commands/ssh-key/list.d.ts +1 -0
- package/dist/commands/ssh-key/list.js +1 -0
- package/dist/commands/ssh-key/list.js.map +1 -1
- package/dist/commands/storage/attach.d.ts +2 -1
- package/dist/commands/storage/attach.js +12 -11
- package/dist/commands/storage/attach.js.map +1 -1
- package/dist/commands/storage/detach.d.ts +1 -0
- package/dist/commands/storage/detach.js +3 -2
- package/dist/commands/storage/detach.js.map +1 -1
- package/dist/commands/storage/list.d.ts +1 -0
- package/dist/commands/storage/list.js +2 -1
- package/dist/commands/storage/list.js.map +1 -1
- package/dist/commands/storage/order.d.ts +2 -1
- package/dist/commands/storage/order.js +11 -10
- package/dist/commands/storage/order.js.map +1 -1
- package/dist/commands/storage/resize.d.ts +1 -0
- package/dist/commands/storage/resize.js +1 -0
- package/dist/commands/storage/resize.js.map +1 -1
- package/dist/commands/team/details.d.ts +1 -0
- package/dist/commands/team/details.js +1 -0
- package/dist/commands/team/details.js.map +1 -1
- package/dist/commands/team/invite.d.ts +1 -0
- package/dist/commands/team/invite.js +1 -0
- package/dist/commands/team/invite.js.map +1 -1
- package/dist/commands/team.d.ts +1 -0
- package/dist/commands/team.js +1 -0
- package/dist/commands/team.js.map +1 -1
- package/dist/commands/tickets/close.d.ts +1 -0
- package/dist/commands/tickets/close.js +1 -0
- package/dist/commands/tickets/close.js.map +1 -1
- package/dist/commands/tickets/create.d.ts +1 -0
- package/dist/commands/tickets/create.js +1 -0
- package/dist/commands/tickets/create.js.map +1 -1
- package/dist/commands/tickets/departments.d.ts +1 -0
- package/dist/commands/tickets/departments.js +1 -0
- package/dist/commands/tickets/departments.js.map +1 -1
- package/dist/commands/tickets/list.d.ts +1 -0
- package/dist/commands/tickets/list.js +1 -0
- package/dist/commands/tickets/list.js.map +1 -1
- package/dist/commands/tickets/open.d.ts +1 -0
- package/dist/commands/tickets/open.js +1 -0
- package/dist/commands/tickets/open.js.map +1 -1
- package/dist/commands/tickets/reopen.d.ts +11 -0
- package/dist/commands/tickets/reopen.js +34 -0
- package/dist/commands/tickets/reopen.js.map +1 -0
- package/dist/commands/tickets/reply.d.ts +1 -0
- package/dist/commands/tickets/reply.js +1 -0
- package/dist/commands/tickets/reply.js.map +1 -1
- package/dist/commands/transit.d.ts +1 -0
- package/dist/commands/transit.js +1 -0
- package/dist/commands/transit.js.map +1 -1
- package/dist/commands/tui/index.d.ts +1 -0
- package/dist/commands/tui/index.js +21 -0
- package/dist/commands/tui/index.js.map +1 -1
- package/dist/commands/vds/activity.d.ts +2 -0
- package/dist/commands/vds/activity.js +7 -0
- package/dist/commands/vds/activity.js.map +1 -1
- package/dist/commands/vds/bandwidth.d.ts +2 -0
- package/dist/commands/vds/bandwidth.js +5 -0
- package/dist/commands/vds/bandwidth.js.map +1 -1
- package/dist/commands/vds/boot-order.d.ts +2 -0
- package/dist/commands/vds/boot-order.js +6 -0
- package/dist/commands/vds/boot-order.js.map +1 -1
- package/dist/commands/vds/console.d.ts +2 -0
- package/dist/commands/vds/console.js +6 -0
- package/dist/commands/vds/console.js.map +1 -1
- package/dist/commands/vds/details.d.ts +3 -0
- package/dist/commands/vds/details.js +10 -0
- package/dist/commands/vds/details.js.map +1 -1
- package/dist/commands/vds/index.d.ts +1 -0
- package/dist/commands/vds/index.js +1 -0
- package/dist/commands/vds/index.js.map +1 -1
- package/dist/commands/vds/ip/add.d.ts +2 -0
- package/dist/commands/vds/ip/add.js +7 -0
- package/dist/commands/vds/ip/add.js.map +1 -1
- package/dist/commands/vds/ip/list.d.ts +2 -0
- package/dist/commands/vds/ip/list.js +5 -0
- package/dist/commands/vds/ip/list.js.map +1 -1
- package/dist/commands/vds/list.d.ts +1 -0
- package/dist/commands/vds/list.js +1 -0
- package/dist/commands/vds/list.js.map +1 -1
- package/dist/commands/vds/order.d.ts +2 -0
- package/dist/commands/vds/order.js +12 -3
- package/dist/commands/vds/order.js.map +1 -1
- package/dist/commands/vds/power.d.ts +2 -0
- package/dist/commands/vds/power.js +7 -0
- package/dist/commands/vds/power.js.map +1 -1
- package/dist/commands/vds/reinstall.d.ts +2 -0
- package/dist/commands/vds/reinstall.js +8 -0
- package/dist/commands/vds/reinstall.js.map +1 -1
- package/dist/commands/vds/resize.d.ts +2 -0
- package/dist/commands/vds/resize.js +7 -0
- package/dist/commands/vds/resize.js.map +1 -1
- package/dist/commands/vds/stats.d.ts +2 -0
- package/dist/commands/vds/stats.js +6 -0
- package/dist/commands/vds/stats.js.map +1 -1
- package/dist/commands/vps/activity.d.ts +1 -0
- package/dist/commands/vps/activity.js +5 -4
- package/dist/commands/vps/activity.js.map +1 -1
- package/dist/commands/vps/bandwidth.d.ts +1 -0
- package/dist/commands/vps/bandwidth.js +6 -5
- package/dist/commands/vps/bandwidth.js.map +1 -1
- package/dist/commands/vps/boot-order.d.ts +1 -0
- package/dist/commands/vps/boot-order.js +6 -5
- package/dist/commands/vps/boot-order.js.map +1 -1
- package/dist/commands/vps/console.d.ts +1 -0
- package/dist/commands/vps/console.js +10 -9
- package/dist/commands/vps/console.js.map +1 -1
- package/dist/commands/vps/details.d.ts +5 -0
- package/dist/commands/vps/details.js +21 -9
- package/dist/commands/vps/details.js.map +1 -1
- package/dist/commands/vps/ip/add.d.ts +1 -0
- package/dist/commands/vps/ip/add.js +11 -9
- package/dist/commands/vps/ip/add.js.map +1 -1
- package/dist/commands/vps/ip/list.d.ts +1 -0
- package/dist/commands/vps/ip/list.js +7 -6
- package/dist/commands/vps/ip/list.js.map +1 -1
- package/dist/commands/vps/list.d.ts +1 -0
- package/dist/commands/vps/list.js +5 -4
- package/dist/commands/vps/list.js.map +1 -1
- package/dist/commands/vps/order.d.ts +4 -2
- package/dist/commands/vps/order.js +26 -16
- package/dist/commands/vps/order.js.map +1 -1
- package/dist/commands/vps/power.d.ts +1 -0
- package/dist/commands/vps/power.js +15 -13
- package/dist/commands/vps/power.js.map +1 -1
- package/dist/commands/vps/reinstall.d.ts +1 -0
- package/dist/commands/vps/reinstall.js +15 -14
- package/dist/commands/vps/reinstall.js.map +1 -1
- package/dist/commands/vps/resize.d.ts +1 -0
- package/dist/commands/vps/resize.js +11 -9
- package/dist/commands/vps/resize.js.map +1 -1
- package/dist/commands/vps/stats.d.ts +1 -0
- package/dist/commands/vps/stats.js +8 -7
- package/dist/commands/vps/stats.js.map +1 -1
- package/dist/commands/whoami.d.ts +1 -0
- package/dist/commands/whoami.js +1 -0
- package/dist/commands/whoami.js.map +1 -1
- package/dist/help/help-filter.d.ts +10 -0
- package/dist/help/help-filter.js +9 -0
- package/dist/help/help-filter.js.map +1 -0
- package/dist/help/scope-aware-help.d.ts +30 -0
- package/dist/help/scope-aware-help.js +71 -0
- package/dist/help/scope-aware-help.js.map +1 -0
- package/dist/help.js +0 -1
- package/dist/help.js.map +1 -1
- package/dist/tui/App.js +1 -1
- package/dist/tui/App.js.map +1 -1
- package/dist/tui/components/NumberInput.js +1 -1
- package/dist/tui/components/Sparkline.js +1 -1
- package/dist/tui/screens/Billing.js +10 -10
- package/dist/tui/screens/Billing.js.map +1 -1
- package/dist/tui/screens/Dashboard.js +1 -1
- package/dist/tui/screens/Dashboard.js.map +1 -1
- package/dist/tui/screens/Order.js +328 -99
- package/dist/tui/screens/Order.js.map +1 -1
- package/dist/tui/screens/Resources.js +35 -64
- package/dist/tui/screens/Resources.js.map +1 -1
- package/dist/tui/screens/Tickets.js +31 -22
- package/dist/tui/screens/Tickets.js.map +1 -1
- package/dist/ui/image-resolve.js +1 -1
- package/dist/ui/image-resolve.js.map +1 -1
- package/dist/ui/payment.d.ts +1 -1
- package/dist/ui/resource-detail.d.ts +3 -0
- package/dist/ui/{vps-detail.js → resource-detail.js} +8 -8
- package/dist/ui/resource-detail.js.map +1 -0
- package/dist/ui/resource-resolve.d.ts +4 -0
- package/dist/ui/resource-resolve.js +24 -0
- package/dist/ui/resource-resolve.js.map +1 -0
- package/dist/ui/wait.d.ts +1 -1
- package/dist/ui/wait.js +4 -4
- package/dist/ui/wait.js.map +1 -1
- package/dist/version-check-bin.d.ts +35 -0
- package/dist/version-check-bin.js +123 -0
- package/dist/version-check-bin.js.map +1 -0
- package/dist/version-check.d.ts +39 -0
- package/dist/version-check.js +148 -0
- package/dist/version-check.js.map +1 -0
- package/package.json +11 -6
- package/dist/commands/bare-metal/index.d.ts +0 -4
- package/dist/commands/bare-metal/index.js +0 -5
- package/dist/commands/bare-metal/index.js.map +0 -1
- package/dist/commands/bare-metal/list.d.ts +0 -9
- package/dist/commands/bare-metal/list.js +0 -38
- package/dist/commands/bare-metal/list.js.map +0 -1
- package/dist/commands/bare-metal/order.d.ts +0 -6
- package/dist/commands/bare-metal/order.js +0 -27
- package/dist/commands/bare-metal/order.js.map +0 -1
- package/dist/ui/vps-detail.d.ts +0 -3
- package/dist/ui/vps-detail.js.map +0 -1
- package/dist/ui/vps-resolve.d.ts +0 -4
- package/dist/ui/vps-resolve.js +0 -24
- package/dist/ui/vps-resolve.js.map +0 -1
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Args, Flags } from "@oclif/core";
|
|
2
2
|
import { BaseCommand } from "../../base/command.js";
|
|
3
|
-
import {
|
|
3
|
+
import { resolveResourceId } from "../../ui/resource-resolve.js";
|
|
4
4
|
import { renderTable } from "../../ui/table.js";
|
|
5
5
|
import { dim } from "../../ui/glyphs.js";
|
|
6
6
|
export default class ResourceActivity extends BaseCommand {
|
|
7
7
|
static description = "Show recent activity for a VPS.";
|
|
8
|
+
static apiKeyScope = "none";
|
|
8
9
|
static examples = [
|
|
9
10
|
"<%= config.bin %> vps activity 019e...",
|
|
10
11
|
"<%= config.bin %> vps activity 019e... --limit 50",
|
|
@@ -13,7 +14,7 @@ export default class ResourceActivity extends BaseCommand {
|
|
|
13
14
|
];
|
|
14
15
|
static args = {
|
|
15
16
|
id: Args.string({
|
|
16
|
-
description: "
|
|
17
|
+
description: "Resource id (full or the short id from `vps list` / `vds list` / `gpu list` / `instant-metal list`), hostname, or IP.",
|
|
17
18
|
required: true,
|
|
18
19
|
}),
|
|
19
20
|
};
|
|
@@ -25,8 +26,8 @@ export default class ResourceActivity extends BaseCommand {
|
|
|
25
26
|
await this.initClients();
|
|
26
27
|
const { args, flags } = await this.parse(this.ctor);
|
|
27
28
|
try {
|
|
28
|
-
const
|
|
29
|
-
const log = await this.clients.api.
|
|
29
|
+
const resourceId = await resolveResourceId(this.clients.api, args.id);
|
|
30
|
+
const log = await this.clients.api.virtualizedControl.activity(resourceId, flags.limit, flags.offset);
|
|
30
31
|
this.emit(log, () => {
|
|
31
32
|
if (log.items.length === 0) {
|
|
32
33
|
this.log("No activity entries.");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity.js","sourceRoot":"","sources":["../../../src/commands/vps/activity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"activity.js","sourceRoot":"","sources":["../../../src/commands/vps/activity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,WAAW;IACvD,MAAM,CAAC,WAAW,GAAG,iCAAiC,CAAC;IACvD,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC;IAC5B,MAAM,CAAC,QAAQ,GAAG;QAChB,wCAAwC;QACxC,mDAAmD;QACnD,+DAA+D;QAC/D,gDAAgD;KACjD,CAAC;IACF,MAAM,CAAC,IAAI,GAAG;QACZ,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC;YACd,WAAW,EAAE,uHAAuH;YACpI,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;IACF,MAAM,CAAC,KAAK,GAAG;QACb,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;QACxE,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;KACzE,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAA+B,CAAC,CAAC;QAC/E,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YACtE,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,QAAQ,CAC5D,UAAU,EACV,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,MAAM,CACb,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE;gBAClB,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC3B,IAAI,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;oBACjC,OAAO;gBACT,CAAC;gBACD,IAAI,CAAC,GAAG,CACN,WAAW,CACT,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,EACrC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;oBACnB,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC;oBAC3C,CAAC,CAAC,KAAK,EAAE,KAAK,IAAI,QAAQ;oBAC1B,CAAC,CAAC,MAAM;oBACR,CAAC,CAAC,MAAM,IAAI,EAAE;iBACf,CAAC,CACH,CACF,CAAC;gBACF,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACb,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,KAAK,CAAC,MAAM,OAAO,GAAG,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC;YACxE,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC;IACH,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { BaseCommand } from "../../base/command.js";
|
|
2
2
|
export default class ResourceBandwidth extends BaseCommand {
|
|
3
3
|
static description: string;
|
|
4
|
+
static apiKeyScope: string;
|
|
4
5
|
static examples: string[];
|
|
5
6
|
static args: {
|
|
6
7
|
id: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Args } from "@oclif/core";
|
|
2
2
|
import { BaseCommand } from "../../base/command.js";
|
|
3
|
-
import {
|
|
3
|
+
import { resolveResourceId } from "../../ui/resource-resolve.js";
|
|
4
4
|
import { panel } from "../../ui/wizard.js";
|
|
5
5
|
import { renderTable } from "../../ui/table.js";
|
|
6
6
|
import { statusColor } from "../../ui/glyphs.js";
|
|
@@ -11,13 +11,14 @@ export default class ResourceBandwidth extends BaseCommand {
|
|
|
11
11
|
"Read-only. Includes up to 12 months of history. `-o json` returns",
|
|
12
12
|
"the full summary (current period + history + rates).",
|
|
13
13
|
].join("\n");
|
|
14
|
+
static apiKeyScope = "read:vps";
|
|
14
15
|
static examples = [
|
|
15
16
|
"<%= config.bin %> vps bandwidth 019e...",
|
|
16
17
|
"<%= config.bin %> vps bandwidth 019e... -o json # full summary for scripting",
|
|
17
18
|
];
|
|
18
19
|
static args = {
|
|
19
20
|
id: Args.string({
|
|
20
|
-
description: "
|
|
21
|
+
description: "Resource id (full or the short id from `vps list` / `vds list` / `gpu list` / `instant-metal list`), hostname, or IP.",
|
|
21
22
|
required: true,
|
|
22
23
|
}),
|
|
23
24
|
};
|
|
@@ -25,8 +26,8 @@ export default class ResourceBandwidth extends BaseCommand {
|
|
|
25
26
|
await this.initClients();
|
|
26
27
|
const { args } = await this.parse(this.ctor);
|
|
27
28
|
try {
|
|
28
|
-
const
|
|
29
|
-
const summary = await this.clients.api.
|
|
29
|
+
const resourceId = await resolveResourceId(this.clients.api, args.id);
|
|
30
|
+
const summary = await this.clients.api.virtualized.bandwidth(resourceId);
|
|
30
31
|
this.emit(summary, () => {
|
|
31
32
|
const includedTb = summary.included_tb != null ? `${summary.included_tb} TB` : "unmetered";
|
|
32
33
|
const overage = summary.overage_per_tb != null
|
|
@@ -38,7 +39,7 @@ export default class ResourceBandwidth extends BaseCommand {
|
|
|
38
39
|
const overageCost = summary.overage_per_tb != null && overTb > 0
|
|
39
40
|
? `$${(overTb * summary.overage_per_tb).toFixed(2)}`
|
|
40
41
|
: null;
|
|
41
|
-
this.log(panel(`Bandwidth —
|
|
42
|
+
this.log(panel(`Bandwidth — ${resourceId}`, [
|
|
42
43
|
["Period", cur ? `${cur.period_start.slice(0, 10)} → ${cur.period_end.slice(0, 10)}` : "no open period"],
|
|
43
44
|
["Used", `${usedTb.toFixed(4)} TB`],
|
|
44
45
|
["Included", includedTb],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bandwidth.js","sourceRoot":"","sources":["../../../src/commands/vps/bandwidth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"bandwidth.js","sourceRoot":"","sources":["../../../src/commands/vps/bandwidth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { BaseCommand } from "../../base/command.js";
|
|
2
2
|
export default class ResourceBootOrder extends BaseCommand {
|
|
3
3
|
static description: string;
|
|
4
|
+
static apiKeyScope: string;
|
|
4
5
|
static examples: string[];
|
|
5
6
|
static args: {
|
|
6
7
|
id: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Args } from "@oclif/core";
|
|
2
2
|
import { BaseCommand } from "../../base/command.js";
|
|
3
|
-
import {
|
|
3
|
+
import { resolveResourceId } from "../../ui/resource-resolve.js";
|
|
4
4
|
import { panel } from "../../ui/wizard.js";
|
|
5
5
|
const VALID = new Set(["disk_first", "cdrom_first"]);
|
|
6
6
|
export default class ResourceBootOrder extends BaseCommand {
|
|
7
7
|
static description = "View or set a VPS's boot order.";
|
|
8
|
+
static apiKeyScope = "write:vps:settings";
|
|
8
9
|
static examples = [
|
|
9
10
|
"<%= config.bin %> vps boot-order 019e... # read current",
|
|
10
11
|
"<%= config.bin %> vps boot-order 019e... disk_first",
|
|
@@ -12,7 +13,7 @@ export default class ResourceBootOrder extends BaseCommand {
|
|
|
12
13
|
];
|
|
13
14
|
static args = {
|
|
14
15
|
id: Args.string({
|
|
15
|
-
description: "
|
|
16
|
+
description: "Resource id (full or the short id from `vps list` / `vds list` / `gpu list` / `instant-metal list`), hostname, or IP.",
|
|
16
17
|
required: true,
|
|
17
18
|
}),
|
|
18
19
|
order: Args.string({
|
|
@@ -24,16 +25,16 @@ export default class ResourceBootOrder extends BaseCommand {
|
|
|
24
25
|
await this.initClients();
|
|
25
26
|
const { args } = await this.parse(this.ctor);
|
|
26
27
|
try {
|
|
27
|
-
const
|
|
28
|
+
const resourceId = await resolveResourceId(this.clients.api, args.id);
|
|
28
29
|
let result;
|
|
29
30
|
if (args.order) {
|
|
30
31
|
if (!VALID.has(args.order)) {
|
|
31
32
|
this.error(`Invalid boot order "${args.order}". Use disk_first or cdrom_first.`, { exit: 1 });
|
|
32
33
|
}
|
|
33
|
-
result = await this.clients.api.
|
|
34
|
+
result = await this.clients.api.virtualizedControl.bootSet(resourceId, args.order);
|
|
34
35
|
}
|
|
35
36
|
else {
|
|
36
|
-
result = await this.clients.api.
|
|
37
|
+
result = await this.clients.api.virtualizedControl.bootGet(resourceId);
|
|
37
38
|
}
|
|
38
39
|
this.emit(result, () => {
|
|
39
40
|
this.log(panel("Boot order", [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"boot-order.js","sourceRoot":"","sources":["../../../src/commands/vps/boot-order.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"boot-order.js","sourceRoot":"","sources":["../../../src/commands/vps/boot-order.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC;AAErD,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,WAAW;IACxD,MAAM,CAAC,WAAW,GAAG,iCAAiC,CAAC;IACvD,MAAM,CAAC,WAAW,GAAG,oBAAoB,CAAC;IAC1C,MAAM,CAAC,QAAQ,GAAG;QAChB,uFAAuF;QACvF,qDAAqD;QACrD,sDAAsD;KACvD,CAAC;IACF,MAAM,CAAC,IAAI,GAAG;QACZ,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC;YACd,WAAW,EAAE,uHAAuH;YACpI,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC;YACjB,WAAW,EAAE,kEAAkE;YAC/E,QAAQ,EAAE,KAAK;SAChB,CAAC;KACH,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAgC,CAAC,CAAC;QAEzE,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YACtE,IAAI,MAAM,CAAC;YACX,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC3B,IAAI,CAAC,KAAK,CACR,uBAAuB,IAAI,CAAC,KAAK,mCAAmC,EACpE,EAAE,IAAI,EAAE,CAAC,EAAE,CACZ,CAAC;gBACJ,CAAC;gBACD,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,OAAO,CACxD,UAAU,EACV,IAAI,CAAC,KAAqC,CAC3C,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACzE,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;gBACrB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,EAAE;oBAC3B,CAAC,YAAY,EAAE,MAAM,CAAC,UAAU,CAAC;oBACjC,CAAC,iBAAiB,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;oBAC1D,CAAC,cAAc,EAAE,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;iBAClD,CAAC,CAAC,CAAC;YACN,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC;IACH,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { BaseCommand } from "../../base/command.js";
|
|
2
2
|
export default class ResourceConsole extends BaseCommand {
|
|
3
3
|
static description: string;
|
|
4
|
+
static apiKeyScope: string;
|
|
4
5
|
static examples: string[];
|
|
5
6
|
static args: {
|
|
6
7
|
id: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
|
|
@@ -2,7 +2,7 @@ import { Args, Flags } from "@oclif/core";
|
|
|
2
2
|
import { BaseCommand } from "../../base/command.js";
|
|
3
3
|
import { panel } from "../../ui/wizard.js";
|
|
4
4
|
import { portalUrl } from "../../ui/portal.js";
|
|
5
|
-
import {
|
|
5
|
+
import { resolveResourceId } from "../../ui/resource-resolve.js";
|
|
6
6
|
import { ok, dim } from "../../ui/glyphs.js";
|
|
7
7
|
export default class ResourceConsole extends BaseCommand {
|
|
8
8
|
static description = [
|
|
@@ -14,6 +14,7 @@ export default class ResourceConsole extends BaseCommand {
|
|
|
14
14
|
"portal console URL to open in a browser instead of attaching.",
|
|
15
15
|
"Reuses your signed-in session — no separate login.",
|
|
16
16
|
].join("\n");
|
|
17
|
+
static apiKeyScope = "none";
|
|
17
18
|
static examples = [
|
|
18
19
|
"<%= config.bin %> vps console 019e... # attach serial (TTY) or print URL",
|
|
19
20
|
"<%= config.bin %> vps console 019e... --print-url # always print the browser URL",
|
|
@@ -21,7 +22,7 @@ export default class ResourceConsole extends BaseCommand {
|
|
|
21
22
|
];
|
|
22
23
|
static args = {
|
|
23
24
|
id: Args.string({
|
|
24
|
-
description: "
|
|
25
|
+
description: "Resource id (full or the short id from `vps list` / `vds list` / `gpu list` / `instant-metal list`), hostname, or IP.",
|
|
25
26
|
required: true,
|
|
26
27
|
}),
|
|
27
28
|
};
|
|
@@ -35,8 +36,8 @@ export default class ResourceConsole extends BaseCommand {
|
|
|
35
36
|
const { args, flags } = await this.parse(this.ctor);
|
|
36
37
|
const insecure = await this.resolveInsecure();
|
|
37
38
|
try {
|
|
38
|
-
const
|
|
39
|
-
const vend = await this.clients.api.
|
|
39
|
+
const resourceId = await resolveResourceId(this.clients.api, args.id);
|
|
40
|
+
const vend = await this.clients.api.virtualizedControl.console(resourceId);
|
|
40
41
|
if (vend.preview) {
|
|
41
42
|
this.emit({ preview: true, console_type: vend.console_type }, () => {
|
|
42
43
|
this.log("This is a dev seed-node VM — no console is available for it.");
|
|
@@ -44,7 +45,7 @@ export default class ResourceConsole extends BaseCommand {
|
|
|
44
45
|
return;
|
|
45
46
|
}
|
|
46
47
|
const apiBase = this.clients.config.get().api_base_url;
|
|
47
|
-
const browserUrl = portalUrl(apiBase, `/console/resources/${
|
|
48
|
+
const browserUrl = portalUrl(apiBase, `/console/resources/${resourceId}`);
|
|
48
49
|
const wantAttach = vend.console_type === "serial" &&
|
|
49
50
|
!flags["print-url"] &&
|
|
50
51
|
Boolean(process.stdin.isTTY) &&
|
|
@@ -52,7 +53,7 @@ export default class ResourceConsole extends BaseCommand {
|
|
|
52
53
|
this.outputFormat === "table";
|
|
53
54
|
if (!wantAttach) {
|
|
54
55
|
this.emit({ url: browserUrl, token: vend.token, console_type: vend.console_type }, () => {
|
|
55
|
-
this.log(panel("Open this
|
|
56
|
+
this.log(panel("Open this console in a browser", [
|
|
56
57
|
["Type", vend.console_type === "vnc" ? "graphical (VNC)" : "serial"],
|
|
57
58
|
["URL", browserUrl],
|
|
58
59
|
]));
|
|
@@ -65,14 +66,14 @@ export default class ResourceConsole extends BaseCommand {
|
|
|
65
66
|
});
|
|
66
67
|
return;
|
|
67
68
|
}
|
|
68
|
-
await this.attachSerial(
|
|
69
|
+
await this.attachSerial(resourceId, vend.token, apiBase, insecure);
|
|
69
70
|
}
|
|
70
71
|
catch (err) {
|
|
71
72
|
this.fail(err);
|
|
72
73
|
}
|
|
73
74
|
}
|
|
74
|
-
async attachSerial(
|
|
75
|
-
const wsUrl = this.wsUrl(apiBase, `/virtualized/${
|
|
75
|
+
async attachSerial(resourceId, token, apiBase, insecure) {
|
|
76
|
+
const wsUrl = this.wsUrl(apiBase, `/virtualized/${resourceId}/term-ws`, token);
|
|
76
77
|
const prevReject = process.env.NODE_TLS_REJECT_UNAUTHORIZED;
|
|
77
78
|
if (insecure)
|
|
78
79
|
process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../src/commands/vps/console.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../src/commands/vps/console.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { BaseCommand } from "../../base/command.js";
|
|
|
2
2
|
export default class ResourceDetails extends BaseCommand {
|
|
3
3
|
static aliases: string[];
|
|
4
4
|
static description: string;
|
|
5
|
+
static apiKeyScope: string;
|
|
5
6
|
static examples: string[];
|
|
6
7
|
static args: {
|
|
7
8
|
id: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
|
|
@@ -10,6 +11,10 @@ export default class ResourceDetails extends BaseCommand {
|
|
|
10
11
|
project: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
11
12
|
refresh: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
12
13
|
};
|
|
14
|
+
/** Product kind this details command is scoped to. vds/gpu/instant-metal
|
|
15
|
+
* subclass and override so `synteq vds details <gpu-id>` refuses to serve
|
|
16
|
+
* a GPU as a VDS. */
|
|
17
|
+
protected matchesKind(): string;
|
|
13
18
|
run(): Promise<void>;
|
|
14
19
|
private pickFrom;
|
|
15
20
|
}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { Args, Flags } from "@oclif/core";
|
|
2
2
|
import select from "@inquirer/select";
|
|
3
3
|
import { BaseCommand } from "../../base/command.js";
|
|
4
|
-
import {
|
|
4
|
+
import { formatResourceDetail, resolveResource } from "../../ui/resource-detail.js";
|
|
5
5
|
import { shortId } from "../../ui/table.js";
|
|
6
6
|
import { statusColor } from "../../ui/glyphs.js";
|
|
7
7
|
export default class ResourceDetails extends BaseCommand {
|
|
8
8
|
static aliases = ["vps:show"];
|
|
9
9
|
static description = "Show full details for one Resource. With no id, pick from a list.";
|
|
10
|
+
static apiKeyScope = "read:vps";
|
|
10
11
|
static examples = [
|
|
11
12
|
"<%= config.bin %> vps details # pick from a list (TTY)",
|
|
12
13
|
"<%= config.bin %> vps details web-01 # by hostname",
|
|
@@ -20,16 +21,24 @@ export default class ResourceDetails extends BaseCommand {
|
|
|
20
21
|
};
|
|
21
22
|
static flags = {
|
|
22
23
|
project: Flags.string({ description: "Scope to a project id when searching." }),
|
|
23
|
-
refresh: Flags.boolean({ description: "Re-fetch the matched
|
|
24
|
+
refresh: Flags.boolean({ description: "Re-fetch the matched resource via GET /resources/{id}." }),
|
|
24
25
|
};
|
|
26
|
+
/** Product kind this details command is scoped to. vds/gpu/instant-metal
|
|
27
|
+
* subclass and override so `synteq vds details <gpu-id>` refuses to serve
|
|
28
|
+
* a GPU as a VDS. */
|
|
29
|
+
matchesKind() {
|
|
30
|
+
return "vps";
|
|
31
|
+
}
|
|
25
32
|
async run() {
|
|
26
33
|
await this.initClients();
|
|
27
34
|
const { args, flags } = await this.parse(this.ctor);
|
|
28
35
|
const isTty = process.stdout.isTTY && process.stdin.isTTY;
|
|
29
36
|
try {
|
|
30
|
-
const
|
|
37
|
+
const wantKind = this.matchesKind();
|
|
38
|
+
const raw = await this.clients.api.virtualized.list(flags.project);
|
|
39
|
+
const all = raw.filter((r) => r.kind === wantKind);
|
|
31
40
|
if (all.length === 0) {
|
|
32
|
-
this.error("No
|
|
41
|
+
this.error("No resources.", { exit: 1 });
|
|
33
42
|
}
|
|
34
43
|
let chosen;
|
|
35
44
|
if (!args.id) {
|
|
@@ -39,24 +48,27 @@ export default class ResourceDetails extends BaseCommand {
|
|
|
39
48
|
chosen = await this.pickFrom(all, "Pick a Resource");
|
|
40
49
|
}
|
|
41
50
|
else {
|
|
42
|
-
const matches =
|
|
51
|
+
const matches = resolveResource(all, args.id);
|
|
43
52
|
if (matches.length === 0) {
|
|
44
|
-
this.error(`No
|
|
53
|
+
this.error(`No resource matches "${args.id}". Run \`synteq vps list\` (or vds/gpu/instant-metal list) to see ids.`, { exit: 1 });
|
|
45
54
|
}
|
|
46
55
|
if (matches.length === 1) {
|
|
47
56
|
chosen = matches[0];
|
|
48
57
|
}
|
|
49
58
|
else if (!isTty || this.outputFormat === "json") {
|
|
50
|
-
this.error(`"${args.id}" matched ${matches.length}
|
|
59
|
+
this.error(`"${args.id}" matched ${matches.length} resources. Refine the query or use a full id.`, { exit: 1 });
|
|
51
60
|
}
|
|
52
61
|
else {
|
|
53
62
|
chosen = await this.pickFrom(matches, `"${args.id}" matched ${matches.length} — pick one`);
|
|
54
63
|
}
|
|
55
64
|
}
|
|
56
65
|
if (flags.refresh) {
|
|
57
|
-
chosen = await this.clients.api.
|
|
66
|
+
chosen = await this.clients.api.virtualized.get(chosen.id);
|
|
67
|
+
if (chosen.kind !== wantKind) {
|
|
68
|
+
this.error(`Resource ${chosen.id} is a ${chosen.kind}, not a ${wantKind} — use the matching command.`, { exit: 1 });
|
|
69
|
+
}
|
|
58
70
|
}
|
|
59
|
-
this.emit(chosen, () => this.log(
|
|
71
|
+
this.emit(chosen, () => this.log(formatResourceDetail(chosen)));
|
|
60
72
|
}
|
|
61
73
|
catch (err) {
|
|
62
74
|
this.fail(err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"details.js","sourceRoot":"","sources":["../../../src/commands/vps/details.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"details.js","sourceRoot":"","sources":["../../../src/commands/vps/details.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { BaseCommand } from "../../../base/command.js";
|
|
2
2
|
export default class ResourceIpAdd extends BaseCommand {
|
|
3
3
|
static description: string;
|
|
4
|
+
static apiKeyScope: string;
|
|
4
5
|
static examples: string[];
|
|
5
6
|
static args: {
|
|
6
7
|
id: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Args, Flags } from "@oclif/core";
|
|
2
2
|
import open from "open";
|
|
3
3
|
import { BaseCommand } from "../../../base/command.js";
|
|
4
|
-
import {
|
|
4
|
+
import { resolveResourceId } from "../../../ui/resource-resolve.js";
|
|
5
5
|
import { confirmDestructive, yesRequiredMessage } from "../../../ui/confirm.js";
|
|
6
6
|
import { isInteractive, panel, summary } from "../../../ui/wizard.js";
|
|
7
7
|
import { pickPayment } from "../../../ui/payment.js";
|
|
@@ -14,6 +14,7 @@ export default class ResourceIpAdd extends BaseCommand {
|
|
|
14
14
|
"confirmation on a TTY (default No). When stdout is piped, pass --yes",
|
|
15
15
|
"or the command exits 1 without charging anything.",
|
|
16
16
|
].join("\n");
|
|
17
|
+
static apiKeyScope = "none";
|
|
17
18
|
static examples = [
|
|
18
19
|
"<%= config.bin %> vps ip add 019e... # 1 IP, prompts for payment + confirm",
|
|
19
20
|
"<%= config.bin %> vps ip add 019e... --quantity 2 --payment-method 019f... --yes",
|
|
@@ -53,17 +54,18 @@ export default class ResourceIpAdd extends BaseCommand {
|
|
|
53
54
|
const { args, flags } = await this.parse(this.ctor);
|
|
54
55
|
const interactive = isInteractive() && this.outputFormat === "table";
|
|
55
56
|
try {
|
|
56
|
-
const
|
|
57
|
+
const resourceId = await resolveResourceId(this.clients.api, args.id);
|
|
57
58
|
if (!flags.yes && !isInteractive()) {
|
|
58
|
-
this.
|
|
59
|
+
const cmd = (this.id ?? "vps:ip:add").replaceAll(":", " ");
|
|
60
|
+
this.error(yesRequiredMessage(`\`${cmd}\` (charges a payment method)`), { exit: 1 });
|
|
59
61
|
}
|
|
60
62
|
if (!interactive && !flags["payment-method"] && !flags["apply-credits"]) {
|
|
61
63
|
this.error("Provide --payment-method <id> or --apply-credits.", { exit: 1 });
|
|
62
64
|
}
|
|
63
65
|
const [catalog, vps, addons] = await Promise.all([
|
|
64
|
-
this.clients.api.
|
|
65
|
-
this.clients.api.
|
|
66
|
-
this.clients.api.
|
|
66
|
+
this.clients.api.orders.catalog(),
|
|
67
|
+
this.clients.api.virtualized.get(resourceId),
|
|
68
|
+
this.clients.api.virtualizedAddons.list(resourceId).catch(() => []),
|
|
67
69
|
]);
|
|
68
70
|
const settings = catalog.addons?.find((a) => a.addon_type === "extra_ip");
|
|
69
71
|
if (!settings) {
|
|
@@ -97,7 +99,7 @@ export default class ResourceIpAdd extends BaseCommand {
|
|
|
97
99
|
api: this.clients.api,
|
|
98
100
|
tokens: this.clients.tokens,
|
|
99
101
|
config: this.clients.config,
|
|
100
|
-
flow: "
|
|
102
|
+
flow: "virtualized_addon",
|
|
101
103
|
estimatedCost: chargedToday,
|
|
102
104
|
prefill: {
|
|
103
105
|
paymentMethodId: flags["payment-method"],
|
|
@@ -115,7 +117,7 @@ export default class ResourceIpAdd extends BaseCommand {
|
|
|
115
117
|
return;
|
|
116
118
|
}
|
|
117
119
|
}
|
|
118
|
-
const result = await this.clients.api.
|
|
120
|
+
const result = await this.clients.api.virtualizedAddons.attach(resourceId, {
|
|
119
121
|
addon_type: "extra_ip",
|
|
120
122
|
count: flags.quantity,
|
|
121
123
|
billing_mode: billingMode,
|
|
@@ -126,7 +128,7 @@ export default class ResourceIpAdd extends BaseCommand {
|
|
|
126
128
|
if (result.status === "succeeded" && reportedAddons.length === 0) {
|
|
127
129
|
try {
|
|
128
130
|
const before = new Set(addons.filter((a) => a.addon_type === "extra_ip").map((a) => a.id));
|
|
129
|
-
const now = await this.clients.api.
|
|
131
|
+
const now = await this.clients.api.virtualizedAddons.list(resourceId);
|
|
130
132
|
const fresh = now.filter((a) => a.addon_type === "extra_ip" && !before.has(a.id));
|
|
131
133
|
if (fresh.length > 0) {
|
|
132
134
|
reportedAddons = fresh.map((a) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../src/commands/vps/ip/add.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../src/commands/vps/ip/add.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { BaseCommand } from "../../../base/command.js";
|
|
2
2
|
export default class ResourceIpList extends BaseCommand {
|
|
3
3
|
static description: string;
|
|
4
|
+
static apiKeyScope: string;
|
|
4
5
|
static examples: string[];
|
|
5
6
|
static args: {
|
|
6
7
|
id: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Args } from "@oclif/core";
|
|
2
2
|
import { BaseCommand } from "../../../base/command.js";
|
|
3
|
-
import {
|
|
3
|
+
import { resolveResourceId } from "../../../ui/resource-resolve.js";
|
|
4
4
|
import { renderTable, shortId } from "../../../ui/table.js";
|
|
5
5
|
import { ApiError } from "../../../api/errors.js";
|
|
6
6
|
export default class ResourceIpList extends BaseCommand {
|
|
7
7
|
static description = "List a Resource's IP addresses, extra-IP add-ons, and add-ons awaiting payment.";
|
|
8
|
+
static apiKeyScope = "read:vps";
|
|
8
9
|
static examples = [
|
|
9
10
|
"<%= config.bin %> vps ip list 019e...",
|
|
10
11
|
"<%= config.bin %> vps ip list 019e... -o json # {ips, addons, pending_addons}",
|
|
@@ -19,14 +20,14 @@ export default class ResourceIpList extends BaseCommand {
|
|
|
19
20
|
await this.initClients();
|
|
20
21
|
const { args } = await this.parse(this.ctor);
|
|
21
22
|
try {
|
|
22
|
-
const
|
|
23
|
+
const resourceId = await resolveResourceId(this.clients.api, args.id);
|
|
23
24
|
const [vps, allAddons] = await Promise.all([
|
|
24
|
-
this.clients.api.
|
|
25
|
-
this.clients.api.
|
|
25
|
+
this.clients.api.virtualized.get(resourceId),
|
|
26
|
+
this.clients.api.virtualizedAddons.list(resourceId),
|
|
26
27
|
]);
|
|
27
28
|
let pending = null;
|
|
28
29
|
try {
|
|
29
|
-
pending = await this.clients.api.
|
|
30
|
+
pending = await this.clients.api.virtualizedAddons.pending(resourceId);
|
|
30
31
|
}
|
|
31
32
|
catch (err) {
|
|
32
33
|
if (!(err instanceof ApiError && err.status === 403))
|
|
@@ -35,7 +36,7 @@ export default class ResourceIpList extends BaseCommand {
|
|
|
35
36
|
const addons = allAddons.filter((a) => a.addon_type === "extra_ip");
|
|
36
37
|
const pendingIp = pending?.filter((p) => p.addon_type === "extra_ip") ?? null;
|
|
37
38
|
const payload = {
|
|
38
|
-
|
|
39
|
+
resource_id: vps.id,
|
|
39
40
|
hostname: vps.hostname,
|
|
40
41
|
ips: vps.ip_addresses ?? [],
|
|
41
42
|
addons,
|