Compliance-trestle

Chore

* chore: Ensure develop is correctly updated after a release. (294)

* chore: Ensure develop is updated after release is completed.

Signed-off-by: Chris Butler <christhebutlers.me>

* Corrected typos in PR template.

Signed-off-by: Chris Butler <christhebutlers.me> ([`72539c9`](https://github.com/oscal-compass/compliance-trestle/commit/72539c956be59422056bdb82143772587a9f5f05))

* chore: Add mdformat-gfm to setup.cfg (292)

Signed-off-by: Taneli Hukkinen <hukkinj1users.noreply.github.com> ([`4750882`](https://github.com/oscal-compass/compliance-trestle/commit/4750882396ea44dbfdebe8860cc527a7768a7ac6))

* chore: Auto-update pre-commit hooks (277)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]users.noreply.github.com> ([`2a2d394`](https://github.com/oscal-compass/compliance-trestle/commit/2a2d39432cd6c32c0373465eee0f84893a7f0718))

* chore: Autoformat GFM tables with mdformat-gfm (268)

Signed-off-by: Taneli Hukkinen <hukkinj1users.noreply.github.com> ([`fe4d907`](https://github.com/oscal-compass/compliance-trestle/commit/fe4d9077318fd46aab8088ad1405b6d22bb573b6))

Documentation

* docs: Initial setup of documentation website. (234)

* Documentation website builds. Needs significantly more content.

Signed-off-by: Chris Butler <christhebutlers.me>

* Fixes missing deploy script

Signed-off-by: Chris Butler <christhebutlers.me>

* More updates to the documentation website.

Signed-off-by: Chris Butler <christhebutlers.me>

* Updated contributing documentation

Signed-off-by: Chris Butler <christhebutlers.me>

* Pre-merge commit

Signed-off-by: Chris Butler <christhebutlers.me>

* Precommit update test.

Signed-off-by: Chris Butler <christhebutlers.me>

* Updated documentation for basemodel

Signed-off-by: Chris Butler <christhebutlers.me>

* Added missing docs files

Signed-off-by: Chris Butler <christhebutlers.me>

* Fixing mdformatting issues with include

Signed-off-by: Chris Butler <christhebutlers.me>

* Added more api docs pages

Signed-off-by: Chris Butler <christhebutlers.me>

* chore: Fix gitignore to cover html coverage website.

Signed-off-by: Chris Butler <christhebutlers.me>

* chore: Fix gitignore to cover html coverage website.

Signed-off-by: Chris Butler <christhebutlers.me>

* Updates

Signed-off-by: Chris Butler <christhebutlers.me>

* Corrected poorly formatted links.

Signed-off-by: Chris Butler <christhebutlers.me>

* Improvements in documentation build process.

Signed-off-by: Chris Butler <christhebutlers.me>

* Basic documentation website setup complete.

Signed-off-by: Chris Butler <christhebutlers.me>

* docs/cli.md

Co-authored-by: Nebula Alam <anebulaau1.ibm.com> ([`a51081b`](https://github.com/oscal-compass/compliance-trestle/commit/a51081bd93cb43b02135b72f00e16cf805eacba9))

Feature

* feat: Force update of version

Version failed due to migration to &39;main&39; branch. ([`fc0357b`](https://github.com/oscal-compass/compliance-trestle/commit/fc0357b297bb59d64ad28af23fe2404c31364010))

* feat: Update to OSCAL 1.0.0rc1 and simplified models. (286)

* Start using latest version of datamodel-generator

* Provide Camel and Snake conversion without datamodel-generator

* Flatten refs in schema and use latest datamodel-generator

This is not passing tests yet but may be due to other issues.
Also there may still be classes missing that should be defined.

* Better handling of corner cases. Need forward refs.

* Now can import and fixed_any works. Need cleanup.

* fixed fix_any to handle componentdefinition

* update dateauthorized in generators.py

* Partial resolution of issues with new version of OSCAL.

Signed-off-by: Chris Butler <christhebutlers.me>

* Initial fixes to fix_any.py

* Fixes issues with the generators for constrained ints. (279)

* Updated get_origin and other calls to ensure constrained lists are handled.

Signed-off-by: Chris Butler <christhebutlers.me>

* Various updates including support for conint.

Signed-off-by: Chris Butler <christhebutlers.me>

* Various updates including support for conint.

Signed-off-by: Chris Butler <christhebutlers.me>

* more fixes

* Allow generators to handle cases of List[NonOscalObject] as a field. (280)

* Updated get_origin and other calls to ensure constrained lists are handled.

Signed-off-by: Chris Butler <christhebutlers.me>

* Various updates including support for conint.

Signed-off-by: Chris Butler <christhebutlers.me>

* Various updates including support for conint.

Signed-off-by: Chris Butler <christhebutlers.me>

* Updated generators to deal with new corner case where field is List[NonOscaObject]

Signed-off-by: Chris Butler <christhebutlers.me>

* Cleanup fix_any. now 17 fail and 148 pass

* Updates with 12 open UT&39;s (282)

* Updated get_origin and other calls to ensure constrained lists are handled.

Signed-off-by: Chris Butler <christhebutlers.me>

* Various updates including support for conint.

Signed-off-by: Chris Butler <christhebutlers.me>

* Various updates including support for conint.

Signed-off-by: Chris Butler <christhebutlers.me>

* Updated generators to deal with new corner case where field is List[NonOscaObject]

Signed-off-by: Chris Butler <christhebutlers.me>

* Update to ensure validator passes. Refactored some yaml examples to do so.

Signed-off-by: Chris Butler <christhebutlers.me>

* More test fixes

Signed-off-by: Chris Butler <christhebutlers.me>

* fixes for split_test

* More UT coverage (283)

* Updated get_origin and other calls to ensure constrained lists are handled.

Signed-off-by: Chris Butler <christhebutlers.me>

* Various updates including support for conint.

Signed-off-by: Chris Butler <christhebutlers.me>

* Various updates including support for conint.

Signed-off-by: Chris Butler <christhebutlers.me>

* Updated generators to deal with new corner case where field is List[NonOscaObject]

Signed-off-by: Chris Butler <christhebutlers.me>

* Update to ensure validator passes. Refactored some yaml examples to do so.

Signed-off-by: Chris Butler <christhebutlers.me>

* More test fixes

Signed-off-by: Chris Butler <christhebutlers.me>

* Corrected more UT&39;s to new OSCAL models.

Signed-off-by: Chris Butler <christhebutlers.me>

* Corrected more UT&39;s to new OSCAL models.

Signed-off-by: Chris Butler <christhebutlers.me>

* Updated unit tests for oscal 1.0.0rc

Signed-off-by: Chris Butler <christhebutlers.me>

* Updated unit tests for oscal 1.0.0rc with corrected behaviour.

Signed-off-by: Chris Butler <christhebutlers.me>

* Updated documentation.

Signed-off-by: Chris Butler <christhebutlers.me>

* Added pytest-random-order to dependencies.

Signed-off-by: Chris Butler <christhebutlers.me>

* Stripped out unused functions to boost test coverage.

Signed-off-by: Chris Butler <christhebutlers.me>

Co-authored-by: FrankSuits <frankstau1.ibm.com> ([`992b317`](https://github.com/oscal-compass/compliance-trestle/commit/992b31743f4d1c4ce11d5b8c1ee69995856d0056))

* feat: Distributed load and trestle merge.(272)

* fix: reference to inexistent function

* Allow certain aliases not to be stripped on get_stripped_contextual_model

* Update merge commands on examples

* Initial unit tests for merge

* add unit test for complex merge case

* latest change

* Non-recursive merge and recursive load of distributed model implemented.

* Load distributed implemented

* Testing distributed load. adding back test data, which were mistakenly deleted

* Load distributed working fully now. Need to clean up code and write unit tests.

* Merge implementation complete.

* Code lint and formating

* Fixed Unit Tests

* More merge UTs

* Format and lint

* Restoring phantom changes from develop

* Restoring phantom changes from develop

* Revert &34;Format and lint&34;

This reverts commit 73ef3c83d9f5a4d071f7a422556a420d781b1306.

* Revert &34;Restoring phantom changes from develop&34;

This reverts commit a2b695e8dcce2b4a802438a726aabc0e0e1b8d80.

* Revert &34;Restoring phantom changes from develop&34;

This reverts commit eec5c1bfe0c875af3e07bb77a85e8f4342f971c4.

* Fixed fs_test

* Merge clenup

* More merge UT

* UT for load_distributed

* More MergeCmd UT

* MyPy typing

* MyPy typing

* Format and lint

* Taking out test_merge_simple_list. Test failes becaues [role1, role2] == [role2, role1] is False

* Taking out test_merge_simple_list. Test failes becaues [role1, role2] == [role2, role1] is False

* Fixing UT

* Using sorted(Path.iterdir()) to ensure order of file iteration. Should fix UTs

* QA, code clean up, typing clean up and refractor

Co-authored-by: Bruno <brunomarau1.ibm.com>
Co-authored-by: Nebula Alam <anebulaau1.ibm.com> ([`dceae85`](https://github.com/oscal-compass/compliance-trestle/commit/dceae854c9e96ef2e66931efa9a0263b0470003e))

* feat: Misc cleanups of code for typing, unsafe functions, and other issues. (274)

* Adding more coverage for type checking and removing conflicts.

Signed-off-by: Chris Butler <christhebutlers.me>

* feat: Updating to btest compatibility with python 3.9

Signed-off-by: Chris Butler <christhebutlers.me>

* Removed depricated &34;warn&34; function from use

Signed-off-by: Chris Butler <christhebutlers.me>

* Update to clean up unit tests.

Signed-off-by: Chris Butler <christhebutlers.me>

* More typing coverage.

Signed-off-by: Chris Butler <christhebutlers.me> ([`0652392`](https://github.com/oscal-compass/compliance-trestle/commit/06523929944351ce90ba83a85d57f0b04b323660))

Fix

* fix: correct semantic release behaviour ([`c25d5be`](https://github.com/oscal-compass/compliance-trestle/commit/c25d5be7448ee956cd848a1476b5c9c70d72ab33))

* fix: Changed split to not write empty files after split. Implemented circular split-merge test (295)

Co-authored-by: Nebula Alam <anebulaau1.ibm.com> ([`1ebbeb2`](https://github.com/oscal-compass/compliance-trestle/commit/1ebbeb20db1e25852dd58f7fa7a4ed909e995ef0))

* fix: Correct semantic release behaviour.

Corrected semantic release behaviour. ([`caba993`](https://github.com/oscal-compass/compliance-trestle/commit/caba993013fed5b70ced84fc58d34345e042cb6c))

* fix: Refactor to use python and pytest internals for temporary paths and creating directories.

* Refactored to use tmp_path everywhere

Signed-off-by: Chris Butler <christhebutlers.me>

* Altered unit test to only use pytest inbuilt temporary directories.

Signed-off-by: Chris Butler <christhebutlers.me>

* Adding more typing and clearing up redundant functionality.

Signed-off-by: Chris Butler <christhebutlers.me> ([`1d99ca2`](https://github.com/oscal-compass/compliance-trestle/commit/1d99ca2ac96d76dfa777a0c514be582b382504de))

* fix: Small typo fix.

Trivial spelling fix. ([`2168bb2`](https://github.com/oscal-compass/compliance-trestle/commit/2168bb2b4d8fa79fbf93687a41265379cba608b8))

Unknown

* Merge branch &39;main&39; into develop ([`df99bf8`](https://github.com/oscal-compass/compliance-trestle/commit/df99bf83c4b3326969ab31b070f71b95d38ecee4))

* Merge pull request 289 from IBM/develop

feat: Force update of version for release ([`e716524`](https://github.com/oscal-compass/compliance-trestle/commit/e716524db01f65ad0f9167143126743ea5de4be9))

* Corrected semantic release behaviour.

Signed-off-by: Chris Butler <christhebutlers.me> ([`c147e94`](https://github.com/oscal-compass/compliance-trestle/commit/c147e9443993c37bb484a925e4a10c195c1eb1cd))

* Merge branch &39;main&39; into develop ([`2c97d6c`](https://github.com/oscal-compass/compliance-trestle/commit/2c97d6c2ad0bf029a417ecfef1866d258ace201b))

* Merge pull request 288 from IBM/develop

feat: Release to support OSCAL 1.0.0rc1 ([`cbb39c4`](https://github.com/oscal-compass/compliance-trestle/commit/cbb39c4455274e9e27f335e0699eac92be25de02))

* Merge branch &39;main&39; into develop ([`aad7018`](https://github.com/oscal-compass/compliance-trestle/commit/aad70181dfe4b8868345010fb5fd10000bcd329a))

* Merge pull request 261 from IBM/develop

Trestle release: task and import. ([`24de68c`](https://github.com/oscal-compass/compliance-trestle/commit/24de68ccd4a23ec306137cbdf931f1de03471eb5))

* Merge pull request 264 from IBM/docs/caching-spec

docs (caching): typos and format fixes, explicit prohibition on unencrypted HTTP ([`b3fda9a`](https://github.com/oscal-compass/compliance-trestle/commit/b3fda9a4598541aaac48b65b7ae2881df3b48ea8))

* Merge branch &39;develop&39; into docs/caching-spec ([`c927861`](https://github.com/oscal-compass/compliance-trestle/commit/c9278611acdb2aeb809b62763e4f1fe15b66f661))

* Specs now require HTTPS for fetching, while unencrypted HTTP is not allowed.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`98aabdb`](https://github.com/oscal-compass/compliance-trestle/commit/98aabdbe643d958dcaac00f9c2ff4804e2cb7c93))

* Fixed a few typos.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`474f693`](https://github.com/oscal-compass/compliance-trestle/commit/474f693e56878fb1d5716a42aad09b3bdf4f0fcc))

* Fixed table.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`4e78f45`](https://github.com/oscal-compass/compliance-trestle/commit/4e78f4506bb03fb0768aaaa9ea908b0a652ca630))

* feature (remote): merged remote-sftp branch and resolved... ([`c193dce`](https://github.com/oscal-compass/compliance-trestle/commit/c193dce90ecbfe2bdfbd608ff931a6728b691142))

* Merge pull request 308 from IBM/feature/remote-sftp

Feature/remote-sftp looks good to reviewer. ([`be497fc`](https://github.com/oscal-compass/compliance-trestle/commit/be497fcda82dc8a14c1dea39e6157eb215d4af3b))

* feat (remote): for sftp fetcher, linting and format fixed.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`37b3543`](https://github.com/oscal-compass/compliance-trestle/commit/37b3543c7f462229566825442128c3d4b21a8ae2))

* feat (remote): for sftp fetcher, added loading of ssh key file via env var SSH_KEY, and updated testing.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`b1907c0`](https://github.com/oscal-compass/compliance-trestle/commit/b1907c078137e2106d87bde330f7b473a229b49b))

* feat (remote): added more unit testing for sftp fetcher
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`e0351e4`](https://github.com/oscal-compass/compliance-trestle/commit/e0351e4bb79aa929312e29644f08c7c70864513e))

* feat (remote): added unit tests for sftp fetcher
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`19ef19b`](https://github.com/oscal-compass/compliance-trestle/commit/19ef19bcb8338650344729a350744e5ad508370c))

* feat (remote): working sftp fetcher, live tested with active ssh-agent and password-less auth
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`cd0725d`](https://github.com/oscal-compass/compliance-trestle/commit/cd0725d0363e0ba9a8f3832cf03268c6d3c06c7c))

* feat (remote): added more validations for sftp fetcher, and one for https, with adjustments to unit testing
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`d0e8304`](https://github.com/oscal-compass/compliance-trestle/commit/d0e830422446e49b6379cabf31d595cc5cc595fd))

* feat (remote): started sftp fetcher with simple validation and test, initializing cache location, but no actual fetching yet.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`0a75bcb`](https://github.com/oscal-compass/compliance-trestle/commit/0a75bcb8f39da55d137acc5fc616651a5718418c))

* feature (remote): misc tweaks resulting from merge... ([`98856b9`](https://github.com/oscal-compass/compliance-trestle/commit/98856b93e9b6f819dda23a8b7976fb06eecf491d))

* feature/remote: various updates to fetchers... ([`ff1596c`](https://github.com/oscal-compass/compliance-trestle/commit/ff1596cbdd3a2ed2c15a6c2c3723f2256331d7ac))

* Merged cache_test... ([`f94f0bd`](https://github.com/oscal-compass/compliance-trestle/commit/f94f0bda54065200f022994bda86b8da0d4c68d8))

* Merge pull request 281 from IBM/feature/remote-local

LocalFetcher can now refresh cache from file:/// or absolute path source. ([`c049fa5`](https://github.com/oscal-compass/compliance-trestle/commit/c049fa5e3b41a74b333ac652232a3562fd68faa9))

* feat (remote): generic handling of paths that should also work on Windows environments, linted.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`a1d8e8f`](https://github.com/oscal-compass/compliance-trestle/commit/a1d8e8f9e626677606a335c1c68974615f6cc74f))

* feat (remote): generic handling of paths that should also work on Windows environments.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`80f2b8d`](https://github.com/oscal-compass/compliance-trestle/commit/80f2b8d50f72e3ed6e1fee3d2b45719a5448c269))

* feat (remote): Adjustments for Windows environment.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`3cdc31f`](https://github.com/oscal-compass/compliance-trestle/commit/3cdc31f3054cc5b232d79976c47f460bb0a67923))

* feat (remote): LocalFetcher can now refresh cache from file:/// or absolute path source.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`dc3f809`](https://github.com/oscal-compass/compliance-trestle/commit/dc3f80909d15e5f61617233af5c3a1b7bc6d754a))

* Progress with GithubFetcher and HTTPSFetcher... ([`f03284e`](https://github.com/oscal-compass/compliance-trestle/commit/f03284e6b1e44a7634a249e9637f1b0ecb85c21b))

* feature (remote): Merged Jeff&39;s changes pushed to feature/remote... ([`a0bfd41`](https://github.com/oscal-compass/compliance-trestle/commit/a0bfd41ac5fe0cfa3a95d59c47e2fd29ce76fe6e))

* Merge pull request 266 from IBM/feature/remote-jeff

feat (remote): New caching code and unit tests, and bringing remote work up to sync with develop today. ([`dfdf9b4`](https://github.com/oscal-compass/compliance-trestle/commit/dfdf9b4fd661a2afb6d51054c587fd38671640f3))

* feat (remote): Synchronizing with correct develop versions of test_utils, conftest, fs and trash.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`360835a`](https://github.com/oscal-compass/compliance-trestle/commit/360835a7209712a67c3dd90e47e327a8478f2bcc))

* feat (remote): Adopting trestle.utils.fs
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`df792bc`](https://github.com/oscal-compass/compliance-trestle/commit/df792bcddf5f30af815319c43f120ba647f838a3))

* feat (remote): Extended feature/remote cache.py and its unit test.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`4712eff`](https://github.com/oscal-compass/compliance-trestle/commit/4712effe78e36eb04d9568eb0634744d6949eabb))

* Merge branch &39;develop&39; into feature/remote
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`b2d3dc4`](https://github.com/oscal-compass/compliance-trestle/commit/b2d3dc4f9664c22d60d14a96975d2fc6d4fdd1c8))

* Merge branch &39;main&39; into develop ([`0b0b6c4`](https://github.com/oscal-compass/compliance-trestle/commit/0b0b6c4a3dad51bdce921099906347abc0a4d7df))

Chore

* chore: Remove references to master branch and run releases off of &34;main&34; (259)

* Remove references to master branch and run releases off of &34;main&34;

Signed-off-by: Chris Butler <christhebutlers.me>

* Corrected broken github header.

Signed-off-by: Chris Butler <christhebutlers.me> ([`c81b4ba`](https://github.com/oscal-compass/compliance-trestle/commit/c81b4ba116726189d0ced5b2a52f470afe94d29e))

* chore: Cleanup of trestle init to ensure correct return codes(232)

* fix: Improvements in typing and return codes.

Signed-off-by: Chris Butler <christhebutlers.me>

* Initial trestle create

Signed-off-by: Chris Butler <christhebutlers.me>

* Added UT file

Signed-off-by: Chris Butler <christhebutlers.me>

* Added main file to allow running as &34;python -m trestle&34;

Signed-off-by: Chris Butler <christhebutlers.me>

* Commit to allow merging

Signed-off-by: Chris Butler <christhebutlers.me>

* Cleaned and as expected UT failures after merge

Signed-off-by: Chris Butler <christhebutlers.me>

* Updated such that all models can generate

Signed-off-by: Chris Butler <christhebutlers.me>

* Added unit tests for generators.

Signed-off-by: Chris Butler <christhebutlers.me>

* Ready for review

Signed-off-by: Chris Butler <christhebutlers.me>

* Fixed merge error

Signed-off-by: Chris Butler <christhebutlers.me>

* chore: Refactored init to use pathlib where possible

Signed-off-by: Chris Butler <christhebutlers.me>

* chore: Refactored init to use pathlib where possible

Signed-off-by: Chris Butler <christhebutlers.me> ([`3c25a21`](https://github.com/oscal-compass/compliance-trestle/commit/3c25a215a1cc1d27fb0ca99a606356221e2969dd))

* chore: Auto-update pre-commit hooks (231)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]users.noreply.github.com> ([`157c9bf`](https://github.com/oscal-compass/compliance-trestle/commit/157c9bf99c279855f1027d996132777c614b750c))

* chore: Auto-update pre-commit hooks (222)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]users.noreply.github.com> ([`026541d`](https://github.com/oscal-compass/compliance-trestle/commit/026541df894be37664da9823f8ce25f8f0d1276c))

Feature

* feat: Trestle import and unit testing

* Bringing in clean import and test.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com>

* Updated logging, removed unwanted trestle init in the test that was messing up the working directory from which I run pytest.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com>

* Added argument and return types.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com>

* Anticipating TrestleError or some specific error in try blocks now.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com>

* Linted.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com>

* Fixed error logs for clarity.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com>

* Simplified unnecessary try blocks with assertion on return code.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com>

* Added a test for attempting to import a non-top level element.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com>

* Linting.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com>

* Tightened testing around just _run() for most tests, and cleaned up testing code comments.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com>

* Added exception handler for file PermissionError.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com>

* Removed buffer I/O used tmp_trestle_dir.dirname to put import input outside of trestle project context, and used generators for sample data.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com>

* Unnecessary str().
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com>

* Linting.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com>

* Removing tempfile from test_import_cmd.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com>

* Linted.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com>

* Removed use of tempfile if generated NamedTemporaryFile will be opened outside test scope, as it breaks in Windows.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com>

* Testing load file failures through mocks. Added JSONDecodeError handler in import code.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`81b0a3c`](https://github.com/oscal-compass/compliance-trestle/commit/81b0a3c6d3815430d1203168084907dfc239cdc7))

* feat: Trestle remove commands including unit test coverage.

* trestle remove and tests

Signed-off-by: Jeff Tan <jeffetanau1.ibm.com>

* sample minimal catalog used in trestle remove testing

Signed-off-by: Jeff Tan <jeffetanau1.ibm.com>

* Handling errors without messy exit. Using logger instead of warnings.
Signed-off-by: Jeff Tan <jefferson.tangmail.com>

* Type hints for the return valies added.
Signed-off-by: Jeff Tan <jefferson.tangmail.com>

* Handling errors arising from file arg.
Signed-off-by: Jeff Tan <jefferson.tangmail.com>

* Corrected log text.
Signed-off-by: Jeff Tan <jefferson.tangmail.com>

* - Testing remove() failure correctly.
- Broke up _run() failures into smaller units.
- Covered all _run() failures except plan execute().

Signed-off-by: Jeff Tan <jefferson.tangmail.com>

* Now covering 100%, tests response to failure of add_plan.execute().
Signed-off-by: Jeff Tan <jefferson.tangmail.com> ([`a09e192`](https://github.com/oscal-compass/compliance-trestle/commit/a09e192b8a9ed2e8ccf362b38b4f9b2aecef54cd))

* feat: Validation of duplicates now uses object factory (216)

* Validation of duplicates now using object factory

* flake8 fix

* refactored and simplified validation factory

* Fixed new flake8 B015 errors

* boost duplicates_validator coverage to 100 pct ([`cf00f8b`](https://github.com/oscal-compass/compliance-trestle/commit/cf00f8bb0ea4f0a7c039e1399525ede8d8d0ace8))

* feat: Completed trestle create implementation.

* Initial trestle create

Signed-off-by: Chris Butler <christhebutlers.me>

* Added UT file

Signed-off-by: Chris Butler <christhebutlers.me>

* Added main file to allow running as &34;python -m trestle&34;

Signed-off-by: Chris Butler <christhebutlers.me>

* Commit to allow merging

Signed-off-by: Chris Butler <christhebutlers.me>

* Cleaned and as expected UT failures after merge

Signed-off-by: Chris Butler <christhebutlers.me>

* Updated such that all models can generate

Signed-off-by: Chris Butler <christhebutlers.me>

* Added unit tests for generators.

Signed-off-by: Chris Butler <christhebutlers.me>

* Ready for review

Signed-off-by: Chris Butler <christhebutlers.me> ([`a73538f`](https://github.com/oscal-compass/compliance-trestle/commit/a73538f57f5bf4142c27f65a0b05834650f00cd7))

Fix

* fix: Generalized error expected after parent_model.oscal_read(file_path.absolute()) to handle any and return clean complaint. (245)

Signed-off-by: Jeff Tan <jefferson.tangmail.com> ([`b92ec8b`](https://github.com/oscal-compass/compliance-trestle/commit/b92ec8b40f15f121994eeb57b36e81a3a1b4c239))

* fix: Additional test for trestle add (227)

* fix:add. Add now creates one action plan for all given element paths, instead of individual plans for each element paths provided with -e flag.

* Formatting and liniting

* Add now works with partial models. This prevents addition to models which has already been split from the parent model

* Implemented test for for already split models.

* Changing directory back after test

* Return code in trestle add. Fixed test.

Co-authored-by: Nebula Alam <anebulaau1.ibm.com>
Co-authored-by: Chris Butler <christhebutlers.me> ([`479413f`](https://github.com/oscal-compass/compliance-trestle/commit/479413f1e0d4f90ae3c89833f71ce3fbd7a3db69))

* fix: for issue 229, another Any] still present in file (230)

* Fix for issue 229, another Any] still present in file

* remove print() and fix typo ([`428b270`](https://github.com/oscal-compass/compliance-trestle/commit/428b270861873d5983551cd5a3d980e6dc728700))

* fix: Improvements in typing and return codes. (224)

Signed-off-by: Chris Butler <christhebutlers.me> ([`c382cb5`](https://github.com/oscal-compass/compliance-trestle/commit/c382cb593bf8b2f2b69810650320fdea544ed803))

* fix: Refactor to adopt FileContentType consistently (223)

Signed-off-by: Chris Butler <christhebutlers.me> ([`793ea7c`](https://github.com/oscal-compass/compliance-trestle/commit/793ea7c353e4445b9a8911f3455656403cca0ca0))

* fix: handle anomalous GroupItems that were generating empty classes (220) ([`8fae9dc`](https://github.com/oscal-compass/compliance-trestle/commit/8fae9dcc74f6067fe01fae0caee167e09a8b5d0f))

Unknown

* Trestle release

Merging from develop for a trestle release. ([`bc877fe`](https://github.com/oscal-compass/compliance-trestle/commit/bc877febbbcf4a9e8cd179d83f68ac3e1a390034))

* feature (remote): added furl to setup requirements and began Github fetch... ([`1555f42`](https://github.com/oscal-compass/compliance-trestle/commit/1555f4286d73d0e17382328183531d7c1f897813))

* Merge branch &39;develop&39; into feature/remote ([`582bae2`](https://github.com/oscal-compass/compliance-trestle/commit/582bae2abe077ee9a9c353f44131951c25df8beb))

* Initial implementation of trestle task interface and sample task for testing.

* Initial set of trestle task docs.

Signed-off-by: Chris Butler <christhebutlers.me>

* Additional details for tasks.

Signed-off-by: Chris Butler <christhebutlers.me>

* Initial implementation of trestle tasks. To be thoroughly tested.

Signed-off-by: Chris Butler <christhebutlers.me>

* Initial implementation of trestle tasks. To be thoroughly tested.

Signed-off-by: Chris Butler <christhebutlers.me>

* Stuff.

Signed-off-by: Chris Butler <christhebutlers.me>

* Altered logging behaviour to use improved logger.

Signed-off-by: Chris Butler <christhebutlers.me>

* Corrected unit tests

Signed-off-by: Chris Butler <christhebutlers.me>

* Ready for merge - first trestle tasks.

Signed-off-by: Chris Butler <christhebutlers.me>

* Merged in removed and updated with appropriate logging changes

Signed-off-by: Chris Butler <christhebutlers.me>

* Corrected behaviour.

Signed-off-by: Chris Butler <christhebutlers.me> ([`d38d933`](https://github.com/oscal-compass/compliance-trestle/commit/d38d933b92e0f61f235532ade74d92e173d66349))

* Merge pull request 229 from IBM/fix/missing_main

Added missing main file for running as a module. ([`d8c0683`](https://github.com/oscal-compass/compliance-trestle/commit/d8c0683a36ea8835b9e50358fb161831df6840ad))

* Added missing main file for running as a module.

Signed-off-by: Chris Butler <christhebutlers.me> ([`93f8e0a`](https://github.com/oscal-compass/compliance-trestle/commit/93f8e0a90fcaaeac105fffb3c77360ee1d029333))

* fix:add. Add now creates one action plan for all given element paths, instead of individual plans for each element paths provided with -e flag.

* fix:add. Add now creates one action plan for all given element paths, instead of individual plans for each element paths provided with -e flag.

* Formatting and liniting

* Add now works with partial models. This prevents addition to models which has already been split from the parent model

Co-authored-by: Nebula Alam <anebulaau1.ibm.com>
Co-authored-by: Chris Butler <christhebutlers.me> ([`f33eeda`](https://github.com/oscal-compass/compliance-trestle/commit/f33eeda6bf83c43269175fa03bbab4dddce4a87a))

* Added test skeleton

Signed-off-by: Chris Butler <christhebutlers.me> ([`d839b9b`](https://github.com/oscal-compass/compliance-trestle/commit/d839b9bb1ad2243ed20d0f2dee3409ed0a4db88c))

* Initial implementation of trestle caching for local fs complete.

Signed-off-by: Chris Butler <christhebutlers.me> ([`d01dfb5`](https://github.com/oscal-compass/compliance-trestle/commit/d01dfb5f3991701cb06a1f7735d94aba8fa5e98e))

* Merge branch &39;master&39; into develop ([`a99b19c`](https://github.com/oscal-compass/compliance-trestle/commit/a99b19c096322e94d24977572691ca4a8c927251))

Chore

* chore: Auto-update pre-commit hooks (210)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]users.noreply.github.com> ([`daa70dc`](https://github.com/oscal-compass/compliance-trestle/commit/daa70dceaae62d1ae7576d19cb9c024deabf02cf))

* chore: Adding interface for representing assembly of oscal models. (198)

* Created initial interface for exchanging oscal model trees

Signed-off-by: Chris Butler <christhebutlers.me>

* Added tests for interface and cleaned up code formatting

Signed-off-by: Chris Butler <christhebutlers.me>

* Updated interface name to better reflect funcionality.

Signed-off-by: Chris Butler <christhebutlers.me>

* Updated unit tests to correct for name change.

Signed-off-by: Chris Butler <christhebutlers.me> ([`46934bc`](https://github.com/oscal-compass/compliance-trestle/commit/46934bc700c18d04f9e34d7783b1bf673428b0c1))

* chore: Auto-update pre-commit hooks (191)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]users.noreply.github.com>
Co-authored-by: Chris Butler <christhebutlers.me> ([`412edc0`](https://github.com/oscal-compass/compliance-trestle/commit/412edc0a1cddedfb3f6b82cb3125d2b9f69917c2))

* chore: Separating pre-commit actions and creating an automatic update of precommit (187)

Signed-off-by: Chris Butler <christhebutlers.me> ([`52b4eb7`](https://github.com/oscal-compass/compliance-trestle/commit/52b4eb7943acdcd8a0dcc49070b58648b6fd7dc9))

* chore: Allow changelog to be automatically populated by semantic-release (185)

Signed-off-by: Nebula Alam <anebulaau1.ibm.com> ([`1187d7c`](https://github.com/oscal-compass/compliance-trestle/commit/1187d7c7a42164ce7bf165b04117e66cd4d6ddd7))

* chore: Ensuring DCO bot does not limit core team access. (183)

Signed-off-by: Chris Butler <christhebutlers.me> ([`40adb2d`](https://github.com/oscal-compass/compliance-trestle/commit/40adb2d9a7c9ee06de86d39c9490d867bc8198d3))

* chore: Add github static analysis (153)

Co-authored-by: Bruno <bruno.assis.marquesgmail.com> ([`3d27204`](https://github.com/oscal-compass/compliance-trestle/commit/3d272047c5014e836d93215f925ce0df7c5bdd1c))

Documentation

* docs: Updated developer documentation with DCO and merge workflow.

* docs: Updated developer docs with workflow and DCO both requirements.

Signed-off-by: Chris Butler <christhebutlers.me>

* docs: Updated developer docs with workflow and DCO both requirements.

Signed-off-by: Chris Butler <christhebutlers.me> ([`041a7aa`](https://github.com/oscal-compass/compliance-trestle/commit/041a7aa8b2183a261827e5ee9d7d562849329e12))

* docs: Initial caching structure documentation (143)

* Initial cachinng structure documentation

Signed-off-by: Chris Butler <christhebutlers.me>

* Updated caching documentation

Signed-off-by: Chris Butler <christhebutlers.me>

* Updated caching documentation

Signed-off-by: Chris Butler <christhebutlers.me>

Co-authored-by: Bruno <bruno.assis.marquesgmail.com> ([`d1a73f3`](https://github.com/oscal-compass/compliance-trestle/commit/d1a73f314d42201fb7b9cbe79775a41b465ef6c7))

* docs: Updated readme to document current level of support for file formats (179)

Signed-off-by: Chris Butler <christhebutlers.me>

Co-authored-by: Bruno <bruno.assis.marquesgmail.com> ([`1df2110`](https://github.com/oscal-compass/compliance-trestle/commit/1df2110eb9fb89816871ce70ceb72d5f3be18049))

* docs: change of trestle model directory structure (169)

* update project model structure

* Update directory structure on examples

* Update test data examples on split and merge

Fixes 162

Signed-off-by:: Bruno <brunomarau1.ibm.com> ([`ed2ab36`](https://github.com/oscal-compass/compliance-trestle/commit/ed2ab36c64ddb45297974bb851819322477c0fd2))

Feature

* feat(trestle add): Implements `add` functionality for trestle cmd. (184)

* Implement `trestle add` for adding child models with default values to parent models.
* Helper functions to get model type given parent element and target element path.
* Helper to create object of given model with default values.
* Unit tests for the helpers and trestle add methods.
* Bug fix in `Element().py.set_at()` for setting collection type objects.

Authored-by: Nebula Alam <anebulaau1.ibm.com> ([`eb42656`](https://github.com/oscal-compass/compliance-trestle/commit/eb42656c60c0697ff2de806d4a57ee7b246363de))

Fix

* fix: Versioning tag was malformed. (199) (200)

Signed-off-by: Chris Butler <christhebutlers.me> ([`957fe0b`](https://github.com/oscal-compass/compliance-trestle/commit/957fe0bf08a358e5ab21eb93c60dba65cc486b24))

* fix: Versioning tag was malformed. (199)

Signed-off-by: Chris Butler <christhebutlers.me> ([`5c84d59`](https://github.com/oscal-compass/compliance-trestle/commit/5c84d59c539773b18709968405cbe77ce27e6a99))

* fix: support contextual element path like groups.* during split (192)

Signed-off-by: Lenin Mehedy <lenin.mehedyau1.ibm.com> ([`c9536b2`](https://github.com/oscal-compass/compliance-trestle/commit/c9536b2bcc6404fa9dab8787fcbf97e8590e4402))

* fix: correct directory names of sub models during split (189)

based on the trestle spec, `catalog/groups/00000__group.json` file should be split into a directory called `catalog/groups/00000__group/` and original group file remaining in `catalog/groups/00000__groups.json`

Signed-off-by: Lenin Mehedy <lenin.mehedyau1.ibm.com> ([`6b18237`](https://github.com/oscal-compass/compliance-trestle/commit/6b18237fda53f91f936fc122fdbf74da8e4db65e))

* fix: reference to inexistent function (182)

Signed-off-by: Bruno <brunomarau1.ibm.com> ([`9605a51`](https://github.com/oscal-compass/compliance-trestle/commit/9605a5101507e3d1c79218328424bdf115c435ca))

* fix: infer wrapper alias from input in Element constructor ([`82820fd`](https://github.com/oscal-compass/compliance-trestle/commit/82820fde423c1982a5aa02965d897f04093187bb))

* fix: explicitly use contextual_model argument in path parsing util function

This is to avoid calling `pathlib.Path.cwd()` inside the function that breaks unit tests or assumes caller has changed directory to a trestle project ([`1ae3b12`](https://github.com/oscal-compass/compliance-trestle/commit/1ae3b12e8a3786aa8f7516ca631070fb289be949))

* fix: do not create empty place holder file after splitting a dict or list ([`cb9fa8b`](https://github.com/oscal-compass/compliance-trestle/commit/cb9fa8be810c915198b094785ce581b89a54ce99))

* fix: create main model alias directory during split

If we split a catalog, the sub element files should be in `catalogs/` directory. If we split `catalog/medata.json`, it&39;s sub elements should be put under `catalogs/metadata/` directory. ([`7656e42`](https://github.com/oscal-compass/compliance-trestle/commit/7656e420acedf5b2e61c5fb27b448196a362c521))

* fix: incorrect file indexing during split 148

When a list item is split the file index should have 5 digits instead of 4 digits. ([`ad7b2e6`](https://github.com/oscal-compass/compliance-trestle/commit/ad7b2e63125fa3508254bd0c579e072f1e260fad))

* fix: utility method to write/read Oscal List and Dict object to/from file correctly (161)

* simplify oscal_read

* fix logic to handle list/dict files.

* simplify logic of to_json and support read and write of dict/list files

* add alias_to_classname function

* add support to generate OscalBaseModel wrapper models for get_stripped_contextual_model

* increase test coverage

* fix comment from comma-separated to dot-separator

* fix pip permission error when running check on windows

Fixes 120

Signed-off-by: Bruno <brunomarau1.ibm.com> ([`43c7bdf`](https://github.com/oscal-compass/compliance-trestle/commit/43c7bdf5c30d88056999776e5df5fc9957842122))

* fix: Updating fetch of NIST content.

* Initial set of pretty badges

Signed-off-by: Chris Butler <christhebutlers.me>

* Updated nist source and added oscal-content as a submodule. Also updated the gen-oscal script to ensure currency

Signed-off-by: Chris Butler <christhebutlers.me> ([`85a852a`](https://github.com/oscal-compass/compliance-trestle/commit/85a852a20fa33c1546a7f6cc64201809fb845fea))

* fix: Merge pull request 158 from IBM/fix/issue_149b

chore: merging hotfix back into develop ([`75b11ca`](https://github.com/oscal-compass/compliance-trestle/commit/75b11ca91e0a23778511ac285b4655fbe12bd9f8))

Refactor

* refactor: adjust contextual helper methods for new structure (180)

Signed-off-by: Bruno <brunomarau1.ibm.com> ([`5f14767`](https://github.com/oscal-compass/compliance-trestle/commit/5f14767166567f529e0dd28dcddb076c168ceece))

* refactor: rename fixture name for sameple_target to sample_target_def ([`788510b`](https://github.com/oscal-compass/compliance-trestle/commit/788510b08dd836e1dfce92520a8517cd345b524d))

Unknown

* fix:add (208)

Trestle `add` now creates one action plan for all given element paths, instead of individual plans for each element paths provided with -e flag.

Co-authored-by: Nebula Alam <anebulaau1.ibm.com>
Co-authored-by: Chris Butler <christhebutlers.me> ([`bcbdae8`](https://github.com/oscal-compass/compliance-trestle/commit/bcbdae86a9ec8844208d9368b8b48429ed25c3ed))

* Merge branch &39;master&39; into develop ([`4d77545`](https://github.com/oscal-compass/compliance-trestle/commit/4d7754504591239eca3af9bdf54f452e90f5eb8d))

* Merge pull request 197 from IBM/develop

Merge for release ([`fe784d8`](https://github.com/oscal-compass/compliance-trestle/commit/fe784d84912bbd3c00b3b1651c9fd657abca05df))

* [ImgBot] Optimize images (190)

Fix

* fix: Merge pull request 155 from IBM/fix/issue_149b

Fix/issue 149b - convert Union[A, A] to Union[A, conlist(A, min_items=2)]

closes 149 ([`7ded03e`](https://github.com/oscal-compass/compliance-trestle/commit/7ded03e92e0b3fc8a6b9ef4e7fb4294bbd26b0b5))

Unknown

* bugfix issue 149 - Union[A, A] -> Union[A, conlist(A, min_items=2)] ([`4f6f6a9`](https://github.com/oscal-compass/compliance-trestle/commit/4f6f6a970dcf0919d3a33500544a54651df92b07))

Fix

* fix: Merge pull request 144 from IBM/fix/issue_138_b

fix for issue 138 forward references in assessment_results ([`153b752`](https://github.com/oscal-compass/compliance-trestle/commit/153b752b0de05baa616ac8d83a107eeaa30b0e63))

Unknown

* fix for issue 138 forward references in assessment_results ([`f0aeaf3`](https://github.com/oscal-compass/compliance-trestle/commit/f0aeaf35be82203adb308ed6bfa24e7bf65caa29))

Documentation

* docs: Update readme to reflect alpha status. (134)

Signed-off-by: Chris Butler <christhebutlers.me> ([`8ef9762`](https://github.com/oscal-compass/compliance-trestle/commit/8ef9762ccb015d3a5e2b5c3e9d119e7cbca76c43))

Fix

* fix: Coding formating failure on merge from master

Signed-off-by: Chris Butler <christhebutlers.me> ([`3e00d5d`](https://github.com/oscal-compass/compliance-trestle/commit/3e00d5d76e2fd3018604b4f88a8bd83d07b35f60))

Unknown

* Merge pull request 129 from IBM/develop

Release to master ([`e164c3d`](https://github.com/oscal-compass/compliance-trestle/commit/e164c3dc331c6b1abe6daf60de55276ab1e56b8a))

* Unit test for the bug fix ([`7da40fe`](https://github.com/oscal-compass/compliance-trestle/commit/7da40fee88489721c169386d3c578d668eef8021))

* Handle multiple element paths argument consistently during split 146 (147) ([`8d7943a`](https://github.com/oscal-compass/compliance-trestle/commit/8d7943a537bb9e8191657245e6a2be2cdeddc729))

* add a few more helpers (151) (152)

* add is_valid_project_model_path, get_project_model_path

* move get_singular_alias to fs module

* update parse_element_arg to be context aware when using get_singular_alias

* refactor import of cmd_utils

Co-authored-by: Bruno <brunomarau1.ibm.com> ([`f766486`](https://github.com/oscal-compass/compliance-trestle/commit/f766486eabe4e50bf3817eedf8cc65a2f50f839d))

* Merge pull request 141 from IBM/feature/split_merge_add

Trestle split and foundational functionalities ([`251079f`](https://github.com/oscal-compass/compliance-trestle/commit/251079fceba1bc80283a064dd6de304733c7c42b))

* Merge branch &39;develop&39; into feature/split_merge_add ([`5db28de`](https://github.com/oscal-compass/compliance-trestle/commit/5db28de545e200a0e4e90a279fc46b0a19a2205f))

* Extend functionality for detecting duplicate values in pydantic objects (105)

* Initial implementation of has_no_duplicate_elements

* renamed find_values_by_name_generic to convey not just pydantic objects

* Simplify parsing tests and use new read/write oscal methods

* Manually edit duplicate uuid&39;s

* add tests for duplicate uuids

* added tools and tests to find duplicate values of specified pydantic type

* better naming of test files and edited uuids

* better implementation of get_values_by_name using fields_set

* Prepare for cli validation

* initial connection to cli

* initial integration of validate test into cli

* Added validation test to cli and refactored

Co-authored-by: Chris Butler <christhebutlers.me> ([`b0e3558`](https://github.com/oscal-compass/compliance-trestle/commit/b0e3558b3f1ce6332f7db199a017986eda27e362))

* Fixed regex escape seq. so can again block w605 errors - issue 115 (135)

Co-authored-by: Lenin Mehedy <lenin.mehedyau1.ibm.com> ([`c3b292f`](https://github.com/oscal-compass/compliance-trestle/commit/c3b292fe4deeeed1ebcd765d7e6777b8eb08fdfd))

* Merge pull request 131 from IBM/enhancement/5c

From develop, fix_any.py now adds a license header to output files. ([`4aaa89d`](https://github.com/oscal-compass/compliance-trestle/commit/4aaa89d420709311912d8bd51c617694e7f718b7))

* Merge branch &39;develop&39; into enhancement/5c ([`c0fe5f0`](https://github.com/oscal-compass/compliance-trestle/commit/c0fe5f00626d0b64c026ab31d24d45d3e0af8836))

* Merge branch &39;develop&39; into enhancement/5c ([`55230a7`](https://github.com/oscal-compass/compliance-trestle/commit/55230a7a5870c1f2596eac8c0757002fc8f68ce8))

* Regenerated models in trestle/oscal/ ([`31c9382`](https://github.com/oscal-compass/compliance-trestle/commit/31c9382cab3291b81e1fcd2f507e3603b47ba588))

* Fixed missing newlines for copyright text. ([`e4ffad6`](https://github.com/oscal-compass/compliance-trestle/commit/e4ffad6bb0ddee292a75e7358426f4e1ed687ad3))

* From develop, fix_any.py now adds a license header to output files. ([`ce4806d`](https://github.com/oscal-compass/compliance-trestle/commit/ce4806d80319fee334e395b7c31e5727806af3ab))

* Use get_stripped_contextual_model (140) ([`b045583`](https://github.com/oscal-compass/compliance-trestle/commit/b045583e6d6ba7b411669208b68814e71cbe506b))

* add get_stripped_contextual_model helper (137)

* add get_stripped_contextual_model helper

Co-authored-by: Bruno <brunomarau1.ibm.com> ([`481f691`](https://github.com/oscal-compass/compliance-trestle/commit/481f6916745657befc96b04e9eded9c520f9b910))

* Merge pull request 139 from IBM/feature/split-cmd

Fix recursive model split for a chain of paths ([`88fd9c5`](https://github.com/oscal-compass/compliance-trestle/commit/88fd9c5579268f33ed59f103f9121bc0a7507fb3))

* Fixed typo ([`9b17ae3`](https://github.com/oscal-compass/compliance-trestle/commit/9b17ae35d9686d264875afe59bb3e0d05df42628))

* Update example in method description for clarity ([`6209113`](https://github.com/oscal-compass/compliance-trestle/commit/62091130e47c21dc2c52aad0dd684fd233aa1742))

* Fix typo and update comment ([`6fcd392`](https://github.com/oscal-compass/compliance-trestle/commit/6fcd3926cb8fdeac3e47e879cee7a5e5701201ae))

* Merge branch &39;feature/split_merge_add&39; into feature/split-cmd ([`21aa9e8`](https://github.com/oscal-compass/compliance-trestle/commit/21aa9e8ab6e9e2d030b1d260d6a53ddb923157f8))

* Catch exception during Plan simulation and always run rollback ([`7845f68`](https://github.com/oscal-compass/compliance-trestle/commit/7845f68e672f704e6c82a58ff450e10d9b539b71))

* Fix recursive model split for a chain of paths ([`ecfed54`](https://github.com/oscal-compass/compliance-trestle/commit/ecfed5432fb1a1eefb0e39d296044ea07f76af1f))

* Reuse to_json method to reduce code duplication ([`b2549cf`](https://github.com/oscal-compass/compliance-trestle/commit/b2549cf40cb54df30800ae7950b97b75ea5e6413))

* Fix parent model name in the element path during parsing ([`ebc8474`](https://github.com/oscal-compass/compliance-trestle/commit/ebc8474e6b873022a0f2cd221bfc3f31201f607e))

* Fix getting full element path recursively ([`897d2d2`](https://github.com/oscal-compass/compliance-trestle/commit/897d2d25cc9fcc56de0afb6a43d6705fd3bf380b))

* Merge branch &39;feature/split_merge_add&39; into feature/split-cmd ([`139983d`](https://github.com/oscal-compass/compliance-trestle/commit/139983dd5f6af84c26bed31f19ed7847ebe58f02))

* add get_singular_alias helper (136)

* add get_singular_alias helper

Co-authored-by: Bruno <brunomarau1.ibm.com> ([`984c94c`](https://github.com/oscal-compass/compliance-trestle/commit/984c94c3faa72ac506a1aa26f4555b2cd610afe1))

* Merge pull request 133 from IBM/feature/split_merge_add

Merge latest code into develop ([`1153584`](https://github.com/oscal-compass/compliance-trestle/commit/115358414db57195d5c3d0215899c16c69224dce))

* Merge branch &39;develop&39; into feature/split_merge_add ([`7800622`](https://github.com/oscal-compass/compliance-trestle/commit/7800622a537a6b882b66a3859fac72b048e0d95a))

* Implement multi-level recursive split ([`dac9e3e`](https://github.com/oscal-compass/compliance-trestle/commit/dac9e3e546eb135dbcff678b49ae33cdc734794c))

* Each element path must have its root model as the path prefix ([`e1cf697`](https://github.com/oscal-compass/compliance-trestle/commit/e1cf69767a015ac657b8c9fa17e810eeea60e019))

* Merge branch &39;feature/split_merge_add&39; into feature/split-cmd ([`c90533c`](https://github.com/oscal-compass/compliance-trestle/commit/c90533c873768e7b49edbadc932c59d9a32690bd))

* Merge develop ([`18d1086`](https://github.com/oscal-compass/compliance-trestle/commit/18d10865e90f0a6ac4171f3fe35bbc0e85ce3910))

* Merge branch &39;master&39; into develop ([`863ad75`](https://github.com/oscal-compass/compliance-trestle/commit/863ad75637c31de19908847d8a671e45d8beb084))