Skip to content

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

refactor: migrate principal references from ID to Email (#18426)

Danny Xud2a29ef64e7b
diff --git a/backend/api/v1/issue_service.go b/backend/api/v1/issue_service.go
index 8a4896531a..5bcd2c0c89 100644
--- a/backend/api/v1/issue_service.go
+++ b/backend/api/v1/issue_service.go
@@ -194,7 +194,7 @@ func (s *IssueService) getIssueFind(
if variable == "current_approver" {
filterIssue.ApproverID = &user.ID
} else {
- issueFind.CreatorID = &user.ID
+ issueFind.CreatorID = &user.Email
}
default:
return "", connect.NewError(connect.CodeInvalidArgument, errors.Errorf("unsupport variable %q with %v operator", variable, celoperators.Equals))
@@ -489,7 +489,7 @@ func (s *IssueService) createIssueDatabaseChange(ctx context.Context, request *v
Labels: request.Issue.Labels,
}
- issue, err := s.store.CreateIssue(ctx, issueCreateMessage, user.ID)
+ issue, err := s.store.CreateIssue(ctx, issueCreateMessage, user.Email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create issue, error: %v", err))
}
@@ -579,7 +579,7 @@ func (s *IssueService) createIssueGrantRequest(ctx context.Context, request *v1p
Labels: request.Issue.Labels,
}
- issue, err := s.store.CreateIssue(ctx, issueCreateMessage, user.ID)
+ issue, err := s.store.CreateIssue(ctx, issueCreateMessage, user.Email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create issue, error: %v", err))
}
@@ -683,7 +683,7 @@ func (s *IssueService) createIssueDatabaseDataExport(ctx context.Context, reques
Labels: request.Issue.Labels,
}
- issue, err := s.store.CreateIssue(ctx, issueCreateMessage, user.ID)
+ issue, err := s.store.CreateIssue(ctx, issueCreateMessage, user.Email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create issue, error: %v", err))
}
@@ -784,7 +784,7 @@ func (s *IssueService) ApproveIssue(ctx context.Context, req *connect.Request[v1
if _, err := s.store.CreateIssueComment(ctx, &store.IssueCommentMessage{
IssueUID: issue.UID,
Payload: p,
- }, user.ID); err != nil {
+ }, user.Email); err != nil {
return err
}
return nil
@@ -954,7 +954,7 @@ func (s *IssueService) RejectIssue(ctx context.Context, req *connect.Request[v1p
_, err := s.store.CreateIssueComment(ctx, &store.IssueCommentMessage{
IssueUID: issue.UID,
Payload: p,
- }, user.ID)
+ }, user.Email)
return err
}(); err != nil {
slog.Warn("failed to create issue comment", log.BBError(err))
@@ -1053,7 +1053,7 @@ func (s *IssueService) RequestIssue(ctx context.Context, req *connect.Request[v1
if _, err := s.store.CreateIssueComment(ctx, &store.IssueCommentMessage{
IssueUID: issue.UID,
Payload: p,
- }, user.ID); err != nil {
+ }, user.Email); err != nil {
return err
}
return nil
@@ -1253,7 +1253,7 @@ func (s *IssueService) UpdateIssue(ctx context.Context, req *connect.Request[v1p
s.webhookManager.CreateEvent(ctx, e)
}
for _, create := range issueCommentCreates {
- if _, err := s.store.CreateIssueComment(ctx, create, user.ID); err != nil {
+ if _, err := s.store.CreateIssueComment(ctx, create, user.Email); err != nil {
slog.Warn("failed to create issue comment", "issue id", issue.UID, log.BBError(err))
}
}
@@ -1343,7 +1343,7 @@ func (s *IssueService) BatchUpdateIssuesStatus(ctx context.Context, req *connect
},
},
},
- }, user.ID); err != nil {
+ }, user.Email); err != nil {
errs = multierr.Append(errs, errors.Wrapf(err, "failed to create issue comment after change the issue status"))
return
}
@@ -1436,7 +1436,7 @@ func (s *IssueService) CreateIssueComment(ctx context.Context, req *connect.Requ
Payload: &storepb.IssueCommentPayload{
Comment: req.Msg.IssueComment.Comment,
},
- }, user.ID)
+ }, user.Email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create issue comment: %v", err))
}
diff --git a/backend/api/v1/plan_service.go b/backend/api/v1/plan_service.go
index 6547d9306b..cfca002f00 100644
--- a/backend/api/v1/plan_service.go
+++ b/backend/api/v1/plan_service.go
@@ -260,7 +260,7 @@ func (s *PlanService) CreatePlan(ctx context.Context, request *connect.Request[v
if _, err := GetPipelineCreate(ctx, s.store, s.sheetManager, s.dbFactory, planMessage.Config.GetSpecs(), deployment, project); err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("failed to get pipeline from the plan, please check you request, error: %v", err))
}
- plan, err := s.store.CreatePlan(ctx, planMessage, user.ID)
+ plan, err := s.store.CreatePlan(ctx, planMessage, user.Email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create plan, error: %v", err))
}
@@ -336,7 +336,7 @@ func (s *PlanService) UpdatePlan(ctx context.Context, request *connect.Request[v
}
ok, err = func() (bool, error) {
- if oldPlan.CreatorUID == user.ID {
+ if oldPlan.Creator == user.Email {
return true, nil
}
return s.iamManager.CheckPermission(ctx, iam.PermissionPlansUpdate, user, oldPlan.ProjectID)
@@ -724,7 +724,7 @@ func (s *PlanService) UpdatePlan(ctx context.Context, request *connect.Request[v
}
for _, issueCommentCreate := range issueCommentCreates {
- if _, err := s.store.CreateIssueComment(ctx, issueCommentCreate, user.ID); err != nil {
+ if _, err := s.store.CreateIssueComment(ctx, issueCommentCreate, user.Email); err != nil {
slog.Warn("failed to create issue comments", "issueUID", issue.UID, log.BBError(err))
}
}
diff --git a/backend/api/v1/plan_service_converter.go b/backend/api/v1/plan_service_converter.go
index 083c4b14df..a52c9a64db 100644
--- a/backend/api/v1/plan_service_converter.go
+++ b/backend/api/v1/plan_service_converter.go
@@ -37,7 +37,7 @@ func convertToPlan(ctx context.Context, s *store.Store, plan *store.PlanMessage)
PlanCheckRunStatusCount: map[string]int32{},
}
- creator, err := s.GetUserByID(ctx, plan.CreatorUID)
+ creator, err := s.GetUserByEmail(ctx, plan.Creator)
if err != nil {
return nil, errors.Wrapf(err, "failed to get plan creator")
}
diff --git a/backend/api/v1/release_service.go b/backend/api/v1/release_service.go
index a22676804d..60aafe8e45 100644
--- a/backend/api/v1/release_service.go
+++ b/backend/api/v1/release_service.go
@@ -94,7 +94,7 @@ func (s *ReleaseService) CreateRelease(ctx context.Context, req *connect.Request
// Batch create sheets if needed.
if len(sheetsToCreate) > 0 {
- createdSheets, err := s.sheetManager.BatchCreateSheets(ctx, sheetsToCreate, project.ResourceID, user.ID)
+ createdSheets, err := s.sheetManager.BatchCreateSheets(ctx, sheetsToCreate, project.ResourceID, user.Email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create sheets"))
}
@@ -123,7 +123,7 @@ func (s *ReleaseService) CreateRelease(ctx context.Context, req *connect.Request
},
}
- release, err := s.store.CreateRelease(ctx, releaseMessage, user.ID)
+ release, err := s.store.CreateRelease(ctx, releaseMessage, user.Email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create release"))
}
@@ -430,7 +430,7 @@ func convertToRelease(ctx context.Context, s *store.Store, release *store.Releas
}
r.Name = common.FormatReleaseName(project.ResourceID, release.UID)
- creator, err := s.GetUserByID(ctx, release.CreatorUID)
+ creator, err := s.GetUserByEmail(ctx, release.Creator)
if err != nil {
return nil, errors.Wrapf(err, "failed to get release creator")
}
diff --git a/backend/api/v1/revision_service.go b/backend/api/v1/revision_service.go
index 1ceda6f33a..85ac6f50d9 100644
--- a/backend/api/v1/revision_service.go
+++ b/backend/api/v1/revision_service.go
@@ -262,7 +262,7 @@ func (s *RevisionService) DeleteRevision(
if !ok {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
}
- if err := s.store.DeleteRevision(ctx, revisionUID, instanceID, databaseName, user.ID); err != nil {
+ if err := s.store.DeleteRevision(ctx, revisionUID, instanceID, databaseName, user.Email); err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to delete revision %v", request.Name))
}
return connect.NewResponse(&emptypb.Empty{}), nil
@@ -323,15 +323,8 @@ func convertToRevision(ctx context.Context, s *store.Store, parent string, revis
Type: convertToRevisionType(revision.Payload.Type),
}
- if revision.DeleterUID != nil {
- deleter, err := s.GetUserByID(ctx, *revision.DeleterUID)
- if err != nil {
- return nil, errors.Wrapf(err, "failed to get deleter")
- }
- if deleter == nil {
- return nil, errors.Errorf("deleter %v not found", *revision.DeleterUID)
- }
- r.Deleter = common.FormatUserEmail(deleter.Email)
+ if revision.Deleter != nil {
+ r.Deleter = common.FormatUserEmail(*revision.Deleter)
}
if revision.DeletedAt != nil {
r.DeleteTime = timestamppb.New(*revision.DeletedAt)
diff --git a/backend/api/v1/rollout_service.go b/backend/api/v1/rollout_service.go
index 3aa5f61b00..8f35c061b3 100644
--- a/backend/api/v1/rollout_service.go
+++ b/backend/api/v1/rollout_service.go
@@ -259,7 +259,7 @@ func (s *RolloutService) CreateRollout(ctx context.Context, req *connect.Request
rolloutV1.Plan = request.Rollout.GetPlan()
return connect.NewResponse(rolloutV1), nil
}
- pipelineUID, err := s.store.CreatePipelineAIO(ctx, planID, pipelineCreate, user.ID)
+ pipelineUID, err := s.store.CreatePipelineAIO(ctx, planID, pipelineCreate, user.Email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create pipeline, error: %v", err))
}
@@ -588,7 +588,7 @@ func (s *RolloutService) BatchRunTasks(ctx context.Context, req *connect.Request
return nil, connect.NewError(connect.CodeInternal, errors.New("user not found"))
}
- ok, err = s.canUserRunEnvironmentTasks(ctx, user, project, issueN, environmentToRun, rollout.CreatorUID)
+ ok, err = s.canUserRunEnvironmentTasks(ctx, user, project, issueN, environmentToRun, rollout.Creator)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check if the user can run tasks, error: %v", err))
}
@@ -636,7 +636,7 @@ func (s *RolloutService) BatchRunTasks(ctx context.Context, req *connect.Request
return a.TaskUID - b.TaskUID
})
- if err := s.store.CreatePendingTaskRuns(ctx, user.ID, taskRunCreates...); err != nil {
+ if err := s.store.CreatePendingTaskRuns(ctx, user.Email, taskRunCreates...); err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create pending task runs, error %v", err))
}
@@ -724,7 +724,7 @@ func (s *RolloutService) BatchSkipTasks(ctx context.Context, req *connect.Reques
}
for environment := range environmentSet {
- ok, err = s.canUserSkipEnvironmentTasks(ctx, user, project, issueN, environment, rollout.CreatorUID)
+ ok, err = s.canUserRunEnvironmentTasks(ctx, user, project, issueN, environment, rollout.Creator)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check if the user can skip tasks, error: %v", err))
}
@@ -742,7 +742,7 @@ func (s *RolloutService) BatchSkipTasks(ctx context.Context, req *connect.Reques
}
if issueN != nil {
- if err := s.store.CreateIssueCommentTaskUpdateStatus(ctx, issueN.UID, request.Tasks, storepb.TaskRun_SKIPPED, user.ID, request.Reason); err != nil {
+ if err := s.store.CreateIssueCommentTaskUpdateStatus(ctx, issueN.UID, request.Tasks, storepb.TaskRun_SKIPPED, user.Email, request.Reason); err != nil {
slog.Warn("failed to create issue comment", "issueUID", issueN.UID, log.BBError(err))
}
}
@@ -819,7 +819,7 @@ func (s *RolloutService) BatchCancelTaskRuns(ctx context.Context, req *connect.R
}
environment := formatEnvironmentFromStageID(stageID)
- ok, err = s.canUserCancelEnvironmentTaskRun(ctx, user, project, issueN, environment, rollout.CreatorUID)
+ ok, err = s.canUserCancelEnvironmentTaskRun(ctx, user, project, issueN, environment, rollout.Creator)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check if the user can run tasks, error: %v", err))
}
@@ -1050,10 +1050,10 @@ func GetValidRolloutPolicyForEnvironment(ctx context.Context, stores *store.Stor
}
// canUserRunEnvironmentTasks returns if a user can run the tasks in an environment.
-func (s *RolloutService) canUserRunEnvironmentTasks(ctx context.Context, user *store.UserMessage, project *store.ProjectMessage, issue *store.IssueMessage, environment string, _ int) (bool, error) {
+func (s *RolloutService) canUserRunEnvironmentTasks(ctx context.Context, user *store.UserMessage, project *store.ProjectMessage, issue *store.IssueMessage, environment string, _ string) (bool, error) {
// For data export issues, only the creator can run tasks.
if issue != nil && issue.Type == storepb.Issue_DATABASE_EXPORT {
- return issue.Creator.ID == user.ID, nil
+ return issue.Creator.Email == user.Email, nil
}
// Users with bb.taskRuns.create can always create task runs.
@@ -1093,12 +1093,8 @@ func (s *RolloutService) canUserRunEnvironmentTasks(ctx context.Context, user *s
return false, nil
}
-func (s *RolloutService) canUserCancelEnvironmentTaskRun(ctx context.Context, user *store.UserMessage, project *store.ProjectMessage, issue *store.IssueMessage, environment string, creatorUID int) (bool, error) {
- return s.canUserRunEnvironmentTasks(ctx, user, project, issue, environment, creatorUID)
-}
-
-func (s *RolloutService) canUserSkipEnvironmentTasks(ctx context.Context, user *store.UserMessage, project *store.ProjectMessage, issue *store.IssueMessage, environment string, creatorUID int) (bool, error) {
- return s.canUserRunEnvironmentTasks(ctx, user, project, issue, environment, creatorUID)
+func (s *RolloutService) canUserCancelEnvironmentTaskRun(ctx context.Context, user *store.UserMessage, project *store.ProjectMessage, issue *store.IssueMessage, environment string, creator string) (bool, error) {
+ return s.canUserRunEnvironmentTasks(ctx, user, project, issue, environment, creator)
}
// getRolloutWithTasks retrieves a pipeline by ID with its tasks populated.
diff --git a/backend/api/v1/rollout_service_converter.go b/backend/api/v1/rollout_service_converter.go
index 125c66c5b3..7caa2d24a8 100644
--- a/backend/api/v1/rollout_service_converter.go
+++ b/backend/api/v1/rollout_service_converter.go
@@ -221,7 +221,7 @@ func convertToRollout(ctx context.Context, s *store.Store, project *store.Projec
UpdateTime: timestamppb.New(rollout.UpdatedAt),
}
- creator, err := s.GetUserByID(ctx, rollout.CreatorUID)
+ creator, err := s.GetUserByEmail(ctx, rollout.Creator)
if err != nil {
return nil, errors.Wrapf(err, "failed to get rollout creator")
}
diff --git a/backend/api/v1/rollout_service_task.go b/backend/api/v1/rollout_service_task.go
index b88ffe17d1..f5be080035 100644
--- a/backend/api/v1/rollout_service_task.go
+++ b/backend/api/v1/rollout_service_task.go
@@ -143,7 +143,7 @@ func getTaskCreatesFromCreateDatabaseConfig(ctx context.Context, s *store.Store,
return nil, err
}
sheet, err := sheetManager.CreateSheet(ctx, &store.SheetMessage{
- CreatorID: common.SystemBotID,
+ Creator: common.SystemBotEmail,
ProjectID: project.ResourceID,
Title: fmt.Sprintf("Sheet for creating database %v", databaseName),
Statement: statement,
diff --git a/backend/api/v1/sheet_service.go b/backend/api/v1/sheet_service.go
index 2a1be6df10..d3d876089a 100644
--- a/backend/api/v1/sheet_service.go
+++ b/backend/api/v1/sheet_service.go
@@ -67,7 +67,7 @@ func (s *SheetService) CreateSheet(ctx context.Context, request *connect.Request
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project with resource id %q had deleted", projectResourceID))
}
- storeSheetCreate := convertToStoreSheetMessage(project.ResourceID, user.ID, request.Msg.Sheet)
+ storeSheetCreate := convertToStoreSheetMessage(project.ResourceID, user.Email, request.Msg.Sheet)
sheet, err := s.sheetManager.CreateSheet(ctx, storeSheetCreate)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create sheet"))
@@ -111,12 +111,12 @@ func (s *SheetService) BatchCreateSheets(ctx context.Context, request *connect.R
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("Sheet Parent %q does not match BatchCreateSheetsRequest.Parent %q", r.Parent, request.Msg.Parent))
}
- storeSheetCreate := convertToStoreSheetMessage(project.ResourceID, user.ID, r.Sheet)
+ storeSheetCreate := convertToStoreSheetMessage(project.ResourceID, user.Email, r.Sheet)
sheetCreates = append(sheetCreates, storeSheetCreate)
}
- sheets, err := s.sheetManager.BatchCreateSheets(ctx, sheetCreates, project.ResourceID, user.ID)
+ sheets, err := s.sheetManager.BatchCreateSheets(ctx, sheetCreates, project.ResourceID, user.Email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create sheet"))
}
@@ -234,8 +234,8 @@ func (s *SheetService) UpdateSheet(ctx context.Context, request *connect.Request
}
sheetPatch := &store.PatchSheetMessage{
- UID: sheet.UID,
- UpdaterID: user.ID,
+ UID: sheet.UID,
+ Updater: user.Email,
}
for _, path := range request.Msg.UpdateMask.Paths {
@@ -271,7 +271,7 @@ func (s *SheetService) findSheet(ctx context.Context, find *store.FindSheetMessa
}
func (s *SheetService) convertToAPISheetMessage(ctx context.Context, sheet *store.SheetMessage) (*v1pb.Sheet, error) {
- creator, err := s.store.GetUserByID(ctx, sheet.CreatorID)
+ creator, err := s.store.GetUserByEmail(ctx, sheet.Creator)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get creator"))
}
@@ -306,10 +306,10 @@ func (s *SheetService) convertToAPISheetMessage(ctx context.Context, sheet *stor
}, nil
}
-func convertToStoreSheetMessage(projectID string, creatorID int, sheet *v1pb.Sheet) *store.SheetMessage {
+func convertToStoreSheetMessage(projectID string, creator string, sheet *v1pb.Sheet) *store.SheetMessage {
sheetMessage := &store.SheetMessage{
ProjectID: projectID,
- CreatorID: creatorID,
+ Creator: creator,
Title: sheet.Title,
Statement: string(sheet.Content),
Payload: &storepb.SheetPayload{},
diff --git a/backend/api/v1/sql_service.go b/backend/api/v1/sql_service.go
index 390baf68fc..89b5d38718 100644
--- a/backend/api/v1/sql_service.go
+++ b/backend/api/v1/sql_service.go
@@ -149,7 +149,7 @@ func (s *SQLService) AdminExecute(ctx context.Context, stream *connect.BidiStrea
queryContext,
)
- s.createQueryHistory(database, store.QueryHistoryTypeQuery, request.Statement, user.ID, duration, queryErr)
+ s.createQueryHistory(database, store.QueryHistoryTypeQuery, request.Statement, user.Email, duration, queryErr)
response := &v1pb.AdminExecuteResponse{}
if queryErr != nil {
response.Results = []*v1pb.QueryResult{
@@ -259,7 +259,7 @@ func (s *SQLService) Query(ctx context.Context, req *connect.Request[v1pb.QueryR
)
// Update activity.
- s.createQueryHistory(database, store.QueryHistoryTypeQuery, statement, user.ID, duration, queryErr)
+ s.createQueryHistory(database, store.QueryHistoryTypeQuery, statement, user.Email, duration, queryErr)
if queryErr != nil {
if len(results) == 0 {
@@ -868,7 +868,7 @@ func (s *SQLService) Export(ctx context.Context, req *connect.Request[v1pb.Expor
}
bytes, duration, exportErr := DoExport(ctx, s.store, s.dbFactory, s.licenseService, request, user, instance, database, s.accessCheck, s.schemaSyncer, dataSource)
- s.createQueryHistory(database, store.QueryHistoryTypeExport, statement, user.ID, duration, exportErr)
+ s.createQueryHistory(database, store.QueryHistoryTypeExport, statement, user.Email, duration, exportErr)
if exportErr != nil {
return nil, connect.NewError(connect.CodeInternal, errors.New(exportErr.Error()))
@@ -1213,13 +1213,13 @@ func doEncrypt(exports []*encryptContent, password string) ([]byte, error) {
return b.Bytes(), nil
}
-func (s *SQLService) createQueryHistory(database *store.DatabaseMessage, queryType store.QueryHistoryType, statement string, userUID int, duration time.Duration, queryErr error) {
+func (s *SQLService) createQueryHistory(database *store.DatabaseMessage, queryType store.QueryHistoryType, statement string, userEmail string, duration time.Duration, queryErr error) {
qh := &store.QueryHistoryMessage{
- CreatorUID: userUID,
- ProjectID: database.ProjectID,
- Database: common.FormatDatabase(database.InstanceID, database.DatabaseName),
- Statement: statement,
- Type: queryType,
+ Creator: userEmail,
+ ProjectID: database.ProjectID,
+ Database: common.FormatDatabase(database.InstanceID, database.DatabaseName),
+ Statement: statement,
+ Type: queryType,
Payload: &storepb.QueryHistoryPayload{
Error: nil,
Duration: durationpb.New(duration),
@@ -1269,9 +1269,9 @@ func (s *SQLService) SearchQueryHistories(ctx context.Context, req *connect.Requ
}
find := &store.FindQueryHistoryMessage{
- CreatorUID: &user.ID,
- Limit: &limitPlusOne,
- Offset: &offset.offset,
+ Creator: &user.Email,
+ Limit: &limitPlusOne,
+ Offset: &offset.offset,
}
filterQ, err := store.GetListQueryHistoryFilter(request.Filter)
if err != nil {
diff --git a/backend/api/v1/sql_service_converter.go b/backend/api/v1/sql_service_converter.go
index 2bcfcf0e30..ae044207af 100644
--- a/backend/api/v1/sql_service_converter.go
+++ b/backend/api/v1/sql_service_converter.go
@@ -38,12 +38,12 @@ func convertAdviceStatus(status storepb.Advice_Status) v1pb.Advice_Level {
}
func (s *SQLService) convertToV1QueryHistory(ctx context.Context, history *store.QueryHistoryMessage) (*v1pb.QueryHistory, error) {
- user, err := s.store.GetUserByID(ctx, history.CreatorUID)
+ creator, err := s.store.GetUserByEmail(ctx, history.Creator)
if err != nil {
return nil, err
}
- if user == nil {
- return nil, errors.Errorf("cannot found user with id %d", history.CreatorUID)
+ if creator == nil {
+ return nil, errors.Errorf("cannot found user with email %s", history.Creator)
}
historyType := v1pb.QueryHistory_TYPE_UNSPECIFIED
@@ -60,7 +60,7 @@ func (s *SQLService) convertToV1QueryHistory(ctx context.Context, history *store
Statement: history.Statement,
Error: history.Payload.Error,
Database: history.Database,
- Creator: common.FormatUserEmail(user.Email),
+ Creator: common.FormatUserEmail(creator.Email),
CreateTime: timestamppb.New(history.CreatedAt),
Duration: history.Payload.Duration,
Type: historyType,
diff --git a/backend/api/v1/worksheet_service.go b/backend/api/v1/worksheet_service.go
index 4cc6d3abf6..e1c693286b 100644
--- a/backend/api/v1/worksheet_service.go
+++ b/backend/api/v1/worksheet_service.go
@@ -80,7 +80,7 @@ func (s *WorksheetService) CreateWorksheet(
}
database = db
}
- storeWorksheetCreate, err := convertToStoreWorksheetMessage(project, database, user.ID, request.Worksheet)
+ storeWorksheetCreate, err := convertToStoreWorksheetMessage(project, database, user.Email, request.Worksheet)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("failed to convert worksheet: %v", err))
}
@@ -154,13 +154,13 @@ func (s *WorksheetService) SearchWorksheets(
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("filter should not be empty"))
}
- filterQ, err := store.GetListSheetFilter(ctx, s.store, user.ID, request.Filter)
+ filterQ, err := store.GetListSheetFilter(ctx, s.store, user.Email, request.Filter)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
worksheetFind.FilterQ = filterQ
- worksheetList, err := s.store.ListWorkSheets(ctx, worksheetFind, user.ID)
+ worksheetList, err := s.store.ListWorkSheets(ctx, worksheetFind, user.Email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to list worksheets: %v", err))
}
@@ -221,7 +221,7 @@ func (s *WorksheetService) UpdateWorksheet(
}
worksheet, err := s.store.GetWorkSheet(ctx, &store.FindWorkSheetMessage{
UID: &worksheetUID,
- }, user.ID)
+ }, user.Email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get worksheet: %v", err))
}
@@ -272,7 +272,7 @@ func (s *WorksheetService) UpdateWorksheet(
worksheet, err = s.store.GetWorkSheet(ctx, &store.FindWorkSheetMessage{
UID: &worksheetUID,
- }, user.ID)
+ }, user.Email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get worksheet: %v", err))
}
@@ -304,7 +304,7 @@ func (s *WorksheetService) DeleteWorksheet(
}
worksheet, err := s.store.GetWorkSheet(ctx, &store.FindWorkSheetMessage{
UID: &worksheetUID,
- }, user.ID)
+ }, user.Email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get worksheet: %v", err))
}
@@ -359,7 +359,7 @@ func (s *WorksheetService) UpdateWorksheetOrganizer(
if !ok {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
}
- worksheetOrganizerUpsert, err := s.store.GetWorksheetOrganizer(ctx, worksheetUID, user.ID)
+ worksheetOrganizerUpsert, err := s.store.GetWorksheetOrganizer(ctx, worksheetUID, user.Email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to found worksheet organizer with error: %v", err))
}
@@ -407,7 +407,7 @@ func (s *WorksheetService) findWorksheet(ctx context.Context, find *store.FindWo
if !ok {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
}
- worksheet, err := s.store.GetWorkSheet(ctx, find, user.ID)
+ worksheet, err := s.store.GetWorkSheet(ctx, find, user.Email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get worksheet: %v", err))
}
@@ -428,7 +428,7 @@ func (s *WorksheetService) canWriteWorksheet(ctx context.Context, worksheet *sto
}
// Worksheet creator and workspace "bb.worksheets.manage" can always write.
- if worksheet.CreatorID == user.ID {
+ if worksheet.Creator == user.Email {
return true, nil
}
ok, err := s.iamManager.CheckPermission(ctx, iam.PermissionWorksheetsManage, user)
@@ -465,7 +465,7 @@ func (s *WorksheetService) canReadWorksheet(ctx context.Context, worksheet *stor
}
// Worksheet creator and workspace bb.worksheets.get can always read.
- if worksheet.CreatorID == user.ID {
+ if worksheet.Creator == user.Email {
return true, nil
}
ok, err := s.iamManager.CheckPermission(ctx, iam.PermissionWorksheetsManage, user)
@@ -534,7 +534,7 @@ func (s *WorksheetService) convertToAPIWorksheetMessage(ctx context.Context, wor
// Keep VISIBILITY_UNSPECIFIED
}
- creator, err := s.store.GetUserByID(ctx, worksheet.CreatorID)
+ creator, err := s.store.GetUserByEmail(ctx, worksheet.Creator)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get creator: %v", err))
}
@@ -564,7 +564,7 @@ func (s *WorksheetService) convertToAPIWorksheetMessage(ctx context.Context, wor
}, nil
}
-func convertToStoreWorksheetMessage(project *store.ProjectMessage, database *store.DatabaseMessage, creatorID int, worksheet *v1pb.Worksheet) (*store.WorkSheetMessage, error) {
+func convertToStoreWorksheetMessage(project *store.ProjectMessage, database *store.DatabaseMessage, creator string, worksheet *v1pb.Worksheet) (*store.WorkSheetMessage, error) {
visibility, err := convertToStoreWorksheetVisibility(worksheet.Visibility)
if err != nil {
return nil, err
@@ -572,7 +572,7 @@ func convertToStoreWorksheetMessage(project *store.ProjectMessage, database *sto
worksheetMessage := &store.WorkSheetMessage{
ProjectID: project.ResourceID,
- CreatorID: creatorID,
+ Creator: creator,
Title: worksheet.Title,
Statement: string(worksheet.Content),
Visibility: visibility,
diff --git a/backend/common/const.go b/backend/common/const.go
index e7c53d2719..e4db2e3510 100644
--- a/backend/common/const.go
+++ b/backend/common/const.go
@@ -11,6 +11,9 @@ const (
// SystemBotID is the ID of the system robot.
SystemBotID = 1
+ // SystemBotEmail is the email of the system robot.
+ SystemBotEmail = "[email protected]"
+
// AllUsers is the email of the pseudo allUsers account.
AllUsers = "allUsers"
diff --git a/backend/component/sheet/sheet.go b/backend/component/sheet/sheet.go
index 06dc96962f..5fda5791ae 100644
--- a/backend/component/sheet/sheet.go
+++ b/backend/component/sheet/sheet.go
@@ -67,7 +67,7 @@ func (sm *Manager) CreateSheet(ctx context.Context, sheet *store.SheetMessage) (
return sm.store.CreateSheet(ctx, sheet)
}
-func (sm *Manager) BatchCreateSheets(ctx context.Context, sheets []*store.SheetMessage, projectID string, creatorUID int) ([]*store.SheetMessage, error) {
+func (sm *Manager) BatchCreateSheets(ctx context.Context, sheets []*store.SheetMessage, projectID string, creator string) ([]*store.SheetMessage, error) {
for _, sheet := range sheets {
if sheet.Payload == nil {
sheet.Payload = &storepb.SheetPayload{}
@@ -75,7 +75,7 @@ func (sm *Manager) BatchCreateSheets(ctx context.Context, sheets []*store.SheetM
sheet.Payload.Commands = getSheetCommands(sheet.Payload.Engine, sheet.Statement)
}
- sheets, err := sm.store.BatchCreateSheet(ctx, projectID, sheets, creatorUID)
+ sheets, err := sm.store.BatchCreateSheet(ctx, projectID, sheets, creator)
if err != nil {
return nil, errors.Wrapf(err, "failed to batch create sheets")
}
diff --git a/backend/migrator/migration/3.13/0022##migrate_creator_id_to_email.sql b/backend/migrator/migration/3.13/0022##migrate_creator_id_to_email.sql
new file mode 100644
index 0000000000..e5e040d953
--- /dev/null
+++ b/backend/migrator/migration/3.13/0022##migrate_creator_id_to_email.sql
@@ -0,0 +1,93 @@
+-- Migration to replace integer IDs with email strings for principal references
+
+-- 1. sheet
+ALTER TABLE sheet ADD COLUMN creator text;
+UPDATE sheet SET creator = p.email FROM principal p WHERE sheet.creator_id = p.id;
+ALTER TABLE sheet ALTER COLUMN creator SET NOT NULL;
+ALTER TABLE sheet DROP COLUMN creator_id;
+ALTER TABLE sheet ADD FOREIGN KEY (creator) REFERENCES principal(email);
+
+-- 2. pipeline
+ALTER TABLE pipeline ADD COLUMN creator text;
+UPDATE pipeline SET creator = p.email FROM principal p WHERE pipeline.creator_id = p.id;
+ALTER TABLE pipeline ALTER COLUMN creator SET NOT NULL;
+ALTER TABLE pipeline DROP COLUMN creator_id;
+ALTER TABLE pipeline ADD FOREIGN KEY (creator) REFERENCES principal(email);
+
+-- 3. task_run
+ALTER TABLE task_run ADD COLUMN creator text;
+UPDATE task_run SET creator = p.email FROM principal p WHERE task_run.creator_id = p.id;
+ALTER TABLE task_run ALTER COLUMN creator SET NOT NULL;
+ALTER TABLE task_run DROP COLUMN creator_id;
+ALTER TABLE task_run ADD FOREIGN KEY (creator) REFERENCES principal(email);
+-- Recreate indexes/constraints if needed (none used creator_id)
+
+-- 4. plan
+ALTER TABLE plan ADD COLUMN creator text;
+UPDATE plan SET creator = p.email FROM principal p WHERE plan.creator_id = p.id;
+ALTER TABLE plan ALTER COLUMN creator SET NOT NULL;
+ALTER TABLE plan DROP COLUMN creator_id;
+ALTER TABLE plan ADD FOREIGN KEY (creator) REFERENCES principal(email);
+
+-- 5. issue
+ALTER TABLE issue ADD COLUMN creator text;
+UPDATE issue SET creator = p.email FROM principal p WHERE issue.creator_id = p.id;
+ALTER TABLE issue ALTER COLUMN creator SET NOT NULL;
+ALTER TABLE issue DROP COLUMN creator_id;
+ALTER TABLE issue ADD FOREIGN KEY (creator) REFERENCES principal(email);
+-- Recreate index
+DROP INDEX IF EXISTS idx_issue_creator_id;
+CREATE INDEX idx_issue_creator ON issue(creator);
+
+-- 6. issue_comment
+ALTER TABLE issue_comment ADD COLUMN creator text;
+UPDATE issue_comment SET creator = p.email FROM principal p WHERE issue_comment.creator_id = p.id;
+ALTER TABLE issue_comment ALTER COLUMN creator SET NOT NULL;
+ALTER TABLE issue_comment DROP COLUMN creator_id;
+ALTER TABLE issue_comment ADD FOREIGN KEY (creator) REFERENCES principal(email);
+
+-- 7. query_history
+ALTER TABLE query_history ADD COLUMN creator text;
+UPDATE query_history SET creator = p.email FROM principal p WHERE query_history.creator_id = p.id;
+ALTER TABLE query_history ALTER COLUMN creator SET NOT NULL;
+ALTER TABLE query_history DROP COLUMN creator_id;
+ALTER TABLE query_history ADD FOREIGN KEY (creator) REFERENCES principal(email);
+-- Recreate index
+DROP INDEX IF EXISTS idx_query_history_creator_id_created_at_project_id;
+CREATE INDEX idx_query_history_creator_created_at_project_id ON query_history(creator, created_at, project_id DESC);
+
+-- 8. worksheet
+ALTER TABLE worksheet ADD COLUMN creator text;
+UPDATE worksheet SET creator = p.email FROM principal p WHERE worksheet.creator_id = p.id;
+ALTER TABLE worksheet ALTER COLUMN creator SET NOT NULL;
+ALTER TABLE worksheet DROP COLUMN creator_id;
+ALTER TABLE worksheet ADD FOREIGN KEY (creator) REFERENCES principal(email);
+-- Recreate index
+DROP INDEX IF EXISTS idx_worksheet_creator_id_project;
+CREATE INDEX idx_worksheet_creator_project ON worksheet(creator, project);
+
+-- 9. worksheet_organizer
+ALTER TABLE worksheet_organizer ADD COLUMN principal text;
+UPDATE worksheet_organizer SET principal = p.email FROM principal p WHERE worksheet_organizer.principal_id = p.id;
+ALTER TABLE worksheet_organizer ALTER COLUMN principal SET NOT NULL;
+ALTER TABLE worksheet_organizer DROP COLUMN principal_id;
+ALTER TABLE worksheet_organizer ADD FOREIGN KEY (principal) REFERENCES principal(email);
+-- Recreate indexes
+DROP INDEX IF EXISTS idx_worksheet_organizer_unique_sheet_id_principal_id;
+CREATE UNIQUE INDEX idx_worksheet_organizer_unique_sheet_id_principal ON worksheet_organizer(worksheet_id, principal);
+DROP INDEX IF EXISTS idx_worksheet_organizer_principal_id;
+CREATE INDEX idx_worksheet_organizer_principal ON worksheet_organizer(principal);
+
+-- 10. revision
+ALTER TABLE revision ADD COLUMN deleter text;
+UPDATE revision SET deleter = p.email FROM principal p WHERE revision.deleter_id = p.id;
+-- deleter is nullable
+ALTER TABLE revision DROP COLUMN deleter_id;
+ALTER TABLE revision ADD FOREIGN KEY (deleter) REFERENCES principal(email);
+
+-- 11. release
+ALTER TABLE release ADD COLUMN creator text;
+UPDATE release SET creator = p.email FROM principal p WHERE release.creator_id = p.id;
+ALTER TABLE release ALTER COLUMN creator SET NOT NULL;
+ALTER TABLE release DROP COLUMN creator_id;
+ALTER TABLE release ADD FOREIGN KEY (creator) REFERENCES principal(email);
diff --git a/backend/migrator/migration/LATEST.sql b/backend/migrator/migration/LATEST.sql
index 21d241b7ff..5ff920d936 100644
--- a/backend/migrator/migration/LATEST.sql
+++ b/backend/migrator/migration/LATEST.sql
@@ -176,7 +176,7 @@ CREATE TABLE sheet_blob (
-- sheet table stores general statements.
CREATE TABLE sheet (
id serial PRIMARY KEY,
- creator_id integer NOT NULL REFERENCES principal(id),
+ creator text NOT NULL REFERENCES principal(email),
created_at timestamptz NOT NULL DEFAULT now(),
project text NOT NULL REFERENCES project(resource_id),
name text NOT NULL,
@@ -194,7 +194,7 @@ ALTER SEQUENCE sheet_id_seq RESTART WITH 101;
-- pipeline table
CREATE TABLE pipeline (
id serial PRIMARY KEY,
- creator_id integer NOT NULL REFERENCES principal(id),
+ creator text NOT NULL REFERENCES principal(email),
created_at timestamptz NOT NULL DEFAULT now(),
project text NOT NULL REFERENCES project(resource_id)
);
@@ -220,7 +220,7 @@ ALTER SEQUENCE task_id_seq RESTART WITH 101;
-- task run table stores the task run
CREATE TABLE task_run (
id serial PRIMARY KEY,
- creator_id integer NOT NULL REFERENCES principal(id),
+ creator text NOT NULL REFERENCES principal(email),
created_at timestamptz NOT NULL DEFAULT now(),
updated_at timestamptz NOT NULL DEFAULT now(),
task_id integer NOT NULL REFERENCES task(id),
@@ -264,7 +264,7 @@ ALTER SEQUENCE task_run_log_id_seq RESTART WITH 101;
CREATE TABLE plan (
id bigserial PRIMARY KEY,
deleted boolean NOT NULL DEFAULT FALSE,
- creator_id integer NOT NULL REFERENCES principal(id),
+ creator text NOT NULL REFERENCES principal(email),
created_at timestamptz NOT NULL DEFAULT now(),
updated_at timestamptz NOT NULL DEFAULT now(),
project text NOT NULL REFERENCES project(resource_id),
@@ -306,7 +306,7 @@ ALTER SEQUENCE plan_check_run_id_seq RESTART WITH 101;
-- issue
CREATE TABLE issue (
id serial PRIMARY KEY,
- creator_id integer NOT NULL REFERENCES principal(id),
+ creator text NOT NULL REFERENCES principal(email),
created_at timestamptz NOT NULL DEFAULT now(),
updated_at timestamptz NOT NULL DEFAULT now(),
project text NOT NULL REFERENCES project(resource_id),
@@ -326,7 +326,7 @@ CREATE INDEX idx_issue_project ON issue(project);
CREATE UNIQUE INDEX idx_issue_unique_plan_id ON issue(plan_id);
-CREATE INDEX idx_issue_creator_id ON issue(creator_id);
+CREATE INDEX idx_issue_creator ON issue(creator);
CREATE INDEX idx_issue_ts_vector ON issue USING GIN(ts_vector);
@@ -363,7 +363,7 @@ ALTER SEQUENCE audit_log_id_seq RESTART WITH 101;
CREATE TABLE issue_comment (
id bigserial PRIMARY KEY,
- creator_id integer NOT NULL REFERENCES principal(id),
+ creator text NOT NULL REFERENCES principal(email),
created_at timestamptz NOT NULL DEFAULT now(),
updated_at timestamptz NOT NULL DEFAULT now(),
issue_id integer NOT NULL REFERENCES issue(id),
@@ -377,7 +377,7 @@ ALTER SEQUENCE issue_comment_id_seq RESTART WITH 101;
CREATE TABLE query_history (
id bigserial PRIMARY KEY,
- creator_id integer NOT NULL REFERENCES principal(id),
+ creator text NOT NULL REFERENCES principal(email),
created_at timestamptz NOT NULL DEFAULT now(),
project_id text NOT NULL, -- the project resource id
database text NOT NULL, -- the database resource name, for example, instances/{instance}/databases/{database}
@@ -389,14 +389,14 @@ CREATE TABLE query_history (
payload jsonb NOT NULL DEFAULT '{}'
);
-CREATE INDEX idx_query_history_creator_id_created_at_project_id ON query_history(creator_id, created_at, project_id DESC);
+CREATE INDEX idx_query_history_creator_created_at_project_id ON query_history(creator, created_at, project_id DESC);
ALTER SEQUENCE query_history_id_seq RESTART WITH 101;
-- worksheet table stores worksheets in SQL Editor.
CREATE TABLE worksheet (
id serial PRIMARY KEY,
- creator_id integer NOT NULL REFERENCES principal(id),
+ creator text NOT NULL REFERENCES principal(email),
created_at timestamptz NOT NULL DEFAULT now(),
updated_at timestamptz NOT NULL DEFAULT now(),
project text NOT NULL REFERENCES project(resource_id),
@@ -410,7 +410,7 @@ CREATE TABLE worksheet (
payload jsonb NOT NULL DEFAULT '{}'
);
-CREATE INDEX idx_worksheet_creator_id_project ON worksheet(creator_id, project);
+CREATE INDEX idx_worksheet_creator_project ON worksheet(creator, project);
ALTER SEQUENCE worksheet_id_seq RESTART WITH 101;
@@ -418,13 +418,13 @@ ALTER SEQUENCE worksheet_id_seq RESTART WITH 101;
CREATE TABLE worksheet_organizer (
id serial PRIMARY KEY,
worksheet_id integer NOT NULL REFERENCES worksheet(id) ON DELETE CASCADE,
- principal_id integer NOT NULL REFERENCES principal(id),
+ principal text NOT NULL REFERENCES principal(email),
payload jsonb NOT NULL DEFAULT '{}'
);
-CREATE UNIQUE INDEX idx_worksheet_organizer_unique_sheet_id_principal_id ON worksheet_organizer(worksheet_id, principal_id);
+CREATE UNIQUE INDEX idx_worksheet_organizer_unique_sheet_id_principal ON worksheet_organizer(worksheet_id, principal);
-CREATE INDEX idx_worksheet_organizer_principal_id ON worksheet_organizer(principal_id);
+CREATE INDEX idx_worksheet_organizer_principal ON worksheet_organizer(principal);
CREATE INDEX idx_worksheet_organizer_payload ON worksheet_organizer USING GIN(payload);
@@ -476,7 +476,7 @@ CREATE TABLE revision (
instance text NOT NULL,
db_name text NOT NULL,
created_at timestamptz NOT NULL DEFAULT now(),
- deleter_id integer REFERENCES principal(id),
+ deleter text REFERENCES principal(email),
deleted_at timestamptz,
version text NOT NULL,
-- Stored as RevisionPayload (proto/store/store/revision.proto)
@@ -526,7 +526,7 @@ CREATE TABLE release (
id bigserial PRIMARY KEY,
deleted boolean NOT NULL DEFAULT FALSE,
project text NOT NULL REFERENCES project(resource_id),
- creator_id integer NOT NULL REFERENCES principal (id),
+ creator text NOT NULL REFERENCES principal (email),
created_at timestamptz NOT NULL DEFAULT now(),
digest text NOT NULL DEFAULT '',
-- Stored as ReleasePayload (proto/store/store/release.proto)
diff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.go
index 6663ce02a5..285db2579d 100644
--- a/backend/migrator/migrator_test.go
+++ b/backend/migrator/migrator_test.go
@@ -12,7 +12,7 @@ import (
func TestLatestVersion(t *testing.T) {
files, err := getSortedVersionedFiles()
require.NoError(t, err)
- require.Equal(t, semver.MustParse("3.13.21"), *files[len(files)-1].version)
+ require.Equal(t, semver.MustParse("3.13.22"), *files[len(files)-1].version)
}
func TestVersionUnique(t *testing.T) {
diff --git a/backend/runner/taskrun/database_migrate_executor.go b/backend/runner/taskrun/database_migrate_executor.go
index 4698e4c939..c5d52283f1 100644
--- a/backend/runner/taskrun/database_migrate_executor.go
+++ b/backend/runner/taskrun/database_migrate_executor.go
@@ -120,7 +120,7 @@ func (exec *DatabaseMigrateExecutor) runMigrationWithPriorBackup(ctx context.Con
},
},
},
- }, common.SystemBotID); err != nil {
+ }, common.SystemBotEmail); err != nil {
slog.Warn("failed to create issue comment", "task", task.ID, log.BBError(err), "backup error", backupErr)
}
}
@@ -440,7 +440,7 @@ func (exec *DatabaseMigrateExecutor) backupData(
},
},
},
- }, common.SystemBotID); err != nil {
+ }, common.SystemBotEmail); err != nil {
slog.Warn("failed to create issue comment", "task", task.ID, log.BBError(err))
}
}
diff --git a/backend/runner/taskrun/scheduler.go b/backend/runner/taskrun/scheduler.go
index f03b29694b..89028dd57f 100644
--- a/backend/runner/taskrun/scheduler.go
+++ b/backend/runner/taskrun/scheduler.go
@@ -247,21 +247,20 @@ func (s *Scheduler) scheduleAutoRolloutTask(ctx context.Context, taskUID int) er
}
create := &store.TaskRunMessage{
- CreatorID: common.SystemBotID,
- TaskUID: task.ID,
+ TaskUID: task.ID,
}
if task.Payload.GetSheetId() != 0 {
sheetUID := int(task.Payload.GetSheetId())
create.SheetUID = &sheetUID
}
- if err := s.store.CreatePendingTaskRuns(ctx, common.SystemBotID, create); err != nil {
+ if err := s.store.CreatePendingTaskRuns(ctx, common.SystemBotEmail, create); err != nil {
return errors.Wrapf(err, "failed to create pending task runs")
}
if issue != nil {
tasks := []string{common.FormatTask(issue.Project.ResourceID, task.PipelineID, common.FormatStageID(task.Environment), taskUID)}
- if err := s.store.CreateIssueCommentTaskUpdateStatus(ctx, issue.UID, tasks, storepb.TaskRun_PENDING, common.SystemBotID, ""); err != nil {
+ if err := s.store.CreateIssueCommentTaskUpdateStatus(ctx, issue.UID, tasks, storepb.TaskRun_PENDING, common.SystemBotEmail, ""); err != nil {
slog.Warn("failed to create issue comment", "issueUID", issue.UID, log.BBError(err))
}
}
@@ -347,9 +346,9 @@ func (s *Scheduler) schedulePendingTaskRun(ctx context.Context, taskRun *store.T
}
if _, err := s.store.UpdateTaskRunStatus(ctx, &store.TaskRunStatusPatch{
- ID: taskRun.ID,
- UpdaterID: common.SystemBotID,
- Status: storepb.TaskRun_RUNNING,
+ ID: taskRun.ID,
+ Updater: common.SystemBotEmail,
+ Status: storepb.TaskRun_RUNNING,
}); err != nil {
return errors.Wrapf(err, "failed to update task run status to running")
}
@@ -606,11 +605,11 @@ func (s *Scheduler) runTaskRunOnce(ctx context.Context, taskRun *store.TaskRunMe
code := common.Ok
result := string(resultBytes)
taskRunStatusPatch := &store.TaskRunStatusPatch{
- ID: taskRun.ID,
- UpdaterID: common.SystemBotID,
- Status: storepb.TaskRun_CANCELED,
- Code: &code,
- Result: &result,
+ ID: taskRun.ID,
+ Updater: common.SystemBotEmail,
+ Status: storepb.TaskRun_CANCELED,
+ Code: &code,
+ Result: &result,
}
if _, err := s.store.UpdateTaskRunStatus(ctx, taskRunStatusPatch); err != nil {
slog.Error("Failed to mark task as CANCELED",
@@ -649,11 +648,11 @@ func (s *Scheduler) runTaskRunOnce(ctx context.Context, taskRun *store.TaskRunMe
code := common.ErrorCode(err)
result := string(resultBytes)
taskRunStatusPatch := &store.TaskRunStatusPatch{
- ID: taskRun.ID,
- UpdaterID: common.SystemBotID,
- Status: storepb.TaskRun_FAILED,
- Code: &code,
- Result: &result,
+ ID: taskRun.ID,
+ Updater: common.SystemBotEmail,
+ Status: storepb.TaskRun_FAILED,
+ Code: &code,
+ Result: &result,
}
if _, err := s.store.UpdateTaskRunStatus(ctx, taskRunStatusPatch); err != nil {
slog.Error("Failed to mark task as FAILED",
@@ -673,7 +672,7 @@ func (s *Scheduler) runTaskRunOnce(ctx context.Context, taskRun *store.TaskRunMe
return nil
}
tasks := []string{common.FormatTask(issue.Project.ResourceID, task.PipelineID, common.FormatStageID(task.Environment), task.ID)}
- return s.store.CreateIssueCommentTaskUpdateStatus(ctx, issue.UID, tasks, storepb.TaskRun_FAILED, common.SystemBotID, "")
+ return s.store.CreateIssueCommentTaskUpdateStatus(ctx, issue.UID, tasks, storepb.TaskRun_FAILED, common.SystemBotEmail, "")
}(); err != nil {
slog.Warn("failed to create issue comment", log.BBError(err))
}
@@ -693,11 +692,11 @@ func (s *Scheduler) runTaskRunOnce(ctx context.Context, taskRun *store.TaskRunMe
code := common.Ok
result := string(resultBytes)
taskRunStatusPatch := &store.TaskRunStatusPatch{
- ID: taskRun.ID,
- UpdaterID: common.SystemBotID,
- Status: storepb.TaskRun_DONE,
- Code: &code,
- Result: &result,
+ ID: taskRun.ID,
+ Updater: common.SystemBotEmail,
+ Status: storepb.TaskRun_DONE,
+ Code: &code,
+ Result: &result,
}
if _, err := s.store.UpdateTaskRunStatus(ctx, taskRunStatusPatch); err != nil {
slog.Error("Failed to mark task as DONE",
@@ -717,7 +716,7 @@ func (s *Scheduler) runTaskRunOnce(ctx context.Context, taskRun *store.TaskRunMe
return nil
}
tasks := []string{common.FormatTask(issue.Project.ResourceID, task.PipelineID, common.FormatStageID(task.Environment), task.ID)}
- return s.store.CreateIssueCommentTaskUpdateStatus(ctx, issue.UID, tasks, storepb.TaskRun_DONE, common.SystemBotID, "")
+ return s.store.CreateIssueCommentTaskUpdateStatus(ctx, issue.UID, tasks, storepb.TaskRun_DONE, common.SystemBotEmail, "")
}(); err != nil {
slog.Warn("failed to create issue comment", log.BBError(err))
}
@@ -877,7 +876,7 @@ func (s *Scheduler) ListenTaskSkippedOrDone(ctx context.Context) {
_, err := s.store.CreateIssueComment(ctx, &store.IssueCommentMessage{
IssueUID: issueN.UID,
Payload: p,
- }, common.SystemBotID)
+ }, common.SystemBotEmail)
return err
}
return nil
@@ -936,7 +935,7 @@ func (s *Scheduler) ListenTaskSkippedOrDone(ctx context.Context) {
},
},
},
- }, common.SystemBotID); err != nil {
+ }, common.SystemBotEmail); err != nil {
return errors.Wrapf(err, "failed to create issue comment after changing the issue status")
}
diff --git a/backend/store/issue.go b/backend/store/issue.go
index 166be4608c..bce5fe1f15 100644
--- a/backend/store/issue.go
+++ b/backend/store/issue.go
@@ -50,8 +50,8 @@ type IssueMessage struct {
UpdatedAt time.Time
// Internal fields.
- projectID string
- creatorUID int
+ projectID string
+ creatorEmail string
}
// UpdateIssueMessage is the message for updating an issue.
@@ -71,9 +71,9 @@ type FindIssueMessage struct {
ProjectIDs *[]string
PlanUID *int64
PipelineID *int // Filter by pipeline_id (computed from plan)
- // To support pagination, we add into creator.
+ // To support pagination, we add into creatorEmail.
// Only principleID or one of the following three fields can be set.
- CreatorID *int
+ CreatorID *string
CreatedAtBefore *time.Time
CreatedAtAfter *time.Time
Types *[]storepb.Issue_Type
@@ -131,7 +131,7 @@ func (s *Store) GetIssue(ctx context.Context, find *FindIssueMessage) (*IssueMes
}
// CreateIssue creates a new issue.
-func (s *Store) CreateIssue(ctx context.Context, create *IssueMessage, creatorID int) (*IssueMessage, error) {
+func (s *Store) CreateIssue(ctx context.Context, create *IssueMessage, creator string) (*IssueMessage, error) {
create.Status = storepb.Issue_OPEN
payload, err := protojson.Marshal(create.Payload)
if err != nil {
@@ -141,7 +141,7 @@ func (s *Store) CreateIssue(ctx context.Context, create *IssueMessage, creatorID
q := qb.Q().Space(`
INSERT INTO issue (
- creator_id,
+ creator,
project,
plan_id,
name,
@@ -153,7 +153,7 @@ func (s *Store) CreateIssue(ctx context.Context, create *IssueMessage, creatorID
)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
RETURNING id`,
- creatorID,
+ creator,
create.Project.ResourceID,
create.PlanUID,
create.Title,
@@ -288,7 +288,7 @@ func (s *Store) ListIssues(ctx context.Context, find *FindIssueMessage) ([]*Issu
where.And("EXISTS (SELECT 1 FROM task WHERE task.pipeline_id = plan.pipeline_id AND task.instance = ? AND task.db_name = ?)", *find.InstanceID, *find.DatabaseName)
}
if v := find.CreatorID; v != nil {
- where.And("issue.creator_id = ?", *v)
+ where.And("issue.creator = ?", *v)
}
if v := find.CreatedAtBefore; v != nil {
where.And("issue.created_at < ?", *v)
@@ -340,7 +340,7 @@ func (s *Store) ListIssues(ctx context.Context, find *FindIssueMessage) ([]*Issu
q := qb.Q().Space(`
SELECT
issue.id,
- issue.creator_id,
+ issue.creator,
issue.created_at,
issue.updated_at,
issue.project,
@@ -418,7 +418,7 @@ func (s *Store) ListIssues(ctx context.Context, find *FindIssueMessage) ([]*Issu
var typeString string
if err := rows.Scan(
&issue.UID,
- &issue.creatorUID,
+ &issue.creatorEmail,
&issue.CreatedAt,
&issue.UpdatedAt,
&issue.projectID,
@@ -466,7 +466,7 @@ func (s *Store) ListIssues(ctx context.Context, find *FindIssueMessage) ([]*Issu
return nil, err
}
issue.Project = project
- creator, err := s.GetUserByID(ctx, issue.creatorUID)
+ creator, err := s.GetUserByEmail(ctx, issue.creatorEmail)
if err != nil {
return nil, err
}
diff --git a/backend/store/issue_comment.go b/backend/store/issue_comment.go
index 27c07a6b6d..4dc4682e27 100644
--- a/backend/store/issue_comment.go
+++ b/backend/store/issue_comment.go
@@ -20,7 +20,7 @@ type IssueCommentMessage struct {
Payload *storepb.IssueCommentPayload
Creator *UserMessage
- creatorUID int
+ creatorEmail string
}
type FindIssueCommentMessage struct {
@@ -55,7 +55,7 @@ func (s *Store) ListIssueComment(ctx context.Context, find *FindIssueCommentMess
q := qb.Q().Space(`
SELECT
id,
- creator_id,
+ creator,
created_at,
updated_at,
issue_id,
@@ -99,7 +99,7 @@ func (s *Store) ListIssueComment(ctx context.Context, find *FindIssueCommentMess
var p []byte
if err := rows.Scan(
&ic.UID,
- &ic.creatorUID,
+ &ic.creatorEmail,
&ic.CreatedAt,
&ic.UpdatedAt,
&ic.IssueUID,
@@ -118,7 +118,7 @@ func (s *Store) ListIssueComment(ctx context.Context, find *FindIssueCommentMess
}
for _, ic := range issueComments {
- creator, err := s.GetUserByID(ctx, ic.creatorUID)
+ creator, err := s.GetUserByEmail(ctx, ic.creatorEmail)
if err != nil {
return nil, errors.Wrapf(err, "failed to get creator")
}
@@ -128,7 +128,7 @@ func (s *Store) ListIssueComment(ctx context.Context, find *FindIssueCommentMess
return issueComments, nil
}
-func (s *Store) CreateIssueCommentTaskUpdateStatus(ctx context.Context, issueUID int, tasks []string, status storepb.TaskRun_Status, creatorUID int, comment string) error {
+func (s *Store) CreateIssueCommentTaskUpdateStatus(ctx context.Context, issueUID int, tasks []string, status storepb.TaskRun_Status, creator string, comment string) error {
create := &IssueCommentMessage{
IssueUID: issueUID,
Payload: &storepb.IssueCommentPayload{
@@ -142,11 +142,11 @@ func (s *Store) CreateIssueCommentTaskUpdateStatus(ctx context.Context, issueUID
},
}
- _, err := s.CreateIssueComment(ctx, create, creatorUID)
+ _, err := s.CreateIssueComment(ctx, create, creator)
return err
}
-func (s *Store) CreateIssueComment(ctx context.Context, create *IssueCommentMessage, creatorUID int) (*IssueCommentMessage, error) {
+func (s *Store) CreateIssueComment(ctx context.Context, create *IssueCommentMessage, creator string) (*IssueCommentMessage, error) {
payload, err := protojson.Marshal(create.Payload)
if err != nil {
return nil, errors.Wrapf(err, "failed to marshal payload")
@@ -154,7 +154,7 @@ func (s *Store) CreateIssueComment(ctx context.Context, create *IssueCommentMess
q := qb.Q().Space(`
INSERT INTO issue_comment (
- creator_id,
+ creator,
issue_id,
payload
) VALUES (
@@ -162,7 +162,7 @@ func (s *Store) CreateIssueComment(ctx context.Context, create *IssueCommentMess
?,
?
) RETURNING id, created_at, updated_at
- `, creatorUID, create.IssueUID, payload)
+ `, creator, create.IssueUID, payload)
query, args, err := q.ToSQL()
if err != nil {
@@ -173,12 +173,12 @@ func (s *Store) CreateIssueComment(ctx context.Context, create *IssueCommentMess
return nil, errors.Wrapf(err, "failed to insert")
}
- create.creatorUID = creatorUID
- creator, err := s.GetUserByID(ctx, creatorUID)
+ c, err := s.GetUserByEmail(ctx, creator)
if err != nil {
return nil, errors.Wrapf(err, "failed to get creator")
}
- create.Creator = creator
+ create.Creator = c
+ create.creatorEmail = creator
return create, nil
}
diff --git a/backend/store/pipeline.go b/backend/store/pipeline.go
index 159e950f9e..8a84086fd7 100644
--- a/backend/store/pipeline.go
+++ b/backend/store/pipeline.go
@@ -21,9 +21,9 @@ type PipelineMessage struct {
ProjectID string
Tasks []*TaskMessage
// Output only.
- ID int
- CreatorUID int
- CreatedAt time.Time
+ ID int
+ Creator string
+ CreatedAt time.Time
// The UpdatedAt is a latest time of task/taskRun updates.
// If there are no tasks, it will be the same as CreatedAt.
UpdatedAt time.Time
@@ -41,7 +41,7 @@ type PipelineFind struct {
}
// CreatePipelineAIO creates a pipeline with tasks all in one.
-func (s *Store) CreatePipelineAIO(ctx context.Context, planUID int64, pipeline *PipelineMessage, creatorUID int) (createdPipelineUID int, err error) {
+func (s *Store) CreatePipelineAIO(ctx context.Context, planUID int64, pipeline *PipelineMessage, creator string) (createdPipelineUID int, err error) {
tx, err := s.GetDB().BeginTx(ctx, nil)
if err != nil {
return 0, errors.Wrapf(err, "failed to begin tx")
@@ -54,7 +54,7 @@ func (s *Store) CreatePipelineAIO(ctx context.Context, planUID int64, pipeline *
}
invalidateCacheF := func() {}
if pipelineUIDMaybe == nil {
- createdPipeline, err := s.createPipeline(ctx, tx, pipeline, creatorUID)
+ createdPipeline, err := s.createPipeline(ctx, tx, pipeline, creator)
if err != nil {
return 0, errors.Wrapf(err, "failed to create pipeline")
}
@@ -167,25 +167,25 @@ func lockPlanAndGetPipelineUID(ctx context.Context, txn *sql.Tx, planUID int64)
return nil, nil
}
-func (*Store) createPipeline(ctx context.Context, txn *sql.Tx, create *PipelineMessage, creatorUID int) (*PipelineMessage, error) {
+func (*Store) createPipeline(ctx context.Context, txn *sql.Tx, create *PipelineMessage, creator string) (*PipelineMessage, error) {
q := qb.Q().Space(`
INSERT INTO pipeline (
project,
- creator_id
+ creator
)
VALUES (
?,
?
)
RETURNING id, created_at
- `, create.ProjectID, creatorUID)
+ `, create.ProjectID, creator)
query, args, err := q.ToSQL()
if err != nil {
return nil, errors.Wrapf(err, "failed to build sql")
}
pipeline := &PipelineMessage{
- ProjectID: create.ProjectID,
- CreatorUID: creatorUID,
+ ProjectID: create.ProjectID,
+ Creator: creator,
}
if err := txn.QueryRowContext(ctx, query, args...).Scan(
&pipeline.ID,
@@ -233,7 +233,7 @@ func (s *Store) ListPipelines(ctx context.Context, find *PipelineFind) ([]*Pipel
q := qb.Q().Space(`
SELECT
pipeline.id,
- pipeline.creator_id,
+ pipeline.creator,
pipeline.created_at,
pipeline.project,
issue.id,
@@ -292,7 +292,7 @@ func (s *Store) ListPipelines(ctx context.Context, find *PipelineFind) ([]*Pipel
var pipeline PipelineMessage
if err := rows.Scan(
&pipeline.ID,
- &pipeline.CreatorUID,
+ &pipeline.Creator,
&pipeline.CreatedAt,
&pipeline.ProjectID,
&pipeline.IssueID,
@@ -356,7 +356,7 @@ func (s *Store) GetListRolloutFilter(ctx context.Context, filter string) (*qb.Qu
if err != nil {
return nil, errors.Errorf("failed to get user %v with error %v", value, err.Error())
}
- return qb.Q().Space("pipeline.creator_id = ?", user.ID), nil
+ return qb.Q().Space("pipeline.creator = ?", user.Email), nil
case "task_type":
taskType, ok := value.(string)
if !ok {
diff --git a/backend/store/plan.go b/backend/store/plan.go
index c0205bc771..b4bc2581dd 100644
--- a/backend/store/plan.go
+++ b/backend/store/plan.go
@@ -28,11 +28,11 @@ type PlanMessage struct {
Description string
Config *storepb.PlanConfig
// output only
- UID int64
- CreatorUID int
- CreatedAt time.Time
- UpdatedAt time.Time
- Deleted bool
+ UID int64
+ Creator string
+ CreatedAt time.Time
+ UpdatedAt time.Time
+ Deleted bool
}
// FindPlanMessage is the message to find a plan.
@@ -59,7 +59,7 @@ type UpdatePlanMessage struct {
}
// CreatePlan creates a new plan.
-func (s *Store) CreatePlan(ctx context.Context, plan *PlanMessage, creatorUID int) (*PlanMessage, error) {
+func (s *Store) CreatePlan(ctx context.Context, plan *PlanMessage, creator string) (*PlanMessage, error) {
config, err := protojson.Marshal(plan.Config)
if err != nil {
return nil, errors.Wrap(err, "failed to marshal plan config")
@@ -67,7 +67,7 @@ func (s *Store) CreatePlan(ctx context.Context, plan *PlanMessage, creatorUID in
q := qb.Q().Space(`
INSERT INTO plan (
- creator_id,
+ creator,
project,
pipeline_id,
name,
@@ -76,7 +76,7 @@ func (s *Store) CreatePlan(ctx context.Context, plan *PlanMessage, creatorUID in
) VALUES (
?, ?, ?, ?, ?, ?
) RETURNING id, created_at, updated_at
- `, creatorUID, plan.ProjectID, plan.PipelineUID, plan.Name, plan.Description, config)
+ `, creator, plan.ProjectID, plan.PipelineUID, plan.Name, plan.Description, config)
query, args, err := q.ToSQL()
if err != nil {
@@ -99,7 +99,7 @@ func (s *Store) CreatePlan(ctx context.Context, plan *PlanMessage, creatorUID in
}
plan.UID = id
- plan.CreatorUID = creatorUID
+ plan.Creator = creator
return plan, nil
}
@@ -123,7 +123,7 @@ func (s *Store) ListPlans(ctx context.Context, find *FindPlanMessage) ([]*PlanMe
q := qb.Q().Space(`
SELECT
plan.id,
- plan.creator_id,
+ plan.creator,
plan.created_at,
plan.updated_at,
plan.project,
@@ -190,7 +190,7 @@ func (s *Store) ListPlans(ctx context.Context, find *FindPlanMessage) ([]*PlanMe
var config []byte
if err := rows.Scan(
&plan.UID,
- &plan.CreatorUID,
+ &plan.Creator,
&plan.CreatedAt,
&plan.UpdatedAt,
&plan.ProjectID,
@@ -324,7 +324,7 @@ func (s *Store) GetListPlanFilter(ctx context.Context, filter string) (*qb.Query
if err != nil {
return nil, errors.Errorf("failed to get user %v with error %v", value, err.Error())
}
- return qb.Q().Space("plan.creator_id = ?", user.ID), nil
+ return qb.Q().Space("plan.creator = ?", user.Email), nil
case "has_pipeline":
hasPipeline, ok := value.(bool)
if !ok {
diff --git a/backend/store/query_history.go b/backend/store/query_history.go
index 5bcc769455..f1b7d20200 100644
--- a/backend/store/query_history.go
+++ b/backend/store/query_history.go
@@ -32,7 +32,7 @@ type QueryHistoryMessage struct {
CreatedAt time.Time
// Related fields
- CreatorUID int
+ Creator string
// ProjectID is the project resource id.
ProjectID string
@@ -46,8 +46,8 @@ type QueryHistoryMessage struct {
// FindQueryHistoryMessage is the API message for finding query histories.
type FindQueryHistoryMessage struct {
- CreatorUID *int
- ProjectID *string
+ Creator *string
+ ProjectID *string
// Instance is the instance resource name like instances/{instance}.
Instance *string
// Database is database resource name like instances/{instance}/databases/{database}.
@@ -68,7 +68,7 @@ func (s *Store) CreateQueryHistory(ctx context.Context, create *QueryHistoryMess
q := qb.Q().Space(`
INSERT INTO query_history (
- creator_id,
+ creator,
project_id,
database,
statement,
@@ -80,7 +80,7 @@ func (s *Store) CreateQueryHistory(ctx context.Context, create *QueryHistoryMess
id,
created_at
`,
- create.CreatorUID,
+ create.Creator,
create.ProjectID,
create.Database,
create.Statement,
@@ -117,7 +117,7 @@ func (s *Store) ListQueryHistories(ctx context.Context, find *FindQueryHistoryMe
q := qb.Q().Space(`
SELECT
query_history.id,
- query_history.creator_id,
+ query_history.creator,
query_history.created_at,
query_history.project_id,
query_history.database,
@@ -131,8 +131,8 @@ func (s *Store) ListQueryHistories(ctx context.Context, find *FindQueryHistoryMe
if filterQ := find.FilterQ; filterQ != nil {
q.And("?", filterQ)
}
- if v := find.CreatorUID; v != nil {
- q.And("query_history.creator_id = ?", *v)
+ if v := find.Creator; v != nil {
+ q.And("query_history.creator = ?", *v)
}
if v := find.ProjectID; v != nil {
q.And("query_history.project_id = ?", *v)
@@ -177,7 +177,7 @@ func (s *Store) ListQueryHistories(ctx context.Context, find *FindQueryHistoryMe
var payloadStr string
if err := rows.Scan(
&queryHistory.UID,
- &queryHistory.CreatorUID,
+ &queryHistory.Creator,
&queryHistory.CreatedAt,
&queryHistory.ProjectID,
&queryHistory.Database,
diff --git a/backend/store/release.go b/backend/store/release.go
index 5ce1683e16..26f6011138 100644
--- a/backend/store/release.go
+++ b/backend/store/release.go
@@ -19,10 +19,10 @@ type ReleaseMessage struct {
Payload *storepb.ReleasePayload
// output only
- UID int64
- Deleted bool
- CreatorUID int
- At time.Time
+ UID int64
+ Deleted bool
+ Creator string
+ At time.Time
}
type FindReleaseMessage struct {
@@ -41,7 +41,7 @@ type UpdateReleaseMessage struct {
Payload *storepb.ReleasePayload
}
-func (s *Store) CreateRelease(ctx context.Context, release *ReleaseMessage, creatorUID int) (*ReleaseMessage, error) {
+func (s *Store) CreateRelease(ctx context.Context, release *ReleaseMessage, creator string) (*ReleaseMessage, error) {
p, err := protojson.Marshal(release.Payload)
if err != nil {
return nil, errors.Wrapf(err, "failed to marshal release payload")
@@ -49,7 +49,7 @@ func (s *Store) CreateRelease(ctx context.Context, release *ReleaseMessage, crea
q := qb.Q().Space(`
INSERT INTO release (
- creator_id,
+ creator,
project,
digest,
payload
@@ -59,7 +59,7 @@ func (s *Store) CreateRelease(ctx context.Context, release *ReleaseMessage, crea
?,
?
) RETURNING id, created_at
- `, creatorUID, release.ProjectID, release.Digest, p)
+ `, creator, release.ProjectID, release.Digest, p)
query, args, err := q.ToSQL()
if err != nil {
@@ -83,7 +83,7 @@ func (s *Store) CreateRelease(ctx context.Context, release *ReleaseMessage, crea
}
release.UID = id
- release.CreatorUID = creatorUID
+ release.Creator = creator
release.At = createdTime
return release, nil
@@ -114,7 +114,7 @@ func (s *Store) ListReleases(ctx context.Context, find *FindReleaseMessage) ([]*
deleted,
project,
digest,
- creator_id,
+ creator,
created_at,
payload
FROM release
@@ -171,7 +171,7 @@ func (s *Store) ListReleases(ctx context.Context, find *FindReleaseMessage) ([]*
&r.Deleted,
&r.ProjectID,
&r.Digest,
- &r.CreatorUID,
+ &r.Creator,
&r.At,
&payload,
); err != nil {
diff --git a/backend/store/revision.go b/backend/store/revision.go
index 85e7c94793..bebb1c67ab 100644
--- a/backend/store/revision.go
+++ b/backend/store/revision.go
@@ -20,10 +20,10 @@ type RevisionMessage struct {
Payload *storepb.RevisionPayload
// output only
- UID int64
- CreatedAt time.Time
- DeleterUID *int
- DeletedAt *time.Time
+ UID int64
+ CreatedAt time.Time
+ Deleter *string
+ DeletedAt *time.Time
}
type FindRevisionMessage struct {
@@ -50,7 +50,7 @@ func (s *Store) ListRevisions(ctx context.Context, find *FindRevisionMessage) ([
instance,
db_name,
created_at,
- deleter_id,
+ deleter,
deleted_at,
version,
payload
@@ -115,7 +115,7 @@ func (s *Store) ListRevisions(ctx context.Context, find *FindRevisionMessage) ([
&r.InstanceID,
&r.DatabaseName,
&r.CreatedAt,
- &r.DeleterUID,
+ &r.Deleter,
&r.DeletedAt,
&r.Version,
&p,
@@ -206,10 +206,10 @@ func (s *Store) CreateRevision(ctx context.Context, revision *RevisionMessage) (
return revision, nil
}
-func (s *Store) DeleteRevision(ctx context.Context, uid int64, instanceID, databaseName string, deleterUID int) error {
+func (s *Store) DeleteRevision(ctx context.Context, uid int64, instanceID, databaseName string, deleter string) error {
query :=
`UPDATE revision
- SET deleter_id = $1, deleted_at = now()
+ SET deleter = $1, deleted_at = now()
WHERE id = $2 AND instance = $3 AND db_name = $4`
tx, err := s.GetDB().BeginTx(ctx, nil)
@@ -218,7 +218,7 @@ func (s *Store) DeleteRevision(ctx context.Context, uid int64, instanceID, datab
}
defer tx.Rollback()
- if _, err := tx.ExecContext(ctx, query, deleterUID, uid, instanceID, databaseName); err != nil {
+ if _, err := tx.ExecContext(ctx, query, deleter, uid, instanceID, databaseName); err != nil {
return errors.Wrapf(err, "failed to exec")
}
diff --git a/backend/store/sheet.go b/backend/store/sheet.go
index bc9c7528af..235d6948b0 100644
--- a/backend/store/sheet.go
+++ b/backend/store/sheet.go
@@ -20,7 +20,7 @@ import (
type SheetMessage struct {
ProjectID string
- CreatorID int
+ Creator string
Title string
Statement string
@@ -46,7 +46,7 @@ type FindSheetMessage struct {
// Used to find the creator's sheet list.
// When finding shared PROJECT/PUBLIC sheets, this value should be empty.
// It does not make sense to set both `CreatorID` and `ExcludedCreatorID`.
- CreatorID *int
+ Creator *string
// LoadFull is used if we want to load the full sheet.
LoadFull bool
@@ -58,7 +58,7 @@ type FindSheetMessage struct {
// PatchSheetMessage is the message to patch a sheet.
type PatchSheetMessage struct {
UID int
- UpdaterID int
+ Updater string
Statement *string
}
@@ -119,7 +119,7 @@ func (s *Store) listSheets(ctx context.Context, find *FindSheetMessage) ([]*Shee
q := qb.Q().Space(fmt.Sprintf(`
SELECT
sheet.id,
- sheet.creator_id,
+ sheet.creator,
sheet.created_at,
sheet.project,
sheet.name,
@@ -134,8 +134,8 @@ func (s *Store) listSheets(ctx context.Context, find *FindSheetMessage) ([]*Shee
if v := find.UID; v != nil {
q.And("sheet.id = ?", *v)
}
- if v := find.CreatorID; v != nil {
- q.And("sheet.creator_id = ?", *v)
+ if v := find.Creator; v != nil {
+ q.And("sheet.creator = ?", *v)
}
if v := find.ProjectID; v != nil {
q.And("sheet.project = ?", *v)
@@ -164,7 +164,7 @@ func (s *Store) listSheets(ctx context.Context, find *FindSheetMessage) ([]*Shee
var payload []byte
if err := rows.Scan(
&sheet.UID,
- &sheet.CreatorID,
+ &sheet.Creator,
&sheet.CreatedAt,
&sheet.ProjectID,
&sheet.Title,
@@ -214,7 +214,7 @@ func (s *Store) CreateSheet(ctx context.Context, create *SheetMessage) (*SheetMe
q := qb.Q().Space(`
INSERT INTO sheet (
- creator_id,
+ creator,
project,
name,
sha256,
@@ -222,7 +222,7 @@ func (s *Store) CreateSheet(ctx context.Context, create *SheetMessage) (*SheetMe
)
VALUES (?, ?, ?, ?, ?)
RETURNING id, created_at
- `, create.CreatorID, create.ProjectID, create.Title, create.Sha256, payload)
+ `, create.Creator, create.ProjectID, create.Title, create.Sha256, payload)
query, args, err := q.ToSQL()
if err != nil {
@@ -255,7 +255,7 @@ func (s *Store) CreateSheet(ctx context.Context, create *SheetMessage) (*SheetMe
// BatchCreateSheet creates a new sheet.
// You should not use this function directly to create sheets.
// Use BatchCreateSheet in component/sheet instead.
-func (s *Store) BatchCreateSheet(ctx context.Context, projectID string, creates []*SheetMessage, creatorUID int) ([]*SheetMessage, error) {
+func (s *Store) BatchCreateSheet(ctx context.Context, projectID string, creates []*SheetMessage, creator string) ([]*SheetMessage, error) {
var names []string
var statements []string
var sha256s [][]byte
@@ -283,7 +283,7 @@ func (s *Store) BatchCreateSheet(ctx context.Context, projectID string, creates
q := qb.Q().Space(`
INSERT INTO sheet (
- creator_id,
+ creator,
project,
name,
sha256,
@@ -295,7 +295,7 @@ func (s *Store) BatchCreateSheet(ctx context.Context, projectID string, creates
unnest(CAST(? AS BYTEA[])),
unnest(CAST(? AS JSONB[]))
RETURNING id, created_at
- `, creatorUID, projectID, names, sha256s, payloads)
+ `, creator, projectID, names, sha256s, payloads)
query, args, err := q.ToSQL()
if err != nil {
@@ -315,7 +315,7 @@ func (s *Store) BatchCreateSheet(ctx context.Context, projectID string, creates
defer rows.Close()
for i := 0; rows.Next(); i++ {
- creates[i].CreatorID = creatorUID
+ creates[i].Creator = creator
if err := rows.Scan(
&creates[i].UID,
diff --git a/backend/store/task_run.go b/backend/store/task_run.go
index 9421218910..fd3fe82e2d 100644
--- a/backend/store/task_run.go
+++ b/backend/store/task_run.go
@@ -24,14 +24,14 @@ type TaskRunMessage struct {
SheetUID *int
// Output only.
- ID int
- CreatorID int
- Creator *UserMessage
- CreatedAt time.Time
- UpdatedAt time.Time
- ProjectID string
- StartedAt *time.Time
- RunAt *time.Time
+ ID int
+ CreatorEmail string
+ Creator *UserMessage
+ CreatedAt time.Time
+ UpdatedAt time.Time
+ ProjectID string
+ StartedAt *time.Time
+ RunAt *time.Time
}
// FindTaskRunMessage is the message for finding task runs.
@@ -49,7 +49,7 @@ type TaskRunStatusPatch struct {
ID int
// Standard fields
- UpdaterID int
+ Updater string
// Domain specific fields
Status storepb.TaskRun_Status
@@ -62,7 +62,7 @@ func (s *Store) ListTaskRuns(ctx context.Context, find *FindTaskRunMessage) ([]*
q := qb.Q().Space(`
SELECT
task_run.id,
- task_run.creator_id,
+ task_run.creator,
task_run.created_at,
task_run.updated_at,
task_run.task_id,
@@ -125,7 +125,7 @@ func (s *Store) ListTaskRuns(ctx context.Context, find *FindTaskRunMessage) ([]*
var statusString string
if err := rows.Scan(
&taskRun.ID,
- &taskRun.CreatorID,
+ &taskRun.CreatorEmail,
&taskRun.CreatedAt,
&taskRun.UpdatedAt,
&taskRun.TaskUID,
@@ -166,7 +166,7 @@ func (s *Store) ListTaskRuns(ctx context.Context, find *FindTaskRunMessage) ([]*
}
for _, taskRun := range taskRuns {
- creator, err := s.GetUserByID(ctx, taskRun.CreatorID)
+ creator, err := s.GetUserByEmail(ctx, taskRun.CreatorEmail)
if err != nil {
return nil, err
}
@@ -261,7 +261,7 @@ func (s *Store) UpdateTaskRunStartAt(ctx context.Context, taskRunID int) error {
// - Uses WHERE NOT EXISTS to skip tasks that already have active (PENDING/RUNNING/DONE) task runs
// - Uses ON CONFLICT DO NOTHING to handle race conditions where two requests try to create the same task run
// - The unique constraint on (task_id, attempt) ensures no duplicates
-func (s *Store) CreatePendingTaskRuns(ctx context.Context, creatorID int, creates ...*TaskRunMessage) error {
+func (s *Store) CreatePendingTaskRuns(ctx context.Context, creator string, creates ...*TaskRunMessage) error {
if len(creates) == 0 {
return nil
}
@@ -282,7 +282,7 @@ func (s *Store) CreatePendingTaskRuns(ctx context.Context, creatorID int, create
// 4. Uses ON CONFLICT DO NOTHING to handle race conditions
q := qb.Q().Space(`
INSERT INTO task_run (
- creator_id,
+ creator,
task_id,
sheet_id,
run_at,
@@ -308,7 +308,7 @@ func (s *Store) CreatePendingTaskRuns(ctx context.Context, creatorID int, create
AND task_run.status IN (?, ?, ?)
)
ON CONFLICT (task_id, attempt) DO NOTHING
- `, creatorID, storepb.TaskRun_PENDING.String(), taskUIDs, sheetUIDs, runAts,
+ `, creator, storepb.TaskRun_PENDING.String(), taskUIDs, sheetUIDs, runAts,
storepb.TaskRun_PENDING.String(), storepb.TaskRun_RUNNING.String(), storepb.TaskRun_DONE.String())
query, args, err := q.ToSQL()
@@ -342,7 +342,7 @@ func (*Store) patchTaskRunStatusImpl(ctx context.Context, txn *sql.Tx, patch *Ta
q := qb.Q().Space("UPDATE task_run SET ?", set).
Space("WHERE id = ?", patch.ID).
- Space("RETURNING id, creator_id, created_at, updated_at, task_id, status, code, result")
+ Space("RETURNING id, creator, created_at, updated_at, task_id, status, code, result")
query, args, err := q.ToSQL()
if err != nil {
@@ -353,7 +353,7 @@ func (*Store) patchTaskRunStatusImpl(ctx context.Context, txn *sql.Tx, patch *Ta
var statusString string
if err := txn.QueryRowContext(ctx, query, args...).Scan(
&taskRun.ID,
- &taskRun.CreatorID,
+ &taskRun.CreatorEmail,
&taskRun.CreatedAt,
&taskRun.UpdatedAt,
&taskRun.TaskUID,
diff --git a/backend/store/worksheet.go b/backend/store/worksheet.go
index 49ed7dba0f..2be44c8f84 100644
--- a/backend/store/worksheet.go
+++ b/backend/store/worksheet.go
@@ -39,7 +39,7 @@ type WorkSheetMessage struct {
InstanceID *string
DatabaseName *string
- CreatorID int
+ Creator string
Title string
Statement string
@@ -75,8 +75,8 @@ type PatchWorkSheetMessage struct {
}
// GetWorkSheet gets a sheet.
-func (s *Store) GetWorkSheet(ctx context.Context, find *FindWorkSheetMessage, currentPrincipalID int) (*WorkSheetMessage, error) {
- sheets, err := s.ListWorkSheets(ctx, find, currentPrincipalID)
+func (s *Store) GetWorkSheet(ctx context.Context, find *FindWorkSheetMessage, currentPrincipal string) (*WorkSheetMessage, error) {
+ sheets, err := s.ListWorkSheets(ctx, find, currentPrincipal)
if err != nil {
return nil, err
}
@@ -92,7 +92,7 @@ func (s *Store) GetWorkSheet(ctx context.Context, find *FindWorkSheetMessage, cu
}
// ListWorkSheets returns a list of sheets.
-func (s *Store) ListWorkSheets(ctx context.Context, find *FindWorkSheetMessage, currentPrincipalID int) ([]*WorkSheetMessage, error) {
+func (s *Store) ListWorkSheets(ctx context.Context, find *FindWorkSheetMessage, currentPrincipal string) ([]*WorkSheetMessage, error) {
statementField := fmt.Sprintf("LEFT(worksheet.statement, %d)", common.MaxSheetSize)
if find.LoadFull {
statementField = "worksheet.statement"
@@ -101,7 +101,7 @@ func (s *Store) ListWorkSheets(ctx context.Context, find *FindWorkSheetMessage,
q := qb.Q().Space(fmt.Sprintf(`
SELECT
worksheet.id,
- worksheet.creator_id,
+ worksheet.creator,
worksheet.created_at,
worksheet.updated_at,
worksheet.project,
@@ -113,8 +113,8 @@ func (s *Store) ListWorkSheets(ctx context.Context, find *FindWorkSheetMessage,
OCTET_LENGTH(worksheet.statement),
COALESCE(worksheet_organizer.payload, '{}')
FROM worksheet
- LEFT JOIN worksheet_organizer ON worksheet_organizer.worksheet_id = worksheet.id AND worksheet_organizer.principal_id = %d
- WHERE TRUE`, statementField, currentPrincipalID))
+ LEFT JOIN worksheet_organizer ON worksheet_organizer.worksheet_id = worksheet.id AND worksheet_organizer.principal = '%s'
+ WHERE TRUE`, statementField, currentPrincipal))
if filterQ := find.FilterQ; filterQ != nil {
q.And("?", filterQ)
@@ -147,7 +147,7 @@ func (s *Store) ListWorkSheets(ctx context.Context, find *FindWorkSheetMessage,
var payloadBytes []byte
if err := rows.Scan(
&sheet.UID,
- &sheet.CreatorID,
+ &sheet.Creator,
&sheet.CreatedAt,
&sheet.UpdatedAt,
&sheet.ProjectID,
@@ -190,7 +190,7 @@ func (s *Store) CreateWorkSheet(ctx context.Context, create *WorkSheetMessage) (
q := qb.Q().Space(`
INSERT INTO worksheet (
- creator_id,
+ creator,
project,
instance,
db_name,
@@ -201,7 +201,7 @@ func (s *Store) CreateWorkSheet(ctx context.Context, create *WorkSheetMessage) (
)
VALUES (?, ?, ?, ?, ?, ?, ?, ?)
RETURNING id, created_at, updated_at, OCTET_LENGTH(statement)
- `, create.CreatorID, create.ProjectID, create.InstanceID, create.DatabaseName, create.Title, create.Statement, create.Visibility, payload)
+ `, create.Creator, create.ProjectID, create.InstanceID, create.DatabaseName, create.Title, create.Statement, create.Visibility, payload)
query, args, err := q.ToSQL()
if err != nil {
@@ -313,18 +313,18 @@ type WorksheetOrganizerMessage struct {
// Related fields
WorksheetUID int
- PrincipalUID int
+ Principal string
Payload *storepb.WorkSheetOrganizerPayload
}
-func (s *Store) GetWorksheetOrganizer(ctx context.Context, worksheetUID, principalUID int) (*WorksheetOrganizerMessage, error) {
+func (s *Store) GetWorksheetOrganizer(ctx context.Context, worksheetUID int, principal string) (*WorksheetOrganizerMessage, error) {
q := qb.Q().Space(`
SELECT
id,
payload
FROM worksheet_organizer
- WHERE worksheet_id = ? AND principal_id = ?
- `, worksheetUID, principalUID)
+ WHERE worksheet_id = ? AND principal = ?
+ `, worksheetUID, principal)
query, args, err := q.ToSQL()
if err != nil {
@@ -333,7 +333,7 @@ func (s *Store) GetWorksheetOrganizer(ctx context.Context, worksheetUID, princip
worksheetOrganizer := WorksheetOrganizerMessage{
WorksheetUID: worksheetUID,
- PrincipalUID: principalUID,
+ Principal: principal,
Payload: &storepb.WorkSheetOrganizerPayload{},
}
var payload []byte
@@ -370,18 +370,18 @@ func (s *Store) UpsertWorksheetOrganizer(ctx context.Context, patch *WorksheetOr
q := qb.Q().Space(`
INSERT INTO worksheet_organizer (
worksheet_id,
- principal_id,
+ principal,
payload
)
VALUES (?, ?, ?)
- ON CONFLICT(worksheet_id, principal_id) DO UPDATE SET
+ ON CONFLICT(worksheet_id, principal) DO UPDATE SET
payload = EXCLUDED.payload
RETURNING
id,
worksheet_id,
- principal_id,
+ principal,
payload
- `, patch.WorksheetUID, patch.PrincipalUID, payloadStr)
+ `, patch.WorksheetUID, patch.Principal, payloadStr)
query, args, err := q.ToSQL()
if err != nil {
@@ -393,7 +393,7 @@ func (s *Store) UpsertWorksheetOrganizer(ctx context.Context, patch *WorksheetOr
if err := tx.QueryRowContext(ctx, query, args...).Scan(
&worksheetOrganizer.UID,
&worksheetOrganizer.WorksheetUID,
- &worksheetOrganizer.PrincipalUID,
+ &worksheetOrganizer.Principal,
&payload,
); err != nil {
if err == sql.ErrNoRows {
@@ -414,7 +414,7 @@ func (s *Store) UpsertWorksheetOrganizer(ctx context.Context, patch *WorksheetOr
return &worksheetOrganizer, nil
}
-func GetListSheetFilter(ctx context.Context, s *Store, callerID int, filter string) (*qb.Query, error) {
+func GetListSheetFilter(ctx context.Context, s *Store, caller string, filter string) (*qb.Query, error) {
if filter == "" {
return nil, nil
}
@@ -430,19 +430,21 @@ func GetListSheetFilter(ctx context.Context, s *Store, callerID int, filter stri
var getFilter func(expr celast.Expr) (*qb.Query, error)
- getUserID := func(name string) (int, error) {
+ getUserID := func(name string) (string, error) {
creatorEmail := strings.TrimPrefix(name, "users/")
if creatorEmail == "" {
- return 0, errors.New("invalid empty creator identifier")
+ return "", errors.New("invalid empty creator identifier")
}
+ // Assuming we trust the email or validate existence elsewhere, or we can keep GetUserByEmail if strict validation needed.
+ // For now, let's keep validation but return email.
user, err := s.GetUserByEmail(ctx, creatorEmail)
if err != nil {
- return 0, errors.Errorf("failed to get user: %v", err)
+ return "", errors.Errorf("failed to get user: %v", err)
}
if user == nil {
- return 0, errors.Errorf("user with email %s not found", creatorEmail)
+ return "", errors.Errorf("user with email %s not found", creatorEmail)
}
- return user.ID, nil
+ return user.Email, nil
}
parseToSQL := func(variable, value any) (*qb.Query, error) {
@@ -452,10 +454,10 @@ func GetListSheetFilter(ctx context.Context, s *Store, callerID int, filter stri
if err != nil {
return nil, err
}
- return qb.Q().Space("worksheet.creator_id = ?", userID), nil
+ return qb.Q().Space("worksheet.creator = ?", userID), nil
case "starred":
if starred, ok := value.(bool); ok {
- return qb.Q().Space("worksheet.id IN (SELECT worksheet_id FROM worksheet_organizer WHERE principal_id = ? AND (payload->>'starred')::boolean = ?)", callerID, starred), nil
+ return qb.Q().Space("worksheet.id IN (SELECT worksheet_id FROM worksheet_organizer WHERE principal = ? AND (payload->>'starred')::boolean = ?)", caller, starred), nil
}
return qb.Q().Space("TRUE"), nil
case "visibility":
@@ -508,7 +510,7 @@ func GetListSheetFilter(ctx context.Context, s *Store, callerID int, filter stri
if err != nil {
return nil, err
}
- return qb.Q().Space("worksheet.creator_id != ?", userID), nil
+ return qb.Q().Space("worksheet.creator != ?", userID), nil
case celoperators.In:
variable, value := getVariableAndValueFromExpr(expr)
if variable != "visibility" {