Compliance-trestle

Chore

* chore: Merge back version tags and changelog into develop. ([`ee17ea5`](https://github.com/oscal-compass/compliance-trestle/commit/ee17ea5524fd56e92698d6f7e0106d48c55c66c8))

Feature

* feat: Update NIST models to latest including refactors & UT&39;s

* feat:Update Oscal version

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

* transformer changes with respect to OSCAL 1.0.0 rc2

* update documentation (transform results)

* multiple changes for latest nist - some tests still fail

Signed-off-by: FrankSuits <frankstau1.ibm.com>

* removed ssp validate test

Signed-off-by: FrankSuits <frankstau1.ibm.com>

* fixed code format

Signed-off-by: FrankSuits <frankstau1.ibm.com>

* fix:Reworking generators

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

* cleaned up gen-oscal.py and regenerated the oscal models.

Signed-off-by: FrankSuits <frankstau1.ibm.com>

Co-authored-by: Chris Butler <christhebutlers.me>
Co-authored-by: degenaro <lou.degenarogmail.com> ([`5a7a8a3`](https://github.com/oscal-compass/compliance-trestle/commit/5a7a8a338ad3ef427f2ae9f26e2de4ac920fa525))

* feat: Initial trestle markdown functionality. (407)

* Initial markdown template for use with cidd

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

* Update for merge

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

* feat: MVP markdown validator working

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

* feat: MVP markdown validator working

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

* Initial full pass of content validation for markdown.

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

* fix:Added missing test files for md workflows.

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

* fix:Correct dependency issues.

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

* chore: Refactored md codebase.

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

* fix: Fixed up unit tests.

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

* fix: Adding markdown_validator tests.

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

* chore: Small updates.

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

* fix:Removing governed projects to reduce scope of PR

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

* chore: Adding UT&39;s for trestle md subcommands.

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

* chore: Added unit test for allowed_task_name

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

* chore: more UT&39;s

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

* chore: Adding more unit tests.

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

* fix: Removing python 3.8+ feature from unit tests.

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

* docs: Adding more documentation.

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

* chore: Updating docs

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

* chore: Adding windows dependencies

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

* fix:Added unit tests.

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

* added windows tests for hidden files

Signed-off-by: FrankSuits <frankstau1.ibm.com>

* fix:documentation

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

* fix:documentation

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

* fix:documentation

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

* fix:documentation

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

* fix:documentation

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

* fix:documentation

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

* fix:documentation

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

* fix:Completed documentation

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

* fix:Correcting unit tests with bad logic

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

* fix: More unit tests.

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

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

* feat: Basics of HTTPS Fetcher for remote caching (421)

* feat (remote) HTTPS Fetcher with basic tests.

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

* feat (remote) More tests for HTTPS Fetcher.

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

* feat (remote) More tests for HTTPS Fetcher and some improvements.

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

* feat (remote) Setting explicit verify arg in requests.get for HTTPS Fetcher, with tests. This is a precaution in case current behavior with verify=None by default becomes verify=False by default, which can be bad (no SSL verification of source certificate).

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

* feat (remote) Minor error message fix.

* feat (remote) Minor error message fix.

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

* feat (remote) Removed outfile use -- was left over from debugging.

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

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

Fix

* fix: Issue 344 checked rc for commands in tests and removed dependency on dictdiffer (440)

Signed-off-by: FrankSuits <frankstau1.ibm.com> ([`acc337b`](https://github.com/oscal-compass/compliance-trestle/commit/acc337b368602d5191244f973029b6ab02f212b2))

* fix: Strangely behaving log lines (425)

* fix errant log lines --signoff

* format fix

signed-off-by: Frank Suits <frankstau1.ibm.com>

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

Unknown

* Trestle release: Markdown functionality and OSCAL updates prepping for rc2

Release to main ([`0d923e1`](https://github.com/oscal-compass/compliance-trestle/commit/0d923e15df8c1fc1936a2efea1d70e9af4750ad0))

* chore:Add google analytics to the trestle website. (437)

* chore:Add google analytics to websie.

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

* chore:Add google analytics to website.

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

* chore:Updating mkdocs to avoid errors (438)

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

* added uuid regen for import and replicate (428)

* added uuid regen for import and replicate

Signed-off-by: FrankSuits <frankstau1.ibm.com>

* some cleanup and added docs

Signed-off-by: FrankSuits <frankstau1.ibm.com> ([`805485f`](https://github.com/oscal-compass/compliance-trestle/commit/805485ffafe0ebc6dd08573d347924eccb6debb9))

* tutorial: what&39;s your compliance posture? (427)

* tutorial: what&39;s your compliance posture?

* changed trestle links and fixed typos

Signed-off-by: Frank Suits <frankstau1.ibm.com>

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

Chore

* chore: Adjust codecov to allow for some wiggle room. (414) ([`888696b`](https://github.com/oscal-compass/compliance-trestle/commit/888696bd060b5b10caf35692ff400cbcf2a7de59))

* chore: Typos and remove automation that is causing issues.

* fix: Updating documentation website content

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

* fix: Small corrections

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

* fix:Formatting issues introduced by manual merging in GH

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

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

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

* chore: Merge back version tags and changelog into develop. ([`be2e49a`](https://github.com/oscal-compass/compliance-trestle/commit/be2e49a5f3733af8d9403f961f88878eba3d86fc))

Documentation

* docs: Added more tutorials to the documentation for split and merge.

* added debug lines

* partial changes - added version command

* added changes to handle names vs. files

* load_distributed can now load object by name

* added test coverage. suppressed trash msg. better handling of top level model

* removed commented code line

* shortened comment

* fixes to some failure modes of split/merge

* new tutorial for split merge of oscal catalog

* fixed links and added missing file to mkdocs.yaml

* update mkdocs ([`0bf275a`](https://github.com/oscal-compass/compliance-trestle/commit/0bf275af173ac563147d73daaf5d500edd5c8729))

* docs: Instructions for gen_oscal and fix_any added to website.md (389)

* updated with description of how to build models with gen_oscal and fix_any

* Added text for order_classes

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

Feature

* feat: Adding exchange protocol as a supported 3rd party schema and object model. (416)

* chore: Adjust codecov to allow for some wiggle room.

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

* feat:Added exchange protocol support

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

* feat: added collection utilities. (413)

* feat: added collection utilities.

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

* fix: Updated documentation to pass build.

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

* fix: leveraged new capability in load_distributed.

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

Fix

* fix: Correcting more issues with load_distributed impacting trestle split and merge

* added debug lines

* partial changes - added version command

* added changes to handle names vs. files

* load_distributed can now load object by name

* added test coverage. suppressed trash msg. better handling of top level model

* removed commented code line

* shortened comment

* fixes to some failure modes of split/merge ([`6ccb4db`](https://github.com/oscal-compass/compliance-trestle/commit/6ccb4db1614b521b9a132cbae17ac0922dea729b))

* fix: Cleanup and add unit tests to the exchange_protocol module (417)

* chore: Adjust codecov to allow for some wiggle room.

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

* feat:Added exchange protocol support

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

* chore: Cleanup for merge.

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

* fix:Added UT&39;s and corrected schema to work with gen_oscal.py

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

* fix: merge updates - added version subcommand and modified load_distrib to load files by name (415)

* added debug lines

* partial changes - added version command

* added changes to handle names vs. files

* load_distributed can now load object by name

* added test coverage. suppressed trash msg. better handling of top level model

* removed commented code line

* shortened comment

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

* fix: Correct OSCAL output to desired design point for osco-to-oscal.

* Several small-ish fix-ups to produced OSCAL.

* Fix comparison data for utils tests.

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

* fix: Model behaviour correction and update to latest pydantic version.

* initial generation of uuids

* updated version of uuid regen

* new script to sort classes to allow diff after fix_any

* Initial fix to fix_any prior to cleanup

* Min pydantic version now 1.8.1 after recent fix for __root__

* New script to order classes for comparison after applying fix_any

* Simplified fix_any and fixed handling of *Item classes

* cleanup for code-lint

* fixes from new fix_any

* Allow creation of duplicate class names by tagging with index: 1,2,3 etc. ([`fcbaa23`](https://github.com/oscal-compass/compliance-trestle/commit/fcbaa2356dc2c7c53e3df1e5c7cd43b5c55c368b))

Unknown

* Merge pull request 424 from IBM/develop

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

* [ImgBot] Optimize images (411) ([`1bc5860`](https://github.com/oscal-compass/compliance-trestle/commit/1bc58607cb80227bdfc49e77373ce8369562c2b6))

* Doc/tutorial task tanium to oscal (406)

* Tutorial: use of trestle task tanium-to-oscal

* transformer-construction

* title change.

* put &34;lite&34; in title

* remove <style> tags.

* Add OSCAL snippets; enlarge diagram.

* Add data processing details for Observation and Finding cases.

* Other possible code stack configurations.

* Tutorials.

* Remove eclipse specific file; ignore eclipse things.

* Fix tutorials link. ([`1c7b700`](https://github.com/oscal-compass/compliance-trestle/commit/1c7b70012000c56ccb223484faada67bb174e5be))

* fix:Remove dead workflow

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

* fix to problem where split has trouble with files specified with path (396)

* fix to problem where split has trouble with files specified with directory path

* boost test coverage

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

* Feature/tanium plus (391)

* task tainium-to-oscal results

* Minor fixes, cleanup, and support for merge or separate output.

* Include top level result: in json output.

* Simulate should not produce output file.

* Fix finding aggregate; code clean-up; 100% test coverage.

* Fix finding aggregate; code clean-up; 100% test coverage.

* task tainium-to-oscal results

* Minor fixes, cleanup, and support for merge or separate output.

* Include top level result: in json output.

* Simulate should not produce output file.

* Fix finding aggregate; code clean-up; 100% test coverage.

* Fix finding aggregate; code clean-up; 100% test coverage.

* Updates to handle fixes to oscal layer.

LocalDefinitions1
InventoryItem

* Update website doc.

* Use ObjectiveStatus, and several small result fixes.

* Use <details> + <summary> to manage large samples in doc. ([`6ecfd13`](https://github.com/oscal-compass/compliance-trestle/commit/6ecfd133b2d0a47e21e7538fe94e3315bddbe55b))

* Cull duplicate oscal models, update to DMCG 0.9.1, add oscal version … (392)

* Cull duplicate oscal models, update to DMCG 0.9.1, add oscal version to -v

* fix: Strip development to minimum commitments.

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

* docs: Call out restriction in changes

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

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

* Merge branch &39;develop&39; into fix/fix_any_drops_item ([`e400738`](https://github.com/oscal-compass/compliance-trestle/commit/e4007381af3812e07acfd00e66a25ed9beca5f59))

* Merge pull request 383 from IBM/feature/samples-oscal-1.0.0-rc1

Updated interchange schema, catching up with OSCAL 1.0.0-rc1, with samples, README, and a script to generate the schema ([`e4b0124`](https://github.com/oscal-compass/compliance-trestle/commit/e4b01244b7be60d1ff467daa201ed4e0fb199760))

* Merge branch &39;feature/samples-oscal-1.0.0-rc1&39; of github.com:IBM/compliance-trestle into feature/samples-oscal-1.0.0-rc1 ([`f070907`](https://github.com/oscal-compass/compliance-trestle/commit/f0709075c157fab7ecf6acefb186084af9fc62ab))

* Merge branch &39;develop&39; into feature/samples-oscal-1.0.0-rc1 ([`ae4544f`](https://github.com/oscal-compass/compliance-trestle/commit/ae4544ff0e08f8dc5a435f67c6f65fddba900e1c))

* feat (samples-oscal-1.0.0-rc1): Improved behavior of script in Windows environments where /dev/stdout won&39;t work for output.

Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`6a02920`](https://github.com/oscal-compass/compliance-trestle/commit/6a029208fadcc419b0d4a1f764689b58029a570d))

* feat (samples-oscal-1.0.0-rc1): Formatted README.

Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`d3da956`](https://github.com/oscal-compass/compliance-trestle/commit/d3da95655b0a1c3fde66f72f00c9e3d13ed904c7))

* feat (samples-oscal-1.0.0-rc1): Clarified README.

Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`ec18022`](https://github.com/oscal-compass/compliance-trestle/commit/ec1802208c5d60d58c94099a0ac43d9711d2bb36))

* feat (samples-oscal-1.0.0-rc1): Sanitized README some more.

Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`a419961`](https://github.com/oscal-compass/compliance-trestle/commit/a4199616869fc894174f66524a5a112d3252b2b3))

* feat (samples-oscal-1.0.0-rc1): Updated custom schema and samples to catch up with OSCAL 1.0.0-rc1. Script to generate schema also added.

Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`de22ac7`](https://github.com/oscal-compass/compliance-trestle/commit/de22ac7c1b32596bd267c8b1f967839d51de1173))

* Allow creation of duplicate class names by tagging with index: 1,2,3 etc. ([`d07a398`](https://github.com/oscal-compass/compliance-trestle/commit/d07a398e806bd9e30c09bde4be8f5848705680a9))

* fixes from new fix_any ([`80aa9c4`](https://github.com/oscal-compass/compliance-trestle/commit/80aa9c4775159c357889c5c191fb364e4a545c85))

* cleanup for code-lint ([`fd93eb5`](https://github.com/oscal-compass/compliance-trestle/commit/fd93eb528a3f9afdf4bc7611435763b781032d3d))

* Simplified fix_any and fixed handling of *Item classes ([`b424150`](https://github.com/oscal-compass/compliance-trestle/commit/b424150aa676a58e2255507f2c08088d36e85cb1))

* New script to order classes for comparison after applying fix_any ([`8904913`](https://github.com/oscal-compass/compliance-trestle/commit/8904913cc0f8955b2b97b5472482af44434bc123))

* Min pydantic version now 1.8.1 after recent fix for __root__ ([`6a686d2`](https://github.com/oscal-compass/compliance-trestle/commit/6a686d29dbae0f81e3e6f4c3f04340042cde1123))

* Initial fix to fix_any prior to cleanup ([`9675a3a`](https://github.com/oscal-compass/compliance-trestle/commit/9675a3ac7f9cdfc9e17d955f4ef37d5c8d796461))

* new script to sort classes to allow diff after fix_any ([`bec3e3a`](https://github.com/oscal-compass/compliance-trestle/commit/bec3e3a9c96203af6824016cab9b79ef4f2db52b))

* updated version of uuid regen ([`27382ce`](https://github.com/oscal-compass/compliance-trestle/commit/27382ce7f098adc64f731cd19d8920a4e3d491fb))

* Merge branch &39;develop&39; of https://github.com/IBM/compliance-trestle into feat/uuid_regen ([`f90ba17`](https://github.com/oscal-compass/compliance-trestle/commit/f90ba17e0c6d261a3a743cbf571da072aedcde73))

Chore

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

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

* chore: Merge back version tags and changelog into develop. ([`5475dbe`](https://github.com/oscal-compass/compliance-trestle/commit/5475dbe2502cd649661d7cd14370c161610f7b18))

Feature

* feat: Tanium export to oscal conversion task.

* task tanium-to-oscal

* task tanium-to-oscal website documentation

* Add config param timestamp.

* 3rd party tools.

* Fix code format issues.

* Missing types.

* Missing return type.

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

Fix

* fix: Enforce oscal version in models and tests (377)

Now enforce oscal version defined in one place. Many changes to tests and data.

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

Unknown

* Merge pull request 382 from IBM/develop

Bug fix release: clean up issue due to pydantic changes in 1.8.0 ([`48e60ed`](https://github.com/oscal-compass/compliance-trestle/commit/48e60ed1f2f1e0eae71799eec2e49873fd3da0eb))

* Fix: Dependency issues including pydantic (380)

* Fix: Dependency issues

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

* fix:Constrain pydantic version

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

* initial generation of uuids ([`9c8fd13`](https://github.com/oscal-compass/compliance-trestle/commit/9c8fd139665a4042ff3fb115b2e2625ec03534ba))

* Merge pull request 356 from IBM/feature/remote

remote cache with SFTP and local fetchers ([`52a49db`](https://github.com/oscal-compass/compliance-trestle/commit/52a49db6df28e6d188b3ec5729d265def2b84128))

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

Chore

* chore: Merge back version tags and changelog into develop. ([`6eb2939`](https://github.com/oscal-compass/compliance-trestle/commit/6eb293999bbbf2052c7a480ffd5a77d7a7304a0f))

Fix

* fix: Import issues with hyphen named files (371)

Includes fixes to:
1) Parsing of unknown OSCAL content types (for top level schemas)
2) Method for testing that the website working. ([`07493ad`](https://github.com/oscal-compass/compliance-trestle/commit/07493ad76f720503d756c54d67a1199abe181693))

Unknown

* Merge pull request 374 from IBM/develop

Bugfix merge to master ([`ade0c5f`](https://github.com/oscal-compass/compliance-trestle/commit/ade0c5f695c976ecc7169dc4241133fb5c9326b4))

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

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

* Fix: Corrected componnent model caused by new datamodel-gen, using original nist source (373)

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

* feat:Improved documentation abstraction to use the doc string at multiple levels. (370)

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

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

Chore

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

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

* chore: Unit test runs to ensure website boots and is usable. (338)

* unit test: website boots and is usable.

Signed-off-by: Lou Degenaro <degenarous.ibm.com>

* whoopsi - forgot to format & lint.

Signed-off-by: Lou Degenaro <degenarous.ibm.com>

Co-authored-by: degenaro <degenarous.ibm.com>
Co-authored-by: Chris Butler <christhebutlers.me> ([`7b1b48d`](https://github.com/oscal-compass/compliance-trestle/commit/7b1b48d8438c0f2f800741945811fb832ad76df0))

* chore: Merge back version tags and changelog into develop. ([`4686dd4`](https://github.com/oscal-compass/compliance-trestle/commit/4686dd46d14e9d9c57431c238a8bed2e4a816acc))

Documentation

* docs: website documentation for trestle task osco-to-oscal (336)

Signed-off-by: Lou Degenaro <degenarous.ibm.com>

Co-authored-by: degenaro <degenarous.ibm.com>
Co-authored-by: Chris Butler <christhebutlers.me> ([`95c5c09`](https://github.com/oscal-compass/compliance-trestle/commit/95c5c09b9f6f56aa4697609459f1369e06b7f3c2))

Feature

* feat: Added bulk operations for assemble (367)

Allows assemble to be executed across all files of a given type.
Co-authored-by: Chris Butler <christhebutlers.me> ([`771d54e`](https://github.com/oscal-compass/compliance-trestle/commit/771d54e29ee839d38330929001c908b6ad669f8f))

* feat: Utility to transform OSCO yaml data into OSCAL observations json data. (348)

Signed-off-by: Lou Degenaro <degenarous.ibm.com>

Co-authored-by: degenaro <degenarous.ibm.com>
Co-authored-by: Chris Butler <christhebutlers.me> ([`488a75a`](https://github.com/oscal-compass/compliance-trestle/commit/488a75a7fa5f259b2655b624ba7e3643c4ab7b28))

* feat: validate duplicates now loads distributed models (346)

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

Fix

* fix: Allow assemble to succeed when no model is found. (368)

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

* fix: To website automation test on windows (366) ([`8e3ecbf`](https://github.com/oscal-compass/compliance-trestle/commit/8e3ecbf5f9acb8db4e200f7769cefcb20941a410))

Unknown

* Merge pull request 364 from IBM/develop

Release to main: Refactored behaviour for validate and assemble. ([`194c005`](https://github.com/oscal-compass/compliance-trestle/commit/194c0058d2d2e806ea19cefddde8a05ea9c5bfe2))

* feat (remote): SSH_KEY must now contain the private key (RSA), not its file name, e.g., SSH_KEY=$(cat ~/.ssh/id_rsa). It is expected to have newlines. Unit test updated accordingly.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`74223a1`](https://github.com/oscal-compass/compliance-trestle/commit/74223a18a7e4d81a55167d0237d0fb1f14d9385d))

* feat (remote): Linted.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`23dc762`](https://github.com/oscal-compass/compliance-trestle/commit/23dc76213d376ee9295d9e0d0bed94c64887a283))

* feat (remote): Removed HTTPS and Github Fetcher code for now, to be dealt with sometime after this version merges in.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`b9c4778`](https://github.com/oscal-compass/compliance-trestle/commit/b9c47781b7b8c8fcd49d64cbb3a6a2a678be9119))

* feat (remote): Updated test_https_fetcher() so a try block isn&39;t included.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`54019af`](https://github.com/oscal-compass/compliance-trestle/commit/54019af446c3942897c142913176a6775248dbe1))

* feat (remote): Local fetcher will now refuse to cache an object that is inside a trestle project. Unit tests adjusted accordingly.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`663af76`](https://github.com/oscal-compass/compliance-trestle/commit/663af764627d36bc3c33f14186d25aafa980ea54))

* Merge branch &39;feature/remote&39; of github.com:IBM/compliance-trestle into feature/remote
Chris merged develop into this more recently.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`90437e4`](https://github.com/oscal-compass/compliance-trestle/commit/90437e4b18ed59c8374cc331bd41a08f8f24d07a))

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

* Wrap validate in try block to catch exceptions. Increase test coverage. (363) ([`14686a8`](https://github.com/oscal-compass/compliance-trestle/commit/14686a873b71aff2ba6a4494efed49d8f95ec29d))

* Feature/validate distributed now validates models by type and all (360)

* validate duplicates now loads distributed models

* Extensive changes to support loading models by name

* validate by type now works. Increased test coverage.

* validate now works on -all. all tests pass

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

* Feat: Trestle init now adds keep files. (357)

* trestle init now adds .keep files to preserve directory structure for git

Signed-off-by: Juliet Rubinstein <juliet.rubinsteinibm.com>

* trestle init now adds .keep files to preserve directory structure for git

Signed-off-by: Juliet Rubinstein <juliet.rubinsteinibm.com>

* trestle init now adds .keep files to preserve directory structure for git

Signed-off-by: Juliet Rubinstein <juliet.rubinsteinibm.com>

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

* Merge pull request 354 from IBM/feature/import-validate

feat (import): Validation is now part of trestle import, with a rollback if duplicates are found. ([`4080dc2`](https://github.com/oscal-compass/compliance-trestle/commit/4080dc23e13eba0398face98d55f705a60b7216e))

* feat (import): Updated test for import with validation calls, coverage up to 100%.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`c168922`](https://github.com/oscal-compass/compliance-trestle/commit/c1689223330d28c9487cde5337ea1a3a18e9883e))

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

* feat (import): Updated tests for import with validation calls.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`2a3b71f`](https://github.com/oscal-compass/compliance-trestle/commit/2a3b71f290077bef6e1247c8d29ec5d5eb78a7eb))

* feat (import): Linted.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`2ea9df6`](https://github.com/oscal-compass/compliance-trestle/commit/2ea9df6a70daca840fa9bbfae262acb277175b59))

* feat (import): Validating imported model using trestle validate, rolling back if unhappy with results.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`d9c810a`](https://github.com/oscal-compass/compliance-trestle/commit/d9c810ad09e7c33baf3f424b5ea9fb38e2483d21))

* feat (remote): Fixed confused use of SSH_KEY, so now it refers to a private key, if supplied. Host keys are now loaded from usual/default paths.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`7cd95ca`](https://github.com/oscal-compass/compliance-trestle/commit/7cd95ca59b2a193d1651f777cfa2eb3d0dadd71c))

* feat (remote): Setting relative paths for the local fetcher aside, for now.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`d5c6285`](https://github.com/oscal-compass/compliance-trestle/commit/d5c628509e871cf7b962b6ca36c497233fa1ec32))

* feat (remote): Can&39;t handle relative paths properly on Windows just yet.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`d1632a7`](https://github.com/oscal-compass/compliance-trestle/commit/d1632a7636a8ab24d0303dfb2f5aa84077875c9e))

* feat (remote): code-format prefers one line.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`cb806bb`](https://github.com/oscal-compass/compliance-trestle/commit/cb806bb0fbacb174adc1399d89c6771c744c70ab))

* feat (remote): Allowing for sftp uri with a password but no username, which is pulled in from environment instead.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`b7f3630`](https://github.com/oscal-compass/compliance-trestle/commit/b7f3630800a6164f9d5e151cd6ff4a992544d493))

* feat (remote): Fixed unwanted attribute assignments (may remove them completely). Added local fetcher test for relative paths.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`0dbf1a5`](https://github.com/oscal-compass/compliance-trestle/commit/0dbf1a55ceb278ea497b9978276137fe1060f78e))

* feat (remote): Fixed naming for _cached_dir variable to disambiguate across fetchers.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`2292f7b`](https://github.com/oscal-compass/compliance-trestle/commit/2292f7b8cd79295dd6f8976af6982c7c47c6f2ad))

* feat (remote): Improved docstrings, with attributes and arguments listed where applicable.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`c779099`](https://github.com/oscal-compass/compliance-trestle/commit/c7790990cb9fe661456808d1c4789d4a4522b0d6))

* feat (remote): Improved docstrings, cleaned up code a bit.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`a96a0c6`](https://github.com/oscal-compass/compliance-trestle/commit/a96a0c6af225b152ec28c54b6c451b70de8d0988))

* feat (remote): Accepting any Windows filesystem drive letter in uri.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`12b4d11`](https://github.com/oscal-compass/compliance-trestle/commit/12b4d11021c3ff43e7d66c7637e976331b32320e))

* feat (remote): Added or improved docstrings, and removed unnecessary fail_hard attribute.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`68d384f`](https://github.com/oscal-compass/compliance-trestle/commit/68d384f881ab0133220f67f5dcad0bd5283f7e61))

* feat (remote): Moving settings work out of this branch.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`178cc4b`](https://github.com/oscal-compass/compliance-trestle/commit/178cc4b7e8dabea1941561f68c1208158385faac))

* feat (settings): Moving settings-related work out of this branch and into its own branch.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`b3de78c`](https://github.com/oscal-compass/compliance-trestle/commit/b3de78c896316bb04ff06ab64281a8a4cc05e196))

* feat (settings): Using random non-functional token string.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`e72ea65`](https://github.com/oscal-compass/compliance-trestle/commit/e72ea6576b431a0351984514eae159714dd81154))

* feat (remote): Again, username and password for HTTPSFetcher tests instead of expecting a particular env var.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`c7390c1`](https://github.com/oscal-compass/compliance-trestle/commit/c7390c1b5138b6707627346c18b32ba3c3ed3a66))

* feat (remote): Setting username and password for HTTPSFetcher tests instead of expecting a particular env var.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`38d4a87`](https://github.com/oscal-compass/compliance-trestle/commit/38d4a8746a63eaeba3014282edbf542695fb3611))

* feat (remote): linted HTTPSFetcher tests.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`664da29`](https://github.com/oscal-compass/compliance-trestle/commit/664da29e91f38a7e9ae9a41888f4f4c1399d4758))

* feat (remote): improved get test for HTTPSFetcher.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`e4aec2c`](https://github.com/oscal-compass/compliance-trestle/commit/e4aec2cd848e5db39b7509ac70727cfac9c1fb34))

* feat (remote): get failure test for HTTPSFetcher.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`620fe44`](https://github.com/oscal-compass/compliance-trestle/commit/620fe442685a8dee0bac53bccb5d578130e90ea9))

* feat (remote): HTTPSFetcher now fills _inst_cache_path, and now has a basic unit test. Minor fix to test_fetcher_factory.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`d3d96e6`](https://github.com/oscal-compass/compliance-trestle/commit/d3d96e6c6d43bde4de1b7d1d4b5b69d9445b317d))

* Added tests for unsupported scheme in url and a local file in a Windows filesystem.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`c8f8de7`](https://github.com/oscal-compass/compliance-trestle/commit/c8f8de79ceeb729511ca830fc60b7911de3128b4))

* feat (import): Updated nist submodules.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`05db1a0`](https://github.com/oscal-compass/compliance-trestle/commit/05db1a08bbc6143a2f66145978d5da13270cfa37))

* feat (import): Linted/formatted/modified to allow make test to succeed.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`f51023f`](https://github.com/oscal-compass/compliance-trestle/commit/f51023f078b993331c59ad561533e8211d8115ac))

* Merge branch &39;develop&39; into feature/remote
Just to align this branch with recent updates in develop.
Signed-off-by: Jeff Tan <jeffetanau1.ibm.com> ([`f5e5723`](https://github.com/oscal-compass/compliance-trestle/commit/f5e57238fe48c7c63e57ce9116c02b98012f5cf1))

* New command replicate and functionality to deduce content type based on discovered file extension (331)

* Initial mock up of replicate and test

* More complete implementation - passes test

* more fixes due to changing --name to --output

* Added path_to_content_type and tests

Allows determining content type from extension of file in directory.

* Usable version of replicate with more comprehensive tests.

* Improved docstring and pluralize function

* increase coverage for replicate

* added tests to bring coverage to 100%

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

Fix

* fix: DevOps fixes onto main (334)

* Implemented trestle assemble with some UT

* Modified docs

* Code format

* Code lint

* Extending UT

* Full UT

* assemble bug fix

* fix &39;make docs-serve&39; on linux (Red Hat 7.9)

Signed-off-by: Lou Degenaro <degenarous.ibm.com>

* Updated to deal with inherently plural model names.

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

* fix: Fix merge main to back to develop automatically.(332)

* Corrected errors in the build process.

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

* Corrected errors in the build process.

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

Co-authored-by: Nebula Alam <anebulaau1.ibm.com>
Co-authored-by: degenaro <degenarous.ibm.com> ([`74df375`](https://github.com/oscal-compass/compliance-trestle/commit/74df375c15ad0bc2f0fb8c54e1ed83faf11d66e4))

Unknown

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