Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor(backend): cleanup store functions and filenames (#18353)
Danny Xue84be8b3200e
diff --git a/backend/api/lsp/completion.go b/backend/api/lsp/completion.goindex 01c082fc50..ed66ed02f6 100644--- a/backend/api/lsp/completion.go+++ b/backend/api/lsp/completion.go@@ -148,7 +148,7 @@ func (h *Handler) GetDatabaseMetadataFunc(ctx context.Context, instanceID, databreturn "", nil, errors.Errorf("instance is not specified")}- database, err := h.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{+ database, err := h.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instanceID,DatabaseName: &databaseName,})diff --git a/backend/api/lsp/handler.go b/backend/api/lsp/handler.goindex a8c92a11ff..248c4dedfe 100644--- a/backend/api/lsp/handler.go+++ b/backend/api/lsp/handler.go@@ -166,7 +166,7 @@ func (h *Handler) getEngineType(ctx context.Context) storepb.Engine {return storepb.Engine_ENGINE_UNSPECIFIED}- instance, err := h.store.GetInstanceV2(ctx, &store.FindInstanceMessage{+ instance, err := h.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instanceID,})if err != nil {@@ -218,7 +218,7 @@ func (h *Handler) checkMetadataPermissions(ctx context.Context, metadata SetMetareturn err}- database, err := h.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{+ database, err := h.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instanceID,DatabaseName: &metadata.DatabaseName,})diff --git a/backend/api/v1/common.go b/backend/api/v1/common.goindex c5076b9522..1d25c0329c 100644--- a/backend/api/v1/common.go+++ b/backend/api/v1/common.go@@ -494,7 +494,7 @@ func getDatabaseMessage(ctx context.Context, s *store.Store, databaseResourceNamreturn nil, errors.Wrapf(err, "failed to parse %q", databaseResourceName)}- instance, err := s.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})+ instance, err := s.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})if err != nil {return nil, errors.Wrapf(err, "failed to get instance %s", instanceID)}@@ -508,7 +508,7 @@ func getDatabaseMessage(ctx context.Context, s *store.Store, databaseResourceNamIsCaseSensitive: store.IsObjectCaseSensitive(instance),ShowDeleted: true,}- database, err := s.GetDatabaseV2(ctx, find)+ database, err := s.GetDatabase(ctx, find)if err != nil {return nil, errors.Wrapf(err, "failed to get database")}diff --git a/backend/api/v1/database_group_service.go b/backend/api/v1/database_group_service.goindex e14bc90bcc..7d3c1f5e09 100644--- a/backend/api/v1/database_group_service.go+++ b/backend/api/v1/database_group_service.go@@ -46,7 +46,7 @@ func (s *DatabaseGroupService) CreateDatabaseGroup(ctx context.Context, req *conif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectResourceID,})if err != nil {@@ -106,7 +106,7 @@ func (s *DatabaseGroupService) UpdateDatabaseGroup(ctx context.Context, req *conif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectResourceID,})if err != nil {@@ -174,7 +174,7 @@ func (s *DatabaseGroupService) DeleteDatabaseGroup(ctx context.Context, req *conif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectResourceID,})if err != nil {@@ -211,7 +211,7 @@ func (s *DatabaseGroupService) ListDatabaseGroups(ctx context.Context, req *connreturn nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectResourceID,})if err != nil {@@ -255,7 +255,7 @@ func getDatabaseGroupByName(ctx context.Context, stores *store.Store, databaseGrif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := stores.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := stores.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectResourceID,})if err != nil {diff --git a/backend/api/v1/database_service.go b/backend/api/v1/database_service.goindex dd963ac9b1..5a866c5ab4 100644--- a/backend/api/v1/database_service.go+++ b/backend/api/v1/database_service.go@@ -288,7 +288,7 @@ func (s *DatabaseService) UpdateDatabase(ctx context.Context, req *connect.Requeif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("%v", err.Error()))}- project, err = s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err = s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,ShowDeleted: true,})@@ -330,7 +330,7 @@ func (s *DatabaseService) UpdateDatabase(ctx context.Context, req *connect.Requeif err != nil {return nil, errors.Wrapf(err, "failed to sync database metadata and schema")}- instance, err := s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &databaseMessage.InstanceID})+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &databaseMessage.InstanceID})if err != nil {return nil, errors.Wrapf(err, "failed to get instance for format version")}@@ -460,7 +460,7 @@ func (s *DatabaseService) BatchUpdateDatabases(ctx context.Context, req *connectdatabases = append(databases, database)}if batchUpdate.ProjectID != nil {- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: batchUpdate.ProjectID,ShowDeleted: true,})@@ -637,14 +637,14 @@ func (s *DatabaseService) GetDatabaseSchema(ctx context.Context, req *connect.Reif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("%v", err.Error()))}- instance, err := s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})if err != nil {return nil, errors.Wrapf(err, "failed to get instance %s", instanceID)}if instance == nil {return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("instance %q not found", instanceID))}- database, err := s.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{+ database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instanceID,DatabaseName: &databaseName,IsCaseSensitive: store.IsObjectCaseSensitive(instance),@@ -689,7 +689,7 @@ func (s *DatabaseService) GetDatabaseSDLSchema(ctx context.Context, req *connectreturn nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("%v", err.Error()))}- instance, err := s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})if err != nil {return nil, errors.Wrapf(err, "failed to get instance %s", instanceID)}@@ -697,7 +697,7 @@ func (s *DatabaseService) GetDatabaseSDLSchema(ctx context.Context, req *connectreturn nil, connect.NewError(connect.CodeNotFound, errors.Errorf("instance %q not found", instanceID))}- database, err := s.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{+ database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instanceID,DatabaseName: &databaseName,IsCaseSensitive: store.IsObjectCaseSensitive(instance),@@ -819,7 +819,7 @@ func (s *DatabaseService) getSourceDBMetadata(ctx context.Context, request *v1pb}// Get instance to determine engine and case sensitivity- instance, err := s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})if err != nil {return nil, err}@@ -899,7 +899,7 @@ func (s *DatabaseService) getTargetDBMetadata(ctx context.Context, request *v1pb}// Get instance to determine engine and case sensitivity- instance, err := s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})if err != nil {return nil, err}@@ -950,7 +950,7 @@ func (s *DatabaseService) getTargetDBMetadata(ctx context.Context, request *v1pbif err != nil {return nil, err}- instance, err := s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})if err != nil {return nil, err}@@ -988,7 +988,7 @@ func (s *DatabaseService) getParserEngine(ctx context.Context, request *v1pb.DifinstanceID = insID}- instance, err := s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})if err != nil {return storepb.Engine_ENGINE_UNSPECIFIED, errors.Wrapf(err, "failed to get instance %s", instanceID)}@@ -1057,7 +1057,7 @@ func convertToChangedResources(r *storepb.ChangedResources) *v1pb.ChangedResourc}func (s *DatabaseService) convertToDatabase(ctx context.Context, database *store.DatabaseMessage) (*v1pb.Database, error) {- instance, err := s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID,})if err != nil {@@ -1105,7 +1105,7 @@ func (s *DatabaseService) GetSchemaString(ctx context.Context, req *connect.Requreturn nil, connect.NewError(connect.CodeInternal, errors.Errorf("%v", err.Error()))}- instance, err := s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID})+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID})if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("%v", err.Error()))}diff --git a/backend/api/v1/database_service_changelog.go b/backend/api/v1/database_service_changelog.goindex fa184fc214..00caeb8d2a 100644--- a/backend/api/v1/database_service_changelog.go+++ b/backend/api/v1/database_service_changelog.go@@ -25,7 +25,7 @@ func (s *DatabaseService) ListChangelogs(ctx context.Context, req *connect.Requereturn nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", req.Msg.Parent))}- instance, err := s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID})+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID})if err != nil {return nil, connect.NewError(connect.CodeInternal, err)}@@ -115,7 +115,7 @@ func (s *DatabaseService) GetChangelog(ctx context.Context, req *connect.Request}// Get related database to convert changelog from store.- instance, err := s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instanceID,})if err != nil {@@ -124,7 +124,7 @@ func (s *DatabaseService) GetChangelog(ctx context.Context, req *connect.Requestif instance == nil {return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("instance %q not found", instanceID))}- database, err := s.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{+ database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instanceID,DatabaseName: &databaseName,IsCaseSensitive: store.IsObjectCaseSensitive(instance),diff --git a/backend/api/v1/instance_service.go b/backend/api/v1/instance_service.goindex 54e0e2484b..50f3d14038 100644--- a/backend/api/v1/instance_service.go+++ b/backend/api/v1/instance_service.go@@ -90,7 +90,7 @@ func (s *InstanceService) ListInstances(ctx context.Context, req *connect.Requesreturn nil, connect.NewError(connect.CodeInvalidArgument, err)}find.FilterQ = filterQ- instances, err := s.store.ListInstancesV2(ctx, find)+ instances, err := s.store.ListInstances(ctx, find)if err != nil {return nil, connect.NewError(connect.CodeInternal, err)}@@ -211,7 +211,7 @@ func (s *InstanceService) CreateInstance(ctx context.Context, req *connect.Requereturn nil, err}- instance, err := s.store.CreateInstanceV2(ctx, instanceMessage)+ instance, err := s.store.CreateInstance(ctx, instanceMessage)if err != nil {return nil, connect.NewError(connect.CodeInternal, err)}@@ -420,7 +420,7 @@ func (s *InstanceService) UpdateInstance(ctx context.Context, req *connect.Reque}}- ins, err := s.store.UpdateInstanceV2(ctx, patch)+ ins, err := s.store.UpdateInstance(ctx, patch)if err != nil {return nil, connect.NewError(connect.CodeInternal, err)}@@ -480,7 +480,7 @@ func (s *InstanceService) DeleteInstance(ctx context.Context, req *connect.Requemetadata := proto.CloneOf(instance.Metadata)metadata.Activation = false- if _, err := s.store.UpdateInstanceV2(ctx, &store.UpdateInstanceMessage{+ if _, err := s.store.UpdateInstance(ctx, &store.UpdateInstanceMessage{ResourceID: &instance.ResourceID,Deleted: &deletePatch,Metadata: metadata,@@ -509,7 +509,7 @@ func (s *InstanceService) UndeleteInstance(ctx context.Context, req *connect.Reqreturn nil, err}- ins, err := s.store.UpdateInstanceV2(ctx, &store.UpdateInstanceMessage{+ ins, err := s.store.UpdateInstance(ctx, &store.UpdateInstanceMessage{ResourceID: &instance.ResourceID,Deleted: &undeletePatch,})@@ -658,7 +658,7 @@ func (s *InstanceService) AddDataSource(ctx context.Context, req *connect.Requesmetadata := proto.CloneOf(instance.Metadata)metadata.DataSources = append(metadata.DataSources, dataSource)- instance, err = s.store.UpdateInstanceV2(ctx, &store.UpdateInstanceMessage{+ instance, err = s.store.UpdateInstance(ctx, &store.UpdateInstanceMessage{ResourceID: &instance.ResourceID,Metadata: metadata,})@@ -856,7 +856,7 @@ func (s *InstanceService) UpdateDataSource(ctx context.Context, req *connect.Reqreturn connect.NewResponse(result), nil}- instance, err = s.store.UpdateInstanceV2(ctx, &store.UpdateInstanceMessage{+ instance, err = s.store.UpdateInstance(ctx, &store.UpdateInstanceMessage{ResourceID: &instance.ResourceID,Metadata: metadata,})@@ -901,7 +901,7 @@ func (s *InstanceService) RemoveDataSource(ctx context.Context, req *connect.Req}metadata.DataSources = updatedDataSources- instance, err = s.store.UpdateInstanceV2(ctx, &store.UpdateInstanceMessage{+ instance, err = s.store.UpdateInstance(ctx, &store.UpdateInstanceMessage{ResourceID: &instance.ResourceID,Metadata: metadata,})@@ -909,7 +909,7 @@ func (s *InstanceService) RemoveDataSource(ctx context.Context, req *connect.Reqreturn nil, connect.NewError(connect.CodeInternal, err)}- instance, err = s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{+ instance, err = s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instance.ResourceID,})if err != nil {@@ -929,7 +929,7 @@ func getInstanceMessage(ctx context.Context, stores *store.Store, name string) (find := &store.FindInstanceMessage{ResourceID: &instanceID,}- instance, err := stores.GetInstanceV2(ctx, find)+ instance, err := stores.GetInstance(ctx, find)if err != nil {return nil, connect.NewError(connect.CodeInternal, err)}diff --git a/backend/api/v1/issue_service.go b/backend/api/v1/issue_service.goindex 6d5bf0112c..8a4896531a 100644--- a/backend/api/v1/issue_service.go+++ b/backend/api/v1/issue_service.go@@ -298,7 +298,7 @@ func (s *IssueService) ListIssues(ctx context.Context, req *connect.Request[v1pb}issueFind.ProjectID = &projectID- issues, err := s.store.ListIssueV2(ctx, issueFind)+ issues, err := s.store.ListIssues(ctx, issueFind)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to search issue, error: %v", err))}@@ -360,7 +360,7 @@ func (s *IssueService) SearchIssues(ctx context.Context, req *connect.Request[v1issueFind.ProjectIDs = projectIDsFilter}- issues, err := s.store.ListIssueV2(ctx, issueFind)+ issues, err := s.store.ListIssues(ctx, issueFind)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to search issue, error: %v", err))}@@ -424,7 +424,7 @@ func (s *IssueService) createIssueDatabaseChange(ctx context.Context, request *vif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("%v", err.Error()))}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -457,7 +457,7 @@ func (s *IssueService) createIssueDatabaseChange(ctx context.Context, request *vif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("%v", err.Error()))}- pipeline, err := s.store.GetPipelineV2(ctx, &store.PipelineFind{+ pipeline, err := s.store.GetPipeline(ctx, &store.PipelineFind{ID: &rolloutID,ProjectID: &projectID,})@@ -489,7 +489,7 @@ func (s *IssueService) createIssueDatabaseChange(ctx context.Context, request *vLabels: request.Issue.Labels,}- issue, err := s.store.CreateIssueV2(ctx, issueCreateMessage, user.ID)+ issue, err := s.store.CreateIssue(ctx, issueCreateMessage, user.ID)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create issue, error: %v", err))}@@ -527,7 +527,7 @@ func (s *IssueService) createIssueGrantRequest(ctx context.Context, request *v1pif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("%v", err.Error()))}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -579,7 +579,7 @@ func (s *IssueService) createIssueGrantRequest(ctx context.Context, request *v1pLabels: request.Issue.Labels,}- issue, err := s.store.CreateIssueV2(ctx, issueCreateMessage, user.ID)+ issue, err := s.store.CreateIssue(ctx, issueCreateMessage, user.ID)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create issue, error: %v", err))}@@ -618,7 +618,7 @@ func (s *IssueService) createIssueDatabaseDataExport(ctx context.Context, requesif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("%v", err.Error()))}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -651,7 +651,7 @@ func (s *IssueService) createIssueDatabaseDataExport(ctx context.Context, requesif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("%v", err.Error()))}- pipeline, err := s.store.GetPipelineV2(ctx, &store.PipelineFind{+ pipeline, err := s.store.GetPipeline(ctx, &store.PipelineFind{ID: &rolloutID,ProjectID: &projectID,})@@ -683,7 +683,7 @@ func (s *IssueService) createIssueDatabaseDataExport(ctx context.Context, requesLabels: request.Issue.Labels,}- issue, err := s.store.CreateIssueV2(ctx, issueCreateMessage, user.ID)+ issue, err := s.store.CreateIssue(ctx, issueCreateMessage, user.ID)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create issue, error: %v", err))}@@ -755,7 +755,7 @@ func (s *IssueService) ApproveIssue(ctx context.Context, req *connect.Request[v1return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check if the approval is approved, error: %v", err))}- issue, err = s.store.UpdateIssueV2(ctx, issue.UID, &store.UpdateIssueMessage{+ issue, err = s.store.UpdateIssue(ctx, issue.UID, &store.UpdateIssueMessage{PayloadUpsert: &storepb.Issue{Approval: payload.Approval,},@@ -933,7 +933,7 @@ func (s *IssueService) RejectIssue(ctx context.Context, req *connect.Request[v1pPrincipalId: int32(user.ID),})- issue, err = s.store.UpdateIssueV2(ctx, issue.UID, &store.UpdateIssueMessage{+ issue, err = s.store.UpdateIssue(ctx, issue.UID, &store.UpdateIssueMessage{PayloadUpsert: &storepb.Issue{Approval: payload.Approval,},@@ -1011,7 +1011,7 @@ func (s *IssueService) RequestIssue(ctx context.Context, req *connect.Request[v1}payload.Approval.Approvers = updatedApprovers- issue, err = s.store.UpdateIssueV2(ctx, issue.UID, &store.UpdateIssueMessage{+ issue, err = s.store.UpdateIssue(ctx, issue.UID, &store.UpdateIssueMessage{PayloadUpsert: &storepb.Issue{Approval: payload.Approval,},@@ -1240,7 +1240,7 @@ func (s *IssueService) UpdateIssue(ctx context.Context, req *connect.Request[v1p}}- issue, err = s.store.UpdateIssueV2(ctx, issue.UID, patch)+ issue, err = s.store.UpdateIssue(ctx, issue.UID, patch)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to update issue, error: %v", err))}@@ -1288,7 +1288,7 @@ func (s *IssueService) BatchUpdateIssuesStatus(ctx context.Context, req *connect// Check if there is any running/pending task runs.if issue.PipelineUID != nil {taskRunStatusList := []storepb.TaskRun_Status{storepb.TaskRun_RUNNING, storepb.TaskRun_PENDING}- taskRuns, err := s.store.ListTaskRunsV2(ctx, &store.FindTaskRunMessage{PipelineUID: issue.PipelineUID, Status: &taskRunStatusList})+ taskRuns, err := s.store.ListTaskRuns(ctx, &store.FindTaskRunMessage{PipelineUID: issue.PipelineUID, Status: &taskRunStatusList})if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to list task runs, err: %v", err))}@@ -1314,7 +1314,7 @@ func (s *IssueService) BatchUpdateIssuesStatus(ctx context.Context, req *connectif err := func() error {var errs errorfor _, issue := range issues {- updatedIssue, err := s.store.GetIssueV2(ctx, &store.FindIssueMessage{UID: &issue.UID})+ updatedIssue, err := s.store.GetIssue(ctx, &store.FindIssueMessage{UID: &issue.UID})if err != nil {errs = multierr.Append(errs, errors.Wrapf(err, "failed to get issue %v", issue.UID))continue@@ -1365,7 +1365,7 @@ func (s *IssueService) ListIssueComments(ctx context.Context, req *connect.Requeif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("%v", err.Error()))}- issue, err := s.store.GetIssueV2(ctx, &store.FindIssueMessage{+ issue, err := s.store.GetIssue(ctx, &store.FindIssueMessage{UID: &issueUID,ProjectID: &projectID,})@@ -1511,7 +1511,7 @@ func (s *IssueService) getIssueMessage(ctx context.Context, name string) (*storeif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- issue, err := s.store.GetIssueV2(ctx, &store.FindIssueMessage{+ issue, err := s.store.GetIssue(ctx, &store.FindIssueMessage{UID: &issueUID,ProjectID: &projectID,})diff --git a/backend/api/v1/org_policy_service.go b/backend/api/v1/org_policy_service.goindex 5b983e8415..0aa92743a6 100644--- a/backend/api/v1/org_policy_service.go+++ b/backend/api/v1/org_policy_service.go@@ -94,7 +94,7 @@ func (s *OrgPolicyService) ListPolicies(ctx context.Context, req *connect.Requesfind.Type = &policyType}- policies, err := s.store.ListPoliciesV2(ctx, find)+ policies, err := s.store.ListPolicies(ctx, find)if err != nil {return nil, connect.NewError(connect.CodeInternal, err)}@@ -196,7 +196,7 @@ func (s *OrgPolicyService) UpdatePolicy(ctx context.Context, req *connect.Reques}}- p, err := s.store.UpdatePolicyV2(ctx, patch)+ p, err := s.store.UpdatePolicy(ctx, patch)if err != nil {return nil, connect.NewError(connect.CodeInternal, err)}@@ -235,7 +235,7 @@ func (s *OrgPolicyService) DeletePolicy(ctx context.Context, req *connect.Requesreturn nil, err}- if err := s.store.DeletePolicyV2(ctx, policy); err != nil {+ if err := s.store.DeletePolicy(ctx, policy); err != nil {return nil, connect.NewError(connect.CodeInternal, err)}@@ -322,7 +322,7 @@ func (s *OrgPolicyService) findPolicyMessage(ctx context.Context, policyName strreturn nil, policyParent, connect.NewError(connect.CodeInvalidArgument, err)}- policy, err := s.store.GetPolicyV2(ctx, &store.FindPolicyMessage{+ policy, err := s.store.GetPolicy(ctx, &store.FindPolicyMessage{ResourceType: &resourceType,Type: &policyType,Resource: resource,@@ -371,7 +371,7 @@ func (s *OrgPolicyService) createPolicyMessage(ctx context.Context, parent strinEnforce: true,}- p, err := s.store.CreatePolicyV2(ctx, create)+ p, err := s.store.CreatePolicy(ctx, create)if err != nil {return nil, connect.NewError(connect.CodeInternal, err)}diff --git a/backend/api/v1/plan_service.go b/backend/api/v1/plan_service.goindex b83746f5e3..6547d9306b 100644--- a/backend/api/v1/plan_service.go+++ b/backend/api/v1/plan_service.go@@ -200,7 +200,7 @@ func getProjectIDsSearchFilter(ctx context.Context, user *store.UserMessage, perif ok {return nil, nil}- projects, err := stores.ListProjectV2(ctx, &store.FindProjectMessage{})+ projects, err := stores.ListProjects(ctx, &store.FindProjectMessage{})if err != nil {return nil, errors.Wrapf(err, "failed to list projects")}@@ -229,7 +229,7 @@ func (s *PlanService) CreatePlan(ctx context.Context, request *connect.Request[vif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -303,7 +303,7 @@ func (s *PlanService) UpdatePlan(ctx context.Context, request *connect.Request[vif err != nil {return nil, connect.NewError(connect.CodeInternal, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{ResourceID: &projectID})+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID})if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get project %q, err: %v", projectID, err))}@@ -480,7 +480,7 @@ func (s *PlanService) UpdatePlan(ctx context.Context, request *connect.Request[vvar taskPatchList []*store.TaskPatchvar issueCommentCreates []*store.IssueCommentMessage- issue, err := s.store.GetIssueV2(ctx, &store.FindIssueMessage{PlanUID: &oldPlan.UID})+ 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))}@@ -718,7 +718,7 @@ func (s *PlanService) UpdatePlan(ctx context.Context, request *connect.Request[vfor _, taskPatch := range taskPatchList {task := tasksMap[taskPatch.ID]- if _, err := s.store.UpdateTaskV2(ctx, taskPatch); err != nil {+ 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))}}@@ -731,7 +731,7 @@ func (s *PlanService) UpdatePlan(ctx context.Context, request *connect.Request[vif issue != nil && doUpdateSheet {if err := func() error {- issue, err := s.store.UpdateIssueV2(ctx, issue.UID, &store.UpdateIssueMessage{+ issue, err := s.store.UpdateIssue(ctx, issue.UID, &store.UpdateIssueMessage{PayloadUpsert: &storepb.Issue{Approval: &storepb.IssuePayloadApproval{ApprovalFindingDone: false,@@ -982,7 +982,7 @@ func (s *PlanService) RunPlanChecks(ctx context.Context, request *connect.Requesif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -1049,7 +1049,7 @@ func (s *PlanService) BatchCancelPlanCheckRuns(ctx context.Context, request *conif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {diff --git a/backend/api/v1/plan_service_converter.go b/backend/api/v1/plan_service_converter.goindex 87dd5271a1..083c4b14df 100644--- a/backend/api/v1/plan_service_converter.go+++ b/backend/api/v1/plan_service_converter.go@@ -43,7 +43,7 @@ func convertToPlan(ctx context.Context, s *store.Store, plan *store.PlanMessage)}p.Creator = common.FormatUserEmail(creator.Email)- issue, err := s.GetIssueV2(ctx, &store.FindIssueMessage{PlanUID: &plan.UID})+ 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 06f8b2118a..a48dfe6eeb 100644--- a/backend/api/v1/plan_service_plan_check.go+++ b/backend/api/v1/plan_service_plan_check.go@@ -31,7 +31,7 @@ func getPlanCheckRunsFromPlan(ctx context.Context, s *store.Store, plan *store.P}func getPlanCheckRunsFromPlanSpecs(ctx context.Context, s *store.Store, plan *store.PlanMessage, skippedSpecIDs map[string]struct{}) ([]*store.PlanCheckRunMessage, error) {- project, err := s.GetProjectV2(ctx, &store.FindProjectMessage{ResourceID: &plan.ProjectID})+ 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)}@@ -169,7 +169,7 @@ func getPlanCheckRunsFromChangeDatabaseConfigDatabaseTarget(ctx context.Context,}func getPlanCheckRunsFromChangeDatabaseConfigForDatabase(ctx context.Context, s *store.Store, plan *store.PlanMessage, config *storepb.PlanConfig_ChangeDatabaseConfig, sheetUID int, database *store.DatabaseMessage) ([]*store.PlanCheckRunMessage, error) {- instance, err := s.GetInstanceV2(ctx, &store.FindInstanceMessage{+ instance, err := s.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID,})if err != nil {diff --git a/backend/api/v1/predicate_columns_check.go b/backend/api/v1/predicate_columns_check.goindex e1aaa5b994..88e6af7ed0 100644--- a/backend/api/v1/predicate_columns_check.go+++ b/backend/api/v1/predicate_columns_check.go@@ -71,7 +71,7 @@ func (s *QueryResultMasker) getSensitiveColumnsForPredicate(var result []base.ColumnResourcefor column := range predicateColumns {- database, err := s.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{+ database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instance.ResourceID,DatabaseName: &column.Database,})@@ -82,7 +82,7 @@ func (s *QueryResultMasker) getSensitiveColumnsForPredicate(continue}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID,})if err != nil {diff --git a/backend/api/v1/project_service.go b/backend/api/v1/project_service.goindex f3eb232ada..63a7d7721e 100644--- a/backend/api/v1/project_service.go+++ b/backend/api/v1/project_service.go@@ -86,7 +86,7 @@ func (s *ProjectService) ListProjects(ctx context.Context, req *connect.Request[return nil, connect.NewError(connect.CodeInvalidArgument, err)}find.FilterQ = filterQ- projects, err := s.store.ListProjectV2(ctx, find)+ projects, err := s.store.ListProjects(ctx, find)if err != nil {return nil, connect.NewError(connect.CodeInternal, err)}@@ -136,7 +136,7 @@ func (s *ProjectService) SearchProjects(ctx context.Context, req *connect.Reques}find.FilterQ = filterQ- projects, err := s.store.ListProjectV2(ctx, find)+ projects, err := s.store.ListProjects(ctx, find)if err != nil {return nil, connect.NewError(connect.CodeInternal, err)}@@ -202,7 +202,7 @@ func (s *ProjectService) CreateProject(ctx context.Context, req *connect.Requestif !ok {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))}- project, err := s.store.CreateProjectV2(ctx,+ project, err := s.store.CreateProject(ctx,projectMessage,user.ID,)@@ -340,7 +340,7 @@ func (s *ProjectService) UpdateProject(ctx context.Context, req *connect.Request}}- project, err = s.store.UpdateProjectV2(ctx, patch)+ project, err = s.store.UpdateProject(ctx, patch)if err != nil {return nil, connect.NewError(connect.CodeInternal, err)}@@ -396,7 +396,7 @@ func (s *ProjectService) DeleteProject(ctx context.Context, req *connect.Request// We don't close the issues because they might be open still.} else {// Return the open issue error first because that's more important than transferring out databases.- openIssues, err := s.store.ListIssueV2(ctx, &store.FindIssueMessage{ProjectIDs: &[]string{project.ResourceID}, StatusList: []storepb.Issue_Status{storepb.Issue_OPEN}})+ openIssues, err := s.store.ListIssues(ctx, &store.FindIssueMessage{ProjectIDs: &[]string{project.ResourceID}, StatusList: []storepb.Issue_Status{storepb.Issue_OPEN}})if err != nil {return nil, connect.NewError(connect.CodeInternal, err)}@@ -408,7 +408,7 @@ func (s *ProjectService) DeleteProject(ctx context.Context, req *connect.Request}}- if _, err := s.store.UpdateProjectV2(ctx, &store.UpdateProjectMessage{+ if _, err := s.store.UpdateProject(ctx, &store.UpdateProjectMessage{ResourceID: project.ResourceID,Delete: &deletePatch,}); err != nil {@@ -428,7 +428,7 @@ func (s *ProjectService) UndeleteProject(ctx context.Context, req *connect.Requereturn nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("project %q is active", req.Msg.Name))}- project, err = s.store.UpdateProjectV2(ctx, &store.UpdateProjectMessage{+ project, err = s.store.UpdateProject(ctx, &store.UpdateProjectMessage{ResourceID: project.ResourceID,Delete: &undeletePatch,})@@ -465,7 +465,7 @@ func (s *ProjectService) BatchDeleteProjects(ctx context.Context, request *connevar blockedProjects []stringfor _, project := range projects {// Check for open issues- openIssues, err := s.store.ListIssueV2(ctx, &store.FindIssueMessage{+ openIssues, err := s.store.ListIssues(ctx, &store.FindIssueMessage{ProjectIDs: &[]string{project.ResourceID},StatusList: []storepb.Issue_Status{storepb.Issue_OPEN},})@@ -529,7 +529,7 @@ func (s *ProjectService) BatchDeleteProjects(ctx context.Context, request *conne})}- if _, err := s.store.BatchUpdateProjectsV2(ctx, updatePatches); err != nil {+ if _, err := s.store.BatchUpdateProjects(ctx, updatePatches); err != nil {return nil, connect.NewError(connect.CodeInternal, err)}@@ -542,7 +542,7 @@ func (s *ProjectService) GetIamPolicy(ctx context.Context, req *connect.Request[if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -573,7 +573,7 @@ func (s *ProjectService) BatchGetIamPolicy(ctx context.Context, req *connect.Reqreturn nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -605,7 +605,7 @@ func (s *ProjectService) SetIamPolicy(ctx context.Context, req *connect.Request[if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -644,7 +644,7 @@ func (s *ProjectService) SetIamPolicy(ctx context.Context, req *connect.Request[if err != nil {return nil, connect.NewError(connect.CodeInternal, err)}- if _, err := s.store.CreatePolicyV2(ctx, &store.PolicyMessage{+ if _, err := s.store.CreatePolicy(ctx, &store.PolicyMessage{Resource: common.FormatProject(project.ResourceID),ResourceType: storepb.Policy_PROJECT,Payload: string(policyPayload),@@ -781,7 +781,7 @@ func (s *ProjectService) AddWebhook(ctx context.Context, req *connect.Request[v1if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -804,11 +804,11 @@ func (s *ProjectService) AddWebhook(ctx context.Context, req *connect.Request[v1return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "invalid webhook URL"))}- if _, err := s.store.CreateProjectWebhookV2(ctx, project.ResourceID, create); err != nil {+ if _, err := s.store.CreateProjectWebhook(ctx, project.ResourceID, create); err != nil {return nil, connect.NewError(connect.CodeInternal, err)}- project, err = s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err = s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -828,7 +828,7 @@ func (s *ProjectService) UpdateWebhook(ctx context.Context, req *connect.Requestreturn nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid webhook id %q", webhookID))}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -841,7 +841,7 @@ func (s *ProjectService) UpdateWebhook(ctx context.Context, req *connect.Requestreturn nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project %q has been deleted", projectID))}- webhook, err := s.store.GetProjectWebhookV2(ctx, &store.FindProjectWebhookMessage{+ webhook, err := s.store.GetProjectWebhook(ctx, &store.FindProjectWebhookMessage{ProjectID: &project.ResourceID,ID: &webhookIDInt,})@@ -896,11 +896,11 @@ func (s *ProjectService) UpdateWebhook(ctx context.Context, req *connect.RequestPayload: updatedPayload,}- if _, err := s.store.UpdateProjectWebhookV2(ctx, project.ResourceID, webhook.ID, update); err != nil {+ if _, err := s.store.UpdateProjectWebhook(ctx, project.ResourceID, webhook.ID, update); err != nil {return nil, connect.NewError(connect.CodeInternal, err)}- project, err = s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err = s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -920,7 +920,7 @@ func (s *ProjectService) RemoveWebhook(ctx context.Context, req *connect.Requestreturn nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid webhook id %q", webhookID))}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -933,7 +933,7 @@ func (s *ProjectService) RemoveWebhook(ctx context.Context, req *connect.Requestreturn nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project %q has been deleted", projectID))}- webhook, err := s.store.GetProjectWebhookV2(ctx, &store.FindProjectWebhookMessage{+ webhook, err := s.store.GetProjectWebhook(ctx, &store.FindProjectWebhookMessage{ProjectID: &project.ResourceID,ID: &webhookIDInt,})@@ -944,11 +944,11 @@ func (s *ProjectService) RemoveWebhook(ctx context.Context, req *connect.Requestreturn nil, connect.NewError(connect.CodeNotFound, errors.Errorf("webhook %q not found", req.Msg.Webhook.Url))}- if err := s.store.DeleteProjectWebhookV2(ctx, project.ResourceID, webhook.ID); err != nil {+ if err := s.store.DeleteProjectWebhook(ctx, project.ResourceID, webhook.ID); err != nil {return nil, connect.NewError(connect.CodeInternal, err)}- project, err = s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err = s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -973,7 +973,7 @@ func (s *ProjectService) TestWebhook(ctx context.Context, req *connect.Request[vif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -1043,7 +1043,7 @@ func (s *ProjectService) getProjectMessage(ctx context.Context, name string) (*sResourceID: &projectID,ShowDeleted: true,}- project, err := s.store.GetProjectV2(ctx, find)+ project, err := s.store.GetProject(ctx, find)if err != nil {return nil, connect.NewError(connect.CodeInternal, err)}diff --git a/backend/api/v1/query_result_masker.go b/backend/api/v1/query_result_masker.goindex 3ac289dfd6..d449a38a30 100644--- a/backend/api/v1/query_result_masker.go+++ b/backend/api/v1/query_result_masker.go@@ -227,7 +227,7 @@ func (s *QueryResultMasker) getMaskerForColumnResource(if instance != nil && !common.EngineSupportMasking(instance.Metadata.GetEngine()) {return masker.NewNoneMasker(), nil, nil}- database, err := s.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{+ database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instance.ResourceID,DatabaseName: &sourceColumn.Database,})@@ -238,7 +238,7 @@ func (s *QueryResultMasker) getMaskerForColumnResource(return masker.NewNoneMasker(), nil, nil}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID,})if err != nil {@@ -310,7 +310,7 @@ func (s *QueryResultMasker) getColumnForColumnResource(ctx context.Context, instif sourceColumn == nil {return nil, nil, nil}- database, err := s.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{+ database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instanceID,DatabaseName: &sourceColumn.Database,})diff --git a/backend/api/v1/release_service.go b/backend/api/v1/release_service.goindex 661e943719..a22676804d 100644--- a/backend/api/v1/release_service.go+++ b/backend/api/v1/release_service.go@@ -64,7 +64,7 @@ func (s *ReleaseService) CreateRelease(ctx context.Context, req *connect.Requestif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to get project id"))}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{ResourceID: &projectID})+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID})if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find project"))}@@ -141,7 +141,7 @@ func (s *ReleaseService) GetRelease(ctx context.Context, req *connect.Request[v1if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to get release uid"))}- releaseMessage, err := s.store.GetReleaseV2(ctx, &store.FindReleaseMessage{+ releaseMessage, err := s.store.GetRelease(ctx, &store.FindReleaseMessage{ProjectID: &projectID,UID: &releaseUID,})@@ -167,7 +167,7 @@ func (s *ReleaseService) ListReleases(ctx context.Context, req *connect.Request[if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to get project id"))}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{ResourceID: &projectID})+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID})if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find project"))}@@ -225,7 +225,7 @@ func (s *ReleaseService) SearchReleases(ctx context.Context, req *connect.Requesif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to get project id"))}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{ResourceID: &projectID})+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID})if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find project"))}@@ -287,8 +287,8 @@ func (s *ReleaseService) UpdateRelease(ctx context.Context, req *connect.Requestreturn nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to get release uid"))}- // Use GetReleaseV2 with FindReleaseMessage for database-level filtering- release, err := s.store.GetReleaseV2(ctx, &store.FindReleaseMessage{+ // Use GetRelease with FindReleaseMessage for database-level filtering+ release, err := s.store.GetRelease(ctx, &store.FindReleaseMessage{ProjectID: &projectID,UID: &releaseUID,})@@ -297,7 +297,7 @@ func (s *ReleaseService) UpdateRelease(ctx context.Context, req *connect.Request}if release == nil {if req.Msg.AllowMissing {- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{ResourceID: &projectID})+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID})if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find project"))}@@ -343,7 +343,7 @@ func (s *ReleaseService) DeleteRelease(ctx context.Context, req *connect.Requestif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to get release uid"))}- release, err := s.store.GetReleaseV2(ctx, &store.FindReleaseMessage{+ release, err := s.store.GetRelease(ctx, &store.FindReleaseMessage{ProjectID: &projectID,UID: &releaseUID,})@@ -368,7 +368,7 @@ func (s *ReleaseService) UndeleteRelease(ctx context.Context, req *connect.Requeif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to get release uid"))}- release, err := s.store.GetReleaseV2(ctx, &store.FindReleaseMessage{+ release, err := s.store.GetRelease(ctx, &store.FindReleaseMessage{ProjectID: &projectID,UID: &releaseUID,ShowDeleted: true,@@ -421,7 +421,7 @@ func convertToRelease(ctx context.Context, s *store.Store, release *store.Releas}r.Files = files- project, err := s.GetProjectV2(ctx, &store.FindProjectMessage{ResourceID: &release.ProjectID})+ project, err := s.GetProject(ctx, &store.FindProjectMessage{ResourceID: &release.ProjectID})if err != nil {return nil, errors.Wrapf(err, "failed to find project")}diff --git a/backend/api/v1/release_service_check.go b/backend/api/v1/release_service_check.goindex c59a152489..9672e81dc5 100644--- a/backend/api/v1/release_service_check.go+++ b/backend/api/v1/release_service_check.go@@ -37,7 +37,7 @@ func (s *ReleaseService) CheckRelease(ctx context.Context, req *connect.Request[if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,ShowDeleted: true,})@@ -64,7 +64,7 @@ func (s *ReleaseService) CheckRelease(ctx context.Context, req *connect.Request[// Handle database group target. Extract all matched databases in the database group.if projectResourceID, databaseGroupResourceID, err := common.GetProjectIDDatabaseGroupID(target); err == nil {- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectResourceID,})if err != nil {@@ -148,7 +148,7 @@ func (s *ReleaseService) checkReleaseVersioned(ctx context.Context, files []*v1ploop:for _, database := range databases {- instance, err := s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID,})if err != nil {@@ -346,7 +346,7 @@ func (s *ReleaseService) checkReleaseDeclarative(ctx context.Context, files []*vvar results []*v1pb.CheckReleaseResponse_CheckResultvar errorAdviceCount, warningAdviceCount intfor _, database := range databases {- instance, err := s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID,})if err != nil {diff --git a/backend/api/v1/review_config_service.go b/backend/api/v1/review_config_service.goindex dd97879c1c..50698ae7f7 100644--- a/backend/api/v1/review_config_service.go+++ b/backend/api/v1/review_config_service.go@@ -161,7 +161,7 @@ func (s *ReviewConfigService) DeleteReviewConfig(ctx context.Context, req *conne}policyType := storepb.Policy_TAG- policies, err := s.store.ListPoliciesV2(ctx, &store.FindPolicyMessage{+ policies, err := s.store.ListPolicies(ctx, &store.FindPolicyMessage{Type: &policyType,})if err != nil {@@ -186,7 +186,7 @@ func (s *ReviewConfigService) DeleteReviewConfig(ctx context.Context, req *connereturn nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to marshal tag policy"))}patch := string(payloadBytes)- if _, err := s.store.UpdatePolicyV2(ctx, &store.UpdatePolicyMessage{+ if _, err := s.store.UpdatePolicy(ctx, &store.UpdatePolicyMessage{ResourceType: policy.ResourceType,Resource: policy.Resource,Payload: &patch,@@ -225,7 +225,7 @@ func convertToReviewConfigMessage(reviewConfig *v1pb.ReviewConfig) (*store.Reviefunc (s *ReviewConfigService) convertToV1ReviewConfig(ctx context.Context, reviewConfigMessage *store.ReviewConfigMessage) (*v1pb.ReviewConfig, error) {policyType := storepb.Policy_TAG- tagPolicies, err := s.store.ListPoliciesV2(ctx, &store.FindPolicyMessage{+ tagPolicies, err := s.store.ListPolicies(ctx, &store.FindPolicyMessage{Type: &policyType,ShowAll: false,})@@ -268,7 +268,7 @@ func (s *ReviewConfigService) convertToV1ReviewConfig(ctx context.Context, revieif err != nil {return nil, err}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,ShowDeleted: false,})diff --git a/backend/api/v1/revision_service.go b/backend/api/v1/revision_service.goindex 2cd1ea5309..1ceda6f33a 100644--- a/backend/api/v1/revision_service.go+++ b/backend/api/v1/revision_service.go@@ -299,7 +299,7 @@ func convertToRevision(ctx context.Context, s *store.Store, parent string, revisif err != nil {return nil, errors.Wrapf(err, "failed to get rollout UID from %q", taskRunName)}- issue, err := s.GetIssueV2(ctx, &store.FindIssueMessage{PipelineID: &rolloutUID})+ issue, err := s.GetIssue(ctx, &store.FindIssueMessage{PipelineID: &rolloutUID})if err != nil {return nil, errors.Wrapf(err, "failed to get issue by rollout %q", rolloutUID)}diff --git a/backend/api/v1/rollout_service.go b/backend/api/v1/rollout_service.goindex 0e32de6599..2678b6b753 100644--- a/backend/api/v1/rollout_service.go+++ b/backend/api/v1/rollout_service.go@@ -65,7 +65,7 @@ func (s *RolloutService) PreviewRollout(ctx context.Context, req *connect.Requesif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -101,7 +101,7 @@ func (s *RolloutService) GetRollout(ctx context.Context, req *connect.Request[v1if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -130,7 +130,7 @@ func (s *RolloutService) ListRollouts(ctx context.Context, req *connect.Request[if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -158,7 +158,7 @@ func (s *RolloutService) ListRollouts(ctx context.Context, req *connect.Request[if err := s.buildRolloutFindWithFilter(ctx, find, request.Filter); err != nil {return nil, err}- pipelines, err := s.store.ListPipelineV2(ctx, find)+ pipelines, err := s.store.ListPipelines(ctx, find)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to list pipelines, error: %v", err))}@@ -219,7 +219,7 @@ func (s *RolloutService) CreateRollout(ctx context.Context, req *connect.Requestif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -288,7 +288,7 @@ func (s *RolloutService) ListTaskRuns(ctx context.Context, req *connect.Request[return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -298,7 +298,7 @@ func (s *RolloutService) ListTaskRuns(ctx context.Context, req *connect.Request[return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project %v not found", projectID))}- pipeline, err := s.store.GetPipelineV2(ctx, &store.PipelineFind{+ pipeline, err := s.store.GetPipeline(ctx, &store.PipelineFind{ID: &rolloutID,ProjectID: &projectID,})@@ -309,7 +309,7 @@ func (s *RolloutService) ListTaskRuns(ctx context.Context, req *connect.Request[return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("pipeline %d not found in project %s", rolloutID, projectID))}- taskRuns, err := s.store.ListTaskRunsV2(ctx, &store.FindTaskRunMessage{+ taskRuns, err := s.store.ListTaskRuns(ctx, &store.FindTaskRunMessage{PipelineUID: &rolloutID,Environment: maybeStageID,TaskUID: maybeTaskID,@@ -335,7 +335,7 @@ func (s *RolloutService) GetTaskRun(ctx context.Context, req *connect.Request[v1return nil, connect.NewError(connect.CodeInvalidArgument, err)}- pipeline, err := s.store.GetPipelineV2(ctx, &store.PipelineFind{+ pipeline, err := s.store.GetPipeline(ctx, &store.PipelineFind{ID: &rolloutID,ProjectID: &projectID,})@@ -392,12 +392,12 @@ func (s *RolloutService) GetTaskRunSession(ctx context.Context, req *connect.Reqreturn nil, connect.NewError(connect.CodeInternal, errors.Errorf("expect connection id to be of type string but found %T", connIDAny))}- task, err := s.store.GetTaskV2ByID(ctx, taskUID)+ task, err := s.store.GetTaskByID(ctx, taskUID)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get task, error: %v", err))}- instance, err := s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get instance, error: %v", err))}@@ -522,7 +522,7 @@ func (s *RolloutService) BatchRunTasks(ctx context.Context, req *connect.Requestif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -532,7 +532,7 @@ func (s *RolloutService) BatchRunTasks(ctx context.Context, req *connect.Requestreturn nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project %v not found", projectID))}- rollout, err := s.store.GetPipelineV2(ctx, &store.PipelineFind{+ rollout, err := s.store.GetPipeline(ctx, &store.PipelineFind{ID: &rolloutID,ProjectID: &projectID,})@@ -543,7 +543,7 @@ func (s *RolloutService) BatchRunTasks(ctx context.Context, req *connect.Requestreturn nil, connect.NewError(connect.CodeNotFound, errors.Errorf("rollout %v not found", rolloutID))}- issueN, err := s.store.GetIssueV2(ctx, &store.FindIssueMessage{+ issueN, err := s.store.GetIssue(ctx, &store.FindIssueMessage{PipelineID: &rolloutID,ProjectID: &projectID,})@@ -669,7 +669,7 @@ func (s *RolloutService) BatchSkipTasks(ctx context.Context, req *connect.Requesif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -679,7 +679,7 @@ func (s *RolloutService) BatchSkipTasks(ctx context.Context, req *connect.Requesreturn nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project %v not found", projectID))}- rollout, err := s.store.GetPipelineV2(ctx, &store.PipelineFind{+ rollout, err := s.store.GetPipeline(ctx, &store.PipelineFind{ID: &rolloutID,ProjectID: &projectID,})@@ -690,7 +690,7 @@ func (s *RolloutService) BatchSkipTasks(ctx context.Context, req *connect.Requesreturn nil, connect.NewError(connect.CodeNotFound, errors.Errorf("rollout %v not found", rolloutID))}- issueN, err := s.store.GetIssueV2(ctx, &store.FindIssueMessage{+ issueN, err := s.store.GetIssue(ctx, &store.FindIssueMessage{PipelineID: &rolloutID,ProjectID: &projectID,})@@ -780,7 +780,7 @@ func (s *RolloutService) BatchCancelTaskRuns(ctx context.Context, req *connect.Rreturn nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -790,7 +790,7 @@ func (s *RolloutService) BatchCancelTaskRuns(ctx context.Context, req *connect.Rreturn nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project %v not found", projectID))}- rollout, err := s.store.GetPipelineV2(ctx, &store.PipelineFind{+ rollout, err := s.store.GetPipeline(ctx, &store.PipelineFind{ID: &rolloutID,ProjectID: &projectID,})@@ -801,7 +801,7 @@ func (s *RolloutService) BatchCancelTaskRuns(ctx context.Context, req *connect.Rreturn nil, connect.NewError(connect.CodeNotFound, errors.Errorf("rollout %v not found", rolloutID))}- issueN, err := s.store.GetIssueV2(ctx, &store.FindIssueMessage{+ issueN, err := s.store.GetIssue(ctx, &store.FindIssueMessage{PipelineID: &rolloutID,ProjectID: &projectID,})@@ -844,7 +844,7 @@ func (s *RolloutService) BatchCancelTaskRuns(ctx context.Context, req *connect.RtaskNames = append(taskNames, common.FormatTask(projectID, rolloutID, stageID, taskID))}- taskRuns, err := s.store.ListTaskRunsV2(ctx, &store.FindTaskRunMessage{+ taskRuns, err := s.store.ListTaskRuns(ctx, &store.FindTaskRunMessage{UIDs: &taskRunIDs,})if err != nil {@@ -899,7 +899,7 @@ func (s *RolloutService) PreviewTaskRunRollback(ctx context.Context, req *connecreturn nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("failed to get task run uid, error: %v", err))}- taskRuns, err := s.store.ListTaskRunsV2(ctx, &store.FindTaskRunMessage{+ taskRuns, err := s.store.ListTaskRuns(ctx, &store.FindTaskRunMessage{UID: &taskRunUID,})if err != nil {@@ -927,12 +927,12 @@ func (s *RolloutService) PreviewTaskRunRollback(ctx context.Context, req *connecreturn nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("task run %v has no rollback", taskRun.ID))}- task, err := s.store.GetTaskV2ByID(ctx, taskUID)+ task, err := s.store.GetTaskByID(ctx, taskUID)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get task, error: %v", err))}- instance, err := s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get instance, error: %v", err))}@@ -1117,7 +1117,7 @@ func (s *RolloutService) canUserSkipEnvironmentTasks(ctx context.Context, user *// getRolloutWithTasks retrieves a pipeline by ID with its tasks populated.func (s *RolloutService) getRolloutWithTasks(ctx context.Context, projectID string, rolloutID int) (*store.PipelineMessage, error) {- pipeline, err := s.store.GetPipelineV2(ctx, &store.PipelineFind{+ pipeline, err := s.store.GetPipeline(ctx, &store.PipelineFind{ID: &rolloutID,ProjectID: &projectID,})diff --git a/backend/api/v1/rollout_service_converter.go b/backend/api/v1/rollout_service_converter.goindex 2f06fbf3c0..125c66c5b3 100644--- a/backend/api/v1/rollout_service_converter.go+++ b/backend/api/v1/rollout_service_converter.go@@ -124,21 +124,21 @@ func convertToSchedulerInfoWaitingCause(ctx context.Context, s *store.Store, c *}, nilcase *storepb.SchedulerInfo_WaitingCause_TaskUid:taskUID := cause.TaskUid- task, err := s.GetTaskV2ByID(ctx, int(taskUID))+ task, err := s.GetTaskByID(ctx, int(taskUID))if err != nil {return nil, errors.Wrapf(err, "failed to get task %v", taskUID)}if task == nil {return nil, errors.Errorf("task %v not found", taskUID)}- pipeline, err := s.GetPipelineV2ByID(ctx, task.PipelineID)+ pipeline, err := s.GetPipelineByID(ctx, task.PipelineID)if err != nil {return nil, errors.Wrapf(err, "failed to get pipeline %v", task.PipelineID)}if pipeline == nil {return nil, errors.Errorf("pipeline %d not found", task.PipelineID)}- issue, err := s.GetIssueV2(ctx, &store.FindIssueMessage{PipelineID: &task.PipelineID})+ issue, err := s.GetIssue(ctx, &store.FindIssueMessage{PipelineID: &task.PipelineID})if err != nil {return nil, errors.Wrapf(err, "failed to get issue by pipeline %v", task.PipelineID)}@@ -320,7 +320,7 @@ func convertToTask(ctx context.Context, s *store.Store, project *store.ProjectMe}func convertToTaskFromDatabaseCreate(ctx context.Context, s *store.Store, project *store.ProjectMessage, task *store.TaskMessage) (*v1pb.Task, error) {- instance, err := s.GetInstanceV2(ctx, &store.FindInstanceMessage{+ instance, err := s.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID,})if err != nil {@@ -359,7 +359,7 @@ func convertToTaskFromSchemaUpdate(ctx context.Context, s *store.Store, projectif task.DatabaseName == nil {return nil, errors.Errorf("schema update task database is nil")}- database, err := s.GetDatabaseV2(ctx, &store.FindDatabaseMessage{InstanceID: &task.InstanceID, DatabaseName: task.DatabaseName, ShowDeleted: true})+ database, err := s.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &task.InstanceID, DatabaseName: task.DatabaseName, ShowDeleted: true})if err != nil {return nil, errors.Wrapf(err, "failed to get database")}@@ -407,7 +407,7 @@ func convertToTaskFromDatabaseDataExport(ctx context.Context, s *store.Store, prif task.DatabaseName == nil {return nil, errors.Errorf("data export task database is nil")}- database, err := s.GetDatabaseV2(ctx, &store.FindDatabaseMessage{InstanceID: &task.InstanceID, DatabaseName: task.DatabaseName, ShowDeleted: true})+ database, err := s.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &task.InstanceID, DatabaseName: task.DatabaseName, ShowDeleted: true})if err != nil {return nil, errors.Wrapf(err, "failed to get database")}diff --git a/backend/api/v1/setting_service.go b/backend/api/v1/setting_service.goindex 87884c93c0..6c1ae85a70 100644--- a/backend/api/v1/setting_service.go+++ b/backend/api/v1/setting_service.go@@ -56,7 +56,7 @@ func NewSettingService(// ListSettings lists all settings.func (s *SettingService) ListSettings(ctx context.Context, _ *connect.Request[v1pb.ListSettingsRequest]) (*connect.Response[v1pb.ListSettingsResponse], error) {- settings, err := s.store.ListSettingV2(ctx)+ settings, err := s.store.ListSettings(ctx, &store.FindSettingMessage{})if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to list settings: %v", err))}@@ -92,7 +92,7 @@ func (s *SettingService) GetSetting(ctx context.Context, request *connect.Requesreturn nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("setting is not available"))}- setting, err := s.store.GetSettingV2(ctx, apiSettingName)+ setting, err := s.store.GetSetting(ctx, apiSettingName)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get setting: %v", err))}@@ -131,7 +131,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqif s.profile.IsFeatureUnavailable(settingName) {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("feature %s is unavailable in current mode", settingName))}- existedSetting, err := s.store.GetSettingV2(ctx, apiSettingName)+ existedSetting, err := s.store.GetSetting(ctx, apiSettingName)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to find setting %s with error: %v", settingName, err))}@@ -495,7 +495,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqif !newEnvIDMap[env.Id] {// deletedemptyStr := ""- if _, err := s.store.UpdateInstanceV2(ctx, &store.UpdateInstanceMessage{+ if _, err := s.store.UpdateInstance(ctx, &store.UpdateInstanceMessage{EnvironmentID: &emptyStr,FindByEnvironmentID: &env.Id,}); err != nil {@@ -522,7 +522,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req}), nil}- setting, err := s.store.UpsertSettingV2(ctx, &store.SetSettingMessage{+ setting, err := s.store.UpsertSetting(ctx, &store.SetSettingMessage{Name: apiSettingName,Value: storeSettingValue,})@@ -550,7 +550,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.ReqclassificationID = classification.Configs[0].Id}- projects, err := s.store.ListProjectV2(ctx, &store.FindProjectMessage{ShowDeleted: false})+ projects, err := s.store.ListProjects(ctx, &store.FindProjectMessage{ShowDeleted: false})if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to list projects with error: %v", err))}@@ -562,7 +562,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.ReqDataClassificationConfigID: &classificationID,})}- if _, err = s.store.BatchUpdateProjectsV2(ctx, batchUpdate); err != nil {+ if _, err = s.store.BatchUpdateProjects(ctx, batchUpdate); err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to patch project classification with error: %v", err))}}diff --git a/backend/api/v1/sheet_service.go b/backend/api/v1/sheet_service.goindex 410cd483cf..2a1be6df10 100644--- a/backend/api/v1/sheet_service.go+++ b/backend/api/v1/sheet_service.go@@ -54,7 +54,7 @@ func (s *SheetService) CreateSheet(ctx context.Context, request *connect.Requestif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectResourceID,})if err != nil {@@ -92,7 +92,7 @@ func (s *SheetService) BatchCreateSheets(ctx context.Context, request *connect.Rif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectResourceID,})if err != nil {@@ -141,7 +141,7 @@ func (s *SheetService) GetSheet(ctx context.Context, request *connect.Request[v1return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid sheet id %d, must be positive integer", sheetUID))}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectResourceID,})if err != nil {@@ -191,7 +191,7 @@ func (s *SheetService) UpdateSheet(ctx context.Context, request *connect.Requestreturn nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid sheet id %d, must be positive integer", sheetUID))}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectResourceID,})if err != nil {@@ -276,7 +276,7 @@ func (s *SheetService) convertToAPISheetMessage(ctx context.Context, sheet *storreturn nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get creator"))}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &sheet.ProjectID,})if err != nil {diff --git a/backend/api/v1/sql_service.go b/backend/api/v1/sql_service.goindex afd00e48d7..390baf68fc 100644--- a/backend/api/v1/sql_service.go+++ b/backend/api/v1/sql_service.go@@ -549,7 +549,7 @@ func queryRetry(// Sync database metadata.for accessDatabaseName := range syncDatabaseMap {slog.Debug("sync database metadata", slog.String("instance", instance.ResourceID), slog.String("database", accessDatabaseName))- d, err := stores.GetDatabaseV2(ctx, &store.FindDatabaseMessage{InstanceID: &instance.ResourceID, DatabaseName: &accessDatabaseName})+ d, err := stores.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instance.ResourceID, DatabaseName: &accessDatabaseName})if err != nil {return nil, nil, duration, err}@@ -893,7 +893,7 @@ func (s *SQLService) doExportFromIssue(ctx context.Context, requestName string)}}- pipeline, err := s.store.GetPipelineV2(ctx, &store.PipelineFind{+ pipeline, err := s.store.GetPipeline(ctx, &store.PipelineFind{ID: &rolloutID,ProjectID: &projectID,})@@ -916,7 +916,7 @@ func (s *SQLService) doExportFromIssue(ctx context.Context, requestName string)targetTaskRunStatus := []storepb.TaskRun_Status{storepb.TaskRun_DONE}for _, task := range tasks {- taskRuns, err := s.store.ListTaskRunsV2(ctx, &store.FindTaskRunMessage{+ taskRuns, err := s.store.ListTaskRuns(ctx, &store.FindTaskRunMessage{TaskUID: &task.ID,Status: &targetTaskRunStatus,})@@ -1351,7 +1351,7 @@ func BuildGetLinkedDatabaseMetadataFunc(storeInstance *store.Store, engine storereturn "", "", nil, err}for _, database := range databaseList {- instance, err := storeInstance.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID})+ instance, err := storeInstance.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID})if err != nil {return "", "", nil, err}@@ -1387,7 +1387,7 @@ func BuildGetLinkedDatabaseMetadataFunc(storeInstance *store.Store, engine storefunc BuildGetDatabaseMetadataFunc(storeInstance *store.Store) parserbase.GetDatabaseMetadataFunc {return func(ctx context.Context, instanceID, databaseName string) (string, *model.DatabaseMetadata, error) {- database, err := storeInstance.GetDatabaseV2(ctx, &store.FindDatabaseMessage{+ database, err := storeInstance.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instanceID,DatabaseName: &databaseName,})@@ -1436,7 +1436,7 @@ func (s *SQLService) accessCheck(spans []*parserbase.QuerySpan,isExplain bool,) error {- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})if err != nil {return err}@@ -1601,7 +1601,7 @@ func (s *SQLService) prepareRelatedMessage(ctx context.Context, requestName strireturn nil, nil, nil, connect.NewError(connect.CodeInternal, errors.New(err.Error()))}- instance, err := s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID,})if err != nil {@@ -1691,7 +1691,7 @@ func getUseDatabaseOwner(ctx context.Context, stores *store.Store, instance *sto}// Check the project setting to see if we should use the database owner.- project, err := stores.GetProjectV2(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})+ project, err := stores.GetProject(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})if err != nil {return false, errors.Wrapf(err, "failed to get project")}@@ -1766,7 +1766,7 @@ func checkAndGetDataSourceQueriable(return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("data source id is required"))}- instance, err := storeInstance.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID})+ instance, err := storeInstance.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID})if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get instance %v with error: %v", database.InstanceID, err.Error()))}@@ -1817,7 +1817,7 @@ func checkAndGetDataSourceQueriable(environmentResourceType := storepb.Policy_ENVIRONMENTenvironmentResource := common.FormatEnvironment(environment.Id)- environmentPolicy, err := storeInstance.GetPolicyV2(ctx, &store.FindPolicyMessage{+ environmentPolicy, err := storeInstance.GetPolicy(ctx, &store.FindPolicyMessage{ResourceType: &environmentResourceType,Resource: &environmentResource,Type: &dataSourceQueryPolicyType,@@ -1838,7 +1838,7 @@ func checkAndGetDataSourceQueriable(var projectAdminDataSourceRestriction v1pb.DataSourceQueryPolicy_RestrictionprojectResourceType := storepb.Policy_PROJECTprojectResource := common.FormatProject(database.ProjectID)- projectPolicy, err := storeInstance.GetPolicyV2(ctx, &store.FindPolicyMessage{+ projectPolicy, err := storeInstance.GetPolicy(ctx, &store.FindPolicyMessage{ResourceType: &projectResourceType,Resource: &projectResource,Type: &dataSourceQueryPolicyType,@@ -1891,7 +1891,7 @@ func checkDataSourceQueryPolicy(ctx context.Context, storeInstance *store.Store,resourceType := storepb.Policy_ENVIRONMENTenvironmentResource := common.FormatEnvironment(environment.Id)policyType := storepb.Policy_DATA_SOURCE_QUERY- dataSourceQueryPolicy, err := storeInstance.GetPolicyV2(ctx, &store.FindPolicyMessage{+ dataSourceQueryPolicy, err := storeInstance.GetPolicy(ctx, &store.FindPolicyMessage{ResourceType: &resourceType,Resource: &environmentResource,Type: &policyType,diff --git a/backend/api/v1/worksheet_service.go b/backend/api/v1/worksheet_service.goindex b989f523fe..4cc6d3abf6 100644--- a/backend/api/v1/worksheet_service.go+++ b/backend/api/v1/worksheet_service.go@@ -52,7 +52,7 @@ func (s *WorksheetService) CreateWorksheet(if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectResourceID,})if err != nil {@@ -493,7 +493,7 @@ func (s *WorksheetService) checkWorksheetPermission(user *store.UserMessage,permission iam.Permission,) (bool, error) {- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {@@ -509,7 +509,7 @@ func (s *WorksheetService) checkWorksheetPermission(func (s *WorksheetService) convertToAPIWorksheetMessage(ctx context.Context, worksheet *store.WorkSheetMessage) (*v1pb.Worksheet, error) {databaseParent := ""if worksheet.InstanceID != nil && worksheet.DatabaseName != nil {- database, err := s.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{+ database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{ProjectID: &worksheet.ProjectID,InstanceID: worksheet.InstanceID,DatabaseName: worksheet.DatabaseName,@@ -539,7 +539,7 @@ func (s *WorksheetService) convertToAPIWorksheetMessage(ctx context.Context, worreturn nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get creator: %v", err))}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &worksheet.ProjectID,})if err != nil {diff --git a/backend/api/v1/workspace_service.go b/backend/api/v1/workspace_service.goindex 0cf2d12299..7fcd28a725 100644--- a/backend/api/v1/workspace_service.go+++ b/backend/api/v1/workspace_service.go@@ -80,7 +80,7 @@ func (s *WorkspaceService) SetIamPolicy(ctx context.Context, req *connect.RequesPayload: &payloadStr,}- if _, err := s.store.UpdatePolicyV2(ctx, patch); err != nil {+ if _, err := s.store.UpdatePolicy(ctx, patch); err != nil {return nil, connect.NewError(connect.CodeInternal, err)}diff --git a/backend/component/export/resources.go b/backend/component/export/resources.goindex 179d8506a2..a4726d34ae 100644--- a/backend/component/export/resources.go+++ b/backend/component/export/resources.go@@ -80,7 +80,7 @@ func getResourcesForMySQL(return list, nil}- database, err := storeInstance.GetDatabaseV2(ctx, &store.FindDatabaseMessage{+ database, err := storeInstance.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instance.ResourceID,DatabaseName: &databaseName,IsCaseSensitive: store.IsObjectCaseSensitive(instance),@@ -113,7 +113,7 @@ func getResourcesForMySQL(LinkedServer: sourceColumn.Server,}if sourceColumn.Database != dbMetadata.GetProto().Name {- resourceDB, err := storeInstance.GetDatabaseV2(ctx, &store.FindDatabaseMessage{+ resourceDB, err := storeInstance.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instance.ResourceID,DatabaseName: &sourceColumn.Database,IsCaseSensitive: store.IsObjectCaseSensitive(instance),@@ -168,7 +168,7 @@ func getResourcesForPostgres(return nil, err}- database, err := storeInstance.GetDatabaseV2(ctx, &store.FindDatabaseMessage{+ database, err := storeInstance.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instance.ResourceID,DatabaseName: &databaseName,IsCaseSensitive: store.IsObjectCaseSensitive(instance),diff --git a/backend/component/iam/manager.go b/backend/component/iam/manager.goindex f27dc8d6f1..6f9245be80 100644--- a/backend/component/iam/manager.go+++ b/backend/component/iam/manager.go@@ -63,7 +63,7 @@ func (m *Manager) CheckPermission(ctx context.Context, p Permission, user *storeif len(projectIDs) > 0 {allOK := truefor _, projectID := range projectIDs {- project, err := m.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := m.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,ShowDeleted: true,})diff --git a/backend/component/sampleinstance/manager.go b/backend/component/sampleinstance/manager.goindex 52d64e6a6c..06745f9344 100644--- a/backend/component/sampleinstance/manager.go+++ b/backend/component/sampleinstance/manager.go@@ -159,14 +159,14 @@ func (m *Manager) GenerateOnboardingData(ctx context.Context, userID int, schema}projectID := "project-sample"- project, err := m.store.GetProjectV2(ctx, &store.FindProjectMessage{+ project, err := m.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID,})if err != nil {return errors.Wrapf(err, "failed to find onboarding project %v", projectID)}if project == nil {- sampleProject, err := m.store.CreateProjectV2(ctx, &store.ProjectMessage{+ sampleProject, err := m.store.CreateProject(ctx, &store.ProjectMessage{ResourceID: "project-sample",Title: "Sample Project",Setting: setting,@@ -223,14 +223,14 @@ func (m *Manager) generateInstance(schemaSyncer *schemasync.Syncer,) error {// Generate Sample Instance- instance, err := m.store.GetInstanceV2(ctx, &store.FindInstanceMessage{+ instance, err := m.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instanceMessage.ResourceID,})if err != nil {return errors.Wrapf(err, "failed to find onboarding instance %v", instanceMessage.ResourceID)}if instance == nil {- sampleInstance, err := m.store.CreateInstanceV2(ctx, &store.InstanceMessage{+ sampleInstance, err := m.store.CreateInstance(ctx, &store.InstanceMessage{ResourceID: instanceMessage.ResourceID,EnvironmentID: instanceMessage.EnvironmentID,Metadata: &storepb.Instance{@@ -279,7 +279,7 @@ func (m *Manager) generateInstance(return errors.Wrapf(err, "failed to transfer sample database %v", dbName)}- testDatabase, err := m.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{+ testDatabase, err := m.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instance.ResourceID,DatabaseName: &dbName,IsCaseSensitive: store.IsObjectCaseSensitive(instance),diff --git a/backend/component/webhook/manager.go b/backend/component/webhook/manager.goindex acbe2a7c56..21649db393 100644--- a/backend/component/webhook/manager.go+++ b/backend/component/webhook/manager.go@@ -45,7 +45,7 @@ func NewManager(store *store.Store, iamManager *iam.Manager, profile *config.Pro}func (m *Manager) CreateEvent(ctx context.Context, e *Event) {- webhookList, err := m.store.FindProjectWebhookV2(ctx, &store.FindProjectWebhookMessage{+ webhookList, err := m.store.FindProjectWebhook(ctx, &store.FindProjectWebhookMessage{ProjectID: &e.Project.ResourceID,EventType: &e.Type,})@@ -349,7 +349,7 @@ func getUsersFromUsers(users ...*store.UserMessage) UsersGetter {// ChangeIssueStatus changes the status of an issue.func ChangeIssueStatus(ctx context.Context, stores *store.Store, webhookManager *Manager, issue *store.IssueMessage, newStatus storepb.Issue_Status, updater *store.UserMessage, comment string) error {updateIssueMessage := &store.UpdateIssueMessage{Status: &newStatus}- updatedIssue, err := stores.UpdateIssueV2(ctx, issue.UID, updateIssueMessage)+ updatedIssue, err := stores.UpdateIssue(ctx, issue.UID, updateIssueMessage)if err != nil {return errors.Wrapf(err, "failed to update issue %q's status", issue.Title)}diff --git a/backend/runner/approval/runner.go b/backend/runner/approval/runner.goindex 25a844790f..ab757c2ef9 100644--- a/backend/runner/approval/runner.go+++ b/backend/runner/approval/runner.go@@ -107,7 +107,7 @@ func (r *Runner) runOnce(ctx context.Context) {}func (r *Runner) retryFindApprovalTemplate(ctx context.Context) {- issues, err := r.store.ListIssueV2(ctx, &store.FindIssueMessage{+ issues, err := r.store.ListIssues(ctx, &store.FindIssueMessage{StatusList: []storepb.Issue_Status{storepb.Issue_OPEN},})if err != nil {@@ -458,7 +458,7 @@ func (r *Runner) buildCELVariablesForDatabaseChange(ctx context.Context, issue *var celVarsList []map[string]anyfor _, task := range pipelineCreate.Tasks {- instance, err := r.store.GetInstanceV2(ctx, &store.FindInstanceMessage{+ instance, err := r.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID,})if err != nil {@@ -484,7 +484,7 @@ func (r *Runner) buildCELVariablesForDatabaseChange(ctx context.Context, issue *databaseName = task.Payload.GetDatabaseName()environmentID = task.Payload.GetEnvironmentId()} else {- database, err := r.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{+ database, err := r.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &task.InstanceID,DatabaseName: task.DatabaseName,})@@ -572,7 +572,7 @@ func (r *Runner) buildCELVariablesForDataExport(ctx context.Context, issue *storif task.Type != storepb.Task_DATABASE_EXPORT {continue}- instance, err := r.store.GetInstanceV2(ctx, &store.FindInstanceMessage{+ instance, err := r.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID,})if err != nil {@@ -582,7 +582,7 @@ func (r *Runner) buildCELVariablesForDataExport(ctx context.Context, issue *storcontinue}- database, err := r.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{+ database, err := r.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &task.InstanceID,DatabaseName: task.DatabaseName,})@@ -685,14 +685,14 @@ func (r *Runner) getDatabaseMap(ctx context.Context, databases []string) (map[stif err != nil {return nil, err}- instance, err := r.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})+ instance, err := r.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})if err != nil {return nil, err}if instance == nil || instance.Deleted {continue}- db, err := r.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{+ db, err := r.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instanceID,DatabaseName: &databaseName,IsCaseSensitive: store.IsObjectCaseSensitive(instance),@@ -749,7 +749,7 @@ func (r *Runner) getApprovalSourceFromIssue(ctx context.Context, issue *store.Is}func updateIssueApprovalPayload(ctx context.Context, s *store.Store, issue *store.IssueMessage, approval *storepb.IssuePayloadApproval, riskLevel storepb.RiskLevel) error {- if _, err := s.UpdateIssueV2(ctx, issue.UID, &store.UpdateIssueMessage{+ if _, err := s.UpdateIssue(ctx, issue.UID, &store.UpdateIssueMessage{PayloadUpsert: &storepb.Issue{Approval: approval,RiskLevel: riskLevel,diff --git a/backend/runner/plancheck/database_connect_executor.go b/backend/runner/plancheck/database_connect_executor.goindex 8a37df227e..03206d4423 100644--- a/backend/runner/plancheck/database_connect_executor.go+++ b/backend/runner/plancheck/database_connect_executor.go@@ -31,7 +31,7 @@ type DatabaseConnectExecutor struct {// Run runs the executor.func (e *DatabaseConnectExecutor) Run(ctx context.Context, config *storepb.PlanCheckRunConfig) ([]*storepb.PlanCheckRunResult_Result, error) {- instance, err := e.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &config.InstanceId})+ instance, err := e.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &config.InstanceId})if err != nil {return nil, errors.Wrapf(err, "failed to get instance %s", config.InstanceId)}@@ -39,7 +39,7 @@ func (e *DatabaseConnectExecutor) Run(ctx context.Context, config *storepb.PlanCreturn nil, errors.Errorf("instance %s not found ", config.InstanceId)}- database, err := e.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{InstanceID: &instance.ResourceID, DatabaseName: &config.DatabaseName})+ database, err := e.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instance.ResourceID, DatabaseName: &config.DatabaseName})if err != nil {return nil, errors.Wrapf(err, "failed to get database %q", config.DatabaseName)}diff --git a/backend/runner/plancheck/ghost_sync_executor.go b/backend/runner/plancheck/ghost_sync_executor.goindex 9b05ec6944..6ebf372e4c 100644--- a/backend/runner/plancheck/ghost_sync_executor.go+++ b/backend/runner/plancheck/ghost_sync_executor.go@@ -62,7 +62,7 @@ func (e *GhostSyncExecutor) Run(ctx context.Context, config *storepb.PlanCheckRu}}()- instance, err := e.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &config.InstanceId})+ instance, err := e.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &config.InstanceId})if err != nil {return nil, errors.Wrapf(err, "failed to get instance %s", config.InstanceId)}@@ -70,7 +70,7 @@ func (e *GhostSyncExecutor) Run(ctx context.Context, config *storepb.PlanCheckRureturn nil, errors.Errorf("instance %s not found", config.InstanceId)}- database, err := e.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{InstanceID: &instance.ResourceID, DatabaseName: &config.DatabaseName})+ database, err := e.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instance.ResourceID, DatabaseName: &config.DatabaseName})if err != nil {return nil, errors.Wrapf(err, "failed to get database %q", config.DatabaseName)}diff --git a/backend/runner/plancheck/scheduler.go b/backend/runner/plancheck/scheduler.goindex ff8baf7a56..f09691c0fd 100644--- a/backend/runner/plancheck/scheduler.go+++ b/backend/runner/plancheck/scheduler.go@@ -106,7 +106,7 @@ func (s *Scheduler) runPlanCheckRun(ctx context.Context, planCheckRun *store.Plareturn}- instance, err := s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &planCheckRun.Config.InstanceId})+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &planCheckRun.Config.InstanceId})if err != nil {slog.Error("failed to find instance", slog.Int("uid", planCheckRun.UID), slog.Int64("plan_uid", planCheckRun.PlanUID), slog.String("instance", planCheckRun.Config.InstanceId))returndiff --git a/backend/runner/plancheck/statement_advise_executor.go b/backend/runner/plancheck/statement_advise_executor.goindex 1a9c15cf82..717c2ade66 100644--- a/backend/runner/plancheck/statement_advise_executor.go+++ b/backend/runner/plancheck/statement_advise_executor.go@@ -71,7 +71,7 @@ func (e *StatementAdviseExecutor) Run(ctx context.Context, config *storepb.PlanCenableGhost := config.EnableGhostenableSDL := config.EnableSdl- instance, err := e.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &config.InstanceId})+ instance, err := e.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &config.InstanceId})if err != nil {return nil, errors.Wrapf(err, "failed to get instance %s", config.InstanceId)}@@ -89,7 +89,7 @@ func (e *StatementAdviseExecutor) Run(ctx context.Context, config *storepb.PlanC}, nil}- database, err := e.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{InstanceID: &instance.ResourceID, DatabaseName: &config.DatabaseName})+ database, err := e.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instance.ResourceID, DatabaseName: &config.DatabaseName})if err != nil {return nil, errors.Wrapf(err, "failed to get database %q", config.DatabaseName)}diff --git a/backend/runner/plancheck/statement_report_executor.go b/backend/runner/plancheck/statement_report_executor.goindex 9a5e545495..809ba79b90 100644--- a/backend/runner/plancheck/statement_report_executor.go+++ b/backend/runner/plancheck/statement_report_executor.go@@ -71,7 +71,7 @@ func (e *StatementReportExecutor) Run(ctx context.Context, config *storepb.PlanCreturn nil, err}- instance, err := e.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &config.InstanceId})+ instance, err := e.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &config.InstanceId})if err != nil {return nil, errors.Wrapf(err, "failed to get instance %v", config.InstanceId)}@@ -89,7 +89,7 @@ func (e *StatementReportExecutor) Run(ctx context.Context, config *storepb.PlanC}, nil}- database, err := e.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{InstanceID: &instance.ResourceID, DatabaseName: &config.DatabaseName})+ database, err := e.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instance.ResourceID, DatabaseName: &config.DatabaseName})if err != nil {return nil, errors.Wrapf(err, "failed to get database %q", config.DatabaseName)}@@ -149,7 +149,7 @@ func GetSQLSummaryReport(ctx context.Context, stores *store.Store, sheetManagerif databaseSchema.GetProto() == nil {return nil, errors.Errorf("database schema metadata %s not found", database.String())}- instance, err := stores.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID})+ instance, err := stores.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID})if err != nil {return nil, err}@@ -286,7 +286,7 @@ func getUseDatabaseOwner(ctx context.Context, stores *store.Store, instance *sto}// Check the project setting to see if we should use the database owner.- project, err := stores.GetProjectV2(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})+ project, err := stores.GetProject(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})if err != nil {return false, errors.Wrapf(err, "failed to get project")}diff --git a/backend/runner/schemasync/syncer.go b/backend/runner/schemasync/syncer.goindex af819d43a2..278cbdd347 100644--- a/backend/runner/schemasync/syncer.go+++ b/backend/runner/schemasync/syncer.go@@ -88,7 +88,7 @@ func (s *Syncer) Run(ctx context.Context, wg *sync.WaitGroup) {for {select {case <-ticker.C:- instances, err := s.store.ListInstancesV2(ctx, &store.FindInstanceMessage{})+ instances, err := s.store.ListInstances(ctx, &store.FindInstanceMessage{})if err != nil {if err != nil {slog.Error("Failed to list instance", log.BBError(err))@@ -157,7 +157,7 @@ func (s *Syncer) trySyncAll(ctx context.Context) {}()wp := pool.New().WithMaxGoroutines(MaximumOutstanding)- instances, err := s.store.ListInstancesV2(ctx, &store.FindInstanceMessage{})+ instances, err := s.store.ListInstances(ctx, &store.FindInstanceMessage{})if err != nil {slog.Error("Failed to retrieve instances", log.BBError(err))return@@ -300,7 +300,7 @@ func (s *Syncer) SyncInstance(ctx context.Context, instance *store.InstanceMessaif instanceMeta.Version != instance.Metadata.GetVersion() {metadata.Version = instanceMeta.Version}- updatedInstance, err := s.store.UpdateInstanceV2(ctx, updateInstance)+ updatedInstance, err := s.store.UpdateInstance(ctx, updateInstance)if err != nil {return nil, nil, nil, err}@@ -354,7 +354,7 @@ func (s *Syncer) SyncInstance(ctx context.Context, instance *store.InstanceMessa// doSyncDatabaseSchema is the core implementation that syncs the schema for a database and optionally creates a sync history record.func (s *Syncer) doSyncDatabaseSchema(ctx context.Context, database *store.DatabaseMessage, createSyncHistory bool) (syncHistoryID int64, retErr error) {- instance, err := s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID})+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID})if err != nil {return 0, errors.Wrapf(err, "failed to get instance %q", database.InstanceID)}@@ -537,7 +537,7 @@ func (s *Syncer) databaseBackupAvailable(ctx context.Context, instance *store.In}case storepb.Engine_MYSQL, storepb.Engine_MSSQL, storepb.Engine_TIDB:dbName := common.BackupDatabaseNameOfEngine(instance.Metadata.GetEngine())- backupDB, err := s.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{+ backupDB, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instance.ResourceID,DatabaseName: &dbName,})@@ -548,7 +548,7 @@ func (s *Syncer) databaseBackupAvailable(ctx context.Context, instance *store.Inreturn backupDB != nilcase storepb.Engine_ORACLE:dbName := common.BackupDatabaseNameOfEngine(storepb.Engine_ORACLE)- backupDB, err := s.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{+ backupDB, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instance.ResourceID,DatabaseName: &dbName,})diff --git a/backend/runner/taskrun/data_export_executor.go b/backend/runner/taskrun/data_export_executor.goindex 73404827b5..6b96dad97f 100644--- a/backend/runner/taskrun/data_export_executor.go+++ b/backend/runner/taskrun/data_export_executor.go@@ -42,19 +42,19 @@ type DataExportExecutor struct {// RunOnce will run the data export task executor once.func (exec *DataExportExecutor) RunOnce(ctx context.Context, _ context.Context, task *store.TaskMessage, _ int) (terminated bool, result *storepb.TaskRunResult, err error) {- issue, err := exec.store.GetIssueV2(ctx, &store.FindIssueMessage{PipelineID: &task.PipelineID})+ issue, err := exec.store.GetIssue(ctx, &store.FindIssueMessage{PipelineID: &task.PipelineID})if err != nil {return true, nil, errors.Wrapf(err, "failed to get issue")}- database, err := exec.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{InstanceID: &task.InstanceID, DatabaseName: task.DatabaseName, ShowDeleted: true})+ database, err := exec.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &task.InstanceID, DatabaseName: task.DatabaseName, ShowDeleted: true})if err != nil {return true, nil, errors.Wrapf(err, "failed to get database")}if database == nil {return true, nil, errors.Errorf("database not found")}- instance, err := exec.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID, ShowDeleted: true})+ instance, err := exec.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &database.InstanceID, ShowDeleted: true})if err != nil {return true, nil, errors.Wrapf(err, "failed to get instance")}diff --git a/backend/runner/taskrun/database_create_executor.go b/backend/runner/taskrun/database_create_executor.goindex 6e0866a23f..69882c9926 100644--- a/backend/runner/taskrun/database_create_executor.go+++ b/backend/runner/taskrun/database_create_executor.go@@ -59,7 +59,7 @@ func (exec *DatabaseCreateExecutor) RunOnce(ctx context.Context, driverCtx contereturn true, nil, errors.Errorf("empty create database statement")}- instance, err := exec.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})+ instance, err := exec.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})if err != nil {return true, nil, err}@@ -68,14 +68,14 @@ func (exec *DatabaseCreateExecutor) RunOnce(ctx context.Context, driverCtx contereturn true, nil, errors.Errorf("creating database is not supported for engine %v", instance.Metadata.GetEngine().String())}- pipeline, err := exec.store.GetPipelineV2ByID(ctx, task.PipelineID)+ pipeline, err := exec.store.GetPipelineByID(ctx, task.PipelineID)if err != nil {return true, nil, errors.Wrapf(err, "failed to get pipeline")}if pipeline == nil {return true, nil, errors.Errorf("pipeline %v not found", task.PipelineID)}- project, err := exec.store.GetProjectV2(ctx, &store.FindProjectMessage{ResourceID: &pipeline.ProjectID})+ project, err := exec.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &pipeline.ProjectID})if err != nil {return true, nil, errors.Errorf("failed to find project %s", pipeline.ProjectID)}diff --git a/backend/runner/taskrun/database_migrate_executor.go b/backend/runner/taskrun/database_migrate_executor.goindex 1501c4aabd..4698e4c939 100644--- a/backend/runner/taskrun/database_migrate_executor.go+++ b/backend/runner/taskrun/database_migrate_executor.go@@ -73,21 +73,21 @@ func (exec *DatabaseMigrateExecutor) runMigrationWithPriorBackup(ctx context.Con// so this works correctly for mixed DDL+DML statements.var priorBackupDetail *storepb.PriorBackupDetailif task.Payload.GetEnablePriorBackup() {- instance, err := exec.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})+ instance, err := exec.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})if err != nil {return true, nil, errors.Wrap(err, "failed to get instance")}if instance == nil {return true, nil, errors.Errorf("instance not found for task %v", task.ID)}- database, err := exec.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{InstanceID: &task.InstanceID, DatabaseName: task.DatabaseName})+ database, err := exec.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &task.InstanceID, DatabaseName: task.DatabaseName})if err != nil {return true, nil, errors.Wrap(err, "failed to get database")}if database == nil {return true, nil, errors.Errorf("database not found for task %v", task.ID)}- issueN, err := exec.store.GetIssueV2(ctx, &store.FindIssueMessage{PipelineID: &task.PipelineID})+ issueN, err := exec.store.GetIssue(ctx, &store.FindIssueMessage{PipelineID: &task.PipelineID})if err != nil {return true, nil, errors.Wrapf(err, "failed to find issue for pipeline %v", task.PipelineID)}@@ -159,14 +159,14 @@ func (exec *DatabaseMigrateExecutor) runGhostMigration(ctx context.Context, driv}flags := task.Payload.GetFlags()- instance, err := exec.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})+ instance, err := exec.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})if err != nil {return true, nil, err}if instance == nil {return true, nil, errors.Errorf("instance %s not found", task.InstanceID)}- database, err := exec.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{InstanceID: &task.InstanceID, DatabaseName: task.DatabaseName})+ database, err := exec.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &task.InstanceID, DatabaseName: task.DatabaseName})if err != nil {return true, nil, err}@@ -252,11 +252,11 @@ func (exec *DatabaseMigrateExecutor) runGhostMigration(ctx context.Context, driv}func (exec *DatabaseMigrateExecutor) shouldSkipBackupError(ctx context.Context, task *store.TaskMessage) (bool, error) {- pipeline, pipelineErr := exec.store.GetPipelineV2ByID(ctx, task.PipelineID)+ pipeline, pipelineErr := exec.store.GetPipelineByID(ctx, task.PipelineID)if pipelineErr != nil {return false, errors.Wrapf(pipelineErr, "failed to get pipeline %v", task.PipelineID)}- project, projectErr := exec.store.GetProjectV2(ctx, &store.FindProjectMessage{ResourceID: &pipeline.ProjectID})+ project, projectErr := exec.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &pipeline.ProjectID})if projectErr != nil {return false, errors.Wrapf(projectErr, "failed to get project %v", pipeline.ProjectID)}@@ -296,7 +296,7 @@ func (exec *DatabaseMigrateExecutor) backupData(}if instance.Metadata.GetEngine() != storepb.Engine_POSTGRES {- backupDatabase, err = exec.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{InstanceID: &backupInstanceID, DatabaseName: &backupDatabaseName})+ backupDatabase, err = exec.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &backupInstanceID, DatabaseName: &backupDatabaseName})if err != nil {return nil, errors.Wrap(err, "failed to get backup database")}@@ -467,7 +467,7 @@ func (exec *DatabaseMigrateExecutor) backupData(func buildGetDatabaseMetadataFunc(storeInstance *store.Store) parserbase.GetDatabaseMetadataFunc {return func(ctx context.Context, instanceID, databaseName string) (string, *model.DatabaseMetadata, error) {- database, err := storeInstance.GetDatabaseV2(ctx, &store.FindDatabaseMessage{+ database, err := storeInstance.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &instanceID,DatabaseName: &databaseName,})diff --git a/backend/runner/taskrun/executor.go b/backend/runner/taskrun/executor.goindex 26e41393d6..0430939ca0 100644--- a/backend/runner/taskrun/executor.go+++ b/backend/runner/taskrun/executor.go@@ -109,7 +109,7 @@ func getUseDatabaseOwner(ctx context.Context, stores *store.Store, instance *sto}// Check the project setting to see if we should use the database owner.- project, err := stores.GetProjectV2(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})+ project, err := stores.GetProject(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})if err != nil {return false, errors.Wrapf(err, "failed to get project")}@@ -157,18 +157,18 @@ func runMigrationWithFunc(}func getMigrationInfo(ctx context.Context, stores *store.Store, profile *config.Profile, syncer *schemasync.Syncer, task *store.TaskMessage, schemaVersion string, sheetID *int, taskRunUID int, dbFactory *dbfactory.DBFactory) (*migrateContext, error) {- instance, err := stores.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})+ instance, err := stores.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})if err != nil {return nil, err}- database, err := stores.GetDatabaseV2(ctx, &store.FindDatabaseMessage{InstanceID: &task.InstanceID, DatabaseName: task.DatabaseName})+ database, err := stores.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &task.InstanceID, DatabaseName: task.DatabaseName})if err != nil {return nil, err}if database == nil {return nil, errors.Errorf("database not found")}- pipeline, err := stores.GetPipelineV2ByID(ctx, task.PipelineID)+ pipeline, err := stores.GetPipelineByID(ctx, task.PipelineID)if err != nil {return nil, errors.Wrapf(err, "failed to get pipeline")}@@ -252,7 +252,7 @@ func getMigrationInfo(ctx context.Context, stores *store.Store, profile *config.if foundChangedResources {break}- taskInstance, err := stores.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})+ taskInstance, err := stores.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})if err != nil {return nil, err}@@ -285,7 +285,7 @@ func getMigrationInfo(ctx context.Context, stores *store.Store, profile *config.}}- issue, err := stores.GetIssueV2(ctx, &store.FindIssueMessage{PipelineID: &task.PipelineID})+ issue, err := stores.GetIssue(ctx, &store.FindIssueMessage{PipelineID: &task.PipelineID})if err != nil {slog.Error("failed to find containing issue", log.BBError(err))}@@ -330,7 +330,7 @@ func doMigrationWithFunc(opts := db.ExecuteOptions{}- project, err := stores.GetProjectV2(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})+ project, err := stores.GetProject(ctx, &store.FindProjectMessage{ResourceID: &database.ProjectID})if err != nil {return false, errors.Wrapf(err, "failed to get project %v for database %v", database.ProjectID, database.DatabaseName)}diff --git a/backend/runner/taskrun/schedulerv2.go b/backend/runner/taskrun/scheduler.gosimilarity index 90%rename from backend/runner/taskrun/schedulerv2.gorename to backend/runner/taskrun/scheduler.goindex 5ce9851698..f03b29694b 100644--- a/backend/runner/taskrun/schedulerv2.go+++ b/backend/runner/taskrun/scheduler.go@@ -33,8 +33,8 @@ const (// No limit by default.const defaultRolloutMaxRunningTaskRuns = 0-// SchedulerV2 is the V2 scheduler for task run.-type SchedulerV2 struct {+// Scheduler is the scheduler for task run.+type Scheduler struct {store *store.StorestateCfg *state.StatewebhookManager *webhook.Manager@@ -43,15 +43,15 @@ type SchedulerV2 struct {licenseService *enterprise.LicenseService}-// NewSchedulerV2 will create a new scheduler.-func NewSchedulerV2(+// NewScheduler will create a new scheduler.+func NewScheduler(store *store.Store,stateCfg *state.State,webhookManager *webhook.Manager,profile *config.Profile,licenseService *enterprise.LicenseService,-) *SchedulerV2 {- return &SchedulerV2{+) *Scheduler {+ return &Scheduler{store: store,stateCfg: stateCfg,webhookManager: webhookManager,@@ -62,7 +62,7 @@ func NewSchedulerV2(}// Register will register a task executor factory.-func (s *SchedulerV2) Register(taskType storepb.Task_Type, executorGetter Executor) {+func (s *Scheduler) Register(taskType storepb.Task_Type, executorGetter Executor) {if executorGetter == nil {panic("scheduler: Register executor is nil for task type: " + taskType.String())}@@ -73,7 +73,7 @@ func (s *SchedulerV2) Register(taskType storepb.Task_Type, executorGetter Execut}// Run will start the scheduler.-func (s *SchedulerV2) Run(ctx context.Context, wg *sync.WaitGroup) {+func (s *Scheduler) Run(ctx context.Context, wg *sync.WaitGroup) {go s.ListenTaskSkippedOrDone(ctx)ticker := time.NewTicker(taskSchedulerInterval)@@ -92,7 +92,7 @@ func (s *SchedulerV2) Run(ctx context.Context, wg *sync.WaitGroup) {}}-func (s *SchedulerV2) runOnce(ctx context.Context) {+func (s *Scheduler) runOnce(ctx context.Context) {defer func() {if r := recover(); r != nil {err, ok := r.(error)@@ -116,7 +116,7 @@ func (s *SchedulerV2) runOnce(ctx context.Context) {}}-func (s *SchedulerV2) scheduleAutoRolloutTasks(ctx context.Context) error {+func (s *Scheduler) scheduleAutoRolloutTasks(ctx context.Context) error {environments, err := s.store.GetEnvironment(ctx)if err != nil {return errors.Wrapf(err, "failed to list environments")@@ -145,8 +145,8 @@ func (s *SchedulerV2) scheduleAutoRolloutTasks(ctx context.Context) error {return nil}-func (s *SchedulerV2) scheduleAutoRolloutTask(ctx context.Context, taskUID int) error {- task, err := s.store.GetTaskV2ByID(ctx, taskUID)+func (s *Scheduler) scheduleAutoRolloutTask(ctx context.Context, taskUID int) error {+ task, err := s.store.GetTaskByID(ctx, taskUID)if err != nil {return errors.Wrapf(err, "failed to get task")}@@ -154,7 +154,7 @@ func (s *SchedulerV2) scheduleAutoRolloutTask(ctx context.Context, taskUID int)return nil}- pipeline, err := s.store.GetPipelineV2ByID(ctx, task.PipelineID)+ pipeline, err := s.store.GetPipelineByID(ctx, task.PipelineID)if err != nil {return errors.Wrapf(err, "failed to get pipeline")}@@ -162,7 +162,7 @@ func (s *SchedulerV2) scheduleAutoRolloutTask(ctx context.Context, taskUID int)return errors.Errorf("pipeline %v not found", task.PipelineID)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{ResourceID: &pipeline.ProjectID})+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &pipeline.ProjectID})if err != nil {return errors.Wrapf(err, "failed to get project")}@@ -170,7 +170,7 @@ func (s *SchedulerV2) scheduleAutoRolloutTask(ctx context.Context, taskUID int)return errors.Errorf("project %v not found", pipeline.ProjectID)}- instance, err := s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})if err != nil {return err}@@ -184,7 +184,7 @@ func (s *SchedulerV2) scheduleAutoRolloutTask(ctx context.Context, taskUID int)return errors.Wrapf(err, "failed to get rollout policy for environment %s", task.Environment)}- issue, err := s.store.GetIssueV2(ctx, &store.FindIssueMessage{PipelineID: &task.PipelineID})+ issue, err := s.store.GetIssue(ctx, &store.FindIssueMessage{PipelineID: &task.PipelineID})if err != nil {return err}@@ -281,8 +281,8 @@ func (s *SchedulerV2) scheduleAutoRolloutTask(ctx context.Context, taskUID int)return nil}-func (s *SchedulerV2) schedulePendingTaskRuns(ctx context.Context) error {- taskRuns, err := s.store.ListTaskRunsV2(ctx, &store.FindTaskRunMessage{+func (s *Scheduler) schedulePendingTaskRuns(ctx context.Context) error {+ taskRuns, err := s.store.ListTaskRuns(ctx, &store.FindTaskRunMessage{Status: &[]storepb.TaskRun_Status{storepb.TaskRun_PENDING},})if err != nil {@@ -297,13 +297,13 @@ func (s *SchedulerV2) schedulePendingTaskRuns(ctx context.Context) error {return nil}-func (s *SchedulerV2) schedulePendingTaskRun(ctx context.Context, taskRun *store.TaskRunMessage) error {+func (s *Scheduler) schedulePendingTaskRun(ctx context.Context, taskRun *store.TaskRunMessage) error {// here, we move pending taskruns to running taskruns which means they are ready to be executed.// pending taskruns remain pending if// 1. taskRun.RunAt not met.// 2. for versioned tasks, there are other versioned tasks on the same database with// a smaller version not finished yet. we need to wait for those first.- task, err := s.store.GetTaskV2ByID(ctx, taskRun.TaskUID)+ task, err := s.store.GetTaskByID(ctx, taskRun.TaskUID)if err != nil {return errors.Wrapf(err, "failed to get task")}@@ -362,8 +362,8 @@ func (s *SchedulerV2) schedulePendingTaskRun(ctx context.Context, taskRun *storereturn nil}-func (s *SchedulerV2) scheduleRunningTaskRuns(ctx context.Context) error {- taskRuns, err := s.store.ListTaskRunsV2(ctx, &store.FindTaskRunMessage{+func (s *Scheduler) scheduleRunningTaskRuns(ctx context.Context) error {+ taskRuns, err := s.store.ListTaskRuns(ctx, &store.FindTaskRunMessage{Status: &[]storepb.TaskRun_Status{storepb.TaskRun_RUNNING},})if err != nil {@@ -377,7 +377,7 @@ func (s *SchedulerV2) scheduleRunningTaskRuns(ctx context.Context) error {// 2.1. Rollout 1 tasks will be run before rollout 2 tasks. Where, rollout 1 tasks are created before rollout 2 tasks.minTaskIDForDatabase := map[string]int{}for _, taskRun := range taskRuns {- task, err := s.store.GetTaskV2ByID(ctx, taskRun.TaskUID)+ task, err := s.store.GetTaskByID(ctx, taskRun.TaskUID)if err != nil {slog.Error("failed to get task", slog.Int("task id", taskRun.TaskUID), log.BBError(err))continue@@ -405,12 +405,12 @@ func (s *SchedulerV2) scheduleRunningTaskRuns(ctx context.Context) error {return nil}-func (s *SchedulerV2) scheduleRunningTaskRun(ctx context.Context, taskRun *store.TaskRunMessage, minTaskIDForDatabase map[string]int) error {+func (s *Scheduler) scheduleRunningTaskRun(ctx context.Context, taskRun *store.TaskRunMessage, minTaskIDForDatabase map[string]int) error {// Skip the task run if it is already executing.if _, ok := s.stateCfg.RunningTaskRuns.Load(taskRun.ID); ok {return nil}- task, err := s.store.GetTaskV2ByID(ctx, taskRun.TaskUID)+ task, err := s.store.GetTaskByID(ctx, taskRun.TaskUID)if err != nil {return errors.Wrapf(err, "failed to get task")}@@ -442,7 +442,7 @@ func (s *SchedulerV2) scheduleRunningTaskRun(ctx context.Context, taskRun *store}}- instance, err := s.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})if err != nil {return errors.Wrapf(err, "failed to get instance")}@@ -479,7 +479,7 @@ func (s *SchedulerV2) scheduleRunningTaskRun(ctx context.Context, taskRun *store}()// Check max running task runs per rollout.- pipeline, err := s.store.GetPipelineV2ByID(ctx, task.PipelineID)+ pipeline, err := s.store.GetPipelineByID(ctx, task.PipelineID)if err != nil {return errors.Wrapf(err, "failed to get pipeline")}@@ -487,7 +487,7 @@ func (s *SchedulerV2) scheduleRunningTaskRun(ctx context.Context, taskRun *storereturn errors.Errorf("pipeline %v not found", task.PipelineID)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{ResourceID: &pipeline.ProjectID})+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &pipeline.ProjectID})if err != nil {return errors.Wrapf(err, "failed to get project")}@@ -549,7 +549,7 @@ func (s *SchedulerV2) scheduleRunningTaskRun(ctx context.Context, taskRun *storereturn nil}-func (s *SchedulerV2) runTaskRunOnce(ctx context.Context, taskRun *store.TaskRunMessage, task *store.TaskMessage, executor Executor) {+func (s *Scheduler) runTaskRunOnce(ctx context.Context, taskRun *store.TaskRunMessage, task *store.TaskMessage, executor Executor) {defer func() {if r := recover(); r != nil {err, ok := r.(error)@@ -663,7 +663,7 @@ func (s *SchedulerV2) runTaskRunOnce(ctx context.Context, taskRun *store.TaskRunreturn}if err := func() error {- issue, err := s.store.GetIssueV2(ctx, &store.FindIssueMessage{+ issue, err := s.store.GetIssue(ctx, &store.FindIssueMessage{PipelineID: &task.PipelineID,})if err != nil {@@ -707,7 +707,7 @@ func (s *SchedulerV2) runTaskRunOnce(ctx context.Context, taskRun *store.TaskRunreturn}if err := func() error {- issue, err := s.store.GetIssueV2(ctx, &store.FindIssueMessage{+ issue, err := s.store.GetIssue(ctx, &store.FindIssueMessage{PipelineID: &task.PipelineID,})if err != nil {@@ -740,7 +740,7 @@ func getDatabaseKey(instanceID, databaseName string) string {return fmt.Sprintf("%s/%s", instanceID, databaseName)}-func (s *SchedulerV2) ListenTaskSkippedOrDone(ctx context.Context) {+func (s *Scheduler) ListenTaskSkippedOrDone(ctx context.Context) {defer func() {if r := recover(); r != nil {err, ok := r.(error)@@ -761,7 +761,7 @@ func (s *SchedulerV2) ListenTaskSkippedOrDone(ctx context.Context) {select {case taskUID := <-s.stateCfg.TaskSkippedOrDoneChan:if err := func() error {- task, err := s.store.GetTaskV2ByID(ctx, taskUID)+ task, err := s.store.GetTaskByID(ctx, taskUID)if err != nil {return errors.Wrapf(err, "failed to get task")}@@ -831,21 +831,21 @@ func (s *SchedulerV2) ListenTaskSkippedOrDone(ctx context.Context) {}}- pipeline, err := s.store.GetPipelineV2ByID(ctx, task.PipelineID)+ pipeline, err := s.store.GetPipelineByID(ctx, task.PipelineID)if err != nil {return errors.Wrapf(err, "failed to get pipeline")}if pipeline == nil {return errors.Errorf("pipeline %v not found", task.PipelineID)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{ResourceID: &pipeline.ProjectID})+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &pipeline.ProjectID})if err != nil {return errors.Wrapf(err, "failed to get project")}if project == nil {return errors.Errorf("project %v not found", pipeline.ProjectID)}- issueN, err := s.store.GetIssueV2(ctx, &store.FindIssueMessage{PipelineID: &task.PipelineID})+ issueN, err := s.store.GetIssue(ctx, &store.FindIssueMessage{PipelineID: &task.PipelineID})if err != nil {return errors.Wrapf(err, "failed to get issue")}@@ -919,7 +919,7 @@ func (s *SchedulerV2) ListenTaskSkippedOrDone(ctx context.Context) {}newStatus := storepb.Issue_DONE- updatedIssue, err := s.store.UpdateIssueV2(ctx, issueN.UID, &store.UpdateIssueMessage{Status: &newStatus})+ updatedIssue, err := s.store.UpdateIssue(ctx, issueN.UID, &store.UpdateIssueMessage{Status: &newStatus})if err != nil {return errors.Wrapf(err, "failed to update issue status")}@@ -963,23 +963,23 @@ func (s *SchedulerV2) ListenTaskSkippedOrDone(ctx context.Context) {}}-func (s *SchedulerV2) createActivityForTaskRunStatusUpdate(ctx context.Context, task *store.TaskMessage, newStatus storepb.TaskRun_Status, errDetail string) {+func (s *Scheduler) createActivityForTaskRunStatusUpdate(ctx context.Context, task *store.TaskMessage, newStatus storepb.TaskRun_Status, errDetail string) {if err := func() error {- rollout, err := s.store.GetPipelineV2ByID(ctx, task.PipelineID)+ rollout, err := s.store.GetPipelineByID(ctx, task.PipelineID)if err != nil {return errors.Wrapf(err, "failed to get pipeline")}if rollout == nil {return errors.Errorf("pipeline %v not found", task.PipelineID)}- project, err := s.store.GetProjectV2(ctx, &store.FindProjectMessage{ResourceID: &rollout.ProjectID})+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &rollout.ProjectID})if err != nil {return errors.Wrapf(err, "failed to get project")}if project == nil {return errors.Errorf("project %v not found", rollout.ProjectID)}- issue, err := s.store.GetIssueV2(ctx, &store.FindIssueMessage{+ issue, err := s.store.GetIssue(ctx, &store.FindIssueMessage{PipelineID: &task.PipelineID,})if err != nil {diff --git a/backend/runner/taskrun/schema_update_sdl_executor.go b/backend/runner/taskrun/schema_update_sdl_executor.goindex 6dccdb527e..dae0594d46 100644--- a/backend/runner/taskrun/schema_update_sdl_executor.go+++ b/backend/runner/taskrun/schema_update_sdl_executor.go@@ -42,11 +42,11 @@ type SchemaDeclareExecutor struct {// RunOnce will run the schema declare (SDL) task executor once.func (exec *SchemaDeclareExecutor) RunOnce(ctx context.Context, driverCtx context.Context, task *store.TaskMessage, taskRunUID int) (bool, *storepb.TaskRunResult, error) {- instance, err := exec.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})+ instance, err := exec.store.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &task.InstanceID})if err != nil {return true, nil, err}- database, err := exec.store.GetDatabaseV2(ctx, &store.FindDatabaseMessage{InstanceID: &task.InstanceID, DatabaseName: task.DatabaseName})+ database, err := exec.store.GetDatabase(ctx, &store.FindDatabaseMessage{InstanceID: &task.InstanceID, DatabaseName: task.DatabaseName})if err != nil {return true, nil, err}@@ -184,7 +184,7 @@ func getPreviousSuccessfulSDLAndSchema(ctx context.Context, s *store.Store, instif syncHistory != nil && syncHistory.Metadata != nil {// Get instance to determine engine and case sensitivity- instance, err := s.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})+ instance, err := s.GetInstance(ctx, &store.FindInstanceMessage{ResourceID: &instanceID})if err != nil {return "", nil, errors.Wrapf(err, "failed to get instance %s", instanceID)}diff --git a/backend/server/server.go b/backend/server/server.goindex f4cd844966..c25a0900c2 100644--- a/backend/server/server.go+++ b/backend/server/server.go@@ -56,7 +56,7 @@ const (// Server is the Bytebase server.type Server struct {// Asynchronous runners.- taskSchedulerV2 *taskrun.SchedulerV2+ taskScheduler *taskrun.SchedulerplanCheckScheduler *plancheck.SchedulermetricReporter *metricreport.ReporterschemaSyncer *schemasync.Syncer@@ -168,10 +168,11 @@ func NewServer(ctx context.Context, profile *config.Profile) (*Server, error) {s.licenseService.LoadSubscription(ctx)// Settings are now initialized in the database schema (LATEST.sql)- secret, err := s.store.GetSecret(ctx)+ systemSetting, err := s.store.GetSystemSetting(ctx)if err != nil {- return nil, errors.Wrapf(err, "failed to get secret")+ return nil, errors.Wrap(err, "failed to get system setting")}+ secret := systemSetting.AuthSecrets.iamManager, err = iam.NewManager(stores, s.licenseService)if err := s.iamManager.ReloadCache(ctx); err != nil {return nil, errors.Wrapf(err, "failed to reload iam cache")@@ -189,11 +190,11 @@ func NewServer(ctx context.Context, profile *config.Profile) (*Server, error) {s.schemaSyncer = schemasync.NewSyncer(stores, s.dbFactory, s.profile, s.stateCfg, s.licenseService)s.approvalRunner = approval.NewRunner(stores, sheetManager, s.dbFactory, s.stateCfg, s.webhookManager, s.licenseService)- s.taskSchedulerV2 = taskrun.NewSchedulerV2(stores, s.stateCfg, s.webhookManager, profile, s.licenseService)- s.taskSchedulerV2.Register(storepb.Task_DATABASE_CREATE, taskrun.NewDatabaseCreateExecutor(stores, s.dbFactory, s.schemaSyncer, s.stateCfg, profile))- s.taskSchedulerV2.Register(storepb.Task_DATABASE_MIGRATE, taskrun.NewDatabaseMigrateExecutor(stores, s.dbFactory, s.licenseService, s.stateCfg, s.schemaSyncer, profile))- s.taskSchedulerV2.Register(storepb.Task_DATABASE_EXPORT, taskrun.NewDataExportExecutor(stores, s.dbFactory, s.licenseService, s.stateCfg, s.schemaSyncer, profile))- s.taskSchedulerV2.Register(storepb.Task_DATABASE_SDL, taskrun.NewSchemaDeclareExecutor(stores, s.dbFactory, s.licenseService, s.stateCfg, s.schemaSyncer, profile))+ s.taskScheduler = taskrun.NewScheduler(stores, s.stateCfg, s.webhookManager, profile, s.licenseService)+ s.taskScheduler.Register(storepb.Task_DATABASE_CREATE, taskrun.NewDatabaseCreateExecutor(stores, s.dbFactory, s.schemaSyncer, s.stateCfg, profile))+ s.taskScheduler.Register(storepb.Task_DATABASE_MIGRATE, taskrun.NewDatabaseMigrateExecutor(stores, s.dbFactory, s.licenseService, s.stateCfg, s.schemaSyncer, profile))+ s.taskScheduler.Register(storepb.Task_DATABASE_EXPORT, taskrun.NewDataExportExecutor(stores, s.dbFactory, s.licenseService, s.stateCfg, s.schemaSyncer, profile))+ s.taskScheduler.Register(storepb.Task_DATABASE_SDL, taskrun.NewSchemaDeclareExecutor(stores, s.dbFactory, s.licenseService, s.stateCfg, s.schemaSyncer, profile))s.planCheckScheduler = plancheck.NewScheduler(stores, s.licenseService, s.stateCfg)databaseConnectExecutor := plancheck.NewDatabaseConnectExecutor(stores, s.dbFactory)@@ -231,7 +232,7 @@ func (s *Server) Run(ctx context.Context, port int) error {s.cancel = cancel// runnerWG waits for all goroutines to complete.s.runnerWG.Add(1)- go s.taskSchedulerV2.Run(ctx, &s.runnerWG)+ go s.taskScheduler.Run(ctx, &s.runnerWG)s.runnerWG.Add(1)go s.schemaSyncer.Run(ctx, &s.runnerWG)s.runnerWG.Add(1)diff --git a/backend/store/database.go b/backend/store/database.goindex e0253f7c70..e097cb460d 100644--- a/backend/store/database.go+++ b/backend/store/database.go@@ -75,8 +75,8 @@ type FindDatabaseMessage struct {Offset *int}-// GetDatabaseV2 gets a database.-func (s *Store) GetDatabaseV2(ctx context.Context, find *FindDatabaseMessage) (*DatabaseMessage, error) {+// GetDatabase gets a database.+func (s *Store) GetDatabase(ctx context.Context, find *FindDatabaseMessage) (*DatabaseMessage, error) {if find.InstanceID != nil && find.DatabaseName != nil {if v, ok := s.databaseCache.Get(getDatabaseCacheKey(*find.InstanceID, *find.DatabaseName)); ok && s.enableCache {return v, nil@@ -89,7 +89,7 @@ func (s *Store) GetDatabaseV2(ctx context.Context, find *FindDatabaseMessage) (*}defer tx.Rollback()- databases, err := s.listDatabaseImplV2(ctx, tx, find)+ databases, err := s.listDatabaseImpl(ctx, tx, find)if err != nil {return nil, err}@@ -117,7 +117,7 @@ func (s *Store) ListDatabases(ctx context.Context, find *FindDatabaseMessage) ([}defer tx.Rollback()- databases, err := s.listDatabaseImplV2(ctx, tx, find)+ databases, err := s.listDatabaseImpl(ctx, tx, find)if err != nil {return nil, err}@@ -150,7 +150,7 @@ func (s *Store) CreateDatabaseDefault(ctx context.Context, create *DatabaseMessa// Invalidate an update the cache.s.databaseCache.Remove(getDatabaseCacheKey(create.InstanceID, create.DatabaseName))- return s.GetDatabaseV2(ctx, &FindDatabaseMessage{InstanceID: &create.InstanceID, DatabaseName: &create.DatabaseName, ShowDeleted: true})+ return s.GetDatabase(ctx, &FindDatabaseMessage{InstanceID: &create.InstanceID, DatabaseName: &create.DatabaseName, ShowDeleted: true})}// createDatabaseDefault only creates a default database with charset, collation only in the default project.@@ -241,7 +241,7 @@ func (s *Store) UpsertDatabase(ctx context.Context, create *DatabaseMessage) (*D// Invalidate and update the cache.s.databaseCache.Remove(getDatabaseCacheKey(create.InstanceID, create.DatabaseName))- return s.GetDatabaseV2(ctx, &FindDatabaseMessage{InstanceID: &create.InstanceID, DatabaseName: &create.DatabaseName, ShowDeleted: true})+ return s.GetDatabase(ctx, &FindDatabaseMessage{InstanceID: &create.InstanceID, DatabaseName: &create.DatabaseName, ShowDeleted: true})}// UpdateDatabase updates a database.@@ -262,7 +262,7 @@ func (s *Store) UpdateDatabase(ctx context.Context, patch *UpdateDatabaseMessageset.Comma("deleted = ?", *v)}if fs := patch.MetadataUpdates; len(fs) > 0 {- database, err := s.GetDatabaseV2(ctx, &FindDatabaseMessage{+ database, err := s.GetDatabase(ctx, &FindDatabaseMessage{InstanceID: &patch.InstanceID,DatabaseName: &patch.DatabaseName,})@@ -307,7 +307,7 @@ func (s *Store) UpdateDatabase(ctx context.Context, patch *UpdateDatabaseMessage// Invalidate and update database cache.s.databaseCache.Remove(getDatabaseCacheKey(patch.InstanceID, patch.DatabaseName))- return s.GetDatabaseV2(ctx, &FindDatabaseMessage{InstanceID: &patch.InstanceID, DatabaseName: &patch.DatabaseName, ShowDeleted: true})+ return s.GetDatabase(ctx, &FindDatabaseMessage{InstanceID: &patch.InstanceID, DatabaseName: &patch.DatabaseName, ShowDeleted: true})}// BatchUpdateDatabases update databases in batch.@@ -379,7 +379,7 @@ func (s *Store) BatchUpdateDatabases(ctx context.Context, databases []*DatabaseMif update.EnvironmentID != nil {updatedDatabase.EnvironmentID = update.EnvironmentIDif *update.EnvironmentID == "" {- instance, err := s.GetInstanceV2(ctx, &FindInstanceMessage{ResourceID: &database.InstanceID})+ instance, err := s.GetInstance(ctx, &FindInstanceMessage{ResourceID: &database.InstanceID})if err != nil {// Should not reach here.return nil, err@@ -395,7 +395,7 @@ func (s *Store) BatchUpdateDatabases(ctx context.Context, databases []*DatabaseMreturn updatedDatabases, nil}-func (*Store) listDatabaseImplV2(ctx context.Context, txn *sql.Tx, find *FindDatabaseMessage) ([]*DatabaseMessage, error) {+func (*Store) listDatabaseImpl(ctx context.Context, txn *sql.Tx, find *FindDatabaseMessage) ([]*DatabaseMessage, error) {from := qb.Q().Space("db")where := qb.Q().Space("TRUE")diff --git a/backend/store/db_schema.go b/backend/store/db_schema.goindex d8d488e86e..44ba0a9424 100644--- a/backend/store/db_schema.go+++ b/backend/store/db_schema.go@@ -188,7 +188,7 @@ func (s *Store) convertMetadataAndConfig(ctx context.Context, metadata, schema,if err := common.ProtojsonUnmarshaler.Unmarshal(config, &databaseConfig); err != nil {return nil, err}- instance, err := s.GetInstanceV2(ctx, &FindInstanceMessage{ResourceID: &instanceID})+ instance, err := s.GetInstance(ctx, &FindInstanceMessage{ResourceID: &instanceID})if err != nil {return nil, err}diff --git a/backend/store/instance.go b/backend/store/instance.goindex f489f473c4..ef20165856 100644--- a/backend/store/instance.go+++ b/backend/store/instance.go@@ -49,8 +49,8 @@ type FindInstanceMessage struct {FilterQ *qb.Query}-// GetInstanceV2 gets an instance by the resource_id.-func (s *Store) GetInstanceV2(ctx context.Context, find *FindInstanceMessage) (*InstanceMessage, error) {+// GetInstance gets an instance by the resource_id.+func (s *Store) GetInstance(ctx context.Context, find *FindInstanceMessage) (*InstanceMessage, error) {if find.ResourceID != nil {if v, ok := s.instanceCache.Get(getInstanceCacheKey(*find.ResourceID)); ok && s.enableCache {return v, nil@@ -60,7 +60,7 @@ func (s *Store) GetInstanceV2(ctx context.Context, find *FindInstanceMessage) (*// We will always return the resource regardless of its deleted state.find.ShowDeleted = true- instances, err := s.ListInstancesV2(ctx, find)+ instances, err := s.ListInstances(ctx, find)if err != nil {return nil, errors.Wrapf(err, "failed to list instances with find instance message %+v", find)}@@ -76,15 +76,15 @@ func (s *Store) GetInstanceV2(ctx context.Context, find *FindInstanceMessage) (*return instance, nil}-// ListInstancesV2 lists all instance.-func (s *Store) ListInstancesV2(ctx context.Context, find *FindInstanceMessage) ([]*InstanceMessage, error) {+// ListInstances lists all instance.+func (s *Store) ListInstances(ctx context.Context, find *FindInstanceMessage) ([]*InstanceMessage, error) {tx, err := s.GetDB().BeginTx(ctx, &sql.TxOptions{ReadOnly: true})if err != nil {return nil, err}defer tx.Rollback()- instances, err := s.listInstanceImplV2(ctx, tx, find)+ instances, err := s.listInstanceImpl(ctx, tx, find)if err != nil {return nil, err}@@ -99,8 +99,8 @@ func (s *Store) ListInstancesV2(ctx context.Context, find *FindInstanceMessage)return instances, nil}-// CreateInstanceV2 creates an instance.-func (s *Store) CreateInstanceV2(ctx context.Context, instanceCreate *InstanceMessage) (*InstanceMessage, error) {+// CreateInstance creates an instance.+func (s *Store) CreateInstance(ctx context.Context, instanceCreate *InstanceMessage) (*InstanceMessage, error) {if err := validateDataSources(instanceCreate.Metadata); err != nil {return nil, err}@@ -151,8 +151,8 @@ func (s *Store) CreateInstanceV2(ctx context.Context, instanceCreate *InstanceMereturn instance, nil}-// UpdateInstanceV2 updates an instance.-func (s *Store) UpdateInstanceV2(ctx context.Context, patch *UpdateInstanceMessage) (*InstanceMessage, error) {+// UpdateInstance updates an instance.+func (s *Store) UpdateInstance(ctx context.Context, patch *UpdateInstanceMessage) (*InstanceMessage, error) {set := qb.Q()if v := patch.EnvironmentID; v != nil {@@ -218,13 +218,13 @@ func (s *Store) UpdateInstanceV2(ctx context.Context, patch *UpdateInstanceMessaif v := patch.ResourceID; v != nil {s.instanceCache.Remove(getInstanceCacheKey(*v))- return s.GetInstanceV2(ctx, &FindInstanceMessage{ResourceID: v})+ return s.GetInstance(ctx, &FindInstanceMessage{ResourceID: v})}return nil, nil}-func (s *Store) listInstanceImplV2(ctx context.Context, txn *sql.Tx, find *FindInstanceMessage) ([]*InstanceMessage, error) {+func (s *Store) listInstanceImpl(ctx context.Context, txn *sql.Tx, find *FindInstanceMessage) ([]*InstanceMessage, error) {where := qb.Q().Space("TRUE")from := qb.Q().Space("instance")if filterQ := find.FilterQ; filterQ != nil {@@ -362,10 +362,11 @@ func IsObjectCaseSensitive(instance *InstanceMessage) bool {}func (s *Store) obfuscateInstance(ctx context.Context, instance *storepb.Instance) (*storepb.Instance, error) {- secret, err := s.GetSecret(ctx)+ systemSetting, err := s.GetSystemSetting(ctx)if err != nil {- return nil, err+ return nil, errors.Wrap(err, "failed to get system setting")}+ secret := systemSetting.AuthSecretredacted := proto.CloneOf(instance)for _, ds := range redacted.GetDataSources() {@@ -419,10 +420,11 @@ func (s *Store) obfuscateInstance(ctx context.Context, instance *storepb.Instanc}func (s *Store) unObfuscateInstance(ctx context.Context, instance *storepb.Instance) error {- secret, err := s.GetSecret(ctx)+ systemSetting, err := s.GetSystemSetting(ctx)if err != nil {- return err+ return errors.Wrap(err, "failed to get system setting")}+ secret := systemSetting.AuthSecretfor _, ds := range instance.GetDataSources() {password, err := common.Unobfuscate(ds.GetObfuscatedPassword(), secret)@@ -540,7 +542,7 @@ func (s *Store) unObfuscateInstance(ctx context.Context, instance *storepb.Insta// HasSampleInstances checks if there are sample instances in the database.func (s *Store) HasSampleInstances(ctx context.Context) (bool, error) {- instances, err := s.ListInstancesV2(ctx, &FindInstanceMessage{+ instances, err := s.ListInstances(ctx, &FindInstanceMessage{ResourceIDs: &[]string{"test-sample-instance", "prod-sample-instance"},ShowDeleted: false,})diff --git a/backend/store/issue.go b/backend/store/issue.goindex 4cc0e3fa6c..166be4608c 100644--- a/backend/store/issue.go+++ b/backend/store/issue.go@@ -98,8 +98,8 @@ type FindIssueMessage struct {NoPipeline bool}-// GetIssueV2 gets issue by issue UID.-func (s *Store) GetIssueV2(ctx context.Context, find *FindIssueMessage) (*IssueMessage, error) {+// GetIssue gets issue by issue UID.+func (s *Store) GetIssue(ctx context.Context, find *FindIssueMessage) (*IssueMessage, error) {if find.UID != nil {if v, ok := s.issueCache.Get(*find.UID); ok && s.enableCache {return v, nil@@ -111,7 +111,7 @@ func (s *Store) GetIssueV2(ctx context.Context, find *FindIssueMessage) (*IssueM}}- issues, err := s.ListIssueV2(ctx, find)+ issues, err := s.ListIssues(ctx, find)if err != nil {return nil, err}@@ -130,8 +130,8 @@ func (s *Store) GetIssueV2(ctx context.Context, find *FindIssueMessage) (*IssueMreturn issue, nil}-// CreateIssueV2 creates a new issue.-func (s *Store) CreateIssueV2(ctx context.Context, create *IssueMessage, creatorID int) (*IssueMessage, error) {+// CreateIssue creates a new issue.+func (s *Store) CreateIssue(ctx context.Context, create *IssueMessage, creatorID int) (*IssueMessage, error) {create.Status = storepb.Issue_OPENpayload, err := protojson.Marshal(create.Payload)if err != nil {@@ -185,12 +185,12 @@ func (s *Store) CreateIssueV2(ctx context.Context, create *IssueMessage, creatorreturn nil, err}- return s.GetIssueV2(ctx, &FindIssueMessage{UID: &create.UID})+ return s.GetIssue(ctx, &FindIssueMessage{UID: &create.UID})}-// UpdateIssueV2 updates an issue.-func (s *Store) UpdateIssueV2(ctx context.Context, uid int, patch *UpdateIssueMessage) (*IssueMessage, error) {- oldIssue, err := s.GetIssueV2(ctx, &FindIssueMessage{UID: &uid})+// UpdateIssue updates an issue.+func (s *Store) UpdateIssue(ctx context.Context, uid int, patch *UpdateIssueMessage) (*IssueMessage, error) {+ oldIssue, err := s.GetIssue(ctx, &FindIssueMessage{UID: &uid})if err != nil {return nil, err}@@ -257,11 +257,11 @@ func (s *Store) UpdateIssueV2(ctx context.Context, uid int, patch *UpdateIssueMeif oldIssue.PipelineUID != nil {s.issueByPipelineCache.Remove(*oldIssue.PipelineUID)}- return s.GetIssueV2(ctx, &FindIssueMessage{UID: &uid})+ return s.GetIssue(ctx, &FindIssueMessage{UID: &uid})}-// ListIssueV2 returns the list of issues by find query.-func (s *Store) ListIssueV2(ctx context.Context, find *FindIssueMessage) ([]*IssueMessage, error) {+// ListIssues returns the list of issues by find query.+func (s *Store) ListIssues(ctx context.Context, find *FindIssueMessage) ([]*IssueMessage, error) {orderByClause := "ORDER BY issue.id DESC"from := qb.Q().Space("issue")where := qb.Q()@@ -461,7 +461,7 @@ func (s *Store) ListIssueV2(ctx context.Context, find *FindIssueMessage) ([]*Iss// Populate from internal fields.for _, issue := range issues {- project, err := s.GetProjectV2(ctx, &FindProjectMessage{ResourceID: &issue.projectID})+ project, err := s.GetProject(ctx, &FindProjectMessage{ResourceID: &issue.projectID})if err != nil {return nil, err}diff --git a/backend/store/pipeline.go b/backend/store/pipeline.goindex 228e9e3dba..159e950f9e 100644--- a/backend/store/pipeline.go+++ b/backend/store/pipeline.go@@ -202,14 +202,14 @@ func (*Store) createPipeline(ctx context.Context, txn *sql.Tx, create *PipelineMreturn pipeline, nil}-// GetPipelineV2 gets the pipeline.-func (s *Store) GetPipelineV2(ctx context.Context, find *PipelineFind) (*PipelineMessage, error) {+// GetPipeline gets the pipeline.+func (s *Store) GetPipeline(ctx context.Context, find *PipelineFind) (*PipelineMessage, error) {if find.ID != nil {if v, ok := s.pipelineCache.Get(*find.ID); ok && s.enableCache {return v, nil}}- pipelines, err := s.ListPipelineV2(ctx, find)+ pipelines, err := s.ListPipelines(ctx, find)if err != nil {return nil, err}@@ -223,13 +223,13 @@ func (s *Store) GetPipelineV2(ctx context.Context, find *PipelineFind) (*Pipelinreturn pipeline, nil}-// GetPipelineV2ByID gets the pipeline by ID.-func (s *Store) GetPipelineV2ByID(ctx context.Context, id int) (*PipelineMessage, error) {- return s.GetPipelineV2(ctx, &PipelineFind{ID: &id})+// GetPipelineByID gets the pipeline by ID.+func (s *Store) GetPipelineByID(ctx context.Context, id int) (*PipelineMessage, error) {+ return s.GetPipeline(ctx, &PipelineFind{ID: &id})}-// ListPipelineV2 lists pipelines.-func (s *Store) ListPipelineV2(ctx context.Context, find *PipelineFind) ([]*PipelineMessage, error) {+// ListPipelines lists pipelines.+func (s *Store) ListPipelines(ctx context.Context, find *PipelineFind) ([]*PipelineMessage, error) {q := qb.Q().Space(`SELECTpipeline.id,diff --git a/backend/store/policy.go b/backend/store/policy.goindex b8784fe87c..29c2909ea0 100644--- a/backend/store/policy.go+++ b/backend/store/policy.go@@ -82,7 +82,7 @@ func (s *Store) PatchWorkspaceIamPolicy(ctx context.Context, patch *PatchIamPolireturn nil, err}- if _, err := s.CreatePolicyV2(ctx, &PolicyMessage{+ if _, err := s.CreatePolicy(ctx, &PolicyMessage{ResourceType: storepb.Policy_WORKSPACE,Payload: string(policyPayload),Type: storepb.Policy_IAM,@@ -108,7 +108,7 @@ func (s *Store) GetProjectIamPolicy(ctx context.Context, projectID string) (*Iamfunc (s *Store) getIamPolicy(ctx context.Context, find *FindPolicyMessage) (*IamPolicyMessage, error) {pType := storepb.Policy_IAMfind.Type = &pType- policy, err := s.GetPolicyV2(ctx, find)+ policy, err := s.GetPolicy(ctx, find)if err != nil {return nil, err}@@ -153,7 +153,7 @@ func (s *Store) GetRolloutPolicy(ctx context.Context, environment string) (*storresource := common.FormatEnvironment(environment)resourceType := storepb.Policy_ENVIRONMENTpType := storepb.Policy_ROLLOUT- policy, err := s.GetPolicyV2(ctx, &FindPolicyMessage{+ policy, err := s.GetPolicy(ctx, &FindPolicyMessage{ResourceType: &resourceType,Resource: &resource,Type: &pType,@@ -236,7 +236,7 @@ func (s *Store) getQueryDataPolicy(ctx context.Context, resource string) (*storereturn nil, err}pType := storepb.Policy_QUERY_DATA- policy, err := s.GetPolicyV2(ctx, &FindPolicyMessage{+ policy, err := s.GetPolicy(ctx, &FindPolicyMessage{ResourceType: &resourceType,Resource: &resource,Type: &pType,@@ -294,7 +294,7 @@ func (s *Store) GetReviewConfigForDatabase(ctx context.Context, database *Databafunc (s *Store) getReviewConfigByResource(ctx context.Context, resourceType storepb.Policy_Resource, resource string) (*storepb.ReviewConfigPayload, error) {pType := storepb.Policy_TAG- policy, err := s.GetPolicyV2(ctx, &FindPolicyMessage{+ policy, err := s.GetPolicy(ctx, &FindPolicyMessage{ResourceType: &resourceType,Resource: &resource,Type: &pType,@@ -340,7 +340,7 @@ func (s *Store) getReviewConfigByResource(ctx context.Context, resourceType stor// GetMaskingRulePolicy will get the masking rule policy.func (s *Store) GetMaskingRulePolicy(ctx context.Context) (*storepb.MaskingRulePolicy, error) {pType := storepb.Policy_MASKING_RULE- policy, err := s.GetPolicyV2(ctx, &FindPolicyMessage{+ policy, err := s.GetPolicy(ctx, &FindPolicyMessage{Type: &pType,})if err != nil {@@ -364,7 +364,7 @@ func (s *Store) GetMaskingExceptionPolicyByProject(ctx context.Context, projectIresourceType := storepb.Policy_PROJECTresource := common.FormatProject(projectID)pType := storepb.Policy_MASKING_EXCEPTION- policy, err := s.GetPolicyV2(ctx, &FindPolicyMessage{+ policy, err := s.GetPolicy(ctx, &FindPolicyMessage{ResourceType: &resourceType,Resource: &resource,Type: &pType,@@ -416,8 +416,8 @@ type UpdatePolicyMessage struct {Enforce *bool}-// GetPolicyV2 gets a policy.-func (s *Store) GetPolicyV2(ctx context.Context, find *FindPolicyMessage) (*PolicyMessage, error) {+// GetPolicy gets a policy.+func (s *Store) GetPolicy(ctx context.Context, find *FindPolicyMessage) (*PolicyMessage, error) {if find.ResourceType != nil && find.Resource != nil && find.Type != nil {if v, ok := s.policyCache.Get(getPolicyCacheKey(*find.ResourceType, *find.Resource, *find.Type)); ok && s.enableCache {return v, nil@@ -432,7 +432,7 @@ func (s *Store) GetPolicyV2(ctx context.Context, find *FindPolicyMessage) (*Poli// We will always return the resource regardless of its deleted state.find.ShowAll = true- policies, err := s.listPolicyImplV2(ctx, tx, find)+ policies, err := s.listPolicyImpl(ctx, tx, find)if err != nil {return nil, err}@@ -457,15 +457,15 @@ func (s *Store) GetPolicyV2(ctx context.Context, find *FindPolicyMessage) (*Polireturn policy, nil}-// ListPoliciesV2 lists all policies.-func (s *Store) ListPoliciesV2(ctx context.Context, find *FindPolicyMessage) ([]*PolicyMessage, error) {+// ListPolicies lists all policies.+func (s *Store) ListPolicies(ctx context.Context, find *FindPolicyMessage) ([]*PolicyMessage, error) {tx, err := s.GetDB().BeginTx(ctx, nil)if err != nil {return nil, err}defer tx.Rollback()- policies, err := s.listPolicyImplV2(ctx, tx, find)+ policies, err := s.listPolicyImpl(ctx, tx, find)if err != nil {return nil, err}@@ -481,15 +481,15 @@ func (s *Store) ListPoliciesV2(ctx context.Context, find *FindPolicyMessage) ([]return policies, nil}-// CreatePolicyV2 creates a policy.-func (s *Store) CreatePolicyV2(ctx context.Context, create *PolicyMessage) (*PolicyMessage, error) {+// CreatePolicy creates a policy.+func (s *Store) CreatePolicy(ctx context.Context, create *PolicyMessage) (*PolicyMessage, error) {tx, err := s.GetDB().BeginTx(ctx, nil)if err != nil {return nil, err}defer tx.Rollback()- policy, err := upsertPolicyV2Impl(ctx, tx, create)+ policy, err := upsertPolicyImpl(ctx, tx, create)if err != nil {return nil, err}@@ -503,8 +503,8 @@ func (s *Store) CreatePolicyV2(ctx context.Context, create *PolicyMessage) (*Polreturn policy, nil}-// UpdatePolicyV2 updates the policy.-func (s *Store) UpdatePolicyV2(ctx context.Context, patch *UpdatePolicyMessage) (*PolicyMessage, error) {+// UpdatePolicy updates the policy.+func (s *Store) UpdatePolicy(ctx context.Context, patch *UpdatePolicyMessage) (*PolicyMessage, error) {set := qb.Q()set.Comma("updated_at = ?", time.Now())if v := patch.InheritFromParent; v != nil {@@ -555,8 +555,8 @@ func (s *Store) UpdatePolicyV2(ctx context.Context, patch *UpdatePolicyMessage)return policy, nil}-// DeletePolicyV2 deletes the policy.-func (s *Store) DeletePolicyV2(ctx context.Context, policy *PolicyMessage) error {+// DeletePolicy deletes the policy.+func (s *Store) DeletePolicy(ctx context.Context, policy *PolicyMessage) error {q := qb.Q().Space("DELETE FROM policy WHERE resource_type = ? AND resource = ? AND type = ?",policy.ResourceType,policy.Resource,@@ -586,7 +586,7 @@ func (s *Store) DeletePolicyV2(ctx context.Context, policy *PolicyMessage) errorreturn nil}-func upsertPolicyV2Impl(ctx context.Context, txn *sql.Tx, create *PolicyMessage) (*PolicyMessage, error) {+func upsertPolicyImpl(ctx context.Context, txn *sql.Tx, create *PolicyMessage) (*PolicyMessage, error) {create.UpdatedAt = time.Now()q := qb.Q().Space(`@@ -626,7 +626,7 @@ func upsertPolicyV2Impl(ctx context.Context, txn *sql.Tx, create *PolicyMessage)return create, nil}-func (*Store) listPolicyImplV2(ctx context.Context, txn *sql.Tx, find *FindPolicyMessage) ([]*PolicyMessage, error) {+func (*Store) listPolicyImpl(ctx context.Context, txn *sql.Tx, find *FindPolicyMessage) ([]*PolicyMessage, error) {q := qb.Q().Space(`SELECTupdated_at,diff --git a/backend/store/project.go b/backend/store/project.goindex 62017fbef2..873aad79d7 100644--- a/backend/store/project.go+++ b/backend/store/project.go@@ -53,8 +53,8 @@ type UpdateProjectMessage struct {Delete *bool}-// GetProjectV2 gets project by resource ID.-func (s *Store) GetProjectV2(ctx context.Context, find *FindProjectMessage) (*ProjectMessage, error) {+// GetProject gets project by resource ID.+func (s *Store) GetProject(ctx context.Context, find *FindProjectMessage) (*ProjectMessage, error) {if find.ResourceID != nil {if v, ok := s.projectCache.Get(*find.ResourceID); ok && s.enableCache {return v, nil@@ -70,7 +70,7 @@ func (s *Store) GetProjectV2(ctx context.Context, find *FindProjectMessage) (*Pr}defer tx.Rollback()- projects, err := s.listProjectImplV2(ctx, tx, find)+ projects, err := s.listProjectImpl(ctx, tx, find)if err != nil {return nil, err}@@ -90,15 +90,15 @@ func (s *Store) GetProjectV2(ctx context.Context, find *FindProjectMessage) (*Prreturn projects[0], nil}-// ListProjectV2 lists all projects.-func (s *Store) ListProjectV2(ctx context.Context, find *FindProjectMessage) ([]*ProjectMessage, error) {+// ListProjects lists all projects.+func (s *Store) ListProjects(ctx context.Context, find *FindProjectMessage) ([]*ProjectMessage, error) {tx, err := s.GetDB().BeginTx(ctx, &sql.TxOptions{ReadOnly: true})if err != nil {return nil, err}defer tx.Rollback()- projects, err := s.listProjectImplV2(ctx, tx, find)+ projects, err := s.listProjectImpl(ctx, tx, find)if err != nil {return nil, err}@@ -113,8 +113,8 @@ func (s *Store) ListProjectV2(ctx context.Context, find *FindProjectMessage) ([]return projects, nil}-// CreateProjectV2 creates a project.-func (s *Store) CreateProjectV2(ctx context.Context, create *ProjectMessage, creatorID int) (*ProjectMessage, error) {+// CreateProject creates a project.+func (s *Store) CreateProject(ctx context.Context, create *ProjectMessage, creatorID int) (*ProjectMessage, error) {user, err := s.GetUserByID(ctx, creatorID)if err != nil {return nil, err@@ -164,7 +164,7 @@ func (s *Store) CreateProjectV2(ctx context.Context, create *ProjectMessage, creif err != nil {return nil, err}- if _, err := s.CreatePolicyV2(ctx, &PolicyMessage{+ if _, err := s.CreatePolicy(ctx, &PolicyMessage{ResourceType: storepb.Policy_PROJECT,Resource: common.FormatProject(project.ResourceID),Payload: string(policyPayload),@@ -184,8 +184,8 @@ func (s *Store) CreateProjectV2(ctx context.Context, create *ProjectMessage, crereturn project, nil}-// UpdateProjectV2 updates a project.-func (s *Store) UpdateProjectV2(ctx context.Context, patch *UpdateProjectMessage) (*ProjectMessage, error) {+// UpdateProject updates a project.+func (s *Store) UpdateProject(ctx context.Context, patch *UpdateProjectMessage) (*ProjectMessage, error) {s.removeProjectCache(patch.ResourceID)tx, err := s.GetDB().BeginTx(ctx, nil)@@ -194,7 +194,7 @@ func (s *Store) UpdateProjectV2(ctx context.Context, patch *UpdateProjectMessage}defer tx.Rollback()- if err := updateProjectImplV2(ctx, tx, patch); err != nil {+ if err := updateProjectImpl(ctx, tx, patch); err != nil {return nil, err}@@ -202,11 +202,11 @@ func (s *Store) UpdateProjectV2(ctx context.Context, patch *UpdateProjectMessagereturn nil, err}- return s.GetProjectV2(ctx, &FindProjectMessage{ResourceID: &patch.ResourceID})+ return s.GetProject(ctx, &FindProjectMessage{ResourceID: &patch.ResourceID})}-// BatchUpdateProjectsV2 updates multiple projects in a single transaction.-func (s *Store) BatchUpdateProjectsV2(ctx context.Context, patches []*UpdateProjectMessage) ([]*ProjectMessage, error) {+// BatchUpdateProjects updates multiple projects in a single transaction.+func (s *Store) BatchUpdateProjects(ctx context.Context, patches []*UpdateProjectMessage) ([]*ProjectMessage, error) {if len(patches) == 0 {return nil, nil}@@ -224,7 +224,7 @@ func (s *Store) BatchUpdateProjectsV2(ctx context.Context, patches []*UpdateProj// Update all projects in the transactionfor _, patch := range patches {- if err := updateProjectImplV2(ctx, tx, patch); err != nil {+ if err := updateProjectImpl(ctx, tx, patch); err != nil {return nil, err}}@@ -236,7 +236,7 @@ func (s *Store) BatchUpdateProjectsV2(ctx context.Context, patches []*UpdateProj// Fetch and return all updated projectsvar updatedProjects []*ProjectMessagefor _, patch := range patches {- project, err := s.GetProjectV2(ctx, &FindProjectMessage{ResourceID: &patch.ResourceID})+ project, err := s.GetProject(ctx, &FindProjectMessage{ResourceID: &patch.ResourceID})if err != nil {return nil, err}@@ -246,7 +246,7 @@ func (s *Store) BatchUpdateProjectsV2(ctx context.Context, patches []*UpdateProjreturn updatedProjects, nil}-func updateProjectImplV2(ctx context.Context, txn *sql.Tx, patch *UpdateProjectMessage) error {+func updateProjectImpl(ctx context.Context, txn *sql.Tx, patch *UpdateProjectMessage) error {set := qb.Q()if v := patch.Title; v != nil {@@ -283,7 +283,7 @@ func updateProjectImplV2(ctx context.Context, txn *sql.Tx, patch *UpdateProjectMreturn nil}-func (s *Store) listProjectImplV2(ctx context.Context, txn *sql.Tx, find *FindProjectMessage) ([]*ProjectMessage, error) {+func (s *Store) listProjectImpl(ctx context.Context, txn *sql.Tx, find *FindProjectMessage) ([]*ProjectMessage, error) {q := qb.Q().Space("SELECT resource_id, name, data_classification_config_id, setting, deleted FROM project WHERE TRUE")if filterQ := find.FilterQ; filterQ != nil {q.And("?", filterQ)@@ -338,7 +338,7 @@ func (s *Store) listProjectImplV2(ctx context.Context, txn *sql.Tx, find *FindPr}for _, project := range projectMessages {- projectWebhooks, err := s.findProjectWebhookImplV2(ctx, txn, &FindProjectWebhookMessage{ProjectID: &project.ResourceID})+ projectWebhooks, err := s.findProjectWebhookImpl(ctx, txn, &FindProjectWebhookMessage{ProjectID: &project.ResourceID})if err != nil {return nil, err}diff --git a/backend/store/project_webhook.go b/backend/store/project_webhook.goindex 718846c458..74d03c8d45 100644--- a/backend/store/project_webhook.go+++ b/backend/store/project_webhook.go@@ -36,8 +36,8 @@ type FindProjectWebhookMessage struct {EventType *storepb.Activity_Type}-// CreateProjectWebhookV2 creates an instance of ProjectWebhook.-func (s *Store) CreateProjectWebhookV2(ctx context.Context, projectID string, create *ProjectWebhookMessage) (*ProjectWebhookMessage, error) {+// CreateProjectWebhook creates an instance of ProjectWebhook.+func (s *Store) CreateProjectWebhook(ctx context.Context, projectID string, create *ProjectWebhookMessage) (*ProjectWebhookMessage, error) {payload := []byte("{}")if create.Payload != nil {p, err := protojson.Marshal(create.Payload)@@ -87,14 +87,14 @@ func (s *Store) CreateProjectWebhookV2(ctx context.Context, projectID string, crreturn &projectWebhook, nil}-// FindProjectWebhookV2 finds a list of ProjectWebhook instances.-func (s *Store) FindProjectWebhookV2(ctx context.Context, find *FindProjectWebhookMessage) ([]*ProjectWebhookMessage, error) {+// FindProjectWebhook finds a list of ProjectWebhook instances.+func (s *Store) FindProjectWebhook(ctx context.Context, find *FindProjectWebhookMessage) ([]*ProjectWebhookMessage, error) {tx, err := s.GetDB().BeginTx(ctx, &sql.TxOptions{ReadOnly: true})if err != nil {return nil, errors.Wrapf(err, "failed to begin transaction")}- webhooks, err := s.findProjectWebhookImplV2(ctx, tx, find)+ webhooks, err := s.findProjectWebhookImpl(ctx, tx, find)if err != nil {return nil, err}@@ -105,14 +105,14 @@ func (s *Store) FindProjectWebhookV2(ctx context.Context, find *FindProjectWebhoreturn webhooks, nil}-// GetProjectWebhookV2 gets an instance of ProjectWebhook.-func (s *Store) GetProjectWebhookV2(ctx context.Context, find *FindProjectWebhookMessage) (*ProjectWebhookMessage, error) {+// GetProjectWebhook gets an instance of ProjectWebhook.+func (s *Store) GetProjectWebhook(ctx context.Context, find *FindProjectWebhookMessage) (*ProjectWebhookMessage, error) {tx, err := s.GetDB().BeginTx(ctx, &sql.TxOptions{ReadOnly: true})if err != nil {return nil, errors.Wrapf(err, "failed to begin transaction")}- webhooks, err := s.findProjectWebhookImplV2(ctx, tx, find)+ webhooks, err := s.findProjectWebhookImpl(ctx, tx, find)if err != nil {return nil, err}@@ -131,8 +131,8 @@ func (s *Store) GetProjectWebhookV2(ctx context.Context, find *FindProjectWebhooreturn webhooks[0], nil}-// UpdateProjectWebhookV2 updates an instance of ProjectWebhook.-func (s *Store) UpdateProjectWebhookV2(ctx context.Context, projectResourceID string, projectWebhookID int, update *UpdateProjectWebhookMessage) (*ProjectWebhookMessage, error) {+// UpdateProjectWebhook updates an instance of ProjectWebhook.+func (s *Store) UpdateProjectWebhook(ctx context.Context, projectResourceID string, projectWebhookID int, update *UpdateProjectWebhookMessage) (*ProjectWebhookMessage, error) {tx, err := s.GetDB().BeginTx(ctx, nil)if err != nil {return nil, errors.Wrapf(err, "failed to begin transaction")@@ -187,8 +187,8 @@ func (s *Store) UpdateProjectWebhookV2(ctx context.Context, projectResourceID streturn &projectWebhook, nil}-// DeleteProjectWebhookV2 deletes an existing projectWebhook by projectUID and url.-func (s *Store) DeleteProjectWebhookV2(ctx context.Context, projectResourceID string, projectWebhookUID int) error {+// DeleteProjectWebhook deletes an existing projectWebhook by projectUID and url.+func (s *Store) DeleteProjectWebhook(ctx context.Context, projectResourceID string, projectWebhookUID int) error {q := qb.Q().Space("DELETE FROM project_webhook WHERE id = ?", projectWebhookUID)query, args, err := q.ToSQL()@@ -213,7 +213,7 @@ func (s *Store) DeleteProjectWebhookV2(ctx context.Context, projectResourceID streturn nil}-func (*Store) findProjectWebhookImplV2(ctx context.Context, txn *sql.Tx, find *FindProjectWebhookMessage) ([]*ProjectWebhookMessage, error) {+func (*Store) findProjectWebhookImpl(ctx context.Context, txn *sql.Tx, find *FindProjectWebhookMessage) ([]*ProjectWebhookMessage, error) {q := qb.Q().Space(`SELECTid,diff --git a/backend/store/release.go b/backend/store/release.goindex 6ee36d5c87..5ce1683e16 100644--- a/backend/store/release.go+++ b/backend/store/release.go@@ -89,7 +89,7 @@ func (s *Store) CreateRelease(ctx context.Context, release *ReleaseMessage, creareturn release, nil}-func (s *Store) GetReleaseV2(ctx context.Context, find *FindReleaseMessage) (*ReleaseMessage, error) {+func (s *Store) GetRelease(ctx context.Context, find *FindReleaseMessage) (*ReleaseMessage, error) {releases, err := s.ListReleases(ctx, find)if err != nil {return nil, errors.Wrapf(err, "failed to list releases")@@ -104,7 +104,7 @@ func (s *Store) GetReleaseV2(ctx context.Context, find *FindReleaseMessage) (*Re}func (s *Store) GetReleaseByUID(ctx context.Context, uid int64) (*ReleaseMessage, error) {- return s.GetReleaseV2(ctx, &FindReleaseMessage{UID: &uid, ShowDeleted: true})+ return s.GetRelease(ctx, &FindReleaseMessage{UID: &uid, ShowDeleted: true})}func (s *Store) ListReleases(ctx context.Context, find *FindReleaseMessage) ([]*ReleaseMessage, error) {diff --git a/backend/store/setting.go b/backend/store/setting.goindex 5d2941610f..a04542d35a 100644--- a/backend/store/setting.go+++ b/backend/store/setting.go@@ -50,7 +50,7 @@ func getSettingMessage(name storepb.SettingName) (proto.Message, error) {// GetWorkspaceProfileSetting gets the workspace profile setting payload.func (s *Store) GetWorkspaceProfileSetting(ctx context.Context) (*storepb.WorkspaceProfileSetting, error) {- setting, err := s.GetSettingV2(ctx, storepb.SettingName_WORKSPACE_PROFILE)+ setting, err := s.GetSetting(ctx, storepb.SettingName_WORKSPACE_PROFILE)if err != nil {return nil, errors.Wrapf(err, "failed to get setting %v", storepb.SettingName_WORKSPACE_PROFILE)}@@ -66,7 +66,7 @@ func (s *Store) GetWorkspaceProfileSetting(ctx context.Context) (*storepb.Worksp}func (s *Store) GetAppIMSetting(ctx context.Context) (*storepb.AppIMSetting, error) {- setting, err := s.GetSettingV2(ctx, storepb.SettingName_APP_IM)+ setting, err := s.GetSetting(ctx, storepb.SettingName_APP_IM)if err != nil {return nil, errors.Wrapf(err, "failed to get setting %v", storepb.SettingName_APP_IM)}@@ -82,7 +82,7 @@ func (s *Store) GetAppIMSetting(ctx context.Context) (*storepb.AppIMSetting, err}func (s *Store) GetSystemSetting(ctx context.Context) (*storepb.SystemSetting, error) {- setting, err := s.GetSettingV2(ctx, storepb.SettingName_SYSTEM)+ setting, err := s.GetSetting(ctx, storepb.SettingName_SYSTEM)if err != nil {return nil, errors.Wrapf(err, "failed to get setting %v", storepb.SettingName_SYSTEM)}@@ -99,7 +99,7 @@ func (s *Store) GetSystemSetting(ctx context.Context) (*storepb.SystemSetting, e// UpsertEnterpriseLicense updates the enterprise license in SYSTEM setting.func (s *Store) UpsertEnterpriseLicense(ctx context.Context, license string) error {- setting, err := s.GetSettingV2(ctx, storepb.SettingName_SYSTEM)+ setting, err := s.GetSetting(ctx, storepb.SettingName_SYSTEM)if err != nil {return errors.Wrap(err, "failed to get system setting")}@@ -117,7 +117,7 @@ func (s *Store) UpsertEnterpriseLicense(ctx context.Context, license string) errsystemSetting.License = license- if _, err := s.UpsertSettingV2(ctx, &SetSettingMessage{+ if _, err := s.UpsertSetting(ctx, &SetSettingMessage{Name: storepb.SettingName_SYSTEM,Value: systemSetting,}); err != nil {@@ -129,7 +129,7 @@ func (s *Store) UpsertEnterpriseLicense(ctx context.Context, license string) err// GetWorkspaceApprovalSetting gets the workspace approval setting.func (s *Store) GetWorkspaceApprovalSetting(ctx context.Context) (*storepb.WorkspaceApprovalSetting, error) {- setting, err := s.GetSettingV2(ctx, storepb.SettingName_WORKSPACE_APPROVAL)+ setting, err := s.GetSetting(ctx, storepb.SettingName_WORKSPACE_APPROVAL)if err != nil {return nil, errors.Wrapf(err, "failed to get setting %v", storepb.SettingName_WORKSPACE_APPROVAL)}@@ -146,7 +146,7 @@ func (s *Store) GetWorkspaceApprovalSetting(ctx context.Context) (*storepb.Works// GetSemanticTypesSetting gets the semantic types setting.func (s *Store) GetSemanticTypesSetting(ctx context.Context) (*storepb.SemanticTypeSetting, error) {- setting, err := s.GetSettingV2(ctx, storepb.SettingName_SEMANTIC_TYPES)+ setting, err := s.GetSetting(ctx, storepb.SettingName_SEMANTIC_TYPES)if err != nil {return nil, errors.Wrapf(err, "failed to get setting %v", storepb.SettingName_SEMANTIC_TYPES)}@@ -163,7 +163,7 @@ func (s *Store) GetSemanticTypesSetting(ctx context.Context) (*storepb.SemanticT// GetDataClassificationSetting gets the data classification setting.func (s *Store) GetDataClassificationSetting(ctx context.Context) (*storepb.DataClassificationSetting, error) {- setting, err := s.GetSettingV2(ctx, storepb.SettingName_DATA_CLASSIFICATION)+ setting, err := s.GetSetting(ctx, storepb.SettingName_DATA_CLASSIFICATION)if err != nil {return nil, errors.Wrapf(err, "failed to get setting %v", storepb.SettingName_DATA_CLASSIFICATION)}@@ -179,7 +179,7 @@ func (s *Store) GetDataClassificationSetting(ctx context.Context) (*storepb.Data}func (s *Store) GetAISetting(ctx context.Context) (*storepb.AISetting, error) {- setting, err := s.GetSettingV2(ctx, storepb.SettingName_AI)+ setting, err := s.GetSetting(ctx, storepb.SettingName_AI)if err != nil {return nil, err}@@ -195,7 +195,7 @@ func (s *Store) GetAISetting(ctx context.Context) (*storepb.AISetting, error) {}func (s *Store) GetEnvironment(ctx context.Context) (*storepb.EnvironmentSetting, error) {- setting, err := s.GetSettingV2(ctx, storepb.SettingName_ENVIRONMENT)+ setting, err := s.GetSetting(ctx, storepb.SettingName_ENVIRONMENT)if err != nil {return nil, err}@@ -210,21 +210,20 @@ func (s *Store) GetEnvironment(ctx context.Context) (*storepb.EnvironmentSettingreturn val, nil}-// GetSettingV2 returns the setting by name.-func (s *Store) GetSettingV2(ctx context.Context, name storepb.SettingName) (*SettingMessage, error) {+// FindSettingMessage is the message for finding settings.+type FindSettingMessage struct {+ Name *storepb.SettingName+}++// GetSetting returns the setting by name.+func (s *Store) GetSetting(ctx context.Context, name storepb.SettingName) (*SettingMessage, error) {if v, ok := s.settingCache.Get(name); ok && s.enableCache {return v, nil}- tx, err := s.GetDB().BeginTx(ctx, &sql.TxOptions{ReadOnly: true})- if err != nil {- return nil, errors.Wrap(err, "failed to begin transaction")- }- defer tx.Rollback()-- settings, err := listSettingV2Impl(ctx, tx, &name)+ settings, err := s.ListSettings(ctx, &FindSettingMessage{Name: &name})if err != nil {- return nil, errors.Wrap(err, "failed to list setting")+ return nil, err}if len(settings) == 0 {return nil, nil@@ -233,47 +232,81 @@ func (s *Store) GetSettingV2(ctx context.Context, name storepb.SettingName) (*Sereturn nil, errors.Errorf("found multiple settings: %v", name)}- if err := tx.Commit(); err != nil {- return nil, errors.Wrap(err, "failed to commit transaction")- }return settings[0], nil}-// ListSettingV2 returns a list of settings.-func (s *Store) ListSettingV2(ctx context.Context) ([]*SettingMessage, error) {+// ListSettings returns a list of settings.+func (s *Store) ListSettings(ctx context.Context, find *FindSettingMessage) ([]*SettingMessage, error) {tx, err := s.GetDB().BeginTx(ctx, &sql.TxOptions{ReadOnly: true})if err != nil {return nil, errors.Wrap(err, "failed to begin transaction")}defer tx.Rollback()- settings, err := listSettingV2Impl(ctx, tx, nil)++ q := qb.Q().Space(`+ SELECT+ name,+ value+ FROM setting+ WHERE TRUE+ `)+ if find != nil && find.Name != nil {+ q.And("name = ?", find.Name.String())+ }+ query, args, err := q.ToSQL()if err != nil {- return nil, errors.Wrap(err, "failed to list setting")+ return nil, errors.Wrapf(err, "failed to build sql")}- if err := tx.Commit(); err != nil {- return nil, errors.Wrap(err, "failed to commit transaction")+ rows, err := tx.QueryContext(ctx, query, args...)+ if err != nil {+ return nil, err}+ defer rows.Close()- for _, setting := range settings {- s.settingCache.Add(setting.Name, setting)+ var settingMessages []*SettingMessage+ for rows.Next() {+ var settingMessage SettingMessage+ var nameString string+ var valueString string+ if err := rows.Scan(+ &nameString,+ &valueString,+ ); err != nil {+ return nil, err+ }+ value, ok := storepb.SettingName_value[nameString]+ if !ok {+ return nil, errors.Errorf("invalid setting name string: %s", nameString)+ }+ settingMessage.Name = storepb.SettingName(value)++ msg, err := getSettingMessage(settingMessage.Name)+ if err != nil {+ return nil, err+ }+ if err := common.ProtojsonUnmarshaler.Unmarshal([]byte(valueString), msg); err != nil {+ return nil, err+ }+ settingMessage.Value = msg++ settingMessages = append(settingMessages, &settingMessage)+ }+ if err := rows.Err(); err != nil {+ return nil, err}- return settings, nil-}-func (s *Store) GetSecret(ctx context.Context) (string, error) {- if s.Secret != "" {- return s.Secret, nil+ if err := tx.Commit(); err != nil {+ return nil, errors.Wrap(err, "failed to commit transaction")}- systemSetting, err := s.GetSystemSetting(ctx)- if err != nil {- return "", errors.Wrap(err, "failed to get system setting")++ for _, setting := range settingMessages {+ s.settingCache.Add(setting.Name, setting)}- s.Secret = systemSetting.AuthSecret- return systemSetting.AuthSecret, nil+ return settingMessages, nil}-// UpsertSettingV2 upserts the setting by name.-func (s *Store) UpsertSettingV2(ctx context.Context, update *SetSettingMessage) (*SettingMessage, error) {+// UpsertSetting upserts the setting by name.+func (s *Store) UpsertSetting(ctx context.Context, update *SetSettingMessage) (*SettingMessage, error) {valueBytes, err := protojson.Marshal(update.Value)if err != nil {return nil, errors.Wrap(err, "failed to marshal setting value")@@ -331,8 +364,8 @@ func (s *Store) UpsertSettingV2(ctx context.Context, update *SetSettingMessage)return &setting, nil}-// DeleteSettingV2 deletes a setting by the name.-func (s *Store) DeleteSettingV2(ctx context.Context, name storepb.SettingName) error {+// DeleteSetting deletes a setting by the name.+func (s *Store) DeleteSetting(ctx context.Context, name storepb.SettingName) error {q := qb.Q().Space("DELETE FROM setting WHERE name = ?", name.String())query, args, err := q.ToSQL()if err != nil {@@ -356,59 +389,3 @@ func (s *Store) DeleteSettingV2(ctx context.Context, name storepb.SettingName) es.settingCache.Remove(name)return nil}--func listSettingV2Impl(ctx context.Context, txn *sql.Tx, name *storepb.SettingName) ([]*SettingMessage, error) {- q := qb.Q().Space(`- SELECT- name,- value- FROM setting- WHERE TRUE- `)- if name != nil {- q.And("name = ?", name.String())- }- query, args, err := q.ToSQL()- if err != nil {- return nil, errors.Wrapf(err, "failed to build sql")- }- rows, err := txn.QueryContext(ctx, query, args...)- if err != nil {- return nil, err- }- defer rows.Close()-- var settingMessages []*SettingMessage- for rows.Next() {- var settingMessage SettingMessage- var nameString string- var valueString string- if err := rows.Scan(- &nameString,- &valueString,- ); err != nil {- return nil, err- }- value, ok := storepb.SettingName_value[nameString]- if !ok {- return nil, errors.Errorf("invalid setting name string: %s", nameString)- }- settingMessage.Name = storepb.SettingName(value)-- msg, err := getSettingMessage(settingMessage.Name)- if err != nil {- return nil, err- }- if err := common.ProtojsonUnmarshaler.Unmarshal([]byte(valueString), msg); err != nil {- return nil, err- }- settingMessage.Value = msg-- settingMessages = append(settingMessages, &settingMessage)- }- if err := rows.Err(); err != nil {- return nil, err- }-- return settingMessages, nil-}diff --git a/backend/store/task.go b/backend/store/task.goindex aec6958199..a11a1d0e63 100644--- a/backend/store/task.go+++ b/backend/store/task.go@@ -89,8 +89,8 @@ type TaskPatch struct {Flags *map[string]string}-// GetTaskV2ByID gets a task by ID.-func (s *Store) GetTaskV2ByID(ctx context.Context, id int) (*TaskMessage, error) {+// GetTaskByID gets a task by ID.+func (s *Store) GetTaskByID(ctx context.Context, id int) (*TaskMessage, error) {tasks, err := s.ListTasks(ctx, &TaskFind{ID: &id})if err != nil {return nil, errors.Wrapf(err, "failed to get Task with ID %d", id)@@ -388,9 +388,9 @@ func (s *Store) ListTasks(ctx context.Context, find *TaskFind) ([]*TaskMessage,return tasks, nil}-// UpdateTaskV2 updates an existing task.+// UpdateTask updates an existing task.// Returns ENOTFOUND if task does not exist.-func (s *Store) UpdateTaskV2(ctx context.Context, patch *TaskPatch) (*TaskMessage, error) {+func (s *Store) UpdateTask(ctx context.Context, patch *TaskPatch) (*TaskMessage, error) {set := qb.Q()if v := patch.DatabaseName; v != nil {set.Comma("db_name = ?", *v)diff --git a/backend/store/task_run.go b/backend/store/task_run.goindex 25524a150f..9421218910 100644--- a/backend/store/task_run.go+++ b/backend/store/task_run.go@@ -57,8 +57,8 @@ type TaskRunStatusPatch struct {Result *string}-// ListTaskRunsV2 lists task runs.-func (s *Store) ListTaskRunsV2(ctx context.Context, find *FindTaskRunMessage) ([]*TaskRunMessage, error) {+// ListTaskRuns lists task runs.+func (s *Store) ListTaskRuns(ctx context.Context, find *FindTaskRunMessage) ([]*TaskRunMessage, error) {q := qb.Q().Space(`SELECTtask_run.id,@@ -178,7 +178,7 @@ func (s *Store) ListTaskRunsV2(ctx context.Context, find *FindTaskRunMessage) ([// GetTaskRunV1 gets a task run.func (s *Store) GetTaskRunV1(ctx context.Context, find *FindTaskRunMessage) (*TaskRunMessage, error) {- taskRuns, err := s.ListTaskRunsV2(ctx, find)+ taskRuns, err := s.ListTaskRuns(ctx, find)if err != nil {return nil, err}diff --git a/backend/tests/action_test.go b/backend/tests/action_test.goindex 6be1991f93..69ec4f3c10 100644--- a/backend/tests/action_test.go+++ b/backend/tests/action_test.go@@ -558,7 +558,7 @@ func (ctl *controller) createTestDatabase(ctx context.Context, t *testing.T) *v1// Create databasedbName := generateRandomString("db")[:8]- err = ctl.createDatabaseV2(ctx, ctl.project, instanceResp.Msg, nil, dbName, "")+ err = ctl.createDatabase(ctx, ctl.project, instanceResp.Msg, nil, dbName, "")a.NoError(err)// Get database@@ -600,7 +600,7 @@ func (ctl *controller) createTestMySQLDatabase(ctx context.Context, t *testing.T// Create databasedbName := generateRandomString("db")[:8]- err = ctl.createDatabaseV2(ctx, ctl.project, instanceResp.Msg, nil, dbName, "")+ err = ctl.createDatabase(ctx, ctl.project, instanceResp.Msg, nil, dbName, "")a.NoError(err)// Get database@@ -642,7 +642,7 @@ func (ctl *controller) createTestPostgreSQLDatabase(ctx context.Context, t *test// Create databasedbName := generateRandomString("db")[:8]- err = ctl.createDatabaseV2(ctx, ctl.project, instanceResp.Msg, nil, dbName, "postgres")+ err = ctl.createDatabase(ctx, ctl.project, instanceResp.Msg, nil, dbName, "postgres")a.NoError(err)// Get databasediff --git a/backend/tests/approval_test.go b/backend/tests/approval_test.goindex 51f455abf3..b81b11c394 100644--- a/backend/tests/approval_test.go+++ b/backend/tests/approval_test.go@@ -47,7 +47,7 @@ func TestDirectApprovalRuleMatching(t *testing.T) {// Create databasedbName := generateRandomString("db")- err = ctl.createDatabaseV2(ctx, ctl.project, instanceResp.Msg, nil, dbName, "")+ err = ctl.createDatabase(ctx, ctl.project, instanceResp.Msg, nil, dbName, "")a.NoError(err)// Create approval rule directly via WorkspaceApprovalSetting@@ -184,7 +184,7 @@ func TestApprovalRuleFirstMatchWins(t *testing.T) {// Create databasedbName := generateRandomString("db")- err = ctl.createDatabaseV2(ctx, ctl.project, instanceResp.Msg, nil, dbName, "")+ err = ctl.createDatabase(ctx, ctl.project, instanceResp.Msg, nil, dbName, "")a.NoError(err)// Create multiple approval rules - first one should match@@ -332,7 +332,7 @@ func TestApprovalRuleNoMatch(t *testing.T) {// Create databasedbName := generateRandomString("db")- err = ctl.createDatabaseV2(ctx, ctl.project, instanceResp.Msg, nil, dbName, "")+ err = ctl.createDatabase(ctx, ctl.project, instanceResp.Msg, nil, dbName, "")a.NoError(err)// Create approval rule only for prod environment@@ -536,7 +536,7 @@ func TestFallbackRuleMatchesWhenSourceSpecificDoesNot(t *testing.T) {// Create databasedbName := generateRandomString("db")- err = ctl.createDatabaseV2(ctx, ctl.project, instanceResp.Msg, nil, dbName, "")+ err = ctl.createDatabase(ctx, ctl.project, instanceResp.Msg, nil, dbName, "")a.NoError(err)// Create rules:@@ -678,7 +678,7 @@ func TestSourceSpecificRuleTakesPriorityOverFallback(t *testing.T) {// Create databasedbName := generateRandomString("db")- err = ctl.createDatabaseV2(ctx, ctl.project, instanceResp.Msg, nil, dbName, "")+ err = ctl.createDatabase(ctx, ctl.project, instanceResp.Msg, nil, dbName, "")a.NoError(err)// Create rules with fallback FIRST in the list, but source-specific should still windiff --git a/backend/tests/change_history_test.go b/backend/tests/change_history_test.goindex bd5c567fd9..b47ae72a8a 100644--- a/backend/tests/change_history_test.go+++ b/backend/tests/change_history_test.go@@ -91,7 +91,7 @@ func TestFilterChangeHistoryByResources(t *testing.T) {a.NoError(err)// Create an issue that creates a database.- err = ctl.createDatabaseV2(ctx, ctl.project, instanceResp.Msg, nil /* environment */, databaseName, "bytebase")+ err = ctl.createDatabase(ctx, ctl.project, instanceResp.Msg, nil /* environment */, databaseName, "bytebase")a.NoError(err)databaseResp, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{diff --git a/backend/tests/database.go b/backend/tests/database.goindex aed1f3199d..65bda4a61e 100644--- a/backend/tests/database.go+++ b/backend/tests/database.go@@ -10,7 +10,7 @@ import (v1pb "github.com/bytebase/bytebase/backend/generated-go/v1")-func (ctl *controller) createDatabaseV2(ctx context.Context, project *v1pb.Project, instance *v1pb.Instance, environment *v1pb.EnvironmentSetting_Environment, databaseName string, owner string) error {+func (ctl *controller) createDatabase(ctx context.Context, project *v1pb.Project, instance *v1pb.Instance, environment *v1pb.EnvironmentSetting_Environment, databaseName string, owner string) error {characterSet, collation := "utf8mb4", "utf8mb4_general_ci"if instance.Engine == v1pb.Engine_POSTGRES {characterSet = "UTF8"diff --git a/backend/tests/environment_test.go b/backend/tests/environment_test.goindex 2bce3c9373..7878efb77d 100644--- a/backend/tests/environment_test.go+++ b/backend/tests/environment_test.go@@ -44,7 +44,7 @@ func TestDatabaseEnvironment(t *testing.T) {instance := instanceResp.Msgdb0Name := "db0"- err = ctl.createDatabaseV2(ctx, ctl.project, instance, testEnvironment /* environment */, db0Name, "")+ err = ctl.createDatabase(ctx, ctl.project, instance, testEnvironment /* environment */, db0Name, "")a.NoError(err)db0Resp, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{Name: fmt.Sprintf("%s/databases/%s", instance.Name, db0Name),@@ -57,7 +57,7 @@ func TestDatabaseEnvironment(t *testing.T) {a.Equal(testEnvironment.Name, *db0.EffectiveEnvironment)db1Name := "db1"- err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil /* environment */, db1Name, "")+ err = ctl.createDatabase(ctx, ctl.project, instance, nil /* environment */, db1Name, "")a.NoError(err)db1Resp, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{Name: fmt.Sprintf("%s/databases/%s", instance.Name, db1Name),@@ -69,7 +69,7 @@ func TestDatabaseEnvironment(t *testing.T) {a.Equal(prodEnvironment.Name, *db1.EffectiveEnvironment)db2Name := "db2"- err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil /* environment */, db2Name, "")+ err = ctl.createDatabase(ctx, ctl.project, instance, nil /* environment */, db2Name, "")a.NoError(err)db2Resp, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{Name: fmt.Sprintf("%s/databases/%s", instance.Name, db2Name),diff --git a/backend/tests/ghost_test.go b/backend/tests/ghost_test.goindex dbc5736472..4120080ded 100644--- a/backend/tests/ghost_test.go+++ b/backend/tests/ghost_test.go@@ -81,10 +81,10 @@ func TestGhostSchemaUpdate(t *testing.T) {// Create backup database for MySQL.backupDBName := common.BackupDatabaseNameOfEngine(storepb.Engine_MYSQL)- err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil /* environment */, backupDBName, "")+ err = ctl.createDatabase(ctx, ctl.project, instance, nil /* environment */, backupDBName, "")a.NoError(err)- err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil /* environment */, databaseName, "")+ err = ctl.createDatabase(ctx, ctl.project, instance, nil /* environment */, databaseName, "")a.NoError(err)databaseResponse, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{diff --git a/backend/tests/gitops_test.go b/backend/tests/gitops_test.goindex ce0d974a4d..aa1a235d66 100644--- a/backend/tests/gitops_test.go+++ b/backend/tests/gitops_test.go@@ -71,9 +71,9 @@ func TestGitOpsCheck(t *testing.T) {// Create databases.databaseName := "gitops_check_db"- err = ctl.createDatabaseV2(ctx, project, testInstance, nil, databaseName, "")+ err = ctl.createDatabase(ctx, project, testInstance, nil, databaseName, "")a.NoError(err)- err = ctl.createDatabaseV2(ctx, project, prodInstance, nil, databaseName, "")+ err = ctl.createDatabase(ctx, project, prodInstance, nil, databaseName, "")a.NoError(err)// Create a release with migration files simulating GitOps workflow.@@ -192,7 +192,7 @@ func TestGitOpsRollout(t *testing.T) {// Create database.databaseName := "gitops_rollout_db"- err = ctl.createDatabaseV2(ctx, project, testInstance, nil, databaseName, "")+ err = ctl.createDatabase(ctx, project, testInstance, nil, databaseName, "")a.NoError(err)// Step 1: Create a release containing migration files.@@ -396,9 +396,9 @@ func TestGitOpsRolloutMultiTarget(t *testing.T) {// Create databases.databaseName := "gitops_multi_db"- err = ctl.createDatabaseV2(ctx, project, testInstance, nil, databaseName, "")+ err = ctl.createDatabase(ctx, project, testInstance, nil, databaseName, "")a.NoError(err)- err = ctl.createDatabaseV2(ctx, project, prodInstance, nil, databaseName, "")+ err = ctl.createDatabase(ctx, project, prodInstance, nil, databaseName, "")a.NoError(err)// Step 1: Create a release containing 3 simple migration files.@@ -653,7 +653,7 @@ func TestGitOpsCheckAppliedButChanged(t *testing.T) {// Create database.databaseName := "gitops_changed_db"- err = ctl.createDatabaseV2(ctx, project, testInstance, nil, databaseName, "")+ err = ctl.createDatabase(ctx, project, testInstance, nil, databaseName, "")a.NoError(err)// Step 1: Create a release with version 1.0.0 file.diff --git a/backend/tests/grouping_change_test.go b/backend/tests/grouping_change_test.goindex 1304bca9b0..67e68d4d0e 100644--- a/backend/tests/grouping_change_test.go+++ b/backend/tests/grouping_change_test.go@@ -137,7 +137,7 @@ func TestCreateDatabaseGroup(t *testing.T) {instance := instanceResp.MsginstanceResourceID2InstanceTitle[instanceResourceID] = instance.Titlefor preCreateDatabase := range prepareInstance.matchedDatabasesName {- err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil, preCreateDatabase, "")+ err = ctl.createDatabase(ctx, ctl.project, instance, nil, preCreateDatabase, "")a.NoError(err)}}diff --git a/backend/tests/pg_sdl_rollout_test.go b/backend/tests/pg_sdl_rollout_test.goindex e6e8b3c33b..132c82e203 100644--- a/backend/tests/pg_sdl_rollout_test.go+++ b/backend/tests/pg_sdl_rollout_test.go@@ -91,7 +91,7 @@ func (stc *sdlTestContext) createTestPgDatabase(t *testing.T, dbNamePrefix strininstance := instanceResp.Msg// Create database in Bytebase- err = stc.ctl.createDatabaseV2(stc.ctx, stc.ctl.project, instance, nil, dbName, "postgres")+ err = stc.ctl.createDatabase(stc.ctx, stc.ctl.project, instance, nil, dbName, "postgres")a.NoError(err)// Get databasediff --git a/backend/tests/project_test.go b/backend/tests/project_test.goindex dba99d7247..89e1f2385b 100644--- a/backend/tests/project_test.go+++ b/backend/tests/project_test.go@@ -40,7 +40,7 @@ func TestArchiveProject(t *testing.T) {t.Run("ArchiveProjectWithDatbase", func(_ *testing.T) {databaseName := "db1"- err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil /* environment */, databaseName, "")+ err = ctl.createDatabase(ctx, ctl.project, instance, nil /* environment */, databaseName, "")a.NoError(err)_, err = ctl.projectServiceClient.DeleteProject(ctx, connect.NewRequest(&v1pb.DeleteProjectRequest{diff --git a/backend/tests/schema_update_test.go b/backend/tests/schema_update_test.goindex a8be226512..d5987bdd28 100644--- a/backend/tests/schema_update_test.go+++ b/backend/tests/schema_update_test.go@@ -46,7 +46,7 @@ func TestSchemaAndDataUpdate(t *testing.T) {// Create an issue that creates a database.databaseName := "testSchemaUpdate"- err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil /* environment */, databaseName, "")+ err = ctl.createDatabase(ctx, ctl.project, instance, nil /* environment */, databaseName, "")a.NoError(err)databaseResp, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{@@ -301,7 +301,7 @@ CREATE TABLE "public"."book" (a.FailNow("unsupported db type")}- err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil, test.databaseName, "postgres")+ err = ctl.createDatabase(ctx, ctl.project, instance, nil, test.databaseName, "postgres")a.NoError(err)databaseResp, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{@@ -372,7 +372,7 @@ func TestMarkTaskAsDone(t *testing.T) {// Create an issue that creates a database.databaseName := "testSchemaUpdate"- err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil, databaseName, "")+ err = ctl.createDatabase(ctx, ctl.project, instance, nil, databaseName, "")a.NoError(err)databaseResp, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{diff --git a/backend/tests/sensitive_data_test.go b/backend/tests/sensitive_data_test.goindex b7d402687a..9b35af8e5d 100644--- a/backend/tests/sensitive_data_test.go+++ b/backend/tests/sensitive_data_test.go@@ -162,7 +162,7 @@ func TestSensitiveData(t *testing.T) {a.NoError(err)instance := instanceResp.Msg- err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil /* environment */, databaseName, "")+ err = ctl.createDatabase(ctx, ctl.project, instance, nil /* environment */, databaseName, "")a.NoError(err)databaseResp, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{diff --git a/backend/tests/sql_editor_test.go b/backend/tests/sql_editor_test.goindex d5a0607b52..443177ad16 100644--- a/backend/tests/sql_editor_test.go+++ b/backend/tests/sql_editor_test.go@@ -181,7 +181,7 @@ func TestAdminQueryAffectedRows(t *testing.T) {default:a.FailNow("unsupported db type")}- err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil /* environment */, tt.databaseName, databaseOwner)+ err = ctl.createDatabase(ctx, ctl.project, instance, nil /* environment */, tt.databaseName, databaseOwner)a.NoError(err)databaseResp, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{diff --git a/backend/tests/sql_export_test.go b/backend/tests/sql_export_test.goindex 194266ab22..0082287ca4 100644--- a/backend/tests/sql_export_test.go+++ b/backend/tests/sql_export_test.go@@ -201,7 +201,7 @@ func TestSQLExport(t *testing.T) {default:a.FailNow("unsupported db type")}- err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil /* environment */, tt.databaseName, databaseOwner)+ err = ctl.createDatabase(ctx, ctl.project, instance, nil /* environment */, tt.databaseName, databaseOwner)a.NoError(err)instanceID, err := common.GetInstanceID(instance.Name)diff --git a/backend/tests/sql_query_test.go b/backend/tests/sql_query_test.goindex b06f0f3073..200e9e173b 100644--- a/backend/tests/sql_query_test.go+++ b/backend/tests/sql_query_test.go@@ -156,7 +156,7 @@ func TestSQLAdminQuery(t *testing.T) {default:a.FailNow("unsupported db type")}- err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil /* environment */, tt.databaseName, databaseOwner)+ err = ctl.createDatabase(ctx, ctl.project, instance, nil /* environment */, tt.databaseName, databaseOwner)a.NoError(err)databaseResp, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{diff --git a/backend/tests/sql_review_test.go b/backend/tests/sql_review_test.goindex 59ea478b1f..e8a6dc035f 100644--- a/backend/tests/sql_review_test.go+++ b/backend/tests/sql_review_test.go@@ -138,7 +138,7 @@ func TestSQLReviewForPostgreSQL(t *testing.T) {}))a.NoError(err)- err = ctl.createDatabaseV2(ctx, ctl.project, instance.Msg, nil /* environment */, databaseName, "bytebase")+ err = ctl.createDatabase(ctx, ctl.project, instance.Msg, nil /* environment */, databaseName, "bytebase")a.NoError(err)database, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{@@ -306,7 +306,7 @@ func TestSQLReviewForMySQL(t *testing.T) {}))a.NoError(err)- err = ctl.createDatabaseV2(ctx, ctl.project, instance.Msg, nil /* environment */, databaseName, "")+ err = ctl.createDatabase(ctx, ctl.project, instance.Msg, nil /* environment */, databaseName, "")a.NoError(err)database, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{diff --git a/backend/tests/sql_stop_on_error_test.go b/backend/tests/sql_stop_on_error_test.goindex a0c6e4bd60..d8f3525cc0 100644--- a/backend/tests/sql_stop_on_error_test.go+++ b/backend/tests/sql_stop_on_error_test.go@@ -230,7 +230,7 @@ func TestSQLQueryStopOnError(t *testing.T) {}}- err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil, tt.databaseName, databaseOwner)+ err = ctl.createDatabase(ctx, ctl.project, instance, nil, tt.databaseName, databaseOwner)a.NoError(err)databaseResp, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{@@ -397,7 +397,7 @@ func TestSQLAdminExecuteStopOnError(t *testing.T) {a.FailNow("unsupported db type")}- err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil, tt.databaseName, databaseOwner)+ err = ctl.createDatabase(ctx, ctl.project, instance, nil, tt.databaseName, databaseOwner)a.NoError(err)databaseResp, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{diff --git a/backend/tests/sync_schema_test.go b/backend/tests/sync_schema_test.goindex 92ed5fe882..44082ba305 100644--- a/backend/tests/sync_schema_test.go+++ b/backend/tests/sync_schema_test.go@@ -68,7 +68,7 @@ DROP SCHEMA IF EXISTS "schema_a";a.NoError(err)instance := instanceResp.Msg- err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil /* environment */, databaseName, "bytebase")+ err = ctl.createDatabase(ctx, ctl.project, instance, nil /* environment */, databaseName, "bytebase")a.NoError(err)databaseResp, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{@@ -99,7 +99,7 @@ DROP SCHEMA IF EXISTS "schema_a";changelogs := resp.Msg.Changelogsa.Equal(1, len(changelogs))- err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil /* environment */, newDatabaseName, "bytebase")+ err = ctl.createDatabase(ctx, ctl.project, instance, nil /* environment */, newDatabaseName, "bytebase")a.NoError(err)newDatabaseResp, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{diff --git a/backend/tests/syncer_test.go b/backend/tests/syncer_test.goindex 49e584a5b1..364a7c47f7 100644--- a/backend/tests/syncer_test.go+++ b/backend/tests/syncer_test.go@@ -217,7 +217,7 @@ func TestSyncerForPostgreSQL(t *testing.T) {a.NoError(err)instance := instanceResp.Msg- err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil /* environment */, databaseName, "bytebase")+ err = ctl.createDatabase(ctx, ctl.project, instance, nil /* environment */, databaseName, "bytebase")a.NoError(err)databaseResp, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{@@ -501,7 +501,7 @@ func TestSyncerForMySQL(t *testing.T) {a.NoError(err)instance := instanceResp.Msg- err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil /* environment */, databaseName, "")+ err = ctl.createDatabase(ctx, ctl.project, instance, nil /* environment */, databaseName, "")a.NoError(err)databaseResp, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{diff --git a/backend/tests/task_run_idempotent_test.go b/backend/tests/task_run_idempotent_test.goindex d5159c10d3..93e702b2ba 100644--- a/backend/tests/task_run_idempotent_test.go+++ b/backend/tests/task_run_idempotent_test.go@@ -43,7 +43,7 @@ func TestBatchRunTasks_Idempotent(t *testing.T) {// Create a databasedatabaseName := "testIdempotentDb"- err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil /* environment */, databaseName, "")+ err = ctl.createDatabase(ctx, ctl.project, instance, nil /* environment */, databaseName, "")a.NoError(err)databaseResp, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{diff --git a/backend/tests/tenant_test.go b/backend/tests/tenant_test.goindex d308abd617..ea154539fd 100644--- a/backend/tests/tenant_test.go+++ b/backend/tests/tenant_test.go@@ -94,11 +94,11 @@ func TestDatabaseGroup(t *testing.T) {// Create issues that create databases.databaseName := "testTenantSchemaUpdate"for _, testInstance := range testInstances {- err := ctl.createDatabaseV2(ctx, project, testInstance, nil, databaseName, "")+ err := ctl.createDatabase(ctx, project, testInstance, nil, databaseName, "")a.NoError(err)}for _, prodInstance := range prodInstances {- err := ctl.createDatabaseV2(ctx, project, prodInstance, nil, databaseName, "")+ err := ctl.createDatabase(ctx, project, prodInstance, nil, databaseName, "")a.NoError(err)}@@ -185,7 +185,7 @@ func TestDatabaseGroup(t *testing.T) {// Create another database in the prod environment.databaseName2 := "testTenantSchemaUpdate2"- err = ctl.createDatabaseV2(ctx, project, prodInstances[0], nil, databaseName2, "")+ err = ctl.createDatabase(ctx, project, prodInstances[0], nil, databaseName2, "")a.NoError(err)resp, err = ctl.databaseServiceClient.ListDatabases(ctx, connect.NewRequest(&v1pb.ListDatabasesRequest{diff --git a/backend/utils/utils.go b/backend/utils/utils.goindex edac315de9..988b68762d 100644--- a/backend/utils/utils.go+++ b/backend/utils/utils.go@@ -132,7 +132,7 @@ func UpdateProjectPolicyFromGrantIssue(ctx context.Context, stores *store.Store,if err != nil {return err}- if _, err := stores.CreatePolicyV2(ctx, &store.PolicyMessage{+ if _, err := stores.CreatePolicy(ctx, &store.PolicyMessage{Resource: common.FormatProject(issue.Project.ResourceID),ResourceType: storepb.Policy_PROJECT,Payload: string(policyPayload),