fix proto lint

rilldata · Sep 25, 2024 · 0be46f1 · 0be46f1
1 parent 147eeda
commit 0be46f1
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 79 deletions.
diff --git a/admin/server/reports.go b/admin/server/reports.go
@@ -74,7 +74,7 @@ func (s *Server) GetReportMeta(ctx context.Context, req *adminv1.GetReportMetaRe
 		}
 	}
 
-	externalUsersUrls := make(map[string]*adminv1.GetReportMetaResponseUrls, len(externalEmails))
+	externalUsersUrls := make(map[string]*adminv1.GetReportMetaResponse_Urls, len(externalEmails))
 	if len(externalEmails) > 0 {
 		// issue magic tokens for external emails
 		var ownerID *string
@@ -87,7 +87,7 @@ func (s *Server) GetReportMeta(ctx context.Context, req *adminv1.GetReportMetaRe
 		}
 
 		for email, token := range emailTokens {
-			externalUsersUrls[email] = &adminv1.GetReportMetaResponseUrls{
+			externalUsersUrls[email] = &adminv1.GetReportMetaResponse_Urls{
 				OpenUrl:   s.admin.URLs.WithCustomDomain(org.CustomDomain).ReportOpenExternal(org.Name, proj.Name, req.Report, token, req.ExecutionTime.AsTime()),
 				ExportUrl: s.admin.URLs.WithCustomDomain(org.CustomDomain).ReportExportExternal(org.Name, proj.Name, req.Report, token),
 			}
@@ -101,7 +101,7 @@ func (s *Server) GetReportMeta(ctx context.Context, req *adminv1.GetReportMetaRe
 	}
 
 	return &adminv1.GetReportMetaResponse{
-		InternalUsersUrls: &adminv1.GetReportMetaResponseUrls{
+		InternalUsersUrls: &adminv1.GetReportMetaResponse_Urls{
 			OpenUrl:   s.admin.URLs.WithCustomDomain(org.CustomDomain).ReportOpen(org.Name, proj.Name, req.Report, req.ExecutionTime.AsTime()),
 			ExportUrl: s.admin.URLs.WithCustomDomain(org.CustomDomain).ReportExport(org.Name, proj.Name, req.Report),
 			EditUrl:   s.admin.URLs.WithCustomDomain(org.CustomDomain).ReportEdit(org.Name, proj.Name, req.Report),

diff --git a/proto/gen/rill/admin/v1/admin.swagger.yaml b/proto/gen/rill/admin/v1/admin.swagger.yaml
@@ -3442,7 +3442,7 @@ paths:
       tags:
         - AdminService
 definitions:
-  GetReportMetaResponseurls:
+  GetReportMetaResponseUrls:
     type: object
     properties:
       openUrl:
@@ -4083,11 +4083,11 @@ definitions:
     type: object
     properties:
       internalUsersUrls:
-        $ref: '#/definitions/GetReportMetaResponseurls'
+        $ref: '#/definitions/GetReportMetaResponseUrls'
       externalUsersUrls:
         type: object
         additionalProperties:
-          $ref: '#/definitions/GetReportMetaResponseurls'
+          $ref: '#/definitions/GetReportMetaResponseUrls'
   v1GetUserResponse:
     type: object
     properties:

diff --git a/proto/gen/rill/admin/v1/api.pb.go b/proto/gen/rill/admin/v1/api.pb.go
diff --git a/proto/gen/rill/admin/v1/api.pb.validate.go b/proto/gen/rill/admin/v1/api.pb.validate.go
diff --git a/proto/rill/admin/v1/api.proto b/proto/rill/admin/v1/api.proto
@@ -1833,13 +1833,13 @@ message GetReportMetaRequest {
 }
 
 message GetReportMetaResponse {
-  message urls {
+  message Urls {
     string open_url = 1;
     string export_url = 2;
     string edit_url = 3;
   }
-  urls internal_users_urls = 1;
-  map<string, urls> external_users_urls = 2;
+  Urls internal_users_urls = 1;
+  map<string, Urls> external_users_urls = 2;
 }
 
 message GetAlertMetaRequest {

diff --git a/web-admin/src/client/gen/index.schemas.ts b/web-admin/src/client/gen/index.schemas.ts
@@ -1000,11 +1000,11 @@ export interface V1GetUserResponse {
 }
 
 export type V1GetReportMetaResponseExternalUsersUrls = {
-  [key: string]: GetReportMetaResponseurls;
+  [key: string]: GetReportMetaResponseUrls;
 };
 
 export interface V1GetReportMetaResponse {
-  internalUsersUrls?: GetReportMetaResponseurls;
+  internalUsersUrls?: GetReportMetaResponseUrls;
   externalUsersUrls?: V1GetReportMetaResponseExternalUsersUrls;
 }
 
@@ -1488,7 +1488,7 @@ export interface ListGithubUserReposResponseRepo {
   defaultBranch?: string;
 }
 
-export interface GetReportMetaResponseurls {
+export interface GetReportMetaResponseUrls {
   openUrl?: string;
   exportUrl?: string;
   editUrl?: string;