Skip to content

fix(policy): remove support for creation/updation of SubjectMappings with deprecated proto actions #2373

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 1 commit into from
Jun 4, 2025
Merged

fix(policy): remove support for creation/updation of SubjectMappings with deprecated proto actions #2373

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 0 additions & 20 deletions service/policy/db/subject_mappings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@ func unmarshalSubjectSetsProto(conditionJSON []byte) ([]*policy.SubjectSet, erro
return ss, nil
}

var (
// TODO: remove once circular CI is resolved
deprecatedStandardActionDecrypt = policy.Action_STANDARD_ACTION_DECRYPT.String()
deprecatedStandardActionTransmit = policy.Action_STANDARD_ACTION_TRANSMIT.String()
)

/*
Subject Condition Sets
*/
Expand Down Expand Up @@ -268,13 +262,6 @@ func (c PolicyDBClient) CreateSubjectMapping(ctx context.Context, s *subjectmapp
actionIDs = append(actionIDs, a.GetId())
case a.GetName() != "":
actionNames = append(actionNames, strings.ToLower(a.GetName()))
// TODO: remove this support for interpreting standard action proto enums to new CRUDable actions once circular CI testing is resolved
case a.GetStandard().String() == deprecatedStandardActionDecrypt:
c.logger.WarnContext(ctx, "standard action is deprecated, use 'id' or 'name' instead")
actionNames = append(actionNames, ActionRead.String())
case a.GetStandard().String() == deprecatedStandardActionTransmit:
c.logger.WarnContext(ctx, "standard action is deprecated, use 'id' or 'name' instead")
actionNames = append(actionNames, ActionCreate.String())
default:
return nil, db.WrapIfKnownInvalidQueryErr(
errors.Join(db.ErrMissingValue, fmt.Errorf("action at index %d missing required 'id' or 'name' when creating a subject mapping; action details: %+v", idx, a)),
Expand Down Expand Up @@ -475,13 +462,6 @@ func (c PolicyDBClient) UpdateSubjectMapping(ctx context.Context, r *subjectmapp
actionIDs = append(actionIDs, a.GetId())
case a.GetName() != "":
actionNames = append(actionNames, strings.ToLower(a.GetName()))
// TODO: remove this support for interpreting standard action proto enums to new CRUDable actions once circular CI testing is resolved
case a.GetStandard().String() == deprecatedStandardActionDecrypt:
c.logger.WarnContext(ctx, "standard action is deprecated, use 'id' or 'name' instead")
actionNames = append(actionNames, ActionRead.String())
case a.GetStandard().String() == deprecatedStandardActionTransmit:
c.logger.WarnContext(ctx, "standard action is deprecated, use 'id' or 'name' instead")
actionNames = append(actionNames, ActionCreate.String())
default:
return nil, db.WrapIfKnownInvalidQueryErr(
errors.Join(db.ErrMissingValue, fmt.Errorf("action at index %d missing required 'id' or 'name' when creating a subject mapping; action details: %+v", idx, a)),
Expand Down
Loading