Skip to content
This repository was archived by the owner on Feb 8, 2024. It is now read-only.

change listServers to getAllServers and updated proto including GetSe… #1164

Closed
avatus wants to merge 2 commits into from
Closed

change listServers to getAllServers and updated proto including GetSe… #1164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c6fb67
change listServers to getAllServers and updated proto including GetSe…
avatus Aug 30, 2022
c56cf3b
Merge branch 'master' into michaelmyers/add-params-to-list-resources
avatus Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/teleterm/src/services/tshd/createClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packages/teleterm/src/services/tshd/fixtures/mocks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>;

Expand Down
2 changes: 1 addition & 1 deletion packages/teleterm/src/services/tshd/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>;

Expand Down
45 changes: 31 additions & 14 deletions packages/teleterm/src/services/tshd/v1/service_grpc_pb.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ interface ITerminalServiceService extends grpc.ServiceDefinition<grpc.UntypedSer
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;
Expand Down Expand Up @@ -73,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.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.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.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";
Expand Down Expand Up @@ -225,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>;
Expand Down Expand Up @@ -256,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;
Expand Down Expand Up @@ -320,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;
Expand Down
96 changes: 65 additions & 31 deletions packages/teleterm/src/services/tshd/v1/service_grpc_pb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,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');
Expand All @@ -114,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');
Expand Down Expand Up @@ -257,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');
Expand Down Expand Up @@ -429,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: {
Expand Down
Loading