Skip to content

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

refactor: remove Project field from IssueMessage struct (#18596)

Danny Xua79e0a0e56bf
diff --git a/backend/api/v1/issue_service.go b/backend/api/v1/issue_service.go
index 25c880b206..d67a6554f4 100644
--- a/backend/api/v1/issue_service.go
+++ b/backend/api/v1/issue_service.go
@@ -470,25 +470,25 @@ func (s *IssueService) createIssueDatabaseChange(ctx context.Context, project *s
}
issueCreateMessage := &store.IssueMessage{
- Project: project,
- PlanUID: planUID,
- PipelineUID: rolloutUID,
- Title: request.Issue.Title,
- Status: storepb.Issue_OPEN,
- Type: storepb.Issue_DATABASE_CHANGE,
- Description: request.Issue.Description,
- }
-
- issueCreateMessage.Payload = &storepb.Issue{
- Approval: &storepb.IssuePayloadApproval{
- ApprovalFindingDone: false,
- ApprovalTemplate: nil,
- Approvers: nil,
+ ProjectID: project.ResourceID,
+ CreatorEmail: user.Email,
+ PlanUID: planUID,
+ PipelineUID: rolloutUID,
+ Title: request.Issue.Title,
+ Status: storepb.Issue_OPEN,
+ Type: storepb.Issue_DATABASE_CHANGE,
+ Description: request.Issue.Description,
+ Payload: &storepb.Issue{
+ Approval: &storepb.IssuePayloadApproval{
+ ApprovalFindingDone: false,
+ ApprovalTemplate: nil,
+ Approvers: nil,
+ },
+ Labels: request.Issue.Labels,
},
- Labels: request.Issue.Labels,
}
- issue, err := s.store.CreateIssue(ctx, issueCreateMessage, user.Email)
+ issue, err := s.store.CreateIssue(ctx, issueCreateMessage)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create issue, error: %v", err))
}
@@ -499,7 +499,7 @@ func (s *IssueService) createIssueDatabaseChange(ctx context.Context, project *s
Type: storepb.Activity_ISSUE_CREATE,
Comment: "",
Issue: webhook.NewIssue(issue),
- Project: webhook.NewProject(issue.Project),
+ Project: webhook.NewProject(project),
})
converted, err := s.convertToIssue(ctx, issue)
@@ -540,32 +540,31 @@ func (s *IssueService) createIssueGrantRequest(ctx context.Context, project *sto
}
}
- issueCreateMessage := &store.IssueMessage{
- Project: project,
- PlanUID: nil,
- PipelineUID: nil,
- Title: request.Issue.Title,
- Status: storepb.Issue_OPEN,
- Type: storepb.Issue_GRANT_REQUEST,
- Description: request.Issue.Description,
- }
-
convertedGrantRequest, err := convertGrantRequest(ctx, s.store, request.Issue.GrantRequest)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to convert GrantRequest, error: %v", err))
}
-
- issueCreateMessage.Payload = &storepb.Issue{
- GrantRequest: convertedGrantRequest,
- Approval: &storepb.IssuePayloadApproval{
- ApprovalFindingDone: false,
- ApprovalTemplate: nil,
- Approvers: nil,
+ issueCreateMessage := &store.IssueMessage{
+ ProjectID: project.ResourceID,
+ CreatorEmail: user.Email,
+ PlanUID: nil,
+ PipelineUID: nil,
+ Title: request.Issue.Title,
+ Status: storepb.Issue_OPEN,
+ Type: storepb.Issue_GRANT_REQUEST,
+ Description: request.Issue.Description,
+ Payload: &storepb.Issue{
+ GrantRequest: convertedGrantRequest,
+ Approval: &storepb.IssuePayloadApproval{
+ ApprovalFindingDone: false,
+ ApprovalTemplate: nil,
+ Approvers: nil,
+ },
+ Labels: request.Issue.Labels,
},
- Labels: request.Issue.Labels,
}
- issue, err := s.store.CreateIssue(ctx, issueCreateMessage, user.Email)
+ issue, err := s.store.CreateIssue(ctx, issueCreateMessage)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create issue, error: %v", err))
}
@@ -576,7 +575,7 @@ func (s *IssueService) createIssueGrantRequest(ctx context.Context, project *sto
Type: storepb.Activity_ISSUE_CREATE,
Comment: "",
Issue: webhook.NewIssue(issue),
- Project: webhook.NewProject(issue.Project),
+ Project: webhook.NewProject(project),
})
converted, err := s.convertToIssue(ctx, issue)
@@ -630,25 +629,25 @@ func (s *IssueService) createIssueDatabaseDataExport(ctx context.Context, projec
}
issueCreateMessage := &store.IssueMessage{
- Project: project,
- PlanUID: planUID,
- PipelineUID: rolloutUID,
- Title: request.Issue.Title,
- Status: storepb.Issue_OPEN,
- Type: storepb.Issue_DATABASE_EXPORT,
- Description: request.Issue.Description,
- }
-
- issueCreateMessage.Payload = &storepb.Issue{
- Approval: &storepb.IssuePayloadApproval{
- ApprovalFindingDone: false,
- ApprovalTemplate: nil,
- Approvers: nil,
+ ProjectID: project.ResourceID,
+ CreatorEmail: user.Email,
+ PlanUID: planUID,
+ PipelineUID: rolloutUID,
+ Title: request.Issue.Title,
+ Status: storepb.Issue_OPEN,
+ Type: storepb.Issue_DATABASE_EXPORT,
+ Description: request.Issue.Description,
+ Payload: &storepb.Issue{
+ Approval: &storepb.IssuePayloadApproval{
+ ApprovalFindingDone: false,
+ ApprovalTemplate: nil,
+ Approvers: nil,
+ },
+ Labels: request.Issue.Labels,
},
- Labels: request.Issue.Labels,
}
- issue, err := s.store.CreateIssue(ctx, issueCreateMessage, user.Email)
+ issue, err := s.store.CreateIssue(ctx, issueCreateMessage)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create issue, error: %v", err))
}
@@ -659,7 +658,7 @@ func (s *IssueService) createIssueDatabaseDataExport(ctx context.Context, projec
Type: storepb.Activity_ISSUE_CREATE,
Comment: "",
Issue: webhook.NewIssue(issue),
- Project: webhook.NewProject(issue.Project),
+ Project: webhook.NewProject(project),
})
converted, err := s.convertToIssue(ctx, issue)
@@ -676,6 +675,13 @@ func (s *IssueService) ApproveIssue(ctx context.Context, req *connect.Request[v1
if err != nil {
return nil, err
}
+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &issue.ProjectID})
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get project, error: %v", err))
+ }
+ if project == nil {
+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project %s not found", issue.ProjectID))
+ }
payload := issue.Payload
if payload.Approval == nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("issue payload approval is nil"))
@@ -771,7 +777,7 @@ func (s *IssueService) ApproveIssue(ctx context.Context, req *connect.Request[v1
Type: storepb.Activity_ISSUE_APPROVAL_NOTIFY,
Comment: "",
Issue: webhook.NewIssue(issue),
- Project: webhook.NewProject(issue.Project),
+ Project: webhook.NewProject(project),
IssueApprovalCreate: &webhook.EventIssueApprovalCreate{
Role: role,
},
@@ -789,7 +795,7 @@ func (s *IssueService) ApproveIssue(ctx context.Context, req *connect.Request[v1
Type: storepb.Activity_NOTIFY_ISSUE_APPROVED,
Comment: "",
Issue: webhook.NewIssue(issue),
- Project: webhook.NewProject(issue.Project),
+ Project: webhook.NewProject(project),
})
// notify pipeline rollout
@@ -816,7 +822,7 @@ func (s *IssueService) ApproveIssue(ctx context.Context, req *connect.Request[v1
Type: storepb.Activity_NOTIFY_PIPELINE_ROLLOUT,
Comment: "",
Issue: webhook.NewIssue(issue),
- Project: webhook.NewProject(issue.Project),
+ Project: webhook.NewProject(project),
IssueRolloutReady: &webhook.EventIssueRolloutReady{
RolloutPolicy: policy,
StageName: firstEnvironment,
@@ -938,6 +944,13 @@ func (s *IssueService) RequestIssue(ctx context.Context, req *connect.Request[v1
if err != nil {
return nil, err
}
+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &issue.ProjectID})
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get project, error: %v", err))
+ }
+ if project == nil {
+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project %s not found", issue.ProjectID))
+ }
payload := issue.Payload
if payload.Approval == nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("issue payload approval is nil"))
@@ -999,7 +1012,7 @@ func (s *IssueService) RequestIssue(ctx context.Context, req *connect.Request[v1
Type: storepb.Activity_ISSUE_APPROVAL_NOTIFY,
Comment: "",
Issue: webhook.NewIssue(issue),
- Project: webhook.NewProject(issue.Project),
+ Project: webhook.NewProject(project),
IssueApprovalCreate: &webhook.EventIssueApprovalCreate{
Role: role,
},
@@ -1069,6 +1082,13 @@ func (s *IssueService) UpdateIssue(ctx context.Context, req *connect.Request[v1p
}
return nil, err
}
+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &issue.ProjectID})
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get project, error: %v", err))
+ }
+ if project == nil {
+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project %s not found", issue.ProjectID))
+ }
updateMasks := map[string]bool{}
@@ -1124,7 +1144,7 @@ func (s *IssueService) UpdateIssue(ctx context.Context, req *connect.Request[v1p
Type: storepb.Activity_ISSUE_FIELD_UPDATE,
Comment: "",
Issue: webhook.NewIssue(issue),
- Project: webhook.NewProject(issue.Project),
+ Project: webhook.NewProject(project),
IssueUpdate: &webhook.EventIssueUpdate{
Path: path,
},
@@ -1155,7 +1175,7 @@ func (s *IssueService) UpdateIssue(ctx context.Context, req *connect.Request[v1p
Type: storepb.Activity_ISSUE_FIELD_UPDATE,
Comment: "",
Issue: webhook.NewIssue(issue),
- Project: webhook.NewProject(issue.Project),
+ Project: webhook.NewProject(project),
IssueUpdate: &webhook.EventIssueUpdate{
Path: path,
},
@@ -1265,6 +1285,15 @@ func (s *IssueService) BatchUpdateIssuesStatus(ctx context.Context, req *connect
errs = multierr.Append(errs, errors.Wrapf(err, "failed to get issue %v", issue.UID))
continue
}
+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &updatedIssue.ProjectID})
+ if err != nil {
+ errs = multierr.Append(errs, errors.Wrapf(err, "failed to get project for issue %v", issue.UID))
+ continue
+ }
+ if project == nil {
+ errs = multierr.Append(errs, errors.Errorf("project %s not found for issue %v", updatedIssue.ProjectID, issue.UID))
+ continue
+ }
func() {
s.webhookManager.CreateEvent(ctx, &webhook.Event{
@@ -1272,7 +1301,7 @@ func (s *IssueService) BatchUpdateIssuesStatus(ctx context.Context, req *connect
Type: storepb.Activity_ISSUE_STATUS_UPDATE,
Comment: req.Msg.Reason,
Issue: webhook.NewIssue(updatedIssue),
- Project: webhook.NewProject(updatedIssue.Project),
+ Project: webhook.NewProject(project),
})
}()
@@ -1368,13 +1397,20 @@ func (s *IssueService) CreateIssueComment(ctx context.Context, req *connect.Requ
if err != nil {
return nil, err
}
+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &issue.ProjectID})
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get project, error: %v", err))
+ }
+ if project == nil {
+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project %s not found", issue.ProjectID))
+ }
s.webhookManager.CreateEvent(ctx, &webhook.Event{
Actor: user,
Type: storepb.Activity_ISSUE_COMMENT_CREATE,
Comment: req.Msg.IssueComment.Comment,
Issue: webhook.NewIssue(issue),
- Project: webhook.NewProject(issue.Project),
+ Project: webhook.NewProject(project),
})
ic, err := s.store.CreateIssueComment(ctx, &store.IssueCommentMessage{
@@ -1471,7 +1507,7 @@ func (s *IssueService) getIssueMessage(ctx context.Context, name string) (*store
}
func (s *IssueService) isUserReviewer(ctx context.Context, issue *store.IssueMessage, role string, user *store.UserMessage) bool {
- roles := s.getUserRoleMap(ctx, issue.Project.ResourceID, user)
+ roles := s.getUserRoleMap(ctx, issue.ProjectID, user)
return roles[role]
}
diff --git a/backend/api/v1/issue_service_converter.go b/backend/api/v1/issue_service_converter.go
index 51a0281bc4..318febb80a 100644
--- a/backend/api/v1/issue_service_converter.go
+++ b/backend/api/v1/issue_service_converter.go
@@ -89,7 +89,7 @@ func (s *IssueService) convertToIssue(ctx context.Context, issue *store.IssueMes
}
issueV1 := &v1pb.Issue{
- Name: common.FormatIssue(issue.Project.ResourceID, issue.UID),
+ Name: common.FormatIssue(issue.ProjectID, issue.UID),
Title: issue.Title,
Description: issue.Description,
Type: convertToIssueType(issue.Type),
@@ -104,10 +104,10 @@ func (s *IssueService) convertToIssue(ctx context.Context, issue *store.IssueMes
}
if issue.PlanUID != nil {
- issueV1.Plan = common.FormatPlan(issue.Project.ResourceID, *issue.PlanUID)
+ issueV1.Plan = common.FormatPlan(issue.ProjectID, *issue.PlanUID)
}
if issue.PipelineUID != nil {
- issueV1.Rollout = common.FormatRollout(issue.Project.ResourceID, *issue.PipelineUID)
+ issueV1.Rollout = common.FormatRollout(issue.ProjectID, *issue.PipelineUID)
}
approval := issuePayload.GetApproval()
diff --git a/backend/api/v1/plan_service.go b/backend/api/v1/plan_service.go
index 84485aafc3..44092b45ed 100644
--- a/backend/api/v1/plan_service.go
+++ b/backend/api/v1/plan_service.go
@@ -1023,7 +1023,7 @@ func convertToPlan(ctx context.Context, s *store.Store, plan *store.PlanMessage)
return nil, errors.Wrapf(err, "failed to get issue by plan uid %d", plan.UID)
}
if issue != nil {
- p.Issue = common.FormatIssue(issue.Project.ResourceID, issue.UID)
+ p.Issue = common.FormatIssue(issue.ProjectID, issue.UID)
}
if plan.PipelineUID != nil {
p.Rollout = common.FormatRollout(plan.ProjectID, *plan.PipelineUID)
diff --git a/backend/api/v1/rollout_service.go b/backend/api/v1/rollout_service.go
index bd1445ccbb..aec40d1000 100644
--- a/backend/api/v1/rollout_service.go
+++ b/backend/api/v1/rollout_service.go
@@ -203,7 +203,7 @@ func (s *RolloutService) CreateRollout(ctx context.Context, req *connect.Request
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("plan %d not found in project %s", planID, projectID))
}
- pipelineCreate, err := GetPipelineCreate(ctx, s.store, s.dbFactory, plan.Config.GetSpecs(), project)
+ pipelineCreate, err := GetPipelineCreate(ctx, s.store, s.dbFactory, plan.Config.GetSpecs(), project.ResourceID)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("failed to get pipeline create, error: %v", err))
}
@@ -912,10 +912,10 @@ func isChangeDatabasePlan(specs []*storepb.PlanConfig_Spec) bool {
}
// GetPipelineCreate gets a pipeline create message from a plan.
-func GetPipelineCreate(ctx context.Context, s *store.Store, dbFactory *dbfactory.DBFactory, specs []*storepb.PlanConfig_Spec, project *store.ProjectMessage) (*store.PipelineMessage, error) {
+func GetPipelineCreate(ctx context.Context, s *store.Store, dbFactory *dbfactory.DBFactory, specs []*storepb.PlanConfig_Spec, projectID string) (*store.PipelineMessage, error) {
// Step 1 - transform database group specs.
// Re-evaluate database groups live to pick up newly created databases.
- transformedSpecs, err := applyDatabaseGroupSpecTransformations(ctx, s, specs, project.ResourceID)
+ transformedSpecs, err := applyDatabaseGroupSpecTransformations(ctx, s, specs, projectID)
if err != nil {
return nil, errors.Wrap(err, "failed to apply database group spec transformations")
}
@@ -931,7 +931,7 @@ func GetPipelineCreate(ctx context.Context, s *store.Store, dbFactory *dbfactory
}
return &store.PipelineMessage{
- ProjectID: project.ResourceID,
+ ProjectID: projectID,
Tasks: taskCreates,
}, nil
}
diff --git a/backend/api/v1/sheet_service.go b/backend/api/v1/sheet_service.go
index f2f2f893f9..bc40cd06f7 100644
--- a/backend/api/v1/sheet_service.go
+++ b/backend/api/v1/sheet_service.go
@@ -66,10 +66,7 @@ func (s *SheetService) CreateSheet(ctx context.Context, request *connect.Request
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create sheet"))
}
sheet := sheets[0]
- v1pbSheet, err := s.convertToAPISheetMessage(ctx, project.ResourceID, sheet)
- if err != nil {
- return nil, err
- }
+ v1pbSheet := convertToAPISheetMessage(project.ResourceID, sheet)
return connect.NewResponse(v1pbSheet), nil
}
@@ -112,10 +109,7 @@ func (s *SheetService) BatchCreateSheets(ctx context.Context, request *connect.R
}
response := &v1pb.BatchCreateSheetsResponse{}
for _, sheet := range sheets {
- v1pbSheet, err := s.convertToAPISheetMessage(ctx, project.ResourceID, sheet)
- if err != nil {
- return nil, err
- }
+ v1pbSheet := convertToAPISheetMessage(project.ResourceID, sheet)
response.Sheets = append(response.Sheets, v1pbSheet)
}
return connect.NewResponse(response), nil
@@ -158,29 +152,16 @@ func (s *SheetService) GetSheet(ctx context.Context, request *connect.Request[v1
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("cannot find the sheet"))
}
- v1pbSheet, err := s.convertToAPISheetMessage(ctx, project.ResourceID, sheet)
- if err != nil {
- return nil, err
- }
+ v1pbSheet := convertToAPISheetMessage(project.ResourceID, sheet)
return connect.NewResponse(v1pbSheet), nil
}
-func (s *SheetService) convertToAPISheetMessage(ctx context.Context, projectID string, sheet *store.SheetMessage) (*v1pb.Sheet, error) {
- project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
- ResourceID: &projectID,
- })
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get project"))
- }
- if project == nil {
- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project with id %s not found", projectID))
- }
-
+func convertToAPISheetMessage(projectID string, sheet *store.SheetMessage) *v1pb.Sheet {
return &v1pb.Sheet{
- Name: common.FormatSheet(project.ResourceID, sheet.Sha256),
+ Name: common.FormatSheet(projectID, sheet.Sha256),
Content: []byte(sheet.Statement),
ContentSize: sheet.Size,
- }, nil
+ }
}
func convertToStoreSheetMessage(sheet *v1pb.Sheet) *store.SheetMessage {
diff --git a/backend/component/webhook/manager.go b/backend/component/webhook/manager.go
index 11f0640e00..dc59420e74 100644
--- a/backend/component/webhook/manager.go
+++ b/backend/component/webhook/manager.go
@@ -381,12 +381,20 @@ func ChangeIssueStatus(ctx context.Context, stores *store.Store, webhookManager
return errors.Wrapf(err, "failed to update issue %q's status", issue.Title)
}
+ project, err := stores.GetProject(ctx, &store.FindProjectMessage{ResourceID: &updatedIssue.ProjectID})
+ if err != nil {
+ return errors.Wrapf(err, "failed to get project")
+ }
+ if project == nil {
+ return errors.Errorf("project %s not found", updatedIssue.ProjectID)
+ }
+
webhookManager.CreateEvent(ctx, &Event{
Actor: updater,
Type: storepb.Activity_ISSUE_STATUS_UPDATE,
Comment: comment,
Issue: NewIssue(updatedIssue),
- Project: NewProject(updatedIssue.Project),
+ Project: NewProject(project),
})
return nil
}
diff --git a/backend/runner/approval/runner.go b/backend/runner/approval/runner.go
index f9d6387a42..3f83f1c1fd 100644
--- a/backend/runner/approval/runner.go
+++ b/backend/runner/approval/runner.go
@@ -128,6 +128,14 @@ func (r *Runner) findApprovalTemplateForIssue(ctx context.Context, issue *store.
return true, nil
}
+ project, err := r.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &issue.ProjectID})
+ if err != nil {
+ return false, errors.Wrap(err, "failed to get project")
+ }
+ if project == nil {
+ return false, errors.Errorf("project %s not found", issue.ProjectID)
+ }
+
approvalTemplate, celVarsList, done, err := func() (*storepb.ApprovalTemplate, []map[string]any, bool, error) {
// no need to find if feature is not enabled
if r.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_APPROVAL_WORKFLOW) != nil {
@@ -238,7 +246,7 @@ func (r *Runner) findApprovalTemplateForIssue(ctx context.Context, issue *store.
Type: storepb.Activity_NOTIFY_PIPELINE_ROLLOUT,
Comment: "",
Issue: webhook.NewIssue(issue),
- Project: webhook.NewProject(issue.Project),
+ Project: webhook.NewProject(project),
IssueRolloutReady: &webhook.EventIssueRolloutReady{
RolloutPolicy: policy,
StageName: firstEnvironment,
@@ -262,7 +270,7 @@ func (r *Runner) findApprovalTemplateForIssue(ctx context.Context, issue *store.
Type: storepb.Activity_ISSUE_APPROVAL_NOTIFY,
Comment: "",
Issue: webhook.NewIssue(issue),
- Project: webhook.NewProject(issue.Project),
+ Project: webhook.NewProject(project),
IssueApprovalCreate: &webhook.EventIssueApprovalCreate{
Role: role,
},
@@ -480,7 +488,7 @@ func (r *Runner) buildCELVariablesForDatabaseChange(ctx context.Context, issue *
}
// Build CEL variables for each task
- pipelineCreate, err := apiv1.GetPipelineCreate(ctx, r.store, r.dbFactory, plan.Config.GetSpecs(), issue.Project)
+ pipelineCreate, err := apiv1.GetPipelineCreate(ctx, r.store, r.dbFactory, plan.Config.GetSpecs(), issue.ProjectID)
if err != nil {
return nil, false, errors.Wrap(err, "failed to get pipeline create")
}
@@ -532,7 +540,7 @@ func (r *Runner) buildCELVariablesForDatabaseChange(ctx context.Context, issue *
// Base CEL variables
celVars := map[string]any{
common.CELAttributeResourceEnvironmentID: environmentID,
- common.CELAttributeResourceProjectID: issue.Project.ResourceID,
+ common.CELAttributeResourceProjectID: issue.ProjectID,
common.CELAttributeResourceInstanceID: instance.ResourceID,
common.CELAttributeResourceDatabaseName: databaseName,
common.CELAttributeResourceDBEngine: instance.Metadata.GetEngine().String(),
@@ -594,7 +602,7 @@ func (r *Runner) buildCELVariablesForDataExport(ctx context.Context, issue *stor
return nil, false, errors.Errorf("plan %v not found", *issue.PlanUID)
}
- pipelineCreate, err := apiv1.GetPipelineCreate(ctx, r.store, r.dbFactory, plan.Config.GetSpecs(), issue.Project)
+ pipelineCreate, err := apiv1.GetPipelineCreate(ctx, r.store, r.dbFactory, plan.Config.GetSpecs(), issue.ProjectID)
if err != nil {
return nil, false, errors.Wrap(err, "failed to get pipeline create")
}
@@ -629,7 +637,7 @@ func (r *Runner) buildCELVariablesForDataExport(ctx context.Context, issue *stor
celVars := map[string]any{
common.CELAttributeResourceEnvironmentID: envID,
- common.CELAttributeResourceProjectID: issue.Project.ResourceID,
+ common.CELAttributeResourceProjectID: issue.ProjectID,
common.CELAttributeResourceInstanceID: instance.ResourceID,
common.CELAttributeResourceDatabaseName: database.DatabaseName,
common.CELAttributeResourceDBEngine: instance.Metadata.GetEngine().String(),
@@ -663,7 +671,7 @@ func (r *Runner) buildCELVariablesForGrantRequest(ctx context.Context, issue *st
}
baseVars := map[string]any{
- common.CELAttributeResourceProjectID: issue.Project.ResourceID,
+ common.CELAttributeResourceProjectID: issue.ProjectID,
common.CELAttributeRequestExpirationDays: expirationDays,
common.CELAttributeRequestRole: payload.GrantRequest.Role,
}
diff --git a/backend/runner/taskrun/database_create_executor.go b/backend/runner/taskrun/database_create_executor.go
index 5ef7e5c5db..b6afff0cb9 100644
--- a/backend/runner/taskrun/database_create_executor.go
+++ b/backend/runner/taskrun/database_create_executor.go
@@ -71,13 +71,6 @@ func (exec *DatabaseCreateExecutor) RunOnce(ctx context.Context, driverCtx conte
if pipeline == nil {
return true, nil, errors.Errorf("pipeline %v not found", task.PipelineID)
}
- 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)
- }
- if project == nil {
- return true, nil, errors.Errorf("project %s not found", pipeline.ProjectID)
- }
// Create database.
slog.Debug("Start creating database...",
diff --git a/backend/store/issue.go b/backend/store/issue.go
index 8630ef82b7..eb020bf489 100644
--- a/backend/store/issue.go
+++ b/backend/store/issue.go
@@ -33,7 +33,8 @@ func init() {
// IssueMessage is the mssage for issues.
type IssueMessage struct {
- Project *ProjectMessage
+ ProjectID string
+ CreatorEmail string
Title string
Status storepb.Issue_Status
Type storepb.Issue_Type
@@ -47,10 +48,6 @@ type IssueMessage struct {
UID int
CreatedAt time.Time
UpdatedAt time.Time
-
- // Internal fields.
- projectID string
- CreatorEmail string
}
// UpdateIssueMessage is the message for updating an issue.
@@ -113,7 +110,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, creator string) (*IssueMessage, error) {
+func (s *Store) CreateIssue(ctx context.Context, create *IssueMessage) (*IssueMessage, error) {
create.Status = storepb.Issue_OPEN
payload, err := protojson.Marshal(create.Payload)
if err != nil {
@@ -135,8 +132,8 @@ func (s *Store) CreateIssue(ctx context.Context, create *IssueMessage, creator s
)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
RETURNING id`,
- creator,
- create.Project.ResourceID,
+ create.CreatorEmail,
+ create.ProjectID,
create.PlanUID,
create.Title,
create.Status.String(),
@@ -398,7 +395,7 @@ func (s *Store) ListIssues(ctx context.Context, find *FindIssueMessage) ([]*Issu
&issue.CreatorEmail,
&issue.CreatedAt,
&issue.UpdatedAt,
- &issue.projectID,
+ &issue.ProjectID,
&issue.PipelineUID,
&issue.PlanUID,
&issue.Title,
@@ -436,15 +433,6 @@ func (s *Store) ListIssues(ctx context.Context, find *FindIssueMessage) ([]*Issu
return nil, err
}
- // Populate from internal fields.
- for _, issue := range issues {
- project, err := s.GetProject(ctx, &FindProjectMessage{ResourceID: &issue.projectID})
- if err != nil {
- return nil, err
- }
- issue.Project = project
- }
-
return issues, nil
}
diff --git a/backend/utils/utils.go b/backend/utils/utils.go
index ab4db49689..9d37945cdb 100644
--- a/backend/utils/utils.go
+++ b/backend/utils/utils.go
@@ -76,9 +76,9 @@ func CheckIssueApproved(issue *store.IssueMessage) (bool, error) {
// UpdateProjectPolicyFromGrantIssue updates the project policy from grant issue.
func UpdateProjectPolicyFromGrantIssue(ctx context.Context, stores *store.Store, issue *store.IssueMessage, grantRequest *storepb.GrantRequest) error {
- policyMessage, err := stores.GetProjectIamPolicy(ctx, issue.Project.ResourceID)
+ policyMessage, err := stores.GetProjectIamPolicy(ctx, issue.ProjectID)
if err != nil {
- return errors.Wrapf(err, "failed to get project policy for project %s", issue.Project.ResourceID)
+ return errors.Wrapf(err, "failed to get project policy for project %s", issue.ProjectID)
}
var newConditionExpr string
@@ -132,7 +132,7 @@ func UpdateProjectPolicyFromGrantIssue(ctx context.Context, stores *store.Store,
return err
}
if _, err := stores.CreatePolicy(ctx, &store.PolicyMessage{
- Resource: common.FormatProject(issue.Project.ResourceID),
+ Resource: common.FormatProject(issue.ProjectID),
ResourceType: storepb.Policy_PROJECT,
Payload: string(policyPayload),
Type: storepb.Policy_IAM,