Address duplicate controls at catalog level in profile resolution

[david-waltermire]

Committer Notes

Ensure that controls defined at the catalog level are not duplicated. This fixes a bug caused during the import handling phase of profile resolution, which was "promoting" controls defined at the catalog level, causing a second copy of the control to be added. This was fixed by making controls at the catalog level always eligible for selection.

Resolves metaschema-framework/oscal-cli#60

All Submissions:

• Have you selected the correct base branch per Contributing guidance?
• Have you followed the guidelines in our Contributing document?
• Have you checked to ensure there aren't other open Pull Requests for the same update/change?
• Have you squashed any non-relevant commits and commit messages? [instructions]
• Have you set "Allow edits and access to secrets by maintainers"?

By submitting a pull request, you are agreeing to provide this contribution under the CC0 1.0 Universal public domain dedication.

Changes to Core Features:

• Have you added an explanation of what your changes do and why you'd like us to include them?
• Have you written new tests for your core changes, as applicable?
• Have you included examples of how to use your new feature(s)?
• Have you updated all website and readme documentation affected by the changes you made?

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

---

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>, please review it.
  • Generate unit testing code for this file.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai generate unit testing code for this file.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
  • @coderabbitai read src/utils.ts and generate unit testing code.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai generate docstrings to generate docstrings for this PR. (Experiment)
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Other keywords and placeholders

• Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
• Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
• Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.

[michaeldavie-amzn]

When do you expect this fix will be available in a release that can be consumed by oscal-cli?

[aj-stein-gsa]

When do you expect this fix will be available in a release that can be consumed by oscal-cli?

Sorry for the delayed response, I was trying to find where I had not yet wrote a clear comment on this from earlier in the day. 😅

Seeing as the release is needed in the coming days of oscal-cli and other bugs we need to revolve in metaschema-java, this codebase, and oscal-cli, can you use our snapshot repo and test a recent dev build? This includes a snapshot version of oscal-cli and this library.

me@computer metaschema-framework_m2 % git clone https://github.com/metaschema-framework/maven2 metaschema-framework_m2
me@computer metaschema-framework_m2 % pushd metaschema-framework_m2
me@computer metaschema-framework_m2 % git remote
metaschema-framework
me@computer metaschema-framework_m2 % git branch --show-current
main
me@computer metaschema-framework_m2 % git rev-parse HEAD
4f2b437f7ef79e5df41281af9728cb96856177d1
me@computer metaschema-framework_m2 % pushd dev/metaschema/oscal/oscal-cli-enhanced/2.5.0-SNAPSHOT 
me@computer 2.5.0-SNAPSHOT % unzip  oscal-cli-enhanced-2.5.0-SNAPSHOT-oscal-cli.zip 
me@computer 2.5.0-SNAPSHOT % oscal-cli --version
oscal-cli 2.5.0-SNAPSHOT built at 2025-01-15 04:40 from branch develop (ba14f61) at Unknown
liboscal-java 5.2.0-SNAPSHOT built at 2025-01-15 04:35 from branch develop (0e18db2) at Unknown
oscal v1.1.3 built at 2025-01-15 04:35 from branch b123c11bd12c8b8f1bcc8bf85763e5775c0423e9 (b123c11) at https://github.com/usnistgov/OSCAL.git
metaschema-java 2.2.0-SNAPSHOT built at 2025-01-07T12:44:28+0000 from branch develop (d8476c3) at https://github.com/metaschema-framework/metaschema-java
metaschema 2.2.0-SNAPSHOT built at 2025-01-07T12:44:28+0000 from branch develop (7e49638) at https://github.com/metaschema-framework/metaschema.git

If you want to subscribe to repo notifications with the watch button on the oscal-cli repo to follow the reason for the moment it happens, we make releases tagged on GitHub to make that easy for you to know when it is final final. Thanks for reaching out!

[michaeldavie-amzn]

Thanks! I've confirmed that the 2.5.0 snapshot build is working correctly.

[aj-stein-gsa]

Thanks! I've confirmed that the 2.5.0 snapshot build is working correctly.

Standby for further guidance on the release. I will try to send out a custom message here.