diff --git a/service/policy/db/subject_mappings.go b/service/policy/db/subject_mappings.go index 235208e744..01d8251bc9 100644 --- a/service/policy/db/subject_mappings.go +++ b/service/policy/db/subject_mappings.go @@ -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 */ @@ -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)), @@ -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)),