Skip to content

Conversation

@chaluli
Copy link
Contributor

@chaluli chaluli commented Feb 17, 2025

Description of changes

Adds the ability to merge a two policy sets. The user can choose to either have conflicting policy ids result in an error or to be automatically renamed. The renaming scheme is returned as a HashMap from the old id to the newly auto-generated id.

Issue #610

Checklist for requesting a review

The change in this PR is (choose one, and delete the other options):

  • A backwards-compatible change requiring a minor version bump to cedar-policy (e.g., addition of a new API).

I confirm that this PR (choose one, and delete the other options):

  • Updates the "Unreleased" section of the CHANGELOG with a description of my change (required for major/minor version bumps).

I confirm that cedar-spec (choose one, and delete the other options):

  • Does not require updates because my change does not impact the Cedar formal model or DRT infrastructure.

I confirm that docs.cedarpolicy.com (choose one, and delete the other options):

  • Does not require updates because my change does not impact the Cedar language specification.

Signed-off-by: Charlie Murphy <[email protected]>
…dress other comments by Adrian.

Signed-off-by: Charlie Murphy <[email protected]>
Signed-off-by: Charlie Murphy <[email protected]>
Copy link
Contributor

@adpaco-aws adpaco-aws left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Just a few minor suggestions.

Signed-off-by: Charlie Murphy <[email protected]>

Co-authored-by: Adrian Palacios <[email protected]>
Copy link
Contributor

@john-h-kastner-aws john-h-kastner-aws left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. A couple nitpicks on Rust std library usage

…shmaps. Addresses John's comments.

Signed-off-by: Charlie Murphy <[email protected]>
@chaluli chaluli removed the request for review from cdisselkoen February 18, 2025 18:10
@chaluli chaluli merged commit b49cee0 into cedar-policy:main Feb 18, 2025
19 checks passed
@chaluli chaluli mentioned this pull request Feb 18, 2025
2 tasks
@chaluli chaluli deleted the merge_policy_sets branch February 19, 2025 21:21
jv-garcia pushed a commit to jv-garcia/cedar that referenced this pull request May 6, 2025
…'s upon duplicate ids. (cedar-policy#1476)

Signed-off-by: Charlie Murphy <[email protected]>
Co-authored-by: Adrian Palacios <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants