From 5c6fb6790ab7c785ef2858eed62ac37a3fafed22 Mon Sep 17 00:00:00 2001 From: Michael Myers Date: Tue, 30 Aug 2022 12:35:34 -0500 Subject: [PATCH] change listServers to getAllServers and updated proto including GetServers --- .../src/services/tshd/createClient.ts | 6 +- .../src/services/tshd/fixtures/mocks.ts | 2 +- packages/teleterm/src/services/tshd/types.ts | 2 +- .../src/services/tshd/v1/service_grpc_pb.d.ts | 50 +- .../src/services/tshd/v1/service_grpc_pb.js | 101 ++- .../src/services/tshd/v1/service_pb.d.ts | 113 ++- .../src/services/tshd/v1/service_pb.js | 684 ++++++++++++++++-- .../services/clusters/clustersService.test.ts | 16 +- .../ui/services/clusters/clustersService.ts | 2 +- 9 files changed, 836 insertions(+), 140 deletions(-) diff --git a/packages/teleterm/src/services/tshd/createClient.ts b/packages/teleterm/src/services/tshd/createClient.ts index d92c686fe..843e67da4 100644 --- a/packages/teleterm/src/services/tshd/createClient.ts +++ b/packages/teleterm/src/services/tshd/createClient.ts @@ -125,10 +125,10 @@ export default function createClient( }); }, - async listServers(clusterUri: string) { - const req = new api.ListServersRequest().setClusterUri(clusterUri); + async getAllServers(clusterUri: string) { + const req = new api.GetAllServersRequest().setClusterUri(clusterUri); return new Promise((resolve, reject) => { - tshd.listServers(req, (err, response) => { + tshd.getAllServers(req, (err, response) => { if (err) { reject(err); } else { diff --git a/packages/teleterm/src/services/tshd/fixtures/mocks.ts b/packages/teleterm/src/services/tshd/fixtures/mocks.ts index 2bc2281de..23af188bc 100644 --- a/packages/teleterm/src/services/tshd/fixtures/mocks.ts +++ b/packages/teleterm/src/services/tshd/fixtures/mocks.ts @@ -22,7 +22,7 @@ export class MockTshClient implements TshClient { listKubes: (clusterUri: string) => Promise; listDatabases: (clusterUri: string) => Promise; listDatabaseUsers: (dbUri: string) => Promise; - listServers: (clusterUri: string) => Promise; + getAllServers: (clusterUri: string) => Promise; createAbortController: () => TshAbortController; addRootCluster: (addr: string) => Promise; diff --git a/packages/teleterm/src/services/tshd/types.ts b/packages/teleterm/src/services/tshd/types.ts index 90cbee954..d15303d47 100644 --- a/packages/teleterm/src/services/tshd/types.ts +++ b/packages/teleterm/src/services/tshd/types.ts @@ -55,7 +55,7 @@ export type TshClient = { listKubes: (clusterUri: string) => Promise; listDatabases: (clusterUri: string) => Promise; listDatabaseUsers: (dbUri: string) => Promise; - listServers: (clusterUri: string) => Promise; + getAllServers: (clusterUri: string) => Promise; createAbortController: () => TshAbortController; addRootCluster: (addr: string) => Promise; diff --git a/packages/teleterm/src/services/tshd/v1/service_grpc_pb.d.ts b/packages/teleterm/src/services/tshd/v1/service_grpc_pb.d.ts index 727542d80..be94f6957 100644 --- a/packages/teleterm/src/services/tshd/v1/service_grpc_pb.d.ts +++ b/packages/teleterm/src/services/tshd/v1/service_grpc_pb.d.ts @@ -6,21 +6,21 @@ import * as grpc from "grpc"; import * as v1_service_pb from "../v1/service_pb"; -import * as google_protobuf_empty_pb from "google-protobuf/google/protobuf/empty_pb"; +import * as v1_app_pb from "../v1/app_pb"; +import * as v1_auth_settings_pb from "../v1/auth_settings_pb"; import * as v1_cluster_pb from "../v1/cluster_pb"; import * as v1_database_pb from "../v1/database_pb"; import * as v1_gateway_pb from "../v1/gateway_pb"; import * as v1_kube_pb from "../v1/kube_pb"; -import * as v1_app_pb from "../v1/app_pb"; import * as v1_server_pb from "../v1/server_pb"; -import * as v1_auth_settings_pb from "../v1/auth_settings_pb"; interface ITerminalServiceService extends grpc.ServiceDefinition { listRootClusters: ITerminalServiceService_IListRootClusters; listLeafClusters: ITerminalServiceService_IListLeafClusters; listDatabases: ITerminalServiceService_IListDatabases; listDatabaseUsers: ITerminalServiceService_IListDatabaseUsers; - listServers: ITerminalServiceService_IListServers; + getAllServers: ITerminalServiceService_IGetAllServers; + getServers: ITerminalServiceService_IGetServers; listKubes: ITerminalServiceService_IListKubes; listApps: ITerminalServiceService_IListApps; addCluster: ITerminalServiceService_IAddCluster; @@ -74,14 +74,23 @@ interface ITerminalServiceService_IListDatabaseUsers extends grpc.MethodDefiniti responseSerialize: grpc.serialize; responseDeserialize: grpc.deserialize; } -interface ITerminalServiceService_IListServers extends grpc.MethodDefinition { - path: "/teleport.terminal.v1.TerminalService/ListServers"; +interface ITerminalServiceService_IGetAllServers extends grpc.MethodDefinition { + path: "/teleport.terminal.v1.TerminalService/GetAllServers"; + requestStream: false; + responseStream: false; + requestSerialize: grpc.serialize; + requestDeserialize: grpc.deserialize; + responseSerialize: grpc.serialize; + responseDeserialize: grpc.deserialize; +} +interface ITerminalServiceService_IGetServers extends grpc.MethodDefinition { + path: "/teleport.terminal.v1.TerminalService/GetServers"; requestStream: false; responseStream: false; - requestSerialize: grpc.serialize; - requestDeserialize: grpc.deserialize; - responseSerialize: grpc.serialize; - responseDeserialize: grpc.deserialize; + requestSerialize: grpc.serialize; + requestDeserialize: grpc.deserialize; + responseSerialize: grpc.serialize; + responseDeserialize: grpc.deserialize; } interface ITerminalServiceService_IListKubes extends grpc.MethodDefinition { path: "/teleport.terminal.v1.TerminalService/ListKubes"; @@ -226,7 +235,8 @@ export interface ITerminalServiceServer { listLeafClusters: grpc.handleUnaryCall; listDatabases: grpc.handleUnaryCall; listDatabaseUsers: grpc.handleUnaryCall; - listServers: grpc.handleUnaryCall; + getAllServers: grpc.handleUnaryCall; + getServers: grpc.handleUnaryCall; listKubes: grpc.handleUnaryCall; listApps: grpc.handleUnaryCall; addCluster: grpc.handleUnaryCall; @@ -257,9 +267,12 @@ export interface ITerminalServiceClient { listDatabaseUsers(request: v1_service_pb.ListDatabaseUsersRequest, callback: (error: grpc.ServiceError | null, response: v1_service_pb.ListDatabaseUsersResponse) => void): grpc.ClientUnaryCall; listDatabaseUsers(request: v1_service_pb.ListDatabaseUsersRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: v1_service_pb.ListDatabaseUsersResponse) => void): grpc.ClientUnaryCall; listDatabaseUsers(request: v1_service_pb.ListDatabaseUsersRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: v1_service_pb.ListDatabaseUsersResponse) => void): grpc.ClientUnaryCall; - listServers(request: v1_service_pb.ListServersRequest, callback: (error: grpc.ServiceError | null, response: v1_service_pb.ListServersResponse) => void): grpc.ClientUnaryCall; - listServers(request: v1_service_pb.ListServersRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: v1_service_pb.ListServersResponse) => void): grpc.ClientUnaryCall; - listServers(request: v1_service_pb.ListServersRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: v1_service_pb.ListServersResponse) => void): grpc.ClientUnaryCall; + getAllServers(request: v1_service_pb.GetAllServersRequest, callback: (error: grpc.ServiceError | null, response: v1_service_pb.GetAllServersResponse) => void): grpc.ClientUnaryCall; + getAllServers(request: v1_service_pb.GetAllServersRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: v1_service_pb.GetAllServersResponse) => void): grpc.ClientUnaryCall; + getAllServers(request: v1_service_pb.GetAllServersRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: v1_service_pb.GetAllServersResponse) => void): grpc.ClientUnaryCall; + getServers(request: v1_service_pb.GetServersRequest, callback: (error: grpc.ServiceError | null, response: v1_service_pb.GetServersResponse) => void): grpc.ClientUnaryCall; + getServers(request: v1_service_pb.GetServersRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: v1_service_pb.GetServersResponse) => void): grpc.ClientUnaryCall; + getServers(request: v1_service_pb.GetServersRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: v1_service_pb.GetServersResponse) => void): grpc.ClientUnaryCall; listKubes(request: v1_service_pb.ListKubesRequest, callback: (error: grpc.ServiceError | null, response: v1_service_pb.ListKubesResponse) => void): grpc.ClientUnaryCall; listKubes(request: v1_service_pb.ListKubesRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: v1_service_pb.ListKubesResponse) => void): grpc.ClientUnaryCall; listKubes(request: v1_service_pb.ListKubesRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: v1_service_pb.ListKubesResponse) => void): grpc.ClientUnaryCall; @@ -321,9 +334,12 @@ export class TerminalServiceClient extends grpc.Client implements ITerminalServi public listDatabaseUsers(request: v1_service_pb.ListDatabaseUsersRequest, callback: (error: grpc.ServiceError | null, response: v1_service_pb.ListDatabaseUsersResponse) => void): grpc.ClientUnaryCall; public listDatabaseUsers(request: v1_service_pb.ListDatabaseUsersRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: v1_service_pb.ListDatabaseUsersResponse) => void): grpc.ClientUnaryCall; public listDatabaseUsers(request: v1_service_pb.ListDatabaseUsersRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: v1_service_pb.ListDatabaseUsersResponse) => void): grpc.ClientUnaryCall; - public listServers(request: v1_service_pb.ListServersRequest, callback: (error: grpc.ServiceError | null, response: v1_service_pb.ListServersResponse) => void): grpc.ClientUnaryCall; - public listServers(request: v1_service_pb.ListServersRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: v1_service_pb.ListServersResponse) => void): grpc.ClientUnaryCall; - public listServers(request: v1_service_pb.ListServersRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: v1_service_pb.ListServersResponse) => void): grpc.ClientUnaryCall; + public getAllServers(request: v1_service_pb.GetAllServersRequest, callback: (error: grpc.ServiceError | null, response: v1_service_pb.GetAllServersResponse) => void): grpc.ClientUnaryCall; + public getAllServers(request: v1_service_pb.GetAllServersRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: v1_service_pb.GetAllServersResponse) => void): grpc.ClientUnaryCall; + public getAllServers(request: v1_service_pb.GetAllServersRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: v1_service_pb.GetAllServersResponse) => void): grpc.ClientUnaryCall; + public getServers(request: v1_service_pb.GetServersRequest, callback: (error: grpc.ServiceError | null, response: v1_service_pb.GetServersResponse) => void): grpc.ClientUnaryCall; + public getServers(request: v1_service_pb.GetServersRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: v1_service_pb.GetServersResponse) => void): grpc.ClientUnaryCall; + public getServers(request: v1_service_pb.GetServersRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: v1_service_pb.GetServersResponse) => void): grpc.ClientUnaryCall; public listKubes(request: v1_service_pb.ListKubesRequest, callback: (error: grpc.ServiceError | null, response: v1_service_pb.ListKubesResponse) => void): grpc.ClientUnaryCall; public listKubes(request: v1_service_pb.ListKubesRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: v1_service_pb.ListKubesResponse) => void): grpc.ClientUnaryCall; public listKubes(request: v1_service_pb.ListKubesRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: v1_service_pb.ListKubesResponse) => void): grpc.ClientUnaryCall; diff --git a/packages/teleterm/src/services/tshd/v1/service_grpc_pb.js b/packages/teleterm/src/services/tshd/v1/service_grpc_pb.js index b2a0d8b2d..54ab48c62 100644 --- a/packages/teleterm/src/services/tshd/v1/service_grpc_pb.js +++ b/packages/teleterm/src/services/tshd/v1/service_grpc_pb.js @@ -18,14 +18,13 @@ 'use strict'; var grpc = require('@grpc/grpc-js'); var v1_service_pb = require('../v1/service_pb.js'); -var google_protobuf_empty_pb = require('google-protobuf/google/protobuf/empty_pb.js'); +var v1_app_pb = require('../v1/app_pb.js'); +var v1_auth_settings_pb = require('../v1/auth_settings_pb.js'); var v1_cluster_pb = require('../v1/cluster_pb.js'); var v1_database_pb = require('../v1/database_pb.js'); var v1_gateway_pb = require('../v1/gateway_pb.js'); var v1_kube_pb = require('../v1/kube_pb.js'); -var v1_app_pb = require('../v1/app_pb.js'); var v1_server_pb = require('../v1/server_pb.js'); -var v1_auth_settings_pb = require('../v1/auth_settings_pb.js'); function serialize_teleport_terminal_v1_AddClusterRequest(arg) { if (!(arg instanceof v1_service_pb.AddClusterRequest)) { @@ -93,6 +92,28 @@ function deserialize_teleport_terminal_v1_Gateway(buffer_arg) { return v1_gateway_pb.Gateway.deserializeBinary(new Uint8Array(buffer_arg)); } +function serialize_teleport_terminal_v1_GetAllServersRequest(arg) { + if (!(arg instanceof v1_service_pb.GetAllServersRequest)) { + throw new Error('Expected argument of type teleport.terminal.v1.GetAllServersRequest'); + } + return Buffer.from(arg.serializeBinary()); +} + +function deserialize_teleport_terminal_v1_GetAllServersRequest(buffer_arg) { + return v1_service_pb.GetAllServersRequest.deserializeBinary(new Uint8Array(buffer_arg)); +} + +function serialize_teleport_terminal_v1_GetAllServersResponse(arg) { + if (!(arg instanceof v1_service_pb.GetAllServersResponse)) { + throw new Error('Expected argument of type teleport.terminal.v1.GetAllServersResponse'); + } + return Buffer.from(arg.serializeBinary()); +} + +function deserialize_teleport_terminal_v1_GetAllServersResponse(buffer_arg) { + return v1_service_pb.GetAllServersResponse.deserializeBinary(new Uint8Array(buffer_arg)); +} + function serialize_teleport_terminal_v1_GetAuthSettingsRequest(arg) { if (!(arg instanceof v1_service_pb.GetAuthSettingsRequest)) { throw new Error('Expected argument of type teleport.terminal.v1.GetAuthSettingsRequest'); @@ -115,6 +136,28 @@ function deserialize_teleport_terminal_v1_GetClusterRequest(buffer_arg) { return v1_service_pb.GetClusterRequest.deserializeBinary(new Uint8Array(buffer_arg)); } +function serialize_teleport_terminal_v1_GetServersRequest(arg) { + if (!(arg instanceof v1_service_pb.GetServersRequest)) { + throw new Error('Expected argument of type teleport.terminal.v1.GetServersRequest'); + } + return Buffer.from(arg.serializeBinary()); +} + +function deserialize_teleport_terminal_v1_GetServersRequest(buffer_arg) { + return v1_service_pb.GetServersRequest.deserializeBinary(new Uint8Array(buffer_arg)); +} + +function serialize_teleport_terminal_v1_GetServersResponse(arg) { + if (!(arg instanceof v1_service_pb.GetServersResponse)) { + throw new Error('Expected argument of type teleport.terminal.v1.GetServersResponse'); + } + return Buffer.from(arg.serializeBinary()); +} + +function deserialize_teleport_terminal_v1_GetServersResponse(buffer_arg) { + return v1_service_pb.GetServersResponse.deserializeBinary(new Uint8Array(buffer_arg)); +} + function serialize_teleport_terminal_v1_ListAppsRequest(arg) { if (!(arg instanceof v1_service_pb.ListAppsRequest)) { throw new Error('Expected argument of type teleport.terminal.v1.ListAppsRequest'); @@ -258,28 +301,6 @@ function deserialize_teleport_terminal_v1_ListLeafClustersRequest(buffer_arg) { return v1_service_pb.ListLeafClustersRequest.deserializeBinary(new Uint8Array(buffer_arg)); } -function serialize_teleport_terminal_v1_ListServersRequest(arg) { - if (!(arg instanceof v1_service_pb.ListServersRequest)) { - throw new Error('Expected argument of type teleport.terminal.v1.ListServersRequest'); - } - return Buffer.from(arg.serializeBinary()); -} - -function deserialize_teleport_terminal_v1_ListServersRequest(buffer_arg) { - return v1_service_pb.ListServersRequest.deserializeBinary(new Uint8Array(buffer_arg)); -} - -function serialize_teleport_terminal_v1_ListServersResponse(arg) { - if (!(arg instanceof v1_service_pb.ListServersResponse)) { - throw new Error('Expected argument of type teleport.terminal.v1.ListServersResponse'); - } - return Buffer.from(arg.serializeBinary()); -} - -function deserialize_teleport_terminal_v1_ListServersResponse(buffer_arg) { - return v1_service_pb.ListServersResponse.deserializeBinary(new Uint8Array(buffer_arg)); -} - function serialize_teleport_terminal_v1_LoginPasswordlessRequest(arg) { if (!(arg instanceof v1_service_pb.LoginPasswordlessRequest)) { throw new Error('Expected argument of type teleport.terminal.v1.LoginPasswordlessRequest'); @@ -430,17 +451,29 @@ listDatabaseUsers: { responseSerialize: serialize_teleport_terminal_v1_ListDatabaseUsersResponse, responseDeserialize: deserialize_teleport_terminal_v1_ListDatabaseUsersResponse, }, - // ListServers lists servers -listServers: { - path: '/teleport.terminal.v1.TerminalService/ListServers', + // GetAllServers returns all servers +getAllServers: { + path: '/teleport.terminal.v1.TerminalService/GetAllServers', + requestStream: false, + responseStream: false, + requestType: v1_service_pb.GetAllServersRequest, + responseType: v1_service_pb.GetAllServersResponse, + requestSerialize: serialize_teleport_terminal_v1_GetAllServersRequest, + requestDeserialize: deserialize_teleport_terminal_v1_GetAllServersRequest, + responseSerialize: serialize_teleport_terminal_v1_GetAllServersResponse, + responseDeserialize: deserialize_teleport_terminal_v1_GetAllServersResponse, + }, + // GetServers returns filtered, sorted, and paginated servers +getServers: { + path: '/teleport.terminal.v1.TerminalService/GetServers', requestStream: false, responseStream: false, - requestType: v1_service_pb.ListServersRequest, - responseType: v1_service_pb.ListServersResponse, - requestSerialize: serialize_teleport_terminal_v1_ListServersRequest, - requestDeserialize: deserialize_teleport_terminal_v1_ListServersRequest, - responseSerialize: serialize_teleport_terminal_v1_ListServersResponse, - responseDeserialize: deserialize_teleport_terminal_v1_ListServersResponse, + requestType: v1_service_pb.GetServersRequest, + responseType: v1_service_pb.GetServersResponse, + requestSerialize: serialize_teleport_terminal_v1_GetServersRequest, + requestDeserialize: deserialize_teleport_terminal_v1_GetServersRequest, + responseSerialize: serialize_teleport_terminal_v1_GetServersResponse, + responseDeserialize: deserialize_teleport_terminal_v1_GetServersResponse, }, // ListKubes list kubes listKubes: { diff --git a/packages/teleterm/src/services/tshd/v1/service_pb.d.ts b/packages/teleterm/src/services/tshd/v1/service_pb.d.ts index 2b5fa0c48..e5de7531a 100644 --- a/packages/teleterm/src/services/tshd/v1/service_pb.d.ts +++ b/packages/teleterm/src/services/tshd/v1/service_pb.d.ts @@ -5,14 +5,13 @@ /* eslint-disable */ import * as jspb from "google-protobuf"; -import * as google_protobuf_empty_pb from "google-protobuf/google/protobuf/empty_pb"; +import * as v1_app_pb from "../v1/app_pb"; +import * as v1_auth_settings_pb from "../v1/auth_settings_pb"; import * as v1_cluster_pb from "../v1/cluster_pb"; import * as v1_database_pb from "../v1/database_pb"; import * as v1_gateway_pb from "../v1/gateway_pb"; import * as v1_kube_pb from "../v1/kube_pb"; -import * as v1_app_pb from "../v1/app_pb"; import * as v1_server_pb from "../v1/server_pb"; -import * as v1_auth_settings_pb from "../v1/auth_settings_pb"; export class RemoveClusterRequest extends jspb.Message { getClusterUri(): string; @@ -728,47 +727,123 @@ export namespace SetGatewayLocalPortRequest { } } -export class ListServersRequest extends jspb.Message { +export class GetAllServersRequest extends jspb.Message { + getClusterUri(): string; + setClusterUri(value: string): GetAllServersRequest; + + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): GetAllServersRequest.AsObject; + static toObject(includeInstance: boolean, msg: GetAllServersRequest): GetAllServersRequest.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: GetAllServersRequest, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): GetAllServersRequest; + static deserializeBinaryFromReader(message: GetAllServersRequest, reader: jspb.BinaryReader): GetAllServersRequest; +} + +export namespace GetAllServersRequest { + export type AsObject = { + clusterUri: string, + } +} + +export class GetAllServersResponse extends jspb.Message { + clearServersList(): void; + getServersList(): Array; + setServersList(value: Array): GetAllServersResponse; + addServers(value?: v1_server_pb.Server, index?: number): v1_server_pb.Server; + + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): GetAllServersResponse.AsObject; + static toObject(includeInstance: boolean, msg: GetAllServersResponse): GetAllServersResponse.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: GetAllServersResponse, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): GetAllServersResponse; + static deserializeBinaryFromReader(message: GetAllServersResponse, reader: jspb.BinaryReader): GetAllServersResponse; +} + +export namespace GetAllServersResponse { + export type AsObject = { + serversList: Array, + } +} + +export class GetServersRequest extends jspb.Message { getClusterUri(): string; - setClusterUri(value: string): ListServersRequest; + setClusterUri(value: string): GetServersRequest; + + getLimit(): number; + setLimit(value: number): GetServersRequest; + + getStartKey(): string; + setStartKey(value: string): GetServersRequest; + + getSearch(): string; + setSearch(value: string): GetServersRequest; + + getQuery(): string; + setQuery(value: string): GetServersRequest; + + getSortBy(): string; + setSortBy(value: string): GetServersRequest; + + getSearchAsRoles(): string; + setSearchAsRoles(value: string): GetServersRequest; serializeBinary(): Uint8Array; - toObject(includeInstance?: boolean): ListServersRequest.AsObject; - static toObject(includeInstance: boolean, msg: ListServersRequest): ListServersRequest.AsObject; + toObject(includeInstance?: boolean): GetServersRequest.AsObject; + static toObject(includeInstance: boolean, msg: GetServersRequest): GetServersRequest.AsObject; static extensions: {[key: number]: jspb.ExtensionFieldInfo}; static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; - static serializeBinaryToWriter(message: ListServersRequest, writer: jspb.BinaryWriter): void; - static deserializeBinary(bytes: Uint8Array): ListServersRequest; - static deserializeBinaryFromReader(message: ListServersRequest, reader: jspb.BinaryReader): ListServersRequest; + static serializeBinaryToWriter(message: GetServersRequest, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): GetServersRequest; + static deserializeBinaryFromReader(message: GetServersRequest, reader: jspb.BinaryReader): GetServersRequest; } -export namespace ListServersRequest { +export namespace GetServersRequest { export type AsObject = { clusterUri: string, + limit: number, + startKey: string, + search: string, + query: string, + sortBy: string, + searchAsRoles: string, } } -export class ListServersResponse extends jspb.Message { +export class GetServersResponse extends jspb.Message { clearServersList(): void; getServersList(): Array; - setServersList(value: Array): ListServersResponse; + setServersList(value: Array): GetServersResponse; addServers(value?: v1_server_pb.Server, index?: number): v1_server_pb.Server; + getTotalCount(): number; + setTotalCount(value: number): GetServersResponse; + + getStartKey(): string; + setStartKey(value: string): GetServersResponse; + serializeBinary(): Uint8Array; - toObject(includeInstance?: boolean): ListServersResponse.AsObject; - static toObject(includeInstance: boolean, msg: ListServersResponse): ListServersResponse.AsObject; + toObject(includeInstance?: boolean): GetServersResponse.AsObject; + static toObject(includeInstance: boolean, msg: GetServersResponse): GetServersResponse.AsObject; static extensions: {[key: number]: jspb.ExtensionFieldInfo}; static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; - static serializeBinaryToWriter(message: ListServersResponse, writer: jspb.BinaryWriter): void; - static deserializeBinary(bytes: Uint8Array): ListServersResponse; - static deserializeBinaryFromReader(message: ListServersResponse, reader: jspb.BinaryReader): ListServersResponse; + static serializeBinaryToWriter(message: GetServersResponse, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): GetServersResponse; + static deserializeBinaryFromReader(message: GetServersResponse, reader: jspb.BinaryReader): GetServersResponse; } -export namespace ListServersResponse { +export namespace GetServersResponse { export type AsObject = { serversList: Array, + totalCount: number, + startKey: string, } } diff --git a/packages/teleterm/src/services/tshd/v1/service_pb.js b/packages/teleterm/src/services/tshd/v1/service_pb.js index 194997a39..924831659 100644 --- a/packages/teleterm/src/services/tshd/v1/service_pb.js +++ b/packages/teleterm/src/services/tshd/v1/service_pb.js @@ -15,8 +15,10 @@ var jspb = require('google-protobuf'); var goog = jspb; var global = (function() { return this || window || global || self || Function('return this')(); }).call(null); -var google_protobuf_empty_pb = require('google-protobuf/google/protobuf/empty_pb.js'); -goog.object.extend(proto, google_protobuf_empty_pb); +var v1_app_pb = require('../v1/app_pb.js'); +goog.object.extend(proto, v1_app_pb); +var v1_auth_settings_pb = require('../v1/auth_settings_pb.js'); +goog.object.extend(proto, v1_auth_settings_pb); var v1_cluster_pb = require('../v1/cluster_pb.js'); goog.object.extend(proto, v1_cluster_pb); var v1_database_pb = require('../v1/database_pb.js'); @@ -25,18 +27,18 @@ var v1_gateway_pb = require('../v1/gateway_pb.js'); goog.object.extend(proto, v1_gateway_pb); var v1_kube_pb = require('../v1/kube_pb.js'); goog.object.extend(proto, v1_kube_pb); -var v1_app_pb = require('../v1/app_pb.js'); -goog.object.extend(proto, v1_app_pb); var v1_server_pb = require('../v1/server_pb.js'); goog.object.extend(proto, v1_server_pb); -var v1_auth_settings_pb = require('../v1/auth_settings_pb.js'); -goog.object.extend(proto, v1_auth_settings_pb); goog.exportSymbol('proto.teleport.terminal.v1.AddClusterRequest', null, global); goog.exportSymbol('proto.teleport.terminal.v1.CreateGatewayRequest', null, global); goog.exportSymbol('proto.teleport.terminal.v1.CredentialInfo', null, global); goog.exportSymbol('proto.teleport.terminal.v1.EmptyResponse', null, global); +goog.exportSymbol('proto.teleport.terminal.v1.GetAllServersRequest', null, global); +goog.exportSymbol('proto.teleport.terminal.v1.GetAllServersResponse', null, global); goog.exportSymbol('proto.teleport.terminal.v1.GetAuthSettingsRequest', null, global); goog.exportSymbol('proto.teleport.terminal.v1.GetClusterRequest', null, global); +goog.exportSymbol('proto.teleport.terminal.v1.GetServersRequest', null, global); +goog.exportSymbol('proto.teleport.terminal.v1.GetServersResponse', null, global); goog.exportSymbol('proto.teleport.terminal.v1.ListAppsRequest', null, global); goog.exportSymbol('proto.teleport.terminal.v1.ListAppsResponse', null, global); goog.exportSymbol('proto.teleport.terminal.v1.ListClustersRequest', null, global); @@ -50,8 +52,6 @@ goog.exportSymbol('proto.teleport.terminal.v1.ListGatewaysResponse', null, globa goog.exportSymbol('proto.teleport.terminal.v1.ListKubesRequest', null, global); goog.exportSymbol('proto.teleport.terminal.v1.ListKubesResponse', null, global); goog.exportSymbol('proto.teleport.terminal.v1.ListLeafClustersRequest', null, global); -goog.exportSymbol('proto.teleport.terminal.v1.ListServersRequest', null, global); -goog.exportSymbol('proto.teleport.terminal.v1.ListServersResponse', null, global); goog.exportSymbol('proto.teleport.terminal.v1.LoginPasswordlessRequest', null, global); goog.exportSymbol('proto.teleport.terminal.v1.LoginPasswordlessRequest.LoginPasswordlessCredentialResponse', null, global); goog.exportSymbol('proto.teleport.terminal.v1.LoginPasswordlessRequest.LoginPasswordlessPINResponse', null, global); @@ -688,16 +688,16 @@ if (goog.DEBUG && !COMPILED) { * @extends {jspb.Message} * @constructor */ -proto.teleport.terminal.v1.ListServersRequest = function(opt_data) { +proto.teleport.terminal.v1.GetAllServersRequest = function(opt_data) { jspb.Message.initialize(this, opt_data, 0, -1, null, null); }; -goog.inherits(proto.teleport.terminal.v1.ListServersRequest, jspb.Message); +goog.inherits(proto.teleport.terminal.v1.GetAllServersRequest, jspb.Message); if (goog.DEBUG && !COMPILED) { /** * @public * @override */ - proto.teleport.terminal.v1.ListServersRequest.displayName = 'proto.teleport.terminal.v1.ListServersRequest'; + proto.teleport.terminal.v1.GetAllServersRequest.displayName = 'proto.teleport.terminal.v1.GetAllServersRequest'; } /** * Generated by JsPbCodeGenerator. @@ -709,16 +709,58 @@ if (goog.DEBUG && !COMPILED) { * @extends {jspb.Message} * @constructor */ -proto.teleport.terminal.v1.ListServersResponse = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, proto.teleport.terminal.v1.ListServersResponse.repeatedFields_, null); +proto.teleport.terminal.v1.GetAllServersResponse = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, proto.teleport.terminal.v1.GetAllServersResponse.repeatedFields_, null); }; -goog.inherits(proto.teleport.terminal.v1.ListServersResponse, jspb.Message); +goog.inherits(proto.teleport.terminal.v1.GetAllServersResponse, jspb.Message); if (goog.DEBUG && !COMPILED) { /** * @public * @override */ - proto.teleport.terminal.v1.ListServersResponse.displayName = 'proto.teleport.terminal.v1.ListServersResponse'; + proto.teleport.terminal.v1.GetAllServersResponse.displayName = 'proto.teleport.terminal.v1.GetAllServersResponse'; +} +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.teleport.terminal.v1.GetServersRequest = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.teleport.terminal.v1.GetServersRequest, jspb.Message); +if (goog.DEBUG && !COMPILED) { + /** + * @public + * @override + */ + proto.teleport.terminal.v1.GetServersRequest.displayName = 'proto.teleport.terminal.v1.GetServersRequest'; +} +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.teleport.terminal.v1.GetServersResponse = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, proto.teleport.terminal.v1.GetServersResponse.repeatedFields_, null); +}; +goog.inherits(proto.teleport.terminal.v1.GetServersResponse, jspb.Message); +if (goog.DEBUG && !COMPILED) { + /** + * @public + * @override + */ + proto.teleport.terminal.v1.GetServersResponse.displayName = 'proto.teleport.terminal.v1.GetServersResponse'; } /** * Generated by JsPbCodeGenerator. @@ -1307,7 +1349,7 @@ proto.teleport.terminal.v1.CredentialInfo.serializeBinaryToWriter = function(mes /** - * optional string Username = 1; + * optional string username = 1; * @return {string} */ proto.teleport.terminal.v1.CredentialInfo.prototype.getUsername = function() { @@ -5281,8 +5323,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) { * http://goto/soy-param-migration * @return {!Object} */ -proto.teleport.terminal.v1.ListServersRequest.prototype.toObject = function(opt_includeInstance) { - return proto.teleport.terminal.v1.ListServersRequest.toObject(opt_includeInstance, this); +proto.teleport.terminal.v1.GetAllServersRequest.prototype.toObject = function(opt_includeInstance) { + return proto.teleport.terminal.v1.GetAllServersRequest.toObject(opt_includeInstance, this); }; @@ -5291,11 +5333,11 @@ proto.teleport.terminal.v1.ListServersRequest.prototype.toObject = function(opt_ * @param {boolean|undefined} includeInstance Deprecated. Whether to include * the JSPB instance for transitional soy proto support: * http://goto/soy-param-migration - * @param {!proto.teleport.terminal.v1.ListServersRequest} msg The msg instance to transform. + * @param {!proto.teleport.terminal.v1.GetAllServersRequest} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ -proto.teleport.terminal.v1.ListServersRequest.toObject = function(includeInstance, msg) { +proto.teleport.terminal.v1.GetAllServersRequest.toObject = function(includeInstance, msg) { var f, obj = { clusterUri: jspb.Message.getFieldWithDefault(msg, 1, "") }; @@ -5311,23 +5353,23 @@ proto.teleport.terminal.v1.ListServersRequest.toObject = function(includeInstanc /** * Deserializes binary data (in protobuf wire format). * @param {jspb.ByteSource} bytes The bytes to deserialize. - * @return {!proto.teleport.terminal.v1.ListServersRequest} + * @return {!proto.teleport.terminal.v1.GetAllServersRequest} */ -proto.teleport.terminal.v1.ListServersRequest.deserializeBinary = function(bytes) { +proto.teleport.terminal.v1.GetAllServersRequest.deserializeBinary = function(bytes) { var reader = new jspb.BinaryReader(bytes); - var msg = new proto.teleport.terminal.v1.ListServersRequest; - return proto.teleport.terminal.v1.ListServersRequest.deserializeBinaryFromReader(msg, reader); + var msg = new proto.teleport.terminal.v1.GetAllServersRequest; + return proto.teleport.terminal.v1.GetAllServersRequest.deserializeBinaryFromReader(msg, reader); }; /** * Deserializes binary data (in protobuf wire format) from the * given reader into the given message object. - * @param {!proto.teleport.terminal.v1.ListServersRequest} msg The message object to deserialize into. + * @param {!proto.teleport.terminal.v1.GetAllServersRequest} msg The message object to deserialize into. * @param {!jspb.BinaryReader} reader The BinaryReader to use. - * @return {!proto.teleport.terminal.v1.ListServersRequest} + * @return {!proto.teleport.terminal.v1.GetAllServersRequest} */ -proto.teleport.terminal.v1.ListServersRequest.deserializeBinaryFromReader = function(msg, reader) { +proto.teleport.terminal.v1.GetAllServersRequest.deserializeBinaryFromReader = function(msg, reader) { while (reader.nextField()) { if (reader.isEndGroup()) { break; @@ -5351,9 +5393,9 @@ proto.teleport.terminal.v1.ListServersRequest.deserializeBinaryFromReader = func * Serializes the message to binary data (in protobuf wire format). * @return {!Uint8Array} */ -proto.teleport.terminal.v1.ListServersRequest.prototype.serializeBinary = function() { +proto.teleport.terminal.v1.GetAllServersRequest.prototype.serializeBinary = function() { var writer = new jspb.BinaryWriter(); - proto.teleport.terminal.v1.ListServersRequest.serializeBinaryToWriter(this, writer); + proto.teleport.terminal.v1.GetAllServersRequest.serializeBinaryToWriter(this, writer); return writer.getResultBuffer(); }; @@ -5361,11 +5403,11 @@ proto.teleport.terminal.v1.ListServersRequest.prototype.serializeBinary = functi /** * Serializes the given message to binary data (in protobuf wire * format), writing to the given BinaryWriter. - * @param {!proto.teleport.terminal.v1.ListServersRequest} message + * @param {!proto.teleport.terminal.v1.GetAllServersRequest} message * @param {!jspb.BinaryWriter} writer * @suppress {unusedLocalVariables} f is only used for nested messages */ -proto.teleport.terminal.v1.ListServersRequest.serializeBinaryToWriter = function(message, writer) { +proto.teleport.terminal.v1.GetAllServersRequest.serializeBinaryToWriter = function(message, writer) { var f = undefined; f = message.getClusterUri(); if (f.length > 0) { @@ -5381,16 +5423,16 @@ proto.teleport.terminal.v1.ListServersRequest.serializeBinaryToWriter = function * optional string cluster_uri = 1; * @return {string} */ -proto.teleport.terminal.v1.ListServersRequest.prototype.getClusterUri = function() { +proto.teleport.terminal.v1.GetAllServersRequest.prototype.getClusterUri = function() { return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, "")); }; /** * @param {string} value - * @return {!proto.teleport.terminal.v1.ListServersRequest} returns this + * @return {!proto.teleport.terminal.v1.GetAllServersRequest} returns this */ -proto.teleport.terminal.v1.ListServersRequest.prototype.setClusterUri = function(value) { +proto.teleport.terminal.v1.GetAllServersRequest.prototype.setClusterUri = function(value) { return jspb.Message.setProto3StringField(this, 1, value); }; @@ -5401,7 +5443,7 @@ proto.teleport.terminal.v1.ListServersRequest.prototype.setClusterUri = function * @private {!Array} * @const */ -proto.teleport.terminal.v1.ListServersResponse.repeatedFields_ = [1]; +proto.teleport.terminal.v1.GetAllServersResponse.repeatedFields_ = [1]; @@ -5418,8 +5460,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) { * http://goto/soy-param-migration * @return {!Object} */ -proto.teleport.terminal.v1.ListServersResponse.prototype.toObject = function(opt_includeInstance) { - return proto.teleport.terminal.v1.ListServersResponse.toObject(opt_includeInstance, this); +proto.teleport.terminal.v1.GetAllServersResponse.prototype.toObject = function(opt_includeInstance) { + return proto.teleport.terminal.v1.GetAllServersResponse.toObject(opt_includeInstance, this); }; @@ -5428,11 +5470,11 @@ proto.teleport.terminal.v1.ListServersResponse.prototype.toObject = function(opt * @param {boolean|undefined} includeInstance Deprecated. Whether to include * the JSPB instance for transitional soy proto support: * http://goto/soy-param-migration - * @param {!proto.teleport.terminal.v1.ListServersResponse} msg The msg instance to transform. + * @param {!proto.teleport.terminal.v1.GetAllServersResponse} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ -proto.teleport.terminal.v1.ListServersResponse.toObject = function(includeInstance, msg) { +proto.teleport.terminal.v1.GetAllServersResponse.toObject = function(includeInstance, msg) { var f, obj = { serversList: jspb.Message.toObjectList(msg.getServersList(), v1_server_pb.Server.toObject, includeInstance) @@ -5449,23 +5491,495 @@ proto.teleport.terminal.v1.ListServersResponse.toObject = function(includeInstan /** * Deserializes binary data (in protobuf wire format). * @param {jspb.ByteSource} bytes The bytes to deserialize. - * @return {!proto.teleport.terminal.v1.ListServersResponse} + * @return {!proto.teleport.terminal.v1.GetAllServersResponse} + */ +proto.teleport.terminal.v1.GetAllServersResponse.deserializeBinary = function(bytes) { + var reader = new jspb.BinaryReader(bytes); + var msg = new proto.teleport.terminal.v1.GetAllServersResponse; + return proto.teleport.terminal.v1.GetAllServersResponse.deserializeBinaryFromReader(msg, reader); +}; + + +/** + * Deserializes binary data (in protobuf wire format) from the + * given reader into the given message object. + * @param {!proto.teleport.terminal.v1.GetAllServersResponse} msg The message object to deserialize into. + * @param {!jspb.BinaryReader} reader The BinaryReader to use. + * @return {!proto.teleport.terminal.v1.GetAllServersResponse} + */ +proto.teleport.terminal.v1.GetAllServersResponse.deserializeBinaryFromReader = function(msg, reader) { + while (reader.nextField()) { + if (reader.isEndGroup()) { + break; + } + var field = reader.getFieldNumber(); + switch (field) { + case 1: + var value = new v1_server_pb.Server; + reader.readMessage(value,v1_server_pb.Server.deserializeBinaryFromReader); + msg.addServers(value); + break; + default: + reader.skipField(); + break; + } + } + return msg; +}; + + +/** + * Serializes the message to binary data (in protobuf wire format). + * @return {!Uint8Array} + */ +proto.teleport.terminal.v1.GetAllServersResponse.prototype.serializeBinary = function() { + var writer = new jspb.BinaryWriter(); + proto.teleport.terminal.v1.GetAllServersResponse.serializeBinaryToWriter(this, writer); + return writer.getResultBuffer(); +}; + + +/** + * Serializes the given message to binary data (in protobuf wire + * format), writing to the given BinaryWriter. + * @param {!proto.teleport.terminal.v1.GetAllServersResponse} message + * @param {!jspb.BinaryWriter} writer + * @suppress {unusedLocalVariables} f is only used for nested messages + */ +proto.teleport.terminal.v1.GetAllServersResponse.serializeBinaryToWriter = function(message, writer) { + var f = undefined; + f = message.getServersList(); + if (f.length > 0) { + writer.writeRepeatedMessage( + 1, + f, + v1_server_pb.Server.serializeBinaryToWriter + ); + } +}; + + +/** + * repeated Server servers = 1; + * @return {!Array} + */ +proto.teleport.terminal.v1.GetAllServersResponse.prototype.getServersList = function() { + return /** @type{!Array} */ ( + jspb.Message.getRepeatedWrapperField(this, v1_server_pb.Server, 1)); +}; + + +/** + * @param {!Array} value + * @return {!proto.teleport.terminal.v1.GetAllServersResponse} returns this +*/ +proto.teleport.terminal.v1.GetAllServersResponse.prototype.setServersList = function(value) { + return jspb.Message.setRepeatedWrapperField(this, 1, value); +}; + + +/** + * @param {!proto.teleport.terminal.v1.Server=} opt_value + * @param {number=} opt_index + * @return {!proto.teleport.terminal.v1.Server} + */ +proto.teleport.terminal.v1.GetAllServersResponse.prototype.addServers = function(opt_value, opt_index) { + return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.teleport.terminal.v1.Server, opt_index); +}; + + +/** + * Clears the list making it empty but non-null. + * @return {!proto.teleport.terminal.v1.GetAllServersResponse} returns this + */ +proto.teleport.terminal.v1.GetAllServersResponse.prototype.clearServersList = function() { + return this.setServersList([]); +}; + + + + + +if (jspb.Message.GENERATE_TO_OBJECT) { +/** + * Creates an object representation of this proto. + * Field names that are reserved in JavaScript and will be renamed to pb_name. + * Optional fields that are not set will be set to undefined. + * To access a reserved field use, foo.pb_, eg, foo.pb_default. + * For the list of reserved names please see: + * net/proto2/compiler/js/internal/generator.cc#kKeyword. + * @param {boolean=} opt_includeInstance Deprecated. whether to include the + * JSPB instance for transitional soy proto support: + * http://goto/soy-param-migration + * @return {!Object} + */ +proto.teleport.terminal.v1.GetServersRequest.prototype.toObject = function(opt_includeInstance) { + return proto.teleport.terminal.v1.GetServersRequest.toObject(opt_includeInstance, this); +}; + + +/** + * Static version of the {@see toObject} method. + * @param {boolean|undefined} includeInstance Deprecated. Whether to include + * the JSPB instance for transitional soy proto support: + * http://goto/soy-param-migration + * @param {!proto.teleport.terminal.v1.GetServersRequest} msg The msg instance to transform. + * @return {!Object} + * @suppress {unusedLocalVariables} f is only used for nested messages + */ +proto.teleport.terminal.v1.GetServersRequest.toObject = function(includeInstance, msg) { + var f, obj = { + clusterUri: jspb.Message.getFieldWithDefault(msg, 1, ""), + limit: jspb.Message.getFieldWithDefault(msg, 2, 0), + startKey: jspb.Message.getFieldWithDefault(msg, 3, ""), + search: jspb.Message.getFieldWithDefault(msg, 4, ""), + query: jspb.Message.getFieldWithDefault(msg, 5, ""), + sortBy: jspb.Message.getFieldWithDefault(msg, 6, ""), + searchAsRoles: jspb.Message.getFieldWithDefault(msg, 7, "") + }; + + if (includeInstance) { + obj.$jspbMessageInstance = msg; + } + return obj; +}; +} + + +/** + * Deserializes binary data (in protobuf wire format). + * @param {jspb.ByteSource} bytes The bytes to deserialize. + * @return {!proto.teleport.terminal.v1.GetServersRequest} + */ +proto.teleport.terminal.v1.GetServersRequest.deserializeBinary = function(bytes) { + var reader = new jspb.BinaryReader(bytes); + var msg = new proto.teleport.terminal.v1.GetServersRequest; + return proto.teleport.terminal.v1.GetServersRequest.deserializeBinaryFromReader(msg, reader); +}; + + +/** + * Deserializes binary data (in protobuf wire format) from the + * given reader into the given message object. + * @param {!proto.teleport.terminal.v1.GetServersRequest} msg The message object to deserialize into. + * @param {!jspb.BinaryReader} reader The BinaryReader to use. + * @return {!proto.teleport.terminal.v1.GetServersRequest} + */ +proto.teleport.terminal.v1.GetServersRequest.deserializeBinaryFromReader = function(msg, reader) { + while (reader.nextField()) { + if (reader.isEndGroup()) { + break; + } + var field = reader.getFieldNumber(); + switch (field) { + case 1: + var value = /** @type {string} */ (reader.readString()); + msg.setClusterUri(value); + break; + case 2: + var value = /** @type {number} */ (reader.readInt32()); + msg.setLimit(value); + break; + case 3: + var value = /** @type {string} */ (reader.readString()); + msg.setStartKey(value); + break; + case 4: + var value = /** @type {string} */ (reader.readString()); + msg.setSearch(value); + break; + case 5: + var value = /** @type {string} */ (reader.readString()); + msg.setQuery(value); + break; + case 6: + var value = /** @type {string} */ (reader.readString()); + msg.setSortBy(value); + break; + case 7: + var value = /** @type {string} */ (reader.readString()); + msg.setSearchAsRoles(value); + break; + default: + reader.skipField(); + break; + } + } + return msg; +}; + + +/** + * Serializes the message to binary data (in protobuf wire format). + * @return {!Uint8Array} + */ +proto.teleport.terminal.v1.GetServersRequest.prototype.serializeBinary = function() { + var writer = new jspb.BinaryWriter(); + proto.teleport.terminal.v1.GetServersRequest.serializeBinaryToWriter(this, writer); + return writer.getResultBuffer(); +}; + + +/** + * Serializes the given message to binary data (in protobuf wire + * format), writing to the given BinaryWriter. + * @param {!proto.teleport.terminal.v1.GetServersRequest} message + * @param {!jspb.BinaryWriter} writer + * @suppress {unusedLocalVariables} f is only used for nested messages + */ +proto.teleport.terminal.v1.GetServersRequest.serializeBinaryToWriter = function(message, writer) { + var f = undefined; + f = message.getClusterUri(); + if (f.length > 0) { + writer.writeString( + 1, + f + ); + } + f = message.getLimit(); + if (f !== 0) { + writer.writeInt32( + 2, + f + ); + } + f = message.getStartKey(); + if (f.length > 0) { + writer.writeString( + 3, + f + ); + } + f = message.getSearch(); + if (f.length > 0) { + writer.writeString( + 4, + f + ); + } + f = message.getQuery(); + if (f.length > 0) { + writer.writeString( + 5, + f + ); + } + f = message.getSortBy(); + if (f.length > 0) { + writer.writeString( + 6, + f + ); + } + f = message.getSearchAsRoles(); + if (f.length > 0) { + writer.writeString( + 7, + f + ); + } +}; + + +/** + * optional string cluster_uri = 1; + * @return {string} + */ +proto.teleport.terminal.v1.GetServersRequest.prototype.getClusterUri = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, "")); +}; + + +/** + * @param {string} value + * @return {!proto.teleport.terminal.v1.GetServersRequest} returns this + */ +proto.teleport.terminal.v1.GetServersRequest.prototype.setClusterUri = function(value) { + return jspb.Message.setProto3StringField(this, 1, value); +}; + + +/** + * optional int32 limit = 2; + * @return {number} + */ +proto.teleport.terminal.v1.GetServersRequest.prototype.getLimit = function() { + return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 2, 0)); +}; + + +/** + * @param {number} value + * @return {!proto.teleport.terminal.v1.GetServersRequest} returns this + */ +proto.teleport.terminal.v1.GetServersRequest.prototype.setLimit = function(value) { + return jspb.Message.setProto3IntField(this, 2, value); +}; + + +/** + * optional string start_key = 3; + * @return {string} + */ +proto.teleport.terminal.v1.GetServersRequest.prototype.getStartKey = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, "")); +}; + + +/** + * @param {string} value + * @return {!proto.teleport.terminal.v1.GetServersRequest} returns this + */ +proto.teleport.terminal.v1.GetServersRequest.prototype.setStartKey = function(value) { + return jspb.Message.setProto3StringField(this, 3, value); +}; + + +/** + * optional string search = 4; + * @return {string} + */ +proto.teleport.terminal.v1.GetServersRequest.prototype.getSearch = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, "")); +}; + + +/** + * @param {string} value + * @return {!proto.teleport.terminal.v1.GetServersRequest} returns this + */ +proto.teleport.terminal.v1.GetServersRequest.prototype.setSearch = function(value) { + return jspb.Message.setProto3StringField(this, 4, value); +}; + + +/** + * optional string query = 5; + * @return {string} + */ +proto.teleport.terminal.v1.GetServersRequest.prototype.getQuery = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, "")); +}; + + +/** + * @param {string} value + * @return {!proto.teleport.terminal.v1.GetServersRequest} returns this + */ +proto.teleport.terminal.v1.GetServersRequest.prototype.setQuery = function(value) { + return jspb.Message.setProto3StringField(this, 5, value); +}; + + +/** + * optional string sort_by = 6; + * @return {string} + */ +proto.teleport.terminal.v1.GetServersRequest.prototype.getSortBy = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, "")); +}; + + +/** + * @param {string} value + * @return {!proto.teleport.terminal.v1.GetServersRequest} returns this + */ +proto.teleport.terminal.v1.GetServersRequest.prototype.setSortBy = function(value) { + return jspb.Message.setProto3StringField(this, 6, value); +}; + + +/** + * optional string search_as_roles = 7; + * @return {string} + */ +proto.teleport.terminal.v1.GetServersRequest.prototype.getSearchAsRoles = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, "")); +}; + + +/** + * @param {string} value + * @return {!proto.teleport.terminal.v1.GetServersRequest} returns this + */ +proto.teleport.terminal.v1.GetServersRequest.prototype.setSearchAsRoles = function(value) { + return jspb.Message.setProto3StringField(this, 7, value); +}; + + + +/** + * List of repeated fields within this message type. + * @private {!Array} + * @const + */ +proto.teleport.terminal.v1.GetServersResponse.repeatedFields_ = [1]; + + + +if (jspb.Message.GENERATE_TO_OBJECT) { +/** + * Creates an object representation of this proto. + * Field names that are reserved in JavaScript and will be renamed to pb_name. + * Optional fields that are not set will be set to undefined. + * To access a reserved field use, foo.pb_, eg, foo.pb_default. + * For the list of reserved names please see: + * net/proto2/compiler/js/internal/generator.cc#kKeyword. + * @param {boolean=} opt_includeInstance Deprecated. whether to include the + * JSPB instance for transitional soy proto support: + * http://goto/soy-param-migration + * @return {!Object} + */ +proto.teleport.terminal.v1.GetServersResponse.prototype.toObject = function(opt_includeInstance) { + return proto.teleport.terminal.v1.GetServersResponse.toObject(opt_includeInstance, this); +}; + + +/** + * Static version of the {@see toObject} method. + * @param {boolean|undefined} includeInstance Deprecated. Whether to include + * the JSPB instance for transitional soy proto support: + * http://goto/soy-param-migration + * @param {!proto.teleport.terminal.v1.GetServersResponse} msg The msg instance to transform. + * @return {!Object} + * @suppress {unusedLocalVariables} f is only used for nested messages + */ +proto.teleport.terminal.v1.GetServersResponse.toObject = function(includeInstance, msg) { + var f, obj = { + serversList: jspb.Message.toObjectList(msg.getServersList(), + v1_server_pb.Server.toObject, includeInstance), + totalCount: jspb.Message.getFieldWithDefault(msg, 2, 0), + startKey: jspb.Message.getFieldWithDefault(msg, 3, "") + }; + + if (includeInstance) { + obj.$jspbMessageInstance = msg; + } + return obj; +}; +} + + +/** + * Deserializes binary data (in protobuf wire format). + * @param {jspb.ByteSource} bytes The bytes to deserialize. + * @return {!proto.teleport.terminal.v1.GetServersResponse} */ -proto.teleport.terminal.v1.ListServersResponse.deserializeBinary = function(bytes) { +proto.teleport.terminal.v1.GetServersResponse.deserializeBinary = function(bytes) { var reader = new jspb.BinaryReader(bytes); - var msg = new proto.teleport.terminal.v1.ListServersResponse; - return proto.teleport.terminal.v1.ListServersResponse.deserializeBinaryFromReader(msg, reader); + var msg = new proto.teleport.terminal.v1.GetServersResponse; + return proto.teleport.terminal.v1.GetServersResponse.deserializeBinaryFromReader(msg, reader); }; /** * Deserializes binary data (in protobuf wire format) from the * given reader into the given message object. - * @param {!proto.teleport.terminal.v1.ListServersResponse} msg The message object to deserialize into. + * @param {!proto.teleport.terminal.v1.GetServersResponse} msg The message object to deserialize into. * @param {!jspb.BinaryReader} reader The BinaryReader to use. - * @return {!proto.teleport.terminal.v1.ListServersResponse} + * @return {!proto.teleport.terminal.v1.GetServersResponse} */ -proto.teleport.terminal.v1.ListServersResponse.deserializeBinaryFromReader = function(msg, reader) { +proto.teleport.terminal.v1.GetServersResponse.deserializeBinaryFromReader = function(msg, reader) { while (reader.nextField()) { if (reader.isEndGroup()) { break; @@ -5477,6 +5991,14 @@ proto.teleport.terminal.v1.ListServersResponse.deserializeBinaryFromReader = fun reader.readMessage(value,v1_server_pb.Server.deserializeBinaryFromReader); msg.addServers(value); break; + case 2: + var value = /** @type {number} */ (reader.readInt32()); + msg.setTotalCount(value); + break; + case 3: + var value = /** @type {string} */ (reader.readString()); + msg.setStartKey(value); + break; default: reader.skipField(); break; @@ -5490,9 +6012,9 @@ proto.teleport.terminal.v1.ListServersResponse.deserializeBinaryFromReader = fun * Serializes the message to binary data (in protobuf wire format). * @return {!Uint8Array} */ -proto.teleport.terminal.v1.ListServersResponse.prototype.serializeBinary = function() { +proto.teleport.terminal.v1.GetServersResponse.prototype.serializeBinary = function() { var writer = new jspb.BinaryWriter(); - proto.teleport.terminal.v1.ListServersResponse.serializeBinaryToWriter(this, writer); + proto.teleport.terminal.v1.GetServersResponse.serializeBinaryToWriter(this, writer); return writer.getResultBuffer(); }; @@ -5500,11 +6022,11 @@ proto.teleport.terminal.v1.ListServersResponse.prototype.serializeBinary = funct /** * Serializes the given message to binary data (in protobuf wire * format), writing to the given BinaryWriter. - * @param {!proto.teleport.terminal.v1.ListServersResponse} message + * @param {!proto.teleport.terminal.v1.GetServersResponse} message * @param {!jspb.BinaryWriter} writer * @suppress {unusedLocalVariables} f is only used for nested messages */ -proto.teleport.terminal.v1.ListServersResponse.serializeBinaryToWriter = function(message, writer) { +proto.teleport.terminal.v1.GetServersResponse.serializeBinaryToWriter = function(message, writer) { var f = undefined; f = message.getServersList(); if (f.length > 0) { @@ -5514,6 +6036,20 @@ proto.teleport.terminal.v1.ListServersResponse.serializeBinaryToWriter = functio v1_server_pb.Server.serializeBinaryToWriter ); } + f = message.getTotalCount(); + if (f !== 0) { + writer.writeInt32( + 2, + f + ); + } + f = message.getStartKey(); + if (f.length > 0) { + writer.writeString( + 3, + f + ); + } }; @@ -5521,7 +6057,7 @@ proto.teleport.terminal.v1.ListServersResponse.serializeBinaryToWriter = functio * repeated Server servers = 1; * @return {!Array} */ -proto.teleport.terminal.v1.ListServersResponse.prototype.getServersList = function() { +proto.teleport.terminal.v1.GetServersResponse.prototype.getServersList = function() { return /** @type{!Array} */ ( jspb.Message.getRepeatedWrapperField(this, v1_server_pb.Server, 1)); }; @@ -5529,9 +6065,9 @@ proto.teleport.terminal.v1.ListServersResponse.prototype.getServersList = functi /** * @param {!Array} value - * @return {!proto.teleport.terminal.v1.ListServersResponse} returns this + * @return {!proto.teleport.terminal.v1.GetServersResponse} returns this */ -proto.teleport.terminal.v1.ListServersResponse.prototype.setServersList = function(value) { +proto.teleport.terminal.v1.GetServersResponse.prototype.setServersList = function(value) { return jspb.Message.setRepeatedWrapperField(this, 1, value); }; @@ -5541,20 +6077,56 @@ proto.teleport.terminal.v1.ListServersResponse.prototype.setServersList = functi * @param {number=} opt_index * @return {!proto.teleport.terminal.v1.Server} */ -proto.teleport.terminal.v1.ListServersResponse.prototype.addServers = function(opt_value, opt_index) { +proto.teleport.terminal.v1.GetServersResponse.prototype.addServers = function(opt_value, opt_index) { return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.teleport.terminal.v1.Server, opt_index); }; /** * Clears the list making it empty but non-null. - * @return {!proto.teleport.terminal.v1.ListServersResponse} returns this + * @return {!proto.teleport.terminal.v1.GetServersResponse} returns this */ -proto.teleport.terminal.v1.ListServersResponse.prototype.clearServersList = function() { +proto.teleport.terminal.v1.GetServersResponse.prototype.clearServersList = function() { return this.setServersList([]); }; +/** + * optional int32 total_count = 2; + * @return {number} + */ +proto.teleport.terminal.v1.GetServersResponse.prototype.getTotalCount = function() { + return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 2, 0)); +}; + + +/** + * @param {number} value + * @return {!proto.teleport.terminal.v1.GetServersResponse} returns this + */ +proto.teleport.terminal.v1.GetServersResponse.prototype.setTotalCount = function(value) { + return jspb.Message.setProto3IntField(this, 2, value); +}; + + +/** + * optional string start_key = 3; + * @return {string} + */ +proto.teleport.terminal.v1.GetServersResponse.prototype.getStartKey = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, "")); +}; + + +/** + * @param {string} value + * @return {!proto.teleport.terminal.v1.GetServersResponse} returns this + */ +proto.teleport.terminal.v1.GetServersResponse.prototype.setStartKey = function(value) { + return jspb.Message.setProto3StringField(this, 3, value); +}; + + /** * List of repeated fields within this message type. diff --git a/packages/teleterm/src/ui/services/clusters/clustersService.test.ts b/packages/teleterm/src/ui/services/clusters/clustersService.test.ts index 08013a7f8..ab6901568 100644 --- a/packages/teleterm/src/ui/services/clusters/clustersService.test.ts +++ b/packages/teleterm/src/ui/services/clusters/clustersService.test.ts @@ -108,7 +108,7 @@ function getClientMocks(): Partial { listLeafClusters: jest.fn().mockResolvedValueOnce([]), listGateways: jest.fn().mockResolvedValueOnce([gatewayMock]), listDatabases: jest.fn().mockResolvedValueOnce([dbMock]), - listServers: jest.fn().mockResolvedValueOnce([serverMock]), + getAllServers: jest.fn().mockResolvedValueOnce([serverMock]), createGateway: jest.fn().mockResolvedValueOnce(gatewayMock), removeGateway: jest.fn().mockResolvedValueOnce(undefined), restartGateway: jest.fn().mockResolvedValueOnce(undefined), @@ -159,14 +159,14 @@ test('sync cluster and its resources', async () => { listLeafClusters, listGateways, listDatabases, - listServers, + getAllServers, } = getClientMocks(); const service = createService({ getCluster, listLeafClusters, listGateways, listDatabases, - listServers, + getAllServers, }); await service.syncRootCluster(clusterUri); @@ -174,7 +174,7 @@ test('sync cluster and its resources', async () => { expect(service.findCluster(clusterUri)).toStrictEqual(clusterMock); expect(listGateways).toHaveBeenCalledWith(); expect(listDatabases).toHaveBeenCalledWith(clusterUri); - expect(listServers).toHaveBeenCalledWith(clusterUri); + expect(getAllServers).toHaveBeenCalledWith(clusterUri); }); test('login into cluster and sync resources', async () => { @@ -196,7 +196,7 @@ test('login into cluster and sync resources', async () => { expect(client.loginLocal).toHaveBeenCalledWith(loginParams, undefined); expect(client.listGateways).toHaveBeenCalledWith(); expect(client.listDatabases).toHaveBeenCalledWith(clusterUri); - expect(client.listServers).toHaveBeenCalledWith(clusterUri); + expect(client.getAllServers).toHaveBeenCalledWith(clusterUri); expect(client.restartGateway).toHaveBeenCalledWith(gatewayMock.uri); expect(service.findCluster(clusterUri).connected).toBe(true); }); @@ -279,9 +279,9 @@ test('sync databases', async () => { }); test('sync servers', async () => { - const { listServers } = getClientMocks(); + const { getAllServers } = getClientMocks(); const service = createService({ - listServers, + getAllServers, }); service.setState(draftState => { draftState.clusters.set(clusterUri, clusterMock); @@ -289,7 +289,7 @@ test('sync servers', async () => { await service.syncServers(clusterUri); - expect(listServers).toHaveBeenCalledWith(clusterUri); + expect(getAllServers).toHaveBeenCalledWith(clusterUri); expect(service.getServers()).toStrictEqual([serverMock]); const readySyncStatus: SyncStatus = { status: 'ready' }; expect(service.getClusterSyncStatus(clusterUri).servers).toStrictEqual( diff --git a/packages/teleterm/src/ui/services/clusters/clustersService.ts b/packages/teleterm/src/ui/services/clusters/clustersService.ts index 68d077005..a063a4727 100644 --- a/packages/teleterm/src/ui/services/clusters/clustersService.ts +++ b/packages/teleterm/src/ui/services/clusters/clustersService.ts @@ -368,7 +368,7 @@ export class ClustersService extends ImmutableStore { }); try { - const received = await this.client.listServers(clusterUri); + const received = await this.client.getAllServers(clusterUri); this.setState(draft => { draft.serversSyncStatus.set(clusterUri, { status: 'ready' }); helpers.updateMap(clusterUri, draft.servers, received);