Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor: remove redundant task proto fields (#18786)
Danny Xu78c83104b27a
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yamlindex ca8e94f490..cb3616627d 100644--- a/backend/api/mcp/gen/openapi.yaml+++ b/backend/api/mcp/gen/openapi.yaml@@ -15868,95 +15868,44 @@ components:bytebase.v1.Task.DatabaseCreate:type: objectproperties:- project:- type: string- title: project- description: |-- The project owning the database.- Format: projects/{project}- database:- type: string- title: database- description: Database name.- table:- type: string- title: table- description: Table name.sheet:type: stringtitle: sheetdescription: 'Format: projects/{project}/sheets/{sheet}'- characterSet:- type: string- title: character_set- description: The character set for the database.- collation:- type: string- title: collation- description: The collation for the database.- environment:- type: string- title: environment- description: The environment the database belongs to.title: DatabaseCreateadditionalProperties: falsedescription: Payload for creating a new database.bytebase.v1.Task.DatabaseDataExport:type: objectproperties:- target:- type: string- title: target- description: |-- The resource name of the target.- Format: instances/{instance-id}/databases/{database-name}sheet:type: stringtitle: sheetdescription: |-The resource name of the sheet.Format: projects/{project}/sheets/{sheet}- format:- title: format- description: The format of the exported file.- $ref: '#/components/schemas/bytebase.v1.ExportFormat'- password:- type:- - string- - "null"- title: password- description: |-- The zip password provided by users.- Leave it empty if no needs to encrypt the zip file.- nullable: truetitle: DatabaseDataExportadditionalProperties: falsedescription: Payload for exporting database data.bytebase.v1.Task.DatabaseUpdate:type: object- allOf:+ oneOf:- properties:- schemaVersion:+ release:type: string- title: schema_version- description: The target schema version after this update.- - oneOf:- - properties:- release:- type: string- title: release- description: 'Format: projects/{project}/releases/{release}'title: release- required:- - release- - properties:- sheet:- type: string- title: sheet- description: 'Format: projects/{project}/sheets/{sheet}'+ description: 'Format: projects/{project}/releases/{release}'+ title: release+ required:+ - release+ - properties:+ sheet:+ type: stringtitle: sheet- required:- - sheet+ description: 'Format: projects/{project}/sheets/{sheet}'+ title: sheet+ required:+ - sheettitle: DatabaseUpdateadditionalProperties: falsedescription: Payload for updating a database schema.diff --git a/backend/api/v1/rollout_service_converter.go b/backend/api/v1/rollout_service_converter.goindex 30bb2d45f6..b73a27e803 100644--- a/backend/api/v1/rollout_service_converter.go+++ b/backend/api/v1/rollout_service_converter.go@@ -247,13 +247,7 @@ func convertToTaskFromDatabaseCreate(project *store.ProjectMessage, task *store.Target: common.FormatInstance(task.InstanceID),Payload: &v1pb.Task_DatabaseCreate_{DatabaseCreate: &v1pb.Task_DatabaseCreate{- Project: "",- Database: task.Payload.GetDatabaseName(),- Table: task.Payload.GetTableName(),- Sheet: common.FormatSheet(project.ResourceID, task.Payload.GetSheetSha256()),- CharacterSet: task.Payload.GetCharacterSet(),- Collation: task.Payload.GetCollation(),- Environment: common.FormatEnvironment(task.Payload.GetEnvironmentId()),+ Sheet: common.FormatSheet(project.ResourceID, task.Payload.GetSheetSha256()),},},}@@ -316,10 +310,7 @@ func convertToTaskFromDatabaseDataExport(project *store.ProjectMessage, task *stsheet := common.FormatSheet(project.ResourceID, task.Payload.GetSheetSha256())v1pbTaskPayload := v1pb.Task_DatabaseDataExport_{DatabaseDataExport: &v1pb.Task_DatabaseDataExport{- Target: targetDatabaseName,- Sheet: sheet,- Format: convertExportFormat(task.Payload.GetFormat()),- Password: &task.Payload.Password,+ Sheet: sheet,},}stageID := common.FormatStageID(task.Environment)diff --git a/backend/api/v1/rollout_service_task.go b/backend/api/v1/rollout_service_task.goindex c203160af7..91bfd9ac52 100644--- a/backend/api/v1/rollout_service_task.go+++ b/backend/api/v1/rollout_service_task.go@@ -156,12 +156,7 @@ func getTaskCreatesFromCreateDatabaseConfig(ctx context.Context, s *store.Store,Environment: effectiveEnvironmentID,Type: storepb.Task_DATABASE_CREATE,Payload: &storepb.Task{- SpecId: spec.Id,- CharacterSet: c.CharacterSet,- TableName: c.Table,- Collation: c.Collation,- EnvironmentId: dbEnvironmentID,- DatabaseName: databaseName,+ SpecId: spec.Id,Source: &storepb.Task_SheetSha256{SheetSha256: sheet.Sha256,},@@ -303,10 +298,6 @@ func getTaskCreatesFromExportDataConfig(Source: &storepb.Task_SheetSha256{SheetSha256: c.SheetSha256,},- Format: c.Format,- }- if c.Password != nil {- payload.Password = *c.Password}tasks := []*store.TaskMessage{}diff --git a/backend/api/v1/sql_service.go b/backend/api/v1/sql_service.goindex 529214602d..aa8d7a513a 100644--- a/backend/api/v1/sql_service.go+++ b/backend/api/v1/sql_service.go@@ -901,6 +901,15 @@ func (s *SQLService) doExportFromIssue(ctx context.Context, requestName string)return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("rollout %d has no task", plan.UID))}+ // Get password from the plan spec+ // For export data plans, there is always exactly one spec+ var passwordStr string+ if len(plan.Config.Specs) > 0 {+ if exportConfig := plan.Config.Specs[0].GetExportDataConfig(); exportConfig != nil && exportConfig.Password != nil {+ passwordStr = *exportConfig.Password+ }+ }+pendingEncrypts := []*encryptContent{}targetTaskRunStatus := []storepb.TaskRun_Status{storepb.TaskRun_DONE}@@ -954,7 +963,7 @@ func (s *SQLService) doExportFromIssue(ctx context.Context, requestName string)}}- encryptedBytes, err := doEncrypt(pendingEncrypts, tasks[0].Payload.GetPassword())+ encryptedBytes, err := doEncrypt(pendingEncrypts, passwordStr)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to encrypt data: %v", err))}diff --git a/backend/generated-go/store/task.pb.go b/backend/generated-go/store/task.pb.goindex c21d9535c4..eec764cf7c 100644--- a/backend/generated-go/store/task.pb.go+++ b/backend/generated-go/store/task.pb.go@@ -88,16 +88,6 @@ type Task struct {SkippedReason string `protobuf:"bytes,2,opt,name=skipped_reason,json=skippedReason,proto3" json:"skipped_reason,omitempty"`// UUID that identifies the spec this task implements.SpecId string `protobuf:"bytes,3,opt,name=spec_id,json=specId,proto3" json:"spec_id,omitempty"`- // The environment where the database will be created.- EnvironmentId string `protobuf:"bytes,5,opt,name=environment_id,json=environmentId,proto3" json:"environment_id,omitempty"`- // Name of the database to create.- DatabaseName string `protobuf:"bytes,6,opt,name=database_name,json=databaseName,proto3" json:"database_name,omitempty"`- // Optional table name to create (required for some databases like MongoDB).- TableName string `protobuf:"bytes,7,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`- // Character set for the new database.- CharacterSet string `protobuf:"bytes,8,opt,name=character_set,json=characterSet,proto3" json:"character_set,omitempty"`- // Collation for the new database.- Collation string `protobuf:"bytes,9,opt,name=collation,proto3" json:"collation,omitempty"`// Source of the task's SQL content - either a single sheet or an entire release.//// Types that are valid to be assigned to Source:@@ -109,10 +99,6 @@ type Task struct {EnablePriorBackup bool `protobuf:"varint,11,opt,name=enable_prior_backup,json=enablePriorBackup,proto3" json:"enable_prior_backup,omitempty"`// Configuration flags for gh-ost migration tool.Flags map[string]string `protobuf:"bytes,12,rep,name=flags,proto3" json:"flags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`- // Password to encrypt the exported data archive.- Password string `protobuf:"bytes,14,opt,name=password,proto3" json:"password,omitempty"`- // Format of the exported data (SQL, CSV, JSON, etc).- Format ExportFormat `protobuf:"varint,15,opt,name=format,proto3,enum=bytebase.store.ExportFormat" json:"format,omitempty"`// Whether to use gh-ost for online schema migration.EnableGhost bool `protobuf:"varint,16,opt,name=enable_ghost,json=enableGhost,proto3" json:"enable_ghost,omitempty"`unknownFields protoimpl.UnknownFields@@ -170,41 +156,6 @@ func (x *Task) GetSpecId() string {return ""}-func (x *Task) GetEnvironmentId() string {- if x != nil {- return x.EnvironmentId- }- return ""-}--func (x *Task) GetDatabaseName() string {- if x != nil {- return x.DatabaseName- }- return ""-}--func (x *Task) GetTableName() string {- if x != nil {- return x.TableName- }- return ""-}--func (x *Task) GetCharacterSet() string {- if x != nil {- return x.CharacterSet- }- return ""-}--func (x *Task) GetCollation() string {- if x != nil {- return x.Collation- }- return ""-}-func (x *Task) GetSource() isTask_Source {if x != nil {return x.Source@@ -244,20 +195,6 @@ func (x *Task) GetFlags() map[string]string {return nil}-func (x *Task) GetPassword() string {- if x != nil {- return x.Password- }- return ""-}--func (x *Task) GetFormat() ExportFormat {- if x != nil {- return x.Format- }- return ExportFormat_FORMAT_UNSPECIFIED-}-func (x *Task) GetEnableGhost() bool {if x != nil {return x.EnableGhost@@ -289,24 +226,16 @@ var File_store_task_proto protoreflect.FileDescriptorconst file_store_task_proto_rawDesc = "" +"\n" +- "\x10store/task.proto\x12\x0ebytebase.store\x1a\x12store/common.proto\"\xd2\x05\n" ++ "\x10store/task.proto\x12\x0ebytebase.store\"\xd2\x03\n" +"\x04Task\x12\x18\n" +"\askipped\x18\x01 \x01(\bR\askipped\x12%\n" +"\x0eskipped_reason\x18\x02 \x01(\tR\rskippedReason\x12\x17\n" +- "\aspec_id\x18\x03 \x01(\tR\x06specId\x12%\n" +- "\x0eenvironment_id\x18\x05 \x01(\tR\renvironmentId\x12#\n" +- "\rdatabase_name\x18\x06 \x01(\tR\fdatabaseName\x12\x1d\n" +- "\n" +- "table_name\x18\a \x01(\tR\ttableName\x12#\n" +- "\rcharacter_set\x18\b \x01(\tR\fcharacterSet\x12\x1c\n" +- "\tcollation\x18\t \x01(\tR\tcollation\x12#\n" ++ "\aspec_id\x18\x03 \x01(\tR\x06specId\x12#\n" +"\fsheet_sha256\x18\n" +" \x01(\tH\x00R\vsheetSha256\x12\x1a\n" +"\arelease\x18\r \x01(\tH\x00R\arelease\x12.\n" +"\x13enable_prior_backup\x18\v \x01(\bR\x11enablePriorBackup\x125\n" +- "\x05flags\x18\f \x03(\v2\x1f.bytebase.store.Task.FlagsEntryR\x05flags\x12\x1a\n" +- "\bpassword\x18\x0e \x01(\tR\bpassword\x124\n" +- "\x06format\x18\x0f \x01(\x0e2\x1c.bytebase.store.ExportFormatR\x06format\x12!\n" ++ "\x05flags\x18\f \x03(\v2\x1f.bytebase.store.Task.FlagsEntryR\x05flags\x12!\n" +"\fenable_ghost\x18\x10 \x01(\bR\venableGhost\x1a8\n" +"\n" +"FlagsEntry\x12\x10\n" +@@ -335,19 +264,17 @@ func file_store_task_proto_rawDescGZIP() []byte {var file_store_task_proto_enumTypes = make([]protoimpl.EnumInfo, 1)var file_store_task_proto_msgTypes = make([]protoimpl.MessageInfo, 2)var file_store_task_proto_goTypes = []any{- (Task_Type)(0), // 0: bytebase.store.Task.Type- (*Task)(nil), // 1: bytebase.store.Task- nil, // 2: bytebase.store.Task.FlagsEntry- (ExportFormat)(0), // 3: bytebase.store.ExportFormat+ (Task_Type)(0), // 0: bytebase.store.Task.Type+ (*Task)(nil), // 1: bytebase.store.Task+ nil, // 2: bytebase.store.Task.FlagsEntry}var file_store_task_proto_depIdxs = []int32{2, // 0: bytebase.store.Task.flags:type_name -> bytebase.store.Task.FlagsEntry- 3, // 1: bytebase.store.Task.format:type_name -> bytebase.store.ExportFormat- 2, // [2:2] is the sub-list for method output_type- 2, // [2:2] is the sub-list for method input_type- 2, // [2:2] is the sub-list for extension type_name- 2, // [2:2] is the sub-list for extension extendee- 0, // [0:2] is the sub-list for field type_name+ 1, // [1:1] is the sub-list for method output_type+ 1, // [1:1] is the sub-list for method input_type+ 1, // [1:1] is the sub-list for extension type_name+ 1, // [1:1] is the sub-list for extension extendee+ 0, // [0:1] is the sub-list for field type_name}func init() { file_store_task_proto_init() }@@ -355,7 +282,6 @@ func file_store_task_proto_init() {if File_store_task_proto != nil {return}- file_store_common_proto_init()file_store_task_proto_msgTypes[0].OneofWrappers = []any{(*Task_SheetSha256)(nil),(*Task_Release)(nil),diff --git a/backend/generated-go/store/task_equal.pb.go b/backend/generated-go/store/task_equal.pb.goindex ed5741bbae..c55a0060be 100644--- a/backend/generated-go/store/task_equal.pb.go+++ b/backend/generated-go/store/task_equal.pb.go@@ -19,21 +19,6 @@ func (x *Task) Equal(y *Task) bool {if x.SpecId != y.SpecId {return false}- if x.EnvironmentId != y.EnvironmentId {- return false- }- if x.DatabaseName != y.DatabaseName {- return false- }- if x.TableName != y.TableName {- return false- }- if x.CharacterSet != y.CharacterSet {- return false- }- if x.Collation != y.Collation {- return false- }if x.GetSheetSha256() != y.GetSheetSha256() {return false}@@ -55,12 +40,6 @@ func (x *Task) Equal(y *Task) bool {return false}}- if x.Password != y.Password {- return false- }- if x.Format != y.Format {- return false- }if x.EnableGhost != y.EnableGhost {return false}diff --git a/backend/generated-go/v1/rollout_service.pb.go b/backend/generated-go/v1/rollout_service.pb.goindex 872fa87ed9..8f4f86d45b 100644--- a/backend/generated-go/v1/rollout_service.pb.go+++ b/backend/generated-go/v1/rollout_service.pb.go@@ -2011,21 +2011,8 @@ func (x *PreviewTaskRunRollbackResponse) GetStatement() string {// Payload for creating a new database.type Task_DatabaseCreate struct {state protoimpl.MessageState `protogen:"open.v1"`- // The project owning the database.- // Format: projects/{project}- Project string `protobuf:"bytes,1,opt,name=project,proto3" json:"project,omitempty"`- // Database name.- Database string `protobuf:"bytes,2,opt,name=database,proto3" json:"database,omitempty"`- // Table name.- Table string `protobuf:"bytes,3,opt,name=table,proto3" json:"table,omitempty"`// Format: projects/{project}/sheets/{sheet}- Sheet string `protobuf:"bytes,4,opt,name=sheet,proto3" json:"sheet,omitempty"`- // The character set for the database.- CharacterSet string `protobuf:"bytes,5,opt,name=character_set,json=characterSet,proto3" json:"character_set,omitempty"`- // The collation for the database.- Collation string `protobuf:"bytes,6,opt,name=collation,proto3" json:"collation,omitempty"`- // The environment the database belongs to.- Environment string `protobuf:"bytes,7,opt,name=environment,proto3" json:"environment,omitempty"`+ Sheet string `protobuf:"bytes,4,opt,name=sheet,proto3" json:"sheet,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}@@ -2060,27 +2047,6 @@ func (*Task_DatabaseCreate) Descriptor() ([]byte, []int) {return file_v1_rollout_service_proto_rawDescGZIP(), []int{16, 0}}-func (x *Task_DatabaseCreate) GetProject() string {- if x != nil {- return x.Project- }- return ""-}--func (x *Task_DatabaseCreate) GetDatabase() string {- if x != nil {- return x.Database- }- return ""-}--func (x *Task_DatabaseCreate) GetTable() string {- if x != nil {- return x.Table- }- return ""-}-func (x *Task_DatabaseCreate) GetSheet() string {if x != nil {return x.Sheet@@ -2088,27 +2054,6 @@ func (x *Task_DatabaseCreate) GetSheet() string {return ""}-func (x *Task_DatabaseCreate) GetCharacterSet() string {- if x != nil {- return x.CharacterSet- }- return ""-}--func (x *Task_DatabaseCreate) GetCollation() string {- if x != nil {- return x.Collation- }- return ""-}--func (x *Task_DatabaseCreate) GetEnvironment() string {- if x != nil {- return x.Environment- }- return ""-}-// Payload for updating a database schema.type Task_DatabaseUpdate struct {state protoimpl.MessageState `protogen:"open.v1"`@@ -2118,9 +2063,7 @@ type Task_DatabaseUpdate struct {//// *Task_DatabaseUpdate_Sheet// *Task_DatabaseUpdate_Release- Source isTask_DatabaseUpdate_Source `protobuf_oneof:"source"`- // The target schema version after this update.- SchemaVersion string `protobuf:"bytes,2,opt,name=schema_version,json=schemaVersion,proto3" json:"schema_version,omitempty"`+ Source isTask_DatabaseUpdate_Source `protobuf_oneof:"source"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}@@ -2180,13 +2123,6 @@ func (x *Task_DatabaseUpdate) GetRelease() string {return ""}-func (x *Task_DatabaseUpdate) GetSchemaVersion() string {- if x != nil {- return x.SchemaVersion- }- return ""-}-type isTask_DatabaseUpdate_Source interface {isTask_DatabaseUpdate_Source()}@@ -2208,17 +2144,9 @@ func (*Task_DatabaseUpdate_Release) isTask_DatabaseUpdate_Source() {}// Payload for exporting database data.type Task_DatabaseDataExport struct {state protoimpl.MessageState `protogen:"open.v1"`- // The resource name of the target.- // Format: instances/{instance-id}/databases/{database-name}- Target string `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"`// The resource name of the sheet.// Format: projects/{project}/sheets/{sheet}- Sheet string `protobuf:"bytes,2,opt,name=sheet,proto3" json:"sheet,omitempty"`- // The format of the exported file.- Format ExportFormat `protobuf:"varint,3,opt,name=format,proto3,enum=bytebase.v1.ExportFormat" json:"format,omitempty"`- // The zip password provided by users.- // Leave it empty if no needs to encrypt the zip file.- Password *string `protobuf:"bytes,4,opt,name=password,proto3,oneof" json:"password,omitempty"`+ Sheet string `protobuf:"bytes,2,opt,name=sheet,proto3" json:"sheet,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}@@ -2253,13 +2181,6 @@ func (*Task_DatabaseDataExport) Descriptor() ([]byte, []int) {return file_v1_rollout_service_proto_rawDescGZIP(), []int{16, 2}}-func (x *Task_DatabaseDataExport) GetTarget() string {- if x != nil {- return x.Target- }- return ""-}-func (x *Task_DatabaseDataExport) GetSheet() string {if x != nil {return x.Sheet@@ -2267,20 +2188,6 @@ func (x *Task_DatabaseDataExport) GetSheet() string {return ""}-func (x *Task_DatabaseDataExport) GetFormat() ExportFormat {- if x != nil {- return x.Format- }- return ExportFormat_FORMAT_UNSPECIFIED-}--func (x *Task_DatabaseDataExport) GetPassword() string {- if x != nil && x.Password != nil {- return *x.Password- }- return ""-}-// Information about task run scheduling.type TaskRun_SchedulerInfo struct {state protoimpl.MessageState `protogen:"open.v1"`@@ -3472,7 +3379,7 @@ const file_v1_rollout_service_proto_rawDesc = "" +"\x02id\x18\x02 \x01(\tB\x03\xe0A\x03R\x02id\x12 \n" +"\venvironment\x18\x03 \x01(\tR\venvironment\x12'\n" +"\x05tasks\x18\x04 \x03(\v2\x11.bytebase.v1.TaskR\x05tasks:O\xeaAL\n" +- "\x12bytebase.com/Stage\x126projects/{project}/plans/{plan}/rollout/stages/{stage}\"\xb1\v\n" ++ "\x12bytebase.com/Stage\x126projects/{project}/plans/{plan}/rollout/stages/{stage}\"\xde\b\n" +"\x04Task\x12\x12\n" +"\x04name\x18\x01 \x01(\tR\x04name\x12\x17\n" +"\aspec_id\x18\x02 \x01(\tR\x06specId\x120\n" +@@ -3486,26 +3393,15 @@ const file_v1_rollout_service_proto_rawDesc = "" +"\vupdate_time\x18\n" +" \x01(\v2\x1a.google.protobuf.TimestampB\x03\xe0A\x03H\x01R\n" +"updateTime\x88\x01\x01\x12?\n" +- "\brun_time\x18\v \x01(\v2\x1a.google.protobuf.TimestampB\x03\xe0A\x03H\x02R\arunTime\x88\x01\x01\x1a\xd7\x01\n" +- "\x0eDatabaseCreate\x12\x18\n" +- "\aproject\x18\x01 \x01(\tR\aproject\x12\x1a\n" +- "\bdatabase\x18\x02 \x01(\tR\bdatabase\x12\x14\n" +- "\x05table\x18\x03 \x01(\tR\x05table\x12\x14\n" +- "\x05sheet\x18\x04 \x01(\tR\x05sheet\x12#\n" +- "\rcharacter_set\x18\x05 \x01(\tR\fcharacterSet\x12\x1c\n" +- "\tcollation\x18\x06 \x01(\tR\tcollation\x12 \n" +- "\venvironment\x18\a \x01(\tR\venvironment\x1au\n" ++ "\brun_time\x18\v \x01(\v2\x1a.google.protobuf.TimestampB\x03\xe0A\x03H\x02R\arunTime\x88\x01\x01\x1a&\n" ++ "\x0eDatabaseCreate\x12\x14\n" ++ "\x05sheet\x18\x04 \x01(\tR\x05sheet\x1aN\n" +"\x0eDatabaseUpdate\x12\x16\n" +"\x05sheet\x18\x01 \x01(\tH\x00R\x05sheet\x12\x1a\n" +- "\arelease\x18\x04 \x01(\tH\x00R\arelease\x12%\n" +- "\x0eschema_version\x18\x02 \x01(\tR\rschemaVersionB\b\n" +- "\x06source\x1a\xa3\x01\n" +- "\x12DatabaseDataExport\x12\x16\n" +- "\x06target\x18\x01 \x01(\tR\x06target\x12\x14\n" +- "\x05sheet\x18\x02 \x01(\tR\x05sheet\x121\n" +- "\x06format\x18\x03 \x01(\x0e2\x19.bytebase.v1.ExportFormatR\x06format\x12\x1f\n" +- "\bpassword\x18\x04 \x01(\tH\x00R\bpassword\x88\x01\x01B\v\n" +- "\t_password\"|\n" ++ "\arelease\x18\x04 \x01(\tH\x00R\areleaseB\b\n" ++ "\x06source\x1a*\n" ++ "\x12DatabaseDataExport\x12\x14\n" ++ "\x05sheet\x18\x02 \x01(\tR\x05sheet\"|\n" +"\x06Status\x12\x16\n" +"\x12STATUS_UNSPECIFIED\x10\x00\x12\x0f\n" +"\vNOT_STARTED\x10\x01\x12\v\n" +@@ -3785,9 +3681,8 @@ var file_v1_rollout_service_proto_goTypes = []any{(*TaskRunSession_Postgres)(nil), // 47: bytebase.v1.TaskRunSession.Postgres(*TaskRunSession_Postgres_Session)(nil), // 48: bytebase.v1.TaskRunSession.Postgres.Session(*timestamppb.Timestamp)(nil), // 49: google.protobuf.Timestamp- (ExportFormat)(0), // 50: bytebase.v1.ExportFormat- (*Range)(nil), // 51: bytebase.v1.Range- (*Position)(nil), // 52: bytebase.v1.Position+ (*Range)(nil), // 50: bytebase.v1.Range+ (*Position)(nil), // 51: bytebase.v1.Position}var file_v1_rollout_service_proto_depIdxs = []int32{49, // 0: bytebase.v1.BatchRunTasksRequest.run_time:type_name -> google.protobuf.Timestamp@@ -3823,61 +3718,60 @@ var file_v1_rollout_service_proto_depIdxs = []int32{41, // 30: bytebase.v1.TaskRunLogEntry.compute_diff:type_name -> bytebase.v1.TaskRunLogEntry.ComputeDiff42, // 31: bytebase.v1.TaskRunLogEntry.release_file_execute:type_name -> bytebase.v1.TaskRunLogEntry.ReleaseFileExecute47, // 32: bytebase.v1.TaskRunSession.postgres:type_name -> bytebase.v1.TaskRunSession.Postgres- 50, // 33: bytebase.v1.Task.DatabaseDataExport.format:type_name -> bytebase.v1.ExportFormat- 49, // 34: bytebase.v1.TaskRun.SchedulerInfo.report_time:type_name -> google.protobuf.Timestamp- 34, // 35: bytebase.v1.TaskRun.SchedulerInfo.waiting_cause:type_name -> bytebase.v1.TaskRun.SchedulerInfo.WaitingCause- 49, // 36: bytebase.v1.TaskRunLogEntry.SchemaDump.start_time:type_name -> google.protobuf.Timestamp- 49, // 37: bytebase.v1.TaskRunLogEntry.SchemaDump.end_time:type_name -> google.protobuf.Timestamp- 49, // 38: bytebase.v1.TaskRunLogEntry.CommandExecute.log_time:type_name -> google.protobuf.Timestamp- 51, // 39: bytebase.v1.TaskRunLogEntry.CommandExecute.range:type_name -> bytebase.v1.Range- 43, // 40: bytebase.v1.TaskRunLogEntry.CommandExecute.response:type_name -> bytebase.v1.TaskRunLogEntry.CommandExecute.CommandResponse- 49, // 41: bytebase.v1.TaskRunLogEntry.DatabaseSync.start_time:type_name -> google.protobuf.Timestamp- 49, // 42: bytebase.v1.TaskRunLogEntry.DatabaseSync.end_time:type_name -> google.protobuf.Timestamp- 5, // 43: bytebase.v1.TaskRunLogEntry.TransactionControl.type:type_name -> bytebase.v1.TaskRunLogEntry.TransactionControl.Type- 49, // 44: bytebase.v1.TaskRunLogEntry.PriorBackup.start_time:type_name -> google.protobuf.Timestamp- 49, // 45: bytebase.v1.TaskRunLogEntry.PriorBackup.end_time:type_name -> google.protobuf.Timestamp- 44, // 46: bytebase.v1.TaskRunLogEntry.PriorBackup.prior_backup_detail:type_name -> bytebase.v1.TaskRunLogEntry.PriorBackup.PriorBackupDetail- 49, // 47: bytebase.v1.TaskRunLogEntry.ComputeDiff.start_time:type_name -> google.protobuf.Timestamp- 49, // 48: bytebase.v1.TaskRunLogEntry.ComputeDiff.end_time:type_name -> google.protobuf.Timestamp- 49, // 49: bytebase.v1.TaskRunLogEntry.CommandExecute.CommandResponse.log_time:type_name -> google.protobuf.Timestamp- 45, // 50: bytebase.v1.TaskRunLogEntry.PriorBackup.PriorBackupDetail.items:type_name -> bytebase.v1.TaskRunLogEntry.PriorBackup.PriorBackupDetail.Item- 46, // 51: bytebase.v1.TaskRunLogEntry.PriorBackup.PriorBackupDetail.Item.source_table:type_name -> bytebase.v1.TaskRunLogEntry.PriorBackup.PriorBackupDetail.Item.Table- 46, // 52: bytebase.v1.TaskRunLogEntry.PriorBackup.PriorBackupDetail.Item.target_table:type_name -> bytebase.v1.TaskRunLogEntry.PriorBackup.PriorBackupDetail.Item.Table- 52, // 53: bytebase.v1.TaskRunLogEntry.PriorBackup.PriorBackupDetail.Item.start_position:type_name -> bytebase.v1.Position- 52, // 54: bytebase.v1.TaskRunLogEntry.PriorBackup.PriorBackupDetail.Item.end_position:type_name -> bytebase.v1.Position- 48, // 55: bytebase.v1.TaskRunSession.Postgres.session:type_name -> bytebase.v1.TaskRunSession.Postgres.Session- 48, // 56: bytebase.v1.TaskRunSession.Postgres.blocking_sessions:type_name -> bytebase.v1.TaskRunSession.Postgres.Session- 48, // 57: bytebase.v1.TaskRunSession.Postgres.blocked_sessions:type_name -> bytebase.v1.TaskRunSession.Postgres.Session- 49, // 58: bytebase.v1.TaskRunSession.Postgres.Session.backend_start:type_name -> google.protobuf.Timestamp- 49, // 59: bytebase.v1.TaskRunSession.Postgres.Session.xact_start:type_name -> google.protobuf.Timestamp- 49, // 60: bytebase.v1.TaskRunSession.Postgres.Session.query_start:type_name -> google.protobuf.Timestamp- 12, // 61: bytebase.v1.RolloutService.GetRollout:input_type -> bytebase.v1.GetRolloutRequest- 13, // 62: bytebase.v1.RolloutService.ListRollouts:input_type -> bytebase.v1.ListRolloutsRequest- 15, // 63: bytebase.v1.RolloutService.CreateRollout:input_type -> bytebase.v1.CreateRolloutRequest- 16, // 64: bytebase.v1.RolloutService.ListTaskRuns:input_type -> bytebase.v1.ListTaskRunsRequest- 18, // 65: bytebase.v1.RolloutService.GetTaskRun:input_type -> bytebase.v1.GetTaskRunRequest- 19, // 66: bytebase.v1.RolloutService.GetTaskRunLog:input_type -> bytebase.v1.GetTaskRunLogRequest- 26, // 67: bytebase.v1.RolloutService.GetTaskRunSession:input_type -> bytebase.v1.GetTaskRunSessionRequest- 6, // 68: bytebase.v1.RolloutService.BatchRunTasks:input_type -> bytebase.v1.BatchRunTasksRequest- 8, // 69: bytebase.v1.RolloutService.BatchSkipTasks:input_type -> bytebase.v1.BatchSkipTasksRequest- 10, // 70: bytebase.v1.RolloutService.BatchCancelTaskRuns:input_type -> bytebase.v1.BatchCancelTaskRunsRequest- 28, // 71: bytebase.v1.RolloutService.PreviewTaskRunRollback:input_type -> bytebase.v1.PreviewTaskRunRollbackRequest- 20, // 72: bytebase.v1.RolloutService.GetRollout:output_type -> bytebase.v1.Rollout- 14, // 73: bytebase.v1.RolloutService.ListRollouts:output_type -> bytebase.v1.ListRolloutsResponse- 20, // 74: bytebase.v1.RolloutService.CreateRollout:output_type -> bytebase.v1.Rollout- 17, // 75: bytebase.v1.RolloutService.ListTaskRuns:output_type -> bytebase.v1.ListTaskRunsResponse- 23, // 76: bytebase.v1.RolloutService.GetTaskRun:output_type -> bytebase.v1.TaskRun- 24, // 77: bytebase.v1.RolloutService.GetTaskRunLog:output_type -> bytebase.v1.TaskRunLog- 27, // 78: bytebase.v1.RolloutService.GetTaskRunSession:output_type -> bytebase.v1.TaskRunSession- 7, // 79: bytebase.v1.RolloutService.BatchRunTasks:output_type -> bytebase.v1.BatchRunTasksResponse- 9, // 80: bytebase.v1.RolloutService.BatchSkipTasks:output_type -> bytebase.v1.BatchSkipTasksResponse- 11, // 81: bytebase.v1.RolloutService.BatchCancelTaskRuns:output_type -> bytebase.v1.BatchCancelTaskRunsResponse- 29, // 82: bytebase.v1.RolloutService.PreviewTaskRunRollback:output_type -> bytebase.v1.PreviewTaskRunRollbackResponse- 72, // [72:83] is the sub-list for method output_type- 61, // [61:72] is the sub-list for method input_type- 61, // [61:61] is the sub-list for extension type_name- 61, // [61:61] is the sub-list for extension extendee- 0, // [0:61] is the sub-list for field type_name+ 49, // 33: bytebase.v1.TaskRun.SchedulerInfo.report_time:type_name -> google.protobuf.Timestamp+ 34, // 34: bytebase.v1.TaskRun.SchedulerInfo.waiting_cause:type_name -> bytebase.v1.TaskRun.SchedulerInfo.WaitingCause+ 49, // 35: bytebase.v1.TaskRunLogEntry.SchemaDump.start_time:type_name -> google.protobuf.Timestamp+ 49, // 36: bytebase.v1.TaskRunLogEntry.SchemaDump.end_time:type_name -> google.protobuf.Timestamp+ 49, // 37: bytebase.v1.TaskRunLogEntry.CommandExecute.log_time:type_name -> google.protobuf.Timestamp+ 50, // 38: bytebase.v1.TaskRunLogEntry.CommandExecute.range:type_name -> bytebase.v1.Range+ 43, // 39: bytebase.v1.TaskRunLogEntry.CommandExecute.response:type_name -> bytebase.v1.TaskRunLogEntry.CommandExecute.CommandResponse+ 49, // 40: bytebase.v1.TaskRunLogEntry.DatabaseSync.start_time:type_name -> google.protobuf.Timestamp+ 49, // 41: bytebase.v1.TaskRunLogEntry.DatabaseSync.end_time:type_name -> google.protobuf.Timestamp+ 5, // 42: bytebase.v1.TaskRunLogEntry.TransactionControl.type:type_name -> bytebase.v1.TaskRunLogEntry.TransactionControl.Type+ 49, // 43: bytebase.v1.TaskRunLogEntry.PriorBackup.start_time:type_name -> google.protobuf.Timestamp+ 49, // 44: bytebase.v1.TaskRunLogEntry.PriorBackup.end_time:type_name -> google.protobuf.Timestamp+ 44, // 45: bytebase.v1.TaskRunLogEntry.PriorBackup.prior_backup_detail:type_name -> bytebase.v1.TaskRunLogEntry.PriorBackup.PriorBackupDetail+ 49, // 46: bytebase.v1.TaskRunLogEntry.ComputeDiff.start_time:type_name -> google.protobuf.Timestamp+ 49, // 47: bytebase.v1.TaskRunLogEntry.ComputeDiff.end_time:type_name -> google.protobuf.Timestamp+ 49, // 48: bytebase.v1.TaskRunLogEntry.CommandExecute.CommandResponse.log_time:type_name -> google.protobuf.Timestamp+ 45, // 49: bytebase.v1.TaskRunLogEntry.PriorBackup.PriorBackupDetail.items:type_name -> bytebase.v1.TaskRunLogEntry.PriorBackup.PriorBackupDetail.Item+ 46, // 50: bytebase.v1.TaskRunLogEntry.PriorBackup.PriorBackupDetail.Item.source_table:type_name -> bytebase.v1.TaskRunLogEntry.PriorBackup.PriorBackupDetail.Item.Table+ 46, // 51: bytebase.v1.TaskRunLogEntry.PriorBackup.PriorBackupDetail.Item.target_table:type_name -> bytebase.v1.TaskRunLogEntry.PriorBackup.PriorBackupDetail.Item.Table+ 51, // 52: bytebase.v1.TaskRunLogEntry.PriorBackup.PriorBackupDetail.Item.start_position:type_name -> bytebase.v1.Position+ 51, // 53: bytebase.v1.TaskRunLogEntry.PriorBackup.PriorBackupDetail.Item.end_position:type_name -> bytebase.v1.Position+ 48, // 54: bytebase.v1.TaskRunSession.Postgres.session:type_name -> bytebase.v1.TaskRunSession.Postgres.Session+ 48, // 55: bytebase.v1.TaskRunSession.Postgres.blocking_sessions:type_name -> bytebase.v1.TaskRunSession.Postgres.Session+ 48, // 56: bytebase.v1.TaskRunSession.Postgres.blocked_sessions:type_name -> bytebase.v1.TaskRunSession.Postgres.Session+ 49, // 57: bytebase.v1.TaskRunSession.Postgres.Session.backend_start:type_name -> google.protobuf.Timestamp+ 49, // 58: bytebase.v1.TaskRunSession.Postgres.Session.xact_start:type_name -> google.protobuf.Timestamp+ 49, // 59: bytebase.v1.TaskRunSession.Postgres.Session.query_start:type_name -> google.protobuf.Timestamp+ 12, // 60: bytebase.v1.RolloutService.GetRollout:input_type -> bytebase.v1.GetRolloutRequest+ 13, // 61: bytebase.v1.RolloutService.ListRollouts:input_type -> bytebase.v1.ListRolloutsRequest+ 15, // 62: bytebase.v1.RolloutService.CreateRollout:input_type -> bytebase.v1.CreateRolloutRequest+ 16, // 63: bytebase.v1.RolloutService.ListTaskRuns:input_type -> bytebase.v1.ListTaskRunsRequest+ 18, // 64: bytebase.v1.RolloutService.GetTaskRun:input_type -> bytebase.v1.GetTaskRunRequest+ 19, // 65: bytebase.v1.RolloutService.GetTaskRunLog:input_type -> bytebase.v1.GetTaskRunLogRequest+ 26, // 66: bytebase.v1.RolloutService.GetTaskRunSession:input_type -> bytebase.v1.GetTaskRunSessionRequest+ 6, // 67: bytebase.v1.RolloutService.BatchRunTasks:input_type -> bytebase.v1.BatchRunTasksRequest+ 8, // 68: bytebase.v1.RolloutService.BatchSkipTasks:input_type -> bytebase.v1.BatchSkipTasksRequest+ 10, // 69: bytebase.v1.RolloutService.BatchCancelTaskRuns:input_type -> bytebase.v1.BatchCancelTaskRunsRequest+ 28, // 70: bytebase.v1.RolloutService.PreviewTaskRunRollback:input_type -> bytebase.v1.PreviewTaskRunRollbackRequest+ 20, // 71: bytebase.v1.RolloutService.GetRollout:output_type -> bytebase.v1.Rollout+ 14, // 72: bytebase.v1.RolloutService.ListRollouts:output_type -> bytebase.v1.ListRolloutsResponse+ 20, // 73: bytebase.v1.RolloutService.CreateRollout:output_type -> bytebase.v1.Rollout+ 17, // 74: bytebase.v1.RolloutService.ListTaskRuns:output_type -> bytebase.v1.ListTaskRunsResponse+ 23, // 75: bytebase.v1.RolloutService.GetTaskRun:output_type -> bytebase.v1.TaskRun+ 24, // 76: bytebase.v1.RolloutService.GetTaskRunLog:output_type -> bytebase.v1.TaskRunLog+ 27, // 77: bytebase.v1.RolloutService.GetTaskRunSession:output_type -> bytebase.v1.TaskRunSession+ 7, // 78: bytebase.v1.RolloutService.BatchRunTasks:output_type -> bytebase.v1.BatchRunTasksResponse+ 9, // 79: bytebase.v1.RolloutService.BatchSkipTasks:output_type -> bytebase.v1.BatchSkipTasksResponse+ 11, // 80: bytebase.v1.RolloutService.BatchCancelTaskRuns:output_type -> bytebase.v1.BatchCancelTaskRunsResponse+ 29, // 81: bytebase.v1.RolloutService.PreviewTaskRunRollback:output_type -> bytebase.v1.PreviewTaskRunRollbackResponse+ 71, // [71:82] is the sub-list for method output_type+ 60, // [60:71] is the sub-list for method input_type+ 60, // [60:60] is the sub-list for extension type_name+ 60, // [60:60] is the sub-list for extension extendee+ 0, // [0:60] is the sub-list for field type_name}func init() { file_v1_rollout_service_proto_init() }@@ -3902,7 +3796,6 @@ func file_v1_rollout_service_proto_init() {(*Task_DatabaseUpdate_Sheet)(nil),(*Task_DatabaseUpdate_Release)(nil),}- file_v1_rollout_service_proto_msgTypes[26].OneofWrappers = []any{}file_v1_rollout_service_proto_msgTypes[28].OneofWrappers = []any{(*TaskRun_SchedulerInfo_WaitingCause_ParallelTasksLimit)(nil),}diff --git a/backend/generated-go/v1/rollout_service_equal.pb.go b/backend/generated-go/v1/rollout_service_equal.pb.goindex fd313c791a..2e9062eb43 100644--- a/backend/generated-go/v1/rollout_service_equal.pb.go+++ b/backend/generated-go/v1/rollout_service_equal.pb.go@@ -295,27 +295,9 @@ func (x *Task_DatabaseCreate) Equal(y *Task_DatabaseCreate) bool {if x == nil || y == nil {return x == nil && y == nil}- if x.Project != y.Project {- return false- }- if x.Database != y.Database {- return false- }- if x.Table != y.Table {- return false- }if x.Sheet != y.Sheet {return false}- if x.CharacterSet != y.CharacterSet {- return false- }- if x.Collation != y.Collation {- return false- }- if x.Environment != y.Environment {- return false- }return true}@@ -332,9 +314,6 @@ func (x *Task_DatabaseUpdate) Equal(y *Task_DatabaseUpdate) bool {if x.GetRelease() != y.GetRelease() {return false}- if x.SchemaVersion != y.SchemaVersion {- return false- }return true}@@ -345,18 +324,9 @@ func (x *Task_DatabaseDataExport) Equal(y *Task_DatabaseDataExport) bool {if x == nil || y == nil {return x == nil && y == nil}- if x.Target != y.Target {- return false- }if x.Sheet != y.Sheet {return false}- if x.Format != y.Format {- return false- }- if p, q := x.Password, y.Password; (p == nil && q != nil) || (p != nil && (q == nil || *p != *q)) {- return false- }return true}diff --git a/backend/runner/taskrun/data_export_executor.go b/backend/runner/taskrun/data_export_executor.goindex 81a00ef862..84ff5b6540 100644--- a/backend/runner/taskrun/data_export_executor.go+++ b/backend/runner/taskrun/data_export_executor.go@@ -50,6 +50,24 @@ func (exec *DataExportExecutor) RunOnce(ctx context.Context, _ context.Context,return nil, errors.Wrapf(err, "failed to get issue")}+ // Get plan to retrieve export format from spec+ plan, err := exec.store.GetPlan(ctx, &store.FindPlanMessage{UID: &task.PlanID})+ if err != nil {+ return nil, errors.Wrapf(err, "failed to get plan")+ }+ if plan == nil {+ return nil, errors.Errorf("plan not found")+ }++ // For export data plans, there is always exactly one spec+ if len(plan.Config.Specs) == 0 {+ return nil, errors.Errorf("plan has no specs")+ }+ exportConfig := plan.Config.Specs[0].GetExportDataConfig()+ if exportConfig == nil {+ return nil, errors.Errorf("spec does not contain export data config")+ }+database, err := exec.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &task.InstanceID, DatabaseName: task.DatabaseName, ShowDeleted: true})if err != nil {return nil, errors.Wrapf(err, "failed to get database")@@ -85,7 +103,7 @@ func (exec *DataExportExecutor) RunOnce(ctx context.Context, _ context.Context,// Execute the export without masking.// For approved DATABASE_EXPORT tasks, the approval itself authorizes access to the data.- bytes, exportErr := exec.executeExport(ctx, instance, database, dataSource, statement, task.Payload.GetFormat(), creatorUser)+ bytes, exportErr := exec.executeExport(ctx, instance, database, dataSource, statement, exportConfig.Format, creatorUser)if exportErr != nil {return nil, errors.Wrap(exportErr, "failed to export data")}@@ -93,7 +111,7 @@ func (exec *DataExportExecutor) RunOnce(ctx context.Context, _ context.Context,exportArchive, err := exec.store.CreateExportArchive(ctx, &store.ExportArchiveMessage{Bytes: bytes,Payload: &storepb.ExportArchivePayload{- FileFormat: task.Payload.GetFormat(),+ FileFormat: exportConfig.Format,},})if err != nil {diff --git a/backend/runner/taskrun/database_create_executor.go b/backend/runner/taskrun/database_create_executor.goindex b7a3bda69a..ab3baf84f9 100644--- a/backend/runner/taskrun/database_create_executor.go+++ b/backend/runner/taskrun/database_create_executor.go@@ -65,22 +65,34 @@ func (exec *DatabaseCreateExecutor) RunOnce(ctx context.Context, driverCtx contereturn nil, errors.Errorf("plan %v not found", task.PlanID)}+ // For create database plans, there is always exactly one spec+ if len(plan.Config.Specs) == 0 {+ return nil, errors.Errorf("plan has no specs")+ }+ createConfig := plan.Config.Specs[0].GetCreateDatabaseConfig()+ if createConfig == nil {+ return nil, errors.Errorf("spec does not contain create database config")+ }+// Create database.slog.Debug("Start creating database...",slog.String("instance", instance.Metadata.GetTitle()),- slog.String("database", task.Payload.GetDatabaseName()),+ slog.String("database", createConfig.Database),slog.String("statement", statement),)- envID := task.Payload.GetEnvironmentId()var environmentID *string- if envID != "" {+ if createConfig.Environment != "" {+ envID, err := common.GetEnvironmentID(createConfig.Environment)+ if err != nil {+ return nil, errors.Wrapf(err, "failed to parse environment %s", createConfig.Environment)+ }environmentID = &envID}database, err := exec.store.UpsertDatabase(ctx, &store.DatabaseMessage{ProjectID: plan.ProjectID,InstanceID: instance.ResourceID,- DatabaseName: task.Payload.GetDatabaseName(),+ DatabaseName: createConfig.Database,EnvironmentID: environmentID,Metadata: &storepb.DatabaseMetadata{},})diff --git a/docs/plans/2026-01-06-remove-redundant-task-proto-fields.md b/docs/plans/2026-01-06-remove-redundant-task-proto-fields.mdnew file mode 100644index 0000000000..87694f774b--- /dev/null+++ b/docs/plans/2026-01-06-remove-redundant-task-proto-fields.md@@ -0,0 +1,947 @@+# Remove Redundant Task Proto Fields Implementation Plan++> **For Claude:** REQUIRED SUB-SKILL: Use superpowers:executing-plans to implement this plan task-by-task.++**Goal:** Remove redundant fields from task proto messages and retrieve them from plan specs instead++**Architecture:** Currently, task payload duplicates information already stored in plan specs. We'll remove these duplicate fields from `storepb.Task` and `v1pb.Task.DatabaseUpdate`, and modify converters and executors to retrieve this data from the plan spec using the `spec_id` field.++**Tech Stack:** Protocol Buffers, Go, PostgreSQL JSONB++---++## Overview++### Fields to Remove++**From `proto/store/store/task.proto` (storepb.Task):**+- `environment_id` (line 32)+- `database_name` (line 34)+- `table_name` (line 36)+- `character_set` (line 38)+- `collation` (line 40)+- `password` (line 58)+- `format` (line 60)++**From `proto/v1/v1/rollout_service.proto` (v1pb.Task.DatabaseUpdate):**+- `schema_version` (line 427)++**Keep in `proto/v1/v1/rollout_service.proto`:**+- `v1pb.Task.DatabaseCreate` message (lines 398-415) - part of public API+- `v1pb.Task.DatabaseDataExport` message (lines 430-443) - part of public API++### Architecture Decision++Tasks are linked to plan specs via `task.payload.spec_id`. Each spec contains the authoritative configuration:+- `PlanConfig_Spec.CreateDatabaseConfig` has database, table, character_set, collation, environment+- `PlanConfig_Spec.ExportDataConfig` has format, password++The converters and executors will look up the spec and extract these fields when needed.++---++## Task 1: Update proto definitions++**Files:**+- Modify: `proto/store/store/task.proto`+- Modify: `proto/v1/v1/rollout_service.proto`++**Step 1: Remove fields from storepb.Task**++Edit `proto/store/store/task.proto` and remove lines 31-40 and 57-60:++```protobuf+// REMOVE these lines (31-40):+ // The environment where the database will be created.+ string environment_id = 5;+ // Name of the database to create.+ string database_name = 6;+ // Optional table name to create (required for some databases like MongoDB).+ string table_name = 7;+ // Character set for the new database.+ string character_set = 8;+ // Collation for the new database.+ string collation = 9;++// REMOVE these lines (57-60):+ // Password to encrypt the exported data archive.+ string password = 14;+ // Format of the exported data (SQL, CSV, JSON, etc).+ ExportFormat format = 15;+```++**Step 2: Remove schema_version from v1pb.Task.DatabaseUpdate**++Edit `proto/v1/v1/rollout_service.proto` and remove lines 426-427:++```protobuf+ message DatabaseUpdate {+ oneof source {+ string sheet = 1;+ string release = 4;+ }+ // REMOVE this line:+ // string schema_version = 2;+ }+```++**Step 3: Generate proto code**++Run: `cd proto && buf generate`++**Step 4: Format proto files**++Run: `buf format -w proto`++**Step 5: Commit proto changes**++```bash+git add proto/store/store/task.proto proto/v1/v1/rollout_service.proto backend/generated-go+git commit -m "refactor: remove redundant task proto fields++Remove duplicate fields from Task proto that are already stored in PlanConfig specs:+- environment_id, database_name, table_name, character_set, collation+- password, format+- schema_version from DatabaseUpdate++These fields will be retrieved from the plan spec using spec_id.++Breaking change: stored Task payloads no longer contain these fields."+```++---++## Task 2: Update task creation logic++**Files:**+- Modify: `backend/api/v1/rollout_service_task.go:153-173`+- Modify: `backend/api/v1/rollout_service_task.go:301-326`++**Step 1: Remove field assignments from getTaskCreatesFromCreateDatabaseConfig**++Edit `backend/api/v1/rollout_service_task.go` lines 153-173:++```go+v := &store.TaskMessage{+ InstanceID: instance.ResourceID,+ DatabaseName: &databaseName,+ Environment: effectiveEnvironmentID,+ Type: storepb.Task_DATABASE_CREATE,+ Payload: &storepb.Task{+ SpecId: spec.Id,+ // REMOVE these lines:+ // CharacterSet: c.CharacterSet,+ // TableName: c.Table,+ // Collation: c.Collation,+ // EnvironmentId: dbEnvironmentID,+ // DatabaseName: databaseName,+ Source: &storepb.Task_SheetSha256{+ SheetSha256: sheet.Sha256,+ },+ },+}+```++**Step 2: Remove field assignments from getTaskCreatesFromExportDataConfig**++Edit `backend/api/v1/rollout_service_task.go` lines 301-326:++```go+payload := &storepb.Task{+ SpecId: spec.Id,+ Source: &storepb.Task_SheetSha256{+ SheetSha256: c.SheetSha256,+ },+ // REMOVE these lines:+ // Format: c.Format,+}+// REMOVE these lines:+// if c.Password != nil {+// payload.Password = *c.Password+// }+```++**Step 3: Run Go formatter**++Run: `gofmt -w backend/api/v1/rollout_service_task.go`++**Step 4: Run linter**++Run: `golangci-lint run --allow-parallel-runners`++Expected: PASS (no new issues)++**Step 5: Commit**++```bash+git add backend/api/v1/rollout_service_task.go+git commit -m "refactor: stop setting redundant fields in task creation++Task payloads no longer duplicate data from plan specs."+```++---++## Task 3: Add helper function to retrieve spec from plan++**Files:**+- Modify: `backend/api/v1/rollout_service_converter.go`++**Step 1: Add getSpecFromPlan helper function**++Add this function after line 17 in `backend/api/v1/rollout_service_converter.go`:++```go+// getSpecFromPlan retrieves a spec by ID from a plan's configuration.+func getSpecFromPlan(plan *store.PlanMessage, specID string) (*storepb.PlanConfig_Spec, error) {+ if plan.Config == nil {+ return nil, errors.Errorf("plan config is nil")+ }+ for _, spec := range plan.Config.Specs {+ if spec.Id == specID {+ return spec, nil+ }+ }+ return nil, errors.Errorf("spec %q not found in plan", specID)+}+```++**Step 2: Run Go formatter**++Run: `gofmt -w backend/api/v1/rollout_service_converter.go`++**Step 3: Run linter**++Run: `golangci-lint run --allow-parallel-runners backend/api/v1/rollout_service_converter.go`++Expected: PASS++**Step 4: Commit**++```bash+git add backend/api/v1/rollout_service_converter.go+git commit -m "feat: add helper to retrieve spec from plan by ID"+```++---++## Task 4: Update rollout converter to get fields from plan spec++**Files:**+- Modify: `backend/api/v1/rollout_service_converter.go:151-220`+- Modify: `backend/api/v1/rollout_service_converter.go:239-267`+- Modify: `backend/api/v1/rollout_service_converter.go:310-341`++**Step 1: Update convertToRollout to pass plan to converters**++Modify `convertToRollout` function signature and calls (lines 151-220):++```go+func convertToRollout(project *store.ProjectMessage, plan *store.PlanMessage, tasks []*store.TaskMessage, environmentOrderMap map[string]int) (*v1pb.Rollout, error) {+ // ... existing code ...++ // Update this section (lines 200-208):+ var v1Tasks []*v1pb.Task+ for _, task := range envTasks {+ v1Task, err := convertToTask(project, plan, task) // ADD plan parameter+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to convert task"))+ }+ v1Tasks = append(v1Tasks, v1Task)+ }+ // ... rest of function ...+}+```++**Step 2: Update convertToTask signature and dispatch**++Modify lines 222-237:++```go+func convertToTask(project *store.ProjectMessage, plan *store.PlanMessage, task *store.TaskMessage) (*v1pb.Task, error) {+ //exhaustive:enforce+ switch task.Type {+ case storepb.Task_DATABASE_CREATE:+ return convertToTaskFromDatabaseCreate(project, plan, task) // ADD plan+ case storepb.Task_DATABASE_MIGRATE:+ return convertToTaskFromSchemaUpdate(project, task) // No change+ case storepb.Task_DATABASE_EXPORT:+ return convertToTaskFromDatabaseDataExport(project, plan, task) // ADD plan+ case storepb.Task_TASK_TYPE_UNSPECIFIED:+ return nil, errors.Errorf("task type %v is not supported", task.Type)+ default:+ return nil, errors.Errorf("task type %v is not supported", task.Type)+ }+}+```++**Step 3: Update convertToTaskFromDatabaseCreate to get fields from spec**++Modify lines 239-267:++```go+func convertToTaskFromDatabaseCreate(project *store.ProjectMessage, plan *store.PlanMessage, task *store.TaskMessage) (*v1pb.Task, error) {+ // Retrieve the spec to get configuration details+ spec, err := getSpecFromPlan(plan, task.Payload.GetSpecId())+ if err != nil {+ return nil, errors.Wrapf(err, "failed to get spec for task")+ }++ createConfig := spec.GetCreateDatabaseConfig()+ if createConfig == nil {+ return nil, errors.Errorf("spec does not contain create database config")+ }++ stageID := common.FormatStageID(task.Environment)+ v1pbTask := &v1pb.Task{+ Name: common.FormatTask(project.ResourceID, task.PlanID, stageID, task.ID),+ SpecId: task.Payload.GetSpecId(),+ Type: convertToTaskType(task),+ Status: convertToTaskStatus(task.LatestTaskRunStatus, task.Payload.GetSkipped()),+ SkippedReason: task.Payload.GetSkippedReason(),+ Target: common.FormatInstance(task.InstanceID),+ Payload: &v1pb.Task_DatabaseCreate_{+ DatabaseCreate: &v1pb.Task_DatabaseCreate{+ Project: "",+ Database: createConfig.Database, // FROM SPEC+ Table: createConfig.Table, // FROM SPEC+ Sheet: common.FormatSheet(project.ResourceID, task.Payload.GetSheetSha256()),+ CharacterSet: createConfig.CharacterSet, // FROM SPEC+ Collation: createConfig.Collation, // FROM SPEC+ Environment: createConfig.Environment, // FROM SPEC+ },+ },+ }+ if task.UpdatedAt != nil {+ v1pbTask.UpdateTime = timestamppb.New(*task.UpdatedAt)+ }+ if task.RunAt != nil {+ v1pbTask.RunTime = timestamppb.New(*task.RunAt)+ }+ return v1pbTask, nil+}+```++**Step 4: Update convertToTaskFromDatabaseDataExport to get fields from spec**++Modify lines 310-341:++```go+func convertToTaskFromDatabaseDataExport(project *store.ProjectMessage, plan *store.PlanMessage, task *store.TaskMessage) (*v1pb.Task, error) {+ if task.DatabaseName == nil {+ return nil, errors.Errorf("data export task database is nil")+ }++ // Retrieve the spec to get configuration details+ spec, err := getSpecFromPlan(plan, task.Payload.GetSpecId())+ if err != nil {+ return nil, errors.Wrapf(err, "failed to get spec for task")+ }++ exportConfig := spec.GetExportDataConfig()+ if exportConfig == nil {+ return nil, errors.Errorf("spec does not contain export data config")+ }++ targetDatabaseName := fmt.Sprintf("%s%s/%s%s", common.InstanceNamePrefix, task.InstanceID, common.DatabaseIDPrefix, *(task.DatabaseName))+ sheet := common.FormatSheet(project.ResourceID, task.Payload.GetSheetSha256())++ var password *string+ if exportConfig.Password != nil {+ password = exportConfig.Password // FROM SPEC+ }++ v1pbTaskPayload := v1pb.Task_DatabaseDataExport_{+ DatabaseDataExport: &v1pb.Task_DatabaseDataExport{+ Target: targetDatabaseName,+ Sheet: sheet,+ Format: convertExportFormat(exportConfig.Format), // FROM SPEC+ Password: password, // FROM SPEC+ },+ }+ stageID := common.FormatStageID(task.Environment)+ v1pbTask := &v1pb.Task{+ Name: common.FormatTask(project.ResourceID, task.PlanID, stageID, task.ID),+ SpecId: task.Payload.GetSpecId(),+ Type: convertToTaskType(task),+ Status: convertToTaskStatus(task.LatestTaskRunStatus, false),+ Target: targetDatabaseName,+ Payload: &v1pbTaskPayload,+ }+ if task.UpdatedAt != nil {+ v1pbTask.UpdateTime = timestamppb.New(*task.UpdatedAt)+ }+ if task.RunAt != nil {+ v1pbTask.RunTime = timestamppb.New(*task.RunAt)+ }+ return v1pbTask, nil+}+```++**Step 5: Find and update all calls to convertToRollout**++Run: `grep -n "convertToRollout" backend/api/v1/rollout_service.go`++Update each call site to ensure all parameters are correct.++**Step 6: Run Go formatter**++Run: `gofmt -w backend/api/v1/rollout_service_converter.go backend/api/v1/rollout_service.go`++**Step 7: Run linter**++Run: `golangci-lint run --allow-parallel-runners`++Expected: PASS (fix any issues)++**Step 8: Commit**++```bash+git add backend/api/v1/rollout_service_converter.go backend/api/v1/rollout_service.go+git commit -m "refactor: get task display fields from plan spec++Converters now retrieve database_name, table_name, character_set,+collation, environment, format, and password from plan specs instead+of task payloads."+```++---++## Task 5: Update database create executor to get fields from spec++**Files:**+- Modify: `backend/runner/taskrun/database_create_executor.go:36-121`++**Step 1: Update RunOnce to retrieve spec and get environment_id and database_name**++Modify the `RunOnce` method (lines 36-121):++```go+func (exec *DatabaseCreateExecutor) RunOnce(ctx context.Context, driverCtx context.Context, task *store.TaskMessage, _ int) (*storepb.TaskRunResult, error) {+ sheet, err := exec.store.GetSheetFull(ctx, task.Payload.GetSheetSha256())+ if err != nil {+ return nil, errors.Wrapf(err, "failed to get sheet: %s", task.Payload.GetSheetSha256())+ }+ if sheet == nil {+ return nil, errors.Errorf("sheet not found: %s", task.Payload.GetSheetSha256())+ }+ statement := sheet.Statement++ statement = strings.TrimSpace(statement)+ if statement == "" {+ return nil, errors.Errorf("empty create database statement")+ }++ instance, err := exec.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})+ if err != nil {+ return nil, err+ }++ if !common.EngineSupportCreateDatabase(instance.Metadata.GetEngine()) {+ return nil, errors.Errorf("creating database is not supported for engine %v", instance.Metadata.GetEngine().String())+ }++ plan, err := exec.store.GetPlan(ctx, &store.FindPlanMessage{UID: &task.PlanID})+ if err != nil {+ return nil, errors.Wrapf(err, "failed to get plan %v", task.PlanID)+ }+ if plan == nil {+ return nil, errors.Errorf("plan %v not found", task.PlanID)+ }++ // NEW: Retrieve the spec to get configuration details+ spec, err := getSpecFromPlan(plan, task.Payload.GetSpecId())+ if err != nil {+ return nil, errors.Wrapf(err, "failed to get spec for task")+ }++ createConfig := spec.GetCreateDatabaseConfig()+ if createConfig == nil {+ return nil, errors.Errorf("spec does not contain create database config")+ }++ // Create database.+ slog.Debug("Start creating database...",+ slog.String("instance", instance.Metadata.GetTitle()),+ slog.String("database", createConfig.Database), // FROM SPEC+ slog.String("statement", statement),+ )++ // NEW: Get environment_id from spec+ envID := ""+ if createConfig.Environment != "" {+ envID = strings.TrimPrefix(createConfig.Environment, common.EnvironmentNamePrefix)+ }++ var environmentID *string+ if envID != "" {+ environmentID = &envID+ }+ database, err := exec.store.UpsertDatabase(ctx, &store.DatabaseMessage{+ ProjectID: plan.ProjectID,+ InstanceID: instance.ResourceID,+ DatabaseName: createConfig.Database, // FROM SPEC+ EnvironmentID: environmentID,+ Metadata: &storepb.DatabaseMetadata{},+ })+ if err != nil {+ return nil, err+ }++ var defaultDBDriver db.Driver+ switch instance.Metadata.GetEngine() {+ case storepb.Engine_MONGODB:+ defaultDBDriver, err = exec.dbFactory.GetAdminDatabaseDriver(ctx, instance, database, db.ConnectionContext{})+ if err != nil {+ return nil, err+ }+ default:+ defaultDBDriver, err = exec.dbFactory.GetAdminDatabaseDriver(ctx, instance, nil /* database */, db.ConnectionContext{})+ if err != nil {+ return nil, err+ }+ }+ defer defaultDBDriver.Close(ctx)+ if _, err := defaultDBDriver.Execute(driverCtx, statement, db.ExecuteOptions{CreateDatabase: true}); err != nil {+ return nil, err+ }++ if err := exec.schemaSyncer.SyncDatabaseSchema(ctx, database); err != nil {+ slog.Error("failed to sync database schema",+ slog.String("instanceName", instance.ResourceID),+ slog.String("databaseName", database.DatabaseName),+ log.BBError(err),+ )+ }++ return &storepb.TaskRunResult{}, nil+}+```++**Step 2: Add getSpecFromPlan helper function**++Add this function at the top of the file after imports:++```go+// getSpecFromPlan retrieves a spec by ID from a plan's configuration.+func getSpecFromPlan(plan *store.PlanMessage, specID string) (*storepb.PlanConfig_Spec, error) {+ if plan.Config == nil {+ return nil, errors.Errorf("plan config is nil")+ }+ for _, spec := range plan.Config.Specs {+ if spec.Id == specID {+ return spec, nil+ }+ }+ return nil, errors.Errorf("spec %q not found in plan", specID)+}+```++**Step 3: Add import for strings package if not already present**++Check if `strings` is imported, add if needed.++**Step 4: Run Go formatter**++Run: `gofmt -w backend/runner/taskrun/database_create_executor.go`++**Step 5: Run linter**++Run: `golangci-lint run --allow-parallel-runners`++Expected: PASS (fix any issues)++**Step 6: Commit**++```bash+git add backend/runner/taskrun/database_create_executor.go+git commit -m "refactor: get database create fields from plan spec++DatabaseCreateExecutor now retrieves environment_id and database_name+from the plan spec instead of task payload."+```++---++## Task 6: Update data export executor to get fields from spec++**Files:**+- Modify: `backend/runner/taskrun/data_export_executor.go:47-106`++**Step 1: Update RunOnce to retrieve spec and get format**++Modify the `RunOnce` method (lines 47-106):++```go+func (exec *DataExportExecutor) RunOnce(ctx context.Context, _ context.Context, task *store.TaskMessage, _ int) (*storepb.TaskRunResult, error) {+ issue, err := exec.store.GetIssue(ctx, &store.FindIssueMessage{PlanUID: &task.PlanID})+ if err != nil {+ return nil, errors.Wrapf(err, "failed to get issue")+ }++ database, err := exec.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &task.InstanceID, DatabaseName: task.DatabaseName, ShowDeleted: true})+ if err != nil {+ return nil, errors.Wrapf(err, "failed to get database")+ }+ if database == nil {+ return nil, errors.Errorf("database not found")+ }+ instance, err := exec.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID, ShowDeleted: true})+ if err != nil {+ return nil, errors.Wrapf(err, "failed to get instance")+ }+ if instance == nil {+ return nil, errors.Errorf("instance not found")+ }++ sheet, err := exec.store.GetSheetFull(ctx, task.Payload.GetSheetSha256())+ if err != nil {+ return nil, err+ }+ if sheet == nil {+ return nil, errors.Errorf("sheet not found: %s", task.Payload.GetSheetSha256())+ }+ statement := sheet.Statement++ // NEW: Get plan and spec to retrieve export configuration+ plan, err := exec.store.GetPlan(ctx, &store.FindPlanMessage{UID: &task.PlanID})+ if err != nil {+ return nil, errors.Wrapf(err, "failed to get plan %v", task.PlanID)+ }+ if plan == nil {+ return nil, errors.Errorf("plan %v not found", task.PlanID)+ }++ spec, err := getSpecFromPlan(plan, task.Payload.GetSpecId())+ if err != nil {+ return nil, errors.Wrapf(err, "failed to get spec for task")+ }++ exportConfig := spec.GetExportDataConfig()+ if exportConfig == nil {+ return nil, errors.Errorf("spec does not contain export data config")+ }++ dataSource := apiv1.GetQueriableDataSource(instance)+ creatorUser, err := exec.store.GetUserByEmail(ctx, issue.CreatorEmail)+ if err != nil {+ return nil, errors.Wrapf(err, "failed to get creator user for issue %d", issue.UID)+ }+ if creatorUser == nil {+ return nil, errors.Errorf("creator user not found for issue %d", issue.UID)+ }++ // Execute the export without masking.+ // For approved DATABASE_EXPORT tasks, the approval itself authorizes access to the data.+ bytes, exportErr := exec.executeExport(ctx, instance, database, dataSource, statement, exportConfig.Format, creatorUser) // FROM SPEC+ if exportErr != nil {+ return nil, errors.Wrap(exportErr, "failed to export data")+ }++ exportArchive, err := exec.store.CreateExportArchive(ctx, &store.ExportArchiveMessage{+ Bytes: bytes,+ Payload: &storepb.ExportArchivePayload{+ FileFormat: exportConfig.Format, // FROM SPEC+ },+ })+ if err != nil {+ return nil, errors.Wrap(err, "failed to create export archive")+ }++ return &storepb.TaskRunResult{+ ExportArchiveUid: int32(exportArchive.UID),+ }, nil+}+```++**Step 2: Add getSpecFromPlan helper function (if not already present)**++Add this function at the top of the file after imports (only if it doesn't already exist from a previous task):++```go+// getSpecFromPlan retrieves a spec by ID from a plan's configuration.+func getSpecFromPlan(plan *store.PlanMessage, specID string) (*storepb.PlanConfig_Spec, error) {+ if plan.Config == nil {+ return nil, errors.Errorf("plan config is nil")+ }+ for _, spec := range plan.Config.Specs {+ if spec.Id == specID {+ return spec, nil+ }+ }+ return nil, errors.Errorf("spec %q not found in plan", specID)+}+```++**Step 3: Run Go formatter**++Run: `gofmt -w backend/runner/taskrun/data_export_executor.go`++**Step 4: Run linter**++Run: `golangci-lint run --allow-parallel-runners`++Expected: PASS (fix any issues)++**Step 5: Commit**++```bash+git add backend/runner/taskrun/data_export_executor.go+git commit -m "refactor: get data export format from plan spec++DataExportExecutor now retrieves export format from the plan spec+instead of task payload."+```++---++## Task 7: Extract getSpecFromPlan to common utility++**Files:**+- Create: `backend/common/plan_utils.go`+- Modify: `backend/api/v1/rollout_service_converter.go`+- Modify: `backend/runner/taskrun/database_create_executor.go`+- Modify: `backend/runner/taskrun/data_export_executor.go`++**Step 1: Create plan_utils.go with shared helper**++Create `backend/common/plan_utils.go`:++```go+package common++import (+ "github.com/pkg/errors"++ storepb "github.com/bytebase/bytebase/backend/generated-go/store"+ "github.com/bytebase/bytebase/backend/store"+)++// GetSpecFromPlan retrieves a spec by ID from a plan's configuration.+func GetSpecFromPlan(plan *store.PlanMessage, specID string) (*storepb.PlanConfig_Spec, error) {+ if plan.Config == nil {+ return nil, errors.Errorf("plan config is nil")+ }+ for _, spec := range plan.Config.Specs {+ if spec.Id == specID {+ return spec, nil+ }+ }+ return nil, errors.Errorf("spec %q not found in plan", specID)+}+```++**Step 2: Replace local getSpecFromPlan in rollout_service_converter.go**++Edit `backend/api/v1/rollout_service_converter.go`:+- Remove the local `getSpecFromPlan` function+- Replace calls to `getSpecFromPlan` with `common.GetSpecFromPlan`++**Step 3: Replace local getSpecFromPlan in database_create_executor.go**++Edit `backend/runner/taskrun/database_create_executor.go`:+- Remove the local `getSpecFromPlan` function+- Replace calls to `getSpecFromPlan` with `common.GetSpecFromPlan`++**Step 4: Replace local getSpecFromPlan in data_export_executor.go**++Edit `backend/runner/taskrun/data_export_executor.go`:+- Remove the local `getSpecFromPlan` function+- Replace calls to `getSpecFromPlan` with `common.GetSpecFromPlan`++**Step 5: Run Go formatter**++Run: `gofmt -w backend/common/plan_utils.go backend/api/v1/rollout_service_converter.go backend/runner/taskrun/database_create_executor.go backend/runner/taskrun/data_export_executor.go`++**Step 6: Run linter**++Run: `golangci-lint run --allow-parallel-runners`++Expected: PASS++**Step 7: Commit**++```bash+git add backend/common/plan_utils.go backend/api/v1/rollout_service_converter.go backend/runner/taskrun/database_create_executor.go backend/runner/taskrun/data_export_executor.go+git commit -m "refactor: extract GetSpecFromPlan to common utility++Consolidate duplicate getSpecFromPlan implementations into a single+shared utility function in the common package."+```++---++## Task 8: Run tests and fix issues++**Files:**+- Various test files may need updates++**Step 1: Run backend tests**++Run: `go test -v -count=1 github.com/bytebase/bytebase/backend/api/v1 -run TestRollout`++Expected: Tests may fail due to proto changes++**Step 2: Identify failing tests**++Review test output and identify tests that fail due to:+- Missing fields in task payloads+- Converter expectations+- Mock data setup++**Step 3: Update test fixtures and mocks**++For each failing test:+1. Update mock plan configs to include proper specs+2. Update task creation to use new field locations+3. Update assertions to check v1pb fields (not storepb fields)++**Step 4: Run executor tests**++Run: `go test -v -count=1 github.com/bytebase/bytebase/backend/runner/taskrun`++Expected: Tests should pass after executor changes++**Step 5: Fix any remaining test failures**++Iterate on test fixes until all tests pass.++**Step 6: Run full linter**++Run: `golangci-lint run --allow-parallel-runners`++Expected: PASS++**Step 7: Commit test fixes**++```bash+git add backend/api/v1/*_test.go backend/runner/taskrun/*_test.go+git commit -m "test: update tests for removed task proto fields++Update test fixtures and assertions to work with new architecture+where fields are retrieved from plan specs."+```++---++## Task 9: Update migrator test for schema changes++**Files:**+- Modify: `backend/migrator/migrator_test.go`++**Step 1: Check TestLatestVersion test**++The CLAUDE.md instructions state that `TestLatestVersion` needs update after migration file changes. Since we're changing stored proto structure, check if this test needs updating.++Run: `go test -v -count=1 github.com/bytebase/bytebase/backend/migrator -run TestLatestVersion`++**Step 2: Update test if needed**++If the test fails, update the test expectations to match the new proto structure.++**Step 3: Run test again**++Run: `go test -v -count=1 github.com/bytebase/bytebase/backend/migrator -run TestLatestVersion`++Expected: PASS++**Step 4: Commit if changes made**++```bash+git add backend/migrator/migrator_test.go+git commit -m "test: update migrator test for proto changes"+```++---++## Task 10: Build and verify++**Files:**+- None (verification only)++**Step 1: Build backend**++Run: `go build -ldflags "-w -s" -p=16 -o ./bytebase-build/bytebase ./backend/bin/server/main.go`++Expected: Build succeeds++**Step 2: Run all linters**++Run: `golangci-lint run --allow-parallel-runners`++Expected: PASS (run multiple times until no issues)++**Step 3: Run full backend test suite**++Run: `go test -v -count=1 github.com/bytebase/bytebase/backend/...`++Expected: All tests pass++**Step 4: Verify proto formatting**++Run: `buf format -w proto && buf lint proto`++Expected: No changes, no lint errors++**Step 5: Final commit if any formatting changes**++```bash+git add -A+git commit -m "chore: final cleanup and formatting"+```++---++## Task 11: Create pull request++**Files:**+- None (git operations only)++**Step 1: Push branch**++Run: `git push -u origin main`++**Step 2: Verify all commits**++Run: `git log --oneline -15`++Review commit history to ensure all changes are properly committed.++**Step 3: Run final verification**++```bash+# Ensure build works+go build -ldflags "-w -s" -p=16 -o ./bytebase-build/bytebase ./backend/bin/server/main.go++# Ensure tests pass+go test -v -count=1 github.com/bytebase/bytebase/backend/api/v1+go test -v -count=1 github.com/bytebase/bytebase/backend/runner/taskrun++# Ensure linter passes+golangci-lint run --allow-parallel-runners+```++Expected: All commands succeed++---++## Summary++This plan removes redundant fields from task proto messages and updates all code to retrieve these fields from plan specs instead. The changes include:++1. **Proto changes**: Removed 7 fields from `storepb.Task` and 1 field from `v1pb.Task.DatabaseUpdate`+2. **Task creation**: Stopped setting redundant fields when creating tasks+3. **Converters**: Updated to retrieve fields from plan specs via `spec_id`+4. **Executors**: Updated to retrieve fields from plan specs via `spec_id`+5. **Common utility**: Created shared `GetSpecFromPlan` helper+6. **Tests**: Updated all affected tests++**Breaking Changes:**+- Existing stored task payloads in the database will not have these fields+- Old tasks will need migration if they need to display these fields (handled by looking up the spec)++**Benefits:**+- Single source of truth for task configuration (plan spec)+- Reduced data duplication+- Smaller task payloads in database+- Easier to update task configuration centrallydiff --git a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/TaskName.vue b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/TaskName.vueindex e5a0cf16e6..eb1e1c6731 100644--- a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/TaskName.vue+++ b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/TaskName.vue@@ -6,14 +6,6 @@@click="toTop"><span>{{ databaseForTask(projectOfIssue(issue), task).databaseName }}</span>- <template v-if="schemaVersion">- <span class="ml-1 text-control-placeholder">(</span>- <span class="lowercase text-control-placeholder">{{- $t("common.schema-version")- }}</span>- <span class="ml-1 text-control-placeholder">{{ schemaVersion }}</span>- <span class="text-control-placeholder">)</span>- </template></router-link></template>@@ -33,7 +25,6 @@ import {databaseForTask,extractPlanUIDFromRolloutName,extractProjectResourceName,- extractSchemaVersionFromTask,extractStageNameFromTaskName,extractStageUID,extractTaskUID,@@ -47,10 +38,6 @@ const props = defineProps<{const { enabledNewLayout } = useIssueLayoutVersion();-const schemaVersion = computed(() => {- return extractSchemaVersionFromTask(props.task);-});-const link = computed(() => {const { issue, task } = props;diff --git a/frontend/src/components/IssueV1/components/TaskListSection/TaskCard.vue b/frontend/src/components/IssueV1/components/TaskListSection/TaskCard.vueindex d1a124ea7c..d0e1c83c43 100644--- a/frontend/src/components/IssueV1/components/TaskListSection/TaskCard.vue+++ b/frontend/src/components/IssueV1/components/TaskListSection/TaskCard.vue@@ -36,9 +36,6 @@</template><span>{{ $t("task.online-migration.self") }}</span></NTooltip>- <NTag v-if="schemaVersion" size="small" round>- {{ schemaVersion }}- </NTag></div><TaskExtraActionsButton :task="task" /></div>@@ -61,11 +58,7 @@ import { useCurrentProjectV1 } from "@/store";import { isValidDatabaseName } from "@/types";import type { Task } from "@/types/proto-es/v1/rollout_service_pb";import { Task_Status, Task_Type } from "@/types/proto-es/v1/rollout_service_pb";-import {- databaseForTask,- databaseV1Url,- extractSchemaVersionFromTask,-} from "@/utils";+import { databaseForTask, databaseV1Url } from "@/utils";import { specForTask, useInstanceForTask, useIssueContext } from "../../logic";import TaskStatusIcon from "../TaskStatusIcon.vue";import TaskExtraActionsButton from "./TaskExtraActionsButton.vue";@@ -78,24 +71,6 @@ const { isCreating, issue, selectedTask, events } = useIssueContext();const { project } = useCurrentProjectV1();const selected = computed(() => props.task === selectedTask.value);-const schemaVersion = computed(() => {- const v = extractSchemaVersionFromTask(props.task);- // Always show the schema version for tasks from a release source.- if (- (- issue.value.planEntity?.specs?.filter(- (spec) =>- spec.config?.case === "changeDatabaseConfig" &&- spec.config.value?.release- ) ?? []- ).length > 0- ) {- return v;- }- if (isCreating.value) return "";- return v;-});-const showGhostTag = computed(() => {const spec = specForTask(issue.value.planEntity, props.task);return (diff --git a/frontend/src/components/IssueV1/logic/utils.ts b/frontend/src/components/IssueV1/logic/utils.tsindex d9445b1a25..aba0008586 100644--- a/frontend/src/components/IssueV1/logic/utils.ts+++ b/frontend/src/components/IssueV1/logic/utils.ts@@ -93,7 +93,8 @@ export const mockDatabase = (projectEntity: Project, database: string) => {export const extractCoreDatabaseInfoFromDatabaseCreateTask = (project: Project,- task: Task+ task: Task,+ plan?: Plan) => {const coreDatabaseInfo = (instanceName: string,@@ -136,8 +137,14 @@ export const extractCoreDatabaseInfoFromDatabaseCreateTask = (};if (task.payload?.case === "databaseCreate") {- const databaseName = task.payload.value.database;const instance = task.target;+ // Get database name from plan spec+ const spec = plan?.specs?.find((s) => s.id === task.specId);+ const createConfig =+ spec?.config?.case === "createDatabaseConfig"+ ? spec.config.value+ : undefined;+ const databaseName = createConfig?.database || "";return coreDatabaseInfo(instance, databaseName);}diff --git a/frontend/src/components/Plan/components/IssueReviewView/DatabaseCreateView.vue b/frontend/src/components/Plan/components/IssueReviewView/DatabaseCreateView.vueindex f7e0dc8717..2289cffa99 100644--- a/frontend/src/components/Plan/components/IssueReviewView/DatabaseCreateView.vue+++ b/frontend/src/components/Plan/components/IssueReviewView/DatabaseCreateView.vue@@ -185,7 +185,8 @@ const createdDatabase = computed(() => {return extractCoreDatabaseInfoFromDatabaseCreateTask(project.value,- createDatabaseTask.value+ createDatabaseTask.value,+ plan.value);});</script>diff --git a/frontend/src/components/Plan/logic/rolloutPreview.ts b/frontend/src/components/Plan/logic/rolloutPreview.tsindex fe7b8b4934..c457bcfb6c 100644--- a/frontend/src/components/Plan/logic/rolloutPreview.ts+++ b/frontend/src/components/Plan/logic/rolloutPreview.ts@@ -231,7 +231,6 @@ function createTask(case: "sheet",value: taskCreate.sheet,},- schemaVersion: "",}),},});diff --git a/frontend/src/components/RolloutV1/components/TaskTable.vue b/frontend/src/components/RolloutV1/components/TaskTable.vueindex 99099e0862..9aa965c738 100644--- a/frontend/src/components/RolloutV1/components/TaskTable.vue+++ b/frontend/src/components/RolloutV1/components/TaskTable.vue@@ -38,7 +38,6 @@ import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";import {extractPlanUIDFromRolloutName,extractProjectResourceName,- extractSchemaVersionFromTask,extractStageNameFromTaskName,humanizeTs,} from "@/utils";@@ -200,19 +199,12 @@ const columnList = computed((): DataTableColumn<Task>[] => {title: t("common.database"),resizable: true,render: (task) => {- const schemaVersion = extractSchemaVersionFromTask(task);-return (<div class="flex items-center gap-2"><DatabaseDisplay database={task.target} /><NTag round size="small">{semanticTaskType(task.type)}</NTag>- {schemaVersion && (- <NTag round size="small">- {schemaVersion}- </NTag>- )}{task.runTime && task.status === Task_Status.PENDING && (<NTooltip>{{diff --git a/frontend/src/components/RolloutV1/components/TaskView.vue b/frontend/src/components/RolloutV1/components/TaskView.vueindex 55afd1143b..821f170100 100644--- a/frontend/src/components/RolloutV1/components/TaskView.vue+++ b/frontend/src/components/RolloutV1/components/TaskView.vue@@ -14,12 +14,6 @@<DatabaseDisplay :database="database.name" :size="'large'" /></div><div class="flex flex-row gap-x-2 flex-wrap">- <NTooltip v-if="schemaVersion">- <template #trigger>- <NTag round>{{ schemaVersion }}</NTag>- </template>- {{ $t("common.version") }}- </NTooltip><NTooltip v-if="task.runTime && task.status === Task_Status.PENDING"><template #trigger><NTag round>@@ -166,7 +160,6 @@ import {databaseForTask,extractPlanUID,extractProjectResourceName,- extractSchemaVersionFromTask,getSheetStatement,isReleaseBasedTask,releaseNameOfTaskV1,@@ -248,7 +241,6 @@ const rollbackableTaskRun = computed(() => {// Task basic infoconst database = computed(() => databaseForTask(project.value, task.value));-const schemaVersion = computed(() => extractSchemaVersionFromTask(task.value));// Related specconst relatedSpec = computed(() => {diff --git a/frontend/src/types/proto-es/v1/rollout_service_pb.d.ts b/frontend/src/types/proto-es/v1/rollout_service_pb.d.tsindex 8fef5abd9b..8eea771f1e 100644--- a/frontend/src/types/proto-es/v1/rollout_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/rollout_service_pb.d.ts@@ -5,7 +5,7 @@import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";import type { Message } from "@bufbuild/protobuf";import type { Timestamp } from "@bufbuild/protobuf/wkt";-import type { ExportFormat, Position, Range } from "./common_pb";+import type { Position, Range } from "./common_pb";/*** Describes the file v1/rollout_service.proto.@@ -534,55 +534,12 @@ export declare const TaskSchema: GenMessage<Task>;* @generated from message bytebase.v1.Task.DatabaseCreate*/export declare type Task_DatabaseCreate = Message<"bytebase.v1.Task.DatabaseCreate"> & {- /**- * The project owning the database.- * Format: projects/{project}- *- * @generated from field: string project = 1;- */- project: string;-- /**- * Database name.- *- * @generated from field: string database = 2;- */- database: string;-- /**- * Table name.- *- * @generated from field: string table = 3;- */- table: string;-/*** Format: projects/{project}/sheets/{sheet}** @generated from field: string sheet = 4;*/sheet: string;-- /**- * The character set for the database.- *- * @generated from field: string character_set = 5;- */- characterSet: string;-- /**- * The collation for the database.- *- * @generated from field: string collation = 6;- */- collation: string;-- /**- * The environment the database belongs to.- *- * @generated from field: string environment = 7;- */- environment: string;};/**@@ -619,13 +576,6 @@ export declare type Task_DatabaseUpdate = Message<"bytebase.v1.Task.DatabaseUpdavalue: string;case: "release";} | { case: undefined; value?: undefined };-- /**- * The target schema version after this update.- *- * @generated from field: string schema_version = 2;- */- schemaVersion: string;};/**@@ -640,14 +590,6 @@ export declare const Task_DatabaseUpdateSchema: GenMessage<Task_DatabaseUpdate>;* @generated from message bytebase.v1.Task.DatabaseDataExport*/export declare type Task_DatabaseDataExport = Message<"bytebase.v1.Task.DatabaseDataExport"> & {- /**- * The resource name of the target.- * Format: instances/{instance-id}/databases/{database-name}- *- * @generated from field: string target = 1;- */- target: string;-/*** The resource name of the sheet.* Format: projects/{project}/sheets/{sheet}@@ -655,21 +597,6 @@ export declare type Task_DatabaseDataExport = Message<"bytebase.v1.Task.Database* @generated from field: string sheet = 2;*/sheet: string;-- /**- * The format of the exported file.- *- * @generated from field: bytebase.v1.ExportFormat format = 3;- */- format: ExportFormat;-- /**- * The zip password provided by users.- * Leave it empty if no needs to encrypt the zip file.- *- * @generated from field: optional string password = 4;- */- password?: string;};/**diff --git a/frontend/src/types/proto-es/v1/rollout_service_pb.js b/frontend/src/types/proto-es/v1/rollout_service_pb.jsindex e1fa4e343f..0d3f9a92e2 100644--- a/frontend/src/types/proto-es/v1/rollout_service_pb.js+++ b/frontend/src/types/proto-es/v1/rollout_service_pb.js@@ -16,7 +16,7 @@ import { file_v1_common } from "./common_pb";* Describes the file v1/rollout_service.proto.*/export const file_v1_rollout_service = /*@__PURE__*/- fileDesc("Chh2MS9yb2xsb3V0X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIpEBChRCYXRjaFJ1blRhc2tzUmVxdWVzdBIqCgZwYXJlbnQYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL1N0YWdlEg0KBXRhc2tzGAIgAygJEjEKCHJ1bl90aW1lGAMgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEgAiAEBQgsKCV9ydW5fdGltZSIXChVCYXRjaFJ1blRhc2tzUmVzcG9uc2UibAoVQmF0Y2hTa2lwVGFza3NSZXF1ZXN0EioKBnBhcmVudBgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vU3RhZ2USDQoFdGFza3MYAiADKAkSGAoGcmVhc29uGAMgASgJQgi6SAVyAxjoByIYChZCYXRjaFNraXBUYXNrc1Jlc3BvbnNlIloKGkJhdGNoQ2FuY2VsVGFza1J1bnNSZXF1ZXN0EikKBnBhcmVudBgBIAEoCUIZ4EEC+kETChFieXRlYmFzZS5jb20vVGFzaxIRCgl0YXNrX3J1bnMYAiADKAkiHQobQmF0Y2hDYW5jZWxUYXNrUnVuc1Jlc3BvbnNlIj8KEUdldFJvbGxvdXRSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1JvbGxvdXQiegoTTGlzdFJvbGxvdXRzUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkSDgoGZmlsdGVyGAQgASgJIlcKFExpc3RSb2xsb3V0c1Jlc3BvbnNlEiYKCHJvbGxvdXRzGAEgAygLMhQuYnl0ZWJhc2UudjEuUm9sbG91dBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkiYQoUQ3JlYXRlUm9sbG91dFJlcXVlc3QSKQoGcGFyZW50GAEgASgJQhngQQL6QRMKEWJ5dGViYXNlLmNvbS9QbGFuEhMKBnRhcmdldBgDIAEoCUgAiAEBQgkKB190YXJnZXQiQAoTTGlzdFRhc2tSdW5zUmVxdWVzdBIpCgZwYXJlbnQYASABKAlCGeBBAvpBEwoRYnl0ZWJhc2UuY29tL1Rhc2siPwoUTGlzdFRhc2tSdW5zUmVzcG9uc2USJwoJdGFza19ydW5zGAEgAygLMhQuYnl0ZWJhc2UudjEuVGFza1J1biI/ChFHZXRUYXNrUnVuUmVxdWVzdBIqCgRuYW1lGAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9UYXNrUnVuIkQKFEdldFRhc2tSdW5Mb2dSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vVGFza1J1biKEAgoHUm9sbG91dBIMCgRuYW1lGAEgASgJEhIKBXRpdGxlGAMgASgJQgPgQQMSJwoGc3RhZ2VzGAQgAygLMhIuYnl0ZWJhc2UudjEuU3RhZ2VCA+BBAxI0CgtjcmVhdGVfdGltZRgGIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgHIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAzpC6kE/ChRieXRlYmFzZS5jb20vUm9sbG91dBIncHJvamVjdHMve3Byb2plY3R9L3BsYW5zL3twbGFufS9yb2xsb3V0Iq4BCgVTdGFnZRIMCgRuYW1lGAEgASgJEg8KAmlkGAIgASgJQgPgQQMSEwoLZW52aXJvbm1lbnQYAyABKAkSIAoFdGFza3MYBCADKAsyES5ieXRlYmFzZS52MS5UYXNrOk/qQUwKEmJ5dGViYXNlLmNvbS9TdGFnZRI2cHJvamVjdHMve3Byb2plY3R9L3BsYW5zL3twbGFufS9yb2xsb3V0L3N0YWdlcy97c3RhZ2V9Iq4JCgRUYXNrEgwKBG5hbWUYASABKAkSDwoHc3BlY19pZBgCIAEoCRIoCgZzdGF0dXMYAyABKA4yGC5ieXRlYmFzZS52MS5UYXNrLlN0YXR1cxIWCg5za2lwcGVkX3JlYXNvbhgEIAEoCRIkCgR0eXBlGAUgASgOMhYuYnl0ZWJhc2UudjEuVGFzay5UeXBlEg4KBnRhcmdldBgGIAEoCRI7Cg9kYXRhYmFzZV9jcmVhdGUYByABKAsyIC5ieXRlYmFzZS52MS5UYXNrLkRhdGFiYXNlQ3JlYXRlSAASOwoPZGF0YWJhc2VfdXBkYXRlGAggASgLMiAuYnl0ZWJhc2UudjEuVGFzay5EYXRhYmFzZVVwZGF0ZUgAEkQKFGRhdGFiYXNlX2RhdGFfZXhwb3J0GAkgASgLMiQuYnl0ZWJhc2UudjEuVGFzay5EYXRhYmFzZURhdGFFeHBvcnRIABI5Cgt1cGRhdGVfdGltZRgKIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBA0gBiAEBEjYKCHJ1bl90aW1lGAsgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDSAKIAQEakAEKDkRhdGFiYXNlQ3JlYXRlEg8KB3Byb2plY3QYASABKAkSEAoIZGF0YWJhc2UYAiABKAkSDQoFdGFibGUYAyABKAkSDQoFc2hlZXQYBCABKAkSFQoNY2hhcmFjdGVyX3NldBgFIAEoCRIRCgljb2xsYXRpb24YBiABKAkSEwoLZW52aXJvbm1lbnQYByABKAkaVgoORGF0YWJhc2VVcGRhdGUSDwoFc2hlZXQYASABKAlIABIRCgdyZWxlYXNlGAQgASgJSAASFgoOc2NoZW1hX3ZlcnNpb24YAiABKAlCCAoGc291cmNlGoIBChJEYXRhYmFzZURhdGFFeHBvcnQSDgoGdGFyZ2V0GAEgASgJEg0KBXNoZWV0GAIgASgJEikKBmZvcm1hdBgDIAEoDjIZLmJ5dGViYXNlLnYxLkV4cG9ydEZvcm1hdBIVCghwYXNzd29yZBgEIAEoCUgAiAEBQgsKCV9wYXNzd29yZCJ8CgZTdGF0dXMSFgoSU1RBVFVTX1VOU1BFQ0lGSUVEEAASDwoLTk9UX1NUQVJURUQQARILCgdQRU5ESU5HEAISCwoHUlVOTklORxADEggKBERPTkUQBBIKCgZGQUlMRUQQBRIMCghDQU5DRUxFRBAGEgsKB1NLSVBQRUQQByJpCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABILCgdHRU5FUkFMEAESEwoPREFUQUJBU0VfQ1JFQVRFEAISFAoQREFUQUJBU0VfTUlHUkFURRADEhMKD0RBVEFCQVNFX0VYUE9SVBAEOlvqQVgKEWJ5dGViYXNlLmNvbS9UYXNrEkNwcm9qZWN0cy97cHJvamVjdH0vcGxhbnMve3BsYW59L3JvbGxvdXQvc3RhZ2VzL3tzdGFnZX0vdGFza3Mve3Rhc2t9QgkKB3BheWxvYWRCDgoMX3VwZGF0ZV90aW1lQgsKCV9ydW5fdGltZSLsBwoHVGFza1J1bhIMCgRuYW1lGAEgASgJEg8KB2NyZWF0b3IYAiABKAkSNAoLY3JlYXRlX3RpbWUYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSNAoLdXBkYXRlX3RpbWUYBCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSKwoGc3RhdHVzGAUgASgOMhsuYnl0ZWJhc2UudjEuVGFza1J1bi5TdGF0dXMSDgoGZGV0YWlsGAYgASgJEjMKCnN0YXJ0X3RpbWUYCSABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSRwoVZXhwb3J0X2FyY2hpdmVfc3RhdHVzGAogASgOMiguYnl0ZWJhc2UudjEuVGFza1J1bi5FeHBvcnRBcmNoaXZlU3RhdHVzEhgKEGhhc19wcmlvcl9iYWNrdXAYCyABKAgSPwoOc2NoZWR1bGVyX2luZm8YDCABKAsyIi5ieXRlYmFzZS52MS5UYXNrUnVuLlNjaGVkdWxlckluZm9CA+BBAxI2CghydW5fdGltZRgOIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBA0gAiAEBGsEBCg1TY2hlZHVsZXJJbmZvEi8KC3JlcG9ydF90aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBJGCg13YWl0aW5nX2NhdXNlGAIgASgLMi8uYnl0ZWJhc2UudjEuVGFza1J1bi5TY2hlZHVsZXJJbmZvLldhaXRpbmdDYXVzZRo3CgxXYWl0aW5nQ2F1c2USHgoUcGFyYWxsZWxfdGFza3NfbGltaXQYAyABKAhIAEIHCgVjYXVzZSJtCgZTdGF0dXMSFgoSU1RBVFVTX1VOU1BFQ0lGSUVEEAASCwoHUEVORElORxABEgsKB1JVTk5JTkcQAhIICgRET05FEAMSCgoGRkFJTEVEEAQSDAoIQ0FOQ0VMRUQQBRINCglBVkFJTEFCTEUQBiJVChNFeHBvcnRBcmNoaXZlU3RhdHVzEiUKIUVYUE9SVF9BUkNISVZFX1NUQVRVU19VTlNQRUNJRklFRBAAEgkKBVJFQURZEAESDAoIRVhQT1JURUQQAjpx6kFuChRieXRlYmFzZS5jb20vVGFza1J1bhJWcHJvamVjdHMve3Byb2plY3R9L3BsYW5zL3twbGFufS9yb2xsb3V0L3N0YWdlcy97c3RhZ2V9L3Rhc2tzL3t0YXNrfS90YXNrUnVucy97dGFza1J1bn1CCwoJX3J1bl90aW1lIsMBCgpUYXNrUnVuTG9nEgwKBG5hbWUYASABKAkSLQoHZW50cmllcxgCIAMoCzIcLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeTp46kF1ChdieXRlYmFzZS5jb20vVGFza1J1bkxvZxJacHJvamVjdHMve3Byb2plY3R9L3BsYW5zL3twbGFufS9yb2xsb3V0L3N0YWdlcy97c3RhZ2V9L3Rhc2tzL3t0YXNrfS90YXNrUnVucy97dGFza1J1bn0vbG9nIuQTCg9UYXNrUnVuTG9nRW50cnkSLwoEdHlwZRgBIAEoDjIhLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5UeXBlEiwKCGxvZ190aW1lGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIRCglkZXBsb3lfaWQYAyABKAkSPAoLc2NoZW1hX2R1bXAYBCABKAsyJy5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuU2NoZW1hRHVtcBJECg9jb21tYW5kX2V4ZWN1dGUYBSABKAsyKy5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuQ29tbWFuZEV4ZWN1dGUSQAoNZGF0YWJhc2Vfc3luYxgGIAEoCzIpLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5EYXRhYmFzZVN5bmMSTAoTdHJhbnNhY3Rpb25fY29udHJvbBgIIAEoCzIvLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5UcmFuc2FjdGlvbkNvbnRyb2wSPgoMcHJpb3JfYmFja3VwGAkgASgLMiguYnl0ZWJhc2UudjEuVGFza1J1bkxvZ0VudHJ5LlByaW9yQmFja3VwEjoKCnJldHJ5X2luZm8YCiABKAsyJi5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuUmV0cnlJbmZvEj4KDGNvbXB1dGVfZGlmZhgLIAEoCzIoLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5Db21wdXRlRGlmZhJNChRyZWxlYXNlX2ZpbGVfZXhlY3V0ZRgMIAEoCzIvLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5SZWxlYXNlRmlsZUV4ZWN1dGUaeQoKU2NoZW1hRHVtcBIuCgpzdGFydF90aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIsCghlbmRfdGltZRgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDQoFZXJyb3IYAyABKAkaxgIKDkNvbW1hbmRFeGVjdXRlEiwKCGxvZ190aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIhCgVyYW5nZRgCIAEoCzISLmJ5dGViYXNlLnYxLlJhbmdlEhEKCXN0YXRlbWVudBgEIAEoCRJNCghyZXNwb25zZRgDIAEoCzI7LmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5Db21tYW5kRXhlY3V0ZS5Db21tYW5kUmVzcG9uc2UagAEKD0NvbW1hbmRSZXNwb25zZRIsCghsb2dfdGltZRgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDQoFZXJyb3IYAiABKAkSFQoNYWZmZWN0ZWRfcm93cxgDIAEoAxIZChFhbGxfYWZmZWN0ZWRfcm93cxgEIAMoAxp7CgxEYXRhYmFzZVN5bmMSLgoKc3RhcnRfdGltZRgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASLAoIZW5kX3RpbWUYAiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEg0KBWVycm9yGAMgASgJGqoBChJUcmFuc2FjdGlvbkNvbnRyb2wSQgoEdHlwZRgBIAEoDjI0LmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5UcmFuc2FjdGlvbkNvbnRyb2wuVHlwZRINCgVlcnJvchgCIAEoCSJBCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABIJCgVCRUdJThABEgoKBkNPTU1JVBACEgwKCFJPTExCQUNLEAMakgUKC1ByaW9yQmFja3VwEi4KCnN0YXJ0X3RpbWUYASABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEiwKCGVuZF90aW1lGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBJXChNwcmlvcl9iYWNrdXBfZGV0YWlsGAMgASgLMjouYnl0ZWJhc2UudjEuVGFza1J1bkxvZ0VudHJ5LlByaW9yQmFja3VwLlByaW9yQmFja3VwRGV0YWlsEg0KBWVycm9yGAQgASgJGrwDChFQcmlvckJhY2t1cERldGFpbBJOCgVpdGVtcxgBIAMoCzI/LmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5QcmlvckJhY2t1cC5QcmlvckJhY2t1cERldGFpbC5JdGVtGtYCCgRJdGVtElsKDHNvdXJjZV90YWJsZRgBIAEoCzJFLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5QcmlvckJhY2t1cC5QcmlvckJhY2t1cERldGFpbC5JdGVtLlRhYmxlElsKDHRhcmdldF90YWJsZRgCIAEoCzJFLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5QcmlvckJhY2t1cC5QcmlvckJhY2t1cERldGFpbC5JdGVtLlRhYmxlEi0KDnN0YXJ0X3Bvc2l0aW9uGAMgASgLMhUuYnl0ZWJhc2UudjEuUG9zaXRpb24SKwoMZW5kX3Bvc2l0aW9uGAQgASgLMhUuYnl0ZWJhc2UudjEuUG9zaXRpb24aOAoFVGFibGUSEAoIZGF0YWJhc2UYASABKAkSDgoGc2NoZW1hGAIgASgJEg0KBXRhYmxlGAMgASgJGkgKCVJldHJ5SW5mbxINCgVlcnJvchgBIAEoCRITCgtyZXRyeV9jb3VudBgCIAEoBRIXCg9tYXhpbXVtX3JldHJpZXMYAyABKAUaegoLQ29tcHV0ZURpZmYSLgoKc3RhcnRfdGltZRgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASLAoIZW5kX3RpbWUYAiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEg0KBWVycm9yGAMgASgJGjgKElJlbGVhc2VGaWxlRXhlY3V0ZRIPCgd2ZXJzaW9uGAEgASgJEhEKCWZpbGVfcGF0aBgCIAEoCSK8AQoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASDwoLU0NIRU1BX0RVTVAQARITCg9DT01NQU5EX0VYRUNVVEUQAhIRCg1EQVRBQkFTRV9TWU5DEAMSFwoTVFJBTlNBQ1RJT05fQ09OVFJPTBAFEhAKDFBSSU9SX0JBQ0tVUBAGEg4KClJFVFJZX0lORk8QBxIQCgxDT01QVVRFX0RJRkYQCBIYChRSRUxFQVNFX0ZJTEVfRVhFQ1VURRAJIkgKGEdldFRhc2tSdW5TZXNzaW9uUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Rhc2tSdW4i6wcKDlRhc2tSdW5TZXNzaW9uEgwKBG5hbWUYASABKAkSOAoIcG9zdGdyZXMYAiABKAsyJC5ieXRlYmFzZS52MS5UYXNrUnVuU2Vzc2lvbi5Qb3N0Z3Jlc0gAGoIGCghQb3N0Z3JlcxI9CgdzZXNzaW9uGAEgASgLMiwuYnl0ZWJhc2UudjEuVGFza1J1blNlc3Npb24uUG9zdGdyZXMuU2Vzc2lvbhJHChFibG9ja2luZ19zZXNzaW9ucxgCIAMoCzIsLmJ5dGViYXNlLnYxLlRhc2tSdW5TZXNzaW9uLlBvc3RncmVzLlNlc3Npb24SRgoQYmxvY2tlZF9zZXNzaW9ucxgDIAMoCzIsLmJ5dGViYXNlLnYxLlRhc2tSdW5TZXNzaW9uLlBvc3RncmVzLlNlc3Npb24apQQKB1Nlc3Npb24SCwoDcGlkGAEgASgJEhcKD2Jsb2NrZWRfYnlfcGlkcxgCIAMoCRINCgVxdWVyeRgDIAEoCRISCgVzdGF0ZRgEIAEoCUgAiAEBEhwKD3dhaXRfZXZlbnRfdHlwZRgFIAEoCUgBiAEBEhcKCndhaXRfZXZlbnQYBiABKAlIAogBARIUCgdkYXRuYW1lGAcgASgJSAOIAQESFAoHdXNlbmFtZRgIIAEoCUgEiAEBEhgKEGFwcGxpY2F0aW9uX25hbWUYCSABKAkSGAoLY2xpZW50X2FkZHIYCiABKAlIBYgBARIYCgtjbGllbnRfcG9ydBgLIAEoCUgGiAEBEjEKDWJhY2tlbmRfc3RhcnQYDCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEjMKCnhhY3Rfc3RhcnQYDSABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wSAeIAQESNAoLcXVlcnlfc3RhcnQYDiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wSAiIAQFCCAoGX3N0YXRlQhIKEF93YWl0X2V2ZW50X3R5cGVCDQoLX3dhaXRfZXZlbnRCCgoIX2RhdG5hbWVCCgoIX3VzZW5hbWVCDgoMX2NsaWVudF9hZGRyQg4KDF9jbGllbnRfcG9ydEINCgtfeGFjdF9zdGFydEIOCgxfcXVlcnlfc3RhcnQ6gAHqQX0KG2J5dGViYXNlLmNvbS9UYXNrUnVuU2Vzc2lvbhJecHJvamVjdHMve3Byb2plY3R9L3BsYW5zL3twbGFufS9yb2xsb3V0L3N0YWdlcy97c3RhZ2V9L3Rhc2tzL3t0YXNrfS90YXNrUnVucy97dGFza1J1bn0vc2Vzc2lvbkIJCgdzZXNzaW9uIksKHVByZXZpZXdUYXNrUnVuUm9sbGJhY2tSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Rhc2tSdW4iMwoeUHJldmlld1Rhc2tSdW5Sb2xsYmFja1Jlc3BvbnNlEhEKCXN0YXRlbWVudBgBIAEoCTKhEAoOUm9sbG91dFNlcnZpY2USjwEKCkdldFJvbGxvdXQSHi5ieXRlYmFzZS52MS5HZXRSb2xsb3V0UmVxdWVzdBoULmJ5dGViYXNlLnYxLlJvbGxvdXQiS9pBBG5hbWWK6jAPYmIucm9sbG91dHMuZ2V0kOowAYLT5JMCJxIlL3YxL3tuYW1lPXByb2plY3RzLyovcGxhbnMvKi9yb2xsb3V0fRKeAQoMTGlzdFJvbGxvdXRzEiAuYnl0ZWJhc2UudjEuTGlzdFJvbGxvdXRzUmVxdWVzdBohLmJ5dGViYXNlLnYxLkxpc3RSb2xsb3V0c1Jlc3BvbnNlIknaQQZwYXJlbnSK6jAQYmIucm9sbG91dHMubGlzdJDqMAGC0+STAiISIC92MS97cGFyZW50PXByb2plY3RzLyp9L3JvbGxvdXRzEqMBCg1DcmVhdGVSb2xsb3V0EiEuYnl0ZWJhc2UudjEuQ3JlYXRlUm9sbG91dFJlcXVlc3QaFC5ieXRlYmFzZS52MS5Sb2xsb3V0IlnaQQZwYXJlbnSK6jASYmIucm9sbG91dHMuY3JlYXRlkOowAZjqMAGC0+STAiw6ASoiJy92MS97cGFyZW50PXByb2plY3RzLyovcGxhbnMvKn0vcm9sbG91dBK/AQoMTGlzdFRhc2tSdW5zEiAuYnl0ZWJhc2UudjEuTGlzdFRhc2tSdW5zUmVxdWVzdBohLmJ5dGViYXNlLnYxLkxpc3RUYXNrUnVuc1Jlc3BvbnNlImraQQZwYXJlbnSK6jAQYmIudGFza1J1bnMubGlzdJDqMAGC0+STAkMSQS92MS97cGFyZW50PXByb2plY3RzLyovcGxhbnMvKi9yb2xsb3V0L3N0YWdlcy8qL3Rhc2tzLyp9L3Rhc2tSdW5zEqwBCgpHZXRUYXNrUnVuEh4uYnl0ZWJhc2UudjEuR2V0VGFza1J1blJlcXVlc3QaFC5ieXRlYmFzZS52MS5UYXNrUnVuImjaQQRuYW1liuowEGJiLnRhc2tSdW5zLmxpc3SQ6jABgtPkkwJDEkEvdjEve25hbWU9cHJvamVjdHMvKi9wbGFucy8qL3JvbGxvdXQvc3RhZ2VzLyovdGFza3MvKi90YXNrUnVucy8qfRK9AQoNR2V0VGFza1J1bkxvZxIhLmJ5dGViYXNlLnYxLkdldFRhc2tSdW5Mb2dSZXF1ZXN0GhcuYnl0ZWJhc2UudjEuVGFza1J1bkxvZyJw2kEGcGFyZW50iuowEGJiLnRhc2tSdW5zLmxpc3SQ6jABgtPkkwJJEkcvdjEve3BhcmVudD1wcm9qZWN0cy8qL3BsYW5zLyovcm9sbG91dC9zdGFnZXMvKi90YXNrcy8qL3Rhc2tSdW5zLyp9L2xvZxLNAQoRR2V0VGFza1J1blNlc3Npb24SJS5ieXRlYmFzZS52MS5HZXRUYXNrUnVuU2Vzc2lvblJlcXVlc3QaGy5ieXRlYmFzZS52MS5UYXNrUnVuU2Vzc2lvbiJ02kEGcGFyZW50iuowEGJiLnRhc2tSdW5zLmxpc3SQ6jABgtPkkwJNEksvdjEve3BhcmVudD1wcm9qZWN0cy8qL3BsYW5zLyovcm9sbG91dC9zdGFnZXMvKi90YXNrcy8qL3Rhc2tSdW5zLyp9L3Nlc3Npb24SswEKDUJhdGNoUnVuVGFza3MSIS5ieXRlYmFzZS52MS5CYXRjaFJ1blRhc2tzUmVxdWVzdBoiLmJ5dGViYXNlLnYxLkJhdGNoUnVuVGFza3NSZXNwb25zZSJb2kEGcGFyZW50kOowApjqMAGC0+STAkQ6ASoiPy92MS97cGFyZW50PXByb2plY3RzLyovcGxhbnMvKi9yb2xsb3V0L3N0YWdlcy8qfS90YXNrczpiYXRjaFJ1bhK3AQoOQmF0Y2hTa2lwVGFza3MSIi5ieXRlYmFzZS52MS5CYXRjaFNraXBUYXNrc1JlcXVlc3QaIy5ieXRlYmFzZS52MS5CYXRjaFNraXBUYXNrc1Jlc3BvbnNlIlzaQQZwYXJlbnSQ6jACmOowAYLT5JMCRToBKiJAL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9wbGFucy8qL3JvbGxvdXQvc3RhZ2VzLyp9L3Rhc2tzOmJhdGNoU2tpcBLTAQoTQmF0Y2hDYW5jZWxUYXNrUnVucxInLmJ5dGViYXNlLnYxLkJhdGNoQ2FuY2VsVGFza1J1bnNSZXF1ZXN0GiguYnl0ZWJhc2UudjEuQmF0Y2hDYW5jZWxUYXNrUnVuc1Jlc3BvbnNlImnaQQZwYXJlbnSQ6jACmOowAYLT5JMCUjoBKiJNL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9wbGFucy8qL3JvbGxvdXQvc3RhZ2VzLyovdGFza3MvKn0vdGFza1J1bnM6YmF0Y2hDYW5jZWwS7gEKFlByZXZpZXdUYXNrUnVuUm9sbGJhY2sSKi5ieXRlYmFzZS52MS5QcmV2aWV3VGFza1J1blJvbGxiYWNrUmVxdWVzdBorLmJ5dGViYXNlLnYxLlByZXZpZXdUYXNrUnVuUm9sbGJhY2tSZXNwb25zZSJ72kEEbmFtZYrqMBBiYi50YXNrUnVucy5saXN0kOowAYLT5JMCVjoBKiJRL3YxL3tuYW1lPXByb2plY3RzLyovcGxhbnMvKi9yb2xsb3V0L3N0YWdlcy8qL3Rhc2tzLyovdGFza1J1bnMvKn06cHJldmlld1JvbGxiYWNrQqkBCg9jb20uYnl0ZWJhc2UudjFCE1JvbGxvdXRTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common]);+ fileDesc("Chh2MS9yb2xsb3V0X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIpEBChRCYXRjaFJ1blRhc2tzUmVxdWVzdBIqCgZwYXJlbnQYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL1N0YWdlEg0KBXRhc2tzGAIgAygJEjEKCHJ1bl90aW1lGAMgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEgAiAEBQgsKCV9ydW5fdGltZSIXChVCYXRjaFJ1blRhc2tzUmVzcG9uc2UibAoVQmF0Y2hTa2lwVGFza3NSZXF1ZXN0EioKBnBhcmVudBgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vU3RhZ2USDQoFdGFza3MYAiADKAkSGAoGcmVhc29uGAMgASgJQgi6SAVyAxjoByIYChZCYXRjaFNraXBUYXNrc1Jlc3BvbnNlIloKGkJhdGNoQ2FuY2VsVGFza1J1bnNSZXF1ZXN0EikKBnBhcmVudBgBIAEoCUIZ4EEC+kETChFieXRlYmFzZS5jb20vVGFzaxIRCgl0YXNrX3J1bnMYAiADKAkiHQobQmF0Y2hDYW5jZWxUYXNrUnVuc1Jlc3BvbnNlIj8KEUdldFJvbGxvdXRSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1JvbGxvdXQiegoTTGlzdFJvbGxvdXRzUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkSDgoGZmlsdGVyGAQgASgJIlcKFExpc3RSb2xsb3V0c1Jlc3BvbnNlEiYKCHJvbGxvdXRzGAEgAygLMhQuYnl0ZWJhc2UudjEuUm9sbG91dBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkiYQoUQ3JlYXRlUm9sbG91dFJlcXVlc3QSKQoGcGFyZW50GAEgASgJQhngQQL6QRMKEWJ5dGViYXNlLmNvbS9QbGFuEhMKBnRhcmdldBgDIAEoCUgAiAEBQgkKB190YXJnZXQiQAoTTGlzdFRhc2tSdW5zUmVxdWVzdBIpCgZwYXJlbnQYASABKAlCGeBBAvpBEwoRYnl0ZWJhc2UuY29tL1Rhc2siPwoUTGlzdFRhc2tSdW5zUmVzcG9uc2USJwoJdGFza19ydW5zGAEgAygLMhQuYnl0ZWJhc2UudjEuVGFza1J1biI/ChFHZXRUYXNrUnVuUmVxdWVzdBIqCgRuYW1lGAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9UYXNrUnVuIkQKFEdldFRhc2tSdW5Mb2dSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vVGFza1J1biKEAgoHUm9sbG91dBIMCgRuYW1lGAEgASgJEhIKBXRpdGxlGAMgASgJQgPgQQMSJwoGc3RhZ2VzGAQgAygLMhIuYnl0ZWJhc2UudjEuU3RhZ2VCA+BBAxI0CgtjcmVhdGVfdGltZRgGIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgHIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAzpC6kE/ChRieXRlYmFzZS5jb20vUm9sbG91dBIncHJvamVjdHMve3Byb2plY3R9L3BsYW5zL3twbGFufS9yb2xsb3V0Iq4BCgVTdGFnZRIMCgRuYW1lGAEgASgJEg8KAmlkGAIgASgJQgPgQQMSEwoLZW52aXJvbm1lbnQYAyABKAkSIAoFdGFza3MYBCADKAsyES5ieXRlYmFzZS52MS5UYXNrOk/qQUwKEmJ5dGViYXNlLmNvbS9TdGFnZRI2cHJvamVjdHMve3Byb2plY3R9L3BsYW5zL3twbGFufS9yb2xsb3V0L3N0YWdlcy97c3RhZ2V9IsQHCgRUYXNrEgwKBG5hbWUYASABKAkSDwoHc3BlY19pZBgCIAEoCRIoCgZzdGF0dXMYAyABKA4yGC5ieXRlYmFzZS52MS5UYXNrLlN0YXR1cxIWCg5za2lwcGVkX3JlYXNvbhgEIAEoCRIkCgR0eXBlGAUgASgOMhYuYnl0ZWJhc2UudjEuVGFzay5UeXBlEg4KBnRhcmdldBgGIAEoCRI7Cg9kYXRhYmFzZV9jcmVhdGUYByABKAsyIC5ieXRlYmFzZS52MS5UYXNrLkRhdGFiYXNlQ3JlYXRlSAASOwoPZGF0YWJhc2VfdXBkYXRlGAggASgLMiAuYnl0ZWJhc2UudjEuVGFzay5EYXRhYmFzZVVwZGF0ZUgAEkQKFGRhdGFiYXNlX2RhdGFfZXhwb3J0GAkgASgLMiQuYnl0ZWJhc2UudjEuVGFzay5EYXRhYmFzZURhdGFFeHBvcnRIABI5Cgt1cGRhdGVfdGltZRgKIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBA0gBiAEBEjYKCHJ1bl90aW1lGAsgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDSAKIAQEaHwoORGF0YWJhc2VDcmVhdGUSDQoFc2hlZXQYBCABKAkaPgoORGF0YWJhc2VVcGRhdGUSDwoFc2hlZXQYASABKAlIABIRCgdyZWxlYXNlGAQgASgJSABCCAoGc291cmNlGiMKEkRhdGFiYXNlRGF0YUV4cG9ydBINCgVzaGVldBgCIAEoCSJ8CgZTdGF0dXMSFgoSU1RBVFVTX1VOU1BFQ0lGSUVEEAASDwoLTk9UX1NUQVJURUQQARILCgdQRU5ESU5HEAISCwoHUlVOTklORxADEggKBERPTkUQBBIKCgZGQUlMRUQQBRIMCghDQU5DRUxFRBAGEgsKB1NLSVBQRUQQByJpCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABILCgdHRU5FUkFMEAESEwoPREFUQUJBU0VfQ1JFQVRFEAISFAoQREFUQUJBU0VfTUlHUkFURRADEhMKD0RBVEFCQVNFX0VYUE9SVBAEOlvqQVgKEWJ5dGViYXNlLmNvbS9UYXNrEkNwcm9qZWN0cy97cHJvamVjdH0vcGxhbnMve3BsYW59L3JvbGxvdXQvc3RhZ2VzL3tzdGFnZX0vdGFza3Mve3Rhc2t9QgkKB3BheWxvYWRCDgoMX3VwZGF0ZV90aW1lQgsKCV9ydW5fdGltZSLsBwoHVGFza1J1bhIMCgRuYW1lGAEgASgJEg8KB2NyZWF0b3IYAiABKAkSNAoLY3JlYXRlX3RpbWUYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSNAoLdXBkYXRlX3RpbWUYBCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSKwoGc3RhdHVzGAUgASgOMhsuYnl0ZWJhc2UudjEuVGFza1J1bi5TdGF0dXMSDgoGZGV0YWlsGAYgASgJEjMKCnN0YXJ0X3RpbWUYCSABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSRwoVZXhwb3J0X2FyY2hpdmVfc3RhdHVzGAogASgOMiguYnl0ZWJhc2UudjEuVGFza1J1bi5FeHBvcnRBcmNoaXZlU3RhdHVzEhgKEGhhc19wcmlvcl9iYWNrdXAYCyABKAgSPwoOc2NoZWR1bGVyX2luZm8YDCABKAsyIi5ieXRlYmFzZS52MS5UYXNrUnVuLlNjaGVkdWxlckluZm9CA+BBAxI2CghydW5fdGltZRgOIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBA0gAiAEBGsEBCg1TY2hlZHVsZXJJbmZvEi8KC3JlcG9ydF90aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBJGCg13YWl0aW5nX2NhdXNlGAIgASgLMi8uYnl0ZWJhc2UudjEuVGFza1J1bi5TY2hlZHVsZXJJbmZvLldhaXRpbmdDYXVzZRo3CgxXYWl0aW5nQ2F1c2USHgoUcGFyYWxsZWxfdGFza3NfbGltaXQYAyABKAhIAEIHCgVjYXVzZSJtCgZTdGF0dXMSFgoSU1RBVFVTX1VOU1BFQ0lGSUVEEAASCwoHUEVORElORxABEgsKB1JVTk5JTkcQAhIICgRET05FEAMSCgoGRkFJTEVEEAQSDAoIQ0FOQ0VMRUQQBRINCglBVkFJTEFCTEUQBiJVChNFeHBvcnRBcmNoaXZlU3RhdHVzEiUKIUVYUE9SVF9BUkNISVZFX1NUQVRVU19VTlNQRUNJRklFRBAAEgkKBVJFQURZEAESDAoIRVhQT1JURUQQAjpx6kFuChRieXRlYmFzZS5jb20vVGFza1J1bhJWcHJvamVjdHMve3Byb2plY3R9L3BsYW5zL3twbGFufS9yb2xsb3V0L3N0YWdlcy97c3RhZ2V9L3Rhc2tzL3t0YXNrfS90YXNrUnVucy97dGFza1J1bn1CCwoJX3J1bl90aW1lIsMBCgpUYXNrUnVuTG9nEgwKBG5hbWUYASABKAkSLQoHZW50cmllcxgCIAMoCzIcLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeTp46kF1ChdieXRlYmFzZS5jb20vVGFza1J1bkxvZxJacHJvamVjdHMve3Byb2plY3R9L3BsYW5zL3twbGFufS9yb2xsb3V0L3N0YWdlcy97c3RhZ2V9L3Rhc2tzL3t0YXNrfS90YXNrUnVucy97dGFza1J1bn0vbG9nIuQTCg9UYXNrUnVuTG9nRW50cnkSLwoEdHlwZRgBIAEoDjIhLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5UeXBlEiwKCGxvZ190aW1lGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIRCglkZXBsb3lfaWQYAyABKAkSPAoLc2NoZW1hX2R1bXAYBCABKAsyJy5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuU2NoZW1hRHVtcBJECg9jb21tYW5kX2V4ZWN1dGUYBSABKAsyKy5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuQ29tbWFuZEV4ZWN1dGUSQAoNZGF0YWJhc2Vfc3luYxgGIAEoCzIpLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5EYXRhYmFzZVN5bmMSTAoTdHJhbnNhY3Rpb25fY29udHJvbBgIIAEoCzIvLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5UcmFuc2FjdGlvbkNvbnRyb2wSPgoMcHJpb3JfYmFja3VwGAkgASgLMiguYnl0ZWJhc2UudjEuVGFza1J1bkxvZ0VudHJ5LlByaW9yQmFja3VwEjoKCnJldHJ5X2luZm8YCiABKAsyJi5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuUmV0cnlJbmZvEj4KDGNvbXB1dGVfZGlmZhgLIAEoCzIoLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5Db21wdXRlRGlmZhJNChRyZWxlYXNlX2ZpbGVfZXhlY3V0ZRgMIAEoCzIvLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5SZWxlYXNlRmlsZUV4ZWN1dGUaeQoKU2NoZW1hRHVtcBIuCgpzdGFydF90aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIsCghlbmRfdGltZRgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDQoFZXJyb3IYAyABKAkaxgIKDkNvbW1hbmRFeGVjdXRlEiwKCGxvZ190aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIhCgVyYW5nZRgCIAEoCzISLmJ5dGViYXNlLnYxLlJhbmdlEhEKCXN0YXRlbWVudBgEIAEoCRJNCghyZXNwb25zZRgDIAEoCzI7LmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5Db21tYW5kRXhlY3V0ZS5Db21tYW5kUmVzcG9uc2UagAEKD0NvbW1hbmRSZXNwb25zZRIsCghsb2dfdGltZRgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDQoFZXJyb3IYAiABKAkSFQoNYWZmZWN0ZWRfcm93cxgDIAEoAxIZChFhbGxfYWZmZWN0ZWRfcm93cxgEIAMoAxp7CgxEYXRhYmFzZVN5bmMSLgoKc3RhcnRfdGltZRgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASLAoIZW5kX3RpbWUYAiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEg0KBWVycm9yGAMgASgJGqoBChJUcmFuc2FjdGlvbkNvbnRyb2wSQgoEdHlwZRgBIAEoDjI0LmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5UcmFuc2FjdGlvbkNvbnRyb2wuVHlwZRINCgVlcnJvchgCIAEoCSJBCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABIJCgVCRUdJThABEgoKBkNPTU1JVBACEgwKCFJPTExCQUNLEAMakgUKC1ByaW9yQmFja3VwEi4KCnN0YXJ0X3RpbWUYASABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEiwKCGVuZF90aW1lGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBJXChNwcmlvcl9iYWNrdXBfZGV0YWlsGAMgASgLMjouYnl0ZWJhc2UudjEuVGFza1J1bkxvZ0VudHJ5LlByaW9yQmFja3VwLlByaW9yQmFja3VwRGV0YWlsEg0KBWVycm9yGAQgASgJGrwDChFQcmlvckJhY2t1cERldGFpbBJOCgVpdGVtcxgBIAMoCzI/LmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5QcmlvckJhY2t1cC5QcmlvckJhY2t1cERldGFpbC5JdGVtGtYCCgRJdGVtElsKDHNvdXJjZV90YWJsZRgBIAEoCzJFLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5QcmlvckJhY2t1cC5QcmlvckJhY2t1cERldGFpbC5JdGVtLlRhYmxlElsKDHRhcmdldF90YWJsZRgCIAEoCzJFLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5QcmlvckJhY2t1cC5QcmlvckJhY2t1cERldGFpbC5JdGVtLlRhYmxlEi0KDnN0YXJ0X3Bvc2l0aW9uGAMgASgLMhUuYnl0ZWJhc2UudjEuUG9zaXRpb24SKwoMZW5kX3Bvc2l0aW9uGAQgASgLMhUuYnl0ZWJhc2UudjEuUG9zaXRpb24aOAoFVGFibGUSEAoIZGF0YWJhc2UYASABKAkSDgoGc2NoZW1hGAIgASgJEg0KBXRhYmxlGAMgASgJGkgKCVJldHJ5SW5mbxINCgVlcnJvchgBIAEoCRITCgtyZXRyeV9jb3VudBgCIAEoBRIXCg9tYXhpbXVtX3JldHJpZXMYAyABKAUaegoLQ29tcHV0ZURpZmYSLgoKc3RhcnRfdGltZRgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASLAoIZW5kX3RpbWUYAiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEg0KBWVycm9yGAMgASgJGjgKElJlbGVhc2VGaWxlRXhlY3V0ZRIPCgd2ZXJzaW9uGAEgASgJEhEKCWZpbGVfcGF0aBgCIAEoCSK8AQoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASDwoLU0NIRU1BX0RVTVAQARITCg9DT01NQU5EX0VYRUNVVEUQAhIRCg1EQVRBQkFTRV9TWU5DEAMSFwoTVFJBTlNBQ1RJT05fQ09OVFJPTBAFEhAKDFBSSU9SX0JBQ0tVUBAGEg4KClJFVFJZX0lORk8QBxIQCgxDT01QVVRFX0RJRkYQCBIYChRSRUxFQVNFX0ZJTEVfRVhFQ1VURRAJIkgKGEdldFRhc2tSdW5TZXNzaW9uUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Rhc2tSdW4i6wcKDlRhc2tSdW5TZXNzaW9uEgwKBG5hbWUYASABKAkSOAoIcG9zdGdyZXMYAiABKAsyJC5ieXRlYmFzZS52MS5UYXNrUnVuU2Vzc2lvbi5Qb3N0Z3Jlc0gAGoIGCghQb3N0Z3JlcxI9CgdzZXNzaW9uGAEgASgLMiwuYnl0ZWJhc2UudjEuVGFza1J1blNlc3Npb24uUG9zdGdyZXMuU2Vzc2lvbhJHChFibG9ja2luZ19zZXNzaW9ucxgCIAMoCzIsLmJ5dGViYXNlLnYxLlRhc2tSdW5TZXNzaW9uLlBvc3RncmVzLlNlc3Npb24SRgoQYmxvY2tlZF9zZXNzaW9ucxgDIAMoCzIsLmJ5dGViYXNlLnYxLlRhc2tSdW5TZXNzaW9uLlBvc3RncmVzLlNlc3Npb24apQQKB1Nlc3Npb24SCwoDcGlkGAEgASgJEhcKD2Jsb2NrZWRfYnlfcGlkcxgCIAMoCRINCgVxdWVyeRgDIAEoCRISCgVzdGF0ZRgEIAEoCUgAiAEBEhwKD3dhaXRfZXZlbnRfdHlwZRgFIAEoCUgBiAEBEhcKCndhaXRfZXZlbnQYBiABKAlIAogBARIUCgdkYXRuYW1lGAcgASgJSAOIAQESFAoHdXNlbmFtZRgIIAEoCUgEiAEBEhgKEGFwcGxpY2F0aW9uX25hbWUYCSABKAkSGAoLY2xpZW50X2FkZHIYCiABKAlIBYgBARIYCgtjbGllbnRfcG9ydBgLIAEoCUgGiAEBEjEKDWJhY2tlbmRfc3RhcnQYDCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEjMKCnhhY3Rfc3RhcnQYDSABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wSAeIAQESNAoLcXVlcnlfc3RhcnQYDiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wSAiIAQFCCAoGX3N0YXRlQhIKEF93YWl0X2V2ZW50X3R5cGVCDQoLX3dhaXRfZXZlbnRCCgoIX2RhdG5hbWVCCgoIX3VzZW5hbWVCDgoMX2NsaWVudF9hZGRyQg4KDF9jbGllbnRfcG9ydEINCgtfeGFjdF9zdGFydEIOCgxfcXVlcnlfc3RhcnQ6gAHqQX0KG2J5dGViYXNlLmNvbS9UYXNrUnVuU2Vzc2lvbhJecHJvamVjdHMve3Byb2plY3R9L3BsYW5zL3twbGFufS9yb2xsb3V0L3N0YWdlcy97c3RhZ2V9L3Rhc2tzL3t0YXNrfS90YXNrUnVucy97dGFza1J1bn0vc2Vzc2lvbkIJCgdzZXNzaW9uIksKHVByZXZpZXdUYXNrUnVuUm9sbGJhY2tSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Rhc2tSdW4iMwoeUHJldmlld1Rhc2tSdW5Sb2xsYmFja1Jlc3BvbnNlEhEKCXN0YXRlbWVudBgBIAEoCTKhEAoOUm9sbG91dFNlcnZpY2USjwEKCkdldFJvbGxvdXQSHi5ieXRlYmFzZS52MS5HZXRSb2xsb3V0UmVxdWVzdBoULmJ5dGViYXNlLnYxLlJvbGxvdXQiS9pBBG5hbWWK6jAPYmIucm9sbG91dHMuZ2V0kOowAYLT5JMCJxIlL3YxL3tuYW1lPXByb2plY3RzLyovcGxhbnMvKi9yb2xsb3V0fRKeAQoMTGlzdFJvbGxvdXRzEiAuYnl0ZWJhc2UudjEuTGlzdFJvbGxvdXRzUmVxdWVzdBohLmJ5dGViYXNlLnYxLkxpc3RSb2xsb3V0c1Jlc3BvbnNlIknaQQZwYXJlbnSK6jAQYmIucm9sbG91dHMubGlzdJDqMAGC0+STAiISIC92MS97cGFyZW50PXByb2plY3RzLyp9L3JvbGxvdXRzEqMBCg1DcmVhdGVSb2xsb3V0EiEuYnl0ZWJhc2UudjEuQ3JlYXRlUm9sbG91dFJlcXVlc3QaFC5ieXRlYmFzZS52MS5Sb2xsb3V0IlnaQQZwYXJlbnSK6jASYmIucm9sbG91dHMuY3JlYXRlkOowAZjqMAGC0+STAiw6ASoiJy92MS97cGFyZW50PXByb2plY3RzLyovcGxhbnMvKn0vcm9sbG91dBK/AQoMTGlzdFRhc2tSdW5zEiAuYnl0ZWJhc2UudjEuTGlzdFRhc2tSdW5zUmVxdWVzdBohLmJ5dGViYXNlLnYxLkxpc3RUYXNrUnVuc1Jlc3BvbnNlImraQQZwYXJlbnSK6jAQYmIudGFza1J1bnMubGlzdJDqMAGC0+STAkMSQS92MS97cGFyZW50PXByb2plY3RzLyovcGxhbnMvKi9yb2xsb3V0L3N0YWdlcy8qL3Rhc2tzLyp9L3Rhc2tSdW5zEqwBCgpHZXRUYXNrUnVuEh4uYnl0ZWJhc2UudjEuR2V0VGFza1J1blJlcXVlc3QaFC5ieXRlYmFzZS52MS5UYXNrUnVuImjaQQRuYW1liuowEGJiLnRhc2tSdW5zLmxpc3SQ6jABgtPkkwJDEkEvdjEve25hbWU9cHJvamVjdHMvKi9wbGFucy8qL3JvbGxvdXQvc3RhZ2VzLyovdGFza3MvKi90YXNrUnVucy8qfRK9AQoNR2V0VGFza1J1bkxvZxIhLmJ5dGViYXNlLnYxLkdldFRhc2tSdW5Mb2dSZXF1ZXN0GhcuYnl0ZWJhc2UudjEuVGFza1J1bkxvZyJw2kEGcGFyZW50iuowEGJiLnRhc2tSdW5zLmxpc3SQ6jABgtPkkwJJEkcvdjEve3BhcmVudD1wcm9qZWN0cy8qL3BsYW5zLyovcm9sbG91dC9zdGFnZXMvKi90YXNrcy8qL3Rhc2tSdW5zLyp9L2xvZxLNAQoRR2V0VGFza1J1blNlc3Npb24SJS5ieXRlYmFzZS52MS5HZXRUYXNrUnVuU2Vzc2lvblJlcXVlc3QaGy5ieXRlYmFzZS52MS5UYXNrUnVuU2Vzc2lvbiJ02kEGcGFyZW50iuowEGJiLnRhc2tSdW5zLmxpc3SQ6jABgtPkkwJNEksvdjEve3BhcmVudD1wcm9qZWN0cy8qL3BsYW5zLyovcm9sbG91dC9zdGFnZXMvKi90YXNrcy8qL3Rhc2tSdW5zLyp9L3Nlc3Npb24SswEKDUJhdGNoUnVuVGFza3MSIS5ieXRlYmFzZS52MS5CYXRjaFJ1blRhc2tzUmVxdWVzdBoiLmJ5dGViYXNlLnYxLkJhdGNoUnVuVGFza3NSZXNwb25zZSJb2kEGcGFyZW50kOowApjqMAGC0+STAkQ6ASoiPy92MS97cGFyZW50PXByb2plY3RzLyovcGxhbnMvKi9yb2xsb3V0L3N0YWdlcy8qfS90YXNrczpiYXRjaFJ1bhK3AQoOQmF0Y2hTa2lwVGFza3MSIi5ieXRlYmFzZS52MS5CYXRjaFNraXBUYXNrc1JlcXVlc3QaIy5ieXRlYmFzZS52MS5CYXRjaFNraXBUYXNrc1Jlc3BvbnNlIlzaQQZwYXJlbnSQ6jACmOowAYLT5JMCRToBKiJAL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9wbGFucy8qL3JvbGxvdXQvc3RhZ2VzLyp9L3Rhc2tzOmJhdGNoU2tpcBLTAQoTQmF0Y2hDYW5jZWxUYXNrUnVucxInLmJ5dGViYXNlLnYxLkJhdGNoQ2FuY2VsVGFza1J1bnNSZXF1ZXN0GiguYnl0ZWJhc2UudjEuQmF0Y2hDYW5jZWxUYXNrUnVuc1Jlc3BvbnNlImnaQQZwYXJlbnSQ6jACmOowAYLT5JMCUjoBKiJNL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9wbGFucy8qL3JvbGxvdXQvc3RhZ2VzLyovdGFza3MvKn0vdGFza1J1bnM6YmF0Y2hDYW5jZWwS7gEKFlByZXZpZXdUYXNrUnVuUm9sbGJhY2sSKi5ieXRlYmFzZS52MS5QcmV2aWV3VGFza1J1blJvbGxiYWNrUmVxdWVzdBorLmJ5dGViYXNlLnYxLlByZXZpZXdUYXNrUnVuUm9sbGJhY2tSZXNwb25zZSJ72kEEbmFtZYrqMBBiYi50YXNrUnVucy5saXN0kOowAYLT5JMCVjoBKiJRL3YxL3tuYW1lPXByb2plY3RzLyovcGxhbnMvKi9yb2xsb3V0L3N0YWdlcy8qL3Rhc2tzLyovdGFza1J1bnMvKn06cHJldmlld1JvbGxiYWNrQqkBCg9jb20uYnl0ZWJhc2UudjFCE1JvbGxvdXRTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common]);/*** Describes the message bytebase.v1.BatchRunTasksRequest.diff --git a/frontend/src/utils/v1/issue/rollout.ts b/frontend/src/utils/v1/issue/rollout.tsindex 100fcd6a9e..d51d553591 100644--- a/frontend/src/utils/v1/issue/rollout.ts+++ b/frontend/src/utils/v1/issue/rollout.ts@@ -15,6 +15,7 @@ import {unknownStage,unknownTask,} from "@/types";+import type { Plan } from "@/types/proto-es/v1/plan_service_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";import {type Rollout,@@ -184,16 +185,6 @@ export const findStageByName = ();};-export const extractSchemaVersionFromTask = (task: Task): string => {- // The schema version is specified in the filename- // parsed and stored to the payload.schemaVersion- // fallback to empty if we can't read the field.- if (task.payload?.case === "databaseUpdate") {- return task.payload.value.schemaVersion ?? "";- }- return "";-};-export const sheetNameOfTaskV1 = (task: Task): string => {if (task.payload?.case === "databaseCreate") {return task.payload.value.sheet ?? "";@@ -288,12 +279,12 @@ export const getRolloutStatus = (rollout: Rollout): Task_Status => {return Task_Status.NOT_STARTED;};-export const databaseForTask = (project: Project, task: Task) => {+export const databaseForTask = (project: Project, task: Task, plan?: Plan) => {switch (task.type) {case Task_Type.DATABASE_CREATE:// The database is not created yet.// extract database info from the task's and payload's properties.- return extractCoreDatabaseInfoFromDatabaseCreateTask(project, task);+ return extractCoreDatabaseInfoFromDatabaseCreateTask(project, task, plan);case Task_Type.DATABASE_MIGRATE:case Task_Type.DATABASE_EXPORT:const db = useDatabaseV1Store().getDatabaseByName(task.target);diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yamlindex 244bb0e013..2e36e1f0dc 100644--- a/proto/gen/grpc-doc/openapi.yaml+++ b/proto/gen/grpc-doc/openapi.yaml@@ -14513,58 +14513,18 @@ components:Task_DatabaseCreate:type: objectproperties:- project:- type: string- description: |-- The project owning the database.- Format: projects/{project}- database:- type: string- description: Database name.- table:- type: string- description: Table name.sheet:type: stringdescription: 'Format: projects/{project}/sheets/{sheet}'- characterSet:- type: string- description: The character set for the database.- collation:- type: string- description: The collation for the database.- environment:- type: string- description: The environment the database belongs to.description: Payload for creating a new database.Task_DatabaseDataExport:type: objectproperties:- target:- type: string- description: |-- The resource name of the target.- Format: instances/{instance-id}/databases/{database-name}sheet:type: stringdescription: |-The resource name of the sheet.Format: projects/{project}/sheets/{sheet}- format:- enum:- - FORMAT_UNSPECIFIED- - CSV- - JSON- - SQL- - XLSX- type: string- description: The format of the exported file.- format: enum- password:- type: string- description: |-- The zip password provided by users.- Leave it empty if no needs to encrypt the zip file.description: Payload for exporting database data.Task_DatabaseUpdate:type: object@@ -14575,9 +14535,6 @@ components:release:type: stringdescription: 'Format: projects/{project}/releases/{release}'- schemaVersion:- type: string- description: The target schema version after this update.description: Payload for updating a database schema.TessellationConfig:type: objectdiff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.mdindex 6038be3b7c..d24db2a9fb 100644--- a/proto/gen/grpc-doc/store/README.md+++ b/proto/gen/grpc-doc/store/README.md@@ -4641,17 +4641,10 @@ Task is the metadata for database operation tasks.| skipped | [bool](#bool) | | Whether the task was skipped during execution. || skipped_reason | [string](#string) | | Reason why the task was skipped. || spec_id | [string](#string) | | UUID that identifies the spec this task implements. |-| environment_id | [string](#string) | | The environment where the database will be created. |-| database_name | [string](#string) | | Name of the database to create. |-| table_name | [string](#string) | | Optional table name to create (required for some databases like MongoDB). |-| character_set | [string](#string) | | Character set for the new database. |-| collation | [string](#string) | | Collation for the new database. || sheet_sha256 | [string](#string) | | The SHA256 hash of a single sheet content (hex-encoded). Used for non-release tasks. || release | [string](#string) | | The release resource name: projects/{project}/releases/{release}. Used for GitOps release-based tasks that execute multiple files. || enable_prior_backup | [bool](#bool) | | Whether to create an automatic backup before applying changes. || flags | [Task.FlagsEntry](#bytebase-store-Task-FlagsEntry) | repeated | Configuration flags for gh-ost migration tool. |-| password | [string](#string) | | Password to encrypt the exported data archive. |-| format | [ExportFormat](#bytebase-store-ExportFormat) | | Format of the exported data (SQL, CSV, JSON, etc). || enable_ghost | [bool](#bool) | | Whether to use gh-ost for online schema migration. |diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.htmlindex c0c93b19fb..83dd786277 100644--- a/proto/gen/grpc-doc/store/index.html+++ b/proto/gen/grpc-doc/store/index.html@@ -12584,41 +12584,6 @@ Default to this mode.</p></td><td><p>UUID that identifies the spec this task implements. </p></td></tr>- <tr>- <td>environment_id</td>- <td><a href="#string">string</a></td>- <td></td>- <td><p>The environment where the database will be created. </p></td>- </tr>-- <tr>- <td>database_name</td>- <td><a href="#string">string</a></td>- <td></td>- <td><p>Name of the database to create. </p></td>- </tr>-- <tr>- <td>table_name</td>- <td><a href="#string">string</a></td>- <td></td>- <td><p>Optional table name to create (required for some databases like MongoDB). </p></td>- </tr>-- <tr>- <td>character_set</td>- <td><a href="#string">string</a></td>- <td></td>- <td><p>Character set for the new database. </p></td>- </tr>-- <tr>- <td>collation</td>- <td><a href="#string">string</a></td>- <td></td>- <td><p>Collation for the new database. </p></td>- </tr>-<tr><td>sheet_sha256</td><td><a href="#string">string</a></td>@@ -12649,20 +12614,6 @@ Used for GitOps release-based tasks that execute multiple files. </p></td><td><p>Configuration flags for gh-ost migration tool. </p></td></tr>- <tr>- <td>password</td>- <td><a href="#string">string</a></td>- <td></td>- <td><p>Password to encrypt the exported data archive. </p></td>- </tr>-- <tr>- <td>format</td>- <td><a href="#bytebase.store.ExportFormat">ExportFormat</a></td>- <td></td>- <td><p>Format of the exported data (SQL, CSV, JSON, etc). </p></td>- </tr>-<tr><td>enable_ghost</td><td><a href="#bool">bool</a></td>diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.mdindex 2445c90e6d..90c7b36511 100644--- a/proto/gen/grpc-doc/v1/README.md+++ b/proto/gen/grpc-doc/v1/README.md@@ -9630,13 +9630,7 @@ Payload for creating a new database.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| project | [string](#string) | | The project owning the database. Format: projects/{project} |-| database | [string](#string) | | Database name. |-| table | [string](#string) | | Table name. || sheet | [string](#string) | | Format: projects/{project}/sheets/{sheet} |-| character_set | [string](#string) | | The character set for the database. |-| collation | [string](#string) | | The collation for the database. |-| environment | [string](#string) | | The environment the database belongs to. |@@ -9651,10 +9645,7 @@ Payload for exporting database data.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| target | [string](#string) | | The resource name of the target. Format: instances/{instance-id}/databases/{database-name} || sheet | [string](#string) | | The resource name of the sheet. Format: projects/{project}/sheets/{sheet} |-| format | [ExportFormat](#bytebase-v1-ExportFormat) | | The format of the exported file. |-| password | [string](#string) | optional | The zip password provided by users. Leave it empty if no needs to encrypt the zip file. |@@ -9671,7 +9662,6 @@ Payload for updating a database schema.| ----- | ---- | ----- | ----------- || sheet | [string](#string) | | Format: projects/{project}/sheets/{sheet} || release | [string](#string) | | Format: projects/{project}/releases/{release} |-| schema_version | [string](#string) | | The target schema version after this update. |diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.htmlindex 68c7a54887..70c21589c7 100644--- a/proto/gen/grpc-doc/v1/index.html+++ b/proto/gen/grpc-doc/v1/index.html@@ -26971,28 +26971,6 @@ If there are no task runs or the task run is not scheduled, it will be empty. </</thead><tbody>- <tr>- <td>project</td>- <td><a href="#string">string</a></td>- <td></td>- <td><p>The project owning the database.-Format: projects/{project} </p></td>- </tr>-- <tr>- <td>database</td>- <td><a href="#string">string</a></td>- <td></td>- <td><p>Database name. </p></td>- </tr>-- <tr>- <td>table</td>- <td><a href="#string">string</a></td>- <td></td>- <td><p>Table name. </p></td>- </tr>-<tr><td>sheet</td><td><a href="#string">string</a></td>@@ -27000,27 +26978,6 @@ Format: projects/{project} </p></td><td><p>Format: projects/{project}/sheets/{sheet} </p></td></tr>- <tr>- <td>character_set</td>- <td><a href="#string">string</a></td>- <td></td>- <td><p>The character set for the database. </p></td>- </tr>-- <tr>- <td>collation</td>- <td><a href="#string">string</a></td>- <td></td>- <td><p>The collation for the database. </p></td>- </tr>-- <tr>- <td>environment</td>- <td><a href="#string">string</a></td>- <td></td>- <td><p>The environment the database belongs to. </p></td>- </tr>-</tbody></table>@@ -27038,14 +26995,6 @@ Format: projects/{project} </p></td></thead><tbody>- <tr>- <td>target</td>- <td><a href="#string">string</a></td>- <td></td>- <td><p>The resource name of the target.-Format: instances/{instance-id}/databases/{database-name} </p></td>- </tr>-<tr><td>sheet</td><td><a href="#string">string</a></td>@@ -27054,21 +27003,6 @@ Format: instances/{instance-id}/databases/{database-name} </p></td>Format: projects/{project}/sheets/{sheet} </p></td></tr>- <tr>- <td>format</td>- <td><a href="#bytebase.v1.ExportFormat">ExportFormat</a></td>- <td></td>- <td><p>The format of the exported file. </p></td>- </tr>-- <tr>- <td>password</td>- <td><a href="#string">string</a></td>- <td>optional</td>- <td><p>The zip password provided by users.-Leave it empty if no needs to encrypt the zip file. </p></td>- </tr>-</tbody></table>@@ -27100,13 +27034,6 @@ Leave it empty if no needs to encrypt the zip file. </p></td><td><p>Format: projects/{project}/releases/{release} </p></td></tr>- <tr>- <td>schema_version</td>- <td><a href="#string">string</a></td>- <td></td>- <td><p>The target schema version after this update. </p></td>- </tr>-</tbody></table>diff --git a/proto/store/store/task.proto b/proto/store/store/task.protoindex faa1b95187..967d0f8c98 100644--- a/proto/store/store/task.proto+++ b/proto/store/store/task.proto@@ -2,8 +2,6 @@ syntax = "proto3";package bytebase.store;-import "store/common.proto";-option go_package = "generated-go/store";// Task is the metadata for database operation tasks.@@ -28,17 +26,6 @@ message Task {// UUID that identifies the spec this task implements.string spec_id = 3;- // The environment where the database will be created.- string environment_id = 5;- // Name of the database to create.- string database_name = 6;- // Optional table name to create (required for some databases like MongoDB).- string table_name = 7;- // Character set for the new database.- string character_set = 8;- // Collation for the new database.- string collation = 9;-// Source of the task's SQL content - either a single sheet or an entire release.oneof source {// The SHA256 hash of a single sheet content (hex-encoded).@@ -54,10 +41,6 @@ message Task {// Configuration flags for gh-ost migration tool.map<string, string> flags = 12;- // Password to encrypt the exported data archive.- string password = 14;- // Format of the exported data (SQL, CSV, JSON, etc).- ExportFormat format = 15;// Whether to use gh-ost for online schema migration.bool enable_ghost = 16;}diff --git a/proto/v1/v1/rollout_service.proto b/proto/v1/v1/rollout_service.protoindex e21966b0be..88170e9cb7 100644--- a/proto/v1/v1/rollout_service.proto+++ b/proto/v1/v1/rollout_service.proto@@ -397,21 +397,8 @@ message Task {// Payload for creating a new database.message DatabaseCreate {- // The project owning the database.- // Format: projects/{project}- string project = 1;- // Database name.- string database = 2;- // Table name.- string table = 3;// Format: projects/{project}/sheets/{sheet}string sheet = 4;- // The character set for the database.- string character_set = 5;- // The collation for the database.- string collation = 6;- // The environment the database belongs to.- string environment = 7;}// Payload for updating a database schema.@@ -423,23 +410,13 @@ message Task {// Format: projects/{project}/releases/{release}string release = 4;}- // The target schema version after this update.- string schema_version = 2;}// Payload for exporting database data.message DatabaseDataExport {- // The resource name of the target.- // Format: instances/{instance-id}/databases/{database-name}- string target = 1;// The resource name of the sheet.// Format: projects/{project}/sheets/{sheet}string sheet = 2;- // The format of the exported file.- ExportFormat format = 3;- // The zip password provided by users.- // Leave it empty if no needs to encrypt the zip file.- optional string password = 4;}}