Skip to content

feat(policy): Create/Update scs to use transaction. #2882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 6, 2025
Merged

feat(policy): Create/Update scs to use transaction. #2882

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65b7df8
feat(policy): Create/Update scs to use transaction.
c-r33d Nov 5, 2025
5f96d74
gemini comments.
c-r33d Nov 5, 2025
e41a47c
gemini comments.
c-r33d Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 35 additions & 14 deletions service/policy/subjectmapping/subject_mapping.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,17 +267,27 @@ func (s SubjectMappingService) CreateSubjectConditionSet(ctx context.Context,
ObjectType: audit.ObjectTypeConditionSet,
}

conditionSet, err := s.dbClient.CreateSubjectConditionSet(ctx, req.Msg.GetSubjectConditionSet())
var conditionSet *policy.SubjectConditionSet
err := s.dbClient.RunInTx(ctx, func(txClient *policydb.PolicyDBClient) error {
cs, err := txClient.CreateSubjectConditionSet(ctx, req.Msg.GetSubjectConditionSet())
if err != nil {
s.logger.Audit.PolicyCRUDFailure(ctx, auditParams)
return db.StatusifyError(ctx, s.logger, err, db.ErrTextCreationFailed, slog.String("subjectConditionSet", req.Msg.String()))
}

conditionSet = cs
return nil
})
if err != nil {
s.logger.Audit.PolicyCRUDFailure(ctx, auditParams)
return nil, db.StatusifyError(ctx, s.logger, err, db.ErrTextCreationFailed, slog.String("subjectConditionSet", req.Msg.String()))
return nil, err
}

auditParams.ObjectID = conditionSet.GetId()
auditParams.Original = conditionSet
s.logger.Audit.PolicyCRUDSuccess(ctx, auditParams)

rsp.SubjectConditionSet = conditionSet

return connect.NewResponse(rsp), nil
}

Expand All @@ -294,25 +304,36 @@ func (s SubjectMappingService) UpdateSubjectConditionSet(ctx context.Context,
ObjectID: subjectConditionSetID,
}

original, err := s.dbClient.GetSubjectConditionSet(ctx, subjectConditionSetID)
if err != nil {
s.logger.Audit.PolicyCRUDFailure(ctx, auditParams)
return nil, db.StatusifyError(ctx, s.logger, err, db.ErrTextGetRetrievalFailed, slog.String("id", subjectConditionSetID))
}
var original, updated *policy.SubjectConditionSet
err := s.dbClient.RunInTx(ctx, func(txClient *policydb.PolicyDBClient) error {
orig, err := txClient.GetSubjectConditionSet(ctx, subjectConditionSetID)
if err != nil {
s.logger.Audit.PolicyCRUDFailure(ctx, auditParams)
return db.StatusifyError(ctx, s.logger, err, db.ErrTextGetRetrievalFailed, slog.String("id", subjectConditionSetID))
}

upd, err := txClient.UpdateSubjectConditionSet(ctx, req.Msg)
if err != nil {
s.logger.Audit.PolicyCRUDFailure(ctx, auditParams)
return db.StatusifyError(ctx, s.logger, err, db.ErrTextUpdateFailed, slog.String("id", req.Msg.GetId()), slog.String("subjectConditionSet fields", req.Msg.String()))
}

original = orig
updated = upd
rsp.SubjectConditionSet = &policy.SubjectConditionSet{
Id: subjectConditionSetID,
}

updated, err := s.dbClient.UpdateSubjectConditionSet(ctx, req.Msg)
return nil
})
if err != nil {
s.logger.Audit.PolicyCRUDFailure(ctx, auditParams)
return nil, db.StatusifyError(ctx, s.logger, err, db.ErrTextUpdateFailed, slog.String("id", req.Msg.GetId()), slog.String("subjectConditionSet fields", req.Msg.String()))
return nil, err
}

auditParams.Original = original
auditParams.Updated = updated
s.logger.Audit.PolicyCRUDSuccess(ctx, auditParams)

rsp.SubjectConditionSet = &policy.SubjectConditionSet{
Id: subjectConditionSetID,
}
return connect.NewResponse(rsp), nil
}

Expand Down
Loading