Skip to content

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

refactor: consolidate issue creation logic into single buildIssueMessage function (#18713)

Danny Xu2bbf7154e868
diff --git a/backend/api/v1/issue_service.go b/backend/api/v1/issue_service.go
index 0c3896c2db..761cd8ede4 100644
--- a/backend/api/v1/issue_service.go
+++ b/backend/api/v1/issue_service.go
@@ -370,23 +370,14 @@ func (s *IssueService) CreateIssue(ctx context.Context, req *connect.Request[v1p
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
}
- var issue *store.IssueMessage
- switch req.Msg.Issue.Type {
- case v1pb.Issue_GRANT_REQUEST:
- if req.Msg.Issue.Title == "" {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("issue title is required"))
- }
- issue, err = s.createIssueGrantRequest(ctx, project, req.Msg)
- case v1pb.Issue_DATABASE_CHANGE:
- issue, err = s.createIssueDatabaseChange(ctx, project, req.Msg)
- case v1pb.Issue_DATABASE_EXPORT:
- issue, err = s.createIssueDatabaseDataExport(ctx, project, req.Msg)
- default:
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("unknown issue type %q", req.Msg.Issue.Type))
- }
+ issue, err := s.buildIssueMessage(ctx, project, user.Email, req.Msg)
if err != nil {
return nil, err
}
+ issue, err = s.store.CreateIssue(ctx, issue)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create issue"))
+ }
// Trigger ISSUE_CREATED webhook
s.webhookManager.CreateEvent(ctx, &webhook.Event{
@@ -431,150 +422,101 @@ func (s *IssueService) CreateIssue(ctx context.Context, req *connect.Request[v1p
return connect.NewResponse(converted), nil
}
-func (s *IssueService) createIssueDatabaseChange(ctx context.Context, project *store.ProjectMessage, request *v1pb.CreateIssueRequest) (*store.IssueMessage, error) {
- user, ok := GetUserFromContext(ctx)
- if !ok {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
- }
-
- if request.Issue.Plan == "" {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("plan is required"))
+func (s *IssueService) buildIssueMessage(ctx context.Context, project *store.ProjectMessage, userEmail string, request *v1pb.CreateIssueRequest) (*store.IssueMessage, error) {
+ if request.Issue.Title == "" {
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("issue title is required"))
}
var planUID *int64
- _, planID, err := common.GetProjectIDPlanID(request.Issue.Plan)
- if err != nil {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("%v", err.Error()))
- }
- plan, err := s.store.GetPlan(ctx, &store.FindPlanMessage{UID: &planID, ProjectID: &project.ResourceID})
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get plan"))
- }
- if plan == nil {
- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("plan %d not found in project %s", planID, project.ResourceID))
- }
- planUID = &plan.UID
-
- issueCreateMessage := &store.IssueMessage{
- ProjectID: project.ResourceID,
- CreatorEmail: user.Email,
- PlanUID: planUID,
- 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,
- },
- }
-
- issue, err := s.store.CreateIssue(ctx, issueCreateMessage)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create issue"))
- }
+ var grantRequest *storepb.GrantRequest
- return issue, nil
-}
+ // Type-specific validation and preparation
+ switch request.Issue.Type {
+ case v1pb.Issue_GRANT_REQUEST:
+ // Check if grant request feature is enabled
+ if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_REQUEST_ROLE_WORKFLOW); err != nil {
+ return nil, connect.NewError(connect.CodePermissionDenied,
+ errors.Errorf("role request requires approval workflow feature (available in Enterprise plan)"))
+ }
-func (s *IssueService) createIssueGrantRequest(ctx context.Context, project *store.ProjectMessage, request *v1pb.CreateIssueRequest) (*store.IssueMessage, error) {
- // Check if grant request feature is enabled.
- // Grant requests are only available in Enterprise plan.
- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_REQUEST_ROLE_WORKFLOW); err != nil {
- return nil, connect.NewError(connect.CodePermissionDenied,
- errors.Errorf("role request requires approval workflow feature (available in Enterprise plan)"))
- }
+ // Validate grant request fields
+ if request.Issue.GrantRequest.GetRole() == "" {
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("expect grant request role"))
+ }
+ if request.Issue.GrantRequest.GetUser() == "" {
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("expect grant request user"))
+ }
- user, ok := GetUserFromContext(ctx)
- if !ok {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
- }
+ // Validate CEL expression if it's not empty
+ if expression := request.Issue.GrantRequest.GetCondition().GetExpression(); expression != "" {
+ e, err := cel.NewEnv(common.IAMPolicyConditionCELAttributes...)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create cel environment"))
+ }
+ if _, issues := e.Compile(expression); issues != nil {
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("found issues in grant request condition expression, issues: %v", issues.String()))
+ }
+ }
- if request.Issue.GrantRequest.GetRole() == "" {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("expect grant request role"))
- }
- if request.Issue.GrantRequest.GetUser() == "" {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("expect grant request user"))
- }
- // Validate CEL expression if it's not empty.
- if expression := request.Issue.GrantRequest.GetCondition().GetExpression(); expression != "" {
- e, err := cel.NewEnv(common.IAMPolicyConditionCELAttributes...)
+ // Convert grant request (inlined from convertGrantRequest)
+ grantRequestUserEmail, err := common.GetUserEmail(request.Issue.GrantRequest.User)
if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create cel environment"))
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get user email from %q", request.Issue.GrantRequest.User))
}
- if _, issues := e.Compile(expression); issues != nil {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("found issues in grant request condition expression, issues: %v", issues.String()))
+ grantRequestUser, err := s.store.GetUserByEmail(ctx, grantRequestUserEmail)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get user by email %q", grantRequestUserEmail))
+ }
+ if grantRequestUser == nil {
+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("user %q not found", request.Issue.GrantRequest.User))
+ }
+ grantRequest = &storepb.GrantRequest{
+ Role: request.Issue.GrantRequest.Role,
+ User: common.FormatUserEmail(grantRequestUser.Email),
+ Condition: request.Issue.GrantRequest.Condition,
+ Expiration: request.Issue.GrantRequest.Expiration,
}
- }
-
- convertedGrantRequest, err := convertGrantRequest(ctx, s.store, request.Issue.GrantRequest)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to convert GrantRequest"))
- }
- issueCreateMessage := &store.IssueMessage{
- ProjectID: project.ResourceID,
- CreatorEmail: user.Email,
- PlanUID: 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,
- },
- }
-
- issue, err := s.store.CreateIssue(ctx, issueCreateMessage)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create issue"))
- }
- return issue, nil
-}
+ case v1pb.Issue_DATABASE_CHANGE, v1pb.Issue_DATABASE_EXPORT:
+ // Validate and fetch plan (shared logic for both types)
+ if request.Issue.Plan == "" {
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("plan is required"))
+ }
-func (s *IssueService) createIssueDatabaseDataExport(ctx context.Context, project *store.ProjectMessage, request *v1pb.CreateIssueRequest) (*store.IssueMessage, error) {
- user, ok := GetUserFromContext(ctx)
- if !ok {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
- }
+ _, planID, err := common.GetProjectIDPlanID(request.Issue.Plan)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("%v", err.Error()))
+ }
- if request.Issue.Plan == "" {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("plan is required"))
+ plan, err := s.store.GetPlan(ctx, &store.FindPlanMessage{UID: &planID, ProjectID: &project.ResourceID})
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get plan"))
+ }
+ if plan == nil {
+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("plan %d not found in project %s", planID, project.ResourceID))
+ }
+ planUID = &plan.UID
+ default:
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("unknown issue type %q", request.Issue.Type))
}
- var planUID *int64
- _, planID, err := common.GetProjectIDPlanID(request.Issue.Plan)
- if err != nil {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("%v", err.Error()))
- }
- plan, err := s.store.GetPlan(ctx, &store.FindPlanMessage{UID: &planID, ProjectID: &project.ResourceID})
+ // Convert v1pb.Issue_Type to storepb.Issue_Type
+ issueType, err := convertToAPIIssueType(request.Issue.Type)
if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get plan"))
- }
- if plan == nil {
- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("plan %d not found in project %s", planID, project.ResourceID))
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to convert issue type"))
}
- planUID = &plan.UID
- issueCreateMessage := &store.IssueMessage{
+ // Build the issue message (common structure)
+ issue := &store.IssueMessage{
ProjectID: project.ResourceID,
- CreatorEmail: user.Email,
+ CreatorEmail: userEmail,
PlanUID: planUID,
Title: request.Issue.Title,
Status: storepb.Issue_OPEN,
- Type: storepb.Issue_DATABASE_EXPORT,
+ Type: issueType,
Description: request.Issue.Description,
Payload: &storepb.Issue{
+ GrantRequest: grantRequest,
Approval: &storepb.IssuePayloadApproval{
ApprovalFindingDone: false,
ApprovalTemplate: nil,
@@ -584,11 +526,6 @@ func (s *IssueService) createIssueDatabaseDataExport(ctx context.Context, projec
},
}
- issue, err := s.store.CreateIssue(ctx, issueCreateMessage)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create issue"))
- }
-
return issue, nil
}
diff --git a/backend/api/v1/issue_service_converter.go b/backend/api/v1/issue_service_converter.go
index a9f94d37b6..d5620c36e9 100644
--- a/backend/api/v1/issue_service_converter.go
+++ b/backend/api/v1/issue_service_converter.go
@@ -262,29 +262,6 @@ func convertToGrantRequest(v *storepb.GrantRequest) *v1pb.GrantRequest {
}
}
-func convertGrantRequest(ctx context.Context, s *store.Store, v *v1pb.GrantRequest) (*storepb.GrantRequest, error) {
- if v == nil {
- return nil, nil
- }
- email, err := common.GetUserEmail(v.User)
- if err != nil {
- return nil, errors.Wrapf(err, "failed to get user email from %q", v.User)
- }
- user, err := s.GetUserByEmail(ctx, email)
- if err != nil {
- return nil, errors.Wrapf(err, "failed to get user by email %q", email)
- }
- if user == nil {
- return nil, errors.Errorf("user %q not found", v.User)
- }
- return &storepb.GrantRequest{
- Role: v.Role,
- User: common.FormatUserEmail(user.Email),
- Condition: v.Condition,
- Expiration: v.Expiration,
- }, nil
-}
-
func convertToIssueComments(issueName string, issueComments []*store.IssueCommentMessage) []*v1pb.IssueComment {
var res []*v1pb.IssueComment
for _, ic := range issueComments {
diff --git a/backend/tests/webhook_test.go b/backend/tests/webhook_test.go
index ef883d3621..dae24e8dcf 100644
--- a/backend/tests/webhook_test.go
+++ b/backend/tests/webhook_test.go
@@ -187,12 +187,12 @@ func TestWebhookIntegration(t *testing.T) {
}))
require.NoError(t, err)
- // Create an issue with empty title and description
+ // Create an issue for webhook testing
issueResp, err := ctl.issueServiceClient.CreateIssue(ctx, connect.NewRequest(&v1pb.CreateIssueRequest{
Parent: ctl.project.Name,
Issue: &v1pb.Issue{
- Title: "", // Empty title
- Description: "", // Empty description
+ Title: "Test webhook issue",
+ Description: "", // Empty description is OK
Type: v1pb.Issue_DATABASE_CHANGE,
Plan: planResp.Msg.Name,
},