Skip to content

Commit d93715a

Browse files
fix: clean up empty field options and missing commas in frontier protos
The annotation removal script left behind: - Empty field option brackets `[]` on fields - Missing commas between remaining field options - Partial annotation remnants on metadata fields - Incorrectly removed google/api/httpbody.proto import (still needed for HttpBody return types) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 83275e9 commit d93715a

2 files changed

Lines changed: 101 additions & 110 deletions

File tree

raystack/frontier/v1beta1/admin.proto

Lines changed: 38 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package raystack.frontier.v1beta1;
44

55
import "google/api/field_behavior.proto";
6+
import "google/api/httpbody.proto";
67
import "google/protobuf/struct.proto";
78
import "google/protobuf/timestamp.proto";
89
import "raystack/frontier/v1beta1/models.proto";
@@ -240,10 +241,10 @@ message ListAllUsersRequest {
240241
ignore_empty: true,
241242
}
242243
];
243-
string keyword = 3 [];
244-
string org_id = 4 [];
245-
string group_id = 5 [];
246-
string state = 6 [];
244+
string keyword = 3;
245+
string org_id = 4;
246+
string group_id = 5;
247+
string state = 6;
247248
}
248249

249250
message ListAllUsersResponse {
@@ -260,17 +261,17 @@ message ListAllServiceUsersResponse {
260261

261262
message ListGroupsRequest {
262263
reserved 1;
263-
string org_id = 2 [];
264-
string state = 3 [];
264+
string org_id = 2;
265+
string state = 3;
265266
}
266267

267268
message ListGroupsResponse {
268269
repeated Group groups = 1;
269270
}
270271

271272
message ListAllOrganizationsRequest {
272-
string user_id = 1 [];
273-
string state = 2 [];
273+
string user_id = 1;
274+
string state = 2;
274275
int32 page_size = 3 [
275276
(validate.rules).int32 = {
276277
gte: 1,
@@ -287,32 +288,31 @@ message ListAllOrganizationsRequest {
287288

288289
message ListAllOrganizationsResponse {
289290
repeated Organization organizations = 1;
290-
int32 count = 2[
291-
];
291+
int32 count = 2;
292292
}
293293

294294
message ListProjectsRequest {
295-
string org_id = 1 [];
296-
string state = 2 [];
295+
string org_id = 1;
296+
string state = 2;
297297
}
298298

299299
message ListProjectsResponse {
300300
repeated Project projects = 1;
301301
}
302302

303303
message ListRelationsRequest {
304-
string subject = 1 [];
305-
string object = 2 [];
304+
string subject = 1;
305+
string object = 2;
306306
}
307307

308308
message ListRelationsResponse {
309309
repeated Relation relations = 1;
310310
}
311311

312312
message ListResourcesRequest {
313-
string user_id = 1 [];
314-
string project_id = 2 [];
315-
string organization_id = 3 [];
313+
string user_id = 1;
314+
string project_id = 2;
315+
string organization_id = 3;
316316
string namespace = 4 [
317317
(validate.rules).string.min_len = 3
318318
];
@@ -357,12 +357,12 @@ message PermissionRequestBody {
357357
string namespace = 2 [
358358
deprecated = true
359359
];
360-
google.protobuf.Struct metadata = 3 [];
361-
string title = 4 [];
360+
google.protobuf.Struct metadata = 3;
361+
string title = 4;
362362

363363
// key is composed of three parts, 'service.resource.verb'. Where 'service.resource' works as a namespace for the 'verb'.
364364
// Use this instead of using name and namespace fields
365-
string key = 5 [];
365+
string key = 5;
366366
}
367367

368368
message CreatePermissionRequest {
@@ -420,8 +420,8 @@ message CheckFederatedResourcePermissionResponse {
420420
}
421421

422422
message AddPlatformUserRequest {
423-
string user_id = 1 [];
424-
string serviceuser_id = 2 [];
423+
string user_id = 1;
424+
string serviceuser_id = 2;
425425

426426
string relation = 3 [
427427
(google.api.field_behavior) = REQUIRED
@@ -438,8 +438,8 @@ message ListPlatformUsersResponse {
438438
}
439439

440440
message RemovePlatformUserRequest {
441-
string user_id = 1 [];
442-
string serviceuser_id = 2 [];
441+
string user_id = 1;
442+
string serviceuser_id = 2;
443443
}
444444

445445
message RemovePlatformUserResponse {}
@@ -487,8 +487,7 @@ message ListAllInvoicesRequest {
487487

488488
message ListAllInvoicesResponse {
489489
repeated Invoice invoices = 1;
490-
int32 count = 2[
491-
];
490+
int32 count = 2;
492491
}
493492

494493
message GenerateInvoicesRequest {}
@@ -555,7 +554,7 @@ message CreateWebhookResponse {
555554

556555
message UpdateWebhookRequest {
557556
string id = 1 [
558-
(google.api.field_behavior) = REQUIRED
557+
(google.api.field_behavior) = REQUIRED,
559558
(validate.rules).string.uuid = true
560559
];
561560
WebhookRequestBody body = 2;
@@ -567,7 +566,7 @@ message UpdateWebhookResponse {
567566

568567
message DeleteWebhookRequest {
569568
string id = 1 [
570-
(google.api.field_behavior) = REQUIRED
569+
(google.api.field_behavior) = REQUIRED,
571570
(validate.rules).string.uuid = true
572571
];
573572
}
@@ -720,8 +719,7 @@ message UpdateProspectRequest{
720719
email: true,
721720
}
722721
];
723-
string phone = 6[
724-
];
722+
string phone = 6;
725723
string activity = 7[
726724
(google.api.field_behavior) = REQUIRED,
727725
(validate.rules).string = {
@@ -739,10 +737,8 @@ message UpdateProspectRequest{
739737
pattern: "^[A-Za-z0-9-_]+$",
740738
}
741739
];
742-
bool verified = 10[
743-
];
744-
google.protobuf.Struct metadata = 11[
745-
];
740+
bool verified = 10;
741+
google.protobuf.Struct metadata = 11;
746742
}
747743

748744
message UpdateProspectResponse{
@@ -773,8 +769,7 @@ message CreateProspectRequest{
773769
email: true,
774770
}
775771
];
776-
string phone = 6[
777-
];
772+
string phone = 6;
778773
string activity = 7[
779774
(google.api.field_behavior) = REQUIRED,
780775
(validate.rules).string = {
@@ -792,10 +787,8 @@ message CreateProspectRequest{
792787
pattern: "^[A-Za-z0-9-_]+$",
793788
}
794789
];
795-
bool verified = 10[
796-
];
797-
google.protobuf.Struct metadata = 11[
798-
];
790+
bool verified = 10;
791+
google.protobuf.Struct metadata = 11;
799792
}
800793

801794
message CreateProspectResponse{
@@ -959,7 +952,7 @@ message ExportUsersRequest {}
959952

960953
message SearchUserOrganizationsRequest {
961954
string id = 1 [
962-
(google.api.field_behavior) = REQUIRED
955+
(google.api.field_behavior) = REQUIRED,
963956
(validate.rules).string.uuid = true
964957
];
965958
RQLRequest query = 2;
@@ -985,11 +978,11 @@ message SearchUserOrganizationsResponse {
985978

986979
message SearchUserProjectsRequest {
987980
string user_id = 1 [
988-
(google.api.field_behavior) = REQUIRED
981+
(google.api.field_behavior) = REQUIRED,
989982
(validate.rules).string.uuid = true
990983
];
991984
string org_id = 2 [
992-
(google.api.field_behavior) = REQUIRED
985+
(google.api.field_behavior) = REQUIRED,
993986
(validate.rules).string.uuid = true
994987
];
995988
RQLRequest query = 3;
@@ -1020,8 +1013,8 @@ message AdminCreateOrganizationRequest {
10201013
(validate.rules).string.pattern = "^[A-Za-z0-9-_]+$",
10211014
(google.api.field_behavior) = REQUIRED
10221015
];
1023-
string title = 2 [];
1024-
google.protobuf.Struct metadata = 3 [, \"description\": \"Organization description\"}`"}];
1016+
string title = 2;
1017+
google.protobuf.Struct metadata = 3;
10251018
string avatar = 4 [
10261019
(validate.rules).string = {
10271020
pattern: "^data:image/(png|jpg|jpeg|gif);base64,([a-zA-Z0-9+/]+={0,2})+$",

0 commit comments

Comments
 (0)