Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix: resolve instance validation issues during plan creation (#18565)
Danny Xue34d1ee4647d
diff --git a/backend/api/v1/plan_service.go b/backend/api/v1/plan_service.goindex 47c008c9cb..54888b86d6 100644--- a/backend/api/v1/plan_service.go+++ b/backend/api/v1/plan_service.go@@ -240,7 +240,8 @@ func (s *PlanService) CreatePlan(ctx context.Context, request *connect.Request[v}// Validate plan specs- if err := validateSpecs(ctx, s.store, projectID, req.Plan.Specs); err != nil {+ databaseGroup, err := validateSpecs(ctx, s.store, projectID, req.Plan.Specs)+ if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("failed to validate plan specs, error: %v", err))}@@ -257,25 +258,19 @@ func (s *PlanService) CreatePlan(ctx context.Context, request *connect.Request[v}planMessage.Config.Deployment = deployment- if _, err := GetPipelineCreate(ctx, s.store, s.dbFactory, planMessage.Config.GetSpecs(), deployment, project); err != nil {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("failed to get pipeline from the plan, please check you request, error: %v", err))- }plan, err := s.store.CreatePlan(ctx, planMessage, user.Email)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create plan, error: %v", err))}// Don't create plan checks if the plan comes from releases.- if !planHasRelease(req.Plan) {- planCheckRuns, err := getPlanCheckRunsFromPlan(ctx, s.store, plan)- if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get plan check runs for plan, error: %v", err))- }- if err := s.store.CreatePlanCheckRuns(ctx, plan, planCheckRuns...); err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create plan check runs, error: %v", err))- }+ planCheckRuns, err := getPlanCheckRunsFromPlan(project, plan, databaseGroup)+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get plan check runs for plan, error: %v", err))+ }+ if err := s.store.CreatePlanCheckRuns(ctx, plan, planCheckRuns...); err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create plan check runs, error: %v", err))}-// Tickle plan check scheduler.s.stateCfg.PlanCheckTickleChan <- 0@@ -365,6 +360,7 @@ func (s *PlanService) UpdatePlan(ctx context.Context, request *connect.Request[v}return strings.Compare(a, b)})+ var databaseGroup *v1pb.DatabaseGroupfor _, path := range paths {switch path {case "title":@@ -387,19 +383,11 @@ func (s *PlanService) UpdatePlan(ctx context.Context, request *connect.Request[v}planUpdate.Deployment = &deploymentcase "specs":+ planCheckRunsTrigger = true// Use specs directly for internal storageallSpecs := convertPlanSpecs(req.GetPlan().GetSpecs())planUpdate.Specs = &allSpecs- if _, err := GetPipelineCreate(ctx,- s.store,- s.dbFactory,- allSpecs,- oldPlan.Config.GetDeployment(),- project); err != nil {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("failed to get pipeline from the plan, please check you request, error: %v", err))- }-// Compare specs directlyoldSpecs := convertToPlanSpecs(project.ResourceID, oldPlan.Config.Specs)removed, added, updated := diffSpecs(oldSpecs, req.Plan.Specs)@@ -425,9 +413,11 @@ func (s *PlanService) UpdatePlan(ctx context.Context, request *connect.Request[v}// Validate the new specs- if err := validateSpecs(ctx, s.store, oldPlan.ProjectID, req.Plan.Specs); err != nil {+ 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 specstasksMap := map[int]*store.TaskMessage{}@@ -721,13 +711,15 @@ func (s *PlanService) UpdatePlan(ctx context.Context, request *connect.Request[v}if planCheckRunsTrigger {- planCheckRuns, err := getPlanCheckRunsFromPlan(ctx, s.store, updatedPlan)+ planCheckRuns, err := getPlanCheckRunsFromPlan(project, updatedPlan, databaseGroup)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get plan check runs for plan, error: %v", err))}if err := s.store.CreatePlanCheckRuns(ctx, updatedPlan, planCheckRuns...); err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create plan check runs, error: %v", err))}+ // Tickle plan check scheduler.+ s.stateCfg.PlanCheckTickleChan <- 0}convertedPlan, err := convertToPlan(ctx, s.store, updatedPlan)@@ -954,29 +946,27 @@ func (s *PlanService) RunPlanChecks(ctx context.Context, request *connect.Requesif storePlanConfigHasRelease(plan.Config) {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("cannot run plan checks because plan %q has release", plan.Name))}-- var planCheckRuns []*store.PlanCheckRunMessage- if req.SpecId != nil {- var foundSpec *storepb.PlanConfig_Spec- for _, spec := range plan.Config.GetSpecs() {- if spec.Id == *req.SpecId {- foundSpec = spec- break+ var databaseGroup *v1pb.DatabaseGroup+ for _, spec := range plan.Config.GetSpecs() {+ if c, ok := spec.Config.(*storepb.PlanConfig_Spec_ChangeDatabaseConfig); ok {+ if len(c.ChangeDatabaseConfig.Targets) == 1 {+ if _, _, err := common.GetProjectIDDatabaseGroupID(c.ChangeDatabaseConfig.Targets[0]); err == nil {+ dg, err := getDatabaseGroupByName(ctx, s.store, c.ChangeDatabaseConfig.Targets[0], v1pb.DatabaseGroupView_DATABASE_GROUP_VIEW_BASIC)+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get database group %q: %v", c.ChangeDatabaseConfig.Targets[0], err))+ }+ if dg == nil {+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database group %q not found", c.ChangeDatabaseConfig.Targets[0]))+ }+ databaseGroup = dg+ break+ }}}- if foundSpec == nil {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("spec with id %q not found in plan", *req.SpecId))- }- planCheckRuns, err = getPlanCheckRunsFromSpec(ctx, s.store, plan, foundSpec)- if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get plan check runs for spec, error: %v", err))- }- } else {- // If spec ID is not provided, run plan check runs for all specs in the plan.- planCheckRuns, err = getPlanCheckRunsFromPlan(ctx, s.store, plan)- if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get plan check runs for plan, error: %v", err))- }+ }+ planCheckRuns, err := getPlanCheckRunsFromPlan(project, plan, databaseGroup)+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get plan check runs for plan, error: %v", err))}if err := s.store.CreatePlanCheckRuns(ctx, plan, planCheckRuns...); err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create plan check runs, error: %v", err))@@ -1090,9 +1080,9 @@ func diffSpecs(oldSpecs []*v1pb.Plan_Spec, newSpecs []*v1pb.Plan_Spec) ([]*v1pb.return removed, added, updated}-func validateSpecs(ctx context.Context, s *store.Store, projectID string, specs []*v1pb.Plan_Spec) error {+func validateSpecs(ctx context.Context, s *store.Store, projectID string, specs []*v1pb.Plan_Spec) (*v1pb.DatabaseGroup, error) {if len(specs) == 0 {- return errors.Errorf("the plan has zero spec")+ return nil, errors.Errorf("the plan has zero spec")}configTypeCount := map[string]int{}seenID := map[string]bool{}@@ -1103,14 +1093,15 @@ func validateSpecs(ctx context.Context, s *store.Store, projectID string, specsvar instanceIDs []stringvar databaseGroups []stringvar databaseNames []string+ var databaseGroup *v1pb.DatabaseGroupfor _, spec := range specs {id := spec.GetId()if id == "" {- return errors.Errorf("spec id cannot be empty")+ return nil, errors.Errorf("spec id cannot be empty")}if seenID[id] {- return errors.Errorf("found duplicate spec id %v", id)+ return nil, errors.Errorf("found duplicate spec id %v", id)}seenID[id] = true@@ -1120,7 +1111,7 @@ func validateSpecs(ctx context.Context, s *store.Store, projectID string, specsif target := config.CreateDatabaseConfig.Target; target != "" {instanceID, err := common.GetInstanceID(target)if err != nil {- return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid instance name %q: %v", target, err))+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid instance name %q: %v", target, err))}instanceIDs = append(instanceIDs, instanceID)}@@ -1135,12 +1126,12 @@ func validateSpecs(ctx context.Context, s *store.Store, projectID string, specsdatabaseGroupTarget++databaseGroups = append(databaseGroups, target)} else {- return errors.Errorf("invalid target %v", target)+ return nil, errors.Errorf("invalid target %v", target)}}// Disallow mixing database and database group targets in the same spec.if databaseTarget > 0 && databaseGroupTarget > 0 {- return errors.Errorf("found databaseTarget and databaseGroupTarget, expect only one kind")+ return nil, errors.Errorf("found databaseTarget and databaseGroupTarget, expect only one kind")}// Track if this spec uses release or sheet.if config.ChangeDatabaseConfig.Release != "" {@@ -1162,29 +1153,34 @@ func validateSpecs(ctx context.Context, s *store.Store, projectID string, specs}}default:- return errors.Errorf("invalid spec type")+ return nil, errors.Errorf("invalid spec type")}}if len(configTypeCount) > 1 {- return errors.Errorf("plan contains multiple types of spec configurations (%v), but each plan must contain only one type", len(configTypeCount))+ return nil, errors.Errorf("plan contains multiple types of spec configurations (%v), but each plan must contain only one type", len(configTypeCount))}// Disallow mixing ChangeDatabaseConfig specs with release and sheet.if releaseCount > 0 && sheetCount > 0 {- return errors.Errorf("plan contains both release and sheet based change database configs, but each plan must use only one approach")+ return nil, errors.Errorf("plan contains both release and sheet based change database configs, but each plan must use only one approach")}// Allow at most one ChangeDatabaseConfig with release.if releaseCount > 1 {- return errors.Errorf("plan contains multiple change database configs with release, but only one is allowed")+ return nil, errors.Errorf("plan contains multiple change database configs with release, but only one is allowed")}// Allow at most one instance.if len(instanceIDs) > 1 {- return errors.Errorf("plan contains targets on multiple instances, but only one instance is allowed")+ return nil, errors.Errorf("plan contains targets on multiple instances, but only one instance is allowed")}// Allow at most one database group.if len(databaseGroups) > 1 {- return errors.Errorf("plan contains multiple database groups, but only one is allowed")+ return nil, errors.Errorf("plan contains multiple database groups, but only one is allowed")+ }++ // Don't allow mixing database group and databases.+ if len(databaseGroups) > 0 && len(databaseNames) > 0 {+ return nil, errors.Errorf("plan contains both database group and databases, but only one is allowed")}// Validate resources existence.@@ -1194,10 +1190,10 @@ func validateSpecs(ctx context.Context, s *store.Store, projectID string, specsResourceID: &instanceID,})if err != nil {- return connect.NewError(connect.CodeInternal, errors.Errorf("failed to get instance %q: %v", instanceID, err))+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get instance %q: %v", instanceID, err))}if instance == nil {- return connect.NewError(connect.CodeNotFound, errors.Errorf("instance %q not found", instanceID))+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("instance %q not found", instanceID))}}@@ -1205,39 +1201,40 @@ func validateSpecs(ctx context.Context, s *store.Store, projectID string, specsname := databaseGroups[0]groupProjectID, _, err := common.GetProjectIDDatabaseGroupID(name)if err != nil {- return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid database group name %q", name))+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid database group name %q", name))}if groupProjectID != projectID {- return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("database group %q (project %q) does not belong to plan project %q", name, groupProjectID, projectID))+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("database group %q (project %q) does not belong to plan project %q", name, groupProjectID, projectID))}- group, err := getDatabaseGroupByName(ctx, s, name, v1pb.DatabaseGroupView_DATABASE_GROUP_VIEW_BASIC)+ dg, err := getDatabaseGroupByName(ctx, s, name, v1pb.DatabaseGroupView_DATABASE_GROUP_VIEW_BASIC)if err != nil {- return connect.NewError(connect.CodeInternal, errors.Errorf("failed to get database group %q: %v", name, err))+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get database group %q: %v", name, err))}- if group == nil {- return connect.NewError(connect.CodeNotFound, errors.Errorf("database group %q not found", name))+ if dg == nil {+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database group %q not found", name))}+ databaseGroup = dg}for _, name := range databaseNames {instanceID, dbName, err := common.GetInstanceDatabaseID(name)if err != nil {- return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid database name %q", name))+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid database name %q", name))}db, err := s.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instanceID,DatabaseName: &dbName,})if err != nil {- return connect.NewError(connect.CodeInternal, errors.Errorf("failed to get database %q: %v", name, err))+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get database %q: %v", name, err))}if db == nil {- return connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", name))+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", name))}if db.ProjectID != projectID {- return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("database %q (project %q) does not belong to plan project %q", name, db.ProjectID, projectID))+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("database %q (project %q) does not belong to plan project %q", name, db.ProjectID, projectID))}}@@ -1245,10 +1242,10 @@ func validateSpecs(ctx context.Context, s *store.Store, projectID string, specsif len(sheetSha256s) > 0 {exist, err := s.HasSheets(ctx, sheetSha256s...)if err != nil {- return connect.NewError(connect.CodeInternal, errors.Errorf("failed to check sheets: %v", err))+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check sheets: %v", err))}if !exist {- return connect.NewError(connect.CodeNotFound, errors.Errorf("some sheets are not found"))+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("some sheets are not found"))}}@@ -1256,20 +1253,20 @@ func validateSpecs(ctx context.Context, s *store.Store, projectID string, specsif releaseString != "" {releaseProjectID, releaseUID, err := common.GetProjectReleaseUID(releaseString)if err != nil {- return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid release name %q", releaseString))+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid release name %q", releaseString))}if releaseProjectID != projectID {- return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("release %q (project %q) does not belong to plan project %q", releaseString, releaseProjectID, projectID))+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("release %q (project %q) does not belong to plan project %q", releaseString, releaseProjectID, projectID))}release, err := s.GetReleaseByUID(ctx, releaseUID)if err != nil {- return connect.NewError(connect.CodeInternal, errors.Errorf("failed to get release %d: %v", releaseUID, err))+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get release %d: %v", releaseUID, err))}if release == nil {- return connect.NewError(connect.CodeNotFound, errors.Errorf("release %d not found", releaseUID))+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("release %d not found", releaseUID))}}- return nil+ return databaseGroup, nil}func getPlanSpecDatabaseGroups(specs []*storepb.PlanConfig_Spec) []string {@@ -1354,17 +1351,6 @@ func getPlanDeployment(ctx context.Context, s *store.Store, specs []*storepb.Plareturn snapshot, nil}-func planHasRelease(plan *v1pb.Plan) bool {- for _, spec := range plan.GetSpecs() {- if c, ok := spec.Config.(*v1pb.Plan_Spec_ChangeDatabaseConfig); ok {- if c.ChangeDatabaseConfig.Release != "" {- return true- }- }- }- return false-}-func storePlanConfigHasRelease(plan *storepb.PlanConfig) bool {for _, spec := range plan.GetSpecs() {if c, ok := spec.Config.(*storepb.PlanConfig_Spec_ChangeDatabaseConfig); ok {diff --git a/backend/api/v1/plan_service_converter.go b/backend/api/v1/plan_service_converter.goindex e070890552..62e3ecd106 100644--- a/backend/api/v1/plan_service_converter.go+++ b/backend/api/v1/plan_service_converter.go@@ -29,6 +29,7 @@ func convertToPlan(ctx context.Context, s *store.Store, plan *store.PlanMessage)Name: common.FormatPlan(plan.ProjectID, plan.UID),Title: plan.Name,Description: plan.Description,+ Creator: common.FormatUserEmail(plan.Creator),Specs: convertToPlanSpecs(plan.ProjectID, plan.Config.Specs), // Use specs field for outputDeployment: convertToPlanDeployment(plan.Config.Deployment),CreateTime: timestamppb.New(plan.CreatedAt),@@ -37,12 +38,6 @@ func convertToPlan(ctx context.Context, s *store.Store, plan *store.PlanMessage)PlanCheckRunStatusCount: map[string]int32{},}- creator, err := s.GetUserByEmail(ctx, plan.Creator)- if err != nil {- return nil, errors.Wrapf(err, "failed to get plan creator")- }- p.Creator = common.FormatUserEmail(creator.Email)-issue, err := s.GetIssue(ctx, &store.FindIssueMessage{PlanUID: &plan.UID})if err != nil {return nil, errors.Wrapf(err, "failed to get issue by plan uid %d", plan.UID)diff --git a/backend/api/v1/plan_service_plan_check.go b/backend/api/v1/plan_service_plan_check.goindex a15c7b7b47..83232e6bab 100644--- a/backend/api/v1/plan_service_plan_check.go+++ b/backend/api/v1/plan_service_plan_check.go@@ -1,10 +1,8 @@package v1import (- "context""fmt"- "connectrpc.com/connect""github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"@@ -13,43 +11,81 @@ import ("github.com/bytebase/bytebase/backend/store")-func getPlanCheckRunsFromPlan(ctx context.Context, s *store.Store, plan *store.PlanMessage) ([]*store.PlanCheckRunMessage, error) {- var skippedSpecIDs map[string]struct{}- if plan.PipelineUID != nil {- tasks, err := s.ListTasks(ctx, &store.TaskFind{PipelineID: plan.PipelineUID})- if err != nil {- return nil, errors.Wrapf(err, "failed to get tasks for pipeline %d", *plan.PipelineUID)- }- skippedSpecIDs = make(map[string]struct{})- for _, task := range tasks {- if task.LatestTaskRunStatus == storepb.TaskRun_DONE {- skippedSpecIDs[task.Payload.GetSpecId()] = struct{}{}+func getPlanCheckRunsFromPlan(project *store.ProjectMessage, plan *store.PlanMessage, databaseGroup *v1pb.DatabaseGroup) ([]*store.PlanCheckRunMessage, error) {+ var planCheckRuns []*store.PlanCheckRunMessage+ for _, spec := range plan.Config.Specs {+ switch config := spec.Config.(type) {+ case *storepb.PlanConfig_Spec_CreateDatabaseConfig:+ // No checks for create database.+ case *storepb.PlanConfig_Spec_ExportDataConfig:+ // No checks export data.+ case *storepb.PlanConfig_Spec_ChangeDatabaseConfig:+ // Skip plan checks for releases.+ if config.ChangeDatabaseConfig.Release != "" {+ continue}- }- }- return getPlanCheckRunsFromPlanSpecs(ctx, s, plan, skippedSpecIDs)-}-func getPlanCheckRunsFromPlanSpecs(ctx context.Context, s *store.Store, plan *store.PlanMessage, skippedSpecIDs map[string]struct{}) ([]*store.PlanCheckRunMessage, error) {- project, err := s.GetProject(ctx, &store.FindProjectMessage{ResourceID: &plan.ProjectID})- if err != nil {- return nil, errors.Wrapf(err, "failed to get project %v", plan.ProjectID)- }- if project == nil {- return nil, errors.Errorf("project %v not found", plan.ProjectID)- }+ var databases []string+ if len(config.ChangeDatabaseConfig.Targets) == 1 && databaseGroup != nil && config.ChangeDatabaseConfig.Targets[0] == databaseGroup.Name {+ for _, m := range databaseGroup.MatchedDatabases {+ databases = append(databases, m.Name)+ }+ } else {+ databases = config.ChangeDatabaseConfig.Targets+ }- var planCheckRuns []*store.PlanCheckRunMessage- for _, spec := range plan.Config.Specs {- if _, ok := skippedSpecIDs[spec.Id]; ok {- continue- }- runs, err := getPlanCheckRunsFromSpec(ctx, s, plan, spec)- if err != nil {- return nil, errors.Wrapf(err, "failed to get plan check runs for plan")+ for _, target := range databases {+ instanceID, databaseName, err := common.GetInstanceDatabaseID(target)+ if err != nil {+ return nil, errors.Wrapf(err, "failed to parse %q", target)+ }+ enableSDL := config.ChangeDatabaseConfig.Type == storepb.PlanConfig_ChangeDatabaseConfig_SDL+ planCheckRuns = append(planCheckRuns, &store.PlanCheckRunMessage{+ PlanUID: plan.UID,+ Status: store.PlanCheckRunStatusRunning,+ Type: store.PlanCheckDatabaseStatementAdvise,+ Config: &storepb.PlanCheckRunConfig{+ SheetSha256: config.ChangeDatabaseConfig.SheetSha256,+ InstanceId: instanceID,+ DatabaseName: databaseName,+ EnablePriorBackup: config.ChangeDatabaseConfig.EnablePriorBackup,+ EnableGhost: config.ChangeDatabaseConfig.EnableGhost,+ EnableSdl: enableSDL,+ },+ })+ planCheckRuns = append(planCheckRuns, &store.PlanCheckRunMessage{+ PlanUID: plan.UID,+ Status: store.PlanCheckRunStatusRunning,+ Type: store.PlanCheckDatabaseStatementSummaryReport,+ Config: &storepb.PlanCheckRunConfig{+ SheetSha256: config.ChangeDatabaseConfig.SheetSha256,+ InstanceId: instanceID,+ DatabaseName: databaseName,+ EnableGhost: config.ChangeDatabaseConfig.EnableGhost,+ EnableSdl: enableSDL,+ },+ })+ if config.ChangeDatabaseConfig.Type == storepb.PlanConfig_ChangeDatabaseConfig_MIGRATE && config.ChangeDatabaseConfig.EnableGhost {+ planCheckRuns = append(planCheckRuns, &store.PlanCheckRunMessage{+ PlanUID: plan.UID,+ Status: store.PlanCheckRunStatusRunning,+ Type: store.PlanCheckDatabaseGhostSync,+ Config: &storepb.PlanCheckRunConfig{+ SheetSha256: config.ChangeDatabaseConfig.SheetSha256,+ InstanceId: instanceID,+ DatabaseName: databaseName,+ EnableGhost: config.ChangeDatabaseConfig.EnableGhost,+ EnableSdl: enableSDL,+ GhostFlags: config.ChangeDatabaseConfig.GhostFlags,+ },+ })+ }+ }+ default:+ return nil, errors.Errorf("unknown spec config type %T", config)}- planCheckRuns = append(planCheckRuns, runs...)}+if project.Setting.GetCiSamplingSize() > 0 {var updatedRuns []*store.PlanCheckRunMessagecountMap := make(map[string]int32)@@ -65,181 +101,3 @@ func getPlanCheckRunsFromPlanSpecs(ctx context.Context, s *store.Store, plan *st}return planCheckRuns, nil}--func getPlanCheckRunsFromSpec(ctx context.Context, s *store.Store, plan *store.PlanMessage, spec *storepb.PlanConfig_Spec) ([]*store.PlanCheckRunMessage, error) {- switch config := spec.Config.(type) {- case *storepb.PlanConfig_Spec_CreateDatabaseConfig:- // No checks for create database.- case *storepb.PlanConfig_Spec_ExportDataConfig:- // No checks export data.- case *storepb.PlanConfig_Spec_ChangeDatabaseConfig:- // Filtered using scheduledDatabase for ChangeDatabase specs.- if len(config.ChangeDatabaseConfig.Targets) == 1 {- if _, _, err := common.GetProjectIDDatabaseGroupID(config.ChangeDatabaseConfig.Targets[0]); err == nil {- return getPlanCheckRunsFromChangeDatabaseConfigDatabaseGroupTarget(ctx, s, plan, config.ChangeDatabaseConfig)- }- }- return getPlanCheckRunsFromChangeDatabaseConfigDatabaseTarget(ctx, s, plan, config.ChangeDatabaseConfig)- default:- return nil, errors.Errorf("unknown spec config type %T", config)- }- return nil, nil-}--func getPlanCheckRunsFromChangeDatabaseConfigDatabaseGroupTarget(ctx context.Context, s *store.Store, plan *store.PlanMessage, config *storepb.PlanConfig_ChangeDatabaseConfig) ([]*store.PlanCheckRunMessage, error) {- switch config.Type {- case storepb.PlanConfig_ChangeDatabaseConfig_MIGRATE:- // Ghost migrations are not supported for database group targets- if config.EnableGhost {- return nil, errors.Errorf("ghost migration is not supported for database group target")- }- default:- return nil, errors.Errorf("unsupported change database config type %q for database group target", config.Type)- }- if len(config.Targets) != 1 {- return nil, errors.Errorf("change database config with database group target must have exactly one target, but got %d targets", len(config.Targets))- }- target := config.Targets[0]-- databaseGroup, err := getDatabaseGroupByName(ctx, s, target, v1pb.DatabaseGroupView_DATABASE_GROUP_VIEW_FULL)- if err != nil {- // If database group was deleted, skip plan checks for it.- if connect.CodeOf(err) == connect.CodeNotFound {- return nil, nil- }- return nil, errors.Wrapf(err, "failed to get database group %q", target)- }- if len(databaseGroup.MatchedDatabases) == 0 {- return nil, errors.Errorf("no matched databases found in database group %q", target)- }-- sheetSha256s := getSheetSha256sFromChangeDatabaseConfig(config)- if len(sheetSha256s) == 0 {- return nil, errors.Errorf("change database config must have sheet specified, but got none")- }-- var planCheckRuns []*store.PlanCheckRunMessage- for _, matchedDatabase := range databaseGroup.MatchedDatabases {- for _, sheetSha256 := range sheetSha256s {- instanceID, databaseName, err := common.GetInstanceDatabaseID(matchedDatabase.Name)- if err != nil {- return nil, errors.Wrapf(err, "failed to parse %q", matchedDatabase.Name)- }- database, err := s.GetDatabase(ctx, &store.FindDatabaseMessage{- InstanceID: &instanceID,- DatabaseName: &databaseName,- })- if err != nil {- return nil, errors.Wrapf(err, "failed to get database")- }- if database == nil {- return nil, errors.Errorf("database %q not found", matchedDatabase.Name)- }- runs, err := getPlanCheckRunsFromChangeDatabaseConfigForDatabase(ctx, s, plan, config, sheetSha256, database)- if err != nil {- return nil, errors.Wrapf(err, "failed to get plan check runs from spec with change database config for database %q", database.DatabaseName)- }- planCheckRuns = append(planCheckRuns, runs...)- }- }-- return planCheckRuns, nil-}--func getPlanCheckRunsFromChangeDatabaseConfigDatabaseTarget(ctx context.Context, s *store.Store, plan *store.PlanMessage, config *storepb.PlanConfig_ChangeDatabaseConfig) ([]*store.PlanCheckRunMessage, error) {- sheetSha256s := getSheetSha256sFromChangeDatabaseConfig(config)- if len(sheetSha256s) == 0 {- return nil, errors.Errorf("change database config must have sheet specified, but got none")- }-- var checks []*store.PlanCheckRunMessage- for _, target := range config.Targets {- instanceID, databaseName, err := common.GetInstanceDatabaseID(target)- if err != nil {- return nil, errors.Wrapf(err, "failed to parse %q", target)- }- database, err := s.GetDatabase(ctx, &store.FindDatabaseMessage{- InstanceID: &instanceID,- DatabaseName: &databaseName,- })- if err != nil {- return nil, errors.Wrapf(err, "failed to get database")- }- if database == nil {- return nil, errors.Errorf("database %q not found", target)- }- for _, sheetSha256 := range sheetSha256s {- v, err := getPlanCheckRunsFromChangeDatabaseConfigForDatabase(ctx, s, plan, config, sheetSha256, database)- if err != nil {- return nil, err- }- checks = append(checks, v...)- }- }- return checks, nil-}--func getPlanCheckRunsFromChangeDatabaseConfigForDatabase(ctx context.Context, s *store.Store, plan *store.PlanMessage, config *storepb.PlanConfig_ChangeDatabaseConfig, sheetSha256 string, database *store.DatabaseMessage) ([]*store.PlanCheckRunMessage, error) {- instance, err := s.GetInstance(ctx, &store.FindInstanceMessage{- ResourceID: &database.InstanceID,- })- if err != nil {- return nil, errors.Wrapf(err, "failed to get instance %q", database.InstanceID)- }- if instance == nil {- return nil, errors.Errorf("instance %q not found", database.InstanceID)- }-- enableSDL := config.Type == storepb.PlanConfig_ChangeDatabaseConfig_SDL- var planCheckRuns []*store.PlanCheckRunMessage- planCheckRuns = append(planCheckRuns, &store.PlanCheckRunMessage{- PlanUID: plan.UID,- Status: store.PlanCheckRunStatusRunning,- Type: store.PlanCheckDatabaseStatementAdvise,- Config: &storepb.PlanCheckRunConfig{- SheetSha256: sheetSha256,- InstanceId: instance.ResourceID,- DatabaseName: database.DatabaseName,- EnablePriorBackup: config.EnablePriorBackup,- EnableGhost: config.EnableGhost,- EnableSdl: enableSDL,- },- })- planCheckRuns = append(planCheckRuns, &store.PlanCheckRunMessage{- PlanUID: plan.UID,- Status: store.PlanCheckRunStatusRunning,- Type: store.PlanCheckDatabaseStatementSummaryReport,- Config: &storepb.PlanCheckRunConfig{- SheetSha256: sheetSha256,- InstanceId: instance.ResourceID,- DatabaseName: database.DatabaseName,- EnableGhost: config.EnableGhost,- EnableSdl: enableSDL,- },- })- if config.Type == storepb.PlanConfig_ChangeDatabaseConfig_MIGRATE && config.EnableGhost {- planCheckRuns = append(planCheckRuns, &store.PlanCheckRunMessage{- PlanUID: plan.UID,- Status: store.PlanCheckRunStatusRunning,- Type: store.PlanCheckDatabaseGhostSync,- Config: &storepb.PlanCheckRunConfig{- SheetSha256: sheetSha256,- InstanceId: instance.ResourceID,- DatabaseName: database.DatabaseName,- EnableGhost: config.EnableGhost,- EnableSdl: enableSDL,- GhostFlags: config.GhostFlags,- },- })- }-- return planCheckRuns, nil-}--func getSheetSha256sFromChangeDatabaseConfig(config *storepb.PlanConfig_ChangeDatabaseConfig) []string {- var sheetSha256s []string- if config.SheetSha256 != "" {- sheetSha256s = append(sheetSha256s, config.SheetSha256)- }- return sheetSha256s-}diff --git a/backend/api/v1/rollout_service.go b/backend/api/v1/rollout_service.goindex 08840c1ee8..f4f69197a4 100644--- a/backend/api/v1/rollout_service.go+++ b/backend/api/v1/rollout_service.go@@ -74,7 +74,7 @@ func (s *RolloutService) PreviewRollout(ctx context.Context, req *connect.Reques}// Validate plan specs- if err := validateSpecs(ctx, s.store, projectID, request.Plan.Specs); err != nil {+ if _, err := validateSpecs(ctx, s.store, projectID, request.Plan.Specs); err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("failed to validate plan specs, error: %v", err))}