Skip to content

Commit 7a509e7

Browse files
edw-defangedw-defang
committed
Update to latest protobuf
1 parent 14247b1 commit 7a509e7

File tree

5 files changed

+371
-217
lines changed

5 files changed

+371
-217
lines changed

‎io/defang/v1/fabric.proto‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ service FabricController {
9999
returns (DelegateSubdomainZoneResponse) {
100100
option idempotency_level = NO_SIDE_EFFECTS;
101101
};
102+
rpc SetOptions(SetOptionsRequest) returns (google.protobuf.Empty) {
103+
option idempotency_level = IDEMPOTENT;
104+
}
102105
rpc WhoAmI(google.protobuf.Empty) returns (WhoAmIResponse) {
103106
option idempotency_level = NO_SIDE_EFFECTS;
104107
};
@@ -162,6 +165,8 @@ message DebugRequest {
162165
string project = 3;
163166
string logs = 4;
164167
repeated string services = 5;
168+
bool training_opt_out = 6; // only valid for Pro users
169+
google.protobuf.Timestamp since = 7;
165170
}
166171

167172
message DebugResponse {
@@ -235,6 +240,7 @@ message GenerateFilesRequest {
235240
string prompt = 1;
236241
string language = 2;
237242
bool agree_tos = 3;
243+
bool training_opt_out = 4; // only valid for Pro users
238244
}
239245

240246
message File {
@@ -296,7 +302,7 @@ message ServiceInfo {
296302
reserved 14; // was: string lb_dns
297303
ServiceState state = 15; // enumerated status of the service
298304
string domainname = 16; // domain name for the service
299-
string lb_dns_name = 17; // fully qualified domain name for the load-balancer
305+
string lb_dns_name = 17; // fully qualified domain name for the load-balancer
300306

301307
// bool is_function = 5; // true if service is a function
302308
}
@@ -445,13 +451,7 @@ enum Platform {
445451
LINUX_ANY = 2;
446452
}
447453

448-
message GetRequest { // was ServiceID
449-
string name = 1;
450-
string project = 2;
451-
}
452-
453-
message ServiceID {
454-
option deprecated = true; // still used by pulumi-defang providers stored in state files
454+
message GetRequest { // was GetRequest
455455
string name = 1;
456456
string project = 2;
457457
}
@@ -632,10 +632,15 @@ enum SubscriptionTier {
632632
TEAM = 4;
633633
}
634634

635+
message SetOptionsRequest {
636+
bool training_opt_out = 1; // only valid for Pro users
637+
}
638+
635639
message WhoAmIResponse {
636640
string tenant = 1;
637641
string account = 2;
638642
string region = 3;
639643
string user_id = 4;
640644
SubscriptionTier tier = 5;
645+
bool training_opt_out = 6;
641646
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ interface IFabricControllerService extends grpc.ServiceDefinition<grpc.UntypedSe
4040
delegateSubdomainZone: grpc.MethodDefinition<io_defang_v1_fabric_pb.DelegateSubdomainZoneRequest, io_defang_v1_fabric_pb.DelegateSubdomainZoneResponse>;
4141
deleteSubdomainZone: grpc.MethodDefinition<google_protobuf_empty_pb.Empty, google_protobuf_empty_pb.Empty>;
4242
getDelegateSubdomainZone: grpc.MethodDefinition<google_protobuf_empty_pb.Empty, io_defang_v1_fabric_pb.DelegateSubdomainZoneResponse>;
43+
setOptions: grpc.MethodDefinition<io_defang_v1_fabric_pb.SetOptionsRequest, google_protobuf_empty_pb.Empty>;
4344
whoAmI: grpc.MethodDefinition<google_protobuf_empty_pb.Empty, io_defang_v1_fabric_pb.WhoAmIResponse>;
4445
track: grpc.MethodDefinition<io_defang_v1_fabric_pb.TrackRequest, google_protobuf_empty_pb.Empty>;
4546
deleteMe: grpc.MethodDefinition<google_protobuf_empty_pb.Empty, google_protobuf_empty_pb.Empty>;
@@ -84,6 +85,7 @@ export interface IFabricControllerServer extends grpc.UntypedServiceImplementati
8485
delegateSubdomainZone: grpc.handleUnaryCall<io_defang_v1_fabric_pb.DelegateSubdomainZoneRequest, io_defang_v1_fabric_pb.DelegateSubdomainZoneResponse>;
8586
deleteSubdomainZone: grpc.handleUnaryCall<google_protobuf_empty_pb.Empty, google_protobuf_empty_pb.Empty>;
8687
getDelegateSubdomainZone: grpc.handleUnaryCall<google_protobuf_empty_pb.Empty, io_defang_v1_fabric_pb.DelegateSubdomainZoneResponse>;
88+
setOptions: grpc.handleUnaryCall<io_defang_v1_fabric_pb.SetOptionsRequest, google_protobuf_empty_pb.Empty>;
8789
whoAmI: grpc.handleUnaryCall<google_protobuf_empty_pb.Empty, io_defang_v1_fabric_pb.WhoAmIResponse>;
8890
track: grpc.handleUnaryCall<io_defang_v1_fabric_pb.TrackRequest, google_protobuf_empty_pb.Empty>;
8991
deleteMe: grpc.handleUnaryCall<google_protobuf_empty_pb.Empty, google_protobuf_empty_pb.Empty>;
@@ -189,6 +191,9 @@ export class FabricControllerClient extends grpc.Client {
189191
getDelegateSubdomainZone(argument: google_protobuf_empty_pb.Empty, callback: grpc.requestCallback<io_defang_v1_fabric_pb.DelegateSubdomainZoneResponse>): grpc.ClientUnaryCall;
190192
getDelegateSubdomainZone(argument: google_protobuf_empty_pb.Empty, metadataOrOptions: grpc.Metadata | grpc.CallOptions | null, callback: grpc.requestCallback<io_defang_v1_fabric_pb.DelegateSubdomainZoneResponse>): grpc.ClientUnaryCall;
191193
getDelegateSubdomainZone(argument: google_protobuf_empty_pb.Empty, metadata: grpc.Metadata | null, options: grpc.CallOptions | null, callback: grpc.requestCallback<io_defang_v1_fabric_pb.DelegateSubdomainZoneResponse>): grpc.ClientUnaryCall;
194+
setOptions(argument: io_defang_v1_fabric_pb.SetOptionsRequest, callback: grpc.requestCallback<google_protobuf_empty_pb.Empty>): grpc.ClientUnaryCall;
195+
setOptions(argument: io_defang_v1_fabric_pb.SetOptionsRequest, metadataOrOptions: grpc.Metadata | grpc.CallOptions | null, callback: grpc.requestCallback<google_protobuf_empty_pb.Empty>): grpc.ClientUnaryCall;
196+
setOptions(argument: io_defang_v1_fabric_pb.SetOptionsRequest, metadata: grpc.Metadata | null, options: grpc.CallOptions | null, callback: grpc.requestCallback<google_protobuf_empty_pb.Empty>): grpc.ClientUnaryCall;
192197
whoAmI(argument: google_protobuf_empty_pb.Empty, callback: grpc.requestCallback<io_defang_v1_fabric_pb.WhoAmIResponse>): grpc.ClientUnaryCall;
193198
whoAmI(argument: google_protobuf_empty_pb.Empty, metadataOrOptions: grpc.Metadata | grpc.CallOptions | null, callback: grpc.requestCallback<io_defang_v1_fabric_pb.WhoAmIResponse>): grpc.ClientUnaryCall;
194199
whoAmI(argument: google_protobuf_empty_pb.Empty, metadata: grpc.Metadata | null, options: grpc.CallOptions | null, callback: grpc.requestCallback<io_defang_v1_fabric_pb.WhoAmIResponse>): grpc.ClientUnaryCall;

‎protos/io/defang/v1/fabric_grpc_pb.js‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,14 @@ function deserialize_io_defang_v1_ServiceInfo(buffer_arg) {
280280
return io_defang_v1_fabric_pb.ServiceInfo.deserializeBinary(new Uint8Array(buffer_arg));
281281
}
282282

283+
function serialize_io_defang_v1_SetOptionsRequest(arg) {
284+
return Buffer.from(arg.serializeBinary());
285+
}
286+
287+
function deserialize_io_defang_v1_SetOptionsRequest(buffer_arg) {
288+
return io_defang_v1_fabric_pb.SetOptionsRequest.deserializeBinary(new Uint8Array(buffer_arg));
289+
}
290+
283291
function serialize_io_defang_v1_SetSelectedProviderRequest(arg) {
284292
return Buffer.from(arg.serializeBinary());
285293
}
@@ -759,6 +767,17 @@ putSecret: {
759767
responseSerialize: serialize_io_defang_v1_DelegateSubdomainZoneResponse,
760768
responseDeserialize: deserialize_io_defang_v1_DelegateSubdomainZoneResponse,
761769
},
770+
setOptions: {
771+
path: '/io.defang.v1.FabricController/SetOptions',
772+
requestStream: false,
773+
responseStream: false,
774+
requestType: io_defang_v1_fabric_pb.SetOptionsRequest,
775+
responseType: google_protobuf_empty_pb.Empty,
776+
requestSerialize: serialize_io_defang_v1_SetOptionsRequest,
777+
requestDeserialize: deserialize_io_defang_v1_SetOptionsRequest,
778+
responseSerialize: serialize_google_protobuf_Empty,
779+
responseDeserialize: deserialize_google_protobuf_Empty,
780+
},
762781
whoAmI: {
763782
path: '/io.defang.v1.FabricController/WhoAmI',
764783
requestStream: false,

‎protos/io/defang/v1/fabric_pb.d.ts‎

Lines changed: 38 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,14 @@ export class DebugRequest extends jspb.Message {
155155
setServicesList(value: Array<string>): void;
156156
addServices(value: string, index?: number): string;
157157

158+
getTrainingOptOut(): boolean;
159+
setTrainingOptOut(value: boolean): void;
160+
161+
hasSince(): boolean;
162+
clearSince(): void;
163+
getSince(): google_protobuf_timestamp_pb.Timestamp | undefined;
164+
setSince(value?: google_protobuf_timestamp_pb.Timestamp): void;
165+
158166
serializeBinary(): Uint8Array;
159167
toObject(includeInstance?: boolean): DebugRequest.AsObject;
160168
static toObject(includeInstance: boolean, msg: DebugRequest): DebugRequest.AsObject;
@@ -172,6 +180,8 @@ export namespace DebugRequest {
172180
project: string,
173181
logs: string,
174182
servicesList: Array<string>,
183+
trainingOptOut: boolean,
184+
since?: google_protobuf_timestamp_pb.Timestamp.AsObject,
175185
}
176186
}
177187

@@ -478,6 +488,9 @@ export class GenerateFilesRequest extends jspb.Message {
478488
getAgreeTos(): boolean;
479489
setAgreeTos(value: boolean): void;
480490

491+
getTrainingOptOut(): boolean;
492+
setTrainingOptOut(value: boolean): void;
493+
481494
serializeBinary(): Uint8Array;
482495
toObject(includeInstance?: boolean): GenerateFilesRequest.AsObject;
483496
static toObject(includeInstance: boolean, msg: GenerateFilesRequest): GenerateFilesRequest.AsObject;
@@ -493,6 +506,7 @@ export namespace GenerateFilesRequest {
493506
prompt: string,
494507
language: string,
495508
agreeTos: boolean,
509+
trainingOptOut: boolean,
496510
}
497511
}
498512

@@ -1408,30 +1422,6 @@ export namespace GetRequest {
14081422
}
14091423
}
14101424

1411-
export class ServiceID extends jspb.Message {
1412-
getName(): string;
1413-
setName(value: string): void;
1414-
1415-
getProject(): string;
1416-
setProject(value: string): void;
1417-
1418-
serializeBinary(): Uint8Array;
1419-
toObject(includeInstance?: boolean): ServiceID.AsObject;
1420-
static toObject(includeInstance: boolean, msg: ServiceID): ServiceID.AsObject;
1421-
static extensions: {[key: number]: jspb.ExtensionFieldInfo<jspb.Message>};
1422-
static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message>};
1423-
static serializeBinaryToWriter(message: ServiceID, writer: jspb.BinaryWriter): void;
1424-
static deserializeBinary(bytes: Uint8Array): ServiceID;
1425-
static deserializeBinaryFromReader(message: ServiceID, reader: jspb.BinaryReader): ServiceID;
1426-
}
1427-
1428-
export namespace ServiceID {
1429-
export type AsObject = {
1430-
name: string,
1431-
project: string,
1432-
}
1433-
}
1434-
14351425
export class Device extends jspb.Message {
14361426
clearCapabilitiesList(): void;
14371427
getCapabilitiesList(): Array<string>;
@@ -2068,6 +2058,26 @@ export namespace DelegateSubdomainZoneResponse {
20682058
}
20692059
}
20702060

2061+
export class SetOptionsRequest extends jspb.Message {
2062+
getTrainingOptOut(): boolean;
2063+
setTrainingOptOut(value: boolean): void;
2064+
2065+
serializeBinary(): Uint8Array;
2066+
toObject(includeInstance?: boolean): SetOptionsRequest.AsObject;
2067+
static toObject(includeInstance: boolean, msg: SetOptionsRequest): SetOptionsRequest.AsObject;
2068+
static extensions: {[key: number]: jspb.ExtensionFieldInfo<jspb.Message>};
2069+
static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message>};
2070+
static serializeBinaryToWriter(message: SetOptionsRequest, writer: jspb.BinaryWriter): void;
2071+
static deserializeBinary(bytes: Uint8Array): SetOptionsRequest;
2072+
static deserializeBinaryFromReader(message: SetOptionsRequest, reader: jspb.BinaryReader): SetOptionsRequest;
2073+
}
2074+
2075+
export namespace SetOptionsRequest {
2076+
export type AsObject = {
2077+
trainingOptOut: boolean,
2078+
}
2079+
}
2080+
20712081
export class WhoAmIResponse extends jspb.Message {
20722082
getTenant(): string;
20732083
setTenant(value: string): void;
@@ -2084,6 +2094,9 @@ export class WhoAmIResponse extends jspb.Message {
20842094
getTier(): SubscriptionTierMap[keyof SubscriptionTierMap];
20852095
setTier(value: SubscriptionTierMap[keyof SubscriptionTierMap]): void;
20862096

2097+
getTrainingOptOut(): boolean;
2098+
setTrainingOptOut(value: boolean): void;
2099+
20872100
serializeBinary(): Uint8Array;
20882101
toObject(includeInstance?: boolean): WhoAmIResponse.AsObject;
20892102
static toObject(includeInstance: boolean, msg: WhoAmIResponse): WhoAmIResponse.AsObject;
@@ -2101,6 +2114,7 @@ export namespace WhoAmIResponse {
21012114
region: string,
21022115
userId: string,
21032116
tier: SubscriptionTierMap[keyof SubscriptionTierMap],
2117+
trainingOptOut: boolean,
21042118
}
21052119
}
21062120

0 commit comments

Comments
 (0)