Skip to content

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

refactor: remove deployment snapshot and simplify plan updates (#18589)

Danny Xu62782d5e0dd4
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index 5779726dd8..579d3675e5 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -12801,9 +12801,6 @@ components:
- WARNING
- ERROR
- RUNNING
- deployment:
- title: deployment
- $ref: '#/components/schemas/bytebase.v1.Plan.Deployment'
title: Plan
additionalProperties: false
bytebase.v1.Plan.ChangeDatabaseConfig:
@@ -12904,38 +12901,6 @@ components:
Format: environments/prod where prod is the environment resource ID.
title: CreateDatabaseConfig
additionalProperties: false
- bytebase.v1.Plan.Deployment:
- type: object
- properties:
- environments:
- type: array
- items:
- type: string
- title: environments
- description: The environments deploy order.
- databaseGroupMappings:
- type: array
- items:
- $ref: '#/components/schemas/bytebase.v1.Plan.Deployment.DatabaseGroupMapping'
- title: database_group_mappings
- description: The database group mapping.
- title: Deployment
- additionalProperties: false
- bytebase.v1.Plan.Deployment.DatabaseGroupMapping:
- type: object
- properties:
- databaseGroup:
- type: string
- title: database_group
- description: 'Format: projects/{project}/databaseGroups/{databaseGroup}.'
- databases:
- type: array
- items:
- type: string
- title: databases
- description: 'Format: instances/{instance-id}/databases/{database-name}.'
- title: DatabaseGroupMapping
- additionalProperties: false
bytebase.v1.Plan.ExportDataConfig:
type: object
properties:
diff --git a/backend/api/v1/plan_service.go b/backend/api/v1/plan_service.go
index 54888b86d6..1317cc2235 100644
--- a/backend/api/v1/plan_service.go
+++ b/backend/api/v1/plan_service.go
@@ -3,9 +3,7 @@ package v1
import (
"context"
"log/slog"
- "maps"
"slices"
- "strings"
"connectrpc.com/connect"
"github.com/google/cel-go/cel"
@@ -17,7 +15,6 @@ import (
"github.com/bytebase/bytebase/backend/common/log"
"github.com/bytebase/bytebase/backend/component/config"
"github.com/bytebase/bytebase/backend/component/dbfactory"
- "github.com/bytebase/bytebase/backend/component/ghost"
"github.com/bytebase/bytebase/backend/component/iam"
"github.com/bytebase/bytebase/backend/component/sheet"
"github.com/bytebase/bytebase/backend/component/state"
@@ -26,7 +23,6 @@ import (
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/generated-go/v1/v1connect"
"github.com/bytebase/bytebase/backend/store"
- "github.com/bytebase/bytebase/backend/utils"
)
// PlanService represents a service for managing plan.
@@ -252,11 +248,6 @@ func (s *PlanService) CreatePlan(ctx context.Context, request *connect.Request[v
Description: req.Plan.Description,
Config: convertPlan(req.Plan),
}
- deployment, err := getPlanDeployment(ctx, s.store, planMessage.Config.GetSpecs(), project)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get plan deployment snapshot, error: %v", err))
- }
- planMessage.Config.Deployment = deployment
plan, err := s.store.CreatePlan(ctx, planMessage, user.Email)
if err != nil {
@@ -348,20 +339,9 @@ func (s *PlanService) UpdatePlan(ctx context.Context, request *connect.Request[v
}
var planCheckRunsTrigger bool
-
- // Update the deployment in the end because the specs might change.
- paths := slices.Clone(req.UpdateMask.Paths)
- slices.SortFunc(paths, func(a, b string) int {
- if a == "deployment" {
- return 1
- }
- if b == "deployment" {
- return -1
- }
- return strings.Compare(a, b)
- })
var databaseGroup *v1pb.DatabaseGroup
- for _, path := range paths {
+
+ for _, path := range req.UpdateMask.Paths {
switch path {
case "title":
title := req.Plan.Title
@@ -372,322 +352,42 @@ func (s *PlanService) UpdatePlan(ctx context.Context, request *connect.Request[v
case "state":
deleted := req.Plan.State == v1pb.State_DELETED
planUpdate.Deleted = &deleted
- case "deployment":
- specs := oldPlan.Config.GetSpecs()
- if planUpdate.Specs != nil {
- specs = *planUpdate.Specs
- }
- deployment, err := getPlanDeployment(ctx, s.store, specs, project)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get plan deployment snapshot, error: %v", err))
- }
- planUpdate.Deployment = &deployment
case "specs":
- planCheckRunsTrigger = true
- // Use specs directly for internal storage
- allSpecs := convertPlanSpecs(req.GetPlan().GetSpecs())
- planUpdate.Specs = &allSpecs
-
- // Compare specs directly
- oldSpecs := convertToPlanSpecs(project.ResourceID, oldPlan.Config.Specs)
- removed, added, updated := diffSpecs(oldSpecs, req.Plan.Specs)
-
- // Check if there are any changes at all.
- hasChanges := len(removed) > 0 || len(added) > 0 || len(updated) > 0
- if !hasChanges {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("no specs updated"))
- }
-
- // Validate spec modifications based on pipeline existence.
+ // Block all spec changes if plan has a rollout (pipeline).
if oldPlan.PipelineUID != nil {
- // Plan has a pipeline - only updates are allowed, no adding/removing.
- if len(removed) > 0 {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("cannot remove specs from plan that has a pipeline"))
- }
- if len(added) > 0 {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("cannot add specs to plan that has a pipeline"))
- }
- if len(updated) == 0 {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("no specs updated"))
- }
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("cannot update specs for plan that has a rollout"))
}
- // Validate the new specs
+ // Validate the new specs.
dg, err := validateSpecs(ctx, s.store, oldPlan.ProjectID, req.Plan.Specs)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("failed to validate plan specs, error: %v", err))
}
databaseGroup = dg
- // Handle task updates for specs
- tasksMap := map[int]*store.TaskMessage{}
- var taskPatchList []*store.TaskPatch
- var issueCommentCreates []*store.IssueCommentMessage
-
- oldSpecsByID := make(map[string]*v1pb.Plan_Spec)
- for _, spec := range oldSpecs {
- oldSpecsByID[spec.Id] = spec
- }
+ // Convert and store new specs.
+ allSpecs := convertPlanSpecs(req.GetPlan().GetSpecs())
+ planUpdate.Specs = &allSpecs
- updatedByID := make(map[string]*v1pb.Plan_Spec)
- for _, spec := range updated {
- updatedByID[spec.Id] = spec
- }
+ // Trigger plan check runs.
+ planCheckRunsTrigger = true
+ // Evict approvals if issue exists to request re-approval.
issue, err := s.store.GetIssue(ctx, &store.FindIssueMessage{PlanUID: &oldPlan.UID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get issue: %v", err))
}
-
- if oldPlan.PipelineUID != nil {
- tasks, err := s.store.ListTasks(ctx, &store.TaskFind{PipelineID: oldPlan.PipelineUID})
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to list tasks: %v", err))
- }
- tasksBySpecID := make(map[string][]*store.TaskMessage)
- for _, task := range tasks {
- specID := task.Payload.GetSpecId()
- tasksBySpecID[specID] = append(tasksBySpecID[specID], task)
- }
- for _, task := range tasks {
- doUpdate := false
- taskPatch := &store.TaskPatch{
- ID: task.ID,
- UpdaterID: user.ID,
- }
- specID := task.Payload.GetSpecId()
- spec, ok := updatedByID[specID]
- if !ok {
- continue
- }
-
- newTaskType, err := getTaskTypeFromSpec(spec)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get task type from spec, err: %v", err))
- }
-
- // Check if enable_ghost changed for DATABASE_MIGRATE tasks
- if newTaskType == storepb.Task_DATABASE_MIGRATE && task.Type == storepb.Task_DATABASE_MIGRATE {
- if config, ok := spec.Config.(*v1pb.Plan_Spec_ChangeDatabaseConfig); ok {
- newEnableGhost := config.ChangeDatabaseConfig.EnableGhost
- if newEnableGhost != task.Payload.GetEnableGhost() {
- taskPatch.EnableGhost = &newEnableGhost
- doUpdate = true
- }
- }
- } else if newTaskType != task.Type {
- // Task type changed - only allow within DATABASE_MIGRATE types or to/from DATABASE_SDL
- if (newTaskType == storepb.Task_DATABASE_MIGRATE && task.Type == storepb.Task_DATABASE_SDL) ||
- (newTaskType == storepb.Task_DATABASE_SDL && task.Type == storepb.Task_DATABASE_MIGRATE) {
- // Allow DATABASE_MIGRATE <-> DATABASE_SDL conversion
- if newTaskType == storepb.Task_DATABASE_MIGRATE {
- if config, ok := spec.Config.(*v1pb.Plan_Spec_ChangeDatabaseConfig); ok {
- newEnableGhost := config.ChangeDatabaseConfig.EnableGhost
- taskPatch.EnableGhost = &newEnableGhost
- doUpdate = true
- }
- }
- } else {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("cannot change task type from %v to %v", task.Type, newTaskType))
- }
- }
-
- // Flags for gh-ost.
- if err := func() error {
- config, ok := spec.Config.(*v1pb.Plan_Spec_ChangeDatabaseConfig)
- if !ok {
- return nil
- }
- if config.ChangeDatabaseConfig.Type != v1pb.DatabaseChangeType_MIGRATE || !config.ChangeDatabaseConfig.EnableGhost {
- return nil
- }
-
- newFlags := config.ChangeDatabaseConfig.GetGhostFlags()
- if _, err := ghost.GetUserFlags(newFlags); err != nil {
- return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid ghost flags %q, error %v", newFlags, err))
- }
- oldFlags := task.Payload.GetFlags()
- if maps.Equal(oldFlags, newFlags) {
- return nil
- }
- taskPatch.Flags = &newFlags
- doUpdate = true
- return nil
- }(); err != nil {
- return nil, err
- }
-
- // Prior Backup
- func() {
- config, ok := spec.Config.(*v1pb.Plan_Spec_ChangeDatabaseConfig)
- if !ok {
- return
- }
- // Prior backup is allowed for non-ghost migrations
- if config.ChangeDatabaseConfig.Type != v1pb.DatabaseChangeType_MIGRATE || config.ChangeDatabaseConfig.EnableGhost {
- return
- }
-
- // Check if backup setting has changed.
- planEnableBackup := config.ChangeDatabaseConfig.GetEnablePriorBackup()
- taskEnableBackup := task.Payload.GetEnablePriorBackup()
- if planEnableBackup != taskEnableBackup {
- taskPatch.EnablePriorBackup = &planEnableBackup
- doUpdate = true
- }
- }()
-
- // Sheet
- if err := func() error {
- switch newTaskType {
- case storepb.Task_DATABASE_MIGRATE, storepb.Task_DATABASE_SDL, storepb.Task_DATABASE_EXPORT:
- var oldSheetName string
- if newTaskType == storepb.Task_DATABASE_EXPORT {
- config, ok := spec.Config.(*v1pb.Plan_Spec_ExportDataConfig)
- if !ok {
- return nil
- }
- oldSheetName = config.ExportDataConfig.Sheet
- } else {
- config, ok := spec.Config.(*v1pb.Plan_Spec_ChangeDatabaseConfig)
- if !ok {
- return nil
- }
- oldSheetName = config.ChangeDatabaseConfig.Sheet
- }
- _, newSheetSha256, err := common.GetProjectResourceIDSheetSha256(oldSheetName)
- if err != nil {
- return connect.NewError(connect.CodeInternal, errors.Errorf("failed to get sheet sha256 from %q, error: %v", oldSheetName, err))
- }
- if task.Payload.GetSheetSha256() == newSheetSha256 {
- return nil
- }
-
- doUpdate = true
- taskPatch.SheetSha256 = &newSheetSha256
-
- if issue != nil {
- oldSheetSha256 := task.Payload.GetSheetSha256()
- issueCommentCreates = append(issueCommentCreates, &store.IssueCommentMessage{
- IssueUID: issue.UID,
- Payload: &storepb.IssueCommentPayload{
- Event: &storepb.IssueCommentPayload_PlanSpecUpdate_{
- PlanSpecUpdate: &storepb.IssueCommentPayload_PlanSpecUpdate{
- Spec: common.FormatSpec(issue.Project.ResourceID, oldPlan.UID, specID),
- FromSheetSha256: &oldSheetSha256,
- ToSheetSha256: &newSheetSha256,
- },
- },
- },
- })
- }
- default:
- // Other task types
- }
- return nil
- }(); err != nil {
- return nil, err
- }
-
- // ExportDataConfig
- func() {
- if newTaskType != storepb.Task_DATABASE_EXPORT {
- return
- }
- config, ok := spec.Config.(*v1pb.Plan_Spec_ExportDataConfig)
- if !ok {
- return
- }
- if config.ExportDataConfig.Format != convertExportFormat(task.Payload.GetFormat()) {
- format := convertToExportFormat(config.ExportDataConfig.Format)
- taskPatch.ExportFormat = &format
- doUpdate = true
- }
- if (config.ExportDataConfig.Password == nil && task.Payload.GetPassword() != "") || (config.ExportDataConfig.Password != nil && *config.ExportDataConfig.Password != task.Payload.GetPassword()) {
- taskPatch.ExportPassword = config.ExportDataConfig.Password
- doUpdate = true
- }
- }()
-
- if !doUpdate {
- continue
- }
- tasksMap[task.ID] = task
- taskPatchList = append(taskPatchList, taskPatch)
- }
-
- if len(taskPatchList) != 0 {
- if issue != nil {
- // Do not allow to update task if issue is done or canceled.
- if issue.Status == storepb.Issue_DONE || issue.Status == storepb.Issue_CANCELED {
- return nil, connect.NewError(connect.CodeFailedPrecondition, errors.Errorf("cannot update task because issue %q is %s", issue.Title, issue.Status))
- }
- }
- }
- }
-
- for _, taskPatch := range taskPatchList {
- task := tasksMap[taskPatch.ID]
- if task.LatestTaskRunStatus == storepb.TaskRun_PENDING || task.LatestTaskRunStatus == storepb.TaskRun_RUNNING || task.LatestTaskRunStatus == storepb.TaskRun_SKIPPED || task.LatestTaskRunStatus == storepb.TaskRun_DONE {
- return nil, connect.NewError(connect.CodeFailedPrecondition, errors.Errorf("cannot update plan because task %v is %s", task.ID, task.LatestTaskRunStatus))
- }
- }
-
- var doUpdateSheet bool
- for _, taskPatch := range taskPatchList {
- if taskPatch.SheetSha256 != nil {
- doUpdateSheet = true
- }
- }
-
- // For plans without pipeline, check if sheet references changed in specs
- if oldPlan.PipelineUID == nil {
- for _, specPatch := range updated {
- oldSpec := oldSpecsByID[specPatch.Id]
- if oldSpec.GetChangeDatabaseConfig() != nil && specPatch.GetChangeDatabaseConfig() != nil {
- oldConfig, newConfig := oldSpec.GetChangeDatabaseConfig(), specPatch.GetChangeDatabaseConfig()
- if oldConfig.Sheet != newConfig.Sheet {
- doUpdateSheet = true
- break
- }
- }
- }
- }
-
- // Check project setting for modify statement.
- if len(taskPatchList) > 0 && doUpdateSheet && !project.Setting.AllowModifyStatement {
- return nil, connect.NewError(connect.CodeFailedPrecondition, errors.Errorf("modify statement is not allowed for project %s", project.Title))
- }
-
- for _, taskPatch := range taskPatchList {
- task := tasksMap[taskPatch.ID]
- if _, err := s.store.UpdateTask(ctx, taskPatch); err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to update task %v: %v", task.ID, err))
- }
- }
-
- for _, issueCommentCreate := range issueCommentCreates {
- if _, err := s.store.CreateIssueComment(ctx, issueCommentCreate, user.Email); err != nil {
- slog.Warn("failed to create issue comments", "issueUID", issue.UID, log.BBError(err))
- }
- }
-
- if issue != nil && doUpdateSheet {
- if err := func() error {
- issue, err := s.store.UpdateIssue(ctx, issue.UID, &store.UpdateIssueMessage{
- PayloadUpsert: &storepb.Issue{
- Approval: &storepb.IssuePayloadApproval{
- ApprovalFindingDone: false,
- },
+ if issue != nil {
+ if _, err := s.store.UpdateIssue(ctx, issue.UID, &store.UpdateIssueMessage{
+ PayloadUpsert: &storepb.Issue{
+ Approval: &storepb.IssuePayloadApproval{
+ ApprovalFindingDone: false,
},
- })
- if err != nil {
- return errors.Errorf("failed to update issue: %v", err)
- }
- s.stateCfg.ApprovalFinding.Store(issue.UID, issue)
- return nil
- }(); err != nil {
+ },
+ }); err != nil {
slog.Error("failed to update issue to refind approval", log.BBError(err))
+ } else {
+ s.stateCfg.ApprovalFinding.Store(issue.UID, issue)
}
}
default:
@@ -1044,42 +744,6 @@ func (s *PlanService) BatchCancelPlanCheckRuns(ctx context.Context, request *con
return connect.NewResponse(&v1pb.BatchCancelPlanCheckRunsResponse{}), nil
}
-// diffSpecs checks if there are any specs removed, added or updated in the new plan.
-// It performs a deep comparison of all spec fields using protocol buffer comparison.
-// Returns (removed, added, updated) slices of specs.
-func diffSpecs(oldSpecs []*v1pb.Plan_Spec, newSpecs []*v1pb.Plan_Spec) ([]*v1pb.Plan_Spec, []*v1pb.Plan_Spec, []*v1pb.Plan_Spec) {
- oldSpecsMap := make(map[string]*v1pb.Plan_Spec, len(oldSpecs))
- newSpecsMap := make(map[string]*v1pb.Plan_Spec, len(newSpecs))
-
- // Build maps for efficient lookup
- for _, spec := range oldSpecs {
- oldSpecsMap[spec.Id] = spec
- }
- for _, spec := range newSpecs {
- newSpecsMap[spec.Id] = spec
- }
-
- var removed, added, updated []*v1pb.Plan_Spec
-
- // Find removed specs - specs in old but not in new.
- for _, spec := range oldSpecs {
- if _, exists := newSpecsMap[spec.Id]; !exists {
- removed = append(removed, spec)
- }
- }
-
- // Find added and updated specs - specs in new but not in old, or changed.
- for _, spec := range newSpecs {
- if oldSpec, exists := oldSpecsMap[spec.Id]; !exists {
- added = append(added, spec)
- } else if !oldSpec.Equal(spec) {
- updated = append(updated, spec)
- }
- }
-
- return removed, added, updated
-}
-
func validateSpecs(ctx context.Context, s *store.Store, projectID string, specs []*v1pb.Plan_Spec) (*v1pb.DatabaseGroup, error) {
if len(specs) == 0 {
return nil, errors.Errorf("the plan has zero spec")
@@ -1269,88 +933,6 @@ func validateSpecs(ctx context.Context, s *store.Store, projectID string, specs
return databaseGroup, nil
}
-func getPlanSpecDatabaseGroups(specs []*storepb.PlanConfig_Spec) []string {
- var databaseGroups []string
- for _, spec := range specs {
- if _, ok := spec.Config.(*storepb.PlanConfig_Spec_ChangeDatabaseConfig); !ok {
- continue
- }
- for _, target := range spec.GetChangeDatabaseConfig().GetTargets() {
- if _, _, err := common.GetProjectIDDatabaseGroupID(target); err == nil {
- databaseGroups = append(databaseGroups, target)
- }
- }
- }
- return databaseGroups
-}
-
-// getAllEnvironmentIDs returns all environment IDs from the store.
-func getAllEnvironmentIDs(ctx context.Context, s *store.Store) ([]string, error) {
- environments, err := s.GetEnvironment(ctx)
- if err != nil {
- return nil, errors.Wrapf(err, "failed to list environments")
- }
- var environmentIDs []string
- for _, e := range environments.GetEnvironments() {
- environmentIDs = append(environmentIDs, e.Id)
- }
- return environmentIDs, nil
-}
-
-func getPlanDeployment(ctx context.Context, s *store.Store, specs []*storepb.PlanConfig_Spec, project *store.ProjectMessage) (*storepb.PlanConfig_Deployment, error) {
- snapshot := &storepb.PlanConfig_Deployment{}
-
- environmentIDs, err := getAllEnvironmentIDs(ctx, s)
- if err != nil {
- return nil, err
- }
- snapshot.Environments = environmentIDs
-
- databaseGroups := getPlanSpecDatabaseGroups(specs)
-
- allDatabases, err := s.ListDatabases(ctx, &store.FindDatabaseMessage{ProjectID: &project.ResourceID})
- if err != nil {
- return nil, errors.Wrapf(err, "failed to list databases for project %q", project.ResourceID)
- }
-
- for _, name := range databaseGroups {
- projectID, id, err := common.GetProjectIDDatabaseGroupID(name)
- if err != nil {
- return nil, errors.Wrapf(err, "failed to get database group id")
- }
- if projectID != project.ResourceID {
- return nil, errors.Errorf("%s does not belong to project %s", name, project.ResourceID)
- }
- databaseGroup, err := s.GetDatabaseGroup(ctx, &store.FindDatabaseGroupMessage{
- ResourceID: &id,
- ProjectID: &project.ResourceID,
- })
- if err != nil {
- return nil, errors.Wrapf(err, "failed to get database group")
- }
- if databaseGroup == nil {
- return nil, errors.Errorf("database group %q not found", name)
- }
-
- matchedDatabases, err := utils.GetMatchedDatabasesInDatabaseGroup(ctx, databaseGroup, allDatabases)
- if err != nil {
- return nil, errors.Wrapf(err, "failed to get matched and unmatched databases in database group %q", id)
- }
-
- var databases []string
- for _, db := range matchedDatabases {
- databases = append(databases, common.FormatDatabase(db.InstanceID, db.DatabaseName))
- }
-
- snapshot.DatabaseGroupMappings = append(snapshot.DatabaseGroupMappings, &storepb.PlanConfig_Deployment_DatabaseGroupMapping{
- DatabaseGroup: name,
- Databases: databases,
- })
- }
-
- return snapshot, nil
-}
-
func storePlanConfigHasRelease(plan *storepb.PlanConfig) bool {
for _, spec := range plan.GetSpecs() {
if c, ok := spec.Config.(*storepb.PlanConfig_Spec_ChangeDatabaseConfig); ok {
@@ -1361,26 +943,3 @@ func storePlanConfigHasRelease(plan *storepb.PlanConfig) bool {
}
return false
}
-
-func getTaskTypeFromSpec(spec *v1pb.Plan_Spec) (storepb.Task_Type, error) {
- //exhaustive:enforce
- switch s := spec.Config.(type) {
- case *v1pb.Plan_Spec_CreateDatabaseConfig:
- return storepb.Task_DATABASE_CREATE, nil
- case *v1pb.Plan_Spec_ChangeDatabaseConfig:
- switch s.ChangeDatabaseConfig.Type {
- case v1pb.DatabaseChangeType_MIGRATE:
- return storepb.Task_DATABASE_MIGRATE, nil
- case v1pb.DatabaseChangeType_SDL:
- return storepb.Task_DATABASE_SDL, nil
- case v1pb.DatabaseChangeType_DATABASE_CHANGE_TYPE_UNSPECIFIED:
- return storepb.Task_TASK_TYPE_UNSPECIFIED, errors.Errorf("unexpected unspecified change database config type")
- default:
- return storepb.Task_TASK_TYPE_UNSPECIFIED, errors.Errorf("invalid change database config type %s", s.ChangeDatabaseConfig.Type)
- }
- case *v1pb.Plan_Spec_ExportDataConfig:
- return storepb.Task_DATABASE_EXPORT, nil
- default:
- return storepb.Task_TASK_TYPE_UNSPECIFIED, errors.Errorf("unknown spec config type")
- }
-}
diff --git a/backend/api/v1/plan_service_converter.go b/backend/api/v1/plan_service_converter.go
index 62e3ecd106..c4ffeabacb 100644
--- a/backend/api/v1/plan_service_converter.go
+++ b/backend/api/v1/plan_service_converter.go
@@ -31,7 +31,6 @@ func convertToPlan(ctx context.Context, s *store.Store, plan *store.PlanMessage)
Description: plan.Description,
Creator: common.FormatUserEmail(plan.Creator),
Specs: convertToPlanSpecs(plan.ProjectID, plan.Config.Specs), // Use specs field for output
- Deployment: convertToPlanDeployment(plan.Config.Deployment),
CreateTime: timestamppb.New(plan.CreatedAt),
UpdateTime: timestamppb.New(plan.UpdatedAt),
State: convertDeletedToState(plan.Deleted),
@@ -144,34 +143,6 @@ func convertToPlanSpecExportDataConfig(projectID string, config *storepb.PlanCon
}
}
-func convertToPlanDeployment(deployment *storepb.PlanConfig_Deployment) *v1pb.Plan_Deployment {
- if deployment == nil {
- return nil
- }
- return &v1pb.Plan_Deployment{
- Environments: deployment.Environments,
- DatabaseGroupMappings: convertToDatabaseGroupMappings(deployment.DatabaseGroupMappings),
- }
-}
-
-func convertToDatabaseGroupMappings(mappings []*storepb.PlanConfig_Deployment_DatabaseGroupMapping) []*v1pb.Plan_Deployment_DatabaseGroupMapping {
- v1Mappings := make([]*v1pb.Plan_Deployment_DatabaseGroupMapping, len(mappings))
- for i := range mappings {
- v1Mappings[i] = convertToDatabaseGroupMapping(mappings[i])
- }
- return v1Mappings
-}
-
-func convertToDatabaseGroupMapping(mapping *storepb.PlanConfig_Deployment_DatabaseGroupMapping) *v1pb.Plan_Deployment_DatabaseGroupMapping {
- if mapping == nil {
- return nil
- }
- return &v1pb.Plan_Deployment_DatabaseGroupMapping{
- DatabaseGroup: mapping.DatabaseGroup,
- Databases: mapping.Databases,
- }
-}
-
func convertPlan(plan *v1pb.Plan) *storepb.PlanConfig {
if plan == nil {
return nil
@@ -180,8 +151,7 @@ func convertPlan(plan *v1pb.Plan) *storepb.PlanConfig {
// At this point, plan.Specs should always be populated
// (either originally or converted from steps at API entry point)
return &storepb.PlanConfig{
- Specs: convertPlanSpecs(plan.Specs),
- Deployment: nil,
+ Specs: convertPlanSpecs(plan.Specs),
}
}
diff --git a/backend/api/v1/rollout_service.go b/backend/api/v1/rollout_service.go
index 9073f5c077..08f07bfdd3 100644
--- a/backend/api/v1/rollout_service.go
+++ b/backend/api/v1/rollout_service.go
@@ -75,7 +75,7 @@ func (s *RolloutService) PreviewRollout(ctx context.Context, req *connect.Reques
specs := convertPlanSpecs(request.Plan.Specs)
- rollout, err := GetPipelineCreate(ctx, s.store, s.dbFactory, specs, nil /* snapshot */, project)
+ rollout, err := GetPipelineCreate(ctx, s.store, s.dbFactory, specs, project)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("failed to get pipeline create, error: %v", err))
}
@@ -234,12 +234,12 @@ func (s *RolloutService) CreateRollout(ctx context.Context, req *connect.Request
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("plan %d not found in project %s", planID, projectID))
}
- pipelineCreate, err := GetPipelineCreate(ctx, s.store, s.dbFactory, plan.Config.GetSpecs(), plan.Config.GetDeployment(), project)
+ pipelineCreate, err := GetPipelineCreate(ctx, s.store, s.dbFactory, plan.Config.GetSpecs(), project)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("failed to get pipeline create, error: %v", err))
}
if isChangeDatabasePlan(plan.Config.GetSpecs()) {
- pipelineCreate, err = getPipelineCreateToTargetStage(ctx, s.store, plan.Config.GetDeployment(), pipelineCreate, request.Target)
+ pipelineCreate, err = getPipelineCreateToTargetStage(ctx, s.store, pipelineCreate, request.Target)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to filter stages with stageId, error: %v", err))
}
@@ -942,28 +942,14 @@ func isChangeDatabasePlan(specs []*storepb.PlanConfig_Spec) bool {
return false
}
-// getPlanEnvironmentSnapshots returns the environment snapshots and environment index map.
-func getPlanEnvironmentSnapshots(ctx context.Context, s *store.Store, deployment *storepb.PlanConfig_Deployment) ([]string, map[string]int, error) {
- snapshotEnvironments := deployment.GetEnvironments()
- if len(snapshotEnvironments) == 0 {
- var err error
- snapshotEnvironments, err = getAllEnvironmentIDs(ctx, s)
- if err != nil {
- return nil, nil, err
- }
- }
- environmentIndex := make(map[string]int)
- for i, e := range snapshotEnvironments {
- environmentIndex[e] = i
- }
- return snapshotEnvironments, environmentIndex, nil
-}
-
// GetPipelineCreate gets a pipeline create message from a plan.
-func GetPipelineCreate(ctx context.Context, s *store.Store, dbFactory *dbfactory.DBFactory, specs []*storepb.PlanConfig_Spec, deployment *storepb.PlanConfig_Deployment /* nullable */, project *store.ProjectMessage) (*store.PipelineMessage, error) {
+func GetPipelineCreate(ctx context.Context, s *store.Store, dbFactory *dbfactory.DBFactory, specs []*storepb.PlanConfig_Spec, project *store.ProjectMessage) (*store.PipelineMessage, error) {
// Step 1 - transform database group specs.
- // Others are untouched.
- transformedSpecs := applyDatabaseGroupSpecTransformations(specs, deployment)
+ // Re-evaluate database groups live to pick up newly created databases.
+ transformedSpecs, err := applyDatabaseGroupSpecTransformations(ctx, s, specs, project.ResourceID)
+ if err != nil {
+ return nil, errors.Wrap(err, "failed to apply database group spec transformations")
+ }
// Step 2 - convert all task creates.
var taskCreates []*store.TaskMessage
@@ -982,7 +968,7 @@ func GetPipelineCreate(ctx context.Context, s *store.Store, dbFactory *dbfactory
}
// filter pipelineCreate.Tasks using targetEnvironmentID.
-func getPipelineCreateToTargetStage(ctx context.Context, s *store.Store, deployment *storepb.PlanConfig_Deployment, pipelineCreate *store.PipelineMessage, targetEnvironment *string) (*store.PipelineMessage, error) {
+func getPipelineCreateToTargetStage(ctx context.Context, s *store.Store, pipelineCreate *store.PipelineMessage, targetEnvironment *string) (*store.PipelineMessage, error) {
if targetEnvironment == nil {
return pipelineCreate, nil
}
@@ -995,14 +981,19 @@ func getPipelineCreateToTargetStage(ctx context.Context, s *store.Store, deploym
return nil, errors.Wrapf(err, "failed to get environment id from %q", *targetEnvironment)
}
- snapshotEnvironments, _, err := getPlanEnvironmentSnapshots(ctx, s, deployment)
+ // Get live environment order
+ environments, err := s.GetEnvironment(ctx)
if err != nil {
- return nil, errors.Wrap(err, "failed to get environment snapshots")
+ return nil, errors.Wrap(err, "failed to get environments")
+ }
+ var environmentOrder []string
+ for _, env := range environments.GetEnvironments() {
+ environmentOrder = append(environmentOrder, env.Id)
}
// Build a set of allowed environments up to and including the target
allowedEnvironments := make(map[string]bool)
- for _, environmentID := range snapshotEnvironments {
+ for _, environmentID := range environmentOrder {
allowedEnvironments[environmentID] = true
if environmentID == targetEnvironmentID {
break
diff --git a/backend/api/v1/rollout_service_converter.go b/backend/api/v1/rollout_service_converter.go
index 7206e82bd0..bc862a599c 100644
--- a/backend/api/v1/rollout_service_converter.go
+++ b/backend/api/v1/rollout_service_converter.go
@@ -227,17 +227,14 @@ func convertToRollout(ctx context.Context, s *store.Store, project *store.Projec
rolloutV1.Issue = common.FormatIssue(project.ResourceID, *rollout.IssueID)
}
- // Get environment order from plan deployment config or global settings
+ // Get live environment order
+ environments, err := s.GetEnvironment(ctx)
+ if err != nil {
+ return nil, err
+ }
var environmentOrder []string
- if plan != nil && len(plan.Config.GetDeployment().GetEnvironments()) > 0 {
- environmentOrder = plan.Config.Deployment.GetEnvironments()
- } else {
- // Use global environment setting order
- var err error
- environmentOrder, err = getAllEnvironmentIDs(ctx, s)
- if err != nil {
- return nil, err
- }
+ for _, env := range environments.GetEnvironments() {
+ environmentOrder = append(environmentOrder, env.Id)
}
// Group tasks by environment.
diff --git a/backend/api/v1/rollout_service_task.go b/backend/api/v1/rollout_service_task.go
index 7be1642985..63c911bf3b 100644
--- a/backend/api/v1/rollout_service_task.go
+++ b/backend/api/v1/rollout_service_task.go
@@ -22,7 +22,7 @@ import (
"github.com/bytebase/bytebase/backend/utils"
)
-func applyDatabaseGroupSpecTransformations(specs []*storepb.PlanConfig_Spec, deployment *storepb.PlanConfig_Deployment) []*storepb.PlanConfig_Spec {
+func applyDatabaseGroupSpecTransformations(ctx context.Context, s *store.Store, specs []*storepb.PlanConfig_Spec, projectID string) ([]*storepb.PlanConfig_Spec, error) {
var result []*storepb.PlanConfig_Spec
for _, spec := range specs {
// Clone the spec to avoid modifying the original
@@ -31,19 +31,40 @@ func applyDatabaseGroupSpecTransformations(specs []*storepb.PlanConfig_Spec, dep
if config := clonedSpec.GetChangeDatabaseConfig(); config != nil {
// transform database group.
if len(config.Targets) == 1 {
- if _, _, err := common.GetProjectIDDatabaseGroupID(config.Targets[0]); err == nil {
- for _, s := range deployment.GetDatabaseGroupMappings() {
- if s.DatabaseGroup == config.Targets[0] {
- config.Targets = s.Databases
- break
- }
+ if _, databaseGroupID, err := common.GetProjectIDDatabaseGroupID(config.Targets[0]); err == nil {
+ // Re-evaluate database group matches live instead of using deployment snapshot
+ databaseGroup, err := s.GetDatabaseGroup(ctx, &store.FindDatabaseGroupMessage{
+ ResourceID: &databaseGroupID,
+ ProjectID: &projectID,
+ })
+ if err != nil {
+ return nil, errors.Wrapf(err, "failed to get database group")
}
+ if databaseGroup == nil {
+ return nil, errors.Errorf("database group %q not found", config.Targets[0])
+ }
+
+ allDatabases, err := s.ListDatabases(ctx, &store.FindDatabaseMessage{ProjectID: &projectID})
+ if err != nil {
+ return nil, errors.Wrapf(err, "failed to list databases for project %q", projectID)
+ }
+
+ matchedDatabases, err := utils.GetMatchedDatabasesInDatabaseGroup(ctx, databaseGroup, allDatabases)
+ if err != nil {
+ return nil, errors.Wrapf(err, "failed to get matched databases in database group %q", databaseGroupID)
+ }
+
+ var databases []string
+ for _, db := range matchedDatabases {
+ databases = append(databases, common.FormatDatabase(db.InstanceID, db.DatabaseName))
+ }
+ config.Targets = databases
}
}
}
result = append(result, clonedSpec)
}
- return result
+ return result, nil
}
func getTaskCreatesFromSpec(ctx context.Context, s *store.Store, dbFactory *dbfactory.DBFactory, spec *storepb.PlanConfig_Spec) ([]*store.TaskMessage, error) {
diff --git a/backend/generated-go/store/plan.pb.go b/backend/generated-go/store/plan.pb.go
index 9c26a5179d..501dc4bc3b 100644
--- a/backend/generated-go/store/plan.pb.go
+++ b/backend/generated-go/store/plan.pb.go
@@ -77,7 +77,6 @@ func (PlanConfig_ChangeDatabaseConfig_Type) EnumDescriptor() ([]byte, []int) {
type PlanConfig struct {
state protoimpl.MessageState `protogen:"open.v1"`
Specs []*PlanConfig_Spec `protobuf:"bytes,1,rep,name=specs,proto3" json:"specs,omitempty"`
- Deployment *PlanConfig_Deployment `protobuf:"bytes,2,opt,name=deployment,proto3" json:"deployment,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -119,13 +118,6 @@ func (x *PlanConfig) GetSpecs() []*PlanConfig_Spec {
return nil
}
-func (x *PlanConfig) GetDeployment() *PlanConfig_Deployment {
- if x != nil {
- return x.Deployment
- }
- return nil
-}
-
type PlanConfig_Spec struct {
state protoimpl.MessageState `protogen:"open.v1"`
// A UUID4 string that uniquely identifies the Spec.
@@ -519,125 +511,15 @@ func (x *PlanConfig_ExportDataConfig) GetPassword() string {
return ""
}
-type PlanConfig_Deployment struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- // The environments deploy order.
- Environments []string `protobuf:"bytes,1,rep,name=environments,proto3" json:"environments,omitempty"`
- // The database group mapping.
- DatabaseGroupMappings []*PlanConfig_Deployment_DatabaseGroupMapping `protobuf:"bytes,2,rep,name=database_group_mappings,json=databaseGroupMappings,proto3" json:"database_group_mappings,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
-}
-
-func (x *PlanConfig_Deployment) Reset() {
- *x = PlanConfig_Deployment{}
- mi := &file_store_plan_proto_msgTypes[5]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
-}
-
-func (x *PlanConfig_Deployment) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PlanConfig_Deployment) ProtoMessage() {}
-
-func (x *PlanConfig_Deployment) ProtoReflect() protoreflect.Message {
- mi := &file_store_plan_proto_msgTypes[5]
- if x != nil {
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- if ms.LoadMessageInfo() == nil {
- ms.StoreMessageInfo(mi)
- }
- return ms
- }
- return mi.MessageOf(x)
-}
-
-// Deprecated: Use PlanConfig_Deployment.ProtoReflect.Descriptor instead.
-func (*PlanConfig_Deployment) Descriptor() ([]byte, []int) {
- return file_store_plan_proto_rawDescGZIP(), []int{0, 4}
-}
-
-func (x *PlanConfig_Deployment) GetEnvironments() []string {
- if x != nil {
- return x.Environments
- }
- return nil
-}
-
-func (x *PlanConfig_Deployment) GetDatabaseGroupMappings() []*PlanConfig_Deployment_DatabaseGroupMapping {
- if x != nil {
- return x.DatabaseGroupMappings
- }
- return nil
-}
-
-type PlanConfig_Deployment_DatabaseGroupMapping struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- // Format: projects/{project}/databaseGroups/{databaseGroup}.
- DatabaseGroup string `protobuf:"bytes,1,opt,name=database_group,json=databaseGroup,proto3" json:"database_group,omitempty"`
- // Format: instances/{instance-id}/databases/{database-name}.
- Databases []string `protobuf:"bytes,2,rep,name=databases,proto3" json:"databases,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
-}
-
-func (x *PlanConfig_Deployment_DatabaseGroupMapping) Reset() {
- *x = PlanConfig_Deployment_DatabaseGroupMapping{}
- mi := &file_store_plan_proto_msgTypes[7]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
-}
-
-func (x *PlanConfig_Deployment_DatabaseGroupMapping) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PlanConfig_Deployment_DatabaseGroupMapping) ProtoMessage() {}
-
-func (x *PlanConfig_Deployment_DatabaseGroupMapping) ProtoReflect() protoreflect.Message {
- mi := &file_store_plan_proto_msgTypes[7]
- if x != nil {
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- if ms.LoadMessageInfo() == nil {
- ms.StoreMessageInfo(mi)
- }
- return ms
- }
- return mi.MessageOf(x)
-}
-
-// Deprecated: Use PlanConfig_Deployment_DatabaseGroupMapping.ProtoReflect.Descriptor instead.
-func (*PlanConfig_Deployment_DatabaseGroupMapping) Descriptor() ([]byte, []int) {
- return file_store_plan_proto_rawDescGZIP(), []int{0, 4, 0}
-}
-
-func (x *PlanConfig_Deployment_DatabaseGroupMapping) GetDatabaseGroup() string {
- if x != nil {
- return x.DatabaseGroup
- }
- return ""
-}
-
-func (x *PlanConfig_Deployment_DatabaseGroupMapping) GetDatabases() []string {
- if x != nil {
- return x.Databases
- }
- return nil
-}
-
var File_store_plan_proto protoreflect.FileDescriptor
const file_store_plan_proto_rawDesc = "" +
"\n" +
- "\x10store/plan.proto\x12\x0ebytebase.store\x1a\x1fgoogle/api/field_behavior.proto\x1a\x12store/common.proto\"\x98\r\n" +
+ "\x10store/plan.proto\x12\x0ebytebase.store\x1a\x1fgoogle/api/field_behavior.proto\x1a\x12store/common.proto\"\xcd\n" +
"\n" +
- "PlanConfig\x125\n" +
- "\x05specs\x18\x01 \x03(\v2\x1f.bytebase.store.PlanConfig.SpecR\x05specs\x12E\n" +
"\n" +
- "deployment\x18\x02 \x01(\v2%.bytebase.store.PlanConfig.DeploymentR\n" +
- "deployment\x1a\xcf\x02\n" +
+ "PlanConfig\x125\n" +
+ "\x05specs\x18\x01 \x03(\v2\x1f.bytebase.store.PlanConfig.SpecR\x05specs\x1a\xcf\x02\n" +
"\x04Spec\x12\x0e\n" +
"\x02id\x18\x05 \x01(\tR\x02id\x12g\n" +
"\x16create_database_config\x18\x01 \x01(\v2/.bytebase.store.PlanConfig.CreateDatabaseConfigH\x00R\x14createDatabaseConfig\x12g\n" +
@@ -675,14 +557,7 @@ const file_store_plan_proto_rawDesc = "" +
"\fsheet_sha256\x18\x02 \x01(\tR\vsheetSha256\x124\n" +
"\x06format\x18\x03 \x01(\x0e2\x1c.bytebase.store.ExportFormatR\x06format\x12\x1f\n" +
"\bpassword\x18\x04 \x01(\tH\x00R\bpassword\x88\x01\x01B\v\n" +
- "\t_password\x1a\x81\x02\n" +
- "\n" +
- "Deployment\x12\"\n" +
- "\fenvironments\x18\x01 \x03(\tR\fenvironments\x12r\n" +
- "\x17database_group_mappings\x18\x02 \x03(\v2:.bytebase.store.PlanConfig.Deployment.DatabaseGroupMappingR\x15databaseGroupMappings\x1a[\n" +
- "\x14DatabaseGroupMapping\x12%\n" +
- "\x0edatabase_group\x18\x01 \x01(\tR\rdatabaseGroup\x12\x1c\n" +
- "\tdatabases\x18\x02 \x03(\tR\tdatabasesB\x8c\x01\n" +
+ "\t_passwordB\x8c\x01\n" +
"\x12com.bytebase.storeB\tPlanProtoP\x01Z\x12generated-go/store\xa2\x02\x03BSX\xaa\x02\x0eBytebase.Store\xca\x02\x0eBytebase\\Store\xe2\x02\x1aBytebase\\Store\\GPBMetadata\xea\x02\x0fBytebase::Storeb\x06proto3"
var (
@@ -698,34 +573,30 @@ func file_store_plan_proto_rawDescGZIP() []byte {
}
var file_store_plan_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_store_plan_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
+var file_store_plan_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
var file_store_plan_proto_goTypes = []any{
- (PlanConfig_ChangeDatabaseConfig_Type)(0), // 0: bytebase.store.PlanConfig.ChangeDatabaseConfig.Type
- (*PlanConfig)(nil), // 1: bytebase.store.PlanConfig
- (*PlanConfig_Spec)(nil), // 2: bytebase.store.PlanConfig.Spec
- (*PlanConfig_CreateDatabaseConfig)(nil), // 3: bytebase.store.PlanConfig.CreateDatabaseConfig
- (*PlanConfig_ChangeDatabaseConfig)(nil), // 4: bytebase.store.PlanConfig.ChangeDatabaseConfig
- (*PlanConfig_ExportDataConfig)(nil), // 5: bytebase.store.PlanConfig.ExportDataConfig
- (*PlanConfig_Deployment)(nil), // 6: bytebase.store.PlanConfig.Deployment
- nil, // 7: bytebase.store.PlanConfig.ChangeDatabaseConfig.GhostFlagsEntry
- (*PlanConfig_Deployment_DatabaseGroupMapping)(nil), // 8: bytebase.store.PlanConfig.Deployment.DatabaseGroupMapping
- (ExportFormat)(0), // 9: bytebase.store.ExportFormat
+ (PlanConfig_ChangeDatabaseConfig_Type)(0), // 0: bytebase.store.PlanConfig.ChangeDatabaseConfig.Type
+ (*PlanConfig)(nil), // 1: bytebase.store.PlanConfig
+ (*PlanConfig_Spec)(nil), // 2: bytebase.store.PlanConfig.Spec
+ (*PlanConfig_CreateDatabaseConfig)(nil), // 3: bytebase.store.PlanConfig.CreateDatabaseConfig
+ (*PlanConfig_ChangeDatabaseConfig)(nil), // 4: bytebase.store.PlanConfig.ChangeDatabaseConfig
+ (*PlanConfig_ExportDataConfig)(nil), // 5: bytebase.store.PlanConfig.ExportDataConfig
+ nil, // 6: bytebase.store.PlanConfig.ChangeDatabaseConfig.GhostFlagsEntry
+ (ExportFormat)(0), // 7: bytebase.store.ExportFormat
}
var file_store_plan_proto_depIdxs = []int32{
2, // 0: bytebase.store.PlanConfig.specs:type_name -> bytebase.store.PlanConfig.Spec
- 6, // 1: bytebase.store.PlanConfig.deployment:type_name -> bytebase.store.PlanConfig.Deployment
- 3, // 2: bytebase.store.PlanConfig.Spec.create_database_config:type_name -> bytebase.store.PlanConfig.CreateDatabaseConfig
- 4, // 3: bytebase.store.PlanConfig.Spec.change_database_config:type_name -> bytebase.store.PlanConfig.ChangeDatabaseConfig
- 5, // 4: bytebase.store.PlanConfig.Spec.export_data_config:type_name -> bytebase.store.PlanConfig.ExportDataConfig
- 0, // 5: bytebase.store.PlanConfig.ChangeDatabaseConfig.type:type_name -> bytebase.store.PlanConfig.ChangeDatabaseConfig.Type
- 7, // 6: bytebase.store.PlanConfig.ChangeDatabaseConfig.ghost_flags:type_name -> bytebase.store.PlanConfig.ChangeDatabaseConfig.GhostFlagsEntry
- 9, // 7: bytebase.store.PlanConfig.ExportDataConfig.format:type_name -> bytebase.store.ExportFormat
- 8, // 8: bytebase.store.PlanConfig.Deployment.database_group_mappings:type_name -> bytebase.store.PlanConfig.Deployment.DatabaseGroupMapping
- 9, // [9:9] is the sub-list for method output_type
- 9, // [9:9] is the sub-list for method input_type
- 9, // [9:9] is the sub-list for extension type_name
- 9, // [9:9] is the sub-list for extension extendee
- 0, // [0:9] is the sub-list for field type_name
+ 3, // 1: bytebase.store.PlanConfig.Spec.create_database_config:type_name -> bytebase.store.PlanConfig.CreateDatabaseConfig
+ 4, // 2: bytebase.store.PlanConfig.Spec.change_database_config:type_name -> bytebase.store.PlanConfig.ChangeDatabaseConfig
+ 5, // 3: bytebase.store.PlanConfig.Spec.export_data_config:type_name -> bytebase.store.PlanConfig.ExportDataConfig
+ 0, // 4: bytebase.store.PlanConfig.ChangeDatabaseConfig.type:type_name -> bytebase.store.PlanConfig.ChangeDatabaseConfig.Type
+ 6, // 5: bytebase.store.PlanConfig.ChangeDatabaseConfig.ghost_flags:type_name -> bytebase.store.PlanConfig.ChangeDatabaseConfig.GhostFlagsEntry
+ 7, // 6: bytebase.store.PlanConfig.ExportDataConfig.format:type_name -> bytebase.store.ExportFormat
+ 7, // [7:7] is the sub-list for method output_type
+ 7, // [7:7] is the sub-list for method input_type
+ 7, // [7:7] is the sub-list for extension type_name
+ 7, // [7:7] is the sub-list for extension extendee
+ 0, // [0:7] is the sub-list for field type_name
}
func init() { file_store_plan_proto_init() }
@@ -746,7 +617,7 @@ func file_store_plan_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_store_plan_proto_rawDesc), len(file_store_plan_proto_rawDesc)),
NumEnums: 1,
- NumMessages: 8,
+ NumMessages: 6,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/backend/generated-go/store/plan_equal.pb.go b/backend/generated-go/store/plan_equal.pb.go
index bcb224ae69..55a25b328c 100644
--- a/backend/generated-go/store/plan_equal.pb.go
+++ b/backend/generated-go/store/plan_equal.pb.go
@@ -131,53 +131,6 @@ func (x *PlanConfig_ExportDataConfig) Equal(y *PlanConfig_ExportDataConfig) bool
return true
}
-func (x *PlanConfig_Deployment_DatabaseGroupMapping) Equal(y *PlanConfig_Deployment_DatabaseGroupMapping) bool {
- if x == y {
- return true
- }
- if x == nil || y == nil {
- return x == nil && y == nil
- }
- if x.DatabaseGroup != y.DatabaseGroup {
- return false
- }
- if len(x.Databases) != len(y.Databases) {
- return false
- }
- for i := 0; i < len(x.Databases); i++ {
- if x.Databases[i] != y.Databases[i] {
- return false
- }
- }
- return true
-}
-
-func (x *PlanConfig_Deployment) Equal(y *PlanConfig_Deployment) bool {
- if x == y {
- return true
- }
- if x == nil || y == nil {
- return x == nil && y == nil
- }
- if len(x.Environments) != len(y.Environments) {
- return false
- }
- for i := 0; i < len(x.Environments); i++ {
- if x.Environments[i] != y.Environments[i] {
- return false
- }
- }
- if len(x.DatabaseGroupMappings) != len(y.DatabaseGroupMappings) {
- return false
- }
- for i := 0; i < len(x.DatabaseGroupMappings); i++ {
- if !x.DatabaseGroupMappings[i].Equal(y.DatabaseGroupMappings[i]) {
- return false
- }
- }
- return true
-}
-
func (x *PlanConfig) Equal(y *PlanConfig) bool {
if x == y {
return true
@@ -193,8 +146,5 @@ func (x *PlanConfig) Equal(y *PlanConfig) bool {
return false
}
}
- if !x.Deployment.Equal(y.Deployment) {
- return false
- }
return true
}
diff --git a/backend/generated-go/v1/plan_service.pb.go b/backend/generated-go/v1/plan_service.pb.go
index d44d5ab73f..e2a0e70529 100644
--- a/backend/generated-go/v1/plan_service.pb.go
+++ b/backend/generated-go/v1/plan_service.pb.go
@@ -618,7 +618,6 @@ type Plan struct {
// - ERROR
// - RUNNING
PlanCheckRunStatusCount map[string]int32 `protobuf:"bytes,11,rep,name=plan_check_run_status_count,json=planCheckRunStatusCount,proto3" json:"plan_check_run_status_count,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
- Deployment *Plan_Deployment `protobuf:"bytes,12,opt,name=deployment,proto3" json:"deployment,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -730,13 +729,6 @@ func (x *Plan) GetPlanCheckRunStatusCount() map[string]int32 {
return nil
}
-func (x *Plan) GetDeployment() *Plan_Deployment {
- if x != nil {
- return x.Deployment
- }
- return nil
-}
-
type ListPlanCheckRunsRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The parent, which owns this collection of plan check runs.
@@ -1543,114 +1535,6 @@ func (x *Plan_ExportDataConfig) GetPassword() string {
return ""
}
-type Plan_Deployment struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- // The environments deploy order.
- Environments []string `protobuf:"bytes,1,rep,name=environments,proto3" json:"environments,omitempty"`
- // The database group mapping.
- DatabaseGroupMappings []*Plan_Deployment_DatabaseGroupMapping `protobuf:"bytes,2,rep,name=database_group_mappings,json=databaseGroupMappings,proto3" json:"database_group_mappings,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
-}
-
-func (x *Plan_Deployment) Reset() {
- *x = Plan_Deployment{}
- mi := &file_v1_plan_service_proto_msgTypes[20]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
-}
-
-func (x *Plan_Deployment) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Plan_Deployment) ProtoMessage() {}
-
-func (x *Plan_Deployment) ProtoReflect() protoreflect.Message {
- mi := &file_v1_plan_service_proto_msgTypes[20]
- if x != nil {
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- if ms.LoadMessageInfo() == nil {
- ms.StoreMessageInfo(mi)
- }
- return ms
- }
- return mi.MessageOf(x)
-}
-
-// Deprecated: Use Plan_Deployment.ProtoReflect.Descriptor instead.
-func (*Plan_Deployment) Descriptor() ([]byte, []int) {
- return file_v1_plan_service_proto_rawDescGZIP(), []int{7, 5}
-}
-
-func (x *Plan_Deployment) GetEnvironments() []string {
- if x != nil {
- return x.Environments
- }
- return nil
-}
-
-func (x *Plan_Deployment) GetDatabaseGroupMappings() []*Plan_Deployment_DatabaseGroupMapping {
- if x != nil {
- return x.DatabaseGroupMappings
- }
- return nil
-}
-
-type Plan_Deployment_DatabaseGroupMapping struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- // Format: projects/{project}/databaseGroups/{databaseGroup}.
- DatabaseGroup string `protobuf:"bytes,1,opt,name=database_group,json=databaseGroup,proto3" json:"database_group,omitempty"`
- // Format: instances/{instance-id}/databases/{database-name}.
- Databases []string `protobuf:"bytes,2,rep,name=databases,proto3" json:"databases,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
-}
-
-func (x *Plan_Deployment_DatabaseGroupMapping) Reset() {
- *x = Plan_Deployment_DatabaseGroupMapping{}
- mi := &file_v1_plan_service_proto_msgTypes[22]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
-}
-
-func (x *Plan_Deployment_DatabaseGroupMapping) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Plan_Deployment_DatabaseGroupMapping) ProtoMessage() {}
-
-func (x *Plan_Deployment_DatabaseGroupMapping) ProtoReflect() protoreflect.Message {
- mi := &file_v1_plan_service_proto_msgTypes[22]
- if x != nil {
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- if ms.LoadMessageInfo() == nil {
- ms.StoreMessageInfo(mi)
- }
- return ms
- }
- return mi.MessageOf(x)
-}
-
-// Deprecated: Use Plan_Deployment_DatabaseGroupMapping.ProtoReflect.Descriptor instead.
-func (*Plan_Deployment_DatabaseGroupMapping) Descriptor() ([]byte, []int) {
- return file_v1_plan_service_proto_rawDescGZIP(), []int{7, 5, 0}
-}
-
-func (x *Plan_Deployment_DatabaseGroupMapping) GetDatabaseGroup() string {
- if x != nil {
- return x.DatabaseGroup
- }
- return ""
-}
-
-func (x *Plan_Deployment_DatabaseGroupMapping) GetDatabases() []string {
- if x != nil {
- return x.Databases
- }
- return nil
-}
-
type PlanCheckRun_Result struct {
state protoimpl.MessageState `protogen:"open.v1"`
Status Advice_Level `protobuf:"varint,1,opt,name=status,proto3,enum=bytebase.v1.Advice_Level" json:"status,omitempty"`
@@ -1668,7 +1552,7 @@ type PlanCheckRun_Result struct {
func (x *PlanCheckRun_Result) Reset() {
*x = PlanCheckRun_Result{}
- mi := &file_v1_plan_service_proto_msgTypes[23]
+ mi := &file_v1_plan_service_proto_msgTypes[21]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1680,7 +1564,7 @@ func (x *PlanCheckRun_Result) String() string {
func (*PlanCheckRun_Result) ProtoMessage() {}
func (x *PlanCheckRun_Result) ProtoReflect() protoreflect.Message {
- mi := &file_v1_plan_service_proto_msgTypes[23]
+ mi := &file_v1_plan_service_proto_msgTypes[21]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1776,7 +1660,7 @@ type PlanCheckRun_Result_SqlSummaryReport struct {
func (x *PlanCheckRun_Result_SqlSummaryReport) Reset() {
*x = PlanCheckRun_Result_SqlSummaryReport{}
- mi := &file_v1_plan_service_proto_msgTypes[24]
+ mi := &file_v1_plan_service_proto_msgTypes[22]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1788,7 +1672,7 @@ func (x *PlanCheckRun_Result_SqlSummaryReport) String() string {
func (*PlanCheckRun_Result_SqlSummaryReport) ProtoMessage() {}
func (x *PlanCheckRun_Result_SqlSummaryReport) ProtoReflect() protoreflect.Message {
- mi := &file_v1_plan_service_proto_msgTypes[24]
+ mi := &file_v1_plan_service_proto_msgTypes[22]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1829,7 +1713,7 @@ type PlanCheckRun_Result_SqlReviewReport struct {
func (x *PlanCheckRun_Result_SqlReviewReport) Reset() {
*x = PlanCheckRun_Result_SqlReviewReport{}
- mi := &file_v1_plan_service_proto_msgTypes[25]
+ mi := &file_v1_plan_service_proto_msgTypes[23]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1841,7 +1725,7 @@ func (x *PlanCheckRun_Result_SqlReviewReport) String() string {
func (*PlanCheckRun_Result_SqlReviewReport) ProtoMessage() {}
func (x *PlanCheckRun_Result_SqlReviewReport) ProtoReflect() protoreflect.Message {
- mi := &file_v1_plan_service_proto_msgTypes[25]
+ mi := &file_v1_plan_service_proto_msgTypes[23]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1905,7 +1789,7 @@ const file_v1_plan_service_proto_rawDesc = "" +
"\x04plan\x18\x01 \x01(\v2\x11.bytebase.v1.PlanB\x03\xe0A\x02R\x04plan\x12@\n" +
"\vupdate_mask\x18\x02 \x01(\v2\x1a.google.protobuf.FieldMaskB\x03\xe0A\x02R\n" +
"updateMask\x12#\n" +
- "\rallow_missing\x18\x03 \x01(\bR\fallowMissing\"\xe7\x10\n" +
+ "\rallow_missing\x18\x03 \x01(\bR\fallowMissing\"\xae\x0e\n" +
"\x04Plan\x12\x12\n" +
"\x04name\x18\x01 \x01(\tR\x04name\x12(\n" +
"\x05state\x18\x02 \x01(\x0e2\x12.bytebase.v1.StateR\x05state\x12\x19\n" +
@@ -1920,10 +1804,7 @@ const file_v1_plan_service_proto_rawDesc = "" +
"\vupdate_time\x18\n" +
" \x01(\v2\x1a.google.protobuf.TimestampB\x03\xe0A\x03R\n" +
"updateTime\x12q\n" +
- "\x1bplan_check_run_status_count\x18\v \x03(\v2..bytebase.v1.Plan.PlanCheckRunStatusCountEntryB\x03\xe0A\x03R\x17planCheckRunStatusCount\x12<\n" +
- "\n" +
- "deployment\x18\f \x01(\v2\x1c.bytebase.v1.Plan.DeploymentR\n" +
- "deployment\x1a\xb4\x02\n" +
+ "\x1bplan_check_run_status_count\x18\v \x03(\v2..bytebase.v1.Plan.PlanCheckRunStatusCountEntryB\x03\xe0A\x03R\x17planCheckRunStatusCount\x1a\xb4\x02\n" +
"\x04Spec\x12\x0e\n" +
"\x02id\x18\x01 \x01(\tR\x02id\x12^\n" +
"\x16create_database_config\x18\x02 \x01(\v2&.bytebase.v1.Plan.CreateDatabaseConfigH\x00R\x14createDatabaseConfig\x12^\n" +
@@ -1960,14 +1841,7 @@ const file_v1_plan_service_proto_rawDesc = "" +
"\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\x1a\xf8\x01\n" +
- "\n" +
- "Deployment\x12\"\n" +
- "\fenvironments\x18\x01 \x03(\tR\fenvironments\x12i\n" +
- "\x17database_group_mappings\x18\x02 \x03(\v21.bytebase.v1.Plan.Deployment.DatabaseGroupMappingR\x15databaseGroupMappings\x1a[\n" +
- "\x14DatabaseGroupMapping\x12%\n" +
- "\x0edatabase_group\x18\x01 \x01(\tR\rdatabaseGroup\x12\x1c\n" +
- "\tdatabases\x18\x02 \x03(\tR\tdatabases:7\xeaA4\n" +
+ "\t_password:7\xeaA4\n" +
"\x11bytebase.com/Plan\x12\x1fprojects/{project}/plans/{plan}\"\x86\x01\n" +
"\x18ListPlanCheckRunsRequest\x121\n" +
"\x06parent\x18\x01 \x01(\tB\x19\xe0A\x02\xfaA\x13\n" +
@@ -2052,7 +1926,7 @@ func file_v1_plan_service_proto_rawDescGZIP() []byte {
}
var file_v1_plan_service_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_v1_plan_service_proto_msgTypes = make([]protoimpl.MessageInfo, 26)
+var file_v1_plan_service_proto_msgTypes = make([]protoimpl.MessageInfo, 24)
var file_v1_plan_service_proto_goTypes = []any{
(PlanCheckRun_Type)(0), // 0: bytebase.v1.PlanCheckRun.Type
(PlanCheckRun_Status)(0), // 1: bytebase.v1.PlanCheckRun.Status
@@ -2076,70 +1950,66 @@ var file_v1_plan_service_proto_goTypes = []any{
(*Plan_CreateDatabaseConfig)(nil), // 19: bytebase.v1.Plan.CreateDatabaseConfig
(*Plan_ChangeDatabaseConfig)(nil), // 20: bytebase.v1.Plan.ChangeDatabaseConfig
(*Plan_ExportDataConfig)(nil), // 21: bytebase.v1.Plan.ExportDataConfig
- (*Plan_Deployment)(nil), // 22: bytebase.v1.Plan.Deployment
- nil, // 23: bytebase.v1.Plan.ChangeDatabaseConfig.GhostFlagsEntry
- (*Plan_Deployment_DatabaseGroupMapping)(nil), // 24: bytebase.v1.Plan.Deployment.DatabaseGroupMapping
- (*PlanCheckRun_Result)(nil), // 25: bytebase.v1.PlanCheckRun.Result
- (*PlanCheckRun_Result_SqlSummaryReport)(nil), // 26: bytebase.v1.PlanCheckRun.Result.SqlSummaryReport
- (*PlanCheckRun_Result_SqlReviewReport)(nil), // 27: bytebase.v1.PlanCheckRun.Result.SqlReviewReport
- (*fieldmaskpb.FieldMask)(nil), // 28: google.protobuf.FieldMask
- (State)(0), // 29: bytebase.v1.State
- (*timestamppb.Timestamp)(nil), // 30: google.protobuf.Timestamp
- (DatabaseChangeType)(0), // 31: bytebase.v1.DatabaseChangeType
- (ExportFormat)(0), // 32: bytebase.v1.ExportFormat
- (Advice_Level)(0), // 33: bytebase.v1.Advice.Level
- (*Position)(nil), // 34: bytebase.v1.Position
+ nil, // 22: bytebase.v1.Plan.ChangeDatabaseConfig.GhostFlagsEntry
+ (*PlanCheckRun_Result)(nil), // 23: bytebase.v1.PlanCheckRun.Result
+ (*PlanCheckRun_Result_SqlSummaryReport)(nil), // 24: bytebase.v1.PlanCheckRun.Result.SqlSummaryReport
+ (*PlanCheckRun_Result_SqlReviewReport)(nil), // 25: bytebase.v1.PlanCheckRun.Result.SqlReviewReport
+ (*fieldmaskpb.FieldMask)(nil), // 26: google.protobuf.FieldMask
+ (State)(0), // 27: bytebase.v1.State
+ (*timestamppb.Timestamp)(nil), // 28: google.protobuf.Timestamp
+ (DatabaseChangeType)(0), // 29: bytebase.v1.DatabaseChangeType
+ (ExportFormat)(0), // 30: bytebase.v1.ExportFormat
+ (Advice_Level)(0), // 31: bytebase.v1.Advice.Level
+ (*Position)(nil), // 32: bytebase.v1.Position
}
var file_v1_plan_service_proto_depIdxs = []int32{
9, // 0: bytebase.v1.ListPlansResponse.plans:type_name -> bytebase.v1.Plan
9, // 1: bytebase.v1.SearchPlansResponse.plans:type_name -> bytebase.v1.Plan
9, // 2: bytebase.v1.CreatePlanRequest.plan:type_name -> bytebase.v1.Plan
9, // 3: bytebase.v1.UpdatePlanRequest.plan:type_name -> bytebase.v1.Plan
- 28, // 4: bytebase.v1.UpdatePlanRequest.update_mask:type_name -> google.protobuf.FieldMask
- 29, // 5: bytebase.v1.Plan.state:type_name -> bytebase.v1.State
+ 26, // 4: bytebase.v1.UpdatePlanRequest.update_mask:type_name -> google.protobuf.FieldMask
+ 27, // 5: bytebase.v1.Plan.state:type_name -> bytebase.v1.State
17, // 6: bytebase.v1.Plan.specs:type_name -> bytebase.v1.Plan.Spec
- 30, // 7: bytebase.v1.Plan.create_time:type_name -> google.protobuf.Timestamp
- 30, // 8: bytebase.v1.Plan.update_time:type_name -> google.protobuf.Timestamp
+ 28, // 7: bytebase.v1.Plan.create_time:type_name -> google.protobuf.Timestamp
+ 28, // 8: bytebase.v1.Plan.update_time:type_name -> google.protobuf.Timestamp
18, // 9: bytebase.v1.Plan.plan_check_run_status_count:type_name -> bytebase.v1.Plan.PlanCheckRunStatusCountEntry
- 22, // 10: bytebase.v1.Plan.deployment:type_name -> bytebase.v1.Plan.Deployment
- 16, // 11: bytebase.v1.ListPlanCheckRunsResponse.plan_check_runs:type_name -> bytebase.v1.PlanCheckRun
- 0, // 12: bytebase.v1.PlanCheckRun.type:type_name -> bytebase.v1.PlanCheckRun.Type
- 1, // 13: bytebase.v1.PlanCheckRun.status:type_name -> bytebase.v1.PlanCheckRun.Status
- 25, // 14: bytebase.v1.PlanCheckRun.results:type_name -> bytebase.v1.PlanCheckRun.Result
- 30, // 15: bytebase.v1.PlanCheckRun.create_time:type_name -> google.protobuf.Timestamp
- 19, // 16: bytebase.v1.Plan.Spec.create_database_config:type_name -> bytebase.v1.Plan.CreateDatabaseConfig
- 20, // 17: bytebase.v1.Plan.Spec.change_database_config:type_name -> bytebase.v1.Plan.ChangeDatabaseConfig
- 21, // 18: bytebase.v1.Plan.Spec.export_data_config:type_name -> bytebase.v1.Plan.ExportDataConfig
- 31, // 19: bytebase.v1.Plan.ChangeDatabaseConfig.type:type_name -> bytebase.v1.DatabaseChangeType
- 23, // 20: bytebase.v1.Plan.ChangeDatabaseConfig.ghost_flags:type_name -> bytebase.v1.Plan.ChangeDatabaseConfig.GhostFlagsEntry
- 32, // 21: bytebase.v1.Plan.ExportDataConfig.format:type_name -> bytebase.v1.ExportFormat
- 24, // 22: bytebase.v1.Plan.Deployment.database_group_mappings:type_name -> bytebase.v1.Plan.Deployment.DatabaseGroupMapping
- 33, // 23: bytebase.v1.PlanCheckRun.Result.status:type_name -> bytebase.v1.Advice.Level
- 26, // 24: bytebase.v1.PlanCheckRun.Result.sql_summary_report:type_name -> bytebase.v1.PlanCheckRun.Result.SqlSummaryReport
- 27, // 25: bytebase.v1.PlanCheckRun.Result.sql_review_report:type_name -> bytebase.v1.PlanCheckRun.Result.SqlReviewReport
- 34, // 26: bytebase.v1.PlanCheckRun.Result.SqlReviewReport.start_position:type_name -> bytebase.v1.Position
- 34, // 27: bytebase.v1.PlanCheckRun.Result.SqlReviewReport.end_position:type_name -> bytebase.v1.Position
- 2, // 28: bytebase.v1.PlanService.GetPlan:input_type -> bytebase.v1.GetPlanRequest
- 3, // 29: bytebase.v1.PlanService.ListPlans:input_type -> bytebase.v1.ListPlansRequest
- 5, // 30: bytebase.v1.PlanService.SearchPlans:input_type -> bytebase.v1.SearchPlansRequest
- 7, // 31: bytebase.v1.PlanService.CreatePlan:input_type -> bytebase.v1.CreatePlanRequest
- 8, // 32: bytebase.v1.PlanService.UpdatePlan:input_type -> bytebase.v1.UpdatePlanRequest
- 10, // 33: bytebase.v1.PlanService.ListPlanCheckRuns:input_type -> bytebase.v1.ListPlanCheckRunsRequest
- 12, // 34: bytebase.v1.PlanService.RunPlanChecks:input_type -> bytebase.v1.RunPlanChecksRequest
- 14, // 35: bytebase.v1.PlanService.BatchCancelPlanCheckRuns:input_type -> bytebase.v1.BatchCancelPlanCheckRunsRequest
- 9, // 36: bytebase.v1.PlanService.GetPlan:output_type -> bytebase.v1.Plan
- 4, // 37: bytebase.v1.PlanService.ListPlans:output_type -> bytebase.v1.ListPlansResponse
- 6, // 38: bytebase.v1.PlanService.SearchPlans:output_type -> bytebase.v1.SearchPlansResponse
- 9, // 39: bytebase.v1.PlanService.CreatePlan:output_type -> bytebase.v1.Plan
- 9, // 40: bytebase.v1.PlanService.UpdatePlan:output_type -> bytebase.v1.Plan
- 11, // 41: bytebase.v1.PlanService.ListPlanCheckRuns:output_type -> bytebase.v1.ListPlanCheckRunsResponse
- 13, // 42: bytebase.v1.PlanService.RunPlanChecks:output_type -> bytebase.v1.RunPlanChecksResponse
- 15, // 43: bytebase.v1.PlanService.BatchCancelPlanCheckRuns:output_type -> bytebase.v1.BatchCancelPlanCheckRunsResponse
- 36, // [36:44] is the sub-list for method output_type
- 28, // [28:36] is the sub-list for method input_type
- 28, // [28:28] is the sub-list for extension type_name
- 28, // [28:28] is the sub-list for extension extendee
- 0, // [0:28] is the sub-list for field type_name
+ 16, // 10: bytebase.v1.ListPlanCheckRunsResponse.plan_check_runs:type_name -> bytebase.v1.PlanCheckRun
+ 0, // 11: bytebase.v1.PlanCheckRun.type:type_name -> bytebase.v1.PlanCheckRun.Type
+ 1, // 12: bytebase.v1.PlanCheckRun.status:type_name -> bytebase.v1.PlanCheckRun.Status
+ 23, // 13: bytebase.v1.PlanCheckRun.results:type_name -> bytebase.v1.PlanCheckRun.Result
+ 28, // 14: bytebase.v1.PlanCheckRun.create_time:type_name -> google.protobuf.Timestamp
+ 19, // 15: bytebase.v1.Plan.Spec.create_database_config:type_name -> bytebase.v1.Plan.CreateDatabaseConfig
+ 20, // 16: bytebase.v1.Plan.Spec.change_database_config:type_name -> bytebase.v1.Plan.ChangeDatabaseConfig
+ 21, // 17: bytebase.v1.Plan.Spec.export_data_config:type_name -> bytebase.v1.Plan.ExportDataConfig
+ 29, // 18: bytebase.v1.Plan.ChangeDatabaseConfig.type:type_name -> bytebase.v1.DatabaseChangeType
+ 22, // 19: bytebase.v1.Plan.ChangeDatabaseConfig.ghost_flags:type_name -> bytebase.v1.Plan.ChangeDatabaseConfig.GhostFlagsEntry
+ 30, // 20: bytebase.v1.Plan.ExportDataConfig.format:type_name -> bytebase.v1.ExportFormat
+ 31, // 21: bytebase.v1.PlanCheckRun.Result.status:type_name -> bytebase.v1.Advice.Level
+ 24, // 22: bytebase.v1.PlanCheckRun.Result.sql_summary_report:type_name -> bytebase.v1.PlanCheckRun.Result.SqlSummaryReport
+ 25, // 23: bytebase.v1.PlanCheckRun.Result.sql_review_report:type_name -> bytebase.v1.PlanCheckRun.Result.SqlReviewReport
+ 32, // 24: bytebase.v1.PlanCheckRun.Result.SqlReviewReport.start_position:type_name -> bytebase.v1.Position
+ 32, // 25: bytebase.v1.PlanCheckRun.Result.SqlReviewReport.end_position:type_name -> bytebase.v1.Position
+ 2, // 26: bytebase.v1.PlanService.GetPlan:input_type -> bytebase.v1.GetPlanRequest
+ 3, // 27: bytebase.v1.PlanService.ListPlans:input_type -> bytebase.v1.ListPlansRequest
+ 5, // 28: bytebase.v1.PlanService.SearchPlans:input_type -> bytebase.v1.SearchPlansRequest
+ 7, // 29: bytebase.v1.PlanService.CreatePlan:input_type -> bytebase.v1.CreatePlanRequest
+ 8, // 30: bytebase.v1.PlanService.UpdatePlan:input_type -> bytebase.v1.UpdatePlanRequest
+ 10, // 31: bytebase.v1.PlanService.ListPlanCheckRuns:input_type -> bytebase.v1.ListPlanCheckRunsRequest
+ 12, // 32: bytebase.v1.PlanService.RunPlanChecks:input_type -> bytebase.v1.RunPlanChecksRequest
+ 14, // 33: bytebase.v1.PlanService.BatchCancelPlanCheckRuns:input_type -> bytebase.v1.BatchCancelPlanCheckRunsRequest
+ 9, // 34: bytebase.v1.PlanService.GetPlan:output_type -> bytebase.v1.Plan
+ 4, // 35: bytebase.v1.PlanService.ListPlans:output_type -> bytebase.v1.ListPlansResponse
+ 6, // 36: bytebase.v1.PlanService.SearchPlans:output_type -> bytebase.v1.SearchPlansResponse
+ 9, // 37: bytebase.v1.PlanService.CreatePlan:output_type -> bytebase.v1.Plan
+ 9, // 38: bytebase.v1.PlanService.UpdatePlan:output_type -> bytebase.v1.Plan
+ 11, // 39: bytebase.v1.PlanService.ListPlanCheckRuns:output_type -> bytebase.v1.ListPlanCheckRunsResponse
+ 13, // 40: bytebase.v1.PlanService.RunPlanChecks:output_type -> bytebase.v1.RunPlanChecksResponse
+ 15, // 41: bytebase.v1.PlanService.BatchCancelPlanCheckRuns:output_type -> bytebase.v1.BatchCancelPlanCheckRunsResponse
+ 34, // [34:42] is the sub-list for method output_type
+ 26, // [26:34] is the sub-list for method input_type
+ 26, // [26:26] is the sub-list for extension type_name
+ 26, // [26:26] is the sub-list for extension extendee
+ 0, // [0:26] is the sub-list for field type_name
}
func init() { file_v1_plan_service_proto_init() }
@@ -2157,7 +2027,7 @@ func file_v1_plan_service_proto_init() {
(*Plan_Spec_ExportDataConfig)(nil),
}
file_v1_plan_service_proto_msgTypes[19].OneofWrappers = []any{}
- file_v1_plan_service_proto_msgTypes[23].OneofWrappers = []any{
+ file_v1_plan_service_proto_msgTypes[21].OneofWrappers = []any{
(*PlanCheckRun_Result_SqlSummaryReport_)(nil),
(*PlanCheckRun_Result_SqlReviewReport_)(nil),
}
@@ -2167,7 +2037,7 @@ func file_v1_plan_service_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_plan_service_proto_rawDesc), len(file_v1_plan_service_proto_rawDesc)),
NumEnums: 2,
- NumMessages: 26,
+ NumMessages: 24,
NumExtensions: 0,
NumServices: 1,
},
diff --git a/backend/generated-go/v1/plan_service_equal.pb.go b/backend/generated-go/v1/plan_service_equal.pb.go
index 0ae218981f..713ba8b00a 100644
--- a/backend/generated-go/v1/plan_service_equal.pb.go
+++ b/backend/generated-go/v1/plan_service_equal.pb.go
@@ -271,53 +271,6 @@ func (x *Plan_ExportDataConfig) Equal(y *Plan_ExportDataConfig) bool {
return true
}
-func (x *Plan_Deployment_DatabaseGroupMapping) Equal(y *Plan_Deployment_DatabaseGroupMapping) bool {
- if x == y {
- return true
- }
- if x == nil || y == nil {
- return x == nil && y == nil
- }
- if x.DatabaseGroup != y.DatabaseGroup {
- return false
- }
- if len(x.Databases) != len(y.Databases) {
- return false
- }
- for i := 0; i < len(x.Databases); i++ {
- if x.Databases[i] != y.Databases[i] {
- return false
- }
- }
- return true
-}
-
-func (x *Plan_Deployment) Equal(y *Plan_Deployment) bool {
- if x == y {
- return true
- }
- if x == nil || y == nil {
- return x == nil && y == nil
- }
- if len(x.Environments) != len(y.Environments) {
- return false
- }
- for i := 0; i < len(x.Environments); i++ {
- if x.Environments[i] != y.Environments[i] {
- return false
- }
- }
- if len(x.DatabaseGroupMappings) != len(y.DatabaseGroupMappings) {
- return false
- }
- for i := 0; i < len(x.DatabaseGroupMappings); i++ {
- if !x.DatabaseGroupMappings[i].Equal(y.DatabaseGroupMappings[i]) {
- return false
- }
- }
- return true
-}
-
func (x *Plan) Equal(y *Plan) bool {
if x == y {
return true
@@ -372,9 +325,6 @@ func (x *Plan) Equal(y *Plan) bool {
return false
}
}
- if !x.Deployment.Equal(y.Deployment) {
- return false
- }
return true
}
diff --git a/backend/migrator/migration/3.14/0004##remove_plan_deployment.sql b/backend/migrator/migration/3.14/0004##remove_plan_deployment.sql
new file mode 100644
index 0000000000..5d05239bd0
--- /dev/null
+++ b/backend/migrator/migration/3.14/0004##remove_plan_deployment.sql
@@ -0,0 +1,7 @@
+-- Remove deployment field from plan config
+-- The deployment snapshot is no longer needed as database groups are now evaluated live
+-- and environment order is retrieved from the store when needed
+
+UPDATE plan
+SET config = config - 'deployment'
+WHERE config ? 'deployment';
diff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.go
index ebb8d08f6e..3e4bf3f14e 100644
--- a/backend/migrator/migrator_test.go
+++ b/backend/migrator/migrator_test.go
@@ -12,7 +12,7 @@ import (
func TestLatestVersion(t *testing.T) {
files, err := getSortedVersionedFiles()
require.NoError(t, err)
- require.Equal(t, semver.MustParse("3.14.3"), *files[len(files)-1].version)
+ require.Equal(t, semver.MustParse("3.14.4"), *files[len(files)-1].version)
}
func TestVersionUnique(t *testing.T) {
diff --git a/backend/runner/approval/runner.go b/backend/runner/approval/runner.go
index 407d65af1e..e8f822e5d7 100644
--- a/backend/runner/approval/runner.go
+++ b/backend/runner/approval/runner.go
@@ -482,7 +482,7 @@ func (r *Runner) buildCELVariablesForDatabaseChange(ctx context.Context, issue *
}
// Build CEL variables for each task
- pipelineCreate, err := apiv1.GetPipelineCreate(ctx, r.store, r.dbFactory, plan.Config.GetSpecs(), plan.Config.GetDeployment(), issue.Project)
+ pipelineCreate, err := apiv1.GetPipelineCreate(ctx, r.store, r.dbFactory, plan.Config.GetSpecs(), issue.Project)
if err != nil {
return nil, false, errors.Wrap(err, "failed to get pipeline create")
}
@@ -596,7 +596,7 @@ func (r *Runner) buildCELVariablesForDataExport(ctx context.Context, issue *stor
return nil, false, errors.Errorf("plan %v not found", *issue.PlanUID)
}
- pipelineCreate, err := apiv1.GetPipelineCreate(ctx, r.store, r.dbFactory, plan.Config.GetSpecs(), plan.Config.GetDeployment(), issue.Project)
+ pipelineCreate, err := apiv1.GetPipelineCreate(ctx, r.store, r.dbFactory, plan.Config.GetSpecs(), issue.Project)
if err != nil {
return nil, false, errors.Wrap(err, "failed to get pipeline create")
}
diff --git a/backend/runner/taskrun/scheduler.go b/backend/runner/taskrun/scheduler.go
index af0c5d78e6..4e424d9d46 100644
--- a/backend/runner/taskrun/scheduler.go
+++ b/backend/runner/taskrun/scheduler.go
@@ -122,22 +122,15 @@ func (s *Scheduler) ListenTaskSkippedOrDone(ctx context.Context) {
pipelineEnvironmentDoneConfirmed[pipelineEnvironment{pipelineUID: task.PipelineID, environment: task.Environment}] = true
- plan, err := s.store.GetPlan(ctx, &store.FindPlanMessage{PipelineID: &task.PipelineID})
+ // Get live environment order
+ // Some environments may have zero tasks. We need to filter them out.
+ environments, err := s.store.GetEnvironment(ctx)
if err != nil {
- return errors.Wrapf(err, "failed to get plan")
+ return errors.Wrapf(err, "failed to get environments")
}
-
- // Get environment order from plan deployment config or global settings
- // Some environments may have zero tasks. We need to filter them out.
var environmentOrder []string
- if plan != nil && len(plan.Config.GetDeployment().GetEnvironments()) > 0 {
- environmentOrder = plan.Config.Deployment.GetEnvironments()
- } else {
- // Use global environment setting order
- environmentOrder, err = getAllEnvironmentIDs(ctx, s.store)
- if err != nil {
- return errors.Wrapf(err, "failed to list environments")
- }
+ for _, env := range environments.GetEnvironments() {
+ environmentOrder = append(environmentOrder, env.Id)
}
allTasks, err := s.store.ListTasks(ctx, &store.TaskFind{PipelineID: &task.PipelineID})
@@ -294,16 +287,3 @@ func tasksSkippedOrDone(tasks []*store.TaskMessage) bool {
}
return true
}
-
-// getAllEnvironmentIDs returns all environment IDs from the store.
-func getAllEnvironmentIDs(ctx context.Context, s *store.Store) ([]string, error) {
- environments, err := s.GetEnvironment(ctx)
- if err != nil {
- return nil, errors.Wrapf(err, "failed to list environments")
- }
- var environmentIDs []string
- for _, e := range environments.GetEnvironments() {
- environmentIDs = append(environmentIDs, e.Id)
- }
- return environmentIDs, nil
-}
diff --git a/backend/store/plan.go b/backend/store/plan.go
index 68f63f84e0..6f083d086b 100644
--- a/backend/store/plan.go
+++ b/backend/store/plan.go
@@ -54,7 +54,6 @@ type UpdatePlanMessage struct {
Name *string
Description *string
Specs *[]*storepb.PlanConfig_Spec
- Deployment **storepb.PlanConfig_Deployment
Deleted *bool
}
@@ -247,14 +246,6 @@ func (s *Store) UpdatePlan(ctx context.Context, patch *UpdatePlanMessage) error
payloadSets = append(payloadSets, "jsonb_build_object('specs', (?)::JSONB->'specs')")
args = append(args, config)
}
- if v := patch.Deployment; v != nil {
- p, err := protojson.Marshal(*v)
- if err != nil {
- return errors.Wrapf(err, "failed to marshal deployment")
- }
- payloadSets = append(payloadSets, "jsonb_build_object('deployment', (?)::JSONB)")
- args = append(args, p)
- }
if len(payloadSets) > 0 {
set = append(set, fmt.Sprintf("config = config || %s", strings.Join(payloadSets, " || ")))
}
diff --git a/backend/tests/tenant_test.go b/backend/tests/tenant_test.go
index 9873905134..80190267af 100644
--- a/backend/tests/tenant_test.go
+++ b/backend/tests/tenant_test.go
@@ -10,7 +10,6 @@ import (
"github.com/google/uuid"
"github.com/stretchr/testify/require"
"google.golang.org/genproto/googleapis/type/expr"
- "google.golang.org/protobuf/types/known/fieldmaskpb"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
)
@@ -164,12 +163,6 @@ func TestDatabaseGroup(t *testing.T) {
plan, rollout, issue, err := ctl.changeDatabaseWithConfig(ctx, project, spec)
a.NoError(err)
- // Assert the plan deployment.
- a.Len(plan.Deployment.DatabaseGroupMappings, 1)
- a.Equal(databaseGroup.Name, plan.Deployment.DatabaseGroupMappings[0].DatabaseGroup)
- a.Len(plan.Deployment.DatabaseGroupMappings[0].Databases, 2)
- a.ElementsMatch([]string{testDatabases[0].Name, prodDatabases[0].Name}, plan.Deployment.DatabaseGroupMappings[0].Databases)
-
// Query schema.
for _, testInstance := range testInstances {
dbMetadataResp, err := ctl.databaseServiceClient.GetDatabaseSchema(ctx, connect.NewRequest(&v1pb.GetDatabaseSchemaRequest{Name: fmt.Sprintf("%s/databases/%s/schema", testInstance.Name, databaseName)}))
@@ -202,24 +195,7 @@ func TestDatabaseGroup(t *testing.T) {
}
a.Len(prodDatabases, 2)
- // Update the plan deployment.
- planResp, err := ctl.planServiceClient.UpdatePlan(ctx, connect.NewRequest(&v1pb.UpdatePlanRequest{
- Plan: &v1pb.Plan{
- Name: plan.Name,
- },
- UpdateMask: &fieldmaskpb.FieldMask{
- Paths: []string{"deployment"},
- },
- }))
- a.NoError(err)
- plan = planResp.Msg
-
- a.Len(plan.Deployment.DatabaseGroupMappings, 1)
- a.Equal(databaseGroup.Name, plan.Deployment.DatabaseGroupMappings[0].DatabaseGroup)
- a.Len(plan.Deployment.DatabaseGroupMappings[0].Databases, 3)
- a.ElementsMatch([]string{testDatabases[0].Name, prodDatabases[0].Name, prodDatabases[1].Name}, plan.Deployment.DatabaseGroupMappings[0].Databases)
-
- // Create the new task.
+ // CreateRollout is now idempotent and will automatically pick up the new database.
rollout2Resp, err := ctl.rolloutServiceClient.CreateRollout(ctx, connect.NewRequest(&v1pb.CreateRolloutRequest{
Parent: project.Name,
Rollout: &v1pb.Rollout{
diff --git a/frontend/src/components/Plan/components/SpecDetailView/AllTargetsDrawer.vue b/frontend/src/components/Plan/components/SpecDetailView/AllTargetsDrawer.vue
index b5c4078680..a3b2b9ba8e 100644
--- a/frontend/src/components/Plan/components/SpecDetailView/AllTargetsDrawer.vue
+++ b/frontend/src/components/Plan/components/SpecDetailView/AllTargetsDrawer.vue
@@ -121,7 +121,7 @@ const loadAllTargets = async () => {
try {
// Separate different types of targets for optimized fetching
- const { databaseTargets, dbGroupTargets } = getDatabaseTargets(
+ const { databaseTargets, dbGroupTargets } = await getDatabaseTargets(
props.targets
);
diff --git a/frontend/src/components/Plan/components/SpecDetailView/DatabaseGroupTargetDisplay.vue b/frontend/src/components/Plan/components/SpecDetailView/DatabaseGroupTargetDisplay.vue
index 142b24a565..4c0f790cea 100644
--- a/frontend/src/components/Plan/components/SpecDetailView/DatabaseGroupTargetDisplay.vue
+++ b/frontend/src/components/Plan/components/SpecDetailView/DatabaseGroupTargetDisplay.vue
@@ -65,14 +65,14 @@
<script setup lang="ts">
import { ExternalLinkIcon } from "lucide-vue-next";
import { NPopover, NTag, NVirtualList } from "naive-ui";
-import { computed } from "vue";
+import { computed, ref, watchEffect } from "vue";
import { useRouter } from "vue-router";
import DatabaseGroupIcon from "@/components/DatabaseGroupIcon.vue";
import DatabaseGroupName from "@/components/v2/Model/DatabaseGroupName.vue";
import { PROJECT_V1_ROUTE_DATABASE_GROUP_DETAIL } from "@/router/dashboard/projectV1";
import { getProjectNameAndDatabaseGroupName, useDBGroupStore } from "@/store";
import { isValidDatabaseGroupName } from "@/types";
-import { usePlanContext } from "../../logic/context";
+import { DatabaseGroupView } from "@/types/proto-es/v1/database_group_service_pb";
import DatabaseDisplay from "../common/DatabaseDisplay.vue";
const MAX_INLINE_DATABASES = 5;
@@ -89,15 +89,20 @@ const props = withDefaults(
const router = useRouter();
const dbGroupStore = useDBGroupStore();
-const { plan } = usePlanContext();
-const databases = computed(() => {
- const deployment = plan.value.deployment;
- if (!deployment) return [];
- const mapping = deployment.databaseGroupMappings.find(
- (m: { databaseGroup: string }) => m.databaseGroup === props.target
- );
- return mapping?.databases ?? [];
+const databases = ref<string[]>([]);
+
+// Fetch database group and populate databases
+watchEffect(async () => {
+ try {
+ const dbGroup = await dbGroupStore.getOrFetchDBGroupByName(props.target, {
+ view: DatabaseGroupView.FULL,
+ silent: true,
+ });
+ databases.value = dbGroup.matchedDatabases?.map((db) => db.name) ?? [];
+ } catch {
+ databases.value = [];
+ }
});
const extraDatabaseItems = computed(() => {
diff --git a/frontend/src/components/Plan/components/SpecDetailView/TargetListSection.vue b/frontend/src/components/Plan/components/SpecDetailView/TargetListSection.vue
index af60f1b810..1d1c1c2561 100644
--- a/frontend/src/components/Plan/components/SpecDetailView/TargetListSection.vue
+++ b/frontend/src/components/Plan/components/SpecDetailView/TargetListSection.vue
@@ -168,7 +168,7 @@ const loadTargetData = async () => {
try {
// Fetch data for visible targets only
- const { databaseTargets, dbGroupTargets } = getDatabaseTargets(
+ const { databaseTargets, dbGroupTargets } = await getDatabaseTargets(
visibleTargets.value
);
diff --git a/frontend/src/components/Plan/components/SpecDetailView/context.ts b/frontend/src/components/Plan/components/SpecDetailView/context.ts
index c396c0b1d5..5bf4ebfd10 100644
--- a/frontend/src/components/Plan/components/SpecDetailView/context.ts
+++ b/frontend/src/components/Plan/components/SpecDetailView/context.ts
@@ -50,26 +50,34 @@ export const useSelectedSpec = () => {
return [];
});
- const getDatabasesForGroup = (groupName: string): string[] => {
- const deployment = plan.value.deployment;
- if (!deployment) return [];
- const mapping = deployment.databaseGroupMappings.find(
- (m: { databaseGroup: string }) => m.databaseGroup === groupName
+ const getDatabasesForGroup = async (groupName: string): Promise<string[]> => {
+ const { useDBGroupStore } = await import("@/store");
+ const { DatabaseGroupView } = await import(
+ "@/types/proto-es/v1/database_group_service_pb"
);
- return mapping?.databases ?? [];
+ const dbGroupStore = useDBGroupStore();
+ try {
+ const dbGroup = await dbGroupStore.getOrFetchDBGroupByName(groupName, {
+ view: DatabaseGroupView.FULL,
+ silent: true,
+ });
+ return dbGroup.matchedDatabases?.map((db) => db.name) ?? [];
+ } catch {
+ return [];
+ }
};
- const getDatabaseTargets = (
+ const getDatabaseTargets = async (
targets: string[]
- ): { databaseTargets: string[]; dbGroupTargets: string[] } => {
+ ): Promise<{ databaseTargets: string[]; dbGroupTargets: string[] }> => {
const databaseTargets: string[] = [];
const dbGroupTargets: string[] = [];
for (const target of targets) {
if (isValidDatabaseGroupName(target)) {
dbGroupTargets.push(target);
- // Also collect databases from deployment mapping for this group
- const mappedDatabases = getDatabasesForGroup(target);
+ // Fetch live databases from the database group
+ const mappedDatabases = await getDatabasesForGroup(target);
databaseTargets.push(...mappedDatabases);
} else {
databaseTargets.push(target);
diff --git a/frontend/src/components/Plan/components/StatementSection/EditorView/EditorView.vue b/frontend/src/components/Plan/components/StatementSection/EditorView/EditorView.vue
index c6d4db7e85..04ae7a95ca 100644
--- a/frontend/src/components/Plan/components/StatementSection/EditorView/EditorView.vue
+++ b/frontend/src/components/Plan/components/StatementSection/EditorView/EditorView.vue
@@ -196,7 +196,7 @@ import { cloneDeep, includes, isEmpty } from "lodash-es";
import { ExpandIcon, TableIcon } from "lucide-vue-next";
import { NButton, NTooltip, useDialog } from "naive-ui";
import { v1 as uuidv1 } from "uuid";
-import { computed, reactive, watch } from "vue";
+import { computed, reactive, ref, watch, watchEffect } from "vue";
import { useI18n } from "vue-i18n";
import { BBAttention, BBModal } from "@/bbkit";
import { MonacoEditor } from "@/components/MonacoEditor";
@@ -410,8 +410,11 @@ const shouldShowSchemaEditorButton = computed(() => {
});
});
-const targetDatabaseNames = computed(() => {
- return getDatabaseTargets(targets.value).databaseTargets;
+const targetDatabaseNames = ref<string[]>([]);
+
+watchEffect(async () => {
+ const result = await getDatabaseTargets(targets.value);
+ targetDatabaseNames.value = result.databaseTargets;
});
const beginEdit = () => {
diff --git a/frontend/src/components/Plan/logic/rolloutPreview.ts b/frontend/src/components/Plan/logic/rolloutPreview.ts
index c2f9642e7e..6c4b598a2b 100644
--- a/frontend/src/components/Plan/logic/rolloutPreview.ts
+++ b/frontend/src/components/Plan/logic/rolloutPreview.ts
@@ -1,12 +1,16 @@
import { create } from "@bufbuild/protobuf";
-import { useDatabaseV1Store, useEnvironmentV1Store } from "@/store";
+import {
+ useDatabaseV1Store,
+ useDBGroupStore,
+ useEnvironmentV1Store,
+} from "@/store";
import { batchGetOrFetchDatabases } from "@/store/modules/v1/database";
import { isValidDatabaseGroupName, isValidDatabaseName } from "@/types";
import { DatabaseChangeType } from "@/types/proto-es/v1/common_pb";
+import { DatabaseGroupView } from "@/types/proto-es/v1/database_group_service_pb";
import type {
Plan,
Plan_ChangeDatabaseConfig,
- Plan_Deployment,
Plan_Spec,
} from "@/types/proto-es/v1/plan_service_pb";
import type {
@@ -42,10 +46,7 @@ export async function generateRolloutPreview(
projectName: string
): Promise<Rollout> {
// Step 1: Extract all database targets from specs and expand database groups
- const allDatabaseNames = extractAndExpandDatabaseTargets(
- plan.specs,
- plan.deployment
- );
+ const allDatabaseNames = await extractAndExpandDatabaseTargets(plan.specs);
// Step 2: Fetch databases that are not cached
if (allDatabaseNames.length > 0) {
@@ -53,10 +54,10 @@ export async function generateRolloutPreview(
}
// Step 3: Generate tasks from specs
- const tasks = generateTasksFromSpecs(plan.specs, plan.deployment);
+ const tasks = await generateTasksFromSpecs(plan.specs);
- // Step 4: Get environment order
- const environmentOrder = getEnvironmentOrder(plan.deployment);
+ // Step 4: Get environment order from store
+ const environmentOrder = getEnvironmentOrder();
// Step 5: Group tasks by environment and create stages
const stages = groupTasksIntoStages(tasks, environmentOrder, projectName);
@@ -70,10 +71,9 @@ export async function generateRolloutPreview(
});
}
-function extractAndExpandDatabaseTargets(
- specs: Plan_Spec[],
- deployment?: Plan_Deployment
-): string[] {
+async function extractAndExpandDatabaseTargets(
+ specs: Plan_Spec[]
+): Promise<string[]> {
const databaseNames: string[] = [];
for (const spec of specs) {
@@ -85,7 +85,7 @@ function extractAndExpandDatabaseTargets(
if (isValidDatabaseName(target)) {
databaseNames.push(target);
} else if (isValidDatabaseGroupName(target)) {
- const expandedDbs = expandDatabaseGroup(target, deployment);
+ const expandedDbs = await expandDatabaseGroup(target);
databaseNames.push(...expandedDbs);
}
}
@@ -94,32 +94,32 @@ function extractAndExpandDatabaseTargets(
return [...new Set(databaseNames)];
}
-function expandDatabaseGroup(
- databaseGroupName: string,
- deployment?: Plan_Deployment
-): string[] {
- if (!deployment) return [];
-
- const mapping = deployment.databaseGroupMappings.find(
- (m) => m.databaseGroup === databaseGroupName
- );
-
- return mapping?.databases ?? [];
+async function expandDatabaseGroup(
+ databaseGroupName: string
+): Promise<string[]> {
+ const dbGroupStore = useDBGroupStore();
+ try {
+ const dbGroup = await dbGroupStore.getOrFetchDBGroupByName(
+ databaseGroupName,
+ { view: DatabaseGroupView.FULL, silent: true }
+ );
+ return dbGroup.matchedDatabases?.map((db) => db.name) ?? [];
+ } catch {
+ return [];
+ }
}
-function generateTasksFromSpecs(
- specs: Plan_Spec[],
- deployment?: Plan_Deployment
-): TaskCreate[] {
+async function generateTasksFromSpecs(
+ specs: Plan_Spec[]
+): Promise<TaskCreate[]> {
const tasks: TaskCreate[] = [];
for (const spec of specs) {
if (spec.config.case !== "changeDatabaseConfig") continue;
- const specTasks = generateChangeDatabaseTasks(
+ const specTasks = await generateChangeDatabaseTasks(
spec.id,
- spec.config.value,
- deployment
+ spec.config.value
);
tasks.push(...specTasks);
}
@@ -127,16 +127,15 @@ function generateTasksFromSpecs(
return tasks;
}
-function generateChangeDatabaseTasks(
+async function generateChangeDatabaseTasks(
specId: string,
- config: Plan_ChangeDatabaseConfig,
- deployment?: Plan_Deployment
-): TaskCreate[] {
+ config: Plan_ChangeDatabaseConfig
+): Promise<TaskCreate[]> {
const tasks: TaskCreate[] = [];
let targets = config.targets ?? [];
if (targets.length === 1 && isValidDatabaseGroupName(targets[0])) {
- targets = expandDatabaseGroup(targets[0], deployment);
+ targets = await expandDatabaseGroup(targets[0]);
}
for (const target of targets) {
@@ -159,15 +158,7 @@ function generateChangeDatabaseTasks(
return tasks;
}
-function getEnvironmentOrder(deployment?: Plan_Deployment): string[] {
- if (deployment && deployment.environments.length > 0) {
- // deployment.environments contains environment IDs like "staging"
- // Convert to full resource names to match db.effectiveEnvironment format
- return deployment.environments.map((env) =>
- env.startsWith("environments/") ? env : `environments/${env}`
- );
- }
-
+function getEnvironmentOrder(): string[] {
const environmentStore = useEnvironmentV1Store();
return environmentStore.environmentList.map((env) => env.name);
}
diff --git a/frontend/src/types/proto-es/v1/plan_service_pb.d.ts b/frontend/src/types/proto-es/v1/plan_service_pb.d.ts
index 3a2cf57f12..f14a9acd62 100644
--- a/frontend/src/types/proto-es/v1/plan_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/plan_service_pb.d.ts
@@ -340,11 +340,6 @@ export declare type Plan = Message<"bytebase.v1.Plan"> & {
* @generated from field: map<string, int32> plan_check_run_status_count = 11;
*/
planCheckRunStatusCount: { [key: string]: number };
-
- /**
- * @generated from field: bytebase.v1.Plan.Deployment deployment = 12;
- */
- deployment?: Plan_Deployment;
};
/**
@@ -569,56 +564,6 @@ export declare type Plan_ExportDataConfig = Message<"bytebase.v1.Plan.ExportData
*/
export declare const Plan_ExportDataConfigSchema: GenMessage<Plan_ExportDataConfig>;
-/**
- * @generated from message bytebase.v1.Plan.Deployment
- */
-export declare type Plan_Deployment = Message<"bytebase.v1.Plan.Deployment"> & {
- /**
- * The environments deploy order.
- *
- * @generated from field: repeated string environments = 1;
- */
- environments: string[];
-
- /**
- * The database group mapping.
- *
- * @generated from field: repeated bytebase.v1.Plan.Deployment.DatabaseGroupMapping database_group_mappings = 2;
- */
- databaseGroupMappings: Plan_Deployment_DatabaseGroupMapping[];
-};
-
-/**
- * Describes the message bytebase.v1.Plan.Deployment.
- * Use `create(Plan_DeploymentSchema)` to create a new message.
- */
-export declare const Plan_DeploymentSchema: GenMessage<Plan_Deployment>;
-
-/**
- * @generated from message bytebase.v1.Plan.Deployment.DatabaseGroupMapping
- */
-export declare type Plan_Deployment_DatabaseGroupMapping = Message<"bytebase.v1.Plan.Deployment.DatabaseGroupMapping"> & {
- /**
- * Format: projects/{project}/databaseGroups/{databaseGroup}.
- *
- * @generated from field: string database_group = 1;
- */
- databaseGroup: string;
-
- /**
- * Format: instances/{instance-id}/databases/{database-name}.
- *
- * @generated from field: repeated string databases = 2;
- */
- databases: string[];
-};
-
-/**
- * Describes the message bytebase.v1.Plan.Deployment.DatabaseGroupMapping.
- * Use `create(Plan_Deployment_DatabaseGroupMappingSchema)` to create a new message.
- */
-export declare const Plan_Deployment_DatabaseGroupMappingSchema: GenMessage<Plan_Deployment_DatabaseGroupMapping>;
-
/**
* @generated from message bytebase.v1.ListPlanCheckRunsRequest
*/
diff --git a/frontend/src/types/proto-es/v1/plan_service_pb.js b/frontend/src/types/proto-es/v1/plan_service_pb.js
index 3be97ea9f1..b71933b863 100644
--- a/frontend/src/types/proto-es/v1/plan_service_pb.js
+++ b/frontend/src/types/proto-es/v1/plan_service_pb.js
@@ -17,7 +17,7 @@ import { file_v1_sql_service } from "./sql_service_pb";
* Describes the file v1/plan_service.proto.
*/
export const file_v1_plan_service = /*@__PURE__*/
- fileDesc("ChV2MS9wbGFuX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIjkKDkdldFBsYW5SZXF1ZXN0EicKBG5hbWUYASABKAlCGeBBAvpBEwoRYnl0ZWJhc2UuY29tL1BsYW4iZwoQTGlzdFBsYW5zUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkiTgoRTGlzdFBsYW5zUmVzcG9uc2USIAoFcGxhbnMYASADKAsyES5ieXRlYmFzZS52MS5QbGFuEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJgChJTZWFyY2hQbGFuc1JlcXVlc3QSEwoGcGFyZW50GAEgASgJQgPgQQISEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkSDgoGZmlsdGVyGAQgASgJIlAKE1NlYXJjaFBsYW5zUmVzcG9uc2USIAoFcGxhbnMYASADKAsyES5ieXRlYmFzZS52MS5QbGFuEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJnChFDcmVhdGVQbGFuUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSJAoEcGxhbhgCIAEoCzIRLmJ5dGViYXNlLnYxLlBsYW5CA+BBAiKGAQoRVXBkYXRlUGxhblJlcXVlc3QSJAoEcGxhbhgBIAEoCzIRLmJ5dGViYXNlLnYxLlBsYW5CA+BBAhI0Cgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBAhIVCg1hbGxvd19taXNzaW5nGAMgASgIIpQNCgRQbGFuEgwKBG5hbWUYASABKAkSIQoFc3RhdGUYAiABKA4yEi5ieXRlYmFzZS52MS5TdGF0ZRISCgVpc3N1ZRgDIAEoCUID4EEDEhQKB3JvbGxvdXQYBCABKAlCA+BBAxIXCgV0aXRsZRgFIAEoCUIIukgFcgMYyAESHQoLZGVzY3JpcHRpb24YBiABKAlCCLpIBXIDGJBOEiUKBXNwZWNzGAcgAygLMhYuYnl0ZWJhc2UudjEuUGxhbi5TcGVjEhQKB2NyZWF0b3IYCCABKAlCA+BBAxI0CgtjcmVhdGVfdGltZRgJIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgKIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxJYChtwbGFuX2NoZWNrX3J1bl9zdGF0dXNfY291bnQYCyADKAsyLi5ieXRlYmFzZS52MS5QbGFuLlBsYW5DaGVja1J1blN0YXR1c0NvdW50RW50cnlCA+BBAxIwCgpkZXBsb3ltZW50GAwgASgLMhwuYnl0ZWJhc2UudjEuUGxhbi5EZXBsb3ltZW50GvIBCgRTcGVjEgoKAmlkGAEgASgJEkgKFmNyZWF0ZV9kYXRhYmFzZV9jb25maWcYAiABKAsyJi5ieXRlYmFzZS52MS5QbGFuLkNyZWF0ZURhdGFiYXNlQ29uZmlnSAASSAoWY2hhbmdlX2RhdGFiYXNlX2NvbmZpZxgDIAEoCzImLmJ5dGViYXNlLnYxLlBsYW4uQ2hhbmdlRGF0YWJhc2VDb25maWdIABJAChJleHBvcnRfZGF0YV9jb25maWcYBCABKAsyIi5ieXRlYmFzZS52MS5QbGFuLkV4cG9ydERhdGFDb25maWdIAEIICgZjb25maWcaPgocUGxhbkNoZWNrUnVuU3RhdHVzQ291bnRFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAU6AjgBGs4BChRDcmVhdGVEYXRhYmFzZUNvbmZpZxITCgZ0YXJnZXQYASABKAlCA+BBAhIVCghkYXRhYmFzZRgCIAEoCUID4EECEhIKBXRhYmxlGAMgASgJQgPgQQESGgoNY2hhcmFjdGVyX3NldBgEIAEoCUID4EEBEhYKCWNvbGxhdGlvbhgFIAEoCUID4EEBEhQKB2NsdXN0ZXIYBiABKAlCA+BBARISCgVvd25lchgHIAEoCUID4EEBEhgKC2Vudmlyb25tZW50GAkgASgJQgPgQQEaxAIKFENoYW5nZURhdGFiYXNlQ29uZmlnEg8KB3RhcmdldHMYASADKAkSDQoFc2hlZXQYAiABKAkSKgoHcmVsZWFzZRgDIAEoCUIZ+kEWChRieXRlYmFzZS5jb20vUmVsZWFzZRItCgR0eXBlGAQgASgOMh8uYnl0ZWJhc2UudjEuRGF0YWJhc2VDaGFuZ2VUeXBlEksKC2dob3N0X2ZsYWdzGAUgAygLMjYuYnl0ZWJhc2UudjEuUGxhbi5DaGFuZ2VEYXRhYmFzZUNvbmZpZy5HaG9zdEZsYWdzRW50cnkSGwoTZW5hYmxlX3ByaW9yX2JhY2t1cBgGIAEoCBIUCgxlbmFibGVfZ2hvc3QYByABKAgaMQoPR2hvc3RGbGFnc0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoCToCOAEagQEKEEV4cG9ydERhdGFDb25maWcSDwoHdGFyZ2V0cxgBIAMoCRINCgVzaGVldBgCIAEoCRIpCgZmb3JtYXQYAyABKA4yGS5ieXRlYmFzZS52MS5FeHBvcnRGb3JtYXQSFQoIcGFzc3dvcmQYBCABKAlIAIgBAUILCglfcGFzc3dvcmQauQEKCkRlcGxveW1lbnQSFAoMZW52aXJvbm1lbnRzGAEgAygJElIKF2RhdGFiYXNlX2dyb3VwX21hcHBpbmdzGAIgAygLMjEuYnl0ZWJhc2UudjEuUGxhbi5EZXBsb3ltZW50LkRhdGFiYXNlR3JvdXBNYXBwaW5nGkEKFERhdGFiYXNlR3JvdXBNYXBwaW5nEhYKDmRhdGFiYXNlX2dyb3VwGAEgASgJEhEKCWRhdGFiYXNlcxgCIAMoCTo36kE0ChFieXRlYmFzZS5jb20vUGxhbhIfcHJvamVjdHMve3Byb2plY3R9L3BsYW5zL3twbGFufSJqChhMaXN0UGxhbkNoZWNrUnVuc1JlcXVlc3QSKQoGcGFyZW50GAEgASgJQhngQQL6QRMKEWJ5dGViYXNlLmNvbS9QbGFuEhMKC2xhdGVzdF9vbmx5GAIgASgIEg4KBmZpbHRlchgDIAEoCSJPChlMaXN0UGxhbkNoZWNrUnVuc1Jlc3BvbnNlEjIKD3BsYW5fY2hlY2tfcnVucxgBIAMoCzIZLmJ5dGViYXNlLnYxLlBsYW5DaGVja1J1biJhChRSdW5QbGFuQ2hlY2tzUmVxdWVzdBInCgRuYW1lGAEgASgJQhngQQL6QRMKEWJ5dGViYXNlLmNvbS9QbGFuEhQKB3NwZWNfaWQYAiABKAlIAIgBAUIKCghfc3BlY19pZCIXChVSdW5QbGFuQ2hlY2tzUmVzcG9uc2UiZQofQmF0Y2hDYW5jZWxQbGFuQ2hlY2tSdW5zUmVxdWVzdBIpCgZwYXJlbnQYASABKAlCGeBBAvpBEwoRYnl0ZWJhc2UuY29tL1BsYW4SFwoPcGxhbl9jaGVja19ydW5zGAIgAygJIiIKIEJhdGNoQ2FuY2VsUGxhbkNoZWNrUnVuc1Jlc3BvbnNlIqQHCgxQbGFuQ2hlY2tSdW4SDAoEbmFtZRgBIAEoCRIsCgR0eXBlGAIgASgOMh4uYnl0ZWJhc2UudjEuUGxhbkNoZWNrUnVuLlR5cGUSMAoGc3RhdHVzGAMgASgOMiAuYnl0ZWJhc2UudjEuUGxhbkNoZWNrUnVuLlN0YXR1cxIOCgZ0YXJnZXQYBCABKAkSDQoFc2hlZXQYBSABKAkSMQoHcmVzdWx0cxgGIAMoCzIgLmJ5dGViYXNlLnYxLlBsYW5DaGVja1J1bi5SZXN1bHQSDQoFZXJyb3IYByABKAkSNAoLY3JlYXRlX3RpbWUYCCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMavgMKBlJlc3VsdBIpCgZzdGF0dXMYASABKA4yGS5ieXRlYmFzZS52MS5BZHZpY2UuTGV2ZWwSDQoFdGl0bGUYAiABKAkSDwoHY29udGVudBgDIAEoCRIMCgRjb2RlGAQgASgFEk8KEnNxbF9zdW1tYXJ5X3JlcG9ydBgFIAEoCzIxLmJ5dGViYXNlLnYxLlBsYW5DaGVja1J1bi5SZXN1bHQuU3FsU3VtbWFyeVJlcG9ydEgAEk0KEXNxbF9yZXZpZXdfcmVwb3J0GAYgASgLMjAuYnl0ZWJhc2UudjEuUGxhbkNoZWNrUnVuLlJlc3VsdC5TcWxSZXZpZXdSZXBvcnRIABpCChBTcWxTdW1tYXJ5UmVwb3J0EhcKD3N0YXRlbWVudF90eXBlcxgCIAMoCRIVCg1hZmZlY3RlZF9yb3dzGAMgASgDGm0KD1NxbFJldmlld1JlcG9ydBItCg5zdGFydF9wb3NpdGlvbhgFIAEoCzIVLmJ5dGViYXNlLnYxLlBvc2l0aW9uEisKDGVuZF9wb3NpdGlvbhgGIAEoCzIVLmJ5dGViYXNlLnYxLlBvc2l0aW9uQggKBnJlcG9ydCJ7CgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABIdChlEQVRBQkFTRV9TVEFURU1FTlRfQURWSVNFEAISJQohREFUQUJBU0VfU1RBVEVNRU5UX1NVTU1BUllfUkVQT1JUEAMSFwoTREFUQUJBU0VfR0hPU1RfU1lOQxAFIlEKBlN0YXR1cxIWChJTVEFUVVNfVU5TUEVDSUZJRUQQABILCgdSVU5OSU5HEAESCAoERE9ORRACEgoKBkZBSUxFRBADEgwKCENBTkNFTEVEEAQy0goKC1BsYW5TZXJ2aWNlEnsKB0dldFBsYW4SGy5ieXRlYmFzZS52MS5HZXRQbGFuUmVxdWVzdBoRLmJ5dGViYXNlLnYxLlBsYW4iQNpBBG5hbWWK6jAMYmIucGxhbnMuZ2V0kOowAYLT5JMCHxIdL3YxL3tuYW1lPXByb2plY3RzLyovcGxhbnMvKn0SjwEKCUxpc3RQbGFucxIdLmJ5dGViYXNlLnYxLkxpc3RQbGFuc1JlcXVlc3QaHi5ieXRlYmFzZS52MS5MaXN0UGxhbnNSZXNwb25zZSJD2kEGcGFyZW50iuowDWJiLnBsYW5zLmxpc3SQ6jABgtPkkwIfEh0vdjEve3BhcmVudD1wcm9qZWN0cy8qfS9wbGFucxKeAQoLU2VhcmNoUGxhbnMSHy5ieXRlYmFzZS52MS5TZWFyY2hQbGFuc1JlcXVlc3QaIC5ieXRlYmFzZS52MS5TZWFyY2hQbGFuc1Jlc3BvbnNlIkzaQQZwYXJlbnSK6jAMYmIucGxhbnMuZ2V0kOowAoLT5JMCKToBKiIkL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vcGxhbnM6c2VhcmNoEpUBCgpDcmVhdGVQbGFuEh4uYnl0ZWJhc2UudjEuQ3JlYXRlUGxhblJlcXVlc3QaES5ieXRlYmFzZS52MS5QbGFuIlTaQQtwYXJlbnQscGxhborqMA9iYi5wbGFucy5jcmVhdGWQ6jABmOowAYLT5JMCJToEcGxhbiIdL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vcGxhbnMSnwEKClVwZGF0ZVBsYW4SHi5ieXRlYmFzZS52MS5VcGRhdGVQbGFuUmVxdWVzdBoRLmJ5dGViYXNlLnYxLlBsYW4iXtpBEHBsYW4sdXBkYXRlX21hc2uK6jAPYmIucGxhbnMudXBkYXRlkOowApjqMAGC0+STAio6BHBsYW4yIi92MS97cGxhbi5uYW1lPXByb2plY3RzLyovcGxhbnMvKn0SvwEKEUxpc3RQbGFuQ2hlY2tSdW5zEiUuYnl0ZWJhc2UudjEuTGlzdFBsYW5DaGVja1J1bnNSZXF1ZXN0GiYuYnl0ZWJhc2UudjEuTGlzdFBsYW5DaGVja1J1bnNSZXNwb25zZSJb2kEGcGFyZW50iuowFWJiLnBsYW5DaGVja1J1bnMubGlzdJDqMAGC0+STAi8SLS92MS97cGFyZW50PXByb2plY3RzLyovcGxhbnMvKn0vcGxhbkNoZWNrUnVucxKxAQoNUnVuUGxhbkNoZWNrcxIhLmJ5dGViYXNlLnYxLlJ1blBsYW5DaGVja3NSZXF1ZXN0GiIuYnl0ZWJhc2UudjEuUnVuUGxhbkNoZWNrc1Jlc3BvbnNlIlnaQQRuYW1liuowFGJiLnBsYW5DaGVja1J1bnMucnVukOowAYLT5JMCMDoBKiIrL3YxL3tuYW1lPXByb2plY3RzLyovcGxhbnMvKn06cnVuUGxhbkNoZWNrcxLiAQoYQmF0Y2hDYW5jZWxQbGFuQ2hlY2tSdW5zEiwuYnl0ZWJhc2UudjEuQmF0Y2hDYW5jZWxQbGFuQ2hlY2tSdW5zUmVxdWVzdBotLmJ5dGViYXNlLnYxLkJhdGNoQ2FuY2VsUGxhbkNoZWNrUnVuc1Jlc3BvbnNlImnaQQZwYXJlbnSK6jAUYmIucGxhbkNoZWNrUnVucy5ydW6Q6jABgtPkkwI+OgEqIjkvdjEve3BhcmVudD1wcm9qZWN0cy8qL3BsYW5zLyp9L3BsYW5DaGVja1J1bnM6YmF0Y2hDYW5jZWxCpgEKD2NvbS5ieXRlYmFzZS52MUIQUGxhblNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_sql_service]);
+ fileDesc("ChV2MS9wbGFuX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIjkKDkdldFBsYW5SZXF1ZXN0EicKBG5hbWUYASABKAlCGeBBAvpBEwoRYnl0ZWJhc2UuY29tL1BsYW4iZwoQTGlzdFBsYW5zUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkiTgoRTGlzdFBsYW5zUmVzcG9uc2USIAoFcGxhbnMYASADKAsyES5ieXRlYmFzZS52MS5QbGFuEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJgChJTZWFyY2hQbGFuc1JlcXVlc3QSEwoGcGFyZW50GAEgASgJQgPgQQISEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkSDgoGZmlsdGVyGAQgASgJIlAKE1NlYXJjaFBsYW5zUmVzcG9uc2USIAoFcGxhbnMYASADKAsyES5ieXRlYmFzZS52MS5QbGFuEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJnChFDcmVhdGVQbGFuUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSJAoEcGxhbhgCIAEoCzIRLmJ5dGViYXNlLnYxLlBsYW5CA+BBAiKGAQoRVXBkYXRlUGxhblJlcXVlc3QSJAoEcGxhbhgBIAEoCzIRLmJ5dGViYXNlLnYxLlBsYW5CA+BBAhI0Cgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBAhIVCg1hbGxvd19taXNzaW5nGAMgASgIIqYLCgRQbGFuEgwKBG5hbWUYASABKAkSIQoFc3RhdGUYAiABKA4yEi5ieXRlYmFzZS52MS5TdGF0ZRISCgVpc3N1ZRgDIAEoCUID4EEDEhQKB3JvbGxvdXQYBCABKAlCA+BBAxIXCgV0aXRsZRgFIAEoCUIIukgFcgMYyAESHQoLZGVzY3JpcHRpb24YBiABKAlCCLpIBXIDGJBOEiUKBXNwZWNzGAcgAygLMhYuYnl0ZWJhc2UudjEuUGxhbi5TcGVjEhQKB2NyZWF0b3IYCCABKAlCA+BBAxI0CgtjcmVhdGVfdGltZRgJIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgKIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxJYChtwbGFuX2NoZWNrX3J1bl9zdGF0dXNfY291bnQYCyADKAsyLi5ieXRlYmFzZS52MS5QbGFuLlBsYW5DaGVja1J1blN0YXR1c0NvdW50RW50cnlCA+BBAxryAQoEU3BlYxIKCgJpZBgBIAEoCRJIChZjcmVhdGVfZGF0YWJhc2VfY29uZmlnGAIgASgLMiYuYnl0ZWJhc2UudjEuUGxhbi5DcmVhdGVEYXRhYmFzZUNvbmZpZ0gAEkgKFmNoYW5nZV9kYXRhYmFzZV9jb25maWcYAyABKAsyJi5ieXRlYmFzZS52MS5QbGFuLkNoYW5nZURhdGFiYXNlQ29uZmlnSAASQAoSZXhwb3J0X2RhdGFfY29uZmlnGAQgASgLMiIuYnl0ZWJhc2UudjEuUGxhbi5FeHBvcnREYXRhQ29uZmlnSABCCAoGY29uZmlnGj4KHFBsYW5DaGVja1J1blN0YXR1c0NvdW50RW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgFOgI4ARrOAQoUQ3JlYXRlRGF0YWJhc2VDb25maWcSEwoGdGFyZ2V0GAEgASgJQgPgQQISFQoIZGF0YWJhc2UYAiABKAlCA+BBAhISCgV0YWJsZRgDIAEoCUID4EEBEhoKDWNoYXJhY3Rlcl9zZXQYBCABKAlCA+BBARIWCgljb2xsYXRpb24YBSABKAlCA+BBARIUCgdjbHVzdGVyGAYgASgJQgPgQQESEgoFb3duZXIYByABKAlCA+BBARIYCgtlbnZpcm9ubWVudBgJIAEoCUID4EEBGsQCChRDaGFuZ2VEYXRhYmFzZUNvbmZpZxIPCgd0YXJnZXRzGAEgAygJEg0KBXNoZWV0GAIgASgJEioKB3JlbGVhc2UYAyABKAlCGfpBFgoUYnl0ZWJhc2UuY29tL1JlbGVhc2USLQoEdHlwZRgEIAEoDjIfLmJ5dGViYXNlLnYxLkRhdGFiYXNlQ2hhbmdlVHlwZRJLCgtnaG9zdF9mbGFncxgFIAMoCzI2LmJ5dGViYXNlLnYxLlBsYW4uQ2hhbmdlRGF0YWJhc2VDb25maWcuR2hvc3RGbGFnc0VudHJ5EhsKE2VuYWJsZV9wcmlvcl9iYWNrdXAYBiABKAgSFAoMZW5hYmxlX2dob3N0GAcgASgIGjEKD0dob3N0RmxhZ3NFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBGoEBChBFeHBvcnREYXRhQ29uZmlnEg8KB3RhcmdldHMYASADKAkSDQoFc2hlZXQYAiABKAkSKQoGZm9ybWF0GAMgASgOMhkuYnl0ZWJhc2UudjEuRXhwb3J0Rm9ybWF0EhUKCHBhc3N3b3JkGAQgASgJSACIAQFCCwoJX3Bhc3N3b3JkOjfqQTQKEWJ5dGViYXNlLmNvbS9QbGFuEh9wcm9qZWN0cy97cHJvamVjdH0vcGxhbnMve3BsYW59ImoKGExpc3RQbGFuQ2hlY2tSdW5zUmVxdWVzdBIpCgZwYXJlbnQYASABKAlCGeBBAvpBEwoRYnl0ZWJhc2UuY29tL1BsYW4SEwoLbGF0ZXN0X29ubHkYAiABKAgSDgoGZmlsdGVyGAMgASgJIk8KGUxpc3RQbGFuQ2hlY2tSdW5zUmVzcG9uc2USMgoPcGxhbl9jaGVja19ydW5zGAEgAygLMhkuYnl0ZWJhc2UudjEuUGxhbkNoZWNrUnVuImEKFFJ1blBsYW5DaGVja3NSZXF1ZXN0EicKBG5hbWUYASABKAlCGeBBAvpBEwoRYnl0ZWJhc2UuY29tL1BsYW4SFAoHc3BlY19pZBgCIAEoCUgAiAEBQgoKCF9zcGVjX2lkIhcKFVJ1blBsYW5DaGVja3NSZXNwb25zZSJlCh9CYXRjaENhbmNlbFBsYW5DaGVja1J1bnNSZXF1ZXN0EikKBnBhcmVudBgBIAEoCUIZ4EEC+kETChFieXRlYmFzZS5jb20vUGxhbhIXCg9wbGFuX2NoZWNrX3J1bnMYAiADKAkiIgogQmF0Y2hDYW5jZWxQbGFuQ2hlY2tSdW5zUmVzcG9uc2UipAcKDFBsYW5DaGVja1J1bhIMCgRuYW1lGAEgASgJEiwKBHR5cGUYAiABKA4yHi5ieXRlYmFzZS52MS5QbGFuQ2hlY2tSdW4uVHlwZRIwCgZzdGF0dXMYAyABKA4yIC5ieXRlYmFzZS52MS5QbGFuQ2hlY2tSdW4uU3RhdHVzEg4KBnRhcmdldBgEIAEoCRINCgVzaGVldBgFIAEoCRIxCgdyZXN1bHRzGAYgAygLMiAuYnl0ZWJhc2UudjEuUGxhbkNoZWNrUnVuLlJlc3VsdBINCgVlcnJvchgHIAEoCRI0CgtjcmVhdGVfdGltZRgIIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxq+AwoGUmVzdWx0EikKBnN0YXR1cxgBIAEoDjIZLmJ5dGViYXNlLnYxLkFkdmljZS5MZXZlbBINCgV0aXRsZRgCIAEoCRIPCgdjb250ZW50GAMgASgJEgwKBGNvZGUYBCABKAUSTwoSc3FsX3N1bW1hcnlfcmVwb3J0GAUgASgLMjEuYnl0ZWJhc2UudjEuUGxhbkNoZWNrUnVuLlJlc3VsdC5TcWxTdW1tYXJ5UmVwb3J0SAASTQoRc3FsX3Jldmlld19yZXBvcnQYBiABKAsyMC5ieXRlYmFzZS52MS5QbGFuQ2hlY2tSdW4uUmVzdWx0LlNxbFJldmlld1JlcG9ydEgAGkIKEFNxbFN1bW1hcnlSZXBvcnQSFwoPc3RhdGVtZW50X3R5cGVzGAIgAygJEhUKDWFmZmVjdGVkX3Jvd3MYAyABKAMabQoPU3FsUmV2aWV3UmVwb3J0Ei0KDnN0YXJ0X3Bvc2l0aW9uGAUgASgLMhUuYnl0ZWJhc2UudjEuUG9zaXRpb24SKwoMZW5kX3Bvc2l0aW9uGAYgASgLMhUuYnl0ZWJhc2UudjEuUG9zaXRpb25CCAoGcmVwb3J0InsKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEh0KGURBVEFCQVNFX1NUQVRFTUVOVF9BRFZJU0UQAhIlCiFEQVRBQkFTRV9TVEFURU1FTlRfU1VNTUFSWV9SRVBPUlQQAxIXChNEQVRBQkFTRV9HSE9TVF9TWU5DEAUiUQoGU3RhdHVzEhYKElNUQVRVU19VTlNQRUNJRklFRBAAEgsKB1JVTk5JTkcQARIICgRET05FEAISCgoGRkFJTEVEEAMSDAoIQ0FOQ0VMRUQQBDLSCgoLUGxhblNlcnZpY2USewoHR2V0UGxhbhIbLmJ5dGViYXNlLnYxLkdldFBsYW5SZXF1ZXN0GhEuYnl0ZWJhc2UudjEuUGxhbiJA2kEEbmFtZYrqMAxiYi5wbGFucy5nZXSQ6jABgtPkkwIfEh0vdjEve25hbWU9cHJvamVjdHMvKi9wbGFucy8qfRKPAQoJTGlzdFBsYW5zEh0uYnl0ZWJhc2UudjEuTGlzdFBsYW5zUmVxdWVzdBoeLmJ5dGViYXNlLnYxLkxpc3RQbGFuc1Jlc3BvbnNlIkPaQQZwYXJlbnSK6jANYmIucGxhbnMubGlzdJDqMAGC0+STAh8SHS92MS97cGFyZW50PXByb2plY3RzLyp9L3BsYW5zEp4BCgtTZWFyY2hQbGFucxIfLmJ5dGViYXNlLnYxLlNlYXJjaFBsYW5zUmVxdWVzdBogLmJ5dGViYXNlLnYxLlNlYXJjaFBsYW5zUmVzcG9uc2UiTNpBBnBhcmVudIrqMAxiYi5wbGFucy5nZXSQ6jACgtPkkwIpOgEqIiQvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9wbGFuczpzZWFyY2gSlQEKCkNyZWF0ZVBsYW4SHi5ieXRlYmFzZS52MS5DcmVhdGVQbGFuUmVxdWVzdBoRLmJ5dGViYXNlLnYxLlBsYW4iVNpBC3BhcmVudCxwbGFuiuowD2JiLnBsYW5zLmNyZWF0ZZDqMAGY6jABgtPkkwIlOgRwbGFuIh0vdjEve3BhcmVudD1wcm9qZWN0cy8qfS9wbGFucxKfAQoKVXBkYXRlUGxhbhIeLmJ5dGViYXNlLnYxLlVwZGF0ZVBsYW5SZXF1ZXN0GhEuYnl0ZWJhc2UudjEuUGxhbiJe2kEQcGxhbix1cGRhdGVfbWFza4rqMA9iYi5wbGFucy51cGRhdGWQ6jACmOowAYLT5JMCKjoEcGxhbjIiL3YxL3twbGFuLm5hbWU9cHJvamVjdHMvKi9wbGFucy8qfRK/AQoRTGlzdFBsYW5DaGVja1J1bnMSJS5ieXRlYmFzZS52MS5MaXN0UGxhbkNoZWNrUnVuc1JlcXVlc3QaJi5ieXRlYmFzZS52MS5MaXN0UGxhbkNoZWNrUnVuc1Jlc3BvbnNlIlvaQQZwYXJlbnSK6jAVYmIucGxhbkNoZWNrUnVucy5saXN0kOowAYLT5JMCLxItL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9wbGFucy8qfS9wbGFuQ2hlY2tSdW5zErEBCg1SdW5QbGFuQ2hlY2tzEiEuYnl0ZWJhc2UudjEuUnVuUGxhbkNoZWNrc1JlcXVlc3QaIi5ieXRlYmFzZS52MS5SdW5QbGFuQ2hlY2tzUmVzcG9uc2UiWdpBBG5hbWWK6jAUYmIucGxhbkNoZWNrUnVucy5ydW6Q6jABgtPkkwIwOgEqIisvdjEve25hbWU9cHJvamVjdHMvKi9wbGFucy8qfTpydW5QbGFuQ2hlY2tzEuIBChhCYXRjaENhbmNlbFBsYW5DaGVja1J1bnMSLC5ieXRlYmFzZS52MS5CYXRjaENhbmNlbFBsYW5DaGVja1J1bnNSZXF1ZXN0Gi0uYnl0ZWJhc2UudjEuQmF0Y2hDYW5jZWxQbGFuQ2hlY2tSdW5zUmVzcG9uc2UiadpBBnBhcmVudIrqMBRiYi5wbGFuQ2hlY2tSdW5zLnJ1bpDqMAGC0+STAj46ASoiOS92MS97cGFyZW50PXByb2plY3RzLyovcGxhbnMvKn0vcGxhbkNoZWNrUnVuczpiYXRjaENhbmNlbEKmAQoPY29tLmJ5dGViYXNlLnYxQhBQbGFuU2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_sql_service]);
/**
* Describes the message bytebase.v1.GetPlanRequest.
@@ -103,20 +103,6 @@ export const Plan_ChangeDatabaseConfigSchema = /*@__PURE__*/
export const Plan_ExportDataConfigSchema = /*@__PURE__*/
messageDesc(file_v1_plan_service, 7, 3);
-/**
- * Describes the message bytebase.v1.Plan.Deployment.
- * Use `create(Plan_DeploymentSchema)` to create a new message.
- */
-export const Plan_DeploymentSchema = /*@__PURE__*/
- messageDesc(file_v1_plan_service, 7, 4);
-
-/**
- * Describes the message bytebase.v1.Plan.Deployment.DatabaseGroupMapping.
- * Use `create(Plan_Deployment_DatabaseGroupMappingSchema)` to create a new message.
- */
-export const Plan_Deployment_DatabaseGroupMappingSchema = /*@__PURE__*/
- messageDesc(file_v1_plan_service, 7, 4, 0);
-
/**
* Describes the message bytebase.v1.ListPlanCheckRunsRequest.
* Use `create(ListPlanCheckRunsRequestSchema)` to create a new message.
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index dd9048e4d9..9e28568b3a 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -9699,17 +9699,6 @@ components:
table:
type: string
description: The table is the name of a reference table.
- Deployment_DatabaseGroupMapping:
- type: object
- properties:
- databaseGroup:
- type: string
- description: 'Format: projects/{project}/databaseGroups/{databaseGroup}.'
- databases:
- type: array
- items:
- type: string
- description: 'Format: instances/{instance-id}/databases/{database-name}.'
DiffMetadataRequest:
required:
- sourceMetadata
@@ -11881,8 +11870,6 @@ components:
- WARNING
- ERROR
- RUNNING
- deployment:
- $ref: '#/components/schemas/Plan_Deployment'
PlanCheckRun:
type: object
properties:
@@ -12020,19 +12007,6 @@ components:
description: |-
The environment resource.
Format: environments/prod where prod is the environment resource ID.
- Plan_Deployment:
- type: object
- properties:
- environments:
- type: array
- items:
- type: string
- description: The environments deploy order.
- databaseGroupMappings:
- type: array
- items:
- $ref: '#/components/schemas/Deployment_DatabaseGroupMapping'
- description: The database group mapping.
Plan_ExportDataConfig:
type: object
properties:
diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.md
index 170819a77b..0d26c0614e 100644
--- a/proto/gen/grpc-doc/store/README.md
+++ b/proto/gen/grpc-doc/store/README.md
@@ -161,8 +161,6 @@
- [PlanConfig.ChangeDatabaseConfig](#bytebase-store-PlanConfig-ChangeDatabaseConfig)
- [PlanConfig.ChangeDatabaseConfig.GhostFlagsEntry](#bytebase-store-PlanConfig-ChangeDatabaseConfig-GhostFlagsEntry)
- [PlanConfig.CreateDatabaseConfig](#bytebase-store-PlanConfig-CreateDatabaseConfig)
- - [PlanConfig.Deployment](#bytebase-store-PlanConfig-Deployment)
- - [PlanConfig.Deployment.DatabaseGroupMapping](#bytebase-store-PlanConfig-Deployment-DatabaseGroupMapping)
- [PlanConfig.ExportDataConfig](#bytebase-store-PlanConfig-ExportDataConfig)
- [PlanConfig.Spec](#bytebase-store-PlanConfig-Spec)
@@ -2783,7 +2781,6 @@ Plan spec update event (tracks sheet changes to plan specs)
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| specs | [PlanConfig.Spec](#bytebase-store-PlanConfig-Spec) | repeated | |
-| deployment | [PlanConfig.Deployment](#bytebase-store-PlanConfig-Deployment) | | |
@@ -2849,38 +2846,6 @@ Plan spec update event (tracks sheet changes to plan specs)
-<a name="bytebase-store-PlanConfig-Deployment"></a>
-
-### PlanConfig.Deployment
-
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| environments | [string](#string) | repeated | The environments deploy order. |
-| database_group_mappings | [PlanConfig.Deployment.DatabaseGroupMapping](#bytebase-store-PlanConfig-Deployment-DatabaseGroupMapping) | repeated | The database group mapping. |
-
-
-
-
-
-
-<a name="bytebase-store-PlanConfig-Deployment-DatabaseGroupMapping"></a>
-
-### PlanConfig.Deployment.DatabaseGroupMapping
-
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| database_group | [string](#string) | | Format: projects/{project}/databaseGroups/{databaseGroup}. |
-| databases | [string](#string) | repeated | Format: instances/{instance-id}/databases/{database-name}. |
-
-
-
-
-
-
<a name="bytebase-store-PlanConfig-ExportDataConfig"></a>
### PlanConfig.ExportDataConfig
diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.html
index 02b09f0ef9..38e4327dd3 100644
--- a/proto/gen/grpc-doc/store/index.html
+++ b/proto/gen/grpc-doc/store/index.html
@@ -805,14 +805,6 @@
<a href="#bytebase.store.PlanConfig.CreateDatabaseConfig"><span class="badge">M</span>PlanConfig.CreateDatabaseConfig</a>
</li>
- <li>
- <a href="#bytebase.store.PlanConfig.Deployment"><span class="badge">M</span>PlanConfig.Deployment</a>
- </li>
-
- <li>
- <a href="#bytebase.store.PlanConfig.Deployment.DatabaseGroupMapping"><span class="badge">M</span>PlanConfig.Deployment.DatabaseGroupMapping</a>
- </li>
-
<li>
<a href="#bytebase.store.PlanConfig.ExportDataConfig"><span class="badge">M</span>PlanConfig.ExportDataConfig</a>
</li>
@@ -8157,13 +8149,6 @@ Format: projects/{project}/plans/{plan}/specs/{spec} </p></td>
<td><p> </p></td>
</tr>
- <tr>
- <td>deployment</td>
- <td><a href="#bytebase.store.PlanConfig.Deployment">PlanConfig.Deployment</a></td>
- <td></td>
- <td><p> </p></td>
- </tr>
-
</tbody>
</table>
@@ -8347,68 +8332,6 @@ Format: environments/prod where prod is the environment resource ID. </p></td>
- <h3 id="bytebase.store.PlanConfig.Deployment">PlanConfig.Deployment</h3>
- <p></p>
-
-
- <table class="field-table">
- <thead>
- <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
- </thead>
- <tbody>
-
- <tr>
- <td>environments</td>
- <td><a href="#string">string</a></td>
- <td>repeated</td>
- <td><p>The environments deploy order. </p></td>
- </tr>
-
- <tr>
- <td>database_group_mappings</td>
- <td><a href="#bytebase.store.PlanConfig.Deployment.DatabaseGroupMapping">PlanConfig.Deployment.DatabaseGroupMapping</a></td>
- <td>repeated</td>
- <td><p>The database group mapping. </p></td>
- </tr>
-
- </tbody>
- </table>
-
-
-
-
-
- <h3 id="bytebase.store.PlanConfig.Deployment.DatabaseGroupMapping">PlanConfig.Deployment.DatabaseGroupMapping</h3>
- <p></p>
-
-
- <table class="field-table">
- <thead>
- <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
- </thead>
- <tbody>
-
- <tr>
- <td>database_group</td>
- <td><a href="#string">string</a></td>
- <td></td>
- <td><p>Format: projects/{project}/databaseGroups/{databaseGroup}. </p></td>
- </tr>
-
- <tr>
- <td>databases</td>
- <td><a href="#string">string</a></td>
- <td>repeated</td>
- <td><p>Format: instances/{instance-id}/databases/{database-name}. </p></td>
- </tr>
-
- </tbody>
- </table>
-
-
-
-
-
<h3 id="bytebase.store.PlanConfig.ExportDataConfig">PlanConfig.ExportDataConfig</h3>
<p></p>
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 76e264b220..9e8e4ee1ea 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -458,8 +458,6 @@
- [Plan.ChangeDatabaseConfig](#bytebase-v1-Plan-ChangeDatabaseConfig)
- [Plan.ChangeDatabaseConfig.GhostFlagsEntry](#bytebase-v1-Plan-ChangeDatabaseConfig-GhostFlagsEntry)
- [Plan.CreateDatabaseConfig](#bytebase-v1-Plan-CreateDatabaseConfig)
- - [Plan.Deployment](#bytebase-v1-Plan-Deployment)
- - [Plan.Deployment.DatabaseGroupMapping](#bytebase-v1-Plan-Deployment-DatabaseGroupMapping)
- [Plan.ExportDataConfig](#bytebase-v1-Plan-ExportDataConfig)
- [Plan.PlanCheckRunStatusCountEntry](#bytebase-v1-Plan-PlanCheckRunStatusCountEntry)
- [Plan.Spec](#bytebase-v1-Plan-Spec)
@@ -7563,7 +7561,6 @@ When paginating, all other parameters provided to `ListPlans` must match the cal
| create_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |
| update_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |
| plan_check_run_status_count | [Plan.PlanCheckRunStatusCountEntry](#bytebase-v1-Plan-PlanCheckRunStatusCountEntry) | repeated | The status count of the latest plan check runs. Keys are: - SUCCESS - WARNING - ERROR - RUNNING |
-| deployment | [Plan.Deployment](#bytebase-v1-Plan-Deployment) | | |
@@ -7629,38 +7626,6 @@ When paginating, all other parameters provided to `ListPlans` must match the cal
-<a name="bytebase-v1-Plan-Deployment"></a>
-
-### Plan.Deployment
-
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| environments | [string](#string) | repeated | The environments deploy order. |
-| database_group_mappings | [Plan.Deployment.DatabaseGroupMapping](#bytebase-v1-Plan-Deployment-DatabaseGroupMapping) | repeated | The database group mapping. |
-
-
-
-
-
-
-<a name="bytebase-v1-Plan-Deployment-DatabaseGroupMapping"></a>
-
-### Plan.Deployment.DatabaseGroupMapping
-
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| database_group | [string](#string) | | Format: projects/{project}/databaseGroups/{databaseGroup}. |
-| databases | [string](#string) | repeated | Format: instances/{instance-id}/databases/{database-name}. |
-
-
-
-
-
-
<a name="bytebase-v1-Plan-ExportDataConfig"></a>
### Plan.ExportDataConfig
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index ea231c8de1..d1fd91524d 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -1927,14 +1927,6 @@
<a href="#bytebase.v1.Plan.CreateDatabaseConfig"><span class="badge">M</span>Plan.CreateDatabaseConfig</a>
</li>
- <li>
- <a href="#bytebase.v1.Plan.Deployment"><span class="badge">M</span>Plan.Deployment</a>
- </li>
-
- <li>
- <a href="#bytebase.v1.Plan.Deployment.DatabaseGroupMapping"><span class="badge">M</span>Plan.Deployment.DatabaseGroupMapping</a>
- </li>
-
<li>
<a href="#bytebase.v1.Plan.ExportDataConfig"><span class="badge">M</span>Plan.ExportDataConfig</a>
</li>
@@ -21371,13 +21363,6 @@ Keys are:
- RUNNING </p></td>
</tr>
- <tr>
- <td>deployment</td>
- <td><a href="#bytebase.v1.Plan.Deployment">Plan.Deployment</a></td>
- <td></td>
- <td><p> </p></td>
- </tr>
-
</tbody>
</table>
@@ -21562,68 +21547,6 @@ Format: environments/prod where prod is the environment resource ID. </p></td>
- <h3 id="bytebase.v1.Plan.Deployment">Plan.Deployment</h3>
- <p></p>
-
-
- <table class="field-table">
- <thead>
- <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
- </thead>
- <tbody>
-
- <tr>
- <td>environments</td>
- <td><a href="#string">string</a></td>
- <td>repeated</td>
- <td><p>The environments deploy order. </p></td>
- </tr>
-
- <tr>
- <td>database_group_mappings</td>
- <td><a href="#bytebase.v1.Plan.Deployment.DatabaseGroupMapping">Plan.Deployment.DatabaseGroupMapping</a></td>
- <td>repeated</td>
- <td><p>The database group mapping. </p></td>
- </tr>
-
- </tbody>
- </table>
-
-
-
-
-
- <h3 id="bytebase.v1.Plan.Deployment.DatabaseGroupMapping">Plan.Deployment.DatabaseGroupMapping</h3>
- <p></p>
-
-
- <table class="field-table">
- <thead>
- <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
- </thead>
- <tbody>
-
- <tr>
- <td>database_group</td>
- <td><a href="#string">string</a></td>
- <td></td>
- <td><p>Format: projects/{project}/databaseGroups/{databaseGroup}. </p></td>
- </tr>
-
- <tr>
- <td>databases</td>
- <td><a href="#string">string</a></td>
- <td>repeated</td>
- <td><p>Format: instances/{instance-id}/databases/{database-name}. </p></td>
- </tr>
-
- </tbody>
- </table>
-
-
-
-
-
<h3 id="bytebase.v1.Plan.ExportDataConfig">Plan.ExportDataConfig</h3>
<p></p>
diff --git a/proto/store/store/plan.proto b/proto/store/store/plan.proto
index 58c8047b25..9d041b9e6d 100644
--- a/proto/store/store/plan.proto
+++ b/proto/store/store/plan.proto
@@ -10,7 +10,6 @@ option go_package = "generated-go/store";
message PlanConfig {
repeated Spec specs = 1;
- Deployment deployment = 2;
message Spec {
// A UUID4 string that uniquely identifies the Spec.
string id = 5;
@@ -87,18 +86,4 @@ message PlanConfig {
// Leave it empty if there is no need to encrypt the zip file.
optional string password = 4;
}
-
- message Deployment {
- // The environments deploy order.
- repeated string environments = 1;
- // The database group mapping.
- repeated DatabaseGroupMapping database_group_mappings = 2;
-
- message DatabaseGroupMapping {
- // Format: projects/{project}/databaseGroups/{databaseGroup}.
- string database_group = 1;
- // Format: instances/{instance-id}/databases/{database-name}.
- repeated string databases = 2;
- }
- }
}
diff --git a/proto/v1/v1/plan_service.proto b/proto/v1/v1/plan_service.proto
index 7cc0237aef..9944bef8a1 100644
--- a/proto/v1/v1/plan_service.proto
+++ b/proto/v1/v1/plan_service.proto
@@ -284,8 +284,6 @@ message Plan {
// - RUNNING
map<string, int32> plan_check_run_status_count = 11 [(google.api.field_behavior) = OUTPUT_ONLY];
- Deployment deployment = 12;
-
message CreateDatabaseConfig {
// The resource name of the instance on which the database is created.
// Format: instances/{instance}
@@ -347,20 +345,6 @@ message Plan {
// Leave it empty if no needs to encrypt the zip file.
optional string password = 4;
}
-
- message Deployment {
- // The environments deploy order.
- repeated string environments = 1;
- // The database group mapping.
- repeated DatabaseGroupMapping database_group_mappings = 2;
-
- message DatabaseGroupMapping {
- // Format: projects/{project}/databaseGroups/{databaseGroup}.
- string database_group = 1;
- // Format: instances/{instance-id}/databases/{database-name}.
- repeated string databases = 2;
- }
- }
}
message ListPlanCheckRunsRequest {