Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

refactor(api): update rollout resource name format to plans/{plan}/rollout (#19114)

boojack48e351415966
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index f8167ec22a..af1334ab5a 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -9950,8 +9950,8 @@ components:
The name is the resource name to execute the export against.
Format: instances/{instance}/databases/{database}
Format: instances/{instance}
- Format: projects/{project}/rollouts/{rollout}
- Format: projects/{project}/rollouts/{rollout}/stages/{stage}
+ Format: projects/{project}/plans/{plan}/rollout
+ Format: projects/{project}/plans/{plan}/rollout/stages/{stage}
statement:
type: string
title: statement
diff --git a/backend/common/resource_name.go b/backend/common/resource_name.go
index 85a0d4dd1e..5ed6694289 100644
--- a/backend/common/resource_name.go
+++ b/backend/common/resource_name.go
@@ -24,7 +24,6 @@ const (
UserNamePrefix = "users/"
IdentityProviderNamePrefix = "idps/"
SettingNamePrefix = "settings/"
- RolloutPrefix = "rollouts/"
StagePrefix = "stages/"
TaskPrefix = "tasks/"
TaskRunPrefix = "taskRuns/"
diff --git a/backend/generated-go/v1/sql_service.pb.go b/backend/generated-go/v1/sql_service.pb.go
index 9a558fc13b..aaad608855 100644
--- a/backend/generated-go/v1/sql_service.pb.go
+++ b/backend/generated-go/v1/sql_service.pb.go
@@ -1445,8 +1445,8 @@ type ExportRequest struct {
// The name is the resource name to execute the export against.
// Format: instances/{instance}/databases/{database}
// Format: instances/{instance}
- // Format: projects/{project}/rollouts/{rollout}
- // Format: projects/{project}/rollouts/{rollout}/stages/{stage}
+ // Format: projects/{project}/plans/{plan}/rollout
+ // Format: projects/{project}/plans/{plan}/rollout/stages/{stage}
Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
// The SQL statement to execute.
Statement string `protobuf:"bytes,2,opt,name=statement,proto3" json:"statement,omitempty"`
@@ -2909,13 +2909,13 @@ const file_v1_sql_service_proto_rawDesc = "" +
"\aContent\x12N\n" +
"\x05parts\x18\x01 \x03(\v28.bytebase.v1.AICompletionResponse.Candidate.Content.PartR\x05parts\x1a\x1a\n" +
"\x04Part\x12\x12\n" +
- "\x04text\x18\x01 \x01(\tR\x04text2\xbd\a\n" +
+ "\x04text\x18\x01 \x01(\tR\x04text2\xc7\a\n" +
"\n" +
"SQLService\x12\x8f\x01\n" +
"\x05Query\x12\x19.bytebase.v1.QueryRequest\x1a\x1a.bytebase.v1.QueryResponse\"O\x8a\xea0\x10bb.databases.get\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02-:\x01*\"(/v1/{name=instances/*/databases/*}:query\x12\x89\x01\n" +
"\fAdminExecute\x12 .bytebase.v1.AdminExecuteRequest\x1a!.bytebase.v1.AdminExecuteResponse\"0\x8a\xea0\fbb.sql.admin\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02\x12\x12\x10/v1:adminExecute(\x010\x01\x12\x95\x01\n" +
- "\x14SearchQueryHistories\x12(.bytebase.v1.SearchQueryHistoriesRequest\x1a).bytebase.v1.SearchQueryHistoriesResponse\"(\x90\xea0\x02\x82\xd3\xe4\x93\x02\x1e:\x01*\"\x19/v1/queryHistories:search\x12\xfa\x01\n" +
- "\x06Export\x12\x1a.bytebase.v1.ExportRequest\x1a\x1b.bytebase.v1.ExportResponse\"\xb6\x01\x8a\xea0\x10bb.databases.get\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02\x93\x01:\x01*Z,:\x01*\"'/v1/{name=projects/*/rollouts/*}:exportZ5:\x01*\"0/v1/{name=projects/*/rollouts/*/stages/*}:export\")/v1/{name=instances/*/databases/*}:export\x12\x81\x01\n" +
+ "\x14SearchQueryHistories\x12(.bytebase.v1.SearchQueryHistoriesRequest\x1a).bytebase.v1.SearchQueryHistoriesResponse\"(\x90\xea0\x02\x82\xd3\xe4\x93\x02\x1e:\x01*\"\x19/v1/queryHistories:search\x12\x84\x02\n" +
+ "\x06Export\x12\x1a.bytebase.v1.ExportRequest\x1a\x1b.bytebase.v1.ExportResponse\"\xc0\x01\x8a\xea0\x10bb.databases.get\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02\x9d\x01:\x01*Z1:\x01*\",/v1/{name=projects/*/plans/*/rollout}:exportZ::\x01*\"5/v1/{name=projects/*/plans/*/rollout/stages/*}:export\")/v1/{name=instances/*/databases/*}:export\x12\x81\x01\n" +
"\fDiffMetadata\x12 .bytebase.v1.DiffMetadataRequest\x1a!.bytebase.v1.DiffMetadataResponse\",\x80\xea0\x01\x82\xd3\xe4\x93\x02\":\x01*\"\x1d/v1/schemaDesign:diffMetadata\x12x\n" +
"\fAICompletion\x12 .bytebase.v1.AICompletionRequest\x1a!.bytebase.v1.AICompletionResponse\"#\x90\xea0\x02\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/v1/sql/aiCompletionB\xa5\x01\n" +
"\x0fcom.bytebase.v1B\x0fSqlServiceProtoP\x01Z4github.com/bytebase/bytebase/backend/generated-go/v1\xa2\x02\x03BXX\xaa\x02\vBytebase.V1\xca\x02\vBytebase\\V1\xe2\x02\x17Bytebase\\V1\\GPBMetadata\xea\x02\fBytebase::V1b\x06proto3"
diff --git a/backend/generated-go/v1/sql_service.pb.gw.go b/backend/generated-go/v1/sql_service.pb.gw.go
index 0082160e4d..62b220b2db 100644
--- a/backend/generated-go/v1/sql_service.pb.gw.go
+++ b/backend/generated-go/v1/sql_service.pb.gw.go
@@ -418,7 +418,7 @@ func RegisterSQLServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
var stream runtime.ServerTransportStream
ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.SQLService/Export", runtime.WithHTTPPathPattern("/v1/{name=projects/*/rollouts/*}:export"))
+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.SQLService/Export", runtime.WithHTTPPathPattern("/v1/{name=projects/*/plans/*/rollout}:export"))
if err != nil {
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return
@@ -438,7 +438,7 @@ func RegisterSQLServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
var stream runtime.ServerTransportStream
ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.SQLService/Export", runtime.WithHTTPPathPattern("/v1/{name=projects/*/rollouts/*/stages/*}:export"))
+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.SQLService/Export", runtime.WithHTTPPathPattern("/v1/{name=projects/*/plans/*/rollout/stages/*}:export"))
if err != nil {
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return
@@ -604,7 +604,7 @@ func RegisterSQLServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux,
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
- annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.SQLService/Export", runtime.WithHTTPPathPattern("/v1/{name=projects/*/rollouts/*}:export"))
+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.SQLService/Export", runtime.WithHTTPPathPattern("/v1/{name=projects/*/plans/*/rollout}:export"))
if err != nil {
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return
@@ -621,7 +621,7 @@ func RegisterSQLServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux,
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
- annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.SQLService/Export", runtime.WithHTTPPathPattern("/v1/{name=projects/*/rollouts/*/stages/*}:export"))
+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.SQLService/Export", runtime.WithHTTPPathPattern("/v1/{name=projects/*/plans/*/rollout/stages/*}:export"))
if err != nil {
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return
@@ -676,8 +676,8 @@ var (
pattern_SQLService_AdminExecute_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"v1"}, "adminExecute"))
pattern_SQLService_SearchQueryHistories_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "queryHistories"}, "search"))
pattern_SQLService_Export_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "instances", "databases", "name"}, "export"))
- pattern_SQLService_Export_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "rollouts", "name"}, "export"))
- pattern_SQLService_Export_2 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 4, 6, 5, 4}, []string{"v1", "projects", "rollouts", "stages", "name"}, "export"))
+ pattern_SQLService_Export_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 4, 5, 5, 4}, []string{"v1", "projects", "plans", "rollout", "name"}, "export"))
+ pattern_SQLService_Export_2 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 2, 4, 1, 0, 4, 7, 5, 5}, []string{"v1", "projects", "plans", "rollout", "stages", "name"}, "export"))
pattern_SQLService_DiffMetadata_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "schemaDesign"}, "diffMetadata"))
pattern_SQLService_AICompletion_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "sql", "aiCompletion"}, ""))
)
diff --git a/frontend/src/components/AuditLog/AuditLogDataTable.vue b/frontend/src/components/AuditLog/AuditLogDataTable.vue
index c02dd8c08f..cf46c0cabe 100644
--- a/frontend/src/components/AuditLog/AuditLogDataTable.vue
+++ b/frontend/src/components/AuditLog/AuditLogDataTable.vue
@@ -30,8 +30,8 @@ import { mapSorterStatus } from "@/components/v2/Model/utils";
import {
extractUserId,
getProjectIdPlanUidStageUidFromRolloutName,
+ planNamePrefix,
projectNamePrefix,
- rolloutNamePrefix,
} from "@/store/modules/v1/common";
import { getDateForPbTimestampProtoEs, unknownProject } from "@/types";
import { StatusSchema } from "@/types/proto-es/google/rpc/status_pb";
@@ -274,7 +274,7 @@ const getViewLink = (auditLog: AuditLog): string | null => {
if (!projectId || !planId) {
return null;
}
- return `${projectNamePrefix}${projectId}/${rolloutNamePrefix}${planId}`;
+ return `${projectNamePrefix}${projectId}/${planNamePrefix}${planId}/rollout`;
}
}
return null;
diff --git a/frontend/src/components/RolloutV1/components/composables/useTaskNavigation.ts b/frontend/src/components/RolloutV1/components/composables/useTaskNavigation.ts
index f10ee103b1..c2a6a2755b 100644
--- a/frontend/src/components/RolloutV1/components/composables/useTaskNavigation.ts
+++ b/frontend/src/components/RolloutV1/components/composables/useTaskNavigation.ts
@@ -13,7 +13,7 @@ export const useTaskNavigation = () => {
const router = useRouter();
const navigateToTaskDetail = (task: Task) => {
- // Task name format: projects/{project}/rollouts/{rollout}/stages/{stage}/tasks/{task}
+ // Task name format: projects/{project}/plans/{plan}/rollout/stages/{stage}/tasks/{task}
// Use utility functions for consistent parsing
const projectName = extractProjectResourceName(task.name);
const planId = extractPlanUIDFromRolloutName(task.name);
diff --git a/frontend/src/components/RolloutV1/components/composables/useTaskRunUtils.ts b/frontend/src/components/RolloutV1/components/composables/useTaskRunUtils.ts
index 099d7c4d54..e4ebeeb6a8 100644
--- a/frontend/src/components/RolloutV1/components/composables/useTaskRunUtils.ts
+++ b/frontend/src/components/RolloutV1/components/composables/useTaskRunUtils.ts
@@ -7,7 +7,7 @@ import {
/**
* Extract task name from task run name.
- * Format: projects/{project}/rollouts/{rollout}/stages/{stage}/tasks/{task}/taskRuns/{taskRun}
+ * Format: projects/{project}/plans/{plan}/rollout/stages/{stage}/tasks/{task}/taskRuns/{taskRun}
*/
export const getTaskNameFromTaskRun = (taskRunName: string): string => {
return taskRunName.replace(
diff --git a/frontend/src/store/modules/v1/common.ts b/frontend/src/store/modules/v1/common.ts
index dad4effc48..a733d57b81 100644
--- a/frontend/src/store/modules/v1/common.ts
+++ b/frontend/src/store/modules/v1/common.ts
@@ -21,7 +21,6 @@ export const groupNamePrefix = "groups/";
export const reviewConfigNamePrefix = "reviewConfigs/";
export const planNamePrefix = "plans/";
export const planCheckRunPrefix = "planCheckRuns/";
-export const rolloutNamePrefix = "rollouts/";
export const stageNamePrefix = "stages/";
export const taskNamePrefix = "tasks/";
export const taskRunNamePrefix = "taskRuns/";
diff --git a/frontend/src/types/proto-es/v1/sql_service_pb.d.ts b/frontend/src/types/proto-es/v1/sql_service_pb.d.ts
index 174c189a92..47039f51a0 100644
--- a/frontend/src/types/proto-es/v1/sql_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/sql_service_pb.d.ts
@@ -998,8 +998,8 @@ export declare type ExportRequest = Message<"bytebase.v1.ExportRequest"> & {
* The name is the resource name to execute the export against.
* Format: instances/{instance}/databases/{database}
* Format: instances/{instance}
- * Format: projects/{project}/rollouts/{rollout}
- * Format: projects/{project}/rollouts/{rollout}/stages/{stage}
+ * Format: projects/{project}/plans/{plan}/rollout
+ * Format: projects/{project}/plans/{plan}/rollout/stages/{stage}
*
* @generated from field: string name = 1;
*/
diff --git a/frontend/src/types/proto-es/v1/sql_service_pb.js b/frontend/src/types/proto-es/v1/sql_service_pb.js
index 36a815e223..a1246c002e 100644
--- a/frontend/src/types/proto-es/v1/sql_service_pb.js
+++ b/frontend/src/types/proto-es/v1/sql_service_pb.js
@@ -15,7 +15,7 @@ import { file_v1_database_service } from "./database_service_pb";
* Describes the file v1/sql_service.proto.
*/
export const file_v1_sql_service = /*@__PURE__*/
- fileDesc("ChR2MS9zcWxfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEiqgEKE0FkbWluRXhlY3V0ZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2USEQoJc3RhdGVtZW50GAIgASgJEg0KBWxpbWl0GAMgASgFEhMKBnNjaGVtYRgEIAEoCUgAiAEBEhYKCWNvbnRhaW5lchgFIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lciJBChRBZG1pbkV4ZWN1dGVSZXNwb25zZRIpCgdyZXN1bHRzGAEgAygLMhguYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQigQIKDFF1ZXJ5UmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglzdGF0ZW1lbnQYAiABKAkSDQoFbGltaXQYAyABKAUSGwoOZGF0YV9zb3VyY2VfaWQYBCABKAlCA+BBAhIPCgdleHBsYWluGAUgASgIEhMKBnNjaGVtYRgGIAEoCUgAiAEBEi4KDHF1ZXJ5X29wdGlvbhgHIAEoCzIYLmJ5dGViYXNlLnYxLlF1ZXJ5T3B0aW9uEhYKCWNvbnRhaW5lchgIIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lciI6Cg1RdWVyeVJlc3BvbnNlEikKB3Jlc3VsdHMYASADKAsyGC5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdCL5AgoLUXVlcnlPcHRpb24SSgoVcmVkaXNfcnVuX2NvbW1hbmRzX29uGAEgASgOMisuYnl0ZWJhc2UudjEuUXVlcnlPcHRpb24uUmVkaXNSdW5Db21tYW5kc09uEkkKFG1zc3FsX2V4cGxhaW5fZm9ybWF0GAIgASgOMisuYnl0ZWJhc2UudjEuUXVlcnlPcHRpb24uTVNTUUxFeHBsYWluRm9ybWF0IlsKElJlZGlzUnVuQ29tbWFuZHNPbhIlCiFSRURJU19SVU5fQ09NTUFORFNfT05fVU5TUEVDSUZJRUQQABIPCgtTSU5HTEVfTk9ERRABEg0KCUFMTF9OT0RFUxACInYKEk1TU1FMRXhwbGFpbkZvcm1hdBIkCiBNU1NRTF9FWFBMQUlOX0ZPUk1BVF9VTlNQRUNJRklFRBAAEhwKGE1TU1FMX0VYUExBSU5fRk9STUFUX0FMTBABEhwKGE1TU1FMX0VYUExBSU5fRk9STUFUX1hNTBACIo8KCgtRdWVyeVJlc3VsdBIUCgxjb2x1bW5fbmFtZXMYASADKAkSGQoRY29sdW1uX3R5cGVfbmFtZXMYAiADKAkSIwoEcm93cxgDIAMoCzIVLmJ5dGViYXNlLnYxLlF1ZXJ5Um93EhIKCnJvd3NfY291bnQYBCABKAMSDQoFZXJyb3IYBSABKAkSKgoHbGF0ZW5jeRgGIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIRCglzdGF0ZW1lbnQYByABKAkSQAoOcG9zdGdyZXNfZXJyb3IYCCABKAsyJi5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdC5Qb3N0Z3Jlc0Vycm9ySAASPAoMc3ludGF4X2Vycm9yGAkgASgLMiQuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuU3ludGF4RXJyb3JIABJGChFwZXJtaXNzaW9uX2RlbmllZBgKIAEoCzIpLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0LlBlcm1pc3Npb25EZW5pZWRIABIyCghtZXNzYWdlcxgLIAMoCzIgLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0Lk1lc3NhZ2USKgoGbWFza2VkGAwgAygLMhouYnl0ZWJhc2UudjEuTWFza2luZ1JlYXNvbhrOAgoNUG9zdGdyZXNFcnJvchIQCghzZXZlcml0eRgBIAEoCRIMCgRjb2RlGAIgASgJEg8KB21lc3NhZ2UYAyABKAkSDgoGZGV0YWlsGAQgASgJEgwKBGhpbnQYBSABKAkSEAoIcG9zaXRpb24YBiABKAUSGQoRaW50ZXJuYWxfcG9zaXRpb24YByABKAUSFgoOaW50ZXJuYWxfcXVlcnkYCCABKAkSDQoFd2hlcmUYCSABKAkSEwoLc2NoZW1hX25hbWUYCiABKAkSEgoKdGFibGVfbmFtZRgLIAEoCRITCgtjb2x1bW5fbmFtZRgMIAEoCRIWCg5kYXRhX3R5cGVfbmFtZRgNIAEoCRIXCg9jb25zdHJhaW50X25hbWUYDiABKAkSDAoEZmlsZRgPIAEoCRIMCgRsaW5lGBAgASgFEg8KB3JvdXRpbmUYESABKAkaPAoLU3ludGF4RXJyb3ISLQoOc3RhcnRfcG9zaXRpb24YASABKAsyFS5ieXRlYmFzZS52MS5Qb3NpdGlvbhrEAQoQUGVybWlzc2lvbkRlbmllZBIRCglyZXNvdXJjZXMYASADKAkSSwoMY29tbWFuZF90eXBlGAIgASgOMjUuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuUGVybWlzc2lvbkRlbmllZC5Db21tYW5kVHlwZSJQCgtDb21tYW5kVHlwZRIcChhDT01NQU5EX1RZUEVfVU5TUEVDSUZJRUQQABIHCgNEREwQARIHCgNETUwQAhIRCg1OT05fUkVBRF9PTkxZEAMatwEKB01lc3NhZ2USNQoFbGV2ZWwYASABKA4yJi5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdC5NZXNzYWdlLkxldmVsEg8KB2NvbnRlbnQYAiABKAkiZAoFTGV2ZWwSFQoRTEVWRUxfVU5TUEVDSUZJRUQQABIICgRJTkZPEAESCwoHV0FSTklORxACEgkKBURFQlVHEAMSBwoDTE9HEAQSCgoGTk9USUNFEAUSDQoJRVhDRVBUSU9OEAZCEAoOZGV0YWlsZWRfZXJyb3IivQEKDU1hc2tpbmdSZWFzb24SGAoQc2VtYW50aWNfdHlwZV9pZBgBIAEoCRIbChNzZW1hbnRpY190eXBlX3RpdGxlGAIgASgJEhcKD21hc2tpbmdfcnVsZV9pZBgDIAEoCRIRCglhbGdvcml0aG0YBCABKAkSDwoHY29udGV4dBgFIAEoCRIcChRjbGFzc2lmaWNhdGlvbl9sZXZlbBgGIAEoCRIaChJzZW1hbnRpY190eXBlX2ljb24YByABKAkiMQoIUXVlcnlSb3cSJQoGdmFsdWVzGAEgAygLMhUuYnl0ZWJhc2UudjEuUm93VmFsdWUijAUKCFJvd1ZhbHVlEjAKCm51bGxfdmFsdWUYASABKA4yGi5nb29nbGUucHJvdG9idWYuTnVsbFZhbHVlSAASFAoKYm9vbF92YWx1ZRgCIAEoCEgAEhUKC2J5dGVzX3ZhbHVlGAMgASgMSAASFgoMZG91YmxlX3ZhbHVlGAQgASgBSAASFQoLZmxvYXRfdmFsdWUYBSABKAJIABIVCgtpbnQzMl92YWx1ZRgGIAEoBUgAEhUKC2ludDY0X3ZhbHVlGAcgASgDSAASFgoMc3RyaW5nX3ZhbHVlGAggASgJSAASFgoMdWludDMyX3ZhbHVlGAkgASgNSAASFgoMdWludDY0X3ZhbHVlGAogASgESAASLQoLdmFsdWVfdmFsdWUYCyABKAsyFi5nb29nbGUucHJvdG9idWYuVmFsdWVIABI6Cg90aW1lc3RhbXBfdmFsdWUYDCABKAsyHy5ieXRlYmFzZS52MS5Sb3dWYWx1ZS5UaW1lc3RhbXBIABI/ChJ0aW1lc3RhbXBfdHpfdmFsdWUYDSABKAsyIS5ieXRlYmFzZS52MS5Sb3dWYWx1ZS5UaW1lc3RhbXBUWkgAGlMKCVRpbWVzdGFtcBI0ChBnb29nbGVfdGltZXN0YW1wGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIQCghhY2N1cmFjeRgCIAEoBRpzCgtUaW1lc3RhbXBUWhI0ChBnb29nbGVfdGltZXN0YW1wGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIMCgR6b25lGAIgASgJEg4KBm9mZnNldBgDIAEoBRIQCghhY2N1cmFjeRgEIAEoBUIGCgRraW5kIoMDCgZBZHZpY2USKQoGc3RhdHVzGAEgASgOMhkuYnl0ZWJhc2UudjEuQWR2aWNlLkxldmVsEgwKBGNvZGUYAiABKAUSDQoFdGl0bGUYAyABKAkSDwoHY29udGVudBgEIAEoCRItCg5zdGFydF9wb3NpdGlvbhgFIAEoCzIVLmJ5dGViYXNlLnYxLlBvc2l0aW9uEisKDGVuZF9wb3NpdGlvbhgGIAEoCzIVLmJ5dGViYXNlLnYxLlBvc2l0aW9uEi8KCXJ1bGVfdHlwZRgHIAEoDjIcLmJ5dGViYXNlLnYxLkFkdmljZS5SdWxlVHlwZSJKCgVMZXZlbBIcChhBRFZJQ0VfTEVWRUxfVU5TUEVDSUZJRUQQABILCgdTVUNDRVNTEAESCwoHV0FSTklORxACEgkKBUVSUk9SEAMiRwoIUnVsZVR5cGUSGQoVUlVMRV9UWVBFX1VOU1BFQ0lGSUVEEAASEAoMUEFSU0VSX0JBU0VEEAESDgoKQUlfUE9XRVJFRBACIuIBCg1FeHBvcnRSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlEhEKCXN0YXRlbWVudBgCIAEoCRINCgVsaW1pdBgDIAEoBRIpCgZmb3JtYXQYBCABKA4yGS5ieXRlYmFzZS52MS5FeHBvcnRGb3JtYXQSDQoFYWRtaW4YBSABKAgSEAoIcGFzc3dvcmQYBiABKAkSFgoOZGF0YV9zb3VyY2VfaWQYByABKAkSEwoGc2NoZW1hGAggASgJSACIAQFCCQoHX3NjaGVtYSIhCg5FeHBvcnRSZXNwb25zZRIPCgdjb250ZW50GAEgASgMIrQBChNEaWZmTWV0YWRhdGFSZXF1ZXN0EjsKD3NvdXJjZV9tZXRhZGF0YRgBIAEoCzIdLmJ5dGViYXNlLnYxLkRhdGFiYXNlTWV0YWRhdGFCA+BBAhI7Cg90YXJnZXRfbWV0YWRhdGEYAiABKAsyHS5ieXRlYmFzZS52MS5EYXRhYmFzZU1ldGFkYXRhQgPgQQISIwoGZW5naW5lGAMgASgOMhMuYnl0ZWJhc2UudjEuRW5naW5lIiQKFERpZmZNZXRhZGF0YVJlc3BvbnNlEgwKBGRpZmYYASABKAkiVAobU2VhcmNoUXVlcnlIaXN0b3JpZXNSZXF1ZXN0EhEKCXBhZ2Vfc2l6ZRgBIAEoBRISCgpwYWdlX3Rva2VuGAIgASgJEg4KBmZpbHRlchgDIAEoCSJwChxTZWFyY2hRdWVyeUhpc3Rvcmllc1Jlc3BvbnNlEjcKD3F1ZXJ5X2hpc3RvcmllcxgBIAMoCzIZLmJ5dGViYXNlLnYxLlF1ZXJ5SGlzdG9yeUID4EEDEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSLUAgoMUXVlcnlIaXN0b3J5EhEKBG5hbWUYASABKAlCA+BBAxIVCghkYXRhYmFzZRgCIAEoCUID4EEDEhQKB2NyZWF0b3IYAyABKAlCA+BBAxI0CgtjcmVhdGVfdGltZRgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIWCglzdGF0ZW1lbnQYBSABKAlCA+BBAxIXCgVlcnJvchgGIAEoCUID4EEDSACIAQESMAoIZHVyYXRpb24YByABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb25CA+BBAxIsCgR0eXBlGAggASgOMh4uYnl0ZWJhc2UudjEuUXVlcnlIaXN0b3J5LlR5cGUiMwoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASCQoFUVVFUlkQARIKCgZFWFBPUlQQAkIICgZfZXJyb3IiewoTQUlDb21wbGV0aW9uUmVxdWVzdBI6CghtZXNzYWdlcxgBIAMoCzIoLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlcXVlc3QuTWVzc2FnZRooCgdNZXNzYWdlEgwKBHJvbGUYASABKAkSDwoHY29udGVudBgCIAEoCSKVAgoUQUlDb21wbGV0aW9uUmVzcG9uc2USPwoKY2FuZGlkYXRlcxgBIAMoCzIrLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlc3BvbnNlLkNhbmRpZGF0ZRq7AQoJQ2FuZGlkYXRlEkQKB2NvbnRlbnQYASABKAsyMy5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXNwb25zZS5DYW5kaWRhdGUuQ29udGVudBpoCgdDb250ZW50EkcKBXBhcnRzGAEgAygLMjguYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVzcG9uc2UuQ2FuZGlkYXRlLkNvbnRlbnQuUGFydBoUCgRQYXJ0EgwKBHRleHQYASABKAkyvQcKClNRTFNlcnZpY2USjwEKBVF1ZXJ5EhkuYnl0ZWJhc2UudjEuUXVlcnlSZXF1ZXN0GhouYnl0ZWJhc2UudjEuUXVlcnlSZXNwb25zZSJPiuowEGJiLmRhdGFiYXNlcy5nZXSQ6jABmOowAYLT5JMCLToBKiIoL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfTpxdWVyeRKJAQoMQWRtaW5FeGVjdXRlEiAuYnl0ZWJhc2UudjEuQWRtaW5FeGVjdXRlUmVxdWVzdBohLmJ5dGViYXNlLnYxLkFkbWluRXhlY3V0ZVJlc3BvbnNlIjCK6jAMYmIuc3FsLmFkbWlukOowAZjqMAGC0+STAhISEC92MTphZG1pbkV4ZWN1dGUoATABEpUBChRTZWFyY2hRdWVyeUhpc3RvcmllcxIoLmJ5dGViYXNlLnYxLlNlYXJjaFF1ZXJ5SGlzdG9yaWVzUmVxdWVzdBopLmJ5dGViYXNlLnYxLlNlYXJjaFF1ZXJ5SGlzdG9yaWVzUmVzcG9uc2UiKJDqMAKC0+STAh46ASoiGS92MS9xdWVyeUhpc3RvcmllczpzZWFyY2gS+gEKBkV4cG9ydBIaLmJ5dGViYXNlLnYxLkV4cG9ydFJlcXVlc3QaGy5ieXRlYmFzZS52MS5FeHBvcnRSZXNwb25zZSK2AYrqMBBiYi5kYXRhYmFzZXMuZ2V0kOowAZjqMAGC0+STApMBOgEqWiw6ASoiJy92MS97bmFtZT1wcm9qZWN0cy8qL3JvbGxvdXRzLyp9OmV4cG9ydFo1OgEqIjAvdjEve25hbWU9cHJvamVjdHMvKi9yb2xsb3V0cy8qL3N0YWdlcy8qfTpleHBvcnQiKS92MS97bmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKn06ZXhwb3J0EoEBCgxEaWZmTWV0YWRhdGESIC5ieXRlYmFzZS52MS5EaWZmTWV0YWRhdGFSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuRGlmZk1ldGFkYXRhUmVzcG9uc2UiLIDqMAGC0+STAiI6ASoiHS92MS9zY2hlbWFEZXNpZ246ZGlmZk1ldGFkYXRhEngKDEFJQ29tcGxldGlvbhIgLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlcXVlc3QaIS5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXNwb25zZSIjkOowAoLT5JMCGToBKiIUL3YxL3NxbC9haUNvbXBsZXRpb25CpQEKD2NvbS5ieXRlYmFzZS52MUIPU3FsU2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_google_api_annotations, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_struct, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_database_service]);
+ fileDesc("ChR2MS9zcWxfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEiqgEKE0FkbWluRXhlY3V0ZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2USEQoJc3RhdGVtZW50GAIgASgJEg0KBWxpbWl0GAMgASgFEhMKBnNjaGVtYRgEIAEoCUgAiAEBEhYKCWNvbnRhaW5lchgFIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lciJBChRBZG1pbkV4ZWN1dGVSZXNwb25zZRIpCgdyZXN1bHRzGAEgAygLMhguYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQigQIKDFF1ZXJ5UmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglzdGF0ZW1lbnQYAiABKAkSDQoFbGltaXQYAyABKAUSGwoOZGF0YV9zb3VyY2VfaWQYBCABKAlCA+BBAhIPCgdleHBsYWluGAUgASgIEhMKBnNjaGVtYRgGIAEoCUgAiAEBEi4KDHF1ZXJ5X29wdGlvbhgHIAEoCzIYLmJ5dGViYXNlLnYxLlF1ZXJ5T3B0aW9uEhYKCWNvbnRhaW5lchgIIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lciI6Cg1RdWVyeVJlc3BvbnNlEikKB3Jlc3VsdHMYASADKAsyGC5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdCL5AgoLUXVlcnlPcHRpb24SSgoVcmVkaXNfcnVuX2NvbW1hbmRzX29uGAEgASgOMisuYnl0ZWJhc2UudjEuUXVlcnlPcHRpb24uUmVkaXNSdW5Db21tYW5kc09uEkkKFG1zc3FsX2V4cGxhaW5fZm9ybWF0GAIgASgOMisuYnl0ZWJhc2UudjEuUXVlcnlPcHRpb24uTVNTUUxFeHBsYWluRm9ybWF0IlsKElJlZGlzUnVuQ29tbWFuZHNPbhIlCiFSRURJU19SVU5fQ09NTUFORFNfT05fVU5TUEVDSUZJRUQQABIPCgtTSU5HTEVfTk9ERRABEg0KCUFMTF9OT0RFUxACInYKEk1TU1FMRXhwbGFpbkZvcm1hdBIkCiBNU1NRTF9FWFBMQUlOX0ZPUk1BVF9VTlNQRUNJRklFRBAAEhwKGE1TU1FMX0VYUExBSU5fRk9STUFUX0FMTBABEhwKGE1TU1FMX0VYUExBSU5fRk9STUFUX1hNTBACIo8KCgtRdWVyeVJlc3VsdBIUCgxjb2x1bW5fbmFtZXMYASADKAkSGQoRY29sdW1uX3R5cGVfbmFtZXMYAiADKAkSIwoEcm93cxgDIAMoCzIVLmJ5dGViYXNlLnYxLlF1ZXJ5Um93EhIKCnJvd3NfY291bnQYBCABKAMSDQoFZXJyb3IYBSABKAkSKgoHbGF0ZW5jeRgGIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIRCglzdGF0ZW1lbnQYByABKAkSQAoOcG9zdGdyZXNfZXJyb3IYCCABKAsyJi5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdC5Qb3N0Z3Jlc0Vycm9ySAASPAoMc3ludGF4X2Vycm9yGAkgASgLMiQuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuU3ludGF4RXJyb3JIABJGChFwZXJtaXNzaW9uX2RlbmllZBgKIAEoCzIpLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0LlBlcm1pc3Npb25EZW5pZWRIABIyCghtZXNzYWdlcxgLIAMoCzIgLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0Lk1lc3NhZ2USKgoGbWFza2VkGAwgAygLMhouYnl0ZWJhc2UudjEuTWFza2luZ1JlYXNvbhrOAgoNUG9zdGdyZXNFcnJvchIQCghzZXZlcml0eRgBIAEoCRIMCgRjb2RlGAIgASgJEg8KB21lc3NhZ2UYAyABKAkSDgoGZGV0YWlsGAQgASgJEgwKBGhpbnQYBSABKAkSEAoIcG9zaXRpb24YBiABKAUSGQoRaW50ZXJuYWxfcG9zaXRpb24YByABKAUSFgoOaW50ZXJuYWxfcXVlcnkYCCABKAkSDQoFd2hlcmUYCSABKAkSEwoLc2NoZW1hX25hbWUYCiABKAkSEgoKdGFibGVfbmFtZRgLIAEoCRITCgtjb2x1bW5fbmFtZRgMIAEoCRIWCg5kYXRhX3R5cGVfbmFtZRgNIAEoCRIXCg9jb25zdHJhaW50X25hbWUYDiABKAkSDAoEZmlsZRgPIAEoCRIMCgRsaW5lGBAgASgFEg8KB3JvdXRpbmUYESABKAkaPAoLU3ludGF4RXJyb3ISLQoOc3RhcnRfcG9zaXRpb24YASABKAsyFS5ieXRlYmFzZS52MS5Qb3NpdGlvbhrEAQoQUGVybWlzc2lvbkRlbmllZBIRCglyZXNvdXJjZXMYASADKAkSSwoMY29tbWFuZF90eXBlGAIgASgOMjUuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuUGVybWlzc2lvbkRlbmllZC5Db21tYW5kVHlwZSJQCgtDb21tYW5kVHlwZRIcChhDT01NQU5EX1RZUEVfVU5TUEVDSUZJRUQQABIHCgNEREwQARIHCgNETUwQAhIRCg1OT05fUkVBRF9PTkxZEAMatwEKB01lc3NhZ2USNQoFbGV2ZWwYASABKA4yJi5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdC5NZXNzYWdlLkxldmVsEg8KB2NvbnRlbnQYAiABKAkiZAoFTGV2ZWwSFQoRTEVWRUxfVU5TUEVDSUZJRUQQABIICgRJTkZPEAESCwoHV0FSTklORxACEgkKBURFQlVHEAMSBwoDTE9HEAQSCgoGTk9USUNFEAUSDQoJRVhDRVBUSU9OEAZCEAoOZGV0YWlsZWRfZXJyb3IivQEKDU1hc2tpbmdSZWFzb24SGAoQc2VtYW50aWNfdHlwZV9pZBgBIAEoCRIbChNzZW1hbnRpY190eXBlX3RpdGxlGAIgASgJEhcKD21hc2tpbmdfcnVsZV9pZBgDIAEoCRIRCglhbGdvcml0aG0YBCABKAkSDwoHY29udGV4dBgFIAEoCRIcChRjbGFzc2lmaWNhdGlvbl9sZXZlbBgGIAEoCRIaChJzZW1hbnRpY190eXBlX2ljb24YByABKAkiMQoIUXVlcnlSb3cSJQoGdmFsdWVzGAEgAygLMhUuYnl0ZWJhc2UudjEuUm93VmFsdWUijAUKCFJvd1ZhbHVlEjAKCm51bGxfdmFsdWUYASABKA4yGi5nb29nbGUucHJvdG9idWYuTnVsbFZhbHVlSAASFAoKYm9vbF92YWx1ZRgCIAEoCEgAEhUKC2J5dGVzX3ZhbHVlGAMgASgMSAASFgoMZG91YmxlX3ZhbHVlGAQgASgBSAASFQoLZmxvYXRfdmFsdWUYBSABKAJIABIVCgtpbnQzMl92YWx1ZRgGIAEoBUgAEhUKC2ludDY0X3ZhbHVlGAcgASgDSAASFgoMc3RyaW5nX3ZhbHVlGAggASgJSAASFgoMdWludDMyX3ZhbHVlGAkgASgNSAASFgoMdWludDY0X3ZhbHVlGAogASgESAASLQoLdmFsdWVfdmFsdWUYCyABKAsyFi5nb29nbGUucHJvdG9idWYuVmFsdWVIABI6Cg90aW1lc3RhbXBfdmFsdWUYDCABKAsyHy5ieXRlYmFzZS52MS5Sb3dWYWx1ZS5UaW1lc3RhbXBIABI/ChJ0aW1lc3RhbXBfdHpfdmFsdWUYDSABKAsyIS5ieXRlYmFzZS52MS5Sb3dWYWx1ZS5UaW1lc3RhbXBUWkgAGlMKCVRpbWVzdGFtcBI0ChBnb29nbGVfdGltZXN0YW1wGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIQCghhY2N1cmFjeRgCIAEoBRpzCgtUaW1lc3RhbXBUWhI0ChBnb29nbGVfdGltZXN0YW1wGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIMCgR6b25lGAIgASgJEg4KBm9mZnNldBgDIAEoBRIQCghhY2N1cmFjeRgEIAEoBUIGCgRraW5kIoMDCgZBZHZpY2USKQoGc3RhdHVzGAEgASgOMhkuYnl0ZWJhc2UudjEuQWR2aWNlLkxldmVsEgwKBGNvZGUYAiABKAUSDQoFdGl0bGUYAyABKAkSDwoHY29udGVudBgEIAEoCRItCg5zdGFydF9wb3NpdGlvbhgFIAEoCzIVLmJ5dGViYXNlLnYxLlBvc2l0aW9uEisKDGVuZF9wb3NpdGlvbhgGIAEoCzIVLmJ5dGViYXNlLnYxLlBvc2l0aW9uEi8KCXJ1bGVfdHlwZRgHIAEoDjIcLmJ5dGViYXNlLnYxLkFkdmljZS5SdWxlVHlwZSJKCgVMZXZlbBIcChhBRFZJQ0VfTEVWRUxfVU5TUEVDSUZJRUQQABILCgdTVUNDRVNTEAESCwoHV0FSTklORxACEgkKBUVSUk9SEAMiRwoIUnVsZVR5cGUSGQoVUlVMRV9UWVBFX1VOU1BFQ0lGSUVEEAASEAoMUEFSU0VSX0JBU0VEEAESDgoKQUlfUE9XRVJFRBACIuIBCg1FeHBvcnRSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlEhEKCXN0YXRlbWVudBgCIAEoCRINCgVsaW1pdBgDIAEoBRIpCgZmb3JtYXQYBCABKA4yGS5ieXRlYmFzZS52MS5FeHBvcnRGb3JtYXQSDQoFYWRtaW4YBSABKAgSEAoIcGFzc3dvcmQYBiABKAkSFgoOZGF0YV9zb3VyY2VfaWQYByABKAkSEwoGc2NoZW1hGAggASgJSACIAQFCCQoHX3NjaGVtYSIhCg5FeHBvcnRSZXNwb25zZRIPCgdjb250ZW50GAEgASgMIrQBChNEaWZmTWV0YWRhdGFSZXF1ZXN0EjsKD3NvdXJjZV9tZXRhZGF0YRgBIAEoCzIdLmJ5dGViYXNlLnYxLkRhdGFiYXNlTWV0YWRhdGFCA+BBAhI7Cg90YXJnZXRfbWV0YWRhdGEYAiABKAsyHS5ieXRlYmFzZS52MS5EYXRhYmFzZU1ldGFkYXRhQgPgQQISIwoGZW5naW5lGAMgASgOMhMuYnl0ZWJhc2UudjEuRW5naW5lIiQKFERpZmZNZXRhZGF0YVJlc3BvbnNlEgwKBGRpZmYYASABKAkiVAobU2VhcmNoUXVlcnlIaXN0b3JpZXNSZXF1ZXN0EhEKCXBhZ2Vfc2l6ZRgBIAEoBRISCgpwYWdlX3Rva2VuGAIgASgJEg4KBmZpbHRlchgDIAEoCSJwChxTZWFyY2hRdWVyeUhpc3Rvcmllc1Jlc3BvbnNlEjcKD3F1ZXJ5X2hpc3RvcmllcxgBIAMoCzIZLmJ5dGViYXNlLnYxLlF1ZXJ5SGlzdG9yeUID4EEDEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSLUAgoMUXVlcnlIaXN0b3J5EhEKBG5hbWUYASABKAlCA+BBAxIVCghkYXRhYmFzZRgCIAEoCUID4EEDEhQKB2NyZWF0b3IYAyABKAlCA+BBAxI0CgtjcmVhdGVfdGltZRgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIWCglzdGF0ZW1lbnQYBSABKAlCA+BBAxIXCgVlcnJvchgGIAEoCUID4EEDSACIAQESMAoIZHVyYXRpb24YByABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb25CA+BBAxIsCgR0eXBlGAggASgOMh4uYnl0ZWJhc2UudjEuUXVlcnlIaXN0b3J5LlR5cGUiMwoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASCQoFUVVFUlkQARIKCgZFWFBPUlQQAkIICgZfZXJyb3IiewoTQUlDb21wbGV0aW9uUmVxdWVzdBI6CghtZXNzYWdlcxgBIAMoCzIoLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlcXVlc3QuTWVzc2FnZRooCgdNZXNzYWdlEgwKBHJvbGUYASABKAkSDwoHY29udGVudBgCIAEoCSKVAgoUQUlDb21wbGV0aW9uUmVzcG9uc2USPwoKY2FuZGlkYXRlcxgBIAMoCzIrLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlc3BvbnNlLkNhbmRpZGF0ZRq7AQoJQ2FuZGlkYXRlEkQKB2NvbnRlbnQYASABKAsyMy5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXNwb25zZS5DYW5kaWRhdGUuQ29udGVudBpoCgdDb250ZW50EkcKBXBhcnRzGAEgAygLMjguYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVzcG9uc2UuQ2FuZGlkYXRlLkNvbnRlbnQuUGFydBoUCgRQYXJ0EgwKBHRleHQYASABKAkyxwcKClNRTFNlcnZpY2USjwEKBVF1ZXJ5EhkuYnl0ZWJhc2UudjEuUXVlcnlSZXF1ZXN0GhouYnl0ZWJhc2UudjEuUXVlcnlSZXNwb25zZSJPiuowEGJiLmRhdGFiYXNlcy5nZXSQ6jABmOowAYLT5JMCLToBKiIoL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfTpxdWVyeRKJAQoMQWRtaW5FeGVjdXRlEiAuYnl0ZWJhc2UudjEuQWRtaW5FeGVjdXRlUmVxdWVzdBohLmJ5dGViYXNlLnYxLkFkbWluRXhlY3V0ZVJlc3BvbnNlIjCK6jAMYmIuc3FsLmFkbWlukOowAZjqMAGC0+STAhISEC92MTphZG1pbkV4ZWN1dGUoATABEpUBChRTZWFyY2hRdWVyeUhpc3RvcmllcxIoLmJ5dGViYXNlLnYxLlNlYXJjaFF1ZXJ5SGlzdG9yaWVzUmVxdWVzdBopLmJ5dGViYXNlLnYxLlNlYXJjaFF1ZXJ5SGlzdG9yaWVzUmVzcG9uc2UiKJDqMAKC0+STAh46ASoiGS92MS9xdWVyeUhpc3RvcmllczpzZWFyY2gShAIKBkV4cG9ydBIaLmJ5dGViYXNlLnYxLkV4cG9ydFJlcXVlc3QaGy5ieXRlYmFzZS52MS5FeHBvcnRSZXNwb25zZSLAAYrqMBBiYi5kYXRhYmFzZXMuZ2V0kOowAZjqMAGC0+STAp0BOgEqWjE6ASoiLC92MS97bmFtZT1wcm9qZWN0cy8qL3BsYW5zLyovcm9sbG91dH06ZXhwb3J0Wjo6ASoiNS92MS97bmFtZT1wcm9qZWN0cy8qL3BsYW5zLyovcm9sbG91dC9zdGFnZXMvKn06ZXhwb3J0IikvdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9OmV4cG9ydBKBAQoMRGlmZk1ldGFkYXRhEiAuYnl0ZWJhc2UudjEuRGlmZk1ldGFkYXRhUmVxdWVzdBohLmJ5dGViYXNlLnYxLkRpZmZNZXRhZGF0YVJlc3BvbnNlIiyA6jABgtPkkwIiOgEqIh0vdjEvc2NoZW1hRGVzaWduOmRpZmZNZXRhZGF0YRJ4CgxBSUNvbXBsZXRpb24SIC5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXF1ZXN0GiEuYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVzcG9uc2UiI5DqMAKC0+STAhk6ASoiFC92MS9zcWwvYWlDb21wbGV0aW9uQqUBCg9jb20uYnl0ZWJhc2UudjFCD1NxbFNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_google_api_annotations, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_struct, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_database_service]);
/**
* Describes the message bytebase.v1.AdminExecuteRequest.
diff --git a/frontend/src/utils/v1/revision.ts b/frontend/src/utils/v1/revision.ts
index e7d34d0c74..41f7c6d036 100644
--- a/frontend/src/utils/v1/revision.ts
+++ b/frontend/src/utils/v1/revision.ts
@@ -32,7 +32,7 @@ export const getRevisionType = (type: Revision_Type): string => {
};
// Extract task link from taskRun resource name
-// e.g., "projects/xxx/rollouts/yyy/stages/zzz/tasks/aaa/taskRuns/bbb" -> "/projects/xxx/rollouts/yyy/stages/zzz/tasks/aaa"
+// e.g., "projects/xxx/plans/yyy/rollout/stages/zzz/tasks/aaa/taskRuns/bbb" -> "/projects/xxx/plans/yyy/rollout/stages/zzz/tasks/aaa"
export const extractTaskLink = (taskRunName: string): string => {
const parts = taskRunName.split("/taskRuns/");
if (parts.length !== 2) {
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index f8187a40bd..d72a681589 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -7120,6 +7120,166 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/bytebase.v1.BatchSkipTasksResponse'
+ /v1/projects/{project}/plans/{plan}/rollout/stages/{stage}:export:
+ post:
+ tags:
+ - SQLService
+ summary: Export
+ description: |-
+ Exports query results to a file format.
+ Permissions required: bb.databases.get
+ operationId: SQLService_Export3
+ parameters:
+ - name: project
+ in: path
+ description: The project id.
+ required: true
+ schema:
+ type: string
+ - name: plan
+ in: path
+ description: The plan id.
+ required: true
+ schema:
+ type: string
+ - name: stage
+ in: path
+ description: The stage id.
+ required: true
+ schema:
+ type: string
+ requestBody:
+ content:
+ application/json:
+ schema:
+ type: object
+ properties:
+ statement:
+ type: string
+ title: statement
+ description: The SQL statement to execute.
+ limit:
+ type: integer
+ title: limit
+ format: int32
+ description: The maximum number of rows to return.
+ format:
+ title: format
+ description: The export format.
+ $ref: '#/components/schemas/bytebase.v1.ExportFormat'
+ admin:
+ type: boolean
+ title: admin
+ description: |-
+ The admin is used for workspace owner and DBA for exporting data from SQL
+ Editor Admin mode. The exported data is not masked.
+ password:
+ type: string
+ title: password
+ description: The zip password provide by users.
+ dataSourceId:
+ type: string
+ title: data_source_id
+ description: |-
+ The id of data source.
+ It is used for querying admin data source even if the instance has
+ read-only data sources. Or it can be used to query a specific read-only
+ data source.
+ schema:
+ type:
+ - string
+ - "null"
+ title: schema
+ description: |-
+ The default schema to search objects. Equals to the current schema in
+ Oracle and search path in Postgres.
+ title: ExportRequest
+ additionalProperties: false
+ required: true
+ responses:
+ "200":
+ description: Success
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/bytebase.v1.ExportResponse'
+ /v1/projects/{project}/plans/{plan}/rollout:export:
+ post:
+ tags:
+ - SQLService
+ summary: Export
+ description: |-
+ Exports query results to a file format.
+ Permissions required: bb.databases.get
+ operationId: SQLService_Export2
+ parameters:
+ - name: project
+ in: path
+ description: The project id.
+ required: true
+ schema:
+ type: string
+ - name: plan
+ in: path
+ description: The plan id.
+ required: true
+ schema:
+ type: string
+ requestBody:
+ content:
+ application/json:
+ schema:
+ type: object
+ properties:
+ statement:
+ type: string
+ title: statement
+ description: The SQL statement to execute.
+ limit:
+ type: integer
+ title: limit
+ format: int32
+ description: The maximum number of rows to return.
+ format:
+ title: format
+ description: The export format.
+ $ref: '#/components/schemas/bytebase.v1.ExportFormat'
+ admin:
+ type: boolean
+ title: admin
+ description: |-
+ The admin is used for workspace owner and DBA for exporting data from SQL
+ Editor Admin mode. The exported data is not masked.
+ password:
+ type: string
+ title: password
+ description: The zip password provide by users.
+ dataSourceId:
+ type: string
+ title: data_source_id
+ description: |-
+ The id of data source.
+ It is used for querying admin data source even if the instance has
+ read-only data sources. Or it can be used to query a specific read-only
+ data source.
+ schema:
+ type:
+ - string
+ - "null"
+ title: schema
+ description: |-
+ The default schema to search objects. Equals to the current schema in
+ Oracle and search path in Postgres.
+ title: ExportRequest
+ additionalProperties: false
+ required: true
+ responses:
+ "200":
+ description: Success
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/bytebase.v1.ExportResponse'
/v1/projects/{project}/plans/{plan}:runPlanChecks:
post:
tags:
@@ -7807,166 +7967,6 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/bytebase.v1.ListRolloutsResponse'
- /v1/projects/{project}/rollouts/{rollout}/stages/{stage}:export:
- post:
- tags:
- - SQLService
- summary: Export
- description: |-
- Exports query results to a file format.
- Permissions required: bb.databases.get
- operationId: SQLService_Export3
- parameters:
- - name: project
- in: path
- description: The project id.
- required: true
- schema:
- type: string
- - name: rollout
- in: path
- description: The rollout id.
- required: true
- schema:
- type: string
- - name: stage
- in: path
- description: The stage id.
- required: true
- schema:
- type: string
- requestBody:
- content:
- application/json:
- schema:
- type: object
- properties:
- statement:
- type: string
- title: statement
- description: The SQL statement to execute.
- limit:
- type: integer
- title: limit
- format: int32
- description: The maximum number of rows to return.
- format:
- title: format
- description: The export format.
- $ref: '#/components/schemas/bytebase.v1.ExportFormat'
- admin:
- type: boolean
- title: admin
- description: |-
- The admin is used for workspace owner and DBA for exporting data from SQL
- Editor Admin mode. The exported data is not masked.
- password:
- type: string
- title: password
- description: The zip password provide by users.
- dataSourceId:
- type: string
- title: data_source_id
- description: |-
- The id of data source.
- It is used for querying admin data source even if the instance has
- read-only data sources. Or it can be used to query a specific read-only
- data source.
- schema:
- type:
- - string
- - "null"
- title: schema
- description: |-
- The default schema to search objects. Equals to the current schema in
- Oracle and search path in Postgres.
- title: ExportRequest
- additionalProperties: false
- required: true
- responses:
- "200":
- description: Success
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/bytebase.v1.ExportResponse'
- /v1/projects/{project}/rollouts/{rollout}:export:
- post:
- tags:
- - SQLService
- summary: Export
- description: |-
- Exports query results to a file format.
- Permissions required: bb.databases.get
- operationId: SQLService_Export2
- parameters:
- - name: project
- in: path
- description: The project id.
- required: true
- schema:
- type: string
- - name: rollout
- in: path
- description: The rollout id.
- required: true
- schema:
- type: string
- requestBody:
- content:
- application/json:
- schema:
- type: object
- properties:
- statement:
- type: string
- title: statement
- description: The SQL statement to execute.
- limit:
- type: integer
- title: limit
- format: int32
- description: The maximum number of rows to return.
- format:
- title: format
- description: The export format.
- $ref: '#/components/schemas/bytebase.v1.ExportFormat'
- admin:
- type: boolean
- title: admin
- description: |-
- The admin is used for workspace owner and DBA for exporting data from SQL
- Editor Admin mode. The exported data is not masked.
- password:
- type: string
- title: password
- description: The zip password provide by users.
- dataSourceId:
- type: string
- title: data_source_id
- description: |-
- The id of data source.
- It is used for querying admin data source even if the instance has
- read-only data sources. Or it can be used to query a specific read-only
- data source.
- schema:
- type:
- - string
- - "null"
- title: schema
- description: |-
- The default schema to search objects. Equals to the current schema in
- Oracle and search path in Postgres.
- title: ExportRequest
- additionalProperties: false
- required: true
- responses:
- "200":
- description: Success
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/bytebase.v1.ExportResponse'
/v1/projects/{project}/serviceAccounts:
get:
tags:
@@ -14003,8 +14003,8 @@ components:
The name is the resource name to execute the export against.
Format: instances/{instance}/databases/{database}
Format: instances/{instance}
- Format: projects/{project}/rollouts/{rollout}
- Format: projects/{project}/rollouts/{rollout}/stages/{stage}
+ Format: projects/{project}/plans/{plan}/rollout
+ Format: projects/{project}/plans/{plan}/rollout/stages/{stage}
statement:
type: string
title: statement
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index cf10eeee16..98ab30b48f 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -6964,7 +6964,7 @@ OrgPolicyService manages organizational policies at various resource levels.
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
-| name | [string](#string) | | The name is the resource name to execute the export against. Format: instances/{instance}/databases/{database} Format: instances/{instance} Format: projects/{project}/rollouts/{rollout} Format: projects/{project}/rollouts/{rollout}/stages/{stage} |
+| name | [string](#string) | | The name is the resource name to execute the export against. Format: instances/{instance}/databases/{database} Format: instances/{instance} Format: projects/{project}/plans/{plan}/rollout Format: projects/{project}/plans/{plan}/rollout/stages/{stage} |
| statement | [string](#string) | | The SQL statement to execute. |
| limit | [int32](#int32) | | The maximum number of rows to return. |
| format | [ExportFormat](#bytebase-v1-ExportFormat) | | The export format. |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index b49384d9f2..19f318bbde 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -19744,8 +19744,8 @@ TODO: use range instead </p></td>
<td><p>The name is the resource name to execute the export against.
Format: instances/{instance}/databases/{database}
Format: instances/{instance}
-Format: projects/{project}/rollouts/{rollout}
-Format: projects/{project}/rollouts/{rollout}/stages/{stage} </p></td>
+Format: projects/{project}/plans/{plan}/rollout
+Format: projects/{project}/plans/{plan}/rollout/stages/{stage} </p></td>
</tr>
<tr>
@@ -21110,14 +21110,14 @@ Permissions required: None (authenticated users only, requires AI to be enabled)
<tr>
<td>Export</td>
<td>POST</td>
- <td>/v1/{name=projects/*/rollouts/*}:export</td>
+ <td>/v1/{name=projects/*/plans/*/rollout}:export</td>
<td>*</td>
</tr>
<tr>
<td>Export</td>
<td>POST</td>
- <td>/v1/{name=projects/*/rollouts/*/stages/*}:export</td>
+ <td>/v1/{name=projects/*/plans/*/rollout/stages/*}:export</td>
<td>*</td>
</tr>
diff --git a/proto/v1/v1/sql_service.proto b/proto/v1/v1/sql_service.proto
index 3338e8b089..e1113c33e3 100644
--- a/proto/v1/v1/sql_service.proto
+++ b/proto/v1/v1/sql_service.proto
@@ -56,11 +56,11 @@ service SQLService {
body: "*"
additional_bindings: {
- post: "/v1/{name=projects/*/rollouts/*}:export"
+ post: "/v1/{name=projects/*/plans/*/rollout}:export"
body: "*"
}
additional_bindings: {
- post: "/v1/{name=projects/*/rollouts/*/stages/*}:export"
+ post: "/v1/{name=projects/*/plans/*/rollout/stages/*}:export"
body: "*"
}
};
@@ -409,8 +409,8 @@ message ExportRequest {
// The name is the resource name to execute the export against.
// Format: instances/{instance}/databases/{database}
// Format: instances/{instance}
- // Format: projects/{project}/rollouts/{rollout}
- // Format: projects/{project}/rollouts/{rollout}/stages/{stage}
+ // Format: projects/{project}/plans/{plan}/rollout
+ // Format: projects/{project}/plans/{plan}/rollout/stages/{stage}
string name = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {type: "bytebase.com/Database"}