Skip to content

Commit 6de82b6

Browse files
committed
Revert "Revert get param to ServiceID"
This reverts commit 49eebc7.
1 parent 8054d30 commit 6de82b6

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ const defangServiceProvider: pulumi.dynamic.ResourceProvider<
718718
id: string,
719719
olds?: DefangServiceOutputs
720720
): Promise<pulumi.dynamic.ReadResult<DefangServiceOutputs>> {
721-
const serviceId = new pb.ServiceID();
721+
const serviceId = new pb.GetRequest();
722722
// serviceId.setProject(project);
723723
serviceId.setName(id);
724724
assert(olds?.fabricDNS, "fabricDNS is required");

io/defang/v1/fabric.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ service FabricController {
2424
option deprecated = true;
2525
}; // used by pulumi-defang provider; should use Deploy
2626
rpc Deploy(DeployRequest) returns (DeployResponse);
27-
rpc Get(ServiceID) returns (ServiceInfo) {
27+
rpc Get(GetRequest) returns (ServiceInfo) {
2828
option idempotency_level = NO_SIDE_EFFECTS;
2929
}; // should be GetService
3030
rpc Delete(DeleteRequest) returns (DeleteResponse) {

protos/io/defang/v1/fabric_grpc_pb.d.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ interface IFabricControllerService extends grpc.ServiceDefinition<grpc.UntypedSe
1515
tail: grpc.MethodDefinition<io_defang_v1_fabric_pb.TailRequest, io_defang_v1_fabric_pb.TailResponse>;
1616
update: grpc.MethodDefinition<io_defang_v1_fabric_pb.Service, io_defang_v1_fabric_pb.ServiceInfo>;
1717
deploy: grpc.MethodDefinition<io_defang_v1_fabric_pb.DeployRequest, io_defang_v1_fabric_pb.DeployResponse>;
18-
get: grpc.MethodDefinition<io_defang_v1_fabric_pb.ServiceID, io_defang_v1_fabric_pb.ServiceInfo>;
18+
get: grpc.MethodDefinition<io_defang_v1_fabric_pb.GetRequest, io_defang_v1_fabric_pb.ServiceInfo>;
1919
delete: grpc.MethodDefinition<io_defang_v1_fabric_pb.DeleteRequest, io_defang_v1_fabric_pb.DeleteResponse>;
2020
destroy: grpc.MethodDefinition<io_defang_v1_fabric_pb.DestroyRequest, io_defang_v1_fabric_pb.DestroyResponse>;
2121
publish: grpc.MethodDefinition<io_defang_v1_fabric_pb.PublishRequest, google_protobuf_empty_pb.Empty>;
@@ -56,7 +56,7 @@ export interface IFabricControllerServer extends grpc.UntypedServiceImplementati
5656
tail: grpc.handleServerStreamingCall<io_defang_v1_fabric_pb.TailRequest, io_defang_v1_fabric_pb.TailResponse>;
5757
update: grpc.handleUnaryCall<io_defang_v1_fabric_pb.Service, io_defang_v1_fabric_pb.ServiceInfo>;
5858
deploy: grpc.handleUnaryCall<io_defang_v1_fabric_pb.DeployRequest, io_defang_v1_fabric_pb.DeployResponse>;
59-
get: grpc.handleUnaryCall<io_defang_v1_fabric_pb.ServiceID, io_defang_v1_fabric_pb.ServiceInfo>;
59+
get: grpc.handleUnaryCall<io_defang_v1_fabric_pb.GetRequest, io_defang_v1_fabric_pb.ServiceInfo>;
6060
delete: grpc.handleUnaryCall<io_defang_v1_fabric_pb.DeleteRequest, io_defang_v1_fabric_pb.DeleteResponse>;
6161
destroy: grpc.handleUnaryCall<io_defang_v1_fabric_pb.DestroyRequest, io_defang_v1_fabric_pb.DestroyResponse>;
6262
publish: grpc.handleUnaryCall<io_defang_v1_fabric_pb.PublishRequest, google_protobuf_empty_pb.Empty>;
@@ -109,9 +109,9 @@ export class FabricControllerClient extends grpc.Client {
109109
deploy(argument: io_defang_v1_fabric_pb.DeployRequest, callback: grpc.requestCallback<io_defang_v1_fabric_pb.DeployResponse>): grpc.ClientUnaryCall;
110110
deploy(argument: io_defang_v1_fabric_pb.DeployRequest, metadataOrOptions: grpc.Metadata | grpc.CallOptions | null, callback: grpc.requestCallback<io_defang_v1_fabric_pb.DeployResponse>): grpc.ClientUnaryCall;
111111
deploy(argument: io_defang_v1_fabric_pb.DeployRequest, metadata: grpc.Metadata | null, options: grpc.CallOptions | null, callback: grpc.requestCallback<io_defang_v1_fabric_pb.DeployResponse>): grpc.ClientUnaryCall;
112-
get(argument: io_defang_v1_fabric_pb.ServiceID, callback: grpc.requestCallback<io_defang_v1_fabric_pb.ServiceInfo>): grpc.ClientUnaryCall;
113-
get(argument: io_defang_v1_fabric_pb.ServiceID, metadataOrOptions: grpc.Metadata | grpc.CallOptions | null, callback: grpc.requestCallback<io_defang_v1_fabric_pb.ServiceInfo>): grpc.ClientUnaryCall;
114-
get(argument: io_defang_v1_fabric_pb.ServiceID, metadata: grpc.Metadata | null, options: grpc.CallOptions | null, callback: grpc.requestCallback<io_defang_v1_fabric_pb.ServiceInfo>): grpc.ClientUnaryCall;
112+
get(argument: io_defang_v1_fabric_pb.GetRequest, callback: grpc.requestCallback<io_defang_v1_fabric_pb.ServiceInfo>): grpc.ClientUnaryCall;
113+
get(argument: io_defang_v1_fabric_pb.GetRequest, metadataOrOptions: grpc.Metadata | grpc.CallOptions | null, callback: grpc.requestCallback<io_defang_v1_fabric_pb.ServiceInfo>): grpc.ClientUnaryCall;
114+
get(argument: io_defang_v1_fabric_pb.GetRequest, metadata: grpc.Metadata | null, options: grpc.CallOptions | null, callback: grpc.requestCallback<io_defang_v1_fabric_pb.ServiceInfo>): grpc.ClientUnaryCall;
115115
delete(argument: io_defang_v1_fabric_pb.DeleteRequest, callback: grpc.requestCallback<io_defang_v1_fabric_pb.DeleteResponse>): grpc.ClientUnaryCall;
116116
delete(argument: io_defang_v1_fabric_pb.DeleteRequest, metadataOrOptions: grpc.Metadata | grpc.CallOptions | null, callback: grpc.requestCallback<io_defang_v1_fabric_pb.DeleteResponse>): grpc.ClientUnaryCall;
117117
delete(argument: io_defang_v1_fabric_pb.DeleteRequest, metadata: grpc.Metadata | null, options: grpc.CallOptions | null, callback: grpc.requestCallback<io_defang_v1_fabric_pb.DeleteResponse>): grpc.ClientUnaryCall;

protos/io/defang/v1/fabric_grpc_pb.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,17 @@ function deserialize_io_defang_v1_GetConfigsResponse(buffer_arg) {
195195
return io_defang_v1_fabric_pb.GetConfigsResponse.deserializeBinary(new Uint8Array(buffer_arg));
196196
}
197197

198+
function serialize_io_defang_v1_GetRequest(arg) {
199+
if (!(arg instanceof io_defang_v1_fabric_pb.GetRequest)) {
200+
throw new Error('Expected argument of type io.defang.v1.GetRequest');
201+
}
202+
return Buffer.from(arg.serializeBinary());
203+
}
204+
205+
function deserialize_io_defang_v1_GetRequest(buffer_arg) {
206+
return io_defang_v1_fabric_pb.GetRequest.deserializeBinary(new Uint8Array(buffer_arg));
207+
}
208+
198209
function serialize_io_defang_v1_GetSelectedProviderRequest(arg) {
199210
if (!(arg instanceof io_defang_v1_fabric_pb.GetSelectedProviderRequest)) {
200211
throw new Error('Expected argument of type io.defang.v1.GetSelectedProviderRequest');
@@ -305,17 +316,6 @@ function deserialize_io_defang_v1_Service(buffer_arg) {
305316
return io_defang_v1_fabric_pb.Service.deserializeBinary(new Uint8Array(buffer_arg));
306317
}
307318

308-
function serialize_io_defang_v1_ServiceID(arg) {
309-
if (!(arg instanceof io_defang_v1_fabric_pb.ServiceID)) {
310-
throw new Error('Expected argument of type io.defang.v1.ServiceID');
311-
}
312-
return Buffer.from(arg.serializeBinary());
313-
}
314-
315-
function deserialize_io_defang_v1_ServiceID(buffer_arg) {
316-
return io_defang_v1_fabric_pb.ServiceID.deserializeBinary(new Uint8Array(buffer_arg));
317-
}
318-
319319
function serialize_io_defang_v1_ServiceInfo(arg) {
320320
if (!(arg instanceof io_defang_v1_fabric_pb.ServiceInfo)) {
321321
throw new Error('Expected argument of type io.defang.v1.ServiceInfo');
@@ -576,10 +576,10 @@ revokeToken: {
576576
path: '/io.defang.v1.FabricController/Get',
577577
requestStream: false,
578578
responseStream: false,
579-
requestType: io_defang_v1_fabric_pb.ServiceID,
579+
requestType: io_defang_v1_fabric_pb.GetRequest,
580580
responseType: io_defang_v1_fabric_pb.ServiceInfo,
581-
requestSerialize: serialize_io_defang_v1_ServiceID,
582-
requestDeserialize: deserialize_io_defang_v1_ServiceID,
581+
requestSerialize: serialize_io_defang_v1_GetRequest,
582+
requestDeserialize: deserialize_io_defang_v1_GetRequest,
583583
responseSerialize: serialize_io_defang_v1_ServiceInfo,
584584
responseDeserialize: deserialize_io_defang_v1_ServiceInfo,
585585
},

0 commit comments

Comments
 (0)