change listServers to getAllServers and updated proto including GetSe…

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<types.Server[]>((resolve, reject) => {
-        tshd.listServers(req, (err, response) => {
+        tshd.getAllServers(req, (err, response) => {
           if (err) {
             reject(err);
           } else {

packages/teleterm/src/services/tshd/fixtures/mocks.ts

@@ -22,7 +22,7 @@ export class MockTshClient implements TshClient {
   listKubes: (clusterUri: string) => Promise<Kube[]>;
   listDatabases: (clusterUri: string) => Promise<Database[]>;
   listDatabaseUsers: (dbUri: string) => Promise<string[]>;
-  listServers: (clusterUri: string) => Promise<Server[]>;
+  getAllServers: (clusterUri: string) => Promise<Server[]>;
   createAbortController: () => TshAbortController;
   addRootCluster: (addr: string) => Promise<Cluster>;
 

packages/teleterm/src/services/tshd/types.ts

@@ -55,7 +55,7 @@ export type TshClient = {
   listKubes: (clusterUri: string) => Promise<Kube[]>;
   listDatabases: (clusterUri: string) => Promise<Database[]>;
   listDatabaseUsers: (dbUri: string) => Promise<string[]>;
-  listServers: (clusterUri: string) => Promise<Server[]>;
+  getAllServers: (clusterUri: string) => Promise<Server[]>;
   createAbortController: () => TshAbortController;
   addRootCluster: (addr: string) => Promise<Cluster>;
 

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<grpc.UntypedServiceImplementation> {
     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<v1_service_pb.ListDatabaseUsersResponse>;
     responseDeserialize: grpc.deserialize<v1_service_pb.ListDatabaseUsersResponse>;
 }
-interface ITerminalServiceService_IListServers extends grpc.MethodDefinition<v1_service_pb.ListServersRequest, v1_service_pb.ListServersResponse> {
-    path: "/teleport.terminal.v1.TerminalService/ListServers";
+interface ITerminalServiceService_IGetAllServers extends grpc.MethodDefinition<v1_service_pb.GetAllServersRequest, v1_service_pb.GetAllServersResponse> {
+    path: "/teleport.terminal.v1.TerminalService/GetAllServers";
+    requestStream: false;
+    responseStream: false;
+    requestSerialize: grpc.serialize<v1_service_pb.GetAllServersRequest>;
+    requestDeserialize: grpc.deserialize<v1_service_pb.GetAllServersRequest>;
+    responseSerialize: grpc.serialize<v1_service_pb.GetAllServersResponse>;
+    responseDeserialize: grpc.deserialize<v1_service_pb.GetAllServersResponse>;
+}
+interface ITerminalServiceService_IGetServers extends grpc.MethodDefinition<v1_service_pb.GetServersRequest, v1_service_pb.GetServersResponse> {
+    path: "/teleport.terminal.v1.TerminalService/GetServers";
     requestStream: false;
     responseStream: false;
-    requestSerialize: grpc.serialize<v1_service_pb.ListServersRequest>;
-    requestDeserialize: grpc.deserialize<v1_service_pb.ListServersRequest>;
-    responseSerialize: grpc.serialize<v1_service_pb.ListServersResponse>;
-    responseDeserialize: grpc.deserialize<v1_service_pb.ListServersResponse>;
+    requestSerialize: grpc.serialize<v1_service_pb.GetServersRequest>;
+    requestDeserialize: grpc.deserialize<v1_service_pb.GetServersRequest>;
+    responseSerialize: grpc.serialize<v1_service_pb.GetServersResponse>;
+    responseDeserialize: grpc.deserialize<v1_service_pb.GetServersResponse>;
 }
 interface ITerminalServiceService_IListKubes extends grpc.MethodDefinition<v1_service_pb.ListKubesRequest, v1_service_pb.ListKubesResponse> {
     path: "/teleport.terminal.v1.TerminalService/ListKubes";
@@ -226,7 +235,8 @@ export interface ITerminalServiceServer {
     listLeafClusters: grpc.handleUnaryCall<v1_service_pb.ListLeafClustersRequest, v1_service_pb.ListClustersResponse>;
     listDatabases: grpc.handleUnaryCall<v1_service_pb.ListDatabasesRequest, v1_service_pb.ListDatabasesResponse>;
     listDatabaseUsers: grpc.handleUnaryCall<v1_service_pb.ListDatabaseUsersRequest, v1_service_pb.ListDatabaseUsersResponse>;
-    listServers: grpc.handleUnaryCall<v1_service_pb.ListServersRequest, v1_service_pb.ListServersResponse>;
+    getAllServers: grpc.handleUnaryCall<v1_service_pb.GetAllServersRequest, v1_service_pb.GetAllServersResponse>;
+    getServers: grpc.handleUnaryCall<v1_service_pb.GetServersRequest, v1_service_pb.GetServersResponse>;
     listKubes: grpc.handleUnaryCall<v1_service_pb.ListKubesRequest, v1_service_pb.ListKubesResponse>;
     listApps: grpc.handleUnaryCall<v1_service_pb.ListAppsRequest, v1_service_pb.ListAppsResponse>;
     addCluster: grpc.handleUnaryCall<v1_service_pb.AddClusterRequest, v1_cluster_pb.Cluster>;
@@ -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<grpc.CallOptions>, 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<grpc.CallOptions>, 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<grpc.CallOptions>, 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<grpc.CallOptions>, 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<grpc.CallOptions>, 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<grpc.CallOptions>, 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<grpc.CallOptions>, 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<grpc.CallOptions>, 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<grpc.CallOptions>, 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<grpc.CallOptions>, callback: (error: grpc.ServiceError | null, response: v1_service_pb.ListKubesResponse) => void): grpc.ClientUnaryCall;

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: {