diff --git a/packages/cli/src/lib/commands/hub.ts b/packages/cli/src/lib/commands/hub.ts index a02cc749c..79a7f0934 100644 --- a/packages/cli/src/lib/commands/hub.ts +++ b/packages/cli/src/lib/commands/hub.ts @@ -34,7 +34,7 @@ export const hub: CommandDefinition = (program) => { .action(async (id: string) => { const space = sessionConfig.lastSpaceId; const managerClient = getMiddlewareClient().getManagerClient(space); - const hosts = await managerClient.getHosts(); + const hosts = (await managerClient.getHosts()).data; const host = hosts.find((h: any) => h.id === id); if (!host) { diff --git a/packages/cli/src/lib/helpers/various.ts b/packages/cli/src/lib/helpers/various.ts index 78a59faca..7594d90e4 100644 --- a/packages/cli/src/lib/helpers/various.ts +++ b/packages/cli/src/lib/helpers/various.ts @@ -5,7 +5,7 @@ import { getMiddlewareClient } from "../platform"; export async function getInfo() { const { lastSpaceId: space, lastHubId: id } = sessionConfig.get(); const managerClient = getMiddlewareClient().getManagerClient(space); - const hosts = await managerClient.getHosts(); + const hosts = (await managerClient.getHosts()).data; const host = hosts.find((h: any) => h.id === id); return { managerClient, host, hosts }; diff --git a/packages/cli/src/lib/platform/common.ts b/packages/cli/src/lib/platform/common.ts index 2f58017de..5dd931ca4 100644 --- a/packages/cli/src/lib/platform/common.ts +++ b/packages/cli/src/lib/platform/common.ts @@ -64,7 +64,7 @@ export const setPlatformDefaults = async () => { const selectedManager = managers[0]; const managerClient = middlewareClient.getManagerClient(selectedManager.id); - const hosts = await managerClient.getHosts(); + const hosts = (await managerClient.getHosts()).data; if (!hosts.length) return false; diff --git a/packages/manager-api-client/src/manager-client.ts b/packages/manager-api-client/src/manager-client.ts index 383b84981..713fc867f 100644 --- a/packages/manager-api-client/src/manager-client.ts +++ b/packages/manager-api-client/src/manager-client.ts @@ -23,7 +23,7 @@ export class ManagerClient implements ClientProvider { } async getHosts() { - return this.client.get("list"); + return this.client.get("list"); } async getVersion(): Promise { diff --git a/packages/runner/src/runner.ts b/packages/runner/src/runner.ts index 358696556..c4cf5cf8e 100644 --- a/packages/runner/src/runner.ts +++ b/packages/runner/src/runner.ts @@ -442,7 +442,7 @@ export class Runner implements IComponent { this.emitter, runner, hostApiClient as HostClient, - managerApiClient as ManagerClient, + managerApiClient, this.instanceId ); this._context.logger.pipe(this.logger); diff --git a/packages/types/src/manager-api-client/manager-client.ts b/packages/types/src/manager-api-client/manager-client.ts index d36fa277b..63e93d1b5 100644 --- a/packages/types/src/manager-api-client/manager-client.ts +++ b/packages/types/src/manager-api-client/manager-client.ts @@ -1,6 +1,6 @@ /// -import { MRestAPI } from ".."; +import * as MRestAPI from "../rest-api-manager"; import * as STHRestAPI from "../rest-api-sth"; import { PublicSTHConfiguration } from "../sth-configuration"; @@ -13,14 +13,14 @@ export declare class ManagerClient { constructor(apiBase: string, utils: ClientUtils | undefined); getHostClient(id: string, hostApiBase: string): import("../api-client/host-client").HostClient; - getHosts(): Promise; + getHosts(): Promise; getVersion(): Promise; sendNamedData(topic: string, stream: Parameters[1], requestInit?: RequestInit, contentType?: string, end?: boolean): Promise; getNamedData(topic: string, requestInit?: RequestInit): ReturnType; getLogStream(requestInit?: RequestInit): ReturnType; getAuditStream(requestInit?: RequestInit): ReturnType; getConfig(): Promise; - getSequences(sequenceId: string): Promise; + getSequences(): Promise; getInstances(): Promise; getTopics(): Promise; } diff --git a/packages/types/src/rest-api-manager/common.ts b/packages/types/src/rest-api-manager/common.ts index f958bd3fe..24b828f71 100644 --- a/packages/types/src/rest-api-manager/common.ts +++ b/packages/types/src/rest-api-manager/common.ts @@ -22,3 +22,9 @@ export type HealthCheckInfo = { [key: string]: boolean; }; } + +export type Pagination = { + pagination: { + total: number + } +} diff --git a/packages/types/src/rest-api-manager/get-instances.ts b/packages/types/src/rest-api-manager/get-instances.ts index c51b12af8..8c867eae9 100644 --- a/packages/types/src/rest-api-manager/get-instances.ts +++ b/packages/types/src/rest-api-manager/get-instances.ts @@ -1,3 +1,4 @@ import { GetInstanceResponse } from "../rest-api-sth"; +import { Pagination } from "./common"; -export type GetInstancesResponse = GetInstanceResponse[]; +export type GetInstancesResponse = Pagination & { data: GetInstanceResponse[]}; diff --git a/packages/types/src/rest-api-manager/get-list.ts b/packages/types/src/rest-api-manager/get-list.ts index 6b98bf649..6a64e315e 100644 --- a/packages/types/src/rest-api-manager/get-list.ts +++ b/packages/types/src/rest-api-manager/get-list.ts @@ -1,15 +1,17 @@ -import { ConnectedSTHInfoDetails } from "./common"; +import { ConnectedSTHInfoDetails, Pagination } from "./common"; -export type GetListResponse = { - id: string, - info: ConnectedSTHInfoDetails, - healthy: boolean, - selfHosted: boolean, - isConnectionActive: boolean, - description?: string, - tags?: string[], - disconnectReason?: string, - topics : string[], - sequences: string[], - instances: string[], -}[] +export type GetListResponse = Pagination & { + data: { + id: string, + info: ConnectedSTHInfoDetails, + healthy: boolean, + selfHosted: boolean, + isConnectionActive: boolean, + description?: string, + tags?: string[], + disconnectReason?: string, + topics : string[], + sequences: string[], + instances: string[], + }[] +} diff --git a/packages/types/src/rest-api-manager/get-sequences.ts b/packages/types/src/rest-api-manager/get-sequences.ts index 91d579029..7f1fe7754 100644 --- a/packages/types/src/rest-api-manager/get-sequences.ts +++ b/packages/types/src/rest-api-manager/get-sequences.ts @@ -1,3 +1,4 @@ +import { Pagination } from "./common"; import { GetSequenceResponse } from "./get-sequence"; -export type GetSequencesResponse = GetSequenceResponse[]; +export type GetSequencesResponse = Pagination & { data: GetSequenceResponse[]}